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

Jump to bottom

#52 [REFACTOR] Review 관련 API response 리팩토링 #56

Merged
merged 1 commit into from
Jul 18, 2023
Merged

#52 [REFACTOR] Review 관련 API response 리팩토링 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions ...rc/main/java/com/puzzling/puzzlingServer/api/project/service/Impl/ProjectServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ public ProjectRegisterResponseDto createProject(Long memberId, ProjectRegisterRe
return ProjectRegisterResponseDto.of(inviteCode);
}
public List<ProjectTeamRankResponseDto> getTeamRank(Long projectId) {
Project projectById = findProjectById(projectId);
List<UserProject> findUserProjects = userProjectRepository.findAllByProjectIdOrderByReviewCountDesc(projectId);
List<ProjectTeamRankResponseDto> result = new ArrayList<>();
int idx = 1;
Expand Down
15 changes: 13 additions & 2 deletions .../src/main/java/com/puzzling/puzzlingServer/api/review/service/Impl/ReviewServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.puzzling.puzzlingServer.api.review.service.Impl;

import com.puzzling.puzzlingServer.api.member.domain.Member;
import com.puzzling.puzzlingServer.api.member.repository.MemberRepository;
import com.puzzling.puzzlingServer.api.project.domain.Project;
import com.puzzling.puzzlingServer.api.project.domain.UserProject;
import com.puzzling.puzzlingServer.api.project.repository.ProjectRepository;
Expand Down Expand Up @@ -29,11 +31,10 @@
import com.puzzling.puzzlingServer.api.template.domain.ReviewTemplate;
import com.puzzling.puzzlingServer.api.template.strategy.AARReviewTemplateStrategy;
import com.puzzling.puzzlingServer.api.template.strategy.FiveFReviewTemplateStrategy;
import com.puzzling.puzzlingServer.api.template.strategy.ReviewTemplateStrategy;
import com.puzzling.puzzlingServer.api.template.strategy.TILReviewTemplateStrategy;
import com.puzzling.puzzlingServer.common.exception.BadRequestException;
import com.puzzling.puzzlingServer.common.exception.NotFoundException;
import com.puzzling.puzzlingServer.common.util.DateUtil;
import com.puzzling.puzzlingServer.common.response.ErrorStatus;
import lombok.RequiredArgsConstructor;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Service;
Expand Down Expand Up @@ -61,6 +62,7 @@ public class ReviewServiceImpl implements ReviewService {
private final ReviewAARRepository reviewAARRepository;
private final ReviewRepository reviewRepository;
private final ProjectRepository projectRepository;
private final MemberRepository memberRepository;

@Override
@Transactional
Expand Down Expand Up @@ -179,6 +181,9 @@ public ReviewPreviousTemplateResponseDto getPreviousReviewTemplate(Long memberId
@Override
@Transactional
public List<ReviewActionPlanResponseDto> getReviewActionPlans(Long memberId, Long projectId) {

findUserProjectByMemberIdAndProjectId(memberId, projectId);

List<Review> findReviews = reviewRepository.findAllByMemberIdAndProjectIdOrderByReviewDateDesc(memberId, projectId);

return findReviews.stream()
Expand Down Expand Up @@ -239,6 +244,7 @@ public List<ReviewTeamStatusResponseDto> getTeamReviewStatus(Long projectId, Str
@Transactional
public List<ReviewDetailResponseDto> getMyReviewDetail(Long memberId, Long projectId, String startDate, String endDate) {
List<ReviewDetailResponseDto> result = new ArrayList<>();
findMemberById(memberId);
String reviewCycle = findProjectById(projectId).getReviewCycle();

List<String> reviewDates = generateReviewDates(startDate, endDate, reviewCycle);
Expand Down Expand Up @@ -308,6 +314,11 @@ public List<MyReviewProjectResponseDto> getMyReviewProjects(Long memberId, Long
.collect(Collectors.toList());
}

private Member findMemberById(Long memberId) {
return memberRepository.findById(memberId)
.orElseThrow(() -> new NotFoundException(ErrorStatus.NOT_FOUND_MEMBER.getMessage()));
}

private Project findProjectById (Long projectId) {
return projectRepository.findById(projectId).orElseThrow(() ->
new NotFoundException(NOT_FOUND_PROJECT.getMessage()));
Expand Down
Loading