Need to handle lowercase

DEFRA · Jan 27, 2025 · eeeb2c6 · eeeb2c6
1 parent da2d403
commit eeeb2c6
Show file tree

Hide file tree

Showing 7 changed files with 314 additions and 31 deletions.
diff --git a/Btms.Business/Extensions/MovementExtensions.cs b/Btms.Business/Extensions/MovementExtensions.cs
@@ -6,29 +6,6 @@ namespace Btms.Business.Extensions;
 
 public static class MovementExtensions
 {
-    public static bool AreNumbersComplete<T>(this IEnumerable<T> source, Func<T, int?> getNumbers)
-    {
-        var numbers = source
-            .Select(getNumbers)
-            .Where(n => n.HasValue())
-            .Order()
-            .ToList();
-
-        if (numbers.Distinct().Count() != numbers.Count())
-        {
-            //Contains duplicates
-            return false;
-        }
-        else if (numbers.Count() != numbers.Last())
-        {
-            //Some missing
-            // should be contiguous
-
-            return false;
-        }
-
-        return true;
-    }
 
     public static string[] UniqueDocumentReferences(this Movement movement)
     {
@@ -53,15 +30,15 @@ public static List<string> UniqueNotificationRelationshipIds(this Movement movem
     public static bool IsChed(this Document doc)
     {
         return doc.DocumentReference != null &&
-               doc.DocumentReference.StartsWith("GBCHD");
+               doc.DocumentReference.ToUpper().StartsWith("GBCHD");
     }
 
     public static List<string> UniqueDocumentReferenceIdsThatShouldLink(this Movement movement)
     {
         return movement.Items
             .SelectMany(i => i.Documents ?? [])
             // Only CHED document refs should result in links
-            .Where(IsChed)
+            .Where(d => d.IsChed())
             .Select(d => d.DocumentReference!.TrimUniqueNumber())
             .Distinct()
             .ToList();

diff --git a/Btms.Business/Services/Matching/MatchingService.cs b/Btms.Business/Services/Matching/MatchingService.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics;
-using Btms.Model;
 using Btms.Business.Extensions;
+using Btms.Model;
 
 namespace Btms.Business.Services.Matching;
 

diff --git a/...ecisionTests/ALVS/2024/12/02/24GBDC4TW6DUQYIAR5-2e652dff-5b1e-4f9c-83d8-e1e0a1ffa2f2.json b/...ecisionTests/ALVS/2024/12/02/24GBDC4TW6DUQYIAR5-2e652dff-5b1e-4f9c-83d8-e1e0a1ffa2f2.json
@@ -1 +1,52 @@
-{"serviceHeader":{"sourceSystem":"CDS","destinationSystem":"ALVS","correlationId":"1307513","serviceCallTimestamp":1733099125000},"header":{"entryReference":"24GBDC4TW6DUQYIAR5","entryVersionNumber":1,"previousVersionNumber":null,"declarationUCR":"4GB823723242000-SLHA24017238","declarationPartNumber":null,"declarationType":"S","arrivalDateTime":null,"submitterTURN":null,"declarantId":"GB823723242000","declarantName":"GB823723242000","dispatchCountryCode":"IL","goodsLocationCode":"FEMLHRPDX","masterUCR":"HPDX11463348040"},"items":[{"itemNumber":1,"customsProcedureCode":"4000000","taricCommodityCode":"1211908620","goodsDescription":"BASIL","consigneeId":"GB101487738000","consigneeName":"GB101487738000","itemNetMass":640,"itemSupplementaryUnits":0,"itemThirdQuantity":null,"itemOriginCountryCode":"IL","documents":[{"documentCode":"N851","documentReference":"gbchd2024.5229377","documentStatus":"JE","documentControl":"P","documentQuantity":null}],"checks":[{"checkCode":"H219","departmentCode":"PHSI"}]}]}
+{
+  "serviceHeader": {
+    "sourceSystem": "CDS",
+    "destinationSystem": "ALVS",
+    "correlationId": "1307513",
+    "serviceCallTimestamp": 1733099125000
+  },
+  "header": {
+    "entryReference": "24GBDC4TW6DUQYIAR5",
+    "entryVersionNumber": 1,
+    "previousVersionNumber": null,
+    "declarationUCR": "4GB823723242000-SLHA24017238",
+    "declarationPartNumber": null,
+    "declarationType": "S",
+    "arrivalDateTime": null,
+    "submitterTURN": null,
+    "declarantId": "GB823723242000",
+    "declarantName": "GB823723242000",
+    "dispatchCountryCode": "IL",
+    "goodsLocationCode": "FEMLHRPDX",
+    "masterUCR": "HPDX11463348040"
+  },
+  "items": [
+    {
+      "itemNumber": 1,
+      "customsProcedureCode": "4000000",
+      "taricCommodityCode": "1211908620",
+      "goodsDescription": "BASIL",
+      "consigneeId": "GB101487738000",
+      "consigneeName": "GB101487738000",
+      "itemNetMass": 640,
+      "itemSupplementaryUnits": 0,
+      "itemThirdQuantity": null,
+      "itemOriginCountryCode": "IL",
+      "documents": [
+        {
+          "documentCode": "N851",
+          "documentReference": "gbchd2024.5229377",
+          "documentStatus": "JE",
+          "documentControl": "P",
+          "documentQuantity": null
+        }
+      ],
+      "checks": [
+        {
+          "checkCode": "H219",
+          "departmentCode": "PHSI"
+        }
+      ]
+    }
+  ]
+}
diff --git a/...ecisionTests/ALVS/2024/12/02/24GBDC4TW6DUQYIAR5-63063f4c-6185-442a-ac94-f39b52964f19.json b/...ecisionTests/ALVS/2024/12/02/24GBDC4TW6DUQYIAR5-63063f4c-6185-442a-ac94-f39b52964f19.json
@@ -1 +1,52 @@
-{"serviceHeader":{"sourceSystem":"CDS","destinationSystem":"ALVS","correlationId":"1307514","serviceCallTimestamp":1733099196000},"header":{"entryReference":"24GBDC4TW6DUQYIAR5","entryVersionNumber":2,"previousVersionNumber":1,"declarationUCR":"4GB823723242000-SLHA24017238","declarationPartNumber":null,"declarationType":"S","arrivalDateTime":null,"submitterTURN":null,"declarantId":"GB823723242000","declarantName":"GB823723242000","dispatchCountryCode":"IL","goodsLocationCode":"FEMLHRPDX","masterUCR":"HPDX11463348040"},"items":[{"itemNumber":1,"customsProcedureCode":"4000000","taricCommodityCode":"1211908620","goodsDescription":"BASIL","consigneeId":"GB101487738000","consigneeName":"GB101487738000","itemNetMass":640,"itemSupplementaryUnits":0,"itemThirdQuantity":null,"itemOriginCountryCode":"IL","documents":[{"documentCode":"N851","documentReference":"gbchd2024.5229377","documentStatus":"JE","documentControl":"P","documentQuantity":null}],"checks":[{"checkCode":"H219","departmentCode":"PHSI"}]}]}
+{
+  "serviceHeader": {
+    "sourceSystem": "CDS",
+    "destinationSystem": "ALVS",
+    "correlationId": "1307514",
+    "serviceCallTimestamp": 1733099196000
+  },
+  "header": {
+    "entryReference": "24GBDC4TW6DUQYIAR5",
+    "entryVersionNumber": 2,
+    "previousVersionNumber": 1,
+    "declarationUCR": "4GB823723242000-SLHA24017238",
+    "declarationPartNumber": null,
+    "declarationType": "S",
+    "arrivalDateTime": null,
+    "submitterTURN": null,
+    "declarantId": "GB823723242000",
+    "declarantName": "GB823723242000",
+    "dispatchCountryCode": "IL",
+    "goodsLocationCode": "FEMLHRPDX",
+    "masterUCR": "HPDX11463348040"
+  },
+  "items": [
+    {
+      "itemNumber": 1,
+      "customsProcedureCode": "4000000",
+      "taricCommodityCode": "1211908620",
+      "goodsDescription": "BASIL",
+      "consigneeId": "GB101487738000",
+      "consigneeName": "GB101487738000",
+      "itemNetMass": 640,
+      "itemSupplementaryUnits": 0,
+      "itemThirdQuantity": null,
+      "itemOriginCountryCode": "IL",
+      "documents": [
+        {
+          "documentCode": "N851",
+          "documentReference": "gbchd2024.5229377",
+          "documentStatus": "JE",
+          "documentControl": "P",
+          "documentQuantity": null
+        }
+      ],
+      "checks": [
+        {
+          "checkCode": "H219",
+          "departmentCode": "PHSI"
+        }
+      ]
+    }
+  ]
+}
diff --git a/...onTests/DECISIONS/2024/12/01/24GBDB6P6GWPVLKAR7-0b32a0ed-18fa-4976-863c-1ef6e0cd4cbf.json b/...onTests/DECISIONS/2024/12/01/24GBDB6P6GWPVLKAR7-0b32a0ed-18fa-4976-863c-1ef6e0cd4cbf.json
@@ -1 +1,69 @@
-{"serviceHeader":{"sourceSystem":"ALVS","destinationSystem":"CDS","correlationId":"000","serviceCallTimestamp":1733045601631},"header":{"entryReference":"24GBDB6P6GWPVLKAR7","entryVersionNumber":1,"decisionNumber":1},"items":[{"itemNumber":1,"documents":[],"checks":[{"checkCode":"H219","decisionCode":"C03","decisionValidUntil":null,"decisionReasons":[]},{"checkCode":"H223","decisionCode":"C03","decisionValidUntil":null,"decisionReasons":[]}]},{"itemNumber":2,"documents":[],"checks":[{"checkCode":"H218","decisionCode":"C03","decisionValidUntil":null,"decisionReasons":[]},{"checkCode":"H219","decisionCode":"C03","decisionValidUntil":null,"decisionReasons":[]},{"checkCode":"H223","decisionCode":"H01","decisionValidUntil":null,"decisionReasons":[]}]},{"itemNumber":6,"documents":[],"checks":[{"checkCode":"H219","decisionCode":"C03","decisionValidUntil":null,"decisionReasons":[]}]}]}
+{
+  "serviceHeader": {
+    "sourceSystem": "ALVS",
+    "destinationSystem": "CDS",
+    "correlationId": "000",
+    "serviceCallTimestamp": 1733045601631
+  },
+  "header": {
+    "entryReference": "24GBDB6P6GWPVLKAR7",
+    "entryVersionNumber": 1,
+    "decisionNumber": 1
+  },
+  "items": [
+    {
+      "itemNumber": 1,
+      "documents": [],
+      "checks": [
+        {
+          "checkCode": "H219",
+          "decisionCode": "C03",
+          "decisionValidUntil": null,
+          "decisionReasons": []
+        },
+        {
+          "checkCode": "H223",
+          "decisionCode": "C03",
+          "decisionValidUntil": null,
+          "decisionReasons": []
+        }
+      ]
+    },
+    {
+      "itemNumber": 2,
+      "documents": [],
+      "checks": [
+        {
+          "checkCode": "H218",
+          "decisionCode": "C03",
+          "decisionValidUntil": null,
+          "decisionReasons": []
+        },
+        {
+          "checkCode": "H219",
+          "decisionCode": "C03",
+          "decisionValidUntil": null,
+          "decisionReasons": []
+        },
+        {
+          "checkCode": "H223",
+          "decisionCode": "H01",
+          "decisionValidUntil": null,
+          "decisionReasons": []
+        }
+      ]
+    },
+    {
+      "itemNumber": 6,
+      "documents": [],
+      "checks": [
+        {
+          "checkCode": "H219",
+          "decisionCode": "C03",
+          "decisionValidUntil": null,
+          "decisionReasons": []
+        }
+      ]
+    }
+  ]
+}
diff --git a/...onTests/DECISIONS/2024/12/01/24GBDB6P6GWPVLKAR7-ff1ca5bf-8896-4a37-9572-d369405d6372.json b/...onTests/DECISIONS/2024/12/01/24GBDB6P6GWPVLKAR7-ff1ca5bf-8896-4a37-9572-d369405d6372.json
@@ -1 +1,69 @@
-{"serviceHeader":{"sourceSystem":"ALVS","destinationSystem":"CDS","correlationId":"000","serviceCallTimestamp":1733062869974},"header":{"entryReference":"24GBDB6P6GWPVLKAR7","entryVersionNumber":2,"decisionNumber":2},"items":[{"itemNumber":1,"documents":[],"checks":[{"checkCode":"H219","decisionCode":"C03","decisionValidUntil":null,"decisionReasons":[]},{"checkCode":"H223","decisionCode":"C03","decisionValidUntil":null,"decisionReasons":[]}]},{"itemNumber":2,"documents":[],"checks":[{"checkCode":"H218","decisionCode":"C03","decisionValidUntil":null,"decisionReasons":[]},{"checkCode":"H219","decisionCode":"C03","decisionValidUntil":null,"decisionReasons":[]},{"checkCode":"H223","decisionCode":"H01","decisionValidUntil":null,"decisionReasons":[]}]},{"itemNumber":6,"documents":[],"checks":[{"checkCode":"H219","decisionCode":"C03","decisionValidUntil":null,"decisionReasons":[]}]}]}
+{
+  "serviceHeader": {
+    "sourceSystem": "ALVS",
+    "destinationSystem": "CDS",
+    "correlationId": "000",
+    "serviceCallTimestamp": 1733062869974
+  },
+  "header": {
+    "entryReference": "24GBDB6P6GWPVLKAR7",
+    "entryVersionNumber": 2,
+    "decisionNumber": 2
+  },
+  "items": [
+    {
+      "itemNumber": 1,
+      "documents": [],
+      "checks": [
+        {
+          "checkCode": "H219",
+          "decisionCode": "C03",
+          "decisionValidUntil": null,
+          "decisionReasons": []
+        },
+        {
+          "checkCode": "H223",
+          "decisionCode": "C03",
+          "decisionValidUntil": null,
+          "decisionReasons": []
+        }
+      ]
+    },
+    {
+      "itemNumber": 2,
+      "documents": [],
+      "checks": [
+        {
+          "checkCode": "H218",
+          "decisionCode": "C03",
+          "decisionValidUntil": null,
+          "decisionReasons": []
+        },
+        {
+          "checkCode": "H219",
+          "decisionCode": "C03",
+          "decisionValidUntil": null,
+          "decisionReasons": []
+        },
+        {
+          "checkCode": "H223",
+          "decisionCode": "H01",
+          "decisionValidUntil": null,
+          "decisionReasons": []
+        }
+      ]
+    },
+    {
+      "itemNumber": 6,
+      "documents": [],
+      "checks": [
+        {
+          "checkCode": "H219",
+          "decisionCode": "C03",
+          "decisionValidUntil": null,
+          "decisionReasons": []
+        }
+      ]
+    }
+  ]
+}
diff --git a/...onTests/DECISIONS/2024/12/02/24GBDB6P6GWPVLKAR7-c6558882-4c2f-49a2-92cb-da85bd4f92d2.json b/...onTests/DECISIONS/2024/12/02/24GBDB6P6GWPVLKAR7-c6558882-4c2f-49a2-92cb-da85bd4f92d2.json
@@ -1 +1,69 @@
-{"serviceHeader":{"sourceSystem":"ALVS","destinationSystem":"CDS","correlationId":"000","serviceCallTimestamp":1733167102171},"header":{"entryReference":"24GBDB6P6GWPVLKAR7","entryVersionNumber":2,"decisionNumber":3},"items":[{"itemNumber":1,"documents":[],"checks":[{"checkCode":"H219","decisionCode":"C03","decisionValidUntil":null,"decisionReasons":[]},{"checkCode":"H223","decisionCode":"C03","decisionValidUntil":null,"decisionReasons":[]}]},{"itemNumber":2,"documents":[],"checks":[{"checkCode":"H218","decisionCode":"C03","decisionValidUntil":null,"decisionReasons":[]},{"checkCode":"H219","decisionCode":"C03","decisionValidUntil":null,"decisionReasons":[]},{"checkCode":"H223","decisionCode":"C03","decisionValidUntil":null,"decisionReasons":[]}]},{"itemNumber":6,"documents":[],"checks":[{"checkCode":"H219","decisionCode":"C03","decisionValidUntil":null,"decisionReasons":[]}]}]}
+{
+  "serviceHeader": {
+    "sourceSystem": "ALVS",
+    "destinationSystem": "CDS",
+    "correlationId": "000",
+    "serviceCallTimestamp": 1733167102171
+  },
+  "header": {
+    "entryReference": "24GBDB6P6GWPVLKAR7",
+    "entryVersionNumber": 2,
+    "decisionNumber": 3
+  },
+  "items": [
+    {
+      "itemNumber": 1,
+      "documents": [],
+      "checks": [
+        {
+          "checkCode": "H219",
+          "decisionCode": "C03",
+          "decisionValidUntil": null,
+          "decisionReasons": []
+        },
+        {
+          "checkCode": "H223",
+          "decisionCode": "C03",
+          "decisionValidUntil": null,
+          "decisionReasons": []
+        }
+      ]
+    },
+    {
+      "itemNumber": 2,
+      "documents": [],
+      "checks": [
+        {
+          "checkCode": "H218",
+          "decisionCode": "C03",
+          "decisionValidUntil": null,
+          "decisionReasons": []
+        },
+        {
+          "checkCode": "H219",
+          "decisionCode": "C03",
+          "decisionValidUntil": null,
+          "decisionReasons": []
+        },
+        {
+          "checkCode": "H223",
+          "decisionCode": "C03",
+          "decisionValidUntil": null,
+          "decisionReasons": []
+        }
+      ]
+    },
+    {
+      "itemNumber": 6,
+      "documents": [],
+      "checks": [
+        {
+          "checkCode": "H219",
+          "decisionCode": "C03",
+          "decisionValidUntil": null,
+          "decisionReasons": []
+        }
+      ]
+    }
+  ]
+}