add task solution

.github/workflows/test.yml-template

@@ -0,0 +1,44 @@
+name: Test
+
+on:
+  pull_request:
+    branches: [master]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [20.x]
+    services:
+      postgres:
+        image: postgres:latest
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: password
+          POSTGRES_DB: students
+          POSTGRES_PORT: 5432
+          POSTGRES_HOST: localhost
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: '20'
+      - name: Install dependencies
+        run: npm install
+      - name: Run tests
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: password
+          POSTGRES_DB: students
+          POSTGRES_HOST: localhost
+          POSTGRES_PORT: 5432
+        run: npm test

.gitignore

@@ -7,7 +7,3 @@ node_modules
 
 # MacOS
 .DS_Store
-
-# env files
-*.env
-.env*

package.json

@@ -6,6 +6,7 @@
   "scripts": {
     "init": "mate-scripts init",
     "start": "node src/index.js",
+    "dev": "node --watch src/index.js",
     "lint": "npm run format && mate-scripts lint",
     "format": "prettier --ignore-path .prettierignore --write './src/**/*.{js,ts}'",
     "test:only": "mate-scripts test",
@@ -23,7 +24,7 @@
   },
   "devDependencies": {
     "@mate-academy/eslint-config": "latest",
-    "@mate-academy/scripts": "^1.8.6",
+    "@mate-academy/scripts": "^2.1.3",
     "axios": "^1.7.2",
     "eslint": "^8.57.0",
     "eslint-plugin-jest": "^28.6.0",

src/controllers/expenses.controller.js

@@ -0,0 +1,79 @@
+const { usersService } = require('../services/users.service.js');
+const { expensesService } = require('../services/expenses.service.js');
+
+const create = async (req, res) => {
+  const { userId, spentAt, title, amount, category, note } = req.body;
+  const user = await usersService.getOne(userId);
+
+  if (!userId || !user) {
+    return res.sendStatus(400);
+  }
+
+  const expense = await expensesService.create({
+    userId: userId,
+    spentAt,
+    title,
+    amount,
+    category,
+    note,
+  });
+
+  res.status(201).json(expensesService.normalize(expense));
+};
+
+const getAll = async (req, res) => {
+  const { userId, categories, from, to } = req.query;
+  const expenses = await expensesService.getAll({
+    userId: Number(userId),
+    categories,
+    from,
+    to,
+  });
+
+  res.json(expenses.map((expense) => expensesService.normalize(expense)));
+};
+
+const getOne = async (req, res) => {
+  const expense = await expensesService.getOne(Number(req.params.id));
+
+  if (!expense) {
+    return res.sendStatus(404);
+  }
+
+  res.json(expensesService.normalize(expense));
+};
+
+const update = async (req, res) => {
+  const expense = await expensesService.getOne(Number(req.params.id));
+
+  if (!expense) {
+    return res.sendStatus(404);
+  }
+
+  const updatedExpense = await expensesService.update({
+    id: Number(req.params.id),
+    ...req.body,
+  });
+
+  res.json(expensesService.normalize(updatedExpense));
+};
+
+const remove = async (req, res) => {
+  const expensesRemoved = await expensesService.remove(Number(req.params.id));
+
+  if (!expensesRemoved) {
+    return res.sendStatus(404);
+  }
+
+  res.sendStatus(204);
+};
+
+const expensesController = {
+  create,
+  getAll,
+  getOne,
+  update,
+  remove,
+};
+
+exports.expensesController = expensesController;

src/controllers/index.js

@@ -0,0 +1,7 @@
+const { usersController } = require('./users.controller');
+const { expensesController } = require('./expenses.controller');
+
+module.exports = {
+  usersController,
+  expensesController,
+};

src/controllers/users.controller.js

@@ -0,0 +1,67 @@
+const { usersService } = require('../services/users.service.js');
+
+const create = async (req, res) => {
+  const { name } = req.body;
+
+  if (!name) {
+    return res.sendStatus(400);
+  }
+
+  const user = await usersService.create(name);
+
+  res.status(201).json(usersService.normalize(user));
+};
+
+const getAll = async (req, res) => {
+  const users = await usersService.getAll();
+
+  res.send(users.map((user) => usersService.normalize(user)));
+};
+
+const getOne = async (req, res) => {
+  const user = await usersService.getOne(Number(req.params.id));
+
+  if (!user) {
+    res.sendStatus(404);
+
+    return;
+  }
+
+  res.send(usersService.normalize(user));
+};
+
+const update = async (req, res) => {
+  const { id } = req.params;
+  const user = await usersService.getOne(Number(id));
+
+  if (!user) {
+    return res.sendStatus(404);
+  }
+
+  const updatedUser = await usersService.update({
+    id: Number(id),
+    name: req.body.name,
+  });
+
+  res.json(usersService.normalize(updatedUser));
+};
+
+const remove = async (req, res) => {
+  const user = await usersService.remove(Number(req.params.id));
+
+  if (!user) {
+    return res.sendStatus(404);
+  }
+
+  res.sendStatus(204);
+};
+
+const usersController = {
+  getAll,
+  getOne,
+  create,
+  update,
+  remove,
+};
+
+exports.usersController = usersController;

src/createServer.js

@@ -1,7 +1,16 @@
 'use strict';
 
+const express = require('express');
+const { routes } = require('./routes/index');
+
 const createServer = () => {
-  // your code goes here
+  const app = express();
+
+  app.use(express.json());
+  app.use('/users', routes.usersRouter);
+  app.use('/expenses', routes.expensesRouter);
+
+  return app;
 };
 
 module.exports = {

src/db.js

@@ -16,7 +16,7 @@ const {
 } = process.env;
 
 /*
-  All credentials setted to default values (exsept password - it is exapmle)
+  All credentials are set to default values (except password - it is example)
   replace if needed with your own
 */
 
@@ -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 || '',
 });
 
 module.exports = {

src/models/Expense.model.js

@@ -1,10 +1,32 @@
 'use strict';
 
 const { sequelize } = require('../db.js');
+const { DataTypes } = require('sequelize');
 
-const Expense = sequelize.define(
-  // your code goes here
-);
+const Expense = sequelize.define('Expense', {
+  userId: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+  },
+  title: {
+    type: DataTypes.STRING,
+    allowNull: false,
+  },
+  amount: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+  },
+  spentAt: {
+    type: DataTypes.DATE,
+    allowNull: false,
+  },
+  category: {
+    type: DataTypes.STRING,
+  },
+  note: {
+    type: DataTypes.STRING,
+  },
+});
 
 module.exports = {
   Expense,

src/models/User.model.js

@@ -1,10 +1,14 @@
 'use strict';
 
 const { sequelize } = require('../db.js');
+const { DataTypes } = require('sequelize');
 
-const User = sequelize.define(
-  // your code goes here
-);
+const User = sequelize.define('User', {
+  name: {
+    type: DataTypes.STRING,
+    allowNull: false,
+  },
+});
 
 module.exports = {
   User,

src/models/models.js → src/models/index.js

@@ -4,8 +4,6 @@ const { User } = require('./User.model');
 const { Expense } = require('./Expense.model');
 
 module.exports = {
-  models: {
-    User,
-    Expense,
-  },
+  User,
+  Expense,
 };

src/routes/expenses.route.js

@@ -0,0 +1,14 @@
+const { Router } = require('express');
+const {
+  expensesController,
+} = require('./../controllers/expenses.controller.js');
+
+const expensesRouter = Router();
+
+expensesRouter.post('/', expensesController.create);
+expensesRouter.get('/', expensesController.getAll);
+expensesRouter.get('/:id', expensesController.getOne);
+expensesRouter.delete('/:id', expensesController.remove);
+expensesRouter.patch('/:id', expensesController.update);
+
+exports.expensesRouter = expensesRouter;

src/routes/index.js

@@ -0,0 +1,7 @@
+const { usersRouter } = require('./users.route');
+const { expensesRouter } = require('./expenses.route');
+
+exports.routes = {
+  usersRouter,
+  expensesRouter,
+};

src/routes/users.route.js

@@ -0,0 +1,12 @@
+const { Router } = require('express');
+const { usersController } = require('./../controllers/users.controller');
+
+const usersRouter = Router();
+
+usersRouter.post('/', usersController.create);
+usersRouter.get('/', usersController.getAll);
+usersRouter.get('/:id', usersController.getOne);
+usersRouter.patch('/:id', usersController.update);
+usersRouter.delete('/:id', usersController.remove);
+
+exports.usersRouter = usersRouter;