feat: use drink api in front and more (#16)

Reviewed-on: #16
Co-authored-by: Clement <c.boesmier@aptatio.com>
Co-committed-by: Clement <c.boesmier@aptatio.com>

Express/barAndCafe/jest.config.js

@@ -1,5 +1,8 @@
 /** @type {import('ts-jest').JestConfigWithTsJest} */
 module.exports = {
+  testPathIgnorePatterns: [
+    "<rootDir>/dist/"
+  ],
   testTimeout: 10000,
   preset: 'ts-jest',
   testEnvironment: 'node',

Express/barAndCafe/package-lock.json

@@ -8,6 +8,7 @@
         "@types/express": "^4.17.21",
         "@types/node": "^20.12.7",
         "axios": "^1.6.8",
+        "cors": "^2.8.5",
         "dotenv": "^16.4.5",
         "express": "^4.19.2",
         "rimraf": "^5.0.5",
@@ -15,6 +16,7 @@
         "swagger-ui-express": "^5.0.0"
       },
       "devDependencies": {
+        "@types/cors": "^2.8.17",
         "@types/jest": "^29.5.12",
         "@types/rewire": "^2.5.30",
         "@types/supertest": "^6.0.2",
@@ -1968,6 +1970,15 @@
       "integrity": "sha512-he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==",
       "dev": true
     },
+    "node_modules/@types/cors": {
+      "version": "2.8.17",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.17.tgz",
+      "integrity": "sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/express": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
@@ -4745,6 +4756,18 @@
       "dev": true,
       "optional": true
     },
+    "node_modules/cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "dependencies": {
+        "object-assign": "^4",
+        "vary": "^1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/create-jest": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
@@ -9248,7 +9271,6 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }

Express/barAndCafe/package.json

@@ -14,6 +14,7 @@
     "@types/express": "^4.17.21",
     "@types/node": "^20.12.7",
     "axios": "^1.6.8",
+    "cors": "^2.8.5",
     "dotenv": "^16.4.5",
     "express": "^4.19.2",
     "rimraf": "^5.0.5",
@@ -21,6 +22,7 @@
     "swagger-ui-express": "^5.0.0"
   },
   "devDependencies": {
+    "@types/cors": "^2.8.17",
     "@types/jest": "^29.5.12",
     "@types/rewire": "^2.5.30",
     "@types/supertest": "^6.0.2",

Express/barAndCafe/src/app.ts

@@ -1,11 +1,13 @@
 import { getCity, getRadius, getPoiId, getBox } from "./openTripMaps"
 import express from "express"
+import cors from "cors"
 /**
  * Initialize Express application instance.
  * @returns An initialized Express application object.
  */
 const app = express()
 
+app.use(cors())
 
 
 /**

Express/barAndCafe/src/openTripMaps.ts

@@ -13,7 +13,7 @@ const key = process.env.OPEN_TRIP_MAPS_KEY
  * @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) {
+async function callBox(lon1:string, lat1:string, lon2: string, lat2: string, rate: 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))
@@ -27,6 +27,7 @@ async function callBox(lon1:string, lat1:string, lon2: string, lat2: string) {
             lon_max: lonMax,
             lat_min: latMin,
             lat_max: latMax,
+            rate: rate,
             apikey: key,
             kinds: 'bars,cafes,pubs,biergartens'
         },
@@ -182,11 +183,16 @@ export async function getBox(req:express.Request, res: express.Response) {
     const lat1 = req.query["lat1"] as string
     const lon2 = req.query["lon2"] as string
     const lat2 = req.query["lat2"] as string
+    let rate = req.query["rate"] as string
     if(!lon1 || !lat1 || !lon2 || !lat2){
         res.status(400).send("Missing Argument")
         return
     }
 
-    res.send( await callBox(lon1, lat1, lon2, lat2))
+    if(!rate){
+        rate = "1";
+    }
+
+    res.send( await callBox(lon1, lat1, lon2, lat2, rate))
 }
 

Express/barAndCafe/src/swaggerDef.ts

@@ -21,7 +21,7 @@ const options = {
 			}
 		],
 	},
-	apis: ['./src/*.ts'],
+	apis: ['./src/*.ts','./dist/src/*.js'],
 	explorer: true
 }
 

Express/barAndCafe/test/openTripMaps.test.ts

@@ -219,6 +219,14 @@ describe("Test the otm city path", () => {
             }
             ]
         }
+        function sleep(milliseconds: number) {
+            const date = Date.now();
+            let currentDate = null;
+            do {
+              currentDate = Date.now();
+            } while (currentDate - date < milliseconds);
+          }
+        sleep(2000);
         request(app)
         .get("/otm/box")
         .query({'lon1':'-1.435199','lon2':'-1.43519', 'lat1':'46.668460', 'lat2':'46.668461'})