Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[REFACTOR] 공통 메서드를 entity내 메서드로 수정 #87

Merged
merged 4 commits into from
Jan 14, 2024
Merged

[REFACTOR] 공통 메서드를 entity내 메서드로 수정 #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c3c07c
[REFACTOR] entity 객체 내 공통메서드 생성
mikekks Jan 14, 2024
bc3eea1
[REFACTOR] entity 객체 내 공통메서드 적용
mikekks Jan 14, 2024
7a89852
[REFACTOR] entity 객체 내 공통메서드 적용 및 기존 메서드 삭제
mikekks Jan 14, 2024
15f54d7
[REFACTOR] 메서드 이름 변경
mikekks Jan 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .../main/java/com/nonsoolmate/nonsoolmateServer/domain/university/entity/UniversityExam.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,8 @@ public class UniversityExam {

@NotNull
private int universityExamTimeLimit;

public String getUniversityExamFullName(){
return this.getUniversity().getUniversityName() + " - " + this.getUniversityExamYear() + " " + this.getUniversityExamName();
}
}
10 changes: 2 additions & 8 deletions ...va/com/nonsoolmate/nonsoolmateServer/domain/university/service/UniversityExamService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -35,17 +34,12 @@ public UniversityExamInfoResponseDTO getUniversityExam(Long universityExamId) {
UniversityExam universityExam = universityExamRepository.findByUniversityExamId(universityExamId)
.orElseThrow(() -> new UniversityExamException(
UniversityExamExceptionType.NOT_FOUND_UNIVERSITY_EXAM));
String universityExamName = getUniversityExamName(universityExam);
String universityExamName = universityExam.getUniversityExamFullName();
return UniversityExamInfoResponseDTO.of(universityExam.getUniversityExamId(),
universityExamName,
universityExam.getUniversityExamTimeLimit());
}

private String getUniversityExamName(UniversityExam universityExam) {
return universityExam.getUniversity().getUniversityName() + " - " + universityExam.getUniversityExamYear() + " "
+ universityExam.getUniversityExamName();
}

public Page<UniversityExamImageResponseDTO> getUniversityExamImages(Long id, Pageable pageable) {
UniversityExam universityExam = universityExamRepository.findByUniversityExamId(id)
.orElseThrow(() -> new UniversityExamException(
Expand Down Expand Up @@ -79,7 +73,7 @@ public UniversityExamImageAndAnswerResponseDTO getUniversityExamImageAndAnswer(L
});

return UniversityExamImageAndAnswerResponseDTO.of(
getUniversityExamName(universityExam)
universityExam.getUniversityExamFullName()
, examImageUrls, examAnswerUrl);
}

Expand Down
7 changes: 1 addition & 6 deletions ...te/nonsoolmateServer/domain/universityExamRecord/service/UniversityExamRecordService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public UniversityExamRecordResponseDTO getUniversityExamRecord(Long universityEx
String resultUrl = cloudFrontService.createPreSignedGetUrl(EXAM_RESULT_FOLDER_NAME,
universityExamRecord.getExamRecordResultFileName(), universityExam.getUniversityExamTimeLimit());

return UniversityExamRecordResponseDTO.of(getUniversityExamName(universityExam), answerUrl, resultUrl);
return UniversityExamRecordResponseDTO.of(universityExam.getUniversityExamFullName(), answerUrl, resultUrl);
}

public UniversityExamRecordResultResponseDTO getUniversityExamRecordResult(Long universityExamId, Member member) {
Expand Down Expand Up @@ -108,11 +108,6 @@ private UniversityExam getUniversityExam(Long universityExamId) {
.orElseThrow(() -> new UniversityExamException(NOT_FOUND_UNIVERSITY_EXAM));
}

private String getUniversityExamName(UniversityExam universityExam) {
return universityExam.getUniversity().getUniversityName() + " - " + universityExam.getUniversityExamYear() + " "
+ universityExam.getUniversityExamName();
}

private UniversityExamRecord getUniversityExamByUniversityExamAndMember(UniversityExam universityExam,
Member member) {
return universityExamRecordRepository.findByUniversityExamAndMemberOrElseThrowException(
Expand Down
Loading