From e2061d6595080b7a0c28b80dc2d5d48fcb5b9f99 Mon Sep 17 00:00:00 2001 From: Alexis <35.alexis.pele@gmail.com> Date: Tue, 19 Jan 2021 21:27:06 +0100 Subject: [PATCH] Updated module tree --- api/routes/ingredients.js | 7 +- api/routes/meta_schools.js | 2 +- api/routes/schools.js | 200 ++++++++++++++++++++----------------- api/routes/spells.js | 6 +- api/routes/users.js | 3 + api/routes/variables.js | 7 +- 6 files changed, 125 insertions(+), 100 deletions(-) diff --git a/api/routes/ingredients.js b/api/routes/ingredients.js index d16f144..9b509ad 100644 --- a/api/routes/ingredients.js +++ b/api/routes/ingredients.js @@ -4,13 +4,16 @@ const express = require('express'); let router = express.Router(); -// Connection -const functions = require('../functions'); +// AuthGuard +const authGuard = require('./middleware/authGuard'); // Repository const IngredientRepository = require('../repositories/ingredient-repository'); const Ingredients = new IngredientRepository(); +// Functions +const functions = require('../functions'); + // ROUTES // GET ALL ------------------ const getIngredients = () => { diff --git a/api/routes/meta_schools.js b/api/routes/meta_schools.js index 6d887ef..90b7d0f 100644 --- a/api/routes/meta_schools.js +++ b/api/routes/meta_schools.js @@ -4,7 +4,7 @@ const express = require('express'); let router = express.Router(); -// Connection +// Functions const functions = require('../functions'); // Repository diff --git a/api/routes/schools.js b/api/routes/schools.js index 5cbb4c7..9008958 100644 --- a/api/routes/schools.js +++ b/api/routes/schools.js @@ -4,13 +4,16 @@ const express = require('express'); let router = express.Router(); -// Connection -const functions = require('../functions'); +// AuthGuard +const authGuard = require('./middleware/authGuard'); // Repository const SchoolRepository = require('../repositories/school-repository'); const Schools = new SchoolRepository(); +// Functions +const functions = require('../functions'); + // ROUTES // GET ALL ------------------ const getSchools = () => { @@ -20,21 +23,23 @@ const getSchools = () => { throw err }) } -router.get('/', async (req, res) => { - getSchools() - .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 - }) - ) - }) -}) +router.get( + '/', + async (req, res) => { + getSchools() + .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 ------------------ @@ -45,21 +50,23 @@ const getSchool = (id) => { throw err }) } -router.get('/:id/', async (req, res) => { - getSchool(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 - }) - ) - }) -}) +router.get( + '/:id/', + async (req, res) => { + getSchool(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 + }) + ) + }) + }) // GET SPELLS FROM ONE ------------------ @@ -70,21 +77,23 @@ const getSpellsFromOne = (id) => { throw err }) } -router.get('/:id/spells', async (req, res) => { - getSpellsFromOne(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 - }) - ) - }) -}) +router.get( + '/:id/spells', + async (req, res) => { + getSpellsFromOne(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 + }) + ) + }) + }) // CREATE ONE ------------------ @@ -95,21 +104,24 @@ const addSchool = (s) => { throw err }) } -router.post('/', async (req, res) => { - addSchool(req.body) - .then(v => { - res.setHeader('Content-Type', 'application/json;charset=utf-8') - res.send(JSON.stringify(v)) - }) - .catch(err => { - res.status(err.code).send(JSON.stringify( - { - "error": err.message, - "code": err.code - }) - ) - }) -}) +router.post( + '/', + authGuard(['SUBMIT_SCHOOL']), + async (req, res) => { + addSchool(req.body) + .then(v => { + res.setHeader('Content-Type', 'application/json;charset=utf-8') + res.send(JSON.stringify(v)) + }) + .catch(err => { + res.status(err.code).send(JSON.stringify( + { + "error": err.message, + "code": err.code + }) + ) + }) + }) // UPDATE ONE ------------------ const updateSchool = (id, s) => { @@ -119,21 +131,23 @@ const updateSchool = (id, s) => { throw err }) } -router.put('/:id/', async (req, res) => { - updateSchool(req.params.id, req.body) - .then(v => { - res.setHeader('Content-Type', 'application/json;charset=utf-8') - res.send(JSON.stringify(v)) - }) - .catch(err => { - res.status(err.code).send(JSON.stringify( - { - "error": err.message, - "code": err.code - }) - ) - }) -}) +router.put( + '/:id/', + async (req, res) => { + updateSchool(req.params.id, req.body) + .then(v => { + res.setHeader('Content-Type', 'application/json;charset=utf-8') + res.send(JSON.stringify(v)) + }) + .catch(err => { + res.status(err.code).send(JSON.stringify( + { + "error": err.message, + "code": err.code + }) + ) + }) + }) // DELETE ONE ------------------ @@ -144,21 +158,23 @@ const deleteSchool = (id) => { throw err }) } -router.delete('/:id/', async (req, res) => { - deleteSchool(req.params.id) - .then(v => { - res.setHeader('Content-Type', 'application/json;charset=utf-8') - res.send(JSON.stringify(v)) - }) - .catch(err => { - res.status(err.code).send(JSON.stringify( - { - "error": err.message, - "code": err.code - }) - ) - }) -}) +router.delete( + '/:id/', + async (req, res) => { + deleteSchool(req.params.id) + .then(v => { + res.setHeader('Content-Type', 'application/json;charset=utf-8') + res.send(JSON.stringify(v)) + }) + .catch(err => { + res.status(err.code).send(JSON.stringify( + { + "error": err.message, + "code": err.code + }) + ) + }) + }) // Param validations router.param('id', functions.paramIntCheck) diff --git a/api/routes/spells.js b/api/routes/spells.js index 2147c00..685aec8 100644 --- a/api/routes/spells.js +++ b/api/routes/spells.js @@ -4,9 +4,6 @@ const express = require('express'); let router = express.Router(); -// Connection -const functions = require('../functions'); - // AuthGuard const authGuard = require('./middleware/authGuard'); @@ -14,6 +11,9 @@ const authGuard = require('./middleware/authGuard'); const SpellReposity = require('../repositories/spell-repository'); const Spells = new SpellReposity(); +// Functions +const functions = require('../functions'); + // ROUTES // GET ALL PUBLIC ------------------ const getPublicSpells = (name, description, level, charge, cost, ritual) => { diff --git a/api/routes/users.js b/api/routes/users.js index 15fc7f4..bfe80b0 100644 --- a/api/routes/users.js +++ b/api/routes/users.js @@ -4,6 +4,9 @@ const express = require('express'); let router = express.Router(); +// AuthGuard +const authGuard = require('./middleware/authGuard'); + // Repository const UserRepository = require('../repositories/user-repository'); const Users = new UserRepository(); diff --git a/api/routes/variables.js b/api/routes/variables.js index 5ed010e..5623c4c 100644 --- a/api/routes/variables.js +++ b/api/routes/variables.js @@ -4,13 +4,16 @@ const express = require('express'); let router = express.Router(); -// Connection -const functions = require('../functions'); +// AuthGuard +const authGuard = require('./middleware/authGuard'); // Repository const VariableRepository = require('../repositories/variable-repository'); const Variables = new VariableRepository(); +// Functions +const functions = require('../functions'); + // ROUTES // GET ALL ------------------ const getvariables = () => {