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.

Sign up for GitHub

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-5655 move shared infra #4526

Merged
merged 9 commits into from
Nov 8, 2023
Merged

BC-5655 move shared infra #4526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9d50a11
Move shared/infra to src/infra
CeEv Nov 7, 2023
a31c8a9
Add ts alias for src/infra
CeEv Nov 7, 2023
5e5edfd
replace shared alias with @infra
CeEv Nov 7, 2023
22ce9b6
Fix wrong import
CeEv Nov 7, 2023
cfcdb5e
fix imports and linter
CeEv Nov 7, 2023
da85eba
Fix readme path
CeEv Nov 7, 2023
8b9ae7d
Merge branch 'main' into BC-5655-move-shared-infra
CeEv Nov 8, 2023
e6c4239
Merge branch 'main' into BC-5655-move-shared-infra
CeEv Nov 8, 2023
3cac1d7
resolve merge conflicts and cleanup path imports
CeEv Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion apps/server/doc/summary.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
},
{
"title": "S3ClientModule",
"file": "../src/shared/infra/s3-client/README.md"
"file": "../src/infra/s3-client/README.md"
}
]
}
Expand Down
6 changes: 3 additions & 3 deletions apps/server/src/apps/helpers/prometheus-metrics.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
PrometheusMetricsConfig,
createAPIResponseTimeMetricMiddleware,
createPrometheusMetricsApp,
} from '@shared/infra/metrics';
} from '@infra/metrics';
import { Logger } from '@src/core/logger';
import express, { Express, NextFunction, Request, RequestHandler, Response } from 'express';
import {
Expand All @@ -15,9 +15,9 @@ import {
createAndStartPrometheusMetricsAppIfEnabled,
} from './prometheus-metrics';

jest.mock('@shared/infra/metrics', () => {
jest.mock('@infra/metrics', () => {
const moduleMock: unknown = {
...jest.requireActual('@shared/infra/metrics'),
...jest.requireActual('@infra/metrics'),
createAPIResponseTimeMetricMiddleware: jest.fn(),
createPrometheusMetricsApp: jest.fn(),
};
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/apps/helpers/prometheus-metrics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
PrometheusMetricsConfig,
createAPIResponseTimeMetricMiddleware,
createPrometheusMetricsApp,
} from '@shared/infra/metrics';
} from '@infra/metrics';
import { LogMessage, Loggable, Logger } from '@src/core/logger';
import { AppStartLoggable } from './app-start-loggable';

Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/apps/server.app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { MikroORM } from '@mikro-orm/core';
import { NestFactory } from '@nestjs/core';
import { ExpressAdapter } from '@nestjs/platform-express';
import { enableOpenApiDocs } from '@shared/controller/swagger';
import { Mail, MailService } from '@shared/infra/mail';
import { Mail, MailService } from '@infra/mail';
import { LegacyLogger, Logger } from '@src/core/logger';
import { AccountService } from '@modules/account/services/account.service';
import { TeamService } from '@modules/teams/service/team.service';
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/console/api-test/database-management.console.api.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { INestApplicationContext } from '@nestjs/common';
import { ConsoleWriterService } from '@shared/infra/console';
import { ConsoleWriterService } from '@infra/console';
import { ServerConsoleModule } from '@src/console/console.module';
CeEv marked this conversation as resolved.
Show resolved Hide resolved
import { CommanderError } from 'commander';
import { BootstrapConsole, ConsoleService } from 'nestjs-console';
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/console/api-test/server-console.api.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { INestApplicationContext } from '@nestjs/common';

import { BootstrapConsole, ConsoleService } from 'nestjs-console';
import { ServerConsoleModule } from '@src/console/console.module';
import { ConsoleWriterService } from '@shared/infra/console';
import { ConsoleWriterService } from '@infra/console';
import { execute, TestBootstrapConsole } from './test-bootstrap.console';

describe('ServerConsole (API)', () => {
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/console/api-test/test-bootstrap.console.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { createMock } from '@golevelup/ts-jest';
import { Test, TestingModule } from '@nestjs/testing';
import { ConsoleWriterService } from '@shared/infra/console';
import { ConsoleWriterService } from '@infra/console';
import { DatabaseManagementUc } from '@modules/management/uc/database-management.uc';
import { AbstractBootstrapConsole, BootstrapConsole } from 'nestjs-console';

Expand Down
4 changes: 2 additions & 2 deletions apps/server/src/console/console.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { MikroOrmModule } from '@mikro-orm/nestjs';
import { Module, NotFoundException } from '@nestjs/common';
import { ConfigModule } from '@nestjs/config';
import { ALL_ENTITIES } from '@shared/domain';
import { ConsoleWriterModule } from '@shared/infra/console/console-writer/console-writer.module';
import { KeycloakModule } from '@shared/infra/identity-management/keycloak/keycloak.module';
import { ConsoleWriterModule } from '@infra/console/console-writer/console-writer.module';
import { KeycloakModule } from '@infra/identity-management/keycloak/keycloak.module';
import { DB_PASSWORD, DB_URL, DB_USERNAME, createConfigModuleOptions } from '@src/config';
import { FilesModule } from '@modules/files';
import { FileEntity } from '@modules/files/entity';
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/console/server.console.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Test, TestingModule } from '@nestjs/testing';
import { ConsoleWriterService } from '@shared/infra/console';
import { ConsoleWriterService } from '@infra/console';
import { ServerConsoleModule } from './console.module';
import { ServerConsole } from './server.console';

Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/console/server.console.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable no-console */
import { Command, Console } from 'nestjs-console';
import { ConsoleWriterService } from '@shared/infra/console';
import { ConsoleWriterService } from '@infra/console';

@Console({ command: 'server', description: 'sample server console' })
export class ServerConsole {
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/core/error/filter/global-error.filter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ArgumentsHost, Catch, ExceptionFilter, HttpException, InternalServerErrorException } from '@nestjs/common';
import { ApiValidationError, BusinessError } from '@shared/common';
import { IError, RpcMessage } from '@shared/infra/rabbitmq/rpc-message';
import { IError, RpcMessage } from '@infra/rabbitmq/rpc-message';
import { ErrorLogger, Loggable } from '@src/core/logger';
import { LoggingUtils } from '@src/core/logger/logging.utils';
import { Response } from 'express';
Expand Down
0 .../infra/antivirus/antivirus.module.spec.ts → .../infra/antivirus/antivirus.module.spec.ts
View file
Open in desktop
File renamed without changes.
0 ...hared/infra/antivirus/antivirus.module.ts → ...r/src/infra/antivirus/antivirus.module.ts
View file
Open in desktop
File renamed without changes.
0 ...infra/antivirus/antivirus.service.spec.ts → ...infra/antivirus/antivirus.service.spec.ts
View file
Open in desktop
File renamed without changes.
0 ...ared/infra/antivirus/antivirus.service.ts → .../src/infra/antivirus/antivirus.service.ts
View file
Open in desktop
File renamed without changes.
0 ...erver/src/shared/infra/antivirus/index.ts → apps/server/src/infra/antivirus/index.ts
View file
Open in desktop
File renamed without changes.
0 ...d/infra/antivirus/interfaces/antivirus.ts → ...c/infra/antivirus/interfaces/antivirus.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...hared/infra/antivirus/interfaces/index.ts → ...r/src/infra/antivirus/interfaces/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export * from './antivirus';
export * from './antivirus';
0 ...er/src/shared/infra/cache/cache.module.ts → apps/server/src/infra/cache/cache.module.ts
View file
Open in desktop
File renamed without changes.
0 apps/server/src/shared/infra/cache/index.ts → apps/server/src/infra/cache/index.ts
View file
Open in desktop
File renamed without changes.
0 .../cache/interface/cache-store-type.enum.ts → .../cache/interface/cache-store-type.enum.ts
View file
Open in desktop
File renamed without changes.
0 ...src/shared/infra/cache/interface/index.ts → ...server/src/infra/cache/interface/index.ts
View file
Open in desktop
File renamed without changes.
0 ...ared/infra/cache/service/cache.service.ts → .../src/infra/cache/service/cache.service.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions .../shared/infra/calendar/calendar.module.ts → ...ver/src/infra/calendar/calendar.module.ts
View file
Open in desktop
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 { CalendarService } from '@shared/infra/calendar/service/calendar.service';
import { CalendarMapper } from '@shared/infra/calendar/mapper/calendar.mapper';
import { CalendarService } from './service/calendar.service';
import { CalendarMapper } from './mapper/calendar.mapper';

@Module({
imports: [HttpModule],
Expand Down
0 .../infra/calendar/dto/calendar-event.dto.ts → .../infra/calendar/dto/calendar-event.dto.ts
View file
Open in desktop
File renamed without changes.
0 ...server/src/shared/infra/calendar/index.ts → apps/server/src/infra/calendar/index.ts
View file
Open in desktop
File renamed without changes.
0 ...dar/interface/calendar-event.interface.ts → ...dar/interface/calendar-event.interface.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...a/calendar/mapper/calendar.mapper.spec.ts → ...a/calendar/mapper/calendar.mapper.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ICalendarEvent } from '@shared/infra/calendar/interface/calendar-event.interface';
import { ICalendarEvent } from '@infra/calendar/interface/calendar-event.interface';
import { Test, TestingModule } from '@nestjs/testing';
import { CalendarMapper } from '@shared/infra/calendar/mapper/calendar.mapper';
import { CalendarMapper } from './calendar.mapper';

describe('CalendarMapper', () => {
let module: TestingModule;
Expand Down
4 changes: 2 additions & 2 deletions .../infra/calendar/mapper/calendar.mapper.ts → .../infra/calendar/mapper/calendar.mapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ICalendarEvent } from '@shared/infra/calendar/interface/calendar-event.interface';
import { ICalendarEvent } from '@infra/calendar/interface/calendar-event.interface';
import { Injectable } from '@nestjs/common';
import { CalendarEventDto } from '@shared/infra/calendar/dto/calendar-event.dto';
import { CalendarEventDto } from '../dto/calendar-event.dto';

@Injectable()
export class CalendarMapper {
Expand Down
6 changes: 3 additions & 3 deletions ...calendar/service/calendar.service.spec.ts → ...calendar/service/calendar.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import { Configuration } from '@hpi-schul-cloud/commons/lib';
import { HttpService } from '@nestjs/axios';
import { InternalServerErrorException } from '@nestjs/common';
import { Test, TestingModule } from '@nestjs/testing';
import { CalendarEventDto, CalendarService } from '@shared/infra/calendar';
import { ICalendarEvent } from '@shared/infra/calendar/interface/calendar-event.interface';
import { CalendarMapper } from '@shared/infra/calendar/mapper/calendar.mapper';
import { CalendarEventDto, CalendarService } from '@infra/calendar';
import { axiosResponseFactory } from '@shared/testing';
import { AxiosResponse } from 'axios';
import { of, throwError } from 'rxjs';
import { CalendarMapper } from '../mapper/calendar.mapper';
import { ICalendarEvent } from '../interface/calendar-event.interface';

describe('CalendarServiceSpec', () => {
let module: TestingModule;
Expand Down
4 changes: 2 additions & 2 deletions ...nfra/calendar/service/calendar.service.ts → ...nfra/calendar/service/calendar.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import { Configuration } from '@hpi-schul-cloud/commons/lib';
import { HttpService } from '@nestjs/axios';
import { Injectable, InternalServerErrorException } from '@nestjs/common';
import { EntityId } from '@shared/domain';
import { CalendarEventDto } from '@shared/infra/calendar/dto/calendar-event.dto';
import { CalendarMapper } from '@shared/infra/calendar/mapper/calendar.mapper';
import { ErrorUtils } from '@src/core/error/utils';
import { AxiosRequestConfig, AxiosResponse } from 'axios';
import { Observable, firstValueFrom } from 'rxjs';
import { URL, URLSearchParams } from 'url';
import { CalendarMapper } from '../mapper/calendar.mapper';
import { CalendarEventDto } from '../dto/calendar-event.dto';
import { ICalendarEvent } from '../interface/calendar-event.interface';

@Injectable()
Expand Down
6 changes: 3 additions & 3 deletions ...e/collaborative-storage-adapter.module.ts → ...e/collaborative-storage-adapter.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { Configuration } from '@hpi-schul-cloud/commons/lib';
import { HttpModule } from '@nestjs/axios';
import { Module, Provider } from '@nestjs/common';
import { CollaborativeStorageAdapterMapper } from '@shared/infra/collaborative-storage/mapper/collaborative-storage-adapter.mapper';
import { NextcloudClient } from '@shared/infra/collaborative-storage/strategy/nextcloud/nextcloud.client';
import { NextcloudStrategy } from '@shared/infra/collaborative-storage/strategy/nextcloud/nextcloud.strategy';
import { LtiToolRepo } from '@shared/repo/ltitool/';
import { LoggerModule } from '@src/core/logger';
import { ToolModule } from '@modules/tool';
import { PseudonymModule } from '@modules/pseudonym';
import { UserModule } from '@modules/user';
import { NextcloudStrategy } from './strategy/nextcloud/nextcloud.strategy';
import { NextcloudClient } from './strategy/nextcloud/nextcloud.client';
import { CollaborativeStorageAdapterMapper } from './mapper';
import { CollaborativeStorageAdapter } from './collaborative-storage.adapter';

const storageStrategy: Provider = {
Expand Down
8 changes: 4 additions & 4 deletions ...age/collaborative-storage.adapter.spec.ts → ...age/collaborative-storage.adapter.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
import { ObjectId } from '@mikro-orm/mongodb';
import { Test, TestingModule } from '@nestjs/testing';
import { RoleName } from '@shared/domain';
import { CollaborativeStorageAdapter } from '@shared/infra/collaborative-storage/collaborative-storage.adapter';
import { CollaborativeStorageAdapterMapper } from '@shared/infra/collaborative-storage/mapper/collaborative-storage-adapter.mapper';
import { ICollaborativeStorageStrategy } from '@shared/infra/collaborative-storage/strategy/base.interface.strategy';
import { LegacyLogger } from '@src/core/logger';
import { TeamDto } from '@modules/collaborative-storage/services/dto/team.dto';
import { TeamDto } from '@modules/collaborative-storage/services/dto/team.dto'; // invalid import please fix
import { CollaborativeStorageAdapter } from './collaborative-storage.adapter';
import { CollaborativeStorageAdapterMapper } from './mapper/collaborative-storage-adapter.mapper';
import { ICollaborativeStorageStrategy } from './strategy/base.interface.strategy';

class TestStrategy implements ICollaborativeStorageStrategy {
baseURL: string;
Expand Down Expand Up @@ -56,7 +56,7 @@
],
}).compile();
adapter = module.get(CollaborativeStorageAdapter);
strategy = adapter.strategy;

Check warning on line 59 in apps/server/src/infra/collaborative-storage/collaborative-storage.adapter.spec.ts

View workflow job for this annotation

GitHub Actions / nest_lint 

Use object destructuring
});

afterEach(() => {
Expand Down
4 changes: 2 additions & 2 deletions ...-storage/collaborative-storage.adapter.ts → ...-storage/collaborative-storage.adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { TeamPermissionsDto } from '@modules/collaborative-storage/services/dto/team-permissions.dto';
import { TeamDto } from '@modules/collaborative-storage/services/dto/team.dto';
import { ICollaborativeStorageStrategy } from '@shared/infra/collaborative-storage/strategy/base.interface.strategy';
import { Inject, Injectable } from '@nestjs/common';
import { CollaborativeStorageAdapterMapper } from '@shared/infra/collaborative-storage/mapper/collaborative-storage-adapter.mapper';
import { LegacyLogger } from '@src/core/logger';
import { RoleDto } from '@modules/role/service/dto/role.dto';
import { CollaborativeStorageAdapterMapper } from './mapper/collaborative-storage-adapter.mapper';
import { ICollaborativeStorageStrategy } from './strategy/base.interface.strategy';

/**
* Provides an Adapter to an external collaborative storage.
Expand Down
0 ...-storage/dto/team-role-permissions.dto.ts → ...-storage/dto/team-role-permissions.dto.ts
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions apps/server/src/infra/collaborative-storage/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export { CollaborativeStorageAdapter } from './collaborative-storage.adapter';
export { CollaborativeStorageAdapterModule } from './collaborative-storage-adapter.module';
2 changes: 1 addition & 1 deletion ...laborative-storage-adapter.mapper.spec.ts → ...laborative-storage-adapter.mapper.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Test, TestingModule } from '@nestjs/testing';
import { RoleName } from '@shared/domain';
import { CollaborativeStorageAdapterMapper } from '@shared/infra/collaborative-storage/mapper/collaborative-storage-adapter.mapper';
import { CollaborativeStorageAdapterMapper } from '@infra/collaborative-storage/mapper/collaborative-storage-adapter.mapper';
CeEv marked this conversation as resolved.
Show resolved Hide resolved

describe('TeamStorage Mapper', () => {
let module: TestingModule;
Expand Down
0 ...r/collaborative-storage-adapter.mapper.ts → ...r/collaborative-storage-adapter.mapper.ts
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions apps/server/src/infra/collaborative-storage/mapper/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './collaborative-storage-adapter.mapper';
0 ...orage/strategy/base.interface.strategy.ts → ...orage/strategy/base.interface.strategy.ts
View file
Open in desktop
File renamed without changes.
0 ...xtcloud/httpRequests/NextcloudGroups.http → ...xtcloud/httpRequests/NextcloudGroups.http
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...rategy/nextcloud/nextcloud.client.spec.ts → ...rategy/nextcloud/nextcloud.client.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ 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 { NextcloudClient } from '@shared/infra/collaborative-storage/strategy/nextcloud/nextcloud.client';
import { axiosResponseFactory } from '@shared/testing';
import { LegacyLogger } from '@src/core/logger';
import { AxiosResponse } from 'axios';
import { Observable, of } from 'rxjs';
import { NextcloudClient } from './nextcloud.client';
import {
GroupUsers,
GroupfoldersCreated,
Expand Down
2 changes: 1 addition & 1 deletion ...ge/strategy/nextcloud/nextcloud.client.ts → ...ge/strategy/nextcloud/nextcloud.client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
NextcloudGroups,
OcsResponse,
SuccessfulRes,
} from '@shared/infra/collaborative-storage/strategy/nextcloud/nextcloud.interface';
} from '@infra/collaborative-storage/strategy/nextcloud/nextcloud.interface';
CeEv marked this conversation as resolved.
Show resolved Hide resolved
import { ErrorUtils } from '@src/core/error/utils';
import { LegacyLogger } from '@src/core/logger';
import { AxiosRequestConfig, AxiosResponse } from 'axios';
Expand Down
0 ...strategy/nextcloud/nextcloud.interface.ts → ...strategy/nextcloud/nextcloud.interface.ts
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...tegy/nextcloud/nextcloud.strategy.spec.ts → ...tegy/nextcloud/nextcloud.strategy.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ import { UnprocessableEntityException } from '@nestjs/common';
import { Test, TestingModule } from '@nestjs/testing';
import { LtiPrivacyPermission, LtiRoleType, Pseudonym, RoleName, User, UserDO } from '@shared/domain';
import { LtiToolDO } from '@shared/domain/domainobject/ltitool.do';
import { TeamRolePermissionsDto } from '@shared/infra/collaborative-storage/dto/team-role-permissions.dto';
import { NextcloudClient } from '@shared/infra/collaborative-storage/strategy/nextcloud/nextcloud.client';
import { NextcloudStrategy } from '@shared/infra/collaborative-storage/strategy/nextcloud/nextcloud.strategy';
import { LtiToolRepo } from '@shared/repo';
import { ltiToolDOFactory, pseudonymFactory, setupEntities, userDoFactory, userFactory } from '@shared/testing';
import { LegacyLogger } from '@src/core/logger';
import { TeamDto, TeamUserDto } from '@modules/collaborative-storage/services/dto/team.dto';
import { PseudonymService } from '@modules/pseudonym';
import { ExternalToolService } from '@modules/tool/external-tool/service';
import { UserService } from '@modules/user';
import { NextcloudStrategy } from './nextcloud.strategy';
import { NextcloudClient } from './nextcloud.client';
import { TeamRolePermissionsDto } from '../../dto/team-role-permissions.dto';

class NextcloudStrategySpec extends NextcloudStrategy {
static specGenerateGroupId(dto: TeamRolePermissionsDto): string {
Expand Down
0 .../strategy/nextcloud/nextcloud.strategy.ts → .../strategy/nextcloud/nextcloud.strategy.ts
View file
Open in desktop
File renamed without changes.
0 ...tive-storage/strategy/nextcloud/test.json → ...tive-storage/strategy/nextcloud/test.json
View file
Open in desktop
File renamed without changes.
0 ...sole-writer/console-writer.module.spec.ts → ...sole-writer/console-writer.module.spec.ts
View file
Open in desktop
File renamed without changes.
0 ...e/console-writer/console-writer.module.ts → ...e/console-writer/console-writer.module.ts
View file
Open in desktop
File renamed without changes.
0 ...ole-writer/console-writer.service.spec.ts → ...ole-writer/console-writer.service.spec.ts
View file
Open in desktop
File renamed without changes.
0 .../console-writer/console-writer.service.ts → .../console-writer/console-writer.service.ts
View file
Open in desktop
File renamed without changes.
0 ...red/infra/console/console-writer/index.ts → ...src/infra/console/console-writer/index.ts
View file
Open in desktop
File renamed without changes.
0 .../server/src/shared/infra/console/index.ts → apps/server/src/infra/console/index.ts
View file
Open in desktop
File renamed without changes.
0 ...server/src/shared/infra/database/index.ts → apps/server/src/infra/database/index.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...gement/database-management.module.spec.ts → ...gement/database-management.module.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Test, TestingModule } from '@nestjs/testing';
import { MongoMemoryDatabaseModule } from '@shared/infra/database';
import { MongoMemoryDatabaseModule } from '@infra/database';
import { DatabaseManagementModule } from './database-management.module';
import { DatabaseManagementService } from './database-management.service';

Expand Down
0 .../management/database-management.module.ts → .../management/database-management.module.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ement/database-management.service.spec.ts → ...ement/database-management.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { MikroORM } from '@mikro-orm/core';
import { Test, TestingModule } from '@nestjs/testing';
import { MongoMemoryDatabaseModule } from '@shared/infra/database';
import { MongoMemoryDatabaseModule } from '@infra/database';
import { ObjectId } from 'mongodb';
import { DatabaseManagementService } from './database-management.service';

Expand Down
0 ...management/database-management.service.ts → ...management/database-management.service.ts
View file
Open in desktop
File renamed without changes.
0 ...shared/infra/database/management/index.ts → ...er/src/infra/database/management/index.ts
View file
Open in desktop
File renamed without changes.
0 ...a/database/mongo-memory-database/index.ts → ...a/database/mongo-memory-database/index.ts
View file
Open in desktop
File renamed without changes.
0 ...-database/mongo-memory-database.module.ts → ...-database/mongo-memory-database.module.ts
View file
Open in desktop
File renamed without changes.
0 ...a/database/mongo-memory-database/types.ts → ...a/database/mongo-memory-database/types.ts
View file
Open in desktop
File renamed without changes.
0 .../infra/encryption/encryption.interface.ts → .../infra/encryption/encryption.interface.ts
View file
Open in desktop
File renamed without changes.
0 ...nfra/encryption/encryption.module.spec.ts → ...nfra/encryption/encryption.module.spec.ts
View file
Open in desktop
File renamed without changes.
0 ...red/infra/encryption/encryption.module.ts → ...src/infra/encryption/encryption.module.ts
View file
Open in desktop
File renamed without changes.
0 ...fra/encryption/encryption.service.spec.ts → ...fra/encryption/encryption.service.spec.ts
View file
Open in desktop
File renamed without changes.
0 ...ed/infra/encryption/encryption.service.ts → ...rc/infra/encryption/encryption.service.ts
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...rver/src/shared/infra/encryption/index.ts → apps/server/src/infra/encryption/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export * from './encryption.module';
export * from './encryption.interface';
export * from './encryption.service';
export * from './encryption.module';
export * from './encryption.interface';
export * from './encryption.service';
0 ...eathers/feathers-service.provider.spec.ts → ...eathers/feathers-service.provider.spec.ts
View file
Open in desktop
File renamed without changes.
0 ...fra/feathers/feathers-service.provider.ts → ...fra/feathers/feathers-service.provider.ts
View file
Open in desktop
File renamed without changes.
0 .../shared/infra/feathers/feathers.module.ts → ...ver/src/infra/feathers/feathers.module.ts
View file
Open in desktop
File renamed without changes.
0 ...server/src/shared/infra/feathers/index.ts → apps/server/src/infra/feathers/index.ts
View file
Open in desktop
File renamed without changes.
0 ...a/file-system/file-system.adapter.spec.ts → ...a/file-system/file-system.adapter.spec.ts
View file
Open in desktop
File renamed without changes.
0 .../infra/file-system/file-system.adapter.ts → .../infra/file-system/file-system.adapter.ts
View file
Open in desktop
File renamed without changes.
0 ...ra/file-system/file-system.module.spec.ts → ...ra/file-system/file-system.module.spec.ts
View file
Open in desktop
File renamed without changes.
0 ...d/infra/file-system/file-system.module.ts → ...c/infra/file-system/file-system.module.ts
View file
Open in desktop
File renamed without changes.
0 ...ver/src/shared/infra/file-system/index.ts → apps/server/src/infra/file-system/index.ts
View file
Open in desktop
File renamed without changes.
0 ...red/infra/file-system/utf-8-test-file.txt → ...src/infra/file-system/utf-8-test-file.txt
View file
Open in desktop
File renamed without changes.
0 ...ment/identity-management-oauth.service.ts → ...ment/identity-management-oauth.service.ts
View file
Open in desktop
File renamed without changes.
0 ...-management/identity-management.config.ts → ...-management/identity-management.config.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...gement/identity-management.module.spec.ts → ...gement/identity-management.module.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Test, TestingModule } from '@nestjs/testing';
import { MongoMemoryDatabaseModule } from '@shared/infra/database';
import { MongoMemoryDatabaseModule } from '@infra/database';
import { ConfigModule } from '@nestjs/config';
import { IdentityManagementService } from './identity-management.service';
import { IdentityManagementModule } from './identity-management.module';
Expand Down
0 ...-management/identity-management.module.ts → ...-management/identity-management.module.ts
View file
Open in desktop
File renamed without changes.
0 ...management/identity-management.service.ts → ...management/identity-management.service.ts
View file
Open in desktop
File renamed without changes.
0 ...shared/infra/identity-management/index.ts → ...er/src/infra/identity-management/index.ts
View file
Open in desktop
File renamed without changes.
0 .../interface/keycloak-settings.interface.ts → .../interface/keycloak-settings.interface.ts
View file
Open in desktop
File renamed without changes.
0 ...on/keycloak-administration.module.spec.ts → ...on/keycloak-administration.module.spec.ts
View file
Open in desktop
File renamed without changes.
0 ...tration/keycloak-administration.module.ts → ...tration/keycloak-administration.module.ts
View file
Open in desktop
File renamed without changes.
0 ...eycloak-administration/keycloak-config.ts → ...eycloak-administration/keycloak-config.ts
View file
Open in desktop
File renamed without changes.
0 ...e/keycloak-administration.service.spec.ts → ...e/keycloak-administration.service.spec.ts
View file
Open in desktop
File renamed without changes.
0 ...ervice/keycloak-administration.service.ts → ...ervice/keycloak-administration.service.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...le/keycloak-configuration.console.spec.ts → ...le/keycloak-configuration.console.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { createMock, DeepMocked } from '@golevelup/ts-jest';
import { Test, TestingModule } from '@nestjs/testing';
import { ConsoleWriterService } from '@shared/infra/console';
import { ConsoleWriterService } from '@infra/console';
import { LegacyLogger } from '@src/core/logger';
import { KeycloakConfigurationUc } from '../uc/keycloak-configuration.uc';
import { KeycloakConsole } from './keycloak-configuration.console';
Expand Down
2 changes: 1 addition & 1 deletion ...console/keycloak-configuration.console.ts → ...console/keycloak-configuration.console.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ConsoleWriterService } from '@shared/infra/console';
import { ConsoleWriterService } from '@infra/console';
import { LegacyLogger } from '@src/core/logger';
import { Command, CommandOption, Console } from 'nestjs-console';
import { KeycloakConfigurationUc } from '../uc/keycloak-configuration.uc';
Expand Down
0 ...keycloak-configuration.controller.spec.ts → ...keycloak-configuration.controller.spec.ts
View file
Open in desktop
File renamed without changes.
0 ...ller/keycloak-configuration.controller.ts → ...ller/keycloak-configuration.controller.ts
View file
Open in desktop
File renamed without changes.
0 ...ation/interface/json-account.interface.ts → ...ation/interface/json-account.interface.ts
View file
Open in desktop
File renamed without changes.
0 ...guration/interface/json-user.interface.ts → ...guration/interface/json-user.interface.ts
View file
Open in desktop
File renamed without changes.
0 ...ak-configuration-input-files.interface.ts → ...ak-configuration-input-files.interface.ts
View file
Open in desktop
File renamed without changes.
0 ...keycloak-configuration/keycloak-config.ts → ...keycloak-configuration/keycloak-config.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ion/keycloak-configuration.module.spec.ts → ...ion/keycloak-configuration.module.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Test, TestingModule } from '@nestjs/testing';
import { MongoMemoryDatabaseModule } from '@shared/infra/database';
import { MongoMemoryDatabaseModule } from '@infra/database';
import { ConfigModule } from '@nestjs/config';
import { KeycloakConfigurationModule } from './keycloak-configuration.module';
import { KeycloakConsole } from './console/keycloak-configuration.console';
Expand Down
4 changes: 2 additions & 2 deletions ...guration/keycloak-configuration.module.ts → ...guration/keycloak-configuration.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Module } from '@nestjs/common';
import { LoggerModule } from '@src/core/logger';
import { EncryptionModule } from '@shared/infra/encryption';
import { ConsoleWriterModule } from '@shared/infra/console';
import { EncryptionModule } from '@infra/encryption';
import { ConsoleWriterModule } from '@infra/console';
import { AccountModule } from '@modules/account';
import { SystemModule } from '@modules/system';
import { KeycloakAdministrationModule } from '../keycloak-administration/keycloak-administration.module';
Expand Down
2 changes: 1 addition & 1 deletion ...n/mapper/identity-provider.mapper.spec.ts → ...n/mapper/identity-provider.mapper.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { createMock } from '@golevelup/ts-jest';
import IdentityProviderRepresentation from '@keycloak/keycloak-admin-client/lib/defs/identityProviderRepresentation';
import { ObjectId } from '@mikro-orm/mongodb';
import { Test, TestingModule } from '@nestjs/testing';
import { DefaultEncryptionService, SymetricKeyEncryptionService } from '@shared/infra/encryption';
import { DefaultEncryptionService, SymetricKeyEncryptionService } from '@infra/encryption';
import { OidcConfigDto } from '@modules/system/service';
import { OidcIdentityProviderMapper } from './identity-provider.mapper';

Expand Down
2 changes: 1 addition & 1 deletion ...ration/mapper/identity-provider.mapper.ts → ...ration/mapper/identity-provider.mapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import IdentityProviderRepresentation from '@keycloak/keycloak-admin-client/lib/defs/identityProviderRepresentation';
import { Inject } from '@nestjs/common';
import { DefaultEncryptionService, IEncryptionService } from '@shared/infra/encryption';
import { DefaultEncryptionService, IEncryptionService } from '@infra/encryption';
import { OidcConfigDto } from '@modules/system/service';

export class OidcIdentityProviderMapper {
Expand Down
2 changes: 1 addition & 1 deletion ...configuration.service.integration.spec.ts → ...configuration.service.integration.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import AuthenticationExecutionExportRepresentation from '@keycloak/keycloak-admi
import AuthenticationFlowRepresentation from '@keycloak/keycloak-admin-client/lib/defs/authenticationFlowRepresentation';
import { ConfigModule } from '@nestjs/config';
import { Test, TestingModule } from '@nestjs/testing';
import { MongoMemoryDatabaseModule } from '@shared/infra/database';
import { MongoMemoryDatabaseModule } from '@infra/database';
import { SystemRepo } from '@shared/repo/system/system.repo';
import { systemFactory } from '@shared/testing/factory';
import { LoggerModule } from '@src/core/logger';
Expand Down
2 changes: 1 addition & 1 deletion ...ce/keycloak-configuration.service.spec.ts → ...ce/keycloak-configuration.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { HttpService } from '@nestjs/axios';
import { ConfigService } from '@nestjs/config';
import { Test, TestingModule } from '@nestjs/testing';
import { SystemEntity, SystemTypeEnum } from '@shared/domain';
import { SymetricKeyEncryptionService } from '@shared/infra/encryption';
import { SymetricKeyEncryptionService } from '@infra/encryption';
import { systemFactory } from '@shared/testing';
import { SystemOidcMapper } from '@modules/system/mapper/system-oidc.mapper';
import { SystemOidcService } from '@modules/system/service/system-oidc.service';
Expand Down
0 ...service/keycloak-configuration.service.ts → ...service/keycloak-configuration.service.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...oak-migration.service.integration.spec.ts → ...oak-migration.service.integration.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import KeycloakAdminClient from '@keycloak/keycloak-admin-client';
import { ConfigModule } from '@nestjs/config';
import { Test, TestingModule } from '@nestjs/testing';
import { Account } from '@shared/domain';
import { MongoMemoryDatabaseModule } from '@shared/infra/database';
import { MongoMemoryDatabaseModule } from '@infra/database';
import { accountFactory, cleanupCollections } from '@shared/testing';
import { LoggerModule } from '@src/core/logger';
import { v1 } from 'uuid';
Expand Down
0 ...ervice/keycloak-migration.service.spec.ts → ...ervice/keycloak-migration.service.spec.ts
View file
Open in desktop
File renamed without changes.
0 ...ion/service/keycloak-migration.service.ts → ...ion/service/keycloak-migration.service.ts
View file
Open in desktop
File renamed without changes.
Loading
Loading