Merge pull request #236 from yashpola/branch-status-patches

Remedy code-related bug-fixes for status
AY2324S2-CS2103T-F11-3 · Apr 8, 2024 · f4fcf1b · f4fcf1b
2 parents d36006e + 0e03d39
commit f4fcf1b
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 439 deletions.
diff --git a/src/main/java/seedu/address/logic/commands/AddInterviewerStatusCommand.java b/src/main/java/seedu/address/logic/commands/AddInterviewerStatusCommand.java
diff --git a/src/main/java/seedu/address/logic/commands/FilterPersonsByStatusCommand.java b/src/main/java/seedu/address/logic/commands/FilterPersonsByStatusCommand.java
@@ -36,7 +36,7 @@ public FilterPersonsByStatusCommand(Status targetStatus) {
     public CommandResult execute(Model model) {
         requireNonNull(model);
 
-        boolean existsMatchingPersons = model.getFilteredPersonList().stream()
+        boolean existsMatchingPersons = model.getAddressBook().getPersonList().stream()
                 .anyMatch(person -> person.getCurrentStatus().equals(targetStatus.toString()));
         if (!existsMatchingPersons) {
             return new CommandResult("No persons found with status: " + targetStatus.toString());

diff --git a/src/main/java/seedu/address/logic/parser/AddApplicantStatusCommandParser.java b/src/main/java/seedu/address/logic/parser/AddApplicantStatusCommandParser.java
@@ -1,7 +1,6 @@
 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_STATUS;
 
 import seedu.address.commons.exceptions.IllegalValueException;
@@ -27,8 +26,7 @@ public AddApplicantStatusCommand parse(String args) throws ParseException {
         try {
             phone = ParserUtil.parsePhone(argMultimap.getPreamble());
         } catch (IllegalValueException ive) {
-            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT,
-                    AddApplicantStatusCommand.MESSAGE_USAGE), ive);
+            throw new ParseException(Phone.MESSAGE_CONSTRAINTS, ive);
         }
 
         ApplicantStatus applicantStatus = ParserUtil.parseApplicantStatus(argMultimap

diff --git a/src/main/java/seedu/address/logic/parser/AddInterviewerStatusCommandParser.java b/src/main/java/seedu/address/logic/parser/AddInterviewerStatusCommandParser.java
diff --git a/src/main/java/seedu/address/logic/parser/AddressBookParser.java b/src/main/java/seedu/address/logic/parser/AddressBookParser.java
@@ -10,7 +10,6 @@
 import seedu.address.logic.commands.AddApplicantStatusCommand;
 import seedu.address.logic.commands.AddInterviewCommand;
 import seedu.address.logic.commands.AddInterviewerPersonCommand;
-import seedu.address.logic.commands.AddInterviewerStatusCommand;
 import seedu.address.logic.commands.ClearCommand;
 import seedu.address.logic.commands.Command;
 import seedu.address.logic.commands.DeleteCommand;
@@ -92,9 +91,6 @@ public Command parseCommand(String userInput) throws ParseException {
         case AddApplicantStatusCommand.COMMAND_WORD:
             return new AddApplicantStatusCommandParser().parse(arguments);
 
-        case AddInterviewerStatusCommand.COMMAND_WORD:
-            return new AddInterviewerStatusCommandParser().parse(arguments);
-
         case ListCommand.COMMAND_WORD:
             return new ListCommand();
 

diff --git a/src/main/java/seedu/address/logic/parser/ParserUtil.java b/src/main/java/seedu/address/logic/parser/ParserUtil.java
@@ -11,7 +11,6 @@
 import seedu.address.logic.parser.exceptions.ParseException;
 import seedu.address.model.person.ApplicantStatus;
 import seedu.address.model.person.Email;
-import seedu.address.model.person.InterviewerStatus;
 import seedu.address.model.person.Name;
 import seedu.address.model.person.Phone;
 import seedu.address.model.tag.Tag;
@@ -122,19 +121,4 @@ public static ApplicantStatus parseApplicantStatus(String applicantStatus) throw
         }
         return new ApplicantStatus(trimmedApplicantStatus);
     }
-
-    /**
-     * Parses a {@code String status} into a {@code InterviewerStatus}.
-     * Leading and trailing whitespaces will be trimmed.
-     *
-     * @throws ParseException if the given {@code status} is invalid.
-     */
-    public static InterviewerStatus parseInterviewerStatus(String interviewerStatus) throws ParseException {
-        requireNonNull(interviewerStatus);
-        String trimmedInterviewerStatus = interviewerStatus.trim().toLowerCase();
-        if (!InterviewerStatus.isValidStatus(trimmedInterviewerStatus)) {
-            throw new ParseException(InterviewerStatus.MESSAGE_CONSTRAINTS);
-        }
-        return new InterviewerStatus(trimmedInterviewerStatus);
-    }
 }
diff --git a/src/main/java/seedu/address/model/person/Applicant.java b/src/main/java/seedu/address/model/person/Applicant.java
@@ -14,7 +14,6 @@
 public class Applicant extends Person {
 
     private final Type type = Type.APPLICANT;
-    private ApplicantStatus previousStatus;
     private ApplicantStatus currentStatus;
 
     /**
@@ -43,7 +42,6 @@ public String getPersonType() {
      */
     @Override
     public void updateCurrentStatusToReflectScheduledInterview(Model model) {
-        previousStatus = currentStatus;
         currentStatus = new ApplicantStatus(ApplicantState.STAGE_TWO.toString());
         /*
             Need to find this applicant by reference equality and replace them for the change in status to reflect in
@@ -59,9 +57,7 @@ public void updateCurrentStatusToReflectScheduledInterview(Model model) {
      */
     @Override
     public void revertCurrentStatus(Model model) {
-        currentStatus = previousStatus == null
-                        ? new ApplicantStatus(ApplicantState.STAGE_ONE.toString())
-                        : previousStatus;
+        currentStatus = new ApplicantStatus(ApplicantState.STAGE_ONE.toString());
         /*
             Need to find this applicant by reference equality and replace them for the change in status to reflect in
             the gui immediately