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

Merge branch 'fixStatus' into 'main' 

Removed useless status in matching sql request

See merge request v3/service/matcher!29
This commit is contained in:
Sylvain Briat 2024-02-02 07:53:55 +00:00
parent 21c2bc663c 50c5b99e54
commit 0d537cd6a4
4 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package-lock.json generated
View File

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

2
package.json
View File

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

5
src/modules/ad/core/application/queries/match/selector/passenger-oriented.selector.ts
View File

@ -1,4 +1,4 @@
import { AdStatus, Frequency, Role } from '@modules/ad/core/domain/ad.types'; import { Frequency, Role } from '@modules/ad/core/domain/ad.types';
import { Selector } from '../algorithm.abstract'; import { Selector } from '../algorithm.abstract';
import { Waypoint } from '../../../types/waypoint.type'; import { Waypoint } from '../../../types/waypoint.type';
import { Point } from '../../../types/point.type'; import { Point } from '../../../types/point.type';
@ -133,7 +133,6 @@ export class PassengerOrientedSelector extends Selector {
private _createWhere = (role: Role): string => private _createWhere = (role: Role): string =>
[ [
this._whereStatus(),
this._whereRole(role), this._whereRole(role),
this._whereStrict(), this._whereStrict(),
this._whereDate(), this._whereDate(),
@ -145,8 +144,6 @@ export class PassengerOrientedSelector extends Selector {
.filter((where: string) => where != '') .filter((where: string) => where != '')
.join(' AND '); .join(' AND ');
private _whereStatus = (): string => `status='${AdStatus.VALID}'`;
private _whereRole = (role: Role): string => private _whereRole = (role: Role): string =>
role == Role.PASSENGER ? 'driver=True' : 'passenger=True'; role == Role.PASSENGER ? 'driver=True' : 'passenger=True';

7
src/modules/ad/core/domain/ad.types.ts
View File

@ -53,10 +53,3 @@ export enum Role {
DRIVER = 'DRIVER', DRIVER = 'DRIVER',
PASSENGER = 'PASSENGER', PASSENGER = 'PASSENGER',
} }
export enum AdStatus {
PENDING = 'PENDING',
VALID = 'VALID',
INVALID = 'INVALID',
SUSPENDED = 'SUSPENDED',
}