[java] [student_grades] Decompose Conditional & Consolidate Conditional Expression Refactoring (add complexity in order to illustrate example)

Author: JavierCane

examples/java/java-student_grades-05_simplify_conditionals/src/main/java/tv/codely/student_grades/StudentGradeCalculator.java

@@ -21,6 +21,19 @@ public class StudentGradeCalculator {
                 new Pair<>("Abelardo", false),
                 new Pair<>("Francisca", false)
             )
+        ),
+        new AbstractMap.SimpleImmutableEntry<>(
+            2018,
+            List.of(
+                new Pair<>("Javi", false),
+                new Pair<>("Rafa", false),
+                new Pair<>("Nico", false),
+                new Pair<>("Núria", false)
+            )
+        ),
+        new AbstractMap.SimpleImmutableEntry<>(
+            2017,
+            List.of(new Pair<>("Lerele", false))
         )
     );
     private final int                                       yearToCalculate;
@@ -82,7 +95,7 @@ private boolean hasToIncreaseOneExtraPoint() {
 
             for (Pair<String, Boolean> teacher : teachers) {
                 Boolean isBenevolent = teacher.second();
-                if (isBenevolent) {
+                if (isBenevolent && yearToCalculate % 2 == 0 || teacher.first().equals("Núria")) {
                     return true;
                 }
             }

examples/java/java-student_grades-05_simplify_conditionals/src/test/java/tv/codely/student_grades/StudentGradeCalculatorShould.java

@@ -163,7 +163,7 @@ void not_increase_one_extra_point_if_there_is_not_any_benevolent_teacher_in_the_
     }
 
     @Test
-    void increase_one_extra_point_if_there_is_any_benevolent_teacher_in_the_year_to_calculate_grades() {
+    void increase_one_extra_point_if_there_is_any_benevolent_teacher_and_the_year_to_calculate_grades_is_even() {
         StudentGradeCalculator studentGradeCalculator = new StudentGradeCalculator(2020);
 
         final List<Pair<Integer, Float>> examsGrades              = List.of(new Pair<>(100, 5f));
@@ -181,4 +181,24 @@ void maintain_10_as_the_maximum_grade_even_if_increasing_one_extra_point() {
 
         assertEquals(10, studentGradeCalculator.calculateGrades(examsGrades, hasReachedMinimumClasses));
     }
+
+    @Test
+    void do_not_increase_one_extra_point_if_there_is_any_benevolent_teacher_but_the_year_to_calculate_grades_is_odd() {
+        StudentGradeCalculator studentGradeCalculator = new StudentGradeCalculator(2017);
+
+        final List<Pair<Integer, Float>> examsGrades              = List.of(new Pair<>(100, 5f));
+        final boolean                    hasReachedMinimumClasses = true;
+
+        assertEquals(5, studentGradeCalculator.calculateGrades(examsGrades, hasReachedMinimumClasses));
+    }
+
+    @Test
+    void increase_one_extra_point_if_there_is_not_any_benevolent_teacher_but_someone_is_called_nuria() {
+        StudentGradeCalculator studentGradeCalculator = new StudentGradeCalculator(2018);
+
+        final List<Pair<Integer, Float>> examsGrades              = List.of(new Pair<>(100, 5f));
+        final boolean                    hasReachedMinimumClasses = true;
+
+        assertEquals(6, studentGradeCalculator.calculateGrades(examsGrades, hasReachedMinimumClasses));
+    }
 }