Update deployed link and formatting

Completed backend with documentation

Instructions.txt

@@ -1,17 +0,0 @@
-# start
-
-By creating a new web app that you will call Dijkstra, I would like you to:
-
-- Find a DB modelization that allows you to store any country given its cities and its roads between them (see Belgian graph);
-
-- Store the Belgian data (see belgium.rb);
-
-- Allow a user to select Belgium as a country (or if he/she navigates to /countries/belgium), then allow to select a starting point (a Belgian city) and a destination (also a Belgian city);
-
-- Once the user has selected the starting point and the destination, tell the shortest distance between those two cities;
-
-- Describe to the user the path (for example: Bruges -> Ghent -> Brussels -> Liège) that corresponds to the shortest distance you returned to the user;
-
-- Make your code shines!
-
-# end

README.md

@@ -0,0 +1,138 @@
+# dijkstra-backend
+Find the the shortest path between different cities in Belgium with Dijkstra algorithm.
+
+- Deployed Frontend: https://dijkstra.ruihildt.xyz/
+- Deployed Backend: https://dijkstra-backend.ruihildt.xyz/
+
+- Frontend Source: https://git.ruihildt.xyz/ruihildt/dijkstra-frontend
+
+## API Documentation
+___
+> Values required in **`bold`**.
+
+### COUNTRIES **`countries`**
+| field    | data type         | metadata                                            |
+| :--------| :---------------- | :-------------------------------------------------- |
+| id       | unsigned integer  | primary key, auto-increments, generated by database |
+| name     | string            |                                                     |
+
+#### Get a list of all cities by country id
+**`GET /api/countries/:country_id`**
+
+##### Response
+An array of json objects with a list of cities in the selected country with `name`, `id` and `country_id`.
+
+```
+[
+  {
+    "id": 1,
+    "name": "bruges",
+    "country_id": 1
+  },
+  {
+    "id": 2,
+    "name": "antwerp",
+    "country_id": 1
+  },
+  {
+    "id": 3,
+    "name": "ghent",
+    "country_id": 1
+  },
+]
+```
+
+### CITIES **`cities`**
+| field      | data type              | metadata                                            |
+| :----------| :--------------------- | :-------------------------------------------------- |
+| id         | unsigned integer       | primary key, auto-increments, generated by database |
+| name       | string                 |                                                     |
+| country_id | unsigned integer       | foreign key referencing `countries.id`              |
+
+#### Get a list of all cities
+**`GET /api/cities`**
+
+##### Response
+An array of json objects with `id`, `name` and `country_id`.
+
+```
+[
+  {
+    "id": 1,
+    "name": 'bruges',
+    "country_id": 1
+  }
+]
+```
+
+### ROADS **`roads`**
+| field         | data type        | metadata                                            |
+| :-------------| :--------------- | :-------------------------------------------------- |
+| id            | unsigned integer | primary key, auto-increments, generated by database |
+| start_city_id | string           | required                                            |
+| end_city_id   | string           | required                                            |
+| distance      | unsigned integer |                                                     |
+
+#### Get roads list
+**`GET /api/roads`**
+
+##### Response
+A array of json objects with `id`, `start_city_id`, 'end_city_id` and `distance`.
+
+```
+[
+  {
+    "id": 1,
+    "start_city_id": 1,
+    "end_city_id": 3,
+    "distance": 50
+  }
+]
+```
+
+### Shortest Path **`cities`**
+
+#### Get the shortest path between two cities and the total distance
+**`GET /api/path`**
+
+##### Request
+Add the **`start_city_id`** and **`end_city_id`** as query strings to the url.
+
+```
+/api/path?start_city_id=2?end_city_id=9
+```
+
+##### Response
+A json object composed of the `path` correctly ordered and the total `distance`.
+
+```
+{
+  "path": [
+    {
+      "id": 2,
+      "name": "antwerp"
+    },
+    {
+      "id": 4,
+      "name": "mechelen"
+    },
+    {
+      "id": 5,
+      "name": "brussels"
+    },
+    {
+      "id": 8,
+      "name": "liege"
+    },
+    {
+      "id": 7,
+      "name": "namur"
+    },
+    {
+      "id": 9,
+      "name": "arlon"
+    }
+  ],
+  "distance": 337
+}
+```

api/models/citiesModel.js

@@ -0,0 +1,22 @@
+const db = require('../../data/dbConfig');
+
+module.exports = {
+	getCities,
+    getCitiesByCountry
+    // getCity,
+};
+
+function getCities() {
+	return db('cities')
+}
+
+function getCitiesByCountry(country_id) {
+	return db('cities')
+	.where({ country_id })
+}
+
+// function getCity(name) {
+// 	return db('cities')
+// 		.where({ name })
+// 		.first()
+// }

api/models/countriesModel.js

@@ -1,4 +1,4 @@
-const db = require('../data/dbConfig');
+const db = require('../../data/dbConfig');
 
 module.exports = {
 	getCountries,

api/models/roadsModel.js

@@ -0,0 +1,9 @@
+const db = require('../../data/dbConfig');
+
+module.exports = {
+	getRoads
+};
+
+function getRoads() {
+	return db('roads')
+}

api/routes/citiesRouter.js

@@ -0,0 +1,14 @@
+const router = require('express').Router();
+
+const Cities = require('../models/citiesModel');
+
+router.get('', async (req, res) => {
+    try {
+        const cities = await Cities.getCities();
+        res.status(200).json(cities);
+    } catch (e) {
+        res.status(500).json(e);
+    }
+})
+
+module.exports = router;

api/routes/countriesRouter.js

@@ -0,0 +1,14 @@
+const router = require('express').Router();
+const Cities = require('../models/citiesModel');
+
+router.get('/:country_id', async (req, res) => {
+    const { country_id } = req.params;
+    try {
+        const cities = await Cities.getCitiesByCountry(country_id);
+        res.status(200).json(cities);
+    } catch (e) {
+        res.status(500).json(e);
+    }
+})
+
+module.exports = router;

api/routes/pathRouter.js

@@ -0,0 +1,43 @@
+const router = require('express').Router();
+
+const Roads = require('../models/roadsModel');
+const Cities = require('../models/citiesModel');
+
+const findShortestPath = require('../../helpers/dijkstra_algo');
+
+router.get('', async (req, res) => {
+    const { start_city_id, end_city_id } = req.query;
+
+    start = Math.floor(start_city_id);
+    end = Math.floor(end_city_id);
+
+    try {
+        const cities = await Cities.getCities();
+        const roads = await Roads.getRoads();
+
+        let { path, distance } = findShortestPath(cities, roads, start, end);
+        const shortestPath = formatPath(path, cities)
+
+        let response = { path: shortestPath, distance }
+
+        res.status(200).json(response);
+    } catch (e) {
+        res.status(500).json(e);
+    }
+})
+
+function formatPath(path, cities) {
+    const complete_path = []
+
+    for (let path_city of path) {
+        for (let city of cities) {
+            if (city.id == path_city) {
+                complete_path.push({ id: city.id, name: city.name });
+            }
+        }
+    }
+
+    return complete_path
+}
+
+module.exports = router;

api/routes/roadsRouter.js

@@ -0,0 +1,13 @@
+const router = require('express').Router();
+const Roads = require('../models/roadsModel');
+
+router.get('', async (req, res) => {
+    try {
+        const roads = await Roads.getRoads();
+        res.status(200).json(roads);
+    } catch (e) {
+        res.status(500).json(e);
+    }
+})
+
+module.exports = router;

api/server.js

@@ -1,17 +1,21 @@
 const express = require("express");
+const helmet = require('helmet');
+const cors = require('cors');
 
-// const authRouter = require('../services/auth/authRouter');
+const citiesRouter = require('./routes/citiesRouter');
-// const usersRouter = require('../services/users/usersRouter');
+const roadsRouter = require('./routes/roadsRouter');
-// const sessionsRouter = require('../services/sessions/sessionsRouter');
+const countriesRouter = require('./routes/countriesRouter');
-// const dailyAveragesRouter = require('../services/dailyAverages/dailyAveragesRouter');
+const pathRouter = require('./routes/pathRouter')
 
 const server = express();
 
+server.use(helmet());
 server.use(express.json());
+server.use(cors());
 
-// server.use('/api/auth', authRouter);
+server.use('/api/cities', citiesRouter);
-// server.use('/api/users', authenticate, usersRouter);
+server.use('/api/roads', roadsRouter);
-// server.use('/api/users', authenticate, sessionsRouter);
+server.use('/api/countries', countriesRouter);
-// server.use('/api/users', authenticate, dailyAveragesRouter);
+server.use('/api/path', pathRouter);
 
 module.exports = server;

data/seeds/02-cities.js

@@ -1,59 +1,58 @@
-
+exports.seed = function (knex) {
-exports.seed = function(knex) {
+	return knex('cities')
-	return knex('cities').truncate()
+		.truncate()
 		.then(function () {
 			return knex('cities').insert([
 				{
-					"id": 1,
+					id: 1,
-					"name": 'bruges',
+					name: 'bruges',
-					"country_id": 1
+					country_id: 1,
-        },
+				},
-        {
+				{
-					"id": 2,
+					id: 2,
-					"name": 'antwerp',
+					name: 'antwerp',
-					"country_id": 1
+					country_id: 1,
-        },
+				},
-        {
+				{
-					"id": 3,
+					id: 3,
-					"name": 'ghent',
+					name: 'ghent',
-					"country_id": 1
+					country_id: 1,
-        },
+				},
-        {
+				{
-					"id": 4,
+					id: 4,
-					"name": 'mechelen',
+					name: 'mechelen',
-					"country_id": 1
+					country_id: 1,
-        },
+				},
-        {
+				{
-					"id": 5,
+					id: 5,
-					"name": 'brussels',
+					name: 'brussels',
-					"country_id": 1
+					country_id: 1,
-        },
+				},
-        {
+				{
-					"id": 6,
+					id: 6,
-					"name": 'mons',
+					name: 'mons',
-					"country_id": 1
+					country_id: 1,
-        },
+				},
-        {
+				{
-					"id": 7,
+					id: 7,
-					"name": 'namur',
+					name: 'namur',
-					"country_id": 1
+					country_id: 1,
-        },
+				},
-        {
+				{
-					"id": 8,
+					id: 8,
-					"name": 'liege',
+					name: 'liege',
-					"country_id": 1
+					country_id: 1,
-        },
+				},
-        {
+				{
-					"id": 9,
+					id: 9,
-					"name": 'arlon',
+					name: 'arlon',
-					"country_id": 1
+					country_id: 1,
-        },
+				},
-        {
+				{
-					"id": 10,
+					id: 10,
-					"name": 'tournai',
+					name: 'tournai',
-					"country_id": 1
+					country_id: 1,
-        },
+				},
-        
 			]);
-	});
+		});
 };

data/seeds/03-roads.js

@@ -1,92 +1,92 @@
-
+exports.seed = function (knex) {
-exports.seed = function(knex) {
+	return knex('roads')
-	return knex('roads').truncate()
+		.truncate()
 		.then(function () {
 			return knex('roads').insert([
 				{
-					"id": 1,
+					id: 1,
-					"start_city_id": 1,
+					start_city_id: 1,
-          "end_city_id": 3,
+					end_city_id: 3,
-          "distance": 50
+					distance: 40,
-        },
+				},
-        {
+				{
-					"id": 2,
+					id: 2,
-					"start_city_id": 3,
+					start_city_id: 3,
-          "end_city_id": 10,
+					end_city_id: 10,
-          "distance": 80
+					distance: 60,
-        },
+				},
-        {
+				{
-					"id": 3,
+					id: 3,
-					"start_city_id": 10,
+					start_city_id: 10,
-          "end_city_id": 5,
+					end_city_id: 5,
-          "distance": 89
+					distance: 70,
-        },
+				},
-        {
+				{
-					"id": 4,
+					id: 4,
-					"start_city_id": 3,
+					start_city_id: 3,
-          "end_city_id": 5,
+					end_city_id: 5,
-          "distance": 56
+					distance: 50,
-        },
+				},
-        {
+				{
-					"id": 5,
+					id: 5,
-					"start_city_id": 3,
+					start_city_id: 3,
-          "end_city_id": 2,
+					end_city_id: 2,
-          "distance": 60
+					distance: 50,
-        },
+				},
-        {
+				{
-					"id": 6,
+					id: 6,
-					"start_city_id": 2,
+					start_city_id: 2,
-          "end_city_id": 4,
+					end_city_id: 4,
-          "distance": 25
+					distance: 20,
-        },
+				},
-        {
+				{
-					"id": 7,
+					id: 7,
-					"start_city_id": 4,
+					start_city_id: 4,
-          "end_city_id": 5,
+					end_city_id: 5,
-          "distance": 27
+					distance: 20,
-        },
+				},
-        {
+				{
-					"id": 8,
+					id: 8,
-					"start_city_id": 5,
+					start_city_id: 5,
-          "end_city_id": 6,
+					end_city_id: 6,
-          "distance": 80
+					distance: 50,
-        },
+				},
-        {
+				{
-					"id": 9,
+					id: 9,
-					"start_city_id": 6,
+					start_city_id: 6,
-          "end_city_id": 7,
+					end_city_id: 7,
-          "distance": 91
+					distance: 60,
-        },
+				},
-        {
+				{
-					"id": 10,
+					id: 10,
-					"start_city_id": 6,
+					start_city_id: 6,
-          "end_city_id": 10,
+					end_city_id: 10,
-          "distance": 51
+					distance: 40,
-        },
+				},
-        {
+				{
-					"id": 11,
+					id: 11,
-					"start_city_id": 7,
+					start_city_id: 7,
-          "end_city_id": 9,
+					end_city_id: 9,
-          "distance": 129
+					distance: 110,
-        },
+				},
-        {
+				{
-					"id": 12,
+					id: 12,
-					"start_city_id": 9,
+					start_city_id: 9,
-          "end_city_id": 7,
+					end_city_id: 7,
-          "distance": 123
+					distance: 110,
-        },
+				},
-        {
+				{
-					"id": 13,
+					id: 13,
-					"start_city_id": 8,
+					start_city_id: 8,
-          "end_city_id": 7,
+					end_city_id: 7,
-          "distance": 65
+					distance: 50,
-        },
+				},
-        {
+				{
-					"id": 14,
+					id: 14,
-					"start_city_id": 8,
+					start_city_id: 8,
-          "end_city_id": 5,
+					end_city_id: 5,
-          "distance": 97
+					distance: 90,
-        }
+				},
 			]);
-	});
+		});
 };

helpers/dijkstra_algo.js

@@ -0,0 +1,55 @@
+const Queue = require('./queue');
+const Graph = require('./graph');
+
+function findPathWithDijkstra(cities, roads, startNode, endNode) {
+    const graph = new Graph();
+    
+    // Add cities and roads to graph
+    for (let city of cities) {
+        graph.addNode(city.id)
+    }
+
+    for (let { start_city_id, end_city_id, distance } of roads) {
+        graph.addEdge(start_city_id, end_city_id, distance)
+    }
+    
+    // Dijkstra path search algo
+    let times = {};
+    let backtrace = {};
+    let queue = new Queue();
+
+    times[startNode] = 0;
+
+    graph.nodes.forEach(node => {
+        if (node !== startNode) {
+            times[node] = Infinity
+        }
+    });
+
+    queue.enqueue([startNode, 0]);
+
+    while (queue.size()) {
+        let shortestStep = queue.dequeue();
+        let currentNode = shortestStep[0];   
+        graph.adjacencyList[currentNode].forEach(neighbor => {
+            let time = times[currentNode] + neighbor.distance;
+        
+            if (time < times[neighbor.node]) {
+                times[neighbor.node] = time;
+                backtrace[neighbor.node] = currentNode;
+                queue.enqueue([neighbor.node, time]);
+            }
+        });
+    }
+
+    let path = [endNode];
+    let lastStep = endNode;  while(lastStep !== startNode) {
+        path.unshift(backtrace[lastStep])
+        lastStep = backtrace[lastStep]
+    } 
+    
+    // return `Path is ${path} and time is ${times[endNode]}`
+    return {path, distance: times[endNode]}
+}
+
+module.exports = findPathWithDijkstra;

helpers/graph.js

@@ -0,0 +1,18 @@
+class Graph {
+    constructor() {
+        this.nodes = [];
+        this.adjacencyList = {};
+    }
+
+    addNode(node) {
+        this.nodes.push(node); 
+        this.adjacencyList[node] = [];
+    }
+
+    addEdge(node1, node2, distance) {
+        this.adjacencyList[node1].push({node:node2, distance});
+        this.adjacencyList[node2].push({node:node1, distance});
+    }
+}
+
+module.exports = Graph;

helpers/queue.js

@@ -0,0 +1,21 @@
+class Queue {
+    constructor() {
+    this.store = [];
+    }
+
+    size() {
+        return this.store.length
+    }
+
+    enqueue(node) {
+        this.store.push(node);
+    }
+
+    dequeue() {
+        if (this.size() > 0) {
+            return this.store.shift();
+        }
+    } 
+}
+
+module.exports = Queue;

index.js

@@ -3,7 +3,7 @@ const server = require("./api/server");
 server.get("/", (req, res) => {
 	res.json({
 		message: `API server for Dijkstra. :)`,
-		documentation: `Coming`
+		documentation: `Check out: https://git.ruihildt.xyz/ruihildt/dijkstra-backend`
 	});
 });
 

package.json

@@ -4,14 +4,18 @@
   "description": "",
   "main": "index.js",
   "dependencies": {
+    "cors": "^2.8.5",
     "express": "^4.17.1",
+    "helmet": "^3.21.2",
     "knex": "^0.20.8",
     "nodejs": "^0.0.0",
     "sqlite3": "^4.1.1"
   },
-  "devDependencies": {},
+  "devDependencies": {
+    "nodemon": "^2.0.2"
+  },
   "scripts": {
-    "test": "test",
+    "watch": "nodemon index.js",
     "start": "node index.js"
   },
   "author": "",