Merge pull request #199 from ChinYanXu/NewAssertions

Refactor loadFileContents
AY2324S2-CS2113-T12-4 · Apr 8, 2024 · 4a4c025 · 4a4c025
2 parents d86ef9e + 289b16a
commit 4a4c025
Showing 1 changed file with 23 additions and 17 deletions.
diff --git a/src/main/java/seedu/omnitravel/storage/FileSave.java b/src/main/java/seedu/omnitravel/storage/FileSave.java
@@ -33,30 +33,36 @@ public void loadFileContents(TravelActivityList list) throws FileNotFoundExcepti
             String duration = line[4];
             String tag = line.length >= 6 ? line[5].trim() : "";
             String expense = line.length >= 7 ? line[6].trim() : "";
-            TravelActivity activity;
-            switch (type) {
-            case "accommodation":
-                activity = new Accommodation(description, date, duration, tag, expense);
-                break;
-            case "food":
-                activity = new Food(description, date, duration, tag, expense);
-                break;
-            case "landmark":
-                activity = new Landmark(description, date, duration, tag, expense);
-                break;
-            case "general":
-                activity = new TravelActivity(description, date, duration, tag, expense);
-                break;
-            default:
-                throw new FileNotFoundException("File is corrupted or has invalid format");
-            }
+            TravelActivity activity = initialiseActivity (type, description, date, duration, tag, expense);
             list.addTravelActivity(activity);
             if (line[1].equals("1")) {
                 activity.setActivityStatus(true);
             }
         }
     }
 
+    public TravelActivity initialiseActivity (String type, String description,
+            LocalDate date, String duration, String tag, String expense) throws FileNotFoundException {
+        TravelActivity activity;
+        switch (type) {
+        case "accommodation":
+            activity = new Accommodation(description, date, duration, tag, expense);
+            break;
+        case "food":
+            activity = new Food(description, date, duration, tag, expense);
+            break;
+        case "landmark":
+            activity = new Landmark(description, date, duration, tag, expense);
+            break;
+        case "general":
+            activity = new TravelActivity(description, date, duration, tag, expense);
+            break;
+        default:
+            throw new FileNotFoundException("File is corrupted or has invalid format");
+        }
+        return activity;
+    }
+
     public void saveActivityList(TravelActivityList list) throws IOException {
         logger.log(Level.INFO, "saveActivityList");
         FileWriter fw = new FileWriter(filePath);