Merge pull request #250 from FunD-StockProject/feat/stock-month-avg

Feat/stock month avg

Author: MuuiGong

src/main/java/com/fund/stockProject/score/repository/ScoreRepository.java

@@ -105,6 +105,8 @@ public interface ScoreRepository extends JpaRepository<Score, Integer> {
     """)
     List<Score> findLatestScoresByStockIds(@Param("stockIds") List<Integer> stockIds);
 
+    List<Score> findByStockIdAndDateBetween(Integer stockId, LocalDate startDate, LocalDate endDate);
+
     /**
      * 각 stock별 최신 유효 Score 데이터를 조회 (국내 종목용)
      * scoreOversea = 9999 이며 scoreKorea != 9999 인 데이터 중 최신

src/main/java/com/fund/stockProject/stock/controller/StockController.java

@@ -94,6 +94,15 @@ ResponseEntity<StockDetailResponse> getStockInfo(final @PathVariable("id") Integ
         return ResponseEntity.ok().body(stockService.getStockDetailInfo(id, country));
     }
 
+    @GetMapping("/{id}/average/month")
+    @Operation(summary = "월 평균 인간지표 점수", description = "지정한 월(yyyy-MM)의 평균 인간지표 점수를 반환합니다. 미지정 시 현재 월.")
+    ResponseEntity<StockMonthlyAverageResponse> getMonthlyAverageScore(
+        final @PathVariable("id") Integer id,
+        @RequestParam(required = false) String yearMonth
+    ) {
+        return ResponseEntity.ok().body(stockService.getMonthlyAverageScore(id, yearMonth));
+    }
+
     @GetMapping("/category/{category}/{country}")
     @Operation(summary = "종목 차트별 인간지표 api", description = "종목 차트별 인간지표 api")
     ResponseEntity<Mono<List<StockCategoryResponse>>> getCategoryStocks(final @PathVariable("category") CATEGORY category, final @PathVariable("country") COUNTRY country) {
@@ -181,6 +190,31 @@ public ResponseEntity<List<SectorAverageResponse>> getSectorAverageScores(
         return ResponseEntity.ok(stockService.getSectorAverageScores(country));
     }
 
+    @GetMapping("/sector/average/{country}/{sector}")
+    @Operation(summary = "섹터 평균 점수(단일)", description = "선택한 섹터의 최신 평균 인간지표 점수를 반환합니다.")
+    public ResponseEntity<SectorAverageResponse> getSectorAverageScore(
+        @PathVariable("country") COUNTRY country,
+        @PathVariable("sector") String sector
+    ) {
+        String normalized = sector == null ? null : sector.trim().toUpperCase();
+        if (normalized == null || normalized.isEmpty()) {
+            return ResponseEntity.badRequest().build();
+        }
+
+        try {
+            if (country == COUNTRY.KOREA) {
+                DomesticSector.valueOf(normalized);
+            } else {
+                OverseasSector.valueOf(normalized);
+            }
+        } catch (IllegalArgumentException e) {
+            log.warn("잘못된 섹터 값: country={}, sector={}", country, sector);
+            return ResponseEntity.badRequest().build();
+        }
+
+        return ResponseEntity.ok(stockService.getSectorAverageScore(country, normalized));
+    }
+
     @GetMapping("/{id}/sector/percentile")
     @Operation(summary = "섹터 내 상위 퍼센트", description = "특정 종목이 해당 섹터에서 상위 몇 %인지 반환합니다.")
     public ResponseEntity<SectorPercentileResponse> getSectorPercentile(

src/main/java/com/fund/stockProject/stock/dto/response/StockMonthlyAverageResponse.java

@@ -0,0 +1,27 @@
+package com.fund.stockProject.stock.dto.response;
+
+import com.fund.stockProject.stock.domain.COUNTRY;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+public class StockMonthlyAverageResponse {
+
+    private final Integer stockId;
+    private final String symbolName;
+    private final COUNTRY country;
+    private final String yearMonth; // yyyy-MM
+    private final Integer dataCount;
+    private final Double averageScore;
+
+    @Builder
+    public StockMonthlyAverageResponse(Integer stockId, String symbolName, COUNTRY country,
+                                       String yearMonth, Integer dataCount, Double averageScore) {
+        this.stockId = stockId;
+        this.symbolName = symbolName;
+        this.country = country;
+        this.yearMonth = yearMonth;
+        this.dataCount = dataCount;
+        this.averageScore = averageScore;
+    }
+}

src/main/java/com/fund/stockProject/stock/service/SectorScoreSnapshotService.java

@@ -37,6 +37,39 @@ public List<SectorAverageResponse> getLatestSectorAverages(COUNTRY country) {
                 .toList())
             .orElseGet(List::of);
     }
+    public SectorAverageResponse getLatestSectorAverage(COUNTRY country, String sectorKey) {
+        String normalizedSector = sectorKey == null ? null : sectorKey.trim().toUpperCase();
+        if (normalizedSector == null || normalizedSector.isEmpty()) {
+            return SectorAverageResponse.builder()
+                .sector(sectorKey)
+                .sectorName(null)
+                .averageScore(0)
+                .count(0)
+                .build();
+        }
+
+        String sectorName = resolveSectorNameByKey(country, normalizedSector);
+        return snapshotRepository.findLatestDateByCountry(country)
+            .map(date -> snapshotRepository.findByCountryAndDateAndSector(country, date, normalizedSector)
+                .map(snapshot -> SectorAverageResponse.builder()
+                    .sector(snapshot.getSector())
+                    .sectorName(snapshot.getSectorName())
+                    .averageScore(snapshot.getAverageScore())
+                    .count(snapshot.getCount())
+                    .build())
+                .orElseGet(() -> SectorAverageResponse.builder()
+                    .sector(normalizedSector)
+                    .sectorName(sectorName)
+                    .averageScore(0)
+                    .count(0)
+                    .build()))
+            .orElseGet(() -> SectorAverageResponse.builder()
+                .sector(normalizedSector)
+                .sectorName(sectorName)
+                .averageScore(0)
+                .count(0)
+                .build());
+    }
 
     public void saveDailySnapshot(COUNTRY country, LocalDate date) {
         if (country == COUNTRY.KOREA) {
@@ -109,4 +142,14 @@ private String resolveSectorName(Enum<?> sector) {
         }
         return sector.name();
     }
+    private String resolveSectorNameByKey(COUNTRY country, String sectorKey) {
+        try {
+            if (country == COUNTRY.KOREA) {
+                return DomesticSector.valueOf(sectorKey).getName();
+            }
+            return OverseasSector.valueOf(sectorKey).getName();
+        } catch (IllegalArgumentException e) {
+            return sectorKey;
+        }
+    }
 }

src/main/java/com/fund/stockProject/stock/service/StockService.java

@@ -545,6 +545,17 @@ private Double parseDouble(String value) {
         }
     }
 
+    private double roundTo1Decimal(double value) {
+        return Math.round(value * 10.0) / 10.0;
+    }
+
+    private java.time.YearMonth parseYearMonthOrNow(String value) {
+        if (value == null || value.isBlank()) {
+            return java.time.YearMonth.now();
+        }
+        return java.time.YearMonth.parse(value.trim());
+    }
+
     /**
      * 국내/해외 떡상 지표 반환
      * @param country 국내/해외 분류
@@ -821,10 +832,49 @@ public StockDetailResponse getStockDetailInfo(Integer id, COUNTRY country) {
                 .build();
     }
 
+    public StockMonthlyAverageResponse getMonthlyAverageScore(Integer id, String yearMonth) {
+        Stock stock = stockRepository.findStockById(id)
+            .orElseThrow(() -> new RuntimeException("no stock found"));
+
+        COUNTRY country = getCountryFromExchangeNum(stock.getExchangeNum());
+        java.time.YearMonth targetMonth = parseYearMonthOrNow(yearMonth);
+        LocalDate startDate = targetMonth.atDay(1);
+        LocalDate endDate = targetMonth.atEndOfMonth();
+
+        List<Score> scores = scoreRepository.findByStockIdAndDateBetween(stock.getId(), startDate, endDate);
+
+        int sum = 0;
+        int count = 0;
+        if (scores != null) {
+            for (Score score : scores) {
+                int value = country == COUNTRY.KOREA ? score.getScoreKorea() : score.getScoreOversea();
+                if (value == 9999) {
+                    continue;
+                }
+                sum += value;
+                count++;
+            }
+        }
+
+        Double average = count == 0 ? null : roundTo1Decimal(sum / (double) count);
+        return StockMonthlyAverageResponse.builder()
+            .stockId(stock.getId())
+            .symbolName(stock.getSymbolName())
+            .country(country)
+            .yearMonth(targetMonth.toString())
+            .dataCount(count)
+            .averageScore(average)
+            .build();
+    }
+
     public List<SectorAverageResponse> getSectorAverageScores(COUNTRY country) {
         return sectorScoreSnapshotService.getLatestSectorAverages(country);
     }
 
+    public SectorAverageResponse getSectorAverageScore(COUNTRY country, String sectorKey) {
+        return sectorScoreSnapshotService.getLatestSectorAverage(country, sectorKey);
+    }
+
     public SectorPercentileResponse getSectorPercentile(Integer stockId) {
         Stock stock = stockRepository.findStockById(stockId)
             .orElseThrow(() -> new RuntimeException("no stock found"));