[BE] 페어룸 삭제 기능 구현

backend/src/main/java/site/coduo/pairroom/controller/PairRoomController.java

@@ -9,6 +9,7 @@
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.CookieValue;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -92,4 +93,10 @@ public ResponseEntity<PairRoomExistResponse> pairRoomExists(@RequestParam("acces
 
         return ResponseEntity.ok(response);
     }
+
+    @DeleteMapping("/pair-room/{accessCode}")
+    public ResponseEntity<Void> deletePairRoom(@PathVariable("accessCode") final String accessCode) {
+        pairRoomService.deletePairRoom(accessCode);
+        return ResponseEntity.noContent().build();
+    }
 }

backend/src/main/java/site/coduo/pairroom/controller/docs/PairRoomDocs.java

@@ -74,4 +74,11 @@ ResponseEntity<List<PairRoomMemberResponse>> getPairRooms(
     @ApiResponse(responseCode = "200", description = "페어룸 존재 여부", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
             schema = @Schema(implementation = PairRoomExistResponse.class)))
     ResponseEntity<PairRoomExistResponse> pairRoomExists(String accessCode);
+
+    @Operation(summary = "페어룸을 삭제한다.")
+    @ApiResponse(responseCode = "204", description = "페어룸 삭제 성공")
+    ResponseEntity<Void> deletePairRoom(
+            @Parameter(description = "페어룸 접근 코드", required = true)
+            String accessCode
+    );
 }

backend/src/main/java/site/coduo/pairroom/domain/PairRoomStatus.java

@@ -12,7 +12,8 @@
 public enum PairRoomStatus {
 
     IN_PROGRESS,
-    COMPLETED;
+    COMPLETED,
+    DELETE;
 
     private static final Map<String, PairRoomStatus> STATUS = Arrays.stream(values())
             .collect(Collectors.toMap(PairRoomStatus::name, Function.identity()));

backend/src/main/java/site/coduo/pairroom/exception/DeletePairRoomException.java

@@ -0,0 +1,8 @@
+package site.coduo.pairroom.exception;
+
+public class DeletePairRoomException extends PairRoomException {
+
+    public DeletePairRoomException(final String message) {
+        super(message);
+    }
+}

backend/src/main/java/site/coduo/pairroom/repository/PairRoomEntity.java

@@ -84,6 +84,10 @@ public void swapNavigatorWithDriver() {
         this.driver = temp;
     }
 
+    public boolean isDelete() {
+        return status == PairRoomStatus.DELETE;
+    }
+
     @Override
     public boolean equals(final Object o) {
         if (this == o) {

backend/src/main/java/site/coduo/pairroom/repository/PairRoomRepository.java

@@ -4,6 +4,7 @@
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import site.coduo.pairroom.domain.PairRoomStatus;
 import site.coduo.pairroom.domain.accesscode.AccessCode;
 import site.coduo.pairroom.exception.PairRoomNotFoundException;
 
@@ -22,4 +23,6 @@ default PairRoomEntity fetchByAccessCode(AccessCode accessCode) {
     }
 
     boolean existsByAccessCode(String generatedAccessCode);
+
+    boolean existsByAccessCodeAndStatusNot(String accessCode, PairRoomStatus status);
 }

backend/src/main/java/site/coduo/pairroom/service/PairRoomService.java

@@ -17,6 +17,7 @@
 import site.coduo.pairroom.domain.PairRoomStatus;
 import site.coduo.pairroom.domain.accesscode.AccessCode;
 import site.coduo.pairroom.domain.accesscode.UUIDAccessCodeGenerator;
+import site.coduo.pairroom.exception.DeletePairRoomException;
 import site.coduo.pairroom.repository.PairRoomEntity;
 import site.coduo.pairroom.repository.PairRoomMemberEntity;
 import site.coduo.pairroom.repository.PairRoomMemberRepository;
@@ -56,7 +57,7 @@ public String savePairRoom(final PairRoomCreateRequest request, @Nullable final
     }
 
     public boolean existsByAccessCode(final String accessCode) {
-        return pairRoomRepository.existsByAccessCode(accessCode);
+        return pairRoomRepository.existsByAccessCodeAndStatusNot(accessCode, PairRoomStatus.DELETE);
     }
 
     private PairRoom createPairRoom(final PairRoomCreateRequest request) {
@@ -77,18 +78,27 @@ private AccessCode generateAccessCode() {
     @Transactional
     public void updateNavigatorWithDriver(final String accessCode) {
         final PairRoomEntity pairRoomEntity = pairRoomRepository.fetchByAccessCode(accessCode);
+        checkDeletePairRoom(pairRoomEntity);
         pairRoomEntity.swapNavigatorWithDriver();
     }
 
+    private void checkDeletePairRoom(final PairRoomEntity pairRoomEntity) {
+        if (pairRoomEntity.isDelete()) {
+            throw new DeletePairRoomException("삭제된 페어룸입니다.");
+        }
+    }
+
     @Transactional
     public void updatePairRoomStatus(final String accessCode, final String statusName) {
+        final PairRoomEntity pairRoomEntity = pairRoomRepository.fetchByAccessCode(accessCode);
+        checkDeletePairRoom(pairRoomEntity);
         final PairRoomStatus status = PairRoomStatus.findByName(statusName);
-        final PairRoomEntity entity = pairRoomRepository.fetchByAccessCode(accessCode);
-        entity.updateStatus(status);
+        pairRoomEntity.updateStatus(status);
     }
 
     public PairRoomReadResponse findPairRoomAndTimer(final String accessCode) {
         final PairRoomEntity pairRoomEntity = pairRoomRepository.fetchByAccessCode(accessCode);
+        checkDeletePairRoom(pairRoomEntity);
         final TimerEntity timerEntity = timerRepository.fetchTimerByPairRoomEntity(pairRoomEntity);
         return PairRoomReadResponse.of(pairRoomEntity.toDomain(), timerEntity.toDomain());
     }
@@ -97,10 +107,20 @@ public List<PairRoomMemberResponse> findPairRooms(final String token) {
         final Member member = memberService.findMemberByCredential(token);
 
         final List<PairRoomMemberEntity> pairRooms = pairRoomMemberRepository.findByMember(member);
-
-        return pairRooms.stream()
+        final List<PairRoomEntity> pairRoomEntities = pairRooms.stream()
                 .map(PairRoomMemberEntity::getPairRoom)
+                .filter(pairRoomEntity -> !pairRoomEntity.isDelete())
+                .toList();
+
+        return pairRoomEntities.stream()
                 .map(PairRoomMemberResponse::from)
                 .toList();
     }
+
+    @Transactional
+    public void deletePairRoom(final String accessCode) {
+        final PairRoomEntity pairRoomEntity = pairRoomRepository.fetchByAccessCode(accessCode);
+        checkDeletePairRoom(pairRoomEntity);
+        pairRoomEntity.updateStatus(PairRoomStatus.DELETE);
+    }
 }

backend/src/test/java/site/coduo/acceptance/PairRoomAcceptanceTest.java

@@ -151,4 +151,24 @@ void exist_pair_room_false() {
 
         assertThat(response.exists()).isFalse();
     }
+
+    @Test
+    @DisplayName("페어룸을 삭제한다.")
+    void delete_pair_room() {
+        // given
+        final PairRoomCreateResponse accessCode =
+                createPairRoom(new PairRoomCreateRequest("레디", "프람", 1000L, 100L, "IN_PROGRESS"));
+
+        // when & then
+        RestAssured
+                .given()
+                .log()
+                .all()
+
+                .when()
+                .delete("/api/pair-room/{access-code}", accessCode.accessCode())
+
+                .then()
+                .statusCode(204);
+    }
 }

backend/src/test/java/site/coduo/acceptance/ReferenceAcceptanceTest.java

@@ -10,16 +10,15 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
-import org.springframework.transaction.annotation.Transactional;
 
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 import site.coduo.pairroom.service.dto.PairRoomCreateRequest;
 import site.coduo.pairroom.service.dto.PairRoomCreateResponse;
 import site.coduo.referencelink.service.dto.CategoryCreateRequest;
 import site.coduo.referencelink.service.dto.CategoryCreateResponse;
+import site.coduo.referencelink.service.dto.ReferenceLinkResponse;
 
-@Transactional
 class ReferenceAcceptanceTest extends AcceptanceFixture {
 
     @Test
@@ -101,18 +100,22 @@ void read_reference_link_without_open_graph() {
                 .body("[0].image", is(""));
     }
 
-    void createReferenceLink(final String url, String accessCodeText, String categoryName) {
+    ReferenceLinkResponse createReferenceLink(final String url, String accessCodeText, String categoryName) {
         final CategoryCreateResponse response = CategoryAcceptanceTest.createCategory(
                 accessCodeText, new CategoryCreateRequest(categoryName));
         final Map<String, Object> request = Map.of("url", url, "categoryId", response.id());
 
-        RestAssured
+        return RestAssured
                 .given()
                 .contentType(ContentType.JSON)
                 .body(request)
 
                 .when()
-                .post("/api/" + accessCodeText + "/reference-link");
+                .post("/api/" + accessCodeText + "/reference-link")
+
+                .then()
+                .extract()
+                .as(ReferenceLinkResponse.class);
     }
 
     @Test
@@ -122,7 +125,8 @@ void delete_reference_link_request() {
         final PairRoomCreateResponse pairRoom =
                 createPairRoom(new PairRoomCreateRequest("레모네", "프람", 1000L, 1000L, "IN_PROGRESS"));
 
-        createReferenceLink("http://www.delete.com", pairRoom.accessCode(), "카테고리 이름");
+        final ReferenceLinkResponse response = createReferenceLink("http://www.delete.com", pairRoom.accessCode(),
+                "카테고리 이름");
 
         // when & then
         RestAssured
@@ -131,7 +135,7 @@ void delete_reference_link_request() {
 
                 .when()
                 .log().all()
-                .delete("/api/" + pairRoom.accessCode() + "/reference-link/1")
+                .delete("/api/" + pairRoom.accessCode() + "/reference-link/" + response.id())
 
                 .then()
                 .assertThat()

backend/src/test/java/site/coduo/pairroom/domain/PairRoomEntityTest.java

@@ -45,4 +45,38 @@ void change_nav_and_driver() {
                 .extracting("navigator", "driver")
                 .contains("dri", "navi");
     }
+
+    @Test
+    @DisplayName("페어룸 상태가 DELETE면 true를 반환한다.")
+    void pairRoomEntityStatusIsDelete() {
+        // Given
+        final PairRoomEntity sut = PairRoomEntity.from(
+                new PairRoom(PairRoomStatus.DELETE,
+                        new Pair(new PairName("navi"), new PairName("dri")),
+                        new AccessCode("access"))
+        );
+
+        // When
+        final boolean isDelete = sut.isDelete();
+
+        // Then
+        assertThat(isDelete).isTrue();
+    }
+
+    @Test
+    @DisplayName("페어룸 상태가 DELETE가 아니면 false를 반환한다.")
+    void pairRoomEntityStatusIsNotDelete() {
+        // Given
+        final PairRoomEntity sut = PairRoomEntity.from(
+                new PairRoom(PairRoomStatus.IN_PROGRESS,
+                        new Pair(new PairName("navi"), new PairName("dri")),
+                        new AccessCode("access"))
+        );
+
+        // When
+        final boolean isDelete = sut.isDelete();
+
+        // Then
+        assertThat(isDelete).isFalse();
+    }
 }

backend/src/test/java/site/coduo/pairroom/service/PairRoomServiceTest.java

@@ -22,6 +22,7 @@
 import site.coduo.pairroom.domain.PairRoom;
 import site.coduo.pairroom.domain.PairRoomStatus;
 import site.coduo.pairroom.domain.accesscode.AccessCode;
+import site.coduo.pairroom.exception.DeletePairRoomException;
 import site.coduo.pairroom.exception.PairRoomNotFoundException;
 import site.coduo.pairroom.repository.PairRoomEntity;
 import site.coduo.pairroom.repository.PairRoomRepository;
@@ -91,6 +92,21 @@ void throw_exception_when_find_not_exist_access_code() {
                 .isExactlyInstanceOf(PairRoomNotFoundException.class);
     }
 
+    @Test
+    @Transactional
+    @DisplayName("삭제된 페어룸의 접근 코드를 찾으면 예외가 발생한다.")
+    void throw_exception_when_find_delete_pair_room_access_code() {
+        // given
+        final PairRoomCreateRequest request =
+                new PairRoomCreateRequest("레디", "프람", 1000L, 100L,
+                        PairRoomStatus.DELETE.name());
+        final String accessCode = pairRoomService.savePairRoom(request, null);
+
+        // when & then
+        assertThatThrownBy(() -> pairRoomService.findPairRoomAndTimer(accessCode))
+                .isExactlyInstanceOf(DeletePairRoomException.class);
+    }
+
     @Test
     @DisplayName("페어룸 상태를 변경한다.")
     void update_pair_room_status() {
@@ -107,6 +123,19 @@ void update_pair_room_status() {
                 .isEqualTo(PairRoomStatus.COMPLETED);
     }
 
+    @Test
+    @DisplayName("삭제된 페어룸 상태를 변경하려고 하면 예외를 발생시킨다.")
+    void update_delete_pair_room_status() {
+        // given
+        final PairRoomCreateRequest request =
+                new PairRoomCreateRequest("레디", "프람", 1000L, 100L, PairRoomStatus.DELETE.name());
+        final String accessCode = pairRoomService.savePairRoom(request, null);
+
+        // when & then
+        assertThatThrownBy(() -> pairRoomService.updatePairRoomStatus(accessCode, PairRoomStatus.COMPLETED.name()))
+                .isExactlyInstanceOf(DeletePairRoomException.class);
+    }
+
     @Test
     @DisplayName("페어 역할을 변경한다.")
     void change_pair_room() {
@@ -127,8 +156,24 @@ void change_pair_room() {
                 .contains("lemonL", "fram");
     }
 
+    @Test
+    @DisplayName("삭제된 페어룸의 페어 역할을 변경하려하면 예외를 발생시킨다.")
+    void change_delete_pair_room_role() {
+        // given
+        final PairRoomEntity entity = PairRoomEntity.from(
+                new PairRoom(PairRoomStatus.DELETE,
+                        new Pair(new PairName("fram"), new PairName("lemonL")),
+                        new AccessCode("1234"))
+        );
+        pairRoomRepository.save(entity);
 
-    @DisplayName("멤버의 방 목록을 가져온다.")
+        // when & then
+        assertThatThrownBy(() -> pairRoomService.updateNavigatorWithDriver(entity.getAccessCode()))
+                .isExactlyInstanceOf(DeletePairRoomException.class);
+    }
+
+
+    @DisplayName("삭제되지 않은, 멤버의 방 목록을 가져온다.")
     @Test
     void find_rooms_by_member() {
         //given
@@ -143,6 +188,12 @@ void find_rooms_by_member() {
         final String accessCodeB_1 = pairRoomService.savePairRoom(pairRoomCreateRequest, memberB.getAccessToken());
         pairRoomService.savePairRoom(pairRoomCreateRequest, null);
 
+        final PairRoomCreateRequest deletePairRoomCreateRequest = new PairRoomCreateRequest("레디", "잉크", 1, 1,
+                "DELETE");
+        pairRoomService.savePairRoom(deletePairRoomCreateRequest, memberA.getAccessToken());
+        pairRoomService.savePairRoom(deletePairRoomCreateRequest, memberA.getAccessToken());
+        pairRoomService.savePairRoom(deletePairRoomCreateRequest, memberA.getAccessToken());
+
         final List<String> memberAExpected = List.of(accessCodeA_1, accessCodeA_2);
         final List<String> memberBExpected = List.of(accessCodeB_1);