Merge pull request #285 from rismm/master

Update rename command
AY2324S2-CS2113-T13-4 · Apr 15, 2024 · cc9515a · cc9515a
2 parents 8bab866 + c3afdc1
commit cc9515a
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/src/main/java/supertracker/parser/Parser.java b/src/main/java/supertracker/parser/Parser.java
@@ -510,6 +510,15 @@ private static void validateItemExistsInInventory(String name, String errorMessa
      * @throws TrackerException If the item already exists in the inventory
      */
     private static String validateItemNotInInventory(String name, String errorMessage) throws TrackerException {
+        String itemName = replaceDelimitersInName(name);
+
+        if (Inventory.contains(itemName)) {
+            throw new TrackerException(itemName + errorMessage);
+        }
+        return itemName;
+    }
+
+    private static String replaceDelimitersInName(String name) {
         String itemName = name;
         if (name.contains(FILE_DELIMITER)) {
             while (itemName.contains(FILE_DELIMITER)) {
@@ -519,9 +528,6 @@ private static String validateItemNotInInventory(String name, String errorMessag
             Ui.printItemNameLimitation(name, FILE_DELIMITER, itemName);
         }
 
-        if (Inventory.contains(itemName)) {
-            throw new TrackerException(itemName + errorMessage);
-        }
         return itemName;
     }
 
@@ -973,8 +979,11 @@ private static Command parseRenameCommand(String input) throws TrackerException
         String newName = matcher.group(NEW_NAME_GROUP).trim();
         validateNonEmptyParam(newName);
         validateItemExistsInInventory(name, ErrorMessage.ITEM_NOT_IN_LIST_RENAME);
-        newName = validateItemNotInInventory(newName, ErrorMessage.ITEM_IN_LIST_RENAME);
+        newName = replaceDelimitersInName(newName);
 
+        if (!newName.equalsIgnoreCase(name)) {
+            newName = validateItemNotInInventory(newName, ErrorMessage.ITEM_IN_LIST_RENAME);
+        }
         return new RenameCommand(name, newName);
     }
     //@@author