Update Sort to include attribute Faculty

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

@@ -1,6 +1,7 @@
 package staffconnect.logic.commands;
 
 import static java.util.Objects.requireNonNull;
+import static staffconnect.logic.parser.CliSyntax.PREFIX_FACULTY;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_MODULE;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_NAME;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_PHONE;
@@ -27,7 +28,7 @@ public class SortCommand extends Command {
             + "[" + PREFIX_NAME + "] "
             + "[" + PREFIX_PHONE + "] "
             + "[" + PREFIX_MODULE + "] "
-            // + "[FACULTY] "
+            + "[" + PREFIX_FACULTY + "] "
             + "[" + PREFIX_VENUE + "] "
             + "Example: " + COMMAND_WORD + " n";
 

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

@@ -1,20 +1,22 @@
 package staffconnect.logic.parser;
 
 import static staffconnect.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static staffconnect.logic.parser.CliSyntax.PREFIX_FACULTY;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_MODULE;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_NAME;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_PHONE;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_VENUE;
+import static staffconnect.model.person.comparators.FacultyComparator.FACULTY_COMPARATOR;
+import static staffconnect.model.person.comparators.ModuleComparator.MODULE_COMPARATOR;
+import static staffconnect.model.person.comparators.NameComparator.NAME_COMPARATOR;
+import static staffconnect.model.person.comparators.PhoneComparator.PHONE_COMPARATOR;
+import static staffconnect.model.person.comparators.VenueComparator.VENUE_COMPARATOR;
 
 import java.util.Comparator;
 
 import staffconnect.logic.commands.SortCommand;
 import staffconnect.logic.parser.exceptions.ParseException;
 import staffconnect.model.person.Person;
-import staffconnect.model.person.comparators.ModuleComparator;
-import staffconnect.model.person.comparators.NameComparator;
-import staffconnect.model.person.comparators.PhoneComparator;
-import staffconnect.model.person.comparators.VenueComparator;
 
 /**
  * Parses input arguments and creates a new SortCommand object
@@ -39,14 +41,16 @@ public SortCommand parse(String args) throws ParseException {
 
     private Comparator<Person> parseComparatorForKeywords(String keyword) throws ParseException {
 
-        if (keyword.equals(PREFIX_MODULE.getPrefix())) {
-            return ModuleComparator.MODULE_COMPARATOR;
-        } else if (keyword.equals(PREFIX_NAME.getPrefix())) {
-            return NameComparator.NAME_COMPARATOR;
+        if (keyword.equals(PREFIX_NAME.getPrefix())) {
+            return NAME_COMPARATOR;
         } else if (keyword.equals(PREFIX_PHONE.getPrefix())) {
-            return PhoneComparator.PHONE_COMPARATOR;
+            return PHONE_COMPARATOR;
+        } else if (keyword.equals(PREFIX_MODULE.getPrefix())) {
+            return MODULE_COMPARATOR;
+        } else if (keyword.equals(PREFIX_FACULTY.getPrefix())) {
+            return FACULTY_COMPARATOR;
         } else if (keyword.equals(PREFIX_VENUE.getPrefix())) {
-            return VenueComparator.VENUE_COMPARATOR;
+            return VENUE_COMPARATOR;
         } else {
             throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, SortCommand.MESSAGE_USAGE));
         }

src/main/java/staffconnect/model/person/comparators/FacultyComparator.java

@@ -0,0 +1,19 @@
+package staffconnect.model.person.comparators;
+
+import java.util.Comparator;
+
+import staffconnect.model.person.Person;
+
+
+/**
+ * Represents a Comparator for a Person's Venue in the staff book.
+ */
+public class FacultyComparator implements Comparator<Person> {
+
+    public static final FacultyComparator FACULTY_COMPARATOR = new FacultyComparator();
+
+    @Override
+    public int compare(Person p1, Person p2) {
+        return p1.getFaculty().toString().compareToIgnoreCase(p2.getFaculty().toString());
+    }
+}

src/test/data/JsonSerializableStaffBookTest/typicalPersonsStaffBook.json

@@ -90,5 +90,23 @@
     "venue" : "underworld avenue",
     "tags" : [ "classmate" ],
     "availabilities" : [ "FRIDAY" ]
+  }, {
+    "name" : "Leonardo DiCaprio",
+    "phone" : "88472234",
+    "email" : "[email protected]",
+    "module": "TS2237",
+    "faculty": "Arts and Social Sciences",
+    "venue" : "LT13",
+    "tags" : [ ],
+    "availabilities" : [ ]
+  }, {
+    "name" : "Michael Jackson",
+    "phone" : "92347123",
+    "email" : "[email protected]",
+    "module": "MUA1163",
+    "faculty": "Music",
+    "venue" : "YSTCM-SR9",
+    "tags" : [ ],
+    "availabilities" : [ ]
   } ]
 }

src/test/java/staffconnect/logic/commands/SortCommandTest.java

@@ -3,6 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static staffconnect.model.person.comparators.FacultyComparator.FACULTY_COMPARATOR;
 import static staffconnect.model.person.comparators.ModuleComparator.MODULE_COMPARATOR;
 import static staffconnect.model.person.comparators.NameComparator.NAME_COMPARATOR;
 import static staffconnect.model.person.comparators.PhoneComparator.PHONE_COMPARATOR;
@@ -40,9 +41,10 @@ public void equals() {
         assertFalse(nameSortCommand.equals(null));
 
         // different values -> returns false
+        assertFalse(nameSortCommand.equals(new SortCommand(PHONE_COMPARATOR)));
         assertFalse(nameSortCommand.equals(new SortCommand(MODULE_COMPARATOR)));
+        assertFalse(nameSortCommand.equals(new SortCommand(FACULTY_COMPARATOR)));
         assertFalse(nameSortCommand.equals(new SortCommand(VENUE_COMPARATOR)));
-        assertFalse(nameSortCommand.equals(new SortCommand(PHONE_COMPARATOR)));
     }
 
     @Test

src/test/java/staffconnect/logic/parser/SortCommandParserTest.java

@@ -2,12 +2,14 @@
 
 
 import static staffconnect.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static staffconnect.logic.parser.CliSyntax.PREFIX_FACULTY;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_MODULE;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_NAME;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_PHONE;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_VENUE;
 import static staffconnect.logic.parser.CommandParserTestUtil.assertParseFailure;
 import static staffconnect.logic.parser.CommandParserTestUtil.assertParseSuccess;
+import static staffconnect.model.person.comparators.FacultyComparator.FACULTY_COMPARATOR;
 import static staffconnect.model.person.comparators.ModuleComparator.MODULE_COMPARATOR;
 import static staffconnect.model.person.comparators.NameComparator.NAME_COMPARATOR;
 import static staffconnect.model.person.comparators.PhoneComparator.PHONE_COMPARATOR;
@@ -56,9 +58,10 @@ public void parse_validArgs_returnsSortCommand() {
     @Test
     public void parse_validArgs_returnsSortCorrectAttribute() {
 
-        assertParseSuccess(parser, "" + PREFIX_MODULE, new SortCommand(MODULE_COMPARATOR));
         assertParseSuccess(parser, "" + PREFIX_NAME, new SortCommand(NAME_COMPARATOR));
         assertParseSuccess(parser, "" + PREFIX_PHONE, new SortCommand(PHONE_COMPARATOR));
+        assertParseSuccess(parser, "" + PREFIX_MODULE, new SortCommand(MODULE_COMPARATOR));
+        assertParseSuccess(parser, "" + PREFIX_FACULTY, new SortCommand(FACULTY_COMPARATOR));
         assertParseSuccess(parser, "" + PREFIX_VENUE, new SortCommand(VENUE_COMPARATOR));
 
     }

src/test/java/staffconnect/model/person/comparators/FacultyComparatorTest.java

@@ -0,0 +1,39 @@
+package staffconnect.model.person.comparators;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static staffconnect.model.person.comparators.FacultyComparator.FACULTY_COMPARATOR;
+import static staffconnect.model.person.comparators.ModuleComparator.MODULE_COMPARATOR;
+import static staffconnect.model.person.comparators.NameComparator.NAME_COMPARATOR;
+import static staffconnect.model.person.comparators.PhoneComparator.PHONE_COMPARATOR;
+import static staffconnect.model.person.comparators.VenueComparator.VENUE_COMPARATOR;
+import static staffconnect.testutil.TypicalPersons.ALICE;
+import static staffconnect.testutil.TypicalPersons.LEONARDO;
+import static staffconnect.testutil.TypicalPersons.MICHAEL;
+
+import org.junit.jupiter.api.Test;
+
+public class FacultyComparatorTest {
+    @Test
+    public void doesNotEquals() {
+        assertNotEquals(FACULTY_COMPARATOR, NAME_COMPARATOR);
+        assertNotEquals(FACULTY_COMPARATOR, PHONE_COMPARATOR);
+        assertNotEquals(FACULTY_COMPARATOR, MODULE_COMPARATOR);
+        assertNotEquals(FACULTY_COMPARATOR, VENUE_COMPARATOR);
+    }
+
+    @Test
+    public void checkComparator() {
+
+        assertTrue(FACULTY_COMPARATOR.compare(ALICE, MICHAEL) <= -1); // Computing < Music
+        assertTrue(FACULTY_COMPARATOR.compare(MICHAEL, ALICE) >= 1); // Music > Computing
+
+        assertTrue(FACULTY_COMPARATOR.compare(LEONARDO, MICHAEL) <= -1); // Arts and Social Sciences < Music
+        assertTrue(FACULTY_COMPARATOR.compare(MICHAEL, LEONARDO) >= 1); //  Music > Arts and Social Sciences
+
+        assertEquals(FACULTY_COMPARATOR.compare(LEONARDO, LEONARDO), 0);
+        // Arts and Social Sciences = Arts and Social Sciences
+        assertEquals(FACULTY_COMPARATOR.compare(MICHAEL, MICHAEL), 0); // Music = Music
+    }
+}

src/test/java/staffconnect/model/person/comparators/ModuleComparatorTest.java

@@ -2,6 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static staffconnect.model.person.comparators.FacultyComparator.FACULTY_COMPARATOR;
 import static staffconnect.model.person.comparators.ModuleComparator.MODULE_COMPARATOR;
 import static staffconnect.model.person.comparators.NameComparator.NAME_COMPARATOR;
 import static staffconnect.model.person.comparators.PhoneComparator.PHONE_COMPARATOR;
@@ -17,6 +18,7 @@ public class ModuleComparatorTest {
     public void doesNotEquals() {
         assertNotEquals(MODULE_COMPARATOR, NAME_COMPARATOR);
         assertNotEquals(MODULE_COMPARATOR, PHONE_COMPARATOR);
+        assertNotEquals(MODULE_COMPARATOR, FACULTY_COMPARATOR);
         assertNotEquals(MODULE_COMPARATOR, VENUE_COMPARATOR);
     }
 

src/test/java/staffconnect/model/person/comparators/NameComparatorTest.java

@@ -3,6 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static staffconnect.model.person.comparators.FacultyComparator.FACULTY_COMPARATOR;
 import static staffconnect.model.person.comparators.ModuleComparator.MODULE_COMPARATOR;
 import static staffconnect.model.person.comparators.NameComparator.NAME_COMPARATOR;
 import static staffconnect.model.person.comparators.PhoneComparator.PHONE_COMPARATOR;
@@ -17,8 +18,9 @@ public class NameComparatorTest {
 
     @Test
     public void doesNotEquals() {
-        assertNotEquals(NAME_COMPARATOR, MODULE_COMPARATOR);
         assertNotEquals(NAME_COMPARATOR, PHONE_COMPARATOR);
+        assertNotEquals(NAME_COMPARATOR, MODULE_COMPARATOR);
+        assertNotEquals(NAME_COMPARATOR, FACULTY_COMPARATOR);
         assertNotEquals(NAME_COMPARATOR, VENUE_COMPARATOR);
     }
 

src/test/java/staffconnect/model/person/comparators/PhoneComparatorTest.java

@@ -3,6 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static staffconnect.model.person.comparators.FacultyComparator.FACULTY_COMPARATOR;
 import static staffconnect.model.person.comparators.ModuleComparator.MODULE_COMPARATOR;
 import static staffconnect.model.person.comparators.NameComparator.NAME_COMPARATOR;
 import static staffconnect.model.person.comparators.PhoneComparator.PHONE_COMPARATOR;
@@ -16,8 +17,9 @@
 public class PhoneComparatorTest {
     @Test
     public void doesNotEquals() {
-        assertNotEquals(PHONE_COMPARATOR, MODULE_COMPARATOR);
         assertNotEquals(PHONE_COMPARATOR, NAME_COMPARATOR);
+        assertNotEquals(PHONE_COMPARATOR, MODULE_COMPARATOR);
+        assertNotEquals(PHONE_COMPARATOR, FACULTY_COMPARATOR);
         assertNotEquals(PHONE_COMPARATOR, VENUE_COMPARATOR);
     }
 

src/test/java/staffconnect/model/person/comparators/VenueComparatorTest.java

@@ -3,6 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static staffconnect.model.person.comparators.FacultyComparator.FACULTY_COMPARATOR;
 import static staffconnect.model.person.comparators.ModuleComparator.MODULE_COMPARATOR;
 import static staffconnect.model.person.comparators.NameComparator.NAME_COMPARATOR;
 import static staffconnect.model.person.comparators.PhoneComparator.PHONE_COMPARATOR;
@@ -16,21 +17,22 @@
 public class VenueComparatorTest {
     @Test
     public void doesNotEquals() {
-        assertNotEquals(VENUE_COMPARATOR, MODULE_COMPARATOR);
         assertNotEquals(VENUE_COMPARATOR, NAME_COMPARATOR);
         assertNotEquals(VENUE_COMPARATOR, PHONE_COMPARATOR);
+        assertNotEquals(VENUE_COMPARATOR, MODULE_COMPARATOR);
+        assertNotEquals(VENUE_COMPARATOR, FACULTY_COMPARATOR);
     }
 
     @Test
     public void checkComparator() {
 
-        assertTrue(PHONE_COMPARATOR.compare(ELLE, CARL) <= -1); // michegan ave < wall street
-        assertTrue(PHONE_COMPARATOR.compare(CARL, ELLE) >= 1); // wall street > michegan ave
+        assertTrue(VENUE_COMPARATOR.compare(ELLE, CARL) <= -1); // michegan ave < wall street
+        assertTrue(VENUE_COMPARATOR.compare(CARL, ELLE) >= 1); // wall street > michegan ave
 
-        assertTrue(PHONE_COMPARATOR.compare(ELLE, GEORGE) <= -1); // michegan ave < 4th street
-        assertTrue(PHONE_COMPARATOR.compare(GEORGE, ELLE) >= 1); //  4th street > michegan ave
+        assertTrue(VENUE_COMPARATOR.compare(GEORGE, ELLE) <= 1); //  4th street > michegan ave
+        assertTrue(VENUE_COMPARATOR.compare(ELLE, GEORGE) >= -1); // michegan ave < 4th street
 
-        assertEquals(PHONE_COMPARATOR.compare(ELLE, ELLE), 0); // michegan ave = michegan ave
-        assertEquals(PHONE_COMPARATOR.compare(GEORGE, GEORGE), 0); // 4th street = 4th street
+        assertEquals(VENUE_COMPARATOR.compare(ELLE, ELLE), 0); // michegan ave = michegan ave
+        assertEquals(VENUE_COMPARATOR.compare(GEORGE, GEORGE), 0); // 4th street = 4th street
     }
 }

src/test/java/staffconnect/testutil/TypicalPersons.java

@@ -52,18 +52,11 @@ public class TypicalPersons {
             .withPhone("9482224").withEmail("[email protected]").withModule("CS2100")
             .withFaculty("Computing").withVenue("michegan ave").build();
     public static final Person FIONA = new PersonBuilder().withName("Fiona Kunz").withPhone("9482427")
-            .withEmail("[email protected]").withVenue("little tokyo")
-            .withFaculty("Computing").withModule("CS2101").build();
+            .withEmail("[email protected]").withModule("CS2101")
+            .withFaculty("Computing").withVenue("little tokyo").build();
     public static final Person GEORGE = new PersonBuilder().withName("George Best").withPhone("9482442")
-            .withEmail("[email protected]").withVenue("4th street")
-            .withFaculty("Computing").withModule("CS2102").build();
-    public static final Person KAFKA = new PersonBuilder().withName("Kafka Apache").withPhone("9452413")
-            .withEmail("[email protected]").withModule("CS2102").withFaculty("Business")
-            .withVenue("pteruges avenue").withTags("classmate").withAvailabilities("FRIDAY").build();
-    public static final Person NATASHA = new PersonBuilder().withName("Natasha Harrower").withPhone("8019394")
-            .withEmail("[email protected]").withModule("CS2102")
-            .withFaculty("Computing").withVenue("underworld avenue")
-            .withTags("classmate").withAvailabilities("FRIDAY").build();
+            .withEmail("[email protected]").withModule("CS2102")
+            .withFaculty("Computing").withVenue("4th street").build();
 
     // Manually added
     public static final Person HOON = new PersonBuilder().withName("Hoon Meier").withPhone("8482424")
@@ -73,6 +66,20 @@ public class TypicalPersons {
             .withEmail("[email protected]").withModule("CS2103T")
             .withFaculty("Computing").withVenue("chicago ave").build();
 
+    public static final Person KAFKA = new PersonBuilder().withName("Kafka Apache").withPhone("9452413")
+            .withEmail("[email protected]").withModule("CS2102").withFaculty("Business")
+            .withVenue("pteruges avenue").withTags("classmate").withAvailabilities("FRIDAY").build();
+    public static final Person NATASHA = new PersonBuilder().withName("Natasha Harrower").withPhone("8019394")
+            .withEmail("[email protected]").withModule("CS2102")
+            .withFaculty("Computing").withVenue("underworld avenue")
+            .withTags("classmate").withAvailabilities("FRIDAY").build();
+    public static final Person LEONARDO = new PersonBuilder().withName("Leonardo DiCaprio").withPhone("88472234")
+            .withEmail("[email protected]").withModule("TS2237")
+            .withFaculty("Arts and Social Sciences").withVenue("LT13").build();
+    public static final Person MICHAEL = new PersonBuilder().withName("Michael Jackson").withPhone("92347123")
+            .withEmail("[email protected]").withModule("MUA1163")
+            .withFaculty("Music").withVenue("YSTCM-SR9").build();
+
     // Manually added - Person's details found in {@code CommandTestUtil}
     public static final Person AMY = new PersonBuilder().withName(VALID_NAME_AMY).withPhone(VALID_PHONE_AMY)
             .withEmail(VALID_EMAIL_AMY).withModule(VALID_MODULE_AMY)
@@ -100,6 +107,7 @@ public static StaffBook getTypicalStaffBook() {
     }
 
     public static List<Person> getTypicalPersons() {
-        return new ArrayList<>(Arrays.asList(ALICE, BENSON, CARL, CLARA, DANIEL, ELLE, FIONA, GEORGE, KAFKA, NATASHA));
+        return new ArrayList<>(Arrays.asList(ALICE, BENSON, CARL, CLARA, DANIEL, ELLE, FIONA, GEORGE, KAFKA, NATASHA,
+                LEONARDO, MICHAEL));
     }
 }