From bf533653899b469fd01c54a2a17c0e360f4e30b0 Mon Sep 17 00:00:00 2001 From: James Gunn Date: Mon, 11 Dec 2023 12:16:02 +0000 Subject: [PATCH] Rearrange DQT-related services (#974) * Rename DQT integration tests project * Rearrange TrsDataSync and DqtReporting bits --- .github/workflows/pr.yml | 6 +- TeachingRecordSystem/TeachingRecordSystem.sln | 4 +- .../src/TeachingRecordSystem.Api/Program.cs | 2 +- .../Commands.GenerateReportingDbTable.cs | 2 +- .../Commands.MigrateReportingDb.cs | 2 +- .../Jobs/SyncAllContactsFromCrmJob.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../CrmEntityChangesService.cs | 5 +- .../ICrmEntityChangesService.cs | 2 +- .../ServiceCollectionExtensions.cs | 3 +- .../DqtReporting/DqtReportingOptions.cs | 2 +- .../DqtReporting/DqtReportingService.cs | 5 +- .../DqtReporting/EntityTableMapping.cs | 2 +- .../HostApplicationBuilderExtensions.cs | 3 +- .../IgnoreDependencyTelemetryProcessor.cs | 2 +- .../DqtReporting/Migrations/0001_Initial.sql | 0 .../Migrations/0002_TrackingColumns.sql | 0 .../0003_ContactSentQtsAwardedEmail.sql | 0 .../0004_ContactAdditionalAttributes.sql | 0 .../Migrations/0005_ContactSlugId.sql | 0 .../0006_Incident_msdyn_copilotengaged.sql | 0 ...007_ContactAllowpiiUpdatesFromRegister.sql | 0 .../0008_EvergreenMissingColumns.sql | 0 .../0009_EvergreenMissingColumns2.sql | 0 .../Migrations/0010_SanctionDetailsLink.sql | 0 .../0011_AddHighProfileProgrammeType.sql | 0 .../0012_FixProgrammeTypeCasing.sql | 0 .../0013_PreviousNameTransactionId.sql | 0 ...ct_dfeta_allowidsigninwithprohibitions.sql | 0 ...15_dfeta_qualification_dfeta_mq_status.sql | 0 ...ta_qualification_dfeta_trsdeletedevent.sql | 0 .../Services/DqtReporting/Migrator.cs | 2 +- .../HostApplicationBuilderExtensions.cs | 3 +- .../Services/TrsDataSync/TrsDataSyncHelper.cs | 5 +- .../TrsDataSync/TrsDataSyncService.cs | 4 +- .../TrsDataSync/TrsDataSyncServiceOptions.cs | 2 +- .../TeachingRecordSystem.Core.csproj | 64 +++++++++---------- .../TeachingRecordSystem.Worker/Program.cs | 6 +- .../CrmClientFixture.cs | 2 +- .../ClearTeacherIdentityInfoTests.cs | 2 +- .../CreateTeacherTests.cs | 2 +- .../ExecuteTransactionRequestExtensions.cs | 2 +- .../FindTeachersTests.cs | 2 +- .../DataverseAdapterTests/GetCountryTests.cs | 2 +- .../GetEarlyYearsStatusTests.cs | 2 +- .../GetEytsAwardeesForDateRangeTests.cs | 2 +- .../GetHeQualificationByCodeTests.cs | 2 +- .../GetHeSubjectByCodeTests.cs | 2 +- .../GetInductionByTeacherTests.cs | 2 +- ...GetInductionCompleteesForDateRangeTests.cs | 2 +- ...GetInitialTeacherTrainingByTeacherTests.cs | 2 +- ...ternationalQtsAwardeesForDateRangeTests.cs | 2 +- .../GetIttProvidersTests.cs | 2 +- .../GetIttSubjectByCodeTests.cs | 2 +- .../GetMatchingTeachersFixture.cs | 2 +- .../GetMatchingTeachersTests.cs | 4 +- .../GetOrganizationsByUkprnTests.cs | 2 +- .../GetQtsAwardeesForDateRangeTests.cs | 2 +- .../GetQualificationByIdTests.cs | 2 +- .../GetQualificationsForTeacherTests.cs | 2 +- .../GetSubjectByTitleTests.cs | 2 +- .../GetTeacherByHusIdTests.cs | 2 +- .../GetTeacherStatusTests.cs | 2 +- .../DataverseAdapterTests/GetTeacherTests.cs | 2 +- ...hersByInitialTeacherTrainingSlugIdTests.cs | 2 +- .../GetTeachersByTrnAndDobTests.cs | 2 +- .../NationalInsuranceNumberGenerator.cs | 2 +- .../SetIttOutcomeForTeacherTests.cs | 2 +- .../SetNpqQualificationTests.cs | 2 +- .../SetTsPersonIdTests.cs | 2 +- .../UnlockTeacherRecordTests.cs | 2 +- .../UpdateTeacherIdentityInfoTests.cs | 2 +- .../UpdateTeacherTests.cs | 2 +- .../EntityTrackingOrganizationService.cs | 2 +- .../ExclusiveCrmTestCollection.cs | 2 +- .../QueryTests/ApproveIncidentTests.cs | 2 +- .../QueryTests/CancelIncidentTests.cs | 2 +- .../QueryTests/CloseSanctionTests.cs | 2 +- .../CreateDateOfBirthChangeIncidentTests.cs | 2 +- .../CreateMandatoryQualificationTests.cs | 2 +- .../CreateNameChangeIncidentTests.cs | 2 +- .../QueryTests/CreateSanctionTests.cs | 2 +- .../QueryTests/DeleteQualificationTests.cs | 2 +- .../QueryTests/GetActiveIncidentsTests.cs | 2 +- .../GetAllEarlyYearsStatusesTests.cs | 2 +- .../QueryTests/GetAllMqEstablishmentsTests.cs | 2 +- .../QueryTests/GetAllSanctionCodesTests.cs | 2 +- .../QueryTests/GetAllSpecialismsTests.cs | 2 +- .../QueryTests/GetAllSubjectsTests.cs | 2 +- .../QueryTests/GetAllTeacherStatusesTests.cs | 2 +- .../QueryTests/GetContactByTrnTests.cs | 2 +- .../QueryTests/GetContactDetailByIdTests.cs | 2 +- .../QueryTests/GetContactDetailByTrnTests.cs | 2 +- .../GetContactsByDateOfBirthTests.cs | 2 +- ...etContactsByLastNameAndDateOfBirthTests.cs | 2 +- .../QueryTests/GetContactsByNameTests.cs | 2 +- .../QueryTests/GetDocumentByIdTests.cs | 2 +- .../GetIncidentByTicketNumberTests.cs | 2 +- .../QueryTests/GetNotesByContactIdTests.cs | 2 +- .../QueryTests/GetQualificationByIdTests.cs | 2 +- .../GetQualificationsByContactIdTests.cs | 2 +- .../GetSanctionDetailsByContactIdTests.cs | 2 +- .../GetSanctionDetailsBySanctionIdTests.cs | 2 +- .../GetSanctionsByContactIdsTests.cs | 2 +- .../QueryTests/RejectIncidentTests.cs | 2 +- .../UpdateContactDateOfBirthTests.cs | 2 +- .../QueryTests/UpdateContactNameTests.cs | 2 +- ...andatoryQualificationEstablishmentTests.cs | 2 +- ...teMandatoryQualificationSpecialismTests.cs | 2 +- ...ateMandatoryQualificationStartDateTests.cs | 2 +- ...UpdateMandatoryQualificationStatusTests.cs | 2 +- .../QueryTests/UpdateSanctionStateTests.cs | 2 +- .../DqtReporting/DqtReportingFixture.cs | 4 +- .../DqtReporting/DqtReportingServiceTests.cs | 2 +- .../Startup.cs | 2 +- ...ystem.Core.Dqt.CrmIntegrationTests.csproj} | 2 - .../TestDataHelper.CreatePerson.cs | 2 +- .../TestDataHelper.CreateQualification.cs | 2 +- .../TestDataHelper.cs | 2 +- .../Usings.cs | 0 .../xunit.runner.json | 0 .../TrsDataSync/TrsDataSyncHelperTests.cs | 5 +- .../TrsDataSync/TrsDataSyncServiceFixture.cs | 21 +++--- .../TrsDataSync/TrsDataSyncServiceTests.cs | 3 +- .../Startup.cs | 3 + .../TeachingRecordSystem.TestCommon.csproj | 2 + .../TestableCrmEntityChangesService.cs | 6 +- 127 files changed, 171 insertions(+), 165 deletions(-) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/CrmEntityChanges/CrmEntityChangesService.cs (97%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/CrmEntityChanges/ICrmEntityChangesService.cs (86%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/CrmEntityChanges/ServiceCollectionExtensions.cs (82%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/DqtReporting/DqtReportingOptions.cs (89%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/DqtReporting/DqtReportingService.cs (98%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/DqtReporting/EntityTableMapping.cs (99%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/DqtReporting/HostApplicationBuilderExtensions.cs (91%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/DqtReporting/IgnoreDependencyTelemetryProcessor.cs (94%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/DqtReporting/Migrations/0001_Initial.sql (100%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/DqtReporting/Migrations/0002_TrackingColumns.sql (100%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/DqtReporting/Migrations/0003_ContactSentQtsAwardedEmail.sql (100%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/DqtReporting/Migrations/0004_ContactAdditionalAttributes.sql (100%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/DqtReporting/Migrations/0005_ContactSlugId.sql (100%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/DqtReporting/Migrations/0006_Incident_msdyn_copilotengaged.sql (100%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/DqtReporting/Migrations/0007_ContactAllowpiiUpdatesFromRegister.sql (100%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/DqtReporting/Migrations/0008_EvergreenMissingColumns.sql (100%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/DqtReporting/Migrations/0009_EvergreenMissingColumns2.sql (100%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/DqtReporting/Migrations/0010_SanctionDetailsLink.sql (100%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/DqtReporting/Migrations/0011_AddHighProfileProgrammeType.sql (100%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/DqtReporting/Migrations/0012_FixProgrammeTypeCasing.sql (100%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/DqtReporting/Migrations/0013_PreviousNameTransactionId.sql (100%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/DqtReporting/Migrations/0014_Contact_dfeta_allowidsigninwithprohibitions.sql (100%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/DqtReporting/Migrations/0015_dfeta_qualification_dfeta_mq_status.sql (100%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/DqtReporting/Migrations/0016_dfeta_qualification_dfeta_trsdeletedevent.sql (100%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/DqtReporting/Migrator.cs (98%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/TrsDataSync/HostApplicationBuilderExtensions.cs (94%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/TrsDataSync/TrsDataSyncHelper.cs (98%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/TrsDataSync/TrsDataSyncService.cs (97%) rename TeachingRecordSystem/src/TeachingRecordSystem.Core/{Dqt => }/Services/TrsDataSync/TrsDataSyncServiceOptions.cs (89%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/CrmClientFixture.cs (99%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/ClearTeacherIdentityInfoTests.cs (96%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/CreateTeacherTests.cs (99%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/ExecuteTransactionRequestExtensions.cs (97%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/FindTeachersTests.cs (98%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/GetCountryTests.cs (93%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/GetEarlyYearsStatusTests.cs (93%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/GetEytsAwardeesForDateRangeTests.cs (99%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/GetHeQualificationByCodeTests.cs (93%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/GetHeSubjectByCodeTests.cs (93%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/GetInductionByTeacherTests.cs (99%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/GetInductionCompleteesForDateRangeTests.cs (99%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/GetInitialTeacherTrainingByTeacherTests.cs (99%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/GetInternationalQtsAwardeesForDateRangeTests.cs (98%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/GetIttProvidersTests.cs (90%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/GetIttSubjectByCodeTests.cs (93%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/GetMatchingTeachersFixture.cs (97%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/GetMatchingTeachersTests.cs (95%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/GetOrganizationsByUkprnTests.cs (93%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/GetQtsAwardeesForDateRangeTests.cs (99%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/GetQualificationByIdTests.cs (97%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/GetQualificationsForTeacherTests.cs (99%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/GetSubjectByTitleTests.cs (93%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/GetTeacherByHusIdTests.cs (97%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/GetTeacherStatusTests.cs (93%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/GetTeacherTests.cs (97%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/GetTeachersByInitialTeacherTrainingSlugIdTests.cs (96%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/GetTeachersByTrnAndDobTests.cs (97%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/NationalInsuranceNumberGenerator.cs (94%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/SetIttOutcomeForTeacherTests.cs (99%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/SetNpqQualificationTests.cs (99%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/SetTsPersonIdTests.cs (94%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/UnlockTeacherRecordTests.cs (95%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/UpdateTeacherIdentityInfoTests.cs (97%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/DataverseAdapterTests/UpdateTeacherTests.cs (99%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/EntityTrackingOrganizationService.cs (99%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/ExclusiveCrmTestCollection.cs (66%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/ApproveIncidentTests.cs (95%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/CancelIncidentTests.cs (95%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/CloseSanctionTests.cs (95%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/CreateDateOfBirthChangeIncidentTests.cs (96%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/CreateMandatoryQualificationTests.cs (97%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/CreateNameChangeIncidentTests.cs (97%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/CreateSanctionTests.cs (96%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/DeleteQualificationTests.cs (95%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/GetActiveIncidentsTests.cs (96%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/GetAllEarlyYearsStatusesTests.cs (88%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/GetAllMqEstablishmentsTests.cs (88%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/GetAllSanctionCodesTests.cs (88%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/GetAllSpecialismsTests.cs (88%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/GetAllSubjectsTests.cs (87%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/GetAllTeacherStatusesTests.cs (88%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/GetContactByTrnTests.cs (94%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/GetContactDetailByIdTests.cs (97%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/GetContactDetailByTrnTests.cs (96%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/GetContactsByDateOfBirthTests.cs (98%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/GetContactsByLastNameAndDateOfBirthTests.cs (95%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/GetContactsByNameTests.cs (98%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/GetDocumentByIdTests.cs (95%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/GetIncidentByTicketNumberTests.cs (96%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/GetNotesByContactIdTests.cs (97%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/GetQualificationByIdTests.cs (95%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/GetQualificationsByContactIdTests.cs (95%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/GetSanctionDetailsByContactIdTests.cs (96%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/GetSanctionDetailsBySanctionIdTests.cs (94%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/GetSanctionsByContactIdsTests.cs (96%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/RejectIncidentTests.cs (95%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/UpdateContactDateOfBirthTests.cs (95%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/UpdateContactNameTests.cs (95%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/UpdateMandatoryQualificationEstablishmentTests.cs (96%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/UpdateMandatoryQualificationSpecialismTests.cs (96%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/UpdateMandatoryQualificationStartDateTests.cs (95%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/UpdateMandatoryQualificationStatusTests.cs (97%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/QueryTests/UpdateSanctionStateTests.cs (95%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/Services/DqtReporting/DqtReportingFixture.cs (94%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/Services/DqtReporting/DqtReportingServiceTests.cs (98%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/Startup.cs (95%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests/TeachingRecordSystem.Core.Dqt.Tests.csproj => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.csproj} (92%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/TestDataHelper.CreatePerson.cs (99%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/TestDataHelper.CreateQualification.cs (98%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/TestDataHelper.cs (87%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/Usings.cs (100%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Dqt.CrmIntegrationTests}/xunit.runner.json (100%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Tests}/Services/TrsDataSync/TrsDataSyncHelperTests.cs (98%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Tests}/Services/TrsDataSync/TrsDataSyncServiceFixture.cs (73%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests => TeachingRecordSystem.Core.Tests}/Services/TrsDataSync/TrsDataSyncServiceTests.cs (98%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.Core.Dqt.Tests/Services => TeachingRecordSystem.TestCommon}/TestableCrmEntityChangesService.cs (89%) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 78ffac245..a4a078957 100644 --- 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 index d00372d65..118beeff4 100644 --- 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 index d785f7331..dc6eff986 100644 --- 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 index 8766329bc..19851eb6a 100644 --- 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 index 40a4473ee..1cd43191d 100644 --- 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 index 65ea1a120..12090cbc5 100644 --- 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 index 5d6603b1f..ab9ff0a83 100644 --- 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/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/CrmEntityChanges/CrmEntityChangesService.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/CrmEntityChanges/CrmEntityChangesService.cs similarity index 97% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/CrmEntityChanges/CrmEntityChangesService.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/CrmEntityChanges/CrmEntityChangesService.cs index 681035e54..92907de4a 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/CrmEntityChanges/CrmEntityChangesService.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/CrmEntityChanges/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("modifiedon") >= modifiedSince.Value)) + e is NewOrUpdatedItem newOrUpdatedItem && newOrUpdatedItem.NewOrUpdatedEntity.GetAttributeValue("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/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/CrmEntityChanges/ICrmEntityChangesService.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/CrmEntityChanges/ICrmEntityChangesService.cs similarity index 86% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/CrmEntityChanges/ICrmEntityChangesService.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/CrmEntityChanges/ICrmEntityChangesService.cs index 7bfd6293a..afc36501d 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/CrmEntityChanges/ICrmEntityChangesService.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/CrmEntityChanges/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/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/CrmEntityChanges/ServiceCollectionExtensions.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/CrmEntityChanges/ServiceCollectionExtensions.cs similarity index 82% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/CrmEntityChanges/ServiceCollectionExtensions.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/CrmEntityChanges/ServiceCollectionExtensions.cs index 55e7b6fe1..12d828867 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/CrmEntityChanges/ServiceCollectionExtensions.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/CrmEntityChanges/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/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/DqtReportingOptions.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/DqtReportingOptions.cs similarity index 89% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/DqtReportingOptions.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/DqtReportingOptions.cs index 37dac4a94..ec8f5a73b 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/DqtReportingOptions.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/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/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/DqtReportingService.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/DqtReportingService.cs similarity index 98% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/DqtReportingService.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/DqtReportingService.cs index eaa2c3990..84e1fa6cd 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/DqtReportingService.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/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/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/EntityTableMapping.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/EntityTableMapping.cs similarity index 99% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/EntityTableMapping.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/EntityTableMapping.cs index 26e579a8b..dead4184e 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/EntityTableMapping.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/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/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/HostApplicationBuilderExtensions.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/HostApplicationBuilderExtensions.cs similarity index 91% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/HostApplicationBuilderExtensions.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/HostApplicationBuilderExtensions.cs index d077b9773..139e2d294 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/HostApplicationBuilderExtensions.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/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/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/IgnoreDependencyTelemetryProcessor.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/IgnoreDependencyTelemetryProcessor.cs similarity index 94% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/IgnoreDependencyTelemetryProcessor.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/IgnoreDependencyTelemetryProcessor.cs index 5b0b26a8b..661e570d4 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/IgnoreDependencyTelemetryProcessor.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/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/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0001_Initial.sql b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0001_Initial.sql similarity index 100% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0001_Initial.sql rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0001_Initial.sql diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0002_TrackingColumns.sql b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0002_TrackingColumns.sql similarity index 100% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0002_TrackingColumns.sql rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0002_TrackingColumns.sql diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0003_ContactSentQtsAwardedEmail.sql b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0003_ContactSentQtsAwardedEmail.sql similarity index 100% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0003_ContactSentQtsAwardedEmail.sql rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0003_ContactSentQtsAwardedEmail.sql diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0004_ContactAdditionalAttributes.sql b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0004_ContactAdditionalAttributes.sql similarity index 100% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0004_ContactAdditionalAttributes.sql rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0004_ContactAdditionalAttributes.sql diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0005_ContactSlugId.sql b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0005_ContactSlugId.sql similarity index 100% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0005_ContactSlugId.sql rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0005_ContactSlugId.sql diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0006_Incident_msdyn_copilotengaged.sql b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0006_Incident_msdyn_copilotengaged.sql similarity index 100% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0006_Incident_msdyn_copilotengaged.sql rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0006_Incident_msdyn_copilotengaged.sql diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0007_ContactAllowpiiUpdatesFromRegister.sql b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0007_ContactAllowpiiUpdatesFromRegister.sql similarity index 100% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0007_ContactAllowpiiUpdatesFromRegister.sql rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0007_ContactAllowpiiUpdatesFromRegister.sql diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0008_EvergreenMissingColumns.sql b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0008_EvergreenMissingColumns.sql similarity index 100% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0008_EvergreenMissingColumns.sql rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0008_EvergreenMissingColumns.sql diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0009_EvergreenMissingColumns2.sql b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0009_EvergreenMissingColumns2.sql similarity index 100% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0009_EvergreenMissingColumns2.sql rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0009_EvergreenMissingColumns2.sql diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0010_SanctionDetailsLink.sql b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0010_SanctionDetailsLink.sql similarity index 100% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0010_SanctionDetailsLink.sql rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0010_SanctionDetailsLink.sql diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0011_AddHighProfileProgrammeType.sql b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0011_AddHighProfileProgrammeType.sql similarity index 100% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0011_AddHighProfileProgrammeType.sql rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0011_AddHighProfileProgrammeType.sql diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0012_FixProgrammeTypeCasing.sql b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0012_FixProgrammeTypeCasing.sql similarity index 100% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0012_FixProgrammeTypeCasing.sql rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0012_FixProgrammeTypeCasing.sql diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0013_PreviousNameTransactionId.sql b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0013_PreviousNameTransactionId.sql similarity index 100% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0013_PreviousNameTransactionId.sql rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0013_PreviousNameTransactionId.sql diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0014_Contact_dfeta_allowidsigninwithprohibitions.sql b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0014_Contact_dfeta_allowidsigninwithprohibitions.sql similarity index 100% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0014_Contact_dfeta_allowidsigninwithprohibitions.sql rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0014_Contact_dfeta_allowidsigninwithprohibitions.sql diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0015_dfeta_qualification_dfeta_mq_status.sql b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0015_dfeta_qualification_dfeta_mq_status.sql similarity index 100% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0015_dfeta_qualification_dfeta_mq_status.sql rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0015_dfeta_qualification_dfeta_mq_status.sql diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0016_dfeta_qualification_dfeta_trsdeletedevent.sql b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0016_dfeta_qualification_dfeta_trsdeletedevent.sql similarity index 100% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrations/0016_dfeta_qualification_dfeta_trsdeletedevent.sql rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrations/0016_dfeta_qualification_dfeta_trsdeletedevent.sql diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrator.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrator.cs similarity index 98% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrator.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/Migrator.cs index 6c12cb28f..bb5b3025b 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/DqtReporting/Migrator.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.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/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/TrsDataSync/HostApplicationBuilderExtensions.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/TrsDataSync/HostApplicationBuilderExtensions.cs similarity index 94% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/TrsDataSync/HostApplicationBuilderExtensions.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/TrsDataSync/HostApplicationBuilderExtensions.cs index 3f496a155..851fa0f6d 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/TrsDataSync/HostApplicationBuilderExtensions.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/TrsDataSync/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/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/TrsDataSync/TrsDataSyncHelper.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/TrsDataSync/TrsDataSyncHelper.cs similarity index 98% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/TrsDataSync/TrsDataSyncHelper.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/TrsDataSync/TrsDataSyncHelper.cs index 153d64fe9..ad9554e88 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/TrsDataSync/TrsDataSyncHelper.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.Core/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 entities, bool ignor await txn.CommitAsync(cancellationToken); - void WriteNullableValueOrNull(Nullable value, NpgsqlDbType dbType) + void WriteNullableValueOrNull(T? value, NpgsqlDbType dbType) where T : struct { if (value.HasValue) diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/TrsDataSync/TrsDataSyncService.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/TrsDataSync/TrsDataSyncService.cs similarity index 97% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/TrsDataSync/TrsDataSyncService.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/TrsDataSync/TrsDataSyncService.cs index 84c06de50..c1b5b59af 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/TrsDataSync/TrsDataSyncService.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/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/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/TrsDataSync/TrsDataSyncServiceOptions.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/TrsDataSync/TrsDataSyncServiceOptions.cs similarity index 89% rename from TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/TrsDataSync/TrsDataSyncServiceOptions.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/TrsDataSync/TrsDataSyncServiceOptions.cs index ccd084ece..750621a41 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Dqt/Services/TrsDataSync/TrsDataSyncServiceOptions.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/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 index 8fff6eca2..035a0ae1e 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Core/TeachingRecordSystem.Core.csproj +++ b/TeachingRecordSystem/src/TeachingRecordSystem.Core/TeachingRecordSystem.Core.csproj @@ -5,41 +5,41 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Worker/Program.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Worker/Program.cs index 7e500e104..586781339 100644 --- 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/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/CrmClientFixture.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/CrmClientFixture.cs similarity index 99% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/CrmClientFixture.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/CrmClientFixture.cs index 0693de526..226e1b51b 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/CrmClientFixture.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.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/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/ClearTeacherIdentityInfoTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/ClearTeacherIdentityInfoTests.cs similarity index 96% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/ClearTeacherIdentityInfoTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/ClearTeacherIdentityInfoTests.cs index a25b8f845..815f39a0c 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/ClearTeacherIdentityInfoTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/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/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/CreateTeacherTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/CreateTeacherTests.cs similarity index 99% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/CreateTeacherTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/CreateTeacherTests.cs index 623382dc1..6b1156aa3 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/CreateTeacherTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/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, IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/ExecuteTransactionRequestExtensions.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/ExecuteTransactionRequestExtensions.cs similarity index 97% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/ExecuteTransactionRequestExtensions.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/ExecuteTransactionRequestExtensions.cs index 884380493..642c73ac1 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/ExecuteTransactionRequestExtensions.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/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/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/FindTeachersTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/FindTeachersTests.cs similarity index 98% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/FindTeachersTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/FindTeachersTests.cs index 8643d6265..ef653778c 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/FindTeachersTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/FindTeachersTests.cs @@ -1,6 +1,6 @@ #nullable disable -namespace TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests; public class FindTeachersTests : IClassFixture { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetCountryTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetCountryTests.cs similarity index 93% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetCountryTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetCountryTests.cs index b5a52eb03..563ad963c 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetCountryTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/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/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetEarlyYearsStatusTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetEarlyYearsStatusTests.cs similarity index 93% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetEarlyYearsStatusTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetEarlyYearsStatusTests.cs index 294951420..8fb4db56a 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetEarlyYearsStatusTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/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/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetEytsAwardeesForDateRangeTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetEytsAwardeesForDateRangeTests.cs similarity index 99% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetEytsAwardeesForDateRangeTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetEytsAwardeesForDateRangeTests.cs index d222caf62..fb3d2d542 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetEytsAwardeesForDateRangeTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/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 { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetHeQualificationByCodeTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetHeQualificationByCodeTests.cs similarity index 93% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetHeQualificationByCodeTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetHeQualificationByCodeTests.cs index cafb490f7..c2a4effdd 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetHeQualificationByCodeTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetHeQualificationByCodeTests.cs @@ -1,6 +1,6 @@ #nullable disable -namespace TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests; public class GetHeQualificationByCodeTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetHeSubjectByCodeTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetHeSubjectByCodeTests.cs similarity index 93% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetHeSubjectByCodeTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetHeSubjectByCodeTests.cs index 470a019fd..38831be78 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetHeSubjectByCodeTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetHeSubjectByCodeTests.cs @@ -1,6 +1,6 @@ #nullable disable -namespace TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests; public class GetHeSubjectByCodeTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetInductionByTeacherTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetInductionByTeacherTests.cs similarity index 99% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetInductionByTeacherTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetInductionByTeacherTests.cs index 8e31f5e54..3a3cc5f03 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetInductionByTeacherTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetInductionByTeacherTests.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 GetInductionByTeacherTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetInductionCompleteesForDateRangeTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetInductionCompleteesForDateRangeTests.cs similarity index 99% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetInductionCompleteesForDateRangeTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetInductionCompleteesForDateRangeTests.cs index 08c5f9632..7b8994e6d 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetInductionCompleteesForDateRangeTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetInductionCompleteesForDateRangeTests.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 GetInductionCompleteesForDateRangeTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetInitialTeacherTrainingByTeacherTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetInitialTeacherTrainingByTeacherTests.cs similarity index 99% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetInitialTeacherTrainingByTeacherTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetInitialTeacherTrainingByTeacherTests.cs index 004a7465c..08b47b17a 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetInitialTeacherTrainingByTeacherTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetInitialTeacherTrainingByTeacherTests.cs @@ -3,7 +3,7 @@ using Microsoft.Xrm.Sdk; using Microsoft.Xrm.Sdk.Messages; -namespace TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests; public class GetInitialTeacherTrainingByTeacherTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetInternationalQtsAwardeesForDateRangeTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetInternationalQtsAwardeesForDateRangeTests.cs similarity index 98% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetInternationalQtsAwardeesForDateRangeTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetInternationalQtsAwardeesForDateRangeTests.cs index 4e7083ccb..625d6d86d 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetInternationalQtsAwardeesForDateRangeTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetInternationalQtsAwardeesForDateRangeTests.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; [Collection(nameof(ExclusiveCrmTestCollection))] public class GetInternationalQtsAwardeesForDateRangeTests : IAsyncLifetime diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetIttProvidersTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetIttProvidersTests.cs similarity index 90% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetIttProvidersTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetIttProvidersTests.cs index 98298c7d6..b04acd84a 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetIttProvidersTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetIttProvidersTests.cs @@ -1,6 +1,6 @@ #nullable disable -namespace TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests; public class GetIttProvidersTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetIttSubjectByCodeTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetIttSubjectByCodeTests.cs similarity index 93% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetIttSubjectByCodeTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetIttSubjectByCodeTests.cs index 6c7ddaa12..162f85306 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetIttSubjectByCodeTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetIttSubjectByCodeTests.cs @@ -1,6 +1,6 @@ #nullable disable -namespace TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests; public class GetIttSubjectByCodeTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetMatchingTeachersFixture.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetMatchingTeachersFixture.cs similarity index 97% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetMatchingTeachersFixture.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetMatchingTeachersFixture.cs index fa3900681..49f80a683 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetMatchingTeachersFixture.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetMatchingTeachersFixture.cs @@ -2,7 +2,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 GetMatchingTeachersFixture : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetMatchingTeachersTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetMatchingTeachersTests.cs similarity index 95% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetMatchingTeachersTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetMatchingTeachersTests.cs index 934f647f1..8a1d71475 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetMatchingTeachersTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetMatchingTeachersTests.cs @@ -1,7 +1,7 @@ #nullable disable -using static TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests.GetMatchingTeachersFixture; +using static TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests.GetMatchingTeachersFixture; -namespace TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests; [Collection(nameof(ExclusiveCrmTestCollection))] public class GetMatchingTeachersTests : IClassFixture diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetOrganizationsByUkprnTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetOrganizationsByUkprnTests.cs similarity index 93% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetOrganizationsByUkprnTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetOrganizationsByUkprnTests.cs index b32221720..681e26a28 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetOrganizationsByUkprnTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetOrganizationsByUkprnTests.cs @@ -1,6 +1,6 @@ #nullable disable -namespace TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests; public class GetOrganizationsByUkprnTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetQtsAwardeesForDateRangeTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetQtsAwardeesForDateRangeTests.cs similarity index 99% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetQtsAwardeesForDateRangeTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetQtsAwardeesForDateRangeTests.cs index 2265e81d9..f4dc4b787 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetQtsAwardeesForDateRangeTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetQtsAwardeesForDateRangeTests.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; [Collection(nameof(ExclusiveCrmTestCollection))] public class GetQtsAwardeesForDateRangeTests : IAsyncLifetime diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetQualificationByIdTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetQualificationByIdTests.cs similarity index 97% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetQualificationByIdTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetQualificationByIdTests.cs index 6a50dffa5..78d4dc836 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetQualificationByIdTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetQualificationByIdTests.cs @@ -3,7 +3,7 @@ using Microsoft.Xrm.Sdk; using Microsoft.Xrm.Sdk.Messages; -namespace TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests; public class GetQualificationByIdTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetQualificationsForTeacherTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetQualificationsForTeacherTests.cs similarity index 99% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetQualificationsForTeacherTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetQualificationsForTeacherTests.cs index 72eb997ad..822386904 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetQualificationsForTeacherTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetQualificationsForTeacherTests.cs @@ -3,7 +3,7 @@ using Microsoft.Xrm.Sdk; using Microsoft.Xrm.Sdk.Messages; -namespace TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests; public class GetQualificationsForTeacherTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetSubjectByTitleTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetSubjectByTitleTests.cs similarity index 93% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetSubjectByTitleTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetSubjectByTitleTests.cs index 6666fc2d0..175e25a97 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetSubjectByTitleTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetSubjectByTitleTests.cs @@ -1,6 +1,6 @@ #nullable disable -namespace TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests; public class GetSubjectByTitleTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetTeacherByHusIdTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetTeacherByHusIdTests.cs similarity index 97% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetTeacherByHusIdTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetTeacherByHusIdTests.cs index 1ab107ba1..e37a98698 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetTeacherByHusIdTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetTeacherByHusIdTests.cs @@ -1,7 +1,7 @@ #nullable disable using Microsoft.Xrm.Sdk.Messages; -namespace TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests; public class GetTeacherByHusIdTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetTeacherStatusTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetTeacherStatusTests.cs similarity index 93% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetTeacherStatusTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetTeacherStatusTests.cs index 4f7ab9f48..a652c6f0d 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetTeacherStatusTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetTeacherStatusTests.cs @@ -1,6 +1,6 @@ #nullable disable -namespace TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests; public class GetTeacherStatusTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetTeacherTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetTeacherTests.cs similarity index 97% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetTeacherTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetTeacherTests.cs index b79321eab..6757f8a3b 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetTeacherTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetTeacherTests.cs @@ -3,7 +3,7 @@ using Microsoft.PowerPlatform.Dataverse.Client; using Microsoft.Xrm.Sdk; -namespace TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests; public class GetTeacherTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetTeachersByInitialTeacherTrainingSlugIdTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetTeachersByInitialTeacherTrainingSlugIdTests.cs similarity index 96% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetTeachersByInitialTeacherTrainingSlugIdTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetTeachersByInitialTeacherTrainingSlugIdTests.cs index 465dcacca..17b474747 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetTeachersByInitialTeacherTrainingSlugIdTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetTeachersByInitialTeacherTrainingSlugIdTests.cs @@ -1,6 +1,6 @@ using Microsoft.Xrm.Sdk; -namespace TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests; public class GetTeachersByInitialTeacherTrainingSlugIdTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetTeachersByTrnAndDobTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetTeachersByTrnAndDobTests.cs similarity index 97% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetTeachersByTrnAndDobTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetTeachersByTrnAndDobTests.cs index bd6053d06..878ed5f5c 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/GetTeachersByTrnAndDobTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/GetTeachersByTrnAndDobTests.cs @@ -1,7 +1,7 @@ #nullable disable using Microsoft.Xrm.Sdk.Messages; -namespace TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests; public class GetTeachersByTrnAndDobTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/NationalInsuranceNumberGenerator.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/NationalInsuranceNumberGenerator.cs similarity index 94% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/NationalInsuranceNumberGenerator.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/NationalInsuranceNumberGenerator.cs index 64cd778d7..e17e84cab 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/NationalInsuranceNumberGenerator.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/NationalInsuranceNumberGenerator.cs @@ -2,7 +2,7 @@ using Microsoft.Xrm.Sdk; using Microsoft.Xrm.Sdk.Query; -namespace TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests; public class NationalInsuranceNumberGenerator { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/SetIttOutcomeForTeacherTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/SetIttOutcomeForTeacherTests.cs similarity index 99% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/SetIttOutcomeForTeacherTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/SetIttOutcomeForTeacherTests.cs index 6a9a2d8fd..b90569d0d 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/SetIttOutcomeForTeacherTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/SetIttOutcomeForTeacherTests.cs @@ -3,7 +3,7 @@ using Microsoft.Xrm.Sdk; using Microsoft.Xrm.Sdk.Messages; -namespace TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests; public class SetIttOutcomeForTeacherTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/SetNpqQualificationTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/SetNpqQualificationTests.cs similarity index 99% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/SetNpqQualificationTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/SetNpqQualificationTests.cs index 39e9095d9..55051b160 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/SetNpqQualificationTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/SetNpqQualificationTests.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 SetNpqQualificationTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/SetTsPersonIdTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/SetTsPersonIdTests.cs similarity index 94% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/SetTsPersonIdTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/SetTsPersonIdTests.cs index 899427e1d..6231544e8 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/SetTsPersonIdTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/SetTsPersonIdTests.cs @@ -2,7 +2,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 SetTsPersonIdTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/UnlockTeacherRecordTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/UnlockTeacherRecordTests.cs similarity index 95% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/UnlockTeacherRecordTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/UnlockTeacherRecordTests.cs index 1d91e015e..17155bb94 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/UnlockTeacherRecordTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/UnlockTeacherRecordTests.cs @@ -2,7 +2,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 UnlockTeacherRecordTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/UpdateTeacherIdentityInfoTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/UpdateTeacherIdentityInfoTests.cs similarity index 97% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/UpdateTeacherIdentityInfoTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/UpdateTeacherIdentityInfoTests.cs index 70532f3fb..0f65fbfab 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/UpdateTeacherIdentityInfoTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/UpdateTeacherIdentityInfoTests.cs @@ -2,7 +2,7 @@ using Microsoft.PowerPlatform.Dataverse.Client; using Microsoft.Xrm.Sdk.Messages; -namespace TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests; public class UpdateTeacherIdentityInfoTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/UpdateTeacherTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/UpdateTeacherTests.cs similarity index 99% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/UpdateTeacherTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/UpdateTeacherTests.cs index 5c5a2fbd5..054915d47 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/DataverseAdapterTests/UpdateTeacherTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/DataverseAdapterTests/UpdateTeacherTests.cs @@ -5,7 +5,7 @@ using Optional; using Optional.Unsafe; -namespace TeachingRecordSystem.Core.Dqt.Tests.DataverseAdapterTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.DataverseAdapterTests; public class UpdateTeacherTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/EntityTrackingOrganizationService.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/EntityTrackingOrganizationService.cs similarity index 99% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/EntityTrackingOrganizationService.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/EntityTrackingOrganizationService.cs index d097732a3..0cd983025 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/EntityTrackingOrganizationService.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/EntityTrackingOrganizationService.cs @@ -5,7 +5,7 @@ using Microsoft.Xrm.Sdk; using Microsoft.Xrm.Sdk.Messages; -namespace TeachingRecordSystem.Core.Dqt.Tests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests; public interface ITrackedEntityOrganizationService : IOrganizationServiceAsync2, IAsyncDisposable { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/ExclusiveCrmTestCollection.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/ExclusiveCrmTestCollection.cs similarity index 66% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/ExclusiveCrmTestCollection.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/ExclusiveCrmTestCollection.cs index 89ac56f48..75fca1a2a 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/ExclusiveCrmTestCollection.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/ExclusiveCrmTestCollection.cs @@ -1,6 +1,6 @@ #nullable disable -namespace TeachingRecordSystem.Core.Dqt.Tests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests; [CollectionDefinition(nameof(ExclusiveCrmTestCollection))] public class ExclusiveCrmTestCollection diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/ApproveIncidentTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/ApproveIncidentTests.cs similarity index 95% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/ApproveIncidentTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/ApproveIncidentTests.cs index 6dd329143..77109d1c6 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/ApproveIncidentTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/ApproveIncidentTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class ApproveIncidentTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/CancelIncidentTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/CancelIncidentTests.cs similarity index 95% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/CancelIncidentTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/CancelIncidentTests.cs index 1b7f256c7..3fd616013 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/CancelIncidentTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/CancelIncidentTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class CancelIncidentTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/CloseSanctionTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/CloseSanctionTests.cs similarity index 95% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/CloseSanctionTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/CloseSanctionTests.cs index f26b4f881..16e4433e5 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/CloseSanctionTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/CloseSanctionTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class CloseSanctionTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/CreateDateOfBirthChangeIncidentTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/CreateDateOfBirthChangeIncidentTests.cs similarity index 96% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/CreateDateOfBirthChangeIncidentTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/CreateDateOfBirthChangeIncidentTests.cs index e8d952679..a9258c2a9 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/CreateDateOfBirthChangeIncidentTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/CreateDateOfBirthChangeIncidentTests.cs @@ -1,6 +1,6 @@ using System.Text; -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class CreateDateOfBirthChangeIncidentTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/CreateMandatoryQualificationTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/CreateMandatoryQualificationTests.cs similarity index 97% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/CreateMandatoryQualificationTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/CreateMandatoryQualificationTests.cs index e2a23d09a..c78fbd0dd 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/CreateMandatoryQualificationTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/CreateMandatoryQualificationTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class CreateMandatoryQualificationTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/CreateNameChangeIncidentTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/CreateNameChangeIncidentTests.cs similarity index 97% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/CreateNameChangeIncidentTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/CreateNameChangeIncidentTests.cs index 8fbdfc8fb..7f211520f 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/CreateNameChangeIncidentTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/CreateNameChangeIncidentTests.cs @@ -1,6 +1,6 @@ using System.Text; -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class CreateNameChangeIncidentTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/CreateSanctionTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/CreateSanctionTests.cs similarity index 96% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/CreateSanctionTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/CreateSanctionTests.cs index 7a02f00fd..e92e71225 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/CreateSanctionTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/CreateSanctionTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class CreateSanctionTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/DeleteQualificationTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/DeleteQualificationTests.cs similarity index 95% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/DeleteQualificationTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/DeleteQualificationTests.cs index 8c873e7da..6494a81d2 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/DeleteQualificationTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/DeleteQualificationTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class DeleteQualificationTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetActiveIncidentsTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetActiveIncidentsTests.cs similarity index 96% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetActiveIncidentsTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetActiveIncidentsTests.cs index 097ca1419..cd36ba151 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetActiveIncidentsTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetActiveIncidentsTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class GetActiveIncidentsTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetAllEarlyYearsStatusesTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetAllEarlyYearsStatusesTests.cs similarity index 88% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetAllEarlyYearsStatusesTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetAllEarlyYearsStatusesTests.cs index ef7c9351c..3055b2757 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetAllEarlyYearsStatusesTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetAllEarlyYearsStatusesTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class GetAllEarlyYearsStatusesTests { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetAllMqEstablishmentsTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetAllMqEstablishmentsTests.cs similarity index 88% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetAllMqEstablishmentsTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetAllMqEstablishmentsTests.cs index 985e8c14d..8e263b9e2 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetAllMqEstablishmentsTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetAllMqEstablishmentsTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class GetAllMqEstablishmentsTests { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetAllSanctionCodesTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetAllSanctionCodesTests.cs similarity index 88% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetAllSanctionCodesTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetAllSanctionCodesTests.cs index d5b75a94e..739b72e87 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetAllSanctionCodesTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetAllSanctionCodesTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class GetAllSanctionCodesTests { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetAllSpecialismsTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetAllSpecialismsTests.cs similarity index 88% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetAllSpecialismsTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetAllSpecialismsTests.cs index 42c421233..10329ef9d 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetAllSpecialismsTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetAllSpecialismsTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class GetAllSpecialismsTests { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetAllSubjectsTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetAllSubjectsTests.cs similarity index 87% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetAllSubjectsTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetAllSubjectsTests.cs index 72e59e4b0..e47999f48 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetAllSubjectsTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetAllSubjectsTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class GetAllSubjectsTests { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetAllTeacherStatusesTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetAllTeacherStatusesTests.cs similarity index 88% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetAllTeacherStatusesTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetAllTeacherStatusesTests.cs index 35ca34758..f68b4fb14 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetAllTeacherStatusesTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetAllTeacherStatusesTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class GetAllTeacherStatusesTests { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetContactByTrnTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetContactByTrnTests.cs similarity index 94% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetContactByTrnTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetContactByTrnTests.cs index 3507371ea..c48994f84 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetContactByTrnTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetContactByTrnTests.cs @@ -1,6 +1,6 @@ using Microsoft.Xrm.Sdk.Query; -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class GetContactByTrnTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetContactDetailByIdTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetContactDetailByIdTests.cs similarity index 97% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetContactDetailByIdTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetContactDetailByIdTests.cs index a28f5a96f..812da28e5 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetContactDetailByIdTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetContactDetailByIdTests.cs @@ -1,6 +1,6 @@ using Microsoft.Xrm.Sdk.Query; -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class GetContactDetailByIdTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetContactDetailByTrnTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetContactDetailByTrnTests.cs similarity index 96% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetContactDetailByTrnTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetContactDetailByTrnTests.cs index 421ea67ef..74ff6fcd1 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetContactDetailByTrnTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetContactDetailByTrnTests.cs @@ -1,6 +1,6 @@ using Microsoft.Xrm.Sdk.Query; -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class GetContactDetailByTrnTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetContactsByDateOfBirthTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetContactsByDateOfBirthTests.cs similarity index 98% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetContactsByDateOfBirthTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetContactsByDateOfBirthTests.cs index 46316ef69..68989cda6 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetContactsByDateOfBirthTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetContactsByDateOfBirthTests.cs @@ -1,6 +1,6 @@ using Microsoft.Xrm.Sdk.Query; -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class GetContactsByDateOfBirthTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetContactsByLastNameAndDateOfBirthTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetContactsByLastNameAndDateOfBirthTests.cs similarity index 95% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetContactsByLastNameAndDateOfBirthTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetContactsByLastNameAndDateOfBirthTests.cs index c023ade31..0277c635b 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetContactsByLastNameAndDateOfBirthTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetContactsByLastNameAndDateOfBirthTests.cs @@ -1,6 +1,6 @@ using Microsoft.Xrm.Sdk.Query; -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class GetContactsByLastNameAndDateOfBirthTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetContactsByNameTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetContactsByNameTests.cs similarity index 98% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetContactsByNameTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetContactsByNameTests.cs index 1c5bcdf89..16446ad74 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetContactsByNameTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetContactsByNameTests.cs @@ -1,6 +1,6 @@ using Microsoft.Xrm.Sdk.Query; -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class GetContactsByNameTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetDocumentByIdTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetDocumentByIdTests.cs similarity index 95% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetDocumentByIdTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetDocumentByIdTests.cs index 4d6f0307a..7c6b15592 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetDocumentByIdTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetDocumentByIdTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class GetDocumentByIdTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetIncidentByTicketNumberTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetIncidentByTicketNumberTests.cs similarity index 96% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetIncidentByTicketNumberTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetIncidentByTicketNumberTests.cs index a0173150c..4823a850a 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetIncidentByTicketNumberTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetIncidentByTicketNumberTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class GetIncidentByTicketNumberTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetNotesByContactIdTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetNotesByContactIdTests.cs similarity index 97% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetNotesByContactIdTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetNotesByContactIdTests.cs index e16a89115..4e7820f07 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetNotesByContactIdTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetNotesByContactIdTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class GetNotesByContactIdTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetQualificationByIdTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetQualificationByIdTests.cs similarity index 95% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetQualificationByIdTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetQualificationByIdTests.cs index d5c4e7639..69f19c680 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetQualificationByIdTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetQualificationByIdTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class GetQualificationByIdTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetQualificationsByContactIdTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetQualificationsByContactIdTests.cs similarity index 95% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetQualificationsByContactIdTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetQualificationsByContactIdTests.cs index dec4c5a3c..74c770555 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetQualificationsByContactIdTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetQualificationsByContactIdTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class GetQualificationsByContactIdTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetSanctionDetailsByContactIdTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetSanctionDetailsByContactIdTests.cs similarity index 96% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetSanctionDetailsByContactIdTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetSanctionDetailsByContactIdTests.cs index 0bfe0d61c..4ba9181a9 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetSanctionDetailsByContactIdTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetSanctionDetailsByContactIdTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class GetSanctionDetailsByContactIdTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetSanctionDetailsBySanctionIdTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetSanctionDetailsBySanctionIdTests.cs similarity index 94% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetSanctionDetailsBySanctionIdTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetSanctionDetailsBySanctionIdTests.cs index d68fd43d2..ac2835191 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetSanctionDetailsBySanctionIdTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetSanctionDetailsBySanctionIdTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class GetSanctionDetailsBySanctionIdTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetSanctionsByContactIdsTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetSanctionsByContactIdsTests.cs similarity index 96% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetSanctionsByContactIdsTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetSanctionsByContactIdsTests.cs index 797b06c8e..37d6de3e4 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/GetSanctionsByContactIdsTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/GetSanctionsByContactIdsTests.cs @@ -1,6 +1,6 @@ using Microsoft.Xrm.Sdk.Query; -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class GetSanctionsByContactIdsTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/RejectIncidentTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/RejectIncidentTests.cs similarity index 95% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/RejectIncidentTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/RejectIncidentTests.cs index ea872c252..c8109e9bb 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/RejectIncidentTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/RejectIncidentTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class RejectIncidentTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/UpdateContactDateOfBirthTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/UpdateContactDateOfBirthTests.cs similarity index 95% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/UpdateContactDateOfBirthTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/UpdateContactDateOfBirthTests.cs index 4ecab0042..defb4cb47 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/UpdateContactDateOfBirthTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/UpdateContactDateOfBirthTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class UpdateContactDateOfBirthTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/UpdateContactNameTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/UpdateContactNameTests.cs similarity index 95% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/UpdateContactNameTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/UpdateContactNameTests.cs index 3244c04b3..3c7e4f829 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/UpdateContactNameTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/UpdateContactNameTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class UpdateContactNameTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/UpdateMandatoryQualificationEstablishmentTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/UpdateMandatoryQualificationEstablishmentTests.cs similarity index 96% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/UpdateMandatoryQualificationEstablishmentTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/UpdateMandatoryQualificationEstablishmentTests.cs index 7183b1ada..c452aeb73 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/UpdateMandatoryQualificationEstablishmentTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/UpdateMandatoryQualificationEstablishmentTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class UpdateMandatoryQualificationEstablishmentTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/UpdateMandatoryQualificationSpecialismTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/UpdateMandatoryQualificationSpecialismTests.cs similarity index 96% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/UpdateMandatoryQualificationSpecialismTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/UpdateMandatoryQualificationSpecialismTests.cs index 73a7cbed9..5a2dd5b54 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/UpdateMandatoryQualificationSpecialismTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/UpdateMandatoryQualificationSpecialismTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class UpdateMandatoryQualificationSpecialismTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/UpdateMandatoryQualificationStartDateTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/UpdateMandatoryQualificationStartDateTests.cs similarity index 95% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/UpdateMandatoryQualificationStartDateTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/UpdateMandatoryQualificationStartDateTests.cs index d954d60d8..2b6cb6212 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/UpdateMandatoryQualificationStartDateTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/UpdateMandatoryQualificationStartDateTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class UpdateMandatoryQualificationStartDateTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/UpdateMandatoryQualificationStatusTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/UpdateMandatoryQualificationStatusTests.cs similarity index 97% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/UpdateMandatoryQualificationStatusTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/UpdateMandatoryQualificationStatusTests.cs index ff7bb0528..c0247b394 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/UpdateMandatoryQualificationStatusTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/UpdateMandatoryQualificationStatusTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class UpdateMandatoryQualificationStatusTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/UpdateSanctionStateTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/UpdateSanctionStateTests.cs similarity index 95% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/UpdateSanctionStateTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/UpdateSanctionStateTests.cs index f8a2ba12c..6ca799e09 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/QueryTests/UpdateSanctionStateTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/QueryTests/UpdateSanctionStateTests.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.Core.Dqt.Tests.QueryTests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.QueryTests; public class UpdateSanctionStateTests : IAsyncLifetime { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/Services/DqtReporting/DqtReportingFixture.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/Services/DqtReporting/DqtReportingFixture.cs similarity index 94% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/Services/DqtReporting/DqtReportingFixture.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/Services/DqtReporting/DqtReportingFixture.cs index 79a220e4e..3a6b0cc7d 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/Services/DqtReporting/DqtReportingFixture.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/Services/DqtReporting/DqtReportingFixture.cs @@ -2,9 +2,9 @@ using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Options; using Microsoft.Xrm.Sdk; -using TeachingRecordSystem.Core.Dqt.Services.DqtReporting; +using TeachingRecordSystem.Core.Services.DqtReporting; -namespace TeachingRecordSystem.Core.Dqt.Tests.Services.DqtReporting; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.Services.DqtReporting; public class DqtReportingFixture { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/Services/DqtReporting/DqtReportingServiceTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/Services/DqtReporting/DqtReportingServiceTests.cs similarity index 98% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/Services/DqtReporting/DqtReportingServiceTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/Services/DqtReporting/DqtReportingServiceTests.cs index 17212a028..6c2138f65 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/Services/DqtReporting/DqtReportingServiceTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/Services/DqtReporting/DqtReportingServiceTests.cs @@ -2,7 +2,7 @@ using Microsoft.Xrm.Sdk; using Xunit.Sdk; -namespace TeachingRecordSystem.Core.Dqt.Tests.Services.DqtReporting; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.Services.DqtReporting; public class DqtReportingServiceTests : IClassFixture { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/Startup.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/Startup.cs similarity index 95% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/Startup.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/Startup.cs index faa00e938..76fd0b328 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/Startup.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/Startup.cs @@ -3,7 +3,7 @@ using Microsoft.PowerPlatform.Dataverse.Client; using TeachingRecordSystem.Core.Infrastructure.Configuration; -namespace TeachingRecordSystem.Core.Dqt.Tests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests; public class Startup { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/TeachingRecordSystem.Core.Dqt.Tests.csproj b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.csproj similarity index 92% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/TeachingRecordSystem.Core.Dqt.Tests.csproj rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.csproj index ef5d4d906..3697baf37 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/TeachingRecordSystem.Core.Dqt.Tests.csproj +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests.csproj @@ -23,8 +23,6 @@ - - diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/TestDataHelper.CreatePerson.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/TestDataHelper.CreatePerson.cs similarity index 99% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/TestDataHelper.CreatePerson.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/TestDataHelper.CreatePerson.cs index 058f3d6d7..db5202e4c 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/TestDataHelper.CreatePerson.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/TestDataHelper.CreatePerson.cs @@ -3,7 +3,7 @@ using Microsoft.Xrm.Sdk; using Microsoft.Xrm.Sdk.Messages; -namespace TeachingRecordSystem.Core.Dqt.Tests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests; public partial class TestDataHelper { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/TestDataHelper.CreateQualification.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/TestDataHelper.CreateQualification.cs similarity index 98% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/TestDataHelper.CreateQualification.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/TestDataHelper.CreateQualification.cs index 2679b44ad..67d983bc4 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/TestDataHelper.CreateQualification.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/TestDataHelper.CreateQualification.cs @@ -3,7 +3,7 @@ using Microsoft.Xrm.Sdk; using Microsoft.Xrm.Sdk.Messages; -namespace TeachingRecordSystem.Core.Dqt.Tests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests; public partial class TestDataHelper { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/TestDataHelper.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/TestDataHelper.cs similarity index 87% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/TestDataHelper.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/TestDataHelper.cs index c694fde1e..8b316a819 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/TestDataHelper.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/TestDataHelper.cs @@ -1,7 +1,7 @@ #nullable disable using Microsoft.Extensions.Caching.Memory; -namespace TeachingRecordSystem.Core.Dqt.Tests; +namespace TeachingRecordSystem.Core.Dqt.CrmIntegrationTests; public partial class TestDataHelper { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/Usings.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/Usings.cs similarity index 100% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/Usings.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/Usings.cs diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/xunit.runner.json b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/xunit.runner.json similarity index 100% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/xunit.runner.json rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/xunit.runner.json diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/Services/TrsDataSync/TrsDataSyncHelperTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Tests/Services/TrsDataSync/TrsDataSyncHelperTests.cs similarity index 98% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/Services/TrsDataSync/TrsDataSyncHelperTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Tests/Services/TrsDataSync/TrsDataSyncHelperTests.cs index a134af4c9..49adf8b87 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/Services/TrsDataSync/TrsDataSyncHelperTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Tests/Services/TrsDataSync/TrsDataSyncHelperTests.cs @@ -1,7 +1,8 @@ using Microsoft.EntityFrameworkCore; -using TeachingRecordSystem.Core.Dqt.Services.TrsDataSync; +using TeachingRecordSystem.Core.Dqt.Models; +using TeachingRecordSystem.Core.Services.TrsDataSync; -namespace TeachingRecordSystem.Core.Dqt.Tests.Services.TrsDataSync; +namespace TeachingRecordSystem.Core.Tests.Services.TrsDataSync; public class TrsDataSyncHelperTests { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/Services/TrsDataSync/TrsDataSyncServiceFixture.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Tests/Services/TrsDataSync/TrsDataSyncServiceFixture.cs similarity index 73% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/Services/TrsDataSync/TrsDataSyncServiceFixture.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Tests/Services/TrsDataSync/TrsDataSyncServiceFixture.cs index cb5f178c8..5fae8f733 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/Services/TrsDataSync/TrsDataSyncServiceFixture.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Tests/Services/TrsDataSync/TrsDataSyncServiceFixture.cs @@ -1,26 +1,21 @@ using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Options; using Microsoft.Xrm.Sdk; -using TeachingRecordSystem.Core.Dqt.Services.TrsDataSync; +using TeachingRecordSystem.Core.Dqt.Models; +using TeachingRecordSystem.Core.Services.TrsDataSync; -namespace TeachingRecordSystem.Core.Dqt.Tests.Services.TrsDataSync; +namespace TeachingRecordSystem.Core.Tests.Services.TrsDataSync; -public class TrsDataSyncServiceFixture +public class TrsDataSyncServiceFixture(DbFixture dbFixture) { - public TrsDataSyncServiceFixture(DbFixture dbFixture) - { - DbFixture = dbFixture; - Clock = new TestableClock(); - } - - public DbFixture DbFixture { get; } + public DbFixture DbFixture { get; } = dbFixture; - public TestableClock Clock { get; } + public TestableClock Clock { get; } = new TestableClock(); public Task PublishChangedItemAndConsume(IChangedItem changedItem) => WithService(async (service, changesObserver) => { - changesObserver.OnNext(new IChangedItem[] { changedItem }); + changesObserver.OnNext([changedItem]); var processTask = service.ProcessChangesForEntityType(Contact.EntityLogicalName, CancellationToken.None); changesObserver.OnCompleted(); await processTask; @@ -31,7 +26,7 @@ public async Task WithService(Func var options = Options.Create(new TrsDataSyncServiceOptions() { CrmConnectionString = "dummy", - Entities = new[] { Contact.EntityLogicalName }, + Entities = [Contact.EntityLogicalName], PollIntervalSeconds = 60, ProcessAllEntityTypesConcurrently = false, IgnoreInvalidData = false, diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/Services/TrsDataSync/TrsDataSyncServiceTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Tests/Services/TrsDataSync/TrsDataSyncServiceTests.cs similarity index 98% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/Services/TrsDataSync/TrsDataSyncServiceTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.Core.Tests/Services/TrsDataSync/TrsDataSyncServiceTests.cs index 3e57491a4..f8eb09294 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/Services/TrsDataSync/TrsDataSyncServiceTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Tests/Services/TrsDataSync/TrsDataSyncServiceTests.cs @@ -1,7 +1,8 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Xrm.Sdk; +using TeachingRecordSystem.Core.Dqt.Models; -namespace TeachingRecordSystem.Core.Dqt.Tests.Services.TrsDataSync; +namespace TeachingRecordSystem.Core.Tests.Services.TrsDataSync; public class TrsDataSyncServiceTests : IClassFixture { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Tests/Startup.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Tests/Startup.cs index fa736acf9..60613af10 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Tests/Startup.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Tests/Startup.cs @@ -1,6 +1,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using TeachingRecordSystem.Core.Dqt; namespace TeachingRecordSystem.Core.Tests; @@ -17,5 +18,7 @@ public void ConfigureHost(IHostBuilder hostBuilder) => services.AddSingleton(); services.AddSingleton(); + services.AddCrmQueries(); + services.AddFakeXrm(); }); } diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.TestCommon/TeachingRecordSystem.TestCommon.csproj b/TeachingRecordSystem/tests/TeachingRecordSystem.TestCommon/TeachingRecordSystem.TestCommon.csproj index c560a20f1..6c5ed93a6 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.TestCommon/TeachingRecordSystem.TestCommon.csproj +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.TestCommon/TeachingRecordSystem.TestCommon.csproj @@ -15,6 +15,8 @@ + + diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/Services/TestableCrmEntityChangesService.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.TestCommon/TestableCrmEntityChangesService.cs similarity index 89% rename from TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/Services/TestableCrmEntityChangesService.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.TestCommon/TestableCrmEntityChangesService.cs index 7c0942a73..f1d3ab0b9 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.Tests/Services/TestableCrmEntityChangesService.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.TestCommon/TestableCrmEntityChangesService.cs @@ -2,9 +2,9 @@ using System.Reactive.Linq; using Microsoft.Xrm.Sdk; using Microsoft.Xrm.Sdk.Query; -using TeachingRecordSystem.Core.Dqt.Services.CrmEntityChanges; +using TeachingRecordSystem.Core.Services.CrmEntityChanges; -namespace TeachingRecordSystem.Core.Dqt.Tests.Services; +namespace TeachingRecordSystem.TestCommon; public sealed class TestableCrmEntityChangesService : ICrmEntityChangesService, IDisposable { @@ -53,7 +53,7 @@ public IAsyncEnumerable GetEntityChanges( return subject .Select(batch => batch .Where(e => !modifiedSince.HasValue || e is not NewOrUpdatedItem || - (e is NewOrUpdatedItem newOrUpdatedItem && newOrUpdatedItem.NewOrUpdatedEntity.GetAttributeValue("modifiedon") >= modifiedSince.Value)) + e is NewOrUpdatedItem newOrUpdatedItem && newOrUpdatedItem.NewOrUpdatedEntity.GetAttributeValue("modifiedon") >= modifiedSince.Value) .ToArray() ) .Where(batch => batch.Length > 0)