Merge pull request #150 from YogitTeam/feat/report

#9 feat: 유저 차단 생성api-유저가 1)호스트2)참여자일때 보드유저 처리
YogitTeam · Mar 15, 2023 · 4b2bef8 · 4b2bef8
2 parents 06c331e + 7707f89
commit 4b2bef8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -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
@@ -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