diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bd0e01f57..54fe9f35b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -93,27 +93,6 @@ jobs: run: dotnet build --configuration Release --no-restore working-directory: dotnet-authserver - - name: Unit tests - uses: ./.github/workflows/actions/test - if: github.event_name != 'push' - with: - test_project_path: dotnet-authserver/tests/TeacherIdentity.AuthServer.Tests - report_name: "Unit test results" - dotnet_test_args: '-e ConnectionStrings__DefaultConnection="Host=localhost;Username=postgres;Password=teacher_identity;Database=teacher_identity"' - - - name: Install Playwright - run: pwsh ./tests/TeacherIdentity.AuthServer.EndToEndTests/bin/Release/net7.0/playwright.ps1 install - if: github.event_name != 'push' - working-directory: dotnet-authserver - - - name: End-to-end tests - uses: ./.github/workflows/actions/test - if: github.event_name != 'push' - with: - test_project_path: dotnet-authserver/tests/TeacherIdentity.AuthServer.EndToEndTests - report_name: "End-to-end test results" - dotnet_test_args: '-e AuthorizationServer__ConnectionStrings__DefaultConnection="Host=localhost;Username=postgres;Password=teacher_identity;Database=teacher_identity"' - - name: Publish run: | dotnet publish --configuration Release --no-build src/TeacherIdentity.AuthServer/TeacherIdentity.AuthServer.csproj diff --git a/dotnet-authserver/src/TeacherIdentity.AuthServer/Services/UserImport/UserImportProcessor.cs b/dotnet-authserver/src/TeacherIdentity.AuthServer/Services/UserImport/UserImportProcessor.cs index 084afc8b5..da2c6a34d 100644 --- a/dotnet-authserver/src/TeacherIdentity.AuthServer/Services/UserImport/UserImportProcessor.cs +++ b/dotnet-authserver/src/TeacherIdentity.AuthServer/Services/UserImport/UserImportProcessor.cs @@ -243,14 +243,14 @@ public async Task Process(Guid userImportJobId) var dateOfBirth = DateOnly.ParseExact(row!.DateOfBirth!, "ddMMyyyy", CultureInfo.InvariantCulture); // Validate for potential duplicates - var existingUsers = await _userSearchService.FindUsers(firstName, lastName, dateOfBirth); - if (existingUsers.Any(u => u.EmailAddress != row.EmailAddress!)) - { - errors.Add("Potential duplicate user"); - userImportJobRow.Notes = errors; - userImportJobRow.UserImportRowResult = UserImportRowResult.Invalid; - } - else + //var existingUsers = await _userSearchService.FindUsers(firstName, lastName, dateOfBirth); + //if (existingUsers.Any(u => u.EmailAddress != row.EmailAddress!)) + //{ + // errors.Add("Potential duplicate user"); + // userImportJobRow.Notes = errors; + // userImportJobRow.UserImportRowResult = UserImportRowResult.Invalid; + //} + //else { user = new User {