full test

Author: pwelter34

src/Foundatio.CommandQuery.MongoDB/EntityCommandHandler.cs

@@ -15,7 +15,7 @@ protected EntityCommandHandler(IMongoDatabase database, IMapper mapper)
     {
     }
 
-    public virtual async ValueTask<Result<TReadModel?>> HandleAsync(
+    public virtual async ValueTask<Result<TReadModel>> HandleAsync(
         CreateEntity<TCreateModel, TReadModel> request,
         CancellationToken cancellationToken = default)
     {
@@ -24,6 +24,8 @@ protected EntityCommandHandler(IMongoDatabase database, IMapper mapper)
 
         // create new entity from model
         var entity = Mapper.Map<TCreateModel, TEntity>(request.Model);
+        if (entity == null)
+            return Result<TReadModel>.BadRequest("Could not map create model.");
 
         // apply create metadata
         if (entity is ITrackCreated createdModel)
@@ -45,11 +47,13 @@ await Collection
 
         // convert to read model
         var readModel = Mapper.Map<TEntity, TReadModel>(entity);
+        if (readModel == null)
+            return Result<TReadModel>.NotFound("Could not map read model.");
 
-        return Result<TReadModel?>.Success(readModel);
+        return Result<TReadModel>.Success(readModel);
     }
 
-    public virtual async ValueTask<Result<TReadModel?>> HandleAsync(
+    public virtual async ValueTask<Result<TReadModel>> HandleAsync(
        UpdateEntity<TKey, TUpdateModel, TReadModel> request,
        CancellationToken cancellationToken = default)
     {
@@ -63,7 +67,7 @@ await Collection
             .ConfigureAwait(false);
 
         if (entity == null && !request.Upsert)
-            return Result<TReadModel?>.NotFound($"Entity with id '{request.Id}' not found.");
+            return Result<TReadModel>.NotFound($"Entity with id '{request.Id}' not found.");
 
         // create entity if not found
         if (entity == null)
@@ -97,12 +101,14 @@ await Collection
 
         // return read model
         var result = Mapper.Map<TEntity, TReadModel>(entity);
+        if (result == null)
+            return Result<TReadModel>.NotFound("Could not map read model.");
 
-        return Result<TReadModel?>.Success(result);
+        return Result<TReadModel>.Success(result);
     }
 
 
-    public virtual async ValueTask<Result<TReadModel?>> HandleAsync(
+    public virtual async ValueTask<Result<TReadModel>> HandleAsync(
       DeleteEntity<TKey, TReadModel> request,
       CancellationToken cancellationToken = default)
     {
@@ -115,7 +121,7 @@ await Collection
             .ConfigureAwait(false);
 
         if (entity == null)
-            return Result<TReadModel?>.NotFound($"Entity with id '{request.Id}' not found.");
+            return Result<TReadModel>.NotFound($"Entity with id '{request.Id}' not found.");
 
         // apply update metadata
         if (entity is ITrackUpdated updateEntity)
@@ -147,7 +153,9 @@ await Collection
 
         // return read model
         var result = Mapper.Map<TEntity, TReadModel>(entity);
+        if (result == null)
+            return Result<TReadModel>.NotFound("Could not map read model.");
 
-        return Result<TReadModel?>.Success(result);
+        return Result<TReadModel>.Success(result);
     }
 }

src/Foundatio.CommandQuery.MongoDB/EntityQueryHandler.cs

@@ -19,7 +19,7 @@ protected EntityQueryHandler(IMongoDatabase database, IMapper mapper)
     {
     }
 
-    public virtual async ValueTask<Result<TReadModel?>> HandleAsync(
+    public virtual async ValueTask<Result<TReadModel>> HandleAsync(
         GetEntity<TKey, TReadModel> request,
         CancellationToken cancellationToken = default)
     {
@@ -33,8 +33,10 @@ protected EntityQueryHandler(IMongoDatabase database, IMapper mapper)
 
         // convert entity to read model
         var readModel = Mapper.Map<TEntity, TReadModel>(result);
+        if (readModel == null)
+            return Result<TReadModel>.NotFound("Could not map read model.");
 
-        return Result<TReadModel?>.Success(readModel);
+        return Result<TReadModel>.Success(readModel);
 
     }
 

tests/Foundatio.CommandQuery.MongoDB.Tests/PriorityTests.cs

@@ -2,6 +2,7 @@
 using Foundatio.CommandQuery.MongoDB.Tests.Domain.Models;
 using Foundatio.CommandQuery.MongoDB.Tests.Fixtures;
 using Foundatio.CommandQuery.MongoDB.Tests.Mocks;
+using Foundatio.CommandQuery.Queries;
 
 using MediatR.CommandQuery.MongoDB.Tests;
 
@@ -17,7 +18,7 @@ public PriorityTests(ITestOutputHelper output, DatabaseFixture databaseFixture)
     }
 
     [Fact]
-    public async Task CreateEntity()
+    public async Task FullTest()
     {
         var mediator = Services.GetService<IMediator>();
         mediator.Should().NotBeNull();
@@ -46,5 +47,64 @@ public async Task CreateEntity()
         created.Description.Should().Be(createModel.Description);
         created.DisplayOrder.Should().Be(createModel.DisplayOrder);
 
+        // get entity
+        var getCommand = new GetEntity<string, PriorityReadModel>(MockPrincipal.Default, created.Id);
+        var getResult = await mediator.InvokeAsync<Result<PriorityReadModel>>(getCommand);
+        getResult.Should().NotBeNull();
+
+        getResult.IsSuccess.Should().BeTrue();
+        getResult.Value.Should().NotBeNull();
+
+        var readModel = (PriorityReadModel)getResult;
+        readModel.Should().NotBeNull();
+        readModel.Id.Should().Be(created.Id);
+        readModel.Name.Should().Be(createModel.Name);
+        readModel.Description.Should().Be(createModel.Description);
+
+        // query entity
+        var queryDefinition = new QueryDefinition
+        {
+            Page = 1,
+            PageSize = 10,
+            Sorts = [new() { Name = nameof(PriorityReadModel.Name) }]
+        };
+
+        var queryCommand = new QueryEntities<PriorityReadModel>(MockPrincipal.Default, queryDefinition);
+
+        var queryResult = await mediator.InvokeAsync<Result<QueryResult<PriorityReadModel>>>(queryCommand);
+        queryResult.Should().NotBeNull();
+
+        var queryModel = (QueryResult<PriorityReadModel>)queryResult;
+        queryModel.Should().NotBeNull();
+        queryModel.Data.Should().NotBeNull();
+        queryModel.Total.Should().BeGreaterThan(0);
+
+        // update entity
+        PriorityUpdateModel updateRequest = new()
+        {
+            Name = createModel.Name + " Updated",
+            Description = createModel.Description + " Updated",
+            DisplayOrder = createModel.DisplayOrder + 1,
+            IsActive = !createModel.IsActive
+        };
+        var updateCommand = new UpdateEntity<string, PriorityUpdateModel, PriorityReadModel>(MockPrincipal.Default, created.Id, updateRequest);
+
+        var updateResult = await mediator.InvokeAsync<Result<PriorityReadModel>>(updateCommand);
+        updateResult.Should().NotBeNull();
+
+        updateResult.IsSuccess.Should().BeTrue();
+        updateResult.Value.Should().NotBeNull();
+
+        var updatedModel = (PriorityReadModel)updateResult;
+        updatedModel.Should().NotBeNull();
+        updatedModel.Id.Should().Be(created.Id);
+        updatedModel.Name.Should().Be(updateRequest.Name);
+        updatedModel.Description.Should().Be(updateRequest.Description);
+
+        // delete entity
+        var deleteCommand = new DeleteEntity<string, PriorityReadModel>(MockPrincipal.Default, created.Id);
+        var deleteResult = await mediator.InvokeAsync<Result<PriorityReadModel>>(deleteCommand);
+        deleteResult.Should().NotBeNull();
+        deleteResult.IsSuccess.Should().BeTrue();
     }
 }