From c9860bd0319b94216d9457fec304e36d647e2a5b Mon Sep 17 00:00:00 2001
From: Thomas Anderson <thomas.anderson@esynergy.co.uk>
Date: Mon, 16 Dec 2024 07:15:00 +0000
Subject: [PATCH] merge conflicts

---
 .../ClearanceRequestConsumerTests.cs          |   2 +
 Btms.Model/Alvs/Header.cs                     | 130 ------------------
 2 files changed, 2 insertions(+), 130 deletions(-)
 delete mode 100644 Btms.Model/Alvs/Header.cs

diff --git a/Btms.Consumers.Tests/ClearanceRequestConsumerTests.cs b/Btms.Consumers.Tests/ClearanceRequestConsumerTests.cs
index f70dd04..da8edc4 100644
--- 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
deleted file mode 100644
index 5581ac3..0000000
--- a/Btms.Model/Alvs/Header.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-#nullable enable
-
-using JsonApiDotNetCore.Resources.Annotations;
-using System.Text.Json.Serialization;
-using System.Dynamic;
-
-
-namespace Btms.Model.Alvs;
-
-/// <summary>
-/// 
-/// </summary>
-public partial class Header  //
-{
-
-
-    /// <summary>
-    /// 
-    /// </summary
-    [Attr]
-    [System.ComponentModel.Description("")]
-    public string? EntryReference { get; set; }
-
-	
-    /// <summary>
-    /// 
-    /// </summary
-    [Attr]
-    [System.ComponentModel.Description("")]
-    public int? EntryVersionNumber { get; set; }
-
-	
-    /// <summary>
-    /// 
-    /// </summary
-    [Attr]
-    [System.ComponentModel.Description("")]
-    public int? PreviousVersionNumber { get; set; }
-
-	
-    /// <summary>
-    /// 
-    /// </summary
-    [Attr]
-    [System.ComponentModel.Description("")]
-    public string? DeclarationUcr { get; set; }
-
-	
-    /// <summary>
-    /// 
-    /// </summary
-    [Attr]
-    [System.ComponentModel.Description("")]
-    public string? DeclarationPartNumber { get; set; }
-
-	
-    /// <summary>
-    /// 
-    /// </summary
-    [Attr]
-    [System.ComponentModel.Description("")]
-    public string? DeclarationType { get; set; }
-
-	
-    /// <summary>
-    /// 
-    /// </summary
-    [Attr]
-    [System.ComponentModel.Description("")]
-    public DateTime? ArrivesAt { get; set; }
-
-	
-    /// <summary>
-    /// 
-    /// </summary
-    [Attr]
-    [System.ComponentModel.Description("")]
-    public string? SubmitterTurn { get; set; }
-
-	
-    /// <summary>
-    /// 
-    /// </summary
-    [Attr]
-    [System.ComponentModel.Description("")]
-    public string? DeclarantId { get; set; }
-
-	
-    /// <summary>
-    /// 
-    /// </summary
-    [Attr]
-    [System.ComponentModel.Description("")]
-    public string? DeclarantName { get; set; }
-
-	
-    /// <summary>
-    /// 
-    /// </summary
-    [Attr]
-    [System.ComponentModel.Description("")]
-    public string? DispatchCountryCode { get; set; }
-
-	
-    /// <summary>
-    /// 
-    /// </summary
-    [Attr]
-    [System.ComponentModel.Description("")]
-    public string? GoodsLocationCode { get; set; }
-
-	
-    /// <summary>
-    /// 
-    /// </summary
-    [Attr]
-    [System.ComponentModel.Description("")]
-    public string? MasterUcr { get; set; }
-
-	}
-
-