DMC/scipro
7
0
Fork 0
Code Issues44 Pull Requests6 Actions Projects1 Releases Wiki Activity

87: Improve test code, milestones work now correctly.

Browse Source
This commit is contained in:
Tom Zhao 2025-04-24 16:10:09 +02:00
parent 142c835589
commit 18689dca24
2 changed files with 14 additions and 4 deletions
test-data/src/main/java/se/su/dsv/scipro/testdata
DataInitializer.java
populators
SplitProjectPopulator.java

10
test-data/src/main/java/se/su/dsv/scipro/testdata/DataInitializer.java vendored

@ -25,6 +25,7 @@ import se.su.dsv.scipro.match.TholanderBox;
import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate;
import se.su.dsv.scipro.milestones.dataobjects.MilestonePhaseTemplate;
import se.su.dsv.scipro.milestones.service.MilestoneActivityTemplateService;
import se.su.dsv.scipro.milestones.service.MilestonePhaseTemplateService;
import se.su.dsv.scipro.notifications.dataobject.CustomEvent;
import se.su.dsv.scipro.notifications.dataobject.GroupEvent;
import se.su.dsv.scipro.notifications.dataobject.IdeaEvent;
@ -70,6 +71,9 @@ public class DataInitializer implements Lifecycle, BaseData, Factory {
@Inject
private MilestoneActivityTemplateService milestoneActivityTemplateService;
@Inject
private MilestonePhaseTemplateService milestonePhaseTemplateService;
@Inject
private EventService eventService;
@ -2190,8 +2194,10 @@ public class DataInitializer implements Lifecycle, BaseData, Factory {
}
private MilestonePhaseTemplate createMileStonePhase(String title, String description) {
MilestonePhaseTemplate milestonePhaseTemplate1 = new MilestonePhaseTemplate(title, description);
return save(milestonePhaseTemplate1);
MilestonePhaseTemplate milestonePhaseTemplate = new MilestonePhaseTemplate(title, description);
LocalDate ld = LocalDate.now().minusYears(1);
milestonePhaseTemplate.setDateCreated(Date.from(ld.atStartOfDay(ZoneId.systemDefault()).toInstant()));
return milestonePhaseTemplateService.save(milestonePhaseTemplate);
}
private <T> T save(T entity) {

8
test-data/src/main/java/se/su/dsv/scipro/testdata/populators/SplitProjectPopulator.java vendored

@ -13,6 +13,7 @@ import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.project.ProjectService;
import se.su.dsv.scipro.reviewing.ReviewerAssignmentService;
import se.su.dsv.scipro.reviewing.ReviewerCapacityService;
import se.su.dsv.scipro.reviewing.ReviewerDecisionService;
import se.su.dsv.scipro.reviewing.RoughDraftApproval;
import se.su.dsv.scipro.reviewing.RoughDraftApprovalService;
import se.su.dsv.scipro.system.User;
@ -27,18 +28,21 @@ public class SplitProjectPopulator implements TestDataPopulator {
private final ReviewerCapacityService reviewerCapacityService;
private final RoughDraftApprovalService roughDraftApprovalService;
private final ReviewerAssignmentService reviewerAssignmentService;
private final ReviewerDecisionService reviewerDecisionService;
@Inject
public SplitProjectPopulator(
ProjectService projectService,
ReviewerCapacityService reviewerCapacityService,
RoughDraftApprovalService roughDraftApprovalService,
ReviewerAssignmentService reviewerAssignmentService
ReviewerAssignmentService reviewerAssignmentService,
ReviewerDecisionService reviewerDecisionService
) {
this.projectService = projectService;
this.reviewerCapacityService = reviewerCapacityService;
this.roughDraftApprovalService = roughDraftApprovalService;
this.reviewerAssignmentService = reviewerAssignmentService;
this.reviewerDecisionService = reviewerDecisionService;
}
@Override
@ -68,7 +72,7 @@ public class SplitProjectPopulator implements TestDataPopulator {
reviewerAssignmentService.assignReviewer(project, reviewer);
Optional<RoughDraftApproval> optional = roughDraftApprovalService.findBy(project);
optional.ifPresent(rda -> rda.approve("Approve! Good Work!", Optional.empty()));
optional.ifPresent(rda -> reviewerDecisionService.approve(rda, "Approved! Good Work!", Optional.empty()));
}
private FileUpload dummyFile() {