Add remark feature

src/main/java/seedu/address/logic/Messages.java

@@ -46,7 +46,10 @@ public static String format(Person person) {
                 .append("\n Admitted: ")
                 .append(person.getAdmissionDate())
                 .append("\n Tags: ");
+
         person.getTags().forEach(builder::append);
+        builder.append("\n Remarks: ")
+                .append(person.getRemark());
         return builder.toString();
     }
 

src/main/java/seedu/address/logic/commands/AddCommand.java

@@ -26,8 +26,8 @@ public class AddCommand extends Command {
             + PREFIX_NAME + "NAME "
             + PREFIX_IC + "IC "
             + PREFIX_DOB + "DOB "
-            + PREFIX_ADMISSION_DATE + "ADMISSION DATE "
-            + PREFIX_WARD + "WARD NUMBER "
+            + PREFIX_ADMISSION_DATE + "ADMISSION_DATE "
+            + PREFIX_WARD + "WARD_NUMBER "
             + "[" + PREFIX_TAG + "TAG]...\n"
             + "Example: " + COMMAND_WORD + " "
             + PREFIX_NAME + "John Doe "

src/main/java/seedu/address/logic/commands/EditCommand.java

@@ -5,6 +5,7 @@
 import static seedu.address.logic.parser.CliSyntax.PREFIX_DOB;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_IC;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_REMARK;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_WARD;
 import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
@@ -27,6 +28,7 @@
 import seedu.address.model.person.Ic;
 import seedu.address.model.person.Name;
 import seedu.address.model.person.Person;
+import seedu.address.model.person.Remark;
 import seedu.address.model.person.Ward;
 import seedu.address.model.tag.Tag;
 
@@ -47,6 +49,7 @@ public class EditCommand extends Command {
             + "[" + PREFIX_WARD + "WARD] "
             + "[" + PREFIX_ADMISSION_DATE + "ADMISSION DATE] "
             + "[" + PREFIX_TAG + "TAG]...\n"
+            + "[" + PREFIX_REMARK + "REMARK]...\n"
             + "Example: " + COMMAND_WORD + " 1 "
             + PREFIX_IC + "T123456Q "
             + PREFIX_DOB + "12/08/1999";
@@ -105,8 +108,10 @@ private static Person createEditedPerson(Person personToEdit, EditPersonDescript
         AdmissionDate updatedAdmissionDate =
                 editPersonDescriptor.getAdmissionDate().orElse(personToEdit.getAdmissionDate());
         Ward updatedWard = editPersonDescriptor.getWard().orElse(personToEdit.getWard());
+        Remark updatedRemark = editPersonDescriptor.getRemark().orElse(personToEdit.getRemark());
 
-        return new Person(updatedName, updatedTags, updatedDob, updatedIc, updatedAdmissionDate, updatedWard);
+        return new Person(updatedName, updatedTags, updatedDob, updatedIc, updatedAdmissionDate,
+                updatedWard, updatedRemark);
     }
 
     @Override
@@ -144,7 +149,7 @@ public static class EditPersonDescriptor {
         private Dob dob;
         private AdmissionDate admissionDate;
         private Ward ward;
-
+        private Remark remark;
         public EditPersonDescriptor() {}
 
         /**
@@ -158,6 +163,7 @@ public EditPersonDescriptor(EditPersonDescriptor toCopy) {
             setIc(toCopy.ic);
             setAdmissionDate(toCopy.admissionDate);
             setWard(toCopy.ward);
+            setRemark(toCopy.remark);
         }
 
         /**
@@ -215,6 +221,12 @@ public void setWard(Ward ward) {
         public Optional<Ward> getWard() {
             return Optional.ofNullable(ward);
         }
+        public void setRemark(Remark remark) {
+            this.remark = remark;
+        }
+        public Optional<Remark> getRemark() {
+            return Optional.ofNullable(remark);
+        }
         @Override
         public boolean equals(Object other) {
             if (other == this) {
@@ -232,19 +244,21 @@ public boolean equals(Object other) {
                     && Objects.equals(ic, otherEditPersonDescriptor.ic)
                     && Objects.equals(dob, otherEditPersonDescriptor.dob)
                     && Objects.equals(admissionDate, otherEditPersonDescriptor.admissionDate)
-                    && Objects.equals(ward, otherEditPersonDescriptor.ward);
+                    && Objects.equals(ward, otherEditPersonDescriptor.ward)
+                    && Objects.equals(remark, otherEditPersonDescriptor.remark);
 
         }
 
         @Override
         public String toString() {
             return new ToStringBuilder(this)
                     .add("name", name)
-                    .add("tags", tags)
-                    .add("ic", ic)
                     .add("dob", dob)
+                    .add("ic", ic)
+                    .add("tags", tags)
                     .add("admissionDate", admissionDate)
                     .add("ward", ward)
+                    .add("remark", remark)
                     .toString();
         }
     }

src/main/java/seedu/address/logic/commands/RemarkCommand.java

@@ -0,0 +1,94 @@
+package seedu.address.logic.commands;
+
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
+
+import java.util.List;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.Messages;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.person.Person;
+import seedu.address.model.person.Remark;
+
+
+
+/**
+ * Changes the remark of an existing person in the address book.
+ */
+public class RemarkCommand extends Command {
+    public static final String COMMAND_WORD = "remark";
+    public static final String MESSAGE_USAGE = COMMAND_WORD
+            + ": Edits the remark of the person identified "
+            + "by the index number used in the last person listing. "
+            + "Existing remark will be overwritten by the input.\n"
+            + "Parameters: INDEX (must be a positive integer) "
+            + "r\\[REMARK]\n"
+            + "Example: " + COMMAND_WORD + " 1 "
+            + "r\\Likes to swim.";
+
+    public static final String MESSAGE_ARGUMENTS = "Index: %1$d, Remark: %2$s";
+    public static final String MESSAGE_ADD_REMARK_SUCCESS = "Added remark to Person: %1$s";
+    public static final String MESSAGE_DELETE_REMARK_SUCCESS = "Removed remark from Person: %1$s";
+
+    private final Index index;
+    private final Remark remark;
+
+    /**
+     * @param index of the person in the filtered person list to edit the remark
+     * @param remark of the person to be updated to
+     */
+    public RemarkCommand(Index index, Remark remark) {
+        requireAllNonNull(index, remark);
+
+        this.index = index;
+        this.remark = remark;
+    }
+
+    @Override
+    public CommandResult execute(Model model) throws CommandException {
+        List<Person> lastShownList = model.getFilteredPersonList();
+
+        if (index.getZeroBased() >= lastShownList.size()) {
+            throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+        }
+
+        Person personToEdit = lastShownList.get(index.getZeroBased());
+        Person editedPerson = new Person(
+                personToEdit.getName(), personToEdit.getTags(), personToEdit.getDob(),
+                personToEdit.getIc(), personToEdit.getAdmissionDate(), personToEdit.getWard(),
+                remark);
+
+        model.setPerson(personToEdit, editedPerson);
+        model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
+
+        return new CommandResult(generateSuccessMessage(editedPerson));
+    }
+
+    /**
+     * Generates a command execution success message based on whether
+     * the remark is added to or removed from
+     * {@code personToEdit}.
+     */
+    private String generateSuccessMessage(Person personToEdit) {
+        String message = !remark.value.isEmpty() ? MESSAGE_ADD_REMARK_SUCCESS : MESSAGE_DELETE_REMARK_SUCCESS;
+        return String.format(message, personToEdit);
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+
+        // instanceof handles nulls
+        if (!(other instanceof RemarkCommand)) {
+            return false;
+        }
+
+        RemarkCommand e = (RemarkCommand) other;
+        return index.equals(e.index)
+                && remark.equals(e.remark);
+    }
+}

src/main/java/seedu/address/logic/parser/AddCommandParser.java

@@ -18,6 +18,7 @@
 import seedu.address.model.person.Ic;
 import seedu.address.model.person.Name;
 import seedu.address.model.person.Person;
+import seedu.address.model.person.Remark;
 import seedu.address.model.person.Ward;
 import seedu.address.model.tag.Tag;
 
@@ -50,9 +51,8 @@ public AddCommand parse(String args) throws ParseException {
         AdmissionDate admissionDate =
                 ParserUtil.parseAdmissionDate(argMultimap.getValue(PREFIX_ADMISSION_DATE).orElse(null));
         Ward ward = ParserUtil.parseWard(argMultimap.getValue(PREFIX_WARD).orElse(null));
-
-
-        Person person = new Person(name, tagList, dob, ic, admissionDate, ward);
+        Remark remark = new Remark("");
+        Person person = new Person(name, tagList, dob, ic, admissionDate, ward, remark);
 
         return new AddCommand(person);
     }

src/main/java/seedu/address/logic/parser/AddressBookParser.java

@@ -17,6 +17,7 @@
 import seedu.address.logic.commands.FindCommand;
 import seedu.address.logic.commands.HelpCommand;
 import seedu.address.logic.commands.ListCommand;
+import seedu.address.logic.commands.RemarkCommand;
 import seedu.address.logic.parser.exceptions.ParseException;
 
 /**
@@ -76,6 +77,8 @@
 
         case HelpCommand.COMMAND_WORD:
             return new HelpCommand();
+        case RemarkCommand.COMMAND_WORD:
+            return new RemarkCommandParser().parse(arguments);
 
         default:
             logger.finer("This user input caused a ParseException: " + userInput);

src/main/java/seedu/address/logic/parser/CliSyntax.java

@@ -12,4 +12,5 @@ public class CliSyntax {
     public static final Prefix PREFIX_WARD = new Prefix("w\\");
     public static final Prefix PREFIX_IC = new Prefix("ic\\");
     public static final Prefix PREFIX_ADMISSION_DATE = new Prefix("ad\\");
+    public static final Prefix PREFIX_REMARK = new Prefix("r\\");
 }

src/main/java/seedu/address/logic/parser/EditCommandParser.java

@@ -6,6 +6,7 @@
 import static seedu.address.logic.parser.CliSyntax.PREFIX_DOB;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_IC;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_REMARK;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_WARD;
 
@@ -34,7 +35,7 @@ public EditCommand parse(String args) throws ParseException {
         requireNonNull(args);
         ArgumentMultimap argMultimap =
                 ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_DOB, PREFIX_WARD, PREFIX_IC,
-                        PREFIX_ADMISSION_DATE, PREFIX_TAG);
+                        PREFIX_ADMISSION_DATE, PREFIX_TAG, PREFIX_REMARK);
 
         Index index;
 
@@ -67,6 +68,10 @@ public EditCommand parse(String args) throws ParseException {
             editPersonDescriptor.setWard(ParserUtil.parseWard(argMultimap.getValue(PREFIX_WARD).get()));
         }
 
+        if (argMultimap.getValue(PREFIX_REMARK).isPresent()) {
+            editPersonDescriptor.setRemark(ParserUtil.parseRemark(argMultimap.getValue(PREFIX_REMARK).get()));
+        }
+
         if (!editPersonDescriptor.isAnyFieldEdited()) {
             throw new ParseException(EditCommand.MESSAGE_NOT_EDITED);
         }

src/main/java/seedu/address/logic/parser/ParserUtil.java

@@ -13,6 +13,7 @@
 import seedu.address.model.person.Dob;
 import seedu.address.model.person.Ic;
 import seedu.address.model.person.Name;
+import seedu.address.model.person.Remark;
 import seedu.address.model.person.Ward;
 import seedu.address.model.tag.Tag;
 
@@ -141,4 +142,14 @@ public static Ward parseWard(String ward) throws ParseException {
         return new Ward(trimmedWard);
     }
 
+    /**
+     * Parses a {@code String remark} into a {@code Remark}.
+     * Leading and trailing whitespaces will be trimmed.
+     */
+    public static Remark parseRemark(String remark) throws ParseException {
+        requireNonNull(remark);
+        String trimmedRemark = remark.trim();
+        return new Remark(trimmedRemark);
+    }
+
 }

src/main/java/seedu/address/logic/parser/RemarkCommandParser.java

@@ -0,0 +1,43 @@
+package seedu.address.logic.parser;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_REMARK;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.commons.exceptions.IllegalValueException;
+import seedu.address.logic.commands.RemarkCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.person.Remark;
+
+
+
+/**
+ * Parses input arguments and creates a new RemarkCommand object
+ */
+public class RemarkCommandParser implements Parser<RemarkCommand> {
+
+    /**
+     * Parses the given {@code String} of arguments in the context of the RemarkCommand
+     * and returns an RemarkCommand object for execution.
+     * @throws ParseException if the user input does not conform the expected format
+     */
+    @Override
+    public RemarkCommand parse(String args) throws ParseException {
+        requireNonNull(args);
+        ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args,
+                PREFIX_REMARK);
+
+        Index index;
+        try {
+            index = ParserUtil.parseIndex(argMultimap.getPreamble());
+        } catch (IllegalValueException ive) {
+            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+                    RemarkCommand.MESSAGE_USAGE), ive);
+        }
+
+        Remark remark = new Remark(argMultimap.getValue(PREFIX_REMARK).orElse(""));
+
+        return new RemarkCommand(index, remark);
+    }
+}