-
Notifications
You must be signed in to change notification settings - Fork 2
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.
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
[BE] feat: 리뷰 상세 조회 기능 구현 #182
Merged
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
efce161
feat: 컨트롤러 리뷰
Kimprodp 9e57e59
feat: 리뷰 상세 조회 api 응답 객체 구현
Kimprodp 95afd2e
refactor: 리뷰 상세 조회 api 응답 객체명 변경
Kimprodp e08e795
feat: 서비스 리뷰 상세 조회 기능 구현
Kimprodp 9c97f81
test: 리뷰 상세 조회 기능 테스트 추가
Kimprodp 87b4053
style: 오타 및 개행 수정
Kimprodp 50a1764
refactor: 날짜 응답 시, 일자까지만 응답하도록 변경
Kimprodp b2babe6
refactor: 리뷰 조회 권한 검증 로직을 repository 사용하도록 변경
Kimprodp 03c5391
refactor: 검증메세지 변경
Kimprodp 91317c3
refactor: 리뷰 서비스에서 리뷰 그룹을 찾을 수 없는 경우에 대한 예외 클래스 변경
Kimprodp 7bef9d7
refactor: 리뷰 상세 조회 메서드명 변경
Kimprodp 6ca7c83
refactor: 헤더명 상수화
Kimprodp 9b8a570
Merge remote-tracking branch 'refs/remotes/origin/develop' into be/re…
Kimprodp File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
backend/src/main/java/reviewme/review/domain/exception/ReviewGroupNotFoundException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
package reviewme.review.domain.exception; | ||
|
||
import reviewme.global.exception.NotFoundException; | ||
|
||
public class ReviewGroupNotFoundException extends NotFoundException { | ||
|
||
public ReviewGroupNotFoundException() { | ||
super("리뷰 그룹을 찾을 수 없어요."); | ||
} | ||
} |
10 changes: 10 additions & 0 deletions
10
...end/src/main/java/reviewme/review/domain/exception/ReviewIsNotInReviewGroupException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
package reviewme.review.domain.exception; | ||
|
||
import reviewme.global.exception.BadRequestException; | ||
|
||
public class ReviewIsNotInReviewGroupException extends BadRequestException { | ||
|
||
public ReviewIsNotInReviewGroupException() { | ||
super("리뷰 그룹에 해당하는 리뷰가 아니에요."); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
backend/src/main/java/reviewme/review/dto/response/ReviewDetailResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
package reviewme.review.dto.response; | ||
|
||
import io.swagger.v3.oas.annotations.media.Schema; | ||
import java.time.LocalDate; | ||
import java.util.List; | ||
|
||
@Schema(name = "리뷰 상세 조회 응답") | ||
public record ReviewDetailResponse( | ||
|
||
@Schema(description = "리뷰 ID") | ||
long id, | ||
|
||
@Schema(description = "리뷰 작성일") | ||
LocalDate createdAt, | ||
|
||
@Schema(description = "프로젝트명") | ||
String projectName, | ||
|
||
@Schema(description = "리뷰이 이름") | ||
String revieweeName, | ||
|
||
@Schema(description = "리뷰 문항 목록") | ||
List<ReviewContentResponse> contents, | ||
|
||
@Schema(description = "키워드 목록") | ||
List<KeywordResponse> keywords | ||
) { | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,23 +6,26 @@ | |
import org.springframework.stereotype.Service; | ||
import org.springframework.transaction.annotation.Transactional; | ||
import reviewme.keyword.repository.KeywordRepository; | ||
import reviewme.question.domain.Question; | ||
import reviewme.review.domain.Review; | ||
import reviewme.review.domain.ReviewContent; | ||
import reviewme.review.domain.ReviewKeyword; | ||
import reviewme.review.domain.exception.ReviewGroupNotFoundException; | ||
import reviewme.review.domain.exception.ReviewIsNotInReviewGroupException; | ||
import reviewme.review.dto.request.CreateReviewContentRequest; | ||
import reviewme.review.dto.request.CreateReviewRequest; | ||
import reviewme.review.dto.response.KeywordResponse; | ||
import reviewme.review.dto.response.QuestionSetupResponse; | ||
import reviewme.review.dto.response.ReceivedReviewKeywordsResponse; | ||
import reviewme.review.dto.response.ReceivedReviewResponse; | ||
import reviewme.review.dto.response.ReceivedReviewsResponse; | ||
import reviewme.review.dto.response.ReviewSetUpKeyword; | ||
import reviewme.review.dto.response.ReviewContentResponse; | ||
import reviewme.review.dto.response.ReviewDetailResponse; | ||
import reviewme.review.dto.response.ReviewSetupResponse; | ||
import reviewme.review.repository.QuestionRepository; | ||
import reviewme.review.repository.ReviewContentRepository; | ||
import reviewme.review.repository.ReviewKeywordRepository; | ||
import reviewme.review.repository.ReviewRepository; | ||
import reviewme.review.service.exception.InvalidGroupAccessCodeException; | ||
import reviewme.review.service.exception.InvalidReviewRequestCodeException; | ||
import reviewme.reviewgroup.domain.ReviewGroup; | ||
import reviewme.reviewgroup.repository.ReviewGroupRepository; | ||
|
||
|
@@ -51,7 +54,7 @@ public Long createReview(CreateReviewRequest request) { | |
|
||
private Review saveReview(CreateReviewRequest request) { | ||
ReviewGroup reviewGroup = reviewGroupRepository.findByReviewRequestCode(request.reviewRequestCode()) | ||
.orElseThrow(InvalidReviewRequestCodeException::new); | ||
.orElseThrow(ReviewGroupNotFoundException::new); | ||
|
||
List<Long> questionIds = request.reviewContents() | ||
.stream() | ||
|
@@ -79,29 +82,67 @@ private void saveReviewKeywords(List<Long> selectedKeywordIds, long savedReviewI | |
@Transactional(readOnly = true) | ||
public ReviewSetupResponse findReviewCreationSetup(String reviewRequestCode) { | ||
ReviewGroup reviewGroup = reviewGroupRepository.findByReviewRequestCode(reviewRequestCode) | ||
.orElseThrow(InvalidReviewRequestCodeException::new); | ||
.orElseThrow(ReviewGroupNotFoundException::new); | ||
return createReviewSetupResponse(reviewGroup); | ||
} | ||
|
||
private ReviewSetupResponse createReviewSetupResponse(ReviewGroup reviewGroup) { | ||
List<QuestionSetupResponse> questionSetupRespons = questionRepository.findAll() | ||
List<QuestionSetupResponse> questionSetupResponse = questionRepository.findAll() | ||
.stream() | ||
.map(question -> new QuestionSetupResponse(question.getId(), question.getContent())) | ||
.toList(); | ||
|
||
List<ReviewSetUpKeyword> reviewSetUpKeywordRespons = keywordRepository.findAll() | ||
List<KeywordResponse> keywordResponse = keywordRepository.findAll() | ||
.stream() | ||
.map(keyword -> new ReviewSetUpKeyword(keyword.getId(), keyword.getContent())) | ||
.map(keyword -> new KeywordResponse(keyword.getId(), keyword.getContent())) | ||
.toList(); | ||
|
||
return new ReviewSetupResponse(reviewGroup.getReviewee(), reviewGroup.getProjectName(), | ||
questionSetupRespons, reviewSetUpKeywordRespons); | ||
return new ReviewSetupResponse( | ||
reviewGroup.getReviewee(), reviewGroup.getProjectName(), questionSetupResponse, keywordResponse | ||
); | ||
} | ||
|
||
@Transactional(readOnly = true) | ||
public ReviewDetailResponse findReceivedReviewDetail(String groupAccessCode, long reviewId) { | ||
ReviewGroup reviewGroup = reviewGroupRepository.findByGroupAccessCode(groupAccessCode) | ||
.orElseThrow(ReviewGroupNotFoundException::new); | ||
|
||
Review review = reviewRepository.findByIdAndReviewGroupId(reviewId, reviewGroup.getId()) | ||
.orElseThrow(ReviewIsNotInReviewGroupException::new); | ||
|
||
return createReviewDetailResponse(review, reviewGroup); | ||
} | ||
|
||
private ReviewDetailResponse createReviewDetailResponse(Review review, ReviewGroup reviewGroup) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 커테도 dto 변환을 private 메서드로 분리해서 해줬군요! |
||
List<ReviewContentResponse> reviewContents = review.getReviewContents() | ||
.stream() | ||
.map(reviewContent -> { | ||
Question question = questionRepository.getQuestionById(reviewContent.getQuestionId()); | ||
return new ReviewContentResponse(reviewContent.getId(), question.getContent(), | ||
reviewContent.getAnswer()); | ||
}) | ||
.toList(); | ||
|
||
List<KeywordResponse> keywords = reviewKeywordRepository.findAllByReviewId(review.getId()) | ||
.stream() | ||
.map(reviewKeyword -> keywordRepository.getKeywordById(reviewKeyword.getKeywordId())) | ||
.map(keyword -> new KeywordResponse(keyword.getId(), keyword.getContent())) | ||
.toList(); | ||
|
||
return new ReviewDetailResponse( | ||
review.getId(), | ||
review.getCreatedAt().toLocalDate(), | ||
reviewGroup.getProjectName(), | ||
reviewGroup.getReviewee(), | ||
reviewContents, | ||
keywords | ||
); | ||
} | ||
|
||
@Transactional(readOnly = true) | ||
public ReceivedReviewsResponse findReceivedReviews(String groupAccessCode) { | ||
ReviewGroup reviewGroup = reviewGroupRepository.findByGroupAccessCode(groupAccessCode) | ||
.orElseThrow(InvalidGroupAccessCodeException::new); | ||
.orElseThrow(ReviewGroupNotFoundException::new); | ||
List<ReceivedReviewResponse> reviewResponses = reviewRepository.findAllByReviewGroupId(reviewGroup.getId()) | ||
.stream() | ||
.map(this::extractResponse) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +0,0 @@ | ||
package reviewme.review.service.exception; | ||
|
||
import reviewme.global.exception.BadRequestException; | ||
|
||
public class InvalidReviewRequestCodeException extends BadRequestException { | ||
|
||
public InvalidReviewRequestCodeException() { | ||
super("잘못된 리뷰 요청코드입니다."); | ||
} | ||
} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
이거 진짜 사소한 것 :
revieweeName은 '리뷰이 이름'인데
projectName은 '프로젝트명'으로 되어있어요!
통일하면 좋을 것 같아요