Merge pull request #32 from Dexter-Wong/branch-add-extra-info

Branch add extra info

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

@@ -48,6 +48,7 @@ public static String format(Person person) {
                 .append("; Salary: ")
                 .append(person.getSalary())
                 .append("$")
+                .append(person.getInfo())
                 .append("; Tags: ");
         person.getTags().forEach(builder::append);
         return builder.toString();

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

@@ -4,6 +4,7 @@
 import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_COMPANY_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_INFO;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_INTERVIEWTIME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
@@ -31,7 +32,8 @@ public class AddCommand extends Command {
             + PREFIX_EMAIL + "EMAIL "
             + PREFIX_ADDRESS + "ADDRESS "
             + PREFIX_INTERVIEWTIME + "INTERVIEW-TIME"
-            + PREFIX_SALARY + "SALARY"
+            + PREFIX_SALARY + "SALARY "
+            + PREFIX_INFO + "INFO "
             + "[" + PREFIX_TAG + "TAG]...\n"
             + "Example: " + COMMAND_WORD + " "
             + PREFIX_COMPANY_NAME + "Google "
@@ -40,13 +42,13 @@ public class AddCommand extends Command {
             + PREFIX_EMAIL + "[email protected] "
             + PREFIX_ADDRESS + "311, Clementi Ave 2, #02-25 "
             + PREFIX_INTERVIEWTIME + "121220221400"
-            + PREFIX_SALARY + "Salary: 0$"
+            + PREFIX_SALARY + "Salary: 0$ "
+            + PREFIX_INFO + "Birthday: 12 May 2001 "
             + PREFIX_TAG + "friends "
             + PREFIX_TAG + "owesMoney";
 
     public static final String MESSAGE_SUCCESS = "New person added: %1$s";
     public static final String MESSAGE_DUPLICATE_PERSON = "This person already exists in the address book";
-
     private final Person toAdd;
 
     /**

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

@@ -4,6 +4,7 @@
 import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_COMPANY_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_INFO;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_INTERVIEWTIME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
@@ -27,6 +28,7 @@
 import seedu.address.model.person.Address;
 import seedu.address.model.person.CompanyName;
 import seedu.address.model.person.Email;
+import seedu.address.model.person.Info;
 import seedu.address.model.person.InterviewTime;
 import seedu.address.model.person.Name;
 import seedu.address.model.person.Person;
@@ -52,6 +54,7 @@ public class EditCommand extends Command {
             + "[" + PREFIX_ADDRESS + "ADDRESS] "
             + "[" + PREFIX_INTERVIEWTIME + "INTERVIEW-TIME] "
             + "[" + PREFIX_SALARY + "SALARY] "
+            + "[" + PREFIX_INFO + "INFO] "
             + "[" + PREFIX_TAG + "TAG]...\n"
             + "Example: " + COMMAND_WORD + " 1 "
             + PREFIX_PHONE + "91234567 "
@@ -110,11 +113,12 @@ private static Person createEditedPerson(Person personToEdit, EditPersonDescript
         Address updatedAddress = editPersonDescriptor.getAddress().orElse(personToEdit.getAddress());
         InterviewTime updatedDateTime = editPersonDescriptor.getDateTime().orElse(personToEdit.getDateTime());
         Salary updatedSalary = editPersonDescriptor.getSalary().orElse(personToEdit.getSalary());
+        Info updatedInfo = editPersonDescriptor.getInfo().orElse(personToEdit.getInfo());
         Set<Tag> updatedTags = editPersonDescriptor.getTags().orElse(personToEdit.getTags());
 
         return new Person(
                 updatedCompanyName, updatedName, updatedPhone, updatedEmail,
-                updatedAddress, updatedDateTime, updatedSalary, updatedTags);
+                updatedAddress, updatedDateTime, updatedSalary, updatedInfo, updatedTags);
     }
 
     @Override
@@ -153,6 +157,7 @@ public static class EditPersonDescriptor {
         private Address address;
         private InterviewTime dateTime;
         private Salary salary;
+        private Info info;
         private Set<Tag> tags;
 
         public EditPersonDescriptor() {}
@@ -169,14 +174,15 @@ public EditPersonDescriptor(EditPersonDescriptor toCopy) {
             setAddress(toCopy.address);
             setDateTime(toCopy.dateTime);
             setSalary(toCopy.salary);
+            setInfo(toCopy.info);
             setTags(toCopy.tags);
         }
 
         /**
          * Returns true if at least one field is edited.
          */
         public boolean isAnyFieldEdited() {
-            return CollectionUtil.isAnyNonNull(name, phone, email, address, dateTime, salary, tags);
+            return CollectionUtil.isAnyNonNull(name, phone, email, address, dateTime, salary, info, tags);
         }
         public void setCompanyName(CompanyName companyName) {
             this.companyName = companyName;
@@ -232,6 +238,12 @@ public Optional<Salary> getSalary() {
             return Optional.ofNullable(salary);
         }
 
+        public void setInfo(Info info) {
+            this.info = info; }
+
+        public Optional<Info> getInfo() {
+            return Optional.ofNullable(info); }
+
         /**
          * Sets {@code tags} to this object's {@code tags}.
          * A defensive copy of {@code tags} is used internally.
@@ -268,6 +280,7 @@ public boolean equals(Object other) {
                     && Objects.equals(address, otherEditPersonDescriptor.address)
                     && Objects.equals(dateTime, otherEditPersonDescriptor.dateTime)
                     && Objects.equals(salary, otherEditPersonDescriptor.salary)
+                    && Objects.equals(info, otherEditPersonDescriptor.info)
                     && Objects.equals(tags, otherEditPersonDescriptor.tags);
         }
 
@@ -281,6 +294,7 @@ public String toString() {
                     .add("address", address)
                     .add("dateTime", dateTime)
                     .add("salary", salary)
+                    .add("info", info)
                     .add("tags", tags)
                     .toString();
         }

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

@@ -4,6 +4,7 @@
 import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_COMPANY_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_INFO;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_INTERVIEWTIME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
@@ -18,6 +19,7 @@
 import seedu.address.model.person.Address;
 import seedu.address.model.person.CompanyName;
 import seedu.address.model.person.Email;
+import seedu.address.model.person.Info;
 import seedu.address.model.person.InterviewTime;
 import seedu.address.model.person.Name;
 import seedu.address.model.person.Person;
@@ -39,7 +41,8 @@ public AddCommand parse(String args) throws ParseException {
         ArgumentMultimap argMultimap =
                 ArgumentTokenizer.tokenize(
                         args, PREFIX_COMPANY_NAME, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS,
-                        PREFIX_INTERVIEWTIME, PREFIX_TAG, PREFIX_SALARY);
+                        PREFIX_INTERVIEWTIME, PREFIX_TAG, PREFIX_SALARY, PREFIX_INFO);
+
 
         if (!arePrefixesPresent(argMultimap, PREFIX_COMPANY_NAME, PREFIX_NAME, PREFIX_ADDRESS,
                 PREFIX_PHONE, PREFIX_EMAIL) || !argMultimap.getPreamble().isEmpty()) {
@@ -55,9 +58,10 @@ public AddCommand parse(String args) throws ParseException {
         Address address = ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).get());
         InterviewTime interviewTime = ParserUtil.parseInterviewTime(argMultimap.getValue(PREFIX_INTERVIEWTIME).get());
         Salary salary = ParserUtil.parseSalary(argMultimap.getValue(PREFIX_SALARY).orElse("0"));
+        Info info = ParserUtil.parseInfo(argMultimap.getValue(PREFIX_INFO).orElse(""));
         Set<Tag> tagList = ParserUtil.parseTags(argMultimap.getAllValues(PREFIX_TAG));
 
-        Person person = new Person(companyName, name, phone, email, address, interviewTime, salary, tagList);
+        Person person = new Person(companyName, name, phone, email, address, interviewTime, salary, info, tagList);
 
         return new AddCommand(person);
     }

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

@@ -14,5 +14,6 @@ public class CliSyntax {
     public static final Prefix PREFIX_TAG = new Prefix("t/");
     public static final Prefix PREFIX_INTERVIEWTIME = new Prefix("tt/");
     public static final Prefix PREFIX_SALARY = new Prefix("s/");
+    public static final Prefix PREFIX_INFO = new Prefix("i/");
 
 }

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

@@ -5,6 +5,7 @@
 import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_COMPANY_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_INFO;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_INTERVIEWTIME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
@@ -39,7 +40,7 @@ public EditCommand parse(String args) throws ParseException {
                 ArgumentTokenizer.tokenize(
                         args, PREFIX_COMPANY_NAME, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL,
                         PREFIX_ADDRESS, PREFIX_INTERVIEWTIME,
-                        PREFIX_SALARY, PREFIX_TAG);
+                        PREFIX_SALARY, PREFIX_INFO, PREFIX_TAG);
 
         Index index;
 
@@ -50,8 +51,8 @@ public EditCommand parse(String args) throws ParseException {
         }
 
         argMultimap.verifyNoDuplicatePrefixesFor(
-                PREFIX_COMPANY_NAME, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_SALARY, PREFIX_ADDRESS,
-                PREFIX_INTERVIEWTIME);
+                PREFIX_COMPANY_NAME, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_SALARY, PREFIX_INFO,
+                PREFIX_ADDRESS, PREFIX_INTERVIEWTIME);
 
         EditPersonDescriptor editPersonDescriptor = new EditPersonDescriptor();
         if (argMultimap.getValue(PREFIX_COMPANY_NAME).isPresent()) {
@@ -77,6 +78,9 @@ public EditCommand parse(String args) throws ParseException {
         if (argMultimap.getValue(PREFIX_SALARY).isPresent()) {
             editPersonDescriptor.setSalary(ParserUtil.parseSalary(argMultimap.getValue(PREFIX_SALARY).get()));
         }
+        if (argMultimap.getValue(PREFIX_INFO).isPresent()) {
+            editPersonDescriptor.setInfo(ParserUtil.parseInfo(argMultimap.getValue(PREFIX_INFO).get()));
+        }
         parseTagsForEdit(argMultimap.getAllValues(PREFIX_TAG)).ifPresent(editPersonDescriptor::setTags);
 
         if (!editPersonDescriptor.isAnyFieldEdited()) {

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

@@ -12,6 +12,7 @@
 import seedu.address.model.person.Address;
 import seedu.address.model.person.CompanyName;
 import seedu.address.model.person.Email;
+import seedu.address.model.person.Info;
 import seedu.address.model.person.InterviewTime;
 import seedu.address.model.person.Name;
 import seedu.address.model.person.Phone;
@@ -169,4 +170,13 @@ public static Salary parseSalary(String salary) throws ParseException {
         }
         return new Salary(trimmedSalary);
     }
+
+    /**
+     * Parses a {@code String info} into an {@code Info}.
+     * Leading and trailing whitespaces will be trimmed.
+     */
+    public static Info parseInfo(String info) {
+        String trimmedInfo = info.trim();
+        return new Info(trimmedInfo);
+    }
 }

src/main/java/seedu/address/model/person/Info.java

@@ -0,0 +1,55 @@
+package seedu.address.model.person;
+
+/**
+ * Represents a Person's info in the address book.
+ */
+public class Info {
+    public final String value;
+
+    /**
+     * Constructs a {@code Info}.
+     *
+     * @param info Information about the person in the address book
+     */
+    public Info(String info) {
+        value = info;
+    }
+
+    public Info() {
+        value = "";
+    }
+
+    public static boolean isValidInfo(String test) {
+        return true;
+    }
+
+    public String getInfo() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return value;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+
+        // instanceof handles nulls
+        if (!(other instanceof Info)) {
+            return false;
+        }
+
+        Info otherInfo = (Info) other;
+        return value.equals(otherInfo.value);
+    }
+
+    @Override
+    public int hashCode() {
+        return value.hashCode();
+    }
+
+}

src/main/java/seedu/address/model/person/Person.java

@@ -25,15 +25,17 @@ public class Person {
     // Data fields
     private final Address address;
     private final Salary salary;
+    private final Info info;
     private final Set<Tag> tags = new HashSet<>();
     private final InterviewTime dateTime;
 
     /**
      * Every field must be present and not null.
      */
+
     public Person(
             CompanyName companyName, Name name, Phone phone, Email email, Address address,
-            InterviewTime dateTime, Salary salary, Set<Tag> tags) {
+            InterviewTime dateTime, Salary salary, Info info, Set<Tag> tags) {
         requireAllNonNull(name, phone, email, address, salary, tags);
         this.companyName = companyName;
         this.name = name;
@@ -42,6 +44,7 @@ public Person(
         this.address = address;
         this.dateTime = dateTime;
         this.salary = salary;
+        this.info = info;
         this.tags.addAll(tags);
     }
     public CompanyName getCompanyName() {
@@ -69,6 +72,9 @@ public InterviewTime getDateTime() {
     public Salary getSalary() {
         return salary;
     }
+    public Info getInfo() {
+        return info;
+    }
 
     /**
      * Returns an immutable tag set, which throws {@code UnsupportedOperationException}
@@ -131,6 +137,7 @@ public String toString() {
                 .add("address", address)
                 .add("interview-time", dateTime)
                 .add("salary", salary)
+                .add("info", info)
                 .add("tags", tags)
                 .toString();
     }

src/main/java/seedu/address/model/util/SampleDataUtil.java

@@ -9,6 +9,7 @@
 import seedu.address.model.person.Address;
 import seedu.address.model.person.CompanyName;
 import seedu.address.model.person.Email;
+import seedu.address.model.person.Info;
 import seedu.address.model.person.InterviewTime;
 import seedu.address.model.person.Name;
 import seedu.address.model.person.Person;
@@ -25,25 +26,28 @@ public static Person[] getSamplePersons() {
             new Person(new CompanyName("Google"), new Name("Alex Yeoh"), new Phone("87438807"), new Email("alexyeoh"
                     + "@example.com"),
                 new Address("Blk 30 Geylang Street 29, #06-40"),
-                new InterviewTime("121220221400"), new Salary("0"),
+                new InterviewTime("121220221400"), new Salary("0"), new Info("Friend of boss"),
                 getTagSet("friends")),
             new Person(new CompanyName("Google"), new Name("Bernice Yu"), new Phone("99272758"),
                     new Email("[email protected]"), new Address("Blk 30 Lorong 3 Serangoon Gardens, #07-18"),
-                    new InterviewTime("121220221400"), new Salary("0"),
+                    new InterviewTime("121220221400"), new Salary("0"), new Info("Friend of boss"),
                     getTagSet("colleagues", "friends")),
             new Person(new CompanyName("Google"), new Name("Charlotte Oliveiro"), new Phone("93210283"),
                     new Email("[email protected]"), new Address("Blk 11 Ang Mo Kio Street 74, #11-04"),
-                    new InterviewTime("121220221400"), new Salary("0"),
+                    new InterviewTime("121220221400"), new Salary("0"), new Info("Friend of boss"),
                     getTagSet("neighbours")),
             new Person(new CompanyName("Google"), new Name("David Li"), new Phone("91031282"),
                     new Email("[email protected]"), new Address("Blk 436 Serangoon Gardens Street 26, #16-43"),
-                    new InterviewTime("121220221400"), new Salary("0"), getTagSet("family")),
+                    new InterviewTime("121220221400"), new Salary("0"), new Info("Friend of boss"),
+                    getTagSet("family")),
             new Person(new CompanyName("Google"), new Name("Irfan Ibrahim"), new Phone("92492021"),
                     new Email("[email protected]"), new Address("Blk 47 Tampines Street 20, #17-35"),
-                    new InterviewTime("121220221400"), new Salary("0"), getTagSet("classmates")),
+                    new InterviewTime("121220221400"), new Salary("0"), new Info("Friend of boss"),
+                    getTagSet("classmates")),
             new Person(new CompanyName("Amazon"), new Name("Roy Balakrishnan"), new Phone("92624417"),
                     new Email("[email protected]"), new Address("Blk 45 Aljunied Street 85, #11-31"),
-                    new InterviewTime("121220221400"), new Salary("0"), getTagSet("colleagues"))
+                    new InterviewTime("121220221400"), new Salary("0"), new Info("Friend of boss"),
+                    getTagSet("colleagues"))
         };
     }