Merge branch 'main' into EW-1061

.eslintrc.js

@@ -121,10 +121,6 @@ module.exports = {
 					'warn',
 					{
 						patterns: [
-							{
-								group: ['@src/apps/**', '@src/core/**', '@src/modules/*/*', '@src/shared/**'],
-								message: 'Remove src/ from import path',
-							},
 							{
 								group: ['@infra/*/*', '@modules/*/*', '!@modules/*/testing', '!*.module'],
 								message: 'Do not deep import from a module',

apps/server/doc/logging.md

@@ -21,7 +21,7 @@ export class YourLoggable implements Loggable {
 ```
 
 ```TypeScript
-import { Logger } from '@src/core/logger';
+import { Logger } from '@core/logger';
 
 export class YourUc {
 	constructor(private logger: Logger) {

apps/server/doc/testing.md

@@ -294,7 +294,7 @@ The basic structure of the repo integration test:
 2. Get repo, orm and entityManager from testing module
 
 ```TypeScript
-	import { MongoMemoryDatabaseModule } from '@src/modules/database';
+	import { MongoMemoryDatabaseModule } from '@modules/database';
 
 	let repo: NewsRepo;
 	let em: EntityManager;

apps/server/src/apps/admin-api-server.app.ts

@@ -1,9 +1,9 @@
 /* istanbul ignore file */
+import { LegacyLogger, Logger } from '@core/logger';
 import { Configuration } from '@hpi-schul-cloud/commons/lib';
+import { AdminApiServerModule } from '@modules/server/admin-api.server.app.module';
 import { NestFactory } from '@nestjs/core';
 import { ExpressAdapter } from '@nestjs/platform-express';
-import { LegacyLogger, Logger } from '@src/core/logger';
-import { AdminApiServerModule } from '@src/modules/server/admin-api.server.app.module';
 import express from 'express';
 import { install as sourceMapInstall } from 'source-map-support';
 import {

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

@@ -6,11 +6,11 @@ import { NestFactory } from '@nestjs/core';
 import { install as sourceMapInstall } from 'source-map-support';
 
 // application imports
+import { LegacyLogger, Logger } from '@core/logger';
 import { RedisIoAdapter } from '@infra/socketio';
 import { BoardCollaborationModule } from '@modules/board/board-collaboration.app.module';
 import { ExpressAdapter } from '@nestjs/platform-express';
 import { SwaggerDocumentOptions } from '@nestjs/swagger';
-import { LegacyLogger, Logger } from '@src/core/logger';
 import express from 'express';
 import {
 	addPrometheusMetricsMiddlewaresIfEnabled,

apps/server/src/apps/common-cartridge.app.ts

@@ -1,9 +1,9 @@
 /* istanbul ignore file */
 /* eslint-disable no-console */
+import { LegacyLogger, Logger } from '@core/logger';
 import { CommonCartridgeApiModule } from '@modules/common-cartridge/common-cartridge-api.app.module';
 import { NestFactory } from '@nestjs/core';
 import { ExpressAdapter } from '@nestjs/platform-express';
-import { LegacyLogger, Logger } from '@src/core/logger';
 import express from 'express';
 import { install as sourceMapInstall } from 'source-map-support';
 import {

apps/server/src/apps/files-storage.app.ts

@@ -8,10 +8,10 @@ import express from 'express';
 import { install as sourceMapInstall } from 'source-map-support';
 
 // application imports
+import { LegacyLogger } from '@core/logger';
 import { FilesStorageApiModule } from '@modules/files-storage/files-storage-api.app.module';
 import { API_VERSION_PATH } from '@modules/files-storage/files-storage.const';
 import { SwaggerDocumentOptions } from '@nestjs/swagger';
-import { LegacyLogger } from '@src/core/logger';
 import { enableOpenApiDocs } from './helpers';
 import { createRequestLoggerMiddleware } from './helpers/request-logger-middleware';
 

apps/server/src/apps/fwu-learning-contents.app.ts

@@ -8,9 +8,10 @@ import express from 'express';
 import { install as sourceMapInstall } from 'source-map-support';
 
 // application imports
+import { LegacyLogger } from '@core/logger';
 import { FwuLearningContentsModule } from '@modules/fwu-learning-contents/fwu-learning-contents.app.module';
-import { LegacyLogger } from '@src/core/logger';
-import { createRequestLoggerMiddleware, enableOpenApiDocs } from './helpers';
+import { enableOpenApiDocs } from './helpers';
+import { createRequestLoggerMiddleware } from './helpers/request-logger-middleware';
 
 async function bootstrap(): Promise<void> {
 	sourceMapInstall();

apps/server/src/apps/h5p-editor.app.ts

@@ -8,9 +8,10 @@ import express from 'express';
 import { install as sourceMapInstall } from 'source-map-support';
 
 // application imports
+import { LegacyLogger } from '@core/logger';
 import { H5PEditorModule } from '@modules/h5p-editor/h5p-editor.app.module';
-import { LegacyLogger } from '@src/core/logger';
-import { createRequestLoggerMiddleware, enableOpenApiDocs } from './helpers';
+import { enableOpenApiDocs } from './helpers';
+import { createRequestLoggerMiddleware } from './helpers/request-logger-middleware';
 
 async function bootstrap(): Promise<void> {
 	sourceMapInstall();

apps/server/src/apps/h5p-library-management.app.ts

@@ -1,9 +1,9 @@
 /* istanbul ignore file */
 /* eslint-disable no-console */
+import { LegacyLogger } from '@core/logger';
 import { H5PLibraryManagementService } from '@modules/h5p-library-management';
 import { H5PLibraryManagementModule } from '@modules/h5p-library-management/h5p-library-management.app.module';
 import { NestFactory } from '@nestjs/core';
-import { LegacyLogger } from '@src/core/logger';
 import { install as sourceMapInstall } from 'source-map-support';
 
 async function bootstrap(): Promise<void> {

apps/server/src/apps/helpers/app-start-loggable.ts

@@ -1,4 +1,4 @@
-import { Loggable, LogMessage, LogMessageData } from '@src/core/logger';
+import { Loggable, LogMessage, LogMessageData } from '@core/logger';
 
 interface AppStartInfo {
 	appName: string;

apps/server/src/apps/helpers/metrics/prometheus-metrics.spec.ts

@@ -1,7 +1,7 @@
+import { Logger } from '@core/logger';
 import { createMock } from '@golevelup/ts-jest';
 import { Configuration } from '@hpi-schul-cloud/commons';
 import { IConfig } from '@hpi-schul-cloud/commons/lib/interfaces/IConfig';
-import { Logger } from '@src/core/logger';
 import express, { Express, NextFunction, Request, RequestHandler, Response } from 'express';
 import {
 	PrometheusMetricsConfig,

apps/server/src/apps/helpers/metrics/prometheus-metrics.ts

@@ -1,6 +1,6 @@
 import { Express } from 'express';
 
-import { LogMessage, Loggable, Logger } from '@src/core/logger';
+import { LogMessage, Loggable, Logger } from '@core/logger';
 import { AppStartLoggable } from '../app-start-loggable';
 import {
 	PrometheusMetricsConfig,

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

@@ -4,9 +4,9 @@ import { NestFactory } from '@nestjs/core';
 import { ExpressAdapter, NestExpressApplication } from '@nestjs/platform-express';
 import express from 'express';
 
+import { LegacyLogger } from '@core/logger';
 import { MikroORM } from '@mikro-orm/core';
 import { ManagementServerModule } from '@modules/management/management-server.app.module';
-import { LegacyLogger } from '@src/core/logger';
 import { install as sourceMapInstall } from 'source-map-support';
 import { createRequestLoggerMiddleware, enableOpenApiDocs } from './helpers';
 import legacyAppPromise = require('../../../../src/app');

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

@@ -2,6 +2,7 @@
 import { Mail, MailService } from '@infra/mail';
 // application imports
 /* eslint-disable no-console */
+import { LegacyLogger, Logger } from '@core/logger';
 import { MikroORM } from '@mikro-orm/core';
 import { AccountService } from '@modules/account';
 import { AccountUc } from '@modules/account/api/account.uc';
@@ -17,7 +18,6 @@ import { TeamService } from '@modules/teams/service/team.service';
 import { ContextExternalToolService } from '@modules/tool/context-external-tool';
 import { NestFactory } from '@nestjs/core';
 import { ExpressAdapter } from '@nestjs/platform-express';
-import { LegacyLogger, Logger } from '@src/core/logger';
 import express from 'express';
 import { join } from 'path';
 

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

@@ -1,8 +1,8 @@
+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 { DB_PASSWORD, DB_URL, DB_USERNAME } from '@src/imports-from-feathers';
 import path from 'path';
 
 const migrationsPath = path.resolve(__dirname, '..', 'migrations', 'mikro-orm');

apps/server/src/core/error/domain/domain-error-handler.spec.ts

@@ -2,7 +2,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest';
 import { BadRequestException, HttpStatus, InternalServerErrorException } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
 import { BusinessError } from '@shared/common';
-import { ErrorLogger, ErrorLogMessage, Loggable, LogMessage, ValidationErrorLogMessage } from '@src/core/logger';
+import { ErrorLogger, ErrorLogMessage, Loggable, LogMessage, ValidationErrorLogMessage } from '@core/logger';
 import util from 'util';
 import { AxiosError } from 'axios';
 import { ErrorLoggable } from '../loggable/error.loggable';

apps/server/src/core/error/domain/domain-error-handler.ts

@@ -1,7 +1,7 @@
+import { ErrorLogger, Loggable, LoggingUtils, LogMessageDataObject } from '@core/logger';
+import { ICurrentUser } from '@infra/auth-guard';
 import { Injectable } from '@nestjs/common';
 import { HttpArgumentsHost } from '@nestjs/common/interfaces';
-import { ErrorLogger, Loggable, LoggingUtils, LogMessageDataObject } from '@src/core/logger';
-import { ICurrentUser } from '@src/infra/auth-guard';
 import { Request } from 'express';
 import util from 'util';
 import { ErrorLoggable } from '../loggable';

apps/server/src/core/error/filter/global-error.filter.spec.ts

@@ -5,7 +5,7 @@ import { ArgumentsHost, BadRequestException, HttpStatus, InternalServerErrorExce
 import { Test, TestingModule } from '@nestjs/testing';
 import { WsException } from '@nestjs/websockets';
 import { BusinessError } from '@shared/common';
-import { ErrorLogMessage, Loggable } from '@src/core/logger';
+import { ErrorLogMessage, Loggable } from '@core/logger';
 import { Response } from 'express';
 import { AxiosError } from 'axios';
 import { DomainErrorHandler } from '../domain';

apps/server/src/core/error/loggable/axios-error.loggable.ts

@@ -1,5 +1,5 @@
 import { HttpException, HttpStatus } from '@nestjs/common';
-import { ErrorLogMessage, Loggable, LogMessage, ValidationErrorLogMessage } from '@src/core/logger';
+import { ErrorLogMessage, Loggable, LogMessage, ValidationErrorLogMessage } from '@core/logger';
 import { AxiosError } from 'axios';
 
 export class AxiosErrorLoggable extends HttpException implements Loggable {

apps/server/src/core/index.ts

@@ -1,3 +1,6 @@
-export { CoreModule } from './core.module';
-export { DomainErrorHandler } from './error';
-export { CoreModuleConfig } from './core.config';
+/**
+
+    Import external dependencies directly, not from here.
+    Avoid loading all external references for testing.
+    Do not re-export here.
+    */

apps/server/src/infra/antivirus/antivirus.service.ts

@@ -1,6 +1,6 @@
 import { AmqpConnection } from '@golevelup/nestjs-rabbitmq';
 import { Inject, Injectable, InternalServerErrorException } from '@nestjs/common';
-import { ErrorUtils } from '@src/core/error/utils';
+import { ErrorUtils } from '@core/error/utils';
 import { API_VERSION_PATH, FilesStorageInternalActions } from '@modules/files-storage/files-storage.const';
 import NodeClam from 'clamscan';
 import { Readable } from 'stream';

apps/server/src/infra/auth-guard/adapter/jwt-validation.adapter.ts

@@ -1,5 +1,5 @@
+import { ensureTokenIsWhitelisted } from '@imports-from-feathers';
 import { Injectable } from '@nestjs/common';
-import { ensureTokenIsWhitelisted } from '@src/imports-from-feathers';
 
 @Injectable()
 export class JwtValidationAdapter {

apps/server/src/infra/authorization-client/error/authorization-error.loggable-exception.ts

@@ -1,6 +1,6 @@
 import { ForbiddenException } from '@nestjs/common';
-import { Loggable } from '@src/core/logger/interfaces';
-import { ErrorLogMessage } from '@src/core/logger/types';
+import { Loggable } from '@core/logger/interfaces';
+import { ErrorLogMessage } from '@core/logger/types';
 import { AuthorizationBodyParams } from '../authorization-api-client';
 
 export class AuthorizationErrorLoggableException extends ForbiddenException implements Loggable {

apps/server/src/infra/authorization-client/error/authorization-forbidden.loggable-exception.ts

@@ -1,6 +1,6 @@
 import { ForbiddenException } from '@nestjs/common';
-import { Loggable } from '@src/core/logger/interfaces';
-import { ErrorLogMessage } from '@src/core/logger/types';
+import { Loggable } from '@core/logger/interfaces';
+import { ErrorLogMessage } from '@core/logger/types';
 import { AuthorizationBodyParams } from '../authorization-api-client';
 
 export class AuthorizationForbiddenLoggableException extends ForbiddenException implements Loggable {

apps/server/src/infra/cache/cache.module.ts

@@ -1,7 +1,7 @@
 import { Configuration } from '@hpi-schul-cloud/commons/lib';
 import { CacheModule, CacheModuleOptions } from '@nestjs/cache-manager';
 import { Module } from '@nestjs/common';
-import { LegacyLogger, LoggerModule } from '@src/core/logger';
+import { LegacyLogger, LoggerModule } from '@core/logger';
 import { redisStore } from 'cache-manager-redis-yet';
 import { CacheStoreType } from './interface';
 import { CacheService } from './service/cache.service';

apps/server/src/infra/calendar/calendar.config.ts

@@ -1,3 +1,3 @@
-import { LoggerConfig } from '@src/core/logger';
+import { LoggerConfig } from '@core/logger';
 
 export interface CalendarConfig extends LoggerConfig {}

apps/server/src/infra/calendar/calendar.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { HttpModule } from '@nestjs/axios';
 import { CqrsModule } from '@nestjs/cqrs';
-import { LoggerModule } from '@src/core/logger';
+import { LoggerModule } from '@core/logger';
 import { CalendarService } from './service/calendar.service';
 import { CalendarMapper } from './mapper/calendar.mapper';
 

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

@@ -11,7 +11,7 @@ import { HttpService } from '@nestjs/axios';
 import { HttpStatus, InternalServerErrorException } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
 import { EntityId } from '@shared/domain/types';
-import { Logger } from '@src/core/logger';
+import { Logger } from '@core/logger';
 import { axiosResponseFactory } from '@testing/factory/axios-response.factory';
 import { AxiosResponse } from 'axios';
 import { of, throwError } from 'rxjs';

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

@@ -1,11 +1,11 @@
 import { Configuration } from '@hpi-schul-cloud/commons/lib';
 import { HttpService } from '@nestjs/axios';
 import { Injectable, InternalServerErrorException } from '@nestjs/common';
-import { ErrorUtils } from '@src/core/error/utils';
+import { ErrorUtils } from '@core/error/utils';
 import { AxiosRequestConfig, AxiosResponse } from 'axios';
 import { firstValueFrom, Observable } from 'rxjs';
 import { URL, URLSearchParams } from 'url';
-import { Logger } from '@src/core/logger';
+import { Logger } from '@core/logger';
 import {
 	DataDeletionDomainOperationLoggable,
 	DeletionService,

apps/server/src/infra/collaborative-storage/collaborative-storage-adapter.module.ts

@@ -5,7 +5,7 @@ import { UserModule } from '@modules/user';
 import { HttpModule } from '@nestjs/axios';
 import { Module, Provider } from '@nestjs/common';
 import { LtiToolRepo } from '@shared/repo/ltitool/';
-import { LoggerModule } from '@src/core/logger';
+import { LoggerModule } from '@core/logger';
 import { CollaborativeStorageAdapter } from './collaborative-storage.adapter';
 import { CollaborativeStorageAdapterMapper } from './mapper';
 import { NextcloudClient } from './strategy/nextcloud/nextcloud.client';

apps/server/src/infra/collaborative-storage/collaborative-storage.adapter.spec.ts

@@ -3,7 +3,7 @@ import { ObjectId } from '@mikro-orm/mongodb';
 import { TeamDto } from '@modules/collaborative-storage/services/dto/team.dto'; // invalid import please fix
 import { Test, TestingModule } from '@nestjs/testing';
 import { RoleName } from '@shared/domain/interface';
-import { LegacyLogger } from '@src/core/logger';
+import { LegacyLogger } from '@core/logger';
 import { CollaborativeStorageAdapter } from './collaborative-storage.adapter';
 import { CollaborativeStorageAdapterMapper } from './mapper/collaborative-storage-adapter.mapper';
 import { CollaborativeStorageStrategy } from './strategy/base.interface.strategy';

apps/server/src/infra/collaborative-storage/collaborative-storage.adapter.ts

@@ -2,7 +2,7 @@ import { TeamPermissionsDto } from '@modules/collaborative-storage/services/dto/
 import { TeamDto } from '@modules/collaborative-storage/services/dto/team.dto';
 import { RoleDto } from '@modules/role/service/dto/role.dto';
 import { Inject, Injectable } from '@nestjs/common';
-import { LegacyLogger } from '@src/core/logger';
+import { LegacyLogger } from '@core/logger';
 import { CollaborativeStorageAdapterMapper } from './mapper/collaborative-storage-adapter.mapper';
 import { CollaborativeStorageStrategy } from './strategy/base.interface.strategy';
 

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 { LegacyLogger } from '@src/core/logger';
+import { LegacyLogger } from '@core/logger';
 import { axiosResponseFactory } from '@testing/factory/axios-response.factory';
 import { AxiosResponse } from 'axios';
 import { Observable, of } from 'rxjs';

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

@@ -16,8 +16,8 @@ import {
 	OcsResponse,
 	SuccessfulRes,
 } from '@infra/collaborative-storage/strategy/nextcloud/nextcloud.interface';
-import { ErrorUtils } from '@src/core/error/utils';
-import { LegacyLogger } from '@src/core/logger';
+import { ErrorUtils } from '@core/error/utils';
+import { LegacyLogger } from '@core/logger';
 import { AxiosRequestConfig, AxiosResponse } from 'axios';
 import { parseInt } from 'lodash';
 import { Observable, firstValueFrom } 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 { LegacyLogger } from '@src/core/logger';
+import { LegacyLogger } from '@core/logger';
 import { ltiToolDOFactory, pseudonymFactory } from '@testing/factory/domainobject';
 import { userDoFactory } from '@testing/factory/user.do.factory';
 import { userFactory } from '@testing/factory/user.factory';

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

@@ -7,7 +7,7 @@ import { Injectable, UnprocessableEntityException } from '@nestjs/common';
 import { Pseudonym, UserDO } from '@shared/domain/domainobject';
 import { LtiToolDO } from '@shared/domain/domainobject/ltitool.do';
 import { LtiToolRepo } from '@shared/repo/ltitool/';
-import { LegacyLogger } from '@src/core/logger';
+import { LegacyLogger } from '@core/logger';
 import { TeamRolePermissionsDto } from '../../dto/team-role-permissions.dto';
 import { CollaborativeStorageStrategy } from '../base.interface.strategy';
 import { NextcloudClient } from './nextcloud.client';

apps/server/src/infra/encryption/encryption.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
-import { LegacyLogger, LoggerModule } from '@src/core/logger';
+import { LegacyLogger, LoggerModule } from '@core/logger';
 import { DefaultEncryptionService, LdapEncryptionService } from './encryption.interface';
 import { SymmetricKeyEncryptionService } from './encryption.service';
 

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

@@ -1,5 +1,5 @@
 import { createMock } from '@golevelup/ts-jest';
-import { LegacyLogger } from '@src/core/logger';
+import { LegacyLogger } from '@core/logger';
 import { SymmetricKeyEncryptionService } from './encryption.service';
 
 describe('SymetricKeyEncryptionService', () => {

apps/server/src/infra/encryption/encryption.service.ts

@@ -1,7 +1,7 @@
 import CryptoJs from 'crypto-js';
 
 import { Injectable } from '@nestjs/common';
-import { LegacyLogger } from '@src/core/logger';
+import { LegacyLogger } from '@core/logger';
 import { EncryptionService } from './encryption.interface';
 
 @Injectable()

apps/server/src/infra/etherpad-client/loggable/etherpad-error-loggable-exception.ts

@@ -1,5 +1,5 @@
 import { HttpExceptionOptions, InternalServerErrorException } from '@nestjs/common';
-import { ErrorLogMessage, Loggable } from '@src/core/logger';
+import { ErrorLogMessage, Loggable } from '@core/logger';
 import { EtherpadErrorType, EtherpadParams } from '../interface';
 
 export class EtherpadErrorLoggableException extends InternalServerErrorException implements Loggable {

apps/server/src/infra/etherpad-client/loggable/etherpad-server-error-exception.spec.ts

@@ -1,4 +1,4 @@
-import { ErrorUtils } from '@src/core/error/utils';
+import { ErrorUtils } from '@core/error/utils';
 import { EtherpadErrorType } from '../interface';
 import { EtherpadErrorLoggableException } from './etherpad-error-loggable-exception';