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

khmandarrin · khmandarrin · commit 31f053a7efd3 · 2024-11-26T17:58:13.000+09:00
diff --git a/src/matching/dto/get-matching.response.ts b/src/matching/dto/get-matching.response.ts
@@ -70,7 +70,7 @@ export class GetMatchingsResponse {
     description: '받은 매칭 수',
     example: 10,
   })
-  matchingCount: number;
+  matchingsCount: number;
 
   @ApiProperty({
     description: '매칭 정보',
diff --git a/src/matching/matching.service.ts b/src/matching/matching.service.ts
@@ -106,7 +106,7 @@ export class MatchingService {
 
     const response: GetMatchingsResponse = {
       isMatching: matchings.length > 0,
-      matchingCount: matchings.length,
+      matchingsCount: matchings.length,
       matching: matchings.map((matching) => {
         const requesterPost = matching.requester.posts[0];
 
diff --git a/src/post-comment/dtos/get-comment.dto.ts b/src/post-comment/dtos/get-comment.dto.ts
@@ -43,5 +43,5 @@ export class GetCommentsDto {
 
   @ApiProperty({ example: '10' })
   @IsBoolean()
-  totalComments: number;
+  totalCount: number;
 }
diff --git a/src/post-comment/post-comment.controller.ts b/src/post-comment/post-comment.controller.ts
@@ -75,7 +75,7 @@ export class PostCommentController {
         },
         isCommentWriter: comment.user.id == currentUserId,
       })),
-      totalComments: comments.length,
+      totalCount: comments.length,
     };
 
     return new BaseResponse(true, '댓글 목록 조회 성공', commenteResponse);
diff --git a/src/post-like/dtos/post-like.response.ts b/src/post-like/dtos/post-like.response.ts
@@ -17,5 +17,5 @@ export class PostLikeResponseDto {
     example: 1,
     description: '좋아요 개수',
   })
-  likeCount: number;
+  postLikeCount: number;
 }
diff --git a/src/post-like/post-like.service.ts b/src/post-like/post-like.service.ts
@@ -102,7 +102,7 @@ export class PostLikeService {
       return {
         id: existingLike[0].post.id,
         isPostLike: existingLike[0].status === 'activated',
-        likeCount:
+        postLikeCount:
           existingLike[0].status === 'activated'
             ? likeData.length + 1
             : likeData.length - 1,
@@ -118,7 +118,7 @@ export class PostLikeService {
       return {
         id: newLike.post.id,
         isPostLike: newLike.status === 'activated',
-        likeCount: likeData.length + 1,
+        postLikeCount: likeData.length + 1,
       };
     }
   }
diff --git a/src/post/dtos/post.response.ts b/src/post/dtos/post.response.ts
@@ -134,13 +134,13 @@ export class PostDetailResponse extends PostDetailDto {
     example: 10,
     description: '게시글에 달린 댓글 수입니다.',
   })
-  commentCount: number;
+  postCommentsCount: number;
 
   @ApiProperty({
     example: 5,
     description: '게시글의 좋아요 수입니다.',
   })
-  likeCount: number;
+  postLikesCount: number;
 
   @ApiProperty({
     example: false,
diff --git a/src/post/dtos/user-posts.response.ts b/src/post/dtos/user-posts.response.ts
@@ -35,13 +35,13 @@ class PostDto {
     example: 10,
     description: '게시글에 달린 댓글 수입니다.',
   })
-  commentCount: number;
+  postCommentsCount: number;
 
   @ApiProperty({
     example: 5,
     description: '게시글의 좋아요 수입니다.',
   })
-  likeCount: number;
+  postLikesCount: number;
 
   @ApiProperty({
     example: true,
@@ -66,23 +66,23 @@ export class GetMyPostsResponse {
     example: 20,
     description: '사용자의 게시글에 달린 총 댓글 수입니다.',
   })
-  totalComments: number;
+  totalPostCommentsCount: number;
 
   @ApiProperty({
     example: 50,
     description: '사용자가 작성한 총 게시글 수입니다.',
   })
-  totalPosts: number;
+  totalPostsCount: number;
 
   @ApiProperty({
     example: 100,
     description: '사용자가 받은 총 좋아요 수입니다.',
   })
-  totalLikes: number;
+  totalPostLikesCount: number;
 }
 
 class OtherUserPostDto extends OmitType(PostDto, [
-  'commentCount',
+  'postCommentsCount',
   'isPostComment',
 ]) {}
 
@@ -97,11 +97,11 @@ export class GetOtherPostsResponse {
     example: 30,
     description: '다른 사용자가 작성한 총 게시글 수입니다.',
   })
-  totalPosts: number;
+  totalPostsCount: number;
 
   @ApiProperty({
     example: 200,
     description: '다른 사용자가 받은 총 좋아요 수입니다.',
   })
-  totalLikes: number;
+  totalPostLikesCount: number;
 }
diff --git a/src/post/post.controller.ts b/src/post/post.controller.ts
@@ -24,7 +24,7 @@ import {
   PatchIsRepresentativeSwagger,
   PatchPostSwagger,
 } from './post.swagger';
-import { ApiBearerAuth, ApiQuery, ApiTags } from '@nestjs/swagger';
+import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
 import { CreatePostRequest } from './dtos/post.request';
 import { BaseResponse } from 'src/common/response/dto';
 import { AuthGuard } from 'src/auth/guards/jwt.auth.guard';
@@ -48,24 +48,6 @@ export class PostController {
   constructor(private readonly postService: PostService) {}
   @Get()
   @GetPostsSwagger('게시글 리스트 조회 API')
-  @ApiQuery({
-    name: 'userId',
-    required: false,
-    description:
-      'User ID가 제공되면 사용자 게시글 조회, 제공되지 않으면 전체 게시글이 조회됩니다. User ID가 현재 사용자면 내 게시물 조회, 다른 사용자면 다른 사용자 게시물 조회입니다.',
-    type: Number,
-  })
-  @ApiQuery({
-    name: 'page',
-    required: false,
-    description: '페이지 번호',
-    type: Number,
-  })
-  @ApiQuery({
-    name: 'take',
-    required: false,
-    description: '한 페이지에 불러올 데이터 개수',
-  })
   async getPosts(
     @Req() req: Request,
     @Query() pageOptionsDto?: PageOptionsDto,
diff --git a/src/post/post.service.ts b/src/post/post.service.ts
@@ -60,6 +60,9 @@ export class PostService {
       )
       .leftJoinAndSelect('post.postLikes', 'postLike')
       .where('post.status = :status', { status: 'activated' })
+      .andWhere('post.user.id NOT IN (:currentUserId)', {
+        currentUserId: [currentUserId],
+      })
       .andWhere(
         blockedUserIds.length > 0
           ? 'post.user.id NOT IN (:...blockedUserIds)'
@@ -170,12 +173,12 @@ export class PostService {
         isRepresentative: post.isRepresentative,
         isPostLike: this.checkIsPostLiked(post, currentUserId),
         isPostComment: this.checkIsPostCommented(post, currentUserId),
-        likeCount: post.postLikes.length,
-        commentCount: post.postComments.length,
+        postLikesCount: post.postLikes.length,
+        postCommentsCount: post.postComments.length,
       })),
-      totalComments: this.calculateTotalComments(posts),
-      totalPosts: posts.length,
-      totalLikes: this.calculateTotalLikes(posts),
+      totalPostCommentsCount: this.calculateTotalComments(posts),
+      totalPostsCount: posts.length,
+      totalPostLikesCount: this.calculateTotalLikes(posts),
     };
   }
 
@@ -191,10 +194,10 @@ export class PostService {
         imageUrl: post.postImages[0]?.url,
         isRepresentative: post.isRepresentative,
         isPostLike: this.checkIsPostLiked(post, currentUserId),
-        likeCount: post.postLikes.length,
+        postLikesCount: post.postLikes.length,
       })),
-      totalPosts: posts.length,
-      totalLikes: this.calculateTotalLikes(posts),
+      totalPostsCount: posts.length,
+      totalPostLikesCount: this.calculateTotalLikes(posts),
     };
   }
 
@@ -460,8 +463,8 @@ export class PostService {
         modelNumber: postClothing.clothing.modelNumber,
         url: postClothing.clothing.url,
       })),
-      likeCount: post.postLikes.length,
-      commentCount: post.postComments.length,
+      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'),
diff --git a/src/post/post.swagger.ts b/src/post/post.swagger.ts
@@ -3,6 +3,7 @@ import {
   ApiInternalServerErrorResponse,
   ApiNotFoundResponse,
   ApiOkResponse,
+  ApiQuery,
 } from '@nestjs/swagger';
 import { BaseSwaggerDecorator } from 'nestjs-swagger-decorator';
 import { BaseResponse } from 'src/common/response/dto';
@@ -51,6 +52,24 @@ export function GetPostsSwagger(text: string) {
         ApiInternalServerErrorResponse({
           description: 'Internal Server Error',
         }),
+        ApiQuery({
+          name: 'userId',
+          required: false,
+          description:
+            'User ID가 제공되면 사용자 게시글 조회, 제공되지 않으면 전체 게시글이 조회됩니다. User ID가 현재 사용자면 내 게시물 조회, 다른 사용자면 다른 사용자 게시물 조회입니다.',
+          type: Number,
+        }),
+        ApiQuery({
+          name: 'page',
+          required: false,
+          description: '페이지 번호',
+          type: Number,
+        }),
+        ApiQuery({
+          name: 'take',
+          required: false,
+          description: '한 페이지에 불러올 데이터 개수',
+        }),
       ],
     ),
   );

Original file line number	Diff line number	Diff line change
`@@ -43,5 +43,5 @@ export class GetCommentsDto {`
`43`	`43`
`44`	`44`	`@ApiProperty({ example: '10' })`
`45`	`45`	`@IsBoolean()`
`46`		`- totalComments: number;`
	`46`	`+ totalCount: number;`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,5 @@ export class PostLikeResponseDto {`
`17`	`17`	`example: 1,`
`18`	`18`	`description: '좋아요 개수',`
`19`	`19`	`})`
`20`		`- likeCount: number;`
	`20`	`+ postLikeCount: number;`
`21`	`21`	`}`