replaced user id with user in reminder and chatmessage

hausdoerfer
1 parent 44dff023
Showing 12 changed files with 104 additions and 156 deletions
services/Common/src/main/java/de/bht/beuthbot/daos/LogMessageDAO.java → services/Common/src/main/java/de/bht/beuthbot/daos/ChatMessageDAO.java
services/Common/src/main/java/de/bht/beuthbot/daos/LogMessageDAOImpl.java → services/Common/src/main/java/de/bht/beuthbot/daos/ChatMessageDAOImpl.java
services/Common/src/main/java/de/bht/beuthbot/model/entities/AppUser.java
services/Common/src/main/java/de/bht/beuthbot/model/entities/AppUserImpl.java
services/Common/src/main/java/de/bht/beuthbot/model/entities/LogMessage.java → services/Common/src/main/java/de/bht/beuthbot/model/entities/ChatMessage.java
services/Common/src/main/java/de/bht/beuthbot/model/entities/LogMessageImpl.java → services/Common/src/main/java/de/bht/beuthbot/model/entities/ChatMessageImpl.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/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
services/Telegram/src/main/java/de/bht/beuthbot/messenger/telegram/TelegramReceiveAdapter.java
 package de.bht.beuthbot.daos;
-import de.bht.beuthbot.model.entities.LogMessage;
+import de.bht.beuthbot.model.entities.ChatMessage;
 import javax.ejb.Remote;
@@ -8,7 +8,7 @@ import javax.ejb.Remote;
  * Created by Stephan Hausdörfer on 19.01.2018.
  */
 @Remote
-public interface LogMessageDAO extends GenericDAO<LogMessage, Long> {
+public interface ChatMessageDAO extends GenericDAO<ChatMessage, Long> {
-    LogMessage createMessage();
+    ChatMessage createMessage();
 }
 package de.bht.beuthbot.daos;
-import de.bht.beuthbot.model.entities.LogMessage;
-import de.bht.beuthbot.model.entities.LogMessageImpl;
+import de.bht.beuthbot.model.entities.ChatMessage;
+import de.bht.beuthbot.model.entities.ChatMessageImpl;
 import javax.ejb.Stateless;
@@ -9,10 +9,10 @@ import javax.ejb.Stateless;
  * Created by Stephan Hausdörfer on 19.01.2018.
  */
 @Stateless
-public class LogMessageDAOImpl extends GenericHibernateDAO<LogMessage, LogMessageImpl, Long> implements LogMessageDAO {
+public class ChatMessageDAOImpl extends GenericHibernateDAO<ChatMessage, ChatMessageImpl, Long> implements ChatMessageDAO {
     @Override
-    public LogMessage createMessage() {
-        return new LogMessageImpl();
+    public ChatMessage createMessage() {
+        return new ChatMessageImpl();
     }
 }
 \ No newline at end of file
 package de.bht.beuthbot.model.entities;
+import de.bht.beuthbot.model.Messenger;
+
+import java.util.List;
+
 /**
  * Created by Benjamin Rühl on 19.11.2017.
  */
@@ -20,4 +24,10 @@ public interface AppUser extends EntityBase {
     void setProperty(GenericEntityAttribute property);
     void setProperty(String propertyName, Object propertyValue);
+
+    List<Reminder> getReminders();
+
+    List<ChatMessage> getChatMessages();
+
+    Messenger getMessenger();
 }
 package de.bht.beuthbot.model.entities;
+import de.bht.beuthbot.model.Messenger;
 import de.bht.beuthbot.persistence.GenericEntityAccessFacade;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import javax.persistence.*;
+import java.util.ArrayList;
+import java.util.List;
 /**
  * Created by Benjamin Rühl on 19.11.2017.
@@ -23,6 +23,12 @@ public class AppUserImpl extends EntityBaseImpl implements AppUser {
     @OneToOne(cascade = CascadeType.ALL)
     private GenericEntity additionalData;
+    @OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL, mappedBy="user")
+    private List<ReminderImpl> reminders;
+
+    @OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL, mappedBy="user")
+    private List<ChatMessageImpl> chatMessages;
+
     public AppUserImpl() {
         additionalData = new GenericEntity();
         additionalData.setName("User");
@@ -58,11 +64,31 @@ public class AppUserImpl extends EntityBaseImpl implements AppUser {
         GenericEntityAccessFacade.setAttribute(additionalData, propertyName, propertyValue);
     }
+    @Override
     public void setFacebookUserId(String facebookUserId) {
         this.facebookUserId = facebookUserId;
     }
+    @Override
     public void setTelegramUserId(String telegramUserId) {
         this.telegramUserId = telegramUserId;
     }
-}
+
+    @Override
+    public List<Reminder> getReminders() {
+        return new ArrayList(reminders);
+    }
+
+    @Override
+    public List<ChatMessage> getChatMessages() {
+        return new ArrayList(chatMessages);
+    }
+
+    @Override
+    public Messenger getMessenger(){
+        if (!facebookUserId.isEmpty()) {
+            return Messenger.FACEBOOK;
+        }
+        return Messenger.TELEGRAM;
+    }
+}
 \ No newline at end of file
@@ -3,11 +3,11 @@ package de.bht.beuthbot.model.entities;
 /**
  * Created by Stephan Hausdörfer on 19.01.2018.
  */
-public interface LogMessage extends EntityBase {
+public interface ChatMessage extends EntityBase {
-    long getUserId();
+    AppUser getUser();
-    void setUserId(long userId);
+    void setUser(AppUser user);
     String getMessage();
 package de.bht.beuthbot.model.entities;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import javax.persistence.*;
 /**
  * Created by Stephan Hausdörfer on 19.01.2018.
  */
 @Entity
-@Table(name = "log_message")
-public class LogMessageImpl extends EntityBaseImpl implements LogMessage {
+@Table(name = "chat_message")
+public class ChatMessageImpl extends EntityBaseImpl implements ChatMessage {
-    private long userId;
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "userId")
+    private AppUserImpl user;
     private String message;
-
     @Override
-    public long getUserId() {
-        return userId;
+    public AppUser getUser() {
+        return user;
     }
     @Override
-    public void setUserId(long userId) {
-        this.userId = userId;
+    public void setUser(AppUser user) {
+        this.user = (AppUserImpl) user;
     }
     @Override
 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.time.LocalDateTime;
 import java.util.Map;
@@ -12,9 +10,9 @@ import java.util.Map;
  */
 public interface Reminder extends EntityBase {
-    long getUserId();
+    AppUser getUser();
-    void setUserId(long userId);
+    void setUser(AppUser user);
     ReminderCycle getReminderCycle();
@@ -22,11 +20,7 @@ public interface Reminder extends EntityBase {
     LocalDateTime getCycleDate();
-    void setCycleDate(LocalDateTime cycleDate);
-
-    Messenger getMessenger();
-
-    void setMessenger(Messenger messenger);
+    void setCycleTime(LocalDateTime cycleDate);
     String getIntent();
@@ -35,4 +29,4 @@ public interface Reminder extends EntityBase {
     Map<String, String> getEntities();
     void setEntities(Map<String, String> entities);
 -}
+}
 \ No newline at end of file
 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 javax.persistence.*;
 import java.time.LocalDateTime;
 import java.util.Map;
@@ -18,14 +13,14 @@ import java.util.Map;
 @Table(name = "reminder")
 public class ReminderImpl extends EntityBaseImpl implements Reminder {
-    private long userId;
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "userId")
+    private AppUserImpl user;
     private ReminderCycle reminderCycle;
     private LocalDateTime cycleDate;
-    private Messenger messenger;
-
     private String intent;
     @ElementCollection
@@ -33,13 +28,13 @@ public class ReminderImpl extends EntityBaseImpl implements Reminder {
     private Map<String, String> entities;
     @Override
-    public long getUserId() {
-        return userId;
+    public AppUser getUser() {
+        return user;
     }
     @Override
-    public void setUserId(long userId) {
-        this.userId = userId;
+    public void setUser(AppUser user) {
+        this.user = (AppUserImpl) user;
     }
     @Override
@@ -58,21 +53,11 @@ public class ReminderImpl extends EntityBaseImpl implements Reminder {
     }
     @Override
-    public void setCycleDate(LocalDateTime cycleDate) {
+    public void setCycleTime(LocalDateTime cycleDate) {
         this.cycleDate = cycleDate;
     }
     @Override
-    public Messenger getMessenger() {
-        return messenger;
-    }
-
-    @Override
-    public void setMessenger(Messenger messenger) {
-        this.messenger = messenger;
-    }
-
-    @Override
     public String getIntent() {
         return intent;
     }
@@ -7,7 +7,7 @@ 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.daos.ChatMessageDAO;
 import de.bht.beuthbot.drools.model.DroolsMessage;
 import de.bht.beuthbot.jms.ProcessQueue;
 import de.bht.beuthbot.jms.ProcessQueueMessageProtocol;
@@ -15,9 +15,9 @@ 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 de.bht.beuthbot.scheduler.SchedulerBean;
+import de.bht.beuthbot.model.entities.ChatMessage;
+
 import org.kie.api.KieServices;
 import org.kie.api.runtime.KieContainer;
 import org.kie.api.runtime.KieSession;
@@ -73,8 +73,8 @@ public class DroolsService implements MessageListener {
     @Resource(lookup = "java:global/global/AppUserDAOImpl")
     private AppUserDAO userDAO;
-    @Resource(lookup = "java:global/global/LogMessageDAOImpl")
-    private LogMessageDAO logMessageDAO;
+    @Resource(lookup = "java:global/global/ChatMessageDAOImpl")
+    private ChatMessageDAO chatMessageDAO;
     @Inject
     private SchedulerBean schedulerBean;
@@ -149,10 +149,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);
+        ChatMessage chatMessage = chatMessageDAO.createMessage();
+        chatMessage.setUser(finishedUser);
+        chatMessage.setMessage(botMessage.getText());
+        chatMessageDAO.saveOrUpdate(chatMessage);
         ksession.setGlobal("canteenData", canteenData);
         ksession.setGlobal("user", finishedUser);
@@ -4,36 +4,29 @@ 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.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.conf.Configuration;
 import de.bht.beuthbot.jms.ProcessQueue;
 import de.bht.beuthbot.jms.TaskMessage;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
-import java.time.temporal.TemporalAccessor;
 import java.util.*;
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import javax.ejb.*;
-import javax.ejb.Timer;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
 @Singleton
 @Startup
@@ -65,7 +58,6 @@ public class SchedulerBean {
     @Resource(lookup = "java:global/global/ReminderDAOImpl")
     private ReminderDAO reminderDAO;
-
     boolean isActive = true;
     public SchedulerBean() {
@@ -95,9 +87,9 @@ public class SchedulerBean {
             //Check if date time now equals reminder date time
             if(dateNow.format(formatter).equals(reminderDate.format(formatter))) {
                 Long messageID = 1L;
-                AppUser user = userDAO.findById(reminder.getUserId());
+                AppUser user = userDAO.findById(reminder.getUser().getId());
                 Long messengerId = Long.valueOf(user.getFacebookUserId() == null ? user.getTelegramUserId() : user.getFacebookUserId());
-                Messenger messenger = reminder.getMessenger();
+                Messenger messenger = user.getMessenger();
                 String text = "";
                 String intent = reminder.getIntent();
                 Map entities = reminder.getEntities();
@@ -122,11 +114,6 @@ public class SchedulerBean {
     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
@@ -211,7 +198,6 @@ public class SchedulerBean {
         //Figure out what we're reminding the user of
         String intent = message.getEntities().getOrDefault("event","FALLBACK");
-
         Map<String, String> entities = new HashMap<>();
         entities.put(EntityName.DATE.getText(), cycleDate.toLocalDate().toString());
         entities.put(EntityName.TIME.getText(), cycleTime.toString());
@@ -221,16 +207,13 @@ public class SchedulerBean {
         Reminder reminder = reminderDAO.createReminder();
         logger.debug("resulting DAO object: " + reminder);
-        reminder.setUserId(user.getId());
+        reminder.setUser(user);
         reminder.setReminderCycle(cycle);
-        reminder.setCycleDate(cycleDate);
-        reminder.setMessenger(messenger);
+        reminder.setCycleTime(cycleDate);
         reminder.setIntent(intent);
         reminder.setEntities(entities);
         return reminderDAO.saveOrUpdate(reminder);
-
-
     }
     public boolean deleteReminder(TaskMessage message, AppUser user) {
@@ -239,8 +222,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.getUserId());
-            if(reminder.getUserId() == user.getId()) {
+            logger.debug("Found reminder for this user:" + reminder.getUser());
+            if(reminder.getUser().getId() == user.getId()) {
                 logger.debug("Found reminder of this user");
                 reminders.remove(reminder);
                 deletedReminders++;
@@ -20,8 +20,13 @@ import java.util.List;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
-
 import java.time.LocalDate;
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.text.ParseException;
 import de.bht.beuthbot.canteen.model.Dish;
 import de.bht.beuthbot.canteen.model.DishType;
@@ -29,18 +34,9 @@ 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;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.text.ParseException;
 import de.bht.beuthbot.model.Messenger;
-
-import java.time.DayOfWeek;
-import java.time.LocalDate;
 import de.bht.beuthbot.utils.DateStringExtractor;
-import java.time.format.DateTimeFormatter
 import de.bht.beuthbot.model.entities.Reminder;
 import de.bht.beuthbot.model.enumeration.ReminderCycle;
@@ -48,7 +44,6 @@ global de.bht.beuthbot.canteen.model.CanteenData canteenData;
 global de.bht.beuthbot.model.entities.AppUser user;
 global de.bht.beuthbot.scheduler.SchedulerBean schedulerBean;
-
 // ---------------------- GREETING ------------------------------------
 rule "Hello Drools"
    dialect "java"
@@ -10,11 +10,12 @@ import com.pengrad.telegrambot.request.GetFile;
 import com.pengrad.telegrambot.request.SetWebhook;
 import com.pengrad.telegrambot.response.BaseResponse;
 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.ChatMessageDAO;
 import de.bht.beuthbot.daos.ReminderDAO;
 import de.bht.beuthbot.jms.ProcessQueue;
 import de.bht.beuthbot.jms.TaskMessage;
@@ -25,10 +26,11 @@ 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.ChatMessage;
 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;
@@ -40,7 +42,6 @@ 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.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
@@ -78,8 +79,8 @@ public class TelegramReceiveAdapter {
     private ReminderDAO reminderDAO;
     /** Injected AppUserDAO */
-    @Resource(lookup = "java:global/global/LogMessageDAOImpl")
-    private LogMessageDAO logMessageDAO;
+    @Resource(lookup = "java:global/global/ChatMessageDAOImpl")
+    private ChatMessageDAO chatMessageDAO;
     /**
      * Initialize TelegramBot with Token
@@ -155,54 +156,7 @@ public class TelegramReceiveAdapter {
             return null;
         }
     }
-
-    /**
-     * 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.setCycleDate(LocalDateTime.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
      */