[Feat] 방 나가기 api 개발

src/main/java/konkuk/thip/common/exception/code/ErrorCode.java

@@ -141,7 +141,7 @@ public enum ErrorCode implements ResponseCode {
     INVALID_MY_ROOM_TYPE(HttpStatus.BAD_REQUEST, 140009, "유저가 참가한 방 목록 검색 요청에 유효하지 않은 MY ROOM type 이 있습니다."),
     INVALID_MY_ROOM_CURSOR(HttpStatus.BAD_REQUEST, 140010, "유저가 참가한 방 목록 검색 요청에 유효하지 않은 cursor 가 있습니다"),
     ROOM_ACCESS_FORBIDDEN(HttpStatus.FORBIDDEN, 140011, "방 접근 권한이 없습니다."),
-
+    ROOM_HOST_CANNOT_LEAVE(HttpStatus.BAD_REQUEST, 140012, "방장은 방을 나갈 수 없습니다."),
     /**
      * 150000 : Category error
      */

src/main/java/konkuk/thip/common/swagger/SwaggerResponseDescription.java

@@ -117,6 +117,11 @@ public enum SwaggerResponseDescription {
             ROOM_ACCESS_FORBIDDEN,
             ROOM_POST_TYPE_NOT_MATCH
     ))),
+    ROOM_LEAVE(new LinkedHashSet<>(Set.of(
+            ROOM_NOT_FOUND,
+            ROOM_PARTICIPANT_NOT_FOUND,
+            ROOM_HOST_CANNOT_LEAVE
+    ))),
 
 
     // Record

src/main/java/konkuk/thip/room/adapter/in/web/RoomCommandController.java

@@ -17,12 +17,10 @@
 import konkuk.thip.room.adapter.in.web.response.RoomRecruitCloseResponse;
 import konkuk.thip.room.application.port.in.RoomCreateUseCase;
 import konkuk.thip.room.application.port.in.RoomJoinUseCase;
+import konkuk.thip.room.application.port.in.RoomParticipantDeleteUseCase;
 import konkuk.thip.room.application.port.in.RoomRecruitCloseUseCase;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import static konkuk.thip.common.swagger.SwaggerResponseDescription.*;
 
@@ -34,6 +32,7 @@ public class RoomCommandController {
     private final RoomCreateUseCase roomCreateUseCase;
     private final RoomJoinUseCase roomJoinUsecase;
     private final RoomRecruitCloseUseCase roomRecruitCloseUsecase;
+    private final RoomParticipantDeleteUseCase roomParticipantDeleteUseCase;
     private final PostLikeUseCase postLikeUseCase;
 
     /**
@@ -102,4 +101,16 @@ public BaseResponse<RoomPostIsLikeResponse> likeRoomPost(
             @Parameter(hidden = true) @UserId final Long userId) {
         return BaseResponse.ok(RoomPostIsLikeResponse.of(postLikeUseCase.changeLikeStatusPost(request.toCommand(userId, postId))));
     }
+
+    @Operation(
+            summary = "방 나가기",
+            description = "방장을 제외한 방의 멤버들이 방에서 나갑니다."
+    )
+    @ExceptionDescription(ROOM_LEAVE)
+    @DeleteMapping("/rooms/{roomId}/leave")
+    public BaseResponse<Void> deleteRoomParticipant(
+            @Parameter(hidden = true) @UserId final Long userId,
+            @Parameter(description = "나갈 방의 ID", example = "1") @PathVariable final Long roomId) {
+        return BaseResponse.ok(roomParticipantDeleteUseCase.leaveRoom(userId, roomId));
+    }
 }

src/main/java/konkuk/thip/room/adapter/out/jpa/RoomJpaEntity.java

@@ -84,4 +84,7 @@ public void updateStartDate(LocalDate localDate) {
     public void updateIsPublic(boolean isPublic) {
         this.isPublic = isPublic;
     }
+
+    @VisibleForTesting
+    public void updateRoomPercentage(double roomPercentage) {this.roomPercentage = roomPercentage;}
 }

src/main/java/konkuk/thip/room/application/port/in/RoomParticipantDeleteUseCase.java

@@ -0,0 +1,5 @@
+package konkuk.thip.room.application.port.in;
+
+public interface RoomParticipantDeleteUseCase {
+    Void leaveRoom(Long userId, Long roomId);
+}

src/main/java/konkuk/thip/room/application/port/out/RoomParticipantCommandPort.java

@@ -1,19 +1,20 @@
 package konkuk.thip.room.application.port.out;
 
 import konkuk.thip.common.exception.EntityNotFoundException;
-import konkuk.thip.common.exception.code.ErrorCode;
 import konkuk.thip.room.domain.RoomParticipant;
 
 import java.util.List;
 import java.util.Optional;
 
+import static konkuk.thip.common.exception.code.ErrorCode.ROOM_PARTICIPANT_NOT_FOUND;
+
 public interface RoomParticipantCommandPort {
 
     Optional<RoomParticipant> findByUserIdAndRoomIdOptional(Long userId, Long roomId);
 
     default RoomParticipant getByUserIdAndRoomIdOrThrow(Long userId, Long roomId) {
         return findByUserIdAndRoomIdOptional(userId, roomId)
-                .orElseThrow(() -> new EntityNotFoundException(ErrorCode.ROOM_PARTICIPANT_NOT_FOUND));
+                .orElseThrow(() -> new EntityNotFoundException(ROOM_PARTICIPANT_NOT_FOUND));
     }
 
     List<RoomParticipant> findAllByRoomId(Long roomId);

src/main/java/konkuk/thip/room/application/service/RoomParticipantDeleteService.java

@@ -0,0 +1,41 @@
+package konkuk.thip.room.application.service;
+
+import konkuk.thip.room.application.port.in.RoomParticipantDeleteUseCase;
+import konkuk.thip.room.application.port.out.RoomCommandPort;
+import konkuk.thip.room.application.port.out.RoomParticipantCommandPort;
+import konkuk.thip.room.domain.Room;
+import konkuk.thip.room.domain.RoomParticipant;
+import konkuk.thip.roompost.application.service.manager.RoomProgressManager;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+public class RoomParticipantDeleteService implements RoomParticipantDeleteUseCase {
+
+    private final RoomCommandPort roomCommandPort;
+    private final RoomParticipantCommandPort roomParticipantCommandPort;
+
+    private final RoomProgressManager roomProgressManager;
+
+    @Override
+    @Transactional
+    public Void leaveRoom(Long userId, Long roomId) {
+
+        // 1. 방 조회 및 검증
+        Room room = roomCommandPort.getByIdOrThrow(roomId);
+
+        // 2. 사용자가 방 참여자인지 확인
+        RoomParticipant roomParticipant = roomParticipantCommandPort.getByUserIdAndRoomIdOrThrow(userId, room.getId());
+        // 2-1. 방 나가기 권한 검증
+        roomParticipant.validateRoomLeavable();
+
+        // 3. 방 멤버수 감소 / 방 진행률 업데이트
+        roomProgressManager.removeUserProgressAndUpdateRoomProgress(roomParticipant.getId(), room);
+
+        // 4. 방나가기
+        roomParticipantCommandPort.deleteByUserIdAndRoomId(userId, room.getId());
+        return null;
+    }
+}

src/main/java/konkuk/thip/room/domain/RoomParticipant.java

@@ -1,10 +1,13 @@
 package konkuk.thip.room.domain;
 
 import konkuk.thip.common.entity.BaseDomainEntity;
+import konkuk.thip.common.exception.InvalidStateException;
 import konkuk.thip.room.adapter.out.jpa.RoomParticipantRole;
 import lombok.Getter;
 import lombok.experimental.SuperBuilder;
 
+import static konkuk.thip.common.exception.code.ErrorCode.ROOM_HOST_CANNOT_LEAVE;
+
 @Getter
 @SuperBuilder
 public class RoomParticipant extends BaseDomainEntity {
@@ -68,5 +71,10 @@ private boolean checkRole(RoomParticipantRole roomParticipantRole) {
         return this.roomParticipantRole.equals(roomParticipantRole.getType());
     }
 
+    public void validateRoomLeavable() {
+        if (isHost()) {
+            throw new InvalidStateException(ROOM_HOST_CANNOT_LEAVE);
+        }
+    }
 
 }

src/main/java/konkuk/thip/roompost/application/service/RecordCreateService.java

@@ -61,7 +61,7 @@ public RecordCreateResult createRecord(RecordCreateCommand command) {
         Long newRecordId = recordCommandPort.saveRecord(record);
 
         // 5. RoomParticipant, Room progress 정보 update
-        roomProgressManager.updateUserAndRoomProgress(record.getCreatorId(), record.getRoomId(), record.getPage());
+        roomProgressManager.updateUserAndRoomProgress(roomParticipant, room, book, record.getPage());
 
         return RecordCreateResult.of(newRecordId, command.roomId());
     }

src/main/java/konkuk/thip/roompost/application/service/RecordDeleteService.java

@@ -5,6 +5,7 @@
 import konkuk.thip.roompost.application.port.in.RecordDeleteUseCase;
 import konkuk.thip.roompost.application.port.in.dto.record.RecordDeleteCommand;
 import konkuk.thip.roompost.application.port.out.RecordCommandPort;
+import konkuk.thip.roompost.application.service.manager.RoomProgressManager;
 import konkuk.thip.roompost.domain.Record;
 import konkuk.thip.room.application.service.validator.RoomParticipantValidator;
 import lombok.RequiredArgsConstructor;
@@ -20,6 +21,7 @@ public class RecordDeleteService implements RecordDeleteUseCase {
     private final PostLikeCommandPort postLikeCommandPort;
 
     private final RoomParticipantValidator roomParticipantValidator;
+    private final RoomProgressManager roomProgressManager;
 
     @Override
     @Transactional
@@ -41,6 +43,7 @@ public Long deleteRecord(RecordDeleteCommand command) {
         // 3-3. 기록 삭제
         recordCommandPort.delete(record);
 
+        //TODO// 4. 유저 방 진행도 업데이트
         return command.roomId();
     }
 }

src/main/java/konkuk/thip/roompost/application/service/VoteCreateService.java

@@ -6,6 +6,7 @@
 import konkuk.thip.room.application.port.out.RoomParticipantCommandPort;
 import konkuk.thip.room.application.service.validator.RoomParticipantValidator;
 import konkuk.thip.room.domain.Room;
+import konkuk.thip.room.domain.RoomParticipant;
 import konkuk.thip.roompost.application.service.manager.RoomProgressManager;
 import konkuk.thip.roompost.application.port.in.VoteCreateUseCase;
 import konkuk.thip.roompost.application.port.in.dto.vote.VoteCreateCommand;
@@ -47,6 +48,7 @@ public VoteCreateResult createVote(VoteCreateCommand command) {
                 command.roomId()
         );
 
+        RoomParticipant roomParticipant = roomParticipantCommandPort.getByUserIdAndRoomIdOrThrow(command.userId(), command.roomId());
         Room room = roomCommandPort.getByIdOrThrow(vote.getRoomId());
         Book book = bookCommandPort.findById(room.getBookId());
         validateVote(vote, book);
@@ -64,7 +66,7 @@ public VoteCreateResult createVote(VoteCreateCommand command) {
         voteCommandPort.saveAllVoteItems(voteItems);
 
         // 4. RoomParticipant, Room progress 정보 update
-        roomProgressManager.updateUserAndRoomProgress(vote.getCreatorId(), vote.getRoomId(), vote.getPage());
+        roomProgressManager.updateUserAndRoomProgress(roomParticipant, room, book, vote.getPage());
 
         return VoteCreateResult.of(savedVoteId, command.roomId());
     }

src/main/java/konkuk/thip/roompost/application/service/VoteDeleteService.java

@@ -41,6 +41,7 @@ public Long deleteVote(VoteDeleteCommand command) {
         // 3-3. 투표 삭제
         voteCommandPort.delete(vote);
 
+        //TODO// 4. 유저 방 진행도 업데이트
         return command.roomId();
     }
 }

src/main/java/konkuk/thip/roompost/application/service/manager/RoomProgressManager.java

@@ -1,6 +1,5 @@
 package konkuk.thip.roompost.application.service.manager;
 
-import konkuk.thip.book.application.port.out.BookCommandPort;
 import konkuk.thip.book.domain.Book;
 import konkuk.thip.common.annotation.HelperService;
 import konkuk.thip.room.application.port.out.RoomCommandPort;
@@ -17,19 +16,14 @@ public class RoomProgressManager {
 
     private final RoomParticipantCommandPort roomParticipantCommandPort;
     private final RoomCommandPort roomCommandPort;
-    private final BookCommandPort bookCommandPort;
-
-    public void updateUserAndRoomProgress(Long userId, Long roomId, int currentPage) {
-        RoomParticipant roomParticipant = roomParticipantCommandPort.getByUserIdAndRoomIdOrThrow(userId, roomId);
-        Room room = roomCommandPort.getByIdOrThrow(roomId);
-        Book book = bookCommandPort.findById(room.getBookId());
 
+    public void updateUserAndRoomProgress(RoomParticipant roomParticipant, Room room, Book book, int currentPage) {
         // 1. 유저 진행률 update
         boolean updated = roomParticipant.updateUserProgress(currentPage, book.getPageCount());
         if (!updated) return;     // update 되지 않았으면 종료
 
         // 2. 방 평균 진행률 update
-        List<RoomParticipant> all = roomParticipantCommandPort.findAllByRoomId(roomId);
+        List<RoomParticipant> all = roomParticipantCommandPort.findAllByRoomId(room.getId());
         double total = all.stream()
                 .filter(p -> !roomParticipant.getId().equals(p.getId()))    // 현재 유저 제외
                 .mapToDouble(RoomParticipant::getUserPercentage)
@@ -41,4 +35,21 @@ public void updateUserAndRoomProgress(Long userId, Long roomId, int currentPage)
         roomCommandPort.update(room);
         roomParticipantCommandPort.update(roomParticipant);
     }
+
+    public void removeUserProgressAndUpdateRoomProgress(Long removeRoomParticipantId, Room room) {
+
+        // 나간 유저를 제외한 방 평균 진행률 update
+        List<RoomParticipant> remainingParticipants = roomParticipantCommandPort.findAllByRoomId(room.getId());
+        double total = remainingParticipants.stream()
+                .filter(p -> !p.getId().equals(removeRoomParticipantId)) // 나간 유저 제외
+                .mapToDouble(RoomParticipant::getUserPercentage)
+                .sum();
+        room.updateRoomPercentage(total / (remainingParticipants.size() - 1));
+
+        // 방 멤버 수 감소
+        room.decreaseMemberCount();
+        // 영속화
+        roomCommandPort.update(room);
+    }
+
 }