Merge pull request #90 from kookmin-sw/backend

[Backend] merge: 3차 API 연동

Author: hyni03

backend/src/main/java/com/example/backend/dashboard/controller/AlarmListController.java

@@ -1,12 +1,14 @@
 package com.example.backend.dashboard.controller;
 
+import com.example.backend.dashboard.dto.AlarmRequest;
 import com.example.backend.dashboard.dto.AlarmResponse;
 import com.example.backend.dashboard.service.AlarmListService;
 import jakarta.servlet.http.HttpSession;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Collections;
 import java.util.List;
 
 @RestController
@@ -30,9 +32,9 @@ public ResponseEntity<?> getCaseById(@PathVariable("id")  int id, HttpSession se
 
     // 출동 | 미출동 클릭 시 => 1. 이미 출동인 상태 or 2. state를 업데이트
     @PutMapping("/ready/{id}")
-    public ResponseEntity<?> updateCaseState(@PathVariable("id") int id, HttpSession session) {
-        String message = alarmListService.updateCaseState(id, session);
-        return ResponseEntity.ok(message);
+    public ResponseEntity<?> updateCaseState(@PathVariable("id") int id, @RequestBody AlarmRequest request, HttpSession session) {
+        String message = alarmListService.updateCaseState(id, request.getState(), session);
+        return ResponseEntity.ok(Collections.singletonMap("message", message));
     }
 
 }

backend/src/main/java/com/example/backend/dashboard/dto/AlarmRequest.java

@@ -0,0 +1,11 @@
+package com.example.backend.dashboard.dto;
+
+import com.example.backend.common.domain.CaseEntity.CaseState;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class AlarmRequest {
+    private CaseState state; // "출동" or "미출동"
+}

backend/src/main/java/com/example/backend/dashboard/service/AlarmListService.java

@@ -66,30 +66,42 @@ public List<AlarmResponse> getReadyCases(HttpSession session) {
     public AlarmResponse getCaseById(Integer id, HttpSession session) {
         CaseEntity caseEntity = getAuthorizedCase(id, session);
 
-        if(caseEntity.getState() != CaseEntity.CaseState.확인 && caseEntity.getState() != CaseEntity.CaseState.미확인) {
-            throw new IllegalStateException("해당 사건은 이미 출동 되었거나 완료된 사건입니다.");
+        if (caseEntity.getState() == CaseState.출동 || caseEntity.getState() == CaseState.미출동 || caseEntity.getState() == CaseState.완료) {
+            throw new IllegalStateException("해당 사건은 이미 출동 처리되었거나 완료된 사건입니다.");
+        }
+
+        if(caseEntity.getState() == CaseState.미확인){
+            caseEntity.setState(CaseState.확인);
+            alarmListRepository.save(caseEntity);
         }
 
         return AlarmResponse.fromEntityWithVideo(caseEntity);
     }
 
-    public String updateCaseState(Integer id, HttpSession session) {
+    public String updateCaseState(Integer id, CaseState state, HttpSession session) {
         CaseEntity caseEntity = getAuthorizedCase(id, session);
         int policeId = getAuthenticatedPoliceId(session);
 
-        // 이미 state가 "출동"이면 메시지 반환
-        if (caseEntity.getState() == CaseEntity.CaseState.출동) {
-            return "이미 출동된 사건입니다.";
-        } else {
-            // 그 외의 경우, state를 "출동"으로 변경 후 저장
-            caseEntity.setState(CaseEntity.CaseState.출동);
+        if (caseEntity.getState() == CaseState.출동 || caseEntity.getState() == CaseState.미출동 || caseEntity.getState() == CaseState.완료) {
+            throw new IllegalStateException("해당 사건은 이미 출동 처리되었거나 완료된 사건입니다.");
+        }
+
+        if (state == CaseState.출동) {
+            // state를 "출동"으로 변경 후 저장
+            caseEntity.setState(CaseState.출동);
 
             // 경찰관 배정: 현재 로그인한 경찰관의 id를 PoliceEntity에 할당
             PoliceEntity assignedPolice = PoliceEntity.builder().id(policeId).build();
             caseEntity.setPolice(assignedPolice);
 
             alarmListRepository.save(caseEntity);
             return "지금 출동합니다.";
+        } else {
+            // state를 "미출동"으로 변경 후 저장
+            caseEntity.setState(CaseState.미출동);
+
+            alarmListRepository.save(caseEntity);
+            return "미출동 사건으로 변경합니다.";
         }
     }