add docker

Author: hi02102002

server/.gitignore

@@ -128,4 +128,7 @@ dist
 .yarn/build-state.yml
 .yarn/install-state.gz
 .pnp.*
-coffeenearyou-firebase.json
+coffeenearyou-firebase.json
+pgadmin
+redis
+bot_db

server/Dockerfile.dev

@@ -12,7 +12,7 @@ RUN npm install --legacy-peer-deps
 
 # Set Env
 ENV NODE_ENV development
-EXPOSE 3000
+EXPOSE 8080
 
 # Cmd script
 CMD ["npm", "run", "dev"]

server/docker-compose.yml

@@ -1,35 +1,69 @@
-version: "3.9"
+version: '3.8'
 
 services:
-  proxy:
-    container_name: proxy
-    image: nginx:alpine
-    ports:
-      - "80:80"
-    volumes:
-      - ./nginx.conf:/etc/nginx/nginx.conf
-    restart: "unless-stopped"
-    networks:
-      - backend
+   server:
+      container_name: server
+      build:
+         context: ./
+         dockerfile: Dockerfile.dev
+      ports:
+         - '8080:8080'
+      volumes:
+         - ./:/app
+         - /app/node_modules
+      restart: 'unless-stopped'
+      networks:
+         - backend
 
-  server:
-    container_name: server
-    build:
-      context: ./
-      dockerfile: Dockerfile.dev
-    ports:
-      - "3000:3000"
-    volumes:
-      - ./:/app
-      - /app/node_modules
-    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' }]
+
+   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:
-  data:
-    driver: local
+   bot_db:
+   pgadmin:
+   redis:

server/drizzle.config.ts

@@ -5,7 +5,6 @@ export default {
    out: './src/database/migrations',
    driver: 'pg',
    dbCredentials: {
-      connectionString:
-         'postgres://postgres:postgres@localhost:5432/server_bot',
+      connectionString: process.env.DATABASE_URL as string,
    },
 } satisfies Config;

server/nodemon.json

@@ -1,5 +1,5 @@
 {
-   "watch": ["src", ".env"],
+   "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"

server/package.json

@@ -9,8 +9,8 @@
       "start": "npm run build  && cross-env NODE_ENV=production concurrently \"npm run start:api\" \"npm run start:worker\" \"npm run typesafe-i18n\"",
       "start:api": "cross-env NODE_ENV=production node dist/server.js",
       "start:worker": "cross-env NODE_ENV=production node dist/worker.js",
-      "dev:worker": "nodemon --watch src/worker.ts --exec \"ts-node -r tsconfig-paths/register --transpile-only src/worker.ts\"",
-      "dev:api": "cross-env NODE_ENV=development  nodemon",
+      "dev:worker": "nodemon --legacy-watch src/worker.ts --exec \"ts-node -r tsconfig-paths/register --transpile-only src/worker.ts\"",
+      "dev:api": "cross-env NODE_ENV=development  nodemon  --legacy-watch ",
       "build": "swc src -d dist --source-maps --copy-files",
       "build:tsc": "tsc && tsc-alias",
       "test": "jest --forceExit --detectOpenHandles",
@@ -25,7 +25,7 @@
       "db:studio": "drizzle-kit studio --port 5050",
       "db:seed": "ts-node -r tsconfig-paths/register --transpile-only src/database/seed.ts",
       "typesafe-i18n": "typesafe-i18n",
-      "debug": "cross-env NODE_ENV=development nodemon --exec \"node --inspect=0.0.0.0:9229 --require ts-node/register -r tsconfig-paths/register src/server.ts\""
+      "debug": "cross-env NODE_ENV=development DATABASE_URL=postgres://postgres:postgres@localhost:5432/dialoguebot REDIS_HOST=localhost nodemon --exec \"node --inspect=0.0.0.0:9229 --require ts-node/register -r tsconfig-paths/register src/server.ts\""
    },
    "dependencies": {
       "@paralleldrive/cuid2": "^2.2.2",

server/src/database/db.ts

@@ -1,8 +1,9 @@
-import { drizzle } from 'drizzle-orm/node-postgres';
-import { Pool } from 'pg';
+import { DATABASE_URL } from '@/config';
+import { logger } from '@/utils/logger';
 import type { LogWriter } from 'drizzle-orm/logger';
 import { DefaultLogger } from 'drizzle-orm/logger';
-import { logger } from '@/utils/logger';
+import { drizzle } from 'drizzle-orm/node-postgres';
+import { Pool } from 'pg';
 import * as schema from './schema';
 
 class Logger implements LogWriter {
@@ -12,8 +13,7 @@ class Logger implements LogWriter {
 }
 
 export const client = new Pool({
-   connectionString:
-      'postgres://postgres:postgres@localhost:5432/coffeenearyou',
+   connectionString: DATABASE_URL,
 });
 
 export const db = drizzle(client, {

server/src/dtos/auth.dto.ts

@@ -1,3 +1,5 @@
+import { MAX_PASSWORD_LENGTH, MIN_PASSWORD_LENGTH } from '@/constants';
+import { getCurrentLocale } from '@/i18n/get-current';
 import {
    IsEmail,
    IsNotEmpty,
@@ -6,8 +8,6 @@ import {
    MaxLength,
    MinLength,
 } from 'class-validator';
-import { MAX_PASSWORD_LENGTH, MIN_PASSWORD_LENGTH } from '@/constants';
-import { getCurrentLocale } from '@/i18n/get-current';
 
 export class LoginDto {
    @IsEmail(

server/src/i18n/get-preferred-locale.ts

@@ -1,11 +1,9 @@
 import { Request } from 'express';
-import { Locales } from './i18n-types';
 import {
    initAcceptLanguageHeaderDetector,
-   initRequestParametersDetector,
    initRequestCookiesDetector,
-   initQueryStringDetector,
 } from 'typesafe-i18n/detectors';
+import { Locales } from './i18n-types';
 import { detectLocale } from './i18n-util';
 
 export const getPreferredLocale = (req: Request): Locales => {
@@ -16,6 +14,7 @@ export const getPreferredLocale = (req: Request): Locales => {
       { headers },
       'lang'
    );
+
    const requestCookiesDetector = initRequestCookiesDetector(req, 'lang');
 
    return detectLocale(acceptLanguageDetector, requestCookiesDetector);

server/src/libs/redis.ts

@@ -1,5 +1,5 @@
-import { Redis } from 'ioredis';
 import { REDIS_HOST, REDIS_PORT } from '@/config';
+import { Redis } from 'ioredis';
 
 export const redis = new Redis({
    host: REDIS_HOST,