Squash migrations and move configuration into dedicated entity config…

…uration files
sancsoft · Jan 13, 2025 · b954345 · b954345
1 parent 849a5b7
commit b954345
Show file tree

Hide file tree

Showing 27 changed files with 142 additions and 13,134 deletions.
diff --git a/src/dotnet/HQ.Server/Data/Configuration/ProjectConfiguration.cs b/src/dotnet/HQ.Server/Data/Configuration/ProjectConfiguration.cs
@@ -15,5 +15,8 @@ public override void Configure(EntityTypeBuilder<Project> builder)
 
         builder.HasIndex(t => t.ProjectNumber)
             .IsUnique();
+
+        builder
+            .HasIndex(p => new { p.ClientId, p.ProjectManagerId });
     }
 }
diff --git a/src/dotnet/HQ.Server/Data/Configuration/ProjectStatusReportConfiguration.cs b/src/dotnet/HQ.Server/Data/Configuration/ProjectStatusReportConfiguration.cs
@@ -12,5 +12,9 @@ public override void Configure(EntityTypeBuilder<ProjectStatusReport> builder)
         base.Configure(builder);
 
         builder.ToTable("project_status_reports");
+
+        builder
+            .HasIndex(p => new { p.ProjectId, p.StartDate, p.EndDate })
+            .IsDescending([false, true, true]);
     }
 }
diff --git a/src/dotnet/HQ.Server/Data/Configuration/StaffConfiguration.cs b/src/dotnet/HQ.Server/Data/Configuration/StaffConfiguration.cs
@@ -13,7 +13,13 @@ public override void Configure(EntityTypeBuilder<Staff> builder)
 
         builder.ToTable("staff");
 
-        builder.HasIndex(t => t.Name)
+        builder
+            .HasMany(t => t.Times)
+            .WithOne(s => s.Staff)
+            .HasForeignKey(t => t.StaffId);
+
+        builder
+            .HasIndex(t => t.Name)
             .IsUnique();
     }
 }
diff --git a/src/dotnet/HQ.Server/Data/Configuration/TimeConfiguration.cs b/src/dotnet/HQ.Server/Data/Configuration/TimeConfiguration.cs
@@ -12,5 +12,18 @@ public override void Configure(EntityTypeBuilder<Time> builder)
         base.Configure(builder);
 
         builder.ToTable("times");
+
+        builder
+            .HasIndex(t => t.Date)
+            .IsDescending();
+
+        builder
+            .HasIndex(t => new { t.ChargeCodeId, t.Status, t.Date })
+            .IsDescending([false, false, true]);
+
+        builder
+            .HasIndex(t => new { t.ChargeCodeId, t.Date })
+            .IncludeProperties(t => new { t.Hours, t.HoursApproved })
+            .IsDescending([false, true]);
     }
 }
diff --git a/src/dotnet/HQ.Server/Data/HQDbContext.cs b/src/dotnet/HQ.Server/Data/HQDbContext.cs
@@ -36,14 +36,7 @@ public HQDbContext(DbContextOptions<HQDbContext> options)
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
-            modelBuilder.Entity<Staff>().HasMany(t => t.Times).WithOne(s => s.Staff).HasForeignKey(t => t.StaffId);
             modelBuilder.ApplyConfigurationsFromAssembly(Assembly.GetExecutingAssembly());
-            modelBuilder.Entity<Time>().HasIndex(t => t.Date).HasDatabaseName("idx_time_date");
-            modelBuilder.Entity<Time>().HasIndex(t => new { t.ChargeCodeId, t.Status, t.Date }).HasDatabaseName("idx_time_chargecodeid_status_date");
-            modelBuilder.Entity<Time>().HasIndex(t => new { t.ChargeCodeId, t.Date }).IncludeProperties(t => new { t.Hours, t.HoursApproved }).HasDatabaseName("idx_time_chargecodeid__date");
-
-            modelBuilder.Entity<ProjectStatusReport>().HasIndex(p => new { p.ProjectId, p.StartDate, p.EndDate }).HasDatabaseName("idx_psr_projectid_startdate_enddate");
-            modelBuilder.Entity<Project>().HasIndex(p => new { p.ClientId, p.ProjectManagerId }).HasDatabaseName("idx_project_clientid_projectmanagerid");
 
             base.OnModelCreating(modelBuilder);
         }