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
593 changes: 452 additions & 141 deletions package-lock.json

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,14 @@
"license": "GPL-3.0",
"dependencies": {
"cors": "^2.8.5",
"express": "^4.19.2"
"express": "^4.22.1",
"uuid": "^8.3.2"
},
"devDependencies": {
"@mate-academy/eslint-config": "latest",
"@mate-academy/scripts": "^1.8.6",
"@mate-academy/scripts": "^2.1.3",
"@types/cors": "^2.8.19",
"@types/express": "^5.0.6",
"eslint": "^8.57.0",
"eslint-plugin-jest": "^28.6.0",
"eslint-plugin-node": "^11.1.0",
Expand Down
126 changes: 126 additions & 0 deletions src/api/expenses.controller.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
const { services: expensesServices } = require('./expenses.service');
const { services: userServices } = require('./users.service');

const controller = {
getExpenses(req, res) {
let expenses = expensesServices.getExpenses();

const { userId, from, to, categories } = req.query;

if (userId) {
const user = userServices.getUser(parseInt(userId, 10));

if (!user) {
res.status(400).json({ message: 'User not found' });

return;
}

expenses = expenses.filter(
(expense) => expense.userId === parseInt(userId, 10),
);
}

if (from || to) {
const fromDate = from ? new Date(from) : null;
const toDate = to ? new Date(to) : null;

expenses = expenses.filter((expense) => {
const expenseDate = new Date(expense.spentAt);

if (fromDate && expenseDate < fromDate) {
return false;
}

if (toDate && expenseDate > toDate) {
return false;
}

return true;
});
}

if (categories) {
const categoriesArray = categories.split(',').map((cat) => cat.trim());

expenses = expenses.filter(
(expense) => categoriesArray.indexOf(expense.category) !== -1,
);
}

res.json(expenses);
},
getExpense(req, res) {
const { id } = req.params;
const expense = expensesServices.getExpense(parseInt(id, 10));

if (expense === null) {
res.status(404).json({ message: 'Expense not found' });

return;
}

res.json(expense);
},
createExpense(req, res) {
const expense = req.body;

if (!expense.userId) {
res.status(400).json({ message: 'userId is required' });

return;
}

const user = userServices.getUser(expense.userId);

if (!user) {
res.status(400).json({ message: 'User not found' });

return;
}

const newExpense = expensesServices.createExpense(expense);

res.status(201).json(newExpense);
},
deleteExpense(req, res) {
const { id } = req.params;
const deletedExpense = expensesServices.deleteExpense(parseInt(id, 10));

if (deletedExpense === null) {
res.status(404).json({ message: 'Expense not found' });

return;
}

res.status(204).end();
},
updateExpense(req, res) {
const { id } = req.params;
const updatedData = req.body;
const currentExpense = expensesServices.getExpense(parseInt(id, 10));

if (currentExpense === null) {
res.status(404).json({ message: 'Expense not found' });

return;
}

if (Object.keys(updatedData).length === 0) {
res.status(400).json({ message: 'No data provided for update' });

return;
}

const updatedExpense = expensesServices.updateExpense(
parseInt(id, 10),
updatedData,
);

res.json(updatedExpense);
},
};

module.exports = {
controller,
};
14 changes: 14 additions & 0 deletions src/api/expenses.router.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
const { Router } = require('express');
const { controller: expensesController } = require('./expenses.controller');

const expensesRouter = Router();

expensesRouter.get('/', expensesController.getExpenses);
expensesRouter.get('/:id', expensesController.getExpense);
expensesRouter.post('/', expensesController.createExpense);
expensesRouter.delete('/:id', expensesController.deleteExpense);
expensesRouter.patch('/:id', expensesController.updateExpense);

module.exports = {
expensesRouter,
};
48 changes: 48 additions & 0 deletions src/api/expenses.service.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
let expenseId = 1;
const expenses = [];

const services = {
getExpenses() {
return expenses;
},
getExpense(id) {
return expenses.find((expense) => expense.id === id) || null;
},
createExpense(expense) {
const newExpense = { ...expense, id: expenseId++ };

expenses.push(newExpense);

return newExpense;
},
deleteExpense(id) {
const index = expenses.findIndex((expense) => expense.id === id);

if (index === -1) {
return null;
}

const deletedExpense = expenses.splice(index, 1)[0];

return deletedExpense;
},
updateExpense(id, updatedExpense) {
const index = expenses.findIndex((expense) => expense.id === id);

if (index === -1) {
return null;
}

Object.assign(expenses[index], updatedExpense);

return expenses[index];
},
reset() {
expenseId = 1;
expenses.length = 0;
},
};

module.exports = {
services,
};
73 changes: 73 additions & 0 deletions src/api/users.controller.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
const { services: userServices } = require('./users.service');

const controller = {
getUsers(req, res) {
const users = userServices.getUsers();

res.json(users);
},
getUser(req, res) {
const { id } = req.params;
const user = userServices.getUser(parseInt(id, 10));

if (user === null) {
res.status(404).json({ message: 'User not found' });

return;
}

res.json(user);
},
createUser(req, res) {
const { name } = req.body;

if (!name) {
res.status(400).json({ message: 'Name is required' });

return;
}

const newUser = userServices.createUser(name);

res.status(201).json(newUser);
},
deleteUser(req, res) {
const { id } = req.params;
const deletedUser = userServices.deleteUser(parseInt(id, 10));

if (deletedUser === null) {
res.status(404).json({ message: 'User not found' });

return;
}

res.status(204).end();
},
updateUser(req, res) {
const { id } = req.params;
const updatedUserData = req.body;

if (Object.keys(updatedUserData).length === 0) {
res.status(400).json({ message: 'No data provided for update' });

return;
}

const updatedUser = userServices.updateUser(
parseInt(id, 10),
updatedUserData,
);

if (updatedUser === null) {
res.status(404).json({ message: 'User not found' });

return;
}

res.json(updatedUser);
},
};

module.exports = {
controller,
};
14 changes: 14 additions & 0 deletions src/api/users.router.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
const { Router } = require('express');
const { controller: usersController } = require('./users.controller');

const usersRouter = Router();

usersRouter.get('/', usersController.getUsers);
usersRouter.get('/:id', usersController.getUser);
usersRouter.post('/', usersController.createUser);
usersRouter.delete('/:id', usersController.deleteUser);
usersRouter.patch('/:id', usersController.updateUser);

module.exports = {
usersRouter,
};
49 changes: 49 additions & 0 deletions src/api/users.service.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
let userId = 1;

const users = [];

const services = {
getUsers() {
return users;
},
getUser(id) {
return users.find((user) => user.id === id) || null;
},
createUser(name) {
const newUser = { name, id: userId++ };

users.push(newUser);

return newUser;
},
deleteUser(id) {
const index = users.findIndex((user) => user.id === id);

if (index === -1) {
return null;
}

const deletedUser = users.splice(index, 1)[0];

return deletedUser;
},
updateUser(id, updatedUser) {
const index = users.findIndex((user) => user.id === id);

if (index === -1) {
return null;
}

Object.assign(users[index], updatedUser);

return users[index];
},
reset() {
userId = 1;
users.length = 0;
},
};

module.exports = {
services,
};
19 changes: 18 additions & 1 deletion src/createServer.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,28 @@
'use strict';

// const express = require('express');
const express = require('express');
const cors = require('cors');
const { usersRouter } = require('./api/users.router');
const { expensesRouter } = require('./api/expenses.router');
const { services: userServices } = require('./api/users.service');
const { services: expensesServices } = require('./api/expenses.service');

function createServer() {
// Use express to create a server
// Add a routes to the server
// Return the server (express app)

userServices.reset();
expensesServices.reset();

const app = express();

app.use(express.json());
app.use(cors());
app.use('/users', usersRouter);
app.use('/expenses', expensesRouter);

return app;
}

module.exports = {
Expand Down
Loading