Merge branch 'main' into fix/DTOSS-6549-move-ampls-to-hub

NHSDigital · Jan 6, 2025 · a7235ec · a7235ec
2 parents dbc4649 + c475268
commit a7235ec
Show file tree

Hide file tree

Showing 25 changed files with 37 additions and 40 deletions.
diff --git a/.gitignore b/.gitignore
@@ -50,6 +50,7 @@ local.settings.json
 application/CohortManager/SampleData/
 *.csv
 *.parquet
+!tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/*.parquet
 
 # csv to sql statement scripts
 bs_select_gp_practice_lpk.txt

diff --git a/application/CohortManager/src/Functions/Functions.sln b/application/CohortManager/src/Functions/Functions.sln
@@ -28,7 +28,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Shared\Common\Com
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Model", "Shared\Model\Model.csproj", "{682DDE9F-2868-4477-B159-9EB7D255D565}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "receiveCaasFileTest", "..\..\..\..\tests\CaasIntegrationTests\receiveCaasFileTest\receiveCaasFileTest.csproj", "{8DF1A047-4800-4668-877F-8AC8708AB238}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "receiveCaasFileTest", "..\..\..\..\tests\UnitTests\CaasIntegrationTests\receiveCaasFileTest\receiveCaasFileTest.csproj", "{8DF1A047-4800-4668-877F-8AC8708AB238}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data", "Shared\Data\Data.csproj", "{ABA8CD5A-BEF7-4962-9C23-AE69F430CC1B}"
 EndProject
@@ -106,7 +106,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UpdateParticipantTests", ".
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RetrieveMeshFile", "CaasIntegration\RetrieveMeshFile\RetrieveMeshFile.csproj", "{A5CC3CCE-2816-434A-AC32-FCF4251BDCAC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "retrieveMeshFileTest", "..\..\..\..\tests\CaasIntegrationTests\retrieveMeshFileTest\retrieveMeshFileTest.csproj", "{31A651CD-25D0-4131-B773-0A34495164D5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "retrieveMeshFileTest", "..\..\..\..\tests\UnitTests\CaasIntegrationTests\retrieveMeshFileTest\retrieveMeshFileTest.csproj", "{31A651CD-25D0-4131-B773-0A34495164D5}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ValidateCohortDistributionRecord", "CohortDistributionServices\ValidateCohortDistributionRecord\ValidateCohortDistributionRecord.csproj", "{BD5E5333-2C20-4009-BF58-BFB930AD6B6C}"
 EndProject
@@ -154,8 +154,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanguageCodesDataService",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CurrentPosting", "screeningDataServices\CurrentPostingDataService\CurrentPosting.csproj", "{9974CB33-DDF0-4CBD-95F8-6CA94F2F04E8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataServiceTests", "..\..\..\..\tests\DataServiceTests\DataServiceTests.csproj", "{824D0893-14F9-47D9-B381-3BB899B4CBDA}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExcludedSMULookupDataServices", "screeningDataServices\ExcludedSMULookupDataService\ExcludedSMULookupDataServices.csproj", "{9B9E8E86-601F-4C10-B6EF-348AF9A168AA}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ParticipantDemographicDataService", "screeningDataServices\ParticipantDemographicDataService\ParticipantDemographicDataService.csproj", "{D8990183-52BA-4A1F-B333-5B32AAF14348}"
@@ -166,13 +164,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TransformReasonForRemovalTe
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TransformDataServiceTests", "..\..\..\..\tests\UnitTests\TransformDataServiceTests\TransformDataServiceTests\TransformDataServiceTests.csproj", "{DCBF3583-DC87-46BE-93DC-C345E779D95C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProcessCaasFileTests", "..\..\..\..\tests\CaasIntegrationTests\processCaasFileTest\ProcessCaasFileTests.csproj", "{FE9773EF-DFB8-4308-869B-EABD0776C828}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProcessCaasFileTests", "..\..\..\..\tests\UnitTests\CaasIntegrationTests\processCaasFileTest\ProcessCaasFileTests.csproj", "{FE9773EF-DFB8-4308-869B-EABD0776C828}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddBatchToQueueTest", "..\..\..\..\tests\UnitTests\CaasIntegrationTests\AddBatchToQueueTest\AddBatchToQueueTest.csproj", "{2AC4643E-35A5-4BC1-BDF9-2377E9748316}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddBatchToQueueTest", "..\..\..\..\tests\CaasIntegrationTests\AddBatchToQueueTest\AddBatchToQueueTest.csproj", "{2AC4643E-35A5-4BC1-BDF9-2377E9748316}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RecordsProcessedTrackerTests", "..\..\..\..\tests\UnitTests\CaasIntegrationTests\RecordsProcessedTrackerTests\RecordsProcessedTrackerTests.csproj", "{AA6F6E1A-7511-4A65-ADCB-B86DF46223D6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RecordsProcessedTrackerTests", "..\..\..\..\tests\CaasIntegrationTests\RecordsProcessedTrackerTests\RecordsProcessedTrackerTests.csproj", "{AA6F6E1A-7511-4A65-ADCB-B86DF46223D6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ValidateDatesTests", "..\..\..\..\tests\UnitTests\CaasIntegrationTests\ValidateDates\ValidateDatesTests.csproj", "{9005A919-F64D-4723-87A7-595BB4E64563}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ValidateDatesTests", "..\..\..\..\tests\CaasIntegrationTests\ValidateDates\ValidateDatesTests.csproj", "{FBF592EF-DB88-4ED9-A65D-0F6C4C310C87}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataServiceTests", "..\..\..\..\tests\UnitTests\DataServiceTests\DataServiceTests.csproj", "{E26B2D73-BD60-4AD8-B403-939ACEDE9429}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -432,6 +432,14 @@ Global
 		{FBF592EF-DB88-4ED9-A65D-0F6C4C310C87}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FBF592EF-DB88-4ED9-A65D-0F6C4C310C87}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FBF592EF-DB88-4ED9-A65D-0F6C4C310C87}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9005A919-F64D-4723-87A7-595BB4E64563}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9005A919-F64D-4723-87A7-595BB4E64563}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9005A919-F64D-4723-87A7-595BB4E64563}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9005A919-F64D-4723-87A7-595BB4E64563}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E26B2D73-BD60-4AD8-B403-939ACEDE9429}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E26B2D73-BD60-4AD8-B403-939ACEDE9429}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E26B2D73-BD60-4AD8-B403-939ACEDE9429}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E26B2D73-BD60-4AD8-B403-939ACEDE9429}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/...ddBatchToQueueTest/AddBatchToQueueTest.cs → ...ddBatchToQueueTest/AddBatchToQueueTest.cs b/...ddBatchToQueueTest/AddBatchToQueueTest.cs → ...ddBatchToQueueTest/AddBatchToQueueTest.cs
diff --git a/...tchToQueueTest/AddBatchToQueueTest.csproj → ...tchToQueueTest/AddBatchToQueueTest.csproj b/...tchToQueueTest/AddBatchToQueueTest.csproj → ...tchToQueueTest/AddBatchToQueueTest.csproj
@@ -23,6 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\application\CohortManager\src\Functions\CaasIntegration\receiveCaasFile\receiveCaasFile.csproj" />
+    <ProjectReference Include="..\..\..\..\application\CohortManager\src\Functions\CaasIntegration\receiveCaasFile\receiveCaasFile.csproj" />
+    <ProjectReference Include="..\..\..\TestUtils\TestUtils.csproj" />
   </ItemGroup>
 </Project>
diff --git a/...ckerTests/RecordsProcessedTrackerTests.cs → ...ckerTests/RecordsProcessedTrackerTests.cs b/...ckerTests/RecordsProcessedTrackerTests.cs → ...ckerTests/RecordsProcessedTrackerTests.cs
@@ -1,11 +1,6 @@
 namespace NHS.CohortManager.Tests.CaasIntegrationTests;
 
-using Azure.Storage.Queues;
-using Microsoft.Extensions.Logging;
-using Model;
-using Moq;
 using NHS.Screening.ReceiveCaasFile;
-using receiveCaasFile;
 
 [TestClass]
 public class RecordsProcessedTrackerTests

diff --git a/...Tests/RecordsProcessedTrackerTests.csproj → ...Tests/RecordsProcessedTrackerTests.csproj b/...Tests/RecordsProcessedTrackerTests.csproj → ...Tests/RecordsProcessedTrackerTests.csproj
@@ -22,8 +22,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference
-      Include="..\..\..\application\CohortManager\src\Functions\CaasIntegration\receiveCaasFile\receiveCaasFile.csproj" />
+     <ProjectReference Include="..\..\..\TestUtils\TestUtils.csproj" />
+    <ProjectReference Include="..\..\..\..\application\CohortManager\src\Functions\CaasIntegration\receiveCaasFile\receiveCaasFile.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...Tests/ValidateDates/ValidateDatesTests.cs → ...Tests/ValidateDates/ValidateDatesTests.cs b/...Tests/ValidateDates/ValidateDatesTests.cs → ...Tests/ValidateDates/ValidateDatesTests.cs
@@ -1,16 +1,10 @@
 namespace NHS.CohortManager.Tests.CaasIntegrationTests;
 
-using System.Diagnostics;
 using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Text.Json;
-using Common;
-using Common.Interfaces;
 using Microsoft.Extensions.Logging;
 using Model;
 using Moq;
 using NHS.Screening.ReceiveCaasFile;
-using receiveCaasFile;
 
 [TestClass]
 public class ValidateDatesTests
@@ -39,7 +33,7 @@ public void ValidateDates_ShouldReturnFalse_WhenCurrentPostingEffectiveFromDateI
             PrimaryCareProviderEffectiveFromDate = "20230101"
         };
 
-        var res = _validateDates.ValidateAlleDates(participant);
+        var res = _validateDates.ValidateAllDates(participant);
 
         // Assert
         Assert.IsFalse(res);
@@ -60,7 +54,7 @@ public void ValidateDates_ShouldReturnTrue_WhenAllDatesAreValid()
             PrimaryCareProviderEffectiveFromDate = "20230101"
         };
 
-        var res = _validateDates.ValidateAlleDates(participant);
+        var res = _validateDates.ValidateAllDates(participant);
 
         // Assert
         Assert.IsTrue(res);
@@ -89,7 +83,7 @@ public void ValidateDates_ShouldReturnFalse_WhenEmailAddressEffectiveFromDateIsI
             PrimaryCareProviderEffectiveFromDate = "20230101"
         };
 
-        var res = _validateDates.ValidateAlleDates(participant);
+        var res = _validateDates.ValidateAllDates(participant);
 
         // Assert
         Assert.IsFalse(res);
@@ -117,7 +111,7 @@ public void ValidateDates_ShouldReturnFalse_WhenMobileNumberEffectiveFromDateIsI
             PrimaryCareProviderEffectiveFromDate = "20230101"
         };
 
-        var res = _validateDates.ValidateAlleDates(participant);
+        var res = _validateDates.ValidateAllDates(participant);
         // Assert
         Assert.IsFalse(res);
         _loggerMock.Verify(x => x.Log(It.Is<LogLevel>(l => l == LogLevel.Error),
@@ -143,7 +137,7 @@ public void ValidateDates_ShouldReturnFalse_WhenUsualAddressEffectiveFromDateIsI
             PrimaryCareProviderEffectiveFromDate = "20230101"
         };
 
-        var res = _validateDates.ValidateAlleDates(participant);
+        var res = _validateDates.ValidateAllDates(participant);
 
         // Assert
         Assert.IsFalse(res);

diff --git a/...s/ValidateDates/ValidateDatesTests.csproj → ...s/ValidateDates/ValidateDatesTests.csproj b/...s/ValidateDates/ValidateDatesTests.csproj → ...s/ValidateDates/ValidateDatesTests.csproj
@@ -22,9 +22,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference
-      Include="..\..\..\application\CohortManager\src\Functions\CaasIntegration\receiveCaasFile\receiveCaasFile.csproj" />
-    <ProjectReference Include="..\..\TestUtils\TestUtils.csproj" />
+    <ProjectReference Include="..\..\..\TestUtils\TestUtils.csproj" />
+    <ProjectReference Include="..\..\..\..\application\CohortManager\src\Functions\CaasIntegration\receiveCaasFile\receiveCaasFile.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...sCaasFileTest/ProcessCaasFileTests.csproj → ...sCaasFileTest/ProcessCaasFileTests.csproj b/...sCaasFileTest/ProcessCaasFileTests.csproj → ...sCaasFileTest/ProcessCaasFileTests.csproj
@@ -23,7 +23,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\..\application\CohortManager\src\Functions\CaasIntegration\receiveCaasFile\receiveCaasFile.csproj" />
+      Include="..\..\..\..\application\CohortManager\src\Functions\CaasIntegration\receiveCaasFile\receiveCaasFile.csproj" />
     <ProjectReference Include="..\..\TestUtils\TestUtils.csproj" />
   </ItemGroup>
 

diff --git a/...ocessCaasFileTest/processCaasFileTests.cs → ...ocessCaasFileTest/processCaasFileTests.cs b/...ocessCaasFileTest/processCaasFileTests.cs → ...ocessCaasFileTest/processCaasFileTests.cs
@@ -10,7 +10,6 @@ namespace NHS.CohortManager.Tests.CaasIntegrationTests;
 using Model;
 using Moq;
 using NHS.Screening.ReceiveCaasFile;
-using receiveCaasFile;
 
 [TestClass]
 public class ProcessCaasFileTests

diff --git a/...aasFileTest/BSS_20240718150245_n4.parquet → ...aasFileTest/BSS_20240718150245_n4.parquet b/...aasFileTest/BSS_20240718150245_n4.parquet → ...aasFileTest/BSS_20240718150245_n4.parquet
diff --git a/tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/F9B292BSS_20241201121212_n1.parquet b/tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/F9B292BSS_20241201121212_n1.parquet
diff --git a/...ceiveCaasFileTest/ReceiveCaasFileTests.cs → ...ceiveCaasFileTest/ReceiveCaasFileTests.cs b/...ceiveCaasFileTest/ReceiveCaasFileTests.cs → ...ceiveCaasFileTest/ReceiveCaasFileTests.cs
diff --git a/...sts/CaasIntegrationTests/receiveCaasFileTest/add_1_-_CAAS_BREAST_SCREENING_COHORT.parquet b/...sts/CaasIntegrationTests/receiveCaasFileTest/add_1_-_CAAS_BREAST_SCREENING_COHORT.parquet
diff --git a/...veCaasFileTest/receiveCaasFileTest.csproj → ...veCaasFileTest/receiveCaasFileTest.csproj b/...veCaasFileTest/receiveCaasFileTest.csproj → ...veCaasFileTest/receiveCaasFileTest.csproj
@@ -32,8 +32,8 @@
 
   <ItemGroup>
     <ProjectReference
-      Include="..\..\..\application\CohortManager\src\Functions\CaasIntegration\receiveCaasFile\receiveCaasFile.csproj" />
-    <ProjectReference Include="..\..\TestUtils\TestUtils.csproj" />
+      Include="..\..\..\..\application\CohortManager\src\Functions\CaasIntegration\receiveCaasFile\receiveCaasFile.csproj" />
+    <ProjectReference Include="..\..\..\TestUtils\TestUtils.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...eveMeshFileTest/MeshResponseTestHelper.cs → ...eveMeshFileTest/MeshResponseTestHelper.cs b/...eveMeshFileTest/MeshResponseTestHelper.cs → ...eveMeshFileTest/MeshResponseTestHelper.cs
diff --git a/...rieveMeshFileTest/RetrieveMeshFileTest.cs → ...rieveMeshFileTest/RetrieveMeshFileTest.cs b/...rieveMeshFileTest/RetrieveMeshFileTest.cs → ...rieveMeshFileTest/RetrieveMeshFileTest.cs
diff --git a/...eMeshFileTest/retrieveMeshFileTest.csproj → ...eMeshFileTest/retrieveMeshFileTest.csproj b/...eMeshFileTest/retrieveMeshFileTest.csproj → ...eMeshFileTest/retrieveMeshFileTest.csproj
@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\application\CohortManager\src\Functions\CaasIntegration\RetrieveMeshFile\RetrieveMeshFile.csproj" />
+    <ProjectReference Include="..\..\..\..\application\CohortManager\src\Functions\CaasIntegration\RetrieveMeshFile\RetrieveMeshFile.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...sts/BsSelectGpPracticeDataServiceTests.cs → ...sts/BsSelectGpPracticeDataServiceTests.cs b/...sts/BsSelectGpPracticeDataServiceTests.cs → ...sts/BsSelectGpPracticeDataServiceTests.cs
diff --git a/...eTests/BsSelectOutCodeDataServiceTests.cs → ...eTests/BsSelectOutCodeDataServiceTests.cs b/...eTests/BsSelectOutCodeDataServiceTests.cs → ...eTests/BsSelectOutCodeDataServiceTests.cs
diff --git a/...ceTests/CurrentPostingDataServiceTests.cs → ...ceTests/CurrentPostingDataServiceTests.cs b/...ceTests/CurrentPostingDataServiceTests.cs → ...ceTests/CurrentPostingDataServiceTests.cs
diff --git a/...ataServiceTests/DataServiceClientTests.cs → ...ataServiceTests/DataServiceClientTests.cs b/...ataServiceTests/DataServiceClientTests.cs → ...ataServiceTests/DataServiceClientTests.cs
diff --git a/...DataServiceTests/DataServiceTestHelper.cs → ...DataServiceTests/DataServiceTestHelper.cs b/...DataServiceTests/DataServiceTestHelper.cs → ...DataServiceTests/DataServiceTestHelper.cs
diff --git a/.../DataServiceTests/DataServiceTests.csproj → .../DataServiceTests/DataServiceTests.csproj b/.../DataServiceTests/DataServiceTests.csproj → .../DataServiceTests/DataServiceTests.csproj
@@ -22,11 +22,11 @@
     <Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="../../application/CohortManager/src/Functions/screeningDataServices/BsSelectOutCode/BsSelectOutCode.csproj" />
-    <ProjectReference Include="../../application/CohortManager/src/Functions/screeningDataServices/CurrentPostingDataService/CurrentPosting.csproj" />
-    <ProjectReference Include="..\..\application\CohortManager\src\Functions\screeningDataServices\BsSelectGpPractice\BsSelectGpPractice.csproj" />
-    <ProjectReference Include="..\TestUtils\TestUtils.csproj" />
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\application\CohortManager\src\Functions\screeningDataServices\BsSelectOutCode\BsSelectOutCode.csproj" />
+    <ProjectReference Include="..\..\..\application\CohortManager\src\Functions\screeningDataServices\BsSelectGpPractice\BsSelectGpPractice.csproj" />
+    <ProjectReference Include="..\..\..\application\CohortManager\src\Functions\screeningDataServices\CurrentPostingDataService\CurrentPosting.csproj" />
+    <ProjectReference Include="..\..\TestUtils\TestUtils.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...taServiceTests/MockDataServiceAccessor.cs → ...taServiceTests/MockDataServiceAccessor.cs b/...taServiceTests/MockDataServiceAccessor.cs → ...taServiceTests/MockDataServiceAccessor.cs