api

Author: gkfktkrh153

src/main/java/com/dduckddak/domain/data/population/dto/PopulationTransitionResponse.java

@@ -6,6 +6,7 @@ public record PopulationTransitionResponse(
         List<PopulationData> populationList
 ) {
     public record PopulationData(
+            String townName,
             long quarter,
             long populationOfTown,
             int rankAtCity,

src/main/java/com/dduckddak/domain/data/population/service/PopulationService.java

@@ -78,7 +78,7 @@ public PopulationTransitionResponse getFloatingPopulationTransition(String code)
         List<Population> populations = populationRepository.findFloatingPopulationTransition(code);
         List<PopulationData> populationDataList = new ArrayList<>();
 
-        long[] quarterArr = new long[]{20241L, 20234L, 20233L, 20232L, 20231L};
+        long[] quarterArr = new long[]{20231L,  20232L, 20233L, 20234L ,20241L };
         for(long quarter : quarterArr){
 
             List<Population> listOfCity = populations.stream().filter
@@ -97,7 +97,7 @@ public PopulationTransitionResponse getFloatingPopulationTransition(String code)
             int rankAtDistrict = listOfDistrict.indexOf(population) + 1; // 20241분기 구 내 등수
             long populationAvgOfDistrict = (long) listOfDistrict.stream().mapToLong(Population::getTotalPopulation).average().getAsDouble();
 
-            populationDataList.add(new PopulationData(quarter, populationOfTown, rankAtCity, populationAvgOfCity, rankAtDistrict, populationAvgOfDistrict));
+            populationDataList.add(new PopulationData(population.getTown().getName().split(" ")[1] ,quarter, populationOfTown, rankAtCity, populationAvgOfCity, rankAtDistrict, populationAvgOfDistrict));
         }
 
         return PopulationTransitionResponse.from(populationDataList);

src/main/java/com/dduckddak/domain/data/sales/dto/SalesTransitionByIndustryResponse.java

@@ -6,6 +6,8 @@ public record SalesTransitionByIndustryResponse(
         List<SalesData> salesList
 ) {
     public record SalesData(
+            String townName,
+            String industryName,
             long quarter,
             long salesOfTown,
             int rankAtCity,

src/main/java/com/dduckddak/domain/data/sales/dto/SalesTransitionResponse.java

@@ -6,6 +6,7 @@ public record SalesTransitionResponse(
         List<SalesData> salesList
 ) {
     public record SalesData(
+            String townName,
             long quarter,
             long salesOfTown,
             int rankAtCity,

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

@@ -42,7 +42,7 @@ public SalesTransitionResponse getSalesTransition(String code) {
 
         List<SalesTransitionResponse.SalesData> salesDataList = new ArrayList<>();
 
-        long[] quarterArr = new long[]{20241L, 20234L, 20233L, 20232L, 20231L};
+        long[] quarterArr = new long[]{20231L,  20232L, 20233L, 20234L ,20241L };
         for(long quarter : quarterArr){
 
             List<SalesForTransitionData> listOfCity = salesForTransitionData.stream().filter
@@ -61,7 +61,7 @@ public SalesTransitionResponse getSalesTransition(String code) {
             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));
+            salesDataList.add(new SalesTransitionResponse.SalesData(sales.getTownName().split(" ")[1] ,quarter, sales.getSalesAtTown(),  rankAtCity, salesAvgOfCity, rankAtDistrict, populationAvgOfDistrict));
         }
 
         return SalesTransitionResponse.from(salesDataList);
@@ -73,7 +73,7 @@ public SalesTransitionByIndustryResponse getSalesTransitionByIndustry(String tow
 
         List<SalesTransitionByIndustryResponse.SalesData> salesDataList = new ArrayList<>();
 
-        long[] quarterArr = new long[]{20241L, 20234L, 20233L, 20232L, 20231L};
+        long[] quarterArr = new long[]{20231L,  20232L, 20233L, 20234L ,20241L };
         for(long quarter : quarterArr){
 
             List<SalesForTransitionData> listOfCity = salesForTransitionData.stream().filter
@@ -92,7 +92,7 @@ public SalesTransitionByIndustryResponse getSalesTransitionByIndustry(String tow
             int rankAtDistrict = listOfDistrict.indexOf(sales) + 1; // 20241분기 구 내 등수
             long populationAvgOfDistrict = (long) listOfDistrict.stream().mapToLong(s -> s.getSalesAtTown()).average().getAsDouble();
 
-            salesDataList.add(new SalesTransitionByIndustryResponse.SalesData(quarter, sales.getSalesAtTown(),  rankAtCity, salesAvgOfCity, rankAtDistrict, populationAvgOfDistrict));
+            salesDataList.add(new SalesTransitionByIndustryResponse.SalesData(sales.getTownName().split(" ")[1], industryName, quarter, sales.getSalesAtTown(),  rankAtCity, salesAvgOfCity, rankAtDistrict, populationAvgOfDistrict));
         }
 
         return SalesTransitionByIndustryResponse.from(salesDataList);