Move Goal class into goal package

AY2324S1-CS2113-F11-1 · Nov 14, 2023 · 647881b · 647881b
1 parent 7e6e5c8
commit 647881b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 25 deletions.
diff --git a/src/main/java/seedu/duke/data/Goal.java b/src/main/java/seedu/duke/data/Goal.java
diff --git a/src/main/java/seedu/duke/goal/GoalList.java b/src/main/java/seedu/duke/goal/GoalList.java
@@ -9,7 +9,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 
-public class GoalList extends ArrayList<Goal> {
+public class GoalList extends ArrayList<GoalList.Goal> {
     private static final String DATEKEYWORD = "on";
 
     private ArrayList<Goal> goals;
@@ -184,5 +184,22 @@ public static void verifyViewAchievementInput(String cmd) throws IncorrectFormat
         }
     }
 
+    public static class Goal {
+        private int calories;
+        private Date date;
+
+        public Goal(int calories, String date) throws IncorrectFormatException {
+            this.calories = calories;
+            this.date = setGoalDateTime(date);
+        }
+
+        private Date setGoalDateTime(String date) throws IncorrectFormatException {
+            return new Date(date);
+        }
+
+        public String toString() {
+            return "Consume " + this.calories + " kcal on " + this.date;
+        }
+    }
 }
 
diff --git a/src/main/java/seedu/duke/ui/TextUi.java b/src/main/java/seedu/duke/ui/TextUi.java
@@ -14,7 +14,6 @@
 
 import seedu.duke.Duke;
 import seedu.duke.commands.CommandResult;
-import seedu.duke.data.Goal;
 import seedu.duke.data.GoalList;
 import seedu.duke.data.Printable;
 
@@ -203,7 +202,7 @@ public static String noOfGoalMsg(int goalCount) {
         return "You now have " + goalCount + " goals to accomplish.";
     }
 
-    public static String deleteGoalMsg(Goal deletedGoal) {
+    public static String deleteGoalMsg(GoalList.Goal deletedGoal) {
 
         return "Good. I have removed this goal: " + deletedGoal + "\n"
                 + "Remember not to give up unaccomplished target!" + "\n";
@@ -216,7 +215,7 @@ public static String deleteGoalMsg(Goal deletedGoal) {
      */
     public static String addGoalSuccessMessage() {
         int currentNoOfGoal = Duke.goalList.getGoalCount();
-        Goal newlyAddedGoal = Duke.goalList.getGoal(currentNoOfGoal - 1);
+        GoalList.Goal newlyAddedGoal = Duke.goalList.getGoal(currentNoOfGoal - 1);
         return "Nice! I have added the following goal to your goals list: \n\t" + newlyAddedGoal;
     }