Merge pull request #249 from AY1920S2-CS2103T-F11-2/Refactor-Exercise…

…-code [Refactor] Add getValue() to Exercise classes to reduce sore eyes
AY1920S2-CS2103T-F11-2 · Apr 10, 2020 · bfca19e · bfca19e
2 parents 117a508 + ac52de8
commit bfca19e
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 13 deletions.
diff --git a/src/main/java/seedu/address/model/exercise/ExerciseDate.java b/src/main/java/seedu/address/model/exercise/ExerciseDate.java
@@ -59,6 +59,10 @@ public long forPlot() {
         return value.toEpochDay();
     }
 
+    public LocalDate getValue() {
+        return value;
+    }
+
     @Override
     public String toString() {
         return this.value.format(DateTimeFormatter.ofPattern("dd-MM-yyyy"));

diff --git a/src/main/java/seedu/address/model/exercise/ExerciseName.java b/src/main/java/seedu/address/model/exercise/ExerciseName.java
@@ -33,6 +33,10 @@ public static boolean isValidExerciseName(String test) {
         return test.matches(VALIDATION_REGEX);
     }
 
+    public String getValue() {
+        return value;
+    }
+
     @Override
     public String toString() {
         return value;

diff --git a/src/main/java/seedu/address/model/exercise/ExerciseReps.java b/src/main/java/seedu/address/model/exercise/ExerciseReps.java
@@ -43,6 +43,10 @@ public int convertToInt() {
         return Integer.parseInt(value);
     }
 
+    public String getValue() {
+        return value;
+    }
+
     @Override
     public String toString() {
         return value;

diff --git a/src/main/java/seedu/address/model/exercise/ExerciseSets.java b/src/main/java/seedu/address/model/exercise/ExerciseSets.java
@@ -33,6 +33,10 @@ public static boolean isValidExerciseSets(String test) {
         return test.equals(EMPTY_STRING) || test.matches(VALIDATION_REGEX);
     }
 
+    public String getValue() {
+        return value;
+    }
+
     @Override
     public String toString() {
         return value;

diff --git a/src/main/java/seedu/address/model/exercise/ExerciseWeight.java b/src/main/java/seedu/address/model/exercise/ExerciseWeight.java
@@ -43,6 +43,10 @@ public int convertToInt() {
         return Integer.parseInt(value);
     }
 
+    public String getValue() {
+        return value;
+    }
+
     @Override
     public String toString() {
         return value;

diff --git a/src/main/java/seedu/address/model/exercise/UniqueExerciseList.java b/src/main/java/seedu/address/model/exercise/UniqueExerciseList.java
@@ -52,9 +52,9 @@ public boolean contains(Exercise toCheck) {
     public boolean containsNameWithinDate(ExerciseName toCheck, StartDate startDate, EndDate endDate) {
         requireNonNull(toCheck);
         return internalList.stream()
-                .filter(exercise -> (exercise.getExerciseDate().value.compareTo(startDate.value) >= 0))
-                .filter(exercise -> (exercise.getExerciseDate().value.compareTo(endDate.value) <= 0))
-                .anyMatch(exercise -> exercise.getExerciseName().value.equals(toCheck.value));
+                .filter(exercise -> (exercise.getExerciseDate().getValue().compareTo(startDate.value) >= 0))
+                .filter(exercise -> (exercise.getExerciseDate().getValue().compareTo(endDate.value) <= 0))
+                .anyMatch(exercise -> exercise.getExerciseName().getValue().equals(toCheck.getValue()));
     }
 
     /**
@@ -95,15 +95,17 @@ public void addToSorted(Exercise toAdd) {
         }
 
         int idx = 0;
-        LocalDate toAddDate = toAdd.getExerciseDate().value;
-        String toAddName = toAdd.getExerciseName().value.toLowerCase();
+        LocalDate toAddDate = toAdd.getExerciseDate().getValue();
+        String toAddName = toAdd.getExerciseName().getValue().toLowerCase();
         for (Exercise curr : internalList) {
-            LocalDate currDate = curr.getExerciseDate().value;
-            String currName = curr.getExerciseName().value.toLowerCase();
-            if (toAddDate.compareTo(currDate) > 0) {
+            LocalDate currDate = curr.getExerciseDate().getValue();
+            String currName = curr.getExerciseName().getValue().toLowerCase();
+
+            int dateComparision = toAddDate.compareTo(currDate);
+            if (dateComparision > 0) {
                 // already at correct position
                 break;
-            } else if (toAddDate.compareTo(currDate) == 0) {
+            } else if (dateComparision == 0) {
                 // sort by name
                 if (toAddName.compareTo(currName) <= 0) {
                     break;
@@ -147,10 +149,10 @@ public void setExercise(Exercise target, Exercise editedExercise) {
      */
     public void sortByExerciseDateAndName() {
         Comparator<Exercise> byExerciseDate = (Exercise e1, Exercise e2) -> {
-            LocalDate e1Date = e1.getExerciseDate().value;
-            LocalDate e2Date = e2.getExerciseDate().value;
-            String e1Name = e1.getExerciseName().value.toUpperCase();
-            String e2Name = e2.getExerciseName().value.toUpperCase();
+            LocalDate e1Date = e1.getExerciseDate().getValue();
+            LocalDate e2Date = e2.getExerciseDate().getValue();
+            String e1Name = e1.getExerciseName().getValue().toUpperCase();
+            String e2Name = e2.getExerciseName().getValue().toUpperCase();
             if (e2Date.compareTo(e1Date) == 0) {
                 return e1Name.compareTo(e2Name);
             }