built-in logging for inbound messages and customized table names

hausdoerfer
1 parent 1287623a
Showing 11 changed files with 171 additions and 10 deletions
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/model/entities/AppUserImpl.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/ReminderImpl.java
services/MainBot/src/main/java/de/bht/beuthbot/drools/DroolsService.java
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 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
@@ -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;
@@ -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;
+    }
+}
@@ -3,6 +3,7 @@ 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;
@@ -13,7 +14,7 @@ import java.util.Map;
  * Created by Stephan Hausdörfer on 16.01.2018.
  */
 @Entity
-@Table
+@Table(name = "reminder")
 public class ReminderImpl extends EntityBaseImpl implements Reminder {
     private long userId;
@@ -27,6 +28,7 @@ public class ReminderImpl extends EntityBaseImpl implements Reminder {
     private String intent;
     @ElementCollection
+    @CollectionTable(name = "reminder_entities")
     private Map<String, String> entities;
     @Override
 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);
@@ -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