MORE-562: fixed bug where timeframe check would always throw exception

MORE-Platform · Jun 27, 2023 · 5f8e186 · 5f8e186
1 parent 49d3193
commit 5f8e186
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/studymanager/src/main/java/io/redlink/more/studymanager/repository/StudyRepository.java b/studymanager/src/main/java/io/redlink/more/studymanager/repository/StudyRepository.java
@@ -163,7 +163,7 @@ private static RowMapper<Study> getStudyRowMapper() {
 
     private static RowMapper<Timeframe> getStudyTimeframeRowMapper() {
         return  (rs,rowNum) -> new Timeframe(
-                RepositoryUtils.readLocalDate(rs, "planned_end_date"),
+                RepositoryUtils.readLocalDate(rs, "planned_start_date"),
                 RepositoryUtils.readLocalDate(rs, "planned_end_date"));
     }
 

diff --git a/studymanager/src/main/java/io/redlink/more/studymanager/service/InterventionService.java b/studymanager/src/main/java/io/redlink/more/studymanager/service/InterventionService.java
@@ -3,27 +3,26 @@
 import io.redlink.more.studymanager.core.component.Component;
 import io.redlink.more.studymanager.core.exception.ConfigurationValidationException;
 import io.redlink.more.studymanager.core.factory.ActionFactory;
+import io.redlink.more.studymanager.core.factory.TriggerFactory;
 import io.redlink.more.studymanager.core.validation.ConfigurationValidationReport;
 import io.redlink.more.studymanager.exception.BadRequestException;
 import io.redlink.more.studymanager.exception.NotFoundException;
-import io.redlink.more.studymanager.model.*;
-import io.redlink.more.studymanager.core.factory.TriggerFactory;
+import io.redlink.more.studymanager.model.Action;
+import io.redlink.more.studymanager.model.Intervention;
+import io.redlink.more.studymanager.model.Study;
+import io.redlink.more.studymanager.model.Trigger;
 import io.redlink.more.studymanager.repository.InterventionRepository;
 import io.redlink.more.studymanager.repository.StudyRepository;
 import io.redlink.more.studymanager.sdk.MoreSDK;
 import io.redlink.more.studymanager.utils.LoggingUtils;
-
-import java.text.ParseException;
-
 import org.quartz.CronExpression;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDate;
-import java.time.ZoneId;
+import java.text.ParseException;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -32,7 +31,6 @@
 @Service
 public class InterventionService {
 
-    private final ScheduleService scheduleService;
     private final StudyStateService studyStateService;
     private final InterventionRepository repository;
     private final StudyRepository studyRepository;
@@ -43,13 +41,11 @@ public class InterventionService {
     private static final Logger LOGGER = LoggerFactory.getLogger(InterventionService.class);
 
 
-    public InterventionService(ScheduleService scheduleService,
-                               StudyStateService studyStateService,
+    public InterventionService(StudyStateService studyStateService,
                                InterventionRepository repository, StudyRepository studyRepository,
                                MoreSDK sdk,
                                Map<String, TriggerFactory> triggerFactories,
                                Map<String, ActionFactory> actionFactories) {
-        this.scheduleService = scheduleService;
         this.studyStateService = studyStateService;
         this.repository = repository;
         this.studyRepository = studyRepository;
@@ -60,7 +56,6 @@ public InterventionService(ScheduleService scheduleService,
 
     public Intervention addIntervention(Intervention intervention) {
         studyStateService.assertStudyNotInState(intervention.getStudyId(), Study.Status.CLOSED);
-        scheduleService.assertScheduleWithinStudyTime(intervention.getStudyId(), intervention.getSchedule());
         return repository.insert(intervention);
     }
 
@@ -79,7 +74,6 @@ public void deleteIntervention(Long studyId, Integer interventionId) {
 
     public Intervention updateIntervention(Intervention intervention) {
         studyStateService.assertStudyNotInState(intervention.getStudyId(), Study.Status.CLOSED);
-        scheduleService.assertScheduleWithinStudyTime(intervention.getStudyId(), intervention.getSchedule());
         return repository.updateIntervention(intervention);
     }