saving changes

Entry.java

@@ -2,7 +2,6 @@ import java.util.ArrayList;
 import java.util.List;
 public class Entry
 {
-    String name;
     String phoneNumber;
     List<String> entryArray = new ArrayList <String>();
 
@@ -12,12 +11,37 @@ public class Entry
 
     public String getPhoneNumber(){
         StringBuilder phoneNumber = new StringBuilder();
-        for(int i  = 0; i < entryArray.size(); i++){
-            phoneNumber.append(entryArray.get(i));
-            if(entryArray.size() > 1){
-                phoneNumber.append(", ");
+        if(entryArray.size()>1){
+            for(int i  = 0; i < entryArray.size()-1; i++){
+                phoneNumber.append(entryArray.get(i) + ", ");
             }
         }
+        phoneNumber.append(entryArray.get(entryArray.size()-1));
         return phoneNumber.toString();
     }
+
+    public void addPhoneNumber(String phoneNumber){
+        entryArray.add(phoneNumber);
+    }
+
+    public boolean entryArrayContainsNumber(String phonenumber){
+        boolean containsNumber = false;
+        if(entryArray.contains(phonenumber)){
+            containsNumber = true;
+        }
+        return containsNumber;
+    }
+
+    public int getNumberOfRecords(){
+        return entryArray.size();
+    }
+
+    public void removePhoneNumber(String phoneNumber){
+        for(String number:entryArray){
+            if(phoneNumber.equals(number)){
+                entryArray.remove(number);
+                break;
+            }
+        }
+    }
 } 

PhoneBook.java

@@ -1,26 +1,283 @@
- import java.util.TreeMap;
- import java.util.Map;
- import java.util.ArrayList;
+import java.util.TreeMap;
+import java.util.Map;
+import java.util.ArrayList;
+import java.util.Scanner;
 
 /**
- * Created by leon on 1/23/18.
+ * Created by Rachelle
  */
 public class PhoneBook {
     Map<String,Entry> phonebook = new TreeMap<String,Entry>();
+    Scanner scanner = new Scanner(System.in);
     public PhoneBook(){       
-        
+
+    }
+
+    public void main(){       
+        System.out.println("Welcome!"); 
+        boolean runningProgram = true;
+        while(runningProgram){
+            System.out.println("\nSelect an option from the menu.\n"
+                + "(Add): to add a new entry or to an existing entry\n(Lookup): to lookup a number\n"
+                + "(Reverse): to perform a reverse lookup\n(Display) to print phonebook\n"
+                + "(Delete): to remove a record or a phone number\n(Exit): to exit the phonebook");
+            switch(getUserInputNormalized()){
+                case "add": 
+                addEntry(getNameFromUser(),getNumberFromUser());
+                break;
+
+                case "lookup":
+                String name = getNameFromUser();
+                if(hasEntry(name)){
+                    System.out.println("\n" + name + ": " + lookupNumber(name));   
+                }else{
+                    System.out.println("\n**Name not found**");
+                }
+                continueMessage();
+                break;
+
+                case "reverse":
+                String phoneNumber = getNumberFromUser();
+                if(reverseLookup(phoneNumber).equals("no match")){
+                    System.out.println("\n**Number not found.**");
+                }else{
+                    System.out.println("This is " + reverseLookup(phoneNumber) + "'s number.");
+                }
+                continueMessage();
+                break;
+
+                case "display":
+                if(phonebook.isEmpty()){
+                    System.out.println("\n**Nothing to display. Please add an entry first.**");   
+                }else{
+                    System.out.println(displayPhonebook());
+                }
+                continueMessage();
+                break;
+
+                case "delete":
+                deleteRecordOrNumberPrompt();
+                break;
+
+                case "exit": runningProgram = false;
+                break;
+
+                default: System.out.println("\n**Command not found.**\n");
+                break;
+            }
+        }
+    }
+
+    //Input
+    public String getUserInputNormalized(){
+        Scanner scanner = new Scanner(System.in);
+        return scanner.nextLine().toLowerCase().trim();
+    }
+
+    public String getNumberFromUser(){
+        System.out.println("Enter phone number.");
+        return scanner.nextLine();
     }
-    
+
+    public String getNameFromUser(){
+        System.out.println("Enter name.");
+        return scanner.nextLine();
+    }
+
+    //Additions
     public void addEntry(String name, String phoneNumber){
-        Entry newEntry = new Entry(phoneNumber);
-        phonebook.put(name,newEntry);        
+        if(hasEntry(name)){
+            duplicateEntry(name, phoneNumber);
+        }else{
+            Entry newEntry = new Entry(phoneNumber);
+            phonebook.put(name,newEntry);
+            recordUpdatedMessage(name, phoneNumber);
+        }
+    }
+
+    public boolean hasEntry(String name){
+        return phonebook.containsKey(name);
+    }
+
+    public void duplicateEntry(String name, String phoneNumber){
+        boolean duplicateError = false;
+        do{    
+            System.out.println("\nDuplicate name found. Add to existing entry? (y/n). Enter (exit) to go back.");
+            String userInput = getUserInputNormalized();
+            if(userInput.equals("n")||userInput.equals("no")){
+                addEntry(getNameFromUser(),phoneNumber);
+            }else if(userInput.equals("y")||userInput.equals("yes")){
+                addAdditionalNumbers(name, phoneNumber);
+            }else if(userInput.equals("exit")){
+                break;
+            }else{
+                System.out.println("\n**Command not recognized.**\n");
+                duplicateError = true;
+            }
+        }while(duplicateError);
+    }
+
+    public void addAdditionalNumbers(String name, String phoneNumber){
+        boolean duplicateNumber = false;
+        do{
+            if(getEntry(name).entryArrayContainsNumber(phoneNumber)){
+                System.out.println("\nThis phone number is already listed for " + name + ". Enter a new number or enter (exit) to go back.");
+                System.out.println("Record found: " + displayRecord(name));
+                String userInput = getUserInputNormalized();
+                if(getEntry(name).entryArrayContainsNumber(userInput)){
+                    duplicateNumber = true;
+                }else if(!userInput.equals("exit")){
+                    getEntry(name).addPhoneNumber(userInput);
+                    recordUpdatedMessage(name,userInput);
+                    duplicateNumber = false;
+                }
+            }else{
+                getEntry(name).addPhoneNumber(phoneNumber);
+                recordUpdatedMessage(name, phoneNumber);
+            }
+        }while(duplicateNumber);
     }
-    
+
     public Entry getEntry(String name){
         return phonebook.get(name);
     }
-    
-    
-    
-    
+
+    //Lookups
+    public String lookupNumber(String name){
+        Entry entryToLookUp = phonebook.get(name);
+        return entryToLookUp.getPhoneNumber();
+    }
+
+    public String reverseLookup(String number){
+        String nameForAGivenNumber = "no match";
+        for(String name: phonebook.keySet()){
+            Entry entry = phonebook.get(name);
+            String phoneNumber = entry.getPhoneNumber();
+            if (phoneNumber.equals(number)){
+                nameForAGivenNumber = name;
+            }
+        }
+        return nameForAGivenNumber;
+    }
+
+    //Deletion
+    public void deleteRecordOrNumberPrompt(){
+        boolean error = false;
+        do{
+            if(phonebook.size()<=0){
+                System.out.println("\n**No records to delete.**\n");
+                break;
+            }else{
+                System.out.println("\nRemove an entire (record) or remove a phone (number)? Enter (exit) to go back.");
+                String userInput = getUserInputNormalized();
+                if(userInput.equals("record")){
+                    removeRecord();
+                }else if(userInput.equals("number")){
+                    removeNumber();
+                }else if(userInput.equals("exit")){
+                    break;
+                }else{
+                    System.out.println("\n**Command not recognized.**");
+                    error = true;
+                }
+            }
+        }while(error);
+    }
+
+    public void removeRecord(){
+        String recordToRemove = getNameFromUser();
+        if(hasEntry(recordToRemove)){
+            confirmRemoveEntry(recordToRemove);
+        }else{
+            System.out.println("\n**Name not found.**\n");
+        }
+    }
+
+    public void  confirmRemoveEntry(String name){
+        boolean continueWithDelete = true;
+        while(continueWithDelete){  
+            System.out.println("\n" + displayRecord(name) + "\nContinue with deleting this listing? (y/n)");
+            String userInput = getUserInputNormalized();
+            if(userInput.equals("n")||userInput.equals("no")){
+                System.out.println("\n**Delete cancelled.**\n");
+                continueWithDelete = false;
+            }else if(userInput.equals("y")||userInput.equals("yes")){
+                removeEntry(name);
+                continueWithDelete = false;
+            }else{
+                System.out.println("\n**Command not recognized.**");
+            }
+        }
+    }
+
+    public void removeEntry(String name){
+        phonebook.remove(name);
+        System.out.println("\n**" + name + " deleted.**\n");
+    }
+
+    public void removeNumber(){
+        String name = getNameFromUser();
+        if(hasEntry(name) && getEntry(name).getNumberOfRecords()>1){
+            deleteWhereMultipleEntries(name);
+        }else if(hasEntry(name) && getEntry(name).getNumberOfRecords()==1){
+            deleteWhereSingleEntry(name);
+        }else{
+            System.out.println("\n**Name not found.**\n");
+        }
+    }
+
+    public void deleteWhereMultipleEntries(String name){
+        System.out.println("\nPhone numbers listed for: " + displayRecord(name));
+        String phoneNumber = getNumberFromUser();
+        getEntry(name).removePhoneNumber(phoneNumber);
+        System.out.println("\n**Deleted " + phoneNumber + ".**\n**Record updated to: " + displayRecord(name) + ".**");
+        continueMessage();
+    }
+
+    public void deleteWhereSingleEntry(String name){
+        System.out.println("\nThere is only one number listed for " + displayRecord(name) + ".");
+        boolean continueToPrompt = true;
+        while(continueToPrompt){
+            System.out.println("Continue with deleting this record? (y/n)");
+            String userInput = getUserInputNormalized();
+            if(userInput.equals("n")||userInput.equals("no")){
+                System.out.println("\n**Delete cancelled.**\n");
+                continueToPrompt = false;
+            }else if(userInput.equals("y")||userInput.equals("yes")){
+                removeEntry(name);
+                continueToPrompt = false;
+            }else{
+                System.out.println("\n**Command not recognized.**\n");
+            }
+        }
+    }
+
+    //Display
+    public String displayPhonebook(){
+        StringBuilder stringToDisplay = new StringBuilder();
+        stringToDisplay.append("\n**Listings:**\n");
+        for(String name: phonebook.keySet()){
+            Entry entry = phonebook.get(name);
+            String phoneNumber = entry.getPhoneNumber();
+            stringToDisplay.append(name + ": " + phoneNumber + "\n");
+        }
+        return stringToDisplay.toString();
+    }
+
+    public String displayRecord(String name){
+        StringBuilder stringToDisplay = new StringBuilder();
+        String phoneNumber = phonebook.get(name).getPhoneNumber();
+        stringToDisplay.append(name + ": " + phoneNumber);
+        return stringToDisplay.toString();
+    }
+
+    //Messaging
+    public void continueMessage(){
+        System.out.println("Press enter to continue.");
+        scanner.nextLine();
+    }
+
+    public void recordUpdatedMessage(String name, String phoneNumber){
+        System.out.println("\n**" + phoneNumber + " added to " + name + "**\n");
+    }
 }

PhoneBookTest.java

@@ -4,16 +4,72 @@ import java.util.ArrayList;
 
 public class PhoneBookTest
 {   
+    PhoneBook newEntry = new PhoneBook();
     @Test 
-    public void addEntryTest(){
-        PhoneBook newEntry = new PhoneBook();
+    public void addEntryTest(){      
         newEntry.addEntry("Rachelle","123-4567");
         Entry actual = newEntry.getEntry("Rachelle");
         assertEquals("123-4567",actual.getPhoneNumber());
     }
 
+    @Test 
+    public void addNumberToExistingEntryTest(){      
+        newEntry.addEntry("Rachelle","123-4567");
+        Entry actual = newEntry.getEntry("Rachelle");
+        actual.addPhoneNumber("987-6543");
+        assertEquals("123-4567, 987-6543",actual.getPhoneNumber());
+    }
+
+    @Test 
+    public void addNumberToExistingEntryTest2(){      
+        newEntry.addEntry("Rachelle","123-4567");
+        newEntry.addAdditionalNumbers("Rachelle","987-6543");
+        assertEquals("123-4567, 987-6543",newEntry.lookupNumber("Rachelle"));
+    }
+
     @Test
     public void hasEntryTest(){
-        
+        newEntry.addEntry("Rachelle","123-4567");
+        assertTrue(newEntry.hasEntry("Rachelle"));
+    }
+
+    @Test
+    public void removeEntryTest(){
+        newEntry.addEntry("Rachelle","123-4567");
+        newEntry.removeEntry("Rachelle");
+        assertFalse(newEntry.hasEntry("Rachelle"));
+    }
+
+    @Test public void lookupNumberTest(){
+        newEntry.addEntry("Rachelle","123-4567");
+        assertEquals("123-4567",newEntry.lookupNumber("Rachelle"));
+    }
+
+    @Test public void reverseLookupTest(){
+        newEntry.addEntry("Rachelle","123-4567");
+        assertEquals("Rachelle",newEntry.reverseLookup("123-4567"));
+    }
+
+    @Test public void reverseLookupTest2(){
+        newEntry.addEntry("Rachelle","123-4567");
+        assertEquals("no match",newEntry.reverseLookup("987-5432"));
+    }
+
+    @Test public void displayPhonebookTest(){
+        newEntry.addEntry("Rachelle","123-4567");
+        newEntry.addEntry("Kris","987-6543");
+        assertEquals("Kris 987-6543\nRachelle 123-4567\n", newEntry.displayPhonebook());
+    }
+    
+    @Test public void entryArrayContainsNumberTest(){
+        newEntry.addEntry("Rachelle","123-4567");
+        Entry actual = newEntry.getEntry("Rachelle");
+        assertTrue(actual.entryArrayContainsNumber("123-4567"));
+    }
+    
+    @Test public void entryArrayContainsNumberTest2(){
+        newEntry.addEntry("Rachelle","123-4567");
+        Entry actual = newEntry.getEntry("Rachelle");
+        assertFalse(actual.entryArrayContainsNumber("987-6543"));
     }
 }

package.bluej

@@ -1,20 +1,29 @@
 #BlueJ package file
-editor.fx.0.height=0
-editor.fx.0.width=0
-editor.fx.0.x=0
-editor.fx.0.y=0
+dependency1.from=PhoneBook
+dependency1.to=Entry
+dependency1.type=UsesDependency
+dependency2.from=PhoneBookTest
+dependency2.to=PhoneBook
+dependency2.type=UsesDependency
+dependency3.from=PhoneBookTest
+dependency3.to=Entry
+dependency3.type=UsesDependency
+editor.fx.0.height=709
+editor.fx.0.width=800
+editor.fx.0.x=205
+editor.fx.0.y=23
 objectbench.height=101
 objectbench.width=461
 package.divider.horizontal=0.6
 package.divider.vertical=0.8007380073800738
 package.editor.height=427
 package.editor.width=674
-package.editor.x=427
-package.editor.y=143
+package.editor.x=300
+package.editor.y=38
 package.frame.height=600
 package.frame.width=800
-package.numDependencies=0
-package.numTargets=1
+package.numDependencies=3
+package.numTargets=3
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -23,4 +32,24 @@ readme.name=@README
 readme.width=47
 readme.x=10
 readme.y=10
-
+target1.height=50
+target1.name=PhoneBookTest
+target1.showInterface=false
+target1.type=UnitTestTargetJunit4
+target1.width=120
+target1.x=120
+target1.y=30
+target2.height=50
+target2.name=Entry
+target2.showInterface=false
+target2.type=ClassTarget
+target2.width=80
+target2.x=400
+target2.y=120
+target3.height=50
+target3.name=PhoneBook
+target3.showInterface=false
+target3.type=ClassTarget
+target3.width=100
+target3.x=80
+target3.y=280