ncaron
/
matcher
mirror of https://gitlab.com/mobicoop/v3/service/matcher.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

fix waystep completer

This commit is contained in:
sbriat 2023-09-13 15:57:22 +02:00
parent 74fb2c120e
commit c65a5b50c2
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/ad/core/application/queries/match/completer/passenger-oriented-waypoints.completer.ts → src/modules/ad/core/application/queries/match/completer/passenger-oriented-waysteps.completer.ts
View File

@ -11,7 +11,7 @@ import { WayStepsCreator } from '@modules/ad/core/domain/waysteps-creator.servic
/** /**
* Complete candidates by setting driver and crew waypoints * Complete candidates by setting driver and crew waypoints
*/ */
export class PassengerOrientedWaypointsCompleter extends Completer { export class PassengerOrientedWayStepsCompleter extends Completer {
complete = async ( complete = async (
candidates: CandidateEntity[], candidates: CandidateEntity[],
): Promise<CandidateEntity[]> => { ): Promise<CandidateEntity[]> => {
@ -54,11 +54,6 @@ export class PassengerOrientedWaypointsCompleter extends Completer {
); );
candidate.setWaySteps(carpoolPathCreator.getCrewCarpoolPath()); candidate.setWaySteps(carpoolPathCreator.getCrewCarpoolPath());
}); });
// console.log(
// candidates[0]
// .getProps()
// .waySteps?.map((waystep: WayStep) => waystep.actors),
// );
return candidates; return candidates;
}; };
} }

4
src/modules/ad/core/application/queries/match/passenger-oriented-algorithm.ts
View File

@ -1,6 +1,6 @@
import { Algorithm } from './algorithm.abstract'; import { Algorithm } from './algorithm.abstract';
import { MatchQuery } from './match.query'; import { MatchQuery } from './match.query';
import { PassengerOrientedWaypointsCompleter } from './completer/passenger-oriented-waypoints.completer'; import { PassengerOrientedWayStepsCompleter } from './completer/passenger-oriented-waysteps.completer';
import { PassengerOrientedGeoFilter } from './filter/passenger-oriented-geo.filter'; import { PassengerOrientedGeoFilter } from './filter/passenger-oriented-geo.filter';
import { AdRepositoryPort } from '../../ports/ad.repository.port'; import { AdRepositoryPort } from '../../ports/ad.repository.port';
import { PassengerOrientedSelector } from './selector/passenger-oriented.selector'; import { PassengerOrientedSelector } from './selector/passenger-oriented.selector';
@ -13,7 +13,7 @@ export class PassengerOrientedAlgorithm extends Algorithm {
super(query, repository); super(query, repository);
this.selector = new PassengerOrientedSelector(query, repository); this.selector = new PassengerOrientedSelector(query, repository);
this.processors = [ this.processors = [
new PassengerOrientedWaypointsCompleter(query), new PassengerOrientedWayStepsCompleter(query),
new PassengerOrientedGeoFilter(query), new PassengerOrientedGeoFilter(query),
]; ];
} }

8
src/modules/ad/tests/unit/core/passenger-oriented-waypoints-completer.spec.ts → src/modules/ad/tests/unit/core/passenger-oriented-waysteps-completer.spec.ts
View File

@ -1,4 +1,4 @@
import { PassengerOrientedWaypointsCompleter } from '@modules/ad/core/application/queries/match/completer/passenger-oriented-waypoints.completer'; import { PassengerOrientedWayStepsCompleter } from '@modules/ad/core/application/queries/match/completer/passenger-oriented-waysteps.completer';
import { MatchQuery } from '@modules/ad/core/application/queries/match/match.query'; import { MatchQuery } from '@modules/ad/core/application/queries/match/match.query';
import { AlgorithmType } from '@modules/ad/core/application/types/algorithm.types'; import { AlgorithmType } from '@modules/ad/core/application/types/algorithm.types';
import { Waypoint } from '@modules/ad/core/application/types/waypoint.type'; import { Waypoint } from '@modules/ad/core/application/types/waypoint.type';
@ -75,10 +75,10 @@ const candidates: CandidateEntity[] = [
}), }),
]; ];
describe('Passenger oriented waypoints completer', () => { describe('Passenger oriented waysteps completer', () => {
it('should complete candidates', async () => { it('should complete candidates', async () => {
const passengerOrientedWaypointsCompleter: PassengerOrientedWaypointsCompleter = const passengerOrientedWaypointsCompleter: PassengerOrientedWayStepsCompleter =
new PassengerOrientedWaypointsCompleter(matchQuery); new PassengerOrientedWayStepsCompleter(matchQuery);
const completedCandidates: CandidateEntity[] = const completedCandidates: CandidateEntity[] =
await passengerOrientedWaypointsCompleter.complete(candidates); await passengerOrientedWaypointsCompleter.complete(candidates);
expect(completedCandidates.length).toBe(2); expect(completedCandidates.length).toBe(2);