Merge pull request #137 from UnivApp/feature/refactor21

feat: 평균 경쟁률 반영
UnivApp · Oct 10, 2024 · 0651de9 · 0651de9
2 parents 0eb3f95 + 5ff337b
commit 0651de9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/src/main/java/yerong/wedle/competitionRate/domain/CompetitionRate.java b/src/main/java/yerong/wedle/competitionRate/domain/CompetitionRate.java
@@ -24,5 +24,6 @@ public class CompetitionRate {
 
     private Double earlyAdmissionRate;
     private Double regularAdmissionRate;
+    private Double AverageAdmissionRate;
     private String competitionYear;
 }
diff --git a/src/main/java/yerong/wedle/competitionRate/dto/CompetitionRateResponse.java b/src/main/java/yerong/wedle/competitionRate/dto/CompetitionRateResponse.java
@@ -10,5 +10,7 @@
 public class CompetitionRateResponse {
     private Double earlyAdmissionRate;
     private Double regularAdmissionRate;
+    private Double AverageAdmissionRate;
+
     private String year;
 }
diff --git a/src/main/java/yerong/wedle/competitionRate/service/CompetitionRateService.java b/src/main/java/yerong/wedle/competitionRate/service/CompetitionRateService.java
@@ -40,6 +40,7 @@ private CompetitionRateResponse convertToDto(CompetitionRate competitionRate) {
         return new CompetitionRateResponse(
                 competitionRate.getEarlyAdmissionRate(),
                 competitionRate.getRegularAdmissionRate(),
+                competitionRate.getAverageAdmissionRate(),
                 competitionRate.getCompetitionYear()
         );
     }

diff --git a/src/main/java/yerong/wedle/university/service/UniversityService.java b/src/main/java/yerong/wedle/university/service/UniversityService.java
@@ -102,7 +102,7 @@ private UniversityAllResponse convertToDetailDto(University university) {
         List<Department> departments = departmentRepository.findByUniversity(university);
 
         List<CompetitionRateResponse> competitionRateResponses = competitionRates.stream()
-                .map(rate -> new CompetitionRateResponse(rate.getEarlyAdmissionRate(), rate.getRegularAdmissionRate(), rate.getCompetitionYear()))
+                .map(rate -> new CompetitionRateResponse(rate.getEarlyAdmissionRate(), rate.getRegularAdmissionRate(), rate.getAverageAdmissionRate(), rate.getCompetitionYear()))
                 .collect(Collectors.toList());
 
         List<EmploymentRateResponse> employmentRateResponses = employmentRates.stream()