fix: Adding proper row count logic to retrieve cohort distribution (#1157)

* Adding proper rowcount logic

* adressing comments

Author: MWClayson-NHS

application/CohortManager/src/Functions/CohortDistributionServices/RetrieveCohortDistribution/RetrieveCohortDistribution.cs

@@ -1,18 +1,15 @@
 namespace NHS.CohortManager.CohortDistributionDataServices;
 
 using System.Net;
-using System.Reflection.Metadata.Ecma335;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Common;
 using Common.Interfaces;
-using Data.Database;
-using DataServices.Client;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Http;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.Extensions.Logging;
-using Model;
-using Microsoft.Identity.Client;
+using Microsoft.Extensions.Options;
 using Model.DTO;
 
 /// <summary>
@@ -35,15 +32,22 @@ public class RetrieveCohortDistributionData
     private readonly ICreateResponse _createResponse;
     private readonly ICreateCohortDistributionData _createCohortDistributionData;
     private readonly IExceptionHandler _exceptionHandler;
+    private readonly RetrieveCohortDistributionConfig _config;
 
 
 
-    public RetrieveCohortDistributionData(ILogger<RetrieveCohortDistributionData> logger, ICreateCohortDistributionData createCohortDistributionData, ICreateResponse createResponse, IExceptionHandler exceptionHandler)
+    public RetrieveCohortDistributionData(ILogger<RetrieveCohortDistributionData> logger,
+        ICreateCohortDistributionData createCohortDistributionData,
+        ICreateResponse createResponse,
+        IExceptionHandler exceptionHandler,
+        IOptions<RetrieveCohortDistributionConfig> config
+        )
     {
         _logger = logger;
         _createCohortDistributionData = createCohortDistributionData;
         _createResponse = createResponse;
         _exceptionHandler = exceptionHandler;
+        _config = config.Value;
     }
 
     [Function(nameof(RetrieveCohortDistributionData))]
@@ -53,9 +57,10 @@ public async Task<HttpResponseData> Run([HttpTrigger(AuthorizationLevel.Anonymou
         try
         {
 
-            if (string.IsNullOrEmpty(req.Query["rowCount"]) || !int.TryParse(req.Query["rowCount"], out int rowCount))
+            int rowCount = _config.MaxRowCount;
+            if (!string.IsNullOrEmpty(req.Query["rowCount"]) && int.TryParse(req.Query["rowCount"], out int rowCountParam))
             {
-                return _createResponse.CreateHttpResponse(HttpStatusCode.BadRequest, req);
+                rowCount = Math.Min(rowCount, rowCountParam);
             }
 
             //If no requestID is provided we send back a batch of unextracted participants

application/CohortManager/src/Functions/CohortDistributionServices/RetrieveCohortDistribution/RetrieveCohortDistributionConfig.cs

@@ -11,5 +11,6 @@ public class RetrieveCohortDistributionConfig
     public string CohortDistributionDataServiceURL { get; set; }
     [Required]
     public string BsSelectRequestAuditDataService { get; set; }
+    public int MaxRowCount { get; set; } = 1_000;
 
 }

tests/UnitTests/CohortDistributionTests/RetrieveCohortDistributionTests/RetrieveCohortDistributionTests.cs

@@ -9,6 +9,7 @@
 using DataServices.Client;
 using Microsoft.Azure.Functions.Worker.Http;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using Model;
 using Moq;
 using NHS.CohortManager.CohortDistributionDataServices;
@@ -27,11 +28,14 @@ public class RetrieveCohortDistributionTests
     private readonly Mock<IDataServiceClient<BsSelectRequestAudit>> _requestAuditDistributionDataClient = new();
     private readonly Mock<ICreateResponse> _createResponse = new();
     private readonly Mock<IExceptionHandler> _exceptionHandler = new();
+    private readonly Mock<IOptions<RetrieveCohortDistributionConfig>> _config = new();
 
     public RetrieveCohortDistributionTests()
     {
+
+        _config.Setup(i => i.Value).Returns(new RetrieveCohortDistributionConfig());
         _createCohortDistribution = new CreateCohortDistributionData(_createCohortLogger.Object, _cohortDistributionDataClient.Object, _requestAuditDistributionDataClient.Object);
-        _sut = new RetrieveCohortDistributionData(_retrieveCohortLogger.Object, _createCohortDistribution, _createResponse.Object, _exceptionHandler.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?>()))
             .Returns((HttpStatusCode statusCode, HttpRequestData req, string? ResponseBody) =>
@@ -118,17 +122,36 @@ public async Task Run_GetBatchBadRequestId_ReturnsBadRequest()
 
     }
     [TestMethod]
-    public async Task Run_GetBatchNoRowCountOrRequestId_ReturnsBadRequest()
+    public async Task Run_GetBatchNoRowCountOrRequestId_ReturnsOkData()
     {
         // arrange
         NameValueCollection urlQueryItems = new NameValueCollection();
         var req = _setupRequest.Setup(null, urlQueryItems);
 
+        var cohortDistributionParticipant = new CohortDistribution { NHSNumber = 123456789 };
+        var participantsList = new List<CohortDistribution>
+        {
+            cohortDistributionParticipant
+        };
+
+        _cohortDistributionDataClient
+            .Setup(x => x.GetByFilter(It.IsAny<Expression<Func<CohortDistribution, bool>>>()))
+            .ReturnsAsync(participantsList);
+
+        _cohortDistributionDataClient
+            .Setup(x => x.GetSingle(It.IsAny<string>()))
+            .ReturnsAsync(cohortDistributionParticipant);
+
+        _cohortDistributionDataClient
+            .Setup(x => x.Update(It.IsAny<CohortDistribution>()))
+            .ReturnsAsync(true);
+
+
         // act
         var result = await _sut.Run(req.Object);
 
         // assert
-        Assert.AreEqual(HttpStatusCode.BadRequest, result.StatusCode);
+        Assert.AreEqual(HttpStatusCode.OK, result.StatusCode);
 
     }
     [TestMethod]