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

happbob · web-flow · commit ad46e0693c26 · 2024-12-01T21:14:17.000+09:00
게시물 상세조회 차단 유저 like, comment 제외
diff --git a/src/post/dto/post.response.ts b/src/post/dto/post.response.ts
@@ -1,5 +1,10 @@
 import { ApiProperty, OmitType } from '@nestjs/swagger';
 import { Type } from 'class-transformer';
+import dayjs from 'dayjs';
+import { PostClothing } from 'src/common/entities/post-clothing.entity';
+import { PostImage } from 'src/common/entities/post-image.entity';
+import { Post } from 'src/common/entities/post.entity';
+import { User } from 'src/common/entities/user.entity';
 
 class PostImageDto {
   @ApiProperty({
@@ -13,6 +18,11 @@ class PostImageDto {
     description: '이미지의 순서 번호',
   })
   orderNum: number;
+
+  constructor(postImage: PostImage) {
+    this.imageUrl = postImage.url;
+    this.orderNum = postImage.orderNum;
+  }
 }
 
 class UserDto {
@@ -33,6 +43,12 @@ class UserDto {
     description: '사용자의 프로필 사진 URL',
   })
   profilePictureUrl: string;
+
+  constructor(user: User) {
+    this.userId = user.id;
+    this.nickname = user.nickname;
+    this.profilePictureUrl = user.profilePictureUrl;
+  }
 }
 
 class PostClothingDto {
@@ -59,6 +75,14 @@ class PostClothingDto {
     description: '옷 상품 링크입니다.',
   })
   url: string;
+
+  constructor(postClothing: PostClothing) {
+    this.imageUrl = postClothing.clothing.imageUrl;
+    this.brandName = postClothing.clothing.brandName;
+    this.modelName = postClothing.clothing.modelName;
+    this.modelNumber = postClothing.clothing.modelNumber;
+    this.url = postClothing.clothing.url;
+  }
 }
 
 export class PostResponse {
@@ -106,11 +130,69 @@ export class PostResponse {
     description: '대표 게시물 여부입니다.',
   })
   isRepresentative: boolean;
+
+  constructor(post: Post) {
+    this.userId = post.user.id;
+    this.postId = post.id;
+    this.content = post.content;
+    this.isRepresentative = post.isRepresentative;
+    this.postImages =
+      post.postImages?.map((image) => new PostImageDto(image)) || [];
+    this.postStyletags =
+      post.postStyletags?.map((postStyleTag) => postStyleTag.styletag.tag) ||
+      [];
+    this.postClothings =
+      post.postClothings?.map((clothing) => new PostClothingDto(clothing)) ||
+      [];
+  }
 }
+export class PostDetailResponse {
+  @ApiProperty({
+    example: 1,
+    description: '게시물 번호입니다.',
+  })
+  postId: number;
+
+  @ApiProperty({
+    type: UserDto,
+    description: '게시물 작성자 정보입니다.',
+  })
+  @Type(() => UserDto)
+  user: UserDto;
+
+  @ApiProperty({
+    example: '게시물 내용',
+    description: '게시물 내용입니다. 최대 100자까지 입력할 수 있습니다.',
+  })
+  content: string;
 
-class PostDetailDto extends OmitType(PostResponse, ['userId']) {}
+  @ApiProperty({
+    type: [PostImageDto],
+    description: '게시물에 포함된 이미지 목록입니다.',
+  })
+  postImages?: PostImageDto[];
+
+  @ApiProperty({
+    type: [String],
+    example: ['classic', 'basic'],
+    description:
+      '게시글에 포함된 스타일 태그 목록입니다. 스타일 태그에 저장된 태그만 입력 가능합니다.',
+  })
+  postStyletags?: string[];
+
+  @ApiProperty({
+    type: [PostClothingDto],
+    description: '게시물에 포함된 옷 정보 리스트입니다.',
+  })
+  @Type(() => PostClothingDto)
+  postClothings?: PostClothingDto[];
+
+  @ApiProperty({
+    example: false,
+    description: '대표 게시물 여부입니다.',
+  })
+  isRepresentative: boolean;
 
-export class PostDetailResponse extends PostDetailDto {
   @ApiProperty({
     example: '2024-10-11T09:00:00.000Z',
     description: '생성 시각',
@@ -123,13 +205,6 @@ export class PostDetailResponse extends PostDetailDto {
   })
   updatedAt: string;
 
-  @ApiProperty({
-    type: UserDto,
-    description: '게시물 작성자 정보입니다.',
-  })
-  @Type(() => UserDto)
-  user: UserDto;
-
   @ApiProperty({
     example: 10,
     description: '게시글에 달린 댓글 수입니다.',
@@ -147,4 +222,24 @@ export class PostDetailResponse extends PostDetailDto {
     description: '현재 사용자가 게시물에 좋아요를 눌렀는지 여부',
   })
   isPostLike: boolean;
+  constructor(post: Post, currentUserId: number) {
+    this.postId = post.id;
+    this.content = post.content;
+    this.isRepresentative = post.isRepresentative;
+    this.postImages =
+      post.postImages?.map((image) => new PostImageDto(image)) || [];
+    this.postStyletags =
+      post.postStyletags?.map((postStyleTag) => postStyleTag.styletag.tag) ||
+      [];
+    this.postClothings =
+      post.postClothings?.map((clothing) => new PostClothingDto(clothing)) ||
+      [];
+    (this.createdAt = dayjs(post.createdAt).format('YYYY-MM-DDTHH:mm:ssZ')),
+      (this.updatedAt = dayjs(post.updatedAt).format('YYYY-MM-DDTHH:mm:ssZ')),
+      (this.user = new UserDto(post.user));
+    this.postCommentsCount = post.postComments?.length || 0;
+    this.postLikesCount = post.postLikes?.length || 0;
+    this.isPostLike =
+      post.postLikes?.some((like) => like.user.id === currentUserId) || false;
+  }
 }
diff --git a/src/post/post.controller.ts b/src/post/post.controller.ts
@@ -110,8 +110,12 @@ export class PostController {
     @Req() req: Request,
   ): Promise<BaseResponse<PostDetailResponse>> {
     const post = await this.postService.getPost(postId, req.user.id);
+    if (!post) {
+      throw DataNotFoundException('해당 게시글을 찾을 수 없습니다.');
+    }
 
-    return new BaseResponse(true, '게시글 조회 성공', post);
+    const postDetailResponse = new PostDetailResponse(post, req.user.id);
+    return new BaseResponse(true, '게시글 조회 성공', postDetailResponse);
   }
 
   @Post()
diff --git a/src/post/post.service.ts b/src/post/post.service.ts
@@ -390,11 +390,10 @@ export class PostService {
   }
 
   // 게시글 상세 조회
-  async getPost(
-    postId: number,
-    currentUserId: number,
-  ): Promise<PostDetailResponse> {
-    const post = await this.postRepository
+  async getPost(postId: number, currentUserId: number): Promise<Post | null> {
+    const blockedUserIds =
+      await this.userBlockService.getBlockedUserIdsByRequesterId(currentUserId);
+    return await this.postRepository
       .createQueryBuilder('post')
       .leftJoinAndSelect(
         'post.postImages',
@@ -406,18 +405,20 @@ export class PostService {
       .leftJoinAndSelect(
         'post.postLikes',
         'postLike',
-        'postLike.status = :likeStatus',
+        'postLike.status = :likeStatus AND postLike.user.id NOT IN (:...blockedUserIds)',
         {
           likeStatus: 'activated',
+          blockedUserIds: blockedUserIds.length > 0 ? blockedUserIds : [-1], // 차단된 사용자가 없으면 무효화된 조건 (-1)
         },
       )
       .leftJoinAndSelect('postLike.user', 'postLikeUser')
       .leftJoinAndSelect(
         'post.postComments',
         'postComment',
-        'postComment.status = :commentStatus',
+        'postComment.status = :commentStatus AND postComment.user.id NOT IN (:...blockedUserIds)',
         {
           commentStatus: 'activated',
+          blockedUserIds: blockedUserIds.length > 0 ? blockedUserIds : [-1],
         },
       )
       .leftJoinAndSelect('postComment.user', 'postCommentUser')
@@ -438,45 +439,6 @@ export class PostService {
       .where('post.id = :postId', { postId })
       .andWhere('post.status = :postStatus', { postStatus: 'activated' })
       .getOne();
-
-    if (!post) {
-      throw DataNotFoundException('해당 게시글을 찾을 수 없습니다.');
-    }
-
-    return this.returnPostDetail(post, currentUserId);
-  }
-
-  private returnPostDetail(
-    post: Post,
-    currentUserId: number,
-  ): PostDetailResponse {
-    return {
-      postId: post.id,
-      user: {
-        userId: post.user.id,
-        nickname: post.user.nickname,
-        profilePictureUrl: post.user.profilePictureUrl,
-      },
-      content: post.content,
-      isRepresentative: post.isRepresentative,
-      postStyletags: post.postStyletags?.map((tag) => tag.styletag.tag),
-      postImages: post.postImages.map((image) => ({
-        imageUrl: image.url,
-        orderNum: image.orderNum,
-      })),
-      postClothings: post.postClothings.map((postClothing) => ({
-        imageUrl: postClothing.clothing.imageUrl,
-        brandName: postClothing.clothing.brandName,
-        modelName: postClothing.clothing.modelName,
-        modelNumber: postClothing.clothing.modelNumber,
-        url: postClothing.clothing.url,
-      })),
-      postLikesCount: post.postLikes.length,
-      postCommentsCount: post.postComments.length,
-      isPostLike: this.checkIsPostLiked(post, currentUserId),
-      createdAt: dayjs(post.createdAt).format('YYYY-MM-DDTHH:mm:ssZ'),
-      updatedAt: dayjs(post.updatedAt).format('YYYY-MM-DDTHH:mm:ssZ'),
-    };
   }
 
   // 대표 게시글 설정
