caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

NSCv3: better profile processing. needs https://github.com/nightscout/cgm-remote-monitor/pull/7839

Browse source
This commit is contained in:
Milos Kozak 2023-01-20 16:55:25 +01:00
parent 71a31f6c5b
commit 9769a01e6f
18 changed files with 60 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/interfaces/src/main/java/info/nightscout/interfaces/profile/ProfileSource.kt
View file

@ -35,6 +35,6 @@ interface ProfileSource {
var currentProfileIndex: Int
fun currentProfile(): SingleProfile?
fun storeSettings(activity: FragmentActivity? = null)
fun storeSettings(activity: FragmentActivity? = null, emptyCreated: Boolean = false)
}

2
core/interfaces/src/main/java/info/nightscout/interfaces/sync/NsClient.kt
View file

@ -16,7 +16,7 @@ interface NsClient : Sync {
fun textLog(): Spanned
fun clearLog()
enum class Collection { ENTRIES, TREATMENTS, FOODS }
enum class Collection { ENTRIES, TREATMENTS, FOODS, PROFILE }
/**
* NSC v3 does first load of all data
* next loads are using srvModified property for sync

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

@ -456,6 +456,19 @@ class NSAndroidClientImpl(
}
override suspend fun getProfileModifiedSince(from: Long): NSAndroidClient.ReadResponse<List<JSONObject>> = callWrapper(dispatcher) {
val response = api.getProfileModifiedSince(from)
if (response.isSuccessful) {
val eTagString = response.headers()["ETag"]
val eTag = eTagString?.substring(3, eTagString.length - 1)?.toLong()
return@callWrapper NSAndroidClient.ReadResponse(code = response.raw().networkResponse?.code ?: response.code(), lastServerModified = eTag, values = response.body()?.result.toNotNull())
} else {
throw UnsuccessfullNightscoutException()
}
}
private suspend fun <T> callWrapper(dispatcher: CoroutineDispatcher, block: suspend () -> T): T =
withContext(dispatcher) {
retry(

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

@ -35,6 +35,7 @@ interface NSAndroidClient {
suspend fun getDeviceStatusModifiedSince(from: Long): List<NSDeviceStatus>
suspend fun createProfileStore(remoteProfileStore: JSONObject): CreateUpdateResponse
suspend fun getProfileModifiedSince(from: Long): ReadResponse<List<JSONObject>>
suspend fun getLastProfileStore(): ReadResponse<List<JSONObject>>
suspend fun createTreatment(nsTreatment: NSTreatment): CreateUpdateResponse

5
core/ns-sdk/src/main/java/info/nightscout/sdk/networking/NightscoutRemoteService.kt
View file

@ -93,9 +93,14 @@ internal interface NightscoutRemoteService {
@DELETE("v3/food")
suspend fun deleteFood(@Path("identifier") identifier: String): Response<NSResponse<RemoteCreateUpdateResponse>>
@GET("v3/profile/history/{from}")
suspend fun getProfileModifiedSince(@Path("from") from: Long, @Query("limit") limit: Long = 10): Response<NSResponse<List<JSONObject>>>
@GET("v3/profile?sort\$desc=date&limit=1")
suspend fun getLastProfile(): Response<NSResponse<List<JSONObject>>>
@POST("v3/profile")
suspend fun createProfile(@Body profile: JsonObject): Response<NSResponse<RemoteCreateUpdateResponse>>

2
implementation/src/main/java/info/nightscout/implementation/profile/ProfileStoreObject.kt
View file

@ -45,7 +45,7 @@ class ProfileStoreObject(val injector: HasAndroidInjector, override val data: JS
}
override fun getStartDate(): Long {
val iso = JsonHelper.safeGetString(data, "startDate") ?: return 0
val iso = JsonHelper.safeGetString(data, "created_at") ?: JsonHelper.safeGetString(data, "startDate") ?: return 0
return try {
dateUtil.fromISODateString(iso)
} catch (e: Exception) {

2
plugins/aps/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
View file

@ -45,7 +45,7 @@ class ProfileStoreObject(val injector: HasAndroidInjector, override val data: JS
}
override fun getStartDate(): Long {
val iso = JsonHelper.safeGetString(data, "startDate") ?: return 0
val iso = JsonHelper.safeGetString(data, "created_at") ?: JsonHelper.safeGetString(data,"startDate") ?: return 0
return try {
dateUtil.fromISODateString(iso)
} catch (e: Exception) {

2
plugins/automation/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
View file

@ -45,7 +45,7 @@ class ProfileStoreObject(val injector: HasAndroidInjector, override val data: JS
}
override fun getStartDate(): Long {
val iso = JsonHelper.safeGetString(data, "startDate") ?: return 0
val iso = JsonHelper.safeGetString(data, "created_at") ?: JsonHelper.safeGetString(data,"startDate") ?: return 0
return try {
dateUtil.fromISODateString(iso)
} catch (e: Exception) {

7
plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt
View file

@ -175,7 +175,7 @@ class ProfilePlugin @Inject constructor(
}
@Synchronized
override fun storeSettings(activity: FragmentActivity?) {
override fun storeSettings(activity: FragmentActivity?, emptyCreated: Boolean) {
for (i in 0 until numOfProfiles) {
profiles[i].run {
val localProfileNumbered = Constants.LOCAL_PROFILE + "_" + i + "_"
@ -191,7 +191,7 @@ class ProfilePlugin @Inject constructor(
}
sp.putInt(Constants.LOCAL_PROFILE + "_profiles", numOfProfiles)
sp.putLong(info.nightscout.core.utils.R.string.key_local_profile_last_change, dateUtil.now())
sp.putLong(info.nightscout.core.utils.R.string.key_local_profile_last_change, if (emptyCreated) 0 else dateUtil.now())
createAndStoreConvertedProfile()
isEdited = false
aapsLogger.debug(LTag.PROFILE, "Storing settings: " + rawProfile?.data.toString())
@ -360,7 +360,7 @@ class ProfilePlugin @Inject constructor(
)
currentProfileIndex = profiles.size - 1
createAndStoreConvertedProfile()
storeSettings()
storeSettings(emptyCreated = true)
}
fun cloneProfile() {
@ -412,6 +412,7 @@ class ProfilePlugin @Inject constructor(
if (numOfProfiles > 0) json.put("defaultProfile", currentProfile()?.name)
val startDate = sp.getLong(info.nightscout.core.utils.R.string.key_local_profile_last_change, dateUtil.now())
json.put("date", startDate)
json.put("created_at", dateUtil.toISOAsUTC(startDate))
json.put("startDate", dateUtil.toISOAsUTC(startDate))
json.put("store", store)
} catch (e: JSONException) {

3
plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt
View file

@ -132,12 +132,14 @@ class NSClientV3Plugin @Inject constructor(
when {
sp.getBoolean(R.string.key_ns_client_paused, false) -> rh.gs(info.nightscout.core.ui.R.string.paused)
isAllowed.not() -> blockingReason
lastOperationError != null -> rh.gs(info.nightscout.core.ui.R.string.error)
nsAndroidClient?.lastStatus == null -> rh.gs(R.string.not_connected)
workIsRunning(arrayOf(JOB_NAME)) -> rh.gs(R.string.working)
nsAndroidClient?.lastStatus?.apiPermissions?.isFull() == true -> rh.gs(info.nightscout.shared.R.string.connected)
nsAndroidClient?.lastStatus?.apiPermissions?.isRead() == true -> rh.gs(R.string.read_only)
else -> rh.gs(info.nightscout.core.ui.R.string.unknown)
}
var lastOperationError: String? = null
internal var nsAndroidClient: NSAndroidClient? = null
@ -315,6 +317,7 @@ class NSClientV3Plugin @Inject constructor(
NsClient.Collection.ENTRIES -> lastLoadedSrvModified.collections.entries == 0L
NsClient.Collection.TREATMENTS -> lastLoadedSrvModified.collections.treatments == 0L
NsClient.Collection.FOODS -> lastLoadedSrvModified.collections.foods == 0L
NsClient.Collection.PROFILE -> lastLoadedSrvModified.collections.profile == 0L
}
override fun updateLatestBgReceivedIfNewer(latestReceived: Long) {

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

@ -119,9 +119,11 @@ class LoadBgWorker(
} catch (error: Exception) {
aapsLogger.error("Error: ", error)
rxBus.send(EventNSClientNewLog("ERROR", error.localizedMessage))
nsClientV3Plugin.lastOperationError = error.localizedMessage
return Result.failure(workDataOf("Error" to error.localizedMessage))
}
nsClientV3Plugin.lastOperationError = null
return Result.success()
}
}

2
plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadDeviceStatusWorker.kt
View file

@ -52,9 +52,11 @@ class LoadDeviceStatusWorker(
} catch (error: Exception) {
aapsLogger.error("Error: ", error)
rxBus.send(EventNSClientNewLog("ERROR", error.localizedMessage))
nsClientV3Plugin.lastOperationError = error.localizedMessage
return Result.failure(workDataOf("Error" to error.localizedMessage))
}
nsClientV3Plugin.lastOperationError = null
return Result.success()
}
}

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

@ -64,9 +64,11 @@ class LoadFoodsWorker(
} catch (error: Exception) {
aapsLogger.error("Error: ", error)
rxBus.send(EventNSClientNewLog("ERROR", error.localizedMessage))
nsClientV3Plugin.lastOperationError = error.localizedMessage
return Result.failure(workDataOf("Error" to error.localizedMessage))
}
nsClientV3Plugin.lastOperationError = null
return Result.success()
}
}

2
plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadLastModificationWorker.kt
View file

@ -28,8 +28,10 @@ class LoadLastModificationWorker(
} catch (error: Exception) {
aapsLogger.error(LTag.NSCLIENT, "Error: ", error)
rxBus.send(EventNSClientNewLog("ERROR", error.localizedMessage))
nsClientV3Plugin.lastOperationError = error.localizedMessage
return Result.failure(workDataOf("Error" to error.localizedMessage))
}
nsClientV3Plugin.lastOperationError = null
return Result.success()
}
}

21
plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadProfileStoreWorker.kt
View file

@ -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.interfaces.sync.NsClient
import info.nightscout.interfaces.utils.JsonHelper
import info.nightscout.interfaces.workflow.WorkerClasses
import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
@ -37,13 +38,23 @@ class LoadProfileStoreWorker(
val nsAndroidClient = nsClientV3Plugin.nsAndroidClient ?: return Result.failure(workDataOf("Error" to "AndroidClient is null"))
try {
val lastLoaded = max(nsClientV3Plugin.lastLoadedSrvModified.collections.profile, 0)
val isFirstLoad = nsClientV3Plugin.isFirstLoad(NsClient.Collection.PROFILE)
val lastLoaded = max(nsClientV3Plugin.lastLoadedSrvModified.collections.profile, dateUtil.now() - nsClientV3Plugin.maxAge)
if ((nsClientV3Plugin.newestDataOnServer?.collections?.profile ?: Long.MAX_VALUE) > lastLoaded) {
val response: NSAndroidClient.ReadResponse<List<JSONObject>> = nsAndroidClient.getLastProfileStore()
val response: NSAndroidClient.ReadResponse<List<JSONObject>> =
if (isFirstLoad) nsAndroidClient.getLastProfileStore()
else nsAndroidClient.getProfileModifiedSince(lastLoaded)
val profiles = response.values
if (profiles.size == 1) {
val profile = profiles[0]
JsonHelper.safeGetLongAllowNull(profile, "srvModified")?.let { nsClientV3Plugin.lastLoadedSrvModified.collections.profile = it }
if (profiles.isNotEmpty()) {
val profile = profiles[profiles.size - 1]
// if srvModified found in response
response.lastServerModified?.let { nsClientV3Plugin.lastLoadedSrvModified.collections.profile = it } ?:
// if srvModified found in record
JsonHelper.safeGetLongAllowNull(profile, "srvModified")?.let { nsClientV3Plugin.lastLoadedSrvModified.collections.profile = it } ?:
// if created_at found in record
JsonHelper.safeGetStringAllowNull(profile, "created_at", null)?.let { nsClientV3Plugin.lastLoadedSrvModified.collections.profile = dateUtil.fromISODateString(it) } ?:
// if not found reset to now
{ nsClientV3Plugin.lastLoadedSrvModified.collections.profile = dateUtil.now() }
nsClientV3Plugin.storeLastLoadedSrvModified()
aapsLogger.debug(LTag.NSCLIENT, "PROFILE: $profile")
rxBus.send(EventNSClientNewLog("RCV", "1 PROFILE from ${dateUtil.dateAndTimeAndSecondsString(lastLoaded)}"))

2
plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadStatusWorker.kt
View file

@ -27,8 +27,10 @@ class LoadStatusWorker(
} catch (error: Exception) {
aapsLogger.error("Error: ", error)
rxBus.send(EventNSClientNewLog("ERROR", error.localizedMessage))
nsClientV3Plugin.lastOperationError = error.localizedMessage
return Result.failure(workDataOf("Error" to error.localizedMessage))
}
nsClientV3Plugin.lastOperationError = null
return Result.success()
}
}

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

@ -104,9 +104,11 @@ class LoadTreatmentsWorker(
} catch (error: Exception) {
aapsLogger.error("Error: ", error)
rxBus.send(EventNSClientNewLog("ERROR", error.localizedMessage))
nsClientV3Plugin.lastOperationError = error.localizedMessage
return Result.failure(workDataOf("Error" to error.localizedMessage))
}
nsClientV3Plugin.lastOperationError = null
return Result.success()
}
}

2
ui/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
View file

@ -45,7 +45,7 @@ class ProfileStoreObject(val injector: HasAndroidInjector, override val data: JS
}
override fun getStartDate(): Long {
val iso = JsonHelper.safeGetString(data, "startDate") ?: return 0
val iso = JsonHelper.safeGetString(data, "created_at") ?: JsonHelper.safeGetString(data, "startDate") ?: return 0
return try {
dateUtil.fromISODateString(iso)
} catch (e: Exception) {