diff --git a/apps/server/src/modules/deletion/client/builder/deletion-request-input.builder.spec.ts b/apps/server/src/modules/deletion-client/builder/deletion-request-input.builder.spec.ts similarity index 100% rename from apps/server/src/modules/deletion/client/builder/deletion-request-input.builder.spec.ts rename to apps/server/src/modules/deletion-client/builder/deletion-request-input.builder.spec.ts diff --git a/apps/server/src/modules/deletion/client/builder/deletion-request-input.builder.ts b/apps/server/src/modules/deletion-client/builder/deletion-request-input.builder.ts similarity index 100% rename from apps/server/src/modules/deletion/client/builder/deletion-request-input.builder.ts rename to apps/server/src/modules/deletion-client/builder/deletion-request-input.builder.ts diff --git a/apps/server/src/modules/deletion/client/builder/deletion-request-output.builder.spec.ts b/apps/server/src/modules/deletion-client/builder/deletion-request-output.builder.spec.ts similarity index 100% rename from apps/server/src/modules/deletion/client/builder/deletion-request-output.builder.spec.ts rename to apps/server/src/modules/deletion-client/builder/deletion-request-output.builder.spec.ts diff --git a/apps/server/src/modules/deletion/client/builder/deletion-request-output.builder.ts b/apps/server/src/modules/deletion-client/builder/deletion-request-output.builder.ts similarity index 100% rename from apps/server/src/modules/deletion/client/builder/deletion-request-output.builder.ts rename to apps/server/src/modules/deletion-client/builder/deletion-request-output.builder.ts diff --git a/apps/server/src/modules/deletion/client/builder/deletion-request-target-ref-input.builder.spec.ts b/apps/server/src/modules/deletion-client/builder/deletion-request-target-ref-input.builder.spec.ts similarity index 100% rename from apps/server/src/modules/deletion/client/builder/deletion-request-target-ref-input.builder.spec.ts rename to apps/server/src/modules/deletion-client/builder/deletion-request-target-ref-input.builder.spec.ts diff --git a/apps/server/src/modules/deletion/client/builder/deletion-request-target-ref-input.builder.ts b/apps/server/src/modules/deletion-client/builder/deletion-request-target-ref-input.builder.ts similarity index 100% rename from apps/server/src/modules/deletion/client/builder/deletion-request-target-ref-input.builder.ts rename to apps/server/src/modules/deletion-client/builder/deletion-request-target-ref-input.builder.ts diff --git a/apps/server/src/modules/deletion/client/builder/index.ts b/apps/server/src/modules/deletion-client/builder/index.ts similarity index 100% rename from apps/server/src/modules/deletion/client/builder/index.ts rename to apps/server/src/modules/deletion-client/builder/index.ts diff --git a/apps/server/src/modules/deletion/client/deletion-client.config.spec.ts b/apps/server/src/modules/deletion-client/deletion-client.config.spec.ts similarity index 100% rename from apps/server/src/modules/deletion/client/deletion-client.config.spec.ts rename to apps/server/src/modules/deletion-client/deletion-client.config.spec.ts diff --git a/apps/server/src/modules/deletion/client/deletion-client.config.ts b/apps/server/src/modules/deletion-client/deletion-client.config.ts similarity index 100% rename from apps/server/src/modules/deletion/client/deletion-client.config.ts rename to apps/server/src/modules/deletion-client/deletion-client.config.ts diff --git a/apps/server/src/modules/deletion/client/deletion.client.spec.ts b/apps/server/src/modules/deletion-client/deletion.client.spec.ts similarity index 100% rename from apps/server/src/modules/deletion/client/deletion.client.spec.ts rename to apps/server/src/modules/deletion-client/deletion.client.spec.ts diff --git a/apps/server/src/modules/deletion/client/deletion.client.ts b/apps/server/src/modules/deletion-client/deletion.client.ts similarity index 100% rename from apps/server/src/modules/deletion/client/deletion.client.ts rename to apps/server/src/modules/deletion-client/deletion.client.ts diff --git a/apps/server/src/modules/deletion/client/index.ts b/apps/server/src/modules/deletion-client/index.ts similarity index 100% rename from apps/server/src/modules/deletion/client/index.ts rename to apps/server/src/modules/deletion-client/index.ts diff --git a/apps/server/src/modules/deletion/client/interface/deletion-client-config.interface.ts b/apps/server/src/modules/deletion-client/interface/deletion-client-config.interface.ts similarity index 100% rename from apps/server/src/modules/deletion/client/interface/deletion-client-config.interface.ts rename to apps/server/src/modules/deletion-client/interface/deletion-client-config.interface.ts diff --git a/apps/server/src/modules/deletion/client/interface/deletion-request-input.interface.ts b/apps/server/src/modules/deletion-client/interface/deletion-request-input.interface.ts similarity index 100% rename from apps/server/src/modules/deletion/client/interface/deletion-request-input.interface.ts rename to apps/server/src/modules/deletion-client/interface/deletion-request-input.interface.ts diff --git a/apps/server/src/modules/deletion/client/interface/deletion-request-output.interface.ts b/apps/server/src/modules/deletion-client/interface/deletion-request-output.interface.ts similarity index 100% rename from apps/server/src/modules/deletion/client/interface/deletion-request-output.interface.ts rename to apps/server/src/modules/deletion-client/interface/deletion-request-output.interface.ts diff --git a/apps/server/src/modules/deletion/client/interface/deletion-request-target-ref-input.interface.ts b/apps/server/src/modules/deletion-client/interface/deletion-request-target-ref-input.interface.ts similarity index 100% rename from apps/server/src/modules/deletion/client/interface/deletion-request-target-ref-input.interface.ts rename to apps/server/src/modules/deletion-client/interface/deletion-request-target-ref-input.interface.ts diff --git a/apps/server/src/modules/deletion/client/interface/index.ts b/apps/server/src/modules/deletion-client/interface/index.ts similarity index 100% rename from apps/server/src/modules/deletion/client/interface/index.ts rename to apps/server/src/modules/deletion-client/interface/index.ts diff --git a/apps/server/src/modules/deletion/console/builder/deletion-execution-trigger-result.builder.spec.ts b/apps/server/src/modules/deletion-console/builder/deletion-execution-trigger-result.builder.spec.ts similarity index 100% rename from apps/server/src/modules/deletion/console/builder/deletion-execution-trigger-result.builder.spec.ts rename to apps/server/src/modules/deletion-console/builder/deletion-execution-trigger-result.builder.spec.ts diff --git a/apps/server/src/modules/deletion/console/builder/deletion-execution-trigger-result.builder.ts b/apps/server/src/modules/deletion-console/builder/deletion-execution-trigger-result.builder.ts similarity index 100% rename from apps/server/src/modules/deletion/console/builder/deletion-execution-trigger-result.builder.ts rename to apps/server/src/modules/deletion-console/builder/deletion-execution-trigger-result.builder.ts diff --git a/apps/server/src/modules/deletion/console/builder/index.ts b/apps/server/src/modules/deletion-console/builder/index.ts similarity index 100% rename from apps/server/src/modules/deletion/console/builder/index.ts rename to apps/server/src/modules/deletion-console/builder/index.ts diff --git a/apps/server/src/modules/deletion/console/builder/push-delete-requests-options.builder.spec.ts b/apps/server/src/modules/deletion-console/builder/push-delete-requests-options.builder.spec.ts similarity index 100% rename from apps/server/src/modules/deletion/console/builder/push-delete-requests-options.builder.spec.ts rename to apps/server/src/modules/deletion-console/builder/push-delete-requests-options.builder.spec.ts diff --git a/apps/server/src/modules/deletion/console/builder/push-delete-requests-options.builder.ts b/apps/server/src/modules/deletion-console/builder/push-delete-requests-options.builder.ts similarity index 100% rename from apps/server/src/modules/deletion/console/builder/push-delete-requests-options.builder.ts rename to apps/server/src/modules/deletion-console/builder/push-delete-requests-options.builder.ts diff --git a/apps/server/src/modules/deletion/console/builder/trigger-deletion-execution-options.builder.spec.ts b/apps/server/src/modules/deletion-console/builder/trigger-deletion-execution-options.builder.spec.ts similarity index 100% rename from apps/server/src/modules/deletion/console/builder/trigger-deletion-execution-options.builder.spec.ts rename to apps/server/src/modules/deletion-console/builder/trigger-deletion-execution-options.builder.spec.ts diff --git a/apps/server/src/modules/deletion/console/builder/trigger-deletion-execution-options.builder.ts b/apps/server/src/modules/deletion-console/builder/trigger-deletion-execution-options.builder.ts similarity index 100% rename from apps/server/src/modules/deletion/console/builder/trigger-deletion-execution-options.builder.ts rename to apps/server/src/modules/deletion-console/builder/trigger-deletion-execution-options.builder.ts diff --git a/apps/server/src/modules/deletion/console/deletion-console.module.ts b/apps/server/src/modules/deletion-console/deletion-console.module.ts similarity index 74% rename from apps/server/src/modules/deletion/console/deletion-console.module.ts rename to apps/server/src/modules/deletion-console/deletion-console.module.ts index 504c1c35885..86a337a5da1 100644 --- a/apps/server/src/modules/deletion/console/deletion-console.module.ts +++ b/apps/server/src/modules/deletion-console/deletion-console.module.ts @@ -4,10 +4,10 @@ import { ConfigModule } from '@nestjs/config'; import { ConsoleModule } from 'nestjs-console'; import { ConsoleWriterModule } from '@infra/console'; import { createConfigModuleOptions } from '@src/config'; -import { DeletionClient } from '../client'; -import { getDeletionClientConfig } from '../client/deletion-client.config'; -import { BatchDeletionService } from '../services'; -import { BatchDeletionUc, DeletionExecutionUc } from '../uc'; +import { DeletionClient } from '../deletion-client'; +import { getDeletionClientConfig } from '../deletion-client/deletion-client.config'; +import { BatchDeletionService } from '../deletion/services'; +import { BatchDeletionUc, DeletionExecutionUc } from '../deletion/uc'; import { DeletionQueueConsole } from './deletion-queue.console'; import { DeletionExecutionConsole } from './deletion-execution.console'; diff --git a/apps/server/src/modules/deletion/console/deletion-execution.console.spec.ts b/apps/server/src/modules/deletion-console/deletion-execution.console.spec.ts similarity index 98% rename from apps/server/src/modules/deletion/console/deletion-execution.console.spec.ts rename to apps/server/src/modules/deletion-console/deletion-execution.console.spec.ts index 39519bab6a9..54f21b04a4b 100644 --- a/apps/server/src/modules/deletion/console/deletion-execution.console.spec.ts +++ b/apps/server/src/modules/deletion-console/deletion-execution.console.spec.ts @@ -1,7 +1,7 @@ import { Test, TestingModule } from '@nestjs/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ConsoleWriterService } from '@infra/console'; -import { DeletionExecutionUc } from '../uc'; +import { DeletionExecutionUc } from '../deletion/uc'; import { DeletionExecutionConsole } from './deletion-execution.console'; import { DeletionExecutionTriggerResultBuilder, TriggerDeletionExecutionOptionsBuilder } from './builder'; diff --git a/apps/server/src/modules/deletion/console/deletion-execution.console.ts b/apps/server/src/modules/deletion-console/deletion-execution.console.ts similarity index 96% rename from apps/server/src/modules/deletion/console/deletion-execution.console.ts rename to apps/server/src/modules/deletion-console/deletion-execution.console.ts index d9fdabe0160..55b3b3f8d1b 100644 --- a/apps/server/src/modules/deletion/console/deletion-execution.console.ts +++ b/apps/server/src/modules/deletion-console/deletion-execution.console.ts @@ -1,6 +1,6 @@ import { Command, Console } from 'nestjs-console'; import { ConsoleWriterService } from '@infra/console'; -import { DeletionExecutionUc } from '../uc'; +import { DeletionExecutionUc } from '../deletion/uc'; import { DeletionExecutionTriggerResultBuilder } from './builder'; import { DeletionExecutionTriggerResult, TriggerDeletionExecutionOptions } from './interface'; diff --git a/apps/server/src/modules/deletion/console/deletion-queue.console.spec.ts b/apps/server/src/modules/deletion-console/deletion-queue.console.spec.ts similarity index 97% rename from apps/server/src/modules/deletion/console/deletion-queue.console.spec.ts rename to apps/server/src/modules/deletion-console/deletion-queue.console.spec.ts index 61f9cf0ff53..2d497779aa5 100644 --- a/apps/server/src/modules/deletion/console/deletion-queue.console.spec.ts +++ b/apps/server/src/modules/deletion-console/deletion-queue.console.spec.ts @@ -1,7 +1,7 @@ import { Test, TestingModule } from '@nestjs/testing'; import { ConsoleWriterService } from '@infra/console'; import { createMock } from '@golevelup/ts-jest'; -import { BatchDeletionUc } from '../uc'; +import { BatchDeletionUc } from '../deletion/uc'; import { DeletionQueueConsole } from './deletion-queue.console'; import { PushDeleteRequestsOptionsBuilder } from './builder'; diff --git a/apps/server/src/modules/deletion/console/deletion-queue.console.ts b/apps/server/src/modules/deletion-console/deletion-queue.console.ts similarity index 96% rename from apps/server/src/modules/deletion/console/deletion-queue.console.ts rename to apps/server/src/modules/deletion-console/deletion-queue.console.ts index c8b133dba84..452e7834c2c 100644 --- a/apps/server/src/modules/deletion/console/deletion-queue.console.ts +++ b/apps/server/src/modules/deletion-console/deletion-queue.console.ts @@ -1,6 +1,6 @@ import { Console, Command } from 'nestjs-console'; import { ConsoleWriterService } from '@infra/console'; -import { BatchDeletionUc } from '../uc'; +import { BatchDeletionUc } from '../deletion/uc'; import { PushDeletionRequestsOptions } from './interface'; @Console({ command: 'queue', description: 'Console providing an access to the deletion queue.' }) diff --git a/apps/server/src/modules/deletion/console/index.ts b/apps/server/src/modules/deletion-console/index.ts similarity index 100% rename from apps/server/src/modules/deletion/console/index.ts rename to apps/server/src/modules/deletion-console/index.ts diff --git a/apps/server/src/modules/deletion/console/interface/deletion-execution-trigger-result.ts b/apps/server/src/modules/deletion-console/interface/deletion-execution-trigger-result.ts similarity index 100% rename from apps/server/src/modules/deletion/console/interface/deletion-execution-trigger-result.ts rename to apps/server/src/modules/deletion-console/interface/deletion-execution-trigger-result.ts diff --git a/apps/server/src/modules/deletion/console/interface/deletion-execution-trigger-status.enum.ts b/apps/server/src/modules/deletion-console/interface/deletion-execution-trigger-status.enum.ts similarity index 100% rename from apps/server/src/modules/deletion/console/interface/deletion-execution-trigger-status.enum.ts rename to apps/server/src/modules/deletion-console/interface/deletion-execution-trigger-status.enum.ts diff --git a/apps/server/src/modules/deletion/console/interface/index.ts b/apps/server/src/modules/deletion-console/interface/index.ts similarity index 100% rename from apps/server/src/modules/deletion/console/interface/index.ts rename to apps/server/src/modules/deletion-console/interface/index.ts diff --git a/apps/server/src/modules/deletion/console/interface/push-delete-requests-options.interface.ts b/apps/server/src/modules/deletion-console/interface/push-delete-requests-options.interface.ts similarity index 100% rename from apps/server/src/modules/deletion/console/interface/push-delete-requests-options.interface.ts rename to apps/server/src/modules/deletion-console/interface/push-delete-requests-options.interface.ts diff --git a/apps/server/src/modules/deletion/console/interface/trigger-deletion-execution-options.interface.ts b/apps/server/src/modules/deletion-console/interface/trigger-deletion-execution-options.interface.ts similarity index 100% rename from apps/server/src/modules/deletion/console/interface/trigger-deletion-execution-options.interface.ts rename to apps/server/src/modules/deletion-console/interface/trigger-deletion-execution-options.interface.ts diff --git a/apps/server/src/modules/deletion/index.ts b/apps/server/src/modules/deletion/index.ts index 793f306e7a0..53cee69016e 100644 --- a/apps/server/src/modules/deletion/index.ts +++ b/apps/server/src/modules/deletion/index.ts @@ -1,4 +1,4 @@ export * from './deletion.module'; export * from './services'; -export * from './client'; -export * from './console'; +export * from '../deletion-client'; +export * from '../deletion-console'; diff --git a/apps/server/src/modules/deletion/services/batch-deletion.service.spec.ts b/apps/server/src/modules/deletion/services/batch-deletion.service.spec.ts index 640e290af1a..11476ba3a2f 100644 --- a/apps/server/src/modules/deletion/services/batch-deletion.service.spec.ts +++ b/apps/server/src/modules/deletion/services/batch-deletion.service.spec.ts @@ -1,7 +1,7 @@ import { ObjectId } from 'bson'; import { Test, TestingModule } from '@nestjs/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { DeletionClient, DeletionRequestOutput, DeletionRequestOutputBuilder } from '../client'; +import { DeletionClient, DeletionRequestOutput, DeletionRequestOutputBuilder } from '../../deletion-client'; import { QueueDeletionRequestInputBuilder, QueueDeletionRequestOutputBuilder } from './builder'; import { BatchDeletionService } from './batch-deletion.service'; diff --git a/apps/server/src/modules/deletion/services/batch-deletion.service.ts b/apps/server/src/modules/deletion/services/batch-deletion.service.ts index d8c14f315a0..9a0471d017e 100644 --- a/apps/server/src/modules/deletion/services/batch-deletion.service.ts +++ b/apps/server/src/modules/deletion/services/batch-deletion.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@nestjs/common'; import { QueueDeletionRequestOutputBuilder } from './builder'; -import { DeletionClient, DeletionRequestInputBuilder } from '../client'; +import { DeletionClient, DeletionRequestInputBuilder } from '../../deletion-client'; import { QueueDeletionRequestInput, QueueDeletionRequestOutput } from './interface'; @Injectable() diff --git a/apps/server/src/modules/deletion/uc/deletion-execution.uc.spec.ts b/apps/server/src/modules/deletion/uc/deletion-execution.uc.spec.ts index 39c8065645a..f24f85ae58b 100644 --- a/apps/server/src/modules/deletion/uc/deletion-execution.uc.spec.ts +++ b/apps/server/src/modules/deletion/uc/deletion-execution.uc.spec.ts @@ -1,6 +1,6 @@ import { Test, TestingModule } from '@nestjs/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { DeletionClient } from '../client'; +import { DeletionClient } from '../../deletion-client'; import { DeletionExecutionUc } from './deletion-execution.uc'; describe(DeletionExecutionUc.name, () => { diff --git a/apps/server/src/modules/deletion/uc/deletion-execution.uc.ts b/apps/server/src/modules/deletion/uc/deletion-execution.uc.ts index ad4c90c567d..d4384340a09 100644 --- a/apps/server/src/modules/deletion/uc/deletion-execution.uc.ts +++ b/apps/server/src/modules/deletion/uc/deletion-execution.uc.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { DeletionClient } from '../client'; +import { DeletionClient } from '../../deletion-client'; @Injectable() export class DeletionExecutionUc {