merge conflicts

DEFRA · Dec 16, 2024 · c9860bd · c9860bd
1 parent db8cc51
commit c9860bd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 130 deletions.
diff --git a/Btms.Consumers.Tests/ClearanceRequestConsumerTests.cs b/Btms.Consumers.Tests/ClearanceRequestConsumerTests.cs
@@ -35,6 +35,7 @@ public async Task WhenPreProcessingSucceeds_AndLastAuditEntryIsLinked_ThenLinkSh
         var mockLinkingService = Substitute.For<ILinkingService>();
             var decisionService = Substitute.For<IDecisionService>();
             var matchingService = Substitute.For<IMatchingService>();
+            var preProcessor = Substitute.For<IPreProcessor<AlvsClearanceRequest, Model.Movement>>();
 
         preProcessor.Process(Arg.Any<PreProcessingContext<AlvsClearanceRequest>>())
             .Returns(Task.FromResult(new PreProcessingResult<Movement>(outcome, movement, null)));
@@ -71,6 +72,7 @@ public async Task WhenPreProcessingSucceeds_AndLastAuditEntryIsCreated_ThenLinkS
         var mockLinkingService = Substitute.For<ILinkingService>();
             var decisionService = Substitute.For<IDecisionService>();
             var matchingService = Substitute.For<IMatchingService>();
+            var preProcessor = Substitute.For<IPreProcessor<AlvsClearanceRequest, Model.Movement>>();
 
         mockLinkingService.Link(Arg.Any<LinkContext>(), Arg.Any<CancellationToken>())
             .Returns(Task.FromResult(new LinkResult(LinkOutcome.Linked)));

diff --git a/Btms.Model/Alvs/Header.cs b/Btms.Model/Alvs/Header.cs