Merge branch 'dev' of https://github.com/oodd-team/oodd-server-nestjs into dev

Author: happbob

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

@@ -1,4 +1,4 @@
-import { ApiProperty } from '@nestjs/swagger';
+import { ApiProperty, OmitType } from '@nestjs/swagger';
 import { Type } from 'class-transformer';
 
 class PostImageDto {
@@ -15,6 +15,26 @@ class PostImageDto {
   orderNum: number;
 }
 
+class UserDto {
+  @ApiProperty({
+    example: '작성자 번호',
+    description: 'userId',
+  })
+  userId: number;
+
+  @ApiProperty({
+    example: 'nickname',
+    description: '사용자의 닉네임',
+  })
+  nickname: string;
+
+  @ApiProperty({
+    example: 'http://example.com/image.jpg',
+    description: '사용자의 프로필 사진 URL',
+  })
+  profilePictureUrl: string;
+}
+
 class PostClothingDto {
   @ApiProperty({
     example: 'http://example.com/clothing.jpg',
@@ -88,7 +108,9 @@ export class PostResponse {
   isRepresentative: boolean;
 }
 
-export class PostDetailResponse extends PostResponse {
+class PostDetailDto extends OmitType(PostResponse, ['userId']) {}
+
+export class PostDetailResponse extends PostDetailDto {
   @ApiProperty({
     example: '2024-10-11T09:00:00.000Z',
     description: '생성 시각',
@@ -102,16 +124,11 @@ export class PostDetailResponse extends PostResponse {
   updatedAt: string;
 
   @ApiProperty({
-    example: 'nickname',
-    description: '사용자의 닉네임',
-  })
-  userNickname: string;
-
-  @ApiProperty({
-    example: 'http://example.com/image.jpg',
-    description: '사용자의 프로필 사진 URL',
+    type: UserDto,
+    description: '게시물 작성자 정보입니다.',
   })
-  userProfilePictureUrl: string;
+  @Type(() => UserDto)
+  user: UserDto;
 
   @ApiProperty({
     example: 10,

src/post/dtos/post.response.ts

@@ -410,7 +410,9 @@ export class PostService {
       )
       .leftJoinAndSelect('post.user', 'user')
       .leftJoinAndSelect('post.postLikes', 'postLike')
+      .leftJoinAndSelect('postLike.user', 'postLikeUser')
       .leftJoinAndSelect('post.postComments', 'postComment')
+      .leftJoinAndSelect('postComment.user', 'postCommentUser')
       .leftJoinAndSelect(
         'post.postClothings',
         'postClothing',
@@ -442,7 +444,11 @@ export class PostService {
   ): PostDetailResponse {
     return {
       postId: post.id,
-      userId: post.user.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),
@@ -460,8 +466,6 @@ export class PostService {
       postLikesCount: post.postLikes.length,
       postCommentsCount: post.postComments.length,
       isPostLike: this.checkIsPostLiked(post, currentUserId),
-      userNickname: post.user.nickname,
-      userProfilePictureUrl: post.user.profilePictureUrl,
       createdAt: dayjs(post.createdAt).format('YYYY-MM-DDTHH:mm:ssZ'),
       updatedAt: dayjs(post.updatedAt).format('YYYY-MM-DDTHH:mm:ssZ'),
     };