Added cycle sensitive reply (e.g. "ich werde dich täglich informieren")

mfcb
1 parent e991e3f9
Showing 2 changed files with 24 additions and 17 deletions
services/MainBot/src/main/java/de/bht/beuthbot/scheduler/SchedulerBean.java
services/MainBot/src/main/resources/de/bht/beuthbot/drools/Canteen.drl
@@ -132,7 +132,7 @@ public class SchedulerBean {
         //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
-        switch(messageDay) {
+        switch(message.getEntities().getOrDefault("cycle", "ONCE")) {
             case "DAILY":
                 cycle = ReminderCycle.DAILY;
                 break;
@@ -142,6 +142,9 @@ public class SchedulerBean {
             case "MONTHLY":
                 cycle = ReminderCycle.MONTHLY;
                 break;
+            default:
+                cycle = ReminderCycle.ONCE;
+                break;
         }
         LocalDate cycleDay = DateStringExtractor.getLocalDateFromString(messageDay);
@@ -210,21 +213,9 @@ public class SchedulerBean {
         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.toLocalDate().toString());
-                entities.put(EntityName.TIME.getText(), cycleTime.toString());
-                logger.debug("Entities added: " + entities);
-                break;
-            case "showCourses":
-                //TODO: add Courses functionality
-                break;
-            default:
-                intent = "FALLBACK";
-                break;
-        }
+        entities.put(EntityName.DATE.getText(), cycleDate.toLocalDate().toString());
+        entities.put(EntityName.TIME.getText(), cycleTime.toString());
+        entities.put(EntityName.REMINDER_CYCLE.getText(), cycle.toString());
         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
@@ -42,6 +42,7 @@ import java.time.LocalDate;
 import de.bht.beuthbot.utils.DateStringExtractor;
 import java.time.format.DateTimeFormatter
 import de.bht.beuthbot.model.entities.Reminder;
+import de.bht.beuthbot.model.enumeration.ReminderCycle;
 global de.bht.beuthbot.canteen.model.CanteenData canteenData;
 global de.bht.beuthbot.model.entities.AppUser user;
@@ -138,8 +139,23 @@ rule &quot;Create reminder&quot;
         TaskMessage message = new TaskMessage(m);
         Reminder reminder = schedulerBean.createReminder(message, user);
         String messageText = "";
+        String outputDate = DateStringExtractor.getGermanWeekDayFromLocalDate(reminder.getCycleDate().toLocalDate(), false);
+        switch(reminder.getReminderCycle().toString()) {
+            case "DAILY":
+                outputDate = "täglich";
+                break;
+            case "WEEKLY":
+                outputDate += "s"; //if its weekly, just take the weekday and add an "s"
+                break;
+            case "MONTHLY":
+                outputDate = "ein mal im Monat";
+                break;
+            case "ONCE":
+                outputDate = DateStringExtractor.getGermanWeekDayFromLocalDate(reminder.getCycleDate().toLocalDate(), true);
+                break;
+        }
         if(reminder.getIntent().equals(Intent.SHOW_FOOD.getText())) {
-            messageText = "Ich werde dir " + DateStringExtractor.getGermanWeekDayFromLocalDate(reminder.getCycleDate().toLocalDate(), true) + " um " + reminder.getCycleDate().toLocalTime().format(DateTimeFormatter.ofPattern("HH:mm")) + " Uhr den Mensaplan mitteilen!";
+            messageText = "Ich werde dir " + outputDate  + " 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