- Added A TON of stuff, separated everything neatly and cleaned most models

routes/index.js

@@ -1,9 +1,15 @@
-const users = require('./users')
 const spells = require('./spells')
 const schools = require('./schools')
+const meta_schools = require('./meta_schools')
+const variables = require('./variables')
+const ingredients = require('./ingredients')
+const users = require('./users')
 
 module.exports = {
     spells,
     schools,
-    users
+    meta_schools,
+    ingredients,
+    variables,
+    users,
 }

routes/ingredients.js

@@ -0,0 +1,90 @@
+'use strict'
+
+// Router
+const express = require('express')
+let router = express.Router()
+
+// Connection
+const connection = require('../database/bookshelf')
+const db = connection.db
+
+// Repository
+const IngredientRepository = require('../repositories/ingredient-repository');
+const Ingredients = new IngredientRepository();
+
+const regexInt = RegExp(/^[1-9]\d*$/)
+
+// Error handling
+const { HttpError } = require('../validations/Errors')
+
+// ROUTES
+// GET ALL ------------------
+const getIngredients = () => {
+    return Ingredients.getAll()
+    .catch(err => {
+        console.log(err)
+        throw err
+    })
+}
+router.get('/', async (req, res) => {
+    getIngredients()
+    .then(v => {
+        res.setHeader('Content-Type', 'application/json;charset=utf-8')
+        res.end(JSON.stringify(v))
+    })
+    .catch(err => {
+        res.status(err.code).send(JSON.stringify(
+            {
+                "error": err.message,
+                "code": err.code
+            })
+        )
+    })
+})
+
+
+// GET ONE ------------------
+const getIngredient = (id) => {
+    return Ingredients.getOne(id)
+    .catch(err => {
+        console.log(err)
+        throw err
+    })
+}
+router.get('/:id/', async (req, res) => {
+    getIngredient(req.params.id)
+    .then(v => {
+        res.setHeader('Content-Type', 'application/json;charset=utf-8')
+        res.end(JSON.stringify(v))
+    })
+    .catch(err => {
+        res.status(err.code).send(JSON.stringify(
+            {
+                "error": err.message,
+                "code": err.code
+            })
+        )
+    })
+})
+
+// Param validation for ID
+// (check if id is int) (could be refactored)
+router.param('id', (req, res, next, id) => {
+    try {
+        if (regexInt.test(id)) {
+            next()
+        } else {
+            throw new Error;
+        }
+    } catch (err) {
+        err = new HttpError(403, 'Provided ID must be an integer and not zero')
+        res.status(err.code).send(JSON.stringify(
+            {
+                "error": err.message,
+                "code": err.code
+            })
+        )
+    }
+})
+
+module.exports = router

routes/meta_schools.js

@@ -0,0 +1,91 @@
+'use strict'
+
+// Router
+const express = require('express')
+let router = express.Router()
+
+// Connection
+const connection = require('../database/bookshelf')
+const db = connection.db
+
+// Repository
+const MetaSchoolRepository = require('../repositories/meta-school-repository');
+const MetaSchools = new MetaSchoolRepository();
+
+const regexInt = RegExp(/^[1-9]\d*$/)
+
+// Error handling
+const { HttpError } = require('../validations/Errors')
+
+// ROUTES
+// GET ALL ------------------
+const getMetaSchools = () => {
+    return MetaSchools.getAll()
+    .catch(err => {
+        console.log(err)
+        throw err
+    })
+}
+router.get('/', async (req, res) => {
+    getMetaSchools()
+    .then(v => {
+        res.setHeader('Content-Type', 'application/json;charset=utf-8')
+        res.end(JSON.stringify(v))
+    })
+    .catch(err => {
+        res.status(err.code).send(JSON.stringify(
+            {
+                "error": err.message,
+                "code": err.code
+            })
+        )
+    })
+})
+
+
+// GET ONE ------------------
+const getMetaSchool = (id) => {
+    return MetaSchools.getOne(id)
+    .catch(err => {
+        console.log(err)
+        throw err
+    })
+}
+router.get('/:id/', async (req, res) => {
+    getMetaSchool(req.params.id)
+    .then(v => {
+        res.setHeader('Content-Type', 'application/json;charset=utf-8')
+        res.end(JSON.stringify(v))
+    })
+    .catch(err => {
+        res.status(err.code).send(JSON.stringify(
+            {
+                "error": err.message,
+                "code": err.code
+            })
+        )
+    })
+})
+
+
+// Param validation for ID
+// (check if id is int) (could be refactored)
+router.param('id', (req, res, next, id) => {
+    try {
+        if (regexInt.test(id)) {
+            next()
+        } else {
+            throw new Error;
+        }
+    } catch (err) {
+        err = new HttpError(403, 'Provided ID must be an integer and not zero')
+        res.status(err.code).send(JSON.stringify(
+            {
+                "error": err.message,
+                "code": err.code
+            })
+        )
+    }
+})
+
+module.exports = router

routes/schools.js

@@ -5,7 +5,7 @@ const express = require('express')
 let router = express.Router()
 
 // Connection
-const connection = require('../database/connection')
+const connection = require('../database/bookshelf')
 const db = connection.db
 
 // Repository
@@ -15,7 +15,7 @@ const Schools = new SchoolRepository();
 const regexInt = RegExp(/^[1-9]\d*$/)
 
 // Error handling
-const { HttpError } = require('../models/Errors')
+const { HttpError } = require('../validations/Errors')
 
 // ROUTES
 // GET ALL ------------------
@@ -142,24 +142,23 @@ router.delete('/:id/', async (req, res) => {
 })
 
 // Param validation for ID
-    // (check if id is int) (could be refactored)
-    router.param('id', (req, res, next, id) => {
-        try {
-            if (regexInt.test(id)) {
-                next()
-            } else {
-                throw new Error;
-            }
-        } catch (err) {
-            err = new HttpError(403, 'Provided ID must be an integer and not zero')
-            res.status(err.code).send(JSON.stringify(
-                {
-                    "error": err.message,
-                    "code": err.code
-                })
-            )
+// (check if id is int) (could be refactored)
+router.param('id', (req, res, next, id) => {
+    try {
+        if (regexInt.test(id)) {
+            next()
+        } else {
+            throw new Error;
         }
-    })
-    
-    module.exports = router
-    
+    } catch (err) {
+        err = new HttpError(403, 'Provided ID must be an integer and not zero')
+        res.status(err.code).send(JSON.stringify(
+            {
+                "error": err.message,
+                "code": err.code
+            })
+        )
+    }
+})
+
+module.exports = router

routes/spells.js

@@ -5,7 +5,7 @@ const express = require('express')
 let router = express.Router()
 
 // Connection
-const connection = require('../database/connection')
+const connection = require('../database/bookshelf')
 const db = connection.db
 
 // Repository
@@ -15,7 +15,7 @@ const Spells = new SpellReposity();
 const regexInt = RegExp(/^[1-9]\d*$/)
 
 // Error handling
-const { HttpError } = require('../models/Errors')
+const { HttpError } = require('../validations/Errors')
 
 // ROUTES
 // GET ALL ------------------

routes/users.js

@@ -5,7 +5,7 @@ const express = require('express')
 let router = express.Router()
 
 // Connection
-const connection = require('../database/connection')
+const connection = require('../database/bookshelf')
 const db = connection.db
 
 // Repository
@@ -15,7 +15,7 @@ const Users = new UserRepository();
 const regexInt = RegExp(/^[1-9]\d*$/)
 
 // Error handling
-const { HttpError } = require('../models/Errors')
+const { HttpError } = require('../validations/Errors')
 
 // ROUTES
 // GET ALL ------------------

routes/variables.js

@@ -0,0 +1,91 @@
+'use strict'
+
+// Router
+const express = require('express')
+let router = express.Router()
+
+// Connection
+const connection = require('../database/bookshelf')
+const db = connection.db
+
+// Repository
+const VariableRepository = require('../repositories/variable-repository');
+const Variables = new VariableRepository();
+
+const regexInt = RegExp(/^[1-9]\d*$/)
+
+// Error handling
+const { HttpError } = require('../validations/Errors')
+
+// ROUTES
+// GET ALL ------------------
+const getvariables = () => {
+    return Variables.getAll()
+    .catch(err => {
+        console.log(err)
+        throw err
+    })
+}
+router.get('/', async (req, res) => {
+    getvariables()
+    .then(v => {
+        res.setHeader('Content-Type', 'application/json;charset=utf-8')
+        res.end(JSON.stringify(v))
+    })
+    .catch(err => {
+        res.status(err.code).send(JSON.stringify(
+            {
+                "error": err.message,
+                "code": err.code
+            })
+        )
+    })
+})
+
+
+// GET ONE ------------------
+const getVariable = (id) => {
+    return Variables.getOne(id)
+    .catch(err => {
+        console.log(err)
+        throw err
+    })
+}
+router.get('/:id/', async (req, res) => {
+    getVariable(req.params.id)
+    .then(v => {
+        res.setHeader('Content-Type', 'application/json;charset=utf-8')
+        res.end(JSON.stringify(v))
+    })
+    .catch(err => {
+        res.status(err.code).send(JSON.stringify(
+            {
+                "error": err.message,
+                "code": err.code
+            })
+        )
+    })
+})
+
+
+// Param validation for ID
+// (check if id is int) (could be refactored)
+router.param('id', (req, res, next, id) => {
+    try {
+        if (regexInt.test(id)) {
+            next()
+        } else {
+            throw new Error;
+        }
+    } catch (err) {
+        err = new HttpError(403, 'Provided ID must be an integer and not zero')
+        res.status(err.code).send(JSON.stringify(
+            {
+                "error": err.message,
+                "code": err.code
+            })
+        )
+    }
+})
+
+module.exports = router