From 63cdcc0d6ce5958e7a60728dcc6327a6a8ce3671 Mon Sep 17 00:00:00 2001 From: Sergej Hoffmann <97111299+SevenWaysDP@users.noreply.github.com> Date: Fri, 7 Mar 2025 12:09:01 +0100 Subject: [PATCH] BC-8563 - Fix imports for @shared user-import (repo and domain) (#5567) --- .../rules/user-login-migration.rule.spec.ts | 3 +- .../rules/user-login-migration.rule.ts | 2 +- .../service/user-import.service.spec.ts | 2 +- .../service/user-import.service.ts | 2 +- .../uc/user-import-fetch.uc.spec.ts | 3 +- .../user-import/uc/user-import-fetch.uc.ts | 3 +- .../user-login-migration-rollback.api.spec.ts | 0 .../api-test/user-login-migration.api.spec.ts | 2 +- .../{controller => api}/dto/index.ts | 0 .../dto/request/force-migration.params.ts | 0 .../{controller => api}/dto/request/index.ts | 0 .../dto/request/oauth2-migration.params.ts | 0 .../dto/request/school-id.params.ts | 0 .../dto/request/user-id.params.ts | 0 .../user-login-migration-mandatory.params.ts | 0 .../user-login-migration-search.params.ts | 0 ...er-login-migration-search-list.response.ts | 0 .../response/user-login-migration.response.ts | 0 .../{ => api}/mapper/index.ts | 0 .../mapper/user-login-migration.mapper.ts | 6 +-- .../uc/close-migration-wizard.uc.spec.ts | 0 .../{ => api}/uc/close-migration-wizard.uc.ts | 0 .../uc/close-user-login-migration.uc.spec.ts | 12 ++++-- .../uc/close-user-login-migration.uc.ts | 10 +++-- .../{ => api}/uc/index.ts | 9 ++--- .../restart-user-login-migration.uc.spec.ts | 8 ++-- .../uc/restart-user-login-migration.uc.ts | 6 +-- .../uc/start-user-login-migration.uc.spec.ts | 11 ++++-- .../uc/start-user-login-migration.uc.ts | 8 ++-- .../uc/toggle-user-login-migration.uc.spec.ts | 8 ++-- .../uc/toggle-user-login-migration.uc.ts | 15 ++++++-- .../user-login-migration-rollback.uc.spec.ts | 2 +- .../uc/user-login-migration-rollback.uc.ts | 2 +- .../uc/user-login-migration.uc.spec.ts | 10 ++--- .../{ => api}/uc/user-login-migration.uc.ts | 8 ++-- ...ser-login-migration-rollback.controller.ts | 2 +- .../user-login-migration.controller.ts | 38 ++++++++++--------- .../domain/do/user-login-migration.do.ts | 2 +- .../{uc/dto => domain/interface}/index.ts | 0 .../interface}/user-login-migration-query.ts | 0 .../{ => domain}/loggable/debug/index.ts | 0 ...hool-migration-successful.loggable.spec.ts | 2 +- .../school-migration-successful.loggable.ts | 2 +- ...ion-correction-successful-loggable.spec.ts | 6 +-- ...igration-correction-successful-loggable.ts | 2 +- .../user-migration-started.loggable.spec.ts | 2 +- .../debug/user-migration-started.loggable.ts | 2 +- ...user-migration-successful.loggable.spec.ts | 2 +- .../user-migration-successful.loggable.ts | 2 +- ...-number-missing.loggable-exception.spec.ts | 0 ...chool-number-missing.loggable-exception.ts | 0 ...igration-system.loggable-exception.spec.ts | 2 +- ...gin-migration-system.loggable-exception.ts | 0 .../{ => domain}/loggable/index.ts | 0 ...login-migration.loggable-exception.spec.ts | 0 ...user-login-migration.loggable-exception.ts | 0 ...ystem-not-found.loggable-exception.spec.ts | 2 +- ...ule-system-not-found.loggable-exception.ts | 0 ...peration-failed.loggable-exception.spec.ts | 0 ...ase-operation-failed.loggable-exception.ts | 0 ...number-mismatch.loggable-exception.spec.ts | 0 ...hool-number-mismatch.loggable-exception.ts | 0 ...-number-missing.loggable-exception.spec.ts | 0 ...chool-number-missing.loggable-exception.ts | 0 ...-already-closed.loggable-exception.spec.ts | 2 +- ...ation-already-closed.loggable-exception.ts | 0 ...grace-period-expired-loggable.exception.ts | 0 ...n-invalid-admin.loggable-exception.spec.ts | 0 ...ration-invalid-admin.loggable-exception.ts | 0 ...ernal-school-id.loggable-exception.spec.ts | 0 ...d-external-school-id.loggable-exception.ts | 0 ...login-migration-mandatory.loggable.spec.ts | 0 ...user-login-migration-mandatory.loggable.ts | 0 ...ple-email-users.loggable-exception.spec.ts | 0 ...multiple-email-users.loggable-exception.ts | 0 ...-migration-not-found.loggable-exception.ts | 0 ...lready-migrated.loggable-exception.spec.ts | 0 ...ool-already-migrated.loggable-exception.ts | 0 ...ser-login-migration-start.loggable.spec.ts | 0 .../user-login-migration-start.loggable.ts | 0 ...lready-migrated.loggable-exception.spec.ts | 0 ...ser-already-migrated.loggable-exception.ts | 0 ...peration-failed.loggable-exception.spec.ts | 0 ...ase-operation-failed.loggable-exception.ts | 0 ...-migration-rollback-successful.loggable.ts | 0 ...er-not-migrated.loggable-exception.spec.ts | 0 .../user-not-migrated.loggable-exception.ts | 0 .../{ => domain}/service/index.ts | 0 .../service/migration-check.service.spec.ts | 4 +- .../service/migration-check.service.ts | 4 +- .../service/school-migration.service.spec.ts | 6 +-- .../service/school-migration.service.ts | 4 +- ...ser-login-migration-revert.service.spec.ts | 2 +- .../user-login-migration-revert.service.ts | 2 +- ...r-login-migration-rollback.service.spec.ts | 2 +- .../user-login-migration-rollback.service.ts | 0 .../user-login-migration.service.spec.ts | 6 +-- .../service/user-login-migration.service.ts | 4 +- .../service/user-migration.service.spec.ts | 4 +- .../service/user-migration.service.ts | 2 +- .../src/modules/user-login-migration/index.ts | 5 ++- .../user-login-migration/repo/index.ts | 2 +- .../repo/user-login-migration.entity.ts | 2 +- ...r-login-migration.repo.integration.spec.ts | 2 +- .../user-login-migration/service/dto/index.ts | 2 - .../service/dto/migration.dto.ts | 7 ---- .../service/dto/page-content.dto.ts | 10 ----- .../user-login-migration/testing/index.ts | 1 + .../user-login-migration-do.factory.ts | 2 +- .../user-login-migration-api.module.ts | 8 ++-- .../user-login-migration.module.ts | 4 +- 111 files changed, 142 insertions(+), 143 deletions(-) rename apps/server/src/modules/user-login-migration/{controller => api}/api-test/user-login-migration-rollback.api.spec.ts (100%) rename apps/server/src/modules/user-login-migration/{controller => api}/api-test/user-login-migration.api.spec.ts (99%) rename apps/server/src/modules/user-login-migration/{controller => api}/dto/index.ts (100%) rename apps/server/src/modules/user-login-migration/{controller => api}/dto/request/force-migration.params.ts (100%) rename apps/server/src/modules/user-login-migration/{controller => api}/dto/request/index.ts (100%) rename apps/server/src/modules/user-login-migration/{controller => api}/dto/request/oauth2-migration.params.ts (100%) rename apps/server/src/modules/user-login-migration/{controller => api}/dto/request/school-id.params.ts (100%) rename apps/server/src/modules/user-login-migration/{controller => api}/dto/request/user-id.params.ts (100%) rename apps/server/src/modules/user-login-migration/{controller => api}/dto/request/user-login-migration-mandatory.params.ts (100%) rename apps/server/src/modules/user-login-migration/{controller => api}/dto/request/user-login-migration-search.params.ts (100%) rename apps/server/src/modules/user-login-migration/{controller => api}/dto/response/user-login-migration-search-list.response.ts (100%) rename apps/server/src/modules/user-login-migration/{controller => api}/dto/response/user-login-migration.response.ts (100%) rename apps/server/src/modules/user-login-migration/{ => api}/mapper/index.ts (100%) rename apps/server/src/modules/user-login-migration/{ => api}/mapper/user-login-migration.mapper.ts (85%) rename apps/server/src/modules/user-login-migration/{ => api}/uc/close-migration-wizard.uc.spec.ts (100%) rename apps/server/src/modules/user-login-migration/{ => api}/uc/close-migration-wizard.uc.ts (100%) rename apps/server/src/modules/user-login-migration/{ => api}/uc/close-user-login-migration.uc.spec.ts (97%) rename apps/server/src/modules/user-login-migration/{ => api}/uc/close-user-login-migration.uc.ts (91%) rename apps/server/src/modules/user-login-migration/{ => api}/uc/index.ts (94%) rename apps/server/src/modules/user-login-migration/{ => api}/uc/restart-user-login-migration.uc.spec.ts (97%) rename apps/server/src/modules/user-login-migration/{ => api}/uc/restart-user-login-migration.uc.ts (92%) rename apps/server/src/modules/user-login-migration/{ => api}/uc/start-user-login-migration.uc.spec.ts (95%) rename apps/server/src/modules/user-login-migration/{ => api}/uc/start-user-login-migration.uc.ts (89%) rename apps/server/src/modules/user-login-migration/{ => api}/uc/toggle-user-login-migration.uc.spec.ts (97%) rename apps/server/src/modules/user-login-migration/{ => api}/uc/toggle-user-login-migration.uc.ts (81%) rename apps/server/src/modules/user-login-migration/{ => api}/uc/user-login-migration-rollback.uc.spec.ts (97%) rename apps/server/src/modules/user-login-migration/{ => api}/uc/user-login-migration-rollback.uc.ts (91%) rename apps/server/src/modules/user-login-migration/{ => api}/uc/user-login-migration.uc.spec.ts (99%) rename apps/server/src/modules/user-login-migration/{ => api}/uc/user-login-migration.uc.ts (97%) rename apps/server/src/modules/user-login-migration/{controller => api}/user-login-migration-rollback.controller.ts (96%) rename apps/server/src/modules/user-login-migration/{controller => api}/user-login-migration.controller.ts (93%) rename apps/server/src/modules/user-login-migration/{uc/dto => domain/interface}/index.ts (100%) rename apps/server/src/modules/user-login-migration/{uc/dto => domain/interface}/user-login-migration-query.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/debug/index.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/debug/school-migration-successful.loggable.spec.ts (95%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/debug/school-migration-successful.loggable.ts (91%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/debug/user-migration-correction-successful-loggable.spec.ts (77%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/debug/user-migration-correction-successful-loggable.ts (89%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/debug/user-migration-started.loggable.spec.ts (93%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/debug/user-migration-started.loggable.ts (90%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/debug/user-migration-successful.loggable.spec.ts (93%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/debug/user-migration-successful.loggable.ts (90%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/external-school-number-missing.loggable-exception.spec.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/external-school-number-missing.loggable-exception.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/identical-user-login-migration-system.loggable-exception.spec.ts (91%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/identical-user-login-migration-system.loggable-exception.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/index.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/invalid-user-login-migration.loggable-exception.spec.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/invalid-user-login-migration.loggable-exception.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/moin-schule-system-not-found.loggable-exception.spec.ts (79%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/moin-schule-system-not-found.loggable-exception.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/school-migration-database-operation-failed.loggable-exception.spec.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/school-migration-database-operation-failed.loggable-exception.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/school-number-mismatch.loggable-exception.spec.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/school-number-mismatch.loggable-exception.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/school-number-missing.loggable-exception.spec.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/school-number-missing.loggable-exception.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/user-login-migration-already-closed.loggable-exception.spec.ts (91%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/user-login-migration-already-closed.loggable-exception.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/user-login-migration-grace-period-expired-loggable.exception.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/user-login-migration-invalid-admin.loggable-exception.spec.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/user-login-migration-invalid-admin.loggable-exception.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/user-login-migration-invalid-external-school-id.loggable-exception.spec.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/user-login-migration-invalid-external-school-id.loggable-exception.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/user-login-migration-mandatory.loggable.spec.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/user-login-migration-mandatory.loggable.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/user-login-migration-multiple-email-users.loggable-exception.spec.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/user-login-migration-multiple-email-users.loggable-exception.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/user-login-migration-not-found.loggable-exception.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/user-login-migration-school-already-migrated.loggable-exception.spec.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/user-login-migration-school-already-migrated.loggable-exception.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/user-login-migration-start.loggable.spec.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/user-login-migration-start.loggable.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/user-login-migration-user-already-migrated.loggable-exception.spec.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/user-login-migration-user-already-migrated.loggable-exception.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/user-migration-database-operation-failed.loggable-exception.spec.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/user-migration-database-operation-failed.loggable-exception.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/user-migration-rollback-successful.loggable.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/user-not-migrated.loggable-exception.spec.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/loggable/user-not-migrated.loggable-exception.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/service/index.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/service/migration-check.service.spec.ts (98%) rename apps/server/src/modules/user-login-migration/{ => domain}/service/migration-check.service.ts (93%) rename apps/server/src/modules/user-login-migration/{ => domain}/service/school-migration.service.spec.ts (99%) rename apps/server/src/modules/user-login-migration/{ => domain}/service/school-migration.service.ts (98%) rename apps/server/src/modules/user-login-migration/{ => domain}/service/user-login-migration-revert.service.spec.ts (97%) rename apps/server/src/modules/user-login-migration/{ => domain}/service/user-login-migration-revert.service.ts (93%) rename apps/server/src/modules/user-login-migration/{ => domain}/service/user-login-migration-rollback.service.spec.ts (99%) rename apps/server/src/modules/user-login-migration/{ => domain}/service/user-login-migration-rollback.service.ts (100%) rename apps/server/src/modules/user-login-migration/{ => domain}/service/user-login-migration.service.spec.ts (99%) rename apps/server/src/modules/user-login-migration/{ => domain}/service/user-login-migration.service.ts (98%) rename apps/server/src/modules/user-login-migration/{ => domain}/service/user-migration.service.spec.ts (99%) rename apps/server/src/modules/user-login-migration/{ => domain}/service/user-migration.service.ts (98%) delete mode 100644 apps/server/src/modules/user-login-migration/service/dto/index.ts delete mode 100644 apps/server/src/modules/user-login-migration/service/dto/migration.dto.ts delete mode 100644 apps/server/src/modules/user-login-migration/service/dto/page-content.dto.ts diff --git a/apps/server/src/modules/authorization-rules/rules/user-login-migration.rule.spec.ts b/apps/server/src/modules/authorization-rules/rules/user-login-migration.rule.spec.ts index d14d6d39c7e..1de4754bbca 100644 --- a/apps/server/src/modules/authorization-rules/rules/user-login-migration.rule.spec.ts +++ b/apps/server/src/modules/authorization-rules/rules/user-login-migration.rule.spec.ts @@ -7,7 +7,6 @@ import { AuthorizationInjectionService, } from '@modules/authorization'; import { schoolEntityFactory } from '@modules/school/testing'; -import { UserLoginMigrationDO } from '@modules/user-login-migration/domain'; import { userLoginMigrationDOFactory } from '@modules/user-login-migration/testing'; import { User } from '@modules/user/repo'; import { userFactory } from '@modules/user/testing'; @@ -87,7 +86,7 @@ describe('UserLoginMigrationRule', () => { it('should return false', () => { const { user, notUserLoginMigration } = setup(); - const result = rule.isApplicable(user, notUserLoginMigration as unknown as UserLoginMigrationDO); + const result = rule.isApplicable(user, notUserLoginMigration); expect(result).toEqual(false); }); diff --git a/apps/server/src/modules/authorization-rules/rules/user-login-migration.rule.ts b/apps/server/src/modules/authorization-rules/rules/user-login-migration.rule.ts index 31cac97f68a..49ea653af32 100644 --- a/apps/server/src/modules/authorization-rules/rules/user-login-migration.rule.ts +++ b/apps/server/src/modules/authorization-rules/rules/user-login-migration.rule.ts @@ -1,5 +1,5 @@ import { AuthorizationContext, AuthorizationHelper, AuthorizationInjectionService, Rule } from '@modules/authorization'; -import { UserLoginMigrationDO } from '@modules/user-login-migration/domain'; +import { UserLoginMigrationDO } from '@modules/user-login-migration'; import { User } from '@modules/user/repo'; import { Injectable } from '@nestjs/common'; diff --git a/apps/server/src/modules/user-import/service/user-import.service.spec.ts b/apps/server/src/modules/user-import/service/user-import.service.spec.ts index 30f56141dba..2b753ba891a 100644 --- a/apps/server/src/modules/user-import/service/user-import.service.spec.ts +++ b/apps/server/src/modules/user-import/service/user-import.service.spec.ts @@ -9,7 +9,7 @@ import { schoolEntityFactory } from '@modules/school/testing'; import { System, SystemService } from '@modules/system'; import { systemFactory } from '@modules/system/testing'; import { UserService } from '@modules/user'; -import { UserLoginMigrationDO } from '@modules/user-login-migration/domain'; +import { UserLoginMigrationDO } from '@modules/user-login-migration'; import { userLoginMigrationDOFactory } from '@modules/user-login-migration/testing'; import { User } from '@modules/user/repo'; import { userFactory } from '@modules/user/testing'; diff --git a/apps/server/src/modules/user-import/service/user-import.service.ts b/apps/server/src/modules/user-import/service/user-import.service.ts index 17aafed85de..541869019f3 100644 --- a/apps/server/src/modules/user-import/service/user-import.service.ts +++ b/apps/server/src/modules/user-import/service/user-import.service.ts @@ -5,7 +5,7 @@ import { SchoolFeature } from '@modules/school/domain'; import { SchoolEntity } from '@modules/school/repo'; import { System, SystemService } from '@modules/system'; import { UserService } from '@modules/user'; -import { UserLoginMigrationDO } from '@modules/user-login-migration/domain'; +import { UserLoginMigrationDO } from '@modules/user-login-migration'; import { User } from '@modules/user/repo'; import { Injectable, InternalServerErrorException } from '@nestjs/common'; import { ConfigService } from '@nestjs/config'; diff --git a/apps/server/src/modules/user-import/uc/user-import-fetch.uc.spec.ts b/apps/server/src/modules/user-import/uc/user-import-fetch.uc.spec.ts index a36b1c36fa5..06e52fd9294 100644 --- a/apps/server/src/modules/user-import/uc/user-import-fetch.uc.spec.ts +++ b/apps/server/src/modules/user-import/uc/user-import-fetch.uc.spec.ts @@ -4,7 +4,7 @@ import { AuthorizationService } from '@modules/authorization'; import { System, SystemService } from '@modules/system'; import { SystemEntity } from '@modules/system/repo'; import { systemEntityFactory, systemFactory } from '@modules/system/testing'; -import { UserLoginMigrationDO } from '@modules/user-login-migration/domain'; +import { UserLoginMigrationDO, UserLoginMigrationService } from '@modules/user-login-migration'; import { userLoginMigrationDOFactory } from '@modules/user-login-migration/testing'; import { User } from '@modules/user/repo'; import { userFactory } from '@modules/user/testing'; @@ -12,7 +12,6 @@ import { ConfigService } from '@nestjs/config'; import { Test, TestingModule } from '@nestjs/testing'; import { Permission } from '@shared/domain/interface'; import { setupEntities } from '@testing/database'; -import { UserLoginMigrationService } from '../../user-login-migration'; import { ImportUser } from '../entity'; import { UserLoginMigrationNotActiveLoggableException, UserMigrationIsNotEnabledLoggableException } from '../loggable'; import { SchulconnexFetchImportUsersService, UserImportService } from '../service'; diff --git a/apps/server/src/modules/user-import/uc/user-import-fetch.uc.ts b/apps/server/src/modules/user-import/uc/user-import-fetch.uc.ts index 576aa840b34..7cc285d2d00 100644 --- a/apps/server/src/modules/user-import/uc/user-import-fetch.uc.ts +++ b/apps/server/src/modules/user-import/uc/user-import-fetch.uc.ts @@ -1,7 +1,6 @@ import { AuthorizationService } from '@modules/authorization'; import { System, SystemService } from '@modules/system'; -import { UserLoginMigrationService } from '@modules/user-login-migration'; -import { UserLoginMigrationDO } from '@modules/user-login-migration/domain'; +import { UserLoginMigrationDO, UserLoginMigrationService } from '@modules/user-login-migration'; import { User } from '@modules/user/repo'; import { Injectable } from '@nestjs/common'; import { ConfigService } from '@nestjs/config'; diff --git a/apps/server/src/modules/user-login-migration/controller/api-test/user-login-migration-rollback.api.spec.ts b/apps/server/src/modules/user-login-migration/api/api-test/user-login-migration-rollback.api.spec.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/controller/api-test/user-login-migration-rollback.api.spec.ts rename to apps/server/src/modules/user-login-migration/api/api-test/user-login-migration-rollback.api.spec.ts diff --git a/apps/server/src/modules/user-login-migration/controller/api-test/user-login-migration.api.spec.ts b/apps/server/src/modules/user-login-migration/api/api-test/user-login-migration.api.spec.ts similarity index 99% rename from apps/server/src/modules/user-login-migration/controller/api-test/user-login-migration.api.spec.ts rename to apps/server/src/modules/user-login-migration/api/api-test/user-login-migration.api.spec.ts index 48cf9e1adf3..c8b285348fb 100644 --- a/apps/server/src/modules/user-login-migration/controller/api-test/user-login-migration.api.spec.ts +++ b/apps/server/src/modules/user-login-migration/api/api-test/user-login-migration.api.spec.ts @@ -27,8 +27,8 @@ import { DeepPartial } from 'fishery'; import { Response } from 'supertest'; import { UserLoginMigrationEntity } from '../../repo'; import { userLoginMigrationFactory } from '../../testing'; -import { UserLoginMigrationUc } from '../../uc'; import { ForceMigrationParams, Oauth2MigrationParams, UserLoginMigrationResponse } from '../dto'; +import { UserLoginMigrationUc } from '../uc'; jest.mock('jwks-rsa', () => () => { return { diff --git a/apps/server/src/modules/user-login-migration/controller/dto/index.ts b/apps/server/src/modules/user-login-migration/api/dto/index.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/controller/dto/index.ts rename to apps/server/src/modules/user-login-migration/api/dto/index.ts diff --git a/apps/server/src/modules/user-login-migration/controller/dto/request/force-migration.params.ts b/apps/server/src/modules/user-login-migration/api/dto/request/force-migration.params.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/controller/dto/request/force-migration.params.ts rename to apps/server/src/modules/user-login-migration/api/dto/request/force-migration.params.ts diff --git a/apps/server/src/modules/user-login-migration/controller/dto/request/index.ts b/apps/server/src/modules/user-login-migration/api/dto/request/index.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/controller/dto/request/index.ts rename to apps/server/src/modules/user-login-migration/api/dto/request/index.ts diff --git a/apps/server/src/modules/user-login-migration/controller/dto/request/oauth2-migration.params.ts b/apps/server/src/modules/user-login-migration/api/dto/request/oauth2-migration.params.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/controller/dto/request/oauth2-migration.params.ts rename to apps/server/src/modules/user-login-migration/api/dto/request/oauth2-migration.params.ts diff --git a/apps/server/src/modules/user-login-migration/controller/dto/request/school-id.params.ts b/apps/server/src/modules/user-login-migration/api/dto/request/school-id.params.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/controller/dto/request/school-id.params.ts rename to apps/server/src/modules/user-login-migration/api/dto/request/school-id.params.ts diff --git a/apps/server/src/modules/user-login-migration/controller/dto/request/user-id.params.ts b/apps/server/src/modules/user-login-migration/api/dto/request/user-id.params.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/controller/dto/request/user-id.params.ts rename to apps/server/src/modules/user-login-migration/api/dto/request/user-id.params.ts diff --git a/apps/server/src/modules/user-login-migration/controller/dto/request/user-login-migration-mandatory.params.ts b/apps/server/src/modules/user-login-migration/api/dto/request/user-login-migration-mandatory.params.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/controller/dto/request/user-login-migration-mandatory.params.ts rename to apps/server/src/modules/user-login-migration/api/dto/request/user-login-migration-mandatory.params.ts diff --git a/apps/server/src/modules/user-login-migration/controller/dto/request/user-login-migration-search.params.ts b/apps/server/src/modules/user-login-migration/api/dto/request/user-login-migration-search.params.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/controller/dto/request/user-login-migration-search.params.ts rename to apps/server/src/modules/user-login-migration/api/dto/request/user-login-migration-search.params.ts diff --git a/apps/server/src/modules/user-login-migration/controller/dto/response/user-login-migration-search-list.response.ts b/apps/server/src/modules/user-login-migration/api/dto/response/user-login-migration-search-list.response.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/controller/dto/response/user-login-migration-search-list.response.ts rename to apps/server/src/modules/user-login-migration/api/dto/response/user-login-migration-search-list.response.ts diff --git a/apps/server/src/modules/user-login-migration/controller/dto/response/user-login-migration.response.ts b/apps/server/src/modules/user-login-migration/api/dto/response/user-login-migration.response.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/controller/dto/response/user-login-migration.response.ts rename to apps/server/src/modules/user-login-migration/api/dto/response/user-login-migration.response.ts diff --git a/apps/server/src/modules/user-login-migration/mapper/index.ts b/apps/server/src/modules/user-login-migration/api/mapper/index.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/mapper/index.ts rename to apps/server/src/modules/user-login-migration/api/mapper/index.ts diff --git a/apps/server/src/modules/user-login-migration/mapper/user-login-migration.mapper.ts b/apps/server/src/modules/user-login-migration/api/mapper/user-login-migration.mapper.ts similarity index 85% rename from apps/server/src/modules/user-login-migration/mapper/user-login-migration.mapper.ts rename to apps/server/src/modules/user-login-migration/api/mapper/user-login-migration.mapper.ts index 861eb980c63..05c8f50f0df 100644 --- a/apps/server/src/modules/user-login-migration/mapper/user-login-migration.mapper.ts +++ b/apps/server/src/modules/user-login-migration/api/mapper/user-login-migration.mapper.ts @@ -1,6 +1,6 @@ -import { UserLoginMigrationResponse, UserLoginMigrationSearchParams } from '../controller/dto'; -import { UserLoginMigrationDO } from '../domain'; -import { UserLoginMigrationQuery } from '../uc'; +import { UserLoginMigrationDO } from '../../domain'; +import { UserLoginMigrationQuery } from '../../domain/interface'; +import { UserLoginMigrationResponse, UserLoginMigrationSearchParams } from '../dto'; export class UserLoginMigrationMapper { static mapSearchParamsToQuery(searchParams: UserLoginMigrationSearchParams): UserLoginMigrationQuery { diff --git a/apps/server/src/modules/user-login-migration/uc/close-migration-wizard.uc.spec.ts b/apps/server/src/modules/user-login-migration/api/uc/close-migration-wizard.uc.spec.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/uc/close-migration-wizard.uc.spec.ts rename to apps/server/src/modules/user-login-migration/api/uc/close-migration-wizard.uc.spec.ts diff --git a/apps/server/src/modules/user-login-migration/uc/close-migration-wizard.uc.ts b/apps/server/src/modules/user-login-migration/api/uc/close-migration-wizard.uc.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/uc/close-migration-wizard.uc.ts rename to apps/server/src/modules/user-login-migration/api/uc/close-migration-wizard.uc.ts diff --git a/apps/server/src/modules/user-login-migration/uc/close-user-login-migration.uc.spec.ts b/apps/server/src/modules/user-login-migration/api/uc/close-user-login-migration.uc.spec.ts similarity index 97% rename from apps/server/src/modules/user-login-migration/uc/close-user-login-migration.uc.spec.ts rename to apps/server/src/modules/user-login-migration/api/uc/close-user-login-migration.uc.spec.ts index 67ec36b89f5..b0fa0d13e4d 100644 --- a/apps/server/src/modules/user-login-migration/uc/close-user-login-migration.uc.spec.ts +++ b/apps/server/src/modules/user-login-migration/api/uc/close-user-login-migration.uc.spec.ts @@ -8,10 +8,14 @@ import { userFactory } from '@modules/user/testing'; import { Test, TestingModule } from '@nestjs/testing'; import { Permission } from '@shared/domain/interface'; import { setupEntities } from '@testing/database'; -import { UserLoginMigrationDO } from '../domain'; -import { UserLoginMigrationNotFoundLoggableException } from '../loggable'; -import { SchoolMigrationService, UserLoginMigrationRevertService, UserLoginMigrationService } from '../service'; -import { userLoginMigrationDOFactory } from '../testing'; +import { UserLoginMigrationDO } from '../../domain'; +import { UserLoginMigrationNotFoundLoggableException } from '../../domain/loggable'; +import { + SchoolMigrationService, + UserLoginMigrationRevertService, + UserLoginMigrationService, +} from '../../domain/service'; +import { userLoginMigrationDOFactory } from '../../testing'; import { CloseUserLoginMigrationUc } from './close-user-login-migration.uc'; describe(CloseUserLoginMigrationUc.name, () => { diff --git a/apps/server/src/modules/user-login-migration/uc/close-user-login-migration.uc.ts b/apps/server/src/modules/user-login-migration/api/uc/close-user-login-migration.uc.ts similarity index 91% rename from apps/server/src/modules/user-login-migration/uc/close-user-login-migration.uc.ts rename to apps/server/src/modules/user-login-migration/api/uc/close-user-login-migration.uc.ts index 9d6cb0c4eb4..57d5f4729d4 100644 --- a/apps/server/src/modules/user-login-migration/uc/close-user-login-migration.uc.ts +++ b/apps/server/src/modules/user-login-migration/api/uc/close-user-login-migration.uc.ts @@ -4,9 +4,13 @@ import { User } from '@modules/user/repo'; import { Injectable } from '@nestjs/common/decorators/core/injectable.decorator'; import { Permission } from '@shared/domain/interface'; import { EntityId } from '@shared/domain/types'; -import { UserLoginMigrationDO } from '../domain'; -import { UserLoginMigrationNotFoundLoggableException } from '../loggable'; -import { SchoolMigrationService, UserLoginMigrationRevertService, UserLoginMigrationService } from '../service'; +import { UserLoginMigrationDO } from '../../domain'; +import { UserLoginMigrationNotFoundLoggableException } from '../../domain/loggable'; +import { + SchoolMigrationService, + UserLoginMigrationRevertService, + UserLoginMigrationService, +} from '../../domain/service'; @Injectable() export class CloseUserLoginMigrationUc { diff --git a/apps/server/src/modules/user-login-migration/uc/index.ts b/apps/server/src/modules/user-login-migration/api/uc/index.ts similarity index 94% rename from apps/server/src/modules/user-login-migration/uc/index.ts rename to apps/server/src/modules/user-login-migration/api/uc/index.ts index 5a4d6eb5f7d..d4296123140 100644 --- a/apps/server/src/modules/user-login-migration/uc/index.ts +++ b/apps/server/src/modules/user-login-migration/api/uc/index.ts @@ -1,8 +1,7 @@ -export * from './dto'; -export * from './user-login-migration.uc'; +export { CloseMigrationWizardUc } from './close-migration-wizard.uc'; +export * from './close-user-login-migration.uc'; +export * from './restart-user-login-migration.uc'; export * from './start-user-login-migration.uc'; export * from './toggle-user-login-migration.uc'; -export * from './restart-user-login-migration.uc'; -export * from './close-user-login-migration.uc'; export * from './user-login-migration-rollback.uc'; -export { CloseMigrationWizardUc } from './close-migration-wizard.uc'; +export * from './user-login-migration.uc'; diff --git a/apps/server/src/modules/user-login-migration/uc/restart-user-login-migration.uc.spec.ts b/apps/server/src/modules/user-login-migration/api/uc/restart-user-login-migration.uc.spec.ts similarity index 97% rename from apps/server/src/modules/user-login-migration/uc/restart-user-login-migration.uc.spec.ts rename to apps/server/src/modules/user-login-migration/api/uc/restart-user-login-migration.uc.spec.ts index 0288c3b4a3a..0df65087195 100644 --- a/apps/server/src/modules/user-login-migration/uc/restart-user-login-migration.uc.spec.ts +++ b/apps/server/src/modules/user-login-migration/api/uc/restart-user-login-migration.uc.spec.ts @@ -7,10 +7,10 @@ import { ForbiddenException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { Permission } from '@shared/domain/interface'; import { setupEntities } from '@testing/database'; -import { UserLoginMigrationDO } from '../domain'; -import { UserLoginMigrationNotFoundLoggableException } from '../loggable'; -import { SchoolMigrationService, UserLoginMigrationService } from '../service'; -import { userLoginMigrationDOFactory } from '../testing'; +import { UserLoginMigrationDO } from '../../domain'; +import { UserLoginMigrationNotFoundLoggableException } from '../../domain/loggable'; +import { SchoolMigrationService, UserLoginMigrationService } from '../../domain/service'; +import { userLoginMigrationDOFactory } from '../../testing'; import { RestartUserLoginMigrationUc } from './restart-user-login-migration.uc'; describe(RestartUserLoginMigrationUc.name, () => { diff --git a/apps/server/src/modules/user-login-migration/uc/restart-user-login-migration.uc.ts b/apps/server/src/modules/user-login-migration/api/uc/restart-user-login-migration.uc.ts similarity index 92% rename from apps/server/src/modules/user-login-migration/uc/restart-user-login-migration.uc.ts rename to apps/server/src/modules/user-login-migration/api/uc/restart-user-login-migration.uc.ts index 7aa72f1019a..3f695aa5c53 100644 --- a/apps/server/src/modules/user-login-migration/uc/restart-user-login-migration.uc.ts +++ b/apps/server/src/modules/user-login-migration/api/uc/restart-user-login-migration.uc.ts @@ -3,9 +3,9 @@ import { AuthorizationContextBuilder, AuthorizationService } from '@modules/auth import { User } from '@modules/user/repo'; import { Injectable } from '@nestjs/common/decorators/core/injectable.decorator'; import { Permission } from '@shared/domain/interface'; -import { UserLoginMigrationDO } from '../domain'; -import { UserLoginMigrationNotFoundLoggableException, UserLoginMigrationStartLoggable } from '../loggable'; -import { SchoolMigrationService, UserLoginMigrationService } from '../service'; +import { UserLoginMigrationDO } from '../../domain'; +import { UserLoginMigrationNotFoundLoggableException, UserLoginMigrationStartLoggable } from '../../domain/loggable'; +import { SchoolMigrationService, UserLoginMigrationService } from '../../domain/service'; @Injectable() export class RestartUserLoginMigrationUc { diff --git a/apps/server/src/modules/user-login-migration/uc/start-user-login-migration.uc.spec.ts b/apps/server/src/modules/user-login-migration/api/uc/start-user-login-migration.uc.spec.ts similarity index 95% rename from apps/server/src/modules/user-login-migration/uc/start-user-login-migration.uc.spec.ts rename to apps/server/src/modules/user-login-migration/api/uc/start-user-login-migration.uc.spec.ts index c1a70434621..08656f9f813 100644 --- a/apps/server/src/modules/user-login-migration/uc/start-user-login-migration.uc.spec.ts +++ b/apps/server/src/modules/user-login-migration/api/uc/start-user-login-migration.uc.spec.ts @@ -9,10 +9,13 @@ import { ForbiddenException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { Permission } from '@shared/domain/interface'; import { setupEntities } from '@testing/database'; -import { UserLoginMigrationDO } from '../domain'; -import { SchoolNumberMissingLoggableException, UserLoginMigrationAlreadyClosedLoggableException } from '../loggable'; -import { UserLoginMigrationService } from '../service'; -import { userLoginMigrationDOFactory } from '../testing'; +import { UserLoginMigrationDO } from '../../domain'; +import { + SchoolNumberMissingLoggableException, + UserLoginMigrationAlreadyClosedLoggableException, +} from '../../domain/loggable'; +import { UserLoginMigrationService } from '../../domain/service'; +import { userLoginMigrationDOFactory } from '../../testing'; import { StartUserLoginMigrationUc } from './start-user-login-migration.uc'; describe(StartUserLoginMigrationUc.name, () => { diff --git a/apps/server/src/modules/user-login-migration/uc/start-user-login-migration.uc.ts b/apps/server/src/modules/user-login-migration/api/uc/start-user-login-migration.uc.ts similarity index 89% rename from apps/server/src/modules/user-login-migration/uc/start-user-login-migration.uc.ts rename to apps/server/src/modules/user-login-migration/api/uc/start-user-login-migration.uc.ts index 0e40c1f42db..e7266463752 100644 --- a/apps/server/src/modules/user-login-migration/uc/start-user-login-migration.uc.ts +++ b/apps/server/src/modules/user-login-migration/api/uc/start-user-login-migration.uc.ts @@ -5,13 +5,13 @@ import { User } from '@modules/user/repo'; import { Injectable } from '@nestjs/common/decorators/core/injectable.decorator'; import { Permission } from '@shared/domain/interface'; import { EntityId } from '@shared/domain/types'; -import { UserLoginMigrationDO } from '../domain'; +import { UserLoginMigrationDO } from '../../domain'; import { SchoolNumberMissingLoggableException, UserLoginMigrationAlreadyClosedLoggableException, UserLoginMigrationStartLoggable, -} from '../loggable'; -import { UserLoginMigrationService } from '../service'; +} from '../../domain/loggable'; +import { UserLoginMigrationService } from '../../domain/service'; @Injectable() export class StartUserLoginMigrationUc { @@ -24,7 +24,7 @@ export class StartUserLoginMigrationUc { this.logger.setContext(StartUserLoginMigrationUc.name); } - async startMigration(userId: EntityId, schoolId: EntityId): Promise { + public async startMigration(userId: EntityId, schoolId: EntityId): Promise { await this.checkPreconditions(userId, schoolId); let userLoginMigration: UserLoginMigrationDO | null = await this.userLoginMigrationService.findMigrationBySchool( diff --git a/apps/server/src/modules/user-login-migration/uc/toggle-user-login-migration.uc.spec.ts b/apps/server/src/modules/user-login-migration/api/uc/toggle-user-login-migration.uc.spec.ts similarity index 97% rename from apps/server/src/modules/user-login-migration/uc/toggle-user-login-migration.uc.spec.ts rename to apps/server/src/modules/user-login-migration/api/uc/toggle-user-login-migration.uc.spec.ts index 4231d53d660..fd242901d04 100644 --- a/apps/server/src/modules/user-login-migration/uc/toggle-user-login-migration.uc.spec.ts +++ b/apps/server/src/modules/user-login-migration/api/uc/toggle-user-login-migration.uc.spec.ts @@ -10,10 +10,10 @@ import { ForbiddenException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { Permission } from '@shared/domain/interface'; import { setupEntities } from '@testing/database'; -import { UserLoginMigrationDO } from '../domain'; -import { UserLoginMigrationNotFoundLoggableException } from '../loggable'; -import { UserLoginMigrationService } from '../service'; -import { userLoginMigrationDOFactory } from '../testing'; +import { UserLoginMigrationDO } from '../../domain'; +import { UserLoginMigrationNotFoundLoggableException } from '../../domain/loggable'; +import { UserLoginMigrationService } from '../../domain/service'; +import { userLoginMigrationDOFactory } from '../../testing'; import { ToggleUserLoginMigrationUc } from './toggle-user-login-migration.uc'; describe(ToggleUserLoginMigrationUc.name, () => { diff --git a/apps/server/src/modules/user-login-migration/uc/toggle-user-login-migration.uc.ts b/apps/server/src/modules/user-login-migration/api/uc/toggle-user-login-migration.uc.ts similarity index 81% rename from apps/server/src/modules/user-login-migration/uc/toggle-user-login-migration.uc.ts rename to apps/server/src/modules/user-login-migration/api/uc/toggle-user-login-migration.uc.ts index 75911ca715d..734fbff452d 100644 --- a/apps/server/src/modules/user-login-migration/uc/toggle-user-login-migration.uc.ts +++ b/apps/server/src/modules/user-login-migration/api/uc/toggle-user-login-migration.uc.ts @@ -5,9 +5,12 @@ import { User } from '@modules/user/repo'; import { Injectable } from '@nestjs/common'; import { Permission } from '@shared/domain/interface'; import { EntityId } from '@shared/domain/types'; -import { UserLoginMigrationDO } from '../domain'; -import { UserLoginMigrationMandatoryLoggable, UserLoginMigrationNotFoundLoggableException } from '../loggable'; -import { UserLoginMigrationService } from '../service'; +import { UserLoginMigrationDO } from '../../domain'; +import { + UserLoginMigrationMandatoryLoggable, + UserLoginMigrationNotFoundLoggableException, +} from '../../domain/loggable'; +import { UserLoginMigrationService } from '../../domain/service'; @Injectable() export class ToggleUserLoginMigrationUc { @@ -18,7 +21,11 @@ export class ToggleUserLoginMigrationUc { private readonly logger: Logger ) {} - async setMigrationMandatory(userId: EntityId, schoolId: EntityId, mandatory: boolean): Promise { + public async setMigrationMandatory( + userId: EntityId, + schoolId: EntityId, + mandatory: boolean + ): Promise { await this.checkPermission(userId, schoolId); let userLoginMigration: UserLoginMigrationDO | null = await this.userLoginMigrationService.findMigrationBySchool( diff --git a/apps/server/src/modules/user-login-migration/uc/user-login-migration-rollback.uc.spec.ts b/apps/server/src/modules/user-login-migration/api/uc/user-login-migration-rollback.uc.spec.ts similarity index 97% rename from apps/server/src/modules/user-login-migration/uc/user-login-migration-rollback.uc.spec.ts rename to apps/server/src/modules/user-login-migration/api/uc/user-login-migration-rollback.uc.spec.ts index aa88fc09c87..1c69a30eb67 100644 --- a/apps/server/src/modules/user-login-migration/uc/user-login-migration-rollback.uc.spec.ts +++ b/apps/server/src/modules/user-login-migration/api/uc/user-login-migration-rollback.uc.spec.ts @@ -6,7 +6,7 @@ import { userFactory } from '@modules/user/testing'; import { Test, TestingModule } from '@nestjs/testing'; import { Permission } from '@shared/domain/interface'; import { setupEntities } from '@testing/database'; -import { UserLoginMigrationRollbackService } from '../service'; +import { UserLoginMigrationRollbackService } from '../../domain/service'; import { UserLoginMigrationRollbackUc } from './user-login-migration-rollback.uc'; describe(UserLoginMigrationRollbackUc.name, () => { diff --git a/apps/server/src/modules/user-login-migration/uc/user-login-migration-rollback.uc.ts b/apps/server/src/modules/user-login-migration/api/uc/user-login-migration-rollback.uc.ts similarity index 91% rename from apps/server/src/modules/user-login-migration/uc/user-login-migration-rollback.uc.ts rename to apps/server/src/modules/user-login-migration/api/uc/user-login-migration-rollback.uc.ts index 6de0777922d..4ab2ea5c24f 100644 --- a/apps/server/src/modules/user-login-migration/uc/user-login-migration-rollback.uc.ts +++ b/apps/server/src/modules/user-login-migration/api/uc/user-login-migration-rollback.uc.ts @@ -2,7 +2,7 @@ import { AuthorizationService } from '@modules/authorization'; import { Injectable } from '@nestjs/common'; import { Permission } from '@shared/domain/interface'; import { EntityId } from '@shared/domain/types'; -import { UserLoginMigrationRollbackService } from '../service'; +import { UserLoginMigrationRollbackService } from '../../domain/service'; @Injectable() export class UserLoginMigrationRollbackUc { diff --git a/apps/server/src/modules/user-login-migration/uc/user-login-migration.uc.spec.ts b/apps/server/src/modules/user-login-migration/api/uc/user-login-migration.uc.spec.ts similarity index 99% rename from apps/server/src/modules/user-login-migration/uc/user-login-migration.uc.spec.ts rename to apps/server/src/modules/user-login-migration/api/uc/user-login-migration.uc.spec.ts index a34710b2a1d..ed5dc3d9820 100644 --- a/apps/server/src/modules/user-login-migration/uc/user-login-migration.uc.spec.ts +++ b/apps/server/src/modules/user-login-migration/api/uc/user-login-migration.uc.spec.ts @@ -8,6 +8,7 @@ import { legacySchoolDoFactory } from '@modules/legacy-school/testing'; import { OAuthService } from '@modules/oauth'; import { OAuthTokenDto } from '@modules/oauth-adapter'; import { ExternalSchoolDto, OauthDataDto, ProvisioningService, ProvisioningSystemDto } from '@modules/provisioning'; +import { externalUserDtoFactory } from '@modules/provisioning/testing'; import { schoolEntityFactory } from '@modules/school/testing'; import { systemEntityFactory } from '@modules/system/testing'; import { UserService } from '@modules/user'; @@ -20,8 +21,7 @@ import { Page, RoleReference } from '@shared/domain/domainobject'; import { Permission, RoleName } from '@shared/domain/interface'; import { SystemProvisioningStrategy } from '@shared/domain/interface/system-provisioning.strategy'; import { setupEntities } from '@testing/database'; -import { externalUserDtoFactory } from '../../provisioning/testing'; -import { UserLoginMigrationDO } from '../domain'; +import { UserLoginMigrationDO } from '../../domain'; import { ExternalSchoolNumberMissingLoggableException, InvalidUserLoginMigrationLoggableException, @@ -30,9 +30,9 @@ import { UserLoginMigrationInvalidExternalSchoolIdLoggableException, UserLoginMigrationMultipleEmailUsersLoggableException, UserLoginMigrationSchoolAlreadyMigratedLoggableException, -} from '../loggable'; -import { SchoolMigrationService, UserLoginMigrationService, UserMigrationService } from '../service'; -import { userLoginMigrationDOFactory } from '../testing'; +} from '../../domain/loggable'; +import { SchoolMigrationService, UserLoginMigrationService, UserMigrationService } from '../../domain/service'; +import { userLoginMigrationDOFactory } from '../../testing'; import { UserLoginMigrationUc } from './user-login-migration.uc'; describe(UserLoginMigrationUc.name, () => { diff --git a/apps/server/src/modules/user-login-migration/uc/user-login-migration.uc.ts b/apps/server/src/modules/user-login-migration/api/uc/user-login-migration.uc.ts similarity index 97% rename from apps/server/src/modules/user-login-migration/uc/user-login-migration.uc.ts rename to apps/server/src/modules/user-login-migration/api/uc/user-login-migration.uc.ts index 1aa5f994a6b..08b0b86571a 100644 --- a/apps/server/src/modules/user-login-migration/uc/user-login-migration.uc.ts +++ b/apps/server/src/modules/user-login-migration/api/uc/user-login-migration.uc.ts @@ -11,7 +11,8 @@ import { NotFoundLoggableException } from '@shared/common/loggable-exception'; import { Page, RoleReference } from '@shared/domain/domainobject'; import { Permission, RoleName } from '@shared/domain/interface'; import { EntityId } from '@shared/domain/types'; -import { UserLoginMigrationDO } from '../domain'; +import { UserLoginMigrationDO } from '../../domain'; +import { UserLoginMigrationQuery } from '../../domain/interface'; import { ExternalSchoolNumberMissingLoggableException, InvalidUserLoginMigrationLoggableException, @@ -24,9 +25,8 @@ import { UserMigrationCorrectionSuccessfulLoggable, UserMigrationStartedLoggable, UserMigrationSuccessfulLoggable, -} from '../loggable'; -import { SchoolMigrationService, UserLoginMigrationService, UserMigrationService } from '../service'; -import { UserLoginMigrationQuery } from './dto'; +} from '../../domain/loggable'; +import { SchoolMigrationService, UserLoginMigrationService, UserMigrationService } from '../../domain/service'; @Injectable() export class UserLoginMigrationUc { diff --git a/apps/server/src/modules/user-login-migration/controller/user-login-migration-rollback.controller.ts b/apps/server/src/modules/user-login-migration/api/user-login-migration-rollback.controller.ts similarity index 96% rename from apps/server/src/modules/user-login-migration/controller/user-login-migration-rollback.controller.ts rename to apps/server/src/modules/user-login-migration/api/user-login-migration-rollback.controller.ts index 8b17eaa6440..c345a1cdd1a 100644 --- a/apps/server/src/modules/user-login-migration/controller/user-login-migration-rollback.controller.ts +++ b/apps/server/src/modules/user-login-migration/api/user-login-migration-rollback.controller.ts @@ -9,8 +9,8 @@ import { ApiUnauthorizedResponse, ApiUnprocessableEntityResponse, } from '@nestjs/swagger'; -import { UserLoginMigrationRollbackUc } from '../uc'; import { UserIdParams } from './dto'; +import { UserLoginMigrationRollbackUc } from './uc'; @ApiTags('UserLoginMigration Rollback') @Controller('user-login-migrations') diff --git a/apps/server/src/modules/user-login-migration/controller/user-login-migration.controller.ts b/apps/server/src/modules/user-login-migration/api/user-login-migration.controller.ts similarity index 93% rename from apps/server/src/modules/user-login-migration/controller/user-login-migration.controller.ts rename to apps/server/src/modules/user-login-migration/api/user-login-migration.controller.ts index 45030369601..f16eaae42ca 100644 --- a/apps/server/src/modules/user-login-migration/controller/user-login-migration.controller.ts +++ b/apps/server/src/modules/user-login-migration/api/user-login-migration.controller.ts @@ -14,22 +14,13 @@ import { } from '@nestjs/swagger'; import { Page } from '@shared/domain/domainobject'; import { UserLoginMigrationDO } from '../domain'; +import { UserLoginMigrationQuery } from '../domain/interface'; import { SchoolNumberMissingLoggableException, UserLoginMigrationAlreadyClosedLoggableException, UserLoginMigrationGracePeriodExpiredLoggableException, UserLoginMigrationNotFoundLoggableException, -} from '../loggable'; -import { UserLoginMigrationMapper } from '../mapper'; -import { - CloseMigrationWizardUc, - CloseUserLoginMigrationUc, - RestartUserLoginMigrationUc, - StartUserLoginMigrationUc, - ToggleUserLoginMigrationUc, - UserLoginMigrationQuery, - UserLoginMigrationUc, -} from '../uc'; +} from '../domain/loggable'; import { ForceMigrationParams, Oauth2MigrationParams, @@ -39,6 +30,15 @@ import { UserLoginMigrationSearchListResponse, UserLoginMigrationSearchParams, } from './dto'; +import { UserLoginMigrationMapper } from './mapper'; +import { + CloseMigrationWizardUc, + CloseUserLoginMigrationUc, + RestartUserLoginMigrationUc, + StartUserLoginMigrationUc, + ToggleUserLoginMigrationUc, + UserLoginMigrationUc, +} from './uc'; @ApiTags('UserLoginMigration') @Controller('user-login-migrations') @@ -61,7 +61,7 @@ export class UserLoginMigrationController { }) @ApiOkResponse({ description: 'UserLoginMigrations has been found.', type: UserLoginMigrationSearchListResponse }) @ApiInternalServerErrorResponse({ description: 'Cannot find target system information.' }) - async getMigrations( + public async getMigrations( @CurrentUser() user: ICurrentUser, @Query() params: UserLoginMigrationSearchParams ): Promise { @@ -91,7 +91,7 @@ export class UserLoginMigrationController { @ApiForbiddenResponse() @ApiOkResponse({ description: 'UserLoginMigrations has been found', type: UserLoginMigrationResponse }) @ApiNotFoundResponse({ description: 'Cannot find UserLoginMigration' }) - async findUserLoginMigrationBySchool( + public async findUserLoginMigrationBySchool( @CurrentUser() user: ICurrentUser, @Param() params: SchoolIdParams ): Promise { @@ -117,7 +117,7 @@ export class UserLoginMigrationController { }) @ApiOkResponse({ description: 'User login migration started', type: UserLoginMigrationResponse }) @ApiForbiddenResponse() - async startMigration(@CurrentUser() currentUser: ICurrentUser): Promise { + public async startMigration(@CurrentUser() currentUser: ICurrentUser): Promise { const migrationDto: UserLoginMigrationDO = await this.startUserLoginMigrationUc.startMigration( currentUser.userId, currentUser.schoolId @@ -141,7 +141,7 @@ export class UserLoginMigrationController { @ApiOkResponse({ description: 'User login migration started', type: UserLoginMigrationResponse }) @ApiUnauthorizedResponse() @ApiForbiddenResponse() - async restartMigration(@CurrentUser() currentUser: ICurrentUser): Promise { + public async restartMigration(@CurrentUser() currentUser: ICurrentUser): Promise { const migrationDto: UserLoginMigrationDO = await this.restartUserLoginMigrationUc.restartMigration( currentUser.userId, currentUser.schoolId @@ -169,7 +169,7 @@ export class UserLoginMigrationController { @ApiOkResponse({ description: 'User login migration is set mandatory/optional', type: UserLoginMigrationResponse }) @ApiUnauthorizedResponse() @ApiForbiddenResponse() - async setMigrationMandatory( + public async setMigrationMandatory( @CurrentUser() currentUser: ICurrentUser, @Body() body: UserLoginMigrationMandatoryParams ): Promise { @@ -203,7 +203,9 @@ export class UserLoginMigrationController { @ApiUnauthorizedResponse() @ApiForbiddenResponse() @ApiNoContentResponse({ description: 'User login migration was reverted' }) - async closeMigration(@CurrentUser() currentUser: ICurrentUser): Promise { + public async closeMigration( + @CurrentUser() currentUser: ICurrentUser + ): Promise { const userLoginMigration: UserLoginMigrationDO | undefined = await this.closeUserLoginMigrationUc.closeMigration( currentUser.userId, currentUser.schoolId @@ -223,7 +225,7 @@ export class UserLoginMigrationController { @Post('migrate-to-oauth2') @ApiOkResponse({ description: 'The User has been successfully migrated.' }) @ApiUnprocessableEntityResponse({ description: 'The migration of the User was not possible.' }) - async migrateUserLogin( + public async migrateUserLogin( @JWT() jwt: string, @CurrentUser() currentUser: ICurrentUser, @Body() body: Oauth2MigrationParams diff --git a/apps/server/src/modules/user-login-migration/domain/do/user-login-migration.do.ts b/apps/server/src/modules/user-login-migration/domain/do/user-login-migration.do.ts index ea8f0f72ee8..9f75fb07890 100644 --- a/apps/server/src/modules/user-login-migration/domain/do/user-login-migration.do.ts +++ b/apps/server/src/modules/user-login-migration/domain/do/user-login-migration.do.ts @@ -1,4 +1,4 @@ -import { BaseDO } from '@shared/domain/domainobject/base.do'; +import { BaseDO } from '@shared/domain/domainobject'; import { EntityId } from '@shared/domain/types'; export class UserLoginMigrationDO extends BaseDO { diff --git a/apps/server/src/modules/user-login-migration/uc/dto/index.ts b/apps/server/src/modules/user-login-migration/domain/interface/index.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/uc/dto/index.ts rename to apps/server/src/modules/user-login-migration/domain/interface/index.ts diff --git a/apps/server/src/modules/user-login-migration/uc/dto/user-login-migration-query.ts b/apps/server/src/modules/user-login-migration/domain/interface/user-login-migration-query.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/uc/dto/user-login-migration-query.ts rename to apps/server/src/modules/user-login-migration/domain/interface/user-login-migration-query.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/debug/index.ts b/apps/server/src/modules/user-login-migration/domain/loggable/debug/index.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/debug/index.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/debug/index.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/debug/school-migration-successful.loggable.spec.ts b/apps/server/src/modules/user-login-migration/domain/loggable/debug/school-migration-successful.loggable.spec.ts similarity index 95% rename from apps/server/src/modules/user-login-migration/loggable/debug/school-migration-successful.loggable.spec.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/debug/school-migration-successful.loggable.spec.ts index 43fc21a6422..cd935aefa69 100644 --- a/apps/server/src/modules/user-login-migration/loggable/debug/school-migration-successful.loggable.spec.ts +++ b/apps/server/src/modules/user-login-migration/domain/loggable/debug/school-migration-successful.loggable.spec.ts @@ -1,6 +1,6 @@ import { ObjectId } from '@mikro-orm/mongodb'; import { legacySchoolDoFactory } from '@modules/legacy-school/testing'; -import { userLoginMigrationDOFactory } from '../../testing'; +import { userLoginMigrationDOFactory } from '../../../testing'; import { SchoolMigrationSuccessfulLoggable } from './school-migration-successful.loggable'; describe(SchoolMigrationSuccessfulLoggable.name, () => { diff --git a/apps/server/src/modules/user-login-migration/loggable/debug/school-migration-successful.loggable.ts b/apps/server/src/modules/user-login-migration/domain/loggable/debug/school-migration-successful.loggable.ts similarity index 91% rename from apps/server/src/modules/user-login-migration/loggable/debug/school-migration-successful.loggable.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/debug/school-migration-successful.loggable.ts index 78af4e17e56..43979d7968f 100644 --- a/apps/server/src/modules/user-login-migration/loggable/debug/school-migration-successful.loggable.ts +++ b/apps/server/src/modules/user-login-migration/domain/loggable/debug/school-migration-successful.loggable.ts @@ -1,6 +1,6 @@ import { Loggable, LogMessage } from '@core/logger'; import { LegacySchoolDo } from '@modules/legacy-school/domain'; -import { UserLoginMigrationDO } from '../../domain'; +import { UserLoginMigrationDO } from '../../do'; export class SchoolMigrationSuccessfulLoggable implements Loggable { constructor(private readonly school: LegacySchoolDo, private readonly userLoginMigration: UserLoginMigrationDO) {} diff --git a/apps/server/src/modules/user-login-migration/loggable/debug/user-migration-correction-successful-loggable.spec.ts b/apps/server/src/modules/user-login-migration/domain/loggable/debug/user-migration-correction-successful-loggable.spec.ts similarity index 77% rename from apps/server/src/modules/user-login-migration/loggable/debug/user-migration-correction-successful-loggable.spec.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/debug/user-migration-correction-successful-loggable.spec.ts index e9dfe2cf65a..19af5e434ca 100644 --- a/apps/server/src/modules/user-login-migration/loggable/debug/user-migration-correction-successful-loggable.spec.ts +++ b/apps/server/src/modules/user-login-migration/domain/loggable/debug/user-migration-correction-successful-loggable.spec.ts @@ -1,8 +1,8 @@ import { LogMessage } from '@core/logger'; import { ObjectId } from '@mikro-orm/mongodb'; -import { UserMigrationCorrectionSuccessfulLoggable } from '@modules/user-login-migration/loggable/debug/user-migration-correction-successful-loggable'; -import { UserLoginMigrationDO } from '../../domain'; -import { userLoginMigrationDOFactory } from '../../testing'; +import { userLoginMigrationDOFactory } from '../../../testing'; +import { UserLoginMigrationDO } from '../../do'; +import { UserMigrationCorrectionSuccessfulLoggable } from './user-migration-correction-successful-loggable'; describe(UserMigrationCorrectionSuccessfulLoggable.name, () => { describe('getLogMessage', () => { diff --git a/apps/server/src/modules/user-login-migration/loggable/debug/user-migration-correction-successful-loggable.ts b/apps/server/src/modules/user-login-migration/domain/loggable/debug/user-migration-correction-successful-loggable.ts similarity index 89% rename from apps/server/src/modules/user-login-migration/loggable/debug/user-migration-correction-successful-loggable.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/debug/user-migration-correction-successful-loggable.ts index 254c650ba92..5a0c93a5e9a 100644 --- a/apps/server/src/modules/user-login-migration/loggable/debug/user-migration-correction-successful-loggable.ts +++ b/apps/server/src/modules/user-login-migration/domain/loggable/debug/user-migration-correction-successful-loggable.ts @@ -1,6 +1,6 @@ import { LogMessage } from '@core/logger'; import { EntityId } from '@shared/domain/types'; -import { UserLoginMigrationDO } from '../../domain'; +import { UserLoginMigrationDO } from '../../do'; export class UserMigrationCorrectionSuccessfulLoggable { constructor(private readonly userId: EntityId, private readonly userLoginMigration: UserLoginMigrationDO) {} diff --git a/apps/server/src/modules/user-login-migration/loggable/debug/user-migration-started.loggable.spec.ts b/apps/server/src/modules/user-login-migration/domain/loggable/debug/user-migration-started.loggable.spec.ts similarity index 93% rename from apps/server/src/modules/user-login-migration/loggable/debug/user-migration-started.loggable.spec.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/debug/user-migration-started.loggable.spec.ts index c90d88f60b1..56f459fd689 100644 --- a/apps/server/src/modules/user-login-migration/loggable/debug/user-migration-started.loggable.spec.ts +++ b/apps/server/src/modules/user-login-migration/domain/loggable/debug/user-migration-started.loggable.spec.ts @@ -1,5 +1,5 @@ import { ObjectId } from '@mikro-orm/mongodb'; -import { userLoginMigrationDOFactory } from '../../testing'; +import { userLoginMigrationDOFactory } from '../../../testing'; import { UserMigrationStartedLoggable } from './user-migration-started.loggable'; describe(UserMigrationStartedLoggable.name, () => { diff --git a/apps/server/src/modules/user-login-migration/loggable/debug/user-migration-started.loggable.ts b/apps/server/src/modules/user-login-migration/domain/loggable/debug/user-migration-started.loggable.ts similarity index 90% rename from apps/server/src/modules/user-login-migration/loggable/debug/user-migration-started.loggable.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/debug/user-migration-started.loggable.ts index ac0492e0d2a..2f79d0b3396 100644 --- a/apps/server/src/modules/user-login-migration/loggable/debug/user-migration-started.loggable.ts +++ b/apps/server/src/modules/user-login-migration/domain/loggable/debug/user-migration-started.loggable.ts @@ -1,6 +1,6 @@ import { Loggable, LogMessage } from '@core/logger'; import { EntityId } from '@shared/domain/types'; -import { UserLoginMigrationDO } from '../../domain'; +import { UserLoginMigrationDO } from '../../do'; export class UserMigrationStartedLoggable implements Loggable { constructor(private readonly userId: EntityId, private readonly userLoginMigration: UserLoginMigrationDO) {} diff --git a/apps/server/src/modules/user-login-migration/loggable/debug/user-migration-successful.loggable.spec.ts b/apps/server/src/modules/user-login-migration/domain/loggable/debug/user-migration-successful.loggable.spec.ts similarity index 93% rename from apps/server/src/modules/user-login-migration/loggable/debug/user-migration-successful.loggable.spec.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/debug/user-migration-successful.loggable.spec.ts index 0c6b1384494..71ec3a63151 100644 --- a/apps/server/src/modules/user-login-migration/loggable/debug/user-migration-successful.loggable.spec.ts +++ b/apps/server/src/modules/user-login-migration/domain/loggable/debug/user-migration-successful.loggable.spec.ts @@ -1,5 +1,5 @@ import { ObjectId } from '@mikro-orm/mongodb'; -import { userLoginMigrationDOFactory } from '../../testing'; +import { userLoginMigrationDOFactory } from '../../../testing'; import { UserMigrationSuccessfulLoggable } from './user-migration-successful.loggable'; describe(UserMigrationSuccessfulLoggable.name, () => { diff --git a/apps/server/src/modules/user-login-migration/loggable/debug/user-migration-successful.loggable.ts b/apps/server/src/modules/user-login-migration/domain/loggable/debug/user-migration-successful.loggable.ts similarity index 90% rename from apps/server/src/modules/user-login-migration/loggable/debug/user-migration-successful.loggable.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/debug/user-migration-successful.loggable.ts index 1d045a3973b..4828fa74116 100644 --- a/apps/server/src/modules/user-login-migration/loggable/debug/user-migration-successful.loggable.ts +++ b/apps/server/src/modules/user-login-migration/domain/loggable/debug/user-migration-successful.loggable.ts @@ -1,6 +1,6 @@ import { Loggable, LogMessage } from '@core/logger'; import { EntityId } from '@shared/domain/types'; -import { UserLoginMigrationDO } from '../../domain'; +import { UserLoginMigrationDO } from '../../do'; export class UserMigrationSuccessfulLoggable implements Loggable { constructor(private readonly userId: EntityId, private readonly userLoginMigration: UserLoginMigrationDO) {} diff --git a/apps/server/src/modules/user-login-migration/loggable/external-school-number-missing.loggable-exception.spec.ts b/apps/server/src/modules/user-login-migration/domain/loggable/external-school-number-missing.loggable-exception.spec.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/external-school-number-missing.loggable-exception.spec.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/external-school-number-missing.loggable-exception.spec.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/external-school-number-missing.loggable-exception.ts b/apps/server/src/modules/user-login-migration/domain/loggable/external-school-number-missing.loggable-exception.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/external-school-number-missing.loggable-exception.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/external-school-number-missing.loggable-exception.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/identical-user-login-migration-system.loggable-exception.spec.ts b/apps/server/src/modules/user-login-migration/domain/loggable/identical-user-login-migration-system.loggable-exception.spec.ts similarity index 91% rename from apps/server/src/modules/user-login-migration/loggable/identical-user-login-migration-system.loggable-exception.spec.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/identical-user-login-migration-system.loggable-exception.spec.ts index d81f84b7ccc..75c91cb52d6 100644 --- a/apps/server/src/modules/user-login-migration/loggable/identical-user-login-migration-system.loggable-exception.spec.ts +++ b/apps/server/src/modules/user-login-migration/domain/loggable/identical-user-login-migration-system.loggable-exception.spec.ts @@ -1,5 +1,5 @@ -import { IdenticalUserLoginMigrationSystemLoggableException } from '@modules/user-login-migration/loggable/identical-user-login-migration-system.loggable-exception'; import { ObjectId } from '@mikro-orm/mongodb'; +import { IdenticalUserLoginMigrationSystemLoggableException } from './identical-user-login-migration-system.loggable-exception'; describe(IdenticalUserLoginMigrationSystemLoggableException.name, () => { describe('getLogMessage', () => { diff --git a/apps/server/src/modules/user-login-migration/loggable/identical-user-login-migration-system.loggable-exception.ts b/apps/server/src/modules/user-login-migration/domain/loggable/identical-user-login-migration-system.loggable-exception.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/identical-user-login-migration-system.loggable-exception.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/identical-user-login-migration-system.loggable-exception.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/index.ts b/apps/server/src/modules/user-login-migration/domain/loggable/index.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/index.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/index.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/invalid-user-login-migration.loggable-exception.spec.ts b/apps/server/src/modules/user-login-migration/domain/loggable/invalid-user-login-migration.loggable-exception.spec.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/invalid-user-login-migration.loggable-exception.spec.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/invalid-user-login-migration.loggable-exception.spec.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/invalid-user-login-migration.loggable-exception.ts b/apps/server/src/modules/user-login-migration/domain/loggable/invalid-user-login-migration.loggable-exception.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/invalid-user-login-migration.loggable-exception.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/invalid-user-login-migration.loggable-exception.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/moin-schule-system-not-found.loggable-exception.spec.ts b/apps/server/src/modules/user-login-migration/domain/loggable/moin-schule-system-not-found.loggable-exception.spec.ts similarity index 79% rename from apps/server/src/modules/user-login-migration/loggable/moin-schule-system-not-found.loggable-exception.spec.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/moin-schule-system-not-found.loggable-exception.spec.ts index fa9e4e00956..123cf472707 100644 --- a/apps/server/src/modules/user-login-migration/loggable/moin-schule-system-not-found.loggable-exception.spec.ts +++ b/apps/server/src/modules/user-login-migration/domain/loggable/moin-schule-system-not-found.loggable-exception.spec.ts @@ -1,4 +1,4 @@ -import { MoinSchuleSystemNotFoundLoggableException } from '@modules/user-login-migration/loggable/moin-schule-system-not-found.loggable-exception'; +import { MoinSchuleSystemNotFoundLoggableException } from './moin-schule-system-not-found.loggable-exception'; describe(MoinSchuleSystemNotFoundLoggableException.name, () => { describe('getLogMessage', () => { diff --git a/apps/server/src/modules/user-login-migration/loggable/moin-schule-system-not-found.loggable-exception.ts b/apps/server/src/modules/user-login-migration/domain/loggable/moin-schule-system-not-found.loggable-exception.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/moin-schule-system-not-found.loggable-exception.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/moin-schule-system-not-found.loggable-exception.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/school-migration-database-operation-failed.loggable-exception.spec.ts b/apps/server/src/modules/user-login-migration/domain/loggable/school-migration-database-operation-failed.loggable-exception.spec.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/school-migration-database-operation-failed.loggable-exception.spec.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/school-migration-database-operation-failed.loggable-exception.spec.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/school-migration-database-operation-failed.loggable-exception.ts b/apps/server/src/modules/user-login-migration/domain/loggable/school-migration-database-operation-failed.loggable-exception.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/school-migration-database-operation-failed.loggable-exception.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/school-migration-database-operation-failed.loggable-exception.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/school-number-mismatch.loggable-exception.spec.ts b/apps/server/src/modules/user-login-migration/domain/loggable/school-number-mismatch.loggable-exception.spec.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/school-number-mismatch.loggable-exception.spec.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/school-number-mismatch.loggable-exception.spec.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/school-number-mismatch.loggable-exception.ts b/apps/server/src/modules/user-login-migration/domain/loggable/school-number-mismatch.loggable-exception.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/school-number-mismatch.loggable-exception.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/school-number-mismatch.loggable-exception.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/school-number-missing.loggable-exception.spec.ts b/apps/server/src/modules/user-login-migration/domain/loggable/school-number-missing.loggable-exception.spec.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/school-number-missing.loggable-exception.spec.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/school-number-missing.loggable-exception.spec.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/school-number-missing.loggable-exception.ts b/apps/server/src/modules/user-login-migration/domain/loggable/school-number-missing.loggable-exception.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/school-number-missing.loggable-exception.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/school-number-missing.loggable-exception.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-already-closed.loggable-exception.spec.ts b/apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-already-closed.loggable-exception.spec.ts similarity index 91% rename from apps/server/src/modules/user-login-migration/loggable/user-login-migration-already-closed.loggable-exception.spec.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-already-closed.loggable-exception.spec.ts index 71fb883f944..c139b08b413 100644 --- a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-already-closed.loggable-exception.spec.ts +++ b/apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-already-closed.loggable-exception.spec.ts @@ -1,5 +1,5 @@ -import { UserLoginMigrationAlreadyClosedLoggableException } from '@modules/user-login-migration/loggable/user-login-migration-already-closed.loggable-exception'; import { ObjectId } from '@mikro-orm/mongodb'; +import { UserLoginMigrationAlreadyClosedLoggableException } from './user-login-migration-already-closed.loggable-exception'; describe(UserLoginMigrationAlreadyClosedLoggableException.name, () => { describe('getLogMessage', () => { diff --git a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-already-closed.loggable-exception.ts b/apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-already-closed.loggable-exception.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/user-login-migration-already-closed.loggable-exception.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-already-closed.loggable-exception.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-grace-period-expired-loggable.exception.ts b/apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-grace-period-expired-loggable.exception.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/user-login-migration-grace-period-expired-loggable.exception.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-grace-period-expired-loggable.exception.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-invalid-admin.loggable-exception.spec.ts b/apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-invalid-admin.loggable-exception.spec.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/user-login-migration-invalid-admin.loggable-exception.spec.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-invalid-admin.loggable-exception.spec.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-invalid-admin.loggable-exception.ts b/apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-invalid-admin.loggable-exception.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/user-login-migration-invalid-admin.loggable-exception.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-invalid-admin.loggable-exception.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-invalid-external-school-id.loggable-exception.spec.ts b/apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-invalid-external-school-id.loggable-exception.spec.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/user-login-migration-invalid-external-school-id.loggable-exception.spec.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-invalid-external-school-id.loggable-exception.spec.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-invalid-external-school-id.loggable-exception.ts b/apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-invalid-external-school-id.loggable-exception.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/user-login-migration-invalid-external-school-id.loggable-exception.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-invalid-external-school-id.loggable-exception.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-mandatory.loggable.spec.ts b/apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-mandatory.loggable.spec.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/user-login-migration-mandatory.loggable.spec.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-mandatory.loggable.spec.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-mandatory.loggable.ts b/apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-mandatory.loggable.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/user-login-migration-mandatory.loggable.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-mandatory.loggable.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-multiple-email-users.loggable-exception.spec.ts b/apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-multiple-email-users.loggable-exception.spec.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/user-login-migration-multiple-email-users.loggable-exception.spec.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-multiple-email-users.loggable-exception.spec.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-multiple-email-users.loggable-exception.ts b/apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-multiple-email-users.loggable-exception.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/user-login-migration-multiple-email-users.loggable-exception.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-multiple-email-users.loggable-exception.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-not-found.loggable-exception.ts b/apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-not-found.loggable-exception.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/user-login-migration-not-found.loggable-exception.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-not-found.loggable-exception.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-school-already-migrated.loggable-exception.spec.ts b/apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-school-already-migrated.loggable-exception.spec.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/user-login-migration-school-already-migrated.loggable-exception.spec.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-school-already-migrated.loggable-exception.spec.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-school-already-migrated.loggable-exception.ts b/apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-school-already-migrated.loggable-exception.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/user-login-migration-school-already-migrated.loggable-exception.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-school-already-migrated.loggable-exception.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-start.loggable.spec.ts b/apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-start.loggable.spec.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/user-login-migration-start.loggable.spec.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-start.loggable.spec.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-start.loggable.ts b/apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-start.loggable.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/user-login-migration-start.loggable.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-start.loggable.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-user-already-migrated.loggable-exception.spec.ts b/apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-user-already-migrated.loggable-exception.spec.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/user-login-migration-user-already-migrated.loggable-exception.spec.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-user-already-migrated.loggable-exception.spec.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-user-already-migrated.loggable-exception.ts b/apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-user-already-migrated.loggable-exception.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/user-login-migration-user-already-migrated.loggable-exception.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/user-login-migration-user-already-migrated.loggable-exception.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/user-migration-database-operation-failed.loggable-exception.spec.ts b/apps/server/src/modules/user-login-migration/domain/loggable/user-migration-database-operation-failed.loggable-exception.spec.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/user-migration-database-operation-failed.loggable-exception.spec.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/user-migration-database-operation-failed.loggable-exception.spec.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/user-migration-database-operation-failed.loggable-exception.ts b/apps/server/src/modules/user-login-migration/domain/loggable/user-migration-database-operation-failed.loggable-exception.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/user-migration-database-operation-failed.loggable-exception.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/user-migration-database-operation-failed.loggable-exception.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/user-migration-rollback-successful.loggable.ts b/apps/server/src/modules/user-login-migration/domain/loggable/user-migration-rollback-successful.loggable.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/user-migration-rollback-successful.loggable.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/user-migration-rollback-successful.loggable.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/user-not-migrated.loggable-exception.spec.ts b/apps/server/src/modules/user-login-migration/domain/loggable/user-not-migrated.loggable-exception.spec.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/user-not-migrated.loggable-exception.spec.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/user-not-migrated.loggable-exception.spec.ts diff --git a/apps/server/src/modules/user-login-migration/loggable/user-not-migrated.loggable-exception.ts b/apps/server/src/modules/user-login-migration/domain/loggable/user-not-migrated.loggable-exception.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/loggable/user-not-migrated.loggable-exception.ts rename to apps/server/src/modules/user-login-migration/domain/loggable/user-not-migrated.loggable-exception.ts diff --git a/apps/server/src/modules/user-login-migration/service/index.ts b/apps/server/src/modules/user-login-migration/domain/service/index.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/service/index.ts rename to apps/server/src/modules/user-login-migration/domain/service/index.ts diff --git a/apps/server/src/modules/user-login-migration/service/migration-check.service.spec.ts b/apps/server/src/modules/user-login-migration/domain/service/migration-check.service.spec.ts similarity index 98% rename from apps/server/src/modules/user-login-migration/service/migration-check.service.spec.ts rename to apps/server/src/modules/user-login-migration/domain/service/migration-check.service.spec.ts index ece6d678110..ab20c51315a 100644 --- a/apps/server/src/modules/user-login-migration/service/migration-check.service.spec.ts +++ b/apps/server/src/modules/user-login-migration/domain/service/migration-check.service.spec.ts @@ -4,8 +4,8 @@ import { legacySchoolDoFactory } from '@modules/legacy-school/testing'; import { UserService } from '@modules/user'; import { userDoFactory } from '@modules/user/testing'; import { Test, TestingModule } from '@nestjs/testing'; -import { UserLoginMigrationDO } from '../domain'; -import { UserLoginMigrationRepo } from '../repo'; +import { UserLoginMigrationRepo } from '../../repo'; +import { UserLoginMigrationDO } from '../do'; import { MigrationCheckService } from './migration-check.service'; describe('MigrationCheckService', () => { diff --git a/apps/server/src/modules/user-login-migration/service/migration-check.service.ts b/apps/server/src/modules/user-login-migration/domain/service/migration-check.service.ts similarity index 93% rename from apps/server/src/modules/user-login-migration/service/migration-check.service.ts rename to apps/server/src/modules/user-login-migration/domain/service/migration-check.service.ts index 1c9da5bffaf..abd3d2f465d 100644 --- a/apps/server/src/modules/user-login-migration/service/migration-check.service.ts +++ b/apps/server/src/modules/user-login-migration/domain/service/migration-check.service.ts @@ -3,8 +3,8 @@ import { UserService } from '@modules/user'; import { UserDo } from '@modules/user/domain'; import { Injectable } from '@nestjs/common'; import { EntityId } from '@shared/domain/types'; -import { UserLoginMigrationDO } from '../domain'; -import { UserLoginMigrationRepo } from '../repo'; +import { UserLoginMigrationRepo } from '../../repo'; +import { UserLoginMigrationDO } from '../do'; @Injectable() export class MigrationCheckService { diff --git a/apps/server/src/modules/user-login-migration/service/school-migration.service.spec.ts b/apps/server/src/modules/user-login-migration/domain/service/school-migration.service.spec.ts similarity index 99% rename from apps/server/src/modules/user-login-migration/service/school-migration.service.spec.ts rename to apps/server/src/modules/user-login-migration/domain/service/school-migration.service.spec.ts index aeffe4754f5..ce3dce8be28 100644 --- a/apps/server/src/modules/user-login-migration/service/school-migration.service.spec.ts +++ b/apps/server/src/modules/user-login-migration/domain/service/school-migration.service.spec.ts @@ -8,14 +8,14 @@ import { UserDo } from '@modules/user/domain'; import { userDoFactory } from '@modules/user/testing'; import { Test, TestingModule } from '@nestjs/testing'; import { Page } from '@shared/domain/domainobject'; -import { UserLoginMigrationDO } from '../domain'; +import { UserLoginMigrationRepo } from '../../repo'; +import { userLoginMigrationDOFactory } from '../../testing'; import { SchoolMigrationDatabaseOperationFailedLoggableException, SchoolNumberMismatchLoggableException, } from '../loggable'; -import { UserLoginMigrationRepo } from '../repo'; -import { userLoginMigrationDOFactory } from '../testing'; import { SchoolMigrationService } from './school-migration.service'; +import { UserLoginMigrationDO } from '../do'; describe(SchoolMigrationService.name, () => { let module: TestingModule; diff --git a/apps/server/src/modules/user-login-migration/service/school-migration.service.ts b/apps/server/src/modules/user-login-migration/domain/service/school-migration.service.ts similarity index 98% rename from apps/server/src/modules/user-login-migration/service/school-migration.service.ts rename to apps/server/src/modules/user-login-migration/domain/service/school-migration.service.ts index 79346163210..4410e545ec6 100644 --- a/apps/server/src/modules/user-login-migration/service/school-migration.service.ts +++ b/apps/server/src/modules/user-login-migration/domain/service/school-migration.service.ts @@ -5,12 +5,12 @@ import { UserService } from '@modules/user'; import { UserDo } from '@modules/user/domain'; import { Injectable } from '@nestjs/common'; import { performance } from 'perf_hooks'; -import { UserLoginMigrationDO } from '../domain'; +import { UserLoginMigrationRepo } from '../../repo'; import { SchoolMigrationDatabaseOperationFailedLoggableException, SchoolNumberMismatchLoggableException, } from '../loggable'; -import { UserLoginMigrationRepo } from '../repo'; +import { UserLoginMigrationDO } from '../do'; @Injectable() export class SchoolMigrationService { diff --git a/apps/server/src/modules/user-login-migration/service/user-login-migration-revert.service.spec.ts b/apps/server/src/modules/user-login-migration/domain/service/user-login-migration-revert.service.spec.ts similarity index 97% rename from apps/server/src/modules/user-login-migration/service/user-login-migration-revert.service.spec.ts rename to apps/server/src/modules/user-login-migration/domain/service/user-login-migration-revert.service.spec.ts index 5484f07cfb7..1f7239ef9f1 100644 --- a/apps/server/src/modules/user-login-migration/service/user-login-migration-revert.service.spec.ts +++ b/apps/server/src/modules/user-login-migration/domain/service/user-login-migration-revert.service.spec.ts @@ -2,7 +2,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { LegacySchoolService } from '@modules/legacy-school'; import { SchoolFeature } from '@modules/school/domain'; import { Test, TestingModule } from '@nestjs/testing'; -import { userLoginMigrationDOFactory } from '../testing'; +import { userLoginMigrationDOFactory } from '../../testing'; import { UserLoginMigrationRevertService } from './user-login-migration-revert.service'; import { UserLoginMigrationService } from './user-login-migration.service'; diff --git a/apps/server/src/modules/user-login-migration/service/user-login-migration-revert.service.ts b/apps/server/src/modules/user-login-migration/domain/service/user-login-migration-revert.service.ts similarity index 93% rename from apps/server/src/modules/user-login-migration/service/user-login-migration-revert.service.ts rename to apps/server/src/modules/user-login-migration/domain/service/user-login-migration-revert.service.ts index bb6b8b44046..e3678bcec36 100644 --- a/apps/server/src/modules/user-login-migration/service/user-login-migration-revert.service.ts +++ b/apps/server/src/modules/user-login-migration/domain/service/user-login-migration-revert.service.ts @@ -1,8 +1,8 @@ import { LegacySchoolService } from '@modules/legacy-school'; import { SchoolFeature } from '@modules/school/domain'; import { Injectable } from '@nestjs/common'; -import { UserLoginMigrationDO } from '../domain'; import { UserLoginMigrationService } from './user-login-migration.service'; +import { UserLoginMigrationDO } from '../do'; @Injectable() export class UserLoginMigrationRevertService { diff --git a/apps/server/src/modules/user-login-migration/service/user-login-migration-rollback.service.spec.ts b/apps/server/src/modules/user-login-migration/domain/service/user-login-migration-rollback.service.spec.ts similarity index 99% rename from apps/server/src/modules/user-login-migration/service/user-login-migration-rollback.service.spec.ts rename to apps/server/src/modules/user-login-migration/domain/service/user-login-migration-rollback.service.spec.ts index aec89690811..44e36199faf 100644 --- a/apps/server/src/modules/user-login-migration/service/user-login-migration-rollback.service.spec.ts +++ b/apps/server/src/modules/user-login-migration/domain/service/user-login-migration-rollback.service.spec.ts @@ -7,12 +7,12 @@ import { UserService } from '@modules/user'; import { UserDo } from '@modules/user/domain'; import { userDoFactory } from '@modules/user/testing'; import { Test, TestingModule } from '@nestjs/testing'; +import { userLoginMigrationDOFactory } from '../../testing'; import { UserLoginMigrationNotFoundLoggableException, UserMigrationRollbackSuccessfulLoggable, UserNotMigratedLoggableException, } from '../loggable'; -import { userLoginMigrationDOFactory } from '../testing'; import { UserLoginMigrationRollbackService } from './user-login-migration-rollback.service'; import { UserLoginMigrationService } from './user-login-migration.service'; diff --git a/apps/server/src/modules/user-login-migration/service/user-login-migration-rollback.service.ts b/apps/server/src/modules/user-login-migration/domain/service/user-login-migration-rollback.service.ts similarity index 100% rename from apps/server/src/modules/user-login-migration/service/user-login-migration-rollback.service.ts rename to apps/server/src/modules/user-login-migration/domain/service/user-login-migration-rollback.service.ts diff --git a/apps/server/src/modules/user-login-migration/service/user-login-migration.service.spec.ts b/apps/server/src/modules/user-login-migration/domain/service/user-login-migration.service.spec.ts similarity index 99% rename from apps/server/src/modules/user-login-migration/service/user-login-migration.service.spec.ts rename to apps/server/src/modules/user-login-migration/domain/service/user-login-migration.service.spec.ts index 281e6884af0..bc9b2fbf263 100644 --- a/apps/server/src/modules/user-login-migration/service/user-login-migration.service.spec.ts +++ b/apps/server/src/modules/user-login-migration/domain/service/user-login-migration.service.spec.ts @@ -10,15 +10,15 @@ import { systemFactory } from '@modules/system/testing'; import { UserService } from '@modules/user'; import { userDoFactory } from '@modules/user/testing'; import { Test, TestingModule } from '@nestjs/testing'; -import { UserLoginMigrationDO } from '../domain'; +import { UserLoginMigrationRepo } from '../../repo'; +import { userLoginMigrationDOFactory } from '../../testing'; +import { UserLoginMigrationDO } from '../do'; import { IdenticalUserLoginMigrationSystemLoggableException, MoinSchuleSystemNotFoundLoggableException, UserLoginMigrationAlreadyClosedLoggableException, UserLoginMigrationGracePeriodExpiredLoggableException, } from '../loggable'; -import { UserLoginMigrationRepo } from '../repo'; -import { userLoginMigrationDOFactory } from '../testing'; import { UserLoginMigrationService } from './user-login-migration.service'; describe(UserLoginMigrationService.name, () => { diff --git a/apps/server/src/modules/user-login-migration/service/user-login-migration.service.ts b/apps/server/src/modules/user-login-migration/domain/service/user-login-migration.service.ts similarity index 98% rename from apps/server/src/modules/user-login-migration/service/user-login-migration.service.ts rename to apps/server/src/modules/user-login-migration/domain/service/user-login-migration.service.ts index 0b422c225e9..f928632eda0 100644 --- a/apps/server/src/modules/user-login-migration/service/user-login-migration.service.ts +++ b/apps/server/src/modules/user-login-migration/domain/service/user-login-migration.service.ts @@ -7,14 +7,14 @@ import { SystemType } from '@modules/system/domain'; import { UserService } from '@modules/user'; import { Injectable } from '@nestjs/common'; import { EntityId } from '@shared/domain/types'; -import { UserLoginMigrationDO } from '../domain'; +import { UserLoginMigrationRepo } from '../../repo'; +import { UserLoginMigrationDO } from '../do'; import { IdenticalUserLoginMigrationSystemLoggableException, MoinSchuleSystemNotFoundLoggableException, UserLoginMigrationAlreadyClosedLoggableException, UserLoginMigrationGracePeriodExpiredLoggableException, } from '../loggable'; -import { UserLoginMigrationRepo } from '../repo'; @Injectable() export class UserLoginMigrationService { diff --git a/apps/server/src/modules/user-login-migration/service/user-migration.service.spec.ts b/apps/server/src/modules/user-login-migration/domain/service/user-migration.service.spec.ts similarity index 99% rename from apps/server/src/modules/user-login-migration/service/user-migration.service.spec.ts rename to apps/server/src/modules/user-login-migration/domain/service/user-migration.service.spec.ts index 4605005c9f4..249ec0ac764 100644 --- a/apps/server/src/modules/user-login-migration/service/user-migration.service.spec.ts +++ b/apps/server/src/modules/user-login-migration/domain/service/user-migration.service.spec.ts @@ -6,12 +6,12 @@ import { UserService } from '@modules/user'; import { userDoFactory } from '@modules/user/testing'; import { Test, TestingModule } from '@nestjs/testing'; import { roleFactory } from '@testing/factory/role.factory'; -import { UserLoginMigrationDO } from '../domain'; +import { userLoginMigrationDOFactory } from '../../testing'; +import { UserLoginMigrationDO } from '../do'; import { UserLoginMigrationUserAlreadyMigratedLoggableException, UserMigrationDatabaseOperationFailedLoggableException, } from '../loggable'; -import { userLoginMigrationDOFactory } from '../testing'; import { UserMigrationService } from './user-migration.service'; describe(UserMigrationService.name, () => { diff --git a/apps/server/src/modules/user-login-migration/service/user-migration.service.ts b/apps/server/src/modules/user-login-migration/domain/service/user-migration.service.ts similarity index 98% rename from apps/server/src/modules/user-login-migration/service/user-migration.service.ts rename to apps/server/src/modules/user-login-migration/domain/service/user-migration.service.ts index 1d47a350083..e1ba4d6c1b5 100644 --- a/apps/server/src/modules/user-login-migration/service/user-migration.service.ts +++ b/apps/server/src/modules/user-login-migration/domain/service/user-migration.service.ts @@ -4,7 +4,7 @@ import { UserService } from '@modules/user'; import { UserDo } from '@modules/user/domain'; import { Injectable } from '@nestjs/common'; import { EntityId } from '@shared/domain/types'; -import { UserLoginMigrationDO } from '../domain'; +import { UserLoginMigrationDO } from '../do'; import { UserLoginMigrationUserAlreadyMigratedLoggableException, UserMigrationDatabaseOperationFailedLoggableException, diff --git a/apps/server/src/modules/user-login-migration/index.ts b/apps/server/src/modules/user-login-migration/index.ts index bdcddcdf0a4..0f285866461 100644 --- a/apps/server/src/modules/user-login-migration/index.ts +++ b/apps/server/src/modules/user-login-migration/index.ts @@ -1,3 +1,4 @@ -export * from './user-login-migration.module'; -export * from './service'; +export { UserLoginMigrationDO } from './domain'; +export { MigrationCheckService, UserLoginMigrationService, UserMigrationService } from './domain/service'; export { UserLoginMigrationConfig } from './user-login-migration.config'; +export * from './user-login-migration.module'; diff --git a/apps/server/src/modules/user-login-migration/repo/index.ts b/apps/server/src/modules/user-login-migration/repo/index.ts index 328597b46ac..1a275977318 100644 --- a/apps/server/src/modules/user-login-migration/repo/index.ts +++ b/apps/server/src/modules/user-login-migration/repo/index.ts @@ -1,2 +1,2 @@ +export { UserLoginMigrationEntity, UserLoginMigrationEntityProps } from './user-login-migration.entity'; export { UserLoginMigrationRepo } from './user-login-migration.repo'; -export { UserLoginMigrationEntityProps, UserLoginMigrationEntity } from './user-login-migration.entity'; diff --git a/apps/server/src/modules/user-login-migration/repo/user-login-migration.entity.ts b/apps/server/src/modules/user-login-migration/repo/user-login-migration.entity.ts index 723720f48ae..29aa822a615 100644 --- a/apps/server/src/modules/user-login-migration/repo/user-login-migration.entity.ts +++ b/apps/server/src/modules/user-login-migration/repo/user-login-migration.entity.ts @@ -29,7 +29,7 @@ export class UserLoginMigrationEntity extends BaseEntityWithTimestamps { sourceSystem?: SystemEntity; @ManyToOne(() => SystemEntity) - targetSystem: SystemEntity; + targetSystem!: SystemEntity; @Property({ nullable: true }) mandatorySince?: Date; diff --git a/apps/server/src/modules/user-login-migration/repo/user-login-migration.repo.integration.spec.ts b/apps/server/src/modules/user-login-migration/repo/user-login-migration.repo.integration.spec.ts index 2a6a4f30923..db268c87ac1 100644 --- a/apps/server/src/modules/user-login-migration/repo/user-login-migration.repo.integration.spec.ts +++ b/apps/server/src/modules/user-login-migration/repo/user-login-migration.repo.integration.spec.ts @@ -5,11 +5,11 @@ import { SchoolEntity } from '@modules/school/repo'; import { schoolEntityFactory } from '@modules/school/testing'; import { type SystemEntity } from '@modules/system/repo'; import { systemEntityFactory } from '@modules/system/testing'; -import { userLoginMigrationFactory } from '@modules/user-login-migration/testing'; import { Test, TestingModule } from '@nestjs/testing'; import { cleanupCollections } from '@testing/cleanup-collections'; import { MongoMemoryDatabaseModule } from '@testing/database'; import { UserLoginMigrationDO } from '../domain'; +import { userLoginMigrationFactory } from '../testing'; import { UserLoginMigrationEntity } from './user-login-migration.entity'; import { UserLoginMigrationRepo } from './user-login-migration.repo'; diff --git a/apps/server/src/modules/user-login-migration/service/dto/index.ts b/apps/server/src/modules/user-login-migration/service/dto/index.ts deleted file mode 100644 index bbc5344f4dd..00000000000 --- a/apps/server/src/modules/user-login-migration/service/dto/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './migration.dto'; -export * from './page-content.dto'; diff --git a/apps/server/src/modules/user-login-migration/service/dto/migration.dto.ts b/apps/server/src/modules/user-login-migration/service/dto/migration.dto.ts deleted file mode 100644 index 726a851f391..00000000000 --- a/apps/server/src/modules/user-login-migration/service/dto/migration.dto.ts +++ /dev/null @@ -1,7 +0,0 @@ -export class MigrationDto { - redirect: string; - - constructor(userMigrationDto: MigrationDto) { - this.redirect = userMigrationDto.redirect; - } -} diff --git a/apps/server/src/modules/user-login-migration/service/dto/page-content.dto.ts b/apps/server/src/modules/user-login-migration/service/dto/page-content.dto.ts deleted file mode 100644 index 9759858b1ab..00000000000 --- a/apps/server/src/modules/user-login-migration/service/dto/page-content.dto.ts +++ /dev/null @@ -1,10 +0,0 @@ -export class PageContentDto { - proceedButtonUrl: string; - - cancelButtonUrl: string; - - constructor(props: PageContentDto) { - this.proceedButtonUrl = props.proceedButtonUrl; - this.cancelButtonUrl = props.cancelButtonUrl; - } -} diff --git a/apps/server/src/modules/user-login-migration/testing/index.ts b/apps/server/src/modules/user-login-migration/testing/index.ts index 343b1825184..fca962356f5 100644 --- a/apps/server/src/modules/user-login-migration/testing/index.ts +++ b/apps/server/src/modules/user-login-migration/testing/index.ts @@ -1,2 +1,3 @@ +export * from './user-login-migration-do.factory'; export * from './user-login-migration.factory'; export * from './user-login-migration-do.factory'; diff --git a/apps/server/src/modules/user-login-migration/testing/user-login-migration-do.factory.ts b/apps/server/src/modules/user-login-migration/testing/user-login-migration-do.factory.ts index 11340989261..9026267b6c6 100644 --- a/apps/server/src/modules/user-login-migration/testing/user-login-migration-do.factory.ts +++ b/apps/server/src/modules/user-login-migration/testing/user-login-migration-do.factory.ts @@ -1,4 +1,4 @@ -import { DoBaseFactory } from '@testing/factory/domainobject/do-base.factory'; +import { DoBaseFactory } from '@testing/factory/domainobject'; import { UserLoginMigrationDO } from '../domain'; export const userLoginMigrationDOFactory = DoBaseFactory.define( diff --git a/apps/server/src/modules/user-login-migration/user-login-migration-api.module.ts b/apps/server/src/modules/user-login-migration/user-login-migration-api.module.ts index 3946436de64..afbe443c34b 100644 --- a/apps/server/src/modules/user-login-migration/user-login-migration-api.module.ts +++ b/apps/server/src/modules/user-login-migration/user-login-migration-api.module.ts @@ -1,3 +1,4 @@ +import { LoggerModule } from '@core/logger'; import { AuthenticationModule } from '@modules/authentication'; import { AuthorizationModule } from '@modules/authorization'; import { LegacySchoolModule } from '@modules/legacy-school'; @@ -6,9 +7,6 @@ import { ProvisioningModule } from '@modules/provisioning'; import { UserModule } from '@modules/user'; import { ImportUserModule } from '@modules/user-import'; import { Module } from '@nestjs/common'; -import { LoggerModule } from '@core/logger'; -import { UserLoginMigrationRollbackController } from './controller/user-login-migration-rollback.controller'; -import { UserLoginMigrationController } from './controller/user-login-migration.controller'; import { CloseMigrationWizardUc, CloseUserLoginMigrationUc, @@ -17,7 +15,9 @@ import { ToggleUserLoginMigrationUc, UserLoginMigrationRollbackUc, UserLoginMigrationUc, -} from './uc'; +} from './api/uc'; +import { UserLoginMigrationRollbackController } from './api/user-login-migration-rollback.controller'; +import { UserLoginMigrationController } from './api/user-login-migration.controller'; import { UserLoginMigrationModule } from './user-login-migration.module'; @Module({ diff --git a/apps/server/src/modules/user-login-migration/user-login-migration.module.ts b/apps/server/src/modules/user-login-migration/user-login-migration.module.ts index b1660c3fade..6ac3e4b3dab 100644 --- a/apps/server/src/modules/user-login-migration/user-login-migration.module.ts +++ b/apps/server/src/modules/user-login-migration/user-login-migration.module.ts @@ -4,7 +4,6 @@ import { LegacySchoolModule } from '@modules/legacy-school'; import { SystemModule } from '@modules/system'; import { UserModule } from '@modules/user'; import { Module } from '@nestjs/common'; -import { UserLoginMigrationRepo } from './repo'; import { MigrationCheckService, SchoolMigrationService, @@ -12,7 +11,8 @@ import { UserLoginMigrationRollbackService, UserLoginMigrationService, UserMigrationService, -} from './service'; +} from './domain/service'; +import { UserLoginMigrationRepo } from './repo'; @Module({ imports: [UserModule, LegacySchoolModule, LoggerModule, AccountModule, SystemModule],