Merge pull request #17 from oodd-team/OD-55

유저 차단 기능 수정

Author: ji-somnie

package-lock.json

@@ -19,16 +19,16 @@
     "test:e2e": "jest --config ./test/jest-e2e.json"
   },
   "dependencies": {
-    "@nestjs/common": "^10.3.2",
+    "@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.6",
+    "@nestjs/platform-socket.io": "^10.4.7",
     "@nestjs/swagger": "^7.4.2",
     "@nestjs/typeorm": "^10.0.2",
-    "@nestjs/websockets": "^10.4.6",
+    "@nestjs/websockets": "^10.4.7",
     "@types/passport-kakao": "^1.0.3",
     "@types/socket.io": "^3.0.2",
     "class-transformer": "^0.5.1",
@@ -42,6 +42,7 @@
     "passport-naver": "^1.0.6",
     "reflect-metadata": "^0.2.1",
     "rxjs": "^7.8.1",
+    "socket.io": "^4.8.1",
     "typeorm": "^0.3.20"
   },
   "devDependencies": {
@@ -53,6 +54,7 @@
     "@types/express": "^4.17.21",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.11.16",
+    "@types/passport-jwt": "^4.0.1",
     "@types/supertest": "^6.0.2",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",

package.json

@@ -6,7 +6,7 @@ import { Post } from './post.entity';
 @Entity('PostReport')
 export class PostReport extends BaseEntity {
   @ManyToOne(() => User, (user) => user.postReports)
-  @JoinColumn({ name: 'reporterId' })
+  @JoinColumn({ name: 'requesterId' })
   reporter!: User;
 
   @ManyToOne(() => Post, (post) => post.postReports)

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

@@ -5,11 +5,11 @@ import { User } from './user.entity';
 @Entity('UserReport')
 export class UserReport extends BaseEntity {
   @ManyToOne(() => User)
-  @JoinColumn({ name: 'fromUserId' })
+  @JoinColumn({ name: 'requesterId' })
   fromUser!: User;
 
   @ManyToOne(() => User)
-  @JoinColumn({ name: 'toUserId' })
+  @JoinColumn({ name: 'targetId' })
   toUser!: User;
 
   @Column({ type: 'varchar', length: 500 })

src/common/entities/user-report.entity.ts

@@ -35,10 +35,14 @@ export const UNAUTHORIZED = new ErrorCodeVo(
   'UNAUTHORIZED',
 );
 
-export const FORBIDDEN = new ErrorCodeVo(403, 'Forbidden', 'FORBIDDEN');
+export const FORBIDDEN = new ErrorCodeVo(
+  403, 'Forbidden', 
+  'FORBIDDEN'
+);
 
 export const INTERNAL_SERVER_ERROR = new ErrorCodeVo(
   500,
   'Internal Server Error',
   'INTERNAL_SERVER_ERROR',
 );
+

src/common/exception/error/error.code.ts

@@ -29,6 +29,7 @@ export const InternalServerException = (message?: string): ServiceException => {
   return new ServiceException(INTERNAL_SERVER_ERROR, message);
 };
 
+
 export class ServiceException extends Error {
   readonly errorCode: ErrorCode;
 

src/common/exception/service.exception.ts

@@ -0,0 +1,10 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { PostLikeResponseDto } from './post-like.response';
+
+export class GetPostLikesResponseDto {
+  @ApiProperty({ example: 3 })
+  totalLikes!: number;
+
+  @ApiProperty({ type: [PostLikeResponseDto] })
+  likes!: PostLikeResponseDto[];
+}

src/post-like/dtos/get-post-like.response.dto.ts

@@ -0,0 +1,21 @@
+import { ApiProperty } from '@nestjs/swagger';
+
+export class PostLikeResponseDto {
+  @ApiProperty({ example: 28 })
+  id!: number;
+
+  @ApiProperty({ example: 8, description: '좋아요를 누른 유저ID'})
+  userId!: number;
+
+  @ApiProperty({ example: 78 })
+  postId!: number;
+
+  @ApiProperty({ example: '2024-08-13T06:59:09.000Z' })
+  createdAt!: Date;
+
+  @ApiProperty({ example: 'activated', description: '좋아요 누르기/취소 여부' })
+  status!: 'activated' | 'deactivated';
+
+  @ApiProperty({ example: '2024-08-13T08:16:28.000Z' })
+  updatedAt!: Date;
+}

src/post-like/dtos/post-like.response.ts

@@ -1,26 +1,41 @@
-import { Controller, Get, Post } from '@nestjs/common';
+import { Controller, Get, Param, Post, Req, UseGuards } from '@nestjs/common';
 import { PostLikeService } from './post-like.service';
 import {
   CreatePostLikeSwagger,
   GetPostLikesSwagger,
 } from './post-like.swagger';
 import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
+import { PostLikeResponseDto } from './dtos/post-like.response';
+import { BaseResponse } from 'src/common/response/dto';
+import { GetPostLikesResponseDto } from './dtos/get-post-like.response.dto';
+import { AuthGuard } from 'src/auth/guards/jwt.auth.guard';
+import { Request } from 'express';
 
 @ApiBearerAuth('Authorization')
 @Controller('post-like')
+@UseGuards(AuthGuard)
 @ApiTags('[서비스] 게시글 좋아요')
 export class PostLikeController {
   constructor(private readonly postLikeService: PostLikeService) {}
 
   @Get()
   @GetPostLikesSwagger('게시글 좋아요 리스트 조회 API')
-  getPostLikes() {
-    // return this.userService.getHello();
+  async getPostLikes(@Req() req: Request): Promise<BaseResponse<GetPostLikesResponseDto>> {
+    const userId = req.user.id;
+    const likesData = await this.postLikeService.getUserLikes(userId);
+
+    return new BaseResponse<GetPostLikesResponseDto>(true, 'SUCCESS', likesData);
   }
 
-  @Post()
-  @CreatePostLikeSwagger('게시글 좋아요 생성 및 삭제 API')
-  createPostLike() {
-    // return this.userService.getHello();
+  @Post(":postId")
+  @CreatePostLikeSwagger('게시글 좋아요 생성 및 삭제 API') 
+  async togglePostLike(
+    @Param('postId') postId: number,
+    @Req() req: Request
+  ): Promise<BaseResponse<PostLikeResponseDto>> {
+    const userId = req.user.id;
+    const postLikeResponse = await this.postLikeService.toggleLike(postId, userId);
+
+    return new BaseResponse<PostLikeResponseDto>(true, 'SUCCESS', postLikeResponse);
   }
-}
+}

src/post-like/post-like.controller.ts

@@ -1,11 +1,15 @@
-import { Module } from '@nestjs/common';
+import { forwardRef, Module } from '@nestjs/common';
 import { PostLikeController } from './post-like.controller';
 import { PostLikeService } from './post-like.service';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { PostLike } from 'src/common/entities/post-like.entity';
+import { PostModule } from 'src/post/post.module';
 
 @Module({
-  imports: [TypeOrmModule.forFeature([PostLike])],
+  imports: [
+    TypeOrmModule.forFeature([PostLike]),
+    forwardRef(() => PostModule), 
+  ],
   controllers: [PostLikeController],
   providers: [PostLikeService],
   exports: [PostLikeService],

src/post-like/post-like.module.ts

@@ -1,9 +1,22 @@
-import { Injectable } from '@nestjs/common';
+import { forwardRef, Inject, Injectable } from '@nestjs/common';
 import { PostLike } from 'src/common/entities/post-like.entity';
 import { QueryRunner } from 'typeorm';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Repository } from 'typeorm';
+import { PostService } from '../post/post.service';
+import { PostLikeResponseDto } from './dtos/post-like.response';
+import { DataNotFoundException } from 'src/common/exception/service.exception';
+import { GetPostLikesResponseDto } from './dtos/get-post-like.response.dto';
 
 @Injectable()
 export class PostLikeService {
+  constructor(
+    @InjectRepository(PostLike)
+    private readonly postLikeRepository: Repository<PostLike>,
+    @Inject(forwardRef(() => PostService)) 
+    private readonly postService: PostService, 
+  ) {}
+
   async deletePostLikeByPostId(
     postId: number,
     queryRunner: QueryRunner,
@@ -20,4 +33,73 @@ export class PostLikeService {
       }),
     );
   }
-}
+
+  // 유저가 좋아요 누른 게시물들 조회
+  async getUserLikes(userId: number): Promise<GetPostLikesResponseDto> {
+    const userLikes = await this.postLikeRepository.find({
+      where: { user: { id: userId }, status: 'activated' },
+      relations: ['post', 'user'],
+    });
+
+    const likes = userLikes.map((like) => ({
+      id: like.id,
+      userId: like.user.id,
+      postId: like.post.id,
+      status: like.status,
+      createdAt: like.createdAt,
+      updatedAt: like.updatedAt,
+    }));
+
+    return {
+      totalLikes: likes.length,
+      likes: likes,
+    };
+  }
+
+  // 좋아요 상태값 
+  async toggleLike(postId: number, userId: number): Promise<PostLikeResponseDto> {
+    const post = await this.postService.findByFields({ where: { id: postId } });
+    if (!post) {
+        throw DataNotFoundException('게시글을 찾을 수 없습니다.');
+    }
+
+    const existingLike = await this.postLikeRepository.findOne({
+      where: { post: { id: postId }, user: { id: userId } },
+      relations: ['user', 'post'], 
+    });
+
+    if (existingLike) {
+        // 좋아요 actiavated인 경우 -> 좋아요 취소
+        // 좋아요 deactivated인 경우 -> 다시 좋아요 누름
+        existingLike.status = existingLike.status === 'deactivated' ? 'activated' : 'deactivated';
+        existingLike.updatedAt = new Date();
+        await this.postLikeRepository.save(existingLike);
+        return {
+          id: existingLike.id,
+          userId: existingLike.user.id,
+          postId: existingLike.post.id,
+          createdAt: existingLike.createdAt,
+          status: existingLike.status,
+          updatedAt: existingLike.updatedAt,
+        };
+      } else {
+        // 좋아요 생성 (처음 좋아요 눌림)
+        const newLike = this.postLikeRepository.create({
+          user: { id: userId },
+          post: post,
+          status: 'activated',
+          createdAt: new Date(),
+          updatedAt: new Date(),
+        });
+        await this.postLikeRepository.save(newLike);
+        return {
+          id: newLike.id,
+          userId: newLike.user.id,
+          postId: newLike.post.id,
+          createdAt: newLike.createdAt,
+          status: newLike.status,
+          updatedAt: newLike.updatedAt,
+        };
+      }
+    }
+  }

src/post-like/post-like.service.ts

@@ -1,11 +1,70 @@
-import { ApiOperation } from '@nestjs/swagger';
+import { ApiOperation, ApiParam, ApiResponse } from '@nestjs/swagger';
+import { BaseResponse } from 'src/common/response/dto';
+import { PostLikeResponseDto } from './dtos/post-like.response';
 
 // 게시글 좋아요 리스트 조회 API Swagger
 export function GetPostLikesSwagger(apiSummary: string) {
   return ApiOperation({ summary: apiSummary });
 }
 
-// 게시글 좋아요 생성 API Swagger
+// 게시글 좋아요 생성 및 삭제 API Swagger
 export function CreatePostLikeSwagger(apiSummary: string) {
-  return ApiOperation({ summary: apiSummary });
-}
+  return (
+    ApiOperation({ summary: apiSummary }),
+    ApiParam({
+      name: 'postId',
+      required: true,
+      description: '좋아요를 추가하거나 삭제할 게시글 ID',
+      example: 78,
+    }),
+    ApiResponse({
+      status: 201,
+      description: '좋아요가 성공적으로 생성된 경우',
+      type: BaseResponse<PostLikeResponseDto>,
+      schema: {
+        example: {
+          isSuccess: true,
+          code: 'SUCCESS',
+          data: {
+            id: 28,
+            userId: 1,
+            postId: 78,
+            createdAt: '2024-08-13T06:59:09.000Z',
+            status: 'activated',
+            updatedAt: '2024-08-13T08:16:28.000Z',
+          },
+        },
+      },
+    }),
+    ApiResponse({
+      status: 200,
+      description: '좋아요가 성공적으로 취소된 경우',
+      type: BaseResponse<PostLikeResponseDto>,
+      schema: {
+        example: {
+          isSuccess: true,
+          code: 'SUCCESS',
+          data: {
+            id: 28,
+            userId: 1,
+            postId: 78,
+            createdAt: '2024-08-13T06:59:09.000Z',
+            status: 'deactivated',
+            updatedAt: '2024-08-13T08:16:28.000Z',
+          },
+        },
+      },
+    }),
+    ApiResponse({
+      status: 404,
+      description: '게시글을 찾을 수 없는 경우',
+      schema: {
+        example: {
+          statusCode: 404,
+          message: '게시글을 찾을 수 없습니다.',
+          error: 'Not Found',
+        },
+      },
+    })
+  );
+}

src/post-like/post-like.swagger.ts

@@ -0,0 +1,17 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsNumber, IsString, MinLength } from 'class-validator';
+
+export class PostReportDto {
+  @ApiProperty({ example: 1, description: '신고하는 사용자 ID' })
+  @IsNumber()
+  requesterId!: number;
+
+  @ApiProperty({ example: 3, description: '신고할 게시글 ID' })
+  @IsNumber()
+  postId!: number;
+
+  @ApiProperty({ example: '윽 이상한 글', description: '신고 사유' })
+  @IsString()
+  @MinLength(5)
+  reason!: string;
+}