Change app name, fix recurring expense bug, fix save on exit bug

data/fastTrack.json

@@ -0,0 +1,149 @@
+{
+  "categories" : [ {
+    "categoryName" : "food",
+    "summary" : "For food"
+  }, {
+    "categoryName" : "entertainment",
+    "summary" : "For entertainment"
+  }, {
+    "categoryName" : "transportation",
+    "summary" : "For bus, car, train"
+  }, {
+    "categoryName" : "shopping",
+    "summary" : ""
+  }, {
+    "categoryName" : "housing",
+    "summary" : ""
+  }, {
+    "categoryName" : "groceries",
+    "summary" : ""
+  } ],
+  "expenses" : [ {
+    "name" : "Meal at JE",
+    "amount" : "4.5",
+    "date" : "2023-04-03",
+    "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"
+    }
+  }, {
+    "name" : "milk",
+    "amount" : "4.5",
+    "date" : "2000-05-15",
+    "category" : {
+      "categoryName" : "groceries",
+      "summary" : ""
+    }
+  }, {
+    "name" : "milk",
+    "amount" : "4.5",
+    "date" : "2000-05-08",
+    "category" : {
+      "categoryName" : "groceries",
+      "summary" : ""
+    }
+  }, {
+    "name" : "milk",
+    "amount" : "4.5",
+    "date" : "2000-05-01",
+    "category" : {
+      "categoryName" : "groceries",
+      "summary" : ""
+    }
+  }, {
+    "name" : "milk",
+    "amount" : "4.5",
+    "date" : "2000-04-24",
+    "category" : {
+      "categoryName" : "groceries",
+      "summary" : ""
+    }
+  }, {
+    "name" : "milk",
+    "amount" : "4.5",
+    "date" : "2000-04-17",
+    "category" : {
+      "categoryName" : "groceries",
+      "summary" : ""
+    }
+  }, {
+    "name" : "milk",
+    "amount" : "4.5",
+    "date" : "2000-04-10",
+    "category" : {
+      "categoryName" : "groceries",
+      "summary" : ""
+    }
+  }, {
+    "name" : "milk",
+    "amount" : "4.5",
+    "date" : "2000-04-03",
+    "category" : {
+      "categoryName" : "groceries",
+      "summary" : ""
+    }
+  }, {
+    "name" : "milk",
+    "amount" : "4.5",
+    "date" : "2000-03-27",
+    "category" : {
+      "categoryName" : "groceries",
+      "summary" : ""
+    }
+  }, {
+    "name" : "milk",
+    "amount" : "4.5",
+    "date" : "2000-03-20",
+    "category" : {
+      "categoryName" : "groceries",
+      "summary" : ""
+    }
+  } ],
+  "budget" : {
+    "amount" : "0.0"
+  },
+  "recurringGenerators" : [ {
+    "expenseName" : "milk",
+    "expenseAmount" : "4.5",
+    "expenseCategory" : {
+      "categoryName" : "groceries",
+      "summary" : ""
+    },
+    "nextExpenseDate" : "2000-05-22",
+    "startDate" : "2000-03-20",
+    "endDate" : "2000-05-15",
+    "recurringExpenseType" : "WEEKLY"
+  } ]
+}

docs/tutorials/AddRemark.md

@@ -295,7 +295,7 @@ While the changes to code may be minimal, the test data will have to be updated
 
 <div markdown="span" class="alert alert-warning">
 
-:exclamation: You must delete AddressBook’s storage file located at `/data/addressbook.json` before running it! Not doing so will cause AddressBook to default to an empty address book!
+:exclamation: You must delete AddressBook’s storage file located at `/data/fastTrack.json` before running it! Not doing so will cause AddressBook to default to an empty address book!
 
 </div>
 

src/main/java/seedu/address/MainApp.java

@@ -187,8 +187,9 @@ public void stop() {
         logger.info("============================ [ Stopping Expense Tracker ] =============================");
         try {
             storage.saveUserPrefs(dataModel.getUserPrefs());
+            storage.saveExpenseTracker(dataModel.getExpenseTracker());
         } catch (IOException e) {
-            logger.severe("Failed to save preferences " + StringUtil.getDetails(e));
+            logger.severe("Failed to save data " + StringUtil.getDetails(e));
         }
     }
 }

src/main/java/seedu/address/model/UserPrefs.java

@@ -14,7 +14,7 @@
 public class UserPrefs implements ReadOnlyUserPrefs {
 
     private GuiSettings guiSettings = new GuiSettings();
-    private Path expenseTrackerFilePath = Paths.get("data" , "addressbook.json");
+    private Path expenseTrackerFilePath = Paths.get("data" , "fastTrack.json");
 
     /**
      * Creates a {@code UserPrefs} with default values.

src/main/java/seedu/address/model/expense/RecurringExpenseManager.java

@@ -100,7 +100,11 @@ public RecurringExpenseManager(String expenseName, double amount,
 
     public ArrayList<Expense> getExpenses() {
         ArrayList<Expense> expenses = new ArrayList<>();
-        while (nextExpenseDate.isBefore(LocalDate.now())) {
+        LocalDate newEndDate = LocalDate.now();
+        if (endDate != null) {
+            newEndDate = !endDate.isAfter(LocalDate.now()) ? endDate : LocalDate.now();
+        }
+        while (!nextExpenseDate.isAfter(newEndDate)) {
             expenses.add(new Expense(expenseName, amount, nextExpenseDate, expenseCategory));
             nextExpenseDate = recurringExpenseType.getNextExpenseDate(nextExpenseDate);
         }

src/main/java/seedu/address/model/expense/RecurringExpenseType.java

@@ -24,7 +24,7 @@ public LocalDate getNextExpenseDate(LocalDate currentDate) {
             currentDate = currentDate.plusWeeks(1);
             break;
         case DAILY:
-            currentDate = LocalDate.now().plusDays(1);
+            currentDate = currentDate.plusDays(1);
             break;
         case YEARLY:
             currentDate = currentDate.plusYears(1);

src/main/java/seedu/address/ui/UiManager.java

@@ -35,9 +35,8 @@ public UiManager(Logic logic) {
     @Override
     public void start(Stage primaryStage) {
         logger.info("Starting UI...");
-
         //Set the application icon.
-        primaryStage.getIcons().add(getImage(ICON_APPLICATION));
+        //primaryStage.getIcons().add(getImage(ICON_APPLICATION));
 
         try {
             mainWindow = new MainWindow(primaryStage, logic);

src/main/resources/view/MainWindow.fxml

@@ -14,7 +14,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.stage.Stage?>
 
-<fx:root minHeight="600" minWidth="450" onCloseRequest="#handleExit" title="Address App" type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
+<fx:root minHeight="600" minWidth="450" onCloseRequest="#handleExit" title="FastTrack" type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
   <icons>
     <Image url="@/images/address_book_32.png" />
   </icons>

src/test/data/JsonUserPrefsStorageTest/ExtraValuesUserPref.json

@@ -9,5 +9,5 @@
       "z" : 99
     }
   },
-  "addressBookFilePath" : "addressbook.json"
+  "addressBookFilePath" : "fastTrack.json"
 }

src/test/data/JsonUserPrefsStorageTest/TypicalUserPref.json

@@ -7,5 +7,5 @@
       "y" : 100
     }
   },
-  "addressBookFilePath" : "addressbook.json"
+  "addressBookFilePath" : "fastTrack.json"
 }

src/test/java/seedu/address/logic/LogicManagerTest.java

@@ -40,7 +40,7 @@ public class LogicManagerTest {
     @BeforeEach
     public void setUp() {
         JsonExpenseTrackerStorage addressBookStorage = new JsonExpenseTrackerStorage(
-                temporaryFolder.resolve("addressBook.json"));
+                temporaryFolder.resolve("fastTrack.json"));
         JsonUserPrefsStorage userPrefsStorage = new JsonUserPrefsStorage(temporaryFolder.resolve("userPrefs.json"));
         StorageManager storage = new StorageManager(addressBookStorage, userPrefsStorage);
         logic = new LogicManager(dataModel, storage);
@@ -70,7 +70,7 @@ public void execute_validCommand_success() throws Exception {
     public void execute_storageThrowsIoException_throwsCommandException() {
         // Setup LogicManager with JsonAddressBookIoExceptionThrowingStub
         JsonExpenseTrackerStorage addressBookStorage = new JsonAddressBookIoExceptionThrowingStub(
-                temporaryFolder.resolve("ioExceptionAddressBook.json"));
+                temporaryFolder.resolve("ioExceptionFastTrack.json"));
         JsonUserPrefsStorage userPrefsStorage = new JsonUserPrefsStorage(
                 temporaryFolder.resolve("ioExceptionUserPrefs.json"));
         StorageManager storage = new StorageManager(addressBookStorage, userPrefsStorage);

src/test/java/seedu/address/storage/JsonUserPrefsStorageTest.java

@@ -73,7 +73,7 @@ public void readUserPrefs_extraValuesInFile_extraValuesIgnored() throws DataConv
     private UserPrefs getTypicalUserPrefs() {
         UserPrefs userPrefs = new UserPrefs();
         userPrefs.setGuiSettings(new GuiSettings(1000, 500, 300, 100));
-        userPrefs.setExpenseTrackerFilePath(Paths.get("addressbook.json"));
+        userPrefs.setExpenseTrackerFilePath(Paths.get("FastTrack.json"));
         return userPrefs;
     }