Neue Rasa-Entities eingebaut.

mfcb
1 parent 05449498
Showing 10 changed files with 21 additions and 12 deletions
BeuthBot.ipr
services/Global/Global_test.iml
services/MainBot/src/main/java/de/bht/beuthbot/drools/DroolsService.java
services/Scheduler/src/main/java/de/bht/beuthbot/scheduler/JAXActivator.java → services/MainBot/src/main/java/de/bht/beuthbot/scheduler/JAXActivator.java
services/Scheduler/src/main/java/de/bht/beuthbot/scheduler/SchedulerBean.java → services/MainBot/src/main/java/de/bht/beuthbot/scheduler/SchedulerBean.java
services/Scheduler/src/main/java/de/bht/beuthbot/scheduler/model/Reminder.java → services/MainBot/src/main/java/de/bht/beuthbot/scheduler/model/Reminder.java
services/Scheduler/src/main/java/de/bht/beuthbot/scheduler/model/ReminderCycle.java → services/MainBot/src/main/java/de/bht/beuthbot/scheduler/model/ReminderCycle.java
services/MainBot/src/main/resources/de/bht/beuthbot/drools/Canteen.drl
services/Rasa/src/main/java/de/bht/beuthbot/nlp/rasa/RasaConnector.java
settings.gradle
@@ -691,7 +691,6 @@
             <option value="$PROJECT_DIR$/services/Common" />
             <option value="$PROJECT_DIR$/services/FaceBook" />
             <option value="$PROJECT_DIR$/services/Global" />
-            <option value="$PROJECT_DIR$/services/JSONRequester" />
             <option value="$PROJECT_DIR$/services/LoggingStatistics" />
             <option value="$PROJECT_DIR$/services/MainBot" />
             <option value="$PROJECT_DIR$/services/Rasa" />
@@ -856,9 +855,6 @@
       <module fileurl="file://$PROJECT_DIR$/services/Global/Global.iml" filepath="$PROJECT_DIR$/services/Global/Global.iml" group="services/Global" />
       <module fileurl="file://$PROJECT_DIR$/services/Global/Global_main.iml" filepath="$PROJECT_DIR$/services/Global/Global_main.iml" group="services/Global" />
       <module fileurl="file://$PROJECT_DIR$/services/Global/Global_test.iml" filepath="$PROJECT_DIR$/services/Global/Global_test.iml" group="services/Global" />
-      <module fileurl="file://$PROJECT_DIR$/services/JSONRequester/JSONRequester.iml" filepath="$PROJECT_DIR$/services/JSONRequester/JSONRequester.iml" group="services/JSONRequester" />
-      <module fileurl="file://$PROJECT_DIR$/services/JSONRequester/JSONRequester_main.iml" filepath="$PROJECT_DIR$/services/JSONRequester/JSONRequester_main.iml" group="services/JSONRequester" />
-      <module fileurl="file://$PROJECT_DIR$/services/JSONRequester/JSONRequester_test.iml" filepath="$PROJECT_DIR$/services/JSONRequester/JSONRequester_test.iml" group="services/JSONRequester" />
       <module fileurl="file://$PROJECT_DIR$/services/LoggingStatistics/LoggingStatistics.iml" filepath="$PROJECT_DIR$/services/LoggingStatistics/LoggingStatistics.iml" group="services/LoggingStatistics" />
       <module fileurl="file://$PROJECT_DIR$/services/LoggingStatistics/LoggingStatistics_main.iml" filepath="$PROJECT_DIR$/services/LoggingStatistics/LoggingStatistics_main.iml" group="services/LoggingStatistics" />
       <module fileurl="file://$PROJECT_DIR$/services/LoggingStatistics/LoggingStatistics_test.iml" filepath="$PROJECT_DIR$/services/LoggingStatistics/LoggingStatistics_test.iml" group="services/LoggingStatistics" />
@@ -66,8 +66,8 @@
     <orderEntry type="library" name="Gradle: org.jboss.shrinkwrap:shrinkwrap-api:1.2.6" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Gradle: org.wildfly.arquillian:wildfly-arquillian-common:2.0.2.Final" level="project" />
     <orderEntry type="library" name="Gradle: org.jboss.arquillian.container:arquillian-container-spi:1.1.13.Final" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Gradle: org.wildfly.arquillian:wildfly-arquillian-protocol-jmx:2.0.2.Final" level="project" />
     <orderEntry type="library" name="Gradle: org.jboss.arquillian.config:arquillian-config-api:1.1.13.Final" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Gradle: org.wildfly.arquillian:wildfly-arquillian-protocol-jmx:2.0.2.Final" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Gradle: org.jboss.marshalling:jboss-marshalling-river:1.4.10.Final" level="project" />
     <orderEntry type="library" name="Gradle: org.jboss.arquillian.config:arquillian-config-impl-base:1.1.13.Final" level="project" />
     <orderEntry type="library" name="Gradle: org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-spi:2.0.0-alpha-10" level="project" />
@@ -72,6 +72,7 @@ public class DroolsService implements MessageListener {
     @Override
     public void onMessage(Message message) {
         try {
+            logger.debug("Drools has received message");
             ProcessQueueMessageProtocol botMessage = message.getBody(TaskMessage.class);
  
             DroolsMessage droolsMessage = doRules(botMessage);
@@ -50,6 +50,10 @@ public class SchedulerBean {
  
     boolean isActive = false;
  
+    public SchedulerBean() {
+
+    }
+
     //CONSTRUCTOR
     @PostConstruct
     public void init(){
@@ -82,10 +86,12 @@ public class SchedulerBean {
  
     }
  
-    public void createReminder(Long userID, ReminderCycle reminderCycle, Date cycleDate) {
-        Reminder newReminder = new Reminder(userID, reminderCycle, cycleDate);
+    public boolean createReminder(TaskMessage message) {
+        //Reminder newReminder = new Reminder(message.getSenderID()); //, reminderCycle, cycleDate);
         //TODO: Insert the new Reminder into Database
  
+        return true;
+
     }
  
 }
@@ -25,10 +25,14 @@ import java.time.LocalDate;
  
 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;
+
 global de.bht.beuthbot.canteen.model.CanteenData canteenData;
  
 // ---------------------- GREETING ------------------------------------
@@ -106,17 +110,19 @@ rule &quot;Show price&quot;
 end
  
 // ---------------------------- CREATE REMINDER -----------------------------
-/*
+
 rule "Create reminder"
     dialect "java"
     when
         m : DroolsMessage(getIntent().equals(Intent.CREATE_REMINDER.getText()))
-    then
  
+    then
+        SchedulerBean s = new SchedulerBean();
+        if (s.createReminder(new TaskMessage(m)) == true) { m.setText("Ich werde dich erinnern!"); }
  
 end
  
-*/
+
 // --------------------------- Fallback -------------------------
 rule "Fallback"
     dialect "java"
@@ -69,6 +69,7 @@ public class RasaConnector implements MessageListener {
     public void onMessage(final Message message) {
  
         try {
+            logger.debug("Rasa has received message");
             ProcessQueueMessageProtocol incomingChatMessage = message.getBody(TaskMessage.class);
             String messageText = incomingChatMessage.getText();
  
@@ -8,7 +8,6 @@ include (
         'services:MainBot',
         'services:LoggingStatistics',
         'services:Telegram',
-        'services:Scheduler',
-        'services:JSONRequestService'
+        'services:Scheduler'
 )