Merge pull request #96 from kookmin-sw/refactor/95

[Backend] refactor: 출동 중, 알림 리스트 API 통합 및 코드 리팩터링

Author: hyni03

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

@@ -0,0 +1,57 @@
+package com.example.backend.dashboard.controller;
+
+import com.example.backend.dashboard.dto.*;
+import com.example.backend.dashboard.service.DashboardService;
+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;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api/v1/case")
+@RequiredArgsConstructor
+public class DashboardController {
+
+    private final DashboardService dashboardService;
+
+    // 사건 정보 조회
+    @GetMapping("")
+    public ResponseEntity<?> getCases(HttpSession session) {
+        List<DashboardResponse> cases = dashboardService.getCases(session);
+        if (cases.isEmpty()) {
+            return ResponseEntity.status(404)
+                    .body(Collections.singletonMap("message", "사건이 없습니다."));
+        }
+        return ResponseEntity.ok(cases);
+    }
+
+    // 사건 영상 확인
+    @GetMapping("/{id}")
+    public ResponseEntity<?> getCaseVideo(@PathVariable("id") int id, HttpSession session) {
+        Map<String, String> videoResponse = dashboardService.getCaseVideo(id, session);
+        return ResponseEntity.ok(videoResponse);
+    }
+
+    // 출동 | 미출동 클릭 시 => 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, session);
+        return ResponseEntity.ok(message);
+    }
+
+    // 출동 중인 사건 해결 처리
+    @PutMapping("/complete/{id}")
+    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/DashboardController.java

@@ -10,7 +10,7 @@
 
 @Data
 @Builder
-public class ProgressResponse {
+public class DashboardResponse {
     private Integer id;
     private String police_name;
     private String police_rank;
@@ -21,22 +21,18 @@ public class ProgressResponse {
 
     private Integer level;
     private CaseCategory category;
-    private String video;
     private CaseState state;
-    private String memo;
 
-    public static ProgressResponse fromEntity(CaseEntity entity) {
-        return ProgressResponse.builder()
+    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())
                 .category(entity.getCategory())
-                .video(entity.getVideo())
                 .state(entity.getState())
-                .memo(entity.getMemo())
                 .build();
     }
 

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

@@ -1,11 +1,13 @@
 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;
 
 @Getter
 @Setter
-public class AlarmRequest {
+public class StateRequest {
     private CaseState state; // "출동" or "미출동"
+    private CaseEntity.CaseCategory category;
 }

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

@@ -0,0 +1,11 @@
+package com.example.backend.dashboard.repository;
+
+import com.example.backend.common.domain.CaseEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+public interface DashboardRepository extends JpaRepository<CaseEntity, Integer> {
+    List<CaseEntity> findAllByOfficeIdAndStateInOrderById(int officeId, List<CaseEntity.CaseState> states);
+
+}