매출 추이 api 버그수정

Author: gkfktkrh153

src/main/java/com/dduckddak/domain/data/dto/SalesForTransitionData.java

@@ -10,11 +10,11 @@
 public class SalesForTransitionData {
     private String townName;
     private String townCode;
-    private String quarter;
+    private Long quarter;
     private Long salesAtTown;
 
     @QueryProjection
-    public SalesForTransitionData(String townName, String townCode, String quarter, Long salesAtTown) {
+    public SalesForTransitionData(String townName, String townCode, Long quarter, Long salesAtTown) {
         this.townName = townName;
         this.townCode = townCode;
         this.quarter = quarter;

src/main/java/com/dduckddak/domain/data/repository/sales/SalesRepositoryImpl.java

@@ -82,11 +82,11 @@ public List<Sales> findByTownAndIndustryInDistrict(String district, String name)
 
     @Override
     public List<SalesForTransitionData> findSalesForTransitionData() {
-        queryFactory
+        return queryFactory
                 .select(new QSalesForTransitionData(
                         town.name.stringValue(),
                         town.code.stringValue(),
-                        town.quarter.stringValue(),
+                        town.quarter,
                         sales.currentMonthlySales.sum()
                 ))
                 .from(townIndustry)
@@ -99,6 +99,5 @@ public List<SalesForTransitionData> findSalesForTransitionData() {
                 .orderBy(town.quarter.desc(), sales.currentMonthlySales.sum().desc())
                 .fetch();
 
-        return List.of();
     }
 }

src/main/java/com/dduckddak/domain/data/service/SalesService.java

@@ -51,14 +51,14 @@ public SalesTransitionResponse getSalesTransition(String code) {
             SalesForTransitionData sales = listOfCity.stream().filter(s -> s.getTownCode().equals(code)).findFirst().get();
             Long salesAtTown = sales.getSalesAtTown();
 
-            int rankAtCity = listOfCity.indexOf(salesAtTown) + 1; // 20241분기 시 내 등수
+            int rankAtCity = listOfCity.indexOf(sales) + 1; // 20241분기 시 내 등수
             long salesAvgOfCity = (long) listOfCity.stream().mapToLong(s -> s.getSalesAtTown()).average().getAsDouble();
 
 
             List<SalesForTransitionData> listOfDistrict = listOfCity.stream().filter
                     (s -> s.getTownName().split(" ")[0].equals(sales.getTownName().split(" ")[0])).toList();
 
-            int rankAtDistrict = listOfDistrict.indexOf(salesAtTown) + 1; // 20241분기 구 내 등수
+            int rankAtDistrict = listOfDistrict.indexOf(sales) + 1; // 20241분기 구 내 등수
             long populationAvgOfDistrict = (long) listOfDistrict.stream().mapToLong(s -> s.getSalesAtTown()).average().getAsDouble();
 
             salesDataList.add(new SalesTransitionResponse.SalesData(quarter, sales.getSalesAtTown(),  rankAtCity, salesAvgOfCity, rankAtDistrict, populationAvgOfDistrict));