1.3.1

Update default configuration management

See merge request v3/service/matcher!14

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@mobicoop/matcher",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@mobicoop/matcher",
-      "version": "1.3.0",
+      "version": "1.3.1",
       "license": "AGPL",
       "dependencies": {
         "@grpc/grpc-js": "^1.9.9",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mobicoop/matcher",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Mobicoop V3 Matcher",
   "author": "sbriat",
   "private": true,

src/modules/ad/core/domain/value-objects/journey.value-object.ts

@@ -38,24 +38,22 @@ export class Journey extends ValueObject<JourneyProps> {
             actorTime.target == Target.START,
         ) as ActorTime,
     ) as JourneyItem;
-    const passengerDepartureActorTime =
+    const passengerDepartureActorTime: ActorTime =
       passengerDepartureJourneyItem.actorTimes.find(
         (actorTime: ActorTime) =>
           actorTime.role == Role.PASSENGER && actorTime.target == Target.START,
       ) as ActorTime;
-    const driverNeutralActorTime =
+    const driverActorTime = passengerDepartureJourneyItem.actorTimes.find(
-      passengerDepartureJourneyItem.actorTimes.find(
+      (actorTime: ActorTime) => actorTime.role == Role.DRIVER,
-        (actorTime: ActorTime) =>
+    ) as ActorTime;
-          actorTime.role == Role.DRIVER && actorTime.target == Target.NEUTRAL,
-      ) as ActorTime;
     return (
       (passengerDepartureActorTime.firstMinDatetime <=
-        driverNeutralActorTime.firstMaxDatetime &&
+        driverActorTime.firstMaxDatetime &&
-        driverNeutralActorTime.firstMaxDatetime <=
+        driverActorTime.firstMaxDatetime <=
           passengerDepartureActorTime.firstMaxDatetime) ||
       (passengerDepartureActorTime.firstMinDatetime <=
-        driverNeutralActorTime.firstMinDatetime &&
+        driverActorTime.firstMinDatetime &&
-        driverNeutralActorTime.firstMinDatetime <=
+        driverActorTime.firstMinDatetime <=
           passengerDepartureActorTime.firstMaxDatetime)
     );
   };

src/modules/ad/tests/unit/core/algorithm.abstract.spec.ts

@@ -53,6 +53,7 @@ const mockAdRepository: AdRepositoryPort = {
   insertExtra: jest.fn(),
   findOneById: jest.fn(),
   findOne: jest.fn(),
+  findAll: jest.fn(),
   insert: jest.fn(),
   update: jest.fn(),
   updateWhere: jest.fn(),

src/modules/ad/tests/unit/core/passenger-oriented-algorithm.spec.ts

@@ -54,6 +54,7 @@ const mockMatcherRepository: AdRepositoryPort = {
   insertExtra: jest.fn(),
   findOneById: jest.fn(),
   findOne: jest.fn(),
+  findAll: jest.fn(),
   insert: jest.fn(),
   update: jest.fn(),
   updateWhere: jest.fn(),

src/modules/ad/tests/unit/core/passenger-oriented-selector.spec.ts

@@ -99,6 +99,7 @@ const mockMatcherRepository: AdRepositoryPort = {
   insertExtra: jest.fn(),
   findOneById: jest.fn(),
   findOne: jest.fn(),
+  findAll: jest.fn(),
   insert: jest.fn(),
   update: jest.fn(),
   updateWhere: jest.fn(),