romanov73/ng-tracker
1
0
Fork 0
Code Issues 18 Pull Requests 4 Projects Releases Wiki Activity

fix event create conditions

Browse Source
This commit is contained in:
Anton Romanov 2018-11-19 07:46:02 +04:00
parent 6adc96761b
commit 2dc0b4e27c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/ru/ulstu/timeline/service/EventScheduler.java
View File

@ -40,7 +40,8 @@ public class EventScheduler {
@Scheduled(cron = "0 0 * * * ?") @Scheduled(cron = "0 0 * * * ?")
public void checkPeriodEvents() { public void checkPeriodEvents() {
log.debug("EventScheduler.checkPeriodEvents started"); log.debug("EventScheduler.checkPeriodEvents started");
for (Event event : eventService.findAllFuture()) { //TODO: filter
for (Event event : eventService.findAll()) {
if (halfOfThePeriodHasPassed(event)) { if (halfOfThePeriodHasPassed(event)) {
eventService.createBasedOn(event, DateUtils.addDays(event.getExecuteDate(), getShiftInDays(event.getPeriod()))); eventService.createBasedOn(event, DateUtils.addDays(event.getExecuteDate(), getShiftInDays(event.getPeriod())));
} }
@ -67,6 +68,6 @@ public class EventScheduler {
private boolean halfOfThePeriodHasPassed(Event event) { private boolean halfOfThePeriodHasPassed(Event event) {
return event.getPeriod() != null && event.getChild() == null return event.getPeriod() != null && event.getChild() == null
&& new Date().after( && new Date().after(
DateUtils.addDays(event.getExecuteDate(), (int) -Math.round((double) getShiftInDays(event.getPeriod()) / 2))); DateUtils.addDays(event.getExecuteDate(), (int) Math.round((double) getShiftInDays(event.getPeriod()) / 2)));
} }
} }