Merge branch 'refs/heads/main' into feature/187393-create-conversion-…

…projects # Conflicts: # src/Tests/Dfe.Complete.Application.Tests/QueryHandlers/Project/GetProjectByUrnQueryHandlerTests.cs
DFE-Digital · Jan 10, 2025 · 11da0cf · 11da0cf
2 parents 94ca7f2 + c8f952d
commit 11da0cf
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 7 deletions.
diff --git a/src/Frontend/Dfe.Complete/Validators/UrnAttribute.cs b/src/Frontend/Dfe.Complete/Validators/UrnAttribute.cs
@@ -29,7 +29,7 @@ protected override ValidationResult IsValid(object value, ValidationContext vali
 
             var result = sender.Send(new GetProjectByUrnQuery(new Urn(urn.ToInt())));
 
-            if (result.Result != null)
+            if (result.Result?.Value != null)
             {
                 var errorMessage = $"A project with the urn: {urn} already exists";
 

diff --git a/.../Dfe.Complete.Application.Tests/QueryHandlers/Project/GetProjectByUrnQueryHandlerTests.cs b/.../Dfe.Complete.Application.Tests/QueryHandlers/Project/GetProjectByUrnQueryHandlerTests.cs
@@ -7,6 +7,7 @@
 using Dfe.Complete.Application.Common.Models;
 using DfE.CoreLibs.Caching.Helpers;
 using Dfe.Complete.Application.Projects.Queries.GetProject;
+using System.Linq.Expressions;
 using Dfe.Complete.Domain.ValueObjects;
 
 namespace Dfe.Complete.Application.Tests.QueryHandlers.Project
@@ -24,11 +25,9 @@ GetProjectByUrnQuery command
         {
             var now = DateTime.UtcNow;
 
-            var urn = 123456;
-
             var project = Domain.Entities.Project.CreateConversionProject(
                 new ProjectId(Guid.NewGuid()),
-                new Domain.ValueObjects.Urn(urn),
+                command.Urn,
                 now,
                 now,
                 Domain.Enums.TaskType.Conversion,
@@ -50,10 +49,10 @@ GetProjectByUrnQuery command
                 null, 
                 null);
 
-            var cacheKey = $"Project_{CacheKeyHelper.GenerateHashedCacheKey(urn.ToString())}";
+            var cacheKey = $"Project_{CacheKeyHelper.GenerateHashedCacheKey(command.Urn.Value.ToString())}";
 
             // Arrange
-            mockProjectRepository.GetAsync()
+            mockProjectRepository.GetAsync(Arg.Any<Expression<Func<Domain.Entities.Project, bool>>>())
                 .Returns(project);
 
             mockCacheService.GetOrAddAsync(
@@ -70,7 +69,46 @@ GetProjectByUrnQuery command
             var result = await handler.Handle(command, default);
 
             // Assert
-            //await mockProjectRepository.Received(1).GetAsync();
+            await mockProjectRepository.Received(1).GetAsync(Arg.Any<Expression<Func<Domain.Entities.Project, bool>>>());
+            Assert.True(result.IsSuccess == true);
+            Assert.True(result.Value?.Urn == command.Urn);
+        }
+
+
+        [Theory]
+        [CustomAutoData(typeof(DateOnlyCustomization))]
+        public async Task ONEONEHandle_ShouldGetAProjectByUrn_WhenCommandIsValid(
+            [Frozen] ICompleteRepository<Domain.Entities.Project> mockProjectRepository,
+            [Frozen] ICacheService<IMemoryCacheType> mockCacheService,
+            GetProjectByUrnQueryHandler handler,
+            GetProjectByUrnQuery command
+            )
+        {
+            var now = DateTime.UtcNow;
+
+            var cacheKey = $"Project_{CacheKeyHelper.GenerateHashedCacheKey(command.Urn.Value.ToString())}";
+
+            // Arrange
+            mockProjectRepository.GetAsync(Arg.Any<Expression<Func<Domain.Entities.Project?, bool>>>())
+                .Returns((Domain.Entities.Project?)null);
+
+            mockCacheService.GetOrAddAsync(
+                cacheKey,
+                Arg.Any<Func<Task<Result<Domain.Entities.Project?>>>>(),
+                Arg.Any<string>())
+            .Returns(callInfo =>
+            {
+                var callback = callInfo.ArgAt<Func<Task<Result<Domain.Entities.Project?>>>>(1);
+                return callback();
+            });
+
+            // Act
+            var result = await handler.Handle(command, default);
+
+            // Assert
+            await mockProjectRepository.Received(1).GetAsync(Arg.Any<Expression<Func<Domain.Entities.Project, bool>>>());
+            Assert.True(result.IsSuccess == true);
+            Assert.True(result.Value == null);
         }
     }
 }