-
Notifications
You must be signed in to change notification settings - Fork 973
The Solution #935
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
The Solution #935
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| name: Test | ||
|
|
||
| on: | ||
| pull_request: | ||
| branches: [ master ] | ||
|
|
||
| jobs: | ||
| build: | ||
|
|
||
| runs-on: ubuntu-latest | ||
|
|
||
| strategy: | ||
| matrix: | ||
| node-version: [20.x] | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - name: Use Node.js ${{ matrix.node-version }} | ||
| uses: actions/setup-node@v1 | ||
| with: | ||
| node-version: ${{ matrix.node-version }} | ||
| - run: npm install | ||
| - run: npm test |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| 'use strict'; | ||
|
|
||
| const expensesService = require('../services/expensesSvc'); | ||
| const usersService = require('../services/usersSvc'); | ||
|
|
||
| const expensesController = { | ||
| create(req, res) { | ||
| const { userId, spentAt, title, amount, category, note } = req.body; | ||
|
|
||
| // Check if required fields are provided | ||
| if ( | ||
| userId === undefined || | ||
| !spentAt || | ||
| !title || | ||
| amount === undefined || | ||
| !category || | ||
| !note | ||
| ) { | ||
| res.status(400).json({ error: 'missing required fields' }); | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| // Check if user exists | ||
| const user = usersService.getById(userId); | ||
|
|
||
| if (!user) { | ||
| res.status(404).json({ error: 'user not found' }); | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| const expense = expensesService.create({ | ||
| userId, | ||
| spentAt, | ||
| title, | ||
| amount, | ||
| category, | ||
| note, | ||
| }); | ||
|
|
||
| res.status(201).json(expense); | ||
| }, | ||
|
|
||
| getAll(req, res) { | ||
| const { userId, from, to, categories } = req.query; | ||
|
|
||
| const filters = {}; | ||
|
|
||
| if (userId) { | ||
| filters.userId = Number(userId); | ||
| } | ||
|
|
||
| if (from) { | ||
| filters.from = from; | ||
| } | ||
|
|
||
| if (to) { | ||
| filters.to = to; | ||
| } | ||
|
|
||
| if (categories) { | ||
| filters.categories = categories.split(',').map((c) => c.trim()); | ||
| } | ||
|
|
||
| const expenses = expensesService.getAll(filters); | ||
|
|
||
| res.status(200).json(expenses); | ||
| }, | ||
|
|
||
| getById(req, res) { | ||
| const { id } = req.params; | ||
| const expense = expensesService.getById(Number(id)); | ||
|
|
||
| if (!expense) { | ||
| res.status(404).json({ error: 'expense not found' }); | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| res.status(200).json(expense); | ||
| }, | ||
|
|
||
| update(req, res) { | ||
| const { id } = req.params; | ||
| const expense = expensesService.update(Number(id), req.body); | ||
|
|
||
| if (!expense) { | ||
| res.status(404).json({ error: 'expense not found' }); | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| res.status(200).json(expense); | ||
| }, | ||
|
|
||
| delete(req, res) { | ||
| const { id } = req.params; | ||
| const deleted = expensesService.delete(Number(id)); | ||
|
|
||
| if (!deleted) { | ||
| res.status(404).json({ error: 'expense not found' }); | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| res.status(204).send(); | ||
| }, | ||
| }; | ||
|
|
||
| module.exports = expensesController; |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| 'use strict'; | ||
|
|
||
| const usersService = require('../services/usersSvc'); | ||
|
|
||
| const usersController = { | ||
| create(req, res) { | ||
| const { name } = req.body; | ||
|
|
||
| if (!name) { | ||
| res.status(400).json({ error: 'name is required' }); | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| const user = usersService.create(name); | ||
|
|
||
| res.status(201).json(user); | ||
| }, | ||
|
|
||
| getAll(req, res) { | ||
| const users = usersService.getAll(); | ||
|
|
||
| res.status(200).json(users); | ||
| }, | ||
|
|
||
| getById(req, res) { | ||
| const { id } = req.params; | ||
| const user = usersService.getById(Number(id)); | ||
|
|
||
| if (!user) { | ||
| res.status(404).json({ error: 'user not found' }); | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| res.status(200).json(user); | ||
| }, | ||
|
|
||
| update(req, res) { | ||
| const { id } = req.params; | ||
| const user = usersService.update(Number(id), req.body); | ||
|
|
||
| if (!user) { | ||
| res.status(404).json({ error: 'user not found' }); | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| res.status(200).json(user); | ||
| }, | ||
|
|
||
| delete(req, res) { | ||
| const { id } = req.params; | ||
| const deleted = usersService.delete(Number(id)); | ||
|
|
||
| if (!deleted) { | ||
| res.status(404).json({ error: 'user not found' }); | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| res.status(204).send(); | ||
| }, | ||
| }; | ||
|
|
||
| module.exports = usersController; | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| 'use strict'; | ||
|
|
||
| const express = require('express'); | ||
| const expensesController = require('../controllers/expensesCtrl'); | ||
|
|
||
| const router = express.Router(); | ||
|
|
||
| router.post('/', (req, res) => expensesController.create(req, res)); | ||
| router.get('/', (req, res) => expensesController.getAll(req, res)); | ||
| router.get('/:id', (req, res) => expensesController.getById(req, res)); | ||
| router.patch('/:id', (req, res) => expensesController.update(req, res)); | ||
| router.delete('/:id', (req, res) => expensesController.delete(req, res)); | ||
|
|
||
| module.exports = router; |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| 'use strict'; | ||
|
|
||
| const express = require('express'); | ||
| const usersController = require('../controllers/usersCtrl'); | ||
|
|
||
| const router = express.Router(); | ||
|
|
||
| router.post('/', (req, res) => usersController.create(req, res)); | ||
| router.get('/', (req, res) => usersController.getAll(req, res)); | ||
| router.get('/:id', (req, res) => usersController.getById(req, res)); | ||
| router.patch('/:id', (req, res) => usersController.update(req, res)); | ||
| router.delete('/:id', (req, res) => usersController.delete(req, res)); | ||
|
|
||
| module.exports = router; |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| 'use strict'; | ||
|
|
||
| let expenses = []; | ||
| let expenseId = 1; | ||
|
|
||
| const expensesService = { | ||
| clear() { | ||
| expenses = []; | ||
| expenseId = 1; | ||
| }, | ||
|
|
||
| create(expenseData) { | ||
| const expense = { | ||
| id: expenseId, | ||
| ...expenseData, | ||
| }; | ||
|
|
||
| expenses.push(expense); | ||
| expenseId += 1; | ||
|
|
||
| return expense; | ||
| }, | ||
|
|
||
| getAll(filters = {}) { | ||
| let result = expenses; | ||
|
|
||
| if (filters.userId) { | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Per the task requirements ('return 404 with any message if expected entity doesn't exist' for every request), this should return 404 when the referenced user doesn't exist, not 400. |
||
| result = result.filter((e) => e.userId === filters.userId); | ||
| } | ||
|
|
||
| if (filters.from) { | ||
| result = result.filter( | ||
| (e) => new Date(e.spentAt) >= new Date(filters.from), | ||
| ); | ||
| } | ||
|
|
||
| if (filters.to) { | ||
| result = result.filter( | ||
| (e) => new Date(e.spentAt) <= new Date(filters.to), | ||
| ); | ||
| } | ||
|
|
||
| if (filters.categories) { | ||
| const categoryList = Array.isArray(filters.categories) | ||
| ? filters.categories | ||
| : [filters.categories]; | ||
|
|
||
| result = result.filter((e) => categoryList.includes(e.category)); | ||
| } | ||
|
|
||
| return result; | ||
| }, | ||
|
|
||
| getById(id) { | ||
| return expenses.find((e) => e.id === id); | ||
| }, | ||
|
|
||
| update(id, data) { | ||
| const expense = this.getById(id); | ||
|
|
||
| if (!expense) { | ||
| return null; | ||
| } | ||
|
|
||
| if (data.userId !== undefined) { | ||
| expense.userId = data.userId; | ||
| } | ||
|
|
||
| if (data.spentAt !== undefined) { | ||
| expense.spentAt = data.spentAt; | ||
| } | ||
|
|
||
| if (data.title !== undefined) { | ||
| expense.title = data.title; | ||
| } | ||
|
|
||
| if (data.amount !== undefined) { | ||
| expense.amount = data.amount; | ||
| } | ||
|
|
||
| if (data.category !== undefined) { | ||
| expense.category = data.category; | ||
| } | ||
|
|
||
| if (data.note !== undefined) { | ||
| expense.note = data.note; | ||
| } | ||
|
|
||
| return expense; | ||
| }, | ||
|
|
||
| delete(id) { | ||
| const index = expenses.findIndex((e) => e.id === id); | ||
|
|
||
| if (index === -1) { | ||
| return false; | ||
| } | ||
| expenses.splice(index, 1); | ||
|
|
||
| return true; | ||
| }, | ||
| }; | ||
|
|
||
| module.exports = expensesService; | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
According to the task requirements, when an expected entity doesn't exist, the response should be 404. Here, a non-existent user returns 400, but it should be 404 since 'user not found' is about a missing entity.