New Reminder text and Droolslogic

Neocortexxx
1 parent 0ee70d95
Showing 9 changed files with 290 additions and 46 deletions
docker/rasa_nlu/volumes/data/api/intents/createReminder.json
docker/rasa_nlu/volumes/data/api/intents/createReminder_usersays_de.json
docker/wildfly/volumes/conf/beuthbot.properties
docu/attachmentstore.md
docu/facebook.md
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
src/main/plantuml/model.puml
@@ -26,10 +26,19 @@
         },
         {
           "id": "b8be17f8-0174-401c-b5a4-fabacaf8cfd6",
+          "required": false,
           "dataType": "@eventDate",
           "name": "eventDate",
           "value": "$eventDate",
           "isList": false
+        },
+        {
+          "id": "efe0fc3c-12c1-4596-b708-629f85eff4d4",
+          "required": false,
+          "dataType": "@sys.time",
+          "name": "time",
+          "value": "$time",
+          "isList": false
         }
       ],
       "messages": [
 [
   {
-    "id": "048b511c-bfd1-4c84-bcaf-b0e5682ae312",
+    "id": "67f7964a-dce7-4850-bc8d-1c54cc9322f9",
+    "data": [
+      {
+        "text": "Schicke mir ",
+        "userDefined": false
+      },
+      {
+        "text": "täglich",
+        "alias": "date",
+        "meta": "@date",
+        "userDefined": true
+      },
+      {
+        "text": " um ",
+        "userDefined": false
+      },
+      {
+        "text": "9:15",
+        "alias": "time",
+        "meta": "@sys.time",
+        "userDefined": true
+      },
+      {
+        "text": " den ",
+        "userDefined": false
+      },
+      {
+        "text": "Mensaplan",
+        "alias": "event",
+        "meta": "@event",
+        "userDefined": false
+      }
+    ],
+    "isTemplate": false,
+    "count": 0
+  },
+  {
+    "id": "57817744-75c2-4506-9aa9-c4fe64c79cf7",
+    "data": [
+      {
+        "text": "Schick mir ",
+        "userDefined": false
+      },
+      {
+        "text": "jeden Tag",
+        "alias": "date",
+        "meta": "@date",
+        "userDefined": true
+      },
+      {
+        "text": " um ",
+        "userDefined": false
+      },
+      {
+        "text": "10:30",
+        "alias": "time",
+        "meta": "@sys.time",
+        "userDefined": true
+      },
+      {
+        "text": " was es in der ",
+        "userDefined": false
+      },
+      {
+        "text": "Mensa",
+        "alias": "event",
+        "meta": "@event",
+        "userDefined": true
+      },
+      {
+        "text": " gibt",
+        "userDefined": false
+      }
+    ],
+    "isTemplate": false,
+    "count": 0
+  },
+  {
+    "id": "dfb1541a-6488-46fc-9780-3e8c1e59a8d0",
+    "data": [
+      {
+        "text": "Schick mir ",
+        "userDefined": false
+      },
+      {
+        "text": "jeden Tag",
+        "alias": "date",
+        "meta": "@date",
+        "userDefined": true
+      },
+      {
+        "text": " um ",
+        "userDefined": false
+      },
+      {
+        "text": "12",
+        "alias": "time",
+        "meta": "@sys.time",
+        "userDefined": true
+      },
+      {
+        "text": " den ",
+        "userDefined": false
+      },
+      {
+        "text": "Mensaplan",
+        "alias": "event",
+        "meta": "@event",
+        "userDefined": true
+      }
+    ],
+    "isTemplate": false,
+    "count": 0
+  },
+  {
+    "id": "cb34aa7b-a3d5-44bb-ae99-8517a3cd87a1",
+    "data": [
+      {
+        "text": "Sag mir ",
+        "userDefined": false
+      },
+      {
+        "text": "morgen",
+        "alias": "date",
+        "meta": "@date",
+        "userDefined": false
+      },
+      {
+        "text": " um ",
+        "userDefined": false
+      },
+      {
+        "text": "10 Uhr",
+        "alias": "time",
+        "meta": "@sys.time",
+        "userDefined": true
+      },
+      {
+        "text": " was es zu ",
+        "userDefined": false
+      },
+      {
+        "text": "essen",
+        "alias": "event",
+        "meta": "@event",
+        "userDefined": false
+      },
+      {
+        "text": " gibt",
+        "userDefined": false
+      }
+    ],
+    "isTemplate": false,
+    "count": 0
+  },
+  {
+    "id": "e57f06f3-b85b-430c-9f80-d5eea3add061",
     "data": [
       {
         "text": "Sag mir ",
@@ -27,7 +183,7 @@
     "count": 0
   },
   {
-    "id": "3db29b3b-0dae-4960-b1b8-2472086f9ab2",
+    "id": "66d04c31-2ae0-431d-a9fd-9f978280e255",
     "data": [
       {
         "text": "Sag mir ",
@@ -58,7 +214,7 @@
     "count": 0
   },
   {
-    "id": "15128099-9cc8-4d75-b463-8a9c14cbbe71",
+    "id": "6355f4ca-616b-4679-a97f-218d132c9548",
     "data": [
       {
         "text": "Erinner mich ",
@@ -85,7 +241,7 @@
     "count": 0
   },
   {
-    "id": "3ac087fd-5dec-4da0-892e-da5158942427",
+    "id": "3bd103d7-59ae-4d78-85e2-7c18832eb2c9",
     "data": [
       {
         "text": "Schick mir ",
@@ -112,7 +268,7 @@
     "count": 0
   },
   {
-    "id": "e3964a35-45c4-486e-9f0c-570ebbb65c41",
+    "id": "be93cedf-afc5-4e2c-9a74-2e712bd2003b",
     "data": [
       {
         "text": "Schick mir ",
@@ -139,7 +295,7 @@
     "count": 0
   },
   {
-    "id": "0c89a079-064f-4d8f-9aa5-93d0cd17d289",
+    "id": "90359a1d-f4c6-4d0b-8c68-e0d533310bf2",
     "data": [
       {
         "text": "Erinnere mich ",
@@ -166,7 +322,7 @@
     "count": 0
   },
   {
-    "id": "1f6e6f74-a322-4a2c-852b-5603b21cc197",
+    "id": "c89bd8fc-05ac-4a83-805c-791bc34875d2",
     "data": [
       {
         "text": "Erinner mich ",
@@ -193,7 +349,7 @@
     "count": 0
   },
   {
-    "id": "8fddff73-5b7f-4323-8406-22278c29a921",
+    "id": "506ac56c-af5d-417b-8f6d-4756a26f961e",
     "data": [
       {
         "text": "Ich möchte ",
@@ -224,7 +380,7 @@
     "count": 0
   },
   {
-    "id": "b986f29a-4e3f-4d5e-80ec-f8a24bf65682",
+    "id": "3a1f5110-eca8-488f-86b7-6a2eb14af696",
     "data": [
       {
         "text": "Ich möchte ",
@@ -255,7 +411,7 @@
     "count": 0
   },
   {
-    "id": "283d3114-0f98-439b-97dc-4533acae7819",
+    "id": "52aed8c1-f5d1-4ac5-b70e-713f4030d91a",
     "data": [
       {
         "text": "Ich möchte ",
@@ -296,7 +452,7 @@
     "count": 0
   },
   {
-    "id": "8cc39102-5715-4aab-a75b-dce15852daf0",
+    "id": "9b459ffc-24ae-4abd-89ca-ee40555b7c79",
     "data": [
       {
         "text": "Ich möchte ",
@@ -337,7 +493,7 @@
     "count": 0
   },
   {
-    "id": "30cfae78-6f8a-4342-8510-df3668148c1b",
+    "id": "e498660c-8e55-4847-b874-09789e622efe",
     "data": [
       {
         "text": "Ich will ",
@@ -378,7 +534,7 @@
     "count": 0
   },
   {
-    "id": "da87cf85-1e1d-473c-b2f8-d4783cb912a8",
+    "id": "4c82899c-5dfe-4408-8554-e27da2c697d9",
     "data": [
       {
         "text": "Ich will ",
@@ -409,7 +565,7 @@
     "count": 0
   },
   {
-    "id": "e0205bbe-d5fd-456c-8da1-302e7e47090c",
+    "id": "b25fbdf2-c155-43b1-a293-e88eae55e2f8",
     "data": [
       {
         "text": "Ich will ",
@@ -440,7 +596,7 @@
     "count": 0
   },
   {
-    "id": "3b09fc0e-cf73-4752-8510-1896b086fce0",
+    "id": "0899dbf0-698c-4e34-a2b3-bc94d3de86ba",
     "data": [
       {
         "text": "Ich möchte ",
@@ -471,7 +627,7 @@
     "count": 0
   },
   {
-    "id": "66cbbf17-d8b3-4ed6-b619-cf73396cb99a",
+    "id": "8b8db57f-ba18-4527-a639-d47fb47a3a4b",
     "data": [
       {
         "text": "Ich möchte ",
@@ -502,7 +658,7 @@
     "count": 0
   },
   {
-    "id": "0f080528-e477-4fbe-8e10-74c93b90b956",
+    "id": "a5fa7401-96dc-4a5c-93c9-9a57fc45d567",
     "data": [
       {
         "text": "Ich möchte ",
@@ -533,7 +689,7 @@
     "count": 0
   },
   {
-    "id": "fa1ef3a4-6e89-4de9-b935-b5c483a2a528",
+    "id": "a0c7e8cf-620f-47df-bf60-b7e217ec137e",
     "data": [
       {
         "text": "Erinnere mich jeden ",
@@ -560,7 +716,7 @@
     "count": 0
   },
   {
-    "id": "fe089fe4-6be1-4a66-b1f5-1b646faacc90",
+    "id": "043ba90b-2cd0-4411-b7ae-2e48f407bbae",
     "data": [
       {
         "text": "Erinner mich ",
@@ -587,7 +743,7 @@
     "count": 0
   },
   {
-    "id": "786a4f45-8367-4442-bb67-ae585ae4a593",
+    "id": "75c7a2e0-54ca-47b6-bf5c-661d45ffacb3",
     "data": [
       {
         "text": "Erinnere mich ",
-WEB_URL = https://tlhiuqrvbl.localtunnel.me
+WEB_URL = https://eoiqzqzwvt.localtunnel.me
 # Webhook token you set in the Facebook App Settings
@@ -10,7 +10,7 @@
 ## Description
-The AttachmentStore represents a Service to persist Data in any variation. For example: an audio-file from a messenger need to be stored locally to be processed further. 
+The AttachmentStore represents a Service to persist Data in any variation. For example: an audio-file from a _messenger need to be stored locally to be processed further. 
 ## Functionality
@@ -27,7 +27,7 @@
 ##### ii. Facebook App
-- after you created the app, add the 'messenger product' in the control panel on the left side
+- after you created the app, add the '_messenger product' in the control panel on the left side
 - generate an messaging key for your Facebook page and store it under 'FACEBOOK_BOT_TOKEN' in the config.properties
 - setup a webhook by using your webhook address (https://yourdomain.com/rest/facebook/getUpdates) and the identification key set in 'FACEBOOK_WEBHOOK_TOKEN' in the config.properties
 - subscribe the webhook to your Facebook page
@@ -15,6 +15,8 @@ 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.util.*;
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
@@ -48,7 +50,7 @@ public class SchedulerBean {
     //list of reminders to be populated with data from the DB
     private ArrayList<Reminder> _reminders = new ArrayList<>();
-    boolean isActive = false;
+    boolean isActive = true;
     public SchedulerBean() {
@@ -67,31 +69,78 @@ public class SchedulerBean {
         if (!isActive) return;
-        Long messageID = 1L;
-        Long senderID = 1L; //TODO: Fill with correct value from DB
-        Messenger messenger = Messenger.TELEGRAM; //TODO: Fill with correct value from DB
-        String text = "";
-        String intent = "remind";
-        Map entities = Collections.emptyMap();
+        SimpleDateFormat formatter = new SimpleDateFormat("dd.MM.yyyy KK:mm");
+        String dateNow = formatter.format(new Date());
+
+        for (Reminder reminder : _reminders) {
+            //Check if date time now equals reminder date time
+            if(dateNow.equals(formatter.format(reminder.getCycleDate()))) {
+                Long messageID = 1L;
+                Long senderID = reminder.getUserID(); //TODO: Fill with correct value from DB
+                Messenger messenger = reminder.getMessenger(); //TODO: Fill with correct value from DB
+                String text = "";
+                String intent = "showFood";
+                Map entities = Collections.emptyMap();
+                try {
+                    TaskMessage message = new TaskMessage(1L, Target.MAINBOT, messageID, senderID, messenger, text, null, intent, entities);
+                    processQueue.route(new TaskMessage(message));
+                } catch (Exception e) {
+                    logger.error("Something went wrong while attempting to send reminder!", e);
+                }
+            }
+        }
+    }
+
+    public String createReminder(TaskMessage message) {
+        Long user =  message.getSenderID();
+        ReminderCycle  cycle = ReminderCycle.DAILY;
+        Messenger messener = message.getMessenger();
+        String intent = message.getEntities().getOrDefault("event","");
+        Date date;
         try {
-            TaskMessage message = new TaskMessage(1L, Target.MAINBOT, messageID, senderID, messenger, text, null, intent, entities);
-            processQueue.route(new TaskMessage(message));
+            //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";
+                }
+
+                SimpleDateFormat f = new SimpleDateFormat("dd.MM.yyyy hh:mm");
+                Date d = f.parse(dateNow);
+                long milliseconds = d.getTime();
+                date = new Date(milliseconds);
+
+            } else
+                date = new Date();
         } catch (Exception e) {
-            logger.error("Something went wrong while attempting to send reminder!", e);
+            return "Fehler beim Anlegen der Erinnerung";
         }
+        Reminder reminder = new Reminder(user, cycle, date, messener, intent);
+        _reminders.add(reminder);
+        return "Erinnerung erstellt:\n" +
+                "Wann: um " + new SimpleDateFormat("KK:mm").format(reminder.getCycleDate()) + " Uhr\n" +
+                "Was: " + reminder.getIntent();
-
-    }
-
-    public boolean createReminder(TaskMessage message) {
-        //Reminder newReminder = new Reminder(message.getSenderID()); //, reminderCycle, cycleDate);
         //TODO: Insert the new Reminder into Database
-
-        return true;
-
     }
 }
 package de.bht.beuthbot.scheduler.model;
-import de.bht.beuthbot.scheduler.model.ReminderCycle;
+import de.bht.beuthbot.model.Messenger;
 import java.util.Date;
@@ -11,11 +11,33 @@ public class Reminder {
     private ReminderCycle _reminderCycle;
     //Date of Cycle
     private Date _cycleDate;
+    //Used Messenger
+    private Messenger _messenger;
+    //Intent after Reminder is triggered
+    private String _intent;
-    public Reminder(Long userID, ReminderCycle reminderCycle, Date cycleDate) {
+    public Reminder(Long userID, ReminderCycle reminderCycle, Date cycleDate, Messenger messenger, String intent) {
         _userID = userID;
         _reminderCycle = reminderCycle;
         _cycleDate = cycleDate;
+        _messenger = messenger;
+        _intent = intent;
+    }
+
+    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 Long getUserID() {
@@ -31,7 +31,13 @@ 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.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;
 global de.bht.beuthbot.canteen.model.CanteenData canteenData;
@@ -118,7 +124,9 @@ rule &quot;Create reminder&quot;
     then
         SchedulerBean s = new SchedulerBean();
-        if (s.createReminder(new TaskMessage(m)) == true) { m.setText("Ich werde dich erinnern!"); }
+        TaskMessage message = new TaskMessage(m);
+        String messageText = s.createReminder(message);
+        m.setText(messageText);
 end
@@ -5,7 +5,7 @@ class Message {
     ID: Long
     messageID: String
     senderID: String
-    messenger: Messenger
+    _messenger: Messenger
     text: String
     attechments: Attachment[]
 }