From 3aaccfa48fe42223bf53ddeee5f01946f56c8977 Mon Sep 17 00:00:00 2001 From: Sylvain Briat Date: Mon, 18 Dec 2023 15:49:44 +0100 Subject: [PATCH 1/2] upgrade graphhopper api params, secure broker --- .env.dist | 2 +- ci/.env.ci | 2 +- src/modules/geography/infrastructure/graphhopper-georouter.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.env.dist b/.env.dist index 05f7050..00bd32c 100644 --- a/.env.dist +++ b/.env.dist @@ -8,7 +8,7 @@ HEALTH_SERVICE_PORT=6005 DATABASE_URL="postgresql://mobicoop:mobicoop@v3-db:5432/mobicoop?schema=matcher" # MESSAGE BROKER -MESSAGE_BROKER_URI=amqp://v3-broker:5672 +MESSAGE_BROKER_URI=amqp://mobicoop:mobicoop@v3-broker:5672 MESSAGE_BROKER_EXCHANGE=mobicoop MESSAGE_BROKER_EXCHANGE_DURABILITY=true diff --git a/ci/.env.ci b/ci/.env.ci index 011adf5..c5f1b70 100644 --- a/ci/.env.ci +++ b/ci/.env.ci @@ -6,7 +6,7 @@ SERVICE_PORT=5005 DATABASE_URL="postgresql://mobicoop:mobicoop@v3-db:5432/mobicoop?schema=public" # MESSAGE BROKER -MESSAGE_BROKER_URI=amqp://v3-broker:5672 +MESSAGE_BROKER_URI=amqp://mobicoop:mobicoop@v3-broker:5672 MESSAGE_BROKER_EXCHANGE=mobicoop # REDIS diff --git a/src/modules/geography/infrastructure/graphhopper-georouter.ts b/src/modules/geography/infrastructure/graphhopper-georouter.ts index ff0eac3..87e8e9f 100644 --- a/src/modules/geography/infrastructure/graphhopper-georouter.ts +++ b/src/modules/geography/infrastructure/graphhopper-georouter.ts @@ -55,7 +55,7 @@ export class GraphhopperGeorouter implements GeorouterPort { }; private _setDefaultUrlArgs = (): void => { - this.urlArgs = ['vehicle=car', 'weighting=fastest', 'points_encoded=false']; + this.urlArgs = ['profile=car', 'points_encoded=false']; }; private _setSettings = (settings: GeorouterSettings): void => { From 4ccfba12fa06a73d2002f650369c8f053a0bffde Mon Sep 17 00:00:00 2001 From: Sylvain Briat Date: Mon, 18 Dec 2023 15:50:30 +0100 Subject: [PATCH 2/2] 1.5.2 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 55545f3..066f2e7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@mobicoop/matcher", - "version": "1.5.1", + "version": "1.5.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@mobicoop/matcher", - "version": "1.5.1", + "version": "1.5.2", "license": "AGPL", "dependencies": { "@grpc/grpc-js": "^1.9.9", diff --git a/package.json b/package.json index 7cd882b..5ad6ecf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@mobicoop/matcher", - "version": "1.5.1", + "version": "1.5.2", "description": "Mobicoop V3 Matcher", "author": "sbriat", "private": true,