Merge pull request #183 from mate-academy/add-test

test run

.github/workflows/test.yml

@@ -2,22 +2,43 @@ name: Test
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     strategy:
       matrix:
-        node-version: [12.x]
-
+        node-version: [14.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: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - run: npm install
-    - run: npm test
+      - uses: actions/checkout@v2
+      - name: Set up Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: '14'
+      - 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

package.json

@@ -16,13 +16,20 @@
   "license": "GPL-3.0",
   "devDependencies": {
     "@mate-academy/eslint-config": "*",
-    "@mate-academy/scripts": "^1.2.3",
+    "@mate-academy/scripts": "^1.7.0",
+    "axios": "^1.6.5",
     "eslint": "^5.16.0",
     "eslint-plugin-jest": "^22.4.1",
     "eslint-plugin-node": "^8.0.1",
-    "jest": "^24.7.0"
+    "jest": "^29.7.0"
   },
   "mateAcademy": {
-    "projectType": "javascript"
+    "projectType": "nodeJs"
+  },
+  "dependencies": {
+    "cors": "^2.8.5",
+    "express": "^4.18.2",
+    "pg": "^8.11.3",
+    "sequelize": "^6.35.2"
   }
 }

readme.md

@@ -3,4 +3,9 @@ Take the Accounting app from prev lesson and use PostgreSQL as a storage
 
 - Implement CRUD page to manage categories
 
+# Note
+- You can sync models by running `npm run test`
+- in local env, tests interect with your local database, so rows can be changed or removed
+
+
 **Read [the guideline](https://github.com/mate-academy/js_task-guideline/blob/master/README.md) before start**

src/createServer.js

@@ -0,0 +1,9 @@
+'use strict';
+
+const createServer = () => {
+  // your code goes here
+};
+
+module.exports = {
+  createServer,
+};

src/db.js

@@ -0,0 +1,34 @@
+'use strict';
+
+const { Sequelize } = require('sequelize');
+const utils = require('util');
+
+// Needed for testing purposes, do not remove
+require('dotenv').config();
+global.TextEncoder = utils.TextEncoder;
+
+const {
+  POSTGRES_HOST,
+  POSTGRES_PORT,
+  POSTGRES_USER,
+  POSTGRES_PASSWORD,
+  POSTGRES_DB,
+} = process.env;
+
+/*
+  All credentials setted to default values (exsept password - it is exapmle)
+  replace if needed with your own
+*/
+
+const sequelize = new Sequelize({
+  database: POSTGRES_DB || 'postgres',
+  username: POSTGRES_USER || 'postgres',
+  host: POSTGRES_HOST || 'localhost',
+  dialect: 'postgres',
+  port: POSTGRES_PORT || 5432,
+  password: POSTGRES_PASSWORD || '123',
+});
+
+module.exports = {
+  sequelize,
+};

src/index.js

@@ -1 +1,10 @@
+/* eslint-disable no-console */
+
 'use strict';
+
+const { createServer } = require('./createServer');
+
+createServer()
+  .listen(5700, () => {
+    console.log('Server is running on localhost:5700');
+  });

src/models/Expense.model.js

@@ -0,0 +1,11 @@
+'use strict';
+
+const { sequelize } = require('../db.js');
+
+const Expense = sequelize.define(
+  // your code goes here
+);
+
+module.exports = {
+  Expense,
+};

src/models/User.model.js

@@ -0,0 +1,11 @@
+'use strict';
+
+const { sequelize } = require('../db.js');
+
+const User = sequelize.define(
+  // your code goes here
+);
+
+module.exports = {
+  User,
+};

src/models/models.js

@@ -0,0 +1,11 @@
+'use strict';
+
+const { User } = require('./User.model');
+const { Expense } = require('./Expense.model');
+
+module.exports = {
+  models: {
+    User,
+    Expense,
+  },
+};