From 20d99f2145c4ec1b6b1b819991010e7fff710713 Mon Sep 17 00:00:00 2001
From: Timo John <tjohn@stud.hs-heilbronn.de>
Date: Wed, 24 Jun 2020 09:14:22 +0200
Subject: [PATCH] Remoddeled /update API endpoint

---
 backend/index.js          |  2 ++
 backend/routes/regions.js | 34 +++++-----------------------------
 backend/routes/update.js  | 29 +++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 29 deletions(-)
 create mode 100644 backend/routes/update.js

diff --git a/backend/index.js b/backend/index.js
index a61a0da..4d48828 100644
--- a/backend/index.js
+++ b/backend/index.js
@@ -16,6 +16,7 @@ const regions = require("./routes/regions");
 const countries = require("./routes/countries");
 const climate = require("./routes/climate");
 const places = require("./routes/place");
+const update = require("./routes/update");
 
 const app = express();
 
@@ -35,6 +36,7 @@ const app = express();
         app.use(countries(dbConn));
         app.use(climate(dbConn));
         app.use(places(dbConn));
+        app.use(update(dbConn))
 
         app.use((err, req, res, next) => {
             // 500
diff --git a/backend/routes/regions.js b/backend/routes/regions.js
index af49c83..33cf9f6 100644
--- a/backend/routes/regions.js
+++ b/backend/routes/regions.js
@@ -3,10 +3,6 @@ const getRegions = require("../models/getRegions.js");
 const getRegionById = require("../models/getRegionById.js");
 const handleRegionLonLat = require("../models/handleRegionLonLat.js")
 const getRegionNearbyById = require("../models/getRegionNearbyById.js")
-const handleUpdateRegionNearby = require("../models/handleUpdateRegionNearby.js")
-const handleUpdateRegionNearbyById = require("../models/handleUpdateRegionNearbyById.js")
-const handleUpdateRegionNearbyImgUrl = require("../models/handleUpdateRegionNearbyImgUrl.js")
-const handleUpdateRegionNearbyImgUrlById = require("../models/handleUpdateRegionNearbyImgUrlById.js")
 const path = require("path");
 const fs = require("fs");
 const _ = require('lodash')
@@ -21,6 +17,11 @@ module.exports = dbConn => {
         }
     });
 
+    router.get("/api/v1/regions/:id", async (req, res) => {
+        const id = req.params.id;
+       res.json(await getRegionById(dbConn, id))
+    });
+
     router.get('/api/v1/regions/:id/image', (req, res) => {
         if (fs.existsSync(path.join(__dirname, `../data/regions/images/${req.params.id}.jpg`))) {
             res.sendFile(path.join(__dirname, `../data/regions/images/${req.params.id}.jpg`))
@@ -29,33 +30,8 @@ module.exports = dbConn => {
         }
     })
 
-    router.get("/api/v1/regions/:id", async (req, res) => {
-        const id = req.params.id;
-       res.json(await getRegionById(dbConn, id))
-    });
-
-    router.patch("/api/v1/regions/lonlat/update", async (req,res) => {
-        res.json(await handleRegionLonLat(dbConn))
-    });
-
     router.get("/api/v1/regions/:id/nearby", async (req,res) => {
         res.json(await getRegionNearbyById(dbConn,req.params.id))
     });
-
-    router.patch("/api/v1/regions/update/nearby", async (req,res) => {
-        res.json(await handleUpdateRegionNearby(dbConn))
-    });
-
-    router.patch("/api/v1/regions/update/nearby/:id", async (req,res) => {
-        res.json(await handleUpdateRegionNearbyById(dbConn, req.params.id))
-    });
-
-    router.patch("/api/v1/regions/update/nearby_imgurl", async (req,res) => {
-        res.json(await handleUpdateRegionNearbyImgUrl(dbConn))
-    });
-
-    router.patch("/api/v1/regions/update/nearby_imgurl/:id", async (req,res) => {
-        res.json(await handleUpdateRegionNearbyImgUrlById(dbConn, req.params.id))
-    });
     return router;
 };
diff --git a/backend/routes/update.js b/backend/routes/update.js
new file mode 100644
index 0000000..73d4250
--- /dev/null
+++ b/backend/routes/update.js
@@ -0,0 +1,29 @@
+const router = require("express").Router();
+const handleUpdateRegionNearby = require("../models/handleUpdateRegionNearby.js")
+const handleUpdateRegionNearbyById = require("../models/handleUpdateRegionNearbyById.js")
+const handleUpdateRegionNearbyImgUrl = require("../models/handleUpdateRegionNearbyImgUrl.js")
+const handleUpdateRegionNearbyImgUrlById = require("../models/handleUpdateRegionNearbyImgUrlById.js")
+
+module.exports = dbConn => {
+    router.patch("/api/v1/update/regions/all/nearby", async (req, res) => {
+        res.json(await handleUpdateRegionNearby(dbConn))
+    });
+
+    router.patch("/api/v1/update/regions/all/lonlat", async (req,res) => {
+        res.json(await handleRegionLonLat(dbConn))
+    });
+
+    router.patch("/api/v1/update/regions/:id/nearby", async (req, res) => {
+        res.json(await handleUpdateRegionNearbyById(dbConn, req.params.id))
+    });
+
+    router.patch("/api/v1/update/regions/all/nearby/imgurl", async (req, res) => {
+        res.json(await handleUpdateRegionNearbyImgUrl(dbConn))
+    });
+
+    router.patch("/api/v1/update/regions/:id/nearby/imgurl", async (req, res) => {
+        res.json(await handleUpdateRegionNearbyImgUrlById(dbConn, req.params.id))
+    });
+
+    return router
+}
\ No newline at end of file