Merge branch 'master' into chore/summary/add-azure-sql-support

equinor · Aug 19, 2024 · 5f45b0c · 5f45b0c
2 parents ba1db16 + 41ee148
commit 5f45b0c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/...ations/20240731103149_Initial.Designer.cs → ...ations/20240807132047_Initial.Designer.cs b/...ations/20240731103149_Initial.Designer.cs → ...ations/20240807132047_Initial.Designer.cs
diff --git a/...base/Migrations/20240731103149_Initial.cs → ...base/Migrations/20240807132047_Initial.cs b/...base/Migrations/20240731103149_Initial.cs → ...base/Migrations/20240807132047_Initial.cs
@@ -40,8 +40,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     AverageTimeToHandleRequests = table.Column<string>(type: "nvarchar(max)", nullable: false),
                     AllocationChangesAwaitingTaskOwnerAction = table.Column<string>(type: "nvarchar(max)", nullable: false),
                     ProjectChangesAffectingNextThreeMonths = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    EndingPositions = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    PersonnelMoreThan100PercentFTEs = table.Column<string>(type: "nvarchar(max)", nullable: true)
+                    PersonnelMoreThan100PercentFTE = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    PositionsEnding = table.Column<string>(type: "nvarchar(max)", nullable: true)
                 },
                 constraints: table =>
                 {

diff --git a/src/Fusion.Summary.Api/Database/Migrations/SummaryDbContextModelSnapshot.cs b/src/Fusion.Summary.Api/Database/Migrations/SummaryDbContextModelSnapshot.cs
@@ -124,7 +124,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                             b1.ToTable("WeeklySummaryReports");
 
-                            b1.ToJson("PersonnelMoreThan100PercentFTEs");
+                            b1.ToJson("PositionsEnding");
 
                             b1.WithOwner()
                                 .HasForeignKey("DbWeeklySummaryReportId");
@@ -150,7 +150,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                             b1.ToTable("WeeklySummaryReports");
 
-                            b1.ToJson("EndingPositions");
+                            b1.ToJson("PersonnelMoreThan100PercentFTE");
 
                             b1.WithOwner()
                                 .HasForeignKey("DbWeeklySummaryReportId");

diff --git a/src/Fusion.Summary.Api/Database/Models/DbWeeklySummaryReport.cs b/src/Fusion.Summary.Api/Database/Models/DbWeeklySummaryReport.cs
@@ -31,18 +31,17 @@ internal static void OnModelCreating(ModelBuilder modelBuilder)
 
             report.Property(r => r.Period)
                 // Strip time from date and retrieve as UTC
-                .HasConversion(d => d.Date,
-                    d => DateTime.SpecifyKind(d, DateTimeKind.Utc));
+                .HasConversion(d => d.Date, d => DateTime.SpecifyKind(d, DateTimeKind.Utc));
 
 
             report.HasIndex(r => new { r.DepartmentSapId, r.Period })
                 .IsUnique();
 
-            report.OwnsMany(r => r.PositionsEnding, pe
-                => pe.ToJson("PersonnelMoreThan100PercentFTEs"));
+            report.OwnsMany(r => r.PositionsEnding,
+                pe => pe.ToJson());
 
-            report.OwnsMany(r => r.PersonnelMoreThan100PercentFTE, pm
-                => pm.ToJson("EndingPositions"));
+            report.OwnsMany(r => r.PersonnelMoreThan100PercentFTE,
+                pm => pm.ToJson());
 
 
             report.HasOne(r => r.Department)