Rearrange DQT-related services (#974)

* Rename DQT integration tests project * Rearrange TrsDataSync and DqtReporting bits
DFE-Digital · Dec 11, 2023 · bf53365 · bf53365
1 parent 9931d21
commit bf53365
Show file tree

Hide file tree

Showing 127 changed files with 171 additions and 165 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -154,7 +154,7 @@ jobs:
       continue-on-error: true  # temporary- we're getting sporadic 503 errors here in action setup
 
   dqt_tests:
-    name: DQT tests
+    name: DQT integration tests
     runs-on: ubuntu-latest
     needs: [build]
     if: ${{ needs.build.outputs.run_crm_integration_tests == 'true' }}
@@ -215,12 +215,12 @@ jobs:
 
     - name: Build
       run: dotnet build --configuration Release
-      working-directory: TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests
+      working-directory: TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests
 
     - name: Run tests
       uses: ./.github/workflows/actions/test
       with:
-        test_project_path: TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests
+        test_project_path: TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests
         report_name: "DQT test results"
         dotnet_test_args: >-
           --no-build

diff --git a/TeachingRecordSystem/TeachingRecordSystem.sln b/TeachingRecordSystem/TeachingRecordSystem.sln
@@ -27,7 +27,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeachingRecordSystem.Suppor
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeachingRecordSystem.Core", "src\TeachingRecordSystem.Core\TeachingRecordSystem.Core.csproj", "{BB84ECB4-583D-4068-9A66-883233661594}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeachingRecordSystem.Core.Dqt.Tests", "tests\TeachingRecordSystem.Core.Dqt.Tests\TeachingRecordSystem.Core.Dqt.Tests.csproj", "{99B4311C-BD30-4370-BA4F-61BFA7B802FA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeachingRecordSystem.Core.Dqt.CrmIntegrationTests", "tests\TeachingRecordSystem.Core.Dqt.CrmIntegrationTests\TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.csproj", "{99B4311C-BD30-4370-BA4F-61BFA7B802FA}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeachingRecordSystem.Core.Tests", "tests\TeachingRecordSystem.Core.Tests\TeachingRecordSystem.Core.Tests.csproj", "{3380ADC3-A691-4B07-9FE3-CB5306974965}"
 EndProject
@@ -41,7 +41,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeachingRecordSystem.Worker
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeachingRecordSystem.Hosting", "src\TeachingRecordSystem.Hosting\TeachingRecordSystem.Hosting.csproj", "{BD13EB34-437A-45FE-AE0C-7DAD1E9681C0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TeachingRecordSystem.ServiceDefaults", "src\TeachingRecordSystem.ServiceDefaults\TeachingRecordSystem.ServiceDefaults.csproj", "{01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeachingRecordSystem.ServiceDefaults", "src\TeachingRecordSystem.ServiceDefaults\TeachingRecordSystem.ServiceDefaults.csproj", "{01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Api/Program.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Api/Program.cs
@@ -22,11 +22,11 @@
 using TeachingRecordSystem.Api.Validation;
 using TeachingRecordSystem.Core.DataStore.Postgres;
 using TeachingRecordSystem.Core.Dqt;
-using TeachingRecordSystem.Core.Dqt.Services.CrmEntityChanges;
 using TeachingRecordSystem.Core.Infrastructure;
 using TeachingRecordSystem.Core.Jobs;
 using TeachingRecordSystem.Core.Services.AccessYourQualifications;
 using TeachingRecordSystem.Core.Services.Certificates;
+using TeachingRecordSystem.Core.Services.CrmEntityChanges;
 using TeachingRecordSystem.Core.Services.GetAnIdentityApi;
 using TeachingRecordSystem.Core.Services.Notify;
 using TeachingRecordSystem.Core.Services.TrnGenerationApi;

diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Cli/Commands.GenerateReportingDbTable.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Cli/Commands.GenerateReportingDbTable.cs
@@ -2,7 +2,7 @@
 using Microsoft.Xrm.Sdk.Metadata;
 using TeachingRecordSystem.Core.Dqt;
 using TeachingRecordSystem.Core.Dqt.Queries;
-using TeachingRecordSystem.Core.Dqt.Services.DqtReporting;
+using TeachingRecordSystem.Core.Services.DqtReporting;
 
 namespace TeachingRecordSystem.Cli;
 

diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Cli/Commands.MigrateReportingDb.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Cli/Commands.MigrateReportingDb.cs
@@ -1,4 +1,4 @@
-using TeachingRecordSystem.Core.Dqt.Services.DqtReporting;
+using TeachingRecordSystem.Core.Services.DqtReporting;
 
 namespace TeachingRecordSystem.Cli;
 

diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Jobs/SyncAllContactsFromCrmJob.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Jobs/SyncAllContactsFromCrmJob.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Options;
 using Microsoft.Xrm.Sdk.Query;
 using TeachingRecordSystem.Core.Dqt;
-using TeachingRecordSystem.Core.Dqt.Services.TrsDataSync;
+using TeachingRecordSystem.Core.Services.TrsDataSync;
 
 namespace TeachingRecordSystem.Core.Jobs;
 

diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Properties/AssemblyInfo.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("TeachingRecordSystem.Core.Tests")]
-[assembly: InternalsVisibleTo("TeachingRecordSystem.Core.Dqt.Tests")]
+[assembly: InternalsVisibleTo("TeachingRecordSystem.Core.Dqt.CrmIntegrationTests")]
diff --git a/...mEntityChanges/CrmEntityChangesService.cs → ...mEntityChanges/CrmEntityChangesService.cs b/...mEntityChanges/CrmEntityChangesService.cs → ...mEntityChanges/CrmEntityChangesService.cs
@@ -6,8 +6,9 @@
 using Microsoft.Xrm.Sdk.Messages;
 using Microsoft.Xrm.Sdk.Query;
 using TeachingRecordSystem.Core.DataStore.Postgres;
+using TeachingRecordSystem.Core.Dqt;
 
-namespace TeachingRecordSystem.Core.Dqt.Services.CrmEntityChanges;
+namespace TeachingRecordSystem.Core.Services.CrmEntityChanges;
 
 public class CrmEntityChangesService : ICrmEntityChangesService
 {
@@ -147,7 +148,7 @@ await UpsertEntityChangesJournal(
                 // and we want to ensure we don't miss any of them.
                 var changes = response.EntityChanges.Changes
                     .Where(e => !modifiedSince.HasValue || e is not NewOrUpdatedItem ||
-                        (e is NewOrUpdatedItem newOrUpdatedItem && newOrUpdatedItem.NewOrUpdatedEntity.GetAttributeValue<DateTime>("modifiedon") >= modifiedSince.Value))
+                        e is NewOrUpdatedItem newOrUpdatedItem && newOrUpdatedItem.NewOrUpdatedEntity.GetAttributeValue<DateTime>("modifiedon") >= modifiedSince.Value)
                     .ToArray();
 
                 // Roll up changes to the same record so callers don't get the same record more than once in a batch.

diff --git a/...EntityChanges/ICrmEntityChangesService.cs → ...EntityChanges/ICrmEntityChangesService.cs b/...EntityChanges/ICrmEntityChangesService.cs → ...EntityChanges/ICrmEntityChangesService.cs
@@ -1,7 +1,7 @@
 using Microsoft.Xrm.Sdk;
 using Microsoft.Xrm.Sdk.Query;
 
-namespace TeachingRecordSystem.Core.Dqt.Services.CrmEntityChanges;
+namespace TeachingRecordSystem.Core.Services.CrmEntityChanges;
 
 public interface ICrmEntityChangesService
 {

diff --git a/...ityChanges/ServiceCollectionExtensions.cs → ...ityChanges/ServiceCollectionExtensions.cs b/...ityChanges/ServiceCollectionExtensions.cs → ...ityChanges/ServiceCollectionExtensions.cs
@@ -1,7 +1,8 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using TeachingRecordSystem.Core.Dqt;
 
-namespace TeachingRecordSystem.Core.Dqt.Services.CrmEntityChanges;
+namespace TeachingRecordSystem.Core.Services.CrmEntityChanges;
 
 public static class ServiceCollectionExtensions
 {

diff --git a/...vices/DqtReporting/DqtReportingOptions.cs → ...vices/DqtReporting/DqtReportingOptions.cs b/...vices/DqtReporting/DqtReportingOptions.cs → ...vices/DqtReporting/DqtReportingOptions.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace TeachingRecordSystem.Core.Dqt.Services.DqtReporting;
+namespace TeachingRecordSystem.Core.Services.DqtReporting;
 
 public class DqtReportingOptions
 {

diff --git a/...vices/DqtReporting/DqtReportingService.cs → ...vices/DqtReporting/DqtReportingService.cs b/...vices/DqtReporting/DqtReportingService.cs → ...vices/DqtReporting/DqtReportingService.cs
@@ -9,10 +9,11 @@
 using Microsoft.Xrm.Sdk;
 using Microsoft.Xrm.Sdk.Metadata;
 using Microsoft.Xrm.Sdk.Query;
+using TeachingRecordSystem.Core.Dqt;
 using TeachingRecordSystem.Core.Dqt.Queries;
-using TeachingRecordSystem.Core.Dqt.Services.CrmEntityChanges;
+using TeachingRecordSystem.Core.Services.CrmEntityChanges;
 
-namespace TeachingRecordSystem.Core.Dqt.Services.DqtReporting;
+namespace TeachingRecordSystem.Core.Services.DqtReporting;
 
 public partial class DqtReportingService : BackgroundService
 {

diff --git a/...rvices/DqtReporting/EntityTableMapping.cs → ...rvices/DqtReporting/EntityTableMapping.cs b/...rvices/DqtReporting/EntityTableMapping.cs → ...rvices/DqtReporting/EntityTableMapping.cs
@@ -5,7 +5,7 @@
 using Microsoft.Xrm.Sdk;
 using Microsoft.Xrm.Sdk.Metadata;
 
-namespace TeachingRecordSystem.Core.Dqt.Services.DqtReporting;
+namespace TeachingRecordSystem.Core.Services.DqtReporting;
 
 [DebuggerDisplay("{EntityLogicalName,nq}")]
 public class EntityTableMapping

diff --git a/...rting/HostApplicationBuilderExtensions.cs → ...rting/HostApplicationBuilderExtensions.cs b/...rting/HostApplicationBuilderExtensions.cs → ...rting/HostApplicationBuilderExtensions.cs
@@ -3,8 +3,9 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 using Microsoft.PowerPlatform.Dataverse.Client;
+using TeachingRecordSystem.Core.Dqt;
 
-namespace TeachingRecordSystem.Core.Dqt.Services.DqtReporting;
+namespace TeachingRecordSystem.Core.Services.DqtReporting;
 
 public static class HostApplicationBuilderExtensions
 {

diff --git a/...ing/IgnoreDependencyTelemetryProcessor.cs → ...ing/IgnoreDependencyTelemetryProcessor.cs b/...ing/IgnoreDependencyTelemetryProcessor.cs → ...ing/IgnoreDependencyTelemetryProcessor.cs
@@ -4,7 +4,7 @@
 using Microsoft.ApplicationInsights.DataContracts;
 using Microsoft.ApplicationInsights.Extensibility;
 
-namespace TeachingRecordSystem.Core.Dqt.Services.DqtReporting;
+namespace TeachingRecordSystem.Core.Services.DqtReporting;
 
 public class IgnoreDependencyTelemetryProcessor : ITelemetryProcessor
 {

diff --git a/.../DqtReporting/Migrations/0001_Initial.sql → .../DqtReporting/Migrations/0001_Initial.sql b/.../DqtReporting/Migrations/0001_Initial.sql → .../DqtReporting/Migrations/0001_Initial.sql
diff --git a/...rting/Migrations/0002_TrackingColumns.sql → ...rting/Migrations/0002_TrackingColumns.sql b/...rting/Migrations/0002_TrackingColumns.sql → ...rting/Migrations/0002_TrackingColumns.sql
diff --git a/...tions/0003_ContactSentQtsAwardedEmail.sql → ...tions/0003_ContactSentQtsAwardedEmail.sql b/...tions/0003_ContactSentQtsAwardedEmail.sql → ...tions/0003_ContactSentQtsAwardedEmail.sql
diff --git a/...ions/0004_ContactAdditionalAttributes.sql → ...ions/0004_ContactAdditionalAttributes.sql b/...ions/0004_ContactAdditionalAttributes.sql → ...ions/0004_ContactAdditionalAttributes.sql
diff --git a/...porting/Migrations/0005_ContactSlugId.sql → ...porting/Migrations/0005_ContactSlugId.sql b/...porting/Migrations/0005_ContactSlugId.sql → ...porting/Migrations/0005_ContactSlugId.sql
diff --git a/...ns/0006_Incident_msdyn_copilotengaged.sql → ...ns/0006_Incident_msdyn_copilotengaged.sql b/...ns/0006_Incident_msdyn_copilotengaged.sql → ...ns/0006_Incident_msdyn_copilotengaged.sql
diff --git a/...07_ContactAllowpiiUpdatesFromRegister.sql → ...07_ContactAllowpiiUpdatesFromRegister.sql b/...07_ContactAllowpiiUpdatesFromRegister.sql → ...07_ContactAllowpiiUpdatesFromRegister.sql
diff --git a/...grations/0008_EvergreenMissingColumns.sql → ...grations/0008_EvergreenMissingColumns.sql b/...grations/0008_EvergreenMissingColumns.sql → ...grations/0008_EvergreenMissingColumns.sql
diff --git a/...rations/0009_EvergreenMissingColumns2.sql → ...rations/0009_EvergreenMissingColumns2.sql b/...rations/0009_EvergreenMissingColumns2.sql → ...rations/0009_EvergreenMissingColumns2.sql
diff --git a/...g/Migrations/0010_SanctionDetailsLink.sql → ...g/Migrations/0010_SanctionDetailsLink.sql b/...g/Migrations/0010_SanctionDetailsLink.sql → ...g/Migrations/0010_SanctionDetailsLink.sql
diff --git a/...ions/0011_AddHighProfileProgrammeType.sql → ...ions/0011_AddHighProfileProgrammeType.sql b/...ions/0011_AddHighProfileProgrammeType.sql → ...ions/0011_AddHighProfileProgrammeType.sql
diff --git a/...igrations/0012_FixProgrammeTypeCasing.sql → ...igrations/0012_FixProgrammeTypeCasing.sql b/...igrations/0012_FixProgrammeTypeCasing.sql → ...igrations/0012_FixProgrammeTypeCasing.sql
diff --git a/...ations/0013_PreviousNameTransactionId.sql → ...ations/0013_PreviousNameTransactionId.sql b/...ations/0013_PreviousNameTransactionId.sql → ...ations/0013_PreviousNameTransactionId.sql
diff --git a/...t_dfeta_allowidsigninwithprohibitions.sql → ...t_dfeta_allowidsigninwithprohibitions.sql b/...t_dfeta_allowidsigninwithprohibitions.sql → ...t_dfeta_allowidsigninwithprohibitions.sql
diff --git a/...5_dfeta_qualification_dfeta_mq_status.sql → ...5_dfeta_qualification_dfeta_mq_status.sql b/...5_dfeta_qualification_dfeta_mq_status.sql → ...5_dfeta_qualification_dfeta_mq_status.sql
diff --git a/...a_qualification_dfeta_trsdeletedevent.sql → ...a_qualification_dfeta_trsdeletedevent.sql b/...a_qualification_dfeta_trsdeletedevent.sql → ...a_qualification_dfeta_trsdeletedevent.sql
diff --git a/...ore/Dqt/Services/DqtReporting/Migrator.cs → ...em.Core/Services/DqtReporting/Migrator.cs b/...ore/Dqt/Services/DqtReporting/Migrator.cs → ...em.Core/Services/DqtReporting/Migrator.cs
@@ -8,7 +8,7 @@
 using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.Logging;
 
-namespace TeachingRecordSystem.Core.Dqt.Services.DqtReporting;
+namespace TeachingRecordSystem.Core.Services.DqtReporting;
 
 public class Migrator
 {

diff --git a/...aSync/HostApplicationBuilderExtensions.cs → ...aSync/HostApplicationBuilderExtensions.cs b/...aSync/HostApplicationBuilderExtensions.cs → ...aSync/HostApplicationBuilderExtensions.cs
@@ -3,8 +3,9 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 using Microsoft.PowerPlatform.Dataverse.Client;
+using TeachingRecordSystem.Core.Dqt;
 
-namespace TeachingRecordSystem.Core.Dqt.Services.TrsDataSync;
+namespace TeachingRecordSystem.Core.Services.TrsDataSync;
 
 public static class HostApplicationBuilderExtensions
 {

diff --git a/...Services/TrsDataSync/TrsDataSyncHelper.cs → ...Services/TrsDataSync/TrsDataSyncHelper.cs b/...Services/TrsDataSync/TrsDataSyncHelper.cs → ...Services/TrsDataSync/TrsDataSyncHelper.cs
@@ -5,8 +5,9 @@
 using NpgsqlTypes;
 using TeachingRecordSystem.Core.DataStore.Postgres;
 using TeachingRecordSystem.Core.DataStore.Postgres.Models;
+using TeachingRecordSystem.Core.Dqt;
 
-namespace TeachingRecordSystem.Core.Dqt.Services.TrsDataSync;
+namespace TeachingRecordSystem.Core.Services.TrsDataSync;
 
 public class TrsDataSyncHelper
 {
@@ -188,7 +189,7 @@ public async Task SyncContacts(IReadOnlyCollection<Contact> entities, bool ignor
 
         await txn.CommitAsync(cancellationToken);
 
-        void WriteNullableValueOrNull<T>(Nullable<T> value, NpgsqlDbType dbType)
+        void WriteNullableValueOrNull<T>(T? value, NpgsqlDbType dbType)
             where T : struct
         {
             if (value.HasValue)

diff --git a/...ervices/TrsDataSync/TrsDataSyncService.cs → ...ervices/TrsDataSync/TrsDataSyncService.cs b/...ervices/TrsDataSync/TrsDataSyncService.cs → ...ervices/TrsDataSync/TrsDataSyncService.cs
@@ -3,9 +3,9 @@
 using Microsoft.Extensions.Options;
 using Microsoft.Xrm.Sdk;
 using Microsoft.Xrm.Sdk.Query;
-using TeachingRecordSystem.Core.Dqt.Services.CrmEntityChanges;
+using TeachingRecordSystem.Core.Services.CrmEntityChanges;
 
-namespace TeachingRecordSystem.Core.Dqt.Services.TrsDataSync;
+namespace TeachingRecordSystem.Core.Services.TrsDataSync;
 
 public class TrsDataSyncService : BackgroundService
 {

diff --git a/.../TrsDataSync/TrsDataSyncServiceOptions.cs → .../TrsDataSync/TrsDataSyncServiceOptions.cs b/.../TrsDataSync/TrsDataSyncServiceOptions.cs → .../TrsDataSync/TrsDataSyncServiceOptions.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace TeachingRecordSystem.Core.Dqt.Services.TrsDataSync;
+namespace TeachingRecordSystem.Core.Services.TrsDataSync;
 
 public class TrsDataSyncServiceOptions
 {

diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/TeachingRecordSystem.Core.csproj b/TeachingRecordSystem/src/TeachingRecordSystem.Core/TeachingRecordSystem.Core.csproj
@@ -5,41 +5,41 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="Dqt\Services\DqtReporting\Migrations\0001_Initial.sql" />
-    <None Remove="Dqt\Services\DqtReporting\Migrations\0002_TrackingColumns.sql" />
-    <None Remove="Dqt\Services\DqtReporting\Migrations\0003_ContactSentQtsAwardedEmail.sql" />
-    <None Remove="Dqt\Services\DqtReporting\Migrations\0004_ContactAdditionalAttributes.sql" />
-    <None Remove="Dqt\Services\DqtReporting\Migrations\0005_ContactSlugId.sql" />
-    <None Remove="Dqt\Services\DqtReporting\Migrations\0006_Incident_msdyn_copilotengaged.sql" />
-    <None Remove="Dqt\Services\DqtReporting\Migrations\0007_ContactAllowpiiUpdatesFromRegister.sql" />
-    <None Remove="Dqt\Services\DqtReporting\Migrations\0008_EvergreenMissingColumns.sql" />
-    <None Remove="Dqt\Services\DqtReporting\Migrations\0009_EvergreenMissingColumns2.sql" />
-    <None Remove="Dqt\Services\DqtReporting\Migrations\0010_SanctionDetailsLink.sql" />
-    <None Remove="Dqt\Services\DqtReporting\Migrations\0011_AddHighProfileProgrammeType.sql" />
-    <None Remove="Dqt\Services\DqtReporting\Migrations\0012_FixProgrammeTypeCasing.sql" />
-    <None Remove="Dqt\Services\DqtReporting\Migrations\0013_PreviousNameTransactionId.sql" />
-    <None Remove="Dqt\Services\DqtReporting\Migrations\0014_Contact_dfeta_allowidsigninwithprohibitions.sql" />
-    <None Remove="Dqt\Services\DqtReporting\Migrations\0015_dfeta_qualification_dfeta_mq_status.sql" />
-    <None Remove="Dqt\Services\DqtReporting\Migrations\0016_dfeta_qualification_dfeta_trsdeletedevent.sql" />
+    <None Remove="Services\DqtReporting\Migrations\0001_Initial.sql" />
+    <None Remove="Services\DqtReporting\Migrations\0002_TrackingColumns.sql" />
+    <None Remove="Services\DqtReporting\Migrations\0003_ContactSentQtsAwardedEmail.sql" />
+    <None Remove="Services\DqtReporting\Migrations\0004_ContactAdditionalAttributes.sql" />
+    <None Remove="Services\DqtReporting\Migrations\0005_ContactSlugId.sql" />
+    <None Remove="Services\DqtReporting\Migrations\0006_Incident_msdyn_copilotengaged.sql" />
+    <None Remove="Services\DqtReporting\Migrations\0007_ContactAllowpiiUpdatesFromRegister.sql" />
+    <None Remove="Services\DqtReporting\Migrations\0008_EvergreenMissingColumns.sql" />
+    <None Remove="Services\DqtReporting\Migrations\0009_EvergreenMissingColumns2.sql" />
+    <None Remove="Services\DqtReporting\Migrations\0010_SanctionDetailsLink.sql" />
+    <None Remove="Services\DqtReporting\Migrations\0011_AddHighProfileProgrammeType.sql" />
+    <None Remove="Services\DqtReporting\Migrations\0012_FixProgrammeTypeCasing.sql" />
+    <None Remove="Services\DqtReporting\Migrations\0013_PreviousNameTransactionId.sql" />
+    <None Remove="Services\DqtReporting\Migrations\0014_Contact_dfeta_allowidsigninwithprohibitions.sql" />
+    <None Remove="Services\DqtReporting\Migrations\0015_dfeta_qualification_dfeta_mq_status.sql" />
+    <None Remove="Services\DqtReporting\Migrations\0016_dfeta_qualification_dfeta_trsdeletedevent.sql" />
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Dqt\Services\DqtReporting\Migrations\0001_Initial.sql" />
-    <EmbeddedResource Include="Dqt\Services\DqtReporting\Migrations\0002_TrackingColumns.sql" />
-    <EmbeddedResource Include="Dqt\Services\DqtReporting\Migrations\0003_ContactSentQtsAwardedEmail.sql" />
-    <EmbeddedResource Include="Dqt\Services\DqtReporting\Migrations\0004_ContactAdditionalAttributes.sql" />
-    <EmbeddedResource Include="Dqt\Services\DqtReporting\Migrations\0005_ContactSlugId.sql" />
-    <EmbeddedResource Include="Dqt\Services\DqtReporting\Migrations\0006_Incident_msdyn_copilotengaged.sql" />
-    <EmbeddedResource Include="Dqt\Services\DqtReporting\Migrations\0007_ContactAllowpiiUpdatesFromRegister.sql" />
-    <EmbeddedResource Include="Dqt\Services\DqtReporting\Migrations\0008_EvergreenMissingColumns.sql" />
-    <EmbeddedResource Include="Dqt\Services\DqtReporting\Migrations\0009_EvergreenMissingColumns2.sql" />
-    <EmbeddedResource Include="Dqt\Services\DqtReporting\Migrations\0010_SanctionDetailsLink.sql" />
-    <EmbeddedResource Include="Dqt\Services\DqtReporting\Migrations\0011_AddHighProfileProgrammeType.sql" />
-    <EmbeddedResource Include="Dqt\Services\DqtReporting\Migrations\0012_FixProgrammeTypeCasing.sql" />
-    <EmbeddedResource Include="Dqt\Services\DqtReporting\Migrations\0013_PreviousNameTransactionId.sql" />
-    <EmbeddedResource Include="Dqt\Services\DqtReporting\Migrations\0014_Contact_dfeta_allowidsigninwithprohibitions.sql" />
-    <EmbeddedResource Include="Dqt\Services\DqtReporting\Migrations\0015_dfeta_qualification_dfeta_mq_status.sql" />
-    <EmbeddedResource Include="Dqt\Services\DqtReporting\Migrations\0016_dfeta_qualification_dfeta_trsdeletedevent.sql" />
+    <EmbeddedResource Include="Services\DqtReporting\Migrations\0001_Initial.sql" />
+    <EmbeddedResource Include="Services\DqtReporting\Migrations\0002_TrackingColumns.sql" />
+    <EmbeddedResource Include="Services\DqtReporting\Migrations\0003_ContactSentQtsAwardedEmail.sql" />
+    <EmbeddedResource Include="Services\DqtReporting\Migrations\0004_ContactAdditionalAttributes.sql" />
+    <EmbeddedResource Include="Services\DqtReporting\Migrations\0005_ContactSlugId.sql" />
+    <EmbeddedResource Include="Services\DqtReporting\Migrations\0006_Incident_msdyn_copilotengaged.sql" />
+    <EmbeddedResource Include="Services\DqtReporting\Migrations\0007_ContactAllowpiiUpdatesFromRegister.sql" />
+    <EmbeddedResource Include="Services\DqtReporting\Migrations\0008_EvergreenMissingColumns.sql" />
+    <EmbeddedResource Include="Services\DqtReporting\Migrations\0009_EvergreenMissingColumns2.sql" />
+    <EmbeddedResource Include="Services\DqtReporting\Migrations\0010_SanctionDetailsLink.sql" />
+    <EmbeddedResource Include="Services\DqtReporting\Migrations\0011_AddHighProfileProgrammeType.sql" />
+    <EmbeddedResource Include="Services\DqtReporting\Migrations\0012_FixProgrammeTypeCasing.sql" />
+    <EmbeddedResource Include="Services\DqtReporting\Migrations\0013_PreviousNameTransactionId.sql" />
+    <EmbeddedResource Include="Services\DqtReporting\Migrations\0014_Contact_dfeta_allowidsigninwithprohibitions.sql" />
+    <EmbeddedResource Include="Services\DqtReporting\Migrations\0015_dfeta_qualification_dfeta_mq_status.sql" />
+    <EmbeddedResource Include="Services\DqtReporting\Migrations\0016_dfeta_qualification_dfeta_trsdeletedevent.sql" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Worker/Program.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Worker/Program.cs
@@ -4,11 +4,11 @@
 using TeachingRecordSystem;
 using TeachingRecordSystem.Core;
 using TeachingRecordSystem.Core.DataStore.Postgres;
-using TeachingRecordSystem.Core.Dqt.Services.CrmEntityChanges;
-using TeachingRecordSystem.Core.Dqt.Services.DqtReporting;
-using TeachingRecordSystem.Core.Dqt.Services.TrsDataSync;
 using TeachingRecordSystem.Core.Infrastructure;
 using TeachingRecordSystem.Core.Infrastructure.Configuration;
+using TeachingRecordSystem.Core.Services.CrmEntityChanges;
+using TeachingRecordSystem.Core.Services.DqtReporting;
+using TeachingRecordSystem.Core.Services.TrsDataSync;
 using TeachingRecordSystem.Worker.Infrastructure.Logging;
 
 var builder = Host.CreateApplicationBuilder(args);

diff --git a/...System.Core.Dqt.Tests/CrmClientFixture.cs → ...t.CrmIntegrationTests/CrmClientFixture.cs b/...System.Core.Dqt.Tests/CrmClientFixture.cs → ...t.CrmIntegrationTests/CrmClientFixture.cs
@@ -9,7 +9,7 @@
 using Microsoft.PowerPlatform.Dataverse.Client;
 using TeachingRecordSystem.Core.Services.TrnGenerationApi;
 
-namespace TeachingRecordSystem.Core.Dqt.Tests;
+namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests;
 
 public sealed class CrmClientFixture : IDisposable
 {

diff --git a/...terTests/ClearTeacherIdentityInfoTests.cs → ...terTests/ClearTeacherIdentityInfoTests.cs b/...terTests/ClearTeacherIdentityInfoTests.cs → ...terTests/ClearTeacherIdentityInfoTests.cs
@@ -1,7 +1,7 @@
 using Microsoft.PowerPlatform.Dataverse.Client;
 using Microsoft.Xrm.Sdk.Query;
 
-namespace TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests;
+namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests;
 
 public class ClearTeacherIdentityInfoTests : IAsyncLifetime
 {

diff --git a/...taverseAdapterTests/CreateTeacherTests.cs → ...taverseAdapterTests/CreateTeacherTests.cs b/...taverseAdapterTests/CreateTeacherTests.cs → ...taverseAdapterTests/CreateTeacherTests.cs
@@ -1,7 +1,7 @@
 #nullable disable
 using Microsoft.PowerPlatform.Dataverse.Client;
 
-namespace TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests;
+namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests;
 
 public class CreateTeacherTests : IClassFixture<CreateTeacherFixture>, IAsyncLifetime
 {

diff --git a/...ts/ExecuteTransactionRequestExtensions.cs → ...ts/ExecuteTransactionRequestExtensions.cs b/...ts/ExecuteTransactionRequestExtensions.cs → ...ts/ExecuteTransactionRequestExtensions.cs
@@ -1,7 +1,7 @@
 using Microsoft.Xrm.Sdk;
 using Microsoft.Xrm.Sdk.Messages;
 
-namespace TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests;
+namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests;
 
 public static class ExecuteTransactionRequestExtensions
 {

diff --git a/...ataverseAdapterTests/FindTeachersTests.cs → ...ataverseAdapterTests/FindTeachersTests.cs b/...ataverseAdapterTests/FindTeachersTests.cs → ...ataverseAdapterTests/FindTeachersTests.cs
@@ -1,6 +1,6 @@
 #nullable disable
 
-namespace TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests;
+namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests;
 
 public class FindTeachersTests : IClassFixture<FindTeachersFixture>
 {

diff --git a/.../DataverseAdapterTests/GetCountryTests.cs → .../DataverseAdapterTests/GetCountryTests.cs b/.../DataverseAdapterTests/GetCountryTests.cs → .../DataverseAdapterTests/GetCountryTests.cs
@@ -1,6 +1,6 @@
 #nullable disable
 
-namespace TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests;
+namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests;
 
 public class GetCountryTests : IAsyncLifetime
 {

diff --git a/...eAdapterTests/GetEarlyYearsStatusTests.cs → ...eAdapterTests/GetEarlyYearsStatusTests.cs b/...eAdapterTests/GetEarlyYearsStatusTests.cs → ...eAdapterTests/GetEarlyYearsStatusTests.cs
@@ -1,6 +1,6 @@
 #nullable disable
 
-namespace TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests;
+namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests;
 
 public class GetEarlyYearsStatusTests : IAsyncLifetime
 {

diff --git a/...Tests/GetEytsAwardeesForDateRangeTests.cs → ...Tests/GetEytsAwardeesForDateRangeTests.cs b/...Tests/GetEytsAwardeesForDateRangeTests.cs → ...Tests/GetEytsAwardeesForDateRangeTests.cs
@@ -2,7 +2,7 @@
 using Microsoft.Xrm.Sdk;
 using Microsoft.Xrm.Sdk.Messages;
 
-namespace TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests;
+namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests;
 
 public class GetEytsAwardeesForDateRangeTests : IAsyncLifetime
 {