fix import cycle

hpi-schul-cloud · Jan 9, 2024 · f8533fc · f8533fc
1 parent 94d113f
commit f8533fc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/apps/server/src/modules/group/entity/group-user.entity.ts b/apps/server/src/modules/group/entity/group-user.entity.ts
@@ -1,5 +1,6 @@
 import { Embeddable, ManyToOne } from '@mikro-orm/core';
-import { Role, User } from '@shared/domain/entity';
+import { Role } from '@shared/domain/entity/role.entity';
+import { User } from '@shared/domain/entity/user.entity';
 
 export interface GroupUserEntityProps {
 	user: User;

diff --git a/...rver/src/modules/user-login-migration/service/user-login-migration-revert.service.spec.ts b/...rver/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 { Test, TestingModule } from '@nestjs/testing';
 import { SchoolFeature } from '@shared/domain/types';
-import { setupEntities, userLoginMigrationDOFactory } from '@shared/testing';
+import { userLoginMigrationDOFactory } from '@shared/testing';
 import { UserLoginMigrationRevertService } from './user-login-migration-revert.service';
 import { UserLoginMigrationService } from './user-login-migration.service';
 
@@ -14,8 +14,6 @@ describe('UserLoginMigrationRevertService', () => {
 	let userLoginMigrationService: DeepMocked<UserLoginMigrationService>;
 
 	beforeAll(async () => {
-		await setupEntities();
-
 		module = await Test.createTestingModule({
 			providers: [
 				UserLoginMigrationRevertService,