diff --git a/apps/server/doc/file-structure.md b/apps/server/doc/file-structure.md index 9b3007ef6b8..e866c715503 100644 --- a/apps/server/doc/file-structure.md +++ b/apps/server/doc/file-structure.md @@ -129,7 +129,7 @@ This possibility should not be used for new features in Feathers, but it can hel ```TypeScript // main.ts - async function bootstrap() { + async function bootstrap(): Promise { // (...) feathersExpress.services['nest-rocket-chat'] = nestApp.get(RocketChatService); // (...) diff --git a/apps/server/src/apps/admin-api-server.app.ts b/apps/server/src/apps/admin-api-server.app.ts index ee8af11d014..06c29d86213 100644 --- a/apps/server/src/apps/admin-api-server.app.ts +++ b/apps/server/src/apps/admin-api-server.app.ts @@ -3,18 +3,18 @@ import { Configuration } from '@hpi-schul-cloud/commons/lib'; import { NestFactory } from '@nestjs/core'; import { ExpressAdapter } from '@nestjs/platform-express'; import { LegacyLogger, Logger } from '@src/core/logger'; -import { AdminApiServerModule } from '@modules/server/admin-api.server.module'; +import { AdminApiServerModule } from '@src/modules/server/admin-api.server.app.module'; import express from 'express'; import { install as sourceMapInstall } from 'source-map-support'; -import { createRequestLoggerMiddleware } from './helpers/request-logger-middleware'; import { - AppStartLoggable, - enableOpenApiDocs, addPrometheusMetricsMiddlewaresIfEnabled, + AppStartLoggable, createAndStartPrometheusMetricsAppIfEnabled, + enableOpenApiDocs, } from './helpers'; +import { createRequestLoggerMiddleware } from './helpers/request-logger-middleware'; -async function bootstrap() { +async function bootstrap(): Promise { sourceMapInstall(); const nestAdminServerExpress = express(); diff --git a/apps/server/src/apps/board-collaboration.app.ts b/apps/server/src/apps/board-collaboration.app.ts index 7316e7e4091..2712cfe4228 100644 --- a/apps/server/src/apps/board-collaboration.app.ts +++ b/apps/server/src/apps/board-collaboration.app.ts @@ -6,20 +6,20 @@ import { NestFactory } from '@nestjs/core'; import { install as sourceMapInstall } from 'source-map-support'; // application imports -import { SwaggerDocumentOptions } from '@nestjs/swagger'; -import { LegacyLogger, Logger } from '@src/core/logger'; import { RedisIoAdapter } from '@infra/socketio'; import { BoardCollaborationModule } from '@modules/board/board-collaboration.app.module'; -import express from 'express'; import { ExpressAdapter } from '@nestjs/platform-express'; -import { createRequestLoggerMiddleware } from './helpers/request-logger-middleware'; +import { SwaggerDocumentOptions } from '@nestjs/swagger'; +import { LegacyLogger, Logger } from '@src/core/logger'; +import express from 'express'; import { - enableOpenApiDocs, addPrometheusMetricsMiddlewaresIfEnabled, createAndStartPrometheusMetricsAppIfEnabled, + enableOpenApiDocs, } from './helpers'; +import { createRequestLoggerMiddleware } from './helpers/request-logger-middleware'; -async function bootstrap() { +async function bootstrap(): Promise { sourceMapInstall(); const nestExpress = express(); diff --git a/apps/server/src/apps/common-cartridge.app.ts b/apps/server/src/apps/common-cartridge.app.ts index 4fea1f1c0f7..2488e613ce8 100644 --- a/apps/server/src/apps/common-cartridge.app.ts +++ b/apps/server/src/apps/common-cartridge.app.ts @@ -1,20 +1,20 @@ /* istanbul ignore file */ /* eslint-disable no-console */ +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 { CommonCartridgeApiModule } from '@modules/common-cartridge/common-cartridge-api.module'; import express from 'express'; import { install as sourceMapInstall } from 'source-map-support'; -import { createRequestLoggerMiddleware } from './helpers/request-logger-middleware'; import { - AppStartLoggable, - enableOpenApiDocs, addPrometheusMetricsMiddlewaresIfEnabled, + AppStartLoggable, createAndStartPrometheusMetricsAppIfEnabled, + enableOpenApiDocs, } from './helpers'; +import { createRequestLoggerMiddleware } from './helpers/request-logger-middleware'; -async function bootstrap() { +async function bootstrap(): Promise { sourceMapInstall(); const nestExpress = express(); diff --git a/apps/server/src/apps/files-storage-consumer.app.ts b/apps/server/src/apps/files-storage-consumer.app.ts index 19e2fe7ac05..8faf5c40f67 100644 --- a/apps/server/src/apps/files-storage-consumer.app.ts +++ b/apps/server/src/apps/files-storage-consumer.app.ts @@ -3,10 +3,10 @@ import { NestFactory } from '@nestjs/core'; // register source-map-support for debugging -import { FilesStorageAMQPModule } from '@modules/files-storage/files-storage-amqp.module'; +import { FilesStorageAMQPModule } from '@modules/files-storage/files-storage-amqp.app.module'; import { install as sourceMapInstall } from 'source-map-support'; -async function bootstrap() { +async function bootstrap(): Promise { sourceMapInstall(); const nestApp = await NestFactory.create(FilesStorageAMQPModule); diff --git a/apps/server/src/apps/files-storage.app.ts b/apps/server/src/apps/files-storage.app.ts index 6d4ef3127d8..2bfd2698051 100644 --- a/apps/server/src/apps/files-storage.app.ts +++ b/apps/server/src/apps/files-storage.app.ts @@ -8,14 +8,14 @@ import express from 'express'; import { install as sourceMapInstall } from 'source-map-support'; // application imports -import { FilesStorageApiModule } from '@modules/files-storage/files-storage-api.module'; +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 { createRequestLoggerMiddleware } from './helpers/request-logger-middleware'; import { enableOpenApiDocs } from './helpers'; +import { createRequestLoggerMiddleware } from './helpers/request-logger-middleware'; -async function bootstrap() { +async function bootstrap(): Promise { sourceMapInstall(); // create the NestJS application on a seperate express instance diff --git a/apps/server/src/apps/fwu-learning-contents.app.ts b/apps/server/src/apps/fwu-learning-contents.app.ts index bb9ab0383e2..11c56daa89c 100644 --- a/apps/server/src/apps/fwu-learning-contents.app.ts +++ b/apps/server/src/apps/fwu-learning-contents.app.ts @@ -8,12 +8,11 @@ import express from 'express'; import { install as sourceMapInstall } from 'source-map-support'; // application imports +import { FwuLearningContentsModule } from '@modules/fwu-learning-contents/fwu-learning-contents.app.module'; import { LegacyLogger } from '@src/core/logger'; -import { FwuLearningContentsModule } from '@modules/fwu-learning-contents'; -import { createRequestLoggerMiddleware } from './helpers/request-logger-middleware'; -import { enableOpenApiDocs } from './helpers'; +import { createRequestLoggerMiddleware, enableOpenApiDocs } from './helpers'; -async function bootstrap() { +async function bootstrap(): Promise { sourceMapInstall(); // create the NestJS application on a seperate express instance diff --git a/apps/server/src/apps/h5p-editor.app.ts b/apps/server/src/apps/h5p-editor.app.ts index af07641dbba..bad0fec141c 100644 --- a/apps/server/src/apps/h5p-editor.app.ts +++ b/apps/server/src/apps/h5p-editor.app.ts @@ -8,12 +8,11 @@ import express from 'express'; import { install as sourceMapInstall } from 'source-map-support'; // application imports +import { H5PEditorModule } from '@modules/h5p-editor/h5p-editor.app.module'; import { LegacyLogger } from '@src/core/logger'; -import { H5PEditorModule } from '@modules/h5p-editor'; -import { createRequestLoggerMiddleware } from './helpers/request-logger-middleware'; -import { enableOpenApiDocs } from './helpers'; +import { createRequestLoggerMiddleware, enableOpenApiDocs } from './helpers'; -async function bootstrap() { +async function bootstrap(): Promise { sourceMapInstall(); // create the NestJS application on a seperate express instance diff --git a/apps/server/src/apps/h5p-library-management.app.ts b/apps/server/src/apps/h5p-library-management.app.ts index 840141c3a7d..dac94cd5a91 100644 --- a/apps/server/src/apps/h5p-library-management.app.ts +++ b/apps/server/src/apps/h5p-library-management.app.ts @@ -1,11 +1,12 @@ /* istanbul ignore file */ /* eslint-disable no-console */ +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 { install as sourceMapInstall } from 'source-map-support'; import { LegacyLogger } from '@src/core/logger'; -import { H5PLibraryManagementModule, H5PLibraryManagementService } from '@modules/h5p-library-management'; +import { install as sourceMapInstall } from 'source-map-support'; -async function bootstrap() { +async function bootstrap(): Promise { sourceMapInstall(); const nestApp = await NestFactory.createApplicationContext(H5PLibraryManagementModule); diff --git a/apps/server/src/apps/helpers/index.ts b/apps/server/src/apps/helpers/index.ts index ece61cf4004..fbfbd1c554b 100644 --- a/apps/server/src/apps/helpers/index.ts +++ b/apps/server/src/apps/helpers/index.ts @@ -1,3 +1,4 @@ export * from './app-start-loggable'; -export * from './prometheus-metrics'; +export * from './metrics'; +export * from './request-logger-middleware'; export * from './swagger'; diff --git a/apps/server/src/apps/helpers/metrics/index.ts b/apps/server/src/apps/helpers/metrics/index.ts new file mode 100644 index 00000000000..6df8b51f1ad --- /dev/null +++ b/apps/server/src/apps/helpers/metrics/index.ts @@ -0,0 +1 @@ +export * from './prometheus-metrics'; diff --git a/apps/server/src/apps/helpers/prometheus-metrics.spec.ts b/apps/server/src/apps/helpers/metrics/prometheus-metrics.spec.ts similarity index 98% rename from apps/server/src/apps/helpers/prometheus-metrics.spec.ts rename to apps/server/src/apps/helpers/metrics/prometheus-metrics.spec.ts index 396fc4865b6..6635bba079f 100644 --- a/apps/server/src/apps/helpers/prometheus-metrics.spec.ts +++ b/apps/server/src/apps/helpers/metrics/prometheus-metrics.spec.ts @@ -1,13 +1,13 @@ 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, createAPIResponseTimeMetricMiddleware, createPrometheusMetricsApp, -} from '@infra/metrics'; -import { Logger } from '@src/core/logger'; -import express, { Express, NextFunction, Request, RequestHandler, Response } from 'express'; +} from './prometheus'; import { PrometheusMetricsSetupState, PrometheusMetricsSetupStateLoggable, @@ -15,9 +15,9 @@ import { createAndStartPrometheusMetricsAppIfEnabled, } from './prometheus-metrics'; -jest.mock('@infra/metrics', () => { +jest.mock('./prometheus', () => { const moduleMock: unknown = { - ...jest.requireActual('@infra/metrics'), + ...jest.requireActual('./prometheus'), createAPIResponseTimeMetricMiddleware: jest.fn(), createPrometheusMetricsApp: jest.fn(), }; diff --git a/apps/server/src/apps/helpers/prometheus-metrics.ts b/apps/server/src/apps/helpers/metrics/prometheus-metrics.ts similarity index 97% rename from apps/server/src/apps/helpers/prometheus-metrics.ts rename to apps/server/src/apps/helpers/metrics/prometheus-metrics.ts index 56d04b85d89..4c82cf2536a 100644 --- a/apps/server/src/apps/helpers/prometheus-metrics.ts +++ b/apps/server/src/apps/helpers/metrics/prometheus-metrics.ts @@ -1,12 +1,12 @@ import { Express } from 'express'; +import { LogMessage, Loggable, Logger } from '@src/core/logger'; +import { AppStartLoggable } from '../app-start-loggable'; import { PrometheusMetricsConfig, createAPIResponseTimeMetricMiddleware, createPrometheusMetricsApp, -} from '@infra/metrics'; -import { LogMessage, Loggable, Logger } from '@src/core/logger'; -import { AppStartLoggable } from './app-start-loggable'; +} from './prometheus'; export const enum PrometheusMetricsSetupState { FEATURE_DISABLED_MIDDLEWARES_WILL_NOT_BE_CREATED = 'Prometheus metrics feature is disabled - no metrics middlewares will be added to the app', diff --git a/apps/server/src/infra/metrics/prometheus/app.spec.ts b/apps/server/src/apps/helpers/metrics/prometheus/app.spec.ts similarity index 100% rename from apps/server/src/infra/metrics/prometheus/app.spec.ts rename to apps/server/src/apps/helpers/metrics/prometheus/app.spec.ts diff --git a/apps/server/src/infra/metrics/prometheus/app.ts b/apps/server/src/apps/helpers/metrics/prometheus/app.ts similarity index 100% rename from apps/server/src/infra/metrics/prometheus/app.ts rename to apps/server/src/apps/helpers/metrics/prometheus/app.ts diff --git a/apps/server/src/infra/metrics/prometheus/config.spec.ts b/apps/server/src/apps/helpers/metrics/prometheus/config.spec.ts similarity index 100% rename from apps/server/src/infra/metrics/prometheus/config.spec.ts rename to apps/server/src/apps/helpers/metrics/prometheus/config.spec.ts diff --git a/apps/server/src/infra/metrics/prometheus/config.ts b/apps/server/src/apps/helpers/metrics/prometheus/config.ts similarity index 100% rename from apps/server/src/infra/metrics/prometheus/config.ts rename to apps/server/src/apps/helpers/metrics/prometheus/config.ts diff --git a/apps/server/src/infra/metrics/prometheus/handler.spec.ts b/apps/server/src/apps/helpers/metrics/prometheus/handler.spec.ts similarity index 100% rename from apps/server/src/infra/metrics/prometheus/handler.spec.ts rename to apps/server/src/apps/helpers/metrics/prometheus/handler.spec.ts diff --git a/apps/server/src/infra/metrics/prometheus/handler.ts b/apps/server/src/apps/helpers/metrics/prometheus/handler.ts similarity index 100% rename from apps/server/src/infra/metrics/prometheus/handler.ts rename to apps/server/src/apps/helpers/metrics/prometheus/handler.ts diff --git a/apps/server/src/infra/metrics/prometheus/index.ts b/apps/server/src/apps/helpers/metrics/prometheus/index.ts similarity index 100% rename from apps/server/src/infra/metrics/prometheus/index.ts rename to apps/server/src/apps/helpers/metrics/prometheus/index.ts diff --git a/apps/server/src/infra/metrics/prometheus/middleware.spec.ts b/apps/server/src/apps/helpers/metrics/prometheus/middleware.spec.ts similarity index 100% rename from apps/server/src/infra/metrics/prometheus/middleware.spec.ts rename to apps/server/src/apps/helpers/metrics/prometheus/middleware.spec.ts diff --git a/apps/server/src/infra/metrics/prometheus/middleware.ts b/apps/server/src/apps/helpers/metrics/prometheus/middleware.ts similarity index 100% rename from apps/server/src/infra/metrics/prometheus/middleware.ts rename to apps/server/src/apps/helpers/metrics/prometheus/middleware.ts diff --git a/apps/server/src/apps/management.app.ts b/apps/server/src/apps/management.app.ts index 95dde3fb06f..a610cf8f52e 100644 --- a/apps/server/src/apps/management.app.ts +++ b/apps/server/src/apps/management.app.ts @@ -4,13 +4,12 @@ import { NestFactory } from '@nestjs/core'; import { ExpressAdapter, NestExpressApplication } from '@nestjs/platform-express'; import express from 'express'; -import { install as sourceMapInstall } from 'source-map-support'; -import { LegacyLogger } from '@src/core/logger'; -import { ManagementServerModule } from '@modules/management'; 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'); -import { createRequestLoggerMiddleware } from './helpers/request-logger-middleware'; -import { enableOpenApiDocs } from './helpers'; async function bootstrap(): Promise { sourceMapInstall(); diff --git a/apps/server/src/apps/preview-generator-consumer.app.ts b/apps/server/src/apps/preview-generator-consumer.app.ts index 82a8d8bd9fd..47e03c174b6 100644 --- a/apps/server/src/apps/preview-generator-consumer.app.ts +++ b/apps/server/src/apps/preview-generator-consumer.app.ts @@ -1,10 +1,10 @@ /* istanbul ignore file */ /* eslint-disable no-console */ -import { PreviewGeneratorAMQPModule } from '@modules/files-storage/files-preview-amqp.module'; +import { PreviewGeneratorAMQPModule } from '@modules/files-storage/files-preview-amqp.app.module'; import { NestFactory } from '@nestjs/core'; import { install as sourceMapInstall } from 'source-map-support'; -async function bootstrap() { +async function bootstrap(): Promise { sourceMapInstall(); const nestApp = await NestFactory.create(PreviewGeneratorAMQPModule); diff --git a/apps/server/src/apps/server.app.ts b/apps/server/src/apps/server.app.ts index 9ba3300099a..af7d65280e7 100644 --- a/apps/server/src/apps/server.app.ts +++ b/apps/server/src/apps/server.app.ts @@ -4,35 +4,35 @@ import { Mail, MailService } from '@infra/mail'; /* eslint-disable no-console */ import { MikroORM } from '@mikro-orm/core'; import { AccountService } from '@modules/account'; +import { AccountUc } from '@modules/account/api/account.uc'; import { SystemRule } from '@modules/authorization-rules'; import { ColumnBoardService } from '@modules/board'; -import { ContextExternalToolService } from '@modules/tool/context-external-tool'; import { CollaborativeStorageUc } from '@modules/collaborative-storage/uc/collaborative-storage.uc'; import { GroupService } from '@modules/group'; -import { InternalServerModule } from '@modules/internal-server'; +import { InternalServerModule } from '@modules/internal-server/internal-server.app.module'; import { RocketChatService } from '@modules/rocketchat'; import { FeathersRosterService } from '@modules/roster'; -import { ServerModule } from '@modules/server'; +import { ServerModule } from '@modules/server/server.app.module'; 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 { AccountUc } from '@modules/account/api/account.uc'; import express from 'express'; import { join } from 'path'; // register source-map-support for debugging import { install as sourceMapInstall } from 'source-map-support'; -import { createRequestLoggerMiddleware } from './helpers/request-logger-middleware'; import { - AppStartLoggable, - enableOpenApiDocs, addPrometheusMetricsMiddlewaresIfEnabled, + AppStartLoggable, createAndStartPrometheusMetricsAppIfEnabled, + createRequestLoggerMiddleware, + enableOpenApiDocs, } from './helpers'; import legacyAppPromise = require('../../../../src/app'); -async function bootstrap() { +async function bootstrap(): Promise { sourceMapInstall(); // create the NestJS application on a separate express instance diff --git a/apps/server/src/infra/identity-management/keycloak/service/keycloak-identity-management.service.integration.spec.ts b/apps/server/src/infra/identity-management/keycloak/service/keycloak-identity-management.service.integration.spec.ts index bb368321f82..de9331ed4ce 100644 --- a/apps/server/src/infra/identity-management/keycloak/service/keycloak-identity-management.service.integration.spec.ts +++ b/apps/server/src/infra/identity-management/keycloak/service/keycloak-identity-management.service.integration.spec.ts @@ -3,7 +3,7 @@ import { KeycloakModule } from '@infra/identity-management/keycloak/keycloak.mod import KeycloakAdminClient from '@keycloak/keycloak-admin-client-cjs/keycloak-admin-client-cjs-index'; import UserRepresentation from '@keycloak/keycloak-admin-client/lib/defs/userRepresentation'; import { ObjectId } from '@mikro-orm/mongodb'; -import { ServerModule } from '@modules/server'; +import { ServerModule } from '@modules/server/server.app.module'; import { HttpModule } from '@nestjs/axios'; import { Test, TestingModule } from '@nestjs/testing'; import { IdmAccount, IdmAccountUpdate } from '@shared/domain/interface'; diff --git a/apps/server/src/infra/metrics/index.ts b/apps/server/src/infra/metrics/index.ts deleted file mode 100644 index 733729d5b2e..00000000000 --- a/apps/server/src/infra/metrics/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './prometheus'; diff --git a/apps/server/src/modules/account/api/test/account.api.spec.ts b/apps/server/src/modules/account/api/test/account.api.spec.ts index c930aac7d8c..d815dc10fd8 100644 --- a/apps/server/src/modules/account/api/test/account.api.spec.ts +++ b/apps/server/src/modules/account/api/test/account.api.spec.ts @@ -1,6 +1,6 @@ import { faker } from '@faker-js/faker'; import { EntityManager } from '@mikro-orm/mongodb'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { User } from '@shared/domain/entity'; diff --git a/apps/server/src/modules/authentication/controllers/api-test/login.api.spec.ts b/apps/server/src/modules/authentication/controllers/api-test/login.api.spec.ts index dd27cc46167..b4df3beadaf 100644 --- a/apps/server/src/modules/authentication/controllers/api-test/login.api.spec.ts +++ b/apps/server/src/modules/authentication/controllers/api-test/login.api.spec.ts @@ -2,7 +2,7 @@ import { EntityManager } from '@mikro-orm/core'; import { AccountEntity } from '@modules/account/domain/entity/account.entity'; import { accountFactory } from '@modules/account/testing'; import { OauthTokenResponse } from '@modules/oauth/service/dto'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { SystemEntity } from '@modules/system/entity'; import { HttpStatus, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; diff --git a/apps/server/src/modules/authentication/controllers/api-test/logout.api.spec.ts b/apps/server/src/modules/authentication/controllers/api-test/logout.api.spec.ts index 732ceaa1aa0..c79a12f5652 100644 --- a/apps/server/src/modules/authentication/controllers/api-test/logout.api.spec.ts +++ b/apps/server/src/modules/authentication/controllers/api-test/logout.api.spec.ts @@ -3,7 +3,7 @@ import { EntityManager } from '@mikro-orm/mongodb'; import { OauthSessionTokenEntity } from '@modules/oauth/entity'; import { oauthSessionTokenEntityFactory } from '@modules/oauth/testing'; import { serverConfig, ServerConfig } from '@modules/server'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { systemOauthConfigFactory } from '@modules/system/testing'; import { CACHE_MANAGER } from '@nestjs/cache-manager'; import { ExecutionContext, HttpStatus, INestApplication } from '@nestjs/common'; diff --git a/apps/server/src/modules/board/controller/api-test/board-copy-in-course.api.spec.ts b/apps/server/src/modules/board/controller/api-test/board-copy-in-course.api.spec.ts index d9007276c08..3e13b239152 100644 --- a/apps/server/src/modules/board/controller/api-test/board-copy-in-course.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/board-copy-in-course.api.spec.ts @@ -1,6 +1,6 @@ import { EntityManager } from '@mikro-orm/mongodb'; import { CopyApiResponse, CopyElementType, CopyStatusEnum } from '@modules/copy-helper'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { cleanupCollections } from '@testing/cleanup-collections'; diff --git a/apps/server/src/modules/board/controller/api-test/board-create-in-course.api.spec.ts b/apps/server/src/modules/board/controller/api-test/board-create-in-course.api.spec.ts index 1dbe83a9223..007332ba0bb 100644 --- a/apps/server/src/modules/board/controller/api-test/board-create-in-course.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/board-create-in-course.api.spec.ts @@ -1,5 +1,5 @@ import { EntityManager } from '@mikro-orm/mongodb'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { cleanupCollections } from '@testing/cleanup-collections'; diff --git a/apps/server/src/modules/board/controller/api-test/board-create-in-room.api.spec.ts b/apps/server/src/modules/board/controller/api-test/board-create-in-room.api.spec.ts index 66cd5ece6b4..076e3cabdfe 100644 --- a/apps/server/src/modules/board/controller/api-test/board-create-in-room.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/board-create-in-room.api.spec.ts @@ -3,7 +3,7 @@ import { accountFactory } from '@modules/account/testing'; import { GroupEntityTypes } from '@modules/group/entity'; import { roomMembershipEntityFactory } from '@modules/room-membership/testing'; import { roomEntityFactory } from '@modules/room/testing'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { Permission } from '@shared/domain/interface'; diff --git a/apps/server/src/modules/board/controller/api-test/board-lookup-in-course.api.spec.ts b/apps/server/src/modules/board/controller/api-test/board-lookup-in-course.api.spec.ts index f094f9f8615..5f9596dd8c6 100644 --- a/apps/server/src/modules/board/controller/api-test/board-lookup-in-course.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/board-lookup-in-course.api.spec.ts @@ -1,5 +1,5 @@ import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { cleanupCollections } from '@testing/cleanup-collections'; diff --git a/apps/server/src/modules/board/controller/api-test/board-lookup-in-room.api.spec.ts b/apps/server/src/modules/board/controller/api-test/board-lookup-in-room.api.spec.ts index 71135c8cb15..4faa83a0755 100644 --- a/apps/server/src/modules/board/controller/api-test/board-lookup-in-room.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/board-lookup-in-room.api.spec.ts @@ -1,5 +1,5 @@ import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; diff --git a/apps/server/src/modules/board/controller/api-test/board-update-title-in-course.api.spec.ts b/apps/server/src/modules/board/controller/api-test/board-update-title-in-course.api.spec.ts index 128ba768732..939af3f0baa 100644 --- a/apps/server/src/modules/board/controller/api-test/board-update-title-in-course.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/board-update-title-in-course.api.spec.ts @@ -1,5 +1,5 @@ import { EntityManager } from '@mikro-orm/mongodb'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ApiValidationError } from '@shared/common'; diff --git a/apps/server/src/modules/board/controller/api-test/board-update-title-in-room.api.spec.ts b/apps/server/src/modules/board/controller/api-test/board-update-title-in-room.api.spec.ts index dbbe1a1bf61..38ca8f4776a 100644 --- a/apps/server/src/modules/board/controller/api-test/board-update-title-in-room.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/board-update-title-in-room.api.spec.ts @@ -1,5 +1,5 @@ import { EntityManager } from '@mikro-orm/mongodb'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ApiValidationError } from '@shared/common'; diff --git a/apps/server/src/modules/board/controller/api-test/board-visibility-in-course.api.spec.ts b/apps/server/src/modules/board/controller/api-test/board-visibility-in-course.api.spec.ts index 8f2a510e207..c3f129bf4d1 100644 --- a/apps/server/src/modules/board/controller/api-test/board-visibility-in-course.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/board-visibility-in-course.api.spec.ts @@ -1,5 +1,5 @@ import { EntityManager } from '@mikro-orm/mongodb'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { cleanupCollections } from '@testing/cleanup-collections'; diff --git a/apps/server/src/modules/board/controller/api-test/board-visibility-in-room.api.spec.ts b/apps/server/src/modules/board/controller/api-test/board-visibility-in-room.api.spec.ts index 86ab2de22ba..6e397cbad00 100644 --- a/apps/server/src/modules/board/controller/api-test/board-visibility-in-room.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/board-visibility-in-room.api.spec.ts @@ -1,5 +1,5 @@ import { EntityManager } from '@mikro-orm/mongodb'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { Permission, RoleName } from '@shared/domain/interface'; diff --git a/apps/server/src/modules/board/controller/api-test/card-create.api.spec.ts b/apps/server/src/modules/board/controller/api-test/card-create.api.spec.ts index fc936bb3e50..085aadd45d4 100644 --- a/apps/server/src/modules/board/controller/api-test/card-create.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/card-create.api.spec.ts @@ -1,5 +1,5 @@ import { EntityManager } from '@mikro-orm/mongodb'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { cleanupCollections } from '@testing/cleanup-collections'; diff --git a/apps/server/src/modules/board/controller/api-test/card-lookup.api.spec.ts b/apps/server/src/modules/board/controller/api-test/card-lookup.api.spec.ts index ec8319040f5..ef16e9a40d2 100644 --- a/apps/server/src/modules/board/controller/api-test/card-lookup.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/card-lookup.api.spec.ts @@ -1,5 +1,5 @@ import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { cleanupCollections } from '@testing/cleanup-collections'; diff --git a/apps/server/src/modules/board/controller/api-test/card-move.api.spec.ts b/apps/server/src/modules/board/controller/api-test/card-move.api.spec.ts index b162b12b215..d4d60e07eaa 100644 --- a/apps/server/src/modules/board/controller/api-test/card-move.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/card-move.api.spec.ts @@ -1,5 +1,5 @@ import { EntityManager } from '@mikro-orm/mongodb'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { cleanupCollections } from '@testing/cleanup-collections'; diff --git a/apps/server/src/modules/board/controller/api-test/card-update-height.api.spec.ts b/apps/server/src/modules/board/controller/api-test/card-update-height.api.spec.ts index d2a6968e540..fbae0e8897c 100644 --- a/apps/server/src/modules/board/controller/api-test/card-update-height.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/card-update-height.api.spec.ts @@ -1,5 +1,5 @@ import { EntityManager } from '@mikro-orm/mongodb'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { cleanupCollections } from '@testing/cleanup-collections'; diff --git a/apps/server/src/modules/board/controller/api-test/card-update-title.api.spec.ts b/apps/server/src/modules/board/controller/api-test/card-update-title.api.spec.ts index 0a0fab79fac..3f87ffa298f 100644 --- a/apps/server/src/modules/board/controller/api-test/card-update-title.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/card-update-title.api.spec.ts @@ -1,5 +1,5 @@ import { EntityManager } from '@mikro-orm/mongodb'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { cleanupCollections } from '@testing/cleanup-collections'; diff --git a/apps/server/src/modules/board/controller/api-test/column-create.api.spec.ts b/apps/server/src/modules/board/controller/api-test/column-create.api.spec.ts index 0603498fdd2..e2a8f3212b4 100644 --- a/apps/server/src/modules/board/controller/api-test/column-create.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/column-create.api.spec.ts @@ -1,5 +1,5 @@ import { EntityManager } from '@mikro-orm/mongodb'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { cleanupCollections } from '@testing/cleanup-collections'; diff --git a/apps/server/src/modules/board/controller/api-test/column-delete.api.spec.ts b/apps/server/src/modules/board/controller/api-test/column-delete.api.spec.ts index dd37f200d42..cb18bba906a 100644 --- a/apps/server/src/modules/board/controller/api-test/column-delete.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/column-delete.api.spec.ts @@ -1,5 +1,5 @@ import { EntityManager } from '@mikro-orm/mongodb'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { cleanupCollections } from '@testing/cleanup-collections'; diff --git a/apps/server/src/modules/board/controller/api-test/column-move.api.spec.ts b/apps/server/src/modules/board/controller/api-test/column-move.api.spec.ts index ff9e4fddf12..1d13126e714 100644 --- a/apps/server/src/modules/board/controller/api-test/column-move.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/column-move.api.spec.ts @@ -1,5 +1,5 @@ import { EntityManager } from '@mikro-orm/mongodb'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { cleanupCollections } from '@testing/cleanup-collections'; diff --git a/apps/server/src/modules/board/controller/api-test/column-update-title.api.spec.ts b/apps/server/src/modules/board/controller/api-test/column-update-title.api.spec.ts index 61e8beadb39..92bee22f9b3 100644 --- a/apps/server/src/modules/board/controller/api-test/column-update-title.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/column-update-title.api.spec.ts @@ -1,5 +1,5 @@ import { EntityManager } from '@mikro-orm/mongodb'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { cleanupCollections } from '@testing/cleanup-collections'; diff --git a/apps/server/src/modules/board/controller/api-test/content-element-create.api.spec.ts b/apps/server/src/modules/board/controller/api-test/content-element-create.api.spec.ts index 02d6e32b969..0efee5c04f7 100644 --- a/apps/server/src/modules/board/controller/api-test/content-element-create.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/content-element-create.api.spec.ts @@ -1,5 +1,5 @@ import { EntityManager } from '@mikro-orm/mongodb'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { cleanupCollections } from '@testing/cleanup-collections'; diff --git a/apps/server/src/modules/board/controller/api-test/content-element-delete.api.spec.ts b/apps/server/src/modules/board/controller/api-test/content-element-delete.api.spec.ts index 21b6ce58884..4d43071b159 100644 --- a/apps/server/src/modules/board/controller/api-test/content-element-delete.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/content-element-delete.api.spec.ts @@ -2,7 +2,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { TldrawClientAdapter } from '@infra/tldraw-client'; import { EntityManager } from '@mikro-orm/mongodb'; import { FilesStorageClientAdapterService } from '@modules/files-storage-client'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { cleanupCollections } from '@testing/cleanup-collections'; diff --git a/apps/server/src/modules/board/controller/api-test/content-element-move.api.spec.ts b/apps/server/src/modules/board/controller/api-test/content-element-move.api.spec.ts index 9fdded4ecc6..7e2e3cd5761 100644 --- a/apps/server/src/modules/board/controller/api-test/content-element-move.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/content-element-move.api.spec.ts @@ -1,5 +1,5 @@ import { EntityManager } from '@mikro-orm/mongodb'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { cleanupCollections } from '@testing/cleanup-collections'; diff --git a/apps/server/src/modules/board/controller/api-test/content-element-update-content.spec.ts b/apps/server/src/modules/board/controller/api-test/content-element-update-content.spec.ts index 74116bb6f73..f8aecb09c24 100644 --- a/apps/server/src/modules/board/controller/api-test/content-element-update-content.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/content-element-update-content.spec.ts @@ -1,5 +1,5 @@ import { EntityManager } from '@mikro-orm/mongodb'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { HttpStatus, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { sanitizeRichText } from '@shared/controller/transformer/sanitize-html.transformer'; diff --git a/apps/server/src/modules/common-cartridge/common-cartridge-api.module.ts b/apps/server/src/modules/common-cartridge/common-cartridge-api.app.module.ts similarity index 100% rename from apps/server/src/modules/common-cartridge/common-cartridge-api.module.ts rename to apps/server/src/modules/common-cartridge/common-cartridge-api.app.module.ts diff --git a/apps/server/src/modules/common-cartridge/controller/common-cartridge.controller.api.spec.ts b/apps/server/src/modules/common-cartridge/controller/common-cartridge.controller.api.spec.ts index 1f655323a38..a32c37010aa 100644 --- a/apps/server/src/modules/common-cartridge/controller/common-cartridge.controller.api.spec.ts +++ b/apps/server/src/modules/common-cartridge/controller/common-cartridge.controller.api.spec.ts @@ -7,7 +7,7 @@ import { Test, TestingModule } from '@nestjs/testing'; import { CoursesApi } from '@src/infra/courses-client/generated'; import { axiosResponseFactory } from '@testing/factory/axios-response.factory'; import supertest from 'supertest'; -import { CommonCartridgeApiModule } from '../common-cartridge-api.module'; +import { CommonCartridgeApiModule } from '../common-cartridge-api.app.module'; import { CommonCartridgeFileBuilder } from '../export/builders/common-cartridge-file-builder'; import { CommonCartridgeElementType, CommonCartridgeVersion } from '../export/common-cartridge.enums'; diff --git a/apps/server/src/modules/deletion/api/controller/api-test/deletion-executions.api.spec.ts b/apps/server/src/modules/deletion/api/controller/api-test/deletion-executions.api.spec.ts index 4c2b6ca6beb..4921c07640c 100644 --- a/apps/server/src/modules/deletion/api/controller/api-test/deletion-executions.api.spec.ts +++ b/apps/server/src/modules/deletion/api/controller/api-test/deletion-executions.api.spec.ts @@ -1,6 +1,6 @@ -import { AdminApiServerTestModule } from '@modules/server/admin-api.server.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; +import { AdminApiServerTestModule } from '@src/modules/server/admin-api.server.app.module'; import { TestApiClient } from '@testing/test-api-client'; const baseRouteName = '/deletionExecutions'; diff --git a/apps/server/src/modules/deletion/api/controller/api-test/deletion-request-create.api.spec.ts b/apps/server/src/modules/deletion/api/controller/api-test/deletion-request-create.api.spec.ts index 47aa8bbae30..801557318ad 100644 --- a/apps/server/src/modules/deletion/api/controller/api-test/deletion-request-create.api.spec.ts +++ b/apps/server/src/modules/deletion/api/controller/api-test/deletion-request-create.api.spec.ts @@ -1,7 +1,7 @@ import { EntityManager } from '@mikro-orm/mongodb'; -import { AdminApiServerTestModule } from '@modules/server/admin-api.server.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; +import { AdminApiServerTestModule } from '@src/modules/server/admin-api.server.app.module'; import { TestApiClient } from '@testing/test-api-client'; import { DomainName } from '../../../domain/types'; import { DeletionRequestEntity } from '../../../repo/entity'; diff --git a/apps/server/src/modules/deletion/api/controller/api-test/deletion-request-delete.api.spec.ts b/apps/server/src/modules/deletion/api/controller/api-test/deletion-request-delete.api.spec.ts index 501e86f7b0b..8f8c67507d3 100644 --- a/apps/server/src/modules/deletion/api/controller/api-test/deletion-request-delete.api.spec.ts +++ b/apps/server/src/modules/deletion/api/controller/api-test/deletion-request-delete.api.spec.ts @@ -1,7 +1,7 @@ import { EntityManager } from '@mikro-orm/mongodb'; -import { AdminApiServerTestModule } from '@modules/server/admin-api.server.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; +import { AdminApiServerTestModule } from '@src/modules/server/admin-api.server.app.module'; import { cleanupCollections } from '@testing/cleanup-collections'; import { TestApiClient } from '@testing/test-api-client'; import { DeletionRequestEntity } from '../../../repo/entity'; diff --git a/apps/server/src/modules/deletion/api/controller/api-test/deletion-request-find.api.spec.ts b/apps/server/src/modules/deletion/api/controller/api-test/deletion-request-find.api.spec.ts index 1e6d6a7900f..b944e61260d 100644 --- a/apps/server/src/modules/deletion/api/controller/api-test/deletion-request-find.api.spec.ts +++ b/apps/server/src/modules/deletion/api/controller/api-test/deletion-request-find.api.spec.ts @@ -1,7 +1,7 @@ import { EntityManager } from '@mikro-orm/mongodb'; -import { AdminApiServerTestModule } from '@modules/server/admin-api.server.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; +import { AdminApiServerTestModule } from '@src/modules/server/admin-api.server.app.module'; import { cleanupCollections } from '@testing/cleanup-collections'; import { TestApiClient } from '@testing/test-api-client'; import { deletionRequestEntityFactory } from '../../../repo/entity/testing'; diff --git a/apps/server/src/modules/files-storage/files-preview-amqp.module.ts b/apps/server/src/modules/files-storage/files-preview-amqp.app.module.ts similarity index 100% rename from apps/server/src/modules/files-storage/files-preview-amqp.module.ts rename to apps/server/src/modules/files-storage/files-preview-amqp.app.module.ts diff --git a/apps/server/src/modules/files-storage/files-storage-amqp.module.ts b/apps/server/src/modules/files-storage/files-storage-amqp.app.module.ts similarity index 100% rename from apps/server/src/modules/files-storage/files-storage-amqp.module.ts rename to apps/server/src/modules/files-storage/files-storage-amqp.app.module.ts diff --git a/apps/server/src/modules/files-storage/files-storage-api.module.ts b/apps/server/src/modules/files-storage/files-storage-api.app.module.ts similarity index 100% rename from apps/server/src/modules/files-storage/files-storage-api.module.ts rename to apps/server/src/modules/files-storage/files-storage-api.app.module.ts diff --git a/apps/server/src/modules/files-storage/files-storage-test.module.ts b/apps/server/src/modules/files-storage/files-storage-test.module.ts index 1278b23b018..cd4cd4eb5ed 100644 --- a/apps/server/src/modules/files-storage/files-storage-test.module.ts +++ b/apps/server/src/modules/files-storage/files-storage-test.module.ts @@ -1,12 +1,12 @@ -import { DynamicModule, Module } from '@nestjs/common'; import { MongoDatabaseModuleOptions, MongoMemoryDatabaseModule } from '@infra/database'; import { RabbitMQWrapperTestModule } from '@infra/rabbitmq'; +import { DynamicModule, Module } from '@nestjs/common'; +import { defaultMikroOrmOptions } from '@shared/common/defaultMikroOrmOptions'; import { ALL_ENTITIES } from '@shared/domain/entity'; import { CoreModule } from '@src/core'; import { LoggerModule } from '@src/core/logger'; -import { defaultMikroOrmOptions } from '@shared/common/defaultMikroOrmOptions'; import { FileRecord } from './entity'; -import { FilesStorageApiModule } from './files-storage-api.module'; +import { FilesStorageApiModule } from './files-storage-api.app.module'; const imports = [ FilesStorageApiModule, diff --git a/apps/server/src/modules/fwu-learning-contents/fwu-learning-contents.module.ts b/apps/server/src/modules/fwu-learning-contents/fwu-learning-contents.app.module.ts similarity index 100% rename from apps/server/src/modules/fwu-learning-contents/fwu-learning-contents.module.ts rename to apps/server/src/modules/fwu-learning-contents/fwu-learning-contents.app.module.ts diff --git a/apps/server/src/modules/fwu-learning-contents/index.ts b/apps/server/src/modules/fwu-learning-contents/index.ts deleted file mode 100644 index abc4375bfe8..00000000000 --- a/apps/server/src/modules/fwu-learning-contents/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './fwu-learning-contents.module'; diff --git a/apps/server/src/modules/h5p-editor/h5p-editor-test.module.ts b/apps/server/src/modules/h5p-editor/h5p-editor-test.module.ts index d64eeba53eb..8ef440c9d41 100644 --- a/apps/server/src/modules/h5p-editor/h5p-editor-test.module.ts +++ b/apps/server/src/modules/h5p-editor/h5p-editor-test.module.ts @@ -10,8 +10,8 @@ import { CoreModule } from '@src/core'; import { LoggerModule } from '@src/core/logger'; import { H5PEditorController } from './controller'; import { H5PContent } from './entity'; +import { H5PEditorModule } from './h5p-editor.app.module'; import { authorizationClientConfig, s3ConfigContent, s3ConfigLibraries } from './h5p-editor.config'; -import { H5PEditorModule } from './h5p-editor.module'; import { H5PAjaxEndpointProvider, H5PEditorProvider, H5PPlayerProvider } from './provider'; import { H5PContentRepo, LibraryRepo } from './repo'; import { ContentStorage, LibraryStorage, TemporaryFileStorage } from './service'; diff --git a/apps/server/src/modules/h5p-editor/h5p-editor.module.ts b/apps/server/src/modules/h5p-editor/h5p-editor.app.module.ts similarity index 100% rename from apps/server/src/modules/h5p-editor/h5p-editor.module.ts rename to apps/server/src/modules/h5p-editor/h5p-editor.app.module.ts diff --git a/apps/server/src/modules/h5p-editor/index.ts b/apps/server/src/modules/h5p-editor/index.ts index b8565a944c2..1f9378488c7 100644 --- a/apps/server/src/modules/h5p-editor/index.ts +++ b/apps/server/src/modules/h5p-editor/index.ts @@ -1,3 +1,2 @@ -export { H5PEditorModule } from './h5p-editor.module'; -export { ContentStorage, LibraryStorage } from './service'; export { s3ConfigContent, s3ConfigLibraries } from './h5p-editor.config'; +export { ContentStorage, LibraryStorage } from './service'; diff --git a/apps/server/src/modules/h5p-library-management/h5p-library-management.module.ts b/apps/server/src/modules/h5p-library-management/h5p-library-management.app.module.ts similarity index 84% rename from apps/server/src/modules/h5p-library-management/h5p-library-management.module.ts rename to apps/server/src/modules/h5p-library-management/h5p-library-management.app.module.ts index 91aa2ebbc2e..ae96eb4ab8b 100644 --- a/apps/server/src/modules/h5p-library-management/h5p-library-management.module.ts +++ b/apps/server/src/modules/h5p-library-management/h5p-library-management.app.module.ts @@ -1,6 +1,7 @@ import { RabbitMQWrapperModule } from '@infra/rabbitmq'; import { S3ClientModule } from '@infra/s3-client'; -import { H5PEditorModule, s3ConfigContent, s3ConfigLibraries } from '@modules/h5p-editor'; +import { s3ConfigContent, s3ConfigLibraries } from '@modules/h5p-editor'; +import { H5PEditorModule } from '@modules/h5p-editor/h5p-editor.app.module'; import { Module } from '@nestjs/common'; import { ConfigModule } from '@nestjs/config'; import { createConfigModuleOptions } from '@shared/common'; diff --git a/apps/server/src/modules/h5p-library-management/index.ts b/apps/server/src/modules/h5p-library-management/index.ts index 442c5dac91d..1b17f7af40b 100644 --- a/apps/server/src/modules/h5p-library-management/index.ts +++ b/apps/server/src/modules/h5p-library-management/index.ts @@ -1,2 +1 @@ -export { H5PLibraryManagementModule } from './h5p-library-management.module'; export { H5PLibraryManagementService } from './service'; diff --git a/apps/server/src/modules/internal-server/index.ts b/apps/server/src/modules/internal-server/index.ts deleted file mode 100644 index c432a32edae..00000000000 --- a/apps/server/src/modules/internal-server/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './internal-server.module'; diff --git a/apps/server/src/modules/internal-server/internal-server.module.ts b/apps/server/src/modules/internal-server/internal-server.app.module.ts similarity index 100% rename from apps/server/src/modules/internal-server/internal-server.module.ts rename to apps/server/src/modules/internal-server/internal-server.app.module.ts diff --git a/apps/server/src/modules/learnroom/controller/api-test/course-info.api.spec.ts b/apps/server/src/modules/learnroom/controller/api-test/course-info.api.spec.ts index dc847763f16..1b294437b07 100644 --- a/apps/server/src/modules/learnroom/controller/api-test/course-info.api.spec.ts +++ b/apps/server/src/modules/learnroom/controller/api-test/course-info.api.spec.ts @@ -1,5 +1,5 @@ import { EntityManager } from '@mikro-orm/mongodb'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { HttpStatus, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { Course as CourseEntity } from '@shared/domain/entity'; diff --git a/apps/server/src/modules/learnroom/controller/api-test/course-rooms.api.spec.ts b/apps/server/src/modules/learnroom/controller/api-test/course-rooms.api.spec.ts index d43416c2eac..f591155c279 100644 --- a/apps/server/src/modules/learnroom/controller/api-test/course-rooms.api.spec.ts +++ b/apps/server/src/modules/learnroom/controller/api-test/course-rooms.api.spec.ts @@ -4,7 +4,7 @@ import { EntityManager } from '@mikro-orm/mongodb'; import { CopyApiResponse } from '@modules/copy-helper'; import { FilesStorageClientAdapterService } from '@modules/files-storage-client'; import { SingleColumnBoardResponse } from '@modules/learnroom/controller/dto'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { Course, LegacyBoard, Task } from '@shared/domain/entity'; diff --git a/apps/server/src/modules/learnroom/controller/api-test/course.api.spec.ts b/apps/server/src/modules/learnroom/controller/api-test/course.api.spec.ts index 52daa963783..f65720b6f78 100644 --- a/apps/server/src/modules/learnroom/controller/api-test/course.api.spec.ts +++ b/apps/server/src/modules/learnroom/controller/api-test/course.api.spec.ts @@ -1,6 +1,6 @@ import { faker } from '@faker-js/faker/locale/af_ZA'; import { EntityManager } from '@mikro-orm/mongodb'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { HttpStatus, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { Course as CourseEntity } from '@shared/domain/entity'; diff --git a/apps/server/src/modules/learnroom/controller/api-test/dashboard.api.spec.ts b/apps/server/src/modules/learnroom/controller/api-test/dashboard.api.spec.ts index fef2cdc94f8..d4fc86b2297 100644 --- a/apps/server/src/modules/learnroom/controller/api-test/dashboard.api.spec.ts +++ b/apps/server/src/modules/learnroom/controller/api-test/dashboard.api.spec.ts @@ -1,6 +1,6 @@ import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { DashboardResponse } from '@modules/learnroom/controller/dto'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { DashboardEntity, GridElement, User } from '@shared/domain/entity'; diff --git a/apps/server/src/modules/legacy-school/controller/api-test/school.administration.api.spec.ts b/apps/server/src/modules/legacy-school/controller/api-test/school.administration.api.spec.ts index 4cb4d2e6e03..596a9959b53 100644 --- a/apps/server/src/modules/legacy-school/controller/api-test/school.administration.api.spec.ts +++ b/apps/server/src/modules/legacy-school/controller/api-test/school.administration.api.spec.ts @@ -2,7 +2,7 @@ import { EntityManager } from '@mikro-orm/mongodb'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { SchoolEntity } from '@shared/domain/entity'; -import { AdminApiServerTestModule } from '@src/modules/server/admin-api.server.module'; +import { AdminApiServerTestModule } from '@src/modules/server/admin-api.server.app.module'; import { federalStateFactory } from '@testing/factory/federal-state.factory'; import { schoolYearFactory } from '@testing/factory/schoolyear.factory'; import { storageProviderFactory } from '@testing/factory/storageprovider.factory'; diff --git a/apps/server/src/modules/management/controller/api-test/database-management.api.spec.ts b/apps/server/src/modules/management/controller/api-test/database-management.api.spec.ts index 6bcfb20f416..dd39d75ff7d 100644 --- a/apps/server/src/modules/management/controller/api-test/database-management.api.spec.ts +++ b/apps/server/src/modules/management/controller/api-test/database-management.api.spec.ts @@ -3,7 +3,7 @@ import { createMock } from '@golevelup/ts-jest'; import { FeathersServiceProvider } from '@infra/feathers'; import { MikroORM } from '@mikro-orm/core'; import { EntityManager } from '@mikro-orm/mongodb'; -import { ManagementServerTestModule } from '@modules/management/management-server.module'; +import { ManagementServerTestModule } from '@modules/management/management-server.app.module'; import { ExpressAdapter, NestExpressApplication } from '@nestjs/platform-express'; import { Test, TestingModule } from '@nestjs/testing'; import { createCollections } from '@testing/create-collections'; diff --git a/apps/server/src/modules/management/index.ts b/apps/server/src/modules/management/index.ts index 71185d2ba28..31ac03434fa 100644 --- a/apps/server/src/modules/management/index.ts +++ b/apps/server/src/modules/management/index.ts @@ -1,2 +1 @@ -export * from './management-server.module'; export * from './management.module'; diff --git a/apps/server/src/modules/management/management-server.module.ts b/apps/server/src/modules/management/management-server.app.module.ts similarity index 100% rename from apps/server/src/modules/management/management-server.module.ts rename to apps/server/src/modules/management/management-server.app.module.ts diff --git a/apps/server/src/modules/management/management.module.spec.ts b/apps/server/src/modules/management/management.module.spec.ts index f8978815079..d259134ee4a 100644 --- a/apps/server/src/modules/management/management.module.spec.ts +++ b/apps/server/src/modules/management/management.module.spec.ts @@ -1,7 +1,7 @@ import { Test, TestingModule } from '@nestjs/testing'; import { DatabaseManagementController } from './controller/database-management.controller'; -import { ManagementServerModule, ManagementServerTestModule } from './management-server.module'; +import { ManagementServerModule, ManagementServerTestModule } from './management-server.app.module'; import { DatabaseManagementUc } from './uc/database-management.uc'; describe('ManagementModule', () => { diff --git a/apps/server/src/modules/meta-tag-extractor/controller/api-test/meta-tag-extractor-get-data.api.spec.ts b/apps/server/src/modules/meta-tag-extractor/controller/api-test/meta-tag-extractor-get-data.api.spec.ts index 87062dff8ee..4348e5f8364 100644 --- a/apps/server/src/modules/meta-tag-extractor/controller/api-test/meta-tag-extractor-get-data.api.spec.ts +++ b/apps/server/src/modules/meta-tag-extractor/controller/api-test/meta-tag-extractor-get-data.api.spec.ts @@ -1,5 +1,5 @@ import { EntityManager } from '@mikro-orm/mongodb'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { UserAndAccountTestFactory } from '@testing/factory/user-and-account.test.factory'; diff --git a/apps/server/src/modules/news/controller/api-test/news.api.spec.ts b/apps/server/src/modules/news/controller/api-test/news.api.spec.ts index 6415140a874..33c2618d6b2 100644 --- a/apps/server/src/modules/news/controller/api-test/news.api.spec.ts +++ b/apps/server/src/modules/news/controller/api-test/news.api.spec.ts @@ -1,7 +1,7 @@ import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { FeathersAuthorizationService } from '@modules/authorization'; import { CreateNewsParams, NewsListResponse, NewsResponse, UpdateNewsParams } from '@modules/news/controller/dto'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { News, User } from '@shared/domain/entity'; diff --git a/apps/server/src/modules/server/admin-api.server.module.ts b/apps/server/src/modules/server/admin-api.server.app.module.ts similarity index 100% rename from apps/server/src/modules/server/admin-api.server.module.ts rename to apps/server/src/modules/server/admin-api.server.app.module.ts diff --git a/apps/server/src/modules/server/index.ts b/apps/server/src/modules/server/index.ts index 9b15d3dd353..00ac8f7aacf 100644 --- a/apps/server/src/modules/server/index.ts +++ b/apps/server/src/modules/server/index.ts @@ -1,2 +1,2 @@ +export { ServerTestModule } from './server.app.module'; export * from './server.config'; -export * from './server.module'; diff --git a/apps/server/src/modules/server/server.module.ts b/apps/server/src/modules/server/server.app.module.ts similarity index 100% rename from apps/server/src/modules/server/server.module.ts rename to apps/server/src/modules/server/server.app.module.ts diff --git a/apps/server/src/modules/sharing/controller/api-test/sharing-create-token.api.spec.ts b/apps/server/src/modules/sharing/controller/api-test/sharing-create-token.api.spec.ts index dbb5dced8df..54b2ac2a5fc 100644 --- a/apps/server/src/modules/sharing/controller/api-test/sharing-create-token.api.spec.ts +++ b/apps/server/src/modules/sharing/controller/api-test/sharing-create-token.api.spec.ts @@ -1,6 +1,6 @@ import { Configuration } from '@hpi-schul-cloud/commons/lib'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { HttpStatus, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { cleanupCollections } from '@testing/cleanup-collections'; diff --git a/apps/server/src/modules/task/controller/api-test/submission.api.spec.ts b/apps/server/src/modules/task/controller/api-test/submission.api.spec.ts index 5fbbe9b0fdb..0a070eccf1d 100644 --- a/apps/server/src/modules/task/controller/api-test/submission.api.spec.ts +++ b/apps/server/src/modules/task/controller/api-test/submission.api.spec.ts @@ -1,7 +1,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { EntityManager } from '@mikro-orm/mongodb'; import { FilesStorageClientAdapterService } from '@modules/files-storage-client'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { SubmissionStatusListResponse } from '@modules/task/controller/dto/submission.response'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; diff --git a/apps/server/src/modules/task/controller/api-test/task-copy-timeout.api.spec.ts b/apps/server/src/modules/task/controller/api-test/task-copy-timeout.api.spec.ts index 4da7c41f906..733534cacf0 100644 --- a/apps/server/src/modules/task/controller/api-test/task-copy-timeout.api.spec.ts +++ b/apps/server/src/modules/task/controller/api-test/task-copy-timeout.api.spec.ts @@ -16,7 +16,7 @@ Configuration.set('FEATURE_COPY_SERVICE_ENABLED', true); Configuration.set('INCOMING_REQUEST_TIMEOUT_COPY_API', 1); // eslint-disable-next-line import/first -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; // This needs to be in a separate test file because of the above configuration. // When we find a way to mock the config, it should be moved alongside the other API tests. diff --git a/apps/server/src/modules/task/controller/api-test/task-finished.api.spec.ts b/apps/server/src/modules/task/controller/api-test/task-finished.api.spec.ts index 850448a7348..694c2ba7964 100644 --- a/apps/server/src/modules/task/controller/api-test/task-finished.api.spec.ts +++ b/apps/server/src/modules/task/controller/api-test/task-finished.api.spec.ts @@ -1,5 +1,5 @@ import { EntityManager } from '@mikro-orm/mongodb'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { cleanupCollections } from '@testing/cleanup-collections'; diff --git a/apps/server/src/modules/task/controller/api-test/task.api.spec.ts b/apps/server/src/modules/task/controller/api-test/task.api.spec.ts index a156f8073c4..e06b4dc44b0 100644 --- a/apps/server/src/modules/task/controller/api-test/task.api.spec.ts +++ b/apps/server/src/modules/task/controller/api-test/task.api.spec.ts @@ -1,5 +1,5 @@ import { EntityManager } from '@mikro-orm/mongodb'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { TaskListResponse } from '@modules/task/controller/dto'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; diff --git a/apps/server/src/modules/tool/context-external-tool/controller/api-test/admin-api-context-external-tool.api.spec.ts b/apps/server/src/modules/tool/context-external-tool/controller/api-test/admin-api-context-external-tool.api.spec.ts index d8ae52e0f58..37e72b84127 100644 --- a/apps/server/src/modules/tool/context-external-tool/controller/api-test/admin-api-context-external-tool.api.spec.ts +++ b/apps/server/src/modules/tool/context-external-tool/controller/api-test/admin-api-context-external-tool.api.spec.ts @@ -1,8 +1,8 @@ import { EntityManager, MikroORM } from '@mikro-orm/core'; -import { AdminApiServerTestModule } from '@modules/server/admin-api.server.module'; import { HttpStatus, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { Course, SchoolEntity } from '@shared/domain/entity'; +import { AdminApiServerTestModule } from '@src/modules/server/admin-api.server.app.module'; // admin-api-context-external-tool and test file is wrong placed need to be part of a admin-api-module folder import { adminApiServerConfig } from '@modules/server/admin-api-server.config'; import { courseFactory } from '@testing/factory/course.factory'; diff --git a/apps/server/src/modules/tool/external-tool/controller/api-test/admin-api-external-tool.api.spec.ts b/apps/server/src/modules/tool/external-tool/controller/api-test/admin-api-external-tool.api.spec.ts index fc7283c4e9c..8ba198db823 100644 --- a/apps/server/src/modules/tool/external-tool/controller/api-test/admin-api-external-tool.api.spec.ts +++ b/apps/server/src/modules/tool/external-tool/controller/api-test/admin-api-external-tool.api.spec.ts @@ -1,7 +1,7 @@ import { EntityManager, MikroORM } from '@mikro-orm/core'; -import { AdminApiServerTestModule } from '@modules/server/admin-api.server.module'; import { HttpStatus, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; +import { AdminApiServerTestModule } from '@src/modules/server/admin-api.server.app.module'; // admin-api-external-tool and test file is wrong placed need to be part of a admin-api-module folder import { adminApiServerConfig } from '@modules/server/admin-api-server.config'; import { TestApiClient } from '@testing/test-api-client'; diff --git a/apps/server/src/modules/tool/school-external-tool/controller/api-test/admin-api-school-external-tool.api.spec.ts b/apps/server/src/modules/tool/school-external-tool/controller/api-test/admin-api-school-external-tool.api.spec.ts index 76cbc744352..7302e89a1b0 100644 --- a/apps/server/src/modules/tool/school-external-tool/controller/api-test/admin-api-school-external-tool.api.spec.ts +++ b/apps/server/src/modules/tool/school-external-tool/controller/api-test/admin-api-school-external-tool.api.spec.ts @@ -1,8 +1,8 @@ import { EntityManager, MikroORM } from '@mikro-orm/core'; -import { AdminApiServerTestModule } from '@modules/server/admin-api.server.module'; import { HttpStatus, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { SchoolEntity } from '@shared/domain/entity'; +import { AdminApiServerTestModule } from '@src/modules/server/admin-api.server.app.module'; // admin-api-external-tool and test file is wrong placed need to be part of a admin-api-module folder import { adminApiServerConfig } from '@modules/server/admin-api-server.config'; import { schoolEntityFactory } from '@testing/factory/school-entity.factory'; diff --git a/apps/server/src/modules/user-import/controller/api-test/import-user-populate.api.spec.ts b/apps/server/src/modules/user-import/controller/api-test/import-user-populate.api.spec.ts index fa9c34b2107..4547d791a5a 100644 --- a/apps/server/src/modules/user-import/controller/api-test/import-user-populate.api.spec.ts +++ b/apps/server/src/modules/user-import/controller/api-test/import-user-populate.api.spec.ts @@ -3,7 +3,7 @@ import { schulconnexResponseFactory } from '@infra/schulconnex-client/testing'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { OauthTokenResponse } from '@modules/oauth/service/dto'; import { serverConfig, ServerConfig } from '@modules/server'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { HttpStatus, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { Permission, RoleName } from '@shared/domain/interface'; diff --git a/apps/server/src/modules/user-import/controller/api-test/import-user.api.spec.ts b/apps/server/src/modules/user-import/controller/api-test/import-user.api.spec.ts index 1f5e4e47df9..77c55d0ed8a 100644 --- a/apps/server/src/modules/user-import/controller/api-test/import-user.api.spec.ts +++ b/apps/server/src/modules/user-import/controller/api-test/import-user.api.spec.ts @@ -1,6 +1,6 @@ import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { serverConfig, ServerConfig } from '@modules/server'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { SystemEntity } from '@modules/system/entity'; import { FilterImportUserParams, diff --git a/apps/server/src/modules/user/controller/api-test/admin-api-user.api.spec.ts b/apps/server/src/modules/user/controller/api-test/admin-api-user.api.spec.ts index c8447803555..20df74ddfa7 100644 --- a/apps/server/src/modules/user/controller/api-test/admin-api-user.api.spec.ts +++ b/apps/server/src/modules/user/controller/api-test/admin-api-user.api.spec.ts @@ -4,7 +4,7 @@ import { Test, TestingModule } from '@nestjs/testing'; import { User } from '@shared/domain/entity'; import { RoleName } from '@shared/domain/interface'; import { AccountEntity } from '@src/modules/account/domain/entity/account.entity'; -import { AdminApiServerTestModule } from '@src/modules/server/admin-api.server.module'; +import { AdminApiServerTestModule } from '@src/modules/server/admin-api.server.app.module'; import { schoolEntityFactory } from '@testing/factory/school-entity.factory'; import { TestApiClient } from '@testing/test-api-client'; import { nanoid } from 'nanoid'; diff --git a/apps/server/src/modules/user/controller/api-test/user-language.api.spec.ts b/apps/server/src/modules/user/controller/api-test/user-language.api.spec.ts index e227b923d11..efc61e3640a 100644 --- a/apps/server/src/modules/user/controller/api-test/user-language.api.spec.ts +++ b/apps/server/src/modules/user/controller/api-test/user-language.api.spec.ts @@ -2,7 +2,7 @@ import { EntityManager } from '@mikro-orm/mongodb'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { ApiValidationError } from '@shared/common'; import { User } from '@shared/domain/entity'; import { LanguageType } from '@shared/domain/interface'; diff --git a/apps/server/src/modules/user/controller/api-test/user-me.api.spec.ts b/apps/server/src/modules/user/controller/api-test/user-me.api.spec.ts index 9459a503184..6b1278c74fb 100644 --- a/apps/server/src/modules/user/controller/api-test/user-me.api.spec.ts +++ b/apps/server/src/modules/user/controller/api-test/user-me.api.spec.ts @@ -2,7 +2,7 @@ import { EntityManager } from '@mikro-orm/mongodb'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { ServerTestModule } from '@modules/server/server.module'; +import { ServerTestModule } from '@modules/server/server.app.module'; import { UserAndAccountTestFactory } from '@testing/factory/user-and-account.test.factory'; import { TestApiClient } from '@testing/test-api-client'; diff --git a/apps/server/src/modules/user/legacy/controller/api-test/admin-api-students.api.spec.ts b/apps/server/src/modules/user/legacy/controller/api-test/admin-api-students.api.spec.ts index 236965a6514..1e92f7ab20d 100644 --- a/apps/server/src/modules/user/legacy/controller/api-test/admin-api-students.api.spec.ts +++ b/apps/server/src/modules/user/legacy/controller/api-test/admin-api-students.api.spec.ts @@ -4,7 +4,7 @@ import { Test, TestingModule } from '@nestjs/testing'; import { User } from '@shared/domain/entity'; import { RoleName } from '@shared/domain/interface'; import { accountFactory } from '@src/modules/account/testing'; -import { ServerTestModule } from '@src/modules/server/server.module'; +import { ServerTestModule } from '@src/modules/server/server.app.module'; import { roleFactory } from '@testing/factory/role.factory'; import { schoolEntityFactory } from '@testing/factory/school-entity.factory'; import { schoolYearFactory } from '@testing/factory/schoolyear.factory'; diff --git a/apps/server/src/modules/user/legacy/controller/api-test/admin-api-teachers.api.spec.ts b/apps/server/src/modules/user/legacy/controller/api-test/admin-api-teachers.api.spec.ts index 0e52967dbe0..a684920c129 100644 --- a/apps/server/src/modules/user/legacy/controller/api-test/admin-api-teachers.api.spec.ts +++ b/apps/server/src/modules/user/legacy/controller/api-test/admin-api-teachers.api.spec.ts @@ -4,7 +4,7 @@ import { Test, TestingModule } from '@nestjs/testing'; import { User } from '@shared/domain/entity'; import { RoleName } from '@shared/domain/interface'; import { accountFactory } from '@src/modules/account/testing'; -import { ServerTestModule } from '@src/modules/server/server.module'; +import { ServerTestModule } from '@src/modules/server/server.app.module'; import { roleFactory } from '@testing/factory/role.factory'; import { schoolEntityFactory } from '@testing/factory/school-entity.factory'; import { schoolYearFactory } from '@testing/factory/schoolyear.factory'; diff --git a/config/README.md b/config/README.md index 4fd56534afb..213212414f1 100644 --- a/config/README.md +++ b/config/README.md @@ -254,7 +254,7 @@ Mocking in api tests. Configuration.set('MY_ENVIREMENT_VARIABLE', 'value'); // eslint-disable-next-line import/first - import { ServerTestModule } from '@src/modules/server/server.module'; + import { ServerTestModule } from '@src/modules/server/server.app.module'; describe('XXX', () => {