NSCv3: react to 304 response

app/src/main/java/info/nightscout/androidaps/workflow/CalculationWorkflowImpl.kt

@@ -12,6 +12,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.core.graph.OverviewData
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.core.utils.receivers.DataWorkerStorage
+import info.nightscout.core.utils.worker.then
 import info.nightscout.core.workflow.CalculationWorkflow
 import info.nightscout.core.workflow.CalculationWorkflow.Companion.JOB
 import info.nightscout.core.workflow.CalculationWorkflow.Companion.MAIN_CALCULATION
@@ -221,9 +222,6 @@ class CalculationWorkflowImpl @Inject constructor(
             .enqueue()
     }
 
-    fun WorkContinuation.then(shouldAdd: Boolean, work: OneTimeWorkRequest): WorkContinuation =
-        if (shouldAdd) then(work) else this
-
     private fun runOnEventTherapyEventChange() {
         WorkManager.getInstance(context)
             .beginUniqueWork(

core/ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidClientImpl.kt

@@ -110,11 +110,11 @@ class NSAndroidClientImpl(
         }
     }
 
-    override suspend fun getSgvs(): List<NSSgvV3> = callWrapper(dispatcher) {
+    override suspend fun getSgvs(): NSAndroidClient.ReadResponse<List<NSSgvV3>> = callWrapper(dispatcher) {
 
         val response = api.getSgvs()
         if (response.isSuccessful) {
-            return@callWrapper response.body()?.result?.map(RemoteEntry::toSgv).toNotNull()
+            return@callWrapper NSAndroidClient.ReadResponse(code = response.raw().networkResponse?.code ?: response.code(), lastServerModified = 0, values = response.body()?.result?.map(RemoteEntry::toSgv).toNotNull())
         } else {
             throw UnsuccessfullNightscoutException()
         }
@@ -126,17 +126,17 @@ class NSAndroidClientImpl(
         if (response.isSuccessful) {
             val eTagString = response.headers()["ETag"]
             val eTag = eTagString?.substring(3, eTagString.length - 1)?.toLong()
-            return@callWrapper NSAndroidClient.ReadResponse(eTag, response.body()?.result?.map(RemoteEntry::toSgv).toNotNull())
+            return@callWrapper NSAndroidClient.ReadResponse(code = response.raw().networkResponse?.code ?: response.code(), lastServerModified = eTag, values = response.body()?.result?.map(RemoteEntry::toSgv).toNotNull())
         } else {
             throw UnsuccessfullNightscoutException()
         }
     }
 
-    override suspend fun getSgvsNewerThan(from: Long, limit: Long): List<NSSgvV3> = callWrapper(dispatcher) {
+    override suspend fun getSgvsNewerThan(from: Long, limit: Long): NSAndroidClient.ReadResponse<List<NSSgvV3>> = callWrapper(dispatcher) {
 
         val response = api.getSgvsNewerThan(from, limit)
         if (response.isSuccessful) {
-            return@callWrapper response.body()?.result?.map(RemoteEntry::toSgv).toNotNull()
+            return@callWrapper NSAndroidClient.ReadResponse(code = response.raw().networkResponse?.code ?: response.code(), lastServerModified = 0, values = response.body()?.result?.map(RemoteEntry::toSgv).toNotNull())
         } else {
             throw UnsuccessfullNightscoutException()
         }
@@ -208,11 +208,11 @@ class NSAndroidClientImpl(
         }
     }
 
-    override suspend fun getTreatmentsNewerThan(createdAt: String, limit: Long): List<NSTreatment> = callWrapper(dispatcher) {
+    override suspend fun getTreatmentsNewerThan(createdAt: String, limit: Long): NSAndroidClient.ReadResponse<List<NSTreatment>> = callWrapper(dispatcher) {
 
         val response = api.getTreatmentsNewerThan(createdAt, limit)
         if (response.isSuccessful) {
-            return@callWrapper response.body()?.result?.map(RemoteTreatment::toTreatment).toNotNull()
+            return@callWrapper NSAndroidClient.ReadResponse(code = response.raw().networkResponse?.code ?: response.code(), lastServerModified = 0, values = response.body()?.result?.map(RemoteTreatment::toTreatment).toNotNull())
         } else {
             throw UnsuccessfullNightscoutException()
         }
@@ -224,7 +224,8 @@ class NSAndroidClientImpl(
         if (response.isSuccessful) {
             val eTagString = response.headers()["ETag"]
             val eTag = eTagString?.substring(3, eTagString.length - 1)?.toLong()
-            return@callWrapper NSAndroidClient.ReadResponse(eTag, response.body()?.result?.map(RemoteTreatment::toTreatment).toNotNull())
+            return@callWrapper NSAndroidClient.ReadResponse(code = response.raw().networkResponse?.code ?: response.code(), lastServerModified = eTag, values = response.body()?.result?.map
+                (RemoteTreatment::toTreatment).toNotNull())
         } else {
             throw UnsuccessfullNightscoutException()
         }
@@ -333,11 +334,11 @@ class NSAndroidClientImpl(
         }
     }
 
-    override suspend fun getFoods(limit: Long): List<NSFood> = callWrapper(dispatcher) {
+    override suspend fun getFoods(limit: Long): NSAndroidClient.ReadResponse<List<NSFood>> = callWrapper(dispatcher) {
 
         val response = api.getFoods(limit)
         if (response.isSuccessful) {
-            return@callWrapper response.body()?.result?.map(RemoteFood::toNSFood).toNotNull()
+            return@callWrapper NSAndroidClient.ReadResponse(code = response.raw().networkResponse?.code ?: response.code(), lastServerModified = 0, values = response.body()?.result?.map(RemoteFood::toNSFood).toNotNull())
         } else {
             throw UnsuccessfullNightscoutException()
         }
@@ -441,7 +442,7 @@ class NSAndroidClientImpl(
         if (response.isSuccessful) {
             val eTagString = response.headers()["ETag"]
             val eTag = eTagString?.substring(3, eTagString.length - 1)?.toLong()
-            return@callWrapper NSAndroidClient.ReadResponse(eTag, response.body()?.result.toNotNull())
+            return@callWrapper NSAndroidClient.ReadResponse(code = response.raw().networkResponse?.code ?: response.code(), lastServerModified = eTag, values = response.body()?.result.toNotNull())
         } else {
             throw UnsuccessfullNightscoutException()
         }

core/ns-sdk/src/main/java/info/nightscout/sdk/interfaces/NSAndroidClient.kt

@@ -12,6 +12,7 @@ import org.json.JSONObject
 interface NSAndroidClient {
 
     class ReadResponse<T>(
+        val code: Int,
         val lastServerModified: Long?,
         val values: T
     )
@@ -21,13 +22,13 @@ interface NSAndroidClient {
     suspend fun getStatus(): Status
     suspend fun getLastModified(): LastModified
 
-    suspend fun getSgvs(): List<NSSgvV3>
+    suspend fun getSgvs(): ReadResponse<List<NSSgvV3>>
     suspend fun getSgvsModifiedSince(from: Long, limit: Long): ReadResponse<List<NSSgvV3>>
-    suspend fun getSgvsNewerThan(from: Long, limit: Long): List<NSSgvV3>
+    suspend fun getSgvsNewerThan(from: Long, limit: Long): ReadResponse<List<NSSgvV3>>
     suspend fun createSvg(nsSgvV3: NSSgvV3): CreateUpdateResponse
     suspend fun updateSvg(nsSgvV3: NSSgvV3): CreateUpdateResponse
 
-    suspend fun getTreatmentsNewerThan(createdAt: String, limit: Long): List<NSTreatment>
+    suspend fun getTreatmentsNewerThan(createdAt: String, limit: Long): ReadResponse<List<NSTreatment>>
     suspend fun getTreatmentsModifiedSince(from: Long, limit: Long): ReadResponse<List<NSTreatment>>
 
     suspend fun createDeviceStatus(nsDeviceStatus: NSDeviceStatus): CreateUpdateResponse
@@ -38,7 +39,7 @@ interface NSAndroidClient {
 
     suspend fun createTreatment(nsTreatment: NSTreatment): CreateUpdateResponse
     suspend fun updateTreatment(nsTreatment: NSTreatment): CreateUpdateResponse
-    suspend fun getFoods(limit: Long): List<NSFood>
+    suspend fun getFoods(limit: Long): ReadResponse<List<NSFood>>
 
     //suspend fun getFoodsModifiedSince(from: Long, limit: Long): ReadResponse<List<NSFood>>
     suspend fun createFood(nsFood: NSFood): CreateUpdateResponse

core/utils/src/main/java/info/nightscout/core/utils/worker/WorkExtensions.kt

@@ -0,0 +1,8 @@
+package info.nightscout.core.utils.worker
+
+import androidx.work.OneTimeWorkRequest
+import androidx.work.WorkContinuation
+
+fun WorkContinuation.then(runIf: Boolean, work: OneTimeWorkRequest): WorkContinuation =
+    if (runIf) then(work) else this
+

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt

@@ -8,6 +8,7 @@ import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import info.nightscout.core.utils.receivers.DataWorkerStorage
 import info.nightscout.core.utils.worker.LoggingWorker
+import info.nightscout.core.utils.worker.then
 import info.nightscout.interfaces.sync.NsClient
 import info.nightscout.interfaces.workflow.WorkerClasses
 import info.nightscout.plugins.sync.nsShared.StoreDataForDbImpl
@@ -51,14 +52,14 @@ class LoadBgWorker(
                 try {
                     val sgvs: List<NSSgvV3>
                     val response: NSAndroidClient.ReadResponse<List<NSSgvV3>>?
-                    if (isFirstLoad) sgvs = nsAndroidClient.getSgvsNewerThan(lastLoaded, 500)
+                    if (isFirstLoad) response = nsAndroidClient.getSgvsNewerThan(lastLoaded, 500)
                     else {
                         response = nsAndroidClient.getSgvsModifiedSince(lastLoaded, 500)
-                        sgvs = response.values
                         response.lastServerModified?.let { nsClientV3Plugin.lastLoadedSrvModified.collections.entries = it }
                         nsClientV3Plugin.storeLastLoadedSrvModified()
                         nsClientV3Plugin.scheduleIrregularExecution() // Idea is to run after 5 min after last BG
                     }
+                    sgvs = response.values
                     aapsLogger.debug("SGVS: $sgvs")
                     if (sgvs.isNotEmpty()) {
                         val action = if (isFirstLoad) "RCV-FIRST" else "RCV"
@@ -70,7 +71,11 @@ class LoadBgWorker(
                             JOB_NAME,
                             ExistingWorkPolicy.APPEND_OR_REPLACE,
                             OneTimeWorkRequest.Builder(workerClasses.nsClientSourceWorker).setInputData(dataWorkerStorage.storeInputData(sgvs)).build()
-                        ).then(OneTimeWorkRequest.Builder(LoadBgWorker::class.java).build()).enqueue()
+                        )
+                            // response 304 == Not modified (happens when date > srvModified => bad time on phone or server during upload
+                            .then(response.code != 304, OneTimeWorkRequest.Builder(LoadBgWorker::class.java).build())
+                            .then(response.code == 304, OneTimeWorkRequest.Builder(LoadTreatmentsWorker::class.java).build())
+                            .enqueue()
                     } else {
                         // End first load
                         if (isFirstLoad) {

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadFoodsWorker.kt

@@ -37,7 +37,7 @@ class LoadFoodsWorker(
         // Read full collection every 5th attempt
         runBlocking {
             if (nsClientV3Plugin.lastLoadedSrvModified.collections.foods++ % 5 == 0L) {
-                val foods: List<NSFood> = nsAndroidClient.getFoods(1000)
+                val foods: List<NSFood> = nsAndroidClient.getFoods(1000).values
                 aapsLogger.debug("FOODS: $foods")
                 rxBus.send(EventNSClientNewLog("RCV", "${foods.size} FOODs"))
                 // Schedule processing of fetched data

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadTreatmentsWorker.kt

@@ -8,6 +8,7 @@ import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import info.nightscout.core.utils.receivers.DataWorkerStorage
 import info.nightscout.core.utils.worker.LoggingWorker
+import info.nightscout.core.utils.worker.then
 import info.nightscout.interfaces.nsclient.StoreDataForDb
 import info.nightscout.interfaces.sync.NsClient
 import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
@@ -47,15 +48,14 @@ class LoadTreatmentsWorker(
                     val response: NSAndroidClient.ReadResponse<List<NSTreatment>>?
                     if (isFirstLoad) {
                         val lastLoadedIso = dateUtil.toISOString(lastLoaded)
-                        treatments = nsAndroidClient.getTreatmentsNewerThan(lastLoadedIso, 500)
+                        response = nsAndroidClient.getTreatmentsNewerThan(lastLoadedIso, 500)
-                        response = NSAndroidClient.ReadResponse(0, treatments)
                     }
                     else {
                         response = nsAndroidClient.getTreatmentsModifiedSince(lastLoaded, 500)
-                        treatments = response.values
                         response.lastServerModified?.let { nsClientV3Plugin.lastLoadedSrvModified.collections.treatments = it }
                         nsClientV3Plugin.storeLastLoadedSrvModified()
                     }
+                    treatments = response.values
                     aapsLogger.debug("TREATMENTS: $treatments")
                     if (treatments.isNotEmpty()) {
                         val action = if (isFirstLoad) "RCV-FIRST" else "RCV"
@@ -68,7 +68,10 @@ class LoadTreatmentsWorker(
                                 OneTimeWorkRequest.Builder(ProcessTreatmentsWorker::class.java)
                                     .setInputData(dataWorkerStorage.storeInputData(response))
                                     .build()
-                            ).then(OneTimeWorkRequest.Builder(LoadTreatmentsWorker::class.java).build())
+                            )
+                            // response 304 == Not modified (happens when date > srvModified => bad time on phone or server during upload
+                            .then(response.code != 304, OneTimeWorkRequest.Builder(LoadTreatmentsWorker::class.java).build())
+                            .then(response.code == 304, OneTimeWorkRequest.Builder(LoadFoodsWorker::class.java).build())
                             .enqueue()
                     } else {
                         // End first load