diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerCapacityServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerCapacityServiceImpl.java index 671388508b..507d899735 100644 --- a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerCapacityServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerCapacityServiceImpl.java @@ -105,10 +105,8 @@ class ReviewerCapacityServiceImpl implements ReviewerCapacityService, ReviewerAs .limit(3) // get three years .map(historicYear -> { Optional<ReviewerTarget> reviewerTarget = reviewerTargetRepository.getReviewerTarget(reviewer, historicYear); - int completedInSpring = decisionRepository.countDecisions(reviewer, - startOfSpring(historicYear.getValue()), endOfSpring(historicYear.getValue())); - int completedInAutumn = decisionRepository.countDecisions(reviewer, - startOfAutumn(historicYear.getValue()), endOfAutumn(historicYear.getValue())); + int completedInSpring = countSpringReviews(reviewer, historicYear); + int completedInAutumn = countAutumnReviews(reviewer, historicYear); return new TargetHistory( historicYear, reviewerTarget.map(ReviewerTarget::getSpring).orElse(0), @@ -123,11 +121,23 @@ class ReviewerCapacityServiceImpl implements ReviewerCapacityService, ReviewerAs @Override public RemainingTargets getRemainingTargets(User reviewer, Year year) { Target target = getTarget(reviewer, year); - int springDecisions = decisionRepository.countDecisions(reviewer, startOfSpring(year.getValue()), endOfSpring(year.getValue())); - int autumnReviews = decisionRepository.countDecisions(reviewer, startOfAutumn(year.getValue()), endOfAutumn(year.getValue())); + int springDecisions = countSpringReviews(reviewer, year); + int autumnReviews = countAutumnReviews(reviewer, year); return new RemainingTargets(target.spring() - springDecisions, target.autumn() - autumnReviews); } + private int countSpringReviews(User reviewer, Year year) { + return countReviews(reviewer, startOfSpring(year.getValue()), endOfSpring(year.getValue())); + } + + private int countAutumnReviews(User reviewer, Year year) { + return countReviews(reviewer, startOfAutumn(year.getValue()), endOfAutumn(year.getValue())); + } + + private int countReviews(User reviewer, LocalDate fromDate, LocalDate toDate) { + return decisionRepository.countDecisions(reviewer, fromDate, toDate); + } + private Optional<ReviewerTarget> getTarget(User reviewer, LocalDate date) { return reviewerTargetRepository.getReviewerTarget(reviewer, Year.from(date)); } @@ -242,12 +252,10 @@ class ReviewerCapacityServiceImpl implements ReviewerCapacityService, ReviewerAs private int countAssignedReviews(User reviewer, LocalDate fromDate) { if (fromDate.getMonthValue() <= Month.JUNE.getValue()) { - return decisionRepository.countDecisions(reviewer, - startOfSpring(fromDate.getYear()), endOfSpring(fromDate.getYear())); + return countReviews(reviewer, startOfSpring(fromDate.getYear()), endOfSpring(fromDate.getYear())); } else { - return decisionRepository.countDecisions(reviewer, - startOfAutumn(fromDate.getYear()), endOfAutumn(fromDate.getYear())); + return countReviews(reviewer, startOfAutumn(fromDate.getYear()), endOfAutumn(fromDate.getYear())); } }