(#384) Renamed TotalNrItems on SynchronizationEventArgs to ItemsTotal.

Made DateTimeConverter on server Except again if input is empty.
Optimised DataTimeConverter to avoid double parsing.

Author: StefanCuypers

src/CommunityToolkit.Datasync.Client/Offline/Operations/PullOperationManager.cs

@@ -118,7 +118,7 @@ public async Task<PullResult> ExecuteAsync(IEnumerable<PullRequest> requests, Pu
                     EventType = SynchronizationEventType.ItemsCommitted,
                     EntityType = pullResponse.EntityType,
                     ItemsProcessed = pullResponse.TotalItemsProcessed,
-                    TotalNrItems = pullResponse.TotalRequestItems,
+                    ItemsTotal = pullResponse.TotalRequestItems,
                     QueryId = pullResponse.QueryId
                 });
             }
@@ -130,7 +130,7 @@ public async Task<PullResult> ExecuteAsync(IEnumerable<PullRequest> requests, Pu
                     EventType = SynchronizationEventType.PullEnded,
                     EntityType = pullResponse.EntityType,
                     ItemsProcessed = pullResponse.TotalItemsProcessed,
-                    TotalNrItems = pullResponse.TotalRequestItems,
+                    ItemsTotal = pullResponse.TotalRequestItems,
                     QueryId = pullResponse.QueryId,
                     Exception = pullResponse.Exception,
                     ServiceResponse = pullResponse.Exception is DatasyncPullException ex ? ex.ServiceResponse : null
@@ -167,7 +167,7 @@ public async Task<PullResult> ExecuteAsync(IEnumerable<PullRequest> requests, Pu
                         EventType = SynchronizationEventType.ItemsFetched,
                         EntityType = pullRequest.EntityType,
                         ItemsProcessed = itemsProcessed,
-                        TotalNrItems = page.Count ?? 0,
+                        ItemsTotal = page.Count ?? 0,
                         QueryId = pullRequest.QueryId
                     });
 

src/CommunityToolkit.Datasync.Client/Offline/OperationsQueue/OperationsQueueManager.cs

@@ -275,7 +275,7 @@ internal async Task<PushResult> PushAsync(IEnumerable<Type> entityTypes, PushOpt
         this._context.SendSynchronizationEvent(new SynchronizationEventArgs()
         {
             EventType = SynchronizationEventType.PushStarted,
-            TotalNrItems = queuedOperations.Count
+            ItemsTotal = queuedOperations.Count
         });
 
         if (queuedOperations.Count == 0)
@@ -301,7 +301,7 @@ internal async Task<PushResult> PushAsync(IEnumerable<Type> entityTypes, PushOpt
             {
                 EventType = SynchronizationEventType.PushItem,
                 ItemsProcessed = newItemsProcessed,
-                TotalNrItems = queuedOperations.Count,
+                ItemsTotal = queuedOperations.Count,
                 PushOperation = operation,
             });
         });
@@ -317,7 +317,7 @@ internal async Task<PushResult> PushAsync(IEnumerable<Type> entityTypes, PushOpt
         {
             EventType = SynchronizationEventType.PushEnded,
             ItemsProcessed = nrItemsProcessed,
-            TotalNrItems = queuedOperations.Count,
+            ItemsTotal = queuedOperations.Count,
         });
 
         return pushResult;

src/CommunityToolkit.Datasync.Client/Offline/SynchronizationEventArgs.cs

@@ -73,7 +73,7 @@ public class SynchronizationEventArgs
     /// When pulling records, the total number of items to pull for the given entity in the current pull request
     /// When pushing records, the total number of items that are being pushed in the current push request.
     /// </summary>
-    public long TotalNrItems { get; init; }
+    public long ItemsTotal { get; init; }
 
     /// <summary>
     /// The query ID that is being processed on pull operations. Not used on push events.

src/CommunityToolkit.Datasync.Client/Serialization/DateTimeConverter.cs

@@ -33,7 +33,7 @@ public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, Jso
                 return utc;
             }
 
-            return DateTime.Parse(token);
+            return utc.ToLocalTime();
         }
     }
 

src/CommunityToolkit.Datasync.Server.Abstractions/Json/DateTimeConverter.cs

@@ -19,22 +19,14 @@ public class DateTimeConverter : JsonConverter<DateTime>
     /// <inheritdoc />
     public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
-        string? token = reader.GetString();
-        if (string.IsNullOrEmpty(token))
+        // Check if datetime was 'default'. If so do not adjust to local time.
+        DateTime utc = DateTime.Parse(reader.GetString() ?? "", CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal);
+        if (utc == default)
         {
-            return DateTime.MinValue;
+            return utc;
         }
-        else
-        {
-            // Check if datetime was 'default'. If so do not adjust to local time.
-            DateTime utc = DateTime.Parse(token, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal);
-            if (utc == default)
-            {
-                return utc;
-            }
 
-            return DateTime.Parse(token);
-        }
+        return utc.ToLocalTime();
     }
 
     /// <inheritdoc />

tests/CommunityToolkit.Datasync.Client.Test/Offline/OfflineDbContext_Tests.cs

@@ -1467,13 +1467,13 @@ public async Task SynchronizationProgress_Event_Works()
                 case SynchronizationEventType.ItemsFetched:
                     currentItemsFetched += 5;
                     args.ItemsProcessed.Should().Be(currentItemsFetched);
-                    args.TotalNrItems.Should().Be(20);
+                    args.ItemsTotal.Should().Be(20);
                     eventFiredForFetch = true;
                     break;
                 case SynchronizationEventType.ItemsCommitted:
                     currentItemsCommited += 5;
                     args.ItemsProcessed.Should().Be(currentItemsCommited);
-                    args.TotalNrItems.Should().Be(20);
+                    args.ItemsTotal.Should().Be(20);
                     eventFiredForCommit = true;
                     break;
                 case SynchronizationEventType.PullStarted:
@@ -1484,7 +1484,7 @@ public async Task SynchronizationProgress_Event_Works()
                     eventFiredForEnd.Should().BeFalse("PullEnded event should only fire once");
                     eventFiredForEnd = true;
                     args.ItemsProcessed.Should().Be(20);
-                    args.TotalNrItems.Should().Be(20);
+                    args.ItemsTotal.Should().Be(20);
                     break;
                 default:
                     Assert.Fail($"Invalid event type: {args.EventType}");
@@ -1572,11 +1572,11 @@ public async Task SynchronizationProgress_Event_Works_For_Push()
             sender.Should().Be(this.context);
             args.Exception.Should().BeNull();
             args.ServiceResponse.Should().BeNull();
-            args.TotalNrItems.Should().Be(newMovies.Length);
+            args.ItemsTotal.Should().Be(newMovies.Length);
             switch (args.EventType)
             {
                 case SynchronizationEventType.PushItem:
-                    args.TotalNrItems.Should().Be(newMovies.Length);
+                    args.ItemsTotal.Should().Be(newMovies.Length);
                     args.ItemsProcessed.Should().BeInRange(1,newMovies.Length);
                     int prevProcessed = Interlocked.Exchange(ref itemsProcessedReported[args.ItemsProcessed-1], 1);
                     prevProcessed.Should().Be(0, "Each item should only be reported once");