Merge remote-tracking branch 'origin/develop'

Oztechan · Jan 27, 2022 · 13ff3b0 · 13ff3b0
2 parents 8d3dfe1 + 129d420
commit 13ff3b0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/client/src/commonMain/kotlin/com/github/mustafaozhan/ccc/client/util/Extensions.kt b/client/src/commonMain/kotlin/com/github/mustafaozhan/ccc/client/util/Extensions.kt
@@ -59,6 +59,8 @@ fun Int.doubleDigits() = if (this <= BIGGEST_DIGIT) "0$this" else "$this"
 
 fun CurrencyResponse.toRates() = rates.copy(base = base, date = nowAsInstant().toDateString())
 
+fun CurrencyResponse.toTodayResponse() = copy(date = nowAsInstant().toDateString())
+
 fun Rates?.calculateResult(name: String, input: String?) = this
     ?.whetherNot { input.isNullOrEmpty() }
     ?.getConversionByName(name)

diff --git a/...ain/kotlin/com/github/mustafaozhan/ccc/client/viewmodel/calculator/CalculatorViewModel.kt b/...ain/kotlin/com/github/mustafaozhan/ccc/client/viewmodel/calculator/CalculatorViewModel.kt
@@ -16,6 +16,7 @@ import com.github.mustafaozhan.ccc.client.util.launchIgnored
 import com.github.mustafaozhan.ccc.client.util.toRates
 import com.github.mustafaozhan.ccc.client.util.toStandardDigits
 import com.github.mustafaozhan.ccc.client.util.toSupportedCharacters
+import com.github.mustafaozhan.ccc.client.util.toTodayResponse
 import com.github.mustafaozhan.ccc.client.viewmodel.calculator.CalculatorData.Companion.CHAR_DOT
 import com.github.mustafaozhan.ccc.client.viewmodel.calculator.CalculatorData.Companion.KEY_AC
 import com.github.mustafaozhan.ccc.client.viewmodel.calculator.CalculatorData.Companion.KEY_DEL
@@ -105,7 +106,7 @@ class CalculatorViewModel(
             calculateConversions(it)
             _state.update(rateState = RateState.Online(it.date))
         }.also {
-            offlineRatesRepository.insertOfflineRates(currencyResponse)
+            offlineRatesRepository.insertOfflineRates(currencyResponse.toTodayResponse())
         }
 
     private fun getRatesFailed(t: Throwable) {

diff --git a/client/src/commonTest/kotlin/com/github/mustafaozhan/ccc/client/extension/ExtensionsTest.kt b/client/src/commonTest/kotlin/com/github/mustafaozhan/ccc/client/extension/ExtensionsTest.kt
@@ -19,6 +19,7 @@ import com.github.mustafaozhan.ccc.client.util.toInstant
 import com.github.mustafaozhan.ccc.client.util.toRates
 import com.github.mustafaozhan.ccc.client.util.toStandardDigits
 import com.github.mustafaozhan.ccc.client.util.toSupportedCharacters
+import com.github.mustafaozhan.ccc.client.util.toTodayResponse
 import com.github.mustafaozhan.ccc.client.util.toValidList
 import com.github.mustafaozhan.ccc.common.model.CurrencyResponse
 import com.github.mustafaozhan.ccc.common.model.CurrencyType
@@ -163,6 +164,12 @@ class ExtensionsTest {
         assertEquals(rates, currencyResponse.toRates())
     }
 
+    @Test
+    fun currencyResponseToTodayResponse() {
+        val currencyResponse = CurrencyResponse("EUR", null, Rates())
+        assertEquals(currencyResponse.copy(date = nowAsInstant().toDateString()), currencyResponse.toTodayResponse())
+    }
+
     @Test
     fun isWeekPassed() {
         assertEquals(true, (nowAsLong() - 1 - WEEK).isWeekPassed())