Updated the code to return an E90 when no decision finder could be found

Btms.Backend.IntegrationTests/DecisionTests/ChedPP/ChedPpHmiTests.cs

@@ -1,3 +1,4 @@
+using System.Text.Json;
 using Btms.Model;
 using FluentAssertions;
 using TestDataGenerator.Scenarios.SpecificFiles;
@@ -18,9 +19,6 @@ public class ChedPpHmiTests(ITestOutputHelper output) : MultipleScenarioGenerato
     [InlineData(typeof(ChedPpHmiDecisionTestsScenarioGenerator), "24GBD69TMXZ2TYCAR9", "N02")]
     [InlineData(typeof(ChedPpHmiDecisionTestsScenarioGenerator), "24GBD69TMXZ2TYCAR8", "H01")]
     [InlineData(typeof(ChedPpHmiDecisionTestsScenarioGenerator), "24GBD69TMXZ2TYCAR7", "H02")]
-
-    //Movement With Different Ched Types, that caused a finder exceptions
-    [InlineData(typeof(Mrn24Gbdy6Xff66H0Xar1ScenarioGenerator), "24GBDY6XFF66H0XAR1", "C03")]
     public void DecisionShouldHaveCorrectDecisionCodeForSingleNotification(Type generatorType, string mrn, string decisionCode)
     {
         base.TestOutputHelper.WriteLine("Generator : {0}, Decision Code : {1}", generatorType!.FullName, decisionCode);
@@ -31,17 +29,39 @@ public void DecisionShouldHaveCorrectDecisionCodeForSingleNotification(Type gene
 
         var movement = apiResponse.GetResourceObject<Movement>();
 
-        var lastDecision = movement.Decisions.OrderByDescending(x => x.ServiceHeader?.ServiceCalled).First();
+        var lastDecision = movement.Decisions.OrderByDescending(x => x.Header.DecisionNumber).First();
 
 
         foreach (var item in lastDecision.Items!)
         {
             foreach (var itemCheck in item.Checks!)
             {
-                itemCheck.DecisionCode.Should().Be(decisionCode);
+                itemCheck.DecisionCode.Should().Be(decisionCode, JsonSerializer.Serialize(lastDecision));
             }
         }
     }
 
+    [Theory]
+    [InlineData(typeof(Mrn24Gbdy6Xff66H0Xar1ScenarioGenerator), "24GBDY6XFF66H0XAR1", "H220", "E90")]
+    public void DecisionShouldHaveCorrectDecisionCodeForCheckCode(Type generatorType, string mrn, string checkCode, string decisionCode)
+    {
+        base.TestOutputHelper.WriteLine("Generator : {0}, Decision Code : {1}", generatorType!.FullName, decisionCode);
+        EnsureEnvironmentInitialised(generatorType);
+
+        var apiResponse = Client
+            .GetMovementByMrn(mrn);
+
+        var movement = apiResponse.GetResourceObject<Movement>();
+
+        var lastDecision = movement.Decisions.OrderByDescending(x => x.Header.DecisionNumber).First();
+
+
+        foreach (var item in lastDecision.Items!)
+        {
+            item.Checks!.FirstOrDefault(x => x.CheckCode == checkCode)?.DecisionCode.Should()
+                .Be(decisionCode, JsonSerializer.Serialize(lastDecision));
+        }
+    }
+
 
 }

Btms.Backend.IntegrationTests/DecisionTests/DecisionComparisonTests.cs

@@ -25,6 +25,7 @@ public class DecisionComparisonTests(ITestOutputHelper output) : MultipleScenari
     [InlineData(typeof(ChedWithAlvsX00WrongDocumentReferenceFormatScenarioGenerator), DecisionStatusEnum.DocumentReferenceFormatIncorrect, Skip = "Lim to investigate test data")]
     [InlineData(typeof(Mrn24Gbd2Uowtwym5Lar8ScenarioGenerator), DecisionStatusEnum.PartialImportNotificationsLinked)]
 
+    [InlineData(typeof(Mrn24Gbd0Mbe1Q1Cntar7ScenarioGenerator), DecisionStatusEnum.PartialImportNotificationsLinked)]
     public void ShouldHaveCorrectDecisionCode(Type generatorType, DecisionStatusEnum decisionStatus)
     {
         base.TestOutputHelper.WriteLine("Generator : {0}, Decision Status : {1}", generatorType!.FullName, decisionStatus);
@@ -43,5 +44,7 @@ private void CheckDecisionStatus(DecisionStatusEnum decisionStatus)
         movement
             .AlvsDecisionStatus.Context.DecisionComparison?.DecisionStatus
             .Should().Be(decisionStatus);
+
+        movement.Decisions.Last().Items.Length.Should().Be(movement.Items.Count);
     }
 }

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

@@ -161,6 +161,13 @@ private static DecisionContext CreateDecisionContext(ImportNotificationTypeEnum?
                         new Items
                         {
                             ItemNumber = 1,
+                            Documents =
+                            [
+                                new Document()
+                                {
+                                    DocumentCode = "9115"
+                                }
+                            ],
                             Checks = checkCodes?.Select(checkCode => new Check { CheckCode = checkCode }).ToArray()
                         }
                     ]

Btms.Business/Services/Decisions/DecisionCode.cs

@@ -20,6 +20,7 @@ public enum DecisionCode
 
     E03,
 
+    E90,    // No Decision Finder found
     E94,    // IUU not indicated in PartTwo?.ControlAuthority?.IuuCheckRequired but "H224" requested in Items[]?.Checks[]?.CheckCode
     E95,    // Unexpected value in PartTwo?.Decision?.IuuOption
     E96,    // Unexpected value in PartTwo?.Decision?.DecisionEnum

Btms.Business/Services/Decisions/DecisionService.cs

@@ -133,6 +133,12 @@ private IEnumerable<DecisionFinderResult> GetDecisionsForCheckCode(ImportNotific
     {
         var finders = decisionFinders.Where(x => x.CanFindDecision(notification, checkCode)).ToArray();
 
+        if (!finders.Any())
+        {
+            logger.LogWarning("No Decision Finder count for ImportNotification {Id} and Check code {CheckCode}", notification.Id, checkCode);
+            yield return new DecisionFinderResult(DecisionCode.E90, checkCode);
+        }
+
         foreach (var finder in finders)
         {
             yield return finder.FindDecision(notification, checkCode);

TestDataGenerator/Scenarios/Samples/Mrn-24GBD0MBE1Q1CNTAR7/DECISIONS/2024/11/24/24GBD0MBE1Q1CNTAR7-3f727094-ce5d-4bb2-9f2b-2d5345e00424.json

@@ -0,0 +1 @@
+{"serviceHeader":{"sourceSystem":"ALVS","destinationSystem":"CDS","correlationId":"000","serviceCallTimestamp":1732455842472},"header":{"entryReference":"24GBD0MBE1Q1CNTAR7","entryVersionNumber":2,"decisionNumber":2},"items":[{"itemNumber":1,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194480). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":2,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194480). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":3,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194480). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":4,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194480). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":5,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194480). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":6,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194480). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":7,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194480). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":8,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194480). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":9,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"C03","decisionValidUntil":null,"decisionReasons":[]}]},{"itemNumber":10,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194493). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":11,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194494). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":12,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194492). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":13,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194495). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":14,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194496). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":15,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194497). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":16,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194498). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":17,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194499). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":18,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194502). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":19,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194500). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":20,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194501). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":21,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194503). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":22,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194504). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":23,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"H02","decisionValidUntil":null,"decisionReasons":[]}]},{"itemNumber":24,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194507). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":25,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194505). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":26,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194508). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":27,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194509). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":28,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194510). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":29,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194511). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":30,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194512). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":31,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194513). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":32,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194514). Please correct the CHEDP number(s) entered on your customs declaration. "]}]},{"itemNumber":33,"documents":[],"checks":[{"checkCode":"H222","decisionCode":"X00","decisionValidUntil":null,"decisionReasons":[" A Customs Declaration has been submitted however no matching CHEDP(s) have been submitted to Port Health (for CHEDP number(s) GBCHD2024.5194480). Please correct the CHEDP number(s) entered on your customs declaration. "]}]}]}