Merge branch 'development' of https://git.ziemers.de/edu/BeuthBot into development

Neocortexxx
2 parents ed8363df 7d394baa
Showing 10 changed files with 174 additions and 26 deletions
docker/rasa_nlu/volumes/data/api/intents/showFood.json
docker/wildfly/volumes/conf/beuthbot.properties
services/Common/src/main/java/de/bht/beuthbot/model/EntityName.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
services/Rasa/src/main/java/de/bht/beuthbot/nlp/rasa/RasaConnector.java
services/Telegram/src/main/java/de/bht/beuthbot/messenger/telegram/TelegramSendAdapter.java
@@ -10,6 +10,7 @@
       "parameters": [
         {
           "id": "7b5df330-e1fc-4bb4-86de-5a51be29c836",
+          "required": false,
           "dataType": "@date",
           "name": "date",
           "value": "$date",
@@ -17,6 +18,7 @@
         },
         {
           "id": "f3da5ec9-d3e8-4263-9bc3-7d600784bd0d",
+          "required": false,
           "dataType": "@dishtype",
           "name": "dishtype",
           "value": "$dishtype",
@@ -24,6 +26,7 @@
         },
         {
           "id": "499e1a33-d7ef-4446-ae7d-30ab94c9e3a5",
+          "required": false,
           "dataType": "@healthy",
           "name": "healthy",
           "value": "$healthy",
@@ -31,6 +34,7 @@
         },
         {
           "id": "f53af932-a4f2-4fe5-be2d-eb96a30e9400",
+          "required": false,
           "dataType": "@ingredients",
           "name": "ingredients",
           "value": "$ingredients",
@@ -38,6 +42,7 @@
         },
         {
           "id": "b8c8ab1d-4190-4200-9540-2893a084a1fd",
+          "required": false,
           "dataType": "@price",
           "name": "price",
           "value": "$price",
@@ -45,6 +50,7 @@
         },
         {
           "id": "92607e59-96c8-4c61-8dc0-670c7b8c2b43",
+          "required": false,
           "dataType": "@dishcategory",
           "name": "dishcategory",
           "value": "$dishcategory",
@@ -18,7 +18,7 @@ API_AI_TOKEN = XXXXX
 TELEGRAM_WEBHOOK_URL = /telegram/getUpdates
 # Your Bot Token e.g.: 000000000:AAAAa0aAA_aaA-Aaaa0A0Aa_a0aa0A0AAAA
-TELEGRAM_BOT_TOKEN = 452768505:AAHNXEYi9nSHcmVc4b3799I00uTZmK53wl4\
+TELEGRAM_BOT_TOKEN = 451726698:AAH2qwZaWOgn1IU1CjJU-HjHDMODG6DEkN0
@@ -5,7 +5,7 @@ package de.bht.beuthbot.model;
  */
 public enum EntityName {
-    DATE("date"), DISH_TYPE("dishtype"), HEALTHY("healthy"), INGREDIENTS("ingredients"), DISH_CATEGORY("dishcategory"),
+    DATE("date"), TIME("time"), DISH_TYPE("dishtype"), HEALTHY("healthy"), INGREDIENTS("ingredients"), DISH_CATEGORY("dishcategory"),
     DISH_NAME("dishname"), REMINDER_CYCLE("reminderCycle");
     private String text;
+package de.bht.beuthbot.utils;
+
+import javax.ejb.Local;
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.format.TextStyle;
+import java.util.Locale;
+
+public class DateStringExtractor {
+    public static LocalDate getLocalDateFromString(String dateString) {
+        LocalDate retrievedDate = LocalDate.now(); //initialize as current date
+        DayOfWeek today = retrievedDate.getDayOfWeek();
+
+        if(dateString.equals("TODAY")) {
+            return retrievedDate;
+        } else if(dateString.equals("TOMORROW")) {
+            retrievedDate = retrievedDate.plusDays(1);
+        } else if(dateString.equals("DAYAFTERTOMORROW")) {
+            retrievedDate = retrievedDate.plusDays(2);
+        } else if(dateString.equals("MONDAY") || dateString.equals("TUESDAY") || dateString.equals("WEDNESDAY") || dateString.equals("THURSDAY") || dateString.equals("FRIDAY") || dateString.equals("SATURDAY") || dateString.equals("SUNDAY")) {
+            DayOfWeek dayFromString = DayOfWeek.valueOf(dateString);
+            long distanceBetweenDates = dayFromString.getValue() - today.getValue();
+            //if the distance between given days is equal to or smaller than 0 we can infer that the user is referring to the upcoming week
+            if(distanceBetweenDates <= 0) {
+                distanceBetweenDates += 7;
+            }
+            retrievedDate = retrievedDate.plusDays(distanceBetweenDates);
+
+        }
+
+        return retrievedDate;
+    }
+
+    //This function takes a LocalDate and returns its Weekday Name in form of a string
+    public static String getWeekDayFromLocalDate(LocalDate date, boolean pretty, Locale locale) {
+        String weekDay = date.getDayOfWeek().getDisplayName(TextStyle.FULL, locale);
+        if(pretty) { //if pretty is set to true, we will return pretty names like "Today" and "Tomorrow"
+            if(LocalDate.now().getDayOfWeek().getValue() == date.getDayOfWeek().getValue()) { //TODAY
+                if(locale == Locale.GERMAN) {
+                    weekDay = "heute";
+                } else {
+                    weekDay = "today";
+                }
+            } else if(LocalDate.now().plusDays(1).getDayOfWeek().getValue() == date.getDayOfWeek().getValue()) { //TOMORROW
+                if(locale == Locale.GERMAN) {
+                    weekDay = "morgen";
+                } else {
+                    weekDay = "tomorrow";
+                }
+            }
+        }
+        return weekDay;
+    }
+
+    public static String getGermanWeekDayFromLocalDate(LocalDate date, boolean pretty) {
+        return getWeekDayFromLocalDate(date, pretty, Locale.GERMAN);
+    }
+}
 package de.bht.beuthbot.canteen.model;
+import de.bht.beuthbot.utils.DateStringExtractor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -84,8 +85,10 @@ public class CanteenData {
     public final List<Dish> getDishesFiltered(final String pDate, final String pHealthy, final String pDishType,
                                               final String pMarkings, final String pDishCategory) {
-        final LocalDate date = ("tomorrow".equals(pDate) ? LocalDate.now().plusDays(1) : LocalDate.now());
-
+        logger.debug("pDate: " + pDate);
+        //final LocalDate date = ("tomorrow".equals(pDate) ? LocalDate.now().plusDays(1) : LocalDate.now());
+        final LocalDate date = DateStringExtractor.getLocalDateFromString(pDate);
+        logger.debug("resulting local date: " + date);
         final TrafficLight trafficLight = (pHealthy != null && !"".equals(pHealthy) ? TrafficLight.getTrafficLight(pHealthy): null);
         final DishType dishType = (pDishType != null && !"".equals(pDishType) ? DishType.getDishTypeByName(pDishType) : null);
@@ -3,11 +3,13 @@ package de.bht.beuthbot.scheduler;
 import de.bht.beuthbot.attachments.AttachmentStore;
 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.utils.DateStringExtractor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,6 +20,7 @@ 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;
@@ -75,14 +78,14 @@ public class SchedulerBean {
         for (Reminder reminder : _reminders) {
             //Check if date time now equals reminder date time
-            if(dateNow.equals(formatter.format(reminder.getCycleDate()))) {
+            if(dateNow.equals(formatter.format(reminder.getCycleTime()))) {
                 Long messageID = 1L;
                 AppUser user = reminder.getUser(); //TODO: Fill with correct value from DB
                 Long messengerId = Long.valueOf(user.getFacebookUserId() == null ? user.getTelegramUserId() : user.getFacebookUserId());
                 Messenger messenger = reminder.getMessenger(); //TODO: Fill with correct value from DB
                 String text = "";
-                String intent = "showFood";
-                Map entities = Collections.emptyMap();
+                String intent = reminder.getIntent();
+                Map entities = reminder.getEntities();
                 try {
                     TaskMessage message = new TaskMessage(1L, Target.MAINBOT, messageID, messengerId , messenger, text, null, intent, entities);
                     processQueue.route(new TaskMessage(message));
@@ -93,12 +96,34 @@ public class SchedulerBean {
         }
     }
-    public String createReminder(TaskMessage message, AppUser user) {
+    public Reminder createReminder(TaskMessage message, AppUser user) {
+        logger.debug("Creating reminder");
+
+        Messenger messenger = message.getMessenger();
+
+
+        //Figure out when to remind the user
+
+        //Set reminder cycle to one shot as a default
+        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
+        switch(messageDay) {
+            case "DAILY":
+                cycle = ReminderCycle.DAILY;
+                break;
+            case "WEEKLY":
+                cycle = ReminderCycle.WEEKLY;
+                break;
+            case "MONTHLY":
+                cycle = ReminderCycle.MONTHLY;
+                break;
+        }
+
+        LocalDate cycleDate = DateStringExtractor.getLocalDateFromString(messageDay);
-        ReminderCycle  cycle = ReminderCycle.DAILY;
-        Messenger messener = message.getMessenger();
-        String intent = message.getEntities().getOrDefault("event","");
-        Date date;
+        Date cycleTime;
         try {
             //Read out time for Reminder
@@ -126,21 +151,39 @@ public class SchedulerBean {
                 SimpleDateFormat f = new SimpleDateFormat("dd.MM.yyyy hh:mm");
                 Date d = f.parse(dateNow);
                 long milliseconds = d.getTime();
-                date = new Date(milliseconds);
+                cycleTime = new Date(milliseconds);
             } else
-                date = new Date();
+                cycleTime = new Date();
         } catch (Exception e) {
-            return "Fehler beim Anlegen der Erinnerung";
+            return null;
+        }
+        //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.TIME.getText(), cycleTime.toString());
+                logger.debug("Entities added: " + entities);
+                break;
+            case "showCourses":
+                //TODO: add Courses functionality
+                break;
+            default:
+                intent = "FALLBACK";
+                break;
         }
-        Reminder reminder = new Reminder(user, cycle, date, messener, intent);
+        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 "Erinnerung erstellt:\n" +
-                "Wann: um " + new SimpleDateFormat("KK:mm").format(reminder.getCycleDate()) + " Uhr\n" +
-                "Was: " + reminder.getIntent();
+        return reminder;
         //TODO: Insert the new Reminder into Database
     }
 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
@@ -11,18 +15,25 @@ public class Reminder {
     //Reminder cycle
     private ReminderCycle _reminderCycle;
     //Date of Cycle
-    private Date _cycleDate;
+    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, Date cycleDate, Messenger messenger, String intent) {
+    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() {
@@ -57,11 +68,17 @@ public class Reminder {
         _reminderCycle = reminderCycle;
     }
-    public Date getCycleDate() {
+    public LocalDate getCycleDate() {
         return _cycleDate;
     }
-    public void setCycleDate(Date 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; }
 }
@@ -39,9 +39,15 @@ 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 de.bht.beuthbot.utils.DateStringExtractor;
+
 global de.bht.beuthbot.canteen.model.CanteenData canteenData;
 global de.bht.beuthbot.model.entities.AppUser user;
+
+
 // ---------------------- GREETING ------------------------------------
 rule "Hello Drools"
    dialect "java"
@@ -88,8 +94,12 @@ rule &quot;Show dishes filtered&quot;
     when
         m : DroolsMessage( getIntent().equals(Intent.SHOW_FOOD.getText()) && !entities.isEmpty() )
     then
+        String day = m.getEntities().getOrDefault(EntityName.DATE.getText(), "");
+        if(day != "") {
+            day = DateStringExtractor.getGermanWeekDayFromLocalDate(DateStringExtractor.getLocalDateFromString(day),true);
+        }
         modify( m ) {
-            setText("Gerichte:\n" + canteenData.getDishesFilteredAsString(
+            setText("Diese Gerichte gibt es " + day + ":\n" + canteenData.getDishesFilteredAsString(
             (m.getEntities().containsKey(EntityName.DATE.getText()) ? m.getEntities().get(EntityName.DATE.getText()) : null),
             (m.getEntities().containsKey(EntityName.HEALTHY.getText()) ? m.getEntities().get(EntityName.HEALTHY.getText()) : null),
             (m.getEntities().containsKey(EntityName.DISH_TYPE.getText()) ? m.getEntities().get(EntityName.DISH_TYPE.getText()) : null),
@@ -126,7 +136,13 @@ rule &quot;Create reminder&quot;
     then
         SchedulerBean s = new SchedulerBean();
         TaskMessage message = new TaskMessage(m);
-        String messageText = s.createReminder(message, user);
+        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!";
+        } else {
+            messageText = "Es war mir leider nicht möglich eine Erinnerung für dich anzulegen. Versuche es bitte noch einmal.";
+        } //TODO: Add other intents
         m.setText(messageText);
 end
@@ -79,7 +79,8 @@ public class RasaConnector implements MessageListener {
             logger.debug("{}: {}", response.getStatus(), responseAsString);
             RasaResponse rasaResponse = gson.fromJson(responseAsString, RasaResponse.class);
-            TaskMessage messageToMainBot = new TaskMessage(new RasaMessage(incomingChatMessage, rasaResponse));
+            RasaMessage rasaMessage = new RasaMessage(incomingChatMessage, rasaResponse);
+            TaskMessage messageToMainBot = new TaskMessage(rasaMessage);
             processQueue.route(messageToMainBot);
         } catch (JMSException e) {
             logger.error("Error while processing message.", e);
@@ -103,9 +103,13 @@ public class TelegramSendAdapter implements MessageListener {
      * @param message to send
      */
     private void sendMessage(final Long senderId, final String message) {
+        logger.debug("Message is " + message.length() + " characters long");
         SendMessage request = new SendMessage(senderId, message);
         SendResponse sendResponse = bot.execute(request);
         logger.debug("Send message: " + sendResponse.isOk());
+        if(!sendResponse.isOk()) {
+            logger.debug("Sending message to user " + senderId + " failed: " + sendResponse.message());
+        }
     }
     /**