refactor and db changes
parent
376c820b44
commit
f0ac06c900
@ -1,67 +1,72 @@
|
|||||||
package ru.ulstu.timeline.service;
|
package ru.ulstu.timeline.service;
|
||||||
|
|
||||||
|
import com.google.common.collect.ImmutableMap;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.scheduling.annotation.Scheduled;
|
import org.springframework.scheduling.annotation.Scheduled;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
import ru.ulstu.core.util.DateUtils;
|
import ru.ulstu.core.util.DateUtils;
|
||||||
import ru.ulstu.timeline.model.Event;
|
import ru.ulstu.timeline.model.Event;
|
||||||
import ru.ulstu.timeline.model.EventDto;
|
import ru.ulstu.timeline.model.PeriodEvent;
|
||||||
import ru.ulstu.timeline.repository.EventRepository;
|
import ru.ulstu.user.service.MailService;
|
||||||
import ru.ulstu.user.model.UserDto;
|
|
||||||
|
|
||||||
import java.sql.Date;
|
import java.util.Date;
|
||||||
import java.time.LocalDate;
|
|
||||||
import java.time.Period;
|
|
||||||
import java.time.ZoneId;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Calendar;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Service
|
||||||
public class EventScheduler {
|
public class EventScheduler {
|
||||||
|
|
||||||
private final Logger log = LoggerFactory.getLogger(EventScheduler.class);
|
private final Logger log = LoggerFactory.getLogger(EventScheduler.class);
|
||||||
private final EventService eventService;
|
private final EventService eventService;
|
||||||
private final EventRepository eventRepository;
|
private final MailService mailService;
|
||||||
|
|
||||||
public EventScheduler(EventRepository eventRepository, EventService eventService) {
|
public EventScheduler(EventService eventService,
|
||||||
this.eventRepository = eventRepository;
|
MailService mailService) {
|
||||||
this.eventService = eventService;
|
this.eventService = eventService;
|
||||||
|
this.mailService = mailService;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Scheduled(cron = "0 0 8 * * ?")
|
||||||
|
public void sendNotifications() {
|
||||||
|
List<Event> events = eventService.findByCurrentDate();
|
||||||
|
events.forEach(event -> {
|
||||||
|
Map<String, Object> variables = ImmutableMap.of("description", event.getDescription());
|
||||||
|
event.getRecipients()
|
||||||
|
.forEach(recipient -> mailService.sendEmailFromTemplate(variables, recipient, "eventNotification", event.getTitle()));
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Scheduled(cron = "0 0 8/12 * 1 ?")
|
@Scheduled(cron = "0 */2 * * * ?")
|
||||||
public void checkPeriodEvents() {
|
public void checkPeriodEvents() {
|
||||||
log.debug("EventScheduler.checkPeriodEvents started");
|
log.debug("EventScheduler.checkPeriodEvents started");
|
||||||
for (Event event : eventRepository.findAll()) {
|
for (Event event : eventService.findAllFuture()) {
|
||||||
if(halfOfThePeriodHasPassed(event)){
|
if (halfOfThePeriodHasPassed(event)) {
|
||||||
event.setCreateDate(Date.from((LocalDate.now().atStartOfDay(ZoneId.systemDefault()).toInstant())));
|
eventService.createBasedOn(event, DateUtils.addDays(event.getExecuteDate(), getShiftInDays(event.getPeriod())));
|
||||||
event.setBeginDate(DateUtils.addDays(event.getBeginDate(), event.getPeriod().getPeriod().getDays()));
|
|
||||||
event.setUpdateDate(null);
|
|
||||||
|
|
||||||
|
|
||||||
eventService.create(new EventDto(
|
|
||||||
event.getId(),
|
|
||||||
event.getTitle(),
|
|
||||||
event.getStatus(),
|
|
||||||
event.getPeriod(),
|
|
||||||
event.getBeginDate(),
|
|
||||||
event.getExecuteDate(),
|
|
||||||
event.getCreateDate(),
|
|
||||||
event.getUpdateDate(),
|
|
||||||
event.getDescription(),
|
|
||||||
new ArrayList<>()
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
log.debug("EventScheduler.checkPeriodEvents finished");
|
log.debug("EventScheduler.checkPeriodEvents finished");
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean halfOfThePeriodHasPassed(Event event){
|
private int getShiftInDays(PeriodEvent periodEvent) {
|
||||||
if (Period.between(event.getBeginDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(),
|
switch (periodEvent) {
|
||||||
LocalDate.now()).getDays() <= event.getPeriod().getPeriod().getDays() / 2) {
|
case EVERY_DAY:
|
||||||
return true;
|
return periodEvent.getPeriod().getDays();
|
||||||
|
case EVERY_WEEK:
|
||||||
|
return periodEvent.getPeriod().getDays();
|
||||||
|
case EVERY_MONTH:
|
||||||
|
return periodEvent.getPeriod().getMonths() * 30;
|
||||||
|
case EVERY_YEAR:
|
||||||
|
return periodEvent.getPeriod().getYears() * 365;
|
||||||
|
default:
|
||||||
|
throw new RuntimeException("period event not exists");
|
||||||
}
|
}
|
||||||
return false;
|
}
|
||||||
|
|
||||||
|
private boolean halfOfThePeriodHasPassed(Event event) {
|
||||||
|
return event.getPeriod() != null && event.getChild() == null
|
||||||
|
&& new Date().after(
|
||||||
|
DateUtils.addDays(event.getExecuteDate(), (int) -Math.round((double) getShiftInDays(event.getPeriod()) / 2)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,26 @@
|
|||||||
|
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
|
||||||
|
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
|
||||||
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
|
||||||
|
<changeSet author="orion" id="20181111_000000-1">
|
||||||
|
<preConditions onFail="MARK_RAN">
|
||||||
|
<not><columnExists columnName="period" tableName="event"/></not>
|
||||||
|
</preConditions>
|
||||||
|
<addColumn tableName="event">
|
||||||
|
<column name="period" type="varchar(50)"/>
|
||||||
|
</addColumn>
|
||||||
|
</changeSet>
|
||||||
|
<changeSet author="orion" id="20181111_000000-2">
|
||||||
|
<preConditions onFail="MARK_RAN">
|
||||||
|
<not><columnExists columnName="child_id" tableName="event"/></not>
|
||||||
|
</preConditions>
|
||||||
|
<addColumn tableName="event">
|
||||||
|
<column name="child_id" type="integer"/>
|
||||||
|
</addColumn>
|
||||||
|
</changeSet>
|
||||||
|
<changeSet author="orion" id="20181111_000000-3">
|
||||||
|
<addForeignKeyConstraint baseTableName="event" baseColumnNames="child_id"
|
||||||
|
constraintName="fk_event_child_event" referencedTableName="event"
|
||||||
|
referencedColumnNames="id"/>
|
||||||
|
</changeSet>
|
||||||
|
</databaseChangeLog>
|
Loading…
Reference in New Issue