Update code to use Availability attribute

src/main/java/staffconnect/logic/Messages.java

@@ -47,6 +47,8 @@ public static String format(Person person) {
                 .append(person.getModule())
                 .append("; Tags: ");
         person.getTags().forEach(builder::append);
+        builder.append("; Availabilities: ");
+        person.getAvailabilities().forEach(builder::append);
         return builder.toString();
     }
 

src/main/java/staffconnect/logic/commands/AddCommand.java

@@ -1,6 +1,7 @@
 package staffconnect.logic.commands;
 
 import static java.util.Objects.requireNonNull;
+import static staffconnect.logic.parser.CliSyntax.PREFIX_AVAILABILITY;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_EMAIL;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_MODULE;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_NAME;
@@ -28,15 +29,18 @@ public class AddCommand extends Command {
             + PREFIX_EMAIL + "EMAIL "
             + PREFIX_VENUE + "VENUE "
             + PREFIX_MODULE + "MODULE "
-            + "[" + PREFIX_TAG + "TAG]...\n"
+            + "[" + PREFIX_TAG + "TAG]... "
+            + "[" + PREFIX_AVAILABILITY + "AVAILABILITY]...\n"
             + "Example: " + COMMAND_WORD + " "
             + PREFIX_NAME + "John Doe "
             + PREFIX_PHONE + "98765432 "
             + PREFIX_EMAIL + "[email protected] "
             + PREFIX_VENUE + "311, Clementi Ave 2, #02-25 "
             + PREFIX_MODULE + "CS2103 "
             + PREFIX_TAG + "friends "
-            + PREFIX_TAG + "owesMoney";
+            + PREFIX_TAG + "owesMoney"
+            + PREFIX_AVAILABILITY + "mon"
+            + PREFIX_AVAILABILITY + "thur";
 
     public static final String MESSAGE_SUCCESS = "New person added: %1$s";
     public static final String MESSAGE_DUPLICATE_PERSON = "This person already exists in the staff book";

src/main/java/staffconnect/logic/commands/EditCommand.java

@@ -1,6 +1,7 @@
 package staffconnect.logic.commands;
 
 import static java.util.Objects.requireNonNull;
+import static staffconnect.logic.parser.CliSyntax.PREFIX_AVAILABILITY;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_EMAIL;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_MODULE;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_NAME;
@@ -22,6 +23,7 @@
 import staffconnect.logic.Messages;
 import staffconnect.logic.commands.exceptions.CommandException;
 import staffconnect.model.Model;
+import staffconnect.model.availability.Availability;
 import staffconnect.model.person.Email;
 import staffconnect.model.person.Module;
 import staffconnect.model.person.Name;
@@ -46,7 +48,8 @@ public class EditCommand extends Command {
             + "[" + PREFIX_EMAIL + "EMAIL] "
             + "[" + PREFIX_VENUE + "VENUE] "
             + "[" + PREFIX_MODULE + "MODULE] "
-            + "[" + PREFIX_TAG + "TAG]...\n"
+            + "[" + PREFIX_TAG + "TAG]... "
+            + "[" + PREFIX_AVAILABILITY + "AVAILABILITY]...\n"
             + "Example: " + COMMAND_WORD + " 1 "
             + PREFIX_PHONE + "91234567 "
             + PREFIX_EMAIL + "[email protected]";
@@ -104,8 +107,11 @@ private static Person createEditedPerson(Person personToEdit, EditPersonDescript
         Venue updatedVenue = editPersonDescriptor.getVenue().orElse(personToEdit.getVenue());
         Module updatedModule = editPersonDescriptor.getModule().orElse(personToEdit.getModule());
         Set<Tag> updatedTags = editPersonDescriptor.getTags().orElse(personToEdit.getTags());
+        Set<Availability> updatedAvailabilities = editPersonDescriptor.getAvailabilities()
+                .orElse(personToEdit.getAvailabilities());
 
-        return new Person(updatedName, updatedPhone, updatedEmail, updatedVenue, updatedModule, updatedTags);
+        return new Person(updatedName, updatedPhone, updatedEmail, updatedVenue, updatedModule,
+                updatedTags, updatedAvailabilities);
     }
 
     @Override
@@ -143,12 +149,13 @@ public static class EditPersonDescriptor {
         private Venue venue;
         private Module module;
         private Set<Tag> tags;
+        private Set<Availability> availabilities;
 
         public EditPersonDescriptor() {}
 
         /**
          * Copy constructor.
-         * A defensive copy of {@code tags} is used internally.
+         * A defensive copy of {@code tags} and {@code availabilities} is used internally.
          */
         public EditPersonDescriptor(EditPersonDescriptor toCopy) {
             setName(toCopy.name);
@@ -157,13 +164,14 @@ public EditPersonDescriptor(EditPersonDescriptor toCopy) {
             setVenue(toCopy.venue);
             setModule(toCopy.module);
             setTags(toCopy.tags);
+            setAvailabilities(toCopy.availabilities);
         }
 
         /**
          * Returns true if at least one field is edited.
          */
         public boolean isAnyFieldEdited() {
-            return CollectionUtil.isAnyNonNull(name, phone, email, venue, module, tags);
+            return CollectionUtil.isAnyNonNull(name, phone, email, venue, module, tags, availabilities);
         }
 
         public void setName(Name name) {
@@ -223,6 +231,25 @@ public Optional<Set<Tag>> getTags() {
             return (tags != null) ? Optional.of(Collections.unmodifiableSet(tags)) : Optional.empty();
         }
 
+        /**
+         * Sets {@code availabilities} to this object's {@code availabilities}.
+         * A defensive copy of {@code availabilities} is used internally.
+         */
+        public void setAvailabilities(Set<Availability> availabilities) {
+            this.availabilities = (availabilities != null) ? new HashSet<>(availabilities) : null;
+        }
+
+        /**
+         * Returns an unmodifiable availability set, which throws {@code UnsupportedOperationException}
+         * if modification is attempted.
+         * Returns {@code Optional#empty()} if {@code availabilities} is null.
+         */
+        public Optional<Set<Availability>> getAvailabilities() {
+            return (availabilities != null)
+                    ? Optional.of(Collections.unmodifiableSet(availabilities))
+                    : Optional.empty();
+        }
+
         @Override
         public boolean equals(Object other) {
             if (other == this) {
@@ -240,7 +267,8 @@ public boolean equals(Object other) {
                     && Objects.equals(email, otherEditPersonDescriptor.email)
                     && Objects.equals(venue, otherEditPersonDescriptor.venue)
                     && Objects.equals(module, otherEditPersonDescriptor.module)
-                    && Objects.equals(tags, otherEditPersonDescriptor.tags);
+                    && Objects.equals(tags, otherEditPersonDescriptor.tags)
+                    && Objects.equals(availabilities, otherEditPersonDescriptor.availabilities);
         }
 
         @Override
@@ -252,6 +280,7 @@ public String toString() {
                     .add("venue", venue)
                     .add("module", module)
                     .add("tags", tags)
+                    .add("availabilities", availabilities)
                     .toString();
         }
     }

src/main/java/staffconnect/logic/parser/AddCommandParser.java

@@ -1,6 +1,7 @@
 package staffconnect.logic.parser;
 
 import static staffconnect.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static staffconnect.logic.parser.CliSyntax.PREFIX_AVAILABILITY;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_EMAIL;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_MODULE;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_NAME;
@@ -13,6 +14,7 @@
 
 import staffconnect.logic.commands.AddCommand;
 import staffconnect.logic.parser.exceptions.ParseException;
+import staffconnect.model.availability.Availability;
 import staffconnect.model.person.Email;
 import staffconnect.model.person.Module;
 import staffconnect.model.person.Name;
@@ -33,9 +35,10 @@ public class AddCommandParser implements Parser<AddCommand> {
      */
     public AddCommand parse(String args) throws ParseException {
         ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE,
-                PREFIX_EMAIL, PREFIX_VENUE, PREFIX_MODULE, PREFIX_TAG);
+                PREFIX_EMAIL, PREFIX_VENUE, PREFIX_MODULE, PREFIX_TAG, PREFIX_AVAILABILITY);
 
-        if (!arePrefixesPresent(argMultimap, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_VENUE, PREFIX_MODULE)
+        if (!arePrefixesPresent(argMultimap, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_VENUE,
+                PREFIX_MODULE)
                 || !argMultimap.getPreamble().isEmpty()) {
             throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE));
         }
@@ -48,8 +51,10 @@ public AddCommand parse(String args) throws ParseException {
         Venue venue = ParserUtil.parseVenue(argMultimap.getValue(PREFIX_VENUE).get());
         Module module = ParserUtil.parseModule(argMultimap.getValue(PREFIX_MODULE).get());
         Set<Tag> tagList = ParserUtil.parseTags(argMultimap.getAllValues(PREFIX_TAG));
+        Set<Availability> availabilityList =
+                ParserUtil.parseAvailabilities(argMultimap.getAllValues(PREFIX_AVAILABILITY));
 
-        Person person = new Person(name, phone, email, venue, module, tagList);
+        Person person = new Person(name, phone, email, venue, module, tagList, availabilityList);
 
         return new AddCommand(person);
     }

src/main/java/staffconnect/logic/parser/CliSyntax.java

@@ -12,5 +12,6 @@ public class CliSyntax {
     public static final Prefix PREFIX_VENUE = new Prefix("v/");
     public static final Prefix PREFIX_MODULE = new Prefix("m/");
     public static final Prefix PREFIX_TAG = new Prefix("t/");
+    public static final Prefix PREFIX_AVAILABILITY = new Prefix("a/");
 
 }

src/main/java/staffconnect/logic/parser/EditCommandParser.java

@@ -2,6 +2,7 @@
 
 import static java.util.Objects.requireNonNull;
 import static staffconnect.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static staffconnect.logic.parser.CliSyntax.PREFIX_AVAILABILITY;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_EMAIL;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_MODULE;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_NAME;
@@ -18,6 +19,7 @@
 import staffconnect.logic.commands.EditCommand;
 import staffconnect.logic.commands.EditCommand.EditPersonDescriptor;
 import staffconnect.logic.parser.exceptions.ParseException;
+import staffconnect.model.availability.Availability;
 import staffconnect.model.tag.Tag;
 
 /**
@@ -34,7 +36,7 @@ public EditCommand parse(String args) throws ParseException {
         requireNonNull(args);
         ArgumentMultimap argMultimap =
                 ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL,
-                    PREFIX_VENUE, PREFIX_MODULE, PREFIX_TAG);
+                    PREFIX_VENUE, PREFIX_MODULE, PREFIX_TAG, PREFIX_AVAILABILITY);
 
         Index index;
 
@@ -65,6 +67,8 @@ public EditCommand parse(String args) throws ParseException {
             editPersonDescriptor.setModule(ParserUtil.parseModule(argMultimap.getValue(PREFIX_MODULE).get()));
         }
         parseTagsForEdit(argMultimap.getAllValues(PREFIX_TAG)).ifPresent(editPersonDescriptor::setTags);
+        parseAvailabilitiesForEdit(argMultimap.getAllValues(PREFIX_AVAILABILITY))
+                .ifPresent(editPersonDescriptor::setAvailabilities);
 
         if (!editPersonDescriptor.isAnyFieldEdited()) {
             throw new ParseException(EditCommand.MESSAGE_NOT_EDITED);
@@ -88,4 +92,23 @@ private Optional<Set<Tag>> parseTagsForEdit(Collection<String> tags) throws Pars
         return Optional.of(ParserUtil.parseTags(tagSet));
     }
 
+    /**
+     * Parses {@code Collection<String> availabilities} into a {@code Set<Availability>}
+     * if {@code availabilities} is non-empty.
+     * If {@code availabilities} contain only one element which is an empty string, it will be parsed
+     * into a {@code Set<Availability>} containing zero availabilities.
+     */
+    private Optional<Set<Availability>> parseAvailabilitiesForEdit(Collection<String> availabilities)
+            throws ParseException {
+        assert availabilities != null;
+
+        if (availabilities.isEmpty()) {
+            return Optional.empty();
+        }
+        Collection<String> availabilitySet =
+                availabilities.size() == 1 && availabilities.contains("")
+                        ? Collections.emptySet()
+                        : availabilities;
+        return Optional.of(ParserUtil.parseAvailabilities(availabilitySet));
+    }
 }

src/main/java/staffconnect/logic/parser/ParserUtil.java

@@ -9,6 +9,7 @@
 import staffconnect.commons.core.index.Index;
 import staffconnect.commons.util.StringUtil;
 import staffconnect.logic.parser.exceptions.ParseException;
+import staffconnect.model.availability.Availability;
 import staffconnect.model.person.Email;
 import staffconnect.model.person.Module;
 import staffconnect.model.person.Name;
@@ -137,4 +138,31 @@ public static Set<Tag> parseTags(Collection<String> tags) throws ParseException
         }
         return tagSet;
     }
+
+    /**
+     * Parses a {@code String availability} into a {@code Availability}.
+     * Leading and trailing whitespaces will be trimmed.
+     *
+     * @throws ParseException if the given {@code availability} is invalid.
+     */
+    public static Availability parseAvailability(String availability) throws ParseException {
+        requireNonNull(availability);
+        String trimmedAvailability = availability.trim();
+        if (!Availability.isValidAvailability(trimmedAvailability)) {
+            throw new ParseException(Availability.MESSAGE_CONSTRAINTS);
+        }
+        return new Availability(trimmedAvailability);
+    }
+
+    /**
+     * Parses {@code Collection<String> availabilities} into a {@code Set<Availability>}.
+     */
+    public static Set<Availability> parseAvailabilities(Collection<String> availabilities) throws ParseException {
+        requireNonNull(availabilities);
+        final Set<Availability> availabilitySet = new HashSet<>();
+        for (String value : availabilities) {
+            availabilitySet.add(parseAvailability(value));
+        }
+        return availabilitySet;
+    }
 }

src/main/java/staffconnect/model/person/Person.java

@@ -8,6 +8,7 @@
 import java.util.Set;
 
 import staffconnect.commons.util.ToStringBuilder;
+import staffconnect.model.availability.Availability;
 import staffconnect.model.tag.Tag;
 
 /**
@@ -25,18 +26,21 @@
     private final Venue venue;
     private final Module module;
     private final Set<Tag> tags = new HashSet<>();
+    private final Set<Availability> availabilities = new HashSet<>();
 
     /**
      * Every field must be present and not null.
      */
-    public Person(Name name, Phone phone, Email email, Venue venue, Module module, Set<Tag> tags) {
-        requireAllNonNull(name, phone, email, venue, module, tags);
+    public Person(Name name, Phone phone, Email email, Venue venue, Module module,
+            Set<Tag> tags, Set<Availability> availabilities) {
+        requireAllNonNull(name, phone, email, venue, module, tags, availabilities);
         this.name = name;
         this.phone = phone;
         this.email = email;
         this.venue = venue;
         this.module = module;
         this.tags.addAll(tags);
+        this.availabilities.addAll(availabilities);
     }
 
     public Name getName() {
@@ -67,6 +71,14 @@
         return Collections.unmodifiableSet(tags);
     }
 
+    /**
+     * Returns an immutable availability set, which throws {@code UnsupportedOperationException}
+     * if modification is attempted.
+     */
+    public Set<Availability> getAvailabilities() {
+        return Collections.unmodifiableSet(availabilities);
+    }
+
     /**
      * Returns true if both persons have the same name.
      * This defines a weaker notion of equality between two persons.
@@ -101,13 +113,14 @@
                 && email.equals(otherPerson.email)
                 && venue.equals(otherPerson.venue)
                 && module.equals(otherPerson.module)
-                && tags.equals(otherPerson.tags);
+                && tags.equals(otherPerson.tags)
+                && availabilities.equals(otherPerson.availabilities);
     }
 
     @Override
     public int hashCode() {
         // use this method for custom fields hashing instead of implementing your own
-        return Objects.hash(name, phone, email, venue, module, tags);
+        return Objects.hash(name, phone, email, venue, module, tags, availabilities);
     }
 
     @Override
@@ -119,6 +132,7 @@
                 .add("venue", venue)
                 .add("module", module)
                 .add("tags", tags)
+                .add("availabilities", availabilities)
                 .toString();
     }