Fixup: Remove DTO PR

src/Geopilot.Api/Context.cs

@@ -89,6 +89,8 @@ public IQueryable<Mandate> MandatesWithIncludes
                 .Include(m => m.Organisations)
                 .ThenInclude(o => o.Users)
                 .Include(m => m.Deliveries)
+                .ThenInclude(d => d.DeclaringUser)
+                .Include(m => m.Deliveries)
                 .ThenInclude(d => d.Assets);
         }
     }
@@ -104,5 +106,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         ArgumentNullException.ThrowIfNull(modelBuilder);
 
         modelBuilder.Entity<Delivery>().HasQueryFilter(d => !d.Deleted);
+        modelBuilder.Entity<Asset>()
+            .HasQueryFilter(a => !a.Delivery.Deleted)
+            .HasQueryFilter(a => !a.Deleted);
     }
 }

src/Geopilot.Api/ContextExtensions.cs

@@ -114,10 +114,12 @@ public static void SeedMandates(this Context context)
         var knownFileFormats = new string[] { ".xtf", ".gpkg", ".*", ".itf", ".xml", ".zip", ".csv" };
         var mandateFaker = new Faker<Mandate>()
             .UseDateTimeReference(referenceDateTime)
+            .StrictMode(true)
             .RuleFor(o => o.Id, f => 0)
             .RuleFor(o => o.Name, f => f.Commerce.ProductName())
             .RuleFor(o => o.FileTypes, f => f.PickRandom(knownFileFormats, 4).Distinct().ToArray())
             .RuleFor(o => o.SpatialExtent, f => GetExtent())
+            .Ignore(o => o.Coordinates)
             .RuleFor(o => o.Organisations, f => f.PickRandom(context.Organisations.ToList(), 1).ToList())
             .RuleFor(o => o.Deliveries, _ => new List<Delivery>());
 

src/Geopilot.Api/Models/Asset.cs

@@ -38,7 +38,7 @@ public class Asset
     /// <summary>
     /// Backreference to the delivery the asset belongs to.
     /// </summary>
-    public Delivery? Delivery { get; set; } = new Delivery();
+    public Delivery Delivery { get; set; } = null!;
 
     /// <summary>
     /// The deletion status of the asset.

src/Geopilot.Api/Models/Delivery.cs

@@ -23,12 +23,12 @@ public class Delivery
     /// <summary>
     /// The user that declared the delivery.
     /// </summary>
-    public User DeclaringUser { get; set; } = new User();
+    public User DeclaringUser { get; set; } = null!;
 
     /// <summary>
     /// The mandate the delivery fulfills.
     /// </summary>
-    public Mandate? Mandate { get; set; } = new Mandate();
+    public Mandate Mandate { get; set; } = null!;
 
     /// <summary>
     /// Assets delivered or created by the validation and delivery process.

src/Geopilot.Frontend/src/pages/admin/mandates.tsx

@@ -43,6 +43,7 @@ export const Mandates = () => {
   }, [fetchApi]);
 
   async function saveMandate(mandate: Mandate) {
+    mandate.deliveries = [];
     mandate.organisations = mandate.organisations?.map(value =>
       typeof value === "number"
         ? ({ id: value } as Organisation)

tests/Geopilot.Api.Test/Controllers/DeliveryControllerTest.cs

@@ -165,7 +165,7 @@ public async Task Create(bool setOptionals)
     public void Delete()
     {
         var guid = Guid.NewGuid();
-        var delivery = new Delivery { JobId = guid };
+        var delivery = new Delivery { JobId = guid, Mandate = context.Mandates.First(), DeclaringUser = context.Users.First() };
         delivery.Assets.Add(new Asset());
         context.Deliveries.Add(delivery);
         context.SaveChanges();
@@ -196,7 +196,7 @@ public async Task Download()
     {
         assetHandlerMock.Setup(p => p.DownloadAssetAsync(It.IsAny<Guid>(), It.IsAny<string>())).ReturnsAsync((Encoding.UTF8.GetBytes("Test"), "text/xml"));
         var guid = Guid.NewGuid();
-        var delivery = new Delivery { JobId = guid };
+        var delivery = new Delivery { JobId = guid, Mandate = context.Mandates.First(), DeclaringUser = context.Users.First() };
         delivery.Assets.Add(new Asset() { OriginalFilename = "Test.xml", SanitizedFilename = "xyz.xml" });
         context.Deliveries.Add(delivery);
         context.SaveChanges();