Merge pull request #1016 from nk-coding/bugfix/change_db_to_sql

Bugfix/change db to sql

Author: nk-coding

server/src/database/sql-database.module.ts

@@ -1,6 +1,6 @@
 import { MikroORM } from '@mikro-orm/core';
 import { ISchemaGenerator } from '@mikro-orm/core/typings';
-import { MikroOrmModule } from '@mikro-orm/nestjs';
+import { MikroOrmModule, MikroOrmModuleSyncOptions } from '@mikro-orm/nestjs';
 import { TsMorphMetadataProvider } from '@mikro-orm/reflection';
 import { DynamicModule, Logger, Module, OnApplicationShutdown, OnModuleInit } from '@nestjs/common';
 import { StartUpException } from '../exceptions/StartUpException';
@@ -12,7 +12,9 @@ function getEntityDirectory(): string {
     return isProduction() ? './database/entities' : './dist/database/entities';
 }
 
-export function loadDatabaseModule(): DynamicModule {
+export function loadDatabaseModule(
+    additionalOptions: MikroOrmModuleSyncOptions = {}
+): DynamicModule {
     return MikroOrmModule.forRoot({
         metadataProvider: TsMorphMetadataProvider,
         baseDir: process.cwd(),
@@ -22,6 +24,7 @@ export function loadDatabaseModule(): DynamicModule {
         type: 'mysql',
         debug: false,
         ...StaticSettings.getService().getDatabaseConnectionInformation(),
+        ...additionalOptions,
     });
 }
 

server/src/module/scheincriteria/scheincriteria.module.ts

@@ -1,4 +1,6 @@
+import { MikroOrmModule } from '@mikro-orm/nestjs';
 import { Logger, Module, OnModuleInit } from '@nestjs/common';
+import { ScheincriteriaEntity } from '../../database/entities/scheincriteria.entity';
 import { ScheinexamModule } from '../scheinexam/scheinexam.module';
 import { SheetModule } from '../sheet/sheet.module';
 import { ShortTestModule } from '../short-test/short-test.module';
@@ -19,7 +21,14 @@ import { ScheincriteriaService } from './scheincriteria.service';
 export type ScheincriteriaConstructor = new (...args: any[]) => Scheincriteria;
 
 @Module({
-    imports: [StudentModule, SheetModule, ScheinexamModule, TutorialModule, ShortTestModule],
+    imports: [
+        StudentModule,
+        SheetModule,
+        ScheinexamModule,
+        TutorialModule,
+        ShortTestModule,
+        MikroOrmModule.forFeature([ScheincriteriaEntity]),
+    ],
     providers: [ScheincriteriaService],
     controllers: [ScheincriteriaController],
     exports: [ScheincriteriaService],

server/src/module/scheincriteria/scheincriteria.service.ts

@@ -1,5 +1,4 @@
 import { EntityRepository } from '@mikro-orm/core';
-import { EntityManager } from '@mikro-orm/mysql';
 import { Injectable, NotFoundException } from '@nestjs/common';
 import { FormDataResponse } from 'shared/model/FormTypes';
 import {
@@ -24,6 +23,7 @@ import { Scheincriteria } from './container/Scheincriteria';
 import { ScheincriteriaContainer } from './container/scheincriteria.container';
 import { ScheinCriteriaDTO } from './scheincriteria.dto';
 import { GradingService, StudentAndGradings } from '../student/grading.service';
+import { InjectRepository } from '@mikro-orm/nestjs';
 
 interface CalculationParams {
     criterias: ScheincriteriaEntity[];
@@ -50,19 +50,16 @@ interface GetRequiredDocsParams {
 export class ScheincriteriaService
     implements CRUDService<IScheinCriteria, ScheinCriteriaDTO, ScheincriteriaEntity>
 {
-    private readonly repository: EntityRepository<ScheincriteriaEntity>;
-
     constructor(
         private readonly studentService: StudentService,
         private readonly sheetService: SheetService,
         private readonly scheinexamService: ScheinexamService,
         private readonly tutorialService: TutorialService,
         private readonly shortTestService: ShortTestService,
         private readonly gradingService: GradingService,
-        entityManager: EntityManager
-    ) {
-        this.repository = entityManager.fork().getRepository(ScheincriteriaEntity);
-    }
+        @InjectRepository(ScheincriteriaEntity)
+        private readonly repository: EntityRepository<ScheincriteriaEntity>
+    ) {}
 
     /**
      * @returns All scheincriterias saved in the database.

server/src/module/scheinexam/scheinexam.module.ts

@@ -1,8 +1,11 @@
+import { MikroOrmModule } from '@mikro-orm/nestjs';
 import { Module } from '@nestjs/common';
+import { Scheinexam } from '../../database/entities/scheinexam.entity';
 import { ScheinexamController } from './scheinexam.controller';
 import { ScheinexamService } from './scheinexam.service';
 
 @Module({
+    imports: [MikroOrmModule.forFeature([Scheinexam])],
     controllers: [ScheinexamController],
     providers: [ScheinexamService],
     exports: [ScheinexamService],

server/src/module/scheinexam/scheinexam.service.ts

@@ -1,5 +1,5 @@
 import { EntityRepository } from '@mikro-orm/core';
-import { EntityManager } from '@mikro-orm/mysql';
+import { InjectRepository } from '@mikro-orm/nestjs';
 import { Injectable, NotFoundException } from '@nestjs/common';
 import { IScheinExam } from 'shared/model/Scheinexam';
 import { Scheinexam } from '../../database/entities/scheinexam.entity';
@@ -8,11 +8,10 @@ import { ScheinexamDTO } from './scheinexam.dto';
 
 @Injectable()
 export class ScheinexamService implements CRUDService<IScheinExam, ScheinexamDTO, Scheinexam> {
-    private readonly repository: EntityRepository<Scheinexam>;
-
-    constructor(entityManager: EntityManager) {
-        this.repository = entityManager.fork().getRepository(Scheinexam);
-    }
+    constructor(
+        @InjectRepository(Scheinexam)
+        private readonly repository: EntityRepository<Scheinexam>
+    ) {}
 
     /**
      * @returns All scheinexams saved in the database.

server/src/module/session/session.module.ts

@@ -1,7 +1,10 @@
+import { MikroOrmModule } from '@mikro-orm/nestjs';
 import { Module } from '@nestjs/common';
+import { SessionEntity } from '../../database/entities/session.entity';
 import { SessionService } from './session.service';
 
 @Module({
+    imports: [MikroOrmModule.forFeature([SessionEntity])],
     providers: [SessionService],
     exports: [SessionService],
 })

server/src/module/session/session.service.ts

@@ -1,5 +1,5 @@
-import { EntityRepository } from '@mikro-orm/core';
-import { EntityManager } from '@mikro-orm/mysql';
+import { EntityRepository, MikroORM, UseRequestContext } from '@mikro-orm/core';
+import { InjectRepository } from '@mikro-orm/nestjs';
 import { Injectable, Logger } from '@nestjs/common';
 import { SessionEntity } from '../../database/entities/session.entity';
 import {
@@ -10,12 +10,14 @@ import {
 @Injectable()
 export class SessionService implements ISessionService {
     private readonly logger = new Logger(SessionService.name);
-    private readonly repository: EntityRepository<SessionEntity>;
 
-    constructor(entityManager: EntityManager) {
-        this.repository = entityManager.fork().getRepository(SessionEntity);
-    }
+    constructor(
+        private readonly orm: MikroORM,
+        @InjectRepository(SessionEntity)
+        private readonly repository: EntityRepository<SessionEntity>
+    ) {}
 
+    @UseRequestContext()
     async setSession(sid: string, sessionData: SessionData): Promise<void> {
         this.logger.log(`SET session for ID ${sid}`);
         const session = (await this.findSession(sid)) ?? new SessionEntity(sid, sessionData);
@@ -24,12 +26,14 @@ export class SessionService implements ISessionService {
         await this.repository.persistAndFlush(session);
     }
 
+    @UseRequestContext()
     async getSession(sid: string): Promise<SessionData | null> {
         this.logger.log(`GET session for ID ${sid}`);
         const session = await this.findSession(sid);
         return session?.sessionData ?? null;
     }
 
+    @UseRequestContext()
     async destroySession(sid: string): Promise<void> {
         this.logger.log(`DESTROY session with ID ${sid}`);
         const session = await this.findSession(sid);

server/src/module/settings/settings.module.ts

@@ -1,9 +1,12 @@
+import { MikroOrmModule } from '@mikro-orm/nestjs';
 import { Global, Module } from '@nestjs/common';
+import { Setting } from '../../database/entities/settings.entity';
 import { SettingsController } from './settings.controller';
 import { SettingsService } from './settings.service';
 
 @Global()
 @Module({
+    imports: [MikroOrmModule.forFeature([Setting])],
     providers: [SettingsService],
     exports: [SettingsService],
     controllers: [SettingsController],

server/src/module/settings/settings.service.ts

@@ -1,5 +1,5 @@
-import { EntityRepository } from '@mikro-orm/core';
-import { EntityManager } from '@mikro-orm/mysql';
+import { EntityRepository, MikroORM, UseRequestContext } from '@mikro-orm/core';
+import { InjectRepository } from '@mikro-orm/nestjs';
 import { Injectable, OnApplicationBootstrap } from '@nestjs/common';
 import { IClientSettings, IMailingSettings } from 'shared/model/Settings';
 import { Setting } from '../../database/entities/settings.entity';
@@ -9,11 +9,12 @@ import { StaticSettings } from './settings.static';
 
 @Injectable()
 export class SettingsService extends StaticSettings implements OnApplicationBootstrap {
-    private readonly repository: EntityRepository<Setting>;
-
-    constructor(entityManager: EntityManager) {
+    constructor(
+        private readonly orm: MikroORM,
+        @InjectRepository(Setting)
+        private readonly repository: EntityRepository<Setting>
+    ) {
         super();
-        this.repository = entityManager.fork().getRepository(Setting);
     }
 
     /**
@@ -56,6 +57,7 @@ export class SettingsService extends StaticSettings implements OnApplicationBoot
      *
      * If there is ONE nothing is done.
      */
+    @UseRequestContext()
     async onApplicationBootstrap(): Promise<void> {
         const settings = await this.repository.findOne({
             id: Setting.SETTING_ID,

server/src/module/sheet/sheet.module.ts

@@ -1,8 +1,11 @@
+import { MikroOrmModule } from '@mikro-orm/nestjs';
 import { Module } from '@nestjs/common';
+import { Sheet } from '../../database/entities/sheet.entity';
 import { SheetController } from './sheet.controller';
 import { SheetService } from './sheet.service';
 
 @Module({
+    imports: [MikroOrmModule.forFeature([Sheet])],
     controllers: [SheetController],
     providers: [SheetService],
     exports: [SheetService],