(CommunityToolkit#298) Pass the conflict resolver through all the entity options in the builder.

Author: adrianhall

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

@@ -95,6 +95,7 @@ public DatasyncOfflineOptionsBuilder Entity<TEntity>(Action<EntityOfflineOptions
         EntityOfflineOptions<TEntity> entity = new();
         configure(entity);
         options.ClientName = entity.ClientName;
+        options.ConflictResolver = entity.ConflictResolver;
         options.Endpoint = entity.Endpoint;
         options.QueryDescription = new QueryTranslator<TEntity>(entity.Query).Translate();
         return this;
@@ -137,7 +138,7 @@ internal OfflineOptions Build()
 
         foreach (EntityOfflineOptions entity in this._entities.Values)
         {
-            result.AddEntity(entity.EntityType, entity.ClientName, entity.Endpoint, entity.QueryDescription);
+            result.AddEntity(entity.EntityType, entity.ClientName, entity.ConflictResolver, entity.Endpoint, entity.QueryDescription);
         }
 
         return result;

src/CommunityToolkit.Datasync.Client/Offline/Models/OfflineOptions.cs

@@ -25,11 +25,18 @@ internal class OfflineOptions()
     /// </summary>
     /// <param name="entityType">The type of the entity being stored.</param>
     /// <param name="clientName">The name of the client.</param>
+    /// <param name="conflictResolver">The conflict resolver to use.</param>
     /// <param name="endpoint">The endpoint serving the datasync services.</param>
     /// <param name="queryDescription">The optional query description to describe what entities need to be pulled.</param>
-    public void AddEntity(Type entityType, string clientName, Uri endpoint, QueryDescription? queryDescription = null)
+    public void AddEntity(Type entityType, string clientName, IConflictResolver? conflictResolver, Uri endpoint, QueryDescription? queryDescription = null)
     {
-        this._cache.Add(entityType, new EntityOptions { ClientName = clientName, Endpoint = endpoint, QueryDescription = queryDescription });
+        this._cache.Add(entityType, new EntityOptions 
+        { 
+            ClientName = clientName, 
+            ConflictResolver = conflictResolver,
+            Endpoint = endpoint, 
+            QueryDescription = queryDescription
+        });
     }
 
     /// <summary>

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

@@ -151,8 +151,15 @@ public async Task PushAsync_WithClientWinsResolver_ShouldResolveConflictAndRetry
         var context = CreateContext();
 
         // Configure context to use client wins resolver
-        context.Configurator = builder => builder.Entity<ClientMovie>(c =>
-            c.ConflictResolver = new ClientWinsConflictResolver());
+        context.Configurator = builder =>
+        {
+            builder.Entity<ClientMovie>(c =>
+            {
+                c.ClientName = "movies";
+                c.Endpoint = new Uri("/tables/movies", UriKind.Relative);
+                c.ConflictResolver = new ClientWinsConflictResolver();
+            });
+        };
 
         // Create a client movie and save it to generate operation
         var clientMovie = new ClientMovie(TestData.Movies.BlackPanther)