feat: 머지 및 수정 완료

Author: happbob

.github/workflows/dev.yml

@@ -31,7 +31,7 @@ jobs:
       - name: create env file
         working-directory: ./
         run: |
-          echo "DB_HOST=${{secrets.DEV_DB_HOST}}" >> .env
+          echo "DB_HOST=${{secrets.DB_HOST}}" >> .env
           echo "DB_USER=${{ secrets.DB_USER }}" >> .env
           echo "DB_PASSWORD=${{ secrets.DB_PASSWORD }}" >> .env
           echo "DB_DATABASE=${{ secrets.DEV_DB_DATABASE }}" >> .env

.github/workflows/prod.yml

@@ -0,0 +1,78 @@
+# This workflow will do a clean install of node dependencies, cache/restore them, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: prod-deploy
+
+on:
+  push:
+    branches: ['main']
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [20.16.0]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+    steps:
+      - name: Checkout source code.
+        uses: actions/checkout@v2
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Check Npm -v
+        run: npm -v
+
+      - name: create env file
+        working-directory: ./
+        run: |
+          echo "DB_HOST=${{secrets.DB_HOST}}" >> .env
+          echo "DB_USER=${{ secrets.DB_USER }}" >> .env
+          echo "DB_PASSWORD=${{ secrets.DB_PASSWORD }}" >> .env
+          echo "DB_DATABASE=${{ secrets.PROD_DB_DATABASE }}" >> .env
+          echo "JWT_SECRET=${{ secrets.JWT_SECRET }}" >> .env
+          echo "JWT_EXPIRATION=${{ secrets.JWT_EXPIRATION }}" >> .env
+          echo "KAKAO_ID=${{ secrets.KAKAO_ID }}" >> .env
+          echo "KAKAO_SECRET=${{ secrets.KAKAO_SECRET }}" >> .env
+          echo "KAKAO_REDIRECT=${{ secrets.PROD_KAKAO_REDIRECT }}" >> .env
+          echo "NAVER_ID=${{ secrets.NAVER_ID }}" >> .env
+          echo "NAVER_SECRET=${{ secrets.NAVER_SECRET }}" >> .env
+          echo "NAVER_REDIRECT=${{ secrets.PROD_NAVER_REDIRECT }}" >> .env
+          echo "PORT"=${{ secrets.PROD_PORT }} >> .env
+
+      - name: copy appspec.yml
+        run: cp appspec/appspec-prod.yml appspec.yml
+
+      - name: copy scripts
+        run: mkdir -p scripts && cp prod-scripts/after-deploy.sh scripts/after-deploy.sh
+
+      - name: build server files
+        working-directory: ./
+        run: |
+          yarn install
+          yarn run build
+
+      - name: zip file
+        run: zip -r build.zip ./dist ./scripts ./appspec.yml ./.env ./package.json ./node_modules ./yarn.lock
+
+      - name: AWS configure credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ap-northeast-2
+
+      - name: upload to S3
+        run: aws s3 cp --region ap-northeast-2 ./build.zip s3://oodd-prod-api-bucket/
+
+      - name: deploy with AWS codeDeploy
+        run: aws deploy create-deployment
+          --application-name nestjs-app-prod
+          --deployment-config-name CodeDeployDefault.OneAtATime
+          --deployment-group-name nestjs-app-prod-group
+          --s3-location bucket=oodd-prod-api-bucket,bundleType=zip,key=build.zip

appspec/appspec-dev.yml

@@ -0,0 +1,18 @@
+version: 0.0
+os: linux
+files:
+  - source: /
+    destination: /home/ubuntu/build-dev
+    overwrite: yes
+file_exists_behavior: OVERWRITE
+permissions:
+  - object: /home/ubuntu
+    pattern: '**'
+    owner: ubuntu
+    group: ubuntu
+
+hooks:
+  AfterInstall:
+    - location: scripts/after-deploy.sh
+      timeout: 60
+      runas: ubuntu

appspec/appspec-prod.yml

@@ -0,0 +1,18 @@
+version: 0.0
+os: linux
+files:
+  - source: /
+    destination: /home/ubuntu/build
+    overwrite: yes
+file_exists_behavior: OVERWRITE
+permissions:
+  - object: /home/ubuntu
+    pattern: '**'
+    owner: ubuntu
+    group: ubuntu
+
+hooks:
+  AfterInstall:
+    - location: scripts/after-deploy.sh
+      timeout: 60
+      runas: ubuntu

package.json

@@ -22,6 +22,8 @@
     "@nestjs/common": "^10.4.5",
     "@nestjs/config": "^3.2.3",
     "@nestjs/core": "^10.3.2",
+    "@nestjs/jwt": "^10.2.0",
+    "@nestjs/passport": "^10.0.3",
     "@nestjs/platform-express": "^10.3.2",
     "@nestjs/platform-socket.io": "^10.4.7",
     "@nestjs/swagger": "^7.4.2",
@@ -34,6 +36,10 @@
     "dayjs": "^1.11.13",
     "mysql2": "^3.11.0",
     "nestjs-swagger-decorator": "^1.2.0",
+    "passport": "^0.7.0",
+    "passport-jwt": "^4.0.1",
+    "passport-kakao": "^1.0.1",
+    "passport-naver": "^1.0.6",
     "reflect-metadata": "^0.2.1",
     "rxjs": "^7.8.1",
     "socket.io": "^4.8.1",

src/app.module.ts

@@ -19,7 +19,7 @@ import { StyletagModule } from './styletag/styletag.module';
 import { UserBlockModule } from './user-block/user-block.module';
 import { UserReportModule } from './user-report/user-report.module';
 import { AuthModule } from './auth/auth.module';
-import { DayjsModule } from './common/dayjs/dayjs.module';
+import { DayjsModule } from './common/dayjs/dayjs.module'; // DayjsModule 추가
 import { EventsGateway } from './eventGateway';
 
 @Module({
@@ -51,6 +51,7 @@ import { EventsGateway } from './eventGateway';
     ChatRoomModule,
     ClothingModule,
     MatchingModule,
+    DayjsModule, // DayjsModule 추가
     PostClothingModule,
     PostCommentModule,
     PostImageModule,
@@ -62,6 +63,9 @@ import { EventsGateway } from './eventGateway';
     UserBlockModule,
     UserReportModule,
     AuthModule,
+    ConfigModule.forRoot({
+      isGlobal: true,
+    }),
   ],
   controllers: [AppController],
   providers: [AppService, EventsGateway],

src/auth/auth.controller.ts

@@ -18,9 +18,12 @@ import dayjs from 'dayjs';
 @Controller('auth')
 @ApiTags('[서비스] Auth 관련')
 export class AuthController {
-  constructor(private readonly userService: UserService) {}
+  constructor(
+    private readonly userService: UserService,
+    private readonly authService: AuthService,
+  ) {}
 
-  @Post()
+  @Get('/login/kakao')
   @KakaoLoginSwagger('kakao 로그인 API')
   @UseGuards(KakaoAuthGuard)
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -39,7 +42,7 @@ export class AuthController {
     return res.redirect(url + '?token=' + jwtToken);
   }
 
-  @Post()
+  @Get('/login/naver')
   @NaverLoginSwagger('naver 로그인 API')
   @UseGuards(NaverAuthGuard)
   // eslint-disable-next-line @typescript-eslint/no-unused-vars

src/auth/auth.module.ts

@@ -1,7 +1,13 @@
-import { Module } from '@nestjs/common';
+import { forwardRef, Module } from '@nestjs/common';
 import { AuthController } from './auth.controller';
 import { AuthService } from './auth.service';
-import { UserService } from 'src/user/user.service';
+import { PassportModule } from '@nestjs/passport';
+import { JwtModule } from '@nestjs/jwt';
+import { UserModule } from 'src/user/user.module';
+import { JwtKakaoStrategy } from './strategies/kakao.strategy';
+import { ConfigModule, ConfigService } from '@nestjs/config';
+import { NaverStrategy } from './strategies/naver.strategy';
+import { JwtStrategy } from './strategies/jwt.strategy';
 
 @Module({
   controllers: [AuthController],

src/auth/auth.service.ts

@@ -1,4 +1,7 @@
-import { Injectable } from '@nestjs/common';
+import { forwardRef, Inject, Injectable } from '@nestjs/common';
+import { UserService } from 'src/user/user.service';
+import { JwtPayload, SocialUser } from './dto/auth.dto';
+import { JwtService } from '@nestjs/jwt';
 
 @Injectable()
 export class AuthService {

src/auth/guards/jwt.auth.guard.ts

@@ -0,0 +1,12 @@
+import { ExecutionContext, Injectable } from '@nestjs/common';
+import { AuthGuard as NestAuthGuard } from '@nestjs/passport';
+import { Observable } from 'rxjs';
+
+@Injectable()
+export class AuthGuard extends NestAuthGuard('jwt') {
+  canActivate(
+    context: ExecutionContext,
+  ): boolean | Promise<boolean> | Observable<boolean> {
+    return super.canActivate(context);
+  }
+}

src/auth/guards/kakao.auth.guard.ts

@@ -0,0 +1,14 @@
+import { ExecutionContext, Injectable } from '@nestjs/common';
+import { AuthGuard } from '@nestjs/passport';
+
+@Injectable()
+export class KakaoAuthGuard extends AuthGuard('kakao') {
+  handleRequest(err, user, info, context: ExecutionContext) {
+    const req = context.switchToHttp().getRequest();
+
+    // 인증된 사용자를 req.kakaoUser에 저장
+    req.socialUser = user;
+
+    return user; // req.user에는 여전히 사용자가 저장되긴 하지만, req.kakaoUser로도 접근 가능
+  }
+}

src/auth/guards/naver.auth.guard.ts

@@ -0,0 +1,14 @@
+import { ExecutionContext, Injectable } from '@nestjs/common';
+import { AuthGuard } from '@nestjs/passport';
+
+@Injectable()
+export class NaverAuthGuard extends AuthGuard('naver') {
+  handleRequest(err, user, info, context: ExecutionContext) {
+    const req = context.switchToHttp().getRequest();
+
+    // 인증된 사용자를 req.kakaoUser에 저장
+    req.socialUser = user;
+
+    return user; // req.user에는 여전히 사용자가 저장되긴 하지만, req.kakaoUser로도 접근 가능
+  }
+}

src/common/constant.response.ts

@@ -0,0 +1,14 @@
+import { Global, Module } from '@nestjs/common';
+import dayjs from 'dayjs';
+
+@Global() // 전역 모듈로 설정
+@Module({
+  providers: [
+    {
+      provide: 'DAYJS', // DI 토큰으로 'DAYJS' 사용
+      useValue: dayjs, // day.js 인스턴스를 제공
+    },
+  ],
+  exports: ['DAYJS'], // 다른 모듈에서 사용할 수 있도록 export
+})
+export class DayjsModule {}

src/common/dayjs/dayjs.module.ts

@@ -1,10 +1,11 @@
+import dayjs from 'dayjs';
 import {
   PrimaryGeneratedColumn,
   CreateDateColumn,
   UpdateDateColumn,
   Column,
-  BeforeUpdate,
   DeleteDateColumn,
+  BeforeUpdate,
 } from 'typeorm';
 
 export abstract class BaseEntity {
@@ -14,12 +15,25 @@ export abstract class BaseEntity {
   @Column({ default: 'activated' })
   status!: 'activated' | 'deactivated';
 
-  @CreateDateColumn({ type: 'datetime' })
+  @CreateDateColumn({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
   createdAt!: Date;
 
   @UpdateDateColumn({ type: 'datetime', nullable: true })
   updatedAt!: Date | null;
 
   @DeleteDateColumn({ type: 'datetime', nullable: true })
   deletedAt!: Date | null;
+
+  @BeforeUpdate()
+  setUpdatedAt() {
+    this.updatedAt = dayjs().toDate(); // 업데이트 시 현재 날짜로 설정
+  }
+
+  softDelete() {
+    this.deletedAt = dayjs().toDate(); // 삭제 시 현재 날짜로 설정
+  }
+
+  restore() {
+    this.deletedAt = null; // 복원 시 deletedAt을 null로 설정
+  }
 }

src/common/base.entity.ts src/common/entities/base.entity.ts

@@ -1,7 +1,7 @@
 import { Entity, Column, ManyToOne, JoinColumn } from 'typeorm';
 import { User } from './user.entity';
 import { ChatRoom } from './chat-room.entity';
-import { BaseEntity } from '../base.entity';
+import { BaseEntity } from './base.entity';
 
 @Entity('ChatMessage')
 export class ChatMessage extends BaseEntity {

src/common/entities/chat-message.entity.ts

@@ -1,5 +1,5 @@
 import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from 'typeorm';
-import { BaseEntity } from '../base.entity';
+import { BaseEntity } from './base.entity';
 import { User } from './user.entity';
 import { ChatMessage } from './chat-message.entity';
 import { Matching } from './matching.entity';

src/common/entities/chat-room.entity.ts

@@ -1,5 +1,5 @@
 import { Entity, Column, OneToMany } from 'typeorm';
-import { BaseEntity } from '../base.entity';
+import { BaseEntity } from './base.entity';
 import { PostClothing } from './post-clothing.entity';
 
 @Entity('Clothing')

src/common/entities/clothing.entity.ts

@@ -1,5 +1,5 @@
 import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from 'typeorm';
-import { BaseEntity } from '../base.entity';
+import { BaseEntity } from './base.entity';
 import { User } from './user.entity';
 import { ChatRoom } from './chat-room.entity';
 import { ApiProperty } from '@nestjs/swagger';

src/common/entities/matching.entity.ts

@@ -1,7 +1,7 @@
 import { Entity, JoinColumn, ManyToOne } from 'typeorm';
 import { Post } from './post.entity';
 import { Clothing } from './clothing.entity';
-import { BaseEntity } from '../base.entity';
+import { BaseEntity } from './base.entity';
 
 @Entity('PostClothing')
 export class PostClothing extends BaseEntity {

src/common/entities/post-clothing.entity.ts

@@ -1,7 +1,7 @@
 import { Entity, Column, ManyToOne, JoinColumn } from 'typeorm';
 import { User } from './user.entity';
 import { Post } from './post.entity';
-import { BaseEntity } from '../base.entity';
+import { BaseEntity } from './base.entity';
 
 @Entity('PostComment')
 export class PostComment extends BaseEntity {

src/common/entities/post-comment.entity.ts

@@ -1,5 +1,5 @@
 import { Entity, Column, ManyToOne, JoinColumn } from 'typeorm';
-import { BaseEntity } from '../base.entity';
+import { BaseEntity } from './base.entity';
 import { Post } from './post.entity';
 
 @Entity('PostImage')

src/common/entities/post-image.entity.ts

@@ -1,5 +1,5 @@
 import { Entity, JoinColumn, ManyToOne } from 'typeorm';
-import { BaseEntity } from '../base.entity';
+import { BaseEntity } from './base.entity';
 import { User } from './user.entity';
 import { Post } from './post.entity';
 

src/common/entities/post-like.entity.ts

@@ -1,6 +1,6 @@
 import { Entity, Column, ManyToOne, JoinColumn } from 'typeorm';
 import { User } from './user.entity';
-import { BaseEntity } from '../base.entity';
+import { BaseEntity } from './base.entity';
 import { Post } from './post.entity';
 
 @Entity('PostReport')