Round down the timestamps returned to the whole second for PresentationCollection

src/IIIFPresentation/API.Tests/Integration/GetCollectionTests.cs

@@ -1,4 +1,6 @@
-using System.Net;
+#nullable disable
+
+using System.Net;
 using API.Tests.Integration.Infrastructure;
 using Core.Response;
 using FluentAssertions;
@@ -8,8 +10,6 @@
 using Test.Helpers.Helpers;
 using Test.Helpers.Integration;
 
-#nullable disable
-
 namespace API.Tests.Integration;
 
 [Trait("Category", "Integration")]
@@ -137,7 +137,7 @@ public async Task Get_RootFlat_ReturnsEntryPointFlat_WhenAuthAndHeader()
         // Act
         var response = await httpClient.AsCustomer(1).SendAsync(requestMessage);
 
-        var collection = await response.ReadAsPresentationJsonAsync<FlatCollection>();
+        var collection = await response.ReadAsPresentationJsonAsync<PresentationCollection>();
 
         // Assert
         response.StatusCode.Should().Be(HttpStatusCode.OK);
@@ -160,7 +160,7 @@ public async Task Get_ChildFlat_ReturnsEntryPointFlat_WhenCalledByChildId()
         // Act
         var response = await httpClient.AsCustomer(1).SendAsync(requestMessage);
 
-        var collection = await response.ReadAsPresentationJsonAsync<FlatCollection>();
+        var collection = await response.ReadAsPresentationJsonAsync<PresentationCollection>();
 
         // Assert
         response.StatusCode.Should().Be(HttpStatusCode.OK);
@@ -184,7 +184,7 @@ public async Task Get_PrivateChild_ReturnsCorrectlyFlatAndHierarchical()
         var flatResponse = await httpClient.AsCustomer(1).SendAsync(requestMessage);
         var hierarchicalResponse = await httpClient.AsCustomer(1).GetAsync("1/non-public");
 
-        var flatCollection = await flatResponse.ReadAsPresentationJsonAsync<FlatCollection>();
+        var flatCollection = await flatResponse.ReadAsPresentationJsonAsync<PresentationCollection>();
 
         // Assert
         flatResponse.StatusCode.Should().Be(HttpStatusCode.OK);
@@ -207,8 +207,8 @@ public async Task Get_RootFlat_ReturnsItems_WhenCalledWithPageSize()
 
         // Act
         var response = await httpClient.AsCustomer(1).SendAsync(requestMessage);
-        
-        var collection = await response.ReadAsPresentationJsonAsync<FlatCollection>();
+
+        var collection = await response.ReadAsPresentationJsonAsync<PresentationCollection>();
 
         // Assert
         collection.TotalItems.Should().Be(2);
@@ -227,8 +227,8 @@ public async Task Get_ChildFlat_ReturnsReducedItems_WhenCalledWithSmallPageSize(
 
         // Act
         var response = await httpClient.AsCustomer(1).SendAsync(requestMessage);
-        
-        var collection = await response.ReadAsPresentationJsonAsync<FlatCollection>();
+
+        var collection = await response.ReadAsPresentationJsonAsync<PresentationCollection>();
 
         // Assert
         collection.TotalItems.Should().Be(2);
@@ -248,8 +248,8 @@ public async Task Get_RootFlat_ReturnsSecondPage_WhenCalledWithSmallPageSize()
 
         // Act
         var response = await httpClient.AsCustomer(1).SendAsync(requestMessage);
-        
-        var collection = await response.ReadAsPresentationJsonAsync<FlatCollection>();
+
+        var collection = await response.ReadAsPresentationJsonAsync<PresentationCollection>();
 
         // Assert
         collection.TotalItems.Should().Be(2);
@@ -269,8 +269,8 @@ public async Task Get_RootFlat_ReturnsDefaults_WhenCalledWithZeroPage()
 
         // Act
         var response = await httpClient.AsCustomer(1).SendAsync(requestMessage);
-        
-        var collection = await response.ReadAsPresentationJsonAsync<FlatCollection>();
+
+        var collection = await response.ReadAsPresentationJsonAsync<PresentationCollection>();
 
         // Assert
         collection.TotalItems.Should().Be(2);
@@ -289,8 +289,8 @@ public async Task Get_RootFlat_ReturnsMaxPageSize_WhenCalledPageSizeExceedsMax()
 
         // Act
         var response = await httpClient.AsCustomer(1).SendAsync(requestMessage);
-        
-        var collection = await response.ReadAsPresentationJsonAsync<FlatCollection>();
+
+        var collection = await response.ReadAsPresentationJsonAsync<PresentationCollection>();
 
         // Assert
         collection.TotalItems.Should().Be(2);
@@ -313,8 +313,8 @@ public async Task Get_ChildFlat_ReturnsCorrectItem_WhenCalledWithSmallPageSizeAn
 
         // Act
         var response = await httpClient.AsCustomer(1).SendAsync(requestMessage);
-        
-        var collection = await response.ReadAsPresentationJsonAsync<FlatCollection>();
+
+        var collection = await response.ReadAsPresentationJsonAsync<PresentationCollection>();
 
         // Assert
         collection.TotalItems.Should().Be(2);
@@ -338,8 +338,8 @@ public async Task Get_RootFlat_ReturnsFirstPageWithSecondItem_WhenCalledWithSmal
 
         // Act
         var response = await httpClient.AsCustomer(1).SendAsync(requestMessage);
-        
-        var collection = await response.ReadAsPresentationJsonAsync<FlatCollection>();
+
+        var collection = await response.ReadAsPresentationJsonAsync<PresentationCollection>();
 
         // Assert
         collection.TotalItems.Should().Be(2);
@@ -361,8 +361,8 @@ public async Task Get_ChildFlat_IgnoresOrderBy_WhenCalledWithInvalidOrderBy()
 
         // Act
         var response = await httpClient.AsCustomer(1).SendAsync(requestMessage);
-        
-        var collection = await response.ReadAsPresentationJsonAsync<FlatCollection>();
+
+        var collection = await response.ReadAsPresentationJsonAsync<PresentationCollection>();
 
         // Assert
         collection.TotalItems.Should().Be(2);

src/IIIFPresentation/API.Tests/Integration/ModifyCollectionTests.cs

@@ -66,7 +66,7 @@ public async Task CreateCollection_CreatesCollection_WhenAllValuesProvided()
         // Act
         var response = await httpClient.AsCustomer(1).SendAsync(requestMessage);
 
-        var responseCollection = await response.ReadAsPresentationResponseAsync<FlatCollection>();
+        var responseCollection = await response.ReadAsPresentationResponseAsync<PresentationCollection>();
 
         var fromDatabase = dbContext.Collections.First(c => c.Id == responseCollection!.Id!.Split('/', StringSplitOptions.TrimEntries).Last());
 
@@ -114,7 +114,7 @@ public async Task CreateCollection_FailsToCreateCollection_WhenIsStorageCollecti
     public async Task CreateCollection_FailsToCreateCollection_WhenDuplicateSlug()
     {
         // Arrange
-        var collection = new FlatCollection()
+        var collection = new PresentationCollection()
         {
             Behavior = new List<string>()
             {
@@ -274,7 +274,7 @@ public async Task UpdateCollection_UpdatesCollection_WhenAllValuesProvided()
         // Act
         var response = await httpClient.AsCustomer(1).SendAsync(updateRequestMessage);
 
-        var responseCollection = await response.ReadAsPresentationResponseAsync<FlatCollection>();
+        var responseCollection = await response.ReadAsPresentationResponseAsync<PresentationCollection>();
 
         var fromDatabase = dbContext.Collections.First(c => c.Id == responseCollection!.Id!.Split('/', StringSplitOptions.TrimEntries).Last());
 
@@ -318,7 +318,7 @@ public async Task UpdateCollection_CreatesCollection_WhenUnknownCollectionIdProv
         // Act
         var response = await httpClient.AsCustomer(1).SendAsync(updateRequestMessage);
 
-        var responseCollection = await response.ReadAsPresentationResponseAsync<FlatCollection>();
+        var responseCollection = await response.ReadAsPresentationResponseAsync<PresentationCollection>();
 
         var fromDatabase = dbContext.Collections.First(c => c.Id == responseCollection!.Id!.Split('/', StringSplitOptions.TrimEntries).Last());
 
@@ -420,7 +420,7 @@ public async Task UpdateCollection_UpdatesCollection_WhenAllValuesProvidedWithou
         // Act
         var response = await httpClient.AsCustomer(1).SendAsync(updateRequestMessage);
 
-        var responseCollection = await response.ReadAsPresentationResponseAsync<FlatCollection>();
+        var responseCollection = await response.ReadAsPresentationResponseAsync<PresentationCollection>();
 
         var fromDatabase = dbContext.Collections.First(c => c.Id == responseCollection!.Id!.Split('/', StringSplitOptions.TrimEntries).Last());
 

src/IIIFPresentation/API/Converters/CollectionConverter.cs

@@ -30,7 +30,7 @@
         return collection;
     }
 
-    public static FlatCollection ToFlatCollection(this Models.Database.Collections.Collection dbAsset,
+    public static PresentationCollection ToFlatCollection(this Models.Database.Collections.Collection dbAsset,
         UrlRoots urlRoots, int pageSize, int currentPage, int totalItems,
         List<Models.Database.Collections.Collection>? items, string? orderQueryParam = null)
     {
@@ -97,8 +97,8 @@
                 }
             ],
 
-            Created = dbAsset.Created,
-            Modified = dbAsset.Modified,
+            Created = dbAsset.Created.Floor(DateTimeX.Precision.Second),
+            Modified = dbAsset.Modified.Floor(DateTimeX.Precision.Second),
             CreatedBy = dbAsset.CreatedBy,
             ModifiedBy = dbAsset.ModifiedBy
         };
@@ -110,7 +110,7 @@
     {
         var view = new View()
         {
             Id = dbAsset.GenerateFlatCollectionViewId(urlRoots, currentPage, pageSize, orderQueryParam),
             Type = PresentationType.PartialCollectionView,
             Page = currentPage,
             PageSize = pageSize,

src/IIIFPresentation/API/Features/Storage/Helpers/PresentationContextX.cs

@@ -10,7 +10,7 @@ namespace API.Features.Storage.Helpers;
 
 public static class PresentationContextX
 {
-    public static async Task<ModifyEntityResult<FlatCollection>?> TrySaveCollection(
+    public static async Task<ModifyEntityResult<PresentationCollection>?> TrySaveCollection(
         this PresentationContext dbContext, 
         int customerId, 
         ILogger logger,
@@ -26,11 +26,11 @@ public static class PresentationContextX
 
             if (ex.IsCustomerIdSlugParentViolation())
             {
-                return ModifyEntityResult<FlatCollection>.Failure(
+                return ModifyEntityResult<PresentationCollection>.Failure(
                     $"The collection could not be created due to a duplicate slug value", WriteResult.Conflict);
             }
-            
-            return ModifyEntityResult<FlatCollection>.Failure(
+
+            return ModifyEntityResult<PresentationCollection>.Failure(
                 $"The collection could not be created");
         }
 

src/IIIFPresentation/API/Features/Storage/Requests/CreateCollection.cs

@@ -17,7 +17,7 @@
 namespace API.Features.Storage.Requests;
 
 public class CreateCollection(int customerId, UpsertFlatCollection collection, UrlRoots urlRoots)
-    : IRequest<ModifyEntityResult<FlatCollection>>
+    : IRequest<ModifyEntityResult<PresentationCollection>>
 {
     public int CustomerId { get; } = customerId;
 
@@ -30,21 +30,21 @@ public class CreateCollectionHandler(
     PresentationContext dbContext,
     ILogger<CreateCollection> logger,
     IOptions<ApiSettings> options)
-    : IRequestHandler<CreateCollection, ModifyEntityResult<FlatCollection>>
+    : IRequestHandler<CreateCollection, ModifyEntityResult<PresentationCollection>>
 {
     private readonly ApiSettings settings = options.Value;
 
     private const int CurrentPage = 1;
 
-    public async Task<ModifyEntityResult<FlatCollection>> Handle(CreateCollection request, CancellationToken cancellationToken)
+    public async Task<ModifyEntityResult<PresentationCollection>> Handle(CreateCollection request, CancellationToken cancellationToken)
     {
         // check parent exists
         var parentCollection = await dbContext.RetrieveCollection(request.CustomerId,
             request.Collection.Parent.GetLastPathElement(), cancellationToken);
 
         if (parentCollection == null)
         {
-            return ModifyEntityResult<FlatCollection>.Failure(
+            return ModifyEntityResult<PresentationCollection>.Failure(
                 $"The parent collection could not be found", WriteResult.Conflict);
         }
 
@@ -80,7 +80,7 @@ public async Task<ModifyEntityResult<FlatCollection>> Handle(CreateCollection re
             collection.FullPath = CollectionRetrieval.RetrieveFullPathForCollection(collection, dbContext);
         }
 
-        return ModifyEntityResult<FlatCollection>.Success(
+        return ModifyEntityResult<PresentationCollection>.Success(
             collection.ToFlatCollection(request.UrlRoots, settings.PageSize, CurrentPage, 0, []), // there can be no items attached to this, as it's just been created
             WriteResult.Created);
     }

src/IIIFPresentation/API/Features/Storage/Requests/UpsertCollection.cs

@@ -19,7 +19,7 @@ namespace API.Features.Storage.Requests;
 
 public class UpsertCollection(int customerId, string collectionId, UpsertFlatCollection collection, UrlRoots urlRoots, 
     string? eTag)
-    : IRequest<ModifyEntityResult<FlatCollection>>
+    : IRequest<ModifyEntityResult<PresentationCollection>>
 {
     public int CustomerId { get; } = customerId;
 
@@ -37,13 +37,13 @@ public class UpsertCollectionHandler(
     IETagManager eTagManager,
     ILogger<CreateCollection> logger,
     IOptions<ApiSettings> options)
-    : IRequestHandler<UpsertCollection, ModifyEntityResult<FlatCollection>>
+    : IRequestHandler<UpsertCollection, ModifyEntityResult<PresentationCollection>>
 {
     private readonly ApiSettings settings = options.Value;
 
     private const int DefaultCurrentPage = 1;
 
-    public async Task<ModifyEntityResult<FlatCollection>> Handle(UpsertCollection request, 
+    public async Task<ModifyEntityResult<PresentationCollection>> Handle(UpsertCollection request, 
         CancellationToken cancellationToken)
     {
         var databaseCollection =
@@ -53,7 +53,7 @@ public async Task<ModifyEntityResult<FlatCollection>> Handle(UpsertCollection re
         {
             if (request.ETag is not null)
             {
-                return ModifyEntityResult<FlatCollection>.Failure(
+                return ModifyEntityResult<PresentationCollection>.Failure(
                     "ETag should not be added when inserting a collection via PUT", WriteResult.PreConditionFailed);
             }
 
@@ -63,7 +63,7 @@ public async Task<ModifyEntityResult<FlatCollection>> Handle(UpsertCollection re
                 request.Collection.Parent.GetLastPathElement(), cancellationToken);
             if (parentCollection == null)
             {
-                return ModifyEntityResult<FlatCollection>.Failure(
+                return ModifyEntityResult<PresentationCollection>.Failure(
                     "The parent collection could not be found", WriteResult.BadRequest);
             }
 
@@ -92,7 +92,7 @@ public async Task<ModifyEntityResult<FlatCollection>> Handle(UpsertCollection re
 
             if (request.ETag != eTag)
             {
-                return ModifyEntityResult<FlatCollection>.Failure(
+                return ModifyEntityResult<PresentationCollection>.Failure(
                     "ETag does not match", WriteResult.PreConditionFailed);
             }
 
@@ -103,7 +103,7 @@ public async Task<ModifyEntityResult<FlatCollection>> Handle(UpsertCollection re
 
                 if (parentCollection == null)
                 {
-                    return ModifyEntityResult<FlatCollection>.Failure(
+                    return ModifyEntityResult<PresentationCollection>.Failure(
                         $"The parent collection could not be found", WriteResult.BadRequest);
                 }
             }
@@ -147,7 +147,7 @@ public async Task<ModifyEntityResult<FlatCollection>> Handle(UpsertCollection re
                 CollectionRetrieval.RetrieveFullPathForCollection(databaseCollection, dbContext);
         }
 
-        return ModifyEntityResult<FlatCollection>.Success(
+        return ModifyEntityResult<PresentationCollection>.Success(
             databaseCollection.ToFlatCollection(request.UrlRoots, settings.PageSize, DefaultCurrentPage, total,
                 await items.ToListAsync(cancellationToken: cancellationToken)));
     }

src/IIIFPresentation/Core/Helpers/DateTimeX.cs

@@ -0,0 +1,12 @@
+namespace Core.Helpers;
+
+public static class DateTimeX
+{
+    public static class Precision
+    {
+        public static readonly TimeSpan Second = TimeSpan.FromSeconds(1);
+    }
+
+    public static DateTime Floor(this DateTime dateTime, TimeSpan interval) =>
+        dateTime.AddTicks(-(dateTime.Ticks % interval.Ticks));
+}

src/IIIFPresentation/Models/API/Collection/FlatCollection.cs → src/IIIFPresentation/Models/API/Collection/PresentationCollection.cs

@@ -2,7 +2,7 @@
 
 namespace Models.API.Collection;
 
-public class FlatCollection : IIIF.Presentation.V3.Collection
+public class PresentationCollection : IIIF.Presentation.V3.Collection
 {
     [JsonProperty("@context")]
     public new List<string>? Context