From 8cdc127cc0b426207282413e094d2cdba4f04cc5 Mon Sep 17 00:00:00 2001 From: yeseul106 <20191037@sungshin.ac.kr> Date: Wed, 19 Jul 2023 01:35:13 +0900 Subject: [PATCH] =?UTF-8?q?#52=20[REFACTOR]=20Review=20=EA=B4=80=EB=A0=A8?= =?UTF-8?q?=20API=20response=20=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/Impl/ProjectServiceImpl.java | 1 + .../review/service/Impl/ReviewServiceImpl.java | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/project/service/Impl/ProjectServiceImpl.java b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/project/service/Impl/ProjectServiceImpl.java index 53785ed..0d2968a 100644 --- a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/project/service/Impl/ProjectServiceImpl.java +++ b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/project/service/Impl/ProjectServiceImpl.java @@ -171,6 +171,7 @@ public ProjectRegisterResponseDto createProject(Long memberId, ProjectRegisterRe return ProjectRegisterResponseDto.of(inviteCode); } public List getTeamRank(Long projectId) { + Project projectById = findProjectById(projectId); List findUserProjects = userProjectRepository.findAllByProjectIdOrderByReviewCountDesc(projectId); List result = new ArrayList<>(); int idx = 1; diff --git a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/service/Impl/ReviewServiceImpl.java b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/service/Impl/ReviewServiceImpl.java index ac419bd..c52c108 100644 --- a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/service/Impl/ReviewServiceImpl.java +++ b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/service/Impl/ReviewServiceImpl.java @@ -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; @@ -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; @@ -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 @@ -179,6 +181,9 @@ public ReviewPreviousTemplateResponseDto getPreviousReviewTemplate(Long memberId @Override @Transactional public List getReviewActionPlans(Long memberId, Long projectId) { + + findUserProjectByMemberIdAndProjectId(memberId, projectId); + List findReviews = reviewRepository.findAllByMemberIdAndProjectIdOrderByReviewDateDesc(memberId, projectId); return findReviews.stream() @@ -239,6 +244,7 @@ public List getTeamReviewStatus(Long projectId, Str @Transactional public List getMyReviewDetail(Long memberId, Long projectId, String startDate, String endDate) { List result = new ArrayList<>(); + findMemberById(memberId); String reviewCycle = findProjectById(projectId).getReviewCycle(); List reviewDates = generateReviewDates(startDate, endDate, reviewCycle); @@ -308,6 +314,11 @@ public List 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()));