From a30b19e2f3235e3bb3efc795205ce9de6aa43492 Mon Sep 17 00:00:00 2001
From: sbriat <sylvain.briat@free.fr>
Date: Wed, 12 Apr 2023 16:03:19 +0200
Subject: [PATCH] refactor

---
 .../adapters/secondaries/default-params.provider.ts       | 2 +-
 src/modules/matcher/domain/dtos/match.request.ts          | 8 ++++----
 src/modules/matcher/domain/entities/algorithm-settings.ts | 6 +++---
 src/modules/matcher/domain/entities/geography.ts          | 6 +++---
 src/modules/matcher/domain/entities/time.ts               | 6 +++---
 .../interfaces/algorithm-settings-request.interface.ts    | 2 +-
 .../domain/interfaces/geography-request.interface.ts      | 2 +-
 .../matcher/domain/interfaces/time-request.interface.ts   | 4 ++--
 .../domain/{entities/actor.ts => types/actor.type..ts}    | 2 +-
 .../matcher/domain/{dtos => types}/algorithm.enum.ts      | 0
 .../default-algorithm-settings.type.ts                    | 2 +-
 .../domain/{interfaces => types}/default-params.type.ts   | 0
 .../matcher/domain/{entities => types}/geography.enum.ts  | 0
 .../domain/{entities => types}/margin-durations.type.ts   | 0
 .../matcher/domain/{entities => types}/point.type.ts      | 0
 .../matcher/domain/{entities => types}/role.enum.ts       | 0
 .../matcher/domain/{entities => types}/schedule.type.ts   | 0
 .../matcher/domain/{entities => types}/step.enum.ts       | 0
 src/modules/matcher/domain/{entities => types}/timing.ts  | 0
 .../matcher/domain/{entities => types}/waypoint.ts        | 2 +-
 src/modules/matcher/queries/match.query.ts                | 4 ++--
 .../matcher/tests/unit/default-params.provider.spec.ts    | 2 +-
 src/modules/matcher/tests/unit/match.query.spec.ts        | 8 ++++----
 src/modules/matcher/tests/unit/match.usecase.spec.ts      | 4 ++--
 24 files changed, 30 insertions(+), 30 deletions(-)
 rename src/modules/matcher/domain/{entities/actor.ts => types/actor.type..ts} (76%)
 rename src/modules/matcher/domain/{dtos => types}/algorithm.enum.ts (100%)
 rename src/modules/matcher/domain/{interfaces => types}/default-algorithm-settings.type.ts (86%)
 rename src/modules/matcher/domain/{interfaces => types}/default-params.type.ts (100%)
 rename src/modules/matcher/domain/{entities => types}/geography.enum.ts (100%)
 rename src/modules/matcher/domain/{entities => types}/margin-durations.type.ts (100%)
 rename src/modules/matcher/domain/{entities => types}/point.type.ts (100%)
 rename src/modules/matcher/domain/{entities => types}/role.enum.ts (100%)
 rename src/modules/matcher/domain/{entities => types}/schedule.type.ts (100%)
 rename src/modules/matcher/domain/{entities => types}/step.enum.ts (100%)
 rename src/modules/matcher/domain/{entities => types}/timing.ts (100%)
 rename src/modules/matcher/domain/{entities => types}/waypoint.ts (73%)

diff --git a/src/modules/matcher/adapters/secondaries/default-params.provider.ts b/src/modules/matcher/adapters/secondaries/default-params.provider.ts
index be1ddeb..9b5bad6 100644
--- a/src/modules/matcher/adapters/secondaries/default-params.provider.ts
+++ b/src/modules/matcher/adapters/secondaries/default-params.provider.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
-import { IDefaultParams } from '../../domain/interfaces/default-params.type';
+import { IDefaultParams } from '../../domain/types/default-params.type';
 
 @Injectable()
 export class DefaultParamsProvider {
diff --git a/src/modules/matcher/domain/dtos/match.request.ts b/src/modules/matcher/domain/dtos/match.request.ts
index d3aa3cd..14d7339 100644
--- a/src/modules/matcher/domain/dtos/match.request.ts
+++ b/src/modules/matcher/domain/dtos/match.request.ts
@@ -10,10 +10,10 @@ import {
   Min,
 } from 'class-validator';
 import { AutoMap } from '@automapper/classes';
-import { Point } from '../entities/point.type';
-import { Schedule } from '../entities/schedule.type';
-import { MarginDurations } from '../entities/margin-durations.type';
-import { Algorithm } from './algorithm.enum';
+import { Point } from '../types/point.type';
+import { Schedule } from '../types/schedule.type';
+import { MarginDurations } from '../types/margin-durations.type';
+import { Algorithm } from '../types/algorithm.enum';
 import { IRequestTime } from '../interfaces/time-request.interface';
 import { IRequestPerson } from '../interfaces/person-request.interface';
 import { IRequestGeography } from '../interfaces/geography-request.interface';
diff --git a/src/modules/matcher/domain/entities/algorithm-settings.ts b/src/modules/matcher/domain/entities/algorithm-settings.ts
index 278dea3..1a79bb5 100644
--- a/src/modules/matcher/domain/entities/algorithm-settings.ts
+++ b/src/modules/matcher/domain/entities/algorithm-settings.ts
@@ -1,7 +1,7 @@
-import { Algorithm } from '../dtos/algorithm.enum';
 import { IRequestAlgorithmSettings } from '../interfaces/algorithm-settings-request.interface';
-import { DefaultAlgorithmSettings } from '../interfaces/default-algorithm-settings.type';
-import { TimingFrequency } from './timing';
+import { DefaultAlgorithmSettings } from '../types/default-algorithm-settings.type';
+import { Algorithm } from '../types/algorithm.enum';
+import { TimingFrequency } from '../types/timing';
 
 export class AlgorithmSettings {
   _algorithmSettingsRequest: IRequestAlgorithmSettings;
diff --git a/src/modules/matcher/domain/entities/geography.ts b/src/modules/matcher/domain/entities/geography.ts
index 7f41c45..3cf3697 100644
--- a/src/modules/matcher/domain/entities/geography.ts
+++ b/src/modules/matcher/domain/entities/geography.ts
@@ -1,10 +1,10 @@
 import { MatcherException } from '../../exceptions/matcher.exception';
 import { IRequestGeography } from '../interfaces/geography-request.interface';
-import { PointType } from './geography.enum';
-import { Point } from './point.type';
+import { PointType } from '../types/geography.enum';
+import { Point } from '../types/point.type';
 import { Route } from './route';
 import { find } from 'geo-tz';
-import { Waypoint } from './waypoint';
+import { Waypoint } from '../types/waypoint';
 
 export class Geography {
   _geographyRequest: IRequestGeography;
diff --git a/src/modules/matcher/domain/entities/time.ts b/src/modules/matcher/domain/entities/time.ts
index 4669fc8..a6be1f1 100644
--- a/src/modules/matcher/domain/entities/time.ts
+++ b/src/modules/matcher/domain/entities/time.ts
@@ -1,8 +1,8 @@
 import { MatcherException } from '../../exceptions/matcher.exception';
-import { MarginDurations } from './margin-durations.type';
+import { MarginDurations } from '../types/margin-durations.type';
 import { IRequestTime } from '../interfaces/time-request.interface';
-import { TimingDays, TimingFrequency, Days } from './timing';
-import { Schedule } from './schedule.type';
+import { TimingDays, TimingFrequency, Days } from '../types/timing';
+import { Schedule } from '../types/schedule.type';
 
 export class Time {
   _timeRequest: IRequestTime;
diff --git a/src/modules/matcher/domain/interfaces/algorithm-settings-request.interface.ts b/src/modules/matcher/domain/interfaces/algorithm-settings-request.interface.ts
index 0b4709f..3ab0de8 100644
--- a/src/modules/matcher/domain/interfaces/algorithm-settings-request.interface.ts
+++ b/src/modules/matcher/domain/interfaces/algorithm-settings-request.interface.ts
@@ -1,4 +1,4 @@
-import { Algorithm } from '../dtos/algorithm.enum';
+import { Algorithm } from '../types/algorithm.enum';
 
 export interface IRequestAlgorithmSettings {
   algorithm: Algorithm;
diff --git a/src/modules/matcher/domain/interfaces/geography-request.interface.ts b/src/modules/matcher/domain/interfaces/geography-request.interface.ts
index 79a18b3..d10a6ac 100644
--- a/src/modules/matcher/domain/interfaces/geography-request.interface.ts
+++ b/src/modules/matcher/domain/interfaces/geography-request.interface.ts
@@ -1,4 +1,4 @@
-import { Point } from '../entities/point.type';
+import { Point } from '../types/point.type';
 
 export interface IRequestGeography {
   waypoints: Array<Point>;
diff --git a/src/modules/matcher/domain/interfaces/time-request.interface.ts b/src/modules/matcher/domain/interfaces/time-request.interface.ts
index 33e902e..1f8c6a7 100644
--- a/src/modules/matcher/domain/interfaces/time-request.interface.ts
+++ b/src/modules/matcher/domain/interfaces/time-request.interface.ts
@@ -1,5 +1,5 @@
-import { MarginDurations } from '../entities/margin-durations.type';
-import { Schedule } from '../entities/schedule.type';
+import { MarginDurations } from '../types/margin-durations.type';
+import { Schedule } from '../types/schedule.type';
 
 export interface IRequestTime {
   departure?: string;
diff --git a/src/modules/matcher/domain/entities/actor.ts b/src/modules/matcher/domain/types/actor.type..ts
similarity index 76%
rename from src/modules/matcher/domain/entities/actor.ts
rename to src/modules/matcher/domain/types/actor.type..ts
index 09e977b..6edd39a 100644
--- a/src/modules/matcher/domain/entities/actor.ts
+++ b/src/modules/matcher/domain/types/actor.type..ts
@@ -1,4 +1,4 @@
-import { Person } from './person';
+import { Person } from '../entities/person';
 import { Role } from './role.enum';
 import { Step } from './step.enum';
 
diff --git a/src/modules/matcher/domain/dtos/algorithm.enum.ts b/src/modules/matcher/domain/types/algorithm.enum.ts
similarity index 100%
rename from src/modules/matcher/domain/dtos/algorithm.enum.ts
rename to src/modules/matcher/domain/types/algorithm.enum.ts
diff --git a/src/modules/matcher/domain/interfaces/default-algorithm-settings.type.ts b/src/modules/matcher/domain/types/default-algorithm-settings.type.ts
similarity index 86%
rename from src/modules/matcher/domain/interfaces/default-algorithm-settings.type.ts
rename to src/modules/matcher/domain/types/default-algorithm-settings.type.ts
index 63eb724..89c0c93 100644
--- a/src/modules/matcher/domain/interfaces/default-algorithm-settings.type.ts
+++ b/src/modules/matcher/domain/types/default-algorithm-settings.type.ts
@@ -1,4 +1,4 @@
-import { Algorithm } from '../dtos/algorithm.enum';
+import { Algorithm } from './algorithm.enum';
 
 export type DefaultAlgorithmSettings = {
   algorithm: Algorithm;
diff --git a/src/modules/matcher/domain/interfaces/default-params.type.ts b/src/modules/matcher/domain/types/default-params.type.ts
similarity index 100%
rename from src/modules/matcher/domain/interfaces/default-params.type.ts
rename to src/modules/matcher/domain/types/default-params.type.ts
diff --git a/src/modules/matcher/domain/entities/geography.enum.ts b/src/modules/matcher/domain/types/geography.enum.ts
similarity index 100%
rename from src/modules/matcher/domain/entities/geography.enum.ts
rename to src/modules/matcher/domain/types/geography.enum.ts
diff --git a/src/modules/matcher/domain/entities/margin-durations.type.ts b/src/modules/matcher/domain/types/margin-durations.type.ts
similarity index 100%
rename from src/modules/matcher/domain/entities/margin-durations.type.ts
rename to src/modules/matcher/domain/types/margin-durations.type.ts
diff --git a/src/modules/matcher/domain/entities/point.type.ts b/src/modules/matcher/domain/types/point.type.ts
similarity index 100%
rename from src/modules/matcher/domain/entities/point.type.ts
rename to src/modules/matcher/domain/types/point.type.ts
diff --git a/src/modules/matcher/domain/entities/role.enum.ts b/src/modules/matcher/domain/types/role.enum.ts
similarity index 100%
rename from src/modules/matcher/domain/entities/role.enum.ts
rename to src/modules/matcher/domain/types/role.enum.ts
diff --git a/src/modules/matcher/domain/entities/schedule.type.ts b/src/modules/matcher/domain/types/schedule.type.ts
similarity index 100%
rename from src/modules/matcher/domain/entities/schedule.type.ts
rename to src/modules/matcher/domain/types/schedule.type.ts
diff --git a/src/modules/matcher/domain/entities/step.enum.ts b/src/modules/matcher/domain/types/step.enum.ts
similarity index 100%
rename from src/modules/matcher/domain/entities/step.enum.ts
rename to src/modules/matcher/domain/types/step.enum.ts
diff --git a/src/modules/matcher/domain/entities/timing.ts b/src/modules/matcher/domain/types/timing.ts
similarity index 100%
rename from src/modules/matcher/domain/entities/timing.ts
rename to src/modules/matcher/domain/types/timing.ts
diff --git a/src/modules/matcher/domain/entities/waypoint.ts b/src/modules/matcher/domain/types/waypoint.ts
similarity index 73%
rename from src/modules/matcher/domain/entities/waypoint.ts
rename to src/modules/matcher/domain/types/waypoint.ts
index 62fe713..6ee5941 100644
--- a/src/modules/matcher/domain/entities/waypoint.ts
+++ b/src/modules/matcher/domain/types/waypoint.ts
@@ -1,4 +1,4 @@
-import { Actor } from './actor';
+import { Actor } from './actor.type.';
 import { Point } from './point.type';
 
 export type Waypoint = {
diff --git a/src/modules/matcher/queries/match.query.ts b/src/modules/matcher/queries/match.query.ts
index c873f13..fdec447 100644
--- a/src/modules/matcher/queries/match.query.ts
+++ b/src/modules/matcher/queries/match.query.ts
@@ -2,10 +2,10 @@ import { MatchRequest } from '../domain/dtos/match.request';
 import { Geography } from '../domain/entities/geography';
 import { Person } from '../domain/entities/person';
 import { Requirement } from '../domain/entities/requirement';
-import { Role } from '../domain/entities/role.enum';
+import { Role } from '../domain/types/role.enum';
 import { AlgorithmSettings } from '../domain/entities/algorithm-settings';
 import { Time } from '../domain/entities/time';
-import { IDefaultParams } from '../domain/interfaces/default-params.type';
+import { IDefaultParams } from '../domain/types/default-params.type';
 
 export class MatchQuery {
   private readonly _matchRequest: MatchRequest;
diff --git a/src/modules/matcher/tests/unit/default-params.provider.spec.ts b/src/modules/matcher/tests/unit/default-params.provider.spec.ts
index 1b3cab7..a721186 100644
--- a/src/modules/matcher/tests/unit/default-params.provider.spec.ts
+++ b/src/modules/matcher/tests/unit/default-params.provider.spec.ts
@@ -1,7 +1,7 @@
 import { ConfigService } from '@nestjs/config';
 import { Test, TestingModule } from '@nestjs/testing';
 import { DefaultParamsProvider } from '../../adapters/secondaries/default-params.provider';
-import { IDefaultParams } from '../../domain/interfaces/default-params.type';
+import { IDefaultParams } from '../../domain/types/default-params.type';
 
 const mockConfigService = {
   get: jest.fn().mockImplementationOnce(() => 99),
diff --git a/src/modules/matcher/tests/unit/match.query.spec.ts b/src/modules/matcher/tests/unit/match.query.spec.ts
index ef5c883..a48c541 100644
--- a/src/modules/matcher/tests/unit/match.query.spec.ts
+++ b/src/modules/matcher/tests/unit/match.query.spec.ts
@@ -1,9 +1,9 @@
-import { Algorithm } from '../../domain/dtos/algorithm.enum';
 import { MatchRequest } from '../../domain/dtos/match.request';
-import { Role } from '../../domain/entities/role.enum';
-import { TimingFrequency } from '../../domain/entities/timing';
-import { IDefaultParams } from '../../domain/interfaces/default-params.type';
+import { Role } from '../../domain/types/role.enum';
+import { TimingFrequency } from '../../domain/types/timing';
+import { IDefaultParams } from '../../domain/types/default-params.type';
 import { MatchQuery } from '../../queries/match.query';
+import { Algorithm } from '../../domain/types/algorithm.enum';
 
 const defaultParams: IDefaultParams = {
   DEFAULT_IDENTIFIER: 0,
diff --git a/src/modules/matcher/tests/unit/match.usecase.spec.ts b/src/modules/matcher/tests/unit/match.usecase.spec.ts
index c215eb2..8d59092 100644
--- a/src/modules/matcher/tests/unit/match.usecase.spec.ts
+++ b/src/modules/matcher/tests/unit/match.usecase.spec.ts
@@ -6,8 +6,8 @@ import { MatchQuery } from '../../queries/match.query';
 import { AdRepository } from '../../adapters/secondaries/ad.repository';
 import { AutomapperModule } from '@automapper/nestjs';
 import { classes } from '@automapper/classes';
-import { IDefaultParams } from '../../domain/interfaces/default-params.type';
-import { Algorithm } from '../../domain/dtos/algorithm.enum';
+import { IDefaultParams } from '../../domain/types/default-params.type';
+import { Algorithm } from '../../domain/types/algorithm.enum';
 
 const mockAdRepository = {};