Merge pull request #155 from J0shuaLeong/master

Solve storage load error and force quit storage saving

src/main/java/fittrack/command/ExitCommand.java

@@ -3,6 +3,8 @@
 import fittrack.parser.CommandParser;
 import fittrack.parser.PatternMatchFailException;
 
+import java.io.IOException;
+
 
 public class ExitCommand extends Command {
     public static final String COMMAND_WORD = "exit";
@@ -21,6 +23,11 @@ public static boolean isExit(Command command) {
 
     @Override
     public CommandResult execute() {
+        try {
+            storage.save(userProfile, mealList, workoutList);
+        } catch (IOException e) {
+            System.out.println("Failed to save to storage.");
+        }
         return new CommandResult(MESSAGE_EXIT);
     }
 

src/main/java/fittrack/data/Meal.java

@@ -14,7 +14,7 @@ public Meal(String name, Calories calories, Date date) {
     }
 
     public String formatToFile() {
-        return String.format("%s | %s| %s", name, calories, date);
+        return String.format("%s | %s | %s", name, calories, date);
     }
 
     public Calories getCalories() {

src/main/java/fittrack/storage/MealListDecoder.java

@@ -14,7 +14,7 @@
 public class MealListDecoder {
 
     private static final Pattern MEAL_PATTERN = Pattern.compile(
-            "(?<name>[^|]+)\\s*\\|\\s*(?<calories>\\d+\\.\\d+)kcal\\s*\\|\\s*(?<date>\\S+)"
+            "(?<name>\\S+)\\s*\\|\\s*(?<calories>\\S+)kcal\\s*\\|\\s*(?<date>\\S+)"
     );
 
     /**

src/main/java/fittrack/storage/WorkoutListDecoder.java

@@ -14,7 +14,7 @@
 public class WorkoutListDecoder {
 
     private static final Pattern WORKOUT_PATTERN = Pattern.compile(
-            "(?<name>[^|]+)\\s*\\|\\s*(?<calories>\\d+\\.\\d+)kcal\\s*\\|\\s*(?<date>\\S+)"
+            "(?<name>\\S+)\\s*\\|\\s*(?<calories>\\S+)kcal\\s*\\|\\s*(?<date>\\S+)" // add \\d+\\.\\d+ if got decimal
     );
 
     /**

src/test/java/fittrack/data/MealTest.java

@@ -32,7 +32,7 @@ void constructor_null_assert() {
 
     @Test
     void formatToFile_tm_success() {
-        assertEquals("meal | 100kcal| 2023-10-30", tm.formatToFile());
+        assertEquals("meal | 100kcal | 2023-10-30", tm.formatToFile());
     }
 
     @Test