Refactor PepDB.cs: Consolidate repetitive Entity Framework configuration

Reduced file from 481 lines to 108 lines (77.5% reduction) by:
- Created ConfigureStringProperties helper method to eliminate repetitive IsUnicode(false) calls
- Organized entity configurations into dedicated methods per entity type
- Maintained all original functionality while improving maintainability

Benefits:
- Easier to add new properties or entities
- Better code organization and readability
- Follows DRY principle
- Type-safe using lambda expressions

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
AJ
2025-10-08 23:29:31 -04:00
parent 8fb1f35396
commit 7c39e89347

View File

@@ -1,7 +1,9 @@
using System; using System;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using System.Data.Entity; using System.Data.Entity;
using System.Data.Entity.ModelConfiguration;
using System.Linq; using System.Linq;
using System.Linq.Expressions;
namespace PepLib.Data namespace PepLib.Data
{ {
@@ -21,461 +23,86 @@ namespace PepLib.Data
protected override void OnModelCreating(DbModelBuilder modelBuilder) protected override void OnModelCreating(DbModelBuilder modelBuilder)
{ {
modelBuilder.Entity<Drawing>() ConfigureDrawingEntity(modelBuilder);
.Property(e => e.Name) ConfigureNestDetailEntity(modelBuilder);
.IsUnicode(false); ConfigureNestDrawingEntity(modelBuilder);
ConfigureNestHeaderEntity(modelBuilder);
modelBuilder.Entity<Drawing>() ConfigurePlateDetailEntity(modelBuilder);
.Property(e => e.CustID) ConfigurePlateHeaderEntity(modelBuilder);
.IsUnicode(false); }
modelBuilder.Entity<Drawing>() private void ConfigureDrawingEntity(DbModelBuilder modelBuilder)
.Property(e => e.Revision) {
.IsUnicode(false); ConfigureStringProperties(modelBuilder.Entity<Drawing>(),
e => e.Name, e => e.CustID, e => e.Revision, e => e.Path, e => e.File,
modelBuilder.Entity<Drawing>() e => e.InUseBy, e => e.Status, e => e.StatusModifiedBy, e => e.Description,
.Property(e => e.Path) e => e.Customer, e => e.Comment, e => e.Notes, e => e.Material, e => e.MatGrade,
.IsUnicode(false); e => e.Programmer, e => e.CreatedBy, e => e.Type, e => e.Errors, e => e.Hardness,
e => e.Specification, e => e.UserDefined1, e => e.UserDefined2, e => e.UserDefined3,
modelBuilder.Entity<Drawing>() e => e.UserDefined4, e => e.UserDefined5, e => e.UserDefined6, e => e.Application,
.Property(e => e.File) e => e.SourceFile, e => e.CadScaled, e => e.ModifiedBy);
.IsUnicode(false); }
modelBuilder.Entity<Drawing>() private void ConfigureNestDetailEntity(DbModelBuilder modelBuilder)
.Property(e => e.InUseBy) {
.IsUnicode(false); ConfigureStringProperties(modelBuilder.Entity<NestDetail>(),
e => e.NestName, e => e.Drawing, e => e.CustID, e => e.DwgRevision,
modelBuilder.Entity<Drawing>() e => e.CustomerNo, e => e.CustomerName, e => e.ModifiedBy);
.Property(e => e.Status) }
.IsUnicode(false);
private void ConfigureNestDrawingEntity(DbModelBuilder modelBuilder)
modelBuilder.Entity<Drawing>() {
.Property(e => e.StatusModifiedBy) var entity = modelBuilder.Entity<NestDrawing>();
.IsUnicode(false);
ConfigureStringProperties(entity,
modelBuilder.Entity<Drawing>() e => e.NestName, e => e.Drawing, e => e.CustID, e => e.DwgRevision,
.Property(e => e.Description) e => e.DwgDesc, e => e.ImageFile, e => e.UserDefined1, e => e.UserDefined2,
.IsUnicode(false); e => e.UserDefined3, e => e.UserDefined4, e => e.UserDefined5, e => e.UserDefined6,
e => e.Description, e => e.ModifiedBy);
modelBuilder.Entity<Drawing>()
.Property(e => e.Customer) entity.Property(e => e.SizeX).HasPrecision(15, 4);
.IsUnicode(false); entity.Property(e => e.SizeY).HasPrecision(15, 4);
}
modelBuilder.Entity<Drawing>()
.Property(e => e.Comment) private void ConfigureNestHeaderEntity(DbModelBuilder modelBuilder)
.IsUnicode(false); {
ConfigureStringProperties(modelBuilder.Entity<NestHeader>(),
modelBuilder.Entity<Drawing>() e => e.NestName, e => e.CustID, e => e.CustomerName, e => e.Material,
.Property(e => e.Notes) e => e.MatDescription, e => e.MatGrade, e => e.Programmer, e => e.Post,
.IsUnicode(false); e => e.Comments, e => e.Remarks, e => e.TypeOfGas, e => e.UserDefined1,
e => e.UserDefined2, e => e.UserDefined3, e => e.UserDefined4, e => e.UserDefined5,
modelBuilder.Entity<Drawing>() e => e.UserDefined6, e => e.ModifiedBy, e => e.Path, e => e.NestGenMethod,
.Property(e => e.Material) e => e.FeedRateScenarios, e => e.OutputJobCosting, e => e.ReportNestedDrawingsOnly,
.IsUnicode(false); e => e.DisplayTimingInfo, e => e.OutputPostTechTable, e => e.WeightTypeForDisplay,
e => e.WeightTypeForCosting, e => e.Errors, e => e.DefPlateSize, e => e.DefKerfDirection,
modelBuilder.Entity<Drawing>() e => e.InUse, e => e.ApplicationName);
.Property(e => e.MatGrade) }
.IsUnicode(false);
private void ConfigurePlateDetailEntity(DbModelBuilder modelBuilder)
modelBuilder.Entity<Drawing>() {
.Property(e => e.Programmer) ConfigureStringProperties(modelBuilder.Entity<PlateDetail>(),
.IsUnicode(false); e => e.NestName, e => e.Drawing, e => e.DwgRevision, e => e.LoopList,
e => e.DwgDesc, e => e.WorkOrder, e => e.Note, e => e.Sales, e => e.Remarks,
modelBuilder.Entity<Drawing>() e => e.RequiredGrade, e => e.JobNo, e => e.Sequence, e => e.Marking,
.Property(e => e.CreatedBy) e => e.ModifiedBy, e => e.LifetimeList, e => e.CustPO, e => e.CustID);
.IsUnicode(false); }
modelBuilder.Entity<Drawing>() private void ConfigurePlateHeaderEntity(DbModelBuilder modelBuilder)
.Property(e => e.Type) {
.IsUnicode(false); ConfigureStringProperties(modelBuilder.Entity<PlateHeader>(),
e => e.NestName, e => e.InvPlateName, e => e.RemnantSize, e => e.PlateSize,
modelBuilder.Entity<Drawing>() e => e.HeatLot, e => e.UpdateStatus, e => e.ImageFile, e => e.Note,
.Property(e => e.Errors) e => e.ProgramName, e => e.ModifiedBy, e => e.Location, e => e.NestedSize);
.IsUnicode(false); }
modelBuilder.Entity<Drawing>() private void ConfigureStringProperties<TEntity>(EntityTypeConfiguration<TEntity> entity,
.Property(e => e.Hardness) params Expression<Func<TEntity, string>>[] properties)
.IsUnicode(false); where TEntity : class
{
modelBuilder.Entity<Drawing>() foreach (var property in properties)
.Property(e => e.Specification) {
.IsUnicode(false); entity.Property(property).IsUnicode(false);
}
modelBuilder.Entity<Drawing>()
.Property(e => e.UserDefined1)
.IsUnicode(false);
modelBuilder.Entity<Drawing>()
.Property(e => e.UserDefined2)
.IsUnicode(false);
modelBuilder.Entity<Drawing>()
.Property(e => e.UserDefined3)
.IsUnicode(false);
modelBuilder.Entity<Drawing>()
.Property(e => e.UserDefined4)
.IsUnicode(false);
modelBuilder.Entity<Drawing>()
.Property(e => e.UserDefined5)
.IsUnicode(false);
modelBuilder.Entity<Drawing>()
.Property(e => e.UserDefined6)
.IsUnicode(false);
modelBuilder.Entity<Drawing>()
.Property(e => e.Application)
.IsUnicode(false);
modelBuilder.Entity<Drawing>()
.Property(e => e.SourceFile)
.IsUnicode(false);
modelBuilder.Entity<Drawing>()
.Property(e => e.CadScaled)
.IsUnicode(false);
modelBuilder.Entity<Drawing>()
.Property(e => e.ModifiedBy)
.IsUnicode(false);
modelBuilder.Entity<NestDetail>()
.Property(e => e.NestName)
.IsUnicode(false);
modelBuilder.Entity<NestDetail>()
.Property(e => e.Drawing)
.IsUnicode(false);
modelBuilder.Entity<NestDetail>()
.Property(e => e.CustID)
.IsUnicode(false);
modelBuilder.Entity<NestDetail>()
.Property(e => e.DwgRevision)
.IsUnicode(false);
modelBuilder.Entity<NestDetail>()
.Property(e => e.CustomerNo)
.IsUnicode(false);
modelBuilder.Entity<NestDetail>()
.Property(e => e.CustomerName)
.IsUnicode(false);
modelBuilder.Entity<NestDetail>()
.Property(e => e.ModifiedBy)
.IsUnicode(false);
modelBuilder.Entity<NestDrawing>()
.Property(e => e.NestName)
.IsUnicode(false);
modelBuilder.Entity<NestDrawing>()
.Property(e => e.Drawing)
.IsUnicode(false);
modelBuilder.Entity<NestDrawing>()
.Property(e => e.CustID)
.IsUnicode(false);
modelBuilder.Entity<NestDrawing>()
.Property(e => e.DwgRevision)
.IsUnicode(false);
modelBuilder.Entity<NestDrawing>()
.Property(e => e.DwgDesc)
.IsUnicode(false);
modelBuilder.Entity<NestDrawing>()
.Property(e => e.ImageFile)
.IsUnicode(false);
modelBuilder.Entity<NestDrawing>()
.Property(e => e.UserDefined1)
.IsUnicode(false);
modelBuilder.Entity<NestDrawing>()
.Property(e => e.UserDefined2)
.IsUnicode(false);
modelBuilder.Entity<NestDrawing>()
.Property(e => e.UserDefined3)
.IsUnicode(false);
modelBuilder.Entity<NestDrawing>()
.Property(e => e.UserDefined4)
.IsUnicode(false);
modelBuilder.Entity<NestDrawing>()
.Property(e => e.UserDefined5)
.IsUnicode(false);
modelBuilder.Entity<NestDrawing>()
.Property(e => e.UserDefined6)
.IsUnicode(false);
modelBuilder.Entity<NestDrawing>()
.Property(e => e.Description)
.IsUnicode(false);
modelBuilder.Entity<NestDrawing>()
.Property(e => e.SizeX)
.HasPrecision(15, 4);
modelBuilder.Entity<NestDrawing>()
.Property(e => e.SizeY)
.HasPrecision(15, 4);
modelBuilder.Entity<NestDrawing>()
.Property(e => e.ModifiedBy)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.NestName)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.CustID)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.CustomerName)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.Material)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.MatDescription)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.MatGrade)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.Programmer)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.Post)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.Comments)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.Remarks)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.TypeOfGas)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.UserDefined1)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.UserDefined2)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.UserDefined3)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.UserDefined4)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.UserDefined5)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.UserDefined6)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.ModifiedBy)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.Path)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.NestGenMethod)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.FeedRateScenarios)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.OutputJobCosting)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.ReportNestedDrawingsOnly)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.DisplayTimingInfo)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.OutputPostTechTable)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.WeightTypeForDisplay)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.WeightTypeForCosting)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.Errors)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.DefPlateSize)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.DefKerfDirection)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.InUse)
.IsUnicode(false);
modelBuilder.Entity<NestHeader>()
.Property(e => e.ApplicationName)
.IsUnicode(false);
modelBuilder.Entity<PlateDetail>()
.Property(e => e.NestName)
.IsUnicode(false);
modelBuilder.Entity<PlateDetail>()
.Property(e => e.Drawing)
.IsUnicode(false);
modelBuilder.Entity<PlateDetail>()
.Property(e => e.DwgRevision)
.IsUnicode(false);
modelBuilder.Entity<PlateDetail>()
.Property(e => e.LoopList)
.IsUnicode(false);
modelBuilder.Entity<PlateDetail>()
.Property(e => e.DwgDesc)
.IsUnicode(false);
modelBuilder.Entity<PlateDetail>()
.Property(e => e.WorkOrder)
.IsUnicode(false);
modelBuilder.Entity<PlateDetail>()
.Property(e => e.Note)
.IsUnicode(false);
modelBuilder.Entity<PlateDetail>()
.Property(e => e.Sales)
.IsUnicode(false);
modelBuilder.Entity<PlateDetail>()
.Property(e => e.Remarks)
.IsUnicode(false);
modelBuilder.Entity<PlateDetail>()
.Property(e => e.RequiredGrade)
.IsUnicode(false);
modelBuilder.Entity<PlateDetail>()
.Property(e => e.JobNo)
.IsUnicode(false);
modelBuilder.Entity<PlateDetail>()
.Property(e => e.Sequence)
.IsUnicode(false);
modelBuilder.Entity<PlateDetail>()
.Property(e => e.Marking)
.IsUnicode(false);
modelBuilder.Entity<PlateDetail>()
.Property(e => e.ModifiedBy)
.IsUnicode(false);
modelBuilder.Entity<PlateDetail>()
.Property(e => e.LifetimeList)
.IsUnicode(false);
modelBuilder.Entity<PlateDetail>()
.Property(e => e.CustPO)
.IsUnicode(false);
modelBuilder.Entity<PlateDetail>()
.Property(e => e.CustID)
.IsUnicode(false);
modelBuilder.Entity<PlateHeader>()
.Property(e => e.NestName)
.IsUnicode(false);
modelBuilder.Entity<PlateHeader>()
.Property(e => e.InvPlateName)
.IsUnicode(false);
modelBuilder.Entity<PlateHeader>()
.Property(e => e.RemnantSize)
.IsUnicode(false);
modelBuilder.Entity<PlateHeader>()
.Property(e => e.PlateSize)
.IsUnicode(false);
modelBuilder.Entity<PlateHeader>()
.Property(e => e.HeatLot)
.IsUnicode(false);
modelBuilder.Entity<PlateHeader>()
.Property(e => e.UpdateStatus)
.IsUnicode(false);
modelBuilder.Entity<PlateHeader>()
.Property(e => e.ImageFile)
.IsUnicode(false);
modelBuilder.Entity<PlateHeader>()
.Property(e => e.Note)
.IsUnicode(false);
modelBuilder.Entity<PlateHeader>()
.Property(e => e.ProgramName)
.IsUnicode(false);
modelBuilder.Entity<PlateHeader>()
.Property(e => e.ModifiedBy)
.IsUnicode(false);
modelBuilder.Entity<PlateHeader>()
.Property(e => e.Location)
.IsUnicode(false);
modelBuilder.Entity<PlateHeader>()
.Property(e => e.NestedSize)
.IsUnicode(false);
} }
} }
} }