Part 1 finished

Client/src/main/java/SimpleShell.java

@@ -71,11 +71,38 @@ public class SimpleShell {
 
                 // messages
                 if (list.get(0).equals("messages")) {
-                    String results = webber.get_messages();
-                    SimpleShell.prettyPrint(results);
+                    if (list.size() >1) {
+                        String results = webber.get_messagesForId(list.get(1));
+                        SimpleShell.prettyPrint(results);
+                    } else {
+                        String results = webber.get_messages();
+                        SimpleShell.prettyPrint(results);
+                    }
                     continue;
                 }
+
                 // you need to add a bunch more.
+                if (list.get(0).equals("send") && list.get(list.size()-2).equals("to")) {
+                    StringBuilder message = new StringBuilder();
+                    System.out.println("Test");
+                    for (int i = 2; i < list.size()-2; i++){
+                        message.append(list.get(i) + " ");
+                    }
+                    String results = webber.sendMessageToId(list.get(1), message.toString(), list.get(list.size()-1));
+                    SimpleShell.prettyPrint(results);
+                    continue;
+                }else if (list.get(0).equals("send")) {
+                    System.out.println("test2");
+                    if (list.size() >1) {
+                        StringBuilder message = new StringBuilder();
+                        for (int i = 2; i < list.size(); i++){
+                            message.append(list.get(i) + " ");
+                        }
+                        String results = webber.sendMessage(list.get(1), message.toString());
+                        SimpleShell.prettyPrint(results);
+                    }
+                    continue;
+                }
 
                 //!! command returns the last command in history
                 if (list.get(list.size() - 1).equals("!!")) {

Client/src/main/java/YouAreEll.java

@@ -3,6 +3,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.mashape.unirest.http.Unirest;
 import com.mashape.unirest.http.exceptions.UnirestException;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
 
 public class YouAreEll {
@@ -30,23 +31,50 @@ public class YouAreEll {
 
     public void postID(String name, String gitHubID){
         String jsonPackage = "{ \"userid\": \"-\", \"name\": \"" + name + "\", \"github\": \"" + gitHubID + "\"}";
-
-        System.out.println(MakeURLCall("/ids", "PUT", jsonPackage));
+        MakeURLCall("/ids", "PUT", jsonPackage);
     }
 
     public String get_messages() {
         ObjectMapper jsonMapper = new ObjectMapper();
         String jsonString = MakeURLCall("/messages", "GET", "");
+        String last20 = convertMessagesToString(jsonMapper, jsonString);
+        if (last20 != null) return last20;
+        return null;
+    }
+
+    private String convertMessagesToString(ObjectMapper jsonMapper, String jsonString) {
         try {
             Messages[] messagesList = jsonMapper.readValue(jsonString, Messages[].class);
-            Messages[] last20 = Arrays.copyOf(messagesList, 20);
-            return Arrays.toString(last20);
+            if (messagesList!=null) {
+                Messages[] last20 = Arrays.copyOf(messagesList, 20);
+                return getRidOfNulls(last20);
+            }
         } catch (IOException e) {
             e.printStackTrace();
         }
         return null;
     }
 
+    public String get_messagesForId(String id) {
+        ObjectMapper jsonMapper = new ObjectMapper();
+        String jsonString = MakeURLCall("/ids/"+id+"/messages", "GET", "");
+        String last20 = convertMessagesToString(jsonMapper, jsonString);
+        if (last20 != null) return last20;
+        return null;
+    }
+
+    public String sendMessage(String id, String message){
+        String jsonPackage = "{ \"sequence\": \"-\", \"timestamp\": \"2018-03-21T01:00:00.0Z\", \"fromid\": \"" +id + "\"," +
+                "\"toid\": \"\", \"message\": \"" + message + "\"}";
+        return MakeURLCall("/ids/" + id + "/messages", "PUT", jsonPackage);
+    }
+
+    public String sendMessageToId(String fromId, String message, String toId){
+        String jsonPackage = "{ \"sequence\": \"-\", \"timestamp\": \"2018-03-21T01:00:00.0Z\", \"fromid\": \"" + fromId + "\"," +
+                "\"toid\": \""+toId+ "\", \"message\": \"" + message + "\"}";
+        return MakeURLCall("/ids/" + fromId + "/messages", "PUT", jsonPackage);
+    }
+
     public String MakeURLCall(String mainurl, String method, String jpayload) {
 
         try {
@@ -54,11 +82,21 @@ public class YouAreEll {
                 return Unirest.get("http://zipcode.rocks:8085" + mainurl).asString().getBody();
             }
             if (method.equals("PUT")){
-                return Unirest.post("http://zipcode.rocks:8085" + mainurl).body(jpayload).asString().getStatusText();
+                return Unirest.post("http://zipcode.rocks:8085" + mainurl).body(jpayload).asString().getBody();
             }
         }catch (UnirestException e){
             e.printStackTrace();
         }
         return null;
     }
+
+    private String getRidOfNulls(Messages[] messages){
+        ArrayList<Messages> returnArrayList = new ArrayList<>();
+        for (Messages message: messages) {
+            if (message!=null){
+                returnArrayList.add(message);
+            }
+        }
+        return returnArrayList.toString();
+    }
 }