Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 72 additions & 7 deletions api/accounts/accounts-middleware.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,78 @@
//const db = require('../../data/db-config');
const Account = require('../accounts/accounts-model.js');
const db = require('../../data/db-config');

//find bug, cant start debugger

exports.checkAccountPayload = (req, res, next) => {
// DO YOUR MAGIC
// Note: you can either write "manual" validation logic
// or use the Yup library (not currently installed)
}
const error = {status: 400}

//const {name, budget} = req.body;
const name = req.body.name
const budget = req.body.budget

exports.checkAccountNameUnique = (req, res, next) => {
// DO YOUR MAGIC
// if (!name || !budget || name === undefined || budget === undefined) {
if (name === undefined || budget === undefined) {
error.message = 'name and budget are required' //Missing name or budget'
//next(error)


} else if (typeof name !== 'string') {
error.message = 'name of account must be a string'
//next(error)
} else if (name.trim().length < 3 || name.trim().length > 100) {
error.message = 'name of account must be between 3 and 100 characters'
//next(error)
//when checking type in budget:= not budget =
} else if (typeof budget !== 'number' || isNaN(budget)) {
error.message = 'budget of account must be a number'
console.log(budget)
//next(error)
} else if (budget < 0 || budget > 1000000) {
error.message = 'budget of account is too large or too small'
//next(error)
} if (error.message) {
next(error)
} else {
next()
}
}

exports.checkAccountNameUnique = async (req, res, next) => {
try {
const existing = await db('accounts')
.where('name', req.body.name.trim())
.first()

if (existing) {
const error = {status: 400}
error.message = 'that name is taken'
next(error)
// next({status: 400, message: "that name is taken"})
}

else {
next()
}

} catch (error) {
next(error)
}
}

exports.checkAccountId = (req, res, next) => {

exports.checkAccountId = async (req, res, next) => {
// DO YOUR MAGIC
// console.log('checkAccountId middleware')
try {
const account = await Account.getById(req.params.id)
if (!account) {
next ({ status: 404, message: 'Account not found' })
} else {
req.account = account
next()
}
} catch (error) {
next(error)
}
}
27 changes: 22 additions & 5 deletions api/accounts/accounts-model.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,38 @@
const db = require ('../../data/db-config');

const getAll = () => {
// DO YOUR MAGIC
// SELECT * from accounts;
return db('accounts');

}

const getById = id => {
// DO YOUR MAGIC
// SELECT * from accounts where id = 1;
return db('accounts').where('id', id).first();
}

const create = account => {
// DO YOUR MAGIC
const create = async account => {
// insert into accounts (name, budget) values ('test', 100);
const [id] = await db('accounts').insert(account)
return getById(id)
}

const updateById = (id, account) => {
// DO YOUR MAGIC
const updateById = async (id, account) => {

// update accounts set name = 'test' where id = 1;
// const [updated] = await db('accounts')
// .where('id', id).update(account) //eslint-disable-line
// return getById(id)

await db('accounts').where('id', id).update(account)
return getById(id)
}

const deleteById = id => {
// DO YOUR MAGIC
// delete from accounts where id = 1;
return db ('accounts').where('id', id).del()
}

module.exports = {
Expand Down
67 changes: 58 additions & 9 deletions api/accounts/accounts-router.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,76 @@
const router = require('express').Router()
const md = require('./accounts-middleware.js')
const Account = require('../accounts/accounts-model.js')

router.get('/', (req, res, next) => {
//testing if I can go back and forth when accessing instead
// of directly going ('./accounts-model.js)

router.get('/', async (req, res, next) => {
// DO YOUR MAGIC
try {
const accounts = await Account.getAll()
res.json(accounts)
} catch (err) {
next(err)
//next({status:422, message: 'test error next'})
//422 = unprocessable entity
}
})

router.get('/:id', (req, res, next) => {
// DO YOUR MAGIC
router.get('/:id', md.checkAccountId, async (req, res, next) => {
// all done by middleware:
// try {
// const account = await Account.getById(req.params.id)
// res.json(account)
// } catch (err) {
// next(err)
// }
res.json(req .account)
})

router.post('/', (req, res, next) => {
router.post(
'/',
md.checkAccountPayload,
md.checkAccountNameUnique,
async (req, res, next) => {
// DO YOUR MAGIC
try {
const newAccount = await Account.create(req.body)
res.status(201).json(newAccount)
} catch (err) {
next(err)
}
})

router.put('/:id', (req, res, next) => {
// DO YOUR MAGIC

router.put('/:id',
md.checkAccountPayload,
//md.checkAccountNameUnique,
md.checkAccountId,
async (req, res, next) => { //put is update
const updated = await Account.updateById(req.params.id, req.body)
try {
res.json('update account')
} catch (err) {
next(err)
}
});

router.delete('/:id', (req, res, next) => {
router.delete('/:id', md.checkAccountId, async (req, res, next) => {
// DO YOUR MAGIC
try {
await Account.deleteById(req.params.id)
res.json(req.account)
} catch (err) {
next(err)
}
})

router.use((err, req, res, next) => { // eslint-disable-line
// DO YOUR MAGIC
})

res.status(err.status || 500).json({
message: err.message,
})
})

module.exports = router;
11 changes: 11 additions & 0 deletions api/server.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
const express = require("express");

const accountsRouter = require("./accounts/accounts-router.js");

const server = express();

server.use(express.json());

server.use("/api/accounts", accountsRouter);

server.use('*', (req, res) => {
res.status(404).json({
message: 'Error 404: Page not found',
//error: err,'Not found'
})
})

module.exports = server;
Binary file modified data/budget.db3
Binary file not shown.
4 changes: 3 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
const server = require("./api/server.js");

const PORT = process.env.PORT || 9000;
const PORT = process.env.PORT || 5000;

server.listen(PORT, () => {
console.log(`\n== API running on port ${PORT} ==\n`);
});

//initializing
Loading