Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,22 @@ public class ReadReviewSubmissionResponse {
LocalDateTime createdAt;
LocalDateTime updatedAt;

public static ReadReviewSubmissionResponse from(ReviewSubmission reviewSubmission) {

BaseAuditResponse baseAuditResponse = BaseAuditResponse.from(reviewSubmission.getCreatedAt());
return ReadReviewSubmissionResponse.builder()
.id(reviewSubmission.getId())
.reviewer(ReadReviewerResponse.from(reviewSubmission.getReviewer()))
.reviewee(ReadRevieweeResponse.from(reviewSubmission.getReviewee()))
.gitUrl(reviewSubmission.getGitUrl())
.branch(reviewSubmission.getBranch())
.requestDetails(reviewSubmission.getRequestDetails())
.status(reviewSubmission.getStatus())
.createdAt(baseAuditResponse.getCreatedAt())
.updatedAt(baseAuditResponse.getUpdatedAt())
.build();
}

public static ReadReviewSubmissionResponse from(ReviewSubmission reviewSubmission, ProjectFileSystemResponse fileSystem) {

BaseAuditResponse baseAuditResponse = BaseAuditResponse.from(reviewSubmission.getCreatedAt());
Expand Down
9 changes: 1 addition & 8 deletions src/main/java/konkuk/ptal/service/ReviewServiceImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,7 @@ public ListReviewSubmissionResponse getReviewSubmissions(ReviewSubmissionType ty
break;
}
List<ReadReviewSubmissionResponse> content = reviewSubmissionPage.getContent().stream()
.map(submission -> {
ProjectFileSystemResponse fileSystem = fileService.getProjectFileSystem(
submission.getGitUrl(),
submission.getBranch(),
submission.getId()
);
return ReadReviewSubmissionResponse.from(submission, fileSystem);
})
.map(ReadReviewSubmissionResponse::from)
.collect(Collectors.toList());

return new ListReviewSubmissionResponse(reviewSubmissionPage, content);
Expand Down