refactor

botham · Sep 22, 2016 · 8b45c57 · 8b45c57
1 parent 000c438
commit 8b45c57
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 10 deletions.
diff --git a/app/bots/Bot.java b/app/bots/Bot.java
@@ -12,10 +12,10 @@ public interface Bot {
 
     void sendMessage(String recipientId, String message);
 
-    default void checkAndSend(String senderId, String text, Function<Message, Void> send) {
+    default void checkAndSend(String senderId, String senderClient, String text, Function<Message, Void> send) {
         Set<String> recipients = MessageParser.extractRecipients(text);
         if(!recipients.isEmpty()) {
-            Message message = new Message(senderId, recipients, text);
+            Message message = new Message(senderId, senderClient, recipients, text);
             send.apply(message);
         }
         else {

diff --git a/app/bots/BotFather.java b/app/bots/BotFather.java
@@ -34,9 +34,10 @@ public BotFather(RedisHelper redisHelper, DBHelper dbHelper) {
       Set<String> recipients = message.getRecipients();
       if (!recipients.isEmpty()) {
         for (String userId : recipients) {
-          CompletionStage<String> senderId = redisHelper.getUserId(message.getSenderClient(), message.getSender());
           CompletionStage<User> recipient = redisHelper.getUser(userId);
-          recipient.thenCombineAsync(senderId, (recipientUser, sId) -> {
+          recipient.thenApplyAsync(recipientUser -> {
+            //TODO: multiple recipient case!!!
+            String sId = redisHelper.getUserId(message.getSenderClient(), message.getSender());
             if(recipientUser != null && sId != null) {
               send(recipientUser, sId, text);
             }
@@ -54,7 +55,7 @@ public BotFather(RedisHelper redisHelper, DBHelper dbHelper) {
   private boolean send(User recipient, String senderId, String text) {
     String client = recipient.getClient();
     String clientId = recipient.getClientId();
-    text = "[@" + senderId + "]: " + text;
+    text = "[+" + senderId + "]: " + text;
     Logger.debug("sent text: " + text);
     try {
       Bot recipientBot = botRegistry.get(client);

diff --git a/app/bots/FacebookBot.java b/app/bots/FacebookBot.java
@@ -54,7 +54,7 @@ public boolean receive(JsonNode json) {
               return name;
             });
           } else {
-            checkAndSend(senderId, text, botFather.sendMessage);
+            checkAndSend(senderId, Contract.FACEBOOK, text, botFather.sendMessage);
           }
         }
       }

diff --git a/app/bots/TelegramBot.java b/app/bots/TelegramBot.java
@@ -45,7 +45,7 @@ public void onUpdateReceived(Update update) {
                         });
                     }
                 } else {
-                    checkAndSend(senderId, text, botFather.sendMessage);
+                    checkAndSend(senderId, Contract.TELEGRAM, text, botFather.sendMessage);
                 }
             }
         } catch (Exception ex) {

diff --git a/app/helpers/RedisHelper.java b/app/helpers/RedisHelper.java
@@ -47,8 +47,8 @@ public CompletionStage<User> getUser(String id) {
       });
   }
 
-  public CompletionStage<String> getUserId(String client, String clientId) {
-    return connection.async().get(client + "-" + clientId);
+  public String getUserId(String client, String clientId) {
+    return connection.sync().get(client + "-" + clientId);
   }
 
   public void terminate() {

diff --git a/app/models/Message.java b/app/models/Message.java
@@ -7,8 +7,9 @@ public class Message {
     private String sender, text, senderClient, recipientClient;
     private Set<String> recipients;
 
-    public Message(String sender, Set<String> recipients, String text) {
+    public Message(String sender, String senderClient, Set<String> recipients, String text) {
         this.sender = sender;
+        this.senderClient = senderClient;
         this.recipients = recipients;
         this.text = text;
     }

diff --git a/conf/evolutions/default/2.sql b/conf/evolutions/default/2.sql
@@ -0,0 +1,17 @@
+# Users schema
+
+# --- !Ups
+
+CREATE TABLE User (
+  id varchar(255) NOT NULL,
+  name varchar(255) NOT NULL,
+  client varchar(255) NOT NULL,
+  clientId varchar(255) NOT NULL,
+  PRIMARY KEY (id)
+) CHARACTER SET=utf8;
+
+CREATE UNIQUE INDEX clientIdPair ON User (client, clientId);
+
+# --- !Downs
+
+DROP TABLE User;