Add search archive document by from- and to-date

GetNextDocumentsUri will now accept from- and to-date to search for
documents archived between the given point in time.
The api will page as normal on limit-size.

Digipost.Api.Client.Archive.Tests/ArchiveTest.cs

@@ -28,7 +28,7 @@ public void BuildCorrectNextDocumentsUri()
             {
                 ["key"] = "val"
             };
-            Assert.Equal("https://www.testing.no/1010/archive/1000/document?limit=100&offset=0&attributes=a2V5LHZhbA==", archive.GetNextDocumentsUri(searchBy).ToString());
+            Assert.Equal("https://www.testing.no/1010/archive/1000/document?limit=100&offset=0&attributes=a2V5LHZhbA%3d%3d", archive.GetNextDocumentsUri(searchBy).ToString());
         }
     }
 }

Digipost.Api.Client.Archive.Tests/Smoke/ArchiveSmokeTests.cs

@@ -1,4 +1,6 @@
-using Digipost.Api.Client.Tests.Utilities;
+using System;
+using System.Collections.Generic;
+using Digipost.Api.Client.Tests.Utilities;
 using Xunit;
 
 namespace Digipost.Api.Client.Archive.Tests.Smoke
@@ -26,10 +28,20 @@ public void ArchiveDocuments_read_and_delete()
         [Fact(Skip = "SmokeTest")]
         public void ArchiveADocumentWithAttributes()
         {
+            var from = DateTime.Now;
+
+            var searchBy = new Dictionary<string, string>
+            {
+                ["smoke"] = "test"
+            };
+
             _t.ArchiveAFile()
                 .Get_Default_Archive()
                 .Get_All_DocumentsWithAttributes()
-                .Update_attritbutesOnFirst();
+                .Update_attritbutesOnFirst()
+                .Get_For_Timeinterval(from, DateTime.Now, 1)
+                .Get_For_TimeintervalWithAttributes(searchBy, from, DateTime.Now, 1);
+
         }
     }
 }

Digipost.Api.Client.Archive.Tests/Smoke/ArchiveSmokeTestsHelper.cs

@@ -57,7 +57,7 @@ public ArchiveSmokeTestsHelper Get_Archive(string archiveName)
 
         public ArchiveSmokeTestsHelper Get_Default_Archive()
         {
-            _archive = _archiveApi.FetchArchives().Result.Where(a => a.Name == null).First();
+            _archive = _archiveApi.FetchArchives().Result.First(a => a.Name == string.Empty);
             return this;
         }
 
@@ -86,6 +86,24 @@ public ArchiveSmokeTestsHelper Get_All_DocumentsWithAttributes()
             return this;
         }
 
+        public ArchiveSmokeTestsHelper Get_For_Timeinterval(DateTime start, DateTime end, int expectCount = 0)
+        {
+            _byAttribute = _archiveApi.FetchArchiveDocuments(_archive.GetNextDocumentsUri(start, end)).Result;
+
+            Assert.Equal(expectCount, _byAttribute.ArchiveDocuments.Count);
+
+            return this;
+        }
+
+        public ArchiveSmokeTestsHelper Get_For_TimeintervalWithAttributes(Dictionary<string, string> searchBy, DateTime start, DateTime end, int expectCount = 0)
+        {
+            _byAttribute = _archiveApi.FetchArchiveDocuments(_archive.GetNextDocumentsUri(searchBy, start, end)).Result;
+
+            Assert.Equal(expectCount, _byAttribute.ArchiveDocuments.Count);
+
+            return this;
+        }
+
         public ArchiveSmokeTestsHelper Update_attritbutesOnFirst()
         {
             Assert_state(_byAttribute);

Digipost.Api.Client.Archive/Archive.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using Digipost.Api.Client.Common;
 using Digipost.Api.Client.Common.Relations;
@@ -66,5 +67,15 @@ public ArchiveNextDocumentsUri GetNextDocumentsUri(Dictionary<string, string> se
         {
             return new ArchiveNextDocumentsUri(Links["NEXT_DOCUMENTS"], searchBy);
         }
+
+        public ArchiveNextDocumentsUri GetNextDocumentsUri(DateTime from, DateTime to)
+        {
+            return new ArchiveNextDocumentsUri(Links["NEXT_DOCUMENTS"], from, to);
+        }
+
+        public ArchiveNextDocumentsUri GetNextDocumentsUri(Dictionary<string,string> searchBy, DateTime from, DateTime to)
+        {
+            return new ArchiveNextDocumentsUri(Links["NEXT_DOCUMENTS"], searchBy, from, to);
+        }
     }
 }

Digipost.Api.Client.Common.Tests/Relations/ApiRelationsTests.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using Digipost.Api.Client.Common.Enums;
+using Digipost.Api.Client.Common.Relations;
+using Digipost.Api.Client.Common.Utilities;
+using Xunit;
+
+namespace Digipost.Api.Client.Common.Tests.Utilities
+{
+    public class ApiRelationsTests
+    {
+        private static readonly Uri BaseUri = new Uri("https://api.io/api/archive/search?id=123");
+
+        [Fact]
+        public void should_produce_archive_search_url_query()
+        {
+            Assert.Equal("https://api.io:443/api/archive/search?id=123",
+                ArchiveNextDocumentsUri.ToUri(BaseUri, new Dictionary<string, string>(), null, null));
+
+            Assert.Equal("https://api.io:443/api/archive/search?id=123&attributes=aWQsMTIz",
+                ArchiveNextDocumentsUri.ToUri(BaseUri, new Dictionary<string, string>()
+                    {
+                        ["id"] = "123",
+                    },
+                    null, null
+                ));
+
+            var url = ArchiveNextDocumentsUri.ToUri(BaseUri, new Dictionary<string, string>(),
+                DateTime.Parse("2024-10-26 14:50:14Z"),
+                DateTime.Parse("2024-10-28 14:50:14Z")
+            );
+            Assert.Contains("fromDate=2024-10-26T", url);
+            Assert.Contains("toDate=2024-10-28T", url);
+        }
+    }
+}

Digipost.Api.Client.Common/Relations/ApiRelations.cs

@@ -71,7 +71,6 @@ public class AddAdditionalDataUri : Uri
         public AddAdditionalDataUri(Link link)
             : base(link.Uri, UriKind.Absolute)
         {
-
         }
     }
 
@@ -144,20 +143,41 @@ public ArchiveNextDocumentsUri(Link link)
         }
 
         public ArchiveNextDocumentsUri(Link link, Dictionary<string, string> searchBy)
-            : base(ToUri(new Uri(link.Uri, UriKind.Absolute), searchBy), UriKind.Absolute)
+            : base(ToUri(new Uri(link.Uri, UriKind.Absolute), searchBy, null, null), UriKind.Absolute)
+        {
+        }
+
+        public ArchiveNextDocumentsUri(Link link, DateTime from, DateTime to)
+            : base(ToUri(new Uri(link.Uri, UriKind.Absolute), new Dictionary<string, string>(), from, to), UriKind.Absolute)
+        {
+        }
+
+        public ArchiveNextDocumentsUri(Link link, Dictionary<string, string> searchBy, DateTime from, DateTime to)
+            : base(ToUri(new Uri(link.Uri, UriKind.Absolute), searchBy, from, to), UriKind.Absolute)
         {
+
         }
 
-        private static string ToUri(Uri nextDocumentsUri, Dictionary<string, string> searchBy)
+        internal static string ToUri(Uri nextDocumentsUri, Dictionary<string, string> searchBy, DateTime? from, DateTime? to)
         {
             var query = HttpUtility.ParseQueryString(nextDocumentsUri.Query);
-            var commaSeparated = string.Join(",", searchBy.Select(x => x.Key + "," + x.Value).ToArray());
-            var base64 = ToBase64String(Encoding.UTF8.GetBytes(commaSeparated));
+            if (searchBy.Count > 0)
+            {
+                var commaSeparated = string.Join(",", searchBy.Select(x => x.Key + "," + x.Value).ToArray());
+                var base64 = ToBase64String(Encoding.UTF8.GetBytes(commaSeparated));
+
+                query["attributes"] = base64;
+            }
+
+            if (from != null && to != null)
+            {
+                query["fromDate"] = from.Value.ToString("o");
+                query["toDate"] = to.Value.ToString("o");
+            }
 
-            query["attributes"] = "";
             var uriBuilder = new UriBuilder(nextDocumentsUri)
             {
-                Query = query + base64
+                Query = query.ToString()
             };
             return uriBuilder.ToString();
         }
@@ -200,7 +220,6 @@ public class DocumentEventsUri : Uri
         public DocumentEventsUri(Link link, Sender sender, DateTime from, DateTime to, int offset, int maxResults)
             : base($"{link.Uri}?sender={sender.Id}&from={DatetimeFormatter(from)}&to={DatetimeFormatter(to)}&offset={offset}&maxResults={maxResults}", UriKind.Absolute)
         {
-
         }
 
         private static string DatetimeFormatter(DateTime? dt)