made oauthbot presentable for milestone 5

Author: rafbel

src/main/java/bots/OAuthBot.java

@@ -47,33 +47,23 @@ public static void main(String[] args) {
             SentMessage message = client.getChatMessages().postMessage("pool2", "109ab13498c64fd5911a42be1076ea6b", 1);
             System.out.println(gson.toJson(client.getChatMessages().listMessages("me", "109ab13498c64fd5911a42be1076ea6b", 1, params)));
 
-            /*client.getChatMessages().putMessage(message.getId(), "edit", "109ab13498c64fd5911a42be1076ea6b", 1);
-            client.getChatMessages().deleteMessage(message.getId(), "109ab13498c64fd5911a42be1076ea6b", 1);*/
+            client.getChatMessages().putMessage(message.getId(), "edit", "109ab13498c64fd5911a42be1076ea6b", 1);
+            client.getChatMessages().deleteMessage(message.getId(), "109ab13498c64fd5911a42be1076ea6b", 1);
 
             //Channels test
             Channel channel = client.getChatChannels().createChannel("testerchannel", 1, new ArrayList<>());
             System.out.println(gson.toJson(client.getChatChannels().listChannels(null)));
             System.out.println(gson.toJson(client.getChatChannels().getChannel("109ab13498c64fd5911a42be1076ea6b")));
-            /*Channel newChannel = client.getChatChannels().createChannel("lalala", 1, new ArrayList<>());
+            Channel newChannel = client.getChatChannels().createChannel("lalala", 1, new ArrayList<>());
             client.getChatChannels().updateChannel(newChannel.getId(), "lululu");
-            client.getChatChannels().deleteChannel(newChannel.getId());*/
+            client.getChatChannels().deleteChannel(newChannel.getId());
 
             //Members test
             System.out.println(gson.toJson(client.getChatChannels().listMembers("109ab13498c64fd5911a42be1076ea6b", null)));
-            //client.getChatChannels().inviteMembers("109ab13498c64fd5911a42be1076ea6b", new ArrayList<>(Arrays.asList("nicalgrant@gmail.com")));
-            /*client.getChatChannels().leaveChannel(channel.getId());
-            System.out.println(gson.toJson(client.getChatChannels().listMembers(channel.getId(), null)));
-            client.getChatChannels().joinChannel(channel.getId());*/
+            client.getChatChannels().inviteMembers("109ab13498c64fd5911a42be1076ea6b", new ArrayList<>(Arrays.asList("nicalgrant@gmail.com")));
+            client.getChatChannels().leaveChannel(newChannel.getId());
+            client.getChatChannels().joinChannel(newChannel.getId());
 
-            /*client.getChatListener().onNewMessage("test", message -> {
-                System.out.println("new");
-                System.out.println(gson.toJson(message));
-            });
-
-            client.getChatListener().onMessageUpdate("test", message -> {
-                System.out.println("update");
-                System.out.println(gson.toJson(message));
-            });*/
         } catch (Exception exception) {
             exception.printStackTrace();
         } finally {

src/main/java/repositories/MessageRepository.java

@@ -17,9 +17,9 @@ public MessageRepository() throws InvalidEntityException {
         super(MessageEntity.class);
     }
 
-    public Optional<MessageEntity> findByMessageIdAndClientId(String messageId, String clientId) {
+    public Optional<MessageEntity> findByMessageIdAndClientId(String id, String clientId) {
         Map<String, Object> params = new HashMap<>();
-        params.put("message_id", messageId);
+        params.put("id", id);
         params.put("client_id", clientId);
 
         List<MessageEntity> messages = get(params);
@@ -31,9 +31,9 @@ public Optional<MessageEntity> findByMessageIdAndClientId(String messageId, Stri
         return Optional.ofNullable(null);
     }
 
-    public void removeByMessageIdAndClientId(String messageId, String clientId) {
+    public void removeByMessageIdAndClientId(String id, String clientId) {
         Map<String, Object> params = new HashMap<>();
-        params.put("message_id", messageId);
+        params.put("id", id);
         params.put("client_id", clientId);
 
         removeByCondition(params);