Skip to content

Commit

Permalink
NSClientV3PluginTest #2
Browse files Browse the repository at this point in the history
  • Loading branch information
@MilosKozak
MilosKozak committed Jan 4, 2023
1 parent eb1fff5 commit 0873df5
Show file tree
Hide file tree
Showing 7 changed files with 615 additions and 194 deletions.
26 changes: 13 additions & 13 deletions core/interfaces/src/main/java/info/nightscout/interfaces/sync/DataSyncSelector.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,43 +43,43 @@ interface DataSyncSelector {
fun resetToNextFullSync()

fun confirmLastBolusIdIfGreater(lastSynced: Long)
fun processChangedBolusesCompat()
fun processChangedBoluses()

fun confirmLastCarbsIdIfGreater(lastSynced: Long)
fun processChangedCarbsCompat()
fun processChangedCarbs()

fun confirmLastBolusCalculatorResultsIdIfGreater(lastSynced: Long)
fun processChangedBolusCalculatorResultsCompat()
fun processChangedBolusCalculatorResults()

fun confirmLastTempTargetsIdIfGreater(lastSynced: Long)
fun processChangedTempTargetsCompat()
fun processChangedTempTargets()

fun confirmLastGlucoseValueIdIfGreater(lastSynced: Long)
fun processChangedGlucoseValuesCompat()
fun processChangedGlucoseValues()

fun confirmLastTherapyEventIdIfGreater(lastSynced: Long)
fun processChangedTherapyEventsCompat()
fun processChangedTherapyEvents()

fun confirmLastFoodIdIfGreater(lastSynced: Long)
fun processChangedFoodsCompat()
fun processChangedFoods()

fun confirmLastDeviceStatusIdIfGreater(lastSynced: Long)
fun processChangedDeviceStatusesCompat()
fun processChangedDeviceStatuses()

fun confirmLastTemporaryBasalIdIfGreater(lastSynced: Long)
fun processChangedTemporaryBasalsCompat()
fun processChangedTemporaryBasals()

fun confirmLastExtendedBolusIdIfGreater(lastSynced: Long)
fun processChangedExtendedBolusesCompat()
fun processChangedExtendedBoluses()

fun confirmLastProfileSwitchIdIfGreater(lastSynced: Long)
fun processChangedProfileSwitchesCompat()
fun processChangedProfileSwitches()

fun confirmLastEffectiveProfileSwitchIdIfGreater(lastSynced: Long)
fun processChangedEffectiveProfileSwitchesCompat()
fun processChangedEffectiveProfileSwitches()

fun confirmLastOfflineEventIdIfGreater(lastSynced: Long)
fun processChangedOfflineEventsCompat()
fun processChangedOfflineEvents()

fun confirmLastProfileStore(lastSynced: Long)
fun processChangedProfileStore()
Expand Down
104 changes: 52 additions & 52 deletions ...ync/src/main/java/info/nightscout/plugins/sync/nsShared/DataSyncSelectorImplementation.kt
View file

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions .../sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class NSClientAddAckWorker(
storeDataForDb.scheduleNsIdUpdate()
rxBus.send(EventNSClientNewLog("DBADD", "Acked TemporaryTarget " + pair.value.interfaceIDs.nightscoutId))
// Send new if waiting
dataSyncSelector.processChangedTempTargetsCompat()
dataSyncSelector.processChangedTempTargets()
}

is PairGlucoseValue -> {
Expand All @@ -74,7 +74,7 @@ class NSClientAddAckWorker(
storeDataForDb.scheduleNsIdUpdate()
rxBus.send(EventNSClientNewLog("DBADD", "Acked GlucoseValue " + pair.value.interfaceIDs.nightscoutId))
// Send new if waiting
dataSyncSelector.processChangedGlucoseValuesCompat()
dataSyncSelector.processChangedGlucoseValues()
}

is PairFood -> {
Expand All @@ -85,7 +85,7 @@ class NSClientAddAckWorker(
storeDataForDb.scheduleNsIdUpdate()
rxBus.send(EventNSClientNewLog("DBADD", "Acked Food " + pair.value.interfaceIDs.nightscoutId))
// Send new if waiting
dataSyncSelector.processChangedFoodsCompat()
dataSyncSelector.processChangedFoods()
}

is PairTherapyEvent -> {
Expand All @@ -96,7 +96,7 @@ class NSClientAddAckWorker(
storeDataForDb.scheduleNsIdUpdate()
rxBus.send(EventNSClientNewLog("DBADD", "Acked TherapyEvent " + pair.value.interfaceIDs.nightscoutId))
// Send new if waiting
dataSyncSelector.processChangedTherapyEventsCompat()
dataSyncSelector.processChangedTherapyEvents()
}

is PairBolus -> {
Expand All @@ -107,7 +107,7 @@ class NSClientAddAckWorker(
storeDataForDb.scheduleNsIdUpdate()
rxBus.send(EventNSClientNewLog("DBADD", "Acked Bolus " + pair.value.interfaceIDs.nightscoutId))
// Send new if waiting
dataSyncSelector.processChangedBolusesCompat()
dataSyncSelector.processChangedBoluses()
}

is PairCarbs -> {
Expand All @@ -118,7 +118,7 @@ class NSClientAddAckWorker(
storeDataForDb.scheduleNsIdUpdate()
rxBus.send(EventNSClientNewLog("DBADD", "Acked Carbs " + pair.value.interfaceIDs.nightscoutId))
// Send new if waiting
dataSyncSelector.processChangedCarbsCompat()
dataSyncSelector.processChangedCarbs()
}

is PairBolusCalculatorResult -> {
Expand All @@ -129,7 +129,7 @@ class NSClientAddAckWorker(
storeDataForDb.scheduleNsIdUpdate()
rxBus.send(EventNSClientNewLog("DBADD", "Acked BolusCalculatorResult " + pair.value.interfaceIDs.nightscoutId))
// Send new if waiting
dataSyncSelector.processChangedBolusCalculatorResultsCompat()
dataSyncSelector.processChangedBolusCalculatorResults()
}

is PairTemporaryBasal -> {
Expand All @@ -140,7 +140,7 @@ class NSClientAddAckWorker(
storeDataForDb.scheduleNsIdUpdate()
rxBus.send(EventNSClientNewLog("DBADD", "Acked TemporaryBasal " + pair.value.interfaceIDs.nightscoutId))
// Send new if waiting
dataSyncSelector.processChangedTemporaryBasalsCompat()
dataSyncSelector.processChangedTemporaryBasals()
}

is PairExtendedBolus -> {
Expand All @@ -151,7 +151,7 @@ class NSClientAddAckWorker(
storeDataForDb.scheduleNsIdUpdate()
rxBus.send(EventNSClientNewLog("DBADD", "Acked ExtendedBolus " + pair.value.interfaceIDs.nightscoutId))
// Send new if waiting
dataSyncSelector.processChangedExtendedBolusesCompat()
dataSyncSelector.processChangedExtendedBoluses()
}

is PairProfileSwitch -> {
Expand All @@ -162,7 +162,7 @@ class NSClientAddAckWorker(
storeDataForDb.scheduleNsIdUpdate()
rxBus.send(EventNSClientNewLog("DBADD", "Acked ProfileSwitch " + pair.value.interfaceIDs.nightscoutId))
// Send new if waiting
dataSyncSelector.processChangedProfileSwitchesCompat()
dataSyncSelector.processChangedProfileSwitches()
}

is PairEffectiveProfileSwitch -> {
Expand All @@ -173,7 +173,7 @@ class NSClientAddAckWorker(
storeDataForDb.scheduleNsIdUpdate()
rxBus.send(EventNSClientNewLog("DBADD", "Acked EffectiveProfileSwitch " + pair.value.interfaceIDs.nightscoutId))
// Send new if waiting
dataSyncSelector.processChangedEffectiveProfileSwitchesCompat()
dataSyncSelector.processChangedEffectiveProfileSwitches()
}

is DataSyncSelector.PairDeviceStatus -> {
Expand All @@ -184,7 +184,7 @@ class NSClientAddAckWorker(
storeDataForDb.scheduleNsIdUpdate()
rxBus.send(EventNSClientNewLog("DBADD", "Acked DeviceStatus " + pair.value.interfaceIDs.nightscoutId))
// Send new if waiting
dataSyncSelector.processChangedDeviceStatusesCompat()
dataSyncSelector.processChangedDeviceStatuses()
}

is PairProfileStore -> {
Expand All @@ -200,7 +200,7 @@ class NSClientAddAckWorker(
storeDataForDb.scheduleNsIdUpdate()
rxBus.send(EventNSClientNewLog("DBADD", "Acked OfflineEvent " + pair.value.interfaceIDs.nightscoutId))
// Send new if waiting
dataSyncSelector.processChangedOfflineEventsCompat()
dataSyncSelector.processChangedOfflineEvents()
}

}
Expand Down
24 changes: 12 additions & 12 deletions .../main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class NSClientUpdateRemoveAckWorker(
dataSyncSelector.confirmLastTempTargetsIdIfGreater(pair.id)
rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked TemporaryTarget" + ack._id))
// Send new if waiting
dataSyncSelector.processChangedTempTargetsCompat()
dataSyncSelector.processChangedTempTargets()
ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
}

Expand All @@ -58,7 +58,7 @@ class NSClientUpdateRemoveAckWorker(
dataSyncSelector.confirmLastGlucoseValueIdIfGreater(pair.id)
rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked GlucoseValue " + ack._id))
// Send new if waiting
dataSyncSelector.processChangedGlucoseValuesCompat()
dataSyncSelector.processChangedGlucoseValues()
ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
}

Expand All @@ -67,7 +67,7 @@ class NSClientUpdateRemoveAckWorker(
dataSyncSelector.confirmLastFoodIdIfGreater(pair.id)
rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked Food " + ack._id))
// Send new if waiting
dataSyncSelector.processChangedFoodsCompat()
dataSyncSelector.processChangedFoods()
ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
}

Expand All @@ -76,7 +76,7 @@ class NSClientUpdateRemoveAckWorker(
dataSyncSelector.confirmLastTherapyEventIdIfGreater(pair.id)
rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked TherapyEvent " + ack._id))
// Send new if waiting
dataSyncSelector.processChangedTherapyEventsCompat()
dataSyncSelector.processChangedTherapyEvents()
ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
}

Expand All @@ -85,7 +85,7 @@ class NSClientUpdateRemoveAckWorker(
dataSyncSelector.confirmLastBolusIdIfGreater(pair.id)
rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked Bolus " + ack._id))
// Send new if waiting
dataSyncSelector.processChangedBolusesCompat()
dataSyncSelector.processChangedBoluses()
ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
}

Expand All @@ -94,7 +94,7 @@ class NSClientUpdateRemoveAckWorker(
dataSyncSelector.confirmLastCarbsIdIfGreater(pair.id)
rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked Carbs " + ack._id))
// Send new if waiting
dataSyncSelector.processChangedCarbsCompat()
dataSyncSelector.processChangedCarbs()
ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
}

Expand All @@ -103,7 +103,7 @@ class NSClientUpdateRemoveAckWorker(
dataSyncSelector.confirmLastBolusCalculatorResultsIdIfGreater(pair.id)
rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked BolusCalculatorResult " + ack._id))
// Send new if waiting
dataSyncSelector.processChangedBolusCalculatorResultsCompat()
dataSyncSelector.processChangedBolusCalculatorResults()
ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
}

Expand All @@ -112,7 +112,7 @@ class NSClientUpdateRemoveAckWorker(
dataSyncSelector.confirmLastTemporaryBasalIdIfGreater(pair.id)
rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked TemporaryBasal " + ack._id))
// Send new if waiting
dataSyncSelector.processChangedTemporaryBasalsCompat()
dataSyncSelector.processChangedTemporaryBasals()
ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
}

Expand All @@ -121,7 +121,7 @@ class NSClientUpdateRemoveAckWorker(
dataSyncSelector.confirmLastExtendedBolusIdIfGreater(pair.id)
rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked ExtendedBolus " + ack._id))
// Send new if waiting
dataSyncSelector.processChangedExtendedBolusesCompat()
dataSyncSelector.processChangedExtendedBoluses()
ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
}

Expand All @@ -130,7 +130,7 @@ class NSClientUpdateRemoveAckWorker(
dataSyncSelector.confirmLastProfileSwitchIdIfGreater(pair.id)
rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked ProfileSwitch " + ack._id))
// Send new if waiting
dataSyncSelector.processChangedProfileSwitchesCompat()
dataSyncSelector.processChangedProfileSwitches()
ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
}

Expand All @@ -139,7 +139,7 @@ class NSClientUpdateRemoveAckWorker(
dataSyncSelector.confirmLastEffectiveProfileSwitchIdIfGreater(pair.id)
rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked EffectiveProfileSwitch " + ack._id))
// Send new if waiting
dataSyncSelector.processChangedEffectiveProfileSwitchesCompat()
dataSyncSelector.processChangedEffectiveProfileSwitches()
ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
}

Expand All @@ -148,7 +148,7 @@ class NSClientUpdateRemoveAckWorker(
dataSyncSelector.confirmLastOfflineEventIdIfGreater(pair.id)
rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked OfflineEvent" + ack._id))
// Send new if waiting
dataSyncSelector.processChangedOfflineEventsCompat()
dataSyncSelector.processChangedOfflineEvents()
ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
}
}
Expand Down
Loading

0 comments on commit 0873df5

Please sign in to comment.