[W5.11][T12-1] Ho Phi Long

.gitignore

@@ -27,3 +27,6 @@ test/localrun.bat
 # Gradle build files
 .gradle/
 build/
+
+# out folder
+.out/

docs/UserGuide.adoc

@@ -38,6 +38,14 @@ What's different from AddressBook-Level1:
 * Support for marking a contact detail as 'private' (`pa/`) (`pe/`) (`pp/`)
 * View details of a person (`view` : shows non-private details), (`viewall` : shows all details)
 
+== Password to login
+Tentaively, I(Gerald) have commented out the login because the .bat file doesn't seem to work with the password but everything is fine when compile.
+Examples:
+
+* `What's the password?` will show up
+* You have to key in `password` to allow access to the `Commands:` part of the code
+* If you typed the wrong password, `Wrong Password, try again` will show up and you are prompted to type in the password again
+
 == Viewing help : `help`
 
 Format: `help`
@@ -91,6 +99,27 @@ Returns `John Doe` but not `john`.
 * `find Betsy Tim John` +
 Returns Any person having names `Betsy`, `Tim`, or `John`.
 
+== Editing a person : `edit`
+
+Edits the specified person from the address book. Irreversible. +
+Format: `edit INDEX n/NAME [p]p/PHONE_NUMBER [p]e/EMAIL [p]a/ADDRESS [t/TAG]...`
+
+****
+Words in `UPPER_CASE` are the parameters, items in `SQUARE_BRACKETS` are optional,
+items with `...` after them can have multiple instances. Order of parameters are fixed.
+
+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 can have any number of tags (including 0).
+****
+
+Examples:
+
+* `list` +
+`edit 2 n/Dickson p/123456 e/[email protected] a/Address, Singapore t/wow` +
+Edits the 2nd person in the address book with the arguments given
+
 == Deleting a person : `delete`
 
 Deletes the specified person from the address book. Irreversible. +

src/seedu/addressbook/Main.java

@@ -3,6 +3,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.Scanner;
 
 import seedu.addressbook.commands.Command;
 import seedu.addressbook.commands.CommandResult;
@@ -40,10 +41,32 @@ public static void main(String... launchArgs) {
     /** Runs the program until termination.  */
     public void run(String[] launchArgs) {
         start(launchArgs);
+        //login(); //commented out first
         runCommandLoopUntilExitCommand();
         exit();
     }
 
+    /*
+    Password feature to allow users to log in
+     */
+    public void login() {
+        while(true){
+            System.out.println("|| What is the Password?");
+            if(checkPassword()){
+                System.out.println("|| Password is correct, you have gained access to the addressbook");
+                break;
+            }
+            else{
+                System.out.println("|| Password is incorrect try again!");
+            }
+        }
+    }
+    public boolean checkPassword(){
+        Scanner SCANNER= new Scanner(System.in);
+        if(SCANNER.nextLine().equals("password")) return true;
+        else return false;
+    }
+
     /**
      * Sets up the required objects, loads up the data from the storage file, and prints the welcome message.
      *

src/seedu/addressbook/commands/DeleteCommand.java

@@ -24,7 +24,6 @@ public DeleteCommand(int targetVisibleIndex) {
         super(targetVisibleIndex);
     }
 
-
     @Override
     public CommandResult execute() {
         try {

src/seedu/addressbook/commands/EditCommand.java

@@ -0,0 +1,75 @@
+package seedu.addressbook.commands;
+
+import seedu.addressbook.common.Messages;
+import seedu.addressbook.data.exception.IllegalValueException;
+import seedu.addressbook.data.person.UniquePersonList.PersonNotFoundException;
+import seedu.addressbook.data.person.*;
+import seedu.addressbook.data.tag.Tag;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Edits a person identified using it's last displayed index from the address book.
+ */
+public class EditCommand extends Command {
+
+    public static final String COMMAND_WORD = "edit";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD
+            + ": Edits the person identified by the index number used in the last person listing.\n"
+            + "Parameters: INDEX NAME [p]p/PHONE [p]e/EMAIL [p]a/ADDRESS [t/TAG]...\n"
+            + "Example: " + COMMAND_WORD + " 1 n/Kristo p/1231818 e/[email protected] a/Singapore t/friends";
+
+    private static final String MESSAGE_EDIT_PERSON_SUCCESS = "Edited Person: %1$s";
+    private static final String MESSAGE_DUPLICATE_PERSON = "This person already exists in the address book";
+
+    private final Person toEdit;
+
+    /**
+     * Convenience constructor using raw values.
+     *
+     * @throws IllegalValueException if any of the raw values are invalid
+     */
+    public EditCommand(String targetVisibleIndex,
+                      String name,
+                      String phone, boolean isPhonePrivate,
+                      String email, boolean isEmailPrivate,
+                      String address, boolean isAddressPrivate,
+                      Set<String> tags) throws IllegalValueException {
+        super(Integer.parseInt(targetVisibleIndex));
+
+        final Set<Tag> tagSet = new HashSet<>();
+        for (String tagName : tags) {
+            tagSet.add(new Tag(tagName));
+        }
+
+        this.toEdit = new Person(
+                new Name(name),
+                new Phone(phone, isPhonePrivate),
+                new Email(email, isEmailPrivate),
+                new Address(address, isAddressPrivate),
+                tagSet
+        );
+    }
+
+    public ReadOnlyPerson getPerson() {
+        return toEdit;
+    }
+
+    @Override
+    public CommandResult execute() {
+        try {
+            final ReadOnlyPerson target = getTargetPerson();
+            addressBook.removePerson(target);
+            addressBook.addPerson(toEdit);
+            return new CommandResult(String.format(MESSAGE_EDIT_PERSON_SUCCESS, toEdit));
+        } catch (UniquePersonList.DuplicatePersonException dpe) {
+            return new CommandResult(MESSAGE_DUPLICATE_PERSON);
+        } catch (IndexOutOfBoundsException ie) {
+            return new CommandResult(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+        } catch (PersonNotFoundException pnfe) {
+            return new CommandResult(Messages.MESSAGE_PERSON_NOT_IN_ADDRESSBOOK);
+        }
+    }
+}

src/seedu/addressbook/commands/HelpCommand.java

@@ -17,6 +17,7 @@ public HelpCommand() {}
     public CommandResult execute() {
         return new CommandResult(
                 AddCommand.MESSAGE_USAGE
+                        + "\n" + EditCommand.MESSAGE_USAGE
                 + "\n" + DeleteCommand.MESSAGE_USAGE
                 + "\n" + ClearCommand.MESSAGE_USAGE
                 + "\n" + FindCommand.MESSAGE_USAGE

src/seedu/addressbook/commands/ListCommand.java

@@ -10,7 +10,7 @@
  */
 public class ListCommand extends Command {
 
-    public static final String COMMAND_WORD = "list";
+    public static final String COMMAND_WORD = "list" ;
 
     public static final String MESSAGE_USAGE = COMMAND_WORD
             + ": Displays all persons in the address book as a list with index numbers.\n"

src/seedu/addressbook/commands/SortCommand.java

@@ -0,0 +1,32 @@
+package seedu.addressbook.commands;
+
+import seedu.addressbook.common.NameComparator;
+import seedu.addressbook.data.person.Person;
+import seedu.addressbook.data.person.ReadOnlyPerson;
+
+import seedu.addressbook.data.person.UniquePersonList;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class SortCommand extends Command {
+    public static final String COMMAND_WORD = "sort";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD
+            + ": Sort base on name in alphabetical order.\n"
+            + "Example: Sort";
+
+    public SortCommand() {}
+    public List<ReadOnlyPerson> SortList() {
+        //Copy the unmodifiable array to a list
+        List<ReadOnlyPerson> SortedList = new ArrayList<ReadOnlyPerson>(addressBook.getAllPersons().immutableListView());
+        SortedList.sort(new NameComparator());
+        return SortedList;
+    }
+    @Override
+    public CommandResult execute () {
+        List<ReadOnlyPerson> SortedList = SortList();
+        return new CommandResult(getMessageForPersonListShownSummary(SortedList), SortedList);
+    }
+}

src/seedu/addressbook/common/Comparators.java

@@ -0,0 +1,8 @@
+package seedu.addressbook.common;
+
+import seedu.addressbook.data.person.ReadOnlyPerson;
+
+//Collection of comparator for different filter/sort used in the project
+public class Comparators {
+
+}

src/seedu/addressbook/common/DateComparator.java

@@ -0,0 +1,13 @@
+package seedu.addressbook.common;
+
+public class DateComparator {
+    //Later will be change will Date class in the project
+    public int compare(int date1, int date2) {
+        if(date1 < date2)
+            return -1;
+        else if (date1 == date2)
+            return 0;
+        else
+            return 1;
+    }
+}

src/seedu/addressbook/common/NameComparator.java

@@ -0,0 +1,13 @@
+package seedu.addressbook.common;
+
+import seedu.addressbook.data.person.ReadOnlyPerson;
+
+import java.util.Comparator;
+
+public class NameComparator implements Comparator<ReadOnlyPerson> {
+    public int compare(ReadOnlyPerson p1, ReadOnlyPerson p2) {
+        String p1Name = p1.getName().fullName;
+        String p2Name = p2.getName().fullName;
+        return p1Name.compareTo(p2Name);
+    }
+}

src/seedu/addressbook/parser/Parser.java

@@ -11,7 +11,9 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import seedu.addressbook.commands.*;
 import seedu.addressbook.commands.AddCommand;
+import seedu.addressbook.commands.EditCommand;
 import seedu.addressbook.commands.ClearCommand;
 import seedu.addressbook.commands.Command;
 import seedu.addressbook.commands.DeleteCommand;
@@ -41,6 +43,14 @@ public class Parser {
                     + " (?<isAddressPrivate>p?)a/(?<address>[^/]+)"
                     + "(?<tagArguments>(?: t/[^/]+)*)"); // variable number of tags
 
+    public static final Pattern PERSON_DATA_EDIT_ARGS_FORMAT =
+            Pattern.compile("(?<targetVisibleIndex>[^/]+)"
+                    + " n/(?<name>[^/]+)"
+                    + " (?<isPhonePrivate>p?)p/(?<phone>[^/]+)"
+                    + " (?<isEmailPrivate>p?)e/(?<email>[^/]+)"
+                    + " (?<isAddressPrivate>p?)a/(?<address>[^/]+)"
+                    + "(?<tagArguments>(?: t/[^/]+)*)"); // variable number of tags
+
 
     /**
      * Signals that the user input could not be parsed.
@@ -78,6 +88,9 @@ public Command parseCommand(String userInput) {
         case AddCommand.COMMAND_WORD:
             return prepareAdd(arguments);
 
+            case EditCommand.COMMAND_WORD:
+                return prepareEdit(arguments);
+
         case DeleteCommand.COMMAND_WORD:
             return prepareDelete(arguments);
 
@@ -99,6 +112,7 @@ public Command parseCommand(String userInput) {
         case ExitCommand.COMMAND_WORD:
             return new ExitCommand();
 
+
         case HelpCommand.COMMAND_WORD: // Fallthrough
         default:
             return new HelpCommand();
@@ -158,6 +172,40 @@ private static Set<String> getTagsFromArgs(String tagArguments) throws IllegalVa
         return new HashSet<>(tagStrings);
     }
 
+    /**
+     * Parses arguments in the context of the edit person command.
+     *
+     * @param args full command args string
+     * @return the prepared command
+     */
+    private Command prepareEdit(String args) {
+
+        final Matcher matcher = PERSON_DATA_EDIT_ARGS_FORMAT.matcher(args.trim());
+        // Validate arg string format
+        if (!matcher.matches()) {
+            return new IncorrectCommand(String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE));
+        }
+        try {
+            return new EditCommand(
+                    matcher.group("targetVisibleIndex"),
+
+                    matcher.group("name"),
+
+                    matcher.group("phone"),
+                    isPrivatePrefixPresent(matcher.group("isPhonePrivate")),
+
+                    matcher.group("email"),
+                    isPrivatePrefixPresent(matcher.group("isEmailPrivate")),
+
+                    matcher.group("address"),
+                    isPrivatePrefixPresent(matcher.group("isAddressPrivate")),
+
+                    getTagsFromArgs(matcher.group("tagArguments"))
+            );
+        } catch (IllegalValueException ive) {
+            return new IncorrectCommand(ive.getMessage());
+        }
+    }
 
     /**
      * Parses arguments in the context of the delete person command.