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

Benjamin Rühl
2 parents 302c0d25 e2aff233
Showing 28 changed files with 839 additions and 19 deletions
docker/rasa_nlu/volumes/data/api/intents/showFood.json
docker/wildfly/volumes/conf/beuthbot.properties
docu/BeuthBot.postman_collection.json
services/Common/src/main/java/de/bht/beuthbot/daos/LogMessageDAO.java
services/Common/src/main/java/de/bht/beuthbot/daos/LogMessageDAOImpl.java
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/EntityName.java
services/Common/src/main/java/de/bht/beuthbot/model/entities/AppUserImpl.java
services/Common/src/main/java/de/bht/beuthbot/model/entities/EntityBaseImpl.java
services/Common/src/main/java/de/bht/beuthbot/model/entities/GenericEntity.java
services/Common/src/main/java/de/bht/beuthbot/model/entities/GenericEntityAttribute.java
services/Common/src/main/java/de/bht/beuthbot/model/entities/GenericEntityAttributeValue.java
services/Common/src/main/java/de/bht/beuthbot/model/entities/LogMessage.java
services/Common/src/main/java/de/bht/beuthbot/model/entities/LogMessageImpl.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/Common/src/main/java/de/bht/beuthbot/utils/DateStringExtractor.java
services/MainBot/src/main/java/de/bht/beuthbot/canteen/model/CanteenData.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
+{
+	"info": {
+		"name": "BeuthBot",
+		"_postman_id": "fd29548f-6b95-81d0-cae3-1233324d3846",
+		"description": "",
+		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+	},
+	"item": [
+		{
+			"name": "Facebook",
+			"description": "",
+			"item": [
+				{
+					"name": "FB setWebhook",
+					"request": {
+						"method": "GET",
+						"header": [],
+						"body": {},
+						"url": {
+							"raw": "localhost:8080/facebook/setWebhook",
+							"host": [
+								"localhost"
+							],
+							"port": "8080",
+							"path": [
+								"facebook",
+								"setWebhook"
+							]
+						},
+						"description": ""
+					},
+					"response": []
+				},
+				{
+					"name": "FB getUpdates",
+					"request": {
+						"method": "POST",
+						"header": [
+							{
+								"key": "Content-Type",
+								"value": "application/json"
+							}
+						],
+						"body": {
+							"mode": "raw",
+							"raw": "{\"object\":\"page\",\"entry\":[{\"id\":\"163783704220143\",\"time\":1513427045712,\"messaging\":[{\"sender\":{\"id\":\"1385529261556255\"},\"recipient\":{\"id\":\"163783704220143\"},\"timestamp\":1513427044846,\"message\":{\"mid\":\"mid.$cAADOButO2l5mkI1R7lgX0gFO8FR5\",\"seq\":4370,\"text\":\"Hallo\"}}]}]}"
+						},
+						"url": {
+							"raw": "localhost:8080/facebook/getUpdates",
+							"host": [
+								"localhost"
+							],
+							"port": "8080",
+							"path": [
+								"facebook",
+								"getUpdates"
+							]
+						},
+						"description": ""
+					},
+					"response": []
+				}
+			]
+		},
+		{
+			"name": "Rasa",
+			"description": "",
+			"item": [
+				{
+					"name": "Rasa parse",
+					"request": {
+						"method": "GET",
+						"header": [],
+						"body": {},
+						"url": {
+							"raw": "localhost:5000/parse?q=Gerichte",
+							"host": [
+								"localhost"
+							],
+							"port": "5000",
+							"path": [
+								"parse"
+							],
+							"query": [
+								{
+									"key": "q",
+									"value": "Gerichte",
+									"equals": true
+								}
+							]
+						},
+						"description": ""
+					},
+					"response": []
+				}
+			]
+		},
+		{
+			"name": "Telegram",
+			"description": "",
+			"item": [
+				{
+					"name": "Telegram setWebhook",
+					"request": {
+						"method": "GET",
+						"header": [],
+						"body": {},
+						"url": {
+							"raw": ""
+						},
+						"description": ""
+					},
+					"response": []
+				},
+				{
+					"name": "Telegram setWebhook",
+					"request": {
+						"method": "POST",
+						"header": [],
+						"body": {},
+						"url": {
+							"raw": "localhost:8080/telegram/setWebhook",
+							"host": [
+								"localhost"
+							],
+							"port": "8080",
+							"path": [
+								"telegram",
+								"setWebhook"
+							]
+						},
+						"description": ""
+					},
+					"response": []
+				}
+			]
+		},
+		{
+			"name": "Wildfly Home",
+			"request": {
+				"method": "GET",
+				"header": [],
+				"body": {},
+				"url": {
+					"raw": "localhost/8080",
+					"host": [
+						"localhost"
+					],
+					"path": [
+						"8080"
+					]
+				},
+				"description": ""
+			},
+			"response": []
+		}
+	]
+}
 \ No newline at end of file
+package de.bht.beuthbot.daos;
+
+import de.bht.beuthbot.model.entities.LogMessage;
+
+import javax.ejb.Remote;
+
+/**
+ * Created by Stephan Hausdörfer on 19.01.2018.
+ */
+@Remote
+public interface LogMessageDAO extends GenericDAO<LogMessage, Long> {
+
+    LogMessage createMessage();
+}
+package de.bht.beuthbot.daos;
+
+import de.bht.beuthbot.model.entities.LogMessage;
+import de.bht.beuthbot.model.entities.LogMessageImpl;
+
+import javax.ejb.Stateless;
+
+/**
+ * Created by Stephan Hausdörfer on 19.01.2018.
+ */
+@Stateless
+public class LogMessageDAOImpl extends GenericHibernateDAO<LogMessage, LogMessageImpl, Long> implements LogMessageDAO {
+
+    @Override
+    public LogMessage createMessage() {
+        return new LogMessageImpl();
+    }
+}
 \ No newline at end of file
+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();
+    }
+}
@@ -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;
@@ -13,7 +13,7 @@ import javax.persistence.Table;
  * Postgres does not support creating a table named "user".
  */
 @Entity
-@Table
+@Table(name = "app_user")
 public class AppUserImpl extends EntityBaseImpl implements AppUser {
     private String facebookUserId;
@@ -38,7 +38,7 @@ public class EntityBaseImpl implements EntityBase {
     @Override
     public Long getId() {
-        return null;
+        return id;
     }
     @Override
@@ -14,7 +14,7 @@ import java.util.stream.Collectors;
  * Follows the Entity-Attribute-Value model of database design.
  */
 @Entity
-@Table
+@Table(name = "generic_entity")
 public class GenericEntity extends EntityBaseImpl {
     /**
@@ -14,7 +14,7 @@ import java.util.stream.Collectors;
  * Holds a collection of generic values.
  */
 @Entity
-@Table
+@Table(name = "generic_entity_attribute")
 public class GenericEntityAttribute extends EntityBaseImpl {
     private String name;
@@ -11,7 +11,7 @@ import javax.persistence.Table;
  * Supports complex nested types using a reference to a generic sub entity.
  */
 @Entity
-@Table
+@Table(name = "generic_entity_attribute_value")
 public class GenericEntityAttributeValue extends EntityBaseImpl {
     private Boolean valueAsBool;
+package de.bht.beuthbot.model.entities;
+
+/**
+ * Created by Stephan Hausdörfer on 19.01.2018.
+ */
+public interface LogMessage extends EntityBase {
+
+    long getUserId();
+
+    void setUserId(long userId);
+
+    String getMessage();
+
+    void setMessage(String message);
+}
+package de.bht.beuthbot.model.entities;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * Created by Stephan Hausdörfer on 19.01.2018.
+ */
+@Entity
+@Table(name = "log_message")
+public class LogMessageImpl extends EntityBaseImpl implements LogMessage {
+
+    private long userId;
+
+    private String message;
+
+
+    @Override
+    public long getUserId() {
+        return userId;
+    }
+
+    @Override
+    public void setUserId(long userId) {
+        this.userId = userId;
+    }
+
+    @Override
+    public String getMessage() {
+        return message;
+    }
+
+    @Override
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}
+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.CollectionTable;
+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(name = "reminder")
+public class ReminderImpl extends EntityBaseImpl implements Reminder {
+
+    private long userId;
+
+    private ReminderCycle reminderCycle;
+
+    private LocalDate cycleTime;
+
+    private Messenger messenger;
+
+    private String intent;
+
+    @ElementCollection
+    @CollectionTable(name = "reminder_entities")
+    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.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);
 package de.bht.beuthbot.drools;
-
-
-
 import com.google.gson.Gson;
-
 import de.bht.beuthbot.attachments.AttachmentStore;
 import de.bht.beuthbot.canteen.Parser;
 import de.bht.beuthbot.canteen.model.CanteenData;
 import de.bht.beuthbot.conf.Application;
 import de.bht.beuthbot.daos.AppUserDAO;
+import de.bht.beuthbot.daos.LogMessageDAO;
 import de.bht.beuthbot.drools.model.DroolsMessage;
 import de.bht.beuthbot.jms.ProcessQueue;
 import de.bht.beuthbot.jms.ProcessQueueMessageProtocol;
@@ -18,6 +15,8 @@ import de.bht.beuthbot.jms.Target;
 import de.bht.beuthbot.jms.TaskMessage;
 import de.bht.beuthbot.model.Messenger;
 import de.bht.beuthbot.model.entities.AppUser;
+
+import de.bht.beuthbot.model.entities.LogMessage;
 import org.kie.api.KieServices;
 import org.kie.api.runtime.KieContainer;
 import org.kie.api.runtime.KieSession;
@@ -73,6 +72,9 @@ public class DroolsService implements MessageListener {
     @Resource(lookup = "java:global/global/AppUserDAOImpl")
     private AppUserDAO userDAO;
+    @Resource(lookup = "java:global/global/LogMessageDAOImpl")
+    private LogMessageDAO logMessageDAO;
+
     @Inject
     private Parser parser;
@@ -143,7 +145,10 @@ public class DroolsService implements MessageListener {
         }
         AppUser finishedUser = userDAO.saveOrUpdate(tempUser);
-
+        LogMessage logMessage = logMessageDAO.createMessage();
+        logMessage.setUserId(finishedUser.getId());
+        logMessage.setMessage(botMessage.getText());
+        logMessageDAO.saveOrUpdate(logMessage);
         ksession.setGlobal("canteenData", canteenData);
         ksession.setGlobal("user", finishedUser);
+package de.bht.beuthbot.scheduler;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+/**
+ * JAXActivator is an arbitrary name, what is important is that javax.ws.rs.core.Application is extended
+ * and the @ApplicationPath annotation is used with a "rest" path.  Without this the rest routes linked to
+ * from index.html would not be found.
+ */
+@ApplicationPath("")
+public class JAXActivator extends Application {
+    // Left empty intentionally
+}
+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.EntityName;
+import de.bht.beuthbot.model.Intent;
+import de.bht.beuthbot.model.Messenger;
+import de.bht.beuthbot.model.entities.AppUser;
+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.jms.ProcessQueue;
+import de.bht.beuthbot.jms.TaskMessage;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.*;
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+import javax.ejb.*;
+
+@Singleton
+@Startup
+public class SchedulerBean {
+    /**
+     * slf4j Logger
+     */
+    private final Logger logger = LoggerFactory.getLogger(SchedulerBean.class);
+    //Timer object for call cycling
+    @Resource
+    TimerService timerService;
+    /** Injected JMS MessageQueue */
+    @Resource(lookup = "java:global/global/ProcessQueueBean")
+    private ProcessQueue processQueue;
+
+    /** Injected AttachmentStore */
+    @Resource(lookup = "java:global/global/AttachmentStoreBean")
+    private AttachmentStore attachmentStore;
+
+    /** BeuthBot Application Bean */
+    @Resource(lookup = "java:global/global/ApplicationBean")
+    private Application application;
+
+    /** 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;
+
+    public SchedulerBean() {
+
+    }
+
+    //CONSTRUCTOR
+    @PostConstruct
+    public void init(){
+        logger.debug("SchedulerBean initiated!");
+    }
+
+    @Schedule(hour="*", minute="*")
+    public void fetchReminders() {
+        logger.debug("SchedulerBean fired!");
+
+        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) {
+            //Check if date time now equals reminder date time
+            if(dateNow.equals(formatter.format(reminder.getCycleTime()))) {
+                Long messageID = 1L;
+                AppUser user = userDAO.findById(reminder.getUserId());
+                Long messengerId = Long.valueOf(user.getFacebookUserId() == null ? user.getTelegramUserId() : user.getFacebookUserId());
+                Messenger messenger = reminder.getMessenger();
+                String text = "";
+                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));
+                } catch (Exception e) {
+                    logger.error("Something went wrong while attempting to send reminder!", e);
+                }
+            }
+        }
+    }
+
+    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);
+
+        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";
+                }
+
+                SimpleDateFormat f = new SimpleDateFormat("dd.MM.yyyy hh:mm");
+                Date d = f.parse(dateNow);
+                long milliseconds = d.getTime();
+                cycleTime = new Date(milliseconds);
+
+            } else
+                cycleTime = new Date();
+
+        } catch (Exception e) {
+            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;
+        }
+
+        logger.debug("Creating reminder with date " + cycleDate.toString() + " and time " + cycleTime.toString());
+
+        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);
+    }
+
+}
@@ -32,16 +32,21 @@ 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.model.Reminder;
+
+import java.time.DayOfWeek;
+import java.time.LocalDate
+import de.bht.beuthbot.utils.DateStringExtractor
+import de.bht.beuthbot.model.entities.Reminder;
 global de.bht.beuthbot.canteen.model.CanteenData canteenData;
 global de.bht.beuthbot.model.entities.AppUser user;
+
+
 // ---------------------- GREETING ------------------------------------
 rule "Hello Drools"
    dialect "java"
@@ -88,8 +93,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 +135,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.getCycleTime(), 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);
@@ -13,6 +13,9 @@ import com.pengrad.telegrambot.response.GetFileResponse;
 import de.bht.beuthbot.attachments.AttachmentStore;
 import de.bht.beuthbot.conf.Application;
 import de.bht.beuthbot.conf.Configuration;
+import de.bht.beuthbot.daos.AppUserDAO;
+import de.bht.beuthbot.daos.LogMessageDAO;
+import de.bht.beuthbot.daos.ReminderDAO;
 import de.bht.beuthbot.jms.ProcessQueue;
 import de.bht.beuthbot.jms.TaskMessage;
 import de.bht.beuthbot.messenger.telegram.model.TelegramAttachment;
@@ -20,6 +23,11 @@ import de.bht.beuthbot.messenger.telegram.model.TelegramMessage;
 import de.bht.beuthbot.messenger.telegram.model.TelegramWebhookURL;
 import de.bht.beuthbot.model.Attachment;
 import de.bht.beuthbot.model.AttachmentType;
+import de.bht.beuthbot.model.Messenger;
+import de.bht.beuthbot.model.entities.AppUser;
+import de.bht.beuthbot.model.entities.LogMessage;
+import de.bht.beuthbot.model.entities.Reminder;
+import de.bht.beuthbot.model.enumeration.ReminderCycle;
 import org.apache.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,10 +35,14 @@ import org.slf4j.LoggerFactory;
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+import java.time.LocalDate;
+import java.util.HashMap;
+import java.util.List;
 /**
  * @Author: Christopher Kümmel on 5/14/2017.
@@ -56,6 +68,18 @@ public class TelegramReceiveAdapter {
     /** com.pengrad.telegrambot.TelegramBot; */
     private TelegramBot bot;
+    /** Injected AppUserDAO */
+    @Resource(lookup = "java:global/global/AppUserDAOImpl")
+    private AppUserDAO userDAO;
+
+    /** Injected AppUserDAO */
+    @Resource(lookup = "java:global/global/ReminderDAOImpl")
+    private ReminderDAO reminderDAO;
+
+    /** Injected AppUserDAO */
+    @Resource(lookup = "java:global/global/LogMessageDAOImpl")
+    private LogMessageDAO logMessageDAO;
+
     /**
      * Initialize TelegramBot with Token
      */
@@ -131,6 +155,52 @@ public class TelegramReceiveAdapter {
         }
     }
+    /**
+     * Test method for database
+     * @return Http response
+     */
+    @GET
+    @Path("/testDatabase")
+    public Response testDatabase() {
+        logger.info("testDatabase: Start");
+        AppUser user = userDAO.createUser();
+        user.setFacebookUserId("88");
+        user.setTelegramUserId("99");
+        user.setProperty("test_key", "test_value");
+        userDAO.saveOrUpdate(user);
+        logger.info("testDatabase: Speichern durchgefuehrt");
+
+        List<AppUser> userList = userDAO.findAll();
+        String result = userList.get(0).getTelegramUserId();
+        logger.info("TelegramUserId: " + result);
+        logger.info("testDatabase: Auslesen durchgefuehrt");
+
+        Reminder reminder = reminderDAO.createReminder();
+        reminder.setMessenger(Messenger.TELEGRAM);
+        reminder.setReminderCycle(ReminderCycle.DAILY);
+        reminder.setCycleTime(LocalDate.now());
+        Long userId = userList.get(0).getId();
+        reminder.setUserId(userId);
+        reminder.setIntent("Intent");
+        HashMap entities = new HashMap();
+        entities.put("key1", "value2");
+        entities.put("key2", "value2");
+        reminder.setEntities(entities);
+        reminderDAO.saveOrUpdate(reminder);
+
+        List<Reminder> reminders = reminderDAO.findAll();
+        Reminder reminderResult = reminders.get(0);
+        logger.info("Reminder Cycle: " + reminderResult.getReminderCycle().toString());
+        logger.info("Telegram ID via Reminder: " + userDAO.findById(reminderResult.getUserId()).getTelegramUserId());
+
+        LogMessage logMessage = logMessageDAO.createMessage();
+        logMessage.setUserId(userList.get(0).getId());
+        logMessage.setMessage("Message");
+        logMessageDAO.saveOrUpdate(logMessage);
+
+        return Response.status(HttpStatus.SC_OK).build();
+    }
+
     /**
      * RESTEasy HTTP Post to set Webhook
@@ -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());
+        }
     }
     /**
+package de.bht.beuthbot.messenger.telegram.model;
+
+import de.bht.beuthbot.conf.Application;
+import de.bht.beuthbot.conf.Configuration;
+
+import javax.annotation.Resource;
+
+public class TelegramWebhookURL {
+    /** BeuthBot Application Bean */
+    @Resource(lookup = "java:global/global/ApplicationBean")
+    private Application application;
+
+    private String url;
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        /*
+        if(!botToken.equals(application.getConfiguration(Configuration.TELEGRAM_BOT_TOKEN))) {
+            return;
+        }*/
+        this.url = url;
+    }
+
+    @Override
+    public String toString() {
+        return url;
+    }
+}