From e106ae92db754dd523f7644f1fc6e2867172340a Mon Sep 17 00:00:00 2001 From: Clement Date: Mon, 6 May 2024 21:50:22 +0200 Subject: [PATCH 01/34] add open trip maps file --- Express/barAndCafe/src/OpenTripMaps.ts | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Express/barAndCafe/src/OpenTripMaps.ts diff --git a/Express/barAndCafe/src/OpenTripMaps.ts b/Express/barAndCafe/src/OpenTripMaps.ts new file mode 100644 index 0000000..e69de29 -- 2.47.1 From 4315560cbcd8895be7c88d8249b20fa87824798b Mon Sep 17 00:00:00 2001 From: Clement Date: Tue, 7 May 2024 09:48:35 +0200 Subject: [PATCH 02/34] tempory rm healthcheck --- Express/barAndCafe/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Express/barAndCafe/Dockerfile b/Express/barAndCafe/Dockerfile index 09ee8fd..6e27f40 100644 --- a/Express/barAndCafe/Dockerfile +++ b/Express/barAndCafe/Dockerfile @@ -47,7 +47,8 @@ WORKDIR /home/node EXPOSE 3000 # Add Healthcheck -HEALTHCHECK --interval=10s --timeout=10s --start-period=5s --retries=3 CMD wget --no-verbose --tries=1 --spider http://localhost:3000 || exit 1 +# FIXME: remttre check +# HEALTHCHECK --interval=10s --timeout=10s --start-period=5s --retries=3 CMD wget --no-verbose --tries=1 --spider http://localhost:3000 || exit 1 # copy from build image COPY --chown=node:node --from=BUILD_IMAGE /home/node/node_modules ./node_modules -- 2.47.1 From 5671735e5488ca2178b8f6de4cc2168337ba59ec Mon Sep 17 00:00:00 2001 From: Clement Date: Mon, 13 May 2024 20:30:14 +0200 Subject: [PATCH 03/34] feat/ add prod swagger api test --- Express/barAndCafe/src/swaggerDef.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Express/barAndCafe/src/swaggerDef.ts b/Express/barAndCafe/src/swaggerDef.ts index 25f8517..7194263 100644 --- a/Express/barAndCafe/src/swaggerDef.ts +++ b/Express/barAndCafe/src/swaggerDef.ts @@ -16,6 +16,9 @@ const options = { { url: "http://localhost:"+port.toString(), }, + { + url: "https://drink-tweb.cb85.fr" + } ], }, apis: ['./src/*.ts'], -- 2.47.1 From 2cc1eac20121da63daec04258881a1c2ca250d80 Mon Sep 17 00:00:00 2001 From: Clement Date: Mon, 13 May 2024 23:09:02 +0200 Subject: [PATCH 04/34] fix: test timeout --- Express/barAndCafe/jest.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Express/barAndCafe/jest.config.js b/Express/barAndCafe/jest.config.js index 21a72eb..2c8a283 100644 --- a/Express/barAndCafe/jest.config.js +++ b/Express/barAndCafe/jest.config.js @@ -1,5 +1,6 @@ /** @type {import('ts-jest').JestConfigWithTsJest} */ module.exports = { + testTimeout: 10000, preset: 'ts-jest', testEnvironment: 'node', collectCoverage: true, -- 2.47.1 From 5a0ceadcc693ce427446b95f262c4e5669cbc10b Mon Sep 17 00:00:00 2001 From: Clement Date: Mon, 13 May 2024 23:10:01 +0200 Subject: [PATCH 05/34] add some bruno test --- .../environments/dev.bru | 6 ++++- ...express test.bru => express Drink OTM.bru} | 4 ++-- bruno/OpenData datatourisme/otm_drink.bru | 19 ++++++++++++++++ bruno/OpenData datatourisme/otm_ex_city.bru | 16 ++++++++++++++ bruno/OpenData datatourisme/otm_location.bru | 16 ++++++++++++++ bruno/OpenData datatourisme/test graphQL.bru | 22 +++++++++++++++++++ 6 files changed, 80 insertions(+), 3 deletions(-) rename bruno/OpenData datatourisme/{express test.bru => express Drink OTM.bru} (71%) create mode 100644 bruno/OpenData datatourisme/otm_drink.bru create mode 100644 bruno/OpenData datatourisme/otm_ex_city.bru create mode 100644 bruno/OpenData datatourisme/otm_location.bru create mode 100644 bruno/OpenData datatourisme/test graphQL.bru diff --git a/bruno/OpenData datatourisme/environments/dev.bru b/bruno/OpenData datatourisme/environments/dev.bru index e9ed20c..59925ce 100644 --- a/bruno/OpenData datatourisme/environments/dev.bru +++ b/bruno/OpenData datatourisme/environments/dev.bru @@ -1,3 +1,7 @@ +vars { + TRIPMAP_URL: https://api.opentripmap.com/0.1 +} vars:secret [ - app_key + app_key, + OTM_KEY ] diff --git a/bruno/OpenData datatourisme/express test.bru b/bruno/OpenData datatourisme/express Drink OTM.bru similarity index 71% rename from bruno/OpenData datatourisme/express test.bru rename to bruno/OpenData datatourisme/express Drink OTM.bru index c514a9c..a13d65f 100644 --- a/bruno/OpenData datatourisme/express test.bru +++ b/bruno/OpenData datatourisme/express Drink OTM.bru @@ -1,7 +1,7 @@ meta { - name: express test + name: express Drink OTM type: http - seq: 3 + seq: 4 } get { diff --git a/bruno/OpenData datatourisme/otm_drink.bru b/bruno/OpenData datatourisme/otm_drink.bru new file mode 100644 index 0000000..1e4c308 --- /dev/null +++ b/bruno/OpenData datatourisme/otm_drink.bru @@ -0,0 +1,19 @@ +meta { + name: otm_drink + type: http + seq: 6 +} + +get { + url: {{TRIPMAP_URL}}/en/places/radius?radius=1000&lon=-1.43333&lat=46.66667&apikey={{OTM_KEY}}&kinds=bars,cafes,pubs,biergartens + body: none + auth: none +} + +query { + radius: 1000 + lon: -1.43333 + lat: 46.66667 + apikey: {{OTM_KEY}} + kinds: bars,cafes,pubs,biergartens +} diff --git a/bruno/OpenData datatourisme/otm_ex_city.bru b/bruno/OpenData datatourisme/otm_ex_city.bru new file mode 100644 index 0000000..3f3036f --- /dev/null +++ b/bruno/OpenData datatourisme/otm_ex_city.bru @@ -0,0 +1,16 @@ +meta { + name: otm_ex_city + type: http + seq: 7 +} + +get { + url: http://localhost:3001/otm/city?name=La roche sur yon&radius=300 + body: none + auth: none +} + +query { + name: La roche sur yon + radius: 300 +} diff --git a/bruno/OpenData datatourisme/otm_location.bru b/bruno/OpenData datatourisme/otm_location.bru new file mode 100644 index 0000000..8e8813f --- /dev/null +++ b/bruno/OpenData datatourisme/otm_location.bru @@ -0,0 +1,16 @@ +meta { + name: otm_location + type: http + seq: 5 +} + +get { + url: {{TRIPMAP_URL}}/en/places/geoname?name=Paris&apikey={{OTM_KEY}} + body: none + auth: none +} + +query { + name: Paris + apikey: {{OTM_KEY}} +} diff --git a/bruno/OpenData datatourisme/test graphQL.bru b/bruno/OpenData datatourisme/test graphQL.bru new file mode 100644 index 0000000..73046ce --- /dev/null +++ b/bruno/OpenData datatourisme/test graphQL.bru @@ -0,0 +1,22 @@ +meta { + name: test graphQL + type: graphql + seq: 3 +} + +post { + url: https://datatour-tweb.cb85.fr + body: graphql + auth: none +} + +body:graphql { + { + poi { + total + results { + _uri + } + } + } +} -- 2.47.1 From e5d6987b104058ab3bf693aa9a2eacfb707835dd Mon Sep 17 00:00:00 2001 From: Clement Date: Mon, 13 May 2024 23:10:24 +0200 Subject: [PATCH 06/34] add some test --- Express/barAndCafe/test/app.test.ts | 14 +---- Express/barAndCafe/test/openTripMaps.test.ts | 66 ++++++++++++++++++++ 2 files changed, 68 insertions(+), 12 deletions(-) create mode 100644 Express/barAndCafe/test/openTripMaps.test.ts diff --git a/Express/barAndCafe/test/app.test.ts b/Express/barAndCafe/test/app.test.ts index f02dde7..e7ccc0a 100644 --- a/Express/barAndCafe/test/app.test.ts +++ b/Express/barAndCafe/test/app.test.ts @@ -10,17 +10,7 @@ let serveur : Server describe("Test the welcome path", () => { - beforeEach(() => { - serveur = app.listen(port, () =>{ - console.log(`serveur running in ${port}`) - }) - }) - - afterEach((done) => { - serveur.close(done) - }) - - test("It should response the GET method", done => { + test("It should response the 200 code for GET method", done => { request(app) .get("/welcome") .then(response => { @@ -29,7 +19,7 @@ describe("Test the welcome path", () => { }); }); - test("It should response the GET method", done => { + test("It should response the GET method with content", done => { const out = {hello:"world"}; request(app) .get("/welcome") diff --git a/Express/barAndCafe/test/openTripMaps.test.ts b/Express/barAndCafe/test/openTripMaps.test.ts new file mode 100644 index 0000000..1e2ce39 --- /dev/null +++ b/Express/barAndCafe/test/openTripMaps.test.ts @@ -0,0 +1,66 @@ +import request from "supertest"; +import app from "../src/app"; +import { Server, IncomingMessage, ServerResponse } from "http"; +import * as dotenv from "dotenv"; + +dotenv.config({path: '../../.env'}) +const port = parseInt(process.env.BAR_PORT || '3000') + +let serveur : Server + +describe("Test the otm city path", () => { + + test("It should response the 200 code for GET method", done => { + request(app) + .get("/otm/city") + .query({'name':'La roche sur yon'}) + .then(response => { + expect(response.statusCode).toBe(200); + done(); + }); + }); + + test("It should response the GET method with content", done => { + const out = { + "type": "FeatureCollection", + "features": [{ + "type": "Feature", + "id": "562635", + "geometry": { + "type": "Point", + "coordinates": [ + -1.4344594, + 46.6686478 + ] + }, + "properties": { + "xid": "N4032296324", + "name": "Le 27 point carré", + "dist": 236.40360026, + "rate": 1, + "osm": "node/4032296324", + "kinds": "foods,bars,tourist_facilities" + } + }] + } + + request(app) + .get("/otm/city") + .query({'name':'La roche sur yon', "radius": 240}) + .then(response => { + console.log(response.text) + expect(response.text).toEqual(JSON.stringify(out)) + done(); + }); + }); + + test("It should response the 400 code for GET method", done => { + request(app) + .get("/otm/city") + .then(response => { + console.log(response.text) + expect(response.statusCode).toBe(400); + done(); + }); + }); +}); \ No newline at end of file -- 2.47.1 From 6efb2683942bb501b45e0376656641f6326e0df8 Mon Sep 17 00:00:00 2001 From: Clement Date: Mon, 13 May 2024 23:11:02 +0200 Subject: [PATCH 07/34] add axio package --- Express/barAndCafe/package-lock.json | 41 ++++++++++++++++++++++++---- Express/barAndCafe/package.json | 3 ++ 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/Express/barAndCafe/package-lock.json b/Express/barAndCafe/package-lock.json index 4082a8b..a90f6f7 100644 --- a/Express/barAndCafe/package-lock.json +++ b/Express/barAndCafe/package-lock.json @@ -7,6 +7,7 @@ "dependencies": { "@types/express": "^4.17.21", "@types/node": "^20.12.7", + "axios": "^1.6.8", "dotenv": "^16.4.5", "express": "^4.19.2", "rimraf": "^5.0.5", @@ -2105,8 +2106,7 @@ "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "node_modules/atob": { "version": "2.1.2", @@ -2121,6 +2121,16 @@ "node": ">= 4.5.0" } }, + "node_modules/axios": { + "version": "1.6.8", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz", + "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/babel-cli": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-cli/-/babel-cli-6.26.0.tgz", @@ -4319,7 +4329,6 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, "dependencies": { "delayed-stream": "~1.0.0" }, @@ -4614,7 +4623,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true, "engines": { "node": ">=0.4.0" } @@ -5138,6 +5146,25 @@ "node": ">=8" } }, + "node_modules/follow-redirects": { + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, "node_modules/for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -5180,7 +5207,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -8845,6 +8871,11 @@ "node": ">= 0.10" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/pseudomap": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", diff --git a/Express/barAndCafe/package.json b/Express/barAndCafe/package.json index 0cc1fef..241e4ed 100644 --- a/Express/barAndCafe/package.json +++ b/Express/barAndCafe/package.json @@ -5,12 +5,15 @@ "start": "node dist/src/server.js", "predev": "npm run build", "dev": "npx tsc -w & nodemon dist/src/server.js", + "predocs": "npm run build", "docs": "jsdoc -c jsdoc.json", + "pretest": "npm run build", "test": "jest" }, "dependencies": { "@types/express": "^4.17.21", "@types/node": "^20.12.7", + "axios": "^1.6.8", "dotenv": "^16.4.5", "express": "^4.19.2", "rimraf": "^5.0.5", -- 2.47.1 From bab32023fb6f4eb303df26c29d26182ccc27d020 Mon Sep 17 00:00:00 2001 From: Clement Date: Mon, 13 May 2024 23:13:12 +0200 Subject: [PATCH 08/34] implement city route for OTM --- Express/barAndCafe/src/OpenTripMaps.ts | 0 Express/barAndCafe/src/app.ts | 25 +++++++++ Express/barAndCafe/src/openTripMaps.ts | 71 ++++++++++++++++++++++++++ 3 files changed, 96 insertions(+) delete mode 100644 Express/barAndCafe/src/OpenTripMaps.ts create mode 100644 Express/barAndCafe/src/openTripMaps.ts diff --git a/Express/barAndCafe/src/OpenTripMaps.ts b/Express/barAndCafe/src/OpenTripMaps.ts deleted file mode 100644 index e69de29..0000000 diff --git a/Express/barAndCafe/src/app.ts b/Express/barAndCafe/src/app.ts index f9c7f25..22e8676 100644 --- a/Express/barAndCafe/src/app.ts +++ b/Express/barAndCafe/src/app.ts @@ -1,3 +1,4 @@ +import { getCity } from "./openTripMaps" import express from "express" /** * Initialize Express application instance. @@ -22,6 +23,7 @@ function getWelcome(req: express.Request, res: express.Response) { * @openapi * /welcome: * get: + * summary: retun just hello * description: Welcome to swagger-jsdoc! * responses: * 200: @@ -29,4 +31,27 @@ function getWelcome(req: express.Request, res: express.Response) { */ app.get("/welcome", getWelcome) +/** + * @openapi + * /otm/city: + * get: + * summary: return the drinks in a city + * description: return the drinks in a defined perimeter in a city + * parameters: + * - name: name + * in: query + * required: true + * description: the name of the city + * schema: + * type: string + * responses: + * 200: + * description: Return a list of bars and coffee in city in geoJSON format + * 400: + * description: Missing Argument Error + * 401: + * description: Missing OTM tocken + */ +app.get("/otm/city", getCity) + export default app \ No newline at end of file diff --git a/Express/barAndCafe/src/openTripMaps.ts b/Express/barAndCafe/src/openTripMaps.ts new file mode 100644 index 0000000..e72fabe --- /dev/null +++ b/Express/barAndCafe/src/openTripMaps.ts @@ -0,0 +1,71 @@ +import axios from 'axios'; +import express from "express" +import * as dotenv from "dotenv"; + +dotenv.config({path: '../../.env'}) + +const key = process.env.OPEN_TRIP_MAPS_KEY + +const optionsDrink = { + method: 'GET', + url: 'https://api.opentripmap.com/0.1/en/places/radius', + params: { + radius: '1000', + lon: '-1.43333', + lat: '46.66667', + apikey: key, + kinds: 'bars,cafes,pubs,biergartens' + }, + headers: {'Content-Type': 'application/json'} +}; + + +const optionsCity = { + method: 'GET', + url: 'https://api.opentripmap.com/0.1/en/places/geoname', + params: { + name: 'Paris', + apikey: key + }, + headers: {'Content-Type': 'application/json'} +}; + +/** + * Handle GET request for city search route ('/otm/city'). + * @param {express.Request} req - HTTP Request object. + * @param {express.Response} res - HTTP Response object. + */ +export async function getCity(req: express.Request, res: express.Response) { + const cityName = req.query["name"] + const radius = req.query["radius"] + + if(!key){ + res.status(401).send("Missing OTM key") + return + } + if(!cityName){ + res.status(400).send("Missing Argument name") + return + } + if(radius){ + optionsDrink.params.radius = radius as string + } + + optionsCity.params.name = cityName as string + + try { + const { data } = await axios.request(optionsCity); + optionsDrink.params.lat = data.lat + optionsDrink.params.lon = data.lon + } catch (error) { + console.error(error); + } + + try { + const { data } = await axios.request(optionsDrink); + res.send(data); + } catch (error) { + console.error(error); + } +} + -- 2.47.1 From 9a4c0dbd4d775cead6647444816c8dfa143c6fae Mon Sep 17 00:00:00 2001 From: Clement Date: Mon, 13 May 2024 23:15:54 +0200 Subject: [PATCH 09/34] sync subrepo --- datatourisme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datatourisme b/datatourisme index fb594bf..b3bc1fd 160000 --- a/datatourisme +++ b/datatourisme @@ -1 +1 @@ -Subproject commit fb594bfd7c715a891f076750403e3a439b804468 +Subproject commit b3bc1fdc68a325905f6d466e860732466d8e750a -- 2.47.1 From 4e5123b331ee36ad426ac456ba1d26fe76758c55 Mon Sep 17 00:00:00 2001 From: Clement Date: Mon, 13 May 2024 23:23:51 +0200 Subject: [PATCH 10/34] fix: env var for API test --- .github/workflows/run_back_test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run_back_test.yml b/.github/workflows/run_back_test.yml index e7f0722..d0b0981 100644 --- a/.github/workflows/run_back_test.yml +++ b/.github/workflows/run_back_test.yml @@ -16,4 +16,6 @@ jobs: prnumber: ${{ steps.findPr.outputs.number }} custom-title: Coverage report for backend github-token: ${{ secrets.PR_TOCKEN}} - annotations: none #disable annotation \ No newline at end of file + annotations: none #disable annotation + env: + OPEN_TRIP_MAPS_KEY: ${{ secrets.OPEN_TRIP_MAPS_KEY}} \ No newline at end of file -- 2.47.1 From 69315cc445b43f7c1341197fc3977287f6224689 Mon Sep 17 00:00:00 2001 From: Clement Date: Wed, 15 May 2024 00:10:09 +0200 Subject: [PATCH 11/34] add drink id test in bruno --- bruno/OpenData datatourisme/otm_drink_id.bru | 15 +++++++++++++++ bruno/OpenData datatourisme/otm_ex_city.bru | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 bruno/OpenData datatourisme/otm_drink_id.bru diff --git a/bruno/OpenData datatourisme/otm_drink_id.bru b/bruno/OpenData datatourisme/otm_drink_id.bru new file mode 100644 index 0000000..408e921 --- /dev/null +++ b/bruno/OpenData datatourisme/otm_drink_id.bru @@ -0,0 +1,15 @@ +meta { + name: otm_drink_id + type: http + seq: 7 +} + +get { + url: https://api.opentripmap.com/0.1/en/places/xid/562635?apikey={{OTM_KEY}} + body: none + auth: none +} + +query { + apikey: {{OTM_KEY}} +} diff --git a/bruno/OpenData datatourisme/otm_ex_city.bru b/bruno/OpenData datatourisme/otm_ex_city.bru index 3f3036f..6f0ad67 100644 --- a/bruno/OpenData datatourisme/otm_ex_city.bru +++ b/bruno/OpenData datatourisme/otm_ex_city.bru @@ -1,7 +1,7 @@ meta { name: otm_ex_city type: http - seq: 7 + seq: 8 } get { -- 2.47.1 From 820ec397ea09f55f1bf32eef5e772b01d90210c8 Mon Sep 17 00:00:00 2001 From: Clement Date: Wed, 15 May 2024 00:11:24 +0200 Subject: [PATCH 12/34] add rewire packet --- Express/barAndCafe/package-lock.json | 1091 ++++++++++++++++++++++++++ Express/barAndCafe/package.json | 5 +- 2 files changed, 1095 insertions(+), 1 deletion(-) diff --git a/Express/barAndCafe/package-lock.json b/Express/barAndCafe/package-lock.json index a90f6f7..e884461 100644 --- a/Express/barAndCafe/package-lock.json +++ b/Express/barAndCafe/package-lock.json @@ -16,6 +16,7 @@ }, "devDependencies": { "@types/jest": "^29.5.12", + "@types/rewire": "^2.5.30", "@types/supertest": "^6.0.2", "babel-cli": "^6.26.0", "babel-preset-env": "^1.7.0", @@ -23,9 +24,11 @@ "jest": "^29.7.0", "jsdoc": "^4.0.3", "nodemon": "^3.1.0", + "rewire": "^7.0.0", "superagent": "^9.0.2", "supertest": "^7.0.0", "ts-jest": "^29.1.2", + "ts-node": "^10.9.2", "typedoc": "^0.25.13", "typescript": "^5.4.5" } @@ -834,6 +837,208 @@ "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", "dev": true }, + "node_modules/@cspotcode/source-map-support": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", + "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", + "dev": true, + "dependencies": { + "@jridgewell/trace-mapping": "0.3.9" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", + "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", + "dev": true, + "dependencies": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", + "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", + "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", + "dev": true, + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "dev": true, + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/eslintrc/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/@eslint/eslintrc/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/@eslint/eslintrc/node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@eslint/eslintrc/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/@eslint/eslintrc/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/@eslint/eslintrc/node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@eslint/js": { + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", + "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.11.14", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", + "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", + "dev": true, + "dependencies": { + "@humanwhocodes/object-schema": "^2.0.2", + "debug": "^4.3.1", + "minimatch": "^3.0.5" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/config-array/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/@humanwhocodes/config-array/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", + "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", + "dev": true + }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", @@ -1591,6 +1796,41 @@ "node": ">=v12.0.0" } }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", @@ -1624,6 +1864,30 @@ "@sinonjs/commons": "^3.0.0" } }, + "node_modules/@tsconfig/node10": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", + "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==", + "dev": true + }, + "node_modules/@tsconfig/node12": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", + "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", + "dev": true + }, + "node_modules/@tsconfig/node14": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", + "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", + "dev": true + }, + "node_modules/@tsconfig/node16": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", + "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", + "dev": true + }, "node_modules/@types/babel__core": { "version": "7.20.5", "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", @@ -1829,6 +2093,12 @@ "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==" }, + "node_modules/@types/rewire": { + "version": "2.5.30", + "resolved": "https://registry.npmjs.org/@types/rewire/-/rewire-2.5.30.tgz", + "integrity": "sha512-CSyzr7TF1EUm85as2noToMtLaBBN/rKKlo5ZDdXedQ64cUiHT25LCNo1J1cI4QghBlGmTymElW/2h3TiWYOsZw==", + "dev": true + }, "node_modules/@types/send": { "version": "0.17.4", "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", @@ -1890,6 +2160,12 @@ "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", "dev": true }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true + }, "node_modules/abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", @@ -1935,6 +2211,31 @@ "acorn": "^4.0.4" } }, + "node_modules/acorn-walk": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz", + "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, "node_modules/align-text": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", @@ -2005,6 +2306,12 @@ "node": ">= 8" } }, + "node_modules/arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", + "dev": true + }, "node_modules/argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -4510,6 +4817,12 @@ "node": ">=8" } }, + "node_modules/create-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", + "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", + "dev": true + }, "node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -4570,6 +4883,12 @@ } } }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true + }, "node_modules/deepmerge": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", @@ -4675,6 +4994,15 @@ "wrappy": "1" } }, + "node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true, + "engines": { + "node": ">=0.3.1" + } + }, "node_modules/diff-match-patch": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.5.tgz", @@ -4822,6 +5150,338 @@ "node": ">=0.8.0" } }, + "node_modules/eslint": { + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", + "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", + "dev": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.57.0", + "@humanwhocodes/config-array": "^0.11.14", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-scope": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/eslint/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/eslint/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/eslint/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/eslint/node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/eslint/node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/eslint/node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/eslint/node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/espree": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dev": true, + "dependencies": { + "acorn": "^8.9.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/espree/node_modules/acorn": { + "version": "8.11.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", + "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/espree/node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, "node_modules/esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", @@ -4835,6 +5495,39 @@ "node": ">=4" } }, + "node_modules/esquery": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", + "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", + "dev": true, + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, "node_modules/estree-to-babel": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/estree-to-babel/-/estree-to-babel-3.2.1.tgz", @@ -5066,18 +5759,39 @@ "node": ">=0.10.0" } }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", "dev": true }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true + }, "node_modules/fast-safe-stringify": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz", "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==", "dev": true }, + "node_modules/fastq": { + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "dev": true, + "dependencies": { + "reusify": "^1.0.4" + } + }, "node_modules/fb-watchman": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", @@ -5087,6 +5801,18 @@ "bser": "2.1.1" } }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, "node_modules/file-uri-to-path": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", @@ -5146,6 +5872,61 @@ "node": ">=8" } }, + "node_modules/flat-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/flat-cache/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/flat-cache/node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/flatted": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "dev": true + }, "node_modules/follow-redirects": { "version": "1.15.6", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", @@ -5487,6 +6268,12 @@ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "dev": true }, + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true + }, "node_modules/has-ansi": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", @@ -5732,12 +6519,46 @@ "node": ">=0.10.0" } }, + "node_modules/ignore": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", + "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, "node_modules/ignore-by-default": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==", "dev": true }, + "node_modules/import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/import-fresh/node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, "node_modules/import-local": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", @@ -5975,6 +6796,15 @@ "node": ">=0.12.0" } }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", @@ -7712,12 +8542,30 @@ "jsesc": "bin/jsesc" } }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true + }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", "dev": true }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true + }, "node_modules/json5": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", @@ -7743,6 +8591,15 @@ "promise": "^7.0.1" } }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "dependencies": { + "json-buffer": "3.0.1" + } + }, "node_modules/kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", @@ -7791,6 +8648,19 @@ "node": ">=6" } }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/lines-and-columns": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", @@ -7840,6 +8710,12 @@ "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==", "dev": true }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true + }, "node_modules/lodash.mergewith": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz", @@ -8505,6 +9381,23 @@ "integrity": "sha512-N4YtSYJqghVu4iek2ZUvcN/0aqH1kRDuNqzcycDxhOUpg7GdvLa2F3DgS6yBNhInhv2r/6I0Flkn7CqL8+nIcw==", "peer": true }, + "node_modules/optionator": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "dev": true, + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/os-homedir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", @@ -8585,6 +9478,18 @@ "node": ">=6" } }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/parse-glob": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", @@ -8768,6 +9673,15 @@ "node": ">=0.10.0" } }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/preserve": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", @@ -9014,6 +9928,15 @@ "integrity": "sha512-GMu3M5nUL3fju4/egXwZO0XLi6fW/K3T3VTgFQ14GxNi8btlxgT5qZL//JwZFm/2Fa64J/PNS8AZeys3wiMkVA==", "dev": true }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/punycode.js": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz", @@ -9053,6 +9976,26 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, "node_modules/randomatic": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz", @@ -9474,6 +10417,25 @@ "node": ">=0.12" } }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true, + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rewire": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/rewire/-/rewire-7.0.0.tgz", + "integrity": "sha512-DyyNyzwMtGYgu0Zl/ya0PR/oaunM+VuCuBxCuhYJHHaV0V+YvYa3bBGxb5OZ71vndgmp1pYY8F4YOwQo1siRGw==", + "dev": true, + "dependencies": { + "eslint": "^8.47.0" + } + }, "node_modules/right-align": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", @@ -9503,6 +10465,29 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -10365,6 +11350,12 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true + }, "node_modules/tmpl": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", @@ -10517,12 +11508,79 @@ "integrity": "sha512-vDWbsl26LIcPGmDpoVzjEP6+hvHZkBkLW7JpvwbCv/5IYPJlsbzCVXY3wsCeAxAUeTclNOUZxnLdGh3VBD/J6w==", "dev": true }, + "node_modules/ts-node": { + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", + "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", + "dev": true, + "dependencies": { + "@cspotcode/source-map-support": "^0.8.0", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", + "arg": "^4.1.0", + "create-require": "^1.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "v8-compile-cache-lib": "^3.0.1", + "yn": "3.1.1" + }, + "bin": { + "ts-node": "dist/bin.js", + "ts-node-cwd": "dist/bin-cwd.js", + "ts-node-esm": "dist/bin-esm.js", + "ts-node-script": "dist/bin-script.js", + "ts-node-transpile-only": "dist/bin-transpile.js", + "ts-script": "dist/bin-script-deprecated.js" + }, + "peerDependencies": { + "@swc/core": ">=1.2.50", + "@swc/wasm": ">=1.2.50", + "@types/node": "*", + "typescript": ">=2.7" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "@swc/wasm": { + "optional": true + } + } + }, + "node_modules/ts-node/node_modules/acorn": { + "version": "8.11.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", + "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/tslib": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", "dev": true }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/type-detect": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", @@ -10781,6 +11839,15 @@ "node": ">=0.10.0" } }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "dependencies": { + "punycode": "^2.1.0" + } + }, "node_modules/urix": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", @@ -10826,6 +11893,12 @@ "node": ">= 0.4.0" } }, + "node_modules/v8-compile-cache-lib": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", + "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", + "dev": true + }, "node_modules/v8-to-istanbul": { "version": "9.2.0", "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz", @@ -11024,6 +12097,15 @@ "node": ">=0.4.0" } }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/wordwrap": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", @@ -11238,6 +12320,15 @@ "node": ">=8" } }, + "node_modules/yn": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", diff --git a/Express/barAndCafe/package.json b/Express/barAndCafe/package.json index 241e4ed..9ed5a3c 100644 --- a/Express/barAndCafe/package.json +++ b/Express/barAndCafe/package.json @@ -8,7 +8,7 @@ "predocs": "npm run build", "docs": "jsdoc -c jsdoc.json", "pretest": "npm run build", - "test": "jest" + "test": "ts-node -O '{\"module\":\"commonjs\"}' node_modules/jest/bin/jest.js" }, "dependencies": { "@types/express": "^4.17.21", @@ -22,6 +22,7 @@ }, "devDependencies": { "@types/jest": "^29.5.12", + "@types/rewire": "^2.5.30", "@types/supertest": "^6.0.2", "babel-cli": "^6.26.0", "babel-preset-env": "^1.7.0", @@ -29,9 +30,11 @@ "jest": "^29.7.0", "jsdoc": "^4.0.3", "nodemon": "^3.1.0", + "rewire": "^7.0.0", "superagent": "^9.0.2", "supertest": "^7.0.0", "ts-jest": "^29.1.2", + "ts-node": "^10.9.2", "typedoc": "^0.25.13", "typescript": "^5.4.5" } -- 2.47.1 From 7be7a618286ba0505449dee8805029de68ca534e Mon Sep 17 00:00:00 2001 From: Clement Date: Wed, 15 May 2024 00:11:55 +0200 Subject: [PATCH 13/34] add radius route WIP --- Express/barAndCafe/src/app.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Express/barAndCafe/src/app.ts b/Express/barAndCafe/src/app.ts index 22e8676..4b5c8b4 100644 --- a/Express/barAndCafe/src/app.ts +++ b/Express/barAndCafe/src/app.ts @@ -1,4 +1,4 @@ -import { getCity } from "./openTripMaps" +import { getCity, getRadius } from "./openTripMaps" import express from "express" /** * Initialize Express application instance. @@ -54,4 +54,8 @@ app.get("/welcome", getWelcome) */ app.get("/otm/city", getCity) + +//XXX: faire la doc SWAGGER +app.get("/otm/radius", getRadius) + export default app \ No newline at end of file -- 2.47.1 From 4d3a4fb2f5fd7b0cda152ce1f9a688d85b3a5deb Mon Sep 17 00:00:00 2001 From: Clement Date: Wed, 15 May 2024 00:12:27 +0200 Subject: [PATCH 14/34] rework OTM --- Express/barAndCafe/src/openTripMaps.ts | 112 +++++++++++++++---------- 1 file changed, 67 insertions(+), 45 deletions(-) diff --git a/Express/barAndCafe/src/openTripMaps.ts b/Express/barAndCafe/src/openTripMaps.ts index e72fabe..7655937 100644 --- a/Express/barAndCafe/src/openTripMaps.ts +++ b/Express/barAndCafe/src/openTripMaps.ts @@ -6,29 +6,48 @@ dotenv.config({path: '../../.env'}) const key = process.env.OPEN_TRIP_MAPS_KEY -const optionsDrink = { - method: 'GET', - url: 'https://api.opentripmap.com/0.1/en/places/radius', - params: { - radius: '1000', - lon: '-1.43333', - lat: '46.66667', - apikey: key, - kinds: 'bars,cafes,pubs,biergartens' - }, - headers: {'Content-Type': 'application/json'} -}; +async function callRadius(lon: string, lat: string, radius = '1000') { + const optionsDrink = { + method: 'GET', + url: 'https://api.opentripmap.com/0.1/en/places/radius', + params: { + radius: radius, + lon: lon, + lat: lat, + apikey: key, + kinds: 'bars,cafes,pubs,biergartens' + }, + headers: {'Content-Type': 'application/json'} + } + + try { + const { data } = await axios.request(optionsDrink); + return data + } catch (error) { + console.error(error); + } +} -const optionsCity = { - method: 'GET', - url: 'https://api.opentripmap.com/0.1/en/places/geoname', - params: { - name: 'Paris', - apikey: key - }, - headers: {'Content-Type': 'application/json'} -}; +async function callCity(name:string) { + const optionsCity = { + method: 'GET', + url: 'https://api.opentripmap.com/0.1/en/places/geoname', + params: { + name: name, + apikey: key + }, + headers: {'Content-Type': 'application/json'} + }; + + try { + const { data } = await axios.request(optionsCity); + return data + } catch (error) { + console.error(error); + } +} + /** * Handle GET request for city search route ('/otm/city'). @@ -37,35 +56,38 @@ const optionsCity = { */ export async function getCity(req: express.Request, res: express.Response) { const cityName = req.query["name"] - const radius = req.query["radius"] + let radius = req.query["radius"] - if(!key){ - res.status(401).send("Missing OTM key") - return - } if(!cityName){ res.status(400).send("Missing Argument name") return } - if(radius){ - optionsDrink.params.radius = radius as string - } - - optionsCity.params.name = cityName as string - - try { - const { data } = await axios.request(optionsCity); - optionsDrink.params.lat = data.lat - optionsDrink.params.lon = data.lon - } catch (error) { - console.error(error); - } - - try { - const { data } = await axios.request(optionsDrink); - res.send(data); - } catch (error) { - console.error(error); + if(!radius){ + radius = "1000" } + const cityPose = await callCity(cityName as string) + res.send( await callRadius(cityPose.lon,cityPose.lat, radius as string)) } +/** + * Handle GET request for city search route ('/otm/radius'). + * @param {express.Request} req - HTTP Request object. + * @param {express.Response} res - HTTP Response object. + */ +export async function getRadius(req:express.Request, res: express.Response) { + const lon = req.query["lon"] as string + const lat = req.query["lat"] as string + let radius = req.query["radius"] + if(!lon || !lat){ + res.status(400).send("Missing Argument name") + return + } + if(!radius){ + radius = "1000" + } + + res.send(callRadius(lon,lat,radius as string)) +} + +//TODO: fair une route ou l'on donne l'id un établicement pour avoir des détailles +//TODO: fair une route ou l'on donne 2 coordonée -- 2.47.1 From c8266560eb35ad00c3e3365988b901f67973f85d Mon Sep 17 00:00:00 2001 From: Clement Date: Wed, 15 May 2024 00:12:36 +0200 Subject: [PATCH 15/34] add som test --- Express/barAndCafe/test/openTripMaps.test.ts | 88 ++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/Express/barAndCafe/test/openTripMaps.test.ts b/Express/barAndCafe/test/openTripMaps.test.ts index 1e2ce39..6a14056 100644 --- a/Express/barAndCafe/test/openTripMaps.test.ts +++ b/Express/barAndCafe/test/openTripMaps.test.ts @@ -2,6 +2,7 @@ import request from "supertest"; import app from "../src/app"; import { Server, IncomingMessage, ServerResponse } from "http"; import * as dotenv from "dotenv"; +import rewire from 'rewire'; dotenv.config({path: '../../.env'}) const port = parseInt(process.env.BAR_PORT || '3000') @@ -9,6 +10,48 @@ const port = parseInt(process.env.BAR_PORT || '3000') let serveur : Server describe("Test the otm city path", () => { + const opentripmapModule = rewire("../src/openTripMaps") + + const callCity = opentripmapModule.__get__("callCity") + const callRadius = opentripmapModule.__get__("callRadius") + test("Get city from OTM", async () => { + const res = { + "name": "Paris", + "country": "FR", + "lat": 48.85341, + "lon": 2.3488, + "population": 2138551, + "timezone": "Europe/Paris", + "status": "OK" + } + expect(await callCity("Paris")).toEqual(res) + }) + + test("Get bar in radius from OTM", async () => { + const res = { + "type": "FeatureCollection", + "features": [{ + "type": "Feature", + "id": "562635", + "geometry": { + "type": "Point", + "coordinates": [ + -1.4344594, + 46.6686478 + ] + }, + "properties": { + "xid": "N4032296324", + "name": "Le 27 point carré", + "dist": 0.17652159, + "rate": 1, + "osm": "node/4032296324", + "kinds": "foods,bars,tourist_facilities" + } + }] + } + expect(await callRadius("-1.4344594", "46.6686478", "10")).toEqual(res) + }) test("It should response the 200 code for GET method", done => { request(app) @@ -63,4 +106,49 @@ describe("Test the otm city path", () => { done(); }); }); + + test("It should response the 200 code for GET method", done => { + request(app) + .get("/otm/radius") + .query({'lon':'-1.4344594', 'lat' : '46.6686478', 'radius': '10'}) + .then(response => { + expect(response.statusCode).toBe(200); + done(); + }); + }); + + //TODO faire les test pour les cas d'erreur + + test("Get bar in radius from API", done => { + const res = { + "type": "FeatureCollection", + "features": [{ + "type": "Feature", + "id": "562635", + "geometry": { + "type": "Point", + "coordinates": [ + -1.4344594, + 46.6686478 + ] + }, + "properties": { + "xid": "N4032296324", + "name": "Le 27 point carré", + "dist": 0.17652159, + "rate": 1, + "osm": "node/4032296324", + "kinds": "foods,bars,tourist_facilities" + } + }] + } + request(app) + .get("/otm/radius") + .query({'lon':'-1.4344594', 'lat' : '46.6686478', 'radius': '10'}) + .then(response => { + expect(response.text).toEqual(JSON.stringify(res)); + done(); + }); + }) + }); \ No newline at end of file -- 2.47.1 From 44afcec30fec5c1881d974bf7f5beee87a96eb97 Mon Sep 17 00:00:00 2001 From: Clement Date: Wed, 15 May 2024 00:13:07 +0200 Subject: [PATCH 16/34] chage docker commentaire for todo --- Express/barAndCafe/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Express/barAndCafe/Dockerfile b/Express/barAndCafe/Dockerfile index 6e27f40..5e14555 100644 --- a/Express/barAndCafe/Dockerfile +++ b/Express/barAndCafe/Dockerfile @@ -47,7 +47,7 @@ WORKDIR /home/node EXPOSE 3000 # Add Healthcheck -# FIXME: remttre check +# FIXME: remttre check avec un port # HEALTHCHECK --interval=10s --timeout=10s --start-period=5s --retries=3 CMD wget --no-verbose --tries=1 --spider http://localhost:3000 || exit 1 # copy from build image -- 2.47.1 From 2e9362cb32d134a92ecb3e25bd5cabaabd53da16 Mon Sep 17 00:00:00 2001 From: Clement Date: Thu, 16 May 2024 10:14:41 +0200 Subject: [PATCH 17/34] add test form radius in bruno --- bruno/OpenData datatourisme/otm_drink.bru | 8 ++++---- bruno/OpenData datatourisme/otm_ex_radius.bru | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 bruno/OpenData datatourisme/otm_ex_radius.bru diff --git a/bruno/OpenData datatourisme/otm_drink.bru b/bruno/OpenData datatourisme/otm_drink.bru index 1e4c308..21449ec 100644 --- a/bruno/OpenData datatourisme/otm_drink.bru +++ b/bruno/OpenData datatourisme/otm_drink.bru @@ -5,15 +5,15 @@ meta { } get { - url: {{TRIPMAP_URL}}/en/places/radius?radius=1000&lon=-1.43333&lat=46.66667&apikey={{OTM_KEY}}&kinds=bars,cafes,pubs,biergartens + url: {{TRIPMAP_URL}}/en/places/radius?radius=10&lon=-1.4344594&lat=46.6686478&apikey={{OTM_KEY}}&kinds=bars,cafes,pubs,biergartens body: none auth: none } query { - radius: 1000 - lon: -1.43333 - lat: 46.66667 + radius: 10 + lon: -1.4344594 + lat: 46.6686478 apikey: {{OTM_KEY}} kinds: bars,cafes,pubs,biergartens } diff --git a/bruno/OpenData datatourisme/otm_ex_radius.bru b/bruno/OpenData datatourisme/otm_ex_radius.bru new file mode 100644 index 0000000..e4d9e03 --- /dev/null +++ b/bruno/OpenData datatourisme/otm_ex_radius.bru @@ -0,0 +1,16 @@ +meta { + name: otm_ex_radius + type: http + seq: 9 +} + +get { + url: http://localhost:3001/otm/city?name=La roche sur yon&radius=300 + body: none + auth: none +} + +query { + name: La roche sur yon + radius: 300 +} -- 2.47.1 From e700ae625afd06caa48ec75d1d16e5a7aa4965d2 Mon Sep 17 00:00:00 2001 From: Clement Date: Thu, 16 May 2024 10:14:54 +0200 Subject: [PATCH 18/34] test rm rewire --- Express/barAndCafe/test/openTripMaps.test.ts | 47 +------------------- 1 file changed, 2 insertions(+), 45 deletions(-) diff --git a/Express/barAndCafe/test/openTripMaps.test.ts b/Express/barAndCafe/test/openTripMaps.test.ts index 6a14056..663ec95 100644 --- a/Express/barAndCafe/test/openTripMaps.test.ts +++ b/Express/barAndCafe/test/openTripMaps.test.ts @@ -2,7 +2,6 @@ import request from "supertest"; import app from "../src/app"; import { Server, IncomingMessage, ServerResponse } from "http"; import * as dotenv from "dotenv"; -import rewire from 'rewire'; dotenv.config({path: '../../.env'}) const port = parseInt(process.env.BAR_PORT || '3000') @@ -10,48 +9,6 @@ const port = parseInt(process.env.BAR_PORT || '3000') let serveur : Server describe("Test the otm city path", () => { - const opentripmapModule = rewire("../src/openTripMaps") - - const callCity = opentripmapModule.__get__("callCity") - const callRadius = opentripmapModule.__get__("callRadius") - test("Get city from OTM", async () => { - const res = { - "name": "Paris", - "country": "FR", - "lat": 48.85341, - "lon": 2.3488, - "population": 2138551, - "timezone": "Europe/Paris", - "status": "OK" - } - expect(await callCity("Paris")).toEqual(res) - }) - - test("Get bar in radius from OTM", async () => { - const res = { - "type": "FeatureCollection", - "features": [{ - "type": "Feature", - "id": "562635", - "geometry": { - "type": "Point", - "coordinates": [ - -1.4344594, - 46.6686478 - ] - }, - "properties": { - "xid": "N4032296324", - "name": "Le 27 point carré", - "dist": 0.17652159, - "rate": 1, - "osm": "node/4032296324", - "kinds": "foods,bars,tourist_facilities" - } - }] - } - expect(await callRadius("-1.4344594", "46.6686478", "10")).toEqual(res) - }) test("It should response the 200 code for GET method", done => { request(app) @@ -120,7 +77,7 @@ describe("Test the otm city path", () => { //TODO faire les test pour les cas d'erreur test("Get bar in radius from API", done => { - const res = { + const out = { "type": "FeatureCollection", "features": [{ "type": "Feature", @@ -146,7 +103,7 @@ describe("Test the otm city path", () => { .get("/otm/radius") .query({'lon':'-1.4344594', 'lat' : '46.6686478', 'radius': '10'}) .then(response => { - expect(response.text).toEqual(JSON.stringify(res)); + expect(response.text).toEqual(JSON.stringify(out)); done(); }); }) -- 2.47.1 From 1d6b334c74bd0bfbbd7a4427e757f8ae12403681 Mon Sep 17 00:00:00 2001 From: Clement Date: Thu, 16 May 2024 10:15:13 +0200 Subject: [PATCH 19/34] fix; radius route --- Express/barAndCafe/src/openTripMaps.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Express/barAndCafe/src/openTripMaps.ts b/Express/barAndCafe/src/openTripMaps.ts index 7655937..1f7e208 100644 --- a/Express/barAndCafe/src/openTripMaps.ts +++ b/Express/barAndCafe/src/openTripMaps.ts @@ -86,7 +86,7 @@ export async function getRadius(req:express.Request, res: express.Response) { radius = "1000" } - res.send(callRadius(lon,lat,radius as string)) + res.send( await callRadius(lon,lat,radius as string)) } //TODO: fair une route ou l'on donne l'id un établicement pour avoir des détailles -- 2.47.1 From 30d1e62b81cbef0aef7346a605107561796b9f24 Mon Sep 17 00:00:00 2001 From: Clement Date: Thu, 16 May 2024 11:32:01 +0200 Subject: [PATCH 20/34] feat/ make function documentary --- Express/barAndCafe/src/openTripMaps.ts | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/Express/barAndCafe/src/openTripMaps.ts b/Express/barAndCafe/src/openTripMaps.ts index 1f7e208..7d4ca1b 100644 --- a/Express/barAndCafe/src/openTripMaps.ts +++ b/Express/barAndCafe/src/openTripMaps.ts @@ -3,9 +3,15 @@ import express from "express" import * as dotenv from "dotenv"; dotenv.config({path: '../../.env'}) - const key = process.env.OPEN_TRIP_MAPS_KEY +/** + * make GET request to the OTM for radius search. + * @param {string} lon Longitude of radius center point + * @param {string} lat Latitude du point central du rayon + * @param {string} radius search radius size in meters + * @returns {FeatureCollection} a list of POIs with their type, id, etc. (cf: [opentripmap](https://dev.opentripmap.org/docs#)) + */ async function callRadius(lon: string, lat: string, radius = '1000') { const optionsDrink = { method: 'GET', @@ -28,7 +34,11 @@ async function callRadius(lon: string, lat: string, radius = '1000') { } } - +/** + * make GET request to the OTM for city info. + * @param {string} name Name of a city + * @returns {Geoname} info of a search city their name, country, lat, lon, etc. (cf: [opentripmap](https://dev.opentripmap.org/docs#)) + */ async function callCity(name:string) { const optionsCity = { method: 'GET', @@ -70,7 +80,7 @@ export async function getCity(req: express.Request, res: express.Response) { } /** - * Handle GET request for city search route ('/otm/radius'). + * Handle GET request for radius search route ('/otm/radius'). * @param {express.Request} req - HTTP Request object. * @param {express.Response} res - HTTP Response object. */ -- 2.47.1 From 6e500a32e319454ac71a38026d9161d013102776 Mon Sep 17 00:00:00 2001 From: Clement Date: Thu, 16 May 2024 11:32:28 +0200 Subject: [PATCH 21/34] add swagger doc --- Express/barAndCafe/src/app.ts | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/Express/barAndCafe/src/app.ts b/Express/barAndCafe/src/app.ts index 4b5c8b4..7d707fe 100644 --- a/Express/barAndCafe/src/app.ts +++ b/Express/barAndCafe/src/app.ts @@ -55,7 +55,40 @@ app.get("/welcome", getWelcome) app.get("/otm/city", getCity) -//XXX: faire la doc SWAGGER +/** + * @openapi + * /otm/radius: + * get: + * summary: return the drinks in a radius + * description: return the drinks in a defined radius + * parameters: + * - name: lon + * in: query + * required: true + * description: longitude of the center of the radius + * schema: + * type: number + * minimum: -180 + * maximum: 180 + * - name: lat + * in: query + * required: true + * description: latitude of the center of the radius + * schema: + * type: number + * minimum: -90 + * maximum: 90 + * - name: radius + * in: query + * description: size of the radius + * responses: + * 200: + * description: Return a list of bars and coffee in city in geoJSON format + * 400: + * description: Missing Argument Error + * 401: + * description: Missing OTM tocken + */ app.get("/otm/radius", getRadius) export default app \ No newline at end of file -- 2.47.1 From ee858b2d91ee223f9c901d891c1da56bdcac320f Mon Sep 17 00:00:00 2001 From: Clement Date: Thu, 16 May 2024 11:32:44 +0200 Subject: [PATCH 22/34] add some jsdocs plugin --- Express/barAndCafe/jsdoc.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Express/barAndCafe/jsdoc.json b/Express/barAndCafe/jsdoc.json index 2f8c36a..797d78d 100644 --- a/Express/barAndCafe/jsdoc.json +++ b/Express/barAndCafe/jsdoc.json @@ -6,10 +6,15 @@ "allowUnknownTags": true }, "plugins": [ - "node_modules/better-docs/typescript" + "node_modules/better-docs/typescript", + "plugins/markdown", + "jsdoc-mermaid" ], "source": { "include": ["./src"], "includePattern": "\\.(jsx|js|ts|tsx)$" + }, + "templates": { + "search": true } -} \ No newline at end of file +} -- 2.47.1 From d9003d7230588b9d61b4c6c738f6c40633e4319f Mon Sep 17 00:00:00 2001 From: Clement Date: Thu, 16 May 2024 11:33:11 +0200 Subject: [PATCH 23/34] add jsdoc plugin --- Express/barAndCafe/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/Express/barAndCafe/package.json b/Express/barAndCafe/package.json index 9ed5a3c..89ee4da 100644 --- a/Express/barAndCafe/package.json +++ b/Express/barAndCafe/package.json @@ -29,6 +29,7 @@ "better-docs": "^2.7.3", "jest": "^29.7.0", "jsdoc": "^4.0.3", + "jsdoc-mermaid": "^1.0.0", "nodemon": "^3.1.0", "rewire": "^7.0.0", "superagent": "^9.0.2", -- 2.47.1 From 4e2803fcdbbaa4732cac91533d83af52f04fa0cf Mon Sep 17 00:00:00 2001 From: Clement Date: Thu, 16 May 2024 11:33:20 +0200 Subject: [PATCH 24/34] add jsdoc plugin --- Express/barAndCafe/package-lock.json | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Express/barAndCafe/package-lock.json b/Express/barAndCafe/package-lock.json index e884461..42ae426 100644 --- a/Express/barAndCafe/package-lock.json +++ b/Express/barAndCafe/package-lock.json @@ -23,6 +23,7 @@ "better-docs": "^2.7.3", "jest": "^29.7.0", "jsdoc": "^4.0.3", + "jsdoc-mermaid": "^1.0.0", "nodemon": "^3.1.0", "rewire": "^7.0.0", "superagent": "^9.0.2", @@ -8512,6 +8513,27 @@ "node": ">=12.0.0" } }, + "node_modules/jsdoc-mermaid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/jsdoc-mermaid/-/jsdoc-mermaid-1.0.0.tgz", + "integrity": "sha512-WgXR/E1369RurPVFkyNzUWP5wB5xQkm0p+vdIh/cX6ZtEQBb5KdeukDje47Du++IehwztkR3GJcwYhM+eaq/4w==", + "dev": true, + "dependencies": { + "doctrine": "^2.0.0" + } + }, + "node_modules/jsdoc-mermaid/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/jsdoc/node_modules/escape-string-regexp": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", -- 2.47.1 From a05fb87f85c36eb5452e065ff3a6ea1df30936d2 Mon Sep 17 00:00:00 2001 From: Clement Date: Sat, 18 May 2024 13:04:12 +0200 Subject: [PATCH 25/34] add test for detaill POI --- Express/barAndCafe/test/openTripMaps.test.ts | 58 ++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/Express/barAndCafe/test/openTripMaps.test.ts b/Express/barAndCafe/test/openTripMaps.test.ts index 663ec95..47fb28d 100644 --- a/Express/barAndCafe/test/openTripMaps.test.ts +++ b/Express/barAndCafe/test/openTripMaps.test.ts @@ -108,4 +108,62 @@ describe("Test the otm city path", () => { }); }) + test("It should response the 200 code for GET method", done => { + request(app) + .get("/otm/poidetaill") + .query({'id':'562635'}) + .then(response => { + expect(response.statusCode).toBe(200); + done(); + }); + }); + + test("Get bar in radius from API", done => { + const out = { + "xid": "N4032296324", + "name": "Le 27 point carré", + "address": { + "road": "Rue Raymond Poincaré", + "town": "La Roche-sur-Yon", + "state": "Pays de la Loire", + "county": "La Roche-sur-Yon", + "suburb": "Zola", + "country": "France", + "postcode": "85000", + "country_code": "fr", + "house_number": "27", + "neighbourhood": "Cité des Forges" + }, + "rate": "1", + "osm": "node/4032296324", + "kinds": "foods,bars,tourist_facilities", + "sources": { + "geometry": "osm", + "attributes": [ + "osm" + ] + }, + "otm": "https://opentripmap.com/en/card/N4032296324", + "point": { + "lon": -1.4344594478607178, + "lat": 46.66864776611328 + } + } + request(app) + .get("/otm/poidetaill") + .query({'id':'562635'}) + .then(response => { + expect(response.text).toEqual(JSON.stringify(out)); + done(); + }); + }) + + test("It should response the 200 code for GET method", done => { + request(app) + .get("/otm/poidetaill") + .then(response => { + expect(response.statusCode).toBe(400); + done(); + }); + }); }); \ No newline at end of file -- 2.47.1 From 165b2e91bfdc1028a56067fa9eb0db4f466df6df Mon Sep 17 00:00:00 2001 From: Clement Date: Sat, 18 May 2024 13:04:23 +0200 Subject: [PATCH 26/34] add some bruno test --- bruno/OpenData datatourisme/get return format.bru | 11 +++++++++++ bruno/OpenData datatourisme/otm_ex_drink_id.bru | 15 +++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 bruno/OpenData datatourisme/get return format.bru create mode 100644 bruno/OpenData datatourisme/otm_ex_drink_id.bru diff --git a/bruno/OpenData datatourisme/get return format.bru b/bruno/OpenData datatourisme/get return format.bru new file mode 100644 index 0000000..b71bc69 --- /dev/null +++ b/bruno/OpenData datatourisme/get return format.bru @@ -0,0 +1,11 @@ +meta { + name: get return format + type: http + seq: 11 +} + +get { + url: https://dev.opentripmap.org/openapi.en.json + body: none + auth: none +} diff --git a/bruno/OpenData datatourisme/otm_ex_drink_id.bru b/bruno/OpenData datatourisme/otm_ex_drink_id.bru new file mode 100644 index 0000000..586b4c9 --- /dev/null +++ b/bruno/OpenData datatourisme/otm_ex_drink_id.bru @@ -0,0 +1,15 @@ +meta { + name: otm_ex_drink_id + type: http + seq: 10 +} + +get { + url: https://api.opentripmap.com/0.1/en/places/xid/562635?apikey={{OTM_KEY}} + body: none + auth: none +} + +query { + apikey: {{OTM_KEY}} +} -- 2.47.1 From 9ac4ba72523199d39e3da0208bc43a1c3be13ad9 Mon Sep 17 00:00:00 2001 From: Clement Date: Sat, 18 May 2024 13:04:43 +0200 Subject: [PATCH 27/34] add call otm call --- Express/barAndCafe/src/openTripMaps.ts | 36 ++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/Express/barAndCafe/src/openTripMaps.ts b/Express/barAndCafe/src/openTripMaps.ts index 7d4ca1b..2ef91d0 100644 --- a/Express/barAndCafe/src/openTripMaps.ts +++ b/Express/barAndCafe/src/openTripMaps.ts @@ -58,6 +58,28 @@ async function callCity(name:string) { } } +/** + * make GET request to the OTM for city info. + * @param {string} name Name of a city + * @returns {Geoname} info of a search city their name, country, lat, lon, etc. (cf: [opentripmap](https://dev.opentripmap.org/docs#)) + */ +async function callId(id:string) { + const optionsId = { + method: 'GET', + url: 'https://api.opentripmap.com/0.1/en/places/xid/' + id, + params: { + apikey: key + }, + headers: {'Content-Type': 'application/json'} + }; + + try { + const { data } = await axios.request(optionsId); + return data + } catch (error) { + console.error(error); + } +} /** * Handle GET request for city search route ('/otm/city'). @@ -99,5 +121,19 @@ export async function getRadius(req:express.Request, res: express.Response) { res.send( await callRadius(lon,lat,radius as string)) } +/** + * Handle GET request for radius search route ('/otm/radius'). + * @param {express.Request} req - HTTP Request object. + * @param {express.Response} res - HTTP Response object. + */ +export async function getPoiId(req: express.Request, res: express.Response){ + const id = req.query["id"] as string + if(!id){ + res.status(400).send("Missing Argument name") + return + } + res.send( await callId( id as string)) +} + //TODO: fair une route ou l'on donne l'id un établicement pour avoir des détailles //TODO: fair une route ou l'on donne 2 coordonée -- 2.47.1 From ae9e1eae47245aeaeb76b328fb227b082a75c8ee Mon Sep 17 00:00:00 2001 From: Clement Date: Sat, 18 May 2024 13:04:59 +0200 Subject: [PATCH 28/34] add route and swagger doc --- Express/barAndCafe/src/app.ts | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/Express/barAndCafe/src/app.ts b/Express/barAndCafe/src/app.ts index 7d707fe..6eb0f0d 100644 --- a/Express/barAndCafe/src/app.ts +++ b/Express/barAndCafe/src/app.ts @@ -1,4 +1,4 @@ -import { getCity, getRadius } from "./openTripMaps" +import { getCity, getRadius, getPoiId } from "./openTripMaps" import express from "express" /** * Initialize Express application instance. @@ -91,4 +91,28 @@ app.get("/otm/city", getCity) */ app.get("/otm/radius", getRadius) + +/** + * @openapi + * /otm/poidetaill: + * get: + * summary: detail of a POI + * description: detail of a POI link name, kind, rate,... + * parameters: + * - name: id + * in: query + * required: true + * description: Unique identifier of the object in OpenTripMap + * schema: + * type: string + * responses: + * 200: + * description: Return a list of bars and coffee in city in geoJSON format + * 400: + * description: Missing Argument Error + * 401: + * description: Missing OTM tocken + */ +app.get("/otm/poidetaill", getPoiId) + export default app \ No newline at end of file -- 2.47.1 From 04ca99afdb0e5aec84e0d8dbecf168da9caa2862 Mon Sep 17 00:00:00 2001 From: Clement Date: Sat, 18 May 2024 13:13:29 +0200 Subject: [PATCH 29/34] add error test case --- Express/barAndCafe/test/openTripMaps.test.ts | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/Express/barAndCafe/test/openTripMaps.test.ts b/Express/barAndCafe/test/openTripMaps.test.ts index 47fb28d..1f5c99c 100644 --- a/Express/barAndCafe/test/openTripMaps.test.ts +++ b/Express/barAndCafe/test/openTripMaps.test.ts @@ -74,7 +74,25 @@ describe("Test the otm city path", () => { }); }); - //TODO faire les test pour les cas d'erreur + test("It should response the 200 code for GET method (default radius)", done => { + request(app) + .get("/otm/radius") + .query({'lon':'-1.4344594', 'lat' : '46.6686478'}) + .then(response => { + expect(response.statusCode).toBe(200); + done(); + }); + }); + + test("It should response the 400 code for GET method (missing lon and lat)", done => { + request(app) + .get("/otm/radius") + .then(response => { + expect(response.statusCode).toBe(400); + done(); + }); + }); + test("Get bar in radius from API", done => { const out = { -- 2.47.1 From 405dcaeba92dad258ac770ea3109fbf6644b0dbb Mon Sep 17 00:00:00 2001 From: Clement Date: Sat, 18 May 2024 14:34:43 +0200 Subject: [PATCH 30/34] change path in bruno --- .../express/otm_ex_box.bru | 20 +++++++++++++++++++ .../{ => express}/otm_ex_city.bru | 2 +- .../{ => express}/otm_ex_drink_id.bru | 2 +- .../{ => express}/otm_ex_radius.bru | 2 +- .../get return format.bru | 11 ---------- .../{ => otm}/otm_drink.bru | 2 +- .../otm/otm_drink_bbox.bru | 19 ++++++++++++++++++ .../{ => otm}/otm_drink_id.bru | 2 +- .../otm/otm_location.bru | 20 +++++++++++++++++++ bruno/OpenData datatourisme/otm_location.bru | 16 --------------- 10 files changed, 64 insertions(+), 32 deletions(-) create mode 100644 bruno/OpenData datatourisme/express/otm_ex_box.bru rename bruno/OpenData datatourisme/{ => express}/otm_ex_city.bru (95%) rename bruno/OpenData datatourisme/{ => express}/otm_ex_drink_id.bru (95%) rename bruno/OpenData datatourisme/{ => express}/otm_ex_radius.bru (95%) delete mode 100644 bruno/OpenData datatourisme/get return format.bru rename bruno/OpenData datatourisme/{ => otm}/otm_drink.bru (97%) create mode 100644 bruno/OpenData datatourisme/otm/otm_drink_bbox.bru rename bruno/OpenData datatourisme/{ => otm}/otm_drink_id.bru (95%) create mode 100644 bruno/OpenData datatourisme/otm/otm_location.bru delete mode 100644 bruno/OpenData datatourisme/otm_location.bru diff --git a/bruno/OpenData datatourisme/express/otm_ex_box.bru b/bruno/OpenData datatourisme/express/otm_ex_box.bru new file mode 100644 index 0000000..f958734 --- /dev/null +++ b/bruno/OpenData datatourisme/express/otm_ex_box.bru @@ -0,0 +1,20 @@ +meta { + name: otm_ex_box + type: http + seq: 4 +} + +get { + url: http://localhost:3001/otm/box?lon1=-1.435199&lon2=-1.43519&lat1=46.668460&lat2=46.668461&apikey={{OTM_KEY}}&kinds=bars,cafes,pubs,biergartens + body: none + auth: none +} + +query { + lon1: -1.435199 + lon2: -1.43519 + lat1: 46.668460 + lat2: 46.668461 + apikey: {{OTM_KEY}} + kinds: bars,cafes,pubs,biergartens +} diff --git a/bruno/OpenData datatourisme/otm_ex_city.bru b/bruno/OpenData datatourisme/express/otm_ex_city.bru similarity index 95% rename from bruno/OpenData datatourisme/otm_ex_city.bru rename to bruno/OpenData datatourisme/express/otm_ex_city.bru index 6f0ad67..15bda16 100644 --- a/bruno/OpenData datatourisme/otm_ex_city.bru +++ b/bruno/OpenData datatourisme/express/otm_ex_city.bru @@ -1,7 +1,7 @@ meta { name: otm_ex_city type: http - seq: 8 + seq: 1 } get { diff --git a/bruno/OpenData datatourisme/otm_ex_drink_id.bru b/bruno/OpenData datatourisme/express/otm_ex_drink_id.bru similarity index 95% rename from bruno/OpenData datatourisme/otm_ex_drink_id.bru rename to bruno/OpenData datatourisme/express/otm_ex_drink_id.bru index 586b4c9..8adc773 100644 --- a/bruno/OpenData datatourisme/otm_ex_drink_id.bru +++ b/bruno/OpenData datatourisme/express/otm_ex_drink_id.bru @@ -1,7 +1,7 @@ meta { name: otm_ex_drink_id type: http - seq: 10 + seq: 2 } get { diff --git a/bruno/OpenData datatourisme/otm_ex_radius.bru b/bruno/OpenData datatourisme/express/otm_ex_radius.bru similarity index 95% rename from bruno/OpenData datatourisme/otm_ex_radius.bru rename to bruno/OpenData datatourisme/express/otm_ex_radius.bru index e4d9e03..31fb497 100644 --- a/bruno/OpenData datatourisme/otm_ex_radius.bru +++ b/bruno/OpenData datatourisme/express/otm_ex_radius.bru @@ -1,7 +1,7 @@ meta { name: otm_ex_radius type: http - seq: 9 + seq: 3 } get { diff --git a/bruno/OpenData datatourisme/get return format.bru b/bruno/OpenData datatourisme/get return format.bru deleted file mode 100644 index b71bc69..0000000 --- a/bruno/OpenData datatourisme/get return format.bru +++ /dev/null @@ -1,11 +0,0 @@ -meta { - name: get return format - type: http - seq: 11 -} - -get { - url: https://dev.opentripmap.org/openapi.en.json - body: none - auth: none -} diff --git a/bruno/OpenData datatourisme/otm_drink.bru b/bruno/OpenData datatourisme/otm/otm_drink.bru similarity index 97% rename from bruno/OpenData datatourisme/otm_drink.bru rename to bruno/OpenData datatourisme/otm/otm_drink.bru index 21449ec..c1f4cf1 100644 --- a/bruno/OpenData datatourisme/otm_drink.bru +++ b/bruno/OpenData datatourisme/otm/otm_drink.bru @@ -1,7 +1,7 @@ meta { name: otm_drink type: http - seq: 6 + seq: 1 } get { diff --git a/bruno/OpenData datatourisme/otm/otm_drink_bbox.bru b/bruno/OpenData datatourisme/otm/otm_drink_bbox.bru new file mode 100644 index 0000000..3b1a349 --- /dev/null +++ b/bruno/OpenData datatourisme/otm/otm_drink_bbox.bru @@ -0,0 +1,19 @@ +meta { + name: otm_drink_bbox + type: http + seq: 4 +} + +get { + url: {{TRIPMAP_URL}}/en/places/radius?radius=10&lon=-1.4344594&lat=46.6686478&apikey={{OTM_KEY}}&kinds=bars,cafes,pubs,biergartens + body: none + auth: none +} + +query { + radius: 10 + lon: -1.4344594 + lat: 46.6686478 + apikey: {{OTM_KEY}} + kinds: bars,cafes,pubs,biergartens +} diff --git a/bruno/OpenData datatourisme/otm_drink_id.bru b/bruno/OpenData datatourisme/otm/otm_drink_id.bru similarity index 95% rename from bruno/OpenData datatourisme/otm_drink_id.bru rename to bruno/OpenData datatourisme/otm/otm_drink_id.bru index 408e921..60253d1 100644 --- a/bruno/OpenData datatourisme/otm_drink_id.bru +++ b/bruno/OpenData datatourisme/otm/otm_drink_id.bru @@ -1,7 +1,7 @@ meta { name: otm_drink_id type: http - seq: 7 + seq: 3 } get { diff --git a/bruno/OpenData datatourisme/otm/otm_location.bru b/bruno/OpenData datatourisme/otm/otm_location.bru new file mode 100644 index 0000000..ca04a6f --- /dev/null +++ b/bruno/OpenData datatourisme/otm/otm_location.bru @@ -0,0 +1,20 @@ +meta { + name: otm_location + type: http + seq: 2 +} + +get { + url: https://api.opentripmap.com/0.1/en/places/bbox?lon_min=-1.435199&lon_max=-1.43519&lat_min=46.668460&lat_max=46.668461&apikey={{OTM_KEY}}&kinds=bars,cafes,pubs,biergartens + body: none + auth: none +} + +query { + lon_min: -1.435199 + lon_max: -1.43519 + lat_min: 46.668460 + lat_max: 46.668461 + apikey: {{OTM_KEY}} + kinds: bars,cafes,pubs,biergartens +} diff --git a/bruno/OpenData datatourisme/otm_location.bru b/bruno/OpenData datatourisme/otm_location.bru deleted file mode 100644 index 8e8813f..0000000 --- a/bruno/OpenData datatourisme/otm_location.bru +++ /dev/null @@ -1,16 +0,0 @@ -meta { - name: otm_location - type: http - seq: 5 -} - -get { - url: {{TRIPMAP_URL}}/en/places/geoname?name=Paris&apikey={{OTM_KEY}} - body: none - auth: none -} - -query { - name: Paris - apikey: {{OTM_KEY}} -} -- 2.47.1 From 70fa338f2fd8189c0941a4bcb7d5dd18d07d5e8a Mon Sep 17 00:00:00 2001 From: Clement Date: Sat, 18 May 2024 14:35:07 +0200 Subject: [PATCH 31/34] add otm tes box --- Express/barAndCafe/test/openTripMaps.test.ts | 171 ++++++++++++++----- 1 file changed, 128 insertions(+), 43 deletions(-) diff --git a/Express/barAndCafe/test/openTripMaps.test.ts b/Express/barAndCafe/test/openTripMaps.test.ts index 1f5c99c..44fdc1f 100644 --- a/Express/barAndCafe/test/openTripMaps.test.ts +++ b/Express/barAndCafe/test/openTripMaps.test.ts @@ -1,7 +1,7 @@ -import request from "supertest"; -import app from "../src/app"; -import { Server, IncomingMessage, ServerResponse } from "http"; -import * as dotenv from "dotenv"; +import request from "supertest" +import app from "../src/app" +import { Server, IncomingMessage, ServerResponse } from "http" +import * as dotenv from "dotenv" dotenv.config({path: '../../.env'}) const port = parseInt(process.env.BAR_PORT || '3000') @@ -15,10 +15,10 @@ describe("Test the otm city path", () => { .get("/otm/city") .query({'name':'La roche sur yon'}) .then(response => { - expect(response.statusCode).toBe(200); - done(); - }); - }); + expect(response.statusCode).toBe(200) + done() + }) + }) test("It should response the GET method with content", done => { const out = { @@ -50,48 +50,48 @@ describe("Test the otm city path", () => { .then(response => { console.log(response.text) expect(response.text).toEqual(JSON.stringify(out)) - done(); - }); - }); + done() + }) + }) test("It should response the 400 code for GET method", done => { request(app) .get("/otm/city") .then(response => { console.log(response.text) - expect(response.statusCode).toBe(400); - done(); - }); - }); + expect(response.statusCode).toBe(400) + done() + }) + }) test("It should response the 200 code for GET method", done => { request(app) .get("/otm/radius") .query({'lon':'-1.4344594', 'lat' : '46.6686478', 'radius': '10'}) .then(response => { - expect(response.statusCode).toBe(200); - done(); - }); - }); + expect(response.statusCode).toBe(200) + done() + }) + }) test("It should response the 200 code for GET method (default radius)", done => { request(app) .get("/otm/radius") .query({'lon':'-1.4344594', 'lat' : '46.6686478'}) .then(response => { - expect(response.statusCode).toBe(200); - done(); - }); - }); + expect(response.statusCode).toBe(200) + done() + }) + }) test("It should response the 400 code for GET method (missing lon and lat)", done => { request(app) .get("/otm/radius") .then(response => { - expect(response.statusCode).toBe(400); - done(); - }); - }); + expect(response.statusCode).toBe(400) + done() + }) + }) test("Get bar in radius from API", done => { @@ -121,9 +121,9 @@ describe("Test the otm city path", () => { .get("/otm/radius") .query({'lon':'-1.4344594', 'lat' : '46.6686478', 'radius': '10'}) .then(response => { - expect(response.text).toEqual(JSON.stringify(out)); - done(); - }); + expect(response.text).toEqual(JSON.stringify(out)) + done() + }) }) test("It should response the 200 code for GET method", done => { @@ -131,10 +131,10 @@ describe("Test the otm city path", () => { .get("/otm/poidetaill") .query({'id':'562635'}) .then(response => { - expect(response.statusCode).toBe(200); - done(); - }); - }); + expect(response.statusCode).toBe(200) + done() + }) + }) test("Get bar in radius from API", done => { const out = { @@ -171,17 +171,102 @@ describe("Test the otm city path", () => { .get("/otm/poidetaill") .query({'id':'562635'}) .then(response => { - expect(response.text).toEqual(JSON.stringify(out)); - done(); - }); + expect(response.text).toEqual(JSON.stringify(out)) + done() + }) + }) + + test("It should response the 400 code for GET method (no id)", done => { + request(app) + .get("/otm/poidetaill") + .then(response => { + expect(response.statusCode).toBe(400) + done() + }) }) test("It should response the 200 code for GET method", done => { request(app) - .get("/otm/poidetaill") + .get("/otm/box") + .query({'lon1':'-1.435199','lon2':'-1.43519', 'lat1':'46.668460', 'lat2':'46.668461'}) .then(response => { - expect(response.statusCode).toBe(400); - done(); - }); - }); -}); \ No newline at end of file + expect(response.statusCode).toBe(200) + done() + }) + }) + + test("Get bar in box from API", done => { + const out = { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "id": "562633", + "geometry": { + "type": "Point", + "coordinates": [ + -1.435197, + 46.6684608 + ] + }, + "properties": { + "xid": "N4032296323", + "name": "Le Cube", + "rate": 1, + "osm": "node/4032296323", + "kinds": "foods,cafes,tourist_facilities" + } + } + ] + } + request(app) + .get("/otm/box") + .query({'lon1':'-1.435199','lon2':'-1.43519', 'lat1':'46.668460', 'lat2':'46.668461'}) + .then(response => { + expect(response.text).toEqual(JSON.stringify(out)) + done() + }) + }) + + test("Get bar in box from API lat reversed", done => { + const out = { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "id": "562633", + "geometry": { + "type": "Point", + "coordinates": [ + -1.435197, + 46.6684608 + ] + }, + "properties": { + "xid": "N4032296323", + "name": "Le Cube", + "rate": 1, + "osm": "node/4032296323", + "kinds": "foods,cafes,tourist_facilities" + } + } + ] + } + request(app) + .get("/otm/box") + .query({'lon1':'-1.435199','lon2':'-1.43519', 'lat2':'46.668460', 'lat1':'46.668461'}) + .then(response => { + expect(response.text).toEqual(JSON.stringify(out)) + done() + }) + }) + + test("It should response the 400 code for GET method (no coordonaite)", done => { + request(app) + .get("/otm/box") + .then(response => { + expect(response.statusCode).toBe(400) + done() + }) + }) +}) \ No newline at end of file -- 2.47.1 From 4ffef9be275307e24b8f42f2300e717e08d7b074 Mon Sep 17 00:00:00 2001 From: Clement Date: Sat, 18 May 2024 14:35:18 +0200 Subject: [PATCH 32/34] add box function --- Express/barAndCafe/src/openTripMaps.ts | 78 ++++++++++++++++++++++---- 1 file changed, 66 insertions(+), 12 deletions(-) diff --git a/Express/barAndCafe/src/openTripMaps.ts b/Express/barAndCafe/src/openTripMaps.ts index 2ef91d0..bbedd21 100644 --- a/Express/barAndCafe/src/openTripMaps.ts +++ b/Express/barAndCafe/src/openTripMaps.ts @@ -1,10 +1,47 @@ -import axios from 'axios'; +import axios from 'axios' import express from "express" -import * as dotenv from "dotenv"; +import * as dotenv from "dotenv" dotenv.config({path: '../../.env'}) const key = process.env.OPEN_TRIP_MAPS_KEY +/** + * make a GET request to the OTM for a rectangle search. + * @param {string} lon1 Longitude of the 1st point of the box + * @param {string} lat1 Latitude of the 1st point of the box + * @param {string} lon2 Longitude of the 2nd point of the box + * @param {string} lat2 Latitude of the 2nd point of the box + * @returns {FeatureCollection} a list of POIs with their type, id, etc. (cf: [opentripmap](https://dev.opentripmap.org/docs#)) + */ +async function callBox(lon1:string, lat1:string, lon2: string, lat2: string) { + const lonMin = Math.min(parseFloat(lon1), parseFloat(lon2)) + const lonMax = Math.max(parseFloat(lon1), parseFloat(lon2)) + const latMin = Math.min(parseFloat(lat1), parseFloat(lat2)) + const latMax = Math.max(parseFloat(lat1), parseFloat(lat2)) + + const options = { + method: 'GET', + url: 'https://api.opentripmap.com/0.1/en/places/bbox', + params: { + lon_min: lonMin, + lon_max: lonMax, + lat_min: latMin, + lat_max: latMax, + apikey: key, + kinds: 'bars,cafes,pubs,biergartens' + }, + headers: {'Content-Type': 'application/json'} + } + + try { + const { data } = await axios.request(options) + return data + } catch (error) { + console.error(error) + } +} + + /** * make GET request to the OTM for radius search. * @param {string} lon Longitude of radius center point @@ -27,10 +64,10 @@ async function callRadius(lon: string, lat: string, radius = '1000') { } try { - const { data } = await axios.request(optionsDrink); + const { data } = await axios.request(optionsDrink) return data } catch (error) { - console.error(error); + console.error(error) } } @@ -48,13 +85,13 @@ async function callCity(name:string) { apikey: key }, headers: {'Content-Type': 'application/json'} - }; + } try { - const { data } = await axios.request(optionsCity); + const { data } = await axios.request(optionsCity) return data } catch (error) { - console.error(error); + console.error(error) } } @@ -71,13 +108,13 @@ async function callId(id:string) { apikey: key }, headers: {'Content-Type': 'application/json'} - }; + } try { - const { data } = await axios.request(optionsId); + const { data } = await axios.request(optionsId) return data } catch (error) { - console.error(error); + console.error(error) } } @@ -111,7 +148,7 @@ export async function getRadius(req:express.Request, res: express.Response) { const lat = req.query["lat"] as string let radius = req.query["radius"] if(!lon || !lat){ - res.status(400).send("Missing Argument name") + res.status(400).send("Missing Argument") return } if(!radius){ @@ -135,5 +172,22 @@ export async function getPoiId(req: express.Request, res: express.Response){ res.send( await callId( id as string)) } -//TODO: fair une route ou l'on donne l'id un établicement pour avoir des détailles +/** + * Handle GET request for radius search route ('/otm/box'). + * @param {express.Request} req - HTTP Request object. + * @param {express.Response} res - HTTP Response object. + */ +export async function getBox(req:express.Request, res: express.Response) { + const lon1 = req.query["lon1"] as string + const lat1 = req.query["lat1"] as string + const lon2 = req.query["lon2"] as string + const lat2 = req.query["lat2"] as string + if(!lon1 || !lat1 || !lon2 || !lat2){ + res.status(400).send("Missing Argument") + return + } + + res.send( await callBox(lon1, lat1, lon2, lat2)) +} + //TODO: fair une route ou l'on donne 2 coordonée -- 2.47.1 From 02dc74bb79f5c1a16efc1d37bbec6946783ec986 Mon Sep 17 00:00:00 2001 From: Clement Date: Sat, 18 May 2024 14:35:28 +0200 Subject: [PATCH 33/34] add box route --- Express/barAndCafe/src/app.ts | 53 +++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/Express/barAndCafe/src/app.ts b/Express/barAndCafe/src/app.ts index 6eb0f0d..400e92f 100644 --- a/Express/barAndCafe/src/app.ts +++ b/Express/barAndCafe/src/app.ts @@ -1,4 +1,4 @@ -import { getCity, getRadius, getPoiId } from "./openTripMaps" +import { getCity, getRadius, getPoiId, getBox } from "./openTripMaps" import express from "express" /** * Initialize Express application instance. @@ -107,7 +107,7 @@ app.get("/otm/radius", getRadius) * type: string * responses: * 200: - * description: Return a list of bars and coffee in city in geoJSON format + * description: Return the detaill of an POI in otm * 400: * description: Missing Argument Error * 401: @@ -115,4 +115,53 @@ app.get("/otm/radius", getRadius) */ app.get("/otm/poidetaill", getPoiId) +/** + * @openapi + * /otm/box: + * get: + * summary: return the drinks in a box + * description: return the drinks in a defined box + * parameters: + * - name: lon1 + * in: query + * required: true + * description: longitude 1 of the box + * schema: + * type: number + * minimum: -180 + * maximum: 180 + * - name: lat1 + * in: query + * required: true + * description: latitude 1 of the box + * schema: + * type: number + * minimum: -90 + * maximum: 90 + * - name: lon2 + * in: query + * required: true + * description: longitude 2 of the box + * schema: + * type: number + * minimum: -180 + * maximum: 180 + * - name: lat2 + * in: query + * required: true + * description: latitude 2 of the box + * schema: + * type: number + * minimum: -90 + * maximum: 90 + * responses: + * 200: + * description: Return a list of bars and coffee in city in geoJSON format + * 400: + * description: Missing Argument Error + * 401: + * description: Missing OTM tocken + */ +app.get("/otm/box", getBox) + export default app \ No newline at end of file -- 2.47.1 From d6109ccdfffe98c5bb62abb11e01dcce302c537a Mon Sep 17 00:00:00 2001 From: Clement Date: Sat, 18 May 2024 14:44:36 +0200 Subject: [PATCH 34/34] update docker file --- Express/barAndCafe/Dockerfile | 9 ++++++--- docker-compose.yml | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Express/barAndCafe/Dockerfile b/Express/barAndCafe/Dockerfile index 5e14555..12c6d98 100644 --- a/Express/barAndCafe/Dockerfile +++ b/Express/barAndCafe/Dockerfile @@ -43,12 +43,15 @@ USER node # go to work folder WORKDIR /home/node + +ARG port +ENV env_port $port + # Expose port -EXPOSE 3000 +EXPOSE $port # Add Healthcheck -# FIXME: remttre check avec un port -# HEALTHCHECK --interval=10s --timeout=10s --start-period=5s --retries=3 CMD wget --no-verbose --tries=1 --spider http://localhost:3000 || exit 1 +HEALTHCHECK --interval=10s --timeout=10s --start-period=5s --retries=3 CMD wget --no-verbose --tries=1 --spider http://localhost:$port || exit 1 # copy from build image COPY --chown=node:node --from=BUILD_IMAGE /home/node/node_modules ./node_modules diff --git a/docker-compose.yml b/docker-compose.yml index 6ce5a81..6d262d5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,6 +31,8 @@ services: back_drink: image: git.lab-ouest.org/epitech/ratrapage_t-web_back:pr-6-head + environment: + - port=${BACK_BASE_PORT} labels: - traefik.enable=true - traefik.http.routers.expressDrinkTweb.rule=Host(`${DRINK_URL}`) -- 2.47.1