[W5.11][F10-3]Shreyas Kuthanoor Prakash

README.adoc

@@ -25,3 +25,4 @@ The full list of contributors for se-edu can be found https://se-edu.github.io/T
 * *Bug reports, Suggestions* : Post in our https://github.com/se-edu/addressbook-level2/issues[issue tracker]
 if you noticed bugs or have suggestions on how to improve.
 * *Contributing* : We welcome pull requests. Follow the process described https://github.com/oss-generic/process[here]
+

docs/UserGuide.adoc

@@ -59,6 +59,9 @@ items with `...` after them can have multiple instances. Order of parameters are
 Put a `p` before the phone / email / address prefixes to mark it as `private`. `private` details can only
 be seen using the `viewall` command.
 
+Persons with duplicate primary key identity fields (Same name AND same phone number/email, or even different
+name with same phone number AND email) will not be allowed.
+
 Persons can have any number of tags (including 0).
 ****
 
@@ -67,11 +70,21 @@ Examples:
 * `add John Doe p/98765432 e/[email protected] a/John street, block 123, #01-01`
 * `add Betsy Crowe pp/1234567 e/[email protected] pa/Newgate Prison t/criminal t/friend`
 
+== Showing current number of contacts : `total`
+
+Shows the current total number of contacts in the address book, without showing the names. +
+Format: `total`
+
 == Listing all persons : `list`
 
 Shows a list of all persons, along with their non-private details, in the address book. +
 Format: `list`
 
+== Listing first five persons : `topFive`
+
+Shows a list of the first five persons, along with their non-private details, in the address book. +
+Format: `topFive`
+
 == Finding all persons containing any keyword in their name: `find`
 
 Finds persons whose names contain any of the given keywords. +
@@ -91,7 +104,7 @@ Returns `John Doe` but not `john`.
 * `find Betsy Tim John` +
 Returns Any person having names `Betsy`, `Tim`, or `John`.
 
-== Deleting a person : `delete`
+== Deleting a person by index: `delete`
 
 Deletes the specified person from the address book. Irreversible. +
 Format: `delete INDEX`
@@ -111,6 +124,27 @@ Deletes the 2nd person in the address book.
 `delete 1` +
 Deletes the 1st person in the results of the `find` command.
 
+== Deleting a person by name: `delete_name`
+
+Deletes the specified person from the address book after indexing other commands. Irreversible. +
+Format: `delete NAME`
+
+****
+Deletes the person by `NAME` not case sensitive.
+`NAME` refers to the full name of the person.
+****
+
+Examples:
+
+* `list` +
+`delete_name Matthew Alexander` +
+Deletes the Matthew Alexander in the address book.
+
+* `find Betsy` +
+`delete_name Betsy` +
+Deletes the 1st person in the results of the `find` command.
+
+
 == View non-private details of a person : `view`
 
 Displays the non-private details of the specified person. +
@@ -153,9 +187,19 @@ Views all details of the 1st person in the results of the `find` command.
 
 == Clearing all entries : `clear`
 
-Clears all entries from the address book. +
+Gives user a warning prompt to confirm or cancel deletion of address book.+
 Format: `clear`
 
+== Confirm Clear all entries : `yes`
+
+Clears all entries from the address book. +
+Format: `yes`
+
+== Cancel the clearing of all entries : `no`
+
+Informs user that the address book has not been cleared. +
+Format: `no`
+
 == Exiting the program : `exit`
 
 Exits the program. +

src/seedu/addressbook/commands/CancelClearCommand.java

@@ -0,0 +1,14 @@
+package seedu.addressbook.commands;
+
+public class CancelClearCommand extends Command {
+
+    public static final String COMMAND_WORD = "no";
+    public static final String MESSAGE_CANCEL = "Address book has not been cleared.";
+
+    public CancelClearCommand() {}
+
+    @Override
+    public CommandResult execute() {
+        return new CommandResult(MESSAGE_CANCEL);
+    }
+}

src/seedu/addressbook/commands/ClearCommand.java

@@ -9,14 +9,12 @@ public class ClearCommand extends Command {
     public static final String MESSAGE_USAGE = "Clears address book permanently.\n"
             + "Example: " + COMMAND_WORD;
 
-    public static final String MESSAGE_SUCCESS = "Address book has been cleared!";
+    public static final String MESSAGE_CONFIRM = "Are you sure you want to clear the Address book? Enter yes or no.";
 
     public ClearCommand() {}
 
-
     @Override
     public CommandResult execute() {
-        addressBook.clear();
-        return new CommandResult(MESSAGE_SUCCESS);
+        return new CommandResult(MESSAGE_CONFIRM);
     }
 }

src/seedu/addressbook/commands/Command.java

@@ -15,6 +15,7 @@ public class Command {
     protected AddressBook addressBook;
     protected List<? extends ReadOnlyPerson> relevantPersons;
     private int targetIndex = -1;
+    private String name = "";
 
     /**
      * @param targetIndex last visible listing index of the target person
@@ -23,6 +24,8 @@ public Command(int targetIndex) {
         this.setTargetIndex(targetIndex);
     }
 
+    public Command(String name) { this.name = name; }
+
     protected Command() {
     }
 
@@ -57,6 +60,7 @@ public void setData(AddressBook addressBook, List<? extends ReadOnlyPerson> rele
      * @throws IndexOutOfBoundsException if the target index is out of bounds of the last viewed listing
      */
     protected ReadOnlyPerson getTargetPerson() throws IndexOutOfBoundsException {
+        if (getTargetIndex() == -1) { setTargetIndex(getTargetIndexByName(this.name)); }    // getTargetIndex == -1, DeleteCommand(name)
         return relevantPersons.get(getTargetIndex() - DISPLAYED_INDEX_OFFSET);
     }
 
@@ -67,4 +71,17 @@ public int getTargetIndex() {
     public void setTargetIndex(int targetIndex) {
         this.targetIndex = targetIndex;
     }
+
+    public int getTargetIndexByName(String name) {
+        int targetIndex = DISPLAYED_INDEX_OFFSET;
+
+        for (ReadOnlyPerson person : relevantPersons) {
+            if (person.getName().toString().equalsIgnoreCase(name)) {
+                return targetIndex;
+            }
+            targetIndex++;
+        }
+
+        return targetIndex;
+    }
 }

src/seedu/addressbook/commands/ConfirmClearCommand.java

@@ -0,0 +1,15 @@
+package seedu.addressbook.commands;
+
+public class ConfirmClearCommand extends Command {
+
+    public static final String COMMAND_WORD = "yes";
+    public static final String MESSAGE_SUCCESS = "Address book has been cleared!";
+
+    public ConfirmClearCommand() {}
+
+    @Override
+    public CommandResult execute() {
+        addressBook.clear();
+        return new CommandResult(MESSAGE_SUCCESS);
+    }
+}

src/seedu/addressbook/commands/DeleteCommand.java

@@ -11,18 +11,19 @@
 public class DeleteCommand extends Command {
 
     public static final String COMMAND_WORD = "delete";
+    public static final String COMMAND_WORD_STRING = "delete_name";
 
     public static final String MESSAGE_USAGE = COMMAND_WORD
             + ": Deletes the person identified by the index number used in the last person listing.\n"
-            + "Parameters: INDEX\n"
+            + "Parameters: INDEX/NAME\n"
             + "Example: " + COMMAND_WORD + " 1";
 
     public static final String MESSAGE_DELETE_PERSON_SUCCESS = "Deleted Person: %1$s";
 
 
-    public DeleteCommand(int targetVisibleIndex) {
-        super(targetVisibleIndex);
-    }
+    public DeleteCommand(int targetVisibleIndex) { super(targetVisibleIndex); }
+
+    public DeleteCommand(String name) { super(name); }
 
 
     @Override
@@ -31,7 +32,6 @@ public CommandResult execute() {
             final ReadOnlyPerson target = getTargetPerson();
             addressBook.removePerson(target);
             return new CommandResult(String.format(MESSAGE_DELETE_PERSON_SUCCESS, target));
-
         } catch (IndexOutOfBoundsException ie) {
             return new CommandResult(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
         } catch (PersonNotFoundException pnfe) {

src/seedu/addressbook/commands/TopFiveCommand.java

@@ -0,0 +1,34 @@
+package seedu.addressbook.commands;
+
+import seedu.addressbook.data.person.ReadOnlyPerson;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Lists the first five persons in the address book to the user.
+ */
+
+public class TopFiveCommand extends Command{
+    public static final String COMMAND_WORD = "topFive";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD
+            + ": Displays first five persons in the address book as a list with index numbers.\n"
+            + "Example: " + COMMAND_WORD;
+
+    @Override
+    public CommandResult execute() {
+        List<ReadOnlyPerson> allPersons = addressBook.getAllPersons().immutableListView();
+        int size = allPersons.size();
+        if(size < 5) {
+            return new CommandResult(getMessageForPersonListShownSummary(allPersons), allPersons);
+        }
+        else {
+            List<ReadOnlyPerson> toBeDisplayed = new ArrayList<>();
+            for(int i = 0; i < 5; i++) {
+                toBeDisplayed.add(i, allPersons.get(i));
+            }
+            return new CommandResult(getMessageForPersonListShownSummary(toBeDisplayed), toBeDisplayed);
+        }
+    }
+}

src/seedu/addressbook/commands/TotalCommand.java

@@ -0,0 +1,27 @@
+package seedu.addressbook.commands;
+
+import seedu.addressbook.data.person.ReadOnlyPerson;
+
+import java.util.List;
+
+
+/**
+ * Shows current total number of contacts in book.
+ */
+public class TotalCommand extends Command {
+
+    public static final String COMMAND_WORD = "total";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD
+            + ": Displays the current number of contacts in the AB.\n"
+            + "Example: " + COMMAND_WORD;
+
+    public static final String MESSAGE_SUCCESS = " Contact(s) found";
+
+
+    @Override
+    public CommandResult execute() {
+        int TotalContacts = addressBook.total();
+        return new CommandResult(TotalContacts + "" + MESSAGE_SUCCESS);
+    }
+}

src/seedu/addressbook/data/AddressBook.java

@@ -61,6 +61,12 @@ public void clear() {
         allPersons.clear();
     }
 
+    /**
+     * Returns total number of contacts
+     */
+
+    public int total() {return allPersons.total();}
+
     /**
      * Returns a new UniquePersonList of all persons in the address book at the time of the call.
      */

src/seedu/addressbook/data/person/ReadOnlyPerson.java

@@ -22,13 +22,17 @@ public interface ReadOnlyPerson {
     Set<Tag> getTags();
 
     /**
-     * Returns true if both persons have the same identity fields (name and telephone).
+     * Returns true if both persons have the same identity fields (name and telephone and/or email).
+     * Will also return true if a different person has the same telephone and email.
      */
     default boolean isSamePerson(ReadOnlyPerson other) {
         return (other == this)
                 || (other != null
-                    && other.getName().equals(this.getName())
-                    && other.getPhone().equals(this.getPhone()));
+                    && other.getPhone().equals(this.getPhone())
+                    && other.getEmail().equals(this.getEmail())
+                    || (other.getName().equals(this.getName())
+                    && (other.getPhone().equals(this.getPhone())
+                    || other.getEmail().equals(this.getEmail()))));
     }
 
     /**

src/seedu/addressbook/data/person/UniquePersonList.java

@@ -110,6 +110,14 @@ public void add(Person toAdd) throws DuplicatePersonException {
         internalList.add(toAdd);
     }
 
+    /**
+     * Gets total contacts
+     */
+
+    public int total(){
+        return internalList.size();
+    }
+
     /**
      * Removes the equivalent person from the list.
      *