feat: 게시글 댓글 리스트 조회

Author: happbob

src/auth/auth.service.ts

@@ -15,7 +15,6 @@ export class AuthService {
     user: SocialUser,
     provider: 'kakao' | 'naver',
   ): Promise<string> {
-    console.log(user);
     let userBySocial;
     if (provider === 'kakao')
       userBySocial = await this.userSerivce.getUserByKaKaoId(user.kakaoId);

src/auth/strategies/kakao.strategy.ts

@@ -35,7 +35,6 @@ export class JwtKakaoStrategy extends PassportStrategy(Strategy, 'kakao') {
     done: (error: any, user?: SocialUser, info?: any) => void,
   ) {
     try {
-      console.log('profile', profile);
       const { _json } = profile;
       const kakaoUser: SocialUser = {
         kakaoId: _json.id,

src/auth/strategies/naver.strategy.ts

@@ -36,7 +36,6 @@ export class NaverStrategy extends PassportStrategy(Strategy, 'naver') {
   ): Promise<any> {
     try {
       const { _json } = profile;
-      console.log('profile', profile);
       const naverUser: SocialUser = {
         naverId: _json.id,
         email: _json.email,

src/post-comment/post-comment.controller.ts

@@ -18,12 +18,12 @@ import {
 import { CreateCommentDto } from './dtos/create-comment.dto';
 import { Request } from 'express';
 import { BaseResponse } from 'src/common/response/dto';
-import { PostService } from 'src/post/post.service';
 import { AuthGuard } from 'src/auth/guards/jwt.auth.guard';
 import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
 import { PostComment } from 'src/common/entities/post-comment.entity';
 import { GetCommentsDto } from './dtos/get-comment.dto';
 import dayjs from 'dayjs';
+import { UserBlockService } from 'src/user-block/user-block.service';
 
 @ApiBearerAuth('Authorization')
 @Controller('post-comment')
@@ -32,7 +32,7 @@ import dayjs from 'dayjs';
 export class PostCommentController {
   constructor(
     private readonly postCommentService: PostCommentService,
-    private readonly postService: PostService,
+    private readonly userBlockService: UserBlockService,
   ) {}
 
   @Post()
@@ -61,9 +61,12 @@ export class PostCommentController {
   ): Promise<BaseResponse<GetCommentsDto>> {
     const currentUserId = req.user.id;
 
+    const blockedUserIds: number[] =
+      await this.userBlockService.getBlockedUserIds(currentUserId);
+
     const comments = await this.postCommentService.getPostComments(
       postId,
-      currentUserId,
+      blockedUserIds,
     );
 
     const commenteResponse: GetCommentsDto = {

src/post-comment/post-comment.module.ts

@@ -5,12 +5,14 @@ import { TypeOrmModule } from '@nestjs/typeorm';
 import { PostComment } from 'src/common/entities/post-comment.entity';
 import { PostModule } from 'src/post/post.module';
 import { UserModule } from 'src/user/user.module';
+import { UserBlockModule } from 'src/user-block/user-block.module';
 
 @Module({
   imports: [
     TypeOrmModule.forFeature([PostComment]),
     forwardRef(() => UserModule),
     forwardRef(() => PostModule),
+    UserBlockModule,
   ],
   controllers: [PostCommentController],
   providers: [PostCommentService],

src/post-comment/post-comment.service.ts

@@ -1,6 +1,6 @@
 import { forwardRef, Inject, Injectable } from '@nestjs/common';
 import { PostComment } from 'src/common/entities/post-comment.entity';
-import { Not, QueryRunner } from 'typeorm';
+import { In, Not, QueryRunner } from 'typeorm';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 import { CreateCommentDto } from './dtos/create-comment.dto';
@@ -87,13 +87,13 @@ export class PostCommentService {
   // 댓글 리스트 조회
   async getPostComments(
     postId: number,
-    currentUserId: number,
+    blockedUserIds: number[],
   ): Promise<PostComment[]> {
     return await this.postCommentRepository.find({
       where: {
         post: { id: postId },
         status: 'activated',
-        user: { status: 'activated', id: Not(currentUserId) },
+        user: { status: 'activated', id: Not(In(blockedUserIds)) },
       },
       relations: ['user'],
     });

src/user-block/user-block.controller.ts

@@ -19,20 +19,19 @@ export class UserBlockController {
   @CreateBlockUserSwagger('유저 차단하기 API')
   async createUserBlock(
     @Body() createUserBlockDto: CreateUserBlockDto,
-    @Req() req: Request, 
+    @Req() req: Request,
   ): Promise<BaseResponse<null>> {
-    const fromUserId = req.user['id']; 
-    //console.log('fromUserId is ', fromUserId);
+    const fromUserId = req.user['id'];
 
     createUserBlockDto.fromUserId = fromUserId;
 
-  const resultCode = await this.userBlockService.createBlock(createUserBlockDto);
+    const resultCode =
+      await this.userBlockService.createBlock(createUserBlockDto);
 
-  if (resultCode === 'BLOCKED_SUCCESS') {
-    return new BaseResponse<null>(true, 'BLOCKED_SUCCESS', null);
-  } else if (resultCode === 'UNBLOCKED_SUCCESS') {
-    return new BaseResponse<null>(true, 'UNBLOCKED_SUCCESS', null);
+    if (resultCode === 'BLOCKED_SUCCESS') {
+      return new BaseResponse<null>(true, 'BLOCKED_SUCCESS', null);
+    } else if (resultCode === 'UNBLOCKED_SUCCESS') {
+      return new BaseResponse<null>(true, 'UNBLOCKED_SUCCESS', null);
+    }
   }
-  
 }
-}

src/user/user.controller.ts

@@ -47,7 +47,6 @@ export class UserController {
   ): Promise<BaseResponse<GetOtherUserInfo>> {
     const user = await this.userService.getUserById(userId);
 
-    console.log(req.user);
     // 현재 사용자의 ID를 가져옵니다. req.user에서 추출할 수 있습니다.
     const currentUserId = req.user.id; // 또는 다른 방법으로 현재 사용자 ID를 가져옴
 
@@ -75,8 +74,6 @@ export class UserController {
     @Param('userId') userId: number,
     @Req() req: Request,
   ): Promise<BaseResponse<null>> {
-    //console.log("req.user['id'] is ~~~~~~~~~~~~~~~~~",typeof(req.user['id']) );
-    //console.log("Number(userId) is ~~~~~~~~~~~~~~~~~", typeof(Number(userId)));
     if (req.user['id'] != Number(userId)) {
       throw UnauthorizedException('권한이 없습니다.');
     }