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

[FEAT] 첨삭: 첨삭 PDF_해제PDF 시험정보 반환데이터 추가 #85

Merged
merged 2 commits into from
Jan 14, 2024
Merged

[FEAT] 첨삭: 첨삭 PDF_해제PDF 시험정보 반환데이터 추가 #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bafed90
[ADD] DTO에 universityExamName 추가
mikekks Jan 14, 2024
74d9d7f
[ADD] 리턴 데이터 변경
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
5 changes: 3 additions & 2 deletions .../domain/universityExamRecord/controller/dto/response/UniversityExamRecordResponseDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package com.nonsoolmate.nonsoolmateServer.domain.universityExamRecord.controller.dto.response;

public record UniversityExamRecordResponseDTO(
String universityExamName,
String examAnswerUrl,
String examResultUrl
) {
public static UniversityExamRecordResponseDTO of(String examAnswerUrl, String examResultUrl) {
return new UniversityExamRecordResponseDTO(examAnswerUrl, examResultUrl);
public static UniversityExamRecordResponseDTO of(String universityExamName, String examAnswerUrl, String examResultUrl) {
return new UniversityExamRecordResponseDTO(universityExamName, examAnswerUrl, examResultUrl);
}
}
7 changes: 6 additions & 1 deletion ...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(answerUrl, resultUrl);
return UniversityExamRecordResponseDTO.of(getUniversityExamName(universityExam), answerUrl, resultUrl);
}

public UniversityExamRecordResultResponseDTO getUniversityExamRecordResult(Long universityExamId, Member member) {
Expand Down Expand Up @@ -108,6 +108,11 @@ 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