3204 Remove old methods
This commit is contained in:
parent
7002608118
commit
5826341e45
core/src/main/java/se/su/dsv/scipro/reviewing
@ -9,12 +9,6 @@ import java.util.List;
|
||||
public interface ReviewerCapacityService {
|
||||
record Target(int spring, int autumn, String note) {}
|
||||
|
||||
default void assignTarget(User reviewer, DateRange dateRange, int target) {
|
||||
Year year = Year.from(dateRange.from());
|
||||
int spring = dateRange.from().getMonthValue() < 7 ? target : 0;
|
||||
int autumn = dateRange.from().getMonthValue() > 6 ? target : 0;
|
||||
assignTarget(reviewer, year, new Target(spring, autumn, ""));
|
||||
}
|
||||
void assignTarget(User reviewer, Year year, Target target);
|
||||
|
||||
List<Unit> getUnitsWithReviewers();
|
||||
@ -23,14 +17,5 @@ public interface ReviewerCapacityService {
|
||||
|
||||
List<User> getActiveReviewersOnUnit(Unit unit);
|
||||
|
||||
default int getTarget(User reviewerObject, DateRange dateRange) {
|
||||
Year year = Year.from(dateRange.from());
|
||||
return getTarget(reviewerObject, year).spring();
|
||||
}
|
||||
|
||||
Target getTarget(User reviewer, Year year);
|
||||
|
||||
String getNote(User reviewer, DateRange dateRange);
|
||||
|
||||
void setNote(User reviewer, DateRange dateRange, String note);
|
||||
}
|
@ -1,7 +1,6 @@
|
||||
package se.su.dsv.scipro.reviewing;
|
||||
|
||||
import com.google.common.eventbus.EventBus;
|
||||
import com.google.inject.persist.Transactional;
|
||||
import se.su.dsv.scipro.project.Project;
|
||||
import se.su.dsv.scipro.project.ProjectService;
|
||||
import se.su.dsv.scipro.project.ReviewerAssignedEvent;
|
||||
@ -93,31 +92,6 @@ class ReviewerCapacityServiceImpl implements ReviewerCapacityService, ReviewerAs
|
||||
.orElse(new Target(0, 0, ""));
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getNote(User reviewer, DateRange dateRange) {
|
||||
return reviewerTargetRepository.getReviewerTarget(reviewer, Year.from(dateRange.from()))
|
||||
.map(ReviewerTarget::getNote)
|
||||
.orElse("");
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public void setNote(User reviewer, DateRange dateRange, String note) {
|
||||
Optional<ReviewerTarget> currentTarget = reviewerTargetRepository.getReviewerTarget(reviewer, Year.from(dateRange.from()));
|
||||
if (currentTarget.isPresent()) {
|
||||
ReviewerTarget targetToUpdate = currentTarget.get();
|
||||
targetToUpdate.setNote(note);
|
||||
reviewerTargetRepository.save(targetToUpdate);
|
||||
}
|
||||
else {
|
||||
ReviewerTarget reviewerTarget = new ReviewerTarget();
|
||||
reviewerTarget.setReviewer(reviewer);
|
||||
reviewerTarget.setYear(dateRange.from().getYear());
|
||||
reviewerTarget.setNote(note);
|
||||
reviewerTargetRepository.save(reviewerTarget);
|
||||
}
|
||||
}
|
||||
|
||||
private Optional<ReviewerTarget> getTarget(User reviewer, LocalDate date) {
|
||||
return reviewerTargetRepository.getReviewerTarget(reviewer, Year.from(date));
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user