Merge branch 'main' into task/cdms-118-coding-standards

DEFRA · Dec 12, 2024 · 93f06de · 93f06de
2 parents 1e36712 + 2c10d51
commit 93f06de
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 41 deletions.
diff --git a/Btms.Analytics/MovementsAggregationService.cs b/Btms.Analytics/MovementsAggregationService.cs
@@ -6,6 +6,8 @@
 using Btms.Model;
 using MongoDB.Bson;
 using MongoDB.Driver;
+using Btms.Analytics.Extensions;
+using Microsoft.EntityFrameworkCore.Query.SqlExpressions;
 
 namespace Btms.Analytics;
 

diff --git a/Btms.Business.Tests/Commands/SyncClearanceRequestsCommandTests.cs b/Btms.Business.Tests/Commands/SyncClearanceRequestsCommandTests.cs
@@ -17,39 +17,40 @@ namespace Btms.Business.Tests.Commands;
 
 public class SyncClearanceRequestsCommandTests(ITestOutputHelper outputHelper)
 {
-    [Fact]
-    public async Task WhenClearanceRequestBlobsExist_ThenTheyShouldBePlacedOnInternalBus()
-    {
-        var clearanceRequest = ClearanceRequestBuilder.Default().Build();
-        var command = new SyncClearanceRequestsCommand();
-        var jobStore = new SyncJobStore();
-        jobStore.CreateJob(command.JobId, SyncPeriod.All.ToString(), "ClearanceRequests");
-
-
-        var bus = Substitute.For<IPublishBus>();
-        var blob = Substitute.For<IBlobService>();
-        blob.GetResourcesAsync(Arg.Any<string>(), Arg.Any<CancellationToken>())
-            .Returns(
-                new TestBlobItem(clearanceRequest.Header!.EntryReference!, clearanceRequest.ToJsonString())
-                    .ToAsyncEnumerator());
-
-        blob.GetResource(Arg.Any<IBlobItem>(), Arg.Any<CancellationToken>())
-            .Returns(clearanceRequest.ToJsonString());
-
-
-        var handler = new SyncClearanceRequestsCommand.Handler(
-            new SyncMetrics(new DummyMeterFactory()),
-            bus,
-            TestLogger.Create<SyncClearanceRequestsCommand>(outputHelper),
-            new SensitiveDataSerializer(Options.Create(SensitiveDataOptions.WithSensitiveData), NullLogger<SensitiveDataSerializer>.Instance),
-            blob,
-            Options.Create(new BusinessOptions()),
-            jobStore);
-
-        await handler.Handle(command, CancellationToken.None);
-
-        // ASSERT
-        await bus.Received(1).Publish(Arg.Any<AlvsClearanceRequest>(), "ALVS",
-            Arg.Any<IDictionary<string, object>>(), Arg.Any<CancellationToken>());
+        [Fact]
+        public async Task WhenClearanceRequestBlobsExist_ThenTheyShouldBePlacedOnInternalBus()
+        {
+            var clearanceRequest = ClearanceRequestBuilder.Default().Build();
+            var command = new SyncClearanceRequestsCommand();
+            var jobStore = new SyncJobStore();
+            jobStore.CreateJob(command.JobId, SyncPeriod.All.ToString(), "ClearanceRequests");
+
+
+            var bus = Substitute.For<IPublishBus>();
+            var blob = Substitute.For<IBlobService>();
+            blob.GetResourcesAsync(Arg.Any<string>(), Arg.Any<CancellationToken>())
+                .Returns(
+                    new TestBlobItem(clearanceRequest!.Header!.EntryReference!, clearanceRequest.ToJsonString())
+                        .ToAsyncEnumerator());
+
+            blob.GetResource(Arg.Any<IBlobItem>(), Arg.Any<CancellationToken>())
+                .Returns(clearanceRequest.ToJsonString());
+
+
+            var handler = new SyncClearanceRequestsCommand.Handler(
+                new SyncMetrics(new DummyMeterFactory()),
+                bus,
+                TestLogger.Create<SyncClearanceRequestsCommand>(outputHelper),
+                new SensitiveDataSerializer(Options.Create(SensitiveDataOptions.WithSensitiveData), NullLogger<SensitiveDataSerializer>.Instance),
+                blob,
+                Options.Create(new BusinessOptions()),
+                jobStore);
+
+            await handler.Handle(command, CancellationToken.None);
+
+            // ASSERT
+            await bus.Received(1).Publish(Arg.Any<AlvsClearanceRequest>(), "CLEARANCEREQUESTS",
+                Arg.Any<IDictionary<string, object>>(), Arg.Any<CancellationToken>());
+        }
     }
 }
diff --git a/Btms.Business.Tests/Services/Linking/LinkingServiceTests.cs b/Btms.Business.Tests/Services/Linking/LinkingServiceTests.cs
@@ -16,7 +16,7 @@ namespace Btms.Business.Tests.Services.Linking;
 
 public class LinkingServiceTests
 {
-    private static readonly Random Random = new ();
+    private static readonly Random random = new ();
     private readonly IMongoDbContext dbContext = new MemoryMongoDbContext();
     private readonly LinkingMetrics linkingMetrics = new(new DummyMeterFactory());
     private static string GenerateDocumentReference(int id) => $"GBCVD2024.{id}";
@@ -295,8 +295,7 @@ private MovementLinkContext CreateMovementContext(Movement? movement, List<Impor
             Items = chedReferences.Select(x => new Items
             {
                 Documents = [ new Document { DocumentReference = GenerateDocumentReference(x) } ]
-            }).ToList(),
-            ClearanceRequests = []
+            }).ToList()
         };
 
         var existingMovement = createExistingMovement ? 
@@ -309,10 +308,10 @@ private MovementLinkContext CreateMovementContext(Movement? movement, List<Impor
                     Documents = fieldsOfInterest
                         ? []
                         : [ new Document { DocumentReference = GenerateDocumentReference(x) } ]
-                }).ToList(),
-                ClearanceRequests = []
+                }).ToList()
             } : null;
 
+
         var changeSet = mov.GenerateChangeSet(existingMovement);
         var output = LinkContext.ForMovement(mov, createExistingMovement ? changeSet : null);
 

diff --git a/Btms.Business/BusinessOptions.cs b/Btms.Business/BusinessOptions.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using Btms.Azure;
 using Btms.Business.Commands;
 
 namespace Btms.Business;

diff --git a/Btms.Business/Commands/SyncNotificationsCommand.cs b/Btms.Business/Commands/SyncNotificationsCommand.cs
@@ -25,8 +25,7 @@ internal class Handler(
             IBlobService blobService,
             IOptions<BusinessOptions> businessOptions,
             ISyncJobStore syncJobStore)
-            : Handler<SyncNotificationsCommand>(syncMetrics, bus, logger, sensitiveDataSerializer,
-                blobService, businessOptions, syncJobStore)
+            : Handler<SyncNotificationsCommand>(syncMetrics, bus, logger, sensitiveDataSerializer, blobService, businessOptions, syncJobStore)
         {
             public override async Task Handle(SyncNotificationsCommand request, CancellationToken cancellationToken)
             {

diff --git a/Btms.Consumers/Extensions/ServiceCollectionExtensions.cs b/Btms.Consumers/Extensions/ServiceCollectionExtensions.cs
@@ -1,3 +1,4 @@
+using System.Configuration;
 using Btms.Common.Extensions;
 using Btms.Consumers.Interceptors;
 using Btms.Consumers.MemoryQueue;
@@ -6,6 +7,7 @@
 using Btms.Types.Ipaffs;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
 using SlimMessageBus.Host;
 using SlimMessageBus.Host.Interceptor;
 using SlimMessageBus.Host.Memory;