added persistence to scheduler and corrected errors in the user

hausdoerfer
1 parent 5d016ca2
Showing 9 changed files with 198 additions and 109 deletions
services/Common/src/main/java/de/bht/beuthbot/daos/ReminderDAO.java
services/Common/src/main/java/de/bht/beuthbot/daos/ReminderDAOImpl.java
services/Common/src/main/java/de/bht/beuthbot/model/entities/EntityBaseImpl.java
services/Common/src/main/java/de/bht/beuthbot/model/entities/Reminder.java
services/Common/src/main/java/de/bht/beuthbot/model/entities/ReminderImpl.java
services/Common/src/main/java/de/bht/beuthbot/model/enumeration/ReminderCycle.java
services/MainBot/src/main/java/de/bht/beuthbot/scheduler/SchedulerBean.java
services/MainBot/src/main/java/de/bht/beuthbot/scheduler/model/Reminder.java
services/MainBot/src/main/java/de/bht/beuthbot/scheduler/model/ReminderCycle.java
+package de.bht.beuthbot.daos;
+
+import de.bht.beuthbot.model.entities.Reminder;
+
+import javax.ejb.Remote;
+
+/**
+ * Created by Stephan Hausdörfer on 16.01.2018.
+ */
+@Remote
+public interface ReminderDAO extends GenericDAO<Reminder, Long> {
+
+    Reminder createReminder();
+}
+package de.bht.beuthbot.daos;
+
+import de.bht.beuthbot.model.entities.Reminder;
+import de.bht.beuthbot.model.entities.ReminderImpl;
+
+import javax.ejb.Stateless;
+
+/**
+ * Created by Stephan Hausdörfer on 16.01.2018.
+ */
+@Stateless
+public class ReminderDAOImpl extends GenericHibernateDAO<Reminder, ReminderImpl, Long> implements ReminderDAO {
+
+    @Override
+    public Reminder createReminder() {
+        return new ReminderImpl();
+    }
+}
@@ -38,7 +38,7 @@ public class EntityBaseImpl implements EntityBase {
     @Override
     public Long getId() {
-        return null;
+        return id;
     }
     @Override
+package de.bht.beuthbot.model.entities;
+
+import de.bht.beuthbot.model.Messenger;
+import de.bht.beuthbot.model.enumeration.ReminderCycle;
+
+import java.time.LocalDate;
+import java.util.Map;
+
+/**
+ * Created by Stephan Hausdörfer on 16.01.2018.
+ */
+public interface Reminder extends EntityBase {
+
+    long getUserId();
+
+    void setUserId(long userId);
+
+    ReminderCycle getReminderCycle();
+
+    void setReminderCycle(ReminderCycle reminderCycle);
+
+    LocalDate getCycleTime();
+
+    void setCycleTime(LocalDate cycleTime);
+
+    Messenger getMessenger();
+
+    void setMessenger(Messenger messenger);
+
+    String getIntent();
+
+    void setIntent(String intent);
+
+    Map<String, String> getEntities();
+
+    void setEntities(Map<String, String> entities);
+}
+package de.bht.beuthbot.model.entities;
+
+import de.bht.beuthbot.model.Messenger;
+import de.bht.beuthbot.model.enumeration.ReminderCycle;
+
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.time.LocalDate;
+import java.util.Map;
+
+/**
+ * Created by Stephan Hausdörfer on 16.01.2018.
+ */
+@Entity
+@Table
+public class ReminderImpl extends EntityBaseImpl implements Reminder {
+
+    private long userId;
+
+    private ReminderCycle reminderCycle;
+
+    private LocalDate cycleTime;
+
+    private Messenger messenger;
+
+    private String intent;
+
+    @ElementCollection
+    private Map<String, String> entities;
+
+    @Override
+    public long getUserId() {
+        return userId;
+    }
+
+    @Override
+    public void setUserId(long userId) {
+        this.userId = userId;
+    }
+
+    @Override
+    public ReminderCycle getReminderCycle() {
+        return reminderCycle;
+    }
+
+    @Override
+    public void setReminderCycle(ReminderCycle reminderCycle) {
+        this.reminderCycle = reminderCycle;
+    }
+
+    @Override
+    public LocalDate getCycleTime() {
+        return cycleTime;
+    }
+
+    @Override
+    public void setCycleTime(LocalDate cycleTime) {
+        this.cycleTime = cycleTime;
+    }
+
+    @Override
+    public Messenger getMessenger() {
+        return messenger;
+    }
+
+    @Override
+    public void setMessenger(Messenger messenger) {
+        this.messenger = messenger;
+    }
+
+    @Override
+    public String getIntent() {
+        return intent;
+    }
+
+    @Override
+    public void setIntent(String intent) {
+        this.intent = intent;
+    }
+
+    @Override
+    public Map<String, String> getEntities() {
+        return entities;
+    }
+
+    @Override
+    public void setEntities(Map<String, String> entities) {
+        this.entities = entities;
+    }
+}
+package de.bht.beuthbot.model.enumeration;
+
+/**
+ * Created by Stephan Hausdörfer on 16.01.2018.
+ */
+public enum ReminderCycle {
+    ONCE,
+    DAILY,
+    WEEKLY,
+    MONTHLY
+}
 package de.bht.beuthbot.scheduler;
 import de.bht.beuthbot.attachments.AttachmentStore;
+import de.bht.beuthbot.daos.AppUserDAO;
+import de.bht.beuthbot.daos.ReminderDAO;
 import de.bht.beuthbot.jms.Target;
-import de.bht.beuthbot.model.Attachment;
 import de.bht.beuthbot.model.EntityName;
 import de.bht.beuthbot.model.Intent;
 import de.bht.beuthbot.model.Messenger;
 import de.bht.beuthbot.model.entities.AppUser;
-import de.bht.beuthbot.scheduler.model.Reminder;
-import de.bht.beuthbot.scheduler.model.ReminderCycle;
+import de.bht.beuthbot.model.entities.Reminder;
+import de.bht.beuthbot.model.enumeration.ReminderCycle;
 import de.bht.beuthbot.utils.DateStringExtractor;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import de.bht.beuthbot.conf.Application;
-import de.bht.beuthbot.conf.Configuration;
 import de.bht.beuthbot.jms.ProcessQueue;
 import de.bht.beuthbot.jms.TaskMessage;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.util.*;
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import javax.ejb.*;
-import javax.ejb.Timer;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
 @Singleton
 @Startup
@@ -51,8 +48,13 @@ public class SchedulerBean {
     @Resource(lookup = "java:global/global/ApplicationBean")
     private Application application;
-    //list of reminders to be populated with data from the DB
-    private static ArrayList<Reminder> _reminders = new ArrayList<>();
+    /** Injected AppUserDAO */
+    @Resource(lookup = "java:global/global/AppUserDAOImpl")
+    private AppUserDAO userDAO;
+
+    /** Injected ReminderDAO */
+    @Resource(lookup = "java:global/global/ReminderDAOImpl")
+    private ReminderDAO reminderDAO;
     boolean isActive = true;
@@ -68,7 +70,6 @@ public class SchedulerBean {
     @Schedule(hour="*", minute="*")
     public void fetchReminders() {
-        //TODO: Establish DB connection and retrieve list of reminders
         logger.debug("SchedulerBean fired!");
         if (!isActive) return;
@@ -76,13 +77,15 @@ public class SchedulerBean {
         SimpleDateFormat formatter = new SimpleDateFormat("dd.MM.yyyy KK:mm");
         String dateNow = formatter.format(new Date());
-        for (Reminder reminder : _reminders) {
+        List<Reminder> reminders = reminderDAO.findAll();
+
+        for (Reminder reminder : reminders) {
             //Check if date time now equals reminder date time
             if(dateNow.equals(formatter.format(reminder.getCycleTime()))) {
                 Long messageID = 1L;
-                AppUser user = reminder.getUser(); //TODO: Fill with correct value from DB
+                AppUser user = userDAO.findById(reminder.getUserId());
                 Long messengerId = Long.valueOf(user.getFacebookUserId() == null ? user.getTelegramUserId() : user.getFacebookUserId());
-                Messenger messenger = reminder.getMessenger(); //TODO: Fill with correct value from DB
+                Messenger messenger = reminder.getMessenger();
                 String text = "";
                 String intent = reminder.getIntent();
                 Map entities = reminder.getEntities();
@@ -105,7 +108,7 @@ public class SchedulerBean {
         //Figure out when to remind the user
         //Set reminder cycle to one shot as a default
-        ReminderCycle  cycle = ReminderCycle.ONCE;
+        ReminderCycle cycle = ReminderCycle.ONCE;
         //Extract the Date from the message
         String messageDay = message.getEntities().getOrDefault("date", "TODAY");
         //If the date retrieved from the message contains a cycling parameter (e.g. "daily"), set the reminderCycle
@@ -180,12 +183,16 @@ public class SchedulerBean {
         }
         logger.debug("Creating reminder with date " + cycleDate.toString() + " and time " + cycleTime.toString());
-        Reminder reminder = new Reminder(user, cycle, cycleDate, cycleTime, messenger, intent, entities);
-        _reminders.add(reminder);
-        return reminder;
+        Reminder reminder = reminderDAO.createReminder();
+        reminder.setUserId(user.getId());
+        reminder.setReminderCycle(cycle);
+        reminder.setCycleTime(cycleDate);
+        reminder.setMessenger(messenger);
+        reminder.setIntent(intent);
+        reminder.setEntities(entities);
-        //TODO: Insert the new Reminder into Database
+        return reminderDAO.saveOrUpdate(reminder);
     }
 }
-package de.bht.beuthbot.scheduler.model;
-
-import de.bht.beuthbot.model.Intent;
-import de.bht.beuthbot.model.Messenger;
-import de.bht.beuthbot.model.entities.AppUser;
-
-import java.time.LocalDate;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-public class Reminder {
-    //TODO: Replace with User Object
-    private AppUser _user;
-    //Reminder cycle
-    private ReminderCycle _reminderCycle;
-    //Date of Cycle
-    private LocalDate _cycleDate;
-    //Time of cycle
-    private Date _cycleTime;
-    //private
-    //Used Messenger
-    private Messenger _messenger;
-    //Intent after Reminder is triggered
-    private String _intent;
-    //Entities
-    private final Map<String, String> _entities;
-
-    public Reminder(AppUser user, ReminderCycle reminderCycle, LocalDate cycleDate, Date cycleTime, Messenger messenger, String intent, Map<String, String> entities) {
-        _user = user;
-        _reminderCycle = reminderCycle;
-        _cycleDate = cycleDate;
-        _cycleTime = cycleTime;
-        _messenger = messenger;
-        _intent = intent;
-        _entities = entities;
-    }
-
-    public Messenger getMessenger() {
-        return _messenger;
-    }
-
-    public void setMessenger(Messenger messenger) {
-        _messenger = messenger;
-    }
-
-    public String getIntent() {
-        return _intent;
-    }
-
-    public void setIntent(String intent) {
-        _intent = intent;
-    }
-
-    public AppUser getUser() {
-        return _user;
-    }
-
-    public void setUserID(AppUser user) {
-        _user = user;
-    }
-
-    public ReminderCycle getReminderCycle() {
-        return _reminderCycle;
-    }
-
-    public void setReminderCycle(ReminderCycle reminderCycle) {
-        _reminderCycle = reminderCycle;
-    }
-
-    public LocalDate getCycleDate() {
-        return _cycleDate;
-    }
-
-    public void setCycleDate(LocalDate cycleDate) {
-        _cycleDate = cycleDate;
-    }
-
-    public Date getCycleTime() { return _cycleTime; }
-
-    public void setCycleTime(Date cycleTime) { _cycleTime = cycleTime; }
-
-    public Map<String, String> getEntities() { return _entities; }
-}
-package de.bht.beuthbot.scheduler.model;
-
-public enum ReminderCycle {
-    ONCE, DAILY, WEEKLY, MONTHLY
-}