엔티티 리팩터링 및 docker-compose (#24)

* chore: add .gitattributes to enforce LF line endings

* refactor: group entity

* refactor: problem entity

* refactor: reorganize module imports and update paths

* feat: docker-compose.yml

* feat: add module name mapping in jest

Author: w8385

.gitattributes

@@ -0,0 +1 @@
+* text eol=lf

.github/workflows/publish-deploy.yml

@@ -81,20 +81,13 @@ jobs:
     steps:
       - name: executing remote ssh commands using password
         uses: appleboy/ssh-action@v1.0.3
+        env:
+          PORT: ${{ secrets.ENV_PORT }}
         with:
           host: ${{ secrets.SSH_HOST }}
+          port: ${{ secrets.SSH_PORT }}
           username: ${{ secrets.SSH_USERNAME }}
           password: ${{ secrets.SSH_PASSWORD }}
-          port: ${{ secrets.SSH_PORT }}
           script: |
-            IMAGE_ID=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-            IMAGE_ID=$(echo $IMAGE_ID | tr '[:upper:]' '[:lower:]')
-            CONTAINER_ID=${{ env.IMAGE_NAME }}
-            CONTAINER_ID=$(echo "CONTAINER_ID=Code-Poker/CodePoker-be" | sed -E 's#.*/##' | tr '[:upper:]' '[:lower:]')
-            docker pull $IMAGE_ID:main
-            docker stop $CONTAINER_ID
-            docker rm $CONTAINER_ID
-            docker run -d --name $CONTAINER_ID \
-            -p 6370:6370 \
-            --restart=always \
-            $IMAGE_ID:main
+            docker-compose pull
+            docker-compose up -d

Dockerfile

@@ -9,6 +9,4 @@ COPY . .
 RUN npm install
 RUN npm run build
 
-EXPOSE $PORT
-
 CMD [ "npm", "run", "start" ]

docker-compose.yml

@@ -0,0 +1,22 @@
+services:
+  backend:
+    image: ghcr.io/code-poker/codepoker-be:main
+    #    build: .
+    container_name: codepoker-be
+    restart: unless-stopped
+    ports:
+      - ${PORT}:${PORT}
+    depends_on:
+      - mongodb
+
+  mongodb:
+    image: mongo
+    container_name: mongodb
+    restart: unless-stopped
+    volumes:
+      - ./mongo_data:/data/db
+    healthcheck:
+      test: echo 'db.stats().ok' | mongosh localhost:27017/test --quiet
+      interval: 10s
+      timeout: 10s
+      retries: 5

eslint.config.mjs

@@ -31,8 +31,8 @@ export default tseslint.config(
       '@typescript-eslint/no-floating-promises': 'warn',
       '@typescript-eslint/no-unsafe-argument': 'warn',
       '@typescript-eslint/no-unsafe-call': 'off',
-      // '@typescript-eslint/no-unsafe-member-access': 'off',
-      // '@typescript-eslint/no-unsafe-return': 'off',
+      '@typescript-eslint/no-unsafe-member-access': 'off',
+      '@typescript-eslint/no-unsafe-return': 'off',
     },
   },
 );

package.json

@@ -74,6 +74,11 @@
       "**/*.(t|j)s"
     ],
     "coverageDirectory": "../coverage",
-    "testEnvironment": "node"
+    "testEnvironment": "node",
+    "moduleNameMapper": {
+      "^@database/(.*)$": "<rootDir>/database/$1",
+      "^@entities/(.*)$": "<rootDir>/entities/$1",
+      "^@modules/(.*)$": "<rootDir>/modules/$1"
+    }
   }
 }

src/app.module.ts

@@ -1,16 +1,15 @@
+import { DatabaseModule } from '@database/database.module';
+import { BojModule } from '@modules/boj/module';
+import { GroupModule } from '@modules/group/module';
+import { PokerModule } from '@modules/poker/module';
+import { ProblemModule } from '@modules/problem/module';
+import { SolvedModule } from '@modules/solved/module';
+import { SsuModule } from '@modules/ssu/module';
+import { UserModule } from '@modules/user/module';
 import { CacheInterceptor, CacheModule } from '@nestjs/cache-manager';
 import { Module } from '@nestjs/common';
 import { APP_INTERCEPTOR } from '@nestjs/core';
 
-import { BojModule } from './boj/boj.module';
-import { DatabaseModule } from './database/database.module';
-import { GroupModule } from './group/group.module';
-import { PokerModule } from './poker/poker.module';
-import { ProblemModule } from './problem/problem.module';
-import { SolvedModule } from './solved/solved.module';
-import { SsuModule } from './ssu/ssu.module';
-import { UserModule } from './user/user.module';
-
 @Module({
   imports: [
     CacheModule.register({

src/common/decorators/solved.decorators.ts

@@ -0,0 +1,6 @@
+import { applyDecorators } from '@nestjs/common';
+import { ApiQuery } from '@nestjs/swagger';
+
+export function SolvedSearchQuery() {
+  return applyDecorators(ApiQuery({}), ApiQuery({}), ApiQuery({}));
+}

src/http-exception.filter.ts …/common/filters/http-exception.filter.tssrc/http-exception.filter.ts renamed to src/common/filters/http-exception.filter.ts src/http-exception.filter.ts renamed to src/common/filters/http-exception.filter.ts

@@ -1,19 +1,18 @@
+import { BojModule } from '@modules/boj/module';
+import { GroupModule } from '@modules/group/module';
+import { PokerModule } from '@modules/poker/module';
+import { SolvedModule } from '@modules/solved/module';
+import { SsuModule } from '@modules/ssu/module';
 import { INestApplication } from '@nestjs/common';
 import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger';
 
-import { BojModule } from './boj/boj.module';
-import { GroupModule } from './group/group.module';
-import { PokerModule } from './poker/poker.module';
-import { SolvedModule } from './solved/solved.module';
-import { SsuModule } from './ssu/ssu.module';
-
-export const configSwagger = (app: INestApplication<any>) => {
+export const configSwagger = (app: INestApplication) => {
   configCodePoker(app);
   configSSUJoon(app);
   configSolved(app);
 };
 
-const configCodePoker = (app: INestApplication<any>) => {
+const configCodePoker = (app: INestApplication) => {
   const options = new DocumentBuilder()
     .setTitle('코드포커 API')
     .setVersion('1.0')
@@ -28,7 +27,7 @@ const configCodePoker = (app: INestApplication<any>) => {
   SwaggerModule.setup('api', app, document);
 };
 
-const configSSUJoon = (app: INestApplication<any>) => {
+const configSSUJoon = (app: INestApplication) => {
   const options = new DocumentBuilder()
     .setTitle('BaekSSU API')
     .setVersion('1.0')