BC-8551 - Delete const ALL_ENTITIES

.eslintrc.js

@@ -65,7 +65,7 @@ module.exports = {
 	},
 	overrides: [
 		{
-			files: ['apps/**/*.ts'],
+			files: ['apps/server/src/**/*.ts'],
 			env: {
 				node: true,
 				es6: true,
@@ -92,7 +92,7 @@ module.exports = {
 				'class-methods-use-this': 'off',
 				'no-param-reassign': 'off',
 				'no-underscore-dangle': 'off',
-				'filename-rules/match': [1, 'kebabcase'],
+				'filename-rules/match': [1, /^([a-z0-9]+-)*[a-z]+(?:\..*)?$/],
 				'require-await': 'warn',
 				'@typescript-eslint/unbound-method': 'error',
 				'@typescript-eslint/no-non-null-assertion': 'warn',

apps/server/src/apps/server.app.ts

@@ -116,7 +116,7 @@ async function bootstrap(): Promise<void> {
 
 	// logger middleware for deprecated paths
 	// TODO remove when all calls to the server are migrated
-	const logDeprecatedPaths = (req: express.Request, res: express.Response, next: express.NextFunction) => {
+	const logDeprecatedPaths = (req: express.Request, res: express.Response, next: express.NextFunction): void => {
 		legacyLogger.error(req.path, 'DEPRECATED-PATH');
 		next();
 	};

apps/server/src/config/mikro-orm-cli.config.ts

@@ -1,9 +1,8 @@
+// TODO: Rename file it is only used for migrations
 import { DB_PASSWORD, DB_URL, DB_USERNAME } from '@imports-from-feathers';
 import type { MikroOrmModuleSyncOptions } from '@mikro-orm/nestjs/typings';
-import { FileRecord } from '@modules/files-storage/entity';
-import { FileEntity } from '@modules/files/entity';
-import { ALL_ENTITIES } from '@shared/domain/entity';
 import path from 'path';
+import { ENTITIES } from './mikro-orm-cli.entity.imports';
 
 const migrationsPath = path.resolve(__dirname, '..', 'migrations', 'mikro-orm');
 
@@ -13,7 +12,12 @@ export const mikroOrmCliConfig: MikroOrmModuleSyncOptions = {
 	clientUrl: DB_URL,
 	password: DB_PASSWORD,
 	user: DB_USERNAME,
-	entities: [...ALL_ENTITIES, FileEntity, FileRecord],
+	entities: ENTITIES,
+	// TODO: use regex instead https://github.com/mikro-orm/nestjs-realworld-example-app/blob/master/src/mikro-orm.config.ts.example
+	// metadataProvider: TsMorphMetadataProvider,
+	// entities: ['dist/apps/server/modules/**/*.entity.js', 'dist/apps/server/shared/domain/entity/*.entity.js'],
+	// entitiesTs: ['apps/server/src/modules/**/*.entity.ts', 'apps/server/src/shared/domain/entity/*.entity.ts'],
+	// extensions: [Migrator, EntityGenerator],
 	allowGlobalContext: true,
 	/*
 	findOneOrFailHandler: (entityName: string, where: Dictionary | IPrimaryKey) =>

apps/server/src/config/mikro-orm-cli.entity.imports.ts

@@ -0,0 +1,112 @@
+// TODO: Rename file it is only used for migrations
+import { AccountEntity } from '@modules/account/domain/entity/account.entity';
+import { BoardNodeEntity } from '@modules/board/repo/entity';
+import { ClassEntity } from '@modules/class/entity';
+import { DeletionLogEntity } from '@modules/deletion/repo/entity/deletion-log.entity';
+import { DeletionRequestEntity } from '@modules/deletion/repo/entity/deletion-request.entity';
+import { GroupEntity } from '@modules/group/entity';
+import { InstanceEntity } from '@modules/instance';
+import { SchoolSystemOptionsEntity } from '@modules/legacy-school/entity';
+import { MediaSourceEntity } from '@modules/media-source/entity';
+import { OauthSessionTokenEntity } from '@modules/oauth/entity';
+import { ExternalToolPseudonymEntity, PseudonymEntity } from '@modules/pseudonym/entity';
+import { RegistrationPinEntity } from '@modules/registration-pin/entity';
+import { RocketChatUserEntity } from '@modules/rocketchat-user/entity';
+import { RoomMembershipEntity } from '@modules/room-membership/repo/entity/room-membership.entity';
+import { RoomEntity } from '@modules/room/repo/entity';
+import { MediaSchoolLicenseEntity, SchoolLicenseEntity } from '@modules/school-license/entity';
+import { ShareToken } from '@modules/sharing/entity/share-token.entity';
+import { SystemEntity } from '@modules/system/entity/system.entity';
+import { ContextExternalToolEntity, LtiDeepLinkTokenEntity } from '@modules/tool/context-external-tool/entity';
+import { ExternalToolEntity } from '@modules/tool/external-tool/entity';
+import { SchoolExternalToolEntity } from '@modules/tool/school-external-tool/entity';
+import { ImportUser } from '@modules/user-import/entity';
+import { MediaUserLicenseEntity, UserLicenseEntity } from '@modules/user-license/entity';
+import { ColumnBoardNode } from '@shared/domain/entity/column-board-node.entity';
+import { Course } from '@shared/domain/entity/course.entity';
+import { CourseGroup } from '@shared/domain/entity/coursegroup.entity';
+import { DashboardGridElementModel, DashboardModelEntity } from '@shared/domain/entity/dashboard.model.entity';
+import { CountyEmbeddable, FederalStateEntity } from '@shared/domain/entity/federal-state.entity';
+import {
+	ColumnboardBoardElement,
+	LegacyBoard,
+	LegacyBoardElement,
+	LessonBoardElement,
+	TaskBoardElement,
+} from '@shared/domain/entity/legacy-board';
+import { LessonEntity } from '@shared/domain/entity/lesson.entity';
+import { LtiTool } from '@shared/domain/entity/ltitool.entity';
+import { Material } from '@shared/domain/entity/materials.entity';
+import { CourseNews, News, SchoolNews, TeamNews } from '@shared/domain/entity/news.entity';
+import { Role } from '@shared/domain/entity/role.entity';
+import { SchoolEntity, SchoolRolePermission, SchoolRoles } from '@shared/domain/entity/school.entity';
+import { SchoolYearEntity } from '@shared/domain/entity/schoolyear.entity';
+import { StorageProviderEntity } from '@shared/domain/entity/storageprovider.entity';
+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 { User } from '@shared/domain/entity/user.entity';
+import { VideoConference } from '@shared/domain/entity/video-conference.entity';
+
+export const ENTITIES = [
+	AccountEntity,
+	LegacyBoard,
+	LegacyBoardElement,
+	BoardNodeEntity,
+	ColumnboardBoardElement,
+	ColumnBoardNode,
+	ClassEntity,
+	DeletionRequestEntity,
+	DeletionLogEntity,
+	ContextExternalToolEntity,
+	CountyEmbeddable,
+	Course,
+	CourseGroup,
+	CourseNews,
+	DashboardGridElementModel,
+	DashboardModelEntity,
+	ExternalToolEntity,
+	FederalStateEntity,
+	ImportUser,
+	LessonEntity,
+	LessonBoardElement,
+	LtiTool,
+	Material,
+	News,
+	PseudonymEntity,
+	ExternalToolPseudonymEntity,
+	RocketChatUserEntity,
+	Role,
+	RoomEntity,
+	RoomMembershipEntity,
+	SchoolEntity,
+	SchoolExternalToolEntity,
+	SchoolNews,
+	SchoolRolePermission,
+	SchoolRoles,
+	SchoolSystemOptionsEntity,
+	SchoolYearEntity,
+	ShareToken,
+	StorageProviderEntity,
+	Submission,
+	SystemEntity,
+	Task,
+	TaskBoardElement,
+	TeamEntity,
+	TeamNews,
+	TeamUserEntity,
+	User,
+	UserLoginMigrationEntity,
+	VideoConference,
+	GroupEntity,
+	RegistrationPinEntity,
+	UserLicenseEntity,
+	MediaUserLicenseEntity,
+	InstanceEntity,
+	MediaSourceEntity,
+	SchoolLicenseEntity,
+	MediaSchoolLicenseEntity,
+	OauthSessionTokenEntity,
+	LtiDeepLinkTokenEntity,
+];

apps/server/src/infra/database/mongo-memory-database/mongo-memory-database.module.ts

@@ -1,23 +1,26 @@
 import { MikroORM } from '@mikro-orm/core';
 import { MikroOrmModule, MikroOrmModuleAsyncOptions } from '@mikro-orm/nestjs';
 import { DynamicModule, Inject, Module, OnModuleDestroy } from '@nestjs/common';
-import { ALL_ENTITIES } from '@shared/domain/entity';
 import _ from 'lodash';
+
+import { defineConfig } from '@mikro-orm/mongodb';
+// Will be removed by https://ticketsystem.dbildungscloud.de/browse/BC-8880
+import { TEST_ENTITIES } from '@modules/server/server.entity.imports';
 import { MongoDatabaseModuleOptions } from './types';
 
-const dbName = () => _.times(20, () => _.random(35).toString(36)).join('');
+const dbName = (): string => _.times(20, () => _.random(35).toString(36)).join('');
 
 const createMikroOrmModule = (options: MikroOrmModuleAsyncOptions): DynamicModule => {
 	const mikroOrmModule = MikroOrmModule.forRootAsync({
 		useFactory: () => {
 			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions, no-process-env
 			const clientUrl = `${process.env.MONGO_TEST_URI}/${dbName()}`;
-			return {
+			return defineConfig({
 				allowGlobalContext: true, // can be overridden by options
 				...options,
 				type: 'mongo',
 				clientUrl,
-			};
+			});
 		},
 	});
 
@@ -28,9 +31,9 @@ const createMikroOrmModule = (options: MikroOrmModuleAsyncOptions): DynamicModul
 export class MongoMemoryDatabaseModule implements OnModuleDestroy {
 	constructor(@Inject(MikroORM) private orm: MikroORM) {}
 
-	static forRoot(options?: MongoDatabaseModuleOptions): DynamicModule {
+	public static forRoot(options?: MongoDatabaseModuleOptions): DynamicModule {
 		const defaultOptions = {
-			entities: ALL_ENTITIES,
+			entities: TEST_ENTITIES,
 		};
 		return {
 			module: MongoMemoryDatabaseModule,
@@ -39,7 +42,7 @@ export class MongoMemoryDatabaseModule implements OnModuleDestroy {
 		};
 	}
 
-	async onModuleDestroy(): Promise<void> {
+	public async onModuleDestroy(): Promise<void> {
 		await this.orm.close();
 	}
 }

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

@@ -8,11 +8,11 @@ import { KeycloakAdministrationService } from '../../keycloak-administration/ser
 
 @Injectable()
 export class KeycloakIdentityManagementService extends IdentityManagementService {
-	public constructor(private readonly kcAdminClient: KeycloakAdministrationService) {
+	constructor(private readonly kcAdminClient: KeycloakAdministrationService) {
 		super();
 	}
 
-	async createAccount(account: IdmAccount, password?: string): Promise<string> {
+	public async createAccount(account: IdmAccount, password?: string): Promise<string> {
 		const kc = await this.kcAdminClient.callKcAdminClient();
 		const id = await kc.users.create({
 			username: account.username,
@@ -44,7 +44,7 @@ export class KeycloakIdentityManagementService extends IdentityManagementService
 		return id.id;
 	}
 
-	async updateAccount(id: string, account: IdmAccountUpdate): Promise<string> {
+	public async updateAccount(id: string, account: IdmAccountUpdate): Promise<string> {
 		await (
 			await this.kcAdminClient.callKcAdminClient()
 		).users.update(
@@ -60,7 +60,7 @@ export class KeycloakIdentityManagementService extends IdentityManagementService
 		return id;
 	}
 
-	async updateAccountPassword(id: string, password: string): Promise<string> {
+	public async updateAccountPassword(id: string, password: string): Promise<string> {
 		await (
 			await this.kcAdminClient.callKcAdminClient()
 		).users.resetPassword({
@@ -74,15 +74,15 @@ export class KeycloakIdentityManagementService extends IdentityManagementService
 		return id;
 	}
 
-	async findAccountById(id: string): Promise<IdmAccount> {
+	public async findAccountById(id: string): Promise<IdmAccount> {
 		const keycloakUser = await (await this.kcAdminClient.callKcAdminClient()).users.findOne({ id });
 		if (!keycloakUser) {
 			throw new Error(`Account '${id}' not found`);
 		}
 		return this.extractAccount(keycloakUser);
 	}
 
-	async findAccountByDbcAccountId(accountDbcAccountId: string): Promise<IdmAccount> {
+	public async findAccountByDbcAccountId(accountDbcAccountId: string): Promise<IdmAccount> {
 		const keycloakUsers = await (
 			await this.kcAdminClient.callKcAdminClient()
 		).users.find({ q: `dbcAccountId:${accountDbcAccountId} }` });
@@ -96,7 +96,7 @@ export class KeycloakIdentityManagementService extends IdentityManagementService
 		return this.extractAccount(keycloakUsers[0]);
 	}
 
-	async findAccountByDbcUserId(accountDbcUserId: string): Promise<IdmAccount> {
+	public async findAccountByDbcUserId(accountDbcUserId: string): Promise<IdmAccount> {
 		const keycloakUsers = await (
 			await this.kcAdminClient.callKcAdminClient()
 		).users.find({ q: `dbcUserId:${accountDbcUserId} }` });
@@ -111,7 +111,7 @@ export class KeycloakIdentityManagementService extends IdentityManagementService
 		return this.extractAccount(keycloakUsers[0]);
 	}
 
-	async findAccountsByUsername(username: string, options?: SearchOptions): Promise<Counted<IdmAccount[]>> {
+	public async findAccountsByUsername(username: string, options?: SearchOptions): Promise<Counted<IdmAccount[]>> {
 		const kc = await this.kcAdminClient.callKcAdminClient();
 		const total = await kc.users.count({ username });
 		const results = await kc.users.find({
@@ -124,17 +124,17 @@ export class KeycloakIdentityManagementService extends IdentityManagementService
 		return [accounts, total];
 	}
 
-	async getAllAccounts(): Promise<IdmAccount[]> {
+	public async getAllAccounts(): Promise<IdmAccount[]> {
 		const keycloakUsers = await (await this.kcAdminClient.callKcAdminClient()).users.find();
 		return keycloakUsers.map((user: UserRepresentation) => this.extractAccount(user));
 	}
 
-	async deleteAccountById(id: string): Promise<string> {
+	public async deleteAccountById(id: string): Promise<string> {
 		await (await this.kcAdminClient.callKcAdminClient()).users.del({ id });
 		return id;
 	}
 
-	async getUserAttribute<TValue extends boolean | number | string | unknown = unknown>(
+	public async getUserAttribute<TValue extends boolean | number | string | unknown = unknown>(
 		userId: string,
 		attributeName: string
 	): Promise<TValue | null> {
@@ -150,7 +150,7 @@ export class KeycloakIdentityManagementService extends IdentityManagementService
 		return null;
 	}
 
-	async setUserAttribute<TValue extends boolean | number | string>(
+	public async setUserAttribute<TValue extends boolean | number | string>(
 		userId: string,
 		attributeName: string,
 		attributeValue: TValue

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

@@ -44,7 +44,7 @@ describe('CurrentUserMapper', () => {
 						accountId,
 						systemId: undefined,
 						roles: [teacherRole.id],
-						schoolId: null,
+						schoolId: user.school.id,
 						isExternalUser: false,
 					});
 				});
@@ -70,7 +70,7 @@ describe('CurrentUserMapper', () => {
 						accountId,
 						systemId: undefined,
 						roles: [],
-						schoolId: null,
+						schoolId: user.school.id,
 						isExternalUser: true,
 					});
 				});

apps/server/src/modules/board/board-collaboration.app.module.ts

@@ -8,11 +8,11 @@ import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { createConfigModuleOptions } from '@shared/common/config-module-options';
 import { defaultMikroOrmOptions } from '@shared/common/defaultMikroOrmOptions';
-import { ALL_ENTITIES } from '@shared/domain/entity/all-entities';
 import { AuthorizationModule } from '../authorization';
 import { serverConfig } from '../server';
 import { config } from './board-collaboration.config';
 import { BoardWsApiModule } from './board-ws-api.module';
+import { ENTITIES, TEST_ENTITIES } from './board.entity.imports';
 import { BoardModule } from './board.module';
 
 const imports = [
@@ -34,7 +34,7 @@ const imports = [
 			clientUrl: DB_URL, // TODO: check if this needs to be different
 			password: DB_PASSWORD,
 			user: DB_USERNAME,
-			entities: ALL_ENTITIES,
+			entities: ENTITIES,
 		}),
 	],
 	providers: [],
@@ -52,7 +52,7 @@ const testConfig = () => {
 		ConfigModule.forRoot(createConfigModuleOptions(testConfig)),
 		MongoMemoryDatabaseModule.forRoot({
 			...defaultMikroOrmOptions,
-			entities: ALL_ENTITIES,
+			entities: TEST_ENTITIES,
 		}),
 	],
 })