Added Endpoints for Countries and Region/Country by ID

backend/index.js

@@ -13,6 +13,7 @@ const port = process.env.PORT
 // Router
 const search = require("./routes/search");
 const regions = require("./routes/regions");
+const countries = require("./routes/countries");
 const climate = require("./routes/climate");
 
 const app = express();
@@ -29,6 +30,7 @@ const app = express();
         // Express routes
         app.use(search(dbConn));
         app.use(regions(dbConn));
+        app.use(countries(dbConn));
         app.use(climate(dbConn));
 
         app.use((err, req, res, next) => {

backend/models/getCountries.js

@@ -0,0 +1,11 @@
+module.exports = async (dbConn) => {
+    const countries = await dbConn.query(
+        `SELECT countries.id AS country_id,
+                countries.country AS name,
+                countries.description,
+                countries.preview_img
+        FROM countries`
+    );
+    return countries;
+};
+

backend/models/getCountryById.js

@@ -0,0 +1,13 @@
+module.exports = async (dbConn, id) => {
+    const country = await dbConn.query(
+        `SELECT countries.id AS country_id,
+                countries.country AS name,
+                countries.description,
+                countries.preview_img
+        FROM countries
+        WHERE countries.id = ?`,
+        [id]
+    );
+    return country;
+};
+

backend/models/getRegionById.js

@@ -0,0 +1,18 @@
+module.exports = async (dbConn, id) => {
+    const region = await dbConn.query(
+        `SELECT regions.id AS region_id,
+                regions.region AS name,
+                regions.description,
+                regions.preview_img,
+                regions.country_id AS country_id,
+                countries.country AS country,
+                regions.meteostat_id AS meteostat_id
+        FROM regions
+        JOIN countries
+        ON regions.country_id = countries.id
+        WHERE regions.id = ?`,
+        [id]
+    );
+    return region;
+};
+

backend/models/getRegions.js

@@ -1,7 +1,9 @@
-module.exports = async (dbConn, lat, long, radius) => {
+module.exports = async (dbConn) => {
     const regions = await dbConn.query(
         `SELECT regions.id AS region_id,
                 regions.region AS name,
+                regions.description,
+                regions.preview_img,
                 regions.country_id AS country_id,
                 countries.country AS country,
                 regions.meteostat_id AS meteostat_id

backend/routes/countries.js

@@ -0,0 +1,15 @@
+const router = require("express").Router();
+const getCountries = require("../models/getCountries.js");
+const getCountryById = require("../models/getCountryById.js");
+
+module.exports = dbConn => {
+    router.get("/api/v1/countries", async (req, res) => {
+        res.json(await getCountries(dbConn));
+    });
+
+    router.get("/api/v1/countries/:id", async (req, res) => {
+        const id = req.params.id;
+        res.json(await getCountryById(dbConn, id))
+    });
+    return router;
+};

backend/routes/regions.js

@@ -1,10 +1,15 @@
 const router = require("express").Router();
 const getRegions = require("../models/getRegions.js");
+const getRegionById = require("../models/getRegionById.js");
 
 module.exports = dbConn => {
     router.get("/api/v1/regions", async (req, res) => {
         res.json(await getRegions(dbConn));
     });
 
+    router.get("/api/v1/regions/:id", async (req, res) => {
+        const id = req.params.id;
+       res.json(await getRegionById(dbConn, id))
+    });
     return router;
 };