CDMS-223 refactoring 'pairing' to be Context.DecisionComparison & onl…

…y having it on one decision at a time. Few decision tests currently failing

Btms.Analytics/MovementExceptions.cs

@@ -32,11 +32,12 @@ public class MovementExceptions(IMongoDbContext context, ILogger logger)
                 ItemCount = m.Items.Count,
                 ChedTypes = m.BtmsStatus.ChedTypes,
                 Status = m.BtmsStatus,
-                DecisionMatched = !m.AlvsDecisionStatus.Decisions
-                    .OrderBy(d => d.Context.AlvsDecisionNumber)
-                    .Reverse()
-                    .First()
-                    .Context.DecisionMatched,
+                DecisionMatched = m.AlvsDecisionStatus.Context.DecisionComparison!.DecisionMatched,
+                // DecisionMatched = !m.AlvsDecisionStatus.Decisions
+                //     .OrderBy(d => d.Context.AlvsDecisionNumber)
+                //     .Reverse()
+                //     .First()
+                //     .Context.DecisionMatched,
                 HasNotificationRelationships = m.Relationships.Notifications.Data.Count > 0,
                 ContiguousAlvsClearanceRequestVersionsFrom1 = 
                     m.ClearanceRequests.Select(c => c.Header!.EntryVersionNumber)

Btms.Analytics/MovementsAggregationService.cs

@@ -289,7 +289,7 @@ public Task<SummarisedDataset<SingleSeriesDataset, StringBucketDimensionResult>>
             .SelectMany(d => d.Decision.Context.Checks.Select(c => new { d.Decision, d.Movement, Check = c}))
             .GroupBy(d => new
             {
-                d.Decision.Context.DecisionStatus,
+                d.Decision.Context.DecisionComparison!.DecisionStatus,
                 d.Check.CheckCode,
                 d.Check.AlvsDecisionCode,
                 d.Check.BtmsDecisionCode

Btms.Backend.IntegrationTests/DecisionTests/AlvsDecisionNumber1Missing.cs

@@ -19,11 +19,8 @@ public class AlvsDecisionNumber1Missing(ITestOutputHelper output)
     [Fact]
     public void ShouldHave1AlvsDecision()
     {
-        // Assert
-        var movement = Client
-            .GetSingleMovement();
-
-        movement
+        Client
+            .GetSingleMovement()
             .AlvsDecisionStatus
             .Decisions
             .Count
@@ -34,11 +31,8 @@ public void ShouldHave1AlvsDecision()
     [Fact]
     public void ShouldHaveCorrectDecisionNumbers()
     {
-        // Assert
-        var movement = Client
-            .GetSingleMovement();
-
-        movement
+        Client
+            .GetSingleMovement()
             .AlvsDecisionStatus
             .Decisions
             .Select(d => d.Context.AlvsDecisionNumber)
@@ -49,13 +43,10 @@ public void ShouldHaveCorrectDecisionNumbers()
     [Fact]
     public void ShouldHaveVersionNotCompleteDecisionStatus()
     {
-
-        // Assert
-        var movement = Client
-            .GetSingleMovement();
-
-        movement
+        Client
+            .GetSingleMovement()
             .AlvsDecisionStatus
+            .Context.DecisionComparison!
             .DecisionStatus
             .Should()
             .Be(DecisionStatusEnum.AlvsDecisionVersion1NotPresent);

Btms.Backend.IntegrationTests/DecisionTests/ChedPDuplicateDecisionTests.cs

@@ -43,7 +43,7 @@ public void SimpleChedPScenario_ShouldBeLinkedAndMatchDecision()
 
             movement.AlvsDecisionStatus.Decisions
                 .First()
-                .Context.DecisionMatched
+                .Context.DecisionComparison!.DecisionMatched
                 .Should().BeTrue();
 
             var decisionWithLinkAndContext = movement.AuditEntries

Btms.Backend.IntegrationTests/DecisionTests/ChedPSimpleTests.cs

@@ -20,19 +20,23 @@ public class ChedPSimpleTests(ITestOutputHelper output)
 {
 
     [Fact]
-    public void ShouldHaveCorrectAlvsDecisionMatchedStatus()
+    public void ShouldHaveCorrectAlvsDecisionMatchedStatusOnDecison()
     {
-        // Assert
-        var movement = Client
-            .GetSingleMovement();
-
-        movement.AlvsDecisionStatus.Decisions
+        Client
+            .GetSingleMovement()
+            .AlvsDecisionStatus.Decisions
             .Single()
-            .Context.DecisionMatched
+            .Context.DecisionComparison!.DecisionMatched
             .Should().BeTrue();
-
-        movement.AlvsDecisionStatus
-            .Context.DecisionMatched
+    }
+
+    [Fact]
+    public void ShouldHaveCorrectAlvsDecisionMatchedStatusAtGlobalLevel()
+    {
+        Client
+            .GetSingleMovement()
+            .AlvsDecisionStatus
+            .Context.DecisionComparison!.DecisionMatched
             .Should().BeTrue();
     }
 
@@ -107,33 +111,26 @@ public void ShouldHaveDecisionMatched()
     {
         var movement = Client
             .GetSingleMovement()
-            .AlvsDecisionStatus
-            .Context!
-            .DecisionMatched
-            .Should()
-            .BeTrue();
+            .AlvsDecisionStatus.Context!.DecisionComparison!.DecisionMatched
+            .Should().BeTrue();
     }
 
     [Fact]
     public void ShouldHaveDecisionStatus()
     {
         Client
             .GetSingleMovement()
-            .AlvsDecisionStatus
-            .DecisionStatus
-            .Should()
-            .Be(DecisionStatusEnum.BtmsMadeSameDecisionAsAlvs);
+            .AlvsDecisionStatus.Context.DecisionComparison!.DecisionStatus
+            .Should().Be(DecisionStatusEnum.BtmsMadeSameDecisionAsAlvs);
     }
 
     [Fact]
     public void ShouldHaveChedType()
     {
         Client
             .GetSingleMovement()
-            .BtmsStatus
-            .ChedTypes
-            .Should()
-            .Equal(ImportNotificationTypeEnum.Cvedp);
+            .BtmsStatus.ChedTypes
+            .Should().Equal(ImportNotificationTypeEnum.Cvedp);
     }
 
     [Fact]
@@ -142,8 +139,7 @@ public void ShouldBeLinked()
         Client
             .GetSingleMovement()
             .BtmsStatus.LinkStatus
-            .Should()
-            .Be("Linked");
+            .Should().Be("Linked");
     }
 
     // [Fact]
@@ -180,11 +176,10 @@ public void AlvsDecisionShouldBePaired()
     {
         Client
             .GetSingleMovement()
-            .AlvsDecisionStatus
-            .Decisions
+            .AlvsDecisionStatus.Decisions
             .Single()
             .Context
-            .Should()
-            .Match<DecisionContext>(c => c.BtmsDecisionNumber == 2 && c.Paired == true);
+            .DecisionComparison!
+            .Should().Match<DecisionComparison>(c => c.BtmsDecisionNumber == 2 && c.Paired == true);
     }
 }

Btms.Backend.IntegrationTests/DecisionTests/ChedPUpdatedNotificationTests.cs

@@ -79,10 +79,9 @@ public void AlvsDecisionShouldMatch()
     {
         Client
             .GetSingleMovement()
-            .AlvsDecisionStatus
-            .Decisions
+            .AlvsDecisionStatus.Decisions
             .Single()
-            .Context.DecisionMatched
+            .Context.DecisionComparison!.DecisionMatched
             .Should().BeTrue();
     }
 
@@ -105,6 +104,6 @@ public void LastBtmsDecisionShouldHaveCorrectAuditEntry()
                 (ChedPNotification.ReferenceNumber!, 2)
             ]);
 
-        decisionWithLinkAndContext.Context.Paired.Should().BeTrue();
+        decisionWithLinkAndContext.Context.DecisionComparison!.Paired.Should().BeTrue();
     }
 }

Btms.Backend.IntegrationTests/DecisionTests/NoMatchNoAlvsDecisionTests.cs

@@ -31,10 +31,10 @@ public void ShouldHaveDecisionStatus()
     {
 
         // Assert
-        var movement = Client
-            .GetSingleMovement();
-
-        movement.AlvsDecisionStatus.DecisionStatus.Should().Be(DecisionStatusEnum.NoAlvsDecisions);
+        Client
+            .GetSingleMovement()
+            .AlvsDecisionStatus.Context.DecisionComparison!.DecisionStatus
+            .Should().Be(DecisionStatusEnum.NoAlvsDecisions);
     }
 
     [Fact]
@@ -47,6 +47,7 @@ public void ShouldHaveDecisionMatched()
         movement
             .AlvsDecisionStatus
             .Context!
+            .DecisionComparison!
             .DecisionMatched
             .Should()
             .BeFalse();

Btms.Backend.IntegrationTests/DecisionTests/NoMatchTests.cs

@@ -20,67 +20,56 @@ public class NoMatchTests(ITestOutputHelper output)
     [Fact]
     public void ShouldNotHaveLinked()
     {
-        // Assert
-        var movement = Client
-            .GetSingleMovement();
-
-        movement.BtmsStatus.LinkStatus.Should().Be("Not Linked");
+        Client
+            .GetSingleMovement()
+            .BtmsStatus.LinkStatus
+            .Should().Be("Not Linked");
     }
 
     [Fact]
     public void ShouldHaveAlvsDecision()
     {
-        // Assert
-        var movement = Client
-            .GetSingleMovement();
-
-        movement.AlvsDecisionStatus.Decisions.Count.Should().Be(1);
+        Client
+            .GetSingleMovement()
+            .AlvsDecisionStatus.Decisions.Count
+            .Should().Be(1);
     }
 
     [Fact]
     public void ShouldHaveDecisionStatus()
     {
-
-        // Assert
-        var movement = Client
-            .GetSingleMovement();
-
-        movement.AlvsDecisionStatus.DecisionStatus.Should().Be(DecisionStatusEnum.InvestigationNeeded);
+        Client
+            .GetSingleMovement()
+            .AlvsDecisionStatus.Context.DecisionComparison!.DecisionStatus
+            .Should().Be(DecisionStatusEnum.InvestigationNeeded);
     }
 
     [Fact]
     public void ShouldHaveDecisionAuditChecks()
     {
-        var auditEntry = Client
+        Client
             .GetSingleMovement()
-            .SingleBtmsDecisionAuditEntry();
-
-        auditEntry.Context?.Checks.Should().NotBeNull();
+            .SingleBtmsDecisionAuditEntry()
+            .Context?.Checks
+            .Should().NotBeNull();
     }
 
     [Fact]
     public void ShouldNotHaveDecisionAuditNotifications()
     {
-
-        var auditEntry = Client
+        Client
             .GetSingleMovement()
-            .SingleBtmsDecisionAuditEntry();
-
-        auditEntry.Context?.ImportNotifications.Should().BeEmpty();
+            .SingleBtmsDecisionAuditEntry()
+            .Context?.ImportNotifications
+            .Should().BeEmpty();
     }
 
     [Fact]
     public void ShouldHaveDecisionMatchedFalse()
     {
-
-        // Assert
-        var movement = Client
-            .GetSingleMovement();
-
-        movement
-            .AlvsDecisionStatus
-            .Context!
-            .DecisionMatched
+        Client
+            .GetSingleMovement()
+            .AlvsDecisionStatus.Context!.DecisionComparison!.DecisionMatched
             .Should()
             .BeFalse();
     }

Btms.Backend.IntegrationTests/DecisionTests/NonContiguous.cs

@@ -47,40 +47,31 @@ public void ShouldHaveCorrectDecisionNumbers()
     [Fact]
     public void ShouldHaveVersionNotCompleteDecisionStatus()
     {
-        var movement = Client
-            .GetSingleMovement();
-
-        movement
-            .AlvsDecisionStatus
-            .DecisionStatus
+        Client
+            .GetSingleMovement()
+            .AlvsDecisionStatus.Context.DecisionComparison!.DecisionStatus
             .Should()
             .Be(DecisionStatusEnum.AlvsDecisionVersionsNotComplete);
     }
 
     [Fact]
     public void ShouldHavePairedAlvsDecisions()
     {
-        var movement = Client
-            .GetSingleMovement();
-
-        movement
+        Client
+            .GetSingleMovement()
             .AlvsDecisionStatus
             .Decisions
-            .Count(d => d.Context.Paired)
+            .Count(d => d.Context.DecisionComparison!.Paired)
             .Should().Be(1);
     }
 
     [Fact]
     public void ShouldHave1BtmsDecision()
     {
-        var movement = Client
-            .GetSingleMovement();
-
-        movement
-            .Decisions
-            .Count
-            .Should()
-            .Be(1);
+        Client
+            .GetSingleMovement()
+            .Decisions.Count
+            .Should().Be(1);
     }
 
     [Fact]
@@ -90,9 +81,8 @@ public void ShouldHavePairedBtmsDecisions()
             .GetSingleMovement();
 
         movement
-            .AlvsDecisionStatus
-            .Decisions
-            .Select(d => (d.Context.AlvsDecisionNumber, d.Context.BtmsDecisionNumber))
+            .AlvsDecisionStatus.Decisions
+            .Select(d => (d.Context.AlvsDecisionNumber, d.Context.DecisionComparison!.BtmsDecisionNumber))
             .Should().Equal((1,null), (3,1));
     }
 }