Merge remote-tracking branch 'origin/main' into DIAL-32-ui-chat-bot

Author: hi02102002

server/.eslintrc

@@ -24,7 +24,5 @@
     "@typescript-eslint/no-misused-promises": "off",
     "@typescript-eslint/no-unnecessary-condition": "off"
   },
-  "ignorePatterns": [
-    "drizzle.config.ts"
-  ]
-}
+  "ignorePatterns": ["drizzle.config.ts"]
+}

server/.typesafe-i18n.json

@@ -1,4 +1,4 @@
 {
-   "adapter": "node",
-   "$schema": "https://unpkg.com/[email protected]/schema/typesafe-i18n.json"
-}
+  "adapter": "node",
+  "$schema": "https://unpkg.com/[email protected]/schema/typesafe-i18n.json"
+}

server/.vscode/launch.json

@@ -1,13 +1,13 @@
 {
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "node",
-            "request": "attach",
-            "name": "Node: Nodemon",
-            "processId": "${command:PickProcess}",
-            "restart": true,
-            "protocol": "inspector"
-        }
-    ]
-}
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "attach",
+      "name": "Node: Nodemon",
+      "processId": "${command:PickProcess}",
+      "restart": true,
+      "protocol": "inspector"
+    }
+  ]
+}

server/.vscode/settings.json

@@ -1,12 +1,12 @@
 {
-    "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": "always",
-        "source.organizeImports": "always"
-    },
-    "editor.formatOnSave": true,
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.formatOnSaveMode": "file",
-    "[typescript]": {
-        "editor.defaultFormatter": "vscode.typescript-language-features"
-    }
-}
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "always",
+    "source.organizeImports": "always"
+  },
+  "editor.formatOnSave": true,
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.formatOnSaveMode": "file",
+  "[typescript]": {
+    "editor.defaultFormatter": "vscode.typescript-language-features"
+  }
+}

server/docker-compose.yml

@@ -1,55 +1,48 @@
 version: '3.8'
 
 services:
-   db:
-      container_name: dialogue-bot-db
-      image: postgres:latest
-      ports:
-         - '5432:5432'
-      environment:
-         POSTGRES_PASSWORD: 'postgres'
-         POSTGRES_DB: 'dialoguebot'
-      volumes:
-         [
-            {
-               type: 'volume',
-               source: 'bot_db',
-               target: '/var/lib/postgresql/data',
-            },
-         ]
-      restart: 'unless-stopped'
-      networks:
-         - backend
+  db:
+    container_name: dialogue-bot-db
+    image: postgres:latest
+    ports:
+      - '5432:5432'
+    environment:
+      POSTGRES_PASSWORD: 'postgres'
+      POSTGRES_DB: 'dialoguebot'
+    volumes:
+      [{ type: 'volume', source: 'bot_db', target: '/var/lib/postgresql/data' }]
+    restart: 'unless-stopped'
+    networks:
+      - backend
 
-   pgadmin:
-      container_name: pgadmin
-      image: dpage/pgadmin4
-      ports:
-         - '5050:80'
-      environment:
-         PGADMIN_DEFAULT_EMAIL: '[email protected]'
-         PGADMIN_DEFAULT_PASSWORD: 'admin'
-      restart: 'unless-stopped'
-      networks:
-         - backend
-      volumes:
-         [{ type: 'volume', source: 'pgadmin', target: '/var/lib/pgadmin' }]
+  pgadmin:
+    container_name: pgadmin
+    image: dpage/pgadmin4
+    ports:
+      - '5050:80'
+    environment:
+      PGADMIN_DEFAULT_EMAIL: '[email protected]'
+      PGADMIN_DEFAULT_PASSWORD: 'admin'
+    restart: 'unless-stopped'
+    networks:
+      - backend
+    volumes: [{ type: 'volume', source: 'pgadmin', target: '/var/lib/pgadmin' }]
 
-   redis:
-      container_name: redis
-      image: redis:alpine
-      ports:
-         - '6379:6379'
-      restart: 'unless-stopped'
-      networks:
-         - backend
-      volumes: [{ type: 'volume', source: 'redis', target: '/data' }]
+  redis:
+    container_name: redis
+    image: redis:alpine
+    ports:
+      - '6379:6379'
+    restart: 'unless-stopped'
+    networks:
+      - backend
+    volumes: [{ type: 'volume', source: 'redis', target: '/data' }]
 
 networks:
-   backend:
-      driver: bridge
+  backend:
+    driver: bridge
 
 volumes:
-   bot_db:
-   pgadmin:
-   redis:
+  bot_db:
+  pgadmin:
+  redis:

server/drizzle.config.ts

@@ -1,13 +1,13 @@
-import { config } from 'dotenv';
-import type { Config } from 'drizzle-kit';
+import { config } from 'dotenv'
+import type { Config } from 'drizzle-kit'
 
-config({ path: `.env.${process.env.NODE_ENV || 'development'}.local` });
+config({ path: `.env.${process.env.NODE_ENV || 'development'}.local` })
 
 export default {
-   schema: './src/database/schema.ts',
-   out: './src/database/migrations',
-   driver: 'pg',
-   dbCredentials: {
-      connectionString: process.env.DATABASE_URL as string,
-   },
-} satisfies Config;
+  schema: './src/database/schema.ts',
+  out: './src/database/migrations',
+  driver: 'pg',
+  dbCredentials: {
+    connectionString: process.env.DATABASE_URL as string,
+  },
+} satisfies Config

server/ecosystem.config.js

@@ -4,7 +4,7 @@
  *  production mode :: pm2 start ecosystem.config.js --only prod
  *  development mode :: pm2 start ecosystem.config.js --only dev
  */
- module.exports = {
+module.exports = {
   apps: [
     {
       name: 'prod', // pm2 start App name
@@ -19,7 +19,8 @@
       merge_logs: true, // if true, stdout and stderr will be merged and sent to pm2 log
       output: './logs/access.log', // pm2 log file
       error: './logs/error.log', // pm2 error log file
-      env: { // environment variable
+      env: {
+        // environment variable
         PORT: 3000,
         NODE_ENV: 'production',
       },
@@ -38,7 +39,8 @@
       merge_logs: true, // if true, stdout and stderr will be merged and sent to pm2 log
       output: './logs/access.log', // pm2 log file
       error: './logs/error.log', // pm2 error log file
-      env: { // environment variable
+      env: {
+        // environment variable
         PORT: 3000,
         NODE_ENV: 'development',
       },
@@ -51,7 +53,8 @@
       ref: 'origin/master',
       repo: '[email protected]:repo.git',
       path: 'dist/server.js',
-      'post-deploy': 'npm install && npm run build && pm2 reload ecosystem.config.js --only prod',
+      'post-deploy':
+        'npm install && npm run build && pm2 reload ecosystem.config.js --only prod',
     },
   },
-};
+}

server/jest.config.js

@@ -1,5 +1,5 @@
-const { pathsToModuleNameMapper } = require('ts-jest');
-const { compilerOptions } = require('./tsconfig.json');
+const { pathsToModuleNameMapper } = require('ts-jest')
+const { compilerOptions } = require('./tsconfig.json')
 
 module.exports = {
   preset: 'ts-jest',
@@ -8,5 +8,7 @@ module.exports = {
   transform: {
     '^.+\\.tsx?$': 'ts-jest',
   },
-  moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths, { prefix: '<rootDir>/src' }),
-};
+  moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths, {
+    prefix: '<rootDir>/src',
+  }),
+}

server/nodemon.json

@@ -1,6 +1,6 @@
 {
-   "watch": ["src", ".env.development.local"],
-   "ext": "js,ts,json",
-   "ignore": ["src/logs/*", "src/**/*.{spec,test}.ts"],
-   "exec": "ts-node -r tsconfig-paths/register --transpile-only src/server.ts"
+  "watch": ["src", ".env.development.local"],
+  "ext": "js,ts,json",
+  "ignore": ["src/logs/*", "src/**/*.{spec,test}.ts"],
+  "exec": "ts-node -r tsconfig-paths/register --transpile-only src/server.ts"
 }