fix data contract for the LazyReload strategy (#44)

Co-authored-by: Artem Mochalov <artyom.mochalov@revolut.com>
revolut-mobile · Nov 27, 2023 · 94e2187 · 94e2187
1 parent 1ab0073
commit 94e2187
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -21,9 +21,9 @@ And then to the module level `build.gradle.kts`:
 
 ```
 dependencies {
-    implementation 'com.revolut.rxdata:dod:1.5.13'
-    implementation 'com.revolut.rxdata:core:1.5.13'
-    implementation 'com.revolut.rxdata:scheduler:1.5.13'
+    implementation 'com.revolut.rxdata:dod:1.5.14'
+    implementation 'com.revolut.rxdata:core:1.5.14'
+    implementation 'com.revolut.rxdata:scheduler:1.5.14'
 }
 ```
 

diff --git a/dfd/gradle.properties b/dfd/gradle.properties
@@ -1,5 +1,5 @@
 POM_ARTIFACT_ID=dfd
-VERSION_NAME=1.5.13
+VERSION_NAME=1.5.14
 POM_NAME=dfd
 POM_PACKAGING=jar
 GROUP=com.revolut.flowdata
diff --git a/dod-wrapper/gradle.properties b/dod-wrapper/gradle.properties
@@ -1,5 +1,5 @@
 POM_ARTIFACT_ID=dod-wrapper
-VERSION_NAME=1.5.13
+VERSION_NAME=1.5.14
 POM_NAME=dod-wrapper
 POM_PACKAGING=jar
 GROUP=com.revolut.rxdata
diff --git a/dod/gradle.properties b/dod/gradle.properties
@@ -1,5 +1,5 @@
 POM_ARTIFACT_ID=dod
-VERSION_NAME=1.5.13
+VERSION_NAME=1.5.14
 POM_NAME=dod
 POM_PACKAGING=jar
 GROUP=com.revolut.rxdata
diff --git a/dod/src/main/java/com/revolut/rxdata/dod/DataObservableDelegate.kt b/dod/src/main/java/com/revolut/rxdata/dod/DataObservableDelegate.kt
@@ -120,11 +120,17 @@ class DataObservableDelegate<Params : Any, Domain : Any> constructor(
             } else {
                 sharedStorageRequest.getOrLoad(params)
                     .flatMapObservable { cached ->
+                        val needToFetchFromNetwork = loadingStrategy.refreshStorage || cached.content == null
+                        val cachedObservable = if (needToFetchFromNetwork) {
+                            just(cached)
+                        } else {
+                            just(cached.copy(loading = false))
+                        }
                         concat(
-                            just(cached),
+                            cachedObservable,
                             subject
                         ).doAfterSubscribe {
-                            if (loadingStrategy.refreshStorage || cached.content == null) {
+                            if (needToFetchFromNetwork) {
                                 fetchFromNetwork(cached.content, params)
                             }
                         }

diff --git a/dod/src/test/java/com/revolut/rxdata/dod/DataObservableDelegateTest.kt b/dod/src/test/java/com/revolut/rxdata/dod/DataObservableDelegateTest.kt
@@ -864,7 +864,7 @@ class DataObservableDelegateTest : BaseDataObservableDelegateTest() {
         ioScheduler.triggerActions()
 
         testObserver.assertValueCount(2)
-        testObserver.assertValueAt(1, Data(content = cachedDomain, error = null, loading = true))
+        testObserver.assertValueAt(1, Data(content = cachedDomain, error = null, loading = false))
 
         ioScheduler.triggerActions()
 

diff --git a/flow-extensions/gradle.properties b/flow-extensions/gradle.properties
@@ -1,5 +1,5 @@
 POM_ARTIFACT_ID=extensions
-VERSION_NAME=1.5.13
+VERSION_NAME=1.5.14
 POM_NAME=flow-core
 POM_PACKAGING=jar
 GROUP=com.revolut.flowdata
diff --git a/model/gradle.properties b/model/gradle.properties
@@ -1,5 +1,5 @@
 POM_ARTIFACT_ID=model
-VERSION_NAME=1.5.13
+VERSION_NAME=1.5.14
 POM_NAME=data
 POM_PACKAGING=jar
 GROUP=com.revolut.data
diff --git a/rx-extensions/gradle.properties b/rx-extensions/gradle.properties
@@ -1,5 +1,5 @@
 POM_ARTIFACT_ID=extensions
-VERSION_NAME=1.5.13
+VERSION_NAME=1.5.14
 POM_NAME=core
 POM_PACKAGING=jar
 GROUP=com.revolut.rxdata
diff --git a/scheduler/gradle.properties b/scheduler/gradle.properties
@@ -1,5 +1,5 @@
 POM_ARTIFACT_ID=scheduler
-VERSION_NAME=1.5.13
+VERSION_NAME=1.5.14
 POM_NAME=scheduler
 POM_PACKAGING=aar
 GROUP=com.revolut.rxdata