N21-2109 Move user login migration from shared to modules (#5558)

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', () => {

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<UserLoginMigrationDO> {

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 = [

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';

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';

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 = [

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,

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,

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,

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';
 

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 = [

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';

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';

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';

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';

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 {

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)', () => {

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';

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,

apps/server/src/modules/user-login-migration/domain/do/index.ts

@@ -0,0 +1 @@
+export * from './user-login-migration.do';

apps/server/src/shared/domain/domainobject/user-login-migration.do.ts → 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);

apps/server/src/modules/user-login-migration/domain/index.ts

@@ -0,0 +1 @@
+export * from './do';

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, () => {

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) {}

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', () => {

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) {}

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, () => {

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) {}