Merge branch 'master' into development

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:10
+FROM node:14
 
 WORKDIR /home/node/bc
 

docker-compose.local.yml

@@ -14,10 +14,8 @@ services:
 
   proxy:
     image: nginx:1.17.3-alpine
-
     ports:
       - 8090:80
-
     volumes:
       - ./nginx-config/local.conf:/etc/nginx/conf.d/default.conf
       - ./public/build:/htdocs

docker-compose.yml

@@ -8,8 +8,21 @@ services:
       POSTGRES_DB: bc
       POSTGRES_USER: bc
       POSTGRES_PASSWORD: bc
+    healthcheck:
+      interval: 10s
+      retries: 10
+      test:
+        [
+          'CMD',
+          'pg_isready',
+          '-U',
+          '${POSTGRES_USER}',
+          '-P',
+          '${POSTGRES_PASSWORD}',
+        ]
+      timeout: 45s
     volumes:
-    - ./pg.sql:/docker-entrypoint-initdb.d/pg.sql
+      - ./pg.sql:/docker-entrypoint-initdb.d/pg.sql
 
   nodejs:
     image: neuralegion/brokencrystals
@@ -21,8 +34,8 @@ services:
           cpus: 3.5
     logging:
       options:
-        max-file: "5"
-        max-size: "10m"
+        max-file: '5'
+        max-size: '10m'
     depends_on:
       - db
       - keycloak
@@ -31,10 +44,10 @@ services:
     image: neuralegion/brokencrystals-client
     restart: always
     environment:
-      CERTBOT_EMAIL: "[email protected]"
+      CERTBOT_EMAIL: '[email protected]'
     ports:
-      - "80:80"
-      - "443:443"
+      - '80:80'
+      - '443:443'
     depends_on:
       - nodejs
     volumes:
@@ -46,28 +59,41 @@ services:
     restart: always
     logging:
       options:
-        max-file: "5"
-        max-size: "10m"
+        max-file: '5'
+        max-size: '10m'
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     command: --interval 300 --debug
 
   keycloak-db:
-    image: "postgres:12.2-alpine"
+    image: 'postgres:12.2-alpine'
     environment:
       POSTGRES_DB: keycloak
       POSTGRES_USER: keycloak
       POSTGRES_PASSWORD: password
+    healthcheck:
+      interval: 10s
+      retries: 10
+      test:
+        [
+            'CMD',
+            'pg_isready',
+            '-U',
+            '${POSTGRES_USER}',
+            '-P',
+            '${POSTGRES_PASSWORD}',
+        ]
+      timeout: 45s
     restart: on-failure
     stdin_open: true
     tty: true
     volumes:
-      - "./keycloak/db:/var/lib/postgresql/data/"
+      - './keycloak/db:/var/lib/postgresql/data/'
 
   keycloak:
     image: jboss/keycloak:latest
     volumes:
-      - "./keycloak/imports/realm-export.json:/opt/jboss/keycloak/imports/realm-export.json"
+      - './keycloak/imports/realm-export.json:/opt/jboss/keycloak/imports/realm-export.json'
     environment:
       DB_VENDOR: POSTGRES
       DB_ADDR: keycloak-db
@@ -79,7 +105,13 @@ services:
       KEYCLOAK_PASSWORD: Pa55w0rd
       KEYCLOAK_IMPORT: /opt/jboss/keycloak/imports/realm-export.json -Dkeycloak.profile.feature.upload_scripts=enabled
     healthcheck:
-      test: [ "CMD", "curl", "-f", "http://localhost:8080/auth/realms/brokencrystals/health/check/database" ]
+      test:
+        [
+          'CMD',
+          'curl',
+          '-f',
+          'http://localhost:8080/auth/realms/brokencrystals/health/check/database',
+        ]
       timeout: 10s
       interval: 30s
       retries: 3

package.json

@@ -8,12 +8,12 @@
   "scripts": {
     "prebuild": "rimraf dist",
     "build": "nest build",
-    "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
+    "format": "prettier --write \"{src,public,test}/**/*.ts\"",
     "start": "nest start",
     "start:dev": "nest start --watch",
     "start:debug": "nest start --debug --watch",
     "start:prod": "node dist/main.js",
-    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
+    "lint": "eslint \"{src,public,test}/**/*.ts\"",
     "test": "jest",
     "test:watch": "jest --watch",
     "test:cov": "jest --coverage",
@@ -23,7 +23,7 @@
   "dependencies": {
     "@mikro-orm/core": "^4.3.3",
     "@mikro-orm/nestjs": "^4.2.0",
-    "@mikro-orm/postgresql": "^4.3.3",
+    "@mikro-orm/postgresql": "^4.5.7",
     "@mikro-orm/sql-highlighter": "^1.0.1",
     "@nestjs/common": "^7.6.7",
     "@nestjs/config": "^0.6.2",
@@ -44,7 +44,7 @@
     "jwt-simple": "^0.5.6",
     "libxmljs": "^0.19.7",
     "node-jwk": "^0.1.0",
-    "pg": "^8.5.1",
+    "pg": "^8.7.1",
     "raw-body": "^2.4.1",
     "reflect-metadata": "^0.1.13",
     "rimraf": "^3.0.2",

pg.sql

@@ -9,7 +9,7 @@ create table "product" ("id" serial primary key, "created_at" timestamptz(0) not
 
 set session_replication_role = 'origin';
 --password is admin
-INSERT INTO public."user" (created_at, updated_at, email, password, first_name, last_name, is_admin, photo) VALUES (now(), now(), 'admin', '$2b$10$BBJjmVNNdyEgv7pV/zQR9u/ssIuwZsdDJbowW/Dgp28uws3GmO0Ky', 'admin', 'admin', false, null);
+INSERT INTO "user" (created_at, updated_at, email, password, first_name, last_name, is_admin, photo) VALUES (now(), now(), 'admin', '$2b$10$BBJjmVNNdyEgv7pV/zQR9u/ssIuwZsdDJbowW/Dgp28uws3GmO0Ky', 'admin', 'admin', false, null);
 
 --insert default products into the table
 INSERT INTO "product" ("category", "photo_url", "name", "description") VALUES ('Healing', '/api/file?path=config/products/crystals/amethyst.jpg&type=image/jpg', 'Amethyst', 'a violet variety of quartz');
@@ -19,4 +19,4 @@ INSERT INTO "product" ("category", "photo_url", "name", "description") VALUES ('
 INSERT INTO "product" ("category", "photo_url", "name", "description") VALUES ('Healing', '/api/file?path=config/products/crystals/amber.jpg&type=image/jpg', 'Amber', 'fossilized tree resin');
 INSERT INTO "product" ("category", "photo_url", "name", "description") VALUES ('Jewellery', '/api/file?path=config/products/crystals/emerald.jpg&type=image/jpg', 'Emerald', 'symbol of fertility and life');
 INSERT INTO "product" ("category", "photo_url", "name", "description") VALUES ('Jewellery', '/api/file?path=config/products/crystals/shattuckite.jpg&type=image/jpg', 'Shattuckite', 'mistery');
-INSERT INTO "product" ("category", "photo_url", "name", "description") VALUES ('Gemstones', '/api/file?path=config/products/crystals/bismuth.jpg&type=image/jpg', 'Bismuth', 'rainbow');
+INSERT INTO "product" ("category", "photo_url", "name", "description") VALUES ('Gemstones', '/api/file?path=config/products/crystals/bismuth.jpg&type=image/jpg', 'Bismuth', 'rainbow');

public/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:10 AS builder
+FROM node:14 AS builder
 
 WORKDIR /home/node/bc