Revert "ci/cd notification for slack" (#48)

Author: hobiJeong

.dockerignore

@@ -3,6 +3,7 @@ node_modules
 # dockerfile
 src
 test
+.env
 .eslintrc.js
 .gitignore
 .prettierrc

.github/workflows/dongurami-v2.yml

@@ -19,32 +19,19 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
 
-      - name: Generate Environment Variables File
-        run: |
-          echo "NODE_ENV=${{ secrets.DEV_NODE_ENV }}" >> $GITHUB_ENV
-          echo "PORT=${{ secrets.DEV_PORT }}" >> $GITHUB_ENV
-          echo "RDB_HOST=${{ secrets.DEV_RDB_HOST }}" >> $GITHUB_ENV
-          echo "RDB_PORT=${{ secrets.DEV_RDB_PORT }}" >> $GITHUB_ENV
-          echo "RDB_USER_NAME=${{ secrets.DEV_RDB_USER_NAME }}" >> $GITHUB_ENV
-          echo "RDB_PASSWORD=${{ secrets.DEV_RDB_PASSWORD }}" >> $GITHUB_ENV
-          echo "RDB_DATABASE=${{ secrets.DEV_RDB_DATABASE }}" >> $GITHUB_ENV
-          echo "JWT_SECRET=${{ secrets.DEV_JWT_SCERET }}" >> $GITHUB_ENV
-          cat $GITHUB_ENV
-
       - name: Build and package
         run: |
           npm install
           npm run build
-          sudo docker build --platform linux/amd64 \
-          --build-arg NODE_ENV=${{ secrets.DEV_NODE_ENV }} \
-          --build-arg PORT=${{ secrets.DEV_PORT }} \
-          --build-arg RDB_HOST=${{ secrets.DEV_RDB_HOST }} \
-          --build-arg RDB_PORT=${{ secrets.DEV_RDB_PORT }} \
-          --build-arg RDB_USER_NAME=${{ secrets.DEV_RDB_USER_NAME }} \
-          --build-arg RDB_PASSWORD=${{ secrets.DEV_RDB_PASSWORD }} \
-          --build-arg RDB_DATABASE=${{ secrets.DEV_RDB_DATABASE }} \
-          --build-arg JWT_SECRET=${{ secrets.DEV_JWT_SECRET }} \
-          -t ${{ secrets.DOCKER_IMAGE_NAME }}:latest .
+          echo "NODE_ENV=${{ secrets.NODE_ENV }}" >> .env
+          echo "PORT=${{ secrets.PORT }}" >> .env
+          echo "DB_HOST=${{ secrets.DB_HOST }}" >> .env
+          echo "DB_PORT=${{ secrets.DB_PORT }}" >> .env
+          echo "DB_USERNAME=${{ secrets.DB_USERNAME }}" >> .env
+          echo "DB_PASSWORD=${{ secrets.DB_PASSWORD }}" >> .env
+          echo "DB_DATABASE=${{ secrets.DB_DATABASE }}" >> .env
+          cat .env
+          sudo docker build --platform linux/amd64 -t ${{ secrets.DOCKER_IMAGE_NAME }}:latest .
 
       - name: Login to Docker Hub
         uses: docker/login-action@v1
@@ -55,39 +42,6 @@ jobs:
       - name: Push Docker image
         run: docker push ${{ secrets.DOCKER_IMAGE_NAME }}:latest
 
-        if: success()
-      - name: Slack Notification on Success
-        id: slack-success
-        uses: slackapi/slack-github-action@v1.24.0
-        with:
-          payload: |
-            {
-              "channel": "채널 ID",
-              "attachments": [
-                {
-                  "color": "#36a64f", # 성공시 연두색
-                  "title": "${{ github.repository }}", # 제목은 깃헙 레포지토리
-                  "title_link": "https://github.com/${{ github.repository }}", # 제목 클릭시 레포지토리로 이동
-                  "text": "GitHub Action 성공",
-                  "fields": [
-                    {
-                      "title": "Repository",
-                      "value": "${{ github.repository }}",
-                      "short": true
-                    },
-                    {
-                      "title": "Tag",
-                      "value": "${{ github.ref_name }}",
-                      "short": true
-                    }
-                  ]
-                }
-              ]
-            }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
-
   deploy:
     needs: build
     runs-on: self-hosted # runner로 ec2 연결
@@ -103,4 +57,4 @@ jobs:
         run: |
           sudo docker pull ${{ secrets.DOCKER_IMAGE_NAME }}:latest
           sudo docker-compose down
-          sudo docker-compose up --force-recreate --build -d
+          sudo docker-compose up --force-recreate --build -d

.gitignore

@@ -32,7 +32,6 @@ lerna-debug.log*
 
 
 # IDE - VSCode
-**/.vscode/
 .vscode/*
 !.vscode/settings.json
 !.vscode/tasks.json

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "cSpell.words": [
+        "dongurami",
+        "mediumtext"
+    ]
+}

dockerfile

@@ -12,25 +12,6 @@ RUN npm ci --only=production && npm cache clean --force
 # /dist 폴더를 이미지에 복사
 COPY ./dist ./dist
 
-ARG NODE_ENV
-ARG PORT
-ARG RDB_HOST
-ARG RDB_PORT
-ARG RDB_USER_NAME
-ARG RDB_PASSWORD
-ARG RDB_DATABASE
-ARG JWT_SECRET
-
-# ENV로 환경 변수 설정
-ENV NODE_ENV=${NODE_ENV}
-ENV PORT=${PORT}
-ENV RDB_HOST=${RDB_HOST}
-ENV RDB_PORT=${RDB_PORT}
-ENV RDB_USER_NAME=${RDB_USER_NAME}
-ENV RDB_PASSWORD=${RDB_PASSWORD}
-ENV RDB_DATABASE=${RDB_DATABASE}
-ENV JWT_SECRET=${JWT_SECRET}
-
 # 애플리케이션 실행
 CMD ["npm", "run", "start:prod"]
 

migrations/1700205074777-init.ts

@@ -47,6 +47,33 @@ const generateUpdatedAtColumn = (
 
 export class Init1700205074777 implements MigrationInterface {
   public async up(queryRunner: QueryRunner): Promise<void> {
+    // 로그인 타입
+    await queryRunner.createTable(
+      new Table({
+        name: 'login_type',
+        columns: [
+          generatePrimaryColumn('로그인 타입 고유 ID'),
+          {
+            name: 'name',
+            type: 'varchar',
+            length: '20',
+            isNullable: false,
+            comment: '로그인 타입',
+          },
+          {
+            name: 'memo',
+            type: 'varchar',
+            length: '255',
+            isNullable: false,
+            comment: '메모',
+          },
+          generateCreatedAtColumn(),
+          generateUpdatedAtColumn(),
+        ],
+      }),
+    );
+    await queryRunner.query('ALTER TABLE login_type COMMENT = "로그인 타입"');
+
     // 전공
     await queryRunner.createTable(
       new Table({
@@ -88,18 +115,18 @@ export class Init1700205074777 implements MigrationInterface {
         columns: [
           generatePrimaryColumn('유저 고유 ID'),
           {
-            name: 'major_id',
+            name: 'login_type_id',
             type: 'int',
             unsigned: true,
             isNullable: false,
-            comment: '전공 고유 ID',
+            comment: '로그인 타입 고유 ID',
           },
           {
-            name: 'login_type',
-            type: 'enum',
-            enum: ['email'],
+            name: 'major_id',
+            type: 'int',
+            unsigned: true,
             isNullable: false,
-            comment: '로그인 타입',
+            comment: '로그인 타입 고유 ID',
           },
           {
             name: 'name',
@@ -162,6 +189,13 @@ export class Init1700205074777 implements MigrationInterface {
           generateUpdatedAtColumn(),
         ],
         foreignKeys: [
+          {
+            referencedTableName: 'login_type',
+            referencedColumnNames: ['id'],
+            columnNames: ['login_type_id'],
+            onDelete: 'CASCADE',
+            onUpdate: 'CASCADE',
+          },
           {
             referencedTableName: 'major',
             referencedColumnNames: ['id'],
@@ -780,6 +814,7 @@ export class Init1700205074777 implements MigrationInterface {
     await queryRunner.dropTable(new Table({ name: 'club_category' }));
 
     await queryRunner.dropTable(new Table({ name: 'user' }));
+    await queryRunner.dropTable(new Table({ name: 'login_type' }));
     await queryRunner.dropTable(new Table({ name: 'major' }));
   }
 }

migrations/1700481633507-init-seed.ts

@@ -1,13 +1,15 @@
 import { MigrationInterface, QueryRunner } from 'typeorm';
-import { ClubCategory } from '../src/entities/ClubCategory';
-import { Major } from '../src/entities/Major';
-import { ReactionType } from '../src/entities/ReactionType';
+import { ClubCategory } from '../output/entities/ClubCategory';
+import { LoginType } from '../output/entities/LoginType';
+import { Major } from '../output/entities/Major';
+import { ReactionType } from '../output/entities/ReactionType';
 
 export class InitSeed1700481633507 implements MigrationInterface {
   public async up(queryRunner: QueryRunner): Promise<void> {
     const entityManager = queryRunner.manager;
 
     const clubCategoryRepository = entityManager.getRepository(ClubCategory);
+    const loginTypeRepository = entityManager.getRepository(LoginType);
     const majorRepository = entityManager.getRepository(Major);
     const reactionTypeRepository = entityManager.getRepository(ReactionType);
 
@@ -44,6 +46,19 @@ export class InitSeed1700481633507 implements MigrationInterface {
       ['name'],
     );
 
+    /**
+     * @todo kakao naver 등 추가 예정
+     */
+    await loginTypeRepository.upsert(
+      [
+        {
+          name: 'email',
+          memo: 'email',
+        },
+      ],
+      ['name'],
+    );
+
     /**
      * @todo 정해지면 수정
      */
@@ -106,10 +121,12 @@ export class InitSeed1700481633507 implements MigrationInterface {
     const entityManager = queryRunner.manager;
 
     const clubCategoryRepository = entityManager.getRepository(ClubCategory);
+    const loginTypeRepository = entityManager.getRepository(LoginType);
     const majorRepository = entityManager.getRepository(Major);
     const reactionTypeRepository = entityManager.getRepository(ReactionType);
 
     await clubCategoryRepository.delete({});
+    await loginTypeRepository.delete({});
     await majorRepository.delete({});
     await reactionTypeRepository.delete({});
   }