Merge pull request #200 from Bransonlj/branch-v1.4BugFix1

Bug Fix: Edit with same fields, Wrong status, Company Case Sensitivity
AY2223S2-CS2103T-W11-2 · Apr 4, 2023 · b7420e1 · b7420e1
2 parents c79d8ff + 679ccdc
commit b7420e1
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 11 deletions.
diff --git a/src/main/java/seedu/internship/commons/core/Messages.java b/src/main/java/seedu/internship/commons/core/Messages.java
@@ -7,7 +7,9 @@ public class Messages {
 
     public static final String MESSAGE_UNKNOWN_COMMAND = "Unknown command";
     public static final String MESSAGE_INVALID_COMMAND_FORMAT = "Invalid command format! \n%1$s";
-    public static final String MESSAGE_INVALID_INTERNSHIP_DISPLAYED_INDEX = "The internship index provided is invalid";
-    public static final String MESSAGE_INVALID_EVENT_DISPLAYED_INDEX = "The event index provided is invalid";
+    public static final String MESSAGE_INVALID_INTERNSHIP_DISPLAYED_INDEX =
+            "The internship index provided is out of range";
+    public static final String MESSAGE_INVALID_EVENT_DISPLAYED_INDEX =
+            "The event index provided is out of range";
 
 }
diff --git a/src/main/java/seedu/internship/commons/util/StringUtil.java b/src/main/java/seedu/internship/commons/util/StringUtil.java
@@ -48,6 +48,17 @@ public static String getDetails(Throwable t) {
         return t.getMessage() + "\n" + sw.toString();
     }
 
+    public static boolean isInteger(String s) {
+        requireNonNull(s);
+
+        try {
+            int value = Integer.parseInt(s);
+            return true;
+        } catch (NumberFormatException nfe) {
+            return false;
+        }
+    }
+
     /**
      * Returns true if {@code s} represents a non-zero unsigned integer
      * e.g. 1, 2, 3, ..., {@code Integer.MAX_VALUE} <br>

diff --git a/src/main/java/seedu/internship/logic/commands/EditCommand.java b/src/main/java/seedu/internship/logic/commands/EditCommand.java
@@ -51,6 +51,7 @@ public class EditCommand extends Command {
 
     public static final String MESSAGE_EDIT_INTERNSHIP_SUCCESS = "Edited Internship: %1$s";
     public static final String MESSAGE_NOT_EDITED = "At least one field to edit must be provided.";
+    public static final String MESSAGE_INTERNSHIP_UNCHANGED = "Internship is unchanged";
     public static final String MESSAGE_DUPLICATE_INTERNSHIP = "This internship already exists "
             + "in the internship catalogue.";
 
@@ -81,10 +82,16 @@ public CommandResult execute(Model model) throws CommandException {
         Internship internshipToEdit = lastShownList.get(index.getZeroBased());
         Internship editedInternship = createEditedInternship(internshipToEdit, editInternshipDescriptor);
 
+        // if another internship other than internshipToEdit has same Position and Company as editedInternship
         if (!internshipToEdit.isSameInternship(editedInternship) && model.hasInternship(editedInternship)) {
             throw new CommandException(MESSAGE_DUPLICATE_INTERNSHIP);
         }
 
+        // if internshipToEdit is not changed.
+        if (internshipToEdit.equals(editedInternship)) {
+            throw new CommandException(MESSAGE_INTERNSHIP_UNCHANGED);
+        }
+
         model.setInternship(internshipToEdit, editedInternship);
         model.updateFilteredInternshipList(PREDICATE_SHOW_ALL_INTERNSHIPS);
         model.updateSelectedInternship(editedInternship);

diff --git a/src/main/java/seedu/internship/logic/commands/event/EventDeleteCommand.java b/src/main/java/seedu/internship/logic/commands/event/EventDeleteCommand.java
@@ -16,9 +16,8 @@
 public class EventDeleteCommand extends EventCommand {
     public static final String COMMAND_WORD = "delete";
     public static final String MESSAGE_USAGE = EventCommand.COMMAND_WORD + " "
-            + EventDeleteCommand.COMMAND_WORD + ": Deletes a event to the event catalogue. \n"
-            + "Parameters: "
-            + "Index of Delete Command\n"
+            + EventDeleteCommand.COMMAND_WORD + ": Deletes an event in the event catalogue. \n"
+            + "Parameters: EVENT_INDEX (must be a positive integer)\n"
             + "Example: " + EventCommand.COMMAND_WORD + " "
             + EventDeleteCommand.COMMAND_WORD + " "
             + "1";

diff --git a/src/main/java/seedu/internship/logic/parser/ParserUtil.java b/src/main/java/seedu/internship/logic/parser/ParserUtil.java
@@ -75,10 +75,14 @@ public static Company parseCompany(String company) throws ParseException {
     public static Status parseStatus(String status) throws ParseException {
         requireNonNull(status);
         String trimmedStatus = status.trim();
-        if (!Status.isValidStatus(Integer.valueOf(trimmedStatus))) {
+        if (!StringUtil.isInteger(trimmedStatus)) {
             throw new ParseException(Status.MESSAGE_CONSTRAINTS);
         }
-        return new Status(Integer.valueOf(trimmedStatus));
+
+        if (!Status.isValidStatus(Integer.parseInt(trimmedStatus))) {
+            throw new ParseException(Status.MESSAGE_CONSTRAINTS);
+        }
+        return new Status(Integer.parseInt(trimmedStatus));
     }
 
     /**

diff --git a/src/main/java/seedu/internship/model/internship/Company.java b/src/main/java/seedu/internship/model/internship/Company.java
@@ -44,6 +44,14 @@ public String toString() {
         return companyName;
     }
 
+    /**
+     * Returns true if both companies have the same name, regardless of casing - Non-Case Sensitive.
+     * This defines a weaker notion of equality between two companies.
+     */
+    public boolean isSameCompany(Company otherCompany) {
+        return companyName.equalsIgnoreCase(otherCompany.companyName);
+    }
+
     @Override
     public boolean equals(Object other) {
         return other == this // short circuit if same object

diff --git a/src/main/java/seedu/internship/model/internship/Internship.java b/src/main/java/seedu/internship/model/internship/Internship.java
@@ -66,7 +66,7 @@ public Set<Tag> getTags() {
     }
 
     /**
-     * Returns true if both internships have the same position and company name.
+     * Returns true if both internships have the same position and company name regardless of case - Non-Case Sensitive.
      * This defines a weaker notion of equality between two internships.
      */
     public boolean isSameInternship(Internship otherInternship) {
@@ -75,8 +75,8 @@ public boolean isSameInternship(Internship otherInternship) {
         }
 
         return otherInternship != null
-                && otherInternship.getPosition().equals(getPosition())
-                && otherInternship.getCompany().equals(getCompany());
+                && otherInternship.getPosition().isSamePosition(getPosition())
+                && otherInternship.getCompany().isSameCompany(getCompany());
     }
 
     /**

diff --git a/src/main/java/seedu/internship/model/internship/Position.java b/src/main/java/seedu/internship/model/internship/Position.java
@@ -44,11 +44,19 @@ public String toString() {
         return positionName;
     }
 
+    /**
+     * Returns true if both positions have the same name, regardless of casing - Non-Case Sensitive.
+     * This defines a weaker notion of equality between two positions.
+     */
+    public boolean isSamePosition(Position otherPosition) {
+        return positionName.equalsIgnoreCase(otherPosition.positionName);
+    }
+
     @Override
     public boolean equals(Object other) {
         return other == this // short circuit if same object
                 || (other instanceof Position // instanceof handles nulls
-                && positionName.equalsIgnoreCase(((Position) other).positionName)); // state check
+                && positionName.equals(((Position) other).positionName)); // state check
     }
 
     @Override