add toString version of datetime support methods

-Tweak test method execution order for robustness of `LocalDateTime.now()` - add methods to fetch portion of list in string representation using dates.
AY2021S1-CS2113-T14-4 · Oct 28, 2020 · 61c0f21 · 61c0f21
1 parent 1a58bc1
commit 61c0f21
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 4 deletions.
diff --git a/src/main/java/seedu/dietbook/list/FoodList.java b/src/main/java/seedu/dietbook/list/FoodList.java
@@ -158,6 +158,7 @@ public List<Integer> getPortionSizes() {
         return FoodListManager.listToPortionSizes(foodEntries);
     }
 
+
     /**
      * Obtain list of LocalDateTimes for when the entries were made.
      * (For storage purposes)
@@ -171,4 +172,25 @@ public String toString() {
         return FoodListManager.listToString(foodEntries);
     }
 
+    /**
+     * Returns toString representation of the segmented list based on DateTime.
+     * @param dateTime Start DateTime.
+     * @return string representation of FoodList
+     */
+    public String getAfterDateTimeToString(LocalDateTime dateTime) {
+        List<FoodEntry> entriesAfterDateTime = FoodListManager.filterListByDate(foodEntries, dateTime);
+        return FoodListManager.listToString(entriesAfterDateTime);
+    }
+
+    /**
+     * Returns toString representation of the segmented list based on DateTime (within a range of 2 datetimes).
+     * @param start start DateTime.
+     * @param end   end DateTime.
+     * @return  string representation of FoodList
+     */
+    public String getInDateTimeRangeToString(LocalDateTime start, LocalDateTime end) {
+        List<FoodEntry> entriesInRange = FoodListManager.filterListByDate(foodEntries, start, end);
+        return FoodListManager.listToString(entriesInRange);
+    }
+
 }
diff --git a/src/test/java/seedu/dietbook/list/FoodListTest.java b/src/test/java/seedu/dietbook/list/FoodListTest.java
@@ -61,11 +61,14 @@ void dateComparisonTest() {
 
     @Test
     void dateFilterAfterTest() {
+        assertEquals(list.toString(), list.getAfterDateTimeToString(LocalDateTime.MIN));
+
         LocalDateTime timeNow = LocalDateTime.now();
 
         assertTrue(list.getFoodsAfterDateTime(timeNow).size() == 0);
-        assertEquals(list.getFoodsAfterDateTime(LocalDateTime.MIN).toString(), 
-                list.getFoods().toString());
+        assertEquals(list.getFoods().toString(),
+                list.getFoodsAfterDateTime(LocalDateTime.MIN).toString());
+
 
         // add new entries:
         if (! LocalDateTime.now().isAfter(timeNow)) { // Execution is too fast that now() = timeNow.
@@ -77,11 +80,17 @@ void dateFilterAfterTest() {
         }
         list.addFood(1, food);
         assertEquals(food.toString(), list.getFoodsAfterDateTime(timeNow).get(0).toString());
+
 
     }
 
     @Test
     void dateFilterRangeTest() {
+
+        assertEquals(list.getPortionedFoods().toString(), 
+                list.getPortionedFoodsInDateTimeRange(LocalDateTime.MIN, LocalDateTime.MAX).toString());
+        assertEquals(list.toString(), list.getInDateTimeRangeToString(LocalDateTime.MIN, LocalDateTime.MAX));
+
         LocalDateTime timeNow = LocalDateTime.now();
 
         if (! LocalDateTime.now().isAfter(timeNow)) { // Execution is too fast that now() = timeNow.
@@ -95,8 +104,6 @@ void dateFilterRangeTest() {
 
         assertTrue(list.getFoodsInDateTimeRange(timeNow, LocalDateTime.MAX).size() == 0);
 
-        assertEquals(list.getPortionedFoods().toString(), 
-                list.getPortionedFoodsInDateTimeRange(LocalDateTime.MIN, LocalDateTime.MAX).toString());
     }
 
     @Test