Merge pull request #136 from kookmin-sw/fix/135

[Backend] fix: API 오류 수정

Author: hyni03

backend/src/main/java/com/example/backend/common/GlobalExceptionHandler.java

@@ -29,14 +29,17 @@ public ResponseEntity<?> handleIllegalStateException(IllegalStateException e) {
         if (e.getMessage().contains("로그인이 필요")) {
             return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
                     .body(Collections.singletonMap("message", e.getMessage()));
+        } else if (e.getMessage().contains("이미 출동")){
+            return ResponseEntity.status(HttpStatus.ALREADY_REPORTED)
+                    .body(Collections.singletonMap("message", e.getMessage()));
         }
         return ResponseEntity.status(HttpStatus.BAD_REQUEST)
                 .body(Collections.singletonMap("message", e.getMessage()));
     }
 
     @ExceptionHandler(NoSuchElementException.class)
     public ResponseEntity<?> handleNoSuchElementException(NoSuchElementException e) {
-        return ResponseEntity.status(HttpStatus.FORBIDDEN)
+        return ResponseEntity.status(HttpStatus.NOT_FOUND)
                 .body(Collections.singletonMap("message", e.getMessage()));
     }
 

backend/src/main/java/com/example/backend/common/domain/CaseEntity.java

@@ -48,6 +48,9 @@ public class CaseEntity {
     @Column(name = "memo", nullable = false, columnDefinition = "TEXT")
     private String memo;
 
+    @Column(name = "progress_date", columnDefinition = "TIMESTAMP WITHOUT TIME ZONE")
+    private LocalDateTime progressDate;
+
     public enum CaseCategory {
         fire, assault, crowd_congestion, weapon, swoon
     }

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

@@ -16,6 +16,7 @@ public class CaseDetectResponse {
     private String category;      // 사건 카테고리 (예: fire, assault 등)
     private String cctvAddress;   // CCTV 주소
     private String dateTime;      // 사건 감지 시각 (문자열 형태, yyyy-MM-dd HH:mm:ss)
+    private int level;
     private String video;      // 영상 URL
 
     public static CaseDetectResponse fromEntity(CaseEntity entity) {
@@ -26,6 +27,7 @@ public static CaseDetectResponse fromEntity(CaseEntity entity) {
                 .category(entity.getCategory().name())
                 .cctvAddress(entity.getCctv().getAddress())
                 .dateTime(formattedDateTime)
+                .level(entity.getLevel())
                 .video(entity.getVideo())
                 .build();
     }

backend/src/main/java/com/example/backend/dashboard/repository/DashboardRepository.java

@@ -6,6 +6,7 @@
 import java.util.List;
 
 public interface DashboardRepository extends JpaRepository<CaseEntity, Integer> {
-    List<CaseEntity> findAllByOfficeIdAndStateInOrderById(int officeId, List<CaseEntity.CaseState> states);
+    List<CaseEntity> findAllByOfficeIdAndStateInOrderByIdDesc(int officeId, List<CaseEntity.CaseState> states);
+    List<CaseEntity> findAllByOfficeIdAndStateOrderByProgressDateDesc(int officeId, CaseEntity.CaseState state);
 
 }

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

@@ -38,6 +38,7 @@ public CaseDetectResponse saveCase(CaseDetectRequest request) {
                 .accuracy(true)
                 .memo(request.getMemo())
                 .level(request.getLevel())
+                .progressDate(null)
                 .build();
 
         CaseEntity saved = caseRepository.save(caseEntity);

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

@@ -13,10 +13,9 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -50,7 +49,7 @@ private CaseEntity getAuthorizedCase(int caseId, HttpSession session) {
         CaseEntity caseEntity = dashboardRepository.findById(caseId)
                 .orElseThrow(() -> new EntityNotFoundException("해당 사건을 찾을 수 없습니다."));
         if (caseEntity.getOffice().getId() != officeId) {
-            throw new NoSuchElementException("해당 사건에 대한 권한이 없습니다.");
+            throw new IllegalStateException("해당 사건에 대한 권한이 없습니다.");
         }
         return caseEntity;
     }
@@ -61,16 +60,22 @@ public List<DashboardResponse> getCases(HttpSession session) {
 
         List<CaseEntity.CaseState> targetStates = List.of(
                 CaseEntity.CaseState.미확인,
-                CaseEntity.CaseState.확인,
-                CaseEntity.CaseState.출동
+                CaseEntity.CaseState.확인
         );
-        List<CaseEntity> cases = dashboardRepository.findAllByOfficeIdAndStateInOrderById(officeId, targetStates);
 
-        if (cases.isEmpty()) {
+        List<CaseEntity> readyCases = dashboardRepository.findAllByOfficeIdAndStateInOrderByIdDesc(officeId, targetStates);
+
+        List<CaseEntity> progressCases = dashboardRepository.findAllByOfficeIdAndStateOrderByProgressDateDesc(officeId, CaseEntity.CaseState.출동);
+
+        if (readyCases.isEmpty() && progressCases.isEmpty()) {
             throw new NoSuchElementException("미확인, 확인 또는 출동 중인 사건이 없습니다.");
         }
 
-        return cases.stream()
+        List<CaseEntity> combinedCases = new ArrayList<>();
+        combinedCases.addAll(readyCases);
+        combinedCases.addAll(progressCases);
+
+        return combinedCases.stream()
                 .map(DashboardResponse::fromEntity)
                 .collect(Collectors.toList());
     }
@@ -111,6 +116,11 @@ public Map<Integer, String> updateCaseState(int id, StateRequest request, HttpSe
             PoliceEntity assignedPolice = PoliceEntity.builder().id(policeId).build();
             caseEntity.setPolice(assignedPolice);
 
+            // 출동 날짜 및 시간
+            LocalDateTime now = LocalDateTime.now();
+            String formatter = now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+            caseEntity.setProgressDate(LocalDateTime.parse(formatter));
+
             dashboardRepository.save(caseEntity);
 
             return Collections.singletonMap(id, "지금 출동합니다.");

backend/src/main/java/com/example/backend/search/dto/DetailResponse.java

@@ -2,17 +2,17 @@
 
 import com.example.backend.common.domain.CaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Builder;
-import lombok.Getter;
+import lombok.*;
 
 import java.time.LocalDateTime;
 
-@Getter
+@Data
+@Getter @Builder
 public class DetailResponse {
-    private int id;
-    private int policeId;
+    private Integer id;
+    private Integer policeId;
     private String policeName;
-    private int cctvId;
+    private Integer cctvId;
     private String address;
     private Double longitude;
     private Double latitude;
@@ -24,22 +24,6 @@ public class DetailResponse {
     private String video;
     private String memo;
 
-    @Builder
-    public DetailResponse(Integer id, Integer policeId, String policeName, Integer cctvId, String address, Double latitude, Double longitude, LocalDateTime date,
-                          String category, String video, String memo) {
-        this.id = id;
-        this.policeId = policeId;
-        this.policeName = policeName;
-        this.cctvId = cctvId;
-        this.address = address;
-        this.latitude = latitude;
-        this.longitude = longitude;
-        this.date = date;
-        this.category = category;
-        this.video = video;
-        this.memo = memo;
-    }
-
     public static DetailResponse fromEntity(CaseEntity entity) {
         return DetailResponse.builder()
                 .id(entity.getId())

backend/src/main/java/com/example/backend/search/dto/SearchResponse.java

@@ -2,21 +2,17 @@
 
 import com.example.backend.common.domain.CaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Builder;
-import lombok.Data;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import java.time.LocalDateTime;
 
-@Getter
-@NoArgsConstructor
 @Data
+@Getter @Builder
 public class SearchResponse {
-    private int id;
-    private int policeId;
+    private Integer id;
+    private Integer policeId;
     private String policeName;
-    private int cctvId;
+    private Integer cctvId;
     private String address;
 
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
@@ -25,19 +21,6 @@ public class SearchResponse {
     private String category;
     private String memo;
 
-    @Builder
-    public SearchResponse(Integer id, Integer policeId, String policeName, Integer cctvId, String address, LocalDateTime date,
-                          String category, String memo) {
-        this.id = id;
-        this.policeId = policeId;
-        this.policeName = policeName;
-        this.cctvId = cctvId;
-        this.address = address;
-        this.date = date;
-        this.category = category;
-        this.memo = memo;
-    }
-
     public static SearchResponse fromEntity(CaseEntity entity) {
         return SearchResponse.builder()
                 .id(entity.getId())

backend/src/main/java/com/example/backend/search/dto/SearchResult.java

@@ -5,16 +5,9 @@
 
 import java.util.List;
 
-@Getter
+@Getter @Builder
 public class SearchResult {
     private final List<SearchResponse> results; // 검색 결과 리스트
     private final int totalPages; // 전체 페이지 수
     private final long totalElements;  // 전체 데이터 개수
-
-    @Builder
-    public SearchResult(List<SearchResponse> results, int totalPages, long totalElements) {
-        this.results = results;
-        this.totalPages = totalPages;
-        this.totalElements = totalElements;
-    }
 }