From 83dbd9874e291009b630c6a7017808d247549d74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 4 Jun 2019 02:27:15 +0200
Subject: [PATCH] Add option to force calc average by app (#400)

---
 .travis.yml                                   |  6 +++---
 .../preferences/PreferencesRepository.kt      |  3 +++
 .../ui/modules/grade/GradeAverageProvider.kt  |  2 +-
 app/src/main/res/values-pl/strings.xml        |  1 +
 app/src/main/res/values/preferences_keys.xml  |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 app/src/main/res/xml/scheme_preferences.xml   |  5 +++++
 .../modules/grade/GradeAverageProviderTest.kt | 19 +++++++++++++++++++
 8 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4c40f615..0f54ff04 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,9 +11,9 @@ cache:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
 
-#branches:
-# only:
-#   - develop
+branches:
+ only:
+   - develop
 
 android:
  licenses:
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
index bde84162..bb9a39b1 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
@@ -20,6 +20,9 @@ class PreferencesRepository @Inject constructor(
     val gradeAverageMode: String
         get() = sharedPref.getString(context.getString(R.string.pref_key_grade_average_mode), "only_one_semester") ?: "only_one_semester"
 
+    val gradeAverageForceCalc: Boolean
+        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_grade_average_force_calc), false)
+
     val isGradeExpandable: Boolean
         get() = !sharedPref.getBoolean(context.getString(R.string.pref_key_expand_grade), false)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
index cff60268..3f794ff1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
@@ -67,6 +67,6 @@ class GradeAverageProvider @Inject constructor(
                 if (it.any { summary -> summary.average != .0 }) {
                     Maybe.just(it.map { summary -> summary.subject to summary.average }.toMap())
                 } else Maybe.empty()
-            }
+            }.filter { !preferencesRepository.gradeAverageForceCalc }
     }
 }
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 128d8636..91d980a6 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -253,6 +253,7 @@
     <string name="pref_view_header">Wygląd</string>
     <string name="pref_view_list">Domyślny widok</string>
     <string name="pref_view_grade_average_mode">Obliczanie średniej końcoworocznej</string>
+    <string name="pref_view_grade_average_force_calc">Wymuś obliczanie średniej przez aplikację</string>
     <string name="pref_view_present">Pokazuj obecność we frekwencji</string>
     <string name="pref_view_app_theme">Motyw aplikacji</string>
     <string name="pref_view_expand_grade">Rozwiń oceny</string>
diff --git a/app/src/main/res/values/preferences_keys.xml b/app/src/main/res/values/preferences_keys.xml
index b09ee51b..730fea59 100644
--- a/app/src/main/res/values/preferences_keys.xml
+++ b/app/src/main/res/values/preferences_keys.xml
@@ -6,6 +6,7 @@
     <string name="pref_key_grade_color_scheme">grade_color_scheme</string>
     <string name="pref_key_expand_grade">expand_grade</string>
     <string name="pref_key_grade_average_mode">grade_average_mode</string>
+    <string name="pref_key_grade_average_force_calc">grade_average_always_calc</string>
     <string name="pref_key_services_enable">services_enable</string>
     <string name="pref_key_services_interval">services_interval</string>
     <string name="pref_key_services_wifi_only">services_disable_wifi_only</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b6424876..fd94e5b6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -237,6 +237,7 @@
     <string name="pref_view_header">Appearance</string>
     <string name="pref_view_list">Default view</string>
     <string name="pref_view_grade_average_mode">Calculation of the end-of-year average</string>
+    <string name="pref_view_grade_average_force_calc">Force average calculation by app</string>
     <string name="pref_view_present">Show presence in attendance</string>
     <string name="pref_view_app_theme">Application theme</string>
     <string name="pref_view_expand_grade">Expand grades</string>
diff --git a/app/src/main/res/xml/scheme_preferences.xml b/app/src/main/res/xml/scheme_preferences.xml
index 149024c0..ccacfe9d 100644
--- a/app/src/main/res/xml/scheme_preferences.xml
+++ b/app/src/main/res/xml/scheme_preferences.xml
@@ -105,6 +105,11 @@
             android:summary="%s"
             android:title="@string/pref_view_grade_average_mode"
             app:iconSpaceReserved="false" />
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/pref_key_grade_average_force_calc"
+            android:title="@string/pref_view_grade_average_force_calc"
+            app:iconSpaceReserved="false" />
         <SwitchPreference
             android:defaultValue="true"
             android:key="@string/pref_key_fill_message_content"
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
index e1ac99d6..3197bb79 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
@@ -59,6 +59,7 @@ class GradeAverageProviderTest {
 
         doReturn(.33).`when`(preferencesRepository).gradeMinusModifier
         doReturn(.33).`when`(preferencesRepository).gradePlusModifier
+        doReturn(false).`when`(preferencesRepository).gradeAverageForceCalc
 
         doReturn(Single.just(firstGrades)).`when`(gradeRepository).getGrades(student, semesters[1], true)
         doReturn(Single.just(secondGrade)).`when`(gradeRepository).getGrades(student, semesters[2], true)
@@ -128,6 +129,24 @@ class GradeAverageProviderTest {
         assertEquals(3.26, averages["Fizyka"])
     }
 
+    @Test
+    fun onlyOneSemester_averageFromSummary_forceCalc() {
+        doReturn(true).`when`(preferencesRepository).gradeAverageForceCalc
+        doReturn("all_year").`when`(preferencesRepository).gradeAverageMode
+        doReturn(Single.just(firstGrades)).`when`(gradeRepository).getGrades(student, semesters[1], false)
+        doReturn(Single.just(listOf(
+            getSummary(22, "Matematyka", 3.1),
+            getSummary(22, "Fizyka", 3.26)
+        ))).`when`(gradeSummaryRepository).getGradesSummary(semesters[2], true)
+
+        val averages = gradeAverageProvider.getGradeAverage(student, semesters, semesters[2].semesterId, true)
+            .blockingGet()
+
+        assertEquals(2, averages.size)
+        assertEquals(3.0, averages["Matematyka"])
+        assertEquals(3.25, averages["Fizyka"])
+    }
+
     private fun getGrade(semesterId: Int, subject: String, value: Int): Grade {
         return Grade(
             studentId = 101,