From 9c80989860c1a4ceb081b020d97a6815a8a54c7c Mon Sep 17 00:00:00 2001 From: Mikayla Dobson <93477693+innocuous-symmetry@users.noreply.github.com> Date: Tue, 27 Sep 2022 17:23:39 -0500 Subject: [PATCH] updates to cart section of api --- db/Seed.js | 4 ++-- models/CartModel.js | 22 +++++++++++++++++++--- routes/auth.js | 8 -------- services/AuthService.js | 2 +- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/db/Seed.js b/db/Seed.js index c1592f5..c2111dc 100644 --- a/db/Seed.js +++ b/db/Seed.js @@ -15,7 +15,7 @@ async function main() { password VARCHAR NOT NULL, firstname VARCHAR, lastname VARCHAR, - isAdmin BOOLEAN DEFAULT FALSE + isadmin BOOLEAN DEFAULT FALSE ); `; @@ -23,7 +23,7 @@ async function main() { const createCartTable = ` CREATE TABLE IF NOT EXISTS cart ( id INT PRIMARY KEY GENERATED ALWAYS AS IDENTITY NOT NULL, - appUserId INT REFERENCES users(id) + userid INT REFERENCES users(id) ); `; diff --git a/models/CartModel.js b/models/CartModel.js index 2d99922..e98ecfc 100644 --- a/models/CartModel.js +++ b/models/CartModel.js @@ -4,7 +4,7 @@ const pgp = require('pg-promise')({ capSQL: true }); module.exports = class CartModel { async create(userid) { try { - const statement = pgp.helpers.insert(userid, null, 'carts') + 'RETURNING *'; + const statement = pgp.helpers.insert(userid, null, 'cart') + 'RETURNING *'; const result = await db.query(statement); if (result.rows.length) return result.rows[0]; return null; @@ -15,7 +15,7 @@ module.exports = class CartModel { async findOneByUserId(userid) { try { - const statement = `SELECT * FROM carts WHERE userid = $1`; + const statement = `SELECT * FROM cart WHERE userid = $1`; const filter = [userid]; const result = await db.query(statement, filter); if (result.rows.length) return result.rows[0]; @@ -27,7 +27,7 @@ module.exports = class CartModel { async findOneByCartId(cartid) { try { - const statement = `SELECT * FROM carts WHERE id = $1`; + const statement = `SELECT * FROM cart WHERE id = $1`; const filter = [cartid]; const result = await db.query(statement, filter); if (result.rows.length) return result.rows[0]; @@ -36,4 +36,20 @@ module.exports = class CartModel { throw new Error(e); } } + + async updateCart(data) { + try { + + } catch(e) { + throw new Error(e); + } + } + + async insertNewItem(data) { + try { + + } catch(e) { + throw new Error(e); + } + } } \ No newline at end of file diff --git a/routes/auth.js b/routes/auth.js index dd42495..9907ae4 100644 --- a/routes/auth.js +++ b/routes/auth.js @@ -5,14 +5,6 @@ const router = require('express').Router(); module.exports = (app, passport) => { app.use('/api/auth', router); - router.get('/', async (req, res, next) => { - try { - res.send('auth get response'); - } catch(e) { - next(e); - } - }) - router.post('/register', async (req, res, next) => { try { const data = req.body; diff --git a/services/AuthService.js b/services/AuthService.js index 2948fae..3e63561 100644 --- a/services/AuthService.js +++ b/services/AuthService.js @@ -16,7 +16,7 @@ module.exports = class AuthService { bcrypt.hash(password, salt, (err, hash) => { if (err) throw err; const newData = { - email: email, + ...data, password: hash }