From e51c643c75a429ed3e2174af27c06733da4bf517 Mon Sep 17 00:00:00 2001 From: mikekks Date: Sun, 14 Jan 2024 23:25:05 +0900 Subject: [PATCH] =?UTF-8?q?[REFACTOR]=20=EB=A9=94=EC=84=9C=EB=93=9C=20?= =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/university/entity/UniversityExam.java | 2 +- .../domain/university/service/UniversityExamService.java | 5 ++--- .../service/UniversityExamRecordService.java | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/nonsoolmateServer/src/main/java/com/nonsoolmate/nonsoolmateServer/domain/university/entity/UniversityExam.java b/nonsoolmateServer/src/main/java/com/nonsoolmate/nonsoolmateServer/domain/university/entity/UniversityExam.java index 803d2e9..843f3bb 100644 --- a/nonsoolmateServer/src/main/java/com/nonsoolmate/nonsoolmateServer/domain/university/entity/UniversityExam.java +++ b/nonsoolmateServer/src/main/java/com/nonsoolmate/nonsoolmateServer/domain/university/entity/UniversityExam.java @@ -39,7 +39,7 @@ public class UniversityExam { @NotNull private int universityExamTimeLimit; - public String getUniversityAndUniversityExamName(){ + public String getUniversityExamFullName(){ return this.getUniversity().getUniversityName() + " - " + this.getUniversityExamYear() + " " + this.getUniversityExamName(); } } \ No newline at end of file diff --git a/nonsoolmateServer/src/main/java/com/nonsoolmate/nonsoolmateServer/domain/university/service/UniversityExamService.java b/nonsoolmateServer/src/main/java/com/nonsoolmate/nonsoolmateServer/domain/university/service/UniversityExamService.java index 89fc45d..890b920 100644 --- a/nonsoolmateServer/src/main/java/com/nonsoolmate/nonsoolmateServer/domain/university/service/UniversityExamService.java +++ b/nonsoolmateServer/src/main/java/com/nonsoolmate/nonsoolmateServer/domain/university/service/UniversityExamService.java @@ -2,7 +2,6 @@ import static com.nonsoolmate.nonsoolmateServer.external.aws.FolderName.EXAM_ANSWER_FOLDER_NAME; import static com.nonsoolmate.nonsoolmateServer.external.aws.FolderName.EXAM_IMAGE_FOLDER_NAME; -import static com.nonsoolmate.nonsoolmateServer.external.aws.FolderName.EXAM_RESULT_FOLDER_NAME; import com.nonsoolmate.nonsoolmateServer.domain.university.controller.dto.response.UniversityExamImageAndAnswerResponseDTO; import com.nonsoolmate.nonsoolmateServer.domain.university.controller.dto.response.UniversityExamImageResponseDTO; @@ -35,7 +34,7 @@ public UniversityExamInfoResponseDTO getUniversityExam(Long universityExamId) { UniversityExam universityExam = universityExamRepository.findByUniversityExamId(universityExamId) .orElseThrow(() -> new UniversityExamException( UniversityExamExceptionType.NOT_FOUND_UNIVERSITY_EXAM)); - String universityExamName = universityExam.getUniversityAndUniversityExamName(); + String universityExamName = universityExam.getUniversityExamFullName(); return UniversityExamInfoResponseDTO.of(universityExam.getUniversityExamId(), universityExamName, universityExam.getUniversityExamTimeLimit()); @@ -74,7 +73,7 @@ public UniversityExamImageAndAnswerResponseDTO getUniversityExamImageAndAnswer(L }); return UniversityExamImageAndAnswerResponseDTO.of( - universityExam.getUniversityAndUniversityExamName() + universityExam.getUniversityExamFullName() , examImageUrls, examAnswerUrl); } diff --git a/nonsoolmateServer/src/main/java/com/nonsoolmate/nonsoolmateServer/domain/universityExamRecord/service/UniversityExamRecordService.java b/nonsoolmateServer/src/main/java/com/nonsoolmate/nonsoolmateServer/domain/universityExamRecord/service/UniversityExamRecordService.java index 3258b98..240f57a 100644 --- a/nonsoolmateServer/src/main/java/com/nonsoolmate/nonsoolmateServer/domain/universityExamRecord/service/UniversityExamRecordService.java +++ b/nonsoolmateServer/src/main/java/com/nonsoolmate/nonsoolmateServer/domain/universityExamRecord/service/UniversityExamRecordService.java @@ -47,7 +47,7 @@ public UniversityExamRecordResponseDTO getUniversityExamRecord(Long universityEx String resultUrl = cloudFrontService.createPreSignedGetUrl(EXAM_RESULT_FOLDER_NAME, universityExamRecord.getExamRecordResultFileName(), universityExam.getUniversityExamTimeLimit()); - return UniversityExamRecordResponseDTO.of(universityExam.getUniversityAndUniversityExamName(), answerUrl, resultUrl); + return UniversityExamRecordResponseDTO.of(universityExam.getUniversityExamFullName(), answerUrl, resultUrl); } public UniversityExamRecordResultResponseDTO getUniversityExamRecordResult(Long universityExamId, Member member) {