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 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 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 findMyClubBoards(GetMyClub Page boards = null; Page boardUsers = null; - List res = null; + List res = new ArrayList<>(); /* 1.생성한 보드: Opened Club 2.참여한 보드 : Applied Club