solved some merge conflicts

hpi-schul-cloud · Nov 13, 2023 · af9b2cf · af9b2cf
1 parent 5f38b88
commit af9b2cf
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/apps/server/src/modules/files-storage-client/dto/file.dto.ts b/apps/server/src/modules/files-storage-client/dto/file.dto.ts
@@ -1,6 +1,6 @@
-import { EntityId } from '@shared/domain';
 import { FileRecordParentType } from '@infra/rabbitmq';
-import { IFileDomainObjectProps } from '../interfaces';
+import { EntityId } from '@shared/domain';
+import { FileDomainObjectProps } from '../interfaces';
 
 export class FileDto {
 	id: EntityId;

diff --git a/apps/server/src/modules/files-storage-client/mapper/files-storage-client.mapper.spec.ts b/apps/server/src/modules/files-storage-client/mapper/files-storage-client.mapper.spec.ts
@@ -1,5 +1,5 @@
 import { FileRecordParentType } from '@infra/rabbitmq';
-import { ICopyFileDomainObjectProps, IFileDomainObjectProps } from '../interfaces';
+import { CopyFileDomainObjectProps, FileDomainObjectProps } from '../interfaces';
 import { FilesStorageClientMapper } from './files-storage-client.mapper';
 
 describe('FilesStorageClientMapper', () => {

diff --git a/apps/server/src/modules/files-storage-client/service/files-storage.producer.ts b/apps/server/src/modules/files-storage-client/service/files-storage.producer.ts
@@ -1,8 +1,4 @@
 import { AmqpConnection } from '@golevelup/nestjs-rabbitmq';
-import { Injectable } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
-import { EntityId } from '@shared/domain';
-import { LegacyLogger } from '@src/core/logger';
 import {
 	FilesStorageEvents,
 	FilesStorageExchange,
@@ -12,7 +8,11 @@ import {
 	IFileRecordParams,
 	RpcMessageProducer,
 } from '@infra/rabbitmq';
-import { IFilesStorageClientConfig } from '../interfaces';
+import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+import { EntityId } from '@shared/domain';
+import { LegacyLogger } from '@src/core/logger';
+import { FilesStorageClientConfig } from '../interfaces';
 
 @Injectable()
 export class FilesStorageProducer extends RpcMessageProducer {

diff --git a/apps/server/src/modules/files-storage/files-storage.config.ts b/apps/server/src/modules/files-storage/files-storage.config.ts
@@ -1,6 +1,6 @@
 import { Configuration } from '@hpi-schul-cloud/commons';
 import { S3Config } from '@infra/s3-client';
-import { ICoreModuleConfig } from '@src/core';
+import { CoreModuleConfig } from '@src/core';
 
 export const FILES_STORAGE_S3_CONNECTION = 'FILES_STORAGE_S3_CONNECTION';
 export interface FileStorageConfig extends CoreModuleConfig {