add solution

src/controllers/expenses.controller.js

@@ -0,0 +1,23 @@
+const express = require('express');
+
+const {
+  getAllExpenses,
+  getExpenseById,
+  deleteExpense,
+  createExpense,
+  updateExpense,
+} = require('../routers/expenses.router.js');
+
+const expensesRoute = express.Router();
+
+expensesRoute.get('/', getAllExpenses);
+
+expensesRoute.get('/:id', getExpenseById);
+
+expensesRoute.post('/', createExpense);
+
+expensesRoute.delete('/:id', deleteExpense);
+
+expensesRoute.patch('/:id', updateExpense);
+
+module.exports = { expensesRoute };

src/controllers/users.controller.js

@@ -0,0 +1,23 @@
+const express = require('express');
+
+const {
+  getAllUsers,
+  getUsersById,
+  deleteUser,
+  createUser,
+  updateUser,
+} = require('../routers/users.router.js');
+
+const usersRoute = express.Router();
+
+usersRoute.get('/', getAllUsers);
+
+usersRoute.get('/:id', getUsersById);
+
+usersRoute.post('/', createUser);
+
+usersRoute.delete('/:id', deleteUser);
+
+usersRoute.patch('/:id', updateUser);
+
+module.exports = { usersRoute };

src/createServer.js

@@ -1,8 +1,23 @@
 'use strict';
 
-const createServer = () => {
-  // your code goes here
-};
+const express = require('express');
+const cors = require('cors');
+
+const { expensesRoute } = require('./controllers/expenses.controller.js');
+const { usersRoute } = require('./controllers/users.controller.js');
+
+function createServer() {
+  const app = express();
+
+  app.use(cors());
+
+  app.use(express.json());
+
+  app.use('/expenses', expensesRoute);
+  app.use('/users', usersRoute);
+
+  return app;
+}
 
 module.exports = {
   createServer,

src/db.js

@@ -26,7 +26,7 @@ const sequelize = new Sequelize({
   host: POSTGRES_HOST || 'localhost',
   dialect: 'postgres',
   port: POSTGRES_PORT || 5432,
-  password: POSTGRES_PASSWORD || '123',
+  password: POSTGRES_PASSWORD || '12345',
 });
 
 module.exports = {

src/models/Expense.model.js

@@ -1,9 +1,44 @@
 'use strict';
 
+const { DataTypes } = require('sequelize');
 const { sequelize } = require('../db.js');
 
 const Expense = sequelize.define(
-  // your code goes here
+  'Expense',
+  {
+    id: {
+      type: DataTypes.INTEGER,
+      primaryKey: true,
+      autoIncrement: true,
+    },
+    userId: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+    },
+    spentAt: {
+      type: DataTypes.DATE,
+      allowNull: false,
+      defaultValue: DataTypes.NOW,
+    },
+    title: {
+      type: DataTypes.STRING,
+      allowNull: false,
+    },
+    amount: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+    },
+    category: {
+      type: DataTypes.STRING,
+    },
+    note: {
+      type: DataTypes.STRING,
+    },
+  },
+  {
+    tableName: 'expenses',
+    timestamps: false,
+  },
 );
 
 module.exports = {

src/models/User.model.js

@@ -1,9 +1,25 @@
 'use strict';
 
+const { DataTypes } = require('sequelize');
 const { sequelize } = require('../db.js');
 
 const User = sequelize.define(
-  // your code goes here
+  'User',
+  {
+    id: {
+      type: DataTypes.INTEGER,
+      primaryKey: true,
+      autoIncrement: true,
+    },
+    name: {
+      type: DataTypes.STRING,
+      allowNull: false,
+    },
+  },
+  {
+    tableName: 'users',
+    timestamps: false,
+  },
 );
 
 module.exports = {

src/routers/expenses.router.js

@@ -0,0 +1,134 @@
+const {
+  getAll,
+  getById,
+  create,
+  update,
+  remove,
+} = require('../services/expenses.service.js');
+
+const { getById: getByUserId } = require('../services/users.service.js');
+
+const getAllExpenses = async (req, res) => {
+  const { userId, from, to, categories } = req.query;
+
+  const expenses = await getAll({
+    userId: userId ? Number(userId) : undefined,
+    from,
+    to,
+    categories,
+  });
+
+  res.send(expenses);
+};
+
+const getExpenseById = async (req, res) => {
+  const { id } = req.params;
+
+  const expense = await getById(id);
+
+  if (!expense) {
+    res.status(404).send({ message: 'Not found' });
+
+    return;
+  }
+
+  res.send(expense);
+};
+
+const createExpense = async (req, res) => {
+  const { userId, spentAt, title, amount, category, note } = req.body;
+
+  if (userId == null || spentAt == null || title == null || amount == null) {
+    res.status(400).send({ message: 'Missing required field' });
+
+    return;
+  }
+
+  const user = await getByUserId(userId);
+
+  if (!user) {
+    return res.status(400).send({ message: 'User not found' });
+  }
+
+  if (typeof amount !== 'number' || Number.isNaN(new Date(spentAt).getTime())) {
+    return res.status(400).send({ message: 'Invalid field' });
+  }
+
+  const expense = await create({
+    userId,
+    spentAt,
+    title,
+    amount,
+    category,
+    note,
+  });
+
+  res.status(201).send(expense);
+};
+
+const deleteExpense = async (req, res) => {
+  const { id } = req.params;
+
+  const expense = await remove(id);
+
+  if (!expense) {
+    res.status(404).send({ message: 'Not found' });
+
+    return;
+  }
+
+  res.status(204).send();
+};
+
+const updateExpense = async (req, res) => {
+  const { id } = req.params;
+  const { amount, spentAt } = req.body;
+
+  const existingExpense = await getById(id);
+
+  if (!existingExpense) {
+    res.status(404).send({ message: 'Not found' });
+
+    return;
+  }
+
+  if (amount !== undefined && typeof amount !== 'number') {
+    res.status(400).send({ message: 'Invalid field' });
+
+    return;
+  }
+
+  if (spentAt !== undefined) {
+    const date = new Date(spentAt);
+
+    if (Number.isNaN(date.getTime())) {
+      res.status(400).send({ message: 'Invalid field' });
+
+      return;
+    }
+  }
+
+  const updatedData = {
+    ...existingExpense,
+    ...req.body,
+    id,
+  };
+
+  const expense = await update(updatedData);
+
+  if (!expense) {
+    res.status(404).send({ message: 'Not found' });
+
+    return;
+  }
+
+  res.status(200).send(expense);
+};
+
+module.exports = {
+  getAllExpenses,
+  getExpenseById,
+  deleteExpense,
+  createExpense,
+  updateExpense,
+};

src/routers/users.router.js

@@ -0,0 +1,106 @@
+const express = require('express');
+const {
+  getAll,
+  getById,
+  create,
+  update,
+  remove,
+} = require('../services/users.service.js');
+
+const usersRoute = express.Router();
+
+const getAllUsers = async (req, res) => {
+  const users = await getAll();
+
+  res.send(users);
+};
+
+const getUsersById = async (req, res) => {
+  const { id } = req.params;
+
+  const idNum = Number(id);
+
+  const user = await getById(idNum);
+
+  if (!user) {
+    res.status(404).send({ message: 'Not found' });
+
+    return;
+  }
+
+  res.send(user);
+};
+
+const createUser = async (req, res) => {
+  const { name } = req.body;
+
+  if (typeof name !== 'string') {
+    res.status(400).send({ message: 'Invalid field' });
+
+    return;
+  }
+
+  if (name === undefined) {
+    res.status(400).send({ message: 'Missing required field' });
+
+    return;
+  }
+
+  const user = await create({ name });
+
+  res.status(201).send(user);
+};
+
+const deleteUser = async (req, res) => {
+  const { id } = req.params;
+
+  const idNum = Number(id);
+
+  const user = await remove(idNum);
+
+  if (!user) {
+    res.status(404).send({ message: 'Not found' });
+
+    return;
+  }
+
+  res.status(204).send();
+};
+
+const updateUser = async (req, res) => {
+  const { id } = req.params;
+  const { name } = req.body;
+
+  const idNum = Number(id);
+
+  if (typeof name !== 'string') {
+    res.status(400).send({ message: 'Invalid field' });
+
+    return;
+  }
+
+  if (name === undefined) {
+    res.status(400).send({ message: 'Missing required field' });
+
+    return;
+  }
+
+  const user = await update({ id: idNum, name });
+
+  if (!user) {
+    res.status(404).send({ message: 'Not found' });
+
+    return;
+  }
+
+  res.send(user);
+};
+
+module.exports = {
+  usersRoute,
+  getAllUsers,
+  getUsersById,
+  createUser,
+  deleteUser,
+  updateUser,
+};