BC-8563 - Fix imports for @shared user-import (repo and domain) (#5567)

apps/server/src/modules/authorization-rules/rules/user-login-migration.rule.spec.ts

@@ -7,7 +7,6 @@ import {
 	AuthorizationInjectionService,
 } from '@modules/authorization';
 import { schoolEntityFactory } from '@modules/school/testing';
-import { UserLoginMigrationDO } from '@modules/user-login-migration/domain';
 import { userLoginMigrationDOFactory } from '@modules/user-login-migration/testing';
 import { User } from '@modules/user/repo';
 import { userFactory } from '@modules/user/testing';
@@ -87,7 +86,7 @@ describe('UserLoginMigrationRule', () => {
 			it('should return false', () => {
 				const { user, notUserLoginMigration } = setup();
 
-				const result = rule.isApplicable(user, notUserLoginMigration as unknown as UserLoginMigrationDO);
+				const result = rule.isApplicable(user, notUserLoginMigration);
 
 				expect(result).toEqual(false);
 			});

apps/server/src/modules/authorization-rules/rules/user-login-migration.rule.ts

@@ -1,5 +1,5 @@
 import { AuthorizationContext, AuthorizationHelper, AuthorizationInjectionService, Rule } from '@modules/authorization';
-import { UserLoginMigrationDO } from '@modules/user-login-migration/domain';
+import { UserLoginMigrationDO } from '@modules/user-login-migration';
 import { User } from '@modules/user/repo';
 import { Injectable } from '@nestjs/common';
 

apps/server/src/modules/user-import/service/user-import.service.spec.ts

@@ -9,7 +9,7 @@ import { schoolEntityFactory } from '@modules/school/testing';
 import { System, SystemService } from '@modules/system';
 import { systemFactory } from '@modules/system/testing';
 import { UserService } from '@modules/user';
-import { UserLoginMigrationDO } from '@modules/user-login-migration/domain';
+import { UserLoginMigrationDO } from '@modules/user-login-migration';
 import { userLoginMigrationDOFactory } from '@modules/user-login-migration/testing';
 import { User } from '@modules/user/repo';
 import { userFactory } from '@modules/user/testing';

apps/server/src/modules/user-import/service/user-import.service.ts

@@ -5,7 +5,7 @@ import { SchoolFeature } from '@modules/school/domain';
 import { SchoolEntity } from '@modules/school/repo';
 import { System, SystemService } from '@modules/system';
 import { UserService } from '@modules/user';
-import { UserLoginMigrationDO } from '@modules/user-login-migration/domain';
+import { UserLoginMigrationDO } from '@modules/user-login-migration';
 import { User } from '@modules/user/repo';
 import { Injectable, InternalServerErrorException } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';

apps/server/src/modules/user-import/uc/user-import-fetch.uc.spec.ts

@@ -4,15 +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 { UserLoginMigrationDO, UserLoginMigrationService } from '@modules/user-login-migration';
 import { userLoginMigrationDOFactory } from '@modules/user-login-migration/testing';
 import { User } from '@modules/user/repo';
 import { userFactory } from '@modules/user/testing';
 import { ConfigService } from '@nestjs/config';
 import { Test, TestingModule } from '@nestjs/testing';
 import { Permission } from '@shared/domain/interface';
 import { setupEntities } from '@testing/database';
-import { UserLoginMigrationService } from '../../user-login-migration';
 import { ImportUser } from '../entity';
 import { UserLoginMigrationNotActiveLoggableException, UserMigrationIsNotEnabledLoggableException } from '../loggable';
 import { SchulconnexFetchImportUsersService, UserImportService } from '../service';

apps/server/src/modules/user-import/uc/user-import-fetch.uc.ts

@@ -1,7 +1,6 @@
 import { AuthorizationService } from '@modules/authorization';
 import { System, SystemService } from '@modules/system';
-import { UserLoginMigrationService } from '@modules/user-login-migration';
-import { UserLoginMigrationDO } from '@modules/user-login-migration/domain';
+import { UserLoginMigrationDO, UserLoginMigrationService } from '@modules/user-login-migration';
 import { User } from '@modules/user/repo';
 import { Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';

apps/server/src/modules/user-login-migration/controller/api-test/user-login-migration.api.spec.ts → apps/server/src/modules/user-login-migration/api/api-test/user-login-migration.api.spec.ts

@@ -27,8 +27,8 @@ import { DeepPartial } from 'fishery';
 import { Response } from 'supertest';
 import { UserLoginMigrationEntity } from '../../repo';
 import { userLoginMigrationFactory } from '../../testing';
-import { UserLoginMigrationUc } from '../../uc';
 import { ForceMigrationParams, Oauth2MigrationParams, UserLoginMigrationResponse } from '../dto';
+import { UserLoginMigrationUc } from '../uc';
 
 jest.mock('jwks-rsa', () => () => {
 	return {

apps/server/src/modules/user-login-migration/mapper/user-login-migration.mapper.ts → apps/server/src/modules/user-login-migration/api/mapper/user-login-migration.mapper.ts

@@ -1,6 +1,6 @@
-import { UserLoginMigrationResponse, UserLoginMigrationSearchParams } from '../controller/dto';
-import { UserLoginMigrationDO } from '../domain';
-import { UserLoginMigrationQuery } from '../uc';
+import { UserLoginMigrationDO } from '../../domain';
+import { UserLoginMigrationQuery } from '../../domain/interface';
+import { UserLoginMigrationResponse, UserLoginMigrationSearchParams } from '../dto';
 
 export class UserLoginMigrationMapper {
 	static mapSearchParamsToQuery(searchParams: UserLoginMigrationSearchParams): UserLoginMigrationQuery {

apps/server/src/modules/user-login-migration/uc/close-user-login-migration.uc.spec.ts → apps/server/src/modules/user-login-migration/api/uc/close-user-login-migration.uc.spec.ts

@@ -8,10 +8,14 @@ import { userFactory } from '@modules/user/testing';
 import { Test, TestingModule } from '@nestjs/testing';
 import { Permission } from '@shared/domain/interface';
 import { setupEntities } from '@testing/database';
-import { UserLoginMigrationDO } from '../domain';
-import { UserLoginMigrationNotFoundLoggableException } from '../loggable';
-import { SchoolMigrationService, UserLoginMigrationRevertService, UserLoginMigrationService } from '../service';
-import { userLoginMigrationDOFactory } from '../testing';
+import { UserLoginMigrationDO } from '../../domain';
+import { UserLoginMigrationNotFoundLoggableException } from '../../domain/loggable';
+import {
+	SchoolMigrationService,
+	UserLoginMigrationRevertService,
+	UserLoginMigrationService,
+} from '../../domain/service';
+import { userLoginMigrationDOFactory } from '../../testing';
 import { CloseUserLoginMigrationUc } from './close-user-login-migration.uc';
 
 describe(CloseUserLoginMigrationUc.name, () => {

apps/server/src/modules/user-login-migration/uc/close-user-login-migration.uc.ts → apps/server/src/modules/user-login-migration/api/uc/close-user-login-migration.uc.ts

@@ -4,9 +4,13 @@ import { User } from '@modules/user/repo';
 import { Injectable } from '@nestjs/common/decorators/core/injectable.decorator';
 import { Permission } from '@shared/domain/interface';
 import { EntityId } from '@shared/domain/types';
-import { UserLoginMigrationDO } from '../domain';
-import { UserLoginMigrationNotFoundLoggableException } from '../loggable';
-import { SchoolMigrationService, UserLoginMigrationRevertService, UserLoginMigrationService } from '../service';
+import { UserLoginMigrationDO } from '../../domain';
+import { UserLoginMigrationNotFoundLoggableException } from '../../domain/loggable';
+import {
+	SchoolMigrationService,
+	UserLoginMigrationRevertService,
+	UserLoginMigrationService,
+} from '../../domain/service';
 
 @Injectable()
 export class CloseUserLoginMigrationUc {

apps/server/src/modules/user-login-migration/uc/index.ts → apps/server/src/modules/user-login-migration/api/uc/index.ts

@@ -1,8 +1,7 @@
-export * from './dto';
-export * from './user-login-migration.uc';
+export { CloseMigrationWizardUc } from './close-migration-wizard.uc';
+export * from './close-user-login-migration.uc';
+export * from './restart-user-login-migration.uc';
 export * from './start-user-login-migration.uc';
 export * from './toggle-user-login-migration.uc';
-export * from './restart-user-login-migration.uc';
-export * from './close-user-login-migration.uc';
 export * from './user-login-migration-rollback.uc';
-export { CloseMigrationWizardUc } from './close-migration-wizard.uc';
+export * from './user-login-migration.uc';

apps/server/src/modules/user-login-migration/uc/restart-user-login-migration.uc.spec.ts → apps/server/src/modules/user-login-migration/api/uc/restart-user-login-migration.uc.spec.ts

@@ -7,10 +7,10 @@ import { ForbiddenException } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
 import { Permission } from '@shared/domain/interface';
 import { setupEntities } from '@testing/database';
-import { UserLoginMigrationDO } from '../domain';
-import { UserLoginMigrationNotFoundLoggableException } from '../loggable';
-import { SchoolMigrationService, UserLoginMigrationService } from '../service';
-import { userLoginMigrationDOFactory } from '../testing';
+import { UserLoginMigrationDO } from '../../domain';
+import { UserLoginMigrationNotFoundLoggableException } from '../../domain/loggable';
+import { SchoolMigrationService, UserLoginMigrationService } from '../../domain/service';
+import { userLoginMigrationDOFactory } from '../../testing';
 import { RestartUserLoginMigrationUc } from './restart-user-login-migration.uc';
 
 describe(RestartUserLoginMigrationUc.name, () => {

apps/server/src/modules/user-login-migration/uc/restart-user-login-migration.uc.ts → apps/server/src/modules/user-login-migration/api/uc/restart-user-login-migration.uc.ts

@@ -3,9 +3,9 @@ import { AuthorizationContextBuilder, AuthorizationService } from '@modules/auth
 import { User } from '@modules/user/repo';
 import { Injectable } from '@nestjs/common/decorators/core/injectable.decorator';
 import { Permission } from '@shared/domain/interface';
-import { UserLoginMigrationDO } from '../domain';
-import { UserLoginMigrationNotFoundLoggableException, UserLoginMigrationStartLoggable } from '../loggable';
-import { SchoolMigrationService, UserLoginMigrationService } from '../service';
+import { UserLoginMigrationDO } from '../../domain';
+import { UserLoginMigrationNotFoundLoggableException, UserLoginMigrationStartLoggable } from '../../domain/loggable';
+import { SchoolMigrationService, UserLoginMigrationService } from '../../domain/service';
 
 @Injectable()
 export class RestartUserLoginMigrationUc {

apps/server/src/modules/user-login-migration/uc/start-user-login-migration.uc.spec.ts → apps/server/src/modules/user-login-migration/api/uc/start-user-login-migration.uc.spec.ts

@@ -9,10 +9,13 @@ import { ForbiddenException } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
 import { Permission } from '@shared/domain/interface';
 import { setupEntities } from '@testing/database';
-import { UserLoginMigrationDO } from '../domain';
-import { SchoolNumberMissingLoggableException, UserLoginMigrationAlreadyClosedLoggableException } from '../loggable';
-import { UserLoginMigrationService } from '../service';
-import { userLoginMigrationDOFactory } from '../testing';
+import { UserLoginMigrationDO } from '../../domain';
+import {
+	SchoolNumberMissingLoggableException,
+	UserLoginMigrationAlreadyClosedLoggableException,
+} from '../../domain/loggable';
+import { UserLoginMigrationService } from '../../domain/service';
+import { userLoginMigrationDOFactory } from '../../testing';
 import { StartUserLoginMigrationUc } from './start-user-login-migration.uc';
 
 describe(StartUserLoginMigrationUc.name, () => {

apps/server/src/modules/user-login-migration/uc/start-user-login-migration.uc.ts → apps/server/src/modules/user-login-migration/api/uc/start-user-login-migration.uc.ts

@@ -5,13 +5,13 @@ import { User } from '@modules/user/repo';
 import { Injectable } from '@nestjs/common/decorators/core/injectable.decorator';
 import { Permission } from '@shared/domain/interface';
 import { EntityId } from '@shared/domain/types';
-import { UserLoginMigrationDO } from '../domain';
+import { UserLoginMigrationDO } from '../../domain';
 import {
 	SchoolNumberMissingLoggableException,
 	UserLoginMigrationAlreadyClosedLoggableException,
 	UserLoginMigrationStartLoggable,
-} from '../loggable';
-import { UserLoginMigrationService } from '../service';
+} from '../../domain/loggable';
+import { UserLoginMigrationService } from '../../domain/service';
 
 @Injectable()
 export class StartUserLoginMigrationUc {
@@ -24,7 +24,7 @@ export class StartUserLoginMigrationUc {
 		this.logger.setContext(StartUserLoginMigrationUc.name);
 	}
 
-	async startMigration(userId: EntityId, schoolId: EntityId): Promise<UserLoginMigrationDO> {
+	public async startMigration(userId: EntityId, schoolId: EntityId): Promise<UserLoginMigrationDO> {
 		await this.checkPreconditions(userId, schoolId);
 
 		let userLoginMigration: UserLoginMigrationDO | null = await this.userLoginMigrationService.findMigrationBySchool(

apps/server/src/modules/user-login-migration/uc/toggle-user-login-migration.uc.spec.ts → apps/server/src/modules/user-login-migration/api/uc/toggle-user-login-migration.uc.spec.ts

@@ -10,10 +10,10 @@ import { ForbiddenException } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
 import { Permission } from '@shared/domain/interface';
 import { setupEntities } from '@testing/database';
-import { UserLoginMigrationDO } from '../domain';
-import { UserLoginMigrationNotFoundLoggableException } from '../loggable';
-import { UserLoginMigrationService } from '../service';
-import { userLoginMigrationDOFactory } from '../testing';
+import { UserLoginMigrationDO } from '../../domain';
+import { UserLoginMigrationNotFoundLoggableException } from '../../domain/loggable';
+import { UserLoginMigrationService } from '../../domain/service';
+import { userLoginMigrationDOFactory } from '../../testing';
 import { ToggleUserLoginMigrationUc } from './toggle-user-login-migration.uc';
 
 describe(ToggleUserLoginMigrationUc.name, () => {

apps/server/src/modules/user-login-migration/uc/toggle-user-login-migration.uc.ts → apps/server/src/modules/user-login-migration/api/uc/toggle-user-login-migration.uc.ts

@@ -5,9 +5,12 @@ import { User } from '@modules/user/repo';
 import { Injectable } from '@nestjs/common';
 import { Permission } from '@shared/domain/interface';
 import { EntityId } from '@shared/domain/types';
-import { UserLoginMigrationDO } from '../domain';
-import { UserLoginMigrationMandatoryLoggable, UserLoginMigrationNotFoundLoggableException } from '../loggable';
-import { UserLoginMigrationService } from '../service';
+import { UserLoginMigrationDO } from '../../domain';
+import {
+	UserLoginMigrationMandatoryLoggable,
+	UserLoginMigrationNotFoundLoggableException,
+} from '../../domain/loggable';
+import { UserLoginMigrationService } from '../../domain/service';
 
 @Injectable()
 export class ToggleUserLoginMigrationUc {
@@ -18,7 +21,11 @@ export class ToggleUserLoginMigrationUc {
 		private readonly logger: Logger
 	) {}
 
-	async setMigrationMandatory(userId: EntityId, schoolId: EntityId, mandatory: boolean): Promise<UserLoginMigrationDO> {
+	public async setMigrationMandatory(
+		userId: EntityId,
+		schoolId: EntityId,
+		mandatory: boolean
+	): Promise<UserLoginMigrationDO> {
 		await this.checkPermission(userId, schoolId);
 
 		let userLoginMigration: UserLoginMigrationDO | null = await this.userLoginMigrationService.findMigrationBySchool(

apps/server/src/modules/user-login-migration/uc/user-login-migration-rollback.uc.spec.ts → apps/server/src/modules/user-login-migration/api/uc/user-login-migration-rollback.uc.spec.ts

@@ -6,7 +6,7 @@ import { userFactory } from '@modules/user/testing';
 import { Test, TestingModule } from '@nestjs/testing';
 import { Permission } from '@shared/domain/interface';
 import { setupEntities } from '@testing/database';
-import { UserLoginMigrationRollbackService } from '../service';
+import { UserLoginMigrationRollbackService } from '../../domain/service';
 import { UserLoginMigrationRollbackUc } from './user-login-migration-rollback.uc';
 
 describe(UserLoginMigrationRollbackUc.name, () => {

apps/server/src/modules/user-login-migration/uc/user-login-migration-rollback.uc.ts → apps/server/src/modules/user-login-migration/api/uc/user-login-migration-rollback.uc.ts

@@ -2,7 +2,7 @@ import { AuthorizationService } from '@modules/authorization';
 import { Injectable } from '@nestjs/common';
 import { Permission } from '@shared/domain/interface';
 import { EntityId } from '@shared/domain/types';
-import { UserLoginMigrationRollbackService } from '../service';
+import { UserLoginMigrationRollbackService } from '../../domain/service';
 
 @Injectable()
 export class UserLoginMigrationRollbackUc {

apps/server/src/modules/user-login-migration/uc/user-login-migration.uc.spec.ts → apps/server/src/modules/user-login-migration/api/uc/user-login-migration.uc.spec.ts

@@ -8,6 +8,7 @@ import { legacySchoolDoFactory } from '@modules/legacy-school/testing';
 import { OAuthService } from '@modules/oauth';
 import { OAuthTokenDto } from '@modules/oauth-adapter';
 import { ExternalSchoolDto, OauthDataDto, ProvisioningService, ProvisioningSystemDto } from '@modules/provisioning';
+import { externalUserDtoFactory } from '@modules/provisioning/testing';
 import { schoolEntityFactory } from '@modules/school/testing';
 import { systemEntityFactory } from '@modules/system/testing';
 import { UserService } from '@modules/user';
@@ -20,8 +21,7 @@ import { Page, RoleReference } from '@shared/domain/domainobject';
 import { Permission, RoleName } from '@shared/domain/interface';
 import { SystemProvisioningStrategy } from '@shared/domain/interface/system-provisioning.strategy';
 import { setupEntities } from '@testing/database';
-import { externalUserDtoFactory } from '../../provisioning/testing';
-import { UserLoginMigrationDO } from '../domain';
+import { UserLoginMigrationDO } from '../../domain';
 import {
 	ExternalSchoolNumberMissingLoggableException,
 	InvalidUserLoginMigrationLoggableException,
@@ -30,9 +30,9 @@ import {
 	UserLoginMigrationInvalidExternalSchoolIdLoggableException,
 	UserLoginMigrationMultipleEmailUsersLoggableException,
 	UserLoginMigrationSchoolAlreadyMigratedLoggableException,
-} from '../loggable';
-import { SchoolMigrationService, UserLoginMigrationService, UserMigrationService } from '../service';
-import { userLoginMigrationDOFactory } from '../testing';
+} from '../../domain/loggable';
+import { SchoolMigrationService, UserLoginMigrationService, UserMigrationService } from '../../domain/service';
+import { userLoginMigrationDOFactory } from '../../testing';
 import { UserLoginMigrationUc } from './user-login-migration.uc';
 
 describe(UserLoginMigrationUc.name, () => {

apps/server/src/modules/user-login-migration/uc/user-login-migration.uc.ts → apps/server/src/modules/user-login-migration/api/uc/user-login-migration.uc.ts

@@ -11,7 +11,8 @@ import { NotFoundLoggableException } from '@shared/common/loggable-exception';
 import { Page, RoleReference } from '@shared/domain/domainobject';
 import { Permission, RoleName } from '@shared/domain/interface';
 import { EntityId } from '@shared/domain/types';
-import { UserLoginMigrationDO } from '../domain';
+import { UserLoginMigrationDO } from '../../domain';
+import { UserLoginMigrationQuery } from '../../domain/interface';
 import {
 	ExternalSchoolNumberMissingLoggableException,
 	InvalidUserLoginMigrationLoggableException,
@@ -24,9 +25,8 @@ import {
 	UserMigrationCorrectionSuccessfulLoggable,
 	UserMigrationStartedLoggable,
 	UserMigrationSuccessfulLoggable,
-} from '../loggable';
-import { SchoolMigrationService, UserLoginMigrationService, UserMigrationService } from '../service';
-import { UserLoginMigrationQuery } from './dto';
+} from '../../domain/loggable';
+import { SchoolMigrationService, UserLoginMigrationService, UserMigrationService } from '../../domain/service';
 
 @Injectable()
 export class UserLoginMigrationUc {

apps/server/src/modules/user-login-migration/controller/user-login-migration-rollback.controller.ts → apps/server/src/modules/user-login-migration/api/user-login-migration-rollback.controller.ts

@@ -9,8 +9,8 @@ import {
 	ApiUnauthorizedResponse,
 	ApiUnprocessableEntityResponse,
 } from '@nestjs/swagger';
-import { UserLoginMigrationRollbackUc } from '../uc';
 import { UserIdParams } from './dto';
+import { UserLoginMigrationRollbackUc } from './uc';
 
 @ApiTags('UserLoginMigration Rollback')
 @Controller('user-login-migrations')