Merge branch 'develop' into backend

Author: hyni03

.github/labeler.yml

@@ -27,16 +27,4 @@ labels:
 
   ':hammer: REFACTOR':
     include:
-      ['\bRefactor\b', '\bREFACTOR\b', '\brefactor\b']
-
-  ':nail_care: FRONTEND':
-    include:
-      ['\bFrontend\b', '\bfrontend\b', '\bFRONTEND\b']
-
-  ':page_facing_up: AI':
-    include:
-      ['\bAI\b', '\bai\b', '\bAi\b']
-
-  ':rocket: BACKEND':
-    include:
-      ['\bbackend\b', '\bBackend\b', '\bBACKEND\b']
+      ['\bRefactor\b', '\bREFACTOR\b', '\brefactor\b']

.github/workflows/backend-cd.yml

@@ -0,0 +1,62 @@
+name: Secure Backend CD
+
+on:
+  push:
+    branches:
+      - develop
+    paths:
+      - "backend/**"
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    environment: secretconfig
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x ./backend/gradlew
+
+      - name: Build backend application
+        working-directory: ./backend
+        run: ./gradlew build -x test
+
+      - name: Prepare SSH key
+        run: |
+          echo "${{ secrets.SSH_PRIVATE_KEY }}" > key.pem
+          chmod 600 key.pem
+
+      - name: Add remote host to known_hosts
+        run: |
+          mkdir -p ~/.ssh
+          ssh-keyscan -H ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts
+
+      - name: Copy JAR to EC2 server
+        run: |
+          scp -i key.pem ./backend/build/libs/backend-0.0.1-SNAPSHOT.jar ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:~/capstone-2025-24/backend/build/libs/
+
+      - name: Deploy on EC2 via SSH
+        env:
+          APP_YML: ${{ secrets.APPLICATION_YML }}
+          DOCKER_COMPOSE_YML: ${{ secrets.DOCKER_COMPOSE_YML }}
+        run: |
+          ssh -i key.pem ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} << 'EOF'
+          cd ~/capstone-2025-24
+          git pull
+          cat > backend/src/main/resources/application.yml << 'END_YML'
+          $APP_YML
+          END_YML
+          cat > docker-compose.yml << 'END_DOCKER'
+          $DOCKER_COMPOSE_YML
+          END_DOCKER
+          docker-compose down
+          docker-compose build
+          docker-compose up -d
+          EOF

.github/workflows/frontend-ci.yml

@@ -19,23 +19,20 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
+      - name: Check file structure
+        run: ls -R
+
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-          cache: 'yarn'
+          cache: "yarn"
+          cache-dependency-path: "./frontend/yarn.lock"
 
       - name: Install dependencies
-        run: |
-          cd frontend
-          yarn install --frozen-lockfile
-
-      - name: Run tests
-        run: |
-          cd frontend
-          yarn test
+        working-directory: frontend
+        run: yarn install --frozen-lockfile
 
       - name: Build project
-        run: |
-          cd frontend
-          yarn build
+        working-directory: frontend
+        run: yarn build

.github/workflows/label.yml

@@ -5,7 +5,7 @@ on:
     types: [opened]
   pull_request_target:
     types: [opened]
-    
+
 jobs:
   labeler:
     runs-on: ubuntu-latest
@@ -18,4 +18,35 @@ jobs:
         id: labeler
         uses: jimschubert/labeler-action@v1
         with:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+
+      - name: Add labels based on user
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const author = context.payload.pull_request 
+              ? context.payload.pull_request.user.login 
+              : context.payload.issue.user.login;
+
+            const userLabels = {
+              "hummingbbird": ":nail_care: FRONTEND",
+              "HeeNamgoong": ":nail_care: FRONTEND",
+              "seo0o519": ":nail_care: FRONTEND",
+              "hyni03": ":rocket: BACKEND",
+              "mjk25": ":rocket: BACKEND",
+              "justpers": ":page_facing_up: AI"
+            };
+
+            const labelToAdd = userLabels[author];
+
+            if (labelToAdd) {
+              github.rest.issues.addLabels({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: context.payload.pull_request 
+                  ? context.payload.pull_request.number 
+                  : context.payload.issue.number,
+                labels: [labelToAdd]
+              });
+            }

backend/Dockerfile

@@ -0,0 +1,4 @@
+FROM openjdk:21
+WORKDIR /app
+COPY build/libs/*.jar app.jar
+ENTRYPOINT ["java", "-jar", "app.jar"]

backend/src/main/java/com/example/backend/analysis/controller/CaseStatsController.java

@@ -7,8 +7,10 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.NoSuchElementException;
 
 @RestController
 @RequestMapping("/api/v1/stats")
@@ -20,18 +22,33 @@ public class CaseStatsController {
     // 개요 조회
     @GetMapping("/overview")
     public ResponseEntity<?> getOverview(HttpSession session) {
-        // 결과가 없으면 404, 있으면 200
-        CaseStatsOverviewResponse response = caseStatsService.getOverview(session);
-        return ResponseEntity.ok(response);
+        try {
+            CaseStatsOverviewResponse response = caseStatsService.getOverview(session);
+            return ResponseEntity.ok(response);
+        } catch (IllegalStateException e) {
+            return ResponseEntity.status(401).body(Collections.singletonMap("message", e.getMessage()));
+        } catch (NoSuchElementException e) {
+            return ResponseEntity.status(404).body(Collections.singletonMap("message", e.getMessage()));
+        } catch (Exception e) {
+            return ResponseEntity.status(500).body(Collections.singletonMap("message", "내부 서버 오류 발생"));
+        }
     }
 
     // 시간대별 사건 수 조회 (0시~23시 모두 반환)
     @GetMapping("/hour")
     public ResponseEntity<?> getHourlyCaseStats(@RequestParam("date") String date,
                                                 @RequestParam(value = "category", required = false) String category,
                                                 HttpSession session) {
-        List<HourlyCaseStatsResponse> stats = caseStatsService.getHourlyCaseStats(date, category, session);
-        return ResponseEntity.ok(stats);
+        try {
+            List<HourlyCaseStatsResponse> stats = caseStatsService.getHourlyCaseStats(date, category, session);
+            return ResponseEntity.ok(stats);
+        } catch (IllegalStateException e) {
+            return ResponseEntity.status(401).body(Collections.singletonMap("message", e.getMessage()));
+        } catch (NoSuchElementException e) {
+            return ResponseEntity.status(404).body(Collections.singletonMap("message", e.getMessage()));
+        } catch (Exception e) {
+            return ResponseEntity.status(500).body(Collections.singletonMap("message", "내부 서버 오류가 발생했습니다."));
+        }
     }
 
     // 월별/일별 사건 수 조회 (month 파라미터 존재 여부에 따라 분기; 전체 범위를 0으로 채워 반환)
@@ -40,29 +57,54 @@ public ResponseEntity<?> getCaseStats(@RequestParam("year") int year,
                                           @RequestParam(value = "month", required = false) Integer month,
                                           @RequestParam(value = "category", required = false) String category,
                                           HttpSession session) {
-        // month가 없으면 월별 데이터
-        if (month == null) {
-            List<MonthlyCaseStatsResponse> monthlyStats = caseStatsService.getMonthlyCaseStats(year, category, session);
-            return ResponseEntity.ok(monthlyStats);
+        try {
+            if (month == null) {
+                List<MonthlyCaseStatsResponse> monthlyStats = caseStatsService.getMonthlyCaseStats(year, category, session);
+                return ResponseEntity.ok(monthlyStats);
+            }
+            List<DailyCaseStatsResponse> dailyStats = caseStatsService.getDailyCaseStats(year, month, category, session);
+            return ResponseEntity.ok(dailyStats);
+        } catch (IllegalStateException e) {
+            return ResponseEntity.status(401).body(Collections.singletonMap("message", e.getMessage()));
+        } catch (NoSuchElementException e) {
+            return ResponseEntity.status(404).body(Collections.singletonMap("message", e.getMessage()));
+        } catch (Exception e) {
+            return ResponseEntity.status(500).body(Collections.singletonMap("message", "내부 서버 오류가 발생했습니다."));
         }
-
-        // month가 있으면 일별 데이터
-        List<DailyCaseStatsResponse> dailyStats = caseStatsService.getDailyCaseStats(year, month, category, session);
-        return ResponseEntity.ok(dailyStats);
     }
 
     // 유형별 사건 수 조회 (기본 카테고리 0 포함)
     @GetMapping("/category")
     public ResponseEntity<?> getCategoryCaseStats(@RequestParam("period") String period, HttpSession session) {
-        Map<String, Integer> stats = caseStatsService.getCategoryCaseStats(period, session);
-        return ResponseEntity.ok(stats);
+        try {
+            Map<String, Integer> stats = caseStatsService.getCategoryCaseStats(period, session);
+            return ResponseEntity.ok(stats);
+        } catch (IllegalStateException e) {
+            return ResponseEntity.status(401).body(Collections.singletonMap("message", e.getMessage()));
+        } catch (IllegalArgumentException e) {
+            return ResponseEntity.status(400).body(Collections.singletonMap("message", e.getMessage()));
+        } catch (NoSuchElementException e) {
+            return ResponseEntity.status(404).body(Collections.singletonMap("message", e.getMessage()));
+        } catch (Exception e) {
+            return ResponseEntity.status(500).body(Collections.singletonMap("message", "내부 서버 오류가 발생했습니다."));
+        }
     }
 
     // 장소별 사건 수 조회
     @GetMapping("/location")
     public ResponseEntity<?> getLocationCaseStats(@RequestParam("period") String period, HttpSession session) {
-        List<LocationCaseStatsResponse> stats = caseStatsService.getLocationCaseStats(period, session);
-        return ResponseEntity.ok(stats);
+        try {
+            List<LocationCaseStatsResponse> stats = caseStatsService.getLocationCaseStats(period, session);
+            return ResponseEntity.ok(stats);
+        } catch (IllegalStateException e) {
+            return ResponseEntity.status(401).body(Collections.singletonMap("message", e.getMessage()));
+        } catch (IllegalArgumentException e) {
+            return ResponseEntity.status(400).body(Collections.singletonMap("message", e.getMessage()));
+        } catch (NoSuchElementException e) {
+            return ResponseEntity.status(404).body(Collections.singletonMap("message", e.getMessage()));
+        } catch (Exception e) {
+            return ResponseEntity.status(500).body(Collections.singletonMap("message", "내부 서버 오류가 발생했습니다."));
+        }
     }
 
     // 지도용 장소별 사건 수 조회
@@ -71,5 +113,4 @@ public ResponseEntity<?> getMapCaseStats(HttpSession session) {
         List<MapCaseStatsResponse> stats = caseStatsService.getMapCaseStats(session);
         return ResponseEntity.ok(stats);
     }
-
 }

backend/src/main/java/com/example/backend/analysis/dto/CaseStatsOverviewResponse.java

@@ -1,25 +1,12 @@
 package com.example.backend.analysis.dto;
 
-import com.example.backend.common.domain.CaseEntity;
-import com.example.backend.common.domain.CaseStatsOverviewEntity;
 import lombok.*;
 
 @Data
-@Builder
-@NoArgsConstructor
 @AllArgsConstructor
 public class CaseStatsOverviewResponse {
     private int recentCase;
     private int todayCase;
-    private CaseEntity.CaseCategory mostCase;
+    private String mostCase;
     private String patrolRegion;
-
-    public static CaseStatsOverviewResponse fromEntity(CaseStatsOverviewEntity entity, String patrolRegionAddress) {
-        return CaseStatsOverviewResponse.builder()
-                .recentCase(entity.getRecentCaseCount())
-                .todayCase(entity.getTodayCaseCount())
-                .mostCase(entity.getMostCase())
-                .patrolRegion(patrolRegionAddress)
-                .build();
-    }
 }

backend/src/main/java/com/example/backend/analysis/dto/DailyCaseStatsResponse.java

@@ -2,26 +2,15 @@
 
 import lombok.*;
 
-@Data
-@Builder
-@NoArgsConstructor
+@Getter
+@Setter
 @AllArgsConstructor
+@NoArgsConstructor
 public class DailyCaseStatsResponse {
     private int day;
     private int fireCount;
     private int assaultCount;
     private int crowdCongestionCount;
     private int weaponCount;
     private int swoonCount;
-
-    public static DailyCaseStatsResponse fromRow(Object[] row) {
-        return DailyCaseStatsResponse.builder()
-                .day(((Number) row[0]).intValue())
-                .fireCount(((Number) row[1]).intValue())
-                .assaultCount(((Number) row[2]).intValue())
-                .crowdCongestionCount(((Number) row[3]).intValue())
-                .weaponCount(((Number) row[4]).intValue())
-                .swoonCount(((Number) row[5]).intValue())
-                .build();
-    }
 }

backend/src/main/java/com/example/backend/analysis/dto/HourlyCaseStatsResponse.java

@@ -1,10 +1,9 @@
 package com.example.backend.analysis.dto;
 
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
 
 @Data
-@Builder
-@NoArgsConstructor
 @AllArgsConstructor
 public class HourlyCaseStatsResponse {
     private int hour;
@@ -13,15 +12,4 @@ public class HourlyCaseStatsResponse {
     private int crowdCongestionCount;
     private int weaponCount;
     private int swoonCount;
-
-    public static HourlyCaseStatsResponse fromRow(Object[] row) {
-        return HourlyCaseStatsResponse.builder()
-                .hour(((Number) row[0]).intValue())
-                .fireCount(((Number) row[1]).intValue())
-                .assaultCount(((Number) row[2]).intValue())
-                .crowdCongestionCount(((Number) row[3]).intValue())
-                .weaponCount(((Number) row[4]).intValue())
-                .swoonCount(((Number) row[5]).intValue())
-                .build();
-    }
 }