diff --git a/src/main/java/yerong/wedle/competitionRate/domain/CompetitionRate.java b/src/main/java/yerong/wedle/competitionRate/domain/CompetitionRate.java index 6b78239..11a1b26 100644 --- 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 index 392433e..f81a8c5 100644 --- 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 index 3a144d3..e2a0877 100644 --- 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 index 8d5db49..26aa37f 100644 --- 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 departments = departmentRepository.findByUniversity(university); List 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 employmentRateResponses = employmentRates.stream()