refactor: replace generic catalog DTOs with shape-typed DTOs for type safety
Replace the single CatalogMaterialDto + CatalogDimensionsDto (bag of nullable fields) with per-shape DTOs that have strongly-typed dimension properties. Catalog JSON now groups materials by shape key instead of a flat array. Delete the old SeedController/SeedDataDtos (superseded by CatalogService). Scraper updated to emit the new grouped format, resume by default, and save items incrementally. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -39,6 +39,101 @@ public class CatalogService
|
||||
.AsNoTracking()
|
||||
.ToListAsync();
|
||||
|
||||
var grouped = materials.GroupBy(m => m.Shape);
|
||||
var materialsDto = new CatalogMaterialsDto();
|
||||
|
||||
foreach (var group in grouped)
|
||||
{
|
||||
foreach (var m in group)
|
||||
{
|
||||
var stockItems = MapStockItems(m, suppliers);
|
||||
|
||||
switch (m.Shape)
|
||||
{
|
||||
case MaterialShape.Angle when m.Dimensions is AngleDimensions d:
|
||||
materialsDto.Angles.Add(new CatalogAngleDto
|
||||
{
|
||||
Type = m.Type.ToString(), Grade = m.Grade, Size = m.Size, Description = m.Description,
|
||||
Leg1 = d.Leg1, Leg2 = d.Leg2, Thickness = d.Thickness,
|
||||
StockItems = stockItems
|
||||
});
|
||||
break;
|
||||
case MaterialShape.Channel when m.Dimensions is ChannelDimensions d:
|
||||
materialsDto.Channels.Add(new CatalogChannelDto
|
||||
{
|
||||
Type = m.Type.ToString(), Grade = m.Grade, Size = m.Size, Description = m.Description,
|
||||
Height = d.Height, Flange = d.Flange, Web = d.Web,
|
||||
StockItems = stockItems
|
||||
});
|
||||
break;
|
||||
case MaterialShape.FlatBar when m.Dimensions is FlatBarDimensions d:
|
||||
materialsDto.FlatBars.Add(new CatalogFlatBarDto
|
||||
{
|
||||
Type = m.Type.ToString(), Grade = m.Grade, Size = m.Size, Description = m.Description,
|
||||
Width = d.Width, Thickness = d.Thickness,
|
||||
StockItems = stockItems
|
||||
});
|
||||
break;
|
||||
case MaterialShape.IBeam when m.Dimensions is IBeamDimensions d:
|
||||
materialsDto.IBeams.Add(new CatalogIBeamDto
|
||||
{
|
||||
Type = m.Type.ToString(), Grade = m.Grade, Size = m.Size, Description = m.Description,
|
||||
Height = d.Height, WeightPerFoot = d.WeightPerFoot,
|
||||
StockItems = stockItems
|
||||
});
|
||||
break;
|
||||
case MaterialShape.Pipe when m.Dimensions is PipeDimensions d:
|
||||
materialsDto.Pipes.Add(new CatalogPipeDto
|
||||
{
|
||||
Type = m.Type.ToString(), Grade = m.Grade, Size = m.Size, Description = m.Description,
|
||||
NominalSize = d.NominalSize, Wall = d.Wall ?? 0, Schedule = d.Schedule,
|
||||
StockItems = stockItems
|
||||
});
|
||||
break;
|
||||
case MaterialShape.RectangularTube when m.Dimensions is RectangularTubeDimensions d:
|
||||
materialsDto.RectangularTubes.Add(new CatalogRectangularTubeDto
|
||||
{
|
||||
Type = m.Type.ToString(), Grade = m.Grade, Size = m.Size, Description = m.Description,
|
||||
Width = d.Width, Height = d.Height, Wall = d.Wall,
|
||||
StockItems = stockItems
|
||||
});
|
||||
break;
|
||||
case MaterialShape.RoundBar when m.Dimensions is RoundBarDimensions d:
|
||||
materialsDto.RoundBars.Add(new CatalogRoundBarDto
|
||||
{
|
||||
Type = m.Type.ToString(), Grade = m.Grade, Size = m.Size, Description = m.Description,
|
||||
Diameter = d.Diameter,
|
||||
StockItems = stockItems
|
||||
});
|
||||
break;
|
||||
case MaterialShape.RoundTube when m.Dimensions is RoundTubeDimensions d:
|
||||
materialsDto.RoundTubes.Add(new CatalogRoundTubeDto
|
||||
{
|
||||
Type = m.Type.ToString(), Grade = m.Grade, Size = m.Size, Description = m.Description,
|
||||
OuterDiameter = d.OuterDiameter, Wall = d.Wall,
|
||||
StockItems = stockItems
|
||||
});
|
||||
break;
|
||||
case MaterialShape.SquareBar when m.Dimensions is SquareBarDimensions d:
|
||||
materialsDto.SquareBars.Add(new CatalogSquareBarDto
|
||||
{
|
||||
Type = m.Type.ToString(), Grade = m.Grade, Size = m.Size, Description = m.Description,
|
||||
SideLength = d.Size,
|
||||
StockItems = stockItems
|
||||
});
|
||||
break;
|
||||
case MaterialShape.SquareTube when m.Dimensions is SquareTubeDimensions d:
|
||||
materialsDto.SquareTubes.Add(new CatalogSquareTubeDto
|
||||
{
|
||||
Type = m.Type.ToString(), Grade = m.Grade, Size = m.Size, Description = m.Description,
|
||||
SideLength = d.Size, Wall = d.Wall,
|
||||
StockItems = stockItems
|
||||
});
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return new CatalogData
|
||||
{
|
||||
ExportedAt = DateTime.UtcNow,
|
||||
@@ -54,30 +149,7 @@ public class CatalogService
|
||||
KerfInches = t.KerfInches,
|
||||
IsDefault = t.IsDefault
|
||||
}).ToList(),
|
||||
Materials = materials.Select(m => new CatalogMaterialDto
|
||||
{
|
||||
Shape = m.Shape.ToString(),
|
||||
Type = m.Type.ToString(),
|
||||
Grade = m.Grade,
|
||||
Size = m.Size,
|
||||
Description = m.Description,
|
||||
Dimensions = MapDimensions(m.Dimensions),
|
||||
StockItems = m.StockItems.OrderBy(s => s.LengthInches).Select(s => new CatalogStockItemDto
|
||||
{
|
||||
LengthInches = s.LengthInches,
|
||||
Name = s.Name,
|
||||
QuantityOnHand = s.QuantityOnHand,
|
||||
Notes = s.Notes,
|
||||
SupplierOfferings = s.SupplierOfferings.Select(o => new CatalogSupplierOfferingDto
|
||||
{
|
||||
SupplierName = suppliers.FirstOrDefault(sup => sup.Id == o.SupplierId)?.Name ?? "Unknown",
|
||||
PartNumber = o.PartNumber,
|
||||
SupplierDescription = o.SupplierDescription,
|
||||
Price = o.Price,
|
||||
Notes = o.Notes
|
||||
}).ToList()
|
||||
}).ToList()
|
||||
}).ToList()
|
||||
Materials = materialsDto
|
||||
};
|
||||
}
|
||||
|
||||
@@ -89,14 +161,14 @@ public class CatalogService
|
||||
|
||||
try
|
||||
{
|
||||
// 1. Suppliers — upsert by name
|
||||
// 1. Suppliers - upsert by name
|
||||
var supplierMap = await ImportSuppliersAsync(data.Suppliers, result);
|
||||
|
||||
// 2. Cutting tools — upsert by name
|
||||
// 2. Cutting tools - upsert by name
|
||||
await ImportCuttingToolsAsync(data.CuttingTools, result);
|
||||
|
||||
// 3. Materials + stock items + offerings
|
||||
await ImportMaterialsAsync(data.Materials, supplierMap, result);
|
||||
await ImportAllMaterialsAsync(data.Materials, supplierMap, result);
|
||||
|
||||
await transaction.CommitAsync();
|
||||
}
|
||||
@@ -173,7 +245,6 @@ public class CatalogService
|
||||
{
|
||||
existing.KerfInches = dto.KerfInches;
|
||||
existing.IsActive = true;
|
||||
// Skip IsDefault changes to avoid conflicts
|
||||
result.CuttingToolsUpdated++;
|
||||
}
|
||||
else
|
||||
@@ -182,7 +253,7 @@ public class CatalogService
|
||||
{
|
||||
Name = dto.Name,
|
||||
KerfInches = dto.KerfInches,
|
||||
IsDefault = false // Never import as default to avoid conflicts
|
||||
IsDefault = false
|
||||
};
|
||||
_context.CuttingTools.Add(tool);
|
||||
existingTools.Add(tool);
|
||||
@@ -198,94 +269,128 @@ public class CatalogService
|
||||
await _context.SaveChangesAsync();
|
||||
}
|
||||
|
||||
private async Task ImportMaterialsAsync(
|
||||
List<CatalogMaterialDto> materials, Dictionary<string, int> supplierMap, ImportResultDto result)
|
||||
private async Task ImportAllMaterialsAsync(
|
||||
CatalogMaterialsDto materials, Dictionary<string, int> supplierMap, ImportResultDto result)
|
||||
{
|
||||
// Pre-load existing materials with their dimensions
|
||||
var existingMaterials = await _context.Materials
|
||||
.Include(m => m.Dimensions)
|
||||
.Include(m => m.StockItems)
|
||||
.ThenInclude(s => s.SupplierOfferings)
|
||||
.ToListAsync();
|
||||
|
||||
foreach (var dto in materials)
|
||||
foreach (var dto in materials.Angles)
|
||||
await ImportMaterialAsync(dto, MaterialShape.Angle, existingMaterials, supplierMap, result,
|
||||
() => new AngleDimensions { Leg1 = dto.Leg1, Leg2 = dto.Leg2, Thickness = dto.Thickness },
|
||||
dim => { var d = (AngleDimensions)dim; d.Leg1 = dto.Leg1; d.Leg2 = dto.Leg2; d.Thickness = dto.Thickness; });
|
||||
|
||||
foreach (var dto in materials.Channels)
|
||||
await ImportMaterialAsync(dto, MaterialShape.Channel, existingMaterials, supplierMap, result,
|
||||
() => new ChannelDimensions { Height = dto.Height, Flange = dto.Flange, Web = dto.Web },
|
||||
dim => { var d = (ChannelDimensions)dim; d.Height = dto.Height; d.Flange = dto.Flange; d.Web = dto.Web; });
|
||||
|
||||
foreach (var dto in materials.FlatBars)
|
||||
await ImportMaterialAsync(dto, MaterialShape.FlatBar, existingMaterials, supplierMap, result,
|
||||
() => new FlatBarDimensions { Width = dto.Width, Thickness = dto.Thickness },
|
||||
dim => { var d = (FlatBarDimensions)dim; d.Width = dto.Width; d.Thickness = dto.Thickness; });
|
||||
|
||||
foreach (var dto in materials.IBeams)
|
||||
await ImportMaterialAsync(dto, MaterialShape.IBeam, existingMaterials, supplierMap, result,
|
||||
() => new IBeamDimensions { Height = dto.Height, WeightPerFoot = dto.WeightPerFoot },
|
||||
dim => { var d = (IBeamDimensions)dim; d.Height = dto.Height; d.WeightPerFoot = dto.WeightPerFoot; });
|
||||
|
||||
foreach (var dto in materials.Pipes)
|
||||
await ImportMaterialAsync(dto, MaterialShape.Pipe, existingMaterials, supplierMap, result,
|
||||
() => new PipeDimensions { NominalSize = dto.NominalSize, Wall = dto.Wall, Schedule = dto.Schedule },
|
||||
dim => { var d = (PipeDimensions)dim; d.NominalSize = dto.NominalSize; d.Wall = (decimal?)dto.Wall; d.Schedule = dto.Schedule; });
|
||||
|
||||
foreach (var dto in materials.RectangularTubes)
|
||||
await ImportMaterialAsync(dto, MaterialShape.RectangularTube, existingMaterials, supplierMap, result,
|
||||
() => new RectangularTubeDimensions { Width = dto.Width, Height = dto.Height, Wall = dto.Wall },
|
||||
dim => { var d = (RectangularTubeDimensions)dim; d.Width = dto.Width; d.Height = dto.Height; d.Wall = dto.Wall; });
|
||||
|
||||
foreach (var dto in materials.RoundBars)
|
||||
await ImportMaterialAsync(dto, MaterialShape.RoundBar, existingMaterials, supplierMap, result,
|
||||
() => new RoundBarDimensions { Diameter = dto.Diameter },
|
||||
dim => { var d = (RoundBarDimensions)dim; d.Diameter = dto.Diameter; });
|
||||
|
||||
foreach (var dto in materials.RoundTubes)
|
||||
await ImportMaterialAsync(dto, MaterialShape.RoundTube, existingMaterials, supplierMap, result,
|
||||
() => new RoundTubeDimensions { OuterDiameter = dto.OuterDiameter, Wall = dto.Wall },
|
||||
dim => { var d = (RoundTubeDimensions)dim; d.OuterDiameter = dto.OuterDiameter; d.Wall = dto.Wall; });
|
||||
|
||||
foreach (var dto in materials.SquareBars)
|
||||
await ImportMaterialAsync(dto, MaterialShape.SquareBar, existingMaterials, supplierMap, result,
|
||||
() => new SquareBarDimensions { Size = dto.SideLength },
|
||||
dim => { var d = (SquareBarDimensions)dim; d.Size = dto.SideLength; });
|
||||
|
||||
foreach (var dto in materials.SquareTubes)
|
||||
await ImportMaterialAsync(dto, MaterialShape.SquareTube, existingMaterials, supplierMap, result,
|
||||
() => new SquareTubeDimensions { Size = dto.SideLength, Wall = dto.Wall },
|
||||
dim => { var d = (SquareTubeDimensions)dim; d.Size = dto.SideLength; d.Wall = dto.Wall; });
|
||||
}
|
||||
|
||||
private async Task ImportMaterialAsync(
|
||||
CatalogMaterialBaseDto dto, MaterialShape shape,
|
||||
List<Material> existingMaterials, Dictionary<string, int> supplierMap,
|
||||
ImportResultDto result,
|
||||
Func<MaterialDimensions> createDimensions,
|
||||
Action<MaterialDimensions> updateDimensions)
|
||||
{
|
||||
try
|
||||
{
|
||||
try
|
||||
if (!Enum.TryParse<MaterialType>(dto.Type, ignoreCase: true, out var type))
|
||||
{
|
||||
if (!Enum.TryParse<MaterialShape>(dto.Shape, ignoreCase: true, out var shape))
|
||||
{
|
||||
result.Errors.Add($"Material '{dto.Shape} - {dto.Size}': Unknown shape '{dto.Shape}'");
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!Enum.TryParse<MaterialType>(dto.Type, ignoreCase: true, out var type))
|
||||
{
|
||||
type = MaterialType.Steel; // Default
|
||||
result.Warnings.Add($"Material '{dto.Shape} - {dto.Size}': Unknown type '{dto.Type}', defaulting to Steel");
|
||||
}
|
||||
|
||||
var existing = existingMaterials.FirstOrDefault(
|
||||
m => m.Shape == shape && m.Size.Equals(dto.Size, StringComparison.OrdinalIgnoreCase));
|
||||
|
||||
Material material;
|
||||
|
||||
if (existing != null)
|
||||
{
|
||||
// Update existing material
|
||||
existing.Type = type;
|
||||
existing.Grade = dto.Grade ?? existing.Grade;
|
||||
existing.Description = dto.Description ?? existing.Description;
|
||||
existing.IsActive = true;
|
||||
existing.UpdatedAt = DateTime.UtcNow;
|
||||
|
||||
// Update dimensions if provided
|
||||
if (dto.Dimensions != null && existing.Dimensions != null)
|
||||
{
|
||||
ApplyDimensionValues(existing.Dimensions, dto.Dimensions);
|
||||
existing.SortOrder = existing.Dimensions.GetSortOrder();
|
||||
}
|
||||
|
||||
material = existing;
|
||||
result.MaterialsUpdated++;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Create new material with dimensions
|
||||
material = new Material
|
||||
{
|
||||
Shape = shape,
|
||||
Type = type,
|
||||
Grade = dto.Grade,
|
||||
Size = dto.Size,
|
||||
Description = dto.Description,
|
||||
CreatedAt = DateTime.UtcNow
|
||||
};
|
||||
|
||||
if (dto.Dimensions != null)
|
||||
{
|
||||
var dimensions = MaterialService.CreateDimensionsForShape(shape);
|
||||
ApplyDimensionValues(dimensions, dto.Dimensions);
|
||||
material = await _materialService.CreateWithDimensionsAsync(material, dimensions);
|
||||
}
|
||||
else
|
||||
{
|
||||
_context.Materials.Add(material);
|
||||
await _context.SaveChangesAsync();
|
||||
}
|
||||
|
||||
existingMaterials.Add(material);
|
||||
result.MaterialsCreated++;
|
||||
}
|
||||
|
||||
await _context.SaveChangesAsync();
|
||||
|
||||
// Import stock items for this material
|
||||
await ImportStockItemsAsync(material, dto.StockItems, supplierMap, result);
|
||||
type = MaterialType.Steel;
|
||||
result.Warnings.Add($"Material '{shape} - {dto.Size}': Unknown type '{dto.Type}', defaulting to Steel");
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
||||
var existing = existingMaterials.FirstOrDefault(
|
||||
m => m.Shape == shape && m.Size.Equals(dto.Size, StringComparison.OrdinalIgnoreCase));
|
||||
|
||||
Material material;
|
||||
|
||||
if (existing != null)
|
||||
{
|
||||
result.Errors.Add($"Material '{dto.Shape} - {dto.Size}': {ex.Message}");
|
||||
existing.Type = type;
|
||||
existing.Grade = dto.Grade ?? existing.Grade;
|
||||
existing.Description = dto.Description ?? existing.Description;
|
||||
existing.IsActive = true;
|
||||
existing.UpdatedAt = DateTime.UtcNow;
|
||||
|
||||
if (existing.Dimensions != null)
|
||||
{
|
||||
updateDimensions(existing.Dimensions);
|
||||
existing.SortOrder = existing.Dimensions.GetSortOrder();
|
||||
}
|
||||
|
||||
material = existing;
|
||||
result.MaterialsUpdated++;
|
||||
}
|
||||
else
|
||||
{
|
||||
material = new Material
|
||||
{
|
||||
Shape = shape,
|
||||
Type = type,
|
||||
Grade = dto.Grade,
|
||||
Size = dto.Size,
|
||||
Description = dto.Description,
|
||||
CreatedAt = DateTime.UtcNow
|
||||
};
|
||||
|
||||
var dimensions = createDimensions();
|
||||
material = await _materialService.CreateWithDimensionsAsync(material, dimensions);
|
||||
existingMaterials.Add(material);
|
||||
result.MaterialsCreated++;
|
||||
}
|
||||
|
||||
await _context.SaveChangesAsync();
|
||||
|
||||
await ImportStockItemsAsync(material, dto.StockItems, supplierMap, result);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
result.Errors.Add($"Material '{shape} - {dto.Size}': {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -293,7 +398,6 @@ public class CatalogService
|
||||
Material material, List<CatalogStockItemDto> stockItems,
|
||||
Dictionary<string, int> supplierMap, ImportResultDto result)
|
||||
{
|
||||
// Reload stock items for this material to ensure we have current state
|
||||
var existingStockItems = await _context.StockItems
|
||||
.Include(s => s.SupplierOfferings)
|
||||
.Where(s => s.MaterialId == material.Id)
|
||||
@@ -314,7 +418,6 @@ public class CatalogService
|
||||
existing.Notes = dto.Notes ?? existing.Notes;
|
||||
existing.IsActive = true;
|
||||
existing.UpdatedAt = DateTime.UtcNow;
|
||||
// Don't overwrite QuantityOnHand — preserve actual inventory
|
||||
stockItem = existing;
|
||||
result.StockItemsUpdated++;
|
||||
}
|
||||
@@ -335,7 +438,6 @@ public class CatalogService
|
||||
result.StockItemsCreated++;
|
||||
}
|
||||
|
||||
// Import supplier offerings
|
||||
foreach (var offeringDto in dto.SupplierOfferings)
|
||||
{
|
||||
try
|
||||
@@ -394,67 +496,22 @@ public class CatalogService
|
||||
}
|
||||
}
|
||||
|
||||
private static CatalogDimensionsDto? MapDimensions(MaterialDimensions? dim) => dim switch
|
||||
private static List<CatalogStockItemDto> MapStockItems(Material m, List<Supplier> suppliers)
|
||||
{
|
||||
RoundBarDimensions d => new CatalogDimensionsDto { Diameter = d.Diameter },
|
||||
RoundTubeDimensions d => new CatalogDimensionsDto { OuterDiameter = d.OuterDiameter, Wall = d.Wall },
|
||||
FlatBarDimensions d => new CatalogDimensionsDto { Width = d.Width, Thickness = d.Thickness },
|
||||
SquareBarDimensions d => new CatalogDimensionsDto { Size = d.Size },
|
||||
SquareTubeDimensions d => new CatalogDimensionsDto { Size = d.Size, Wall = d.Wall },
|
||||
RectangularTubeDimensions d => new CatalogDimensionsDto { Width = d.Width, Height = d.Height, Wall = d.Wall },
|
||||
AngleDimensions d => new CatalogDimensionsDto { Leg1 = d.Leg1, Leg2 = d.Leg2, Thickness = d.Thickness },
|
||||
ChannelDimensions d => new CatalogDimensionsDto { Height = d.Height, Flange = d.Flange, Web = d.Web },
|
||||
IBeamDimensions d => new CatalogDimensionsDto { Height = d.Height, WeightPerFoot = d.WeightPerFoot },
|
||||
PipeDimensions d => new CatalogDimensionsDto { NominalSize = d.NominalSize, Wall = d.Wall, Schedule = d.Schedule },
|
||||
_ => null
|
||||
};
|
||||
|
||||
private static void ApplyDimensionValues(MaterialDimensions dimensions, CatalogDimensionsDto dto)
|
||||
{
|
||||
switch (dimensions)
|
||||
return m.StockItems.OrderBy(s => s.LengthInches).Select(s => new CatalogStockItemDto
|
||||
{
|
||||
case RoundBarDimensions rb:
|
||||
if (dto.Diameter.HasValue) rb.Diameter = dto.Diameter.Value;
|
||||
break;
|
||||
case RoundTubeDimensions rt:
|
||||
if (dto.OuterDiameter.HasValue) rt.OuterDiameter = dto.OuterDiameter.Value;
|
||||
if (dto.Wall.HasValue) rt.Wall = dto.Wall.Value;
|
||||
break;
|
||||
case FlatBarDimensions fb:
|
||||
if (dto.Width.HasValue) fb.Width = dto.Width.Value;
|
||||
if (dto.Thickness.HasValue) fb.Thickness = dto.Thickness.Value;
|
||||
break;
|
||||
case SquareBarDimensions sb:
|
||||
if (dto.Size.HasValue) sb.Size = dto.Size.Value;
|
||||
break;
|
||||
case SquareTubeDimensions st:
|
||||
if (dto.Size.HasValue) st.Size = dto.Size.Value;
|
||||
if (dto.Wall.HasValue) st.Wall = dto.Wall.Value;
|
||||
break;
|
||||
case RectangularTubeDimensions rect:
|
||||
if (dto.Width.HasValue) rect.Width = dto.Width.Value;
|
||||
if (dto.Height.HasValue) rect.Height = dto.Height.Value;
|
||||
if (dto.Wall.HasValue) rect.Wall = dto.Wall.Value;
|
||||
break;
|
||||
case AngleDimensions a:
|
||||
if (dto.Leg1.HasValue) a.Leg1 = dto.Leg1.Value;
|
||||
if (dto.Leg2.HasValue) a.Leg2 = dto.Leg2.Value;
|
||||
if (dto.Thickness.HasValue) a.Thickness = dto.Thickness.Value;
|
||||
break;
|
||||
case ChannelDimensions c:
|
||||
if (dto.Height.HasValue) c.Height = dto.Height.Value;
|
||||
if (dto.Flange.HasValue) c.Flange = dto.Flange.Value;
|
||||
if (dto.Web.HasValue) c.Web = dto.Web.Value;
|
||||
break;
|
||||
case IBeamDimensions ib:
|
||||
if (dto.Height.HasValue) ib.Height = dto.Height.Value;
|
||||
if (dto.WeightPerFoot.HasValue) ib.WeightPerFoot = dto.WeightPerFoot.Value;
|
||||
break;
|
||||
case PipeDimensions p:
|
||||
if (dto.NominalSize.HasValue) p.NominalSize = dto.NominalSize.Value;
|
||||
if (dto.Wall.HasValue) p.Wall = dto.Wall.Value;
|
||||
if (dto.Schedule != null) p.Schedule = dto.Schedule;
|
||||
break;
|
||||
}
|
||||
LengthInches = s.LengthInches,
|
||||
Name = s.Name,
|
||||
QuantityOnHand = s.QuantityOnHand,
|
||||
Notes = s.Notes,
|
||||
SupplierOfferings = s.SupplierOfferings.Select(o => new CatalogSupplierOfferingDto
|
||||
{
|
||||
SupplierName = suppliers.FirstOrDefault(sup => sup.Id == o.SupplierId)?.Name ?? "Unknown",
|
||||
PartNumber = o.PartNumber,
|
||||
SupplierDescription = o.SupplierDescription,
|
||||
Price = o.Price,
|
||||
Notes = o.Notes
|
||||
}).ToList()
|
||||
}).ToList();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user