resolve conflict

Author: andrechristikan

.dockerignore

@@ -3,8 +3,6 @@
 # Build dependencies
 node_modules/
 coverage/
-coverage-e2e/
-coverage-integration/
 dist/
 .husky/
 .github/

.env.example

@@ -26,30 +26,23 @@ AUTH_JWT_SUBJECT=AckDevelopment
 AUTH_JWT_ISSUER=ack
 AUTH_JWT_AUDIENCE=https://example.com
 
-AUTH_JWT_ACCESS_TOKEN_SECRET_KEY=85huyujDurLdvLsjAW93XsqP79rAotqplHCOEWj1wzyIcMtT
-AUTH_JWT_ACCESS_TOKEN_EXPIRED=15m
+AUTH_JWT_ACCESS_TOKEN_SECRET_KEY=
+AUTH_JWT_ACCESS_TOKEN_EXPIRED=1h
 
-AUTH_JWT_REFRESH_TOKEN_SECRET_KEY=7Y3nqaO8jKVOFBRy9ujn5uUxV8Iy2otHrnQgiXlIGAqiVdb5
-AUTH_JWT_REFRESH_TOKEN_EXPIRED=7d
-AUTH_JWT_REFRESH_TOKEN_REMEMBER_ME_EXPIRED=30d
-AUTH_JWT_REFRESH_TOKEN_NOT_BEFORE_EXPIRATION=15m
-
-AUTH_PERMISSION_TOKEN_SECRET_KEY=85huyujDurLdvLsjAW93XsqP79rAotqplHCOEWj1wzyIcMtT
-AUTH_PERMISSION_TOKEN_EXPIRED=5m
+AUTH_JWT_REFRESH_TOKEN_SECRET_KEY=
+AUTH_JWT_REFRESH_TOKEN_EXPIRED=14d
+AUTH_JWT_REFRESH_TOKEN_NOT_BEFORE_EXPIRATION=1h
 
 AUTH_JWT_PAYLOAD_ENCRYPT=false
-AUTH_JWT_PAYLOAD_ACCESS_TOKEN_ENCRYPT_KEY=fKyRq7g9eftVNEdiCC7lNU6fga5Pr1iC7dc0JYsC
-AUTH_JWT_PAYLOAD_ACCESS_TOKEN_ENCRYPT_IV=mLZZdQrXqjPW5F5H2eko
-AUTH_JWT_PAYLOAD_REFRESH_TOKEN_ENCRYPT_KEY=NnCnSrRmw5YuQyTPtDokOWmKR37EYbuB6ITZqqZd
-AUTH_JWT_PAYLOAD_REFRESH_TOKEN_ENCRYPT_IV=eP7P8Pmvq207zhyd61dz
-
-AUTH_PAYLOAD_PERMISSION_TOKEN_ENCRYPT_KEY=hUcRIUQzJMe17w8cAZAreMdjxjo1JbucBACu7tAw
-AUTH_PAYLOAD_PERMISSION_TOKEN_ENCRYPT_IV=7V0D5a0D3SdsgM1KT5rF
+AUTH_JWT_PAYLOAD_ACCESS_TOKEN_ENCRYPT_KEY=
+AUTH_JWT_PAYLOAD_ACCESS_TOKEN_ENCRYPT_IV=
+AUTH_JWT_PAYLOAD_REFRESH_TOKEN_ENCRYPT_KEY=
+AUTH_JWT_PAYLOAD_REFRESH_TOKEN_ENCRYPT_IV=
 
 AWS_CREDENTIAL_KEY=
 AWS_CREDENTIAL_SECRET=
 AWS_S3_REGION=ap-southeast-3
-AWS_S3_BUCKET=baibay-development
+AWS_S3_BUCKET=
 
 KAFKA_CLIENT_ID=KAFKA_ACK
 KAFKA_ADMIN_CLIENT_ID=KAFKA_ADMIN_ACK

.github/workflows/test.yml

@@ -1,9 +1,8 @@
 name: Test
 on:
-  # pull_request:
-  #   branches: 
-  #   - main
-  workflow_dispatch:
+  pull_request:
+    branches: 
+    - main
 
 jobs:
   test:
@@ -13,7 +12,6 @@ jobs:
     strategy:
       matrix:
         node-version: ['18.x']
-        mongodb-version: ['5.0', '6.0']
 
     steps:
       - name: Git checkout
@@ -24,17 +22,6 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: Start Bitname Kafka
-        uses: bbcCorp/kafka-actions@v1
-
-      - name: Start MongoDB ${{ matrix.mongodb-version }}
-        uses: supercharge/[email protected]
-        with:
-          mongodb-version: ${{ matrix.mongodb-version }}
-          mongodb-replica-set: test-rs
-          mongodb-db: ack
-          mongodb-port: 27017
-
       - name: Install dependencies
         run: yarn --frozen-lockfile
 
@@ -74,19 +61,13 @@ jobs:
 
           echo AUTH_JWT_REFRESH_TOKEN_SECRET_KEY="7Y3nqaO8jKVOFBRy9ujn5uUxV8Iy2otHrnQgiXlIGAqiVdb5" >> .env
           echo AUTH_JWT_REFRESH_TOKEN_EXPIRED="7d" >> .env
-          echo AUTH_JWT_REFRESH_TOKEN_REMEMBER_ME_EXPIRED="30d" >> .env
           echo AUTH_JWT_REFRESH_TOKEN_NOT_BEFORE_EXPIRATION="15m" >> .env
 
-          echo AUTH_PERMISSION_TOKEN_SECRET_KEY="85huyujDurLdvLsjAW93XsqP79rAotqplHCOEWj1wzyIcMtT" >> .env
-          echo AUTH_PERMISSION_TOKEN_EXPIRED="1h" >> .env
-
           echo AUTH_JWT_PAYLOAD_ENCRYPT="false" >> .env
           echo AUTH_JWT_PAYLOAD_ACCESS_TOKEN_ENCRYPT_KEY="fKyRq7g9eftVNEdiCC7lNU6fga5Pr1iC7dc0JYsC" >> .env
           echo AUTH_JWT_PAYLOAD_ACCESS_TOKEN_ENCRYPT_IV="mLZZdQrXqjPW5F5H2eko" >> .env
           echo AUTH_JWT_PAYLOAD_REFRESH_TOKEN_ENCRYPT_KEY="NnCnSrRmw5YuQyTPtDokOWmKR37EYbuB6ITZqqZd" >> .env
           echo AUTH_JWT_PAYLOAD_REFRESH_TOKEN_ENCRYPT_IV="eP7P8Pmvq207zhyd61dz" >> .env
-          echo AUTH_PAYLOAD_PERMISSION_TOKEN_ENCRYPT_KEY="hUcRIUQzJMe17w8cAZAreMdjxjo1JbucBACu7tAw" >> .env
-          echo AUTH_PAYLOAD_PERMISSION_TOKEN_ENCRYPT_IV="7V0D5a0D3SdsgM1KT5rF" >> .env
 
           echo AWS_CREDENTIAL_KEY="$AWS_CREDENTIAL_KEY" >> .env
           echo AWS_CREDENTIAL_SECRET="$AWS_CREDENTIAL_SECRET" >> .env
@@ -103,17 +84,9 @@ jobs:
           AWS_CREDENTIAL_SECRET: ${{ secrets.AWS_CREDENTIAL_SECRET }}
           AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
           AWS_S3_REGION: ${{ secrets.AWS_S3_REGION }}
-          
-      - name: Migration
-        run: yarn seed
 
       - name: Unit Test
-        run: yarn test:unit
+        run: yarn test
         env:
           CI: true
 
-      - name: Unit Integration
-        run: yarn test:integration
-
-      - name: E2E Test
-        run: yarn test:e2e

.gitignore

@@ -16,8 +16,6 @@ lerna-debug.log*
 
 # Tests
 /coverage
-/coverage-e2e
-/coverage-integration
 /.nyc_output
 
 # IDEs and editors

.husky/pre-commit

@@ -4,4 +4,3 @@
 yarn lint
 yarn deadcode
 yarn spell
-yarn test

cspell.json

@@ -2,62 +2,24 @@
     "version": "0.2",
     "language": "en",
     "words": [
-        "nestjs",
-        "metatype",
-        "virtuals",
-        "prebuild",
-        "logform",
-        "transfomer",
-        "insync",
-        "microservices",
-        "globby",
-        "dockerhub",
-        "fifsky",
-        "buildx",
-        "exceljs",
-        "milis",
-        "workdir",
-        "dbdata",
-        "initdb",
-        "deadcode",
-        "authapis",
-        "headerapikey",
-        "jenkinsfile",
-        "superadmin",
         "alphanum",
-        "dtos",
         "kafkajs",
         "Partitioners",
         "rebalance",
-        "Partitioner",
-        "Partitioners",
-        "Partitioner",
         "wurstmeister",
         "zookeeperdata",
         "bitnami",
-        "wurstmeister",
-        "kafkadata",
-        "bitnami",
-        "kafkadata",
-        "zookeeperdata",
-        "typeorm",
-        "apikeys",
+        "DIQU",
+        "Kvnwr",
+        "Zgoh",
+        "QUDRX",
+        "MILIS",
+        "ength",
+        "strongpassword",
+        "weakpassword",
         "apikey",
-        "maxlength",
-        "Streamable"
-    ],
-    "ignoreWords": [
-        "psheon",
-        "aallithioo",
-        "tiaamoo",
-        "qwertyuiop12345zxcvbnmkjh",
-        "opbUwdiS1FBsrDUoPgZdx",
-        "cuwakimacojulawu",
-        "baibay",
-        "acks",
-        "andrechristikan",
-        "trueaaa",
-        "aasdasd"
+        "requestid",
+        "dtos"
     ],
     "ignorePaths": [
         "node_modules/**", 
@@ -66,7 +28,6 @@
         ".husky/**",
         ".github/**",
         "dist/**",
-        "logs/**",
-        "src/database/json/**"
+        "logs/**"
     ]
 }

docker-compose.yml

@@ -1,9 +1,9 @@
 version: '3.8'
 services:
-  ackService:
+  service:
     build: .
-    container_name: ackService
-    hostname: ackService
+    container_name: service
+    hostname: service
     ports:
       - 3000:3000
     networks:
@@ -14,21 +14,45 @@ services:
     restart: unless-stopped
     depends_on: 
       - ackDatabase
-  ackDatabase:
-    image: mongo:latest
-    container_name: ackDatabase
-    hostname: ackDatabase
+  mongo1:
+    container_name: mongo1
+    hostname: mongo1
+    image: mongo
     ports:
-      - 27017:27017
-    environment:
-      MONGO_INITDB_ROOT_USERNAME: root
-      MONGO_INITDB_ROOT_PASSWORD: 123456
-      MONGO_INITDB_DATABASE: ack
+      - 30001:27017 
+    restart: always
+    networks:
+      - app-network
     volumes:
-      - dbdata:/data/db
-    restart: unless-stopped
+      - dbdata1:/data/db
+    command: mongod --bind_ip_all --replSet rs0
+
+  mongo2:
+    container_name: mongo2
+    hostname: mongo2
+    image: mongo
+    ports:
+      - 30002:27017
     networks:
       - app-network
+    restart: always
+    volumes:
+      - dbdata2:/data/db
+    command: mongod --bind_ip_all --replSet rs0
+
+  mongo3:
+    container_name: mongo3
+    hostname: mongo3
+    image: mongo
+    ports:
+      - 30003:27017
+    networks:
+      - app-network
+    restart: always
+    volumes:
+      - dbdata3:/data/db
+    command: mongod --bind_ip_all --replSet rs0
+
   zookeeper:
     container_name: zookeeper
     image: wurstmeister/zookeeper
@@ -72,6 +96,8 @@ networks:
     name: app-network
     driver: bridge
 volumes:
-  dbdata:
   kafkadata:
-  zookeeperdata:
+  zookeeperdata:
+  dbdata1:
+  dbdata2:
+  dbdata3: