#9 fix: 유저 차단API-관련 보드의 멤버 삭제메소드 추가

YogitTeam · Mar 9, 2023 · e72d446 · e72d446
1 parent cfa972c
commit e72d446
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 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
@@ -65,8 +65,8 @@ public ApplicationResponse<BlockRes> createBlock(CreateBlockReq dto){
                 List<BoardUser> boardUsers = b.getBoardUsers();
                 if(!boardUsers.isEmpty()){
                     for(BoardUser bu: boardUsers){
-                        if(bu.getUser().getId() == blockingUser.getId() && bu.getStatus().equals(BaseStatus.ACTIVE)){
-                            boardUserRepository.deleteById(bu.getId());
+                        if(bu.getUser().getId().equals(blockingUser.getId()) && bu.getStatus().equals(BaseStatus.ACTIVE)){
+                            bu.changeStatusToInactive();
                         }
                     }
                 }
@@ -82,8 +82,8 @@ public ApplicationResponse<BlockRes> createBlock(CreateBlockReq dto){
                 List<BoardUser> boardUsers = b.getBoardUsers();
                 if(!boardUsers.isEmpty()){
                     for(BoardUser bu: boardUsers){
-                        if(bu.getUser().getId() == blockedUser.getId() && bu.getStatus().equals(BaseStatus.ACTIVE)){
-                            boardUserRepository.deleteById(bu.getId());
+                        if(bu.getUser().getId().equals(blockedUser.getId()) && bu.getStatus().equals(BaseStatus.ACTIVE)){
+                            bu.changeStatusToInactive();
                         }
                     }
                 }

diff --git a/server/src/main/java/com/yogit/server/board/entity/BoardUser.java b/server/src/main/java/com/yogit/server/board/entity/BoardUser.java
@@ -1,6 +1,7 @@
 package com.yogit.server.board.entity;
 
 import com.yogit.server.config.domain.BaseEntity;
+import com.yogit.server.config.domain.BaseStatus;
 import com.yogit.server.user.entity.User;
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -41,4 +42,8 @@ public BoardUser(User user, Board board) {
     public void changeApplyStatus(){
         this.applyStatus = 1;
     }
+
+    public void changeStatusToInactive(){
+        this.setStatus(BaseStatus.INACTIVE);
+    }
 }