From 0bab2a0c1b3d5a7db97fb9548af87edff1b606ae Mon Sep 17 00:00:00 2001 From: Jay Leach Date: Sun, 29 Mar 2020 13:13:58 -0400 Subject: [PATCH] Berries finished with seeds, migration, router, and model --- 04-berries.js | 18 --- api/server.js | 4 +- berries/berryModel.js | 48 ++++---- berries/berryRouter.js | 108 +++++++++--------- database/auth.db3 | Bin 40960 -> 32768 bytes .../20200305182952_create_tables.js | 37 +++--- database/seeds/04-berries.js | 19 +++ items/itemModel.js | 4 +- items/itemRouter.js | 6 +- machines/machineRouter.js | 105 +++++++++-------- pokemon/pokemonRouter.js | 105 +++++++++-------- 11 files changed, 226 insertions(+), 228 deletions(-) delete mode 100644 04-berries.js create mode 100644 database/seeds/04-berries.js diff --git a/04-berries.js b/04-berries.js deleted file mode 100644 index c81013e..0000000 --- a/04-berries.js +++ /dev/null @@ -1,18 +0,0 @@ -// exports.seed = function (knex) { -// return knex('').truncate() -// .then(function () { -// return knex('').insert([ -// { -// name: 'chesto', -// pokeid: 2, -// user_id: 1, -// size: 80, -// smoothness: 25, -// naturalGiftPower: 60, -// soilDryness: 15, -// growthTime: 3, -// maxHarvest: 5 -// } -// ]); -// }); -// }; diff --git a/api/server.js b/api/server.js index 8ba1d42..f9c044a 100644 --- a/api/server.js +++ b/api/server.js @@ -5,7 +5,7 @@ const helmet = require('helmet'); const authenticate = require('../auth/authenticate-middleware.js'); const authRouter = require('../auth/auth-router.js'); -// const berryRouter = require('../berries/berryRouter.js'); + const berryRouter = require('../berries/berryRouter.js'); const itemRouter = require('../items/itemRouter.js'); // const machineRouter = require('../machines/machineRouter.js'); // const pokemonRouter = require('../pokemon/pokemonRouter.js'); @@ -22,7 +22,7 @@ server.get('/', (req, res) => { server.use('/api/auth', authRouter); // For the trainer -// server.use('/api/berries', authenticate, berryRouter); // For the berries + server.use('/api/berries', authenticate, berryRouter); // For the berries server.use('/api/items', itemRouter); // For the items // server.use('/api/machines', authenticate, machineRouter); // For the machines // server.use('/api/pokemon', authenticate, pokemonRouter); // For the pokemon diff --git a/berries/berryModel.js b/berries/berryModel.js index c04ef3a..893487c 100644 --- a/berries/berryModel.js +++ b/berries/berryModel.js @@ -1,63 +1,63 @@ const db = require('../database/dbConfig'); module.exports = { - getItems, - getItemsById, - addItem, - getItemFilter, - updateItem, - deleteItem, - updateItemCount + getBerries, + getBerriesById, + addBerry, + getBerryFilter, + updateBerry, + deleteBerry, + updateBerryCount }; -function getItems() { - return db('items'); +function getBerries() { + return db('berries'); } -function addItem(post) { - return db('items as i') +function addBerry(post) { + return db('berries as i') .insert(post) .then(ids => { console.log('ADD ITEM', ids) const [id] = ids; - return getItemsById(id); + return getBerriesById(id); }) } -function getItemsById(id) { - return db('items') +function getBerriesById(id) { + return db('berries') .select('*') .where({id}) .first() } -async function updateItem(id, changes) { - await db('classes') +async function updateBerry(id, changes) { + await db('berries') .where({id}) .update(changes) - return getClassesById(id); + return getBerriesById(id); } -async function updateItemCount(id, changes) { - await db('items') +async function updateBerryCount(id, changes) { + await db('berries') .where({id}) .update(changes) - return db('items') + return db('berries') .select('count') .where({id}) .first() } -function deleteItem(id) { - return db('items') +function deleteBerry(id) { + return db('berries') .where('id', id) .delete() } -function getItemsFIlter(filter) { - return db('items') +function getBerriesFIlter(filter) { + return db('berries') .select('*') .where('user_id', filter) } diff --git a/berries/berryRouter.js b/berries/berryRouter.js index 62fe245..80bab68 100644 --- a/berries/berryRouter.js +++ b/berries/berryRouter.js @@ -1,14 +1,12 @@ const express = require('express'); const router = express.Router(); const dbUsers = require('../auth/auth-model'); -const classDb = require('./classModel'); -const classesData = require('./classModel'); +const berryDb = require('./berryModel'); +const berriesData = require('./berryModel'); - -//GET all available classes - -router.get('/classes', (req, res) => { - classesData.getClasses() +// GET all available berries +router.get('/berries', (req, res) => { + berriesData.getBerries() .then( posts =>{ res.status(200).json(posts); console.log(posts); @@ -18,15 +16,15 @@ router.get('/classes', (req, res) => { }) }) -// gets all classes for single user -router.get('/:id/classes', (req, res) => { +// gets all berries for single user +router.get('/:id/berries', (req, res) => { const { id } = req.params; - classesData - .getClassesFilter(id) - .then(classes => { - res.status(200).json(classes) + berriesData + .getBerriesFilter(id) + .then(berries => { + res.status(200).json(berries) }) .catch(({ name, message, code, stack }) => { res.status(500).json({ name, message, code, stack }) @@ -34,14 +32,14 @@ router.get('/:id/classes', (req, res) => { }); -// gets single class -router.get('/classes/:id', validateClass, (req, res) => { +// gets single berry +router.get('/berries/:id', validateBerry, (req, res) => { const { id } = req.params; - classesData - .getClassesById(id) - .then(issue => { - res.status(200).json(issue) + berriesData + .getItemsById(id) + .then(berry => { + res.status(200).json(berry) }) .catch(({ name, message, code, stack }) => { res.status(500).json({ name, message, code, stack }) @@ -49,57 +47,57 @@ router.get('/classes/:id', validateClass, (req, res) => { }) -// adds class to database with user id -router.post('/:id/classes/', validateUser, (req, res) => { +// adds berry to database with user id +router.post('/:id/berries/', validateUser, (req, res) => { const { id } = req.params; - const issue = { ...req.body, user_id: id } + const berry = { ...req.body, user_id: id } - classesData - .addClass(issue) - .then(issue => { - res.status(200).json(issue) + berriesData + .addBerry(berry) + .then(berry => { + res.status(200).json(berry) }) .catch(({ name, message, code, stack }) => { res.status(500).json({ name, message, code, stack }) }) }) -// edits single class -router.put("/classes/:id", validateClass, (req, res) => { +// edits single berry +router.put("/berries/:id", validateBerry, (req, res) => { const { id } = req.params const changes = { ...req.body} - classesData.updateClass(id, changes) - .then(issue => { - console.log(`this is class`, issue) - res.status(200).json(issue) + berriesData.updateBerry(id, changes) + .then(berry => { + console.log(`this is berry`, berry) + res.status(200).json(berry) }) .catch(({ name, message, code, stack }) => { res.status(500).json({ name, message, code, stack }) }) }) -// edits current_attendees of classes -router.patch("/classes/:id", validateClass, (req, res) => { +// edits count of berries +router.patch("/berries/:id", validateBerry, (req, res) => { const { id } = req.params const join = req.body; - classesData - .updateClassSize(id, join) - .then(classes=> { - res.status(200).json({ message: `Attendees for Class# ${id} Updated Successfully`, classes}) + berriesData + .updateBerryCount(id, join) + .then(berries=> { + res.status(200).json({ message: `Count for Berry# ${id} Updated Successfully`, berries}) }) .catch(({ name, message, code, stack }) => { res.status(500).json({ name, message, code, stack }) }) }) -// deletes an issue -router.delete("/classes/:id", (req, res) => { +// deletes an berry +router.delete("/berries/:id", (req, res) => { const { id } = req.params - classesData.deleteClass(id) - .then(classes => { - res.status(200).json(classes) + berriesData.deleteBerry(id) + .then(berries => { + res.status(200).json(berries) }) .catch(({ name, message, code, stack }) => { res.status(500).json({ name, message, code, stack }) @@ -111,32 +109,32 @@ router.delete("/classes/:id", (req, res) => { // Validation MiddleWare async function validateUser(req, res, next) { - // validates all POST requests for new ISSUE (not new user) + // validates all POST requests for new berry (not new user) const { id } = req.params; - const issue = { ...req.body, user_id: id} ; - console.log(`validate issue:`, issue) + const berry = { ...req.body, user_id: id} ; + console.log(`validate berry:`, berry) const userCheck = await dbUsers.getUserById(id) !userCheck ? res.status(404).json({ message: "User does not exist!" }) - : !issue ? - res.status(404).json({ message: "Class does not exist!" }) - : !issue.title || !issue.description || !issue.type || !issue.start || !issue.location || !issue.intensity || !issue.max_class + : !berry ? + res.status(404).json({ message: "Berry does not exist!" }) + : !berry.name || !berry.pokeid || !berry.size || !berry.smoothness || !berry.naturalGiftPower || !berry.soilDryness || !berry.growthTime || !berry.maxHarvest ? res.status(406).json({ message: "Please make sure the required fields are completed. " }) : next(); } -async function validateClass(req, res, next) { - // validates all POST requests for new ISSUE (not new user) +async function validateBerry(req, res, next) { + // validates all POST requests for new berry (not new user) const { id } = req.params; - const classes = req.body; - console.log(`validate class:`, classes) + const berries = req.body; + console.log(`validate berry:`, berries) - const issueCheck = await classDb.getClassesById(id) + const issueCheck = await berryDb.getBerriesById(id) !issueCheck - ? res.status(404).json({ message: "Class does not exist!" }) + ? res.status(404).json({ message: "Berry does not exist!" }) : next(); } diff --git a/database/auth.db3 b/database/auth.db3 index d3ebc11f0df406fedeb360f65eca717f5689a280..c04c62281a65b6d53ac4dca90bd9dfbc58bc4f70 100644 GIT binary patch delta 377 zcmZoTz|_#dG(lQWj)8%J1BhXOZK95`v>bz;^+#Ty5IdI=1HU8RdpzQC;`BBbs%)eB@8 zGyi=C{;&M6`R{KQG&ssHA;iS2&6%B-S`nX{$;Hep%?Z`N`L(`{ys5KGlxuiUdR}@) zwtk37m{UNmZ*oCtW?5E2Xnt|Ie{QZpVo{={Q)OssxwpGlu8Xs0RzT|H7=LL~qY|G& z1LO374425HB0mf7Fh2wHBE71tu%vRQ^gMr;g3Ktdpa8GRVt22yM6c3-l#Kk);K^%% zI+G)VP5g86!o3YM{6oz`OkC1j{Ig0U-JJb`{c?(Oy@E4y{2l#+9CHeD%1nGsgTnk% weKR-z@#j!rW8{Cr!2bm3v0MByQj9zdl8l^;5RjaaT3nLP6d-BC&&|9A4#7EMQUwxC|GVVVJovEgLbm zabrxI`5JBvapTIJTfc-GSu`%()x-g*qQslroO6HYk$e7UG}4bg>d#%PQJqd_)$a8% zUu^rfqB{4(Z#E5Cj1wI}+b`{m?X``>KU+uUOXK9-3*P8E#VjVL%Z0rvBDUHAVz&+W zt}r*&P&Pv6BV?WqCL&~IPSqbcMNEBIuaHncfCG~1S-E3?Jg2^~u0L-A$TiXL*fv>F zmIyi#fm|UGI7TF$&C*3JOBMn6)AARnLAFC9#Mau2{j|(!APgEnkilZ44jSygj9sd4 ziiWFW-J?H_y~NlV|Exfh1{d=EgF9Y+c7x1uy$d zCgIdtFTE;i<3J*B;zStLPO-fBC$#N;Cnn=n?r7eKtBOY=Ri(prfotS|dPdtydsGT@GV1olh@nTi* zwiJJ6Kye^8+;8nN`ApL9VR@$G4@FC9l;rZEK{o;XIrUlEMeXEv_qYeK$Ww{os8lr- zp=-@R`lNM`$+g^l5OJ3}@nSIcMD`Z;r2yxJhpA#ueXCWvGsC?i;|H;Dd+0?>Pe#IF zt6%8Fleu0vSFa0&Vo7KTQHcsMN!$SU!~2YUgyw;`bu1!JB-sw|NHz2l=u8+ diff --git a/database/migrations/20200305182952_create_tables.js b/database/migrations/20200305182952_create_tables.js index 6a10005..cb0a27c 100644 --- a/database/migrations/20200305182952_create_tables.js +++ b/database/migrations/20200305182952_create_tables.js @@ -37,24 +37,25 @@ exports.up = function(knex) { // tbl.string('mega-punch').notNullable(); // }) // - // .createTable('berries', tbl => { - // tbl.increments(); - // tbl.string('name').notNullable(); - // tbl.integer('pokeid'); - // tbl.integer('user_id') - // .unsigned() - // .notNullable() - // .references('pokeid') - // .inTable('users') - // .onUpdate('CASCADE') - // .onDelete('RESTRICT'); - // tbl.integer('size'); - // tbl.integer('smoothness'); - // tbl.integer('naturalGiftPower'); - // tbl.integer('soilDryness'); - // tbl.integer('growthTime'); - // tbl.integer('maxHarvest'); - // }) + .createTable('berries', tbl => { + tbl.increments(); + tbl.string('name').notNullable(); + tbl.integer('pokeid'); + tbl.integer('user_id') + .unsigned() + .notNullable() + .references('pokeid') + .inTable('users') + .onUpdate('CASCADE') + .onDelete('RESTRICT'); + tbl.integer('size'); + tbl.integer('smoothness'); + tbl.integer('naturalGiftPower'); + tbl.integer('soilDryness'); + tbl.integer('growthTime'); + tbl.integer('maxHarvest'); + tbl.integer('count').defaultTo(0); + }) // // .createTable('pokemon', tbl => { // tbl.increments(); diff --git a/database/seeds/04-berries.js b/database/seeds/04-berries.js new file mode 100644 index 0000000..9383275 --- /dev/null +++ b/database/seeds/04-berries.js @@ -0,0 +1,19 @@ + exports.seed = function (knex) { + return knex('berries').truncate() + .then(function () { + return knex('berries').insert([ + { + name: 'chesto', + pokeid: 2, + user_id: 1, + size: 80, + smoothness: 25, + naturalGiftPower: 60, + soilDryness: 15, + growthTime: 3, + maxHarvest: 5, + count: 2 + } + ]); + }); + }; diff --git a/items/itemModel.js b/items/itemModel.js index 712bcfc..7fec8e9 100644 --- a/items/itemModel.js +++ b/items/itemModel.js @@ -32,11 +32,11 @@ function getItemsById(id) { } async function updateItem(id, changes) { - await db('classes') + await db('items') .where({id}) .update(changes) - return getClassesById(id); + return getItemsById(id); } async function updateItemCount(id, changes) { diff --git a/items/itemRouter.js b/items/itemRouter.js index 0dbaed1..9d39aa5 100644 --- a/items/itemRouter.js +++ b/items/itemRouter.js @@ -78,7 +78,7 @@ router.put("/items/:id", validateItem, (req, res) => { }) }) -// edits current_attendees of items +// edits count of items router.patch("/items/:id", validateItem, (req, res) => { const { id } = req.params @@ -121,13 +121,13 @@ async function validateUser(req, res, next) { ? res.status(404).json({ message: "User does not exist!" }) : !item ? res.status(404).json({ message: "Item does not exist!" }) - : !item.name || !item.id || !item.costAmount || !item.total_count + : !item.name || !item.pokeid || !item.costAmount || !item.total_count ? res.status(406).json({ message: "Please make sure the required fields are completed. " }) : next(); } async function validateItem(req, res, next) { - // validates all POST requests for new ISSUE (not new user) + // validates all POST requests for new item (not new user) const { id } = req.params; const items = req.body; console.log(`validate item:`, items) diff --git a/machines/machineRouter.js b/machines/machineRouter.js index 62fe245..0dbaed1 100644 --- a/machines/machineRouter.js +++ b/machines/machineRouter.js @@ -1,14 +1,13 @@ const express = require('express'); const router = express.Router(); const dbUsers = require('../auth/auth-model'); -const classDb = require('./classModel'); -const classesData = require('./classModel'); +const itemDb = require('./itemModel'); +const itemsData = require('./itemModel'); +// GET all available items -//GET all available classes - -router.get('/classes', (req, res) => { - classesData.getClasses() +router.get('/items', (req, res) => { + itemsData.getItems() .then( posts =>{ res.status(200).json(posts); console.log(posts); @@ -18,15 +17,15 @@ router.get('/classes', (req, res) => { }) }) -// gets all classes for single user -router.get('/:id/classes', (req, res) => { +// gets all items for single user +router.get('/:id/items', (req, res) => { const { id } = req.params; - classesData - .getClassesFilter(id) - .then(classes => { - res.status(200).json(classes) + itemsData + .getItemsFilter(id) + .then(items => { + res.status(200).json(items) }) .catch(({ name, message, code, stack }) => { res.status(500).json({ name, message, code, stack }) @@ -34,14 +33,14 @@ router.get('/:id/classes', (req, res) => { }); -// gets single class -router.get('/classes/:id', validateClass, (req, res) => { +// gets single item +router.get('/items/:id', validateItem, (req, res) => { const { id } = req.params; - classesData - .getClassesById(id) - .then(issue => { - res.status(200).json(issue) + itemsData + .getItemsById(id) + .then(item => { + res.status(200).json(item) }) .catch(({ name, message, code, stack }) => { res.status(500).json({ name, message, code, stack }) @@ -49,57 +48,57 @@ router.get('/classes/:id', validateClass, (req, res) => { }) -// adds class to database with user id -router.post('/:id/classes/', validateUser, (req, res) => { +// adds item to database with user id +router.post('/:id/items/', validateUser, (req, res) => { const { id } = req.params; - const issue = { ...req.body, user_id: id } + const item = { ...req.body, user_id: id } - classesData - .addClass(issue) - .then(issue => { - res.status(200).json(issue) + itemsData + .addItem(item) + .then(item => { + res.status(200).json(item) }) .catch(({ name, message, code, stack }) => { res.status(500).json({ name, message, code, stack }) }) }) -// edits single class -router.put("/classes/:id", validateClass, (req, res) => { +// edits single item +router.put("/items/:id", validateItem, (req, res) => { const { id } = req.params const changes = { ...req.body} - classesData.updateClass(id, changes) - .then(issue => { - console.log(`this is class`, issue) - res.status(200).json(issue) + itemsData.updateItem(id, changes) + .then(item => { + console.log(`this is item`, item) + res.status(200).json(item) }) .catch(({ name, message, code, stack }) => { res.status(500).json({ name, message, code, stack }) }) }) -// edits current_attendees of classes -router.patch("/classes/:id", validateClass, (req, res) => { +// edits current_attendees of items +router.patch("/items/:id", validateItem, (req, res) => { const { id } = req.params const join = req.body; - classesData - .updateClassSize(id, join) - .then(classes=> { - res.status(200).json({ message: `Attendees for Class# ${id} Updated Successfully`, classes}) + itemsData + .updateItemCount(id, join) + .then(items=> { + res.status(200).json({ message: `Count for Item# ${id} Updated Successfully`, items}) }) .catch(({ name, message, code, stack }) => { res.status(500).json({ name, message, code, stack }) }) }) -// deletes an issue -router.delete("/classes/:id", (req, res) => { +// deletes an item +router.delete("/items/:id", (req, res) => { const { id } = req.params - classesData.deleteClass(id) - .then(classes => { - res.status(200).json(classes) + itemsData.deleteItem(id) + .then(items => { + res.status(200).json(items) }) .catch(({ name, message, code, stack }) => { res.status(500).json({ name, message, code, stack }) @@ -111,32 +110,32 @@ router.delete("/classes/:id", (req, res) => { // Validation MiddleWare async function validateUser(req, res, next) { - // validates all POST requests for new ISSUE (not new user) + // validates all POST requests for new item (not new user) const { id } = req.params; - const issue = { ...req.body, user_id: id} ; - console.log(`validate issue:`, issue) + const item = { ...req.body, user_id: id} ; + console.log(`validate item:`, item) const userCheck = await dbUsers.getUserById(id) !userCheck ? res.status(404).json({ message: "User does not exist!" }) - : !issue ? - res.status(404).json({ message: "Class does not exist!" }) - : !issue.title || !issue.description || !issue.type || !issue.start || !issue.location || !issue.intensity || !issue.max_class + : !item ? + res.status(404).json({ message: "Item does not exist!" }) + : !item.name || !item.id || !item.costAmount || !item.total_count ? res.status(406).json({ message: "Please make sure the required fields are completed. " }) : next(); } -async function validateClass(req, res, next) { +async function validateItem(req, res, next) { // validates all POST requests for new ISSUE (not new user) const { id } = req.params; - const classes = req.body; - console.log(`validate class:`, classes) + const items = req.body; + console.log(`validate item:`, items) - const issueCheck = await classDb.getClassesById(id) + const issueCheck = await itemDb.getItemsById(id) !issueCheck - ? res.status(404).json({ message: "Class does not exist!" }) + ? res.status(404).json({ message: "Item does not exist!" }) : next(); } diff --git a/pokemon/pokemonRouter.js b/pokemon/pokemonRouter.js index 62fe245..0dbaed1 100644 --- a/pokemon/pokemonRouter.js +++ b/pokemon/pokemonRouter.js @@ -1,14 +1,13 @@ const express = require('express'); const router = express.Router(); const dbUsers = require('../auth/auth-model'); -const classDb = require('./classModel'); -const classesData = require('./classModel'); +const itemDb = require('./itemModel'); +const itemsData = require('./itemModel'); +// GET all available items -//GET all available classes - -router.get('/classes', (req, res) => { - classesData.getClasses() +router.get('/items', (req, res) => { + itemsData.getItems() .then( posts =>{ res.status(200).json(posts); console.log(posts); @@ -18,15 +17,15 @@ router.get('/classes', (req, res) => { }) }) -// gets all classes for single user -router.get('/:id/classes', (req, res) => { +// gets all items for single user +router.get('/:id/items', (req, res) => { const { id } = req.params; - classesData - .getClassesFilter(id) - .then(classes => { - res.status(200).json(classes) + itemsData + .getItemsFilter(id) + .then(items => { + res.status(200).json(items) }) .catch(({ name, message, code, stack }) => { res.status(500).json({ name, message, code, stack }) @@ -34,14 +33,14 @@ router.get('/:id/classes', (req, res) => { }); -// gets single class -router.get('/classes/:id', validateClass, (req, res) => { +// gets single item +router.get('/items/:id', validateItem, (req, res) => { const { id } = req.params; - classesData - .getClassesById(id) - .then(issue => { - res.status(200).json(issue) + itemsData + .getItemsById(id) + .then(item => { + res.status(200).json(item) }) .catch(({ name, message, code, stack }) => { res.status(500).json({ name, message, code, stack }) @@ -49,57 +48,57 @@ router.get('/classes/:id', validateClass, (req, res) => { }) -// adds class to database with user id -router.post('/:id/classes/', validateUser, (req, res) => { +// adds item to database with user id +router.post('/:id/items/', validateUser, (req, res) => { const { id } = req.params; - const issue = { ...req.body, user_id: id } + const item = { ...req.body, user_id: id } - classesData - .addClass(issue) - .then(issue => { - res.status(200).json(issue) + itemsData + .addItem(item) + .then(item => { + res.status(200).json(item) }) .catch(({ name, message, code, stack }) => { res.status(500).json({ name, message, code, stack }) }) }) -// edits single class -router.put("/classes/:id", validateClass, (req, res) => { +// edits single item +router.put("/items/:id", validateItem, (req, res) => { const { id } = req.params const changes = { ...req.body} - classesData.updateClass(id, changes) - .then(issue => { - console.log(`this is class`, issue) - res.status(200).json(issue) + itemsData.updateItem(id, changes) + .then(item => { + console.log(`this is item`, item) + res.status(200).json(item) }) .catch(({ name, message, code, stack }) => { res.status(500).json({ name, message, code, stack }) }) }) -// edits current_attendees of classes -router.patch("/classes/:id", validateClass, (req, res) => { +// edits current_attendees of items +router.patch("/items/:id", validateItem, (req, res) => { const { id } = req.params const join = req.body; - classesData - .updateClassSize(id, join) - .then(classes=> { - res.status(200).json({ message: `Attendees for Class# ${id} Updated Successfully`, classes}) + itemsData + .updateItemCount(id, join) + .then(items=> { + res.status(200).json({ message: `Count for Item# ${id} Updated Successfully`, items}) }) .catch(({ name, message, code, stack }) => { res.status(500).json({ name, message, code, stack }) }) }) -// deletes an issue -router.delete("/classes/:id", (req, res) => { +// deletes an item +router.delete("/items/:id", (req, res) => { const { id } = req.params - classesData.deleteClass(id) - .then(classes => { - res.status(200).json(classes) + itemsData.deleteItem(id) + .then(items => { + res.status(200).json(items) }) .catch(({ name, message, code, stack }) => { res.status(500).json({ name, message, code, stack }) @@ -111,32 +110,32 @@ router.delete("/classes/:id", (req, res) => { // Validation MiddleWare async function validateUser(req, res, next) { - // validates all POST requests for new ISSUE (not new user) + // validates all POST requests for new item (not new user) const { id } = req.params; - const issue = { ...req.body, user_id: id} ; - console.log(`validate issue:`, issue) + const item = { ...req.body, user_id: id} ; + console.log(`validate item:`, item) const userCheck = await dbUsers.getUserById(id) !userCheck ? res.status(404).json({ message: "User does not exist!" }) - : !issue ? - res.status(404).json({ message: "Class does not exist!" }) - : !issue.title || !issue.description || !issue.type || !issue.start || !issue.location || !issue.intensity || !issue.max_class + : !item ? + res.status(404).json({ message: "Item does not exist!" }) + : !item.name || !item.id || !item.costAmount || !item.total_count ? res.status(406).json({ message: "Please make sure the required fields are completed. " }) : next(); } -async function validateClass(req, res, next) { +async function validateItem(req, res, next) { // validates all POST requests for new ISSUE (not new user) const { id } = req.params; - const classes = req.body; - console.log(`validate class:`, classes) + const items = req.body; + console.log(`validate item:`, items) - const issueCheck = await classDb.getClassesById(id) + const issueCheck = await itemDb.getItemsById(id) !issueCheck - ? res.status(404).json({ message: "Class does not exist!" }) + ? res.status(404).json({ message: "Item does not exist!" }) : next(); }