refactor: remove unused logger and fix maintainability issues (#1173)

Warren-Pitterson · web-flow · commit a9603ec1d5c9 · 2025-06-24T15:07:12.000Z
diff --git a/application/CohortManager/src/Functions/CaasIntegration/receiveCaasFile/ProcessFileClasses/AddBatchToQueue.cs b/application/CohortManager/src/Functions/CaasIntegration/receiveCaasFile/ProcessFileClasses/AddBatchToQueue.cs
@@ -1,22 +1,16 @@
 namespace NHS.Screening.ReceiveCaasFile;
 
 using System.Collections.Concurrent;
-using System.Text;
-using System.Text.Json;
-using Azure.Storage.Queues;
 using Common;
-using Microsoft.Extensions.Logging;
 using Model;
 
 public class AddBatchToQueue : IAddBatchToQueue
 {
 
-    private readonly ILogger<AddBatchToQueue> _logger;
     private readonly IQueueClient _queueClient;
 
-    public AddBatchToQueue(ILogger<AddBatchToQueue> logger, IQueueClient queueClient)
+    public AddBatchToQueue(IQueueClient queueClient)
     {
-        _logger = logger;
         _queueClient = queueClient;
     }
 
@@ -45,7 +39,6 @@ private async Task AddMessagesAsync(ConcurrentQueue<BasicParticipantCsvRecord> c
 
         // Wait for all tasks to complete
         await Task.WhenAll(tasks.ToArray());
-
     }
 
     private async Task AddMessage(BasicParticipantCsvRecord basicParticipantCsvRecord, string queueName)
diff --git a/application/CohortManager/src/Functions/Shared/Data/Database/CreateCohortDistributionData.cs b/application/CohortManager/src/Functions/Shared/Data/Database/CreateCohortDistributionData.cs
@@ -6,23 +6,19 @@ namespace Data.Database;
 using System.Threading.Tasks;
 using Common.Interfaces;
 using DataServices.Client;
-using Microsoft.Extensions.Logging;
 using Model;
 using Model.DTO;
 using Model.Enums;
 using NHS.CohortManager.Shared.Utilities;
 
 public class CreateCohortDistributionData : ICreateCohortDistributionData
 {
-    private readonly ILogger<CreateCohortDistributionData> _logger;
-
     private readonly IDataServiceClient<CohortDistribution> _cohortDistributionDataServiceClient;
 
     private readonly IDataServiceClient<BsSelectRequestAudit> _bsSelectRequestAuditDataServiceClient;
 
-    public CreateCohortDistributionData(ILogger<CreateCohortDistributionData> logger, IDataServiceClient<CohortDistribution> cohortDistributionDataServiceClient, IDataServiceClient<BsSelectRequestAudit> bsSelectRequestAuditDataServiceClient)
+    public CreateCohortDistributionData(IDataServiceClient<CohortDistribution> cohortDistributionDataServiceClient, IDataServiceClient<BsSelectRequestAudit> bsSelectRequestAuditDataServiceClient)
     {
-        _logger = logger;
         _cohortDistributionDataServiceClient = cohortDistributionDataServiceClient;
         _bsSelectRequestAuditDataServiceClient = bsSelectRequestAuditDataServiceClient;
     }
@@ -173,7 +169,7 @@ public async Task<CohortRequestAudit> GetNextCohortRequestAudit(Guid requestId)
 
         var previousRequest = await _bsSelectRequestAuditDataServiceClient.GetSingleByFilter(x => x.RequestId == requestId);
 
-        if(previousRequest == null)
+        if (previousRequest == null)
         {
             throw new KeyNotFoundException("No RequestId Found");
         }
@@ -186,7 +182,7 @@ public async Task<CohortRequestAudit> GetNextCohortRequestAudit(Guid requestId)
 
         var recordToReturn = res.OrderBy(x => x.CreatedDateTime).FirstOrDefault();
 
-        if(recordToReturn == null)
+        if (recordToReturn == null)
         {
             return null;
         }
diff --git a/tests/UnitTests/CaasIntegrationTests/AddBatchToQueueTest/AddBatchToQueueTest.cs b/tests/UnitTests/CaasIntegrationTests/AddBatchToQueueTest/AddBatchToQueueTest.cs
@@ -14,17 +14,12 @@
 [TestClass]
 public class AddBatchToQueueTest
 {
-    private readonly Mock<ILogger<AddBatchToQueue>> _loggerMock = new();
     private readonly Mock<IQueueClient> _mockQueueStorageHelper = new();
     private AddBatchToQueue _addBatchToQueue;
 
-
-
     public AddBatchToQueueTest()
     {
-
-
-        _addBatchToQueue = new AddBatchToQueue(_loggerMock.Object, _mockQueueStorageHelper.Object);
+        _addBatchToQueue = new AddBatchToQueue(_mockQueueStorageHelper.Object);
     }
 
     [TestMethod]
@@ -84,6 +79,4 @@ public async Task ProcessBatch_BatchIsNull_SendMessageNotCalled()
         //Assert
         _mockQueueStorageHelper.Verify(x => x.AddAsync(It.IsAny<BasicParticipantCsvRecord>(), It.IsAny<string>()), Times.Never);
     }
-
 }
-
diff --git a/tests/UnitTests/CohortDistributionTests/CohortDistributionDataTests/AddCohortDistributionTests.cs b/tests/UnitTests/CohortDistributionTests/CohortDistributionDataTests/AddCohortDistributionTests.cs
@@ -1,31 +1,24 @@
 namespace NHS.CohortManager.Tests.UnitTests.AddCohortDistributionDataTests;
 
-using System.Collections.Concurrent;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
-using Castle.Core.Logging;
 using Data.Database;
 using DataServices.Client;
-using Microsoft.Extensions.Logging;
 using Model;
-using Model.DTO;
 using Moq;
-using NHS.CohortManager.Tests.TestUtils;
 
 [TestClass]
 public class AddCohortDistributionTests
 {
     private readonly CreateCohortDistributionData _createCohortDistributionData;
     private readonly Guid _requestId = Guid.NewGuid();
-
-    private readonly Mock<ILogger<CreateCohortDistributionData>> _loggerMock = new();
     private List<CohortDistribution> _cohortDistributionList;
     private readonly Mock<IDataServiceClient<CohortDistribution>> _cohortDistributionDataServiceClient = new();
     private readonly Mock<IDataServiceClient<BsSelectRequestAudit>> _bsSelectRequestAuditDataServiceClient = new();
 
     public AddCohortDistributionTests()
     {
-        _createCohortDistributionData = new CreateCohortDistributionData(_loggerMock.Object, _cohortDistributionDataServiceClient.Object, _bsSelectRequestAuditDataServiceClient.Object);
+        _createCohortDistributionData = new CreateCohortDistributionData(_cohortDistributionDataServiceClient.Object, _bsSelectRequestAuditDataServiceClient.Object);
     }
 
     [TestMethod]
diff --git a/tests/UnitTests/CohortDistributionTests/RetrieveCohortDistributionTests/RetrieveCohortDistributionTests.cs b/tests/UnitTests/CohortDistributionTests/RetrieveCohortDistributionTests/RetrieveCohortDistributionTests.cs
@@ -23,7 +23,6 @@ public class RetrieveCohortDistributionTests
     private readonly RetrieveCohortDistributionData _sut;
     private readonly ICreateCohortDistributionData _createCohortDistribution;
     private readonly Mock<ILogger<RetrieveCohortDistributionData>> _retrieveCohortLogger = new();
-    private readonly Mock<ILogger<CreateCohortDistributionData>> _createCohortLogger = new();
     private readonly Mock<IDataServiceClient<CohortDistribution>> _cohortDistributionDataClient = new();
     private readonly Mock<IDataServiceClient<BsSelectRequestAudit>> _requestAuditDistributionDataClient = new();
     private readonly Mock<ICreateResponse> _createResponse = new();
@@ -34,7 +33,7 @@ public RetrieveCohortDistributionTests()
     {
 
         _config.Setup(i => i.Value).Returns(new RetrieveCohortDistributionConfig());
-        _createCohortDistribution = new CreateCohortDistributionData(_createCohortLogger.Object, _cohortDistributionDataClient.Object, _requestAuditDistributionDataClient.Object);
+        _createCohortDistribution = new CreateCohortDistributionData(_cohortDistributionDataClient.Object, _requestAuditDistributionDataClient.Object);
         _sut = new RetrieveCohortDistributionData(_retrieveCohortLogger.Object, _createCohortDistribution, _createResponse.Object, _exceptionHandler.Object, _config.Object);
 
         _createResponse.Setup(x => x.CreateHttpResponse(It.IsAny<HttpStatusCode>(), It.IsAny<HttpRequestData>(), It.IsAny<string?>()))
@@ -273,6 +272,5 @@ public async Task Run_GetBatchWithRequestIdNextBatchNull_ReturnsSuccessful()
 
         // assert
         Assert.AreEqual(HttpStatusCode.OK, result.StatusCode);
-
     }
 }
diff --git a/tests/UnitTests/CohortDistributionTests/RetrieveCohortRequestAuditTests/RetrieveCohortRequestAuditTests.cs b/tests/UnitTests/CohortDistributionTests/RetrieveCohortRequestAuditTests/RetrieveCohortRequestAuditTests.cs
@@ -3,23 +3,19 @@ namespace NHS.CohortManager.Tests.UnitTests.RetrieveCohortRequestAuditTests;
 using System.Linq.Expressions;
 using Data.Database;
 using DataServices.Client;
-using Microsoft.Extensions.Logging;
 using Model;
 using Moq;
 [TestClass]
 public class RetrieveCohortRequestAuditTests
 {
 
     private readonly CreateCohortDistributionData _createCohortDistributionData;
-    private readonly Guid _requestId = Guid.NewGuid();
-
-    private readonly Mock<ILogger<CreateCohortDistributionData>> _loggerMock = new();
     private readonly Mock<IDataServiceClient<CohortDistribution>> _cohortDistributionDataServiceClient = new();
     private readonly Mock<IDataServiceClient<BsSelectRequestAudit>> _bsSelectRequestAuditDataServiceClient = new();
 
     public RetrieveCohortRequestAuditTests()
     {
-        _createCohortDistributionData = new CreateCohortDistributionData(_loggerMock.Object, _cohortDistributionDataServiceClient.Object, _bsSelectRequestAuditDataServiceClient.Object);
+        _createCohortDistributionData = new CreateCohortDistributionData(_cohortDistributionDataServiceClient.Object, _bsSelectRequestAuditDataServiceClient.Object);
     }
 
 
@@ -79,7 +75,6 @@ public async Task GetCohortRequestAudit_WithNullParameters_ReturnsValidCohortReq
         Assert.IsNotNull(result);
         Assert.AreEqual(1, result.Count);
         Assert.IsInstanceOfType(result, typeof(List<CohortRequestAudit>));
-
     }
 
     [TestMethod]

Original file line number	Diff line number	Diff line change
`@@ -1,22 +1,16 @@`
`1`	`1`	`namespace NHS.Screening.ReceiveCaasFile;`
`2`	`2`
`3`	`3`	`using System.Collections.Concurrent;`
`4`		`-using System.Text;`
`5`		`-using System.Text.Json;`
`6`		`-using Azure.Storage.Queues;`
`7`	`4`	`using Common;`
`8`		`-using Microsoft.Extensions.Logging;`
`9`	`5`	`using Model;`
`10`	`6`
`11`	`7`	`public class AddBatchToQueue : IAddBatchToQueue`
`12`	`8`	`{`
`13`	`9`
`14`		`- private readonly ILogger<AddBatchToQueue> _logger;`
`15`	`10`	`private readonly IQueueClient _queueClient;`
`16`	`11`
`17`		`- public AddBatchToQueue(ILogger<AddBatchToQueue> logger, IQueueClient queueClient)`
	`12`	`+ public AddBatchToQueue(IQueueClient queueClient)`
`18`	`13`	`{`
`19`		`- _logger = logger;`
`20`	`14`	`_queueClient = queueClient;`
`21`	`15`	`}`
`22`	`16`
`@@ -45,7 +39,6 @@ private async Task AddMessagesAsync(ConcurrentQueue<BasicParticipantCsvRecord> c`
`45`	`39`
`46`	`40`	`// Wait for all tasks to complete`
`47`	`41`	`await Task.WhenAll(tasks.ToArray());`
`48`		`-`
`49`	`42`	`}`
`50`	`43`
`51`	`44`	`private async Task AddMessage(BasicParticipantCsvRecord basicParticipantCsvRecord, string queueName)`
Original file line number	Diff line number	Diff line change
`@@ -6,23 +6,19 @@ namespace Data.Database;`
`6`	`6`	`using System.Threading.Tasks;`
`7`	`7`	`using Common.Interfaces;`
`8`	`8`	`using DataServices.Client;`
`9`		`-using Microsoft.Extensions.Logging;`
`10`	`9`	`using Model;`
`11`	`10`	`using Model.DTO;`
`12`	`11`	`using Model.Enums;`
`13`	`12`	`using NHS.CohortManager.Shared.Utilities;`
`14`	`13`
`15`	`14`	`public class CreateCohortDistributionData : ICreateCohortDistributionData`
`16`	`15`	`{`
`17`		`- private readonly ILogger<CreateCohortDistributionData> _logger;`
`18`		`-`
`19`	`16`	`private readonly IDataServiceClient<CohortDistribution> _cohortDistributionDataServiceClient;`
`20`	`17`
`21`	`18`	`private readonly IDataServiceClient<BsSelectRequestAudit> _bsSelectRequestAuditDataServiceClient;`
`22`	`19`
`23`		`- public CreateCohortDistributionData(ILogger<CreateCohortDistributionData> logger, IDataServiceClient<CohortDistribution> cohortDistributionDataServiceClient, IDataServiceClient<BsSelectRequestAudit> bsSelectRequestAuditDataServiceClient)`
	`20`	`+ public CreateCohortDistributionData(IDataServiceClient<CohortDistribution> cohortDistributionDataServiceClient, IDataServiceClient<BsSelectRequestAudit> bsSelectRequestAuditDataServiceClient)`
`24`	`21`	`{`
`25`		`- _logger = logger;`
`26`	`22`	`_cohortDistributionDataServiceClient = cohortDistributionDataServiceClient;`
`27`	`23`	`_bsSelectRequestAuditDataServiceClient = bsSelectRequestAuditDataServiceClient;`
`28`	`24`	`}`
`@@ -173,7 +169,7 @@ public async Task<CohortRequestAudit> GetNextCohortRequestAudit(Guid requestId)`
`173`	`169`
`174`	`170`	`var previousRequest = await _bsSelectRequestAuditDataServiceClient.GetSingleByFilter(x => x.RequestId == requestId);`
`175`	`171`
`176`		`- if(previousRequest == null)`
	`172`	`+ if (previousRequest == null)`
`177`	`173`	`{`
`178`	`174`	`throw new KeyNotFoundException("No RequestId Found");`
`179`	`175`	`}`
`@@ -186,7 +182,7 @@ public async Task<CohortRequestAudit> GetNextCohortRequestAudit(Guid requestId)`
`186`	`182`
`187`	`183`	`var recordToReturn = res.OrderBy(x => x.CreatedDateTime).FirstOrDefault();`
`188`	`184`
`189`		`- if(recordToReturn == null)`
	`185`	`+ if (recordToReturn == null)`
`190`	`186`	`{`
`191`	`187`	`return null;`
`192`	`188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,17 +14,12 @@`
`14`	`14`	`[TestClass]`
`15`	`15`	`public class AddBatchToQueueTest`
`16`	`16`	`{`
`17`		`- private readonly Mock<ILogger<AddBatchToQueue>> _loggerMock = new();`
`18`	`17`	`private readonly Mock<IQueueClient> _mockQueueStorageHelper = new();`
`19`	`18`	`private AddBatchToQueue _addBatchToQueue;`
`20`	`19`
`21`		`-`
`22`		`-`
`23`	`20`	`public AddBatchToQueueTest()`
`24`	`21`	`{`
`25`		`-`
`26`		`-`
`27`		`- _addBatchToQueue = new AddBatchToQueue(_loggerMock.Object, _mockQueueStorageHelper.Object);`
	`22`	`+ _addBatchToQueue = new AddBatchToQueue(_mockQueueStorageHelper.Object);`
`28`	`23`	`}`
`29`	`24`
`30`	`25`	`[TestMethod]`
`@@ -84,6 +79,4 @@ public async Task ProcessBatch_BatchIsNull_SendMessageNotCalled()`
`84`	`79`	`//Assert`
`85`	`80`	`_mockQueueStorageHelper.Verify(x => x.AddAsync(It.IsAny<BasicParticipantCsvRecord>(), It.IsAny<string>()), Times.Never);`
`86`	`81`	`}`
`87`		`-`
`88`	`82`	`}`
`89`		`-`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ public class RetrieveCohortDistributionTests`
`23`	`23`	`private readonly RetrieveCohortDistributionData _sut;`
`24`	`24`	`private readonly ICreateCohortDistributionData _createCohortDistribution;`
`25`	`25`	`private readonly Mock<ILogger<RetrieveCohortDistributionData>> _retrieveCohortLogger = new();`
`26`		`- private readonly Mock<ILogger<CreateCohortDistributionData>> _createCohortLogger = new();`
`27`	`26`	`private readonly Mock<IDataServiceClient<CohortDistribution>> _cohortDistributionDataClient = new();`
`28`	`27`	`private readonly Mock<IDataServiceClient<BsSelectRequestAudit>> _requestAuditDistributionDataClient = new();`
`29`	`28`	`private readonly Mock<ICreateResponse> _createResponse = new();`
`@@ -34,7 +33,7 @@ public RetrieveCohortDistributionTests()`
`34`	`33`	`{`
`35`	`34`
`36`	`35`	`_config.Setup(i => i.Value).Returns(new RetrieveCohortDistributionConfig());`
`37`		`- _createCohortDistribution = new CreateCohortDistributionData(_createCohortLogger.Object, _cohortDistributionDataClient.Object, _requestAuditDistributionDataClient.Object);`
	`36`	`+ _createCohortDistribution = new CreateCohortDistributionData(_cohortDistributionDataClient.Object, _requestAuditDistributionDataClient.Object);`
`38`	`37`	`_sut = new RetrieveCohortDistributionData(_retrieveCohortLogger.Object, _createCohortDistribution, _createResponse.Object, _exceptionHandler.Object, _config.Object);`
`39`	`38`
`40`	`39`	`_createResponse.Setup(x => x.CreateHttpResponse(It.IsAny<HttpStatusCode>(), It.IsAny<HttpRequestData>(), It.IsAny<string?>()))`
`@@ -273,6 +272,5 @@ public async Task Run_GetBatchWithRequestIdNextBatchNull_ReturnsSuccessful()`
`273`	`272`
`274`	`273`	`// assert`
`275`	`274`	`Assert.AreEqual(HttpStatusCode.OK, result.StatusCode);`
`276`		`-`
`277`	`275`	`}`
`278`	`276`	`}`