Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BC-8479 - Remove @src #5437

Merged
merged 13 commits into from
Jan 21, 2025
  •  
  •  
  •  
4 changes: 0 additions & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion apps/server/doc/logging.md
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion apps/server/doc/testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions apps/server/src/apps/admin-api-server.app.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/apps/board-collaboration.app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
import { install as sourceMapInstall } from 'source-map-support';

// application imports
import { LegacyLogger, Logger } from '@core/logger';
import { RedisIoAdapter } from '@infra/socketio';

Check warning on line 10 in apps/server/src/apps/board-collaboration.app.ts

View workflow job for this annotation

GitHub Actions / nest_lint

'@infra/socketio' import is restricted from being used by a pattern. apps-modules may NOT import from @apps, @infra, @shared, or migrations
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,
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/apps/common-cartridge.app.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/apps/files-storage.app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
5 changes: 3 additions & 2 deletions apps/server/src/apps/fwu-learning-contents.app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
5 changes: 3 additions & 2 deletions apps/server/src/apps/h5p-editor.app.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* istanbul ignore file */
/* eslint-disable no-console */
import { NestFactory } from '@nestjs/core';

Check warning on line 3 in apps/server/src/apps/h5p-editor.app.ts

View workflow job for this annotation

GitHub Actions / nest_lint

Filename 'h5p-editor.app.ts' does not match kebabcase
import { ExpressAdapter } from '@nestjs/platform-express';
import express from 'express';

Expand All @@ -8,9 +8,10 @@
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();
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/apps/h5p-library-management.app.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/* istanbul ignore file */
/* eslint-disable no-console */
import { LegacyLogger } from '@core/logger';

Check warning on line 3 in apps/server/src/apps/h5p-library-management.app.ts

View workflow job for this annotation

GitHub Actions / nest_lint

Filename 'h5p-library-management.app.ts' does not match kebabcase
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> {
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/apps/helpers/app-start-loggable.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Loggable, LogMessage, LogMessageData } from '@src/core/logger';
import { Loggable, LogMessage, LogMessageData } from '@core/logger';

interface AppStartInfo {
appName: string;
Expand All @@ -10,7 +10,7 @@
export class AppStartLoggable implements Loggable {
constructor(private readonly info: AppStartInfo) {}

getLogMessage(): LogMessage {

Check warning on line 13 in apps/server/src/apps/helpers/app-start-loggable.ts

View workflow job for this annotation

GitHub Actions / nest_lint

Missing accessibility modifier on method definition getLogMessage
const data: LogMessageData = { appName: this.info.appName };

if (this.info.port !== undefined) {
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/apps/helpers/metrics/prometheus-metrics.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -19,7 +19,7 @@
export class PrometheusMetricsSetupStateLoggable implements Loggable {
constructor(private readonly state: PrometheusMetricsSetupState) {}

getLogMessage(): LogMessage {

Check warning on line 22 in apps/server/src/apps/helpers/metrics/prometheus-metrics.ts

View workflow job for this annotation

GitHub Actions / nest_lint

Missing accessibility modifier on method definition getLogMessage
return {
message: 'Setting up Prometheus metrics...',
data: {
Expand All @@ -29,7 +29,7 @@
}
}

export const addPrometheusMetricsMiddlewaresIfEnabled = (logger: Logger, app: Express) => {

Check warning on line 32 in apps/server/src/apps/helpers/metrics/prometheus-metrics.ts

View workflow job for this annotation

GitHub Actions / nest_lint

Missing return type on function
if (!PrometheusMetricsConfig.instance.isEnabled) {
logger.debug(
new PrometheusMetricsSetupStateLoggable(
Expand All @@ -49,7 +49,7 @@
);
};

export const createAndStartPrometheusMetricsAppIfEnabled = (logger: Logger) => {

Check warning on line 52 in apps/server/src/apps/helpers/metrics/prometheus-metrics.ts

View workflow job for this annotation

GitHub Actions / nest_lint

Missing return type on function
if (!PrometheusMetricsConfig.instance.isEnabled) {
logger.debug(
new PrometheusMetricsSetupStateLoggable(PrometheusMetricsSetupState.FEATURE_DISABLED_APP_WILL_NOT_BE_CREATED)
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/apps/management.app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/apps/server.app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/config/mikro-orm-cli.config.ts
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions apps/server/src/core/error/domain/domain-error-handler.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
9 changes: 6 additions & 3 deletions apps/server/src/core/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
export { CoreModule } from './core.module';
export { DomainErrorHandler } from './error';
bergatco marked this conversation as resolved.
Show resolved Hide resolved
export { CoreModuleConfig } from './core.config';
/**
Import external dependencies directly, not from here.
Avoid loading all external references for testing.
Do not re-export here.
*/
2 changes: 1 addition & 1 deletion apps/server/src/infra/antivirus/antivirus.service.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/infra/cache/cache.module.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/infra/calendar/calendar.config.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { LoggerConfig } from '@src/core/logger';
import { LoggerConfig } from '@core/logger';

export interface CalendarConfig extends LoggerConfig {}
2 changes: 1 addition & 1 deletion apps/server/src/infra/calendar/calendar.module.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions apps/server/src/infra/calendar/service/calendar.service.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/infra/encryption/encryption.module.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/infra/encryption/encryption.service.ts
Original file line number Diff line number Diff line change
@@ -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()
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Loading
Loading