From 8203d0e104bce045224d95edbe674982db266338 Mon Sep 17 00:00:00 2001 From: lisset-orozco Date: Wed, 3 Jul 2019 14:03:46 -0500 Subject: [PATCH 1/3] put and delete --- config/routes.js | 6 ++ controllers/ExercisesController.js | 112 +++++++++++++++++++---------- index.js | 9 +-- 3 files changed, 83 insertions(+), 44 deletions(-) diff --git a/config/routes.js b/config/routes.js index 69715d7..aff5ef7 100644 --- a/config/routes.js +++ b/config/routes.js @@ -12,4 +12,10 @@ router.post('/exercises', exercisesController.store) // Obtiene detalles del ejercicio router.get('/exercises/:id', exercisesController.details) +// Actualiza el ejercicio +router.put('/exercises/:id', exercisesController.update) + +// Elimina el ejercicio +router.delete('/exercises/:id', exercisesController.delete) + export default router diff --git a/controllers/ExercisesController.js b/controllers/ExercisesController.js index 2728566..5c9f8e3 100644 --- a/controllers/ExercisesController.js +++ b/controllers/ExercisesController.js @@ -2,46 +2,82 @@ import db from '../config/database' class ExercisesController { - static index(req, res){ - var sql = "select * from exercise" - db.all(sql, (err, exercises) => { - if (err) { - res.status(500).json({'error': err.message}); - return; - } - res.json(exercises) - }); - } + static index(req, res){ + var sql = "SELECT * FROM exercise" + db.all(sql, (err, exercises) => { + if (err) { + res.status(500).json({'error': err.message}); + return; + } + res.json(exercises) + }); + } - static store(req, res){ - const { title, description, img, leftColor, rightColor } = req.body - const SQL = 'INSERT INTO exercise (title, description, img, leftColor, rightColor) VALUES (?,?,?,?,?)' - const params = [title, description, img, leftColor, rightColor] - db.run(SQL, params, function (err) { - if (err){ - res.status(500).json({'error': err.message}) - return; - } - req.body.id = this.lastID - res.json({ - 'exercise': req.body - }) - }) - } + static store(req, res){ + const { title, description, img, leftColor, rightColor } = req.body + const SQL = 'INSERT INTO exercise (title, description, img, leftColor, rightColor) VALUES (?,?,?,?,?)' + const params = [title, description, img, leftColor, rightColor] + db.run(SQL, params, function (err) { + if (err){ + res.status(500).json({'error': err.message}) + return; + } + req.body.id = this.lastID + res.json({ + 'exercise': req.body + }) + }) + } - static details(req, res){ - var sql = "select * from exercise where id = ?" - - db.get(sql, req.params.id, (err, exercise) => { - if (err) { - res.status(500).json({'error': err.message}); - return; - } - res.json({ - exercise - }) - }); - } + static details(req, res){ + var sql = "SELECT * FROM exercise WHERE id = ?" + + db.get(sql, req.params.id, (err, exercise) => { + if (err) { + res.status(500).json({'error': err.message}); + return; + } + res.json({ + exercise + }) + }); + } + + static update(req, res){ + const { title, description, img, leftColor, rightColor, id } = req.body + const SQL = ` UPDATE exercise + SET title = ? , + description = ? , + img = ? , + leftColor = ?, + rightColor = ? + WHERE id = ?` + const params = [title, description, img, leftColor, rightColor, id] + db.run(SQL, params, function (err, exercise) { + if (err){ + res.status(500).json({'error': err.message}) + return; + } + res.json({ + exercise + }) + }) + } + + static delete(req, res){ + const SQL = ` DELETE FROM exercise + WHERE id = ?` + + db.run(SQL, req.params.id, function (err) { + if (err){ + res.status(500).json({'error': err.message}) + return; + } + res.json({ + 'msg': 'deleted' + }) + }) + } } export default ExercisesController diff --git a/index.js b/index.js index 7340ec2..b3defc1 100644 --- a/index.js +++ b/index.js @@ -5,7 +5,7 @@ import cors from 'cors' const app = express() const corsOptions = { - origin: '*' + origin: '*' } app.use(bodyParser.urlencoded({extended: false})) @@ -13,13 +13,10 @@ app.use(bodyParser.json()) app.use('/api',cors(corsOptions), routes) - app.get('/', (req, res) => res.send('Welcome to FitnessAPI')) - const server = app.listen(process.env.PORT || 8000, () => { - console.log(`http://localhost:${server.address().port}`) + console.log(`http://localhost:${server.address().port}`) }) - -export default app \ No newline at end of file +export default app From 3ad83ecd4501f6bb4023a3b5f20d764b7ffbb158 Mon Sep 17 00:00:00 2001 From: lisset-orozco Date: Wed, 10 Jul 2019 19:04:32 -0500 Subject: [PATCH 2/3] fix update --- controllers/ExercisesController.js | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/controllers/ExercisesController.js b/controllers/ExercisesController.js index 5c9f8e3..d80370c 100644 --- a/controllers/ExercisesController.js +++ b/controllers/ExercisesController.js @@ -14,14 +14,16 @@ class ExercisesController { } static store(req, res){ - const { title, description, img, leftColor, rightColor } = req.body - const SQL = 'INSERT INTO exercise (title, description, img, leftColor, rightColor) VALUES (?,?,?,?,?)' - const params = [title, description, img, leftColor, rightColor] - db.run(SQL, params, function (err) { + const { title, description, img, leftColor, rightColor } = req.body; + const SQL = 'INSERT INTO exercise (title, description, img, leftColor, rightColor) VALUES (?,?,?,?,?)'; + const params = [title, description, img, leftColor, rightColor]; + + let a = db.run(SQL, params, function (err) { if (err){ res.status(500).json({'error': err.message}) return; } + console.log(this); req.body.id = this.lastID res.json({ 'exercise': req.body @@ -53,26 +55,25 @@ class ExercisesController { rightColor = ? WHERE id = ?` const params = [title, description, img, leftColor, rightColor, id] - db.run(SQL, params, function (err, exercise) { + db.run(SQL, params, (err) => { if (err){ res.status(500).json({'error': err.message}) return; - } + } res.json({ - exercise + 'exercise': res.req.body }) - }) + }) } static delete(req, res){ - const SQL = ` DELETE FROM exercise - WHERE id = ?` + const SQL = ` DELETE FROM exercise WHERE id = ?` db.run(SQL, req.params.id, function (err) { if (err){ res.status(500).json({'error': err.message}) return; - } + } res.json({ 'msg': 'deleted' }) From dd224020b7c61349c210581479a15daa7e45d239 Mon Sep 17 00:00:00 2001 From: lisset-orozco Date: Wed, 10 Jul 2019 19:22:08 -0500 Subject: [PATCH 3/3] clean --- controllers/ExercisesController.js | 39 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/controllers/ExercisesController.js b/controllers/ExercisesController.js index d80370c..5b786cc 100644 --- a/controllers/ExercisesController.js +++ b/controllers/ExercisesController.js @@ -3,7 +3,7 @@ import db from '../config/database' class ExercisesController { static index(req, res){ - var sql = "SELECT * FROM exercise" + var sql = "SELECT * FROM exercise"; db.all(sql, (err, exercises) => { if (err) { res.status(500).json({'error': err.message}); @@ -20,15 +20,14 @@ class ExercisesController { let a = db.run(SQL, params, function (err) { if (err){ - res.status(500).json({'error': err.message}) - return; + res.status(500).json({'error': err.message}); + return; } - console.log(this); - req.body.id = this.lastID + res.req.body.id = this.lastID; res.json({ - 'exercise': req.body - }) - }) + 'exercise': res.req.body + }); + }); } static details(req, res){ @@ -41,12 +40,12 @@ class ExercisesController { } res.json({ exercise - }) + }); }); } static update(req, res){ - const { title, description, img, leftColor, rightColor, id } = req.body + const { title, description, img, leftColor, rightColor, id } = req.body; const SQL = ` UPDATE exercise SET title = ? , description = ? , @@ -54,31 +53,31 @@ class ExercisesController { leftColor = ?, rightColor = ? WHERE id = ?` - const params = [title, description, img, leftColor, rightColor, id] + const params = [title, description, img, leftColor, rightColor, id]; db.run(SQL, params, (err) => { if (err){ - res.status(500).json({'error': err.message}) + res.status(500).json({'error': err.message}); return; } res.json({ 'exercise': res.req.body - }) - }) + }); + }); } static delete(req, res){ - const SQL = ` DELETE FROM exercise WHERE id = ?` + const SQL = " DELETE FROM exercise WHERE id = ? " db.run(SQL, req.params.id, function (err) { if (err){ - res.status(500).json({'error': err.message}) - return; + res.status(500).json({'error': err.message}); + return; } res.json({ 'msg': 'deleted' - }) - }) + }); + }); } } -export default ExercisesController +export default ExercisesController;