Added informalDate-functionality. Added basic DeleteReminder-functionality

mfcb
1 parent 7d394baa
Showing 6 changed files with 157 additions and 70 deletions
services/Common/src/main/java/de/bht/beuthbot/model/Intent.java
services/Common/src/main/java/de/bht/beuthbot/utils/DateStringExtractor.java
services/MainBot/src/main/java/de/bht/beuthbot/canteen/model/CanteenData.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/resources/de/bht/beuthbot/drools/Canteen.drl
@@ -7,7 +7,7 @@ public enum Intent {
     SHOW_FOOD("showFood"), HELLO("Hello"), GREET("greet"), BYE("Bye"),
     GOODBYE("goodbye"), RESTAURANT_SEARCH("restaurant_search"), START("Start"),
-    SHOW_PRICE("showPrice"), REMIND("remind"), CREATE_REMINDER("createReminder"), FALLBACK("Fallback");
+    SHOW_PRICE("showPrice"), REMIND("remind"), CREATE_REMINDER("createReminder"), DELETE_REMINDER("deleteReminder"), FALLBACK("Fallback");
     private String text;
@@ -3,6 +3,7 @@ package de.bht.beuthbot.utils;
 import javax.ejb.Local;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.format.TextStyle;
 import java.util.Locale;
@@ -5,6 +5,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 package de.bht.beuthbot.scheduler;
 import de.bht.beuthbot.attachments.AttachmentStore;
+import de.bht.beuthbot.daos.AppUserDAO;
 import de.bht.beuthbot.jms.Target;
 import de.bht.beuthbot.model.Attachment;
 import de.bht.beuthbot.model.EntityName;
@@ -21,6 +22,10 @@ import de.bht.beuthbot.jms.TaskMessage;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAccessor;
 import java.util.*;
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
@@ -51,8 +56,14 @@ 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;
@@ -73,16 +84,19 @@ public class SchedulerBean {
         if (!isActive) return;
-        SimpleDateFormat formatter = new SimpleDateFormat("dd.MM.yyyy KK:mm");
-        String dateNow = formatter.format(new Date());
+        List<Reminder> reminders = reminderDAO.findAll();
-        for (Reminder reminder : _reminders) {
+        LocalDateTime dateNow = LocalDateTime.now();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy MM dd HH:mm");
+        for (Reminder reminder : reminders) {
+            LocalDateTime reminderDate = reminder.getCycleDate();
+            logger.debug("Date now: " + dateNow.format(formatter) + " reminder date: " + reminder.getCycleDate().format(formatter));
             //Check if date time now equals reminder date time
-            if(dateNow.equals(formatter.format(reminder.getCycleTime()))) {
+            if(dateNow.format(formatter).equals(reminderDate.format(formatter))) {
                 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();
@@ -96,6 +110,14 @@ public class SchedulerBean {
         }
     }
+    //---------------------
+    //CreateReminder function
+    //The way this function works is by extracting the date and time from the entities of a TaskMessage.
+    //First a LocalDate variable is instantiated, storing the desired reminder date.
+    //If the message contains a cycle entity, the cycle is set accordingly, otherwise it defaults to ONCE.
+    //Then a LocalTime variable is created in order to extract the time at which the user desires to be reminded.
+    //Should there be no time-entity present, a sensible value is chosen instead.
+    //---------------------
     public Reminder createReminder(TaskMessage message, AppUser user) {
         logger.debug("Creating reminder");
@@ -121,53 +143,77 @@ public class SchedulerBean {
                 break;
         }
-        LocalDate cycleDate = DateStringExtractor.getLocalDateFromString(messageDay);
-
-        Date cycleTime;
-        try {
-            //Read out time for Reminder
-
-            String messageTime = message.getEntities().getOrDefault("time","");
-            //time should not be empty
-            if(!messageTime.equals("")) {
-                //get Date new for day, month, year
-                String dateNow = new SimpleDateFormat("dd.MM.yyyy").format(new Date());
-                //remove all chars from time String (e.g. "10 Uhr")
-                String reminderTime = messageTime.replaceAll("[^0-9:]", "");
-                //trim spaces
-                reminderTime = reminderTime.trim();
-                //check if given time is e.g. "11:15"
-                if(reminderTime.contains(":")) {
-                    //split for hours and minutes
-                    String[] splittedTime = reminderTime.split(":");
-                    //add hours and minutes to date
-                    if(splittedTime.length > 1)
-                        dateNow = dateNow + " " + splittedTime[0] + ":" + splittedTime[1];
-                } else {
-                    //add hours from time and set to "00"
-                    dateNow = dateNow + " " + reminderTime + ":" + "00";
-                }
+        LocalDate cycleDay = DateStringExtractor.getLocalDateFromString(messageDay);
+
+        LocalTime cycleTime = LocalTime.now();
-                SimpleDateFormat f = new SimpleDateFormat("dd.MM.yyyy hh:mm");
-                Date d = f.parse(dateNow);
-                long milliseconds = d.getTime();
-                cycleTime = new Date(milliseconds);
+        String messageTime = message.getEntities().getOrDefault("time","");
-            } else
-                cycleTime = new Date();
+        if(!messageTime.equals("")) {
+            String dateNow = new SimpleDateFormat("dd.MM.yyyy").format(new Date());
+            logger.debug("Date now: " + dateNow);
+
+            String reminderTime = messageTime.replaceAll("[^0-9:]", "");
+            //trim spaces
+            reminderTime = reminderTime.trim();
+            //check if given time is e.g. "11:15"
+            if (reminderTime.contains(":")) {
+                //split for hours and minutes
+                String[] splittedTime = reminderTime.split(":");
+                //add hours and minutes to date
+                if (splittedTime.length > 1)
+                    dateNow = splittedTime[0] + ":" + splittedTime[1];
+            } else {
+                //add hours from time and set to "00"
+                dateNow = reminderTime + ":" + "00";
+            }
+            logger.debug("DateNow:" + dateNow);
+            cycleTime = LocalTime.parse(dateNow);
+        } else if((messageTime = message.getEntities().getOrDefault("informalTime", "")) != "") {
+            //the user might have given an informal time, such as "morning" or "evening"
+            switch(messageTime) {
+                case "MORNING":
+                    cycleTime = LocalTime.of(9,0);
+                    break;
+                case "NOON":
+                    cycleTime = LocalTime.of(12,0);
+                    break;
+                case "EVENING":
+                    cycleTime = LocalTime.of(20,0);
+                    break;
+                default:
+                    cycleTime = LocalTime.of(9,0);
+                    break;
+            }
+        }  else {
+            //if no time entity is given, we will decide ourselves when it makes sense
+            if(cycleDay.isEqual(LocalDate.now())) {
+                //if the desired day is today, we'll remind the user in a few hours
+                //...unless that would make it tomorrow
+                if(cycleTime.plusHours(4).getHour() < cycleTime.getHour()) {
+                    cycleTime = LocalTime.of(23,59);
+                } else {
+                    cycleTime = LocalTime.of(cycleTime.plusHours(4).getHour(),0);
+                }
-        } catch (Exception e) {
-            return null;
+            } else {
+                //if the desired day is sometime in the future, remind the user at 9 in the morning
+                cycleTime = LocalTime.of(9,0);
+            }
         }
+        logger.debug("Resulting cycleTime: " + cycleTime.toString());
+        LocalDateTime cycleDate =  LocalDateTime.of(cycleDay, cycleTime);
+
         //Figure out what we're reminding the user of
         String intent = message.getEntities().getOrDefault("event","FALLBACK");
+
         Map<String, String> entities = new HashMap<>();
         switch(intent) {
             case "showFood":
                 intent = Intent.SHOW_FOOD.getText();
                 logger.debug("Intent is show food");
-                entities.put(EntityName.DATE.getText(), cycleDate.toString());
+                entities.put(EntityName.DATE.getText(), cycleDate.toLocalDate().toString());
                 entities.put(EntityName.TIME.getText(), cycleTime.toString());
                 logger.debug("Entities added: " + entities);
                 break;
@@ -179,13 +225,39 @@ public class SchedulerBean {
                 break;
         }
-        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);
+        logger.debug("Creating reminder with date " + cycleDate.toString() + " and time " + cycleTime.minusHours(1).toString()); //For some reason the server time is off by an hour, so we need to subtract it from the cycleTime
-        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);
+
+        return reminderDAO.saveOrUpdate(reminder);
         //TODO: Insert the new Reminder into Database
     }
+    public boolean deleteReminder(TaskMessage message, AppUser user) {
+        int deletedReminders = 0;
+        logger.debug("Delete reminders for user:" + user.getTelegramUserId());
+        List<Reminder> reminders = reminderDAO.findAll();
+        logger.debug("Number of reminders: " + reminders.size());
+        for(Reminder reminder : reminders) {
+            logger.debug("Found reminder for this user:" + reminder.getUser().getTelegramUserId());
+            if(reminder.getUser().getTelegramUserId().equals(user.getTelegramUserId()) || reminder.getUser().getFacebookUserId().equals(user.getFacebookUserId())) {
+                logger.debug("Found reminder of this user");
+                reminders.remove(reminder);
+                deletedReminders++;
+            }
+        }
+        if(deletedReminders > 0) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
 }
@@ -5,6 +5,7 @@ import de.bht.beuthbot.model.Messenger;
 import de.bht.beuthbot.model.entities.AppUser;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -15,9 +16,7 @@ public class Reminder {
     //Reminder cycle
     private ReminderCycle _reminderCycle;
     //Date of Cycle
-    private LocalDate _cycleDate;
-    //Time of cycle
-    private Date _cycleTime;
+    private LocalDateTime _cycleDate;
     //private
     //Used Messenger
     private Messenger _messenger;
@@ -26,11 +25,10 @@ public class Reminder {
     //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) {
+    public Reminder(AppUser user, ReminderCycle reminderCycle, LocalDateTime cycleDate, Messenger messenger, String intent, Map<String, String> entities) {
         _user = user;
         _reminderCycle = reminderCycle;
         _cycleDate = cycleDate;
-        _cycleTime = cycleTime;
         _messenger = messenger;
         _intent = intent;
         _entities = entities;
@@ -68,17 +66,13 @@ public class Reminder {
         _reminderCycle = reminderCycle;
     }
-    public LocalDate getCycleDate() {
+    public LocalDateTime getCycleDate() {
         return _cycleDate;
     }
-    public void setCycleDate(LocalDate cycleDate) {
+    public void setCycleDate(LocalDateTime cycleDate) {
         _cycleDate = cycleDate;
     }
-    public Date getCycleTime() { return _cycleTime; }
-
-    public void setCycleTime(Date cycleTime) { _cycleTime = cycleTime; }
-
     public Map<String, String> getEntities() { return _entities; }
 }
@@ -16,32 +16,33 @@
 package de.bht.beuthbot.drools
-import java.util.List
+import java.util.List;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.time.LocalDate;
-import de.bht.beuthbot.canteen.model.Dish
+import de.bht.beuthbot.canteen.model.Dish;
 import de.bht.beuthbot.canteen.model.DishType;
 import de.bht.beuthbot.canteen.model.CanteenData;
 import de.bht.beuthbot.model.Intent;
 import de.bht.beuthbot.model.EntityName;
 import de.bht.beuthbot.drools.model.DroolsMessage;
-import de.bht.beuthbot.scheduler.SchedulerBean
-import de.bht.beuthbot.jms.TaskMessage
-import de.bht.beuthbot.scheduler.model.ReminderCycle
-import java.util.Date
-import java.text.SimpleDateFormat
-import java.text.ParseException
-import de.bht.beuthbot.model.Messenger
+import de.bht.beuthbot.scheduler.SchedulerBean;
+import de.bht.beuthbot.jms.TaskMessage;
+import de.bht.beuthbot.scheduler.model.ReminderCycle;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.text.ParseException;
+import de.bht.beuthbot.model.Messenger;
 import de.bht.beuthbot.scheduler.model.Reminder;
 import java.time.DayOfWeek;
-import java.time.LocalDate
+import java.time.LocalDate;
 import de.bht.beuthbot.utils.DateStringExtractor;
+import java.time.format.DateTimeFormatter;
 global de.bht.beuthbot.canteen.model.CanteenData canteenData;
 global de.bht.beuthbot.model.entities.AppUser user;
@@ -139,7 +140,7 @@ rule &quot;Create reminder&quot;
         Reminder reminder = s.createReminder(message, user);
         String messageText = "";
         if(reminder.getIntent() == Intent.SHOW_FOOD.getText()) {
-            messageText = "Ich werde dir " + DateStringExtractor.getGermanWeekDayFromLocalDate(reminder.getCycleDate(), true) + " um " + new SimpleDateFormat("KK:mm").format(reminder.getCycleTime()) + " Uhr den Mensaplan mitteilen!";
+            messageText = "Ich werde dir " + DateStringExtractor.getGermanWeekDayFromLocalDate(reminder.getCycleDate().toLocalDate(), true) + " um " + reminder.getCycleDate().toLocalTime().format(DateTimeFormatter.ofPattern("HH:mm")) + " Uhr den Mensaplan mitteilen!";
         } else {
             messageText = "Es war mir leider nicht möglich eine Erinnerung für dich anzulegen. Versuche es bitte noch einmal.";
         } //TODO: Add other intents
@@ -147,6 +148,24 @@ rule &quot;Create reminder&quot;
 end
+rule "Delete reminder"
+    dialect "java"
+    when
+        m : DroolsMessage(getIntent().equals(Intent.DELETE_REMINDER.getText()))
+    then
+        SchedulerBean s = new SchedulerBean();
+        TaskMessage message = new TaskMessage(m);
+        boolean didDelete = s.deleteReminder(message, user);
+        String messageText = "";
+        if(didDelete) {
+            messageText = "Ich werde dir von nun an keine Erinnerungen mehr schicken!";
+        } else {
+            messageText = "Ich tu doch gar nichts!";
+        }
+        m.setText(messageText);
+
+end
+
 // --------------------------- Fallback -------------------------
 rule "Fallback"