From dc3e0d0b185824365a4063ce17935c3dc7cffcaa Mon Sep 17 00:00:00 2001 From: rui hildt Date: Fri, 1 May 2020 18:24:59 +0200 Subject: [PATCH] Fix accounts model --- api/models/accountModel.js | 20 ++++++++------------ api/routes/accountRoute.js | 7 +++---- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/api/models/accountModel.js b/api/models/accountModel.js index cb6d2db..53b780c 100644 --- a/api/models/accountModel.js +++ b/api/models/accountModel.js @@ -1,18 +1,14 @@ const db = require('../../data/dbConfig'); module.exports = { - addUser + addUser, }; function addUser(userData) { - db.one('INSERT INTO account VALUES("", ${username}, ${email}, ${password}, ${timezone}, ${earliest_time}, ${latest_time}) RETURNING *', userData) - .then(data => { - console.log(data); - return data; - }) - .catch(error => { - console.log('ERROR:', error); - }); - -}; - + // TODO Complete query without providing id + // right now if ID is not provided, pg-promise send an erro fo mising column + return db.one( + 'INSERT INTO account VALUES(emptyUpdate, ${username}, ${email}, ${password}, ${timezone}, ${earliest_time}, ${latest_time}) RETURNING *', + userData, + ); +} diff --git a/api/routes/accountRoute.js b/api/routes/accountRoute.js index 25724eb..48e1a55 100644 --- a/api/routes/accountRoute.js +++ b/api/routes/accountRoute.js @@ -3,16 +3,15 @@ let router = express.Router(); let Account = require('../models/accountModel'); - // Add a user router.post('/', async (req, res) => { - const userData = {...req.body}; + const userData = { ...req.body }; try { const user = await Account.addUser(userData); res.status(201).json(user); - } catch { - res.status(500).json({ message: "Failed to add new user" }); + } catch (error) { + res.status(500).json({ message: 'Failed to add new user', error }); } });