Fix issues in CI pipeline + Implement multi staged build in to two separated Images

.github/workflows/main.yml

@@ -6,9 +6,9 @@ name: CI
 # events but only for the master branch
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -17,21 +17,32 @@ jobs:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
     steps:
-    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - uses: actions/checkout@v2
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
 
-    - name: Install dependencies
-      working-directory: ./server
-      run: npm i
+      - name: Install dependencies
+        working-directory: ./server
+        run: npm i
+
+      - name: CI tests
+        working-directory: ./server
+        run: npm run test
 
   build-client:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
     steps:
-    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - uses: actions/checkout@v2
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+
+      - name: Install dependencies
+        working-directory: ./client
+        run: npm i
 
-    - name: Install dependencies
-      working-directory: ./client
-      run: npm i
+      - name: CI tests
+        working-directory: ./client
+        run: npm run test
 
+      - name: Production build
+        working-director: ./client
+        run: npm run build

client/.dockerignore

@@ -0,0 +1,3 @@
+node_modules
+Dockerfile
+.dockerignore

client/Dockerfile

@@ -0,0 +1,29 @@
+# escape=`
+
+# client build
+
+FROM node:14 as dep
+
+ENV NODE_ENV=production 
+
+WORKDIR /app
+
+COPY package*.json .
+
+RUN npm install
+
+FROM node:14 as serve
+
+ENV NODE_ENV=production 
+
+WORKDIR /app
+
+COPY --from=dep /app/node_modules /node_modules
+
+COPY . .
+
+RUN npm install -g @angular/cli@8.0.4
+
+EXPOSE 4200
+
+CMD ["ng", "serve"]

docker-compose.yml

@@ -1,8 +1,12 @@
 version: '2'
 
 services:
-  server:
-    build: . 
+  client:
+    build: client/
     restart: always
     ports:
-      - "80:3003"
+      - '4200:4200'
+  server:
+    build: server/
+    ports:
+      - '3003:3003'

server/.dockerignore

@@ -0,0 +1,3 @@
+node_modules
+Dockerfile
+.dockerignore

server/Dockerfile

@@ -0,0 +1,21 @@
+# escape=`
+
+FROM node:14 as dep
+
+WORKDIR /app
+
+COPY package*.json .
+
+RUN npm install
+
+FROM node:14 as prod
+
+WORKDIR /app
+
+COPY --from=dep app/node_modules node_modules
+
+COPY . .
+
+EXPOSE 3003
+
+CMD ["node", "server.js"]

server/app.js

@@ -1,32 +1,17 @@
-const express = require("express");
-const leaderBoardRouter = require("./routes/leaderBoardRouter");
-const syncRouter = require("./routes/syncRouter");
-const bodyParser = require("body-parser");
-const mongoose = require("mongoose");
-const expresValidator = require("express-validator");
-const cors = require("cors");
+const express = require('express');
+const leaderBoardRouter = require('./routes/leaderBoardRouter');
+const syncRouter = require('./routes/syncRouter');
+const bodyParser = require('body-parser');
+const mongoose = require('mongoose');
+const expresValidator = require('express-validator');
+const cors = require('cors');
 const mockgoose = require('mockgoose');
+const db = require('./helpers/db');
 
-if(process.env.NODE_ENV === 'test'){
-  const Mockgoose = mockgoose.Mockgoose;
-  const mock = new Mockgoose(mongoose);
-
-  mock.prepareStorage()
-  .then(() => {
-    mongoose.connect(process.env.MONGO_STR, {
-      useNewUrlParser: true
-    });
-  });
-
-}else{
-  mongoose.connect(process.env.MONGO_STR, {
-    useNewUrlParser: true
-  });
-}
-
+if (process.env.NODE_ENV != 'test') db.connect();
 const app = express();
 
-app.use(express.static("../client/dist/walk2win"));
+app.use(express.static('../client/dist/walk2win'));
 app.use(bodyParser.json());
 
 app.use(cors());

server/helpers/db.js

@@ -0,0 +1,71 @@
+const mongoose = require('mongoose');
+// const team = require('../models/team');
+// const player = require('../models/player');
+
+exports.connectMock = (teamArr, playerArr) => {
+  return new Promise((resolve, reject) => {
+    const { MongoMemoryServer } = require('mongodb-memory-server');
+    MongoMemoryServer.create()
+      .then((mongoServer) => {
+        return mongoose.connect(mongoServer.getUri(), {
+          useNewUrlParser: true,
+          useUnifiedTopology: true,
+        });
+      })
+      .then((client) => {
+        const team = client.model('Team');
+        const player = client.model('Player');
+        let selected = {
+          team: '',
+          player: '',
+        };
+        team.insertMany(teamArr).then((teams) => {
+          selected.team =
+            teams[Math.round(Math.random() * 100) % 3]._id.toString();
+          playerArr[0].team =
+            teams[Math.round(Math.random() * 100) % 3]._id.toString();
+          playerArr[1].team =
+            teams[Math.round(Math.random() * 100) % 3]._id.toString();
+          playerArr[2].team =
+            teams[Math.round(Math.random() * 100) % 3]._id.toString();
+          playerArr[3].team =
+            teams[Math.round(Math.random() * 100) % 3]._id.toString();
+          playerArr[4].team =
+            teams[Math.round(Math.random() * 100) % 3]._id.toString();
+          playerArr[5].team =
+            teams[Math.round(Math.random() * 100) % 3]._id.toString();
+          player.insertMany(playerArr).then((players) => {
+            selected.player =
+              players[Math.round(Math.random() * 100) % 6]._id.toString();
+            resolve(selected);
+          });
+        });
+      })
+      .catch((err) => {
+        reject(err);
+      });
+  });
+};
+
+exports.connect = () => {
+  return new Promise((resolve, reject) => {
+    mongoose
+      .connect(
+        process.env.MONGO_STR,
+        {
+          useNewUrlParser: true,
+          useUnifiedTopology: true,
+        }
+      )
+      .then(() => {
+        resolve();
+      })
+      .catch((err) => {
+        reject(err);
+      });
+  });
+};
+
+exports.close = () => {
+  mongoose.disconnect();
+};