DMC/scipro
7
0
Fork 0
Code Issues43 Pull Requests9 Actions Projects1 Releases Wiki Activity

3392 Refactoring

Browse Source
This commit is contained in:
Andreas Svanberg 2024-05-22 12:38:57 +02:00
parent a79ee20cba
commit 58cd2003a7
1 changed files with 18 additions and 10 deletions

28
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 .limit(3) // get three years
.map(historicYear -> { .map(historicYear -> {
Optional<ReviewerTarget> reviewerTarget = reviewerTargetRepository.getReviewerTarget(reviewer, historicYear); Optional<ReviewerTarget> reviewerTarget = reviewerTargetRepository.getReviewerTarget(reviewer, historicYear);
int completedInSpring = decisionRepository.countDecisions(reviewer, int completedInSpring = countSpringReviews(reviewer, historicYear);
startOfSpring(historicYear.getValue()), endOfSpring(historicYear.getValue())); int completedInAutumn = countAutumnReviews(reviewer, historicYear);
int completedInAutumn = decisionRepository.countDecisions(reviewer,
startOfAutumn(historicYear.getValue()), endOfAutumn(historicYear.getValue()));
return new TargetHistory( return new TargetHistory(
historicYear, historicYear,
reviewerTarget.map(ReviewerTarget::getSpring).orElse(0), reviewerTarget.map(ReviewerTarget::getSpring).orElse(0),
@ -123,11 +121,23 @@ class ReviewerCapacityServiceImpl implements ReviewerCapacityService, ReviewerAs
@Override @Override
public RemainingTargets getRemainingTargets(User reviewer, Year year) { public RemainingTargets getRemainingTargets(User reviewer, Year year) {
Target target = getTarget(reviewer, year); Target target = getTarget(reviewer, year);
int springDecisions = decisionRepository.countDecisions(reviewer, startOfSpring(year.getValue()), endOfSpring(year.getValue())); int springDecisions = countSpringReviews(reviewer, year);
int autumnReviews = decisionRepository.countDecisions(reviewer, startOfAutumn(year.getValue()), endOfAutumn(year.getValue())); int autumnReviews = countAutumnReviews(reviewer, year);
return new RemainingTargets(target.spring() - springDecisions, target.autumn() - autumnReviews); 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) { private Optional<ReviewerTarget> getTarget(User reviewer, LocalDate date) {
return reviewerTargetRepository.getReviewerTarget(reviewer, Year.from(date)); return reviewerTargetRepository.getReviewerTarget(reviewer, Year.from(date));
} }
@ -242,12 +252,10 @@ class ReviewerCapacityServiceImpl implements ReviewerCapacityService, ReviewerAs
private int countAssignedReviews(User reviewer, LocalDate fromDate) { private int countAssignedReviews(User reviewer, LocalDate fromDate) {
if (fromDate.getMonthValue() <= Month.JUNE.getValue()) { if (fromDate.getMonthValue() <= Month.JUNE.getValue()) {
return decisionRepository.countDecisions(reviewer, return countReviews(reviewer, startOfSpring(fromDate.getYear()), endOfSpring(fromDate.getYear()));
startOfSpring(fromDate.getYear()), endOfSpring(fromDate.getYear()));
} }
else { else {
return decisionRepository.countDecisions(reviewer, return countReviews(reviewer, startOfAutumn(fromDate.getYear()), endOfAutumn(fromDate.getYear()));
startOfAutumn(fromDate.getYear()), endOfAutumn(fromDate.getYear()));
} }
} }