chage docker commentaire for todo

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

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"
   }

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

Express/barAndCafe/src/openTripMaps.ts

@@ -6,29 +6,48 @@ dotenv.config({path: '../../.env'})
 
 const key = process.env.OPEN_TRIP_MAPS_KEY
 
-const optionsDrink = {
+async function callRadius(lon: string, lat: string, radius = '1000') {
-    method: 'GET',
+    const optionsDrink = {
-    url: 'https://api.opentripmap.com/0.1/en/places/radius',
+        method: 'GET',
-    params: {
+        url: 'https://api.opentripmap.com/0.1/en/places/radius',
-        radius: '1000',
+        params: {
-        lon: '-1.43333',
+            radius: radius,
-        lat: '46.66667',
+            lon: lon,
-        apikey: key,
+            lat: lat,
-        kinds: 'bars,cafes,pubs,biergartens'
+            apikey: key,
-    },
+            kinds: 'bars,cafes,pubs,biergartens'
-    headers: {'Content-Type': 'application/json'}
+        },
-};
+        headers: {'Content-Type': 'application/json'}
+    }
+
+    try {
+        const { data } = await axios.request(optionsDrink);
+        return data
+    } catch (error) {
+        console.error(error);
+    }
+}
 
 
-const optionsCity = {
+async function callCity(name:string) {
-  method: 'GET',
+    const optionsCity = {
-  url: 'https://api.opentripmap.com/0.1/en/places/geoname',
+        method: 'GET',
-  params: {
+        url: 'https://api.opentripmap.com/0.1/en/places/geoname',
-    name: 'Paris',
+        params: {
-    apikey: key
+            name: name,
-  },
+            apikey: key
-  headers: {'Content-Type': 'application/json'}
+        },
-};
+        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){
+    if(!radius){
-        optionsDrink.params.radius = radius as string
+        radius = "1000"
-    }
-
-    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);
     }
+    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

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<typeof IncomingMessage, typeof ServerResponse>
 
 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();
+        });
+    })
+
 });

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}}
+}

bruno/OpenData datatourisme/otm_ex_city.bru

@@ -1,7 +1,7 @@
 meta {
   name: otm_ex_city
   type: http
-  seq: 7
+  seq: 8
 }
 
 get {