From 7707f89682be5376f5e82d5e3a9fe75ff75fddf2 Mon Sep 17 00:00:00 2001
From: xhaktmchl <xhaktmchl@naver.com>
Date: Wed, 15 Mar 2023 18:21:33 +0900
Subject: [PATCH] =?UTF-8?q?#9=20feat:=20=EC=9C=A0=EC=A0=80=20=EC=B0=A8?=
 =?UTF-8?q?=EB=8B=A8=20=EC=83=9D=EC=84=B1api-=EC=9C=A0=EC=A0=80=EA=B0=80?=
 =?UTF-8?q?=201)=ED=98=B8=EC=8A=A4=ED=8A=B82)=EC=B0=B8=EC=97=AC=EC=9E=90?=
 =?UTF-8?q?=EC=9D=BC=EB=95=8C=20=EB=B3=B4=EB=93=9C=EC=9C=A0=EC=A0=80=20?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yogit/server/block/service/BlockServiceImpl.java | 4 ++--
 .../java/com/yogit/server/board/service/BoardServiceImpl.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/src/main/java/com/yogit/server/block/service/BlockServiceImpl.java b/server/src/main/java/com/yogit/server/block/service/BlockServiceImpl.java
index 5d25268..83d3412 100644
--- a/server/src/main/java/com/yogit/server/block/service/BlockServiceImpl.java
+++ b/server/src/main/java/com/yogit/server/block/service/BlockServiceImpl.java
@@ -66,7 +66,7 @@ public ApplicationResponse<BlockRes> createBlock(CreateBlockReq dto){
                 if(!boardUsers.isEmpty()){
                     for(BoardUser bu: boardUsers){
                         if(bu.getUser().getId().equals(blockingUser.getId()) && bu.getStatus().equals(BaseStatus.ACTIVE)){
-                            //bu.changeStatusToInactive();
+                            bu.changeStatusToInactive();
                         }
                     }
                 }
@@ -83,7 +83,7 @@ public ApplicationResponse<BlockRes> createBlock(CreateBlockReq dto){
                 if(!boardUsers.isEmpty()){
                     for(BoardUser bu: boardUsers){
                         if(bu.getUser().getId().equals(blockedUser.getId()) && bu.getStatus().equals(BaseStatus.ACTIVE)){
-                            //bu.changeStatusToInactive();
+                            bu.changeStatusToInactive();
                         }
                     }
                 }
diff --git a/server/src/main/java/com/yogit/server/board/service/BoardServiceImpl.java b/server/src/main/java/com/yogit/server/board/service/BoardServiceImpl.java
index 3435f41..9a95418 100644
--- a/server/src/main/java/com/yogit/server/board/service/BoardServiceImpl.java
+++ b/server/src/main/java/com/yogit/server/board/service/BoardServiceImpl.java
@@ -262,7 +262,7 @@ public ApplicationResponse<GetAllBoardsByCategoryRes> findMyClubBoards(GetMyClub
 
         Page<Board> boards = null;
         Page<BoardUser> boardUsers = null;
-        List<GetAllBoardRes> res = null;
+        List<GetAllBoardRes> res = new ArrayList<>();
         /*
         1.생성한 보드: Opened Club
         2.참여한 보드 : Applied Club