Merge pull request #262 from nicleejy/master

fix duplicate category bug

data/fastTrack.json

@@ -1,8 +1,63 @@
 {
-  "categories" : [ ],
-  "expenses" : [ ],
+  "categories" : [ {
+    "categoryName" : "Food",
+    "summary" : "For food"
+  }, {
+    "categoryName" : "Entertainment",
+    "summary" : "For entertainment"
+  }, {
+    "categoryName" : "Transportation",
+    "summary" : "For bus, car, train"
+  }, {
+    "categoryName" : "Shopping",
+    "summary" : ""
+  }, {
+    "categoryName" : "Housing",
+    "summary" : ""
+  } ],
+  "expenses" : [ {
+    "name" : "Meal at JE",
+    "amount" : "4.5",
+    "date" : "2023-04-10",
+    "category" : {
+      "categoryName" : "Food",
+      "summary" : "For food"
+    }
+  }, {
+    "name" : "Groceries",
+    "amount" : "56.3",
+    "date" : "2023-03-25",
+    "category" : {
+      "categoryName" : "Food",
+      "summary" : "For food"
+    }
+  }, {
+    "name" : "Shoes",
+    "amount" : "75.0",
+    "date" : "2023-03-20",
+    "category" : {
+      "categoryName" : "Shopping",
+      "summary" : ""
+    }
+  }, {
+    "name" : "Movie ticket",
+    "amount" : "12.99",
+    "date" : "2023-03-15",
+    "category" : {
+      "categoryName" : "Entertainment",
+      "summary" : "For entertainment"
+    }
+  }, {
+    "name" : "MRT fare",
+    "amount" : "45.8",
+    "date" : "2023-03-10",
+    "category" : {
+      "categoryName" : "Transportation",
+      "summary" : "For bus, car, train"
+    }
+  } ],
   "budget" : {
-    "amount" : "4000.0"
+    "amount" : "0.0"
   },
   "recurringGenerators" : [ ]
 }

preferences.json

@@ -1,7 +1,7 @@
 {
   "guiSettings" : {
     "windowWidth" : 1000.0,
-    "windowHeight" : 835.2000122070312,
+    "windowHeight" : 700.0,
     "windowCoordinates" : {
       "x" : 208,
       "y" : 25

src/main/java/fasttrack/MainApp.java

@@ -36,7 +36,7 @@
  */
 public class MainApp extends Application {
 
-    public static final Version VERSION = new Version(1, 3, 1, true);
+    public static final Version VERSION = new Version(1, 4, 0, true);
 
     private static final Logger logger = LogsCenter.getLogger(MainApp.class);
 

src/main/java/fasttrack/logic/commands/edit/EditCategoryCommand.java

@@ -67,7 +67,7 @@ public CommandResult execute(Model model) throws CommandException {
                 throw new CommandException(Messages.MESSAGE_INVALID_CATEGORY_NAME);
             }
             for (Category category : lastShownList) {
-                if (category.getCategoryName().equals(newCategoryName)) {
+                if (category.getCategoryName().equalsIgnoreCase(newCategoryName)) {
                     throw new CommandException(MESSAGE_DUPLICATE_CATEGORY);
                 }
             }

src/main/java/fasttrack/logic/commands/edit/EditExpenseCommand.java

@@ -67,7 +67,7 @@ public CommandResult execute(Model model) throws CommandException {
         Category toBeAllocated = null;
 
         for (Category category : lastShownListOfCategories) {
-            if (category.getCategoryName().equals(this.newExpenseCategoryInString)) {
+            if (category.getCategoryName().equalsIgnoreCase(this.newExpenseCategoryInString)) {
                 toBeAllocated = category;
                 break;
             }

src/main/java/fasttrack/logic/commands/edit/EditRecurringExpenseManagerCommand.java

@@ -83,7 +83,7 @@ public CommandResult execute(Model model) throws CommandException {
         Category toBeAllocated = null;
 
         for (Category category : lastShownListOfCategories) {
-            if (category.getCategoryName().equals(this.newExpenseCategoryInString)) {
+            if (category.getCategoryName().equalsIgnoreCase(this.newExpenseCategoryInString)) {
                 toBeAllocated = category;
                 break;
             }