diff --git a/src/main/java/konkuk/ptal/dto/response/ReadReviewSubmissionResponse.java b/src/main/java/konkuk/ptal/dto/response/ReadReviewSubmissionResponse.java index fd9f1d8..e2487c4 100644 --- a/src/main/java/konkuk/ptal/dto/response/ReadReviewSubmissionResponse.java +++ b/src/main/java/konkuk/ptal/dto/response/ReadReviewSubmissionResponse.java @@ -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()); diff --git a/src/main/java/konkuk/ptal/service/ReviewServiceImpl.java b/src/main/java/konkuk/ptal/service/ReviewServiceImpl.java index 0a0c2ee..659cec3 100644 --- a/src/main/java/konkuk/ptal/service/ReviewServiceImpl.java +++ b/src/main/java/konkuk/ptal/service/ReviewServiceImpl.java @@ -87,14 +87,7 @@ public ListReviewSubmissionResponse getReviewSubmissions(ReviewSubmissionType ty break; } List 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);