fix issue with mongodb mapping

Author: pwelter34

samples/EntityFramework/src/Tracker.Client/Services/ServiceRegistration.cs

@@ -39,14 +39,12 @@ public static void Register(IServiceCollection services, ISet<string> tags)
         if (tags.Contains("WebAssembly"))
         {
             services
-                .AddHttpClient<RemoteDispatcher>((sp, client) =>
+                .AddRemoteDispatcher((sp, client) =>
                 {
                     var hostEnvironment = sp.GetRequiredService<IOptions<EnvironmentOptions>>();
                     client.BaseAddress = new Uri(hostEnvironment.Value.BaseAddress);
                 })
                 .AddHttpMessageHandler<ProgressBarHandler>();
-
-            services.AddRemoteDispatcher();
         }
 
         if (tags.Contains("Server"))

samples/EntityFramework/src/Tracker.Host/Tracker.Host.csproj

@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspire.Hosting.AppHost" Version="9.4.1" />
+    <PackageReference Include="Aspire.Hosting.AppHost" Version="9.4.2" />
   </ItemGroup>
 
   <ItemGroup>

samples/EntityFramework/src/Tracker.Web/Tracker.Web.csproj

@@ -16,7 +16,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.8" />
-    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.4.1" />
+    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.4.2" />
     <PackageReference Include="Microsoft.Identity.Web" Version="3.14.0" />
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />

src/Arbiter.CommandQuery.MongoDB/Arbiter.CommandQuery.MongoDB.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MongoDB.Abstracts" Version="6.5.0" />
+    <PackageReference Include="MongoDB.Abstracts" Version="6.6.0" />
   </ItemGroup>
 
   <ItemGroup>

src/Arbiter.CommandQuery.MongoDB/Handlers/EntityIdentifiersQueryHandler.cs

@@ -1,4 +1,5 @@
 using Arbiter.CommandQuery.Definitions;
+using Arbiter.CommandQuery.Extensions;
 using Arbiter.CommandQuery.Queries;
 
 using Microsoft.Extensions.Logging;
@@ -44,12 +45,11 @@ public EntityIdentifiersQueryHandler(ILoggerFactory loggerFactory, TRepository r
 
         var keys = new HashSet<TKey>(request.Ids);
 
-        var results = await Repository.Collection
+        return await Repository.Collection
             .AsQueryable()
             .Where(p => keys.Contains(p.Id))
+            .ProjectTo<TEntity, TReadModel>(Mapper)
             .ToListAsync(cancellationToken)
             .ConfigureAwait(false);
-
-        return Mapper.Map<IList<TEntity>, IReadOnlyCollection<TReadModel>>(results);
     }
 }

src/Arbiter.CommandQuery.MongoDB/Handlers/EntityPagedQueryHandler.cs

@@ -117,8 +117,9 @@ protected virtual async ValueTask<IReadOnlyCollection<TReadModel>> QueryPaged(En
         if (entityQuery.Page > 0 && entityQuery.PageSize > 0)
             queryable = queryable.Page(entityQuery.Page, entityQuery.PageSize);
 
-        var results = await queryable.ToListAsync(cancellationToken).ConfigureAwait(false);
-
-        return Mapper.Map<IList<TEntity>, IReadOnlyCollection<TReadModel>>(results);
+        return await queryable
+            .ProjectTo<TEntity, TReadModel>(Mapper)
+            .ToListAsync(cancellationToken)
+            .ConfigureAwait(false);
     }
 }

src/Arbiter.CommandQuery.MongoDB/Handlers/EntitySelectQueryHandler.cs

@@ -84,11 +84,10 @@ protected virtual ValueTask<IQueryable<TEntity>> BuildQuery(EntitySelectQuery<TR
     /// <returns>A collection of read models.</returns>
     protected virtual async ValueTask<IReadOnlyCollection<TReadModel>> QueryList(EntitySelectQuery<TReadModel> request, IQueryable<TEntity> query, CancellationToken cancellationToken)
     {
-        var results = await query
+        return await query
             .Sort(request?.Select?.Sort)
+            .ProjectTo<TEntity, TReadModel>(Mapper)
             .ToListAsync(cancellationToken)
             .ConfigureAwait(false);
-
-        return Mapper.Map<IList<TEntity>, IReadOnlyCollection<TReadModel>>(results);
     }
 }

test/Arbiter.CommandQuery.EntityFramework.Tests/Arbiter.CommandQuery.EntityFramework.Tests.csproj

@@ -26,7 +26,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.8" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.8" />
     <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.14.2" />
-    <PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="1.8.3" />
+    <PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="1.8.4" />
     <PackageReference Include="Testcontainers.MsSql" Version="4.7.0" />
     <PackageReference Include="TestHost.Abstracts" Version="1.2.0" />
     <PackageReference Include="TUnit" Version="0.57.24" />

test/Arbiter.CommandQuery.MongoDB.Tests/Acceptance/AuditTests.cs

@@ -1,11 +1,10 @@
 using Arbiter.CommandQuery.Commands;
+using Arbiter.CommandQuery.Definitions;
 using Arbiter.CommandQuery.MongoDB.Tests.Data.Entities;
 using Arbiter.CommandQuery.MongoDB.Tests.Domain.Models;
 using Arbiter.CommandQuery.Queries;
 using Arbiter.Mediation;
 
-using AutoMapper;
-
 using Microsoft.Extensions.DependencyInjection;
 
 using MongoDB.Bson;
@@ -79,7 +78,7 @@ public async Task FullTest()
         patchResult.Content.Should().Be("Patch Update");
 
         // Update Entity
-        var updateModel = mapper.Map<AuditUpdateModel>(patchResult);
+        var updateModel = mapper.Map<AuditReadModel, AuditUpdateModel>(patchResult);
         updateModel.Content = "Update Command";
 
         var updateCommand = new EntityUpdateCommand<string, AuditUpdateModel, AuditReadModel>(MockPrincipal.Default, key, updateModel);

test/Arbiter.CommandQuery.MongoDB.Tests/Acceptance/PriorityTests.cs

@@ -1,10 +1,9 @@
+using Arbiter.CommandQuery.Definitions;
 using Arbiter.CommandQuery.MongoDB.Tests.Constants;
 using Arbiter.CommandQuery.MongoDB.Tests.Domain.Models;
 using Arbiter.CommandQuery.Queries;
 using Arbiter.Mediation;
 
-using AutoMapper;
-
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Arbiter.CommandQuery.MongoDB.Tests.Acceptance;