Merge pull request #51 from oodd-team/OD-38-new

khmandarrin · web-flow · commit c4cbd4272547 · 2024-11-29T00:03:00.000+09:00
likecount, 사용자 게시물 응답에 commentCount추가
diff --git a/src/matching/dto/matching.response.ts b/src/matching/dto/matching.response.ts
@@ -36,7 +36,7 @@ export class PatchMatchingResponse {
 class RequesterResponse {
   @ApiProperty({
     description: '매칭 요청자의 ID',
-    example: '19',
+    example: 19,
   })
   requesterId: number;
 
diff --git a/src/post-comment/dtos/get-comment.dto.ts b/src/post-comment/dtos/get-comment.dto.ts
@@ -2,7 +2,7 @@ import { ApiProperty } from '@nestjs/swagger';
 import { IsBoolean, IsNumber, IsString } from 'class-validator';
 
 class UserDto {
-  @ApiProperty({ example: '10' })
+  @ApiProperty({ example: 10 })
   id: number;
 
   @ApiProperty({ example: '닉네임' })
@@ -13,7 +13,7 @@ class UserDto {
 }
 
 class CommentDto {
-  @ApiProperty({ example: '10' })
+  @ApiProperty({ example: 10 })
   @IsNumber()
   id: number;
 
@@ -41,7 +41,7 @@ export class GetCommentsDto {
   @ApiProperty({ type: [CommentDto] })
   comments: CommentDto[];
 
-  @ApiProperty({ example: '10' })
+  @ApiProperty({ example: 10 })
   @IsBoolean()
   totalCount: number;
 }
diff --git a/src/post/dtos/all-posts.response.ts b/src/post/dtos/all-posts.response.ts
@@ -1,4 +1,7 @@
 import { ApiProperty } from '@nestjs/swagger';
+import dayjs from 'dayjs';
+import { Post } from 'src/common/entities/post.entity';
+import { PostImage } from 'src/common/entities/post-image.entity';
 
 class PostImageDto {
   @ApiProperty({
@@ -12,11 +15,16 @@ class PostImageDto {
     description: '이미지의 순서를 나타내는 번호입니다.',
   })
   orderNum: number;
+
+  constructor(postImage: PostImage) {
+    this.imageUrl = postImage.url;
+    this.orderNum = postImage.orderNum;
+  }
 }
 
 class UserDto {
   @ApiProperty({
-    example: '19',
+    example: 19,
     description: '작성자의 user ID 입니다.',
   })
   userId: number;
@@ -32,11 +40,17 @@ class UserDto {
     description: '작성자의 프로필 사진 URL입니다.',
   })
   profilePictureUrl: string;
+
+  constructor(user: any) {
+    this.userId = user.id;
+    this.nickname = user.nickname;
+    this.profilePictureUrl = user.profilePictureUrl;
+  }
 }
 
 export class PostDto {
   @ApiProperty({
-    example: '3',
+    example: 3,
     description: '게시글의 번호입니다.',
   })
   postId: number;
@@ -70,6 +84,17 @@ export class PostDto {
     description: '게시글 작성자의 정보입니다.',
   })
   user: UserDto;
+
+  constructor(post: Post, currentUserId: number) {
+    this.postId = post.id;
+    this.content = post.content;
+    this.createdAt = dayjs(post.createdAt).format('YYYY-MM-DDTHH:mm:ssZ');
+    this.postImages =
+      post.postImages?.map((image) => new PostImageDto(image)) || [];
+    this.isPostLike =
+      post.postLikes?.some((like) => like.user.id === currentUserId) || false;
+    this.user = new UserDto(post.user);
+  }
 }
 
 export class GetAllPostsResponse {
@@ -78,4 +103,8 @@ export class GetAllPostsResponse {
     description: '조회된 게시글 목록입니다.',
   })
   post: PostDto[];
+
+  constructor(posts: Post[], currentUserId: number) {
+    this.post = posts.map((post) => new PostDto(post, currentUserId));
+  }
 }
diff --git a/src/post/dtos/post.response.ts b/src/post/dtos/post.response.ts
@@ -17,7 +17,7 @@ class PostImageDto {
 
 class UserDto {
   @ApiProperty({
-    example: '작성자 번호',
+    example: 1,
     description: 'userId',
   })
   userId: number;
@@ -63,13 +63,13 @@ class PostClothingDto {
 
 export class PostResponse {
   @ApiProperty({
-    example: '게시물 번호',
+    example: 1,
     description: '게시물 번호입니다.',
   })
   postId: number;
 
   @ApiProperty({
-    example: '작성자 번호',
+    example: 1,
     description: 'userId',
   })
   userId: number;
diff --git a/src/post/dtos/user-posts.response.ts b/src/post/dtos/user-posts.response.ts
@@ -1,14 +1,16 @@
 import { ApiProperty, OmitType } from '@nestjs/swagger';
+import dayjs from 'dayjs';
+import { Post } from 'src/common/entities/post.entity';
 
-class PostDto {
+export class PostDto {
   @ApiProperty({
-    example: '19',
+    example: 19,
     description: '조회한 작성자의 user ID 입니다.',
   })
   userId: number;
 
   @ApiProperty({
-    example: '3',
+    example: 3,
     description: '게시글의 번호입니다.',
   })
   postId: number;
@@ -54,7 +56,23 @@ class PostDto {
     description: '현재 사용자가 게시글에 댓글을 작성했는지 여부입니다.',
   })
   isPostComment: boolean;
+
+  constructor(post: Post, currentUserId: number) {
+    this.userId = post.user.id;
+    this.postId = post.id;
+    this.isRepresentative = post.isRepresentative;
+    (this.createdAt = dayjs(post.createdAt).format('YYYY-MM-DDTHH:mm:ssZ')),
+      (this.imageUrl = post.postImages?.[0]?.url || '');
+    this.postCommentsCount = post.postComments?.length || 0;
+    this.postLikesCount = post.postLikes?.length || 0;
+    this.isPostLike =
+      post.postLikes?.some((like) => like.user.id === currentUserId) || false;
+    this.isPostComment =
+      post.postComments?.some((comment) => comment.user.id === currentUserId) ||
+      false;
+  }
 }
+
 export class GetMyPostsResponse {
   @ApiProperty({
     type: [PostDto],
@@ -80,28 +98,6 @@ export class GetMyPostsResponse {
   })
   totalPostLikesCount: number;
 }
-
-class OtherUserPostDto extends OmitType(PostDto, [
-  'postCommentsCount',
-  'isPostComment',
+export class GetOtherPostsResponse extends OmitType(GetMyPostsResponse, [
+  'totalPostCommentsCount',
 ]) {}
-
-export class GetOtherPostsResponse {
-  @ApiProperty({
-    type: [OtherUserPostDto],
-    description: '다른 사용자의 게시글 목록입니다.',
-  })
-  post: OtherUserPostDto[];
-
-  @ApiProperty({
-    example: 30,
-    description: '다른 사용자가 작성한 총 게시글 수입니다.',
-  })
-  totalPostsCount: number;
-
-  @ApiProperty({
-    example: 200,
-    description: '다른 사용자가 받은 총 좋아요 수입니다.',
-  })
-  totalPostLikesCount: number;
-}
diff --git a/src/post/post.service.ts b/src/post/post.service.ts
@@ -21,6 +21,7 @@ import { GetAllPostsResponse } from './dtos/all-posts.response';
 import {
   GetMyPostsResponse,
   GetOtherPostsResponse,
+  PostDto,
 } from './dtos/user-posts.response';
 import { PostDetailResponse } from './dtos/post.response';
 
@@ -98,7 +99,7 @@ export class PostService {
     posts: GetMyPostsResponse | GetOtherPostsResponse;
     total: number;
   }> {
-    const queryBuilder = this.dataSource
+    const [posts, total] = await this.dataSource
       .getRepository(Post)
       .createQueryBuilder('post')
       .leftJoinAndSelect('post.user', 'user')
@@ -109,25 +110,26 @@ export class PostService {
         { status: 'activated', orderNum: 1 },
       )
       .leftJoinAndSelect('post.postLikes', 'postLike')
+      .leftJoinAndSelect('postLike.user', 'postLikeUser')
       .leftJoinAndSelect('post.postComments', 'postComment')
+      .leftJoinAndSelect('postComment.user', 'postCommentUser')
       .where('post.status = :status', { status: 'activated' })
-      .andWhere('post.user.id = :userId', { userId });
-
-    const [posts, total] = await queryBuilder
+      .andWhere('post.user.id = :userId', { userId })
       .select([
         'post.id',
         'post.isRepresentative',
         'post.createdAt',
         'user.id',
         'postImage.url',
-        'postLike.user.id',
-        'postComment.user.id',
+        'postComment.id',
+        'postLike.id',
+        'postLikeUser.id',
+        'postCommentUser.id',
       ])
       .orderBy('post.createdAt', 'DESC')
       .take(pageOptionsDto.take)
       .skip((pageOptionsDto.page - 1) * pageOptionsDto.take)
       .getManyAndCount();
-
     return {
       posts:
         userId === currentUserId
@@ -137,45 +139,12 @@ export class PostService {
     };
   }
 
-  private formatAllPosts(
-    posts: Post[],
-    currentUserId: number,
-  ): GetAllPostsResponse {
-    return {
-      post: posts.map((post) => ({
-        postId: post.id,
-        content: post.content,
-        createdAt: dayjs(post.createdAt).format('YYYY-MM-DDTHH:mm:ssZ'),
-        postImages: post.postImages.map((image) => ({
-          imageUrl: image.url,
-          orderNum: image.orderNum,
-        })),
-        isPostLike: this.checkIsPostLiked(post, currentUserId),
-        user: {
-          userId: post.user.id,
-          nickname: post.user.nickname,
-          profilePictureUrl: post.user.profilePictureUrl,
-        },
-      })),
-    };
-  }
-
   private formatMyPosts(
     posts: Post[],
     currentUserId: number,
   ): GetMyPostsResponse {
     return {
-      post: posts.map((post) => ({
-        postId: post.id,
-        userId: post.user.id,
-        createdAt: dayjs(post.createdAt).format('YYYY-MM-DDTHH:mm:ssZ'),
-        imageUrl: post.postImages[0]?.url,
-        isRepresentative: post.isRepresentative,
-        isPostLike: this.checkIsPostLiked(post, currentUserId),
-        isPostComment: this.checkIsPostCommented(post, currentUserId),
-        postLikesCount: post.postLikes.length,
-        postCommentsCount: post.postComments.length,
-      })),
+      post: posts.map((post) => new PostDto(post, currentUserId)),
       totalPostCommentsCount: this.calculateTotalComments(posts),
       totalPostsCount: posts.length,
       totalPostLikesCount: this.calculateTotalLikes(posts),
@@ -187,20 +156,19 @@ export class PostService {
     currentUserId: number,
   ): GetOtherPostsResponse {
     return {
-      post: posts.map((post) => ({
-        postId: post.id,
-        userId: post.user.id,
-        createdAt: dayjs(post.createdAt).format('YYYY-MM-DDTHH:mm:ssZ'),
-        imageUrl: post.postImages[0]?.url,
-        isRepresentative: post.isRepresentative,
-        isPostLike: this.checkIsPostLiked(post, currentUserId),
-        postLikesCount: post.postLikes.length,
-      })),
+      post: posts.map((post) => new PostDto(post, currentUserId)),
       totalPostsCount: posts.length,
       totalPostLikesCount: this.calculateTotalLikes(posts),
     };
   }
 
+  private formatAllPosts(
+    posts: Post[],
+    currentUserId: number,
+  ): GetAllPostsResponse {
+    return new GetAllPostsResponse(posts, currentUserId);
+  }
+
   async createPost(uploadPostDto: CreatePostRequest, currentUserId: number) {
     const {
       content,
diff --git a/src/user/dto/response/get-user.response.ts b/src/user/dto/response/get-user.response.ts
@@ -3,7 +3,7 @@ import { ApiProperty } from '@nestjs/swagger';
 export class GetUserInfo {
   @ApiProperty({
     description: 'user ID',
-    example: '19',
+    example: 19,
   })
   userId: number;
 
diff --git a/src/user/dto/response/patch-user.response.ts b/src/user/dto/response/patch-user.response.ts
@@ -3,7 +3,7 @@ import { ApiProperty } from '@nestjs/swagger';
 export class PatchUserResponse {
   @ApiProperty({
     description: 'user ID',
-    example: '19',
+    example: 19,
   })
   userId: number;
 
