refactor: merge survey API into case dispatch and completion API #95

Author: hyni03

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

@@ -38,15 +38,19 @@ public ResponseEntity<?> getCaseVideo(@PathVariable("id") int id, HttpSession se
 
     // 출동 | 미출동 클릭 시 => 1. 이미 출동인 상태 or 2. state를 업데이트
     @PutMapping("/ready/{id}")
-    public ResponseEntity<?> updateCaseState(@PathVariable("id") int id, @RequestBody StateRequest request, HttpSession session) {
-        Map<Integer, String> message = dashboardService.updateCaseState(id, request.getState(), session);
+    public ResponseEntity<?> updateCaseState(@PathVariable("id") int id,
+                                             @RequestBody StateRequest request,
+                                             HttpSession session) {
+        Map<Integer, String> message = dashboardService.updateCaseState(id, request, session);
         return ResponseEntity.ok(message);
     }
 
     // 출동 중인 사건 해결 처리
     @PutMapping("/complete/{id}")
-    public ResponseEntity<?> completeCase(@PathVariable("id")  int id, HttpSession session) {
-        Map<Integer, String> completedCase = dashboardService.completeCase(id, session);
+    public ResponseEntity<?> completeCase(@PathVariable("id")  int id,
+                                          @RequestBody SurveyRequest surveyRequest,
+                                          HttpSession session) {
+        Map<Integer, String> completedCase = dashboardService.completeCase(id, surveyRequest, session);
         return ResponseEntity.ok(completedCase);
     }
 

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

@@ -26,8 +26,8 @@ public class DashboardResponse {
     public static DashboardResponse fromEntity(CaseEntity entity) {
         return DashboardResponse.builder()
                 .id(entity.getId())
-                .police_name(entity.getPolice().getName())
-                .police_rank(String.valueOf(entity.getPolice().getRank()))
+                .police_name(entity.getPolice() != null ? entity.getPolice().getName() : null)
+                .police_rank(entity.getPolice() != null ? String.valueOf(entity.getPolice().getRank()) : null)
                 .address(entity.getCctv().getAddress())
                 .date(entity.getDate())
                 .level(entity.getLevel())

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

@@ -1,5 +1,6 @@
 package com.example.backend.dashboard.dto;
 
+import com.example.backend.common.domain.CaseEntity;
 import com.example.backend.common.domain.CaseEntity.CaseState;
 import lombok.Getter;
 import lombok.Setter;
@@ -8,4 +9,5 @@
 @Setter
 public class StateRequest {
     private CaseState state; // "출동" or "미출동"
+    private CaseEntity.CaseCategory category;
 }

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

@@ -3,6 +3,8 @@
 import com.example.backend.common.domain.CaseEntity;
 import com.example.backend.common.domain.PoliceEntity;
 import com.example.backend.dashboard.dto.DashboardResponse;
+import com.example.backend.dashboard.dto.StateRequest;
+import com.example.backend.dashboard.dto.SurveyRequest;
 import com.example.backend.dashboard.repository.DashboardRepository;
 import com.example.backend.user.dto.UserResponseDto;
 import jakarta.persistence.EntityNotFoundException;
@@ -82,7 +84,7 @@ public Map<String, String> getCaseVideo(int id, HttpSession session) {
     }
 
     // 출동, 미출동 상태 변경
-    public Map<Integer, String> updateCaseState(int id, CaseEntity.CaseState state, HttpSession session) {
+    public Map<Integer, String> updateCaseState(int id, StateRequest request, HttpSession session) {
         CaseEntity caseEntity = getAuthorizedCase(id, session);
         int policeId = getAuthenticatedPoliceId(session);
 
@@ -92,7 +94,7 @@ public Map<Integer, String> updateCaseState(int id, CaseEntity.CaseState state,
             throw new IllegalStateException("해당 사건은 이미 출동 처리되었거나 완료된 사건입니다.");
         }
 
-        if (state == CaseEntity.CaseState.출동) {
+        if (request.getState() == CaseEntity.CaseState.출동) {
             // 출동 처리
             caseEntity.setState(CaseEntity.CaseState.출동);
 
@@ -106,21 +108,33 @@ public Map<Integer, String> updateCaseState(int id, CaseEntity.CaseState state,
         } else {
             // 미출동 처리
             caseEntity.setState(CaseEntity.CaseState.미출동);
+
+            if (request.getCategory() != null) {
+                caseEntity.setAccuracy(false);
+                caseEntity.setCategory(request.getCategory());
+            }
+
             dashboardRepository.save(caseEntity);
 
             return Collections.singletonMap(id, "미출동 사건으로 변경합니다.");
         }
     }
 
     // 출동 중인 사건 해결 처리
-    public Map<Integer, String> completeCase(int id, HttpSession session) {
+    public Map<Integer, String> completeCase(int id, SurveyRequest surveyRequest, HttpSession session) {
         CaseEntity caseEntity = getAuthorizedCase(id, session);
 
         if (caseEntity.getState() != CaseEntity.CaseState.출동) {
             throw new IllegalStateException("해당 사건은 출동 상태가 아닙니다.");
         }
 
         caseEntity.setState(CaseEntity.CaseState.완료);
+
+        if (surveyRequest.getCategory() != null) {
+            caseEntity.setAccuracy(false);
+            caseEntity.setCategory(surveyRequest.getCategory());
+        }
+
         dashboardRepository.save(caseEntity);
 
         return Collections.singletonMap(id, "해당 사건이 해결 처리되었습니다.");