PhoneBook

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

@@ -1,81 +1,76 @@
 package com.zipcodewilmington.phonebook;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
+import java.util.*;
 
 /**
  * Created by leon on 1/23/18.
  */
 public class PhoneBook {
-    Map<String,String> phoneBook = new TreeMap<String, String>();
-    Set<String>names;
-    Set<String>phoneBookList;
-    String nameLists="";
-    String namesAndNumbers ="";
-
-
-    public PhoneBook(Map<String, String> phoneBook) {
-        this.phoneBook = phoneBook;
-    }
+    Map<String, List<String>> phoneBook;
 
     public PhoneBook() {
-
+        this.phoneBook = new TreeMap<String, List<String>>();
     }
 
-    public boolean add(String name,String phoneNumber) {
-
-     phoneBook.put(name, phoneNumber);
-     if(phoneBook.get(name).equals(phoneNumber)){
-         return true;
-     }return false;
-    }
+    public boolean add(String name, String phone) {
+        if (phoneBook.containsKey(name)) {
+            phoneBook.get(name).add(phone);
+            return true;
 
-    public boolean remove(String name){
-        if(phoneBook.containsKey(name)){
-            phoneBook.remove(name);
-        }
-        else{
-            System.out.println(name+" does not exist in the phone book list");
+        } else {
+            List<String> contactNumbers = new ArrayList<String>();
+            contactNumbers.add(phone);
+            phoneBook.put(name, contactNumbers);
         }
-        return !phoneBook.containsKey(name);
 
+        return true;
+    }
 
+    public boolean remove(String name) {
+        return phoneBook.remove(name) != null;
     }
 
-        public String lookup(String name){
+    public String lookup(String name) {
+        String myNumbers = "";
+        for (String key : phoneBook.keySet()) {
+            for (int i = 0; i < phoneBook.get(key).size(); i++) {
+                myNumbers += phoneBook.get(key).get(i) + "  ";
+            }
 
-        return phoneBook.get(name);
         }
+        return myNumbers;
+    }
 
-        public String listNames(){
-        if(phoneBook.isEmpty()){
-            return null;
-        }else {
-            Set<String> names = phoneBook.keySet();
-
-            for (String name : names) {
-                nameLists += name + "\n";
-            }
-            return nameLists;
+    public String listNames() {
+        String names = "";
+        for (String a : phoneBook.keySet()) {
+            names += a + "\n";
         }
 
-        }
+        return names;
+    }
 
-        public String listNamesAndNumbers(){
-            if(phoneBook.isEmpty()){
-                return null;
-            }else {
-                Set<String> PhoneBookList = phoneBook.keySet();
-                for (String nameKeys : phoneBookList) {
-                    namesAndNumbers += nameKeys + "   " + phoneBook.get(nameKeys) + "\n";
-                }
+    public String listNamesAndNumbers() {
+        StringBuilder namesAndNumbers = new StringBuilder();
+        for (String keys : phoneBook.keySet()) {
+            List<String> contact = phoneBook.get(keys);
+            for (String num : contact) {
+                namesAndNumbers.append(keys).append("    ").append(num);
             }
-
-        return namesAndNumbers;
+            namesAndNumbers.append("\n");
         }
+        return namesAndNumbers.toString();
+    }
 
+    public String reverseLookUp(String number) {
+        for (String keys : phoneBook.keySet()) {
+            for (int i = 0; i < phoneBook.get(keys).size(); i++) {
+                if (phoneBook.get(keys).get(i).equals(number))
+                    return keys;
+            }
+        }
+        return null;
+    }
 
 
 }

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

@@ -5,6 +5,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
+import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -16,14 +17,12 @@ import java.util.TreeMap;
 
 
 public class PhoneBookTest {
-    private static PhoneBook phoneBookRecord;
+    private static PhoneBook phoneBookTest;
 
-    @Before
-    public void setUp() {
-        //PhoneBook phoneBookRecord;
-        Map<String,String>initialRecord = new TreeMap<String, String>(){ {put("John","1234567890");put("Micheal","5678901234");
-            put("James","1234554321");}};
-        this.phoneBookRecord=new PhoneBook(initialRecord);
+     @Before
+     public void setUp() {
+        PhoneBook phoneBookTest = new PhoneBook();
+        phoneBookTest.add("John","1234567890");
 
     }
 
@@ -32,42 +31,62 @@ public class PhoneBookTest {
     }
 
     @Test
-    public void testLookup() {
-        String expected = "5678901234";
-        String actual = phoneBookRecord.lookup("Micheal");
-        Assert.assertEquals(expected, actual);
+   public void testLookup() {
+        PhoneBook phoneBookTest = new PhoneBook();
+        phoneBookTest.add("James","555555555");
+
+        String actual = phoneBookTest.lookup("John");
+        Assert.assertEquals("555555555  ",actual);
     }
     @Test
     public void testListNames(){
+        PhoneBook phoneBookTest = new PhoneBook();
+        phoneBookTest.add("John","1234567890");
+        phoneBookTest.add("James","555555555");
         String expected = "James\n" +
-                            "John\n"+
-                            "Micheal\n";
-        String actual = phoneBookRecord.listNames();
+                            "John\n";
+        String actual = phoneBookTest.listNames();
         Assert.assertEquals(expected, actual);
 
     }
     @Test
     public void testListNumbersAndNumbers(){
-        String expected = "James   "+ "1234554321\n"+
-                "John   "+"1234567890\n"+
-                "Micheal   "+"5678901234";
-        String actual =phoneBookRecord.listNamesAndNumbers();
+        PhoneBook phoneBookTest = new PhoneBook();
+        phoneBookTest.add("John","1234567890");
+        phoneBookTest.add("James","555555555");
+        phoneBookTest.add("Micheal","5678901234");
+        String expected = "James    "+ "555555555\n"+
+                "John    "+"1234567890\n"+
+                "Micheal    "+"5678901234\n";
+        String actual =phoneBookTest.listNamesAndNumbers();
         Assert.assertEquals(expected, actual);
     }
 
     @Test
     public void testAdd(){
+        PhoneBook phoneBookTest = new PhoneBook();
         boolean expected = true;
-        boolean actual = phoneBookRecord.add("Peter","7777777777");
+        boolean actual = phoneBookTest.add("Peter","7777777777");
         Assert.assertEquals(expected, actual);
 
     }
     @Test
     public void testRemove(){
+        PhoneBook phoneBookTest = new PhoneBook();
+        phoneBookTest.add("John","1234567890");
         boolean expected =true;
-        boolean actual = phoneBookRecord.remove("John");
+        boolean actual = phoneBookTest.remove("John");
         Assert.assertEquals(expected, actual);
     }
+    @Test
+    public void testReverseLookup() {
+        PhoneBook phoneBookTest = new PhoneBook();
+        phoneBookTest.add("James","555555555");
+
+        String actual = phoneBookTest.reverseLookUp("555555555");
+        Assert.assertEquals("James",actual);
+    }
+
 
 
 }