Merged latest changes.

# Conflicts: # 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

Merged latest changes.
# Conflicts: # 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
mfcb
1 parent 5de3209e
Showing 5 changed files with 27 additions and 19 deletions
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/MainBot/src/main/java/de/bht/beuthbot/scheduler/SchedulerBean.java
services/MainBot/src/main/resources/de/bht/beuthbot/drools/Canteen.drl
services/Telegram/src/main/java/de/bht/beuthbot/messenger/telegram/TelegramReceiveAdapter.java
@@ -4,6 +4,7 @@ import de.bht.beuthbot.model.Messenger;
 import de.bht.beuthbot.model.enumeration.ReminderCycle;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Map;
 /**
@@ -19,9 +20,9 @@ public interface Reminder extends EntityBase {
     void setReminderCycle(ReminderCycle reminderCycle);
-    LocalDate getCycleTime();
+    LocalDateTime getCycleDate();
-    void setCycleTime(LocalDate cycleTime);
+    void setCycleDate(LocalDateTime cycleDate);
     Messenger getMessenger();
@@ -8,6 +8,7 @@ import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Map;
 /**
@@ -21,7 +22,7 @@ public class ReminderImpl extends EntityBaseImpl implements Reminder {
     private ReminderCycle reminderCycle;
-    private LocalDate cycleTime;
+    private LocalDateTime cycleDate;
     private Messenger messenger;
@@ -52,13 +53,13 @@ public class ReminderImpl extends EntityBaseImpl implements Reminder {
     }
     @Override
-    public LocalDate getCycleTime() {
-        return cycleTime;
+    public LocalDateTime getCycleDate() {
+        return cycleDate;
     }
     @Override
-    public void setCycleTime(LocalDate cycleTime) {
-        this.cycleTime = cycleTime;
+    public void setCycleDate(LocalDateTime cycleDate) {
+        this.cycleDate = cycleDate;
     }
     @Override
@@ -2,14 +2,15 @@ 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.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.model.entities.Reminder;
+import de.bht.beuthbot.model.enumeration.ReminderCycle;
 import de.bht.beuthbot.utils.DateStringExtractor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -228,16 +229,21 @@ public class SchedulerBean {
         logger.debug("Creating reminder with date " + cycleDate.toString() + " and time " + cycleTime.minusHours(1).toString()); //For some reason the server time is off by an hour, so we need to subtract it from the cycleTime
         Reminder reminder = reminderDAO.createReminder();
+        logger.debug("resulting DAO object: " + reminder);
         reminder.setUserId(user.getId());
         reminder.setReminderCycle(cycle);
-        reminder.setCycleTime(cycleDate);
+        reminder.setCycleDate(cycleDate);
         reminder.setMessenger(messenger);
         reminder.setIntent(intent);
         reminder.setEntities(entities);
-        return reminderDAO.saveOrUpdate(reminder);
+        Reminder reminder1 = reminderDAO.saveOrUpdate(reminder);
+
+
+
+        return reminder1;
+
-        //TODO: Insert the new Reminder into Database
     }
     public boolean deleteReminder(TaskMessage message, AppUser user) {
@@ -246,8 +252,8 @@ public class SchedulerBean {
         List<Reminder> reminders = reminderDAO.findAll();
         logger.debug("Number of reminders: " + reminders.size());
         for(Reminder reminder : reminders) {
-            logger.debug("Found reminder for this user:" + reminder.getUser().getTelegramUserId());
-            if(reminder.getUser().getTelegramUserId().equals(user.getTelegramUserId()) || reminder.getUser().getFacebookUserId().equals(user.getFacebookUserId())) {
+            logger.debug("Found reminder for this user:" + reminder.getUserId());
+            if(reminder.getUserId() == user.getId()) {
                 logger.debug("Found reminder of this user");
                 reminders.remove(reminder);
                 deletedReminders++;
@@ -32,17 +32,16 @@ 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 java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatter
+import de.bht.beuthbot.model.entities.Reminder;
 global de.bht.beuthbot.canteen.model.CanteenData canteenData;
 global de.bht.beuthbot.model.entities.AppUser user;
@@ -139,7 +138,7 @@ rule &quot;Create reminder&quot;
         TaskMessage message = new TaskMessage(m);
         Reminder reminder = s.createReminder(message, user);
         String messageText = "";
-        if(reminder.getIntent() == Intent.SHOW_FOOD.getText()) {
+        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!";
         } else {
             messageText = "Es war mir leider nicht möglich eine Erinnerung für dich anzulegen. Versuche es bitte noch einmal.";
@@ -41,6 +41,7 @@ import javax.ws.rs.Path;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
@@ -178,7 +179,7 @@ public class TelegramReceiveAdapter {
         Reminder reminder = reminderDAO.createReminder();
         reminder.setMessenger(Messenger.TELEGRAM);
         reminder.setReminderCycle(ReminderCycle.DAILY);
-        reminder.setCycleTime(LocalDate.now());
+        reminder.setCycleDate(LocalDateTime.now());
         Long userId = userList.get(0).getId();
         reminder.setUserId(userId);
         reminder.setIntent("Intent");