Merge pull request #12 from DEFRA/feature/cdms-182

rearranged domain services, added decisions skeleton

Btms.Business.Tests/Services/Decisions/DecisionServiceTests.cs

@@ -0,0 +1,19 @@
+using Btms.Business.Services.Decisions;
+using Xunit;
+
+namespace Btms.Business.Tests.Services.Decisions;
+
+public class DecisionServiceTests
+{
+    [Fact]
+    public async Task DeriveDecision()
+    {
+        // Arrange
+        var sut = new DecisionService();
+
+        // Act
+
+        // Assert
+        await Task.CompletedTask;
+    }
+}

Btms.Business.Tests/Services/Decisions/Finders/ChedADecisionFinderTests.cs

@@ -0,0 +1,19 @@
+using Btms.Business.Services.Decisions.Finders;
+using Xunit;
+
+namespace Btms.Business.Tests.Services.Decisions.Finders;
+
+public class ChedADecisionFinderTests
+{
+    [Fact]
+    public async Task Find_Should_DoThings()
+    {
+        // Arrange
+        var sut = new ChedADecisionFinder();
+
+        // Act
+
+        // Assert
+        await Task.CompletedTask;
+    }
+}

Btms.Business.Tests/Services/Decisions/Finders/ChedDDecisionFinderTests.cs

@@ -0,0 +1,19 @@
+using Btms.Business.Services.Decisions.Finders;
+using Xunit;
+
+namespace Btms.Business.Tests.Services.Decisions.Finders;
+
+public class ChedDDecisionFinderTests
+{
+    [Fact]
+    public async Task Find_Should_DoThings()
+    {
+        // Arrange
+        var sut = new ChedDDecisionFinder();
+
+        // Act
+
+        // Assert
+        await Task.CompletedTask;
+    }
+}

Btms.Business.Tests/Services/Decisions/Finders/ChedPDecisionFinderTests.cs

@@ -0,0 +1,19 @@
+using Btms.Business.Services.Decisions.Finders;
+using Xunit;
+
+namespace Btms.Business.Tests.Services.Decisions.Finders;
+
+public class ChedPDecisionFinderTests
+{
+    [Fact]
+    public async Task Find_Should_DoThings()
+    {
+        // Arrange
+        var sut = new ChedPDecisionFinder();
+
+        // Act
+
+        // Assert
+        await Task.CompletedTask;
+    }
+}

Btms.Business.Tests/Services/Decisions/Finders/ChedPPDecisionFinderTests.cs

@@ -0,0 +1,19 @@
+using Btms.Business.Services.Decisions.Finders;
+using Xunit;
+
+namespace Btms.Business.Tests.Services.Decisions.Finders;
+
+public class ChedPPDecisionFinderTests
+{
+    [Fact]
+    public async Task Find_Should_DoThings()
+    {
+        // Arrange
+        var sut = new ChedPPDecisionFinder();
+
+        // Act
+
+        // Assert
+        await Task.CompletedTask;
+    }
+}

Btms.Business.Tests/Services/LinkingServiceTests.cs → Btms.Business.Tests/Services/Linking/LinkingServiceTests.cs

@@ -1,6 +1,6 @@
 using Btms.Backend.Data;
 using Btms.Backend.Data.InMemory;
-using Btms.Business.Services;
+using Btms.Business.Services.Linking;
 using Btms.Metrics;
 using Btms.Model.Alvs;
 using Btms.Model.ChangeLog;
@@ -12,7 +12,7 @@
 using Items = Btms.Model.Alvs.Items;
 using Movement = Btms.Model.Movement;
 
-namespace Btms.Business.Tests.Services;
+namespace Btms.Business.Tests.Services.Linking;
 
 public class LinkingServiceTests
 {

Btms.Business/Btms.Business.csproj

@@ -35,4 +35,8 @@
     <ProjectReference Include="..\Btms.Types.Ipaffs.V1\Btms.Types.Ipaffs.V1.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Services\Matching\" />
+  </ItemGroup>
+
 </Project>

Btms.Business/Extensions/ServiceCollectionExtensions.cs

@@ -2,7 +2,6 @@
 using Btms.Business.Pipelines;
 using Btms.Business.Pipelines.Matching;
 using Btms.Business.Pipelines.Matching.Rules;
-using Btms.Business.Services;
 using Btms.Backend.Data.Extensions;
 using Btms.BlobService;
 using Btms.BlobService.Extensions;
@@ -14,6 +13,8 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Btms.Business.Pipelines.PreProcessing;
+using Btms.Business.Services.Decisions;
+using Btms.Business.Services.Linking;
 using Btms.Types.Alvs;
 
 namespace Btms.Business.Extensions
@@ -61,6 +62,7 @@ public static IServiceCollection AddBusinessServices(this IServiceCollection ser
             });
 
             services.AddScoped<ILinkingService, LinkingService>();
+            services.AddScoped<IDecisionService, DecisionService>();
 
             services.AddScoped<IPreProcessor<ImportNotification, Model.Ipaffs.ImportNotification>, ImportNotificationPreProcessor>();
             services.AddScoped<IPreProcessor<AlvsClearanceRequest, Model.Movement>, MovementPreProcessor>();

Btms.Business/Services/Decisions/DecisionCode.cs

@@ -0,0 +1,15 @@
+namespace Btms.Business.Services.Decisions;
+
+public enum DecisionCode
+{
+    E03,
+    C03,
+    C05,
+    C06,
+    C07,
+    C08,
+    N02,
+    N03,
+    N04,
+    N07
+}

Btms.Business/Services/Decisions/DecisionContext.cs

@@ -0,0 +1,10 @@
+using Btms.Model;
+using Btms.Model.Ipaffs;
+
+namespace Btms.Business.Services.Decisions;
+
+public class DecisionContext
+{
+    public List<ImportNotification> Notifications { get; set; } = new();
+    public List<Movement> Movements { get; set; } = new();
+}

Btms.Business/Services/Decisions/DecisionResult.cs

@@ -0,0 +1,3 @@
+namespace Btms.Business.Services.Decisions;
+
+public record DecisionResult(DecisionCode DecisionCode);

Btms.Business/Services/Decisions/DecisionService.cs

@@ -0,0 +1,58 @@
+using Btms.Business.Services.Decisions.Finders;
+using Btms.Model.Ipaffs;
+
+namespace Btms.Business.Services.Decisions;
+
+public class DecisionService : IDecisionService
+{
+    public async Task<DecisionResult> DeriveDecision(DecisionContext decisionContext)
+    {
+        // Validate and prerequisite checks
+
+        var decisions = decisionContext.Notifications.Select(x => (x.Id, GetDecision(x))).ToList();
+
+        foreach (var movement in decisionContext.Movements)
+        {
+            // Generate list matched items -> decisions
+
+            foreach (var item in movement.Items)
+            {
+                // check decisions list for match reference, if no match then drop out with "no-match"
+
+            }
+
+            // Return decision based on prioritisation from confluence
+        }
+
+        await Task.CompletedTask;
+        return new DecisionResult(DecisionCode.N02);
+    }
+
+    private DecisionResult GetDecision(ImportNotification notification)
+    {
+        // get decision finder - fold IUU stuff into the decision finder for fish?
+        IDecisionFinder finder;
+        switch (notification.ImportNotificationType)
+        {
+            case ImportNotificationTypeEnum.Ced:
+                finder = new ChedDDecisionFinder();
+                break;
+
+            case ImportNotificationTypeEnum.Cveda:
+                finder = new  ChedADecisionFinder();
+                break;
+
+            case ImportNotificationTypeEnum.Cvedp:
+                finder = new  ChedPDecisionFinder();
+                break;
+
+            case ImportNotificationTypeEnum.Chedpp:
+                finder = new  ChedPPDecisionFinder();
+                break;
+
+            default: throw new InvalidOperationException("Invalid ImportNotificationType");
+        }
+
+        return finder.FindDecision(notification);
+    }
+}

Btms.Business/Services/Decisions/Finders/ChedADecisionFinder.cs

@@ -0,0 +1,11 @@
+using Btms.Model.Ipaffs;
+
+namespace Btms.Business.Services.Decisions.Finders;
+
+public class ChedADecisionFinder : IDecisionFinder
+{
+    public DecisionResult FindDecision(ImportNotification notification)
+    {
+        throw new NotImplementedException();
+    }
+}

Btms.Business/Services/Decisions/Finders/ChedDDecisionFinder.cs

@@ -0,0 +1,11 @@
+using Btms.Model.Ipaffs;
+
+namespace Btms.Business.Services.Decisions.Finders;
+
+public class ChedDDecisionFinder : IDecisionFinder
+{
+    public DecisionResult FindDecision(ImportNotification notification)
+    {
+        throw new NotImplementedException();
+    }
+}

Btms.Business/Services/Decisions/Finders/ChedPDecisionFinder.cs

@@ -0,0 +1,11 @@
+using Btms.Model.Ipaffs;
+
+namespace Btms.Business.Services.Decisions.Finders;
+
+public class ChedPDecisionFinder : IDecisionFinder
+{
+    public DecisionResult FindDecision(ImportNotification notification)
+    {
+        throw new NotImplementedException();
+    }
+}

Btms.Business/Services/Decisions/Finders/ChedPPDecisionFinder.cs

@@ -0,0 +1,11 @@
+using Btms.Model.Ipaffs;
+
+namespace Btms.Business.Services.Decisions.Finders;
+
+public class ChedPPDecisionFinder : IDecisionFinder
+{
+    public DecisionResult FindDecision(ImportNotification notification)
+    {
+        throw new NotImplementedException();
+    }
+}

Btms.Business/Services/Decisions/Finders/IDecisionFinder.cs

@@ -0,0 +1,8 @@
+using Btms.Model.Ipaffs;
+
+namespace Btms.Business.Services.Decisions.Finders;
+
+public interface IDecisionFinder
+{
+    DecisionResult FindDecision(ImportNotification notification);
+}

Btms.Business/Services/Decisions/IDecisionService.cs

@@ -0,0 +1,6 @@
+namespace Btms.Business.Services.Decisions;
+
+public interface IDecisionService
+{
+    public Task<DecisionResult> DeriveDecision(DecisionContext decisionContext);
+}

Btms.Business/Services/ILinkingService.cs → Btms.Business/Services/Linking/ILinkingService.cs

@@ -1,5 +1,5 @@
 
-namespace Btms.Business.Services;
+namespace Btms.Business.Services.Linking;
 
 public interface ILinkingService
 {

Btms.Business/Services/ImportNotificationLinkContext.cs → Btms.Business/Services/Linking/ImportNotificationLinkContext.cs

@@ -1,7 +1,7 @@
 using Btms.Model.ChangeLog;
 using Btms.Model.Ipaffs;
 
-namespace Btms.Business.Services;
+namespace Btms.Business.Services.Linking;
 
 public record ImportNotificationLinkContext(ImportNotification PersistedImportNotification, ChangeSet? ChangeSet) : LinkContext
 {

Btms.Business/Services/LinkContext.cs → Btms.Business/Services/Linking/LinkContext.cs

@@ -2,7 +2,7 @@
 using Btms.Model.ChangeLog;
 using Btms.Model.Ipaffs;
 
-namespace Btms.Business.Services;
+namespace Btms.Business.Services.Linking;
 
 public abstract record LinkContext
 {

Btms.Business/Services/LinkException.cs → Btms.Business/Services/Linking/LinkException.cs

@@ -1,3 +1,3 @@
-namespace Btms.Business.Services;
+namespace Btms.Business.Services.Linking;
 
 public class LinkException(Exception inner) : Exception("Failed to link", inner);

Btms.Business/Services/LinkOutcome.cs → Btms.Business/Services/Linking/LinkOutcome.cs

@@ -1,4 +1,4 @@
-namespace Btms.Business.Services;
+namespace Btms.Business.Services.Linking;
 
 public enum LinkOutcome
 {

Btms.Business/Services/LinkResult.cs → Btms.Business/Services/Linking/LinkResult.cs

@@ -1,7 +1,7 @@
 using Btms.Model;
 using Btms.Model.Ipaffs;
 
-namespace Btms.Business.Services;
+namespace Btms.Business.Services.Linking;
 
 public class LinkResult(LinkOutcome state)
 {

Btms.Business/Services/LinkingService.cs → Btms.Business/Services/Linking/LinkingService.cs

@@ -1,16 +1,14 @@
 using System.Text.RegularExpressions;
 using Btms.Backend.Data;
 using Btms.Backend.Data.Extensions;
-using Btms.Common.Extensions;
 using Btms.Metrics;
 using Btms.Model;
 using Btms.Model.ChangeLog;
 using Btms.Model.Ipaffs;
 using Btms.Model.Relationships;
-using Json.Patch;
 using Microsoft.Extensions.Logging;
 
-namespace Btms.Business.Services;
+namespace Btms.Business.Services.Linking;
 
 public static partial class LinkingServiceLogging
 {

Btms.Business/Services/MovementLinkContext.cs → Btms.Business/Services/Linking/MovementLinkContext.cs

@@ -1,7 +1,7 @@
 using Btms.Model;
 using Btms.Model.ChangeLog;
 
-namespace Btms.Business.Services;
+namespace Btms.Business.Services.Linking;
 
 public record MovementLinkContext(Movement PersistedMovement, ChangeSet? ChangeSet) : LinkContext
 {

Btms.Consumers.Tests/ClearanceRequestConsumerTests.cs

@@ -1,5 +1,5 @@
 using Btms.Business.Pipelines.PreProcessing;
-using Btms.Business.Services;
+using Btms.Business.Services.Linking;
 using Btms.Consumers.Extensions;
 using Btms.Model;
 using Btms.Model.Auditing;