Add sum properties to AccessQueueRepositoryState

AccessQueueService/Data/AccessQueueRepository.cs

@@ -179,19 +179,21 @@ namespace AccessQueueService.Data
             _nextUnusedTicket = newIndex;
         }
 
-        public string ToState()
+        public AccessQueueRepositoryState ToState()
         {
-            var state = new TakeANumberAccessQueueRepoState
+            var accessTickets = new Dictionary<string, AccessTicket>(_accessTickets);
+            var accessQueue = new Dictionary<ulong, AccessTicket>(_accessQueue);
+
+            var state = new AccessQueueRepositoryState
             {
                 AccessTickets = new Dictionary<string, AccessTicket>(_accessTickets),
                 AccessQueue = new Dictionary<ulong, AccessTicket>(_accessQueue),
             };
-            return JsonSerializer.Serialize(state);
+            return state;
         }
 
-        public static AccessQueueRepository FromState(string stateJson)
+        public static AccessQueueRepository FromState(AccessQueueRepositoryState state)
         {
-            var state = JsonSerializer.Deserialize<TakeANumberAccessQueueRepoState?>(stateJson);
             if (state?.AccessTickets == null || state?.AccessQueue == null)
             {
                 return new();

AccessQueueService/Models/AccessQueueRepositoryState.cs

@@ -1,8 +1,11 @@
 namespace AccessQueueService.Models
 {
-    public class TakeANumberAccessQueueRepoState
+    public class AccessQueueRepositoryState
     {
         public Dictionary<string, AccessTicket> AccessTickets { get; set; } = [];
         public Dictionary<ulong, AccessTicket> AccessQueue { get; set; } = [];
+        public int UnexpiredTicketsCount { get; set; }
+        public int ActiveTicketsCount { get; set; }
+        public int QueueCount { get; set; }
     }
 }

AccessQueueService/Program.cs

@@ -1,4 +1,6 @@
+using System.Text.Json;
 using AccessQueueService.Data;
+using AccessQueueService.Models;
 using AccessQueueService.Services;
 using Serilog;
 
@@ -24,8 +26,14 @@ builder.Services.AddSingleton<AccessQueueRepository>(sp =>
     {
         try
         {
-            var json = File.ReadAllText(filePath);
+            string json = File.ReadAllText(filePath);
-            return AccessQueueRepository.FromState(json);
+            var state = JsonSerializer.Deserialize<AccessQueueRepositoryState>(json);
+            if (state == null)
+            {
+                Console.WriteLine($"Failed to load state from {filePath}. Deserialized object was null.");
+                return new AccessQueueRepository();
+            }
+            return AccessQueueRepository.FromState(state);
         }
         catch (Exception ex)
         {

AccessQueueService/Services/AccessQueueSerializerService.cs

@@ -30,7 +30,7 @@ namespace AccessQueueService.Services
                 {
                     _logger.LogInformation($"Writing backup to {backupPath}");
                     var stateJson = _accessRepo.ToState();
-                    File.WriteAllText(backupPath, stateJson);
+                    File.WriteAllText(backupPath, JsonSerializer.Serialize(stateJson));
                 }
                 catch (Exception ex)
                 {

AccessQueueServiceTests/AccessQueueRepoTests.cs

@@ -287,8 +287,7 @@ namespace AccessQueueServiceTests
             _repo.UpsertTicket(ticketWithAccess);
             _repo.Enqueue(ticketWithoutAccess);
 
-            string stateJson = _repo.ToState();
+            var state = _repo.ToState();
-            var state = JsonSerializer.Deserialize<TakeANumberAccessQueueRepoState>(stateJson);
 
             Assert.NotNull(state?.AccessQueue);
             Assert.NotNull(state?.AccessTickets);
@@ -312,8 +311,8 @@ namespace AccessQueueServiceTests
             _repo.UpsertTicket(ticketWithAccess);
             _repo.Enqueue(ticketWithoutAccess);
 
-            string stateJson = _repo.ToState();
+            var state = _repo.ToState();
-            var deserializedRepo = AccessQueueRepository.FromState(stateJson);
+            var deserializedRepo = AccessQueueRepository.FromState(state);
 
             Assert.Equal(1, deserializedRepo.GetUnexpiredTicketsCount());
             Assert.Equal(1, deserializedRepo.GetQueueCount());