From 2635a93f7a127e79ab827827fd13cc4d46da1f79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marvin=20=C3=96hlerking?= <103562092+MarvinOehlerkingCap@users.noreply.github.com> Date: Fri, 7 Mar 2025 10:02:17 +0100 Subject: [PATCH] N21-2109 Move user login migration from shared to modules (#5558) --- .../rules/user-login-migration.rule.spec.ts | 4 ++-- .../rules/user-login-migration.rule.ts | 2 +- .../src/modules/board/board.entity.imports.ts | 2 +- .../legacy-school.repo.integration.spec.ts | 2 +- .../legacy-school/repo/legacy-school.repo.ts | 3 ++- .../management/management.entity.imports.ts | 2 +- ...onnex-group-provisioning.entity.imports.ts | 2 +- ...chulconnex-group-removal.entity.imports.ts | 2 +- ...nex-license-provisioning.entity.imports.ts | 4 ++-- .../school/repo/mikro-orm/school.entity.ts | 8 ++++---- .../modules/server/server.entity.imports.ts | 2 +- .../service/user-import.service.spec.ts | 4 ++-- .../service/user-import.service.ts | 2 +- .../uc/user-import-fetch.uc.spec.ts | 4 ++-- .../user-import/uc/user-import-fetch.uc.ts | 2 +- .../user-import/uc/user-import.uc.spec.ts | 2 +- .../user-login-migration-rollback.api.spec.ts | 2 +- .../api-test/user-login-migration.api.spec.ts | 2 +- .../user-login-migration.controller.ts | 3 ++- .../user-login-migration/domain/do/index.ts | 1 + .../domain/do}/user-login-migration.do.ts | 18 ++++++++--------- .../user-login-migration/domain/index.ts | 1 + ...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 | 4 ++-- .../user-migration-started.loggable.spec.ts | 2 +- .../debug/user-migration-started.loggable.ts | 4 ++-- ...user-migration-successful.loggable.spec.ts | 2 +- .../user-migration-successful.loggable.ts | 4 ++-- .../mapper/user-login-migration.mapper.ts | 2 +- .../user-login-migration/repo/index.ts | 2 ++ .../repo}/user-login-migration.entity.ts | 20 ++++++++++++++++--- ...r-login-migration.repo.integration.spec.ts | 13 ++++++------ .../repo}/user-login-migration.repo.ts | 12 +++++------ .../service/migration-check.service.spec.ts | 4 ++-- .../service/migration-check.service.ts | 4 ++-- .../service/school-migration.service.spec.ts | 7 ++++--- .../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.service.spec.ts | 6 +++--- .../service/user-login-migration.service.ts | 4 ++-- .../service/user-migration.service.spec.ts | 4 ++-- .../service/user-migration.service.ts | 2 +- .../user-login-migration/testing/index.ts | 1 + .../user-login-migration-do.factory.ts | 4 ++-- .../testing/user-login-migration.factory.ts | 4 ++-- .../uc/close-user-login-migration.uc.spec.ts | 4 ++-- .../uc/close-user-login-migration.uc.ts | 4 ++-- .../restart-user-login-migration.uc.spec.ts | 4 ++-- .../uc/restart-user-login-migration.uc.ts | 2 +- .../uc/start-user-login-migration.uc.spec.ts | 4 ++-- .../uc/start-user-login-migration.uc.ts | 2 +- .../uc/toggle-user-login-migration.uc.spec.ts | 4 ++-- .../uc/toggle-user-login-migration.uc.ts | 2 +- .../uc/user-login-migration.uc.spec.ts | 5 +++-- .../uc/user-login-migration.uc.ts | 5 +++-- .../user-login-migration.module.ts | 2 +- .../src/shared/domain/domainobject/index.ts | 1 - apps/server/src/shared/domain/entity/index.ts | 1 - .../shared/repo/userloginmigration/index.ts | 1 - .../src/testing/factory/domainobject/index.ts | 1 - 64 files changed, 130 insertions(+), 111 deletions(-) create mode 100644 apps/server/src/modules/user-login-migration/domain/do/index.ts rename apps/server/src/{shared/domain/domainobject => modules/user-login-migration/domain/do}/user-login-migration.do.ts (56%) create mode 100644 apps/server/src/modules/user-login-migration/domain/index.ts create mode 100644 apps/server/src/modules/user-login-migration/repo/index.ts rename apps/server/src/{shared/domain/entity => modules/user-login-migration/repo}/user-login-migration.entity.ts (75%) rename apps/server/src/{shared/repo/userloginmigration => modules/user-login-migration/repo}/user-login-migration.repo.integration.spec.ts (96%) rename apps/server/src/{shared/repo/userloginmigration => modules/user-login-migration/repo}/user-login-migration.repo.ts (80%) rename apps/server/src/{testing/factory/domainobject => modules/user-login-migration/testing}/user-login-migration-do.factory.ts (69%) delete mode 100644 apps/server/src/shared/repo/userloginmigration/index.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 867e67c512b..d14d6d39c7e 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,13 +7,13 @@ 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'; import { Test, TestingModule } from '@nestjs/testing'; -import { UserLoginMigrationDO } from '@shared/domain/domainobject'; import { Permission } from '@shared/domain/interface'; import { setupEntities } from '@testing/database'; -import { userLoginMigrationDOFactory } from '@testing/factory/domainobject'; import { UserLoginMigrationRule } from './user-login-migration.rule'; describe('UserLoginMigrationRule', () => { 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 a1f545b0d9c..31cac97f68a 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,7 +1,7 @@ import { AuthorizationContext, AuthorizationHelper, AuthorizationInjectionService, Rule } from '@modules/authorization'; +import { UserLoginMigrationDO } from '@modules/user-login-migration/domain'; import { User } from '@modules/user/repo'; import { Injectable } from '@nestjs/common'; -import { UserLoginMigrationDO } from '@shared/domain/domainobject'; @Injectable() export class UserLoginMigrationRule implements Rule { diff --git a/apps/server/src/modules/board/board.entity.imports.ts b/apps/server/src/modules/board/board.entity.imports.ts index 7f7b83e9661..9c0ed45caf0 100644 --- a/apps/server/src/modules/board/board.entity.imports.ts +++ b/apps/server/src/modules/board/board.entity.imports.ts @@ -41,6 +41,7 @@ import { ExternalToolEntity } from '@modules/tool/external-tool/repo'; import { SchoolExternalToolEntity } from '@modules/tool/school-external-tool/repo'; import { ImportUser } from '@modules/user-import/entity'; import { MediaUserLicenseEntity, UserLicenseEntity } from '@modules/user-license/entity'; +import { UserLoginMigrationEntity } from '@modules/user-login-migration/repo'; import { User } from '@modules/user/repo'; import { Material } from '@shared/domain/entity/materials.entity'; import { CourseNews, News, SchoolNews, TeamNews } from '@shared/domain/entity/news.entity'; @@ -49,7 +50,6 @@ import { StorageProviderEntity } from '@shared/domain/entity/storageprovider.ent import { Submission } from '@shared/domain/entity/submission.entity'; import { Task } from '@shared/domain/entity/task.entity'; import { TeamEntity, TeamUserEntity } from '@shared/domain/entity/team.entity'; -import { UserLoginMigrationEntity } from '@shared/domain/entity/user-login-migration.entity'; import { VideoConference } from '@shared/domain/entity/video-conference.entity'; export const ENTITIES = [ diff --git a/apps/server/src/modules/legacy-school/repo/legacy-school.repo.integration.spec.ts b/apps/server/src/modules/legacy-school/repo/legacy-school.repo.integration.spec.ts index 403b040ce92..edf663db8cf 100644 --- a/apps/server/src/modules/legacy-school/repo/legacy-school.repo.integration.spec.ts +++ b/apps/server/src/modules/legacy-school/repo/legacy-school.repo.integration.spec.ts @@ -6,10 +6,10 @@ import { SchoolEntity, SchoolRolePermission, SchoolRoles, SchoolYearEntity } fro import { schoolEntityFactory, schoolYearEntityFactory } from '@modules/school/testing'; import { SystemEntity } from '@modules/system/repo'; import { systemEntityFactory } from '@modules/system/testing'; +import { UserLoginMigrationEntity } from '@modules/user-login-migration/repo'; import { userLoginMigrationFactory } from '@modules/user-login-migration/testing'; import { InternalServerErrorException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { UserLoginMigrationEntity } from '@shared/domain/entity'; import { MongoMemoryDatabaseModule } from '@testing/database'; import { legacySchoolDoFactory } from '../testing'; import { LegacySchoolRepo } from './legacy-school.repo'; diff --git a/apps/server/src/modules/legacy-school/repo/legacy-school.repo.ts b/apps/server/src/modules/legacy-school/repo/legacy-school.repo.ts index 0d7711a4c2b..e1fd6980013 100644 --- a/apps/server/src/modules/legacy-school/repo/legacy-school.repo.ts +++ b/apps/server/src/modules/legacy-school/repo/legacy-school.repo.ts @@ -3,8 +3,9 @@ import { EntityData, EntityName } from '@mikro-orm/core'; import { EntityManager } from '@mikro-orm/mongodb'; import { SchoolEntity } from '@modules/school/repo'; import { SystemEntity } from '@modules/system/repo'; +import { UserLoginMigrationEntity } from '@modules/user-login-migration/repo'; import { Injectable, InternalServerErrorException } from '@nestjs/common'; -import { StorageProviderEntity, UserLoginMigrationEntity } from '@shared/domain/entity'; +import { StorageProviderEntity } from '@shared/domain/entity'; import { EntityId } from '@shared/domain/types'; import { BaseDORepo } from '@shared/repo/base.do.repo'; import { LegacySchoolDo } from '../domain'; diff --git a/apps/server/src/modules/management/management.entity.imports.ts b/apps/server/src/modules/management/management.entity.imports.ts index 128dc326eba..526b86d95ea 100644 --- a/apps/server/src/modules/management/management.entity.imports.ts +++ b/apps/server/src/modules/management/management.entity.imports.ts @@ -43,6 +43,7 @@ import { ExternalToolEntity } from '@modules/tool/external-tool/repo'; import { SchoolExternalToolEntity } from '@modules/tool/school-external-tool/repo'; import { ImportUser } from '@modules/user-import/entity'; import { MediaUserLicenseEntity, UserLicenseEntity } from '@modules/user-license/entity'; +import { UserLoginMigrationEntity } from '@modules/user-login-migration/repo'; import { User } from '@modules/user/repo'; import { Material } from '@shared/domain/entity/materials.entity'; import { CourseNews, News, SchoolNews, TeamNews } from '@shared/domain/entity/news.entity'; @@ -51,7 +52,6 @@ import { StorageProviderEntity } from '@shared/domain/entity/storageprovider.ent import { Submission } from '@shared/domain/entity/submission.entity'; import { Task } from '@shared/domain/entity/task.entity'; import { TeamEntity, TeamUserEntity } from '@shared/domain/entity/team.entity'; -import { UserLoginMigrationEntity } from '@shared/domain/entity/user-login-migration.entity'; import { VideoConference } from '@shared/domain/entity/video-conference.entity'; export const ENTITIES = [ diff --git a/apps/server/src/modules/provisioning/schulconnex-group-provisioning.entity.imports.ts b/apps/server/src/modules/provisioning/schulconnex-group-provisioning.entity.imports.ts index 3c1975c58de..d53c1a191ac 100644 --- a/apps/server/src/modules/provisioning/schulconnex-group-provisioning.entity.imports.ts +++ b/apps/server/src/modules/provisioning/schulconnex-group-provisioning.entity.imports.ts @@ -5,10 +5,10 @@ import { GroupEntity } from '@modules/group/entity'; import { SchoolSystemOptionsEntity } from '@modules/legacy-school/entity'; import { FederalStateEntity, SchoolEntity, SchoolYearEntity } from '@modules/school/repo'; import { SystemEntity } from '@modules/system/repo'; +import { UserLoginMigrationEntity } from '@modules/user-login-migration/repo'; import { User } from '@modules/user/repo'; import { Role } from '@shared/domain/entity/role.entity'; import { StorageProviderEntity } from '@shared/domain/entity/storageprovider.entity'; -import { UserLoginMigrationEntity } from '@shared/domain/entity/user-login-migration.entity'; export const ENTITIES = [ SchoolEntity, diff --git a/apps/server/src/modules/provisioning/schulconnex-group-removal.entity.imports.ts b/apps/server/src/modules/provisioning/schulconnex-group-removal.entity.imports.ts index 1a023d6a025..ea888d15686 100644 --- a/apps/server/src/modules/provisioning/schulconnex-group-removal.entity.imports.ts +++ b/apps/server/src/modules/provisioning/schulconnex-group-removal.entity.imports.ts @@ -4,10 +4,10 @@ import { GroupEntity } from '@modules/group/entity'; import { SchoolSystemOptionsEntity } from '@modules/legacy-school/entity'; import { FederalStateEntity, SchoolEntity, SchoolYearEntity } from '@modules/school/repo'; import { SystemEntity } from '@modules/system/repo'; +import { UserLoginMigrationEntity } from '@modules/user-login-migration/repo'; import { User } from '@modules/user/repo'; import { Role } from '@shared/domain/entity/role.entity'; import { StorageProviderEntity } from '@shared/domain/entity/storageprovider.entity'; -import { UserLoginMigrationEntity } from '@shared/domain/entity/user-login-migration.entity'; export const ENTITIES = [ SchoolEntity, diff --git a/apps/server/src/modules/provisioning/schulconnex-license-provisioning.entity.imports.ts b/apps/server/src/modules/provisioning/schulconnex-license-provisioning.entity.imports.ts index b3d1f7fec42..55d9cbd8d13 100644 --- a/apps/server/src/modules/provisioning/schulconnex-license-provisioning.entity.imports.ts +++ b/apps/server/src/modules/provisioning/schulconnex-license-provisioning.entity.imports.ts @@ -1,16 +1,16 @@ import { SchoolSystemOptionsEntity } from '@modules/legacy-school/entity'; import { MediaSourceEntity } from '@modules/media-source/entity'; -import { FederalStateEntity, SchoolEntity, SchoolYearEntity } from '@modules/school/repo'; import { MediaSchoolLicenseEntity, SchoolLicenseEntity } from '@modules/school-license/entity'; +import { FederalStateEntity, SchoolEntity, SchoolYearEntity } from '@modules/school/repo'; import { SystemEntity } from '@modules/system/repo'; import { ContextExternalToolEntity } from '@modules/tool/context-external-tool/repo'; import { ExternalToolEntity } from '@modules/tool/external-tool/repo'; import { SchoolExternalToolEntity } from '@modules/tool/school-external-tool/repo'; import { MediaUserLicenseEntity, UserLicenseEntity } from '@modules/user-license/entity'; +import { UserLoginMigrationEntity } from '@modules/user-login-migration/repo'; import { User } from '@modules/user/repo'; import { Role } from '@shared/domain/entity/role.entity'; import { StorageProviderEntity } from '@shared/domain/entity/storageprovider.entity'; -import { UserLoginMigrationEntity } from '@shared/domain/entity/user-login-migration.entity'; export const ENTITIES = [ SchoolEntity, diff --git a/apps/server/src/modules/school/repo/mikro-orm/school.entity.ts b/apps/server/src/modules/school/repo/mikro-orm/school.entity.ts index 7685c79fa05..75ff3f557c1 100644 --- a/apps/server/src/modules/school/repo/mikro-orm/school.entity.ts +++ b/apps/server/src/modules/school/repo/mikro-orm/school.entity.ts @@ -15,10 +15,10 @@ import { SchoolSystemOptionsEntity } from '@modules/legacy-school/entity'; import { SchoolFeature, SchoolPurpose } from '@modules/school/domain'; import { FileStorageType } from '@modules/school/domain/type/file-storage-type.enum'; import { SystemEntity } from '@modules/system/repo'; -import { UserLoginMigrationEntity } from '@shared/domain/entity/user-login-migration.entity'; -import { BaseEntityWithTimestamps } from '../../../../shared/domain/entity/base.entity'; -import { StorageProviderEntity } from '../../../../shared/domain/entity/storageprovider.entity'; -import { LanguageType } from '../../../../shared/domain/interface'; +import { UserLoginMigrationEntity } from '@modules/user-login-migration/repo'; +import { BaseEntityWithTimestamps } from '@shared/domain/entity/base.entity'; +import { StorageProviderEntity } from '@shared/domain/entity/storageprovider.entity'; +import { LanguageType } from '@shared/domain/interface'; import { CountyEmbeddable, FederalStateEntity } from './federal-state.entity'; import { SchoolYearEntity } from './school-year.entity'; diff --git a/apps/server/src/modules/server/server.entity.imports.ts b/apps/server/src/modules/server/server.entity.imports.ts index a9b81ee95ad..805925e56e9 100644 --- a/apps/server/src/modules/server/server.entity.imports.ts +++ b/apps/server/src/modules/server/server.entity.imports.ts @@ -41,6 +41,7 @@ import { ExternalToolEntity } from '@modules/tool/external-tool/repo'; import { SchoolExternalToolEntity } from '@modules/tool/school-external-tool/repo'; import { ImportUser } from '@modules/user-import/entity'; import { MediaUserLicenseEntity, UserLicenseEntity } from '@modules/user-license/entity'; +import { UserLoginMigrationEntity } from '@modules/user-login-migration/repo'; import { User } from '@modules/user/repo'; import { Material } from '@shared/domain/entity/materials.entity'; import { CourseNews, News, SchoolNews, TeamNews } from '@shared/domain/entity/news.entity'; @@ -49,7 +50,6 @@ import { StorageProviderEntity } from '@shared/domain/entity/storageprovider.ent import { Submission } from '@shared/domain/entity/submission.entity'; import { Task } from '@shared/domain/entity/task.entity'; import { TeamEntity, TeamUserEntity } from '@shared/domain/entity/team.entity'; -import { UserLoginMigrationEntity } from '@shared/domain/entity/user-login-migration.entity'; import { VideoConference } from '@shared/domain/entity/video-conference.entity'; export const ENTITIES = [ 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 66543b759ee..30f56141dba 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,14 +9,14 @@ 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 { userLoginMigrationDOFactory } from '@modules/user-login-migration/testing'; import { User } from '@modules/user/repo'; import { userFactory } from '@modules/user/testing'; import { InternalServerErrorException } from '@nestjs/common'; import { ConfigService } from '@nestjs/config'; import { Test, TestingModule } from '@nestjs/testing'; -import { UserLoginMigrationDO } from '@shared/domain/domainobject'; import { MongoMemoryDatabaseModule } from '@testing/database'; -import { userLoginMigrationDOFactory } from '@testing/factory/domainobject'; import { ImportUser, MatchCreator } from '../entity'; import { UserMigrationCanceledLoggable, UserMigrationIsNotEnabled } from '../loggable'; import { ImportUserRepo } from '../repo'; 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 e576fa3ba14..17aafed85de 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,10 +5,10 @@ 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 { User } from '@modules/user/repo'; import { Injectable, InternalServerErrorException } from '@nestjs/common'; import { ConfigService } from '@nestjs/config'; -import { UserLoginMigrationDO } from '@shared/domain/domainobject'; import { ImportUser, MatchCreator } from '../entity'; import { UserMigrationCanceledLoggable, UserMigrationIsNotEnabled } from '../loggable'; import { ImportUserRepo } from '../repo/import-user.repo'; 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 09d979b479e..a36b1c36fa5 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,14 +4,14 @@ 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 { userLoginMigrationDOFactory } from '@modules/user-login-migration/testing'; import { User } from '@modules/user/repo'; import { userFactory } from '@modules/user/testing'; import { ConfigService } from '@nestjs/config'; import { Test, TestingModule } from '@nestjs/testing'; -import { UserLoginMigrationDO } from '@shared/domain/domainobject'; import { Permission } from '@shared/domain/interface'; import { setupEntities } from '@testing/database'; -import { userLoginMigrationDOFactory } from '@testing/factory/domainobject'; import { UserLoginMigrationService } from '../../user-login-migration'; import { ImportUser } from '../entity'; import { UserLoginMigrationNotActiveLoggableException, UserMigrationIsNotEnabledLoggableException } from '../loggable'; 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 606af80909c..576aa840b34 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,10 +1,10 @@ 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 { User } from '@modules/user/repo'; import { Injectable } from '@nestjs/common'; import { ConfigService } from '@nestjs/config'; -import { UserLoginMigrationDO } from '@shared/domain/domainobject'; import { Permission } from '@shared/domain/interface'; import { EntityId } from '@shared/domain/types'; import { ImportUser } from '../entity'; diff --git a/apps/server/src/modules/user-import/uc/user-import.uc.spec.ts b/apps/server/src/modules/user-import/uc/user-import.uc.spec.ts index e80123d54f8..ccfbcc0c275 100644 --- a/apps/server/src/modules/user-import/uc/user-import.uc.spec.ts +++ b/apps/server/src/modules/user-import/uc/user-import.uc.spec.ts @@ -14,6 +14,7 @@ import { SystemEntity } from '@modules/system/repo'; import { systemEntityFactory, systemFactory } from '@modules/system/testing'; import { UserService } from '@modules/user'; import { UserLoginMigrationService, UserMigrationService } from '@modules/user-login-migration'; +import { userLoginMigrationDOFactory } from '@modules/user-login-migration/testing'; import { User } from '@modules/user/repo'; import { userDoFactory, userFactory } from '@modules/user/testing'; import { BadRequestException, ForbiddenException } from '@nestjs/common'; @@ -24,7 +25,6 @@ import { NotFoundLoggableException } from '@shared/common/loggable-exception'; import { Permission } from '@shared/domain/interface'; import { Counted } from '@shared/domain/types'; import { setupEntities } from '@testing/database'; -import { userLoginMigrationDOFactory } from '@testing/factory/domainobject'; import { ImportUserFilter, ImportUserMatchCreatorScope } from '../domain/interface'; import { ImportUser, MatchCreator } from '../entity'; import { 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/controller/api-test/user-login-migration-rollback.api.spec.ts index 8d0cb06be07..5eb98b78e4b 100644 --- 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/controller/api-test/user-login-migration-rollback.api.spec.ts @@ -6,11 +6,11 @@ import { systemEntityFactory } from '@modules/system/testing'; import { User } from '@modules/user/repo'; import { HttpStatus, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { UserLoginMigrationEntity } from '@shared/domain/entity/user-login-migration.entity'; import { cleanupCollections } from '@testing/cleanup-collections'; import { UserAndAccountTestFactory } from '@testing/factory/user-and-account.test.factory'; import { TestApiClient } from '@testing/test-api-client'; import { Response } from 'supertest'; +import { UserLoginMigrationEntity } from '../../repo'; import { userLoginMigrationFactory } from '../../testing'; describe('UserLoginMigrationRollbackController (API)', () => { 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/controller/api-test/user-login-migration.api.spec.ts index 4e821f1e175..48cf9e1adf3 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/controller/api-test/user-login-migration.api.spec.ts @@ -15,7 +15,6 @@ import { userFactory } from '@modules/user/testing'; import { HttpStatus, INestApplication } from '@nestjs/common'; import { ConfigService } from '@nestjs/config'; import { Test, TestingModule } from '@nestjs/testing'; -import { UserLoginMigrationEntity } from '@shared/domain/entity/user-login-migration.entity'; import { SystemProvisioningStrategy } from '@shared/domain/interface/system-provisioning.strategy'; import { cleanupCollections } from '@testing/cleanup-collections'; import { JwtTestFactory } from '@testing/factory/jwt.test.factory'; @@ -26,6 +25,7 @@ import MockAdapter from 'axios-mock-adapter'; import { UUID } from 'bson'; 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'; diff --git a/apps/server/src/modules/user-login-migration/controller/user-login-migration.controller.ts b/apps/server/src/modules/user-login-migration/controller/user-login-migration.controller.ts index be4469825ae..45030369601 100644 --- a/apps/server/src/modules/user-login-migration/controller/user-login-migration.controller.ts +++ b/apps/server/src/modules/user-login-migration/controller/user-login-migration.controller.ts @@ -12,7 +12,8 @@ import { ApiUnauthorizedResponse, ApiUnprocessableEntityResponse, } from '@nestjs/swagger'; -import { Page, UserLoginMigrationDO } from '@shared/domain/domainobject'; +import { Page } from '@shared/domain/domainobject'; +import { UserLoginMigrationDO } from '../domain'; import { SchoolNumberMissingLoggableException, UserLoginMigrationAlreadyClosedLoggableException, diff --git a/apps/server/src/modules/user-login-migration/domain/do/index.ts b/apps/server/src/modules/user-login-migration/domain/do/index.ts new file mode 100644 index 00000000000..08d45179ed6 --- /dev/null +++ b/apps/server/src/modules/user-login-migration/domain/do/index.ts @@ -0,0 +1 @@ +export * from './user-login-migration.do'; diff --git a/apps/server/src/shared/domain/domainobject/user-login-migration.do.ts b/apps/server/src/modules/user-login-migration/domain/do/user-login-migration.do.ts similarity index 56% rename from apps/server/src/shared/domain/domainobject/user-login-migration.do.ts rename to apps/server/src/modules/user-login-migration/domain/do/user-login-migration.do.ts index 88e58aa8a2d..ea8f0f72ee8 100644 --- a/apps/server/src/shared/domain/domainobject/user-login-migration.do.ts +++ b/apps/server/src/modules/user-login-migration/domain/do/user-login-migration.do.ts @@ -1,20 +1,20 @@ -import { EntityId } from '../types'; -import { BaseDO } from './base.do'; +import { BaseDO } from '@shared/domain/domainobject/base.do'; +import { EntityId } from '@shared/domain/types'; export class UserLoginMigrationDO extends BaseDO { - schoolId: EntityId; + public schoolId: EntityId; - sourceSystemId?: EntityId; + public sourceSystemId?: EntityId; - targetSystemId: EntityId; + public targetSystemId: EntityId; - mandatorySince?: Date; + public mandatorySince?: Date; - startedAt: Date; + public startedAt: Date; - closedAt?: Date; + public closedAt?: Date; - finishedAt?: Date; + public finishedAt?: Date; constructor(props: UserLoginMigrationDO) { super(props.id); diff --git a/apps/server/src/modules/user-login-migration/domain/index.ts b/apps/server/src/modules/user-login-migration/domain/index.ts new file mode 100644 index 00000000000..10cd66b4a7b --- /dev/null +++ b/apps/server/src/modules/user-login-migration/domain/index.ts @@ -0,0 +1 @@ +export * from './do'; 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/loggable/debug/school-migration-successful.loggable.spec.ts index e2c15a891ce..43fc21a6422 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/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/factory/domainobject'; +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/loggable/debug/school-migration-successful.loggable.ts index 9e0598df0b3..78af4e17e56 100644 --- a/apps/server/src/modules/user-login-migration/loggable/debug/school-migration-successful.loggable.ts +++ b/apps/server/src/modules/user-login-migration/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 '@shared/domain/domainobject'; +import { UserLoginMigrationDO } from '../../domain'; 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/loggable/debug/user-migration-correction-successful-loggable.spec.ts index 8cac16b423a..e9dfe2cf65a 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/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 '@shared/domain/domainobject'; -import { LogMessage } from '@core/logger'; -import { userLoginMigrationDOFactory } from '@testing/factory/domainobject'; +import { UserLoginMigrationDO } from '../../domain'; +import { userLoginMigrationDOFactory } from '../../testing'; 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/loggable/debug/user-migration-correction-successful-loggable.ts index c201bb91412..254c650ba92 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/loggable/debug/user-migration-correction-successful-loggable.ts @@ -1,6 +1,6 @@ -import { EntityId } from '@shared/domain/types'; -import { UserLoginMigrationDO } from '@shared/domain/domainobject'; import { LogMessage } from '@core/logger'; +import { EntityId } from '@shared/domain/types'; +import { UserLoginMigrationDO } from '../../domain'; 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/loggable/debug/user-migration-started.loggable.spec.ts index 93805170941..c90d88f60b1 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/loggable/debug/user-migration-started.loggable.spec.ts @@ -1,5 +1,5 @@ import { ObjectId } from '@mikro-orm/mongodb'; -import { userLoginMigrationDOFactory } from '@testing/factory/domainobject'; +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/loggable/debug/user-migration-started.loggable.ts index f09c91c0e99..ac0492e0d2a 100644 --- a/apps/server/src/modules/user-login-migration/loggable/debug/user-migration-started.loggable.ts +++ b/apps/server/src/modules/user-login-migration/loggable/debug/user-migration-started.loggable.ts @@ -1,6 +1,6 @@ -import { UserLoginMigrationDO } from '@shared/domain/domainobject'; -import { EntityId } from '@shared/domain/types'; import { Loggable, LogMessage } from '@core/logger'; +import { EntityId } from '@shared/domain/types'; +import { UserLoginMigrationDO } from '../../domain'; 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/loggable/debug/user-migration-successful.loggable.spec.ts index c695e99585f..0c6b1384494 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/loggable/debug/user-migration-successful.loggable.spec.ts @@ -1,5 +1,5 @@ import { ObjectId } from '@mikro-orm/mongodb'; -import { userLoginMigrationDOFactory } from '@testing/factory/domainobject'; +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/loggable/debug/user-migration-successful.loggable.ts index 6c755de8c34..1d045a3973b 100644 --- a/apps/server/src/modules/user-login-migration/loggable/debug/user-migration-successful.loggable.ts +++ b/apps/server/src/modules/user-login-migration/loggable/debug/user-migration-successful.loggable.ts @@ -1,6 +1,6 @@ -import { UserLoginMigrationDO } from '@shared/domain/domainobject'; -import { EntityId } from '@shared/domain/types'; import { Loggable, LogMessage } from '@core/logger'; +import { EntityId } from '@shared/domain/types'; +import { UserLoginMigrationDO } from '../../domain'; export class UserMigrationSuccessfulLoggable implements Loggable { constructor(private readonly userId: EntityId, private readonly userLoginMigration: UserLoginMigrationDO) {} diff --git a/apps/server/src/modules/user-login-migration/mapper/user-login-migration.mapper.ts b/apps/server/src/modules/user-login-migration/mapper/user-login-migration.mapper.ts index 96d40fdd7ae..861eb980c63 100644 --- a/apps/server/src/modules/user-login-migration/mapper/user-login-migration.mapper.ts +++ b/apps/server/src/modules/user-login-migration/mapper/user-login-migration.mapper.ts @@ -1,5 +1,5 @@ -import { UserLoginMigrationDO } from '@shared/domain/domainobject'; import { UserLoginMigrationResponse, UserLoginMigrationSearchParams } from '../controller/dto'; +import { UserLoginMigrationDO } from '../domain'; import { UserLoginMigrationQuery } from '../uc'; export class UserLoginMigrationMapper { diff --git a/apps/server/src/modules/user-login-migration/repo/index.ts b/apps/server/src/modules/user-login-migration/repo/index.ts new file mode 100644 index 00000000000..328597b46ac --- /dev/null +++ b/apps/server/src/modules/user-login-migration/repo/index.ts @@ -0,0 +1,2 @@ +export { UserLoginMigrationRepo } from './user-login-migration.repo'; +export { UserLoginMigrationEntityProps, UserLoginMigrationEntity } from './user-login-migration.entity'; diff --git a/apps/server/src/shared/domain/entity/user-login-migration.entity.ts b/apps/server/src/modules/user-login-migration/repo/user-login-migration.entity.ts similarity index 75% rename from apps/server/src/shared/domain/entity/user-login-migration.entity.ts rename to apps/server/src/modules/user-login-migration/repo/user-login-migration.entity.ts index 773c3240275..723720f48ae 100644 --- a/apps/server/src/shared/domain/entity/user-login-migration.entity.ts +++ b/apps/server/src/modules/user-login-migration/repo/user-login-migration.entity.ts @@ -1,9 +1,23 @@ import { Entity, ManyToOne, OneToOne, Property } from '@mikro-orm/core'; import { SchoolEntity } from '@modules/school/repo'; import { SystemEntity } from '@modules/system/repo'; -import { BaseEntityWithTimestamps } from './base.entity'; +import { BaseEntityWithTimestamps } from '@shared/domain/entity/base.entity'; -export type IUserLoginMigration = Readonly>; +export type UserLoginMigrationEntityProps = { + school: SchoolEntity; + + sourceSystem?: SystemEntity; + + targetSystem: SystemEntity; + + mandatorySince?: Date; + + startedAt: Date; + + closedAt?: Date; + + finishedAt?: Date; +}; @Entity({ tableName: 'user-login-migrations' }) export class UserLoginMigrationEntity extends BaseEntityWithTimestamps { @@ -29,7 +43,7 @@ export class UserLoginMigrationEntity extends BaseEntityWithTimestamps { @Property({ nullable: true }) finishedAt?: Date; - constructor(props: IUserLoginMigration) { + constructor(props: UserLoginMigrationEntityProps) { super(); this.school = props.school; this.sourceSystem = props.sourceSystem; diff --git a/apps/server/src/shared/repo/userloginmigration/user-login-migration.repo.integration.spec.ts b/apps/server/src/modules/user-login-migration/repo/user-login-migration.repo.integration.spec.ts similarity index 96% rename from apps/server/src/shared/repo/userloginmigration/user-login-migration.repo.integration.spec.ts rename to apps/server/src/modules/user-login-migration/repo/user-login-migration.repo.integration.spec.ts index 3b395bc735f..2a6a4f30923 100644 --- a/apps/server/src/shared/repo/userloginmigration/user-login-migration.repo.integration.spec.ts +++ b/apps/server/src/modules/user-login-migration/repo/user-login-migration.repo.integration.spec.ts @@ -1,17 +1,16 @@ +import { LegacyLogger } from '@core/logger'; import { createMock } from '@golevelup/ts-jest'; import { EntityManager } from '@mikro-orm/mongodb'; -import { type SystemEntity } from '@modules/system/repo'; -import { Test, TestingModule } from '@nestjs/testing'; -import { MongoMemoryDatabaseModule } from '@testing/database'; - -import { LegacyLogger } from '@core/logger'; 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 { UserLoginMigrationDO } from '@shared/domain/domainobject'; -import { UserLoginMigrationEntity } from '@shared/domain/entity/user-login-migration.entity'; +import { Test, TestingModule } from '@nestjs/testing'; import { cleanupCollections } from '@testing/cleanup-collections'; +import { MongoMemoryDatabaseModule } from '@testing/database'; +import { UserLoginMigrationDO } from '../domain'; +import { UserLoginMigrationEntity } from './user-login-migration.entity'; import { UserLoginMigrationRepo } from './user-login-migration.repo'; describe('UserLoginMigrationRepo', () => { diff --git a/apps/server/src/shared/repo/userloginmigration/user-login-migration.repo.ts b/apps/server/src/modules/user-login-migration/repo/user-login-migration.repo.ts similarity index 80% rename from apps/server/src/shared/repo/userloginmigration/user-login-migration.repo.ts rename to apps/server/src/modules/user-login-migration/repo/user-login-migration.repo.ts index 18720ed2bb0..46da31c33fe 100644 --- a/apps/server/src/shared/repo/userloginmigration/user-login-migration.repo.ts +++ b/apps/server/src/modules/user-login-migration/repo/user-login-migration.repo.ts @@ -4,10 +4,10 @@ import { EntityManager } from '@mikro-orm/mongodb'; import { SchoolEntity } from '@modules/school/repo'; import { SystemEntity } from '@modules/system/repo'; import { Injectable } from '@nestjs/common'; -import { UserLoginMigrationDO } from '@shared/domain/domainobject'; -import { UserLoginMigrationEntity } from '@shared/domain/entity/user-login-migration.entity'; import { EntityId } from '@shared/domain/types'; -import { BaseDORepo } from '../base.do.repo'; +import { BaseDORepo } from '@shared/repo/base.do.repo'; +import { UserLoginMigrationDO } from '../domain'; +import { UserLoginMigrationEntity } from './user-login-migration.entity'; @Injectable() export class UserLoginMigrationRepo extends BaseDORepo { @@ -19,7 +19,7 @@ export class UserLoginMigrationRepo extends BaseDORepo { + public async findBySchoolId(schoolId: EntityId): Promise { const userLoginMigration: UserLoginMigrationEntity | null = await this._em.findOne(UserLoginMigrationEntity, { school: schoolId, }); @@ -32,7 +32,7 @@ export class UserLoginMigrationRepo extends BaseDORepo { + public mapDOToEntityProperties(entityDO: UserLoginMigrationDO): EntityData { const userLoginMigrationProps: EntityData = { school: this._em.getReference(SchoolEntity, entityDO.schoolId), sourceSystem: entityDO.sourceSystemId ? this._em.getReference(SystemEntity, entityDO.sourceSystemId) : undefined, diff --git a/apps/server/src/modules/user-login-migration/service/migration-check.service.spec.ts b/apps/server/src/modules/user-login-migration/service/migration-check.service.spec.ts index 47a5c5aa0de..ece6d678110 100644 --- a/apps/server/src/modules/user-login-migration/service/migration-check.service.spec.ts +++ b/apps/server/src/modules/user-login-migration/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 '@shared/domain/domainobject'; -import { UserLoginMigrationRepo } from '@shared/repo/userloginmigration'; +import { UserLoginMigrationDO } from '../domain'; +import { UserLoginMigrationRepo } from '../repo'; 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/service/migration-check.service.ts index dd9ce2750e7..1c9da5bffaf 100644 --- a/apps/server/src/modules/user-login-migration/service/migration-check.service.ts +++ b/apps/server/src/modules/user-login-migration/service/migration-check.service.ts @@ -2,9 +2,9 @@ import { LegacySchoolService } from '@modules/legacy-school'; import { UserService } from '@modules/user'; import { UserDo } from '@modules/user/domain'; import { Injectable } from '@nestjs/common'; -import { UserLoginMigrationDO } from '@shared/domain/domainobject'; import { EntityId } from '@shared/domain/types'; -import { UserLoginMigrationRepo } from '@shared/repo/userloginmigration'; +import { UserLoginMigrationDO } from '../domain'; +import { UserLoginMigrationRepo } from '../repo'; @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/service/school-migration.service.spec.ts index a09be687be7..aeffe4754f5 100644 --- a/apps/server/src/modules/user-login-migration/service/school-migration.service.spec.ts +++ b/apps/server/src/modules/user-login-migration/service/school-migration.service.spec.ts @@ -7,13 +7,14 @@ import { UserService } from '@modules/user'; import { UserDo } from '@modules/user/domain'; import { userDoFactory } from '@modules/user/testing'; import { Test, TestingModule } from '@nestjs/testing'; -import { Page, UserLoginMigrationDO } from '@shared/domain/domainobject'; -import { UserLoginMigrationRepo } from '@shared/repo/userloginmigration/user-login-migration.repo'; -import { userLoginMigrationDOFactory } from '@testing/factory/domainobject'; +import { Page } from '@shared/domain/domainobject'; +import { UserLoginMigrationDO } from '../domain'; import { SchoolMigrationDatabaseOperationFailedLoggableException, SchoolNumberMismatchLoggableException, } from '../loggable'; +import { UserLoginMigrationRepo } from '../repo'; +import { userLoginMigrationDOFactory } from '../testing'; import { SchoolMigrationService } from './school-migration.service'; describe(SchoolMigrationService.name, () => { diff --git a/apps/server/src/modules/user-login-migration/service/school-migration.service.ts b/apps/server/src/modules/user-login-migration/service/school-migration.service.ts index 8a4f9bab091..79346163210 100644 --- a/apps/server/src/modules/user-login-migration/service/school-migration.service.ts +++ b/apps/server/src/modules/user-login-migration/service/school-migration.service.ts @@ -4,13 +4,13 @@ import { LegacySchoolDo } from '@modules/legacy-school/domain'; import { UserService } from '@modules/user'; import { UserDo } from '@modules/user/domain'; import { Injectable } from '@nestjs/common'; -import { UserLoginMigrationDO } from '@shared/domain/domainobject'; -import { UserLoginMigrationRepo } from '@shared/repo/userloginmigration'; import { performance } from 'perf_hooks'; +import { UserLoginMigrationDO } from '../domain'; import { SchoolMigrationDatabaseOperationFailedLoggableException, SchoolNumberMismatchLoggableException, } from '../loggable'; +import { UserLoginMigrationRepo } from '../repo'; @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/service/user-login-migration-revert.service.spec.ts index 28323660e19..5484f07cfb7 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/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/factory/domainobject'; +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/service/user-login-migration-revert.service.ts index 5c5c89c50ab..bb6b8b44046 100644 --- a/apps/server/src/modules/user-login-migration/service/user-login-migration-revert.service.ts +++ b/apps/server/src/modules/user-login-migration/service/user-login-migration-revert.service.ts @@ -1,7 +1,7 @@ import { LegacySchoolService } from '@modules/legacy-school'; import { SchoolFeature } from '@modules/school/domain'; import { Injectable } from '@nestjs/common'; -import { UserLoginMigrationDO } from '@shared/domain/domainobject'; +import { UserLoginMigrationDO } from '../domain'; import { UserLoginMigrationService } from './user-login-migration.service'; @Injectable() 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/service/user-login-migration-rollback.service.spec.ts index 1583a5cfa86..aec89690811 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/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/factory/domainobject'; 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.service.spec.ts b/apps/server/src/modules/user-login-migration/service/user-login-migration.service.spec.ts index 0329945737c..281e6884af0 100644 --- a/apps/server/src/modules/user-login-migration/service/user-login-migration.service.spec.ts +++ b/apps/server/src/modules/user-login-migration/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 '@shared/domain/domainobject'; -import { UserLoginMigrationRepo } from '@shared/repo/userloginmigration'; -import { userLoginMigrationDOFactory } from '@testing/factory/domainobject'; +import { UserLoginMigrationDO } from '../domain'; 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/service/user-login-migration.service.ts index 6a9f61de5ff..0b422c225e9 100644 --- a/apps/server/src/modules/user-login-migration/service/user-login-migration.service.ts +++ b/apps/server/src/modules/user-login-migration/service/user-login-migration.service.ts @@ -6,15 +6,15 @@ import { System, SystemService } from '@modules/system'; import { SystemType } from '@modules/system/domain'; import { UserService } from '@modules/user'; import { Injectable } from '@nestjs/common'; -import { UserLoginMigrationDO } from '@shared/domain/domainobject'; import { EntityId } from '@shared/domain/types'; -import { UserLoginMigrationRepo } from '@shared/repo/userloginmigration'; +import { UserLoginMigrationDO } from '../domain'; 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/service/user-migration.service.spec.ts index 05bd7b72c7d..4605005c9f4 100644 --- a/apps/server/src/modules/user-login-migration/service/user-migration.service.spec.ts +++ b/apps/server/src/modules/user-login-migration/service/user-migration.service.spec.ts @@ -5,13 +5,13 @@ import { Account, AccountService } from '@modules/account'; import { UserService } from '@modules/user'; import { userDoFactory } from '@modules/user/testing'; import { Test, TestingModule } from '@nestjs/testing'; -import { UserLoginMigrationDO } from '@shared/domain/domainobject'; -import { userLoginMigrationDOFactory } from '@testing/factory/domainobject'; import { roleFactory } from '@testing/factory/role.factory'; +import { UserLoginMigrationDO } from '../domain'; 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/service/user-migration.service.ts index 1ab23eeb783..1d47a350083 100644 --- a/apps/server/src/modules/user-login-migration/service/user-migration.service.ts +++ b/apps/server/src/modules/user-login-migration/service/user-migration.service.ts @@ -3,8 +3,8 @@ import { Account, AccountService } from '@modules/account'; import { UserService } from '@modules/user'; import { UserDo } from '@modules/user/domain'; import { Injectable } from '@nestjs/common'; -import { UserLoginMigrationDO } from '@shared/domain/domainobject'; import { EntityId } from '@shared/domain/types'; +import { UserLoginMigrationDO } from '../domain'; import { UserLoginMigrationUserAlreadyMigratedLoggableException, UserMigrationDatabaseOperationFailedLoggableException, 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 3f04848c6a0..343b1825184 100644 --- a/apps/server/src/modules/user-login-migration/testing/index.ts +++ b/apps/server/src/modules/user-login-migration/testing/index.ts @@ -1 +1,2 @@ export * from './user-login-migration.factory'; +export * from './user-login-migration-do.factory'; diff --git a/apps/server/src/testing/factory/domainobject/user-login-migration-do.factory.ts b/apps/server/src/modules/user-login-migration/testing/user-login-migration-do.factory.ts similarity index 69% rename from apps/server/src/testing/factory/domainobject/user-login-migration-do.factory.ts rename to apps/server/src/modules/user-login-migration/testing/user-login-migration-do.factory.ts index e68af3bab23..11340989261 100644 --- a/apps/server/src/testing/factory/domainobject/user-login-migration-do.factory.ts +++ b/apps/server/src/modules/user-login-migration/testing/user-login-migration-do.factory.ts @@ -1,5 +1,5 @@ -import { UserLoginMigrationDO } from '@shared/domain/domainobject'; -import { DoBaseFactory } from './do-base.factory'; +import { DoBaseFactory } from '@testing/factory/domainobject/do-base.factory'; +import { UserLoginMigrationDO } from '../domain'; export const userLoginMigrationDOFactory = DoBaseFactory.define( UserLoginMigrationDO, diff --git a/apps/server/src/modules/user-login-migration/testing/user-login-migration.factory.ts b/apps/server/src/modules/user-login-migration/testing/user-login-migration.factory.ts index ff17c064a49..1226b069928 100644 --- a/apps/server/src/modules/user-login-migration/testing/user-login-migration.factory.ts +++ b/apps/server/src/modules/user-login-migration/testing/user-login-migration.factory.ts @@ -1,9 +1,9 @@ import { schoolEntityFactory } from '@modules/school/testing'; import { systemEntityFactory } from '@modules/system/testing'; -import { IUserLoginMigration, UserLoginMigrationEntity } from '@shared/domain/entity'; import { BaseFactory } from '@testing/factory/base.factory'; +import { UserLoginMigrationEntity, UserLoginMigrationEntityProps } from '../repo'; -export const userLoginMigrationFactory = BaseFactory.define( +export const userLoginMigrationFactory = BaseFactory.define( UserLoginMigrationEntity, () => { return { 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/uc/close-user-login-migration.uc.spec.ts index 2c5f13b73c3..67ec36b89f5 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/uc/close-user-login-migration.uc.spec.ts @@ -6,12 +6,12 @@ import { legacySchoolDoFactory } from '@modules/legacy-school/testing'; import { User } from '@modules/user/repo'; import { userFactory } from '@modules/user/testing'; import { Test, TestingModule } from '@nestjs/testing'; -import { UserLoginMigrationDO } from '@shared/domain/domainobject'; import { Permission } from '@shared/domain/interface'; import { setupEntities } from '@testing/database'; -import { userLoginMigrationDOFactory } from '@testing/factory/domainobject'; +import { UserLoginMigrationDO } from '../domain'; import { UserLoginMigrationNotFoundLoggableException } from '../loggable'; import { SchoolMigrationService, UserLoginMigrationRevertService, UserLoginMigrationService } from '../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/uc/close-user-login-migration.uc.ts index 275647518be..9d6cb0c4eb4 100644 --- a/apps/server/src/modules/user-login-migration/uc/close-user-login-migration.uc.ts +++ b/apps/server/src/modules/user-login-migration/uc/close-user-login-migration.uc.ts @@ -1,10 +1,10 @@ import { AuthorizationContextBuilder, AuthorizationService } from '@modules/authorization'; +import { LegacySchoolService } from '@modules/legacy-school'; import { User } from '@modules/user/repo'; import { Injectable } from '@nestjs/common/decorators/core/injectable.decorator'; -import { UserLoginMigrationDO } from '@shared/domain/domainobject'; import { Permission } from '@shared/domain/interface'; import { EntityId } from '@shared/domain/types'; -import { LegacySchoolService } from '../../legacy-school'; +import { UserLoginMigrationDO } from '../domain'; import { UserLoginMigrationNotFoundLoggableException } from '../loggable'; import { SchoolMigrationService, UserLoginMigrationRevertService, UserLoginMigrationService } from '../service'; 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/uc/restart-user-login-migration.uc.spec.ts index 6754aab4e0a..0288c3b4a3a 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/uc/restart-user-login-migration.uc.spec.ts @@ -5,12 +5,12 @@ import { User } from '@modules/user/repo'; import { userFactory } from '@modules/user/testing'; import { ForbiddenException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { UserLoginMigrationDO } from '@shared/domain/domainobject'; import { Permission } from '@shared/domain/interface'; import { setupEntities } from '@testing/database'; -import { userLoginMigrationDOFactory } from '@testing/factory/domainobject'; +import { UserLoginMigrationDO } from '../domain'; import { UserLoginMigrationNotFoundLoggableException } from '../loggable'; import { SchoolMigrationService, UserLoginMigrationService } from '../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/uc/restart-user-login-migration.uc.ts index 553e433c29a..7aa72f1019a 100644 --- a/apps/server/src/modules/user-login-migration/uc/restart-user-login-migration.uc.ts +++ b/apps/server/src/modules/user-login-migration/uc/restart-user-login-migration.uc.ts @@ -2,8 +2,8 @@ import { Logger } from '@core/logger'; import { AuthorizationContextBuilder, AuthorizationService } from '@modules/authorization'; import { User } from '@modules/user/repo'; import { Injectable } from '@nestjs/common/decorators/core/injectable.decorator'; -import { UserLoginMigrationDO } from '@shared/domain/domainobject'; import { Permission } from '@shared/domain/interface'; +import { UserLoginMigrationDO } from '../domain'; import { UserLoginMigrationNotFoundLoggableException, UserLoginMigrationStartLoggable } from '../loggable'; import { SchoolMigrationService, UserLoginMigrationService } from '../service'; 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/uc/start-user-login-migration.uc.spec.ts index 8a5eddaa60a..c1a70434621 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/uc/start-user-login-migration.uc.spec.ts @@ -7,12 +7,12 @@ import { User } from '@modules/user/repo'; import { userFactory } from '@modules/user/testing'; import { ForbiddenException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { UserLoginMigrationDO } from '@shared/domain/domainobject'; import { Permission } from '@shared/domain/interface'; import { setupEntities } from '@testing/database'; -import { userLoginMigrationDOFactory } from '@testing/factory/domainobject'; +import { UserLoginMigrationDO } from '../domain'; import { SchoolNumberMissingLoggableException, UserLoginMigrationAlreadyClosedLoggableException } from '../loggable'; import { UserLoginMigrationService } from '../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/uc/start-user-login-migration.uc.ts index 91d199a42b0..0e40c1f42db 100644 --- a/apps/server/src/modules/user-login-migration/uc/start-user-login-migration.uc.ts +++ b/apps/server/src/modules/user-login-migration/uc/start-user-login-migration.uc.ts @@ -3,9 +3,9 @@ import { AuthorizationContext, AuthorizationContextBuilder, AuthorizationService import { LegacySchoolService } from '@modules/legacy-school'; import { User } from '@modules/user/repo'; import { Injectable } from '@nestjs/common/decorators/core/injectable.decorator'; -import { UserLoginMigrationDO } from '@shared/domain/domainobject'; import { Permission } from '@shared/domain/interface'; import { EntityId } from '@shared/domain/types'; +import { UserLoginMigrationDO } from '../domain'; import { SchoolNumberMissingLoggableException, UserLoginMigrationAlreadyClosedLoggableException, 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/uc/toggle-user-login-migration.uc.spec.ts index 0116fedc8e9..4231d53d660 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/uc/toggle-user-login-migration.uc.spec.ts @@ -8,12 +8,12 @@ import { User } from '@modules/user/repo'; import { userFactory } from '@modules/user/testing'; import { ForbiddenException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { UserLoginMigrationDO } from '@shared/domain/domainobject'; import { Permission } from '@shared/domain/interface'; import { setupEntities } from '@testing/database'; -import { userLoginMigrationDOFactory } from '@testing/factory/domainobject'; +import { UserLoginMigrationDO } from '../domain'; import { UserLoginMigrationNotFoundLoggableException } from '../loggable'; import { UserLoginMigrationService } from '../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/uc/toggle-user-login-migration.uc.ts index f32ffe8a783..75911ca715d 100644 --- a/apps/server/src/modules/user-login-migration/uc/toggle-user-login-migration.uc.ts +++ b/apps/server/src/modules/user-login-migration/uc/toggle-user-login-migration.uc.ts @@ -3,9 +3,9 @@ import { AuthorizationContext, AuthorizationContextBuilder, AuthorizationService import { LegacySchoolService } from '@modules/legacy-school'; import { User } from '@modules/user/repo'; import { Injectable } from '@nestjs/common'; -import { UserLoginMigrationDO } from '@shared/domain/domainobject'; 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'; 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/uc/user-login-migration.uc.spec.ts index 73c43edf772..a34710b2a1d 100644 --- a/apps/server/src/modules/user-login-migration/uc/user-login-migration.uc.spec.ts +++ b/apps/server/src/modules/user-login-migration/uc/user-login-migration.uc.spec.ts @@ -16,12 +16,12 @@ import { userDoFactory, userFactory } from '@modules/user/testing'; import { ForbiddenException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { NotFoundLoggableException } from '@shared/common/loggable-exception'; -import { Page, RoleReference, UserLoginMigrationDO } from '@shared/domain/domainobject'; +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 { userLoginMigrationDOFactory } from '@testing/factory/domainobject'; import { externalUserDtoFactory } from '../../provisioning/testing'; +import { UserLoginMigrationDO } from '../domain'; import { ExternalSchoolNumberMissingLoggableException, InvalidUserLoginMigrationLoggableException, @@ -32,6 +32,7 @@ import { UserLoginMigrationSchoolAlreadyMigratedLoggableException, } from '../loggable'; import { SchoolMigrationService, UserLoginMigrationService, UserMigrationService } from '../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/uc/user-login-migration.uc.ts index 1c64911d1b9..1aa5f994a6b 100644 --- a/apps/server/src/modules/user-login-migration/uc/user-login-migration.uc.ts +++ b/apps/server/src/modules/user-login-migration/uc/user-login-migration.uc.ts @@ -5,12 +5,13 @@ import { LegacySchoolService } from '@modules/legacy-school'; import { OAuthService } from '@modules/oauth'; import { OAuthTokenDto } from '@modules/oauth-adapter'; import { ProvisioningService } from '@modules/provisioning'; -import { UserService, UserDo } from '@modules/user'; +import { UserDo, UserService } from '@modules/user'; import { ForbiddenException, Injectable } from '@nestjs/common'; import { NotFoundLoggableException } from '@shared/common/loggable-exception'; -import { Page, RoleReference, UserLoginMigrationDO } from '@shared/domain/domainobject'; +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 { ExternalSchoolNumberMissingLoggableException, InvalidUserLoginMigrationLoggableException, 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 b4d954ec6ed..b1660c3fade 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,7 @@ import { LegacySchoolModule } from '@modules/legacy-school'; import { SystemModule } from '@modules/system'; import { UserModule } from '@modules/user'; import { Module } from '@nestjs/common'; -import { UserLoginMigrationRepo } from '@shared/repo/userloginmigration'; +import { UserLoginMigrationRepo } from './repo'; import { MigrationCheckService, SchoolMigrationService, diff --git a/apps/server/src/shared/domain/domainobject/index.ts b/apps/server/src/shared/domain/domainobject/index.ts index 558fa75b56a..a5e3d5c2a20 100644 --- a/apps/server/src/shared/domain/domainobject/index.ts +++ b/apps/server/src/shared/domain/domainobject/index.ts @@ -3,5 +3,4 @@ export * from './external-source'; export * from './page'; export * from './pseudonym.do'; export * from './role-reference'; -export * from './user-login-migration.do'; export * from './video-conference.do'; diff --git a/apps/server/src/shared/domain/entity/index.ts b/apps/server/src/shared/domain/entity/index.ts index 18baf23c6ec..a72fc2c1ae6 100644 --- a/apps/server/src/shared/domain/entity/index.ts +++ b/apps/server/src/shared/domain/entity/index.ts @@ -7,5 +7,4 @@ export * from './storageprovider.entity'; export * from './submission.entity'; export * from './task.entity'; export * from './team.entity'; -export * from './user-login-migration.entity'; export * from './video-conference.entity'; diff --git a/apps/server/src/shared/repo/userloginmigration/index.ts b/apps/server/src/shared/repo/userloginmigration/index.ts deleted file mode 100644 index 79f31cbe32b..00000000000 --- a/apps/server/src/shared/repo/userloginmigration/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './user-login-migration.repo'; diff --git a/apps/server/src/testing/factory/domainobject/index.ts b/apps/server/src/testing/factory/domainobject/index.ts index 191d21f2ebc..6acd7d35f91 100644 --- a/apps/server/src/testing/factory/domainobject/index.ts +++ b/apps/server/src/testing/factory/domainobject/index.ts @@ -1,4 +1,3 @@ export * from './do-base.factory'; export * from './domain-object.factory'; export * from './pseudonym.factory'; -export * from './user-login-migration-do.factory';