BC-7340 - avoid test factories import cycles

apps/server/src/infra/calendar/service/calendar.service.spec.ts

@@ -4,7 +4,7 @@ import { CalendarEventDto, CalendarService } from '@infra/calendar';
 import { HttpService } from '@nestjs/axios';
 import { HttpStatus, InternalServerErrorException } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
-import { axiosResponseFactory } from '@shared/testing';
+import { axiosResponseFactory } from '@shared/testing/factory';
 import { AxiosResponse } from 'axios';
 import { of, throwError } from 'rxjs';
 import { Logger } from '@src/core/logger';

apps/server/src/infra/collaborative-storage/strategy/nextcloud/nextcloud.client.spec.ts

@@ -3,7 +3,7 @@ import { ObjectId } from '@mikro-orm/mongodb';
 import { HttpService } from '@nestjs/axios';
 import { NotFoundException, NotImplementedException, UnprocessableEntityException } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
-import { axiosResponseFactory } from '@shared/testing';
+import { axiosResponseFactory } from '@shared/testing/factory';
 import { LegacyLogger } from '@src/core/logger';
 import { AxiosResponse } from 'axios';
 import { Observable, of } from 'rxjs';

apps/server/src/infra/collaborative-storage/strategy/nextcloud/nextcloud.strategy.spec.ts

@@ -10,7 +10,7 @@ import { LtiToolDO } from '@shared/domain/domainobject/ltitool.do';
 import { LtiPrivacyPermission, LtiRoleType, User } from '@shared/domain/entity';
 import { RoleName } from '@shared/domain/interface';
 import { LtiToolRepo } from '@shared/repo';
-import { ltiToolDOFactory, pseudonymFactory, setupEntities, userDoFactory, userFactory } from '@shared/testing';
+import { ltiToolDOFactory, pseudonymFactory, setupEntities, userDoFactory, userFactory } from '@shared/testing/factory';
 import { LegacyLogger } from '@src/core/logger';
 import { TeamRolePermissionsDto } from '../../dto/team-role-permissions.dto';
 import { NextcloudClient } from './nextcloud.client';

apps/server/src/infra/identity-management/keycloak-configuration/service/keycloak-configuration.service.spec.ts

@@ -15,7 +15,7 @@ import { Test, TestingModule } from '@nestjs/testing';
 import { SystemEntity } from '@shared/domain/entity';
 import { SystemTypeEnum } from '@shared/domain/types';
 
-import { systemEntityFactory } from '@shared/testing';
+import { systemEntityFactory } from '@shared/testing/factory';
 import { AxiosResponse } from 'axios';
 import { of } from 'rxjs';
 import { v1 } from 'uuid';

apps/server/src/infra/oauth-provider/hydra/hydra.adapter.spec.ts

@@ -12,8 +12,7 @@ import {
 } from '@infra/oauth-provider/dto';
 import { HttpService } from '@nestjs/axios';
 import { Test, TestingModule } from '@nestjs/testing';
-import { axiosResponseFactory } from '@shared/testing';
-import { axiosErrorFactory } from '@shared/testing/factory';
+import { axiosResponseFactory, axiosErrorFactory } from '@shared/testing/factory';
 import { AxiosError, AxiosRequestConfig, Method, RawAxiosRequestHeaders } from 'axios';
 import { of, throwError } from 'rxjs';
 import { ProviderConsentSessionResponse } from '../dto';

apps/server/src/infra/schulconnex-client/schulconnex-rest-client.spec.ts

@@ -1,7 +1,7 @@
 import { createMock, DeepMocked } from '@golevelup/ts-jest';
 import { OauthAdapterService, OAuthTokenDto } from '@modules/oauth';
 import { HttpService } from '@nestjs/axios';
-import { axiosResponseFactory } from '@shared/testing';
+import { axiosResponseFactory } from '@shared/testing/factory';
 import { Logger } from '@src/core/logger';
 import { of } from 'rxjs';
 import { SchulconnexConfigurationMissingLoggable } from './loggable';

apps/server/src/modules/account/api/account.uc.spec.ts

@@ -10,7 +10,7 @@ import { UnauthorizedException } from '@nestjs/common/exceptions/unauthorized.ex
 import { Role, User } from '@shared/domain/entity';
 import { Permission, RoleName } from '@shared/domain/interface';
 import { EntityId } from '@shared/domain/types';
-import { schoolEntityFactory, setupEntities, userFactory } from '@shared/testing';
+import { schoolEntityFactory, setupEntities, userFactory } from '@shared/testing/factory';
 import { Account, AccountSave } from '../domain';
 import { AccountEntity } from '../domain/entity/account.entity';
 import { AccountService } from '../domain/services';

apps/server/src/modules/account/api/test/account.api.spec.ts

@@ -3,7 +3,13 @@ import { INestApplication } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
 import { User } from '@shared/domain/entity';
 import { Permission, RoleName } from '@shared/domain/interface';
-import { TestApiClient, cleanupCollections, roleFactory, schoolEntityFactory, userFactory } from '@shared/testing';
+import {
+	TestApiClient,
+	cleanupCollections,
+	roleFactory,
+	schoolEntityFactory,
+	userFactory,
+} from '@shared/testing/factory';
 import { ServerTestModule } from '@modules/server/server.module';
 import {
 	AccountByIdBodyParams,

apps/server/src/modules/account/domain/services/account-db.service.spec.ts

@@ -6,7 +6,7 @@ import { Test, TestingModule } from '@nestjs/testing';
 import { EntityNotFoundError } from '@shared/common';
 import { IdmAccount } from '@shared/domain/interface';
 import { EntityId } from '@shared/domain/types';
-import { setupEntities, userFactory } from '@shared/testing';
+import { setupEntities, userFactory } from '@shared/testing/factory';
 import { Logger } from '@src/core/logger';
 import bcrypt from 'bcryptjs';
 import { v1 } from 'uuid';

apps/server/src/modules/account/domain/services/account.service.spec.ts

@@ -14,7 +14,7 @@ import { Test, TestingModule } from '@nestjs/testing';
 import { AuthorizationError, EntityNotFoundError, ForbiddenOperationError, ValidationError } from '@shared/common';
 import { User } from '@shared/domain/entity';
 import { UserRepo } from '@shared/repo';
-import { schoolEntityFactory, setupEntities, systemFactory, userFactory } from '@shared/testing';
+import { schoolEntityFactory, setupEntities, systemFactory, userFactory } from '@shared/testing/factory';
 import { Logger } from '@src/core/logger';
 import 'reflect-metadata';
 import { Account, AccountSave, UpdateAccount } from '..';

apps/server/src/modules/account/domain/services/account.validation.service.spec.ts

@@ -3,7 +3,7 @@ import { Test, TestingModule } from '@nestjs/testing';
 import { Role } from '@shared/domain/entity';
 import { Permission, RoleName } from '@shared/domain/interface';
 import { UserRepo } from '@shared/repo';
-import { setupEntities, systemFactory, userFactory } from '@shared/testing';
+import { setupEntities, systemFactory, userFactory } from '@shared/testing/factory';
 import { ObjectId } from '@mikro-orm/mongodb';
 import { AccountRepo } from '../../repo/micro-orm/account.repo';
 import { AccountValidationService } from './account.validation.service';

apps/server/src/modules/account/repo/micro-orm/account.repo.integration.spec.ts

@@ -3,7 +3,7 @@ import { NotFoundError } from '@mikro-orm/core';
 import { EntityManager, ObjectId } from '@mikro-orm/mongodb';
 import { Test, TestingModule } from '@nestjs/testing';
 import { User } from '@shared/domain/entity';
-import { cleanupCollections, userFactory } from '@shared/testing';
+import { cleanupCollections, userFactory } from '@shared/testing/factory';
 import { AccountRepo } from './account.repo';
 import { AccountEntity } from '../../domain/entity/account.entity';
 import { AccountDoToEntityMapper } from './mapper/account-do-to-entity.mapper';

apps/server/src/modules/alert/adapter/status.adapter.spec.ts

@@ -3,7 +3,7 @@ import { HttpService } from '@nestjs/axios';
 import { createMock, DeepMocked } from '@golevelup/ts-jest';
 import { ConfigService } from '@nestjs/config';
 import { ServerConfig } from '@modules/server';
-import { axiosResponseFactory } from '@shared/testing';
+import { axiosResponseFactory } from '@shared/testing/factory';
 import { of, throwError } from 'rxjs';
 import { AxiosError } from 'axios';
 import { StatusAdapter } from './status.adapter';

apps/server/src/modules/alert/controller/api-test/alert.api.spec.ts

@@ -4,7 +4,7 @@ import { HttpService } from '@nestjs/axios';
 import { Test, TestingModule } from '@nestjs/testing';
 import request from 'supertest';
 import { of } from 'rxjs';
-import { axiosResponseFactory } from '@shared/testing';
+import { axiosResponseFactory } from '@shared/testing/factory';
 import { SchulcloudTheme } from '@shared/domain/types';
 import { serverConfig, ServerTestModule } from '../../../server';
 import { createComponent, createIncident } from '../../testing';

apps/server/src/modules/authentication/controllers/api-test/login.api.spec.ts

@@ -5,7 +5,7 @@ import { HttpStatus, INestApplication } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
 import { SchoolEntity, SystemEntity, User } from '@shared/domain/entity';
 import { RoleName } from '@shared/domain/interface';
-import { roleFactory, schoolEntityFactory, systemEntityFactory, userFactory } from '@shared/testing';
+import { roleFactory, schoolEntityFactory, systemEntityFactory, userFactory } from '@shared/testing/factory';
 import { AccountEntity } from '@src/modules/account/domain/entity/account.entity';
 import { accountFactory } from '@src/modules/account/testing';
 import axios from 'axios';

apps/server/src/modules/authentication/mapper/current-user.mapper.spec.ts

@@ -1,7 +1,7 @@
 import { ValidationError } from '@shared/common';
 import { UserDO } from '@shared/domain/domainobject/user.do';
 import { Permission, RoleName } from '@shared/domain/interface';
-import { roleFactory, schoolEntityFactory, setupEntities, userDoFactory, userFactory } from '@shared/testing';
+import { roleFactory, schoolEntityFactory, setupEntities, userDoFactory, userFactory } from '@shared/testing/factory';
 import { ICurrentUser, OauthCurrentUser } from '../interface';
 import { CreateJwtPayload, JwtPayload } from '../interface/jwt-payload';
 import { CurrentUserMapper } from './current-user.mapper';

apps/server/src/modules/authentication/services/ldap.service.spec.ts

@@ -2,7 +2,7 @@ import { createMock } from '@golevelup/ts-jest';
 import { UnauthorizedException } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
 import { SystemEntity } from '@shared/domain/entity';
-import { systemEntityFactory } from '@shared/testing';
+import { systemEntityFactory } from '@shared/testing/factory';
 import { LegacyLogger } from '@src/core/logger';
 import { LdapService } from './ldap.service';
 

apps/server/src/modules/authentication/strategy/local.strategy.spec.ts

@@ -7,7 +7,7 @@ import { ConfigService } from '@nestjs/config';
 import { User } from '@shared/domain/entity';
 import { RoleName } from '@shared/domain/interface';
 import { UserRepo } from '@shared/repo';
-import { setupEntities, userFactory } from '@shared/testing';
+import { setupEntities, userFactory } from '@shared/testing/factory';
 import { accountDoFactory } from '@src/modules/account/testing';
 import bcrypt from 'bcryptjs';
 import { AuthenticationService } from '../services/authentication.service';

apps/server/src/modules/authentication/strategy/oauth2.strategy.spec.ts

@@ -6,7 +6,7 @@ import { Test, TestingModule } from '@nestjs/testing';
 import { UserDO } from '@shared/domain/domainobject/user.do';
 import { RoleName } from '@shared/domain/interface';
 import { EntityId } from '@shared/domain/types';
-import { userDoFactory } from '@shared/testing';
+import { userDoFactory } from '@shared/testing/factory';
 
 import { ICurrentUser, OauthCurrentUser } from '../interface';
 

apps/server/src/modules/authorization/domain/rules/context-external-tool.rule.spec.ts

@@ -7,7 +7,7 @@ import { schoolExternalToolEntityFactory } from '@modules/tool/school-external-t
 import { Test, TestingModule } from '@nestjs/testing';
 import { Role, User } from '@shared/domain/entity';
 import { Permission } from '@shared/domain/interface';
-import { roleFactory, schoolEntityFactory, setupEntities, userFactory } from '@shared/testing';
+import { roleFactory, schoolEntityFactory, setupEntities, userFactory } from '@shared/testing/factory';
 import { AuthorizationHelper } from '../service/authorization.helper';
 import { Action } from '../type';
 import { ContextExternalToolRule } from './context-external-tool.rule';

apps/server/src/modules/authorization/domain/rules/course-group.rule.spec.ts

@@ -1,7 +1,7 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { CourseGroup, User } from '@shared/domain/entity';
 import { Permission } from '@shared/domain/interface';
-import { courseFactory, courseGroupFactory, roleFactory, setupEntities, userFactory } from '@shared/testing';
+import { courseFactory, courseGroupFactory, roleFactory, setupEntities, userFactory } from '@shared/testing/factory';
 import { CourseGroupRule } from './course-group.rule';
 import { CourseRule } from './course.rule';
 import { Action } from '../type';

apps/server/src/modules/authorization/domain/rules/course.rule.spec.ts

@@ -2,7 +2,7 @@ import { courseFactory } from '@modules/learnroom/testing';
 import { Test, TestingModule } from '@nestjs/testing';
 import { Course, User } from '@shared/domain/entity';
 import { Permission } from '@shared/domain/interface';
-import { courseFactory as courseEntityFactory, roleFactory, setupEntities, userFactory } from '@shared/testing';
+import { courseFactory as courseEntityFactory, roleFactory, setupEntities, userFactory } from '@shared/testing/factory';
 import { AuthorizationHelper } from '../service/authorization.helper';
 import { Action } from '../type';
 import { CourseRule } from './course.rule';

apps/server/src/modules/authorization/domain/rules/group.rule.spec.ts

@@ -2,7 +2,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest';
 import { Test, TestingModule } from '@nestjs/testing';
 import { Role, SchoolEntity, User } from '@shared/domain/entity';
 import { Permission } from '@shared/domain/interface';
-import { groupFactory, roleFactory, schoolEntityFactory, setupEntities, userFactory } from '@shared/testing';
+import { groupFactory, roleFactory, schoolEntityFactory, setupEntities, userFactory } from '@shared/testing/factory';
 import { Action, AuthorizationContext, AuthorizationHelper } from '@src/modules/authorization';
 import { Group } from '@src/modules/group';
 import { ObjectId } from '@mikro-orm/mongodb';

apps/server/src/modules/authorization/domain/rules/legacy-school.rule.spec.ts

@@ -1,6 +1,6 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { Permission } from '@shared/domain/interface';
-import { roleFactory, legacySchoolDoFactory, setupEntities, userFactory } from '@shared/testing';
+import { roleFactory, legacySchoolDoFactory, setupEntities, userFactory } from '@shared/testing/factory';
 import { ObjectId } from '@mikro-orm/mongodb';
 import { Action } from '../type';
 import { AuthorizationHelper } from '../service/authorization.helper';

apps/server/src/modules/authorization/domain/rules/school.rule.spec.ts

@@ -1,7 +1,7 @@
 import { createMock, DeepMocked } from '@golevelup/ts-jest';
 import { schoolFactory } from '@modules/school/testing/school.factory';
 import { Test, TestingModule } from '@nestjs/testing';
-import { setupEntities, userFactory } from '@shared/testing';
+import { setupEntities, userFactory } from '@shared/testing/factory';
 import { AuthorizationContextBuilder } from '../mapper';
 import { AuthorizationHelper } from '../service/authorization.helper';
 import { SchoolRule } from './school.rule';

apps/server/src/modules/authorization/domain/rules/system.rule.spec.ts

@@ -3,7 +3,13 @@ import { System } from '@modules/system';
 import { Test, TestingModule } from '@nestjs/testing';
 import { SchoolEntity, SystemEntity, User } from '@shared/domain/entity';
 import { Permission } from '@shared/domain/interface';
-import { schoolEntityFactory, setupEntities, systemEntityFactory, systemFactory, userFactory } from '@shared/testing';
+import {
+	schoolEntityFactory,
+	setupEntities,
+	systemEntityFactory,
+	systemFactory,
+	userFactory,
+} from '@shared/testing/factory';
 import { AuthorizationContextBuilder } from '../mapper';
 import { AuthorizationHelper } from '../service/authorization.helper';
 import { SystemRule } from './system.rule';

apps/server/src/modules/authorization/domain/rules/task.rule.spec.ts

@@ -1,7 +1,14 @@
 import { DeepPartial } from '@mikro-orm/core';
 import { Test, TestingModule } from '@nestjs/testing';
 import { Permission, RoleName } from '@shared/domain/interface';
-import { courseFactory, lessonFactory, roleFactory, setupEntities, taskFactory, userFactory } from '@shared/testing';
+import {
+	courseFactory,
+	lessonFactory,
+	roleFactory,
+	setupEntities,
+	taskFactory,
+	userFactory,
+} from '@shared/testing/factory';
 import { AuthorizationHelper } from '../service/authorization.helper';
 import { Action } from '../type';
 import { CourseGroupRule } from './course-group.rule';

apps/server/src/modules/authorization/domain/rules/team.rule.spec.ts

@@ -1,6 +1,6 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { Permission } from '@shared/domain/interface';
-import { roleFactory, setupEntities, userFactory, teamFactory } from '@shared/testing';
+import { roleFactory, setupEntities, userFactory, teamFactory } from '@shared/testing/factory';
 import { AuthorizationHelper } from '../service/authorization.helper';
 import { TeamRule } from './team.rule';
 import { AuthorizationContextBuilder } from '../mapper';

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

@@ -3,7 +3,7 @@ import { ObjectId } from '@mikro-orm/mongodb';
 import { Test, TestingModule } from '@nestjs/testing';
 import { UserLoginMigrationDO } from '@shared/domain/domainobject';
 import { Permission } from '@shared/domain/interface';
-import { schoolEntityFactory, setupEntities, userFactory, userLoginMigrationDOFactory } from '@shared/testing';
+import { schoolEntityFactory, setupEntities, userFactory, userLoginMigrationDOFactory } from '@shared/testing/factory';
 import { AuthorizationHelper } from '../service/authorization.helper';
 import { Action, AuthorizationContext } from '../type';
 import { UserLoginMigrationRule } from './user-login-migration.rule';

apps/server/src/modules/authorization/domain/rules/user.rule.spec.ts

@@ -1,7 +1,7 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { Role, User } from '@shared/domain/entity';
 import { Permission } from '@shared/domain/interface';
-import { roleFactory, setupEntities, userFactory } from '@shared/testing';
+import { roleFactory, setupEntities, userFactory } from '@shared/testing/factory';
 import { Action } from '../type';
 import { AuthorizationHelper } from '../service/authorization.helper';
 import { UserRule } from './user.rule';

apps/server/src/modules/authorization/domain/service/authorization-reference.service.spec.ts

@@ -1,7 +1,7 @@
 import { createMock, DeepMocked } from '@golevelup/ts-jest';
 import { NotFoundException } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
-import { courseFactory, setupEntities, userFactory } from '@shared/testing';
+import { courseFactory, setupEntities, userFactory } from '@shared/testing/factory';
 import { ObjectId } from '@mikro-orm/mongodb';
 import { AuthorizableReferenceType } from '../type';
 import { AuthorizationService } from './authorization.service';

apps/server/src/modules/authorization/domain/service/authorization.service.spec.ts

@@ -3,7 +3,7 @@ import { UnauthorizedException } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
 import { Permission } from '@shared/domain/interface';
 import { UserRepo } from '@shared/repo';
-import { setupEntities, userFactory } from '@shared/testing';
+import { setupEntities, userFactory } from '@shared/testing/factory';
 import { ForbiddenLoggableException } from '../error';
 import { AuthorizationContextBuilder } from '../mapper';
 import { Rule } from '../type';

apps/server/src/modules/authorization/domain/service/reference.loader.spec.ts

@@ -16,7 +16,7 @@ import {
 	TeamsRepo,
 	UserRepo,
 } from '@shared/repo';
-import { setupEntities, userFactory } from '@shared/testing';
+import { setupEntities, userFactory } from '@shared/testing/factory';
 import { AuthorizableReferenceType } from '../type';
 import { ReferenceLoader } from './reference.loader';
 

apps/server/src/modules/authorization/domain/service/rule-manager.spec.ts

@@ -1,7 +1,7 @@
 import { createMock, DeepMocked } from '@golevelup/ts-jest';
 import { InternalServerErrorException, NotImplementedException } from '@nestjs/common';
 import { Test } from '@nestjs/testing';
-import { courseFactory, setupEntities, userFactory } from '@shared/testing';
+import { courseFactory, setupEntities, userFactory } from '@shared/testing/factory';
 import { AuthorizationContextBuilder } from '../mapper';
 import {
 	BoardDoRule,

apps/server/src/modules/board/controller/api-test/board-create.api.spec.ts

@@ -4,7 +4,7 @@ import { INestApplication } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
 import { BoardExternalReferenceType, BoardLayout } from '@shared/domain/domainobject';
 import { ColumnBoardNode } from '@shared/domain/entity';
-import { cleanupCollections, courseFactory, TestApiClient, UserAndAccountTestFactory } from '@shared/testing';
+import { cleanupCollections, courseFactory, TestApiClient, UserAndAccountTestFactory } from '@shared/testing/factory';
 import { CreateBoardBodyParams } from '../dto';
 
 const baseRouteName = '/boards';

apps/server/src/modules/board/controller/media-board/api-test/media-line.api.spec.ts

@@ -4,7 +4,12 @@ import { HttpStatus, INestApplication } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
 import { BoardExternalReferenceType } from '@shared/domain/domainobject';
 import { BoardNode } from '@shared/domain/entity';
-import { mediaBoardNodeFactory, mediaLineNodeFactory, TestApiClient, UserAndAccountTestFactory } from '@shared/testing';
+import {
+	mediaBoardNodeFactory,
+	mediaLineNodeFactory,
+	TestApiClient,
+	UserAndAccountTestFactory,
+} from '@shared/testing/factory';
 import { MoveColumnBodyParams, RenameBodyParams } from '../../dto';
 
 const baseRouteName = '/media-lines';

apps/server/src/modules/board/service/event/user-deleted-event-handler.service.spec.ts

@@ -3,7 +3,7 @@ import { ObjectId } from '@mikro-orm/mongodb';
 import { EventBus } from '@nestjs/cqrs';
 import { Test, TestingModule } from '@nestjs/testing';
 import { BoardExternalReferenceType } from '@shared/domain/domainobject';
-import { mediaBoardFactory } from '@shared/testing';
+import { mediaBoardFactory } from '@shared/testing/factory';
 import { Logger } from '@src/core/logger';
 import {
 	DataDeletedEvent,