refactor

src/modules/ad/adapters/primaries/ad-messager.controller.ts

@@ -22,6 +22,7 @@ export class AdMessagerController {
     try {
       // parse message to conform to CreateAdRequest (not a real instance yet)
       const parsedMessage: CreateAdRequest = JSON.parse(message);
+      console.log(parsedMessage);
       // create a real instance of CreateAdRequest from parsed message
       const createAdRequest: CreateAdRequest = this.mapper.map(
         parsedMessage,

src/modules/ad/domain/dtos/create-ad.request.ts

@@ -8,11 +8,10 @@ import {
   IsNumber,
   IsOptional,
   IsString,
-  ValidateNested,
 } from 'class-validator';
 import { PointType } from '../../../geography/domain/types/point-type.enum';
 import { Frequency } from '../types/frequency.enum';
-import { Point } from '../../../geography/domain/types/point.type';
+import { Coordinates } from '../../../geography/domain/types/coordinates.type';
 
 export class CreateAdRequest {
   @IsString()
@@ -114,9 +113,8 @@ export class CreateAdRequest {
 
   @IsArray()
   @ArrayMinSize(2)
-  @ValidateNested({ each: true })
+  @AutoMap(() => [Coordinates])
-  @AutoMap()
+  waypoints: Coordinates[];
-  waypoints: Array<Point>;
 
   @IsNumber()
   @AutoMap()

src/modules/ad/domain/entities/ad.ts

@@ -1,7 +1,6 @@
 import { AutoMap } from '@automapper/classes';
-import { ArrayMinSize, IsArray, IsEnum, ValidateNested } from 'class-validator';
 import { PointType } from '../../../geography/domain/types/point-type.enum';
-import { Point } from '../../../geography/domain/types/point.type';
+import { Coordinates } from '../../../geography/domain/types/coordinates.type';
 
 export class Ad {
   @AutoMap()
@@ -76,19 +75,14 @@ export class Ad {
   @AutoMap()
   passengerDistance: number;
 
-  @IsEnum(PointType)
   @AutoMap()
   originType: PointType;
 
-  @IsEnum(PointType)
   @AutoMap()
   destinationType: PointType;
 
-  @IsArray()
+  @AutoMap(() => [Coordinates])
-  @ArrayMinSize(2)
+  waypoints: Coordinates[];
-  @ValidateNested({ each: true })
-  @AutoMap()
-  waypoints: Array<Point>;
 
   @AutoMap()
   direction: string;

src/modules/configuration/adapters/primaries/configuration-messager.controller.ts

@@ -57,7 +57,7 @@ export class ConfigurationMessagerController {
     name: 'propagateConfiguration',
   })
   public async propagateConfigurationsHandler(message: string) {
-    const configurations: Array<Configuration> = JSON.parse(message);
+    const configurations: Configuration[] = JSON.parse(message);
     configurations.forEach(async (configuration) => {
       if (
         configuration.domain ==

src/modules/database/src/adapters/secondaries/prisma-repository.abstract.ts

@@ -187,13 +187,13 @@ export abstract class PrismaRepository<T> implements IRepository<T> {
   }
 
   async findAllByQuery(
-    include: Array<string>,
+    include: string[],
-    where: Array<string>,
+    where: string[],
   ): Promise<ICollection<T>> {
     const query = `SELECT ${include.join(',')} FROM ${
       this._model
     } WHERE ${where.join(' AND ')}`;
-    const data: Array<T> = await this._prisma.$queryRawUnsafe(query);
+    const data: T[] = await this._prisma.$queryRawUnsafe(query);
     return Promise.resolve({
       data,
       total: data.length,

src/modules/geography/adapters/secondaries/geo-timezone-finder.ts

@@ -4,5 +4,5 @@ import { find } from 'geo-tz';
 
 @Injectable()
 export class GeoTimezoneFinder implements IFindTimezone {
-  timezones = (lon: number, lat: number): Array<string> => find(lat, lon);
+  timezones = (lon: number, lat: number): string[] => find(lat, lon);
 }

src/modules/geography/domain/interfaces/timezone-finder.interface.ts

@@ -1,3 +1,3 @@
 export interface IFindTimezone {
-  timezones(lon: number, lat: number): Array<string>;
+  timezones(lon: number, lat: number): string[];
 }

src/modules/geography/domain/types/coordinates.type.ts

@@ -1,4 +1,21 @@
-export type Coordinates = {
+import { AutoMap } from '@automapper/classes';
+import { IsNumber, Max, Min } from 'class-validator';
+
+export class Coordinates {
+  constructor(lon: number, lat: number) {
+    this.lon = lon;
+    this.lat = lat;
+  }
+
+  @IsNumber()
+  @Min(-180)
+  @Max(180)
+  @AutoMap()
   lon: number;
+
+  @IsNumber()
+  @Min(-90)
+  @Max(90)
+  @AutoMap()
   lat: number;
-};
+}

src/modules/matcher/adapters/secondaries/graphhopper-georouter.ts

@@ -17,11 +17,11 @@ import {
 @Injectable()
 export class GraphhopperGeorouter implements IGeorouter {
   private url: string;
-  private urlArgs: Array<string>;
+  private urlArgs: string[];
   private withTime: boolean;
   private withPoints: boolean;
   private withDistance: boolean;
-  private paths: Array<Path>;
+  private paths: Path[];
   private httpService: HttpService;
   private geodesic: IGeodesic;
 
@@ -32,9 +32,9 @@ export class GraphhopperGeorouter implements IGeorouter {
   }
 
   route = async (
-    paths: Array<Path>,
+    paths: Path[],
     settings: GeorouterSettings,
-  ): Promise<Array<NamedRoute>> => {
+  ): Promise<NamedRoute[]> => {
     this.setDefaultUrlArgs();
     this.setWithTime(settings.withTime);
     this.setWithPoints(settings.withPoints);
@@ -70,7 +70,7 @@ export class GraphhopperGeorouter implements IGeorouter {
     }
   };
 
-  private getRoutes = async (): Promise<Array<NamedRoute>> => {
+  private getRoutes = async (): Promise<NamedRoute[]> => {
     const routes = Promise.all(
       this.paths.map(async (path) => {
         const url: string = [
@@ -125,7 +125,7 @@ export class GraphhopperGeorouter implements IGeorouter {
           shortestPath.snapped_waypoints &&
           shortestPath.snapped_waypoints.coordinates
         ) {
-          let instructions: Array<GraphhopperInstruction> = [];
+          let instructions: GraphhopperInstruction[] = [];
           if (shortestPath.instructions)
             instructions = shortestPath.instructions;
           route.setSpacetimePoints(
@@ -143,11 +143,11 @@ export class GraphhopperGeorouter implements IGeorouter {
   };
 
   private generateSpacetimePoints = (
-    points: Array<Array<number>>,
+    points: Array<number[]>,
-    snappedWaypoints: Array<Array<number>>,
+    snappedWaypoints: Array<number[]>,
-    durations: Array<Array<number>>,
+    durations: Array<number[]>,
-    instructions: Array<GraphhopperInstruction>,
+    instructions: GraphhopperInstruction[],
-  ): Array<SpacetimePoint> => {
+  ): SpacetimePoint[] => {
     const indices = this.getIndices(points, snappedWaypoints);
     const times = this.getTimes(durations, indices);
     const distances = this.getDistances(instructions, indices);
@@ -162,9 +162,9 @@ export class GraphhopperGeorouter implements IGeorouter {
   };
 
   private getIndices = (
-    points: Array<Array<number>>,
+    points: Array<number[]>,
-    snappedWaypoints: Array<Array<number>>,
+    snappedWaypoints: Array<number[]>,
-  ): Array<number> => {
+  ): number[] => {
     const indices = snappedWaypoints.map((waypoint) =>
       points.findIndex(
         (point) => point[0] == waypoint[0] && point[1] == waypoint[1],
@@ -178,7 +178,7 @@ export class GraphhopperGeorouter implements IGeorouter {
             {
               index: number;
               originIndex: number;
-              waypoint: Array<number>;
+              waypoint: number[];
               nearest: number;
               distance: number;
             }
@@ -212,8 +212,8 @@ export class GraphhopperGeorouter implements IGeorouter {
   };
 
   private getTimes = (
-    durations: Array<Array<number>>,
+    durations: Array<number[]>,
-    indices: Array<number>,
+    indices: number[],
   ): Array<{ index: number; duration: number }> => {
     const times: Array<{ index: number; duration: number }> = [];
     let duration = 0;
@@ -262,8 +262,8 @@ export class GraphhopperGeorouter implements IGeorouter {
   };
 
   private getDistances = (
-    instructions: Array<GraphhopperInstruction>,
+    instructions: GraphhopperInstruction[],
-    indices: Array<number>,
+    indices: number[],
   ): Array<{ index: number; distance: number }> => {
     let distance = 0;
     const distances: Array<{ index: number; distance: number }> = [
@@ -296,26 +296,26 @@ type GraphhopperResponse = {
       weight: number;
       time: number;
       points_encoded: boolean;
-      bbox: Array<number>;
+      bbox: number[];
       points: GraphhopperCoordinates;
       snapped_waypoints: GraphhopperCoordinates;
       details: {
-        time: Array<Array<number>>;
+        time: Array<number[]>;
       };
-      instructions: Array<GraphhopperInstruction>;
+      instructions: GraphhopperInstruction[];
     },
   ];
 };
 
 type GraphhopperCoordinates = {
-  coordinates: Array<Array<number>>;
+  coordinates: Array<number[]>;
 };
 
 type GraphhopperInstruction = {
   distance: number;
   heading: number;
   sign: GraphhopperSign;
-  interval: Array<number>;
+  interval: number[];
   text: string;
 };
 

src/modules/matcher/adapters/secondaries/timezone-finder.ts

@@ -6,6 +6,6 @@ import { IFindTimezone } from '../../../geography/domain/interfaces/timezone-fin
 export class TimezoneFinder implements IFindTimezone {
   constructor(private readonly geoTimezoneFinder: GeoTimezoneFinder) {}
 
-  timezones = (lon: number, lat: number): Array<string> =>
+  timezones = (lon: number, lat: number): string[] =>
     this.geoTimezoneFinder.timezones(lon, lat);
 }

src/modules/matcher/domain/dtos/match.request.ts

@@ -30,7 +30,7 @@ export class MatchRequest
 {
   @IsArray()
   @AutoMap()
-  waypoints: Array<Point>;
+  waypoints: Point[];
 
   @IsOptional()
   @IsString()
@@ -138,7 +138,7 @@ export class MatchRequest
 
   @IsOptional()
   @IsArray()
-  exclusions: Array<number>;
+  exclusions: number[];
 
   @IsOptional()
   @IsInt()

src/modules/matcher/domain/entities/ecosystem/geography.ts

@@ -19,10 +19,10 @@ import { Timezoner } from './timezoner';
 export class Geography {
   private geographyRequest: IRequestGeography;
   private person: Person;
-  private points: Array<Point>;
+  private points: Point[];
   originType: PointType;
   destinationType: PointType;
-  timezones: Array<string>;
+  timezones: string[];
   driverRoute: Route;
   passengerRoute: Route;
   timezoneFinder: IFindTimezone;
@@ -48,12 +48,12 @@ export class Geography {
   };
 
   createRoutes = async (
-    roles: Array<Role>,
+    roles: Role[],
     georouter: IGeorouter,
   ): Promise<void> => {
-    let driverWaypoints: Array<Waypoint> = [];
+    let driverWaypoints: Waypoint[] = [];
-    let passengerWaypoints: Array<Waypoint> = [];
+    let passengerWaypoints: Waypoint[] = [];
-    const paths: Array<Path> = [];
+    const paths: Path[] = [];
     if (roles.includes(Role.DRIVER) && roles.includes(Role.PASSENGER)) {
       if (this.points.length == 2) {
         // 2 points => same route for driver and passenger
@@ -174,10 +174,7 @@ export class Geography {
   private isValidLatitude = (latitude: number): boolean =>
     latitude >= -90 && latitude <= 90;
 
-  private createWaypoints = (
+  private createWaypoints = (points: Point[], role: Role): Waypoint[] => {
-    points: Array<Point>,
-    role: Role,
-  ): Array<Waypoint> => {
     return points.map((point, index) => {
       const waypoint = new Waypoint(point);
       if (index == 0) {

src/modules/matcher/domain/entities/ecosystem/person.ts

@@ -5,7 +5,7 @@ export class Person {
   private defaultIdentifier: number;
   private defaultMarginDuration: number;
   identifier: number;
-  marginDurations: Array<number>;
+  marginDurations: number[];
 
   constructor(
     personRequest: IRequestPerson,
@@ -34,7 +34,7 @@ export class Person {
     this.identifier = identifier;
   };
 
-  setMarginDurations = (marginDurations: Array<number>): void => {
+  setMarginDurations = (marginDurations: number[]): void => {
     this.marginDurations = marginDurations;
   };
 }

src/modules/matcher/domain/entities/ecosystem/route.ts

@@ -9,9 +9,9 @@ export class Route {
   fwdAzimuth: number;
   backAzimuth: number;
   distanceAzimuth: number;
-  waypoints: Array<Waypoint>;
+  waypoints: Waypoint[];
-  points: Array<Point>;
+  points: Point[];
-  spacetimePoints: Array<SpacetimePoint>;
+  spacetimePoints: SpacetimePoint[];
   private geodesic: IGeodesic;
 
   constructor(geodesic: IGeodesic) {
@@ -26,21 +26,21 @@ export class Route {
     this.geodesic = geodesic;
   }
 
-  setWaypoints = (waypoints: Array<Waypoint>): void => {
+  setWaypoints = (waypoints: Waypoint[]): void => {
     this.waypoints = waypoints;
     this.setAzimuth(waypoints.map((waypoint) => waypoint.point));
   };
 
-  setPoints = (points: Array<Point>): void => {
+  setPoints = (points: Point[]): void => {
     this.points = points;
     this.setAzimuth(points);
   };
 
-  setSpacetimePoints = (spacetimePoints: Array<SpacetimePoint>): void => {
+  setSpacetimePoints = (spacetimePoints: SpacetimePoint[]): void => {
     this.spacetimePoints = spacetimePoints;
   };
 
-  private setAzimuth = (points: Array<Point>): void => {
+  private setAzimuth = (points: Point[]): void => {
     const inverse = this.geodesic.inverse(
       points[0].lon,
       points[0].lat,

src/modules/matcher/domain/entities/ecosystem/waypoint.ts

@@ -3,7 +3,7 @@ import { Actor } from './actor';
 
 export class Waypoint {
   point: Point;
-  actors: Array<Actor>;
+  actors: Actor[];
 
   constructor(point: Point) {
     this.point = point;

src/modules/matcher/domain/entities/engine/factory/algorithm-factory.abstract.ts

@@ -5,7 +5,7 @@ import { Selector } from '../selector/selector.abstract';
 
 export abstract class AlgorithmFactory {
   protected matchQuery: MatchQuery;
-  private candidates: Array<Candidate>;
+  private candidates: Candidate[];
 
   constructor(matchQuery: MatchQuery) {
     this.matchQuery = matchQuery;
@@ -13,5 +13,5 @@ export abstract class AlgorithmFactory {
   }
 
   abstract createSelector(): Selector;
-  abstract createProcessors(): Array<Processor>;
+  abstract createProcessors(): Processor[];
 }

src/modules/matcher/domain/entities/engine/factory/classic.ts

@@ -10,7 +10,7 @@ import { ClassicSelector } from '../selector/classic.selector';
 
 export class ClassicAlgorithmFactory extends AlgorithmFactory {
   createSelector = (): Selector => new ClassicSelector(this.matchQuery);
-  createProcessors = (): Array<Processor> => [
+  createProcessors = (): Processor[] => [
     new ClassicWaypointsCompleter(this.matchQuery),
     new RouteCompleter(this.matchQuery, true, true, true),
     new ClassicGeoFilter(this.matchQuery),

src/modules/matcher/domain/entities/engine/matcher.ts

@@ -11,10 +11,10 @@ export class Matcher {
     private readonly algorithmFactoryCreator: AlgorithmFactoryCreator,
   ) {}
 
-  match = async (matchQuery: MatchQuery): Promise<Array<Match>> => {
+  match = async (matchQuery: MatchQuery): Promise<Match[]> => {
     const algorithmFactory: AlgorithmFactory =
       this.algorithmFactoryCreator.create(matchQuery);
-    let candidates: Array<Candidate> = await algorithmFactory
+    let candidates: Candidate[] = await algorithmFactory
       .createSelector()
       .select();
     for (const processor of algorithmFactory.createProcessors()) {

src/modules/matcher/domain/entities/engine/processor/completer/classic-waypoint.completer.processor.ts

@@ -2,7 +2,7 @@ import { Candidate } from '../../candidate';
 import { Completer } from './completer.abstract';
 
 export class ClassicWaypointsCompleter extends Completer {
-  complete = (candidates: Array<Candidate>): Array<Candidate> => {
+  complete = (candidates: Candidate[]): Candidate[] => {
     return candidates;
   };
 }

src/modules/matcher/domain/entities/engine/processor/completer/completer.abstract.ts

@@ -2,8 +2,7 @@ import { Candidate } from '../../candidate';
 import { Processor } from '../processor.abstract';
 
 export abstract class Completer extends Processor {
-  execute = (candidates: Array<Candidate>): Array<Candidate> =>
+  execute = (candidates: Candidate[]): Candidate[] => this.complete(candidates);
-    this.complete(candidates);
 
-  abstract complete(candidates: Array<Candidate>): Array<Candidate>;
+  abstract complete(candidates: Candidate[]): Candidate[];
 }

src/modules/matcher/domain/entities/engine/processor/completer/journey.completer.processor.ts

@@ -2,7 +2,7 @@ import { Candidate } from '../../candidate';
 import { Completer } from './completer.abstract';
 
 export class JourneyCompleter extends Completer {
-  complete = (candidates: Array<Candidate>): Array<Candidate> => {
+  complete = (candidates: Candidate[]): Candidate[] => {
     return candidates;
   };
 }

src/modules/matcher/domain/entities/engine/processor/completer/route.completer.processor.ts

@@ -19,7 +19,7 @@ export class RouteCompleter extends Completer {
     this.withDistance = withDistance;
   }
 
-  complete = (candidates: Array<Candidate>): Array<Candidate> => {
+  complete = (candidates: Candidate[]): Candidate[] => {
     return candidates;
   };
 }

src/modules/matcher/domain/entities/engine/processor/filter/filter.abstract.ts

@@ -2,8 +2,7 @@ import { Candidate } from '../../candidate';
 import { Processor } from '../processor.abstract';
 
 export abstract class Filter extends Processor {
-  execute = (candidates: Array<Candidate>): Array<Candidate> =>
+  execute = (candidates: Candidate[]): Candidate[] => this.filter(candidates);
-    this.filter(candidates);
 
-  abstract filter(candidates: Array<Candidate>): Array<Candidate>;
+  abstract filter(candidates: Candidate[]): Candidate[];
 }

src/modules/matcher/domain/entities/engine/processor/filter/geofilter/classic.filter.processor.ts

@@ -2,7 +2,7 @@ import { Candidate } from '../../../candidate';
 import { Filter } from '../filter.abstract';
 
 export class ClassicGeoFilter extends Filter {
-  filter = (candidates: Array<Candidate>): Array<Candidate> => {
+  filter = (candidates: Candidate[]): Candidate[] => {
     return candidates;
   };
 }

src/modules/matcher/domain/entities/engine/processor/filter/timefilter/classic.filter.processor.ts

@@ -2,7 +2,7 @@ import { Candidate } from '../../../candidate';
 import { Filter } from '../filter.abstract';
 
 export class ClassicTimeFilter extends Filter {
-  filter = (candidates: Array<Candidate>): Array<Candidate> => {
+  filter = (candidates: Candidate[]): Candidate[] => {
     return candidates;
   };
 }

src/modules/matcher/domain/entities/engine/processor/processor.abstract.ts

@@ -8,5 +8,5 @@ export abstract class Processor {
     this.matchQuery = matchQuery;
   }
 
-  abstract execute(candidates: Array<Candidate>): Array<Candidate>;
+  abstract execute(candidates: Candidate[]): Candidate[];
 }

src/modules/matcher/domain/entities/engine/selector/classic.selector.ts

@@ -2,7 +2,7 @@ import { Candidate } from '../candidate';
 import { Selector } from './selector.abstract';
 
 export class ClassicSelector extends Selector {
-  select = async (): Promise<Array<Candidate>> => {
+  select = async (): Promise<Candidate[]> => {
     return [];
   };
 }

src/modules/matcher/domain/entities/engine/selector/selector.abstract.ts

@@ -8,5 +8,5 @@ export abstract class Selector {
     this.matchQuery = matchQuery;
   }
 
-  abstract select(): Promise<Array<Candidate>>;
+  abstract select(): Promise<Candidate[]>;
 }

src/modules/matcher/domain/interfaces/geography-request.interface.ts

@@ -1,5 +1,5 @@
 import { Point } from '../../../geography/domain/types/point.type';
 
 export interface IRequestGeography {
-  waypoints: Array<Point>;
+  waypoints: Point[];
 }

src/modules/matcher/domain/interfaces/georouter.interface.ts

@@ -3,8 +3,5 @@ import { GeorouterSettings } from '../types/georouter-settings.type';
 import { Path } from '../types/path.type';
 
 export interface IGeorouter {
-  route(
+  route(paths: Path[], settings: GeorouterSettings): Promise<NamedRoute[]>;
-    paths: Array<Path>,
-    settings: GeorouterSettings,
-  ): Promise<Array<NamedRoute>>;
 }

src/modules/matcher/domain/types/path.type.ts

@@ -2,5 +2,5 @@ import { Point } from '../../../geography/domain/types/point.type';
 
 export type Path = {
   key: string;
-  points: Array<Point>;
+  points: Point[];
 };

src/modules/matcher/domain/types/waypoint.ts

@@ -3,5 +3,5 @@ import { Point } from '../../../geography/domain/types/point.type';
 
 export type Waypoint = {
   point: Point;
-  actors: Array<Actor>;
+  actors: Actor[];
 };

src/modules/matcher/domain/usecases/match.usecase.ts

@@ -17,7 +17,7 @@ export class MatchUseCase {
 
   execute = async (matchQuery: MatchQuery): Promise<ICollection<Match>> => {
     try {
-      const data: Array<Match> = await this._matcher.match(matchQuery);
+      const data: Match[] = await this._matcher.match(matchQuery);
       this._messager.publish('matcher.match', 'match !');
       return {
         data,

src/modules/matcher/queries/match.query.ts

@@ -15,10 +15,10 @@ export class MatchQuery {
   private readonly defaultParams: IDefaultParams;
   private readonly georouterCreator: ICreateGeorouter;
   person: Person;
-  roles: Array<Role>;
+  roles: Role[];
   time: Time;
   geography: Geography;
-  exclusions: Array<number>;
+  exclusions: number[];
   requirement: Requirement;
   algorithmSettings: AlgorithmSettings;
   georouter: IGeorouter;