Dependency-Injected SchedulerBean in DroolsService.

mfcb
1 parent 94d8b527
Showing 4 changed files with 13 additions and 11 deletions
services/Common/src/main/java/de/bht/beuthbot/daos/ReminderDAOImpl.java
services/MainBot/src/main/java/de/bht/beuthbot/drools/DroolsService.java
services/MainBot/src/main/java/de/bht/beuthbot/scheduler/SchedulerBean.java
services/MainBot/src/main/resources/de/bht/beuthbot/drools/Canteen.drl
@@ -3,6 +3,8 @@ package de.bht.beuthbot.daos;
 import de.bht.beuthbot.model.entities.Reminder;
 import de.bht.beuthbot.model.entities.ReminderImpl;
+
+
 import javax.ejb.Stateless;
 /**
@@ -17,6 +17,7 @@ import de.bht.beuthbot.model.Messenger;
 import de.bht.beuthbot.model.entities.AppUser;
 import de.bht.beuthbot.model.entities.LogMessage;
+import de.bht.beuthbot.scheduler.SchedulerBean;
 import org.kie.api.KieServices;
 import org.kie.api.runtime.KieContainer;
 import org.kie.api.runtime.KieSession;
@@ -76,6 +77,9 @@ public class DroolsService implements MessageListener {
     private LogMessageDAO logMessageDAO;
     @Inject
+    private SchedulerBean schedulerBean;
+
+    @Inject
     private Parser parser;
     @Override
@@ -152,6 +156,7 @@ public class DroolsService implements MessageListener {
         ksession.setGlobal("canteenData", canteenData);
         ksession.setGlobal("user", finishedUser);
+        ksession.setGlobal("schedulerBean", schedulerBean);
         // The application can insert facts into the session
         // Map incoming ApiAiMessages and RasaMessages to DroolsMessage
@@ -237,11 +237,7 @@ public class SchedulerBean {
         reminder.setIntent(intent);
         reminder.setEntities(entities);
-        Reminder reminder1 = reminderDAO.saveOrUpdate(reminder);
-
-
-
-        return reminder1;
+        return reminderDAO.saveOrUpdate(reminder);
     }
@@ -30,7 +30,7 @@ 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.scheduler.SchedulerBean;
 import de.bht.beuthbot.jms.TaskMessage;
 import java.util.Date;
 import java.text.SimpleDateFormat;
@@ -45,7 +45,7 @@ import de.bht.beuthbot.model.entities.Reminder;
 global de.bht.beuthbot.canteen.model.CanteenData canteenData;
 global de.bht.beuthbot.model.entities.AppUser user;
-
+global de.bht.beuthbot.scheduler.SchedulerBean schedulerBean;
 // ---------------------- GREETING ------------------------------------
@@ -134,9 +134,9 @@ rule &quot;Create reminder&quot;
         m : DroolsMessage(getIntent().equals(Intent.CREATE_REMINDER.getText()))
     then
-        SchedulerBean s = new SchedulerBean();
+        //SchedulerBean s = new SchedulerBean();
         TaskMessage message = new TaskMessage(m);
-        Reminder reminder = s.createReminder(message, user);
+        Reminder reminder = schedulerBean.createReminder(message, user);
         String messageText = "";
         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!";
@@ -152,9 +152,8 @@ rule &quot;Delete reminder&quot;
     when
         m : DroolsMessage(getIntent().equals(Intent.DELETE_REMINDER.getText()))
     then
-        SchedulerBean s = new SchedulerBean();
         TaskMessage message = new TaskMessage(m);
-        boolean didDelete = s.deleteReminder(message, user);
+        boolean didDelete = schedulerBean.deleteReminder(message, user);
         String messageText = "";
         if(didDelete) {
             messageText = "Ich werde dir von nun an keine Erinnerungen mehr schicken!";