From 4762c844e1bb02d8814272cededa5e73ee0a28b8 Mon Sep 17 00:00:00 2001
From: sbriat <sylvain.briat@free.fr>
Date: Tue, 22 Aug 2023 13:28:37 +0200
Subject: [PATCH] simplify ad georouter signature

---
 src/modules/ad/ad.mapper.ts                            |  6 +-----
 .../ad/core/application/ports/route-provider.port.ts   | 10 ++++------
 .../core/application/types/georouter-settings.type.ts  |  5 -----
 src/modules/ad/tests/unit/ad.mapper.spec.ts            |  2 +-
 .../ad/tests/unit/infrastructure/ad.repository.spec.ts |  2 +-
 5 files changed, 7 insertions(+), 18 deletions(-)
 delete mode 100644 src/modules/ad/core/application/types/georouter-settings.type.ts

diff --git a/src/modules/ad/ad.mapper.ts b/src/modules/ad/ad.mapper.ts
index 18690b9..c9df8b1 100644
--- a/src/modules/ad/ad.mapper.ts
+++ b/src/modules/ad/ad.mapper.ts
@@ -38,11 +38,7 @@ export class AdMapper
     const roles: Role[] = [];
     if (copy.driver) roles.push(Role.DRIVER);
     if (copy.passenger) roles.push(Role.PASSENGER);
-    const route: Route = this.routeProvider.get(roles, copy.waypoints, {
-      points: true,
-      detailedDistance: false,
-      detailedDuration: false,
-    });
+    const route: Route = this.routeProvider.getBasic(roles, copy.waypoints);
     const record: AdWriteModel = {
       uuid: copy.id,
       driver: copy.driver,
diff --git a/src/modules/ad/core/application/ports/route-provider.port.ts b/src/modules/ad/core/application/ports/route-provider.port.ts
index 7ac93be..f8fd19e 100644
--- a/src/modules/ad/core/application/ports/route-provider.port.ts
+++ b/src/modules/ad/core/application/ports/route-provider.port.ts
@@ -1,12 +1,10 @@
-import { GeorouterSettings } from '../types/georouter-settings.type';
 import { Role } from '../../domain/ad.types';
 import { Waypoint } from '../types/waypoint.type';
 import { Route } from '../types/route.type';
 
 export interface RouteProviderPort {
-  get(
-    roles: Role[],
-    waypoints: Waypoint[],
-    georouterSettings: GeorouterSettings,
-  ): Route;
+  /**
+   * Get a basic route with points and overall duration / distance
+   */
+  getBasic(roles: Role[], waypoints: Waypoint[]): Route;
 }
diff --git a/src/modules/ad/core/application/types/georouter-settings.type.ts b/src/modules/ad/core/application/types/georouter-settings.type.ts
deleted file mode 100644
index ae5b391..0000000
--- a/src/modules/ad/core/application/types/georouter-settings.type.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export type GeorouterSettings = {
-  points: boolean;
-  detailedDuration: boolean;
-  detailedDistance: boolean;
-};
diff --git a/src/modules/ad/tests/unit/ad.mapper.spec.ts b/src/modules/ad/tests/unit/ad.mapper.spec.ts
index 646e7aa..14ae563 100644
--- a/src/modules/ad/tests/unit/ad.mapper.spec.ts
+++ b/src/modules/ad/tests/unit/ad.mapper.spec.ts
@@ -105,7 +105,7 @@ const mockDirectionEncoder: DirectionEncoderPort = {
 };
 
 const mockRouteProvider: RouteProviderPort = {
-  get: jest.fn().mockImplementation(() => ({
+  getBasic: jest.fn().mockImplementation(() => ({
     driverDistance: 350101,
     driverDuration: 14422,
     passengerDistance: 350101,
diff --git a/src/modules/ad/tests/unit/infrastructure/ad.repository.spec.ts b/src/modules/ad/tests/unit/infrastructure/ad.repository.spec.ts
index 2dfe7e4..789b547 100644
--- a/src/modules/ad/tests/unit/infrastructure/ad.repository.spec.ts
+++ b/src/modules/ad/tests/unit/infrastructure/ad.repository.spec.ts
@@ -20,7 +20,7 @@ const mockDirectionEncoder: DirectionEncoderPort = {
 };
 
 const mockRouteProvider: RouteProviderPort = {
-  get: jest.fn(),
+  getBasic: jest.fn(),
 };
 
 describe('Ad repository', () => {