soooo close

src/main/java/com/zipcodewilmington/phonebook/PhoneBook.java

@@ -1,9 +1,6 @@
 package com.zipcodewilmington.phonebook;
 
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by leon on 1/23/18.
@@ -13,7 +10,7 @@ public class PhoneBook {
     private String name;
     private String number;
 
-    TreeMap<String, String> myTree = new TreeMap<String, String>();
+    TreeMap<String, ArrayList<String>> myTree = new TreeMap<String, ArrayList<String>>();
 
 
     public PhoneBook(){
@@ -21,30 +18,40 @@ public class PhoneBook {
     }
 
 
-    public void addEntry(String name, String number) {
-        myTree.put(name, number);
-
+    public void addEntry(String name, String... number) {
+        ArrayList<String> listOfPhoneNumbers = new ArrayList<String>(Arrays.asList(number));
+        myTree.put(name, listOfPhoneNumbers);
 
     }
 
+    public void additionalPhoneNumberToKey(String name, String number) {
+        myTree.get(name).add(number);
+    }
 
-    public void remove(String name) {
-        myTree.remove(name);
 
+    public void removeNumberFromName(String name, String number) {
+        myTree.get(name).remove(number);
     }
 
-    public String stringLookup(String name) {
 
-       return myTree.get(name);
+    public void removeEntry(String name) {
+        myTree.remove(name);
 
+    }
+
+    public String lookupNumber(String name) {
+        ArrayList<String> matchingNumbers = myTree.get(name);
+        String listedNumbers = "";
+        for (String phoneNumbers : matchingNumbers) {
+            listedNumbers +=phoneNumbers + "\n";
+        }
+       return listedNumbers.trim();
 
 
     }
 
     public String listNames() {
 
-
-
         Set<String> contacts = myTree.keySet();
 
         String allNames = "";
@@ -52,18 +59,19 @@ public class PhoneBook {
             allNames += contact + "\n";
 
         }
-        return allNames;
+        return allNames.trim();
     }
 
     public String listPhoneBook() {
 
+        Set<String> contacts = myTree.keySet();
         StringBuilder printBook = new StringBuilder();
 
-        for (Map.Entry<String, String> entry : myTree.entrySet()) {
-            String key = entry.getKey();
-            String value = entry.getValue();
-
-            printBook.append(key).append(" = ").append(value).append("\n");
+        for (String name : contacts) {
+            printBook.append(name).append(": ");
+            for (int x = 0; x<myTree.get(name).size(); x++) {
+                printBook.append(x).append("  ");
+            } printBook.append("\n");
 
         }
         String result = printBook.toString();
@@ -73,13 +81,14 @@ public class PhoneBook {
 
     public String reverseLookup(String number) {
 
-        String getName = "";
-        for (Map.Entry<String, String> entry : myTree.entrySet()) {
-            if (entry.getValue() == number) {
-                getName += entry.getKey();
-                return getName;
-            }
+        Set<String> contacts = myTree.keySet();
 
+        for (String name : contacts) {
+            for (int y = 0; y < myTree.get(name).size(); y++) {
+                if (myTree.get(name).get(y).equals(number)) {
+                    return name;
+                }
+            }
         }
 
 
@@ -105,7 +114,7 @@ public class PhoneBook {
 
 
         phonebookEntry.listPhoneBook();
-        System.out.println(phonebookEntry.reverseLookup("4899994190"));
+        System.out.println(phonebookEntry.listPhoneBook());
 
     }
 

src/test/java/com/zipcodewilmington/phonebook/PhoneBookTest.java

@@ -16,7 +16,7 @@ public class PhoneBookTest {
     public void addTest() {
         PhoneBook testBook = new PhoneBook();
         testBook.addEntry("Luke", "6109998787");
-        String testNumber = testBook.stringLookup("Luke");
+        String testNumber = testBook.lookupNumber("Luke");
         Assert.assertTrue(testNumber.equals("6109998787"));
 
     }
@@ -25,7 +25,7 @@ public class PhoneBookTest {
     public void addTest1() {
         PhoneBook testBook = new PhoneBook();
         testBook.addEntry("Kate", "4846569090");
-        String testNumber = testBook.stringLookup("Kate");
+        String testNumber = testBook.lookupNumber("Kate");
         Assert.assertTrue(testNumber.equals("4846569090"));
 
     }
@@ -34,8 +34,8 @@ public class PhoneBookTest {
     public void removeTest1() {
         PhoneBook testBook = new PhoneBook();
         testBook.addEntry("Kate", "4846569090");
-        testBook.remove("Kate");
-        String testNumber = testBook.stringLookup("Kate");
+        testBook.removeEntry("Kate");
+        String testNumber = testBook.lookupNumber("Kate");
         Assert.assertEquals(null, testNumber);
 
 
@@ -45,7 +45,7 @@ public class PhoneBookTest {
     public void stringLookupTest() {
         PhoneBook testBook = new PhoneBook();
         testBook.addEntry("Kate", "4846569090");
-        String testNumber = testBook.stringLookup("Kate");
+        String testNumber = testBook.lookupNumber("Kate");
         Assert.assertFalse(testNumber.equals("4846587091"));
 
     }
@@ -54,7 +54,7 @@ public class PhoneBookTest {
     public void stringLookupTest1() {
         PhoneBook testBook = new PhoneBook();
         testBook.addEntry("Kate", "4846569090");
-        String testNumber = testBook.stringLookup("Kate");
+        String testNumber = testBook.lookupNumber("Kate");
         Assert.assertTrue(testNumber.equals("4846569090"));
 
     }
@@ -79,8 +79,8 @@ public class PhoneBookTest {
         testBook.addEntry("Adam", "4864569090");
         testBook.addEntry("Zeke", "4787869090");
         String actual = testBook.listPhoneBook();
-        String expected = "Adam = 4864569090\nKate = 4846569090\nZeke = 4787869090\n";
-        Assert.assertEquals(actual, expected);
+        String expected = "Adam: 4864569090\nKate: 4846569090\nZeke: 4787869090\n";
+        Assert.assertEquals(expected, actual);
 
 
     }