New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use preference datastore to monitor syncJobStatus. #2142

Merged

santosh-pingle merged 71 commits into google:master from santosh-pingle:sp/issue-2119-datastore

Jan 2, 2024

Collaborator

santosh-pingle commented Aug 23, 2023 •

edited

Loading

IMPORTANT: All PRs must be linked to an issue (except for extremely trivial and straightforward changes).

Fixes #2119

Description
Utilize the preference datastore to store SyncJobStatus. SyncJobStatus is serialized and subsequently updated within the preference datastore. The unique workname of the worker serves as the key for editing and reading the serialized data from the preference datastore.
Merge work state with SyncJobStatus.

Alternative(s) considered
Have you considered any alternatives? And if so, why have you chosen the approach in this PR?

Type
Choose one: (Bug fix | Feature | Documentation | Testing | Code health | Builds | Releases | Other)

Screenshots (if applicable)

Checklist

I have read and acknowledged the Code of conduct.
I have read the Contributing page.
I have signed the Google Individual CLA, or I am covered by my company's Corporate CLA.
I have discussed my proposed solution with code owners in the linked issue(s) and we have agreed upon the general approach.
I have run ./gradlew spotlessApply and ./gradlew spotlessCheck to check my code follows the style guide of this project.
I have run ./gradlew check and ./gradlew connectedCheck to test my changes locally.
I have built and run the demo app(s) to verify my change fixes the issue and/or does not break the demo app(s).

Santosh Pingle added 2 commits

August 23, 2023 13:52


          Update syncJobStatus to preference datastore.

f0a884e


          add fhirdatastore file.

7c19a83

Collaborator Author

santosh-pingle commented Aug 23, 2023

Screen.Recording.2023-08-23.at.2.10.12.PM.mov

Santosh Pingle and others added 7 commits

August 23, 2023 14:27


          code cleanup.

f915c21


          unit tests

55d9a6d


          unit test.

339d808


          Cancel ongoing coroutine job before launching new oneTimeSync in demo…

ce473b8

… app.


          Fix android test, pass context instead of datastore in fhir engine co…

…nfiguration.


          Merge branch 'master' into sp/issue-2119-datastore

95a486a


          fix tests.

295c915

santosh-pingle added the kokoro:force-run label

android-fhir-bot removed the kokoro:force-run label


          update kotlin doc.

5a0f317

santosh-pingle marked this pull request as ready for review

August 28, 2023 10:30

santosh-pingle requested a review from a team as a code owner

August 28, 2023 10:30

santosh-pingle requested a review from jingtang10

August 28, 2023 10:30


          combine work state with syncjobstatus

d2e2644

Collaborator Author

santosh-pingle commented Aug 29, 2023

combine workstate and syncjobstatus

Screen.Recording.2023-08-29.at.4.59.56.PM.mov

jingtang10 requested changes

View reviewed changes

demo/src/main/java/com/google/android/fhir/demo/FhirApplication.kt Outdated Show resolved Hide resolved

engine/src/main/java/com/google/android/fhir/sync/Sync.kt Outdated Show resolved Hide resolved

engine/src/main/java/com/google/android/fhir/sync/Sync.kt Outdated Show resolved Hide resolved

engine/src/test/java/com/google/android/fhir/FhirEngineProviderTest.kt Outdated Show resolved Hide resolved

engine/src/test/java/com/google/android/fhir/FhirEngineProviderTest.kt Outdated Show resolved Hide resolved

demo/src/main/java/com/google/android/fhir/demo/MainActivityViewModel.kt Outdated Show resolved Hide resolved

anchita-g suggested changes

View reviewed changes

demo/src/main/java/com/google/android/fhir/demo/MainActivityViewModel.kt Outdated Show resolved Hide resolved

demo/src/main/java/com/google/android/fhir/demo/MainActivityViewModel.kt Outdated Show resolved Hide resolved

engine/src/main/java/com/google/android/fhir/sync/FhirDataStore.kt Outdated Show resolved Hide resolved

engine/src/main/java/com/google/android/fhir/sync/FhirDataStore.kt Outdated Show resolved Hide resolved

engine/src/main/java/com/google/android/fhir/sync/Sync.kt Outdated Show resolved Hide resolved

engine/src/main/java/com/google/android/fhir/sync/FhirSyncWorker.kt Outdated Show resolved Hide resolved

Santosh Pingle added 2 commits

September 6, 2023 14:16


          Address review comments.

1e663f9


          Address review comments.

c5b60d7

santosh-pingle requested review from jingtang10 and anchita-g

September 6, 2023 12:09

jingtang10 mentioned this pull request

Fix sync state exception handling #1669

Closed

7 tasks

Collaborator

MJ1998 commented Sep 15, 2023

Perhaps add #2046 getting resolved by this too ?

MJ1998 previously requested changes

View reviewed changes

engine/src/main/java/com/google/android/fhir/sync/Sync.kt Outdated Show resolved Hide resolved

engine/src/main/java/com/google/android/fhir/sync/Config.kt Outdated Show resolved Hide resolved

demo/src/main/java/com/google/android/fhir/demo/FhirApplication.kt Outdated Show resolved Hide resolved

engine/src/main/java/com/google/android/fhir/FhirEngineProvider.kt Outdated Show resolved Hide resolved

engine/src/main/java/com/google/android/fhir/sync/FhirSyncWorker.kt Outdated Show resolved Hide resolved

engine/src/main/java/com/google/android/fhir/sync/Sync.kt Outdated Show resolved Hide resolved

engine/src/main/java/com/google/android/fhir/sync/Sync.kt Outdated Show resolved Hide resolved

anchita-g reviewed

View reviewed changes

demo/src/main/java/com/google/android/fhir/demo/MainActivityViewModel.kt Show resolved Hide resolved

omarismail94 reviewed

View reviewed changes

engine/src/main/java/com/google/android/fhir/sync/FhirDataStore.kt Show resolved Hide resolved

engine/src/main/java/com/google/android/fhir/sync/FhirDataStore.kt Outdated Show resolved Hide resolved

engine/src/main/java/com/google/android/fhir/sync/FhirDataStore.kt Outdated Show resolved Hide resolved

anchita-g reviewed

View reviewed changes

engine/src/main/java/com/google/android/fhir/sync/FhirDataStore.kt Outdated Show resolved Hide resolved

Santosh Pingle and others added 2 commits

December 15, 2023 13:39


          Address review comments.

b845ba4


          Merge branch 'master' into sp/issue-2119-datastore

fe1c64f

Collaborator Author

santosh-pingle commented Dec 18, 2023

Resolving conflicts.

Santosh Pingle added 2 commits

December 18, 2023 15:09


          Merge branch 'master' into sp/issue-2119-datastore

8d49119


          Review address comments.

35f86a1

santosh-pingle requested a review from omarismail94

December 18, 2023 12:13

omarismail94 reviewed

View reviewed changes

demo/src/main/java/com/google/android/fhir/demo/MainActivityViewModel.kt Show resolved Hide resolved

engine/src/main/java/com/google/android/fhir/sync/Sync.kt Show resolved Hide resolved

engine/src/main/java/com/google/android/fhir/sync/CurrentSyncJobStatus.kt Outdated Show resolved Hide resolved

engine/src/main/java/com/google/android/fhir/sync/CurrentSyncJobStatus.kt Outdated Show resolved Hide resolved

Santosh Pingle and others added 2 commits

December 19, 2023 13:55


          Address review comments.

68ccb65


          Merge branch 'master' into sp/issue-2119-datastore

8c1aa08

santosh-pingle requested a review from omarismail94

December 19, 2023 08:44

santosh-pingle added the kokoro:force-run label

android-fhir-bot removed the kokoro:force-run label

santosh-pingle requested a review from jingtang10

December 20, 2023 04:44

jingtang10 requested changes

View reviewed changes

engine/src/main/java/com/google/android/fhir/sync/SyncJobStatusSerializer.kt Outdated Show resolved Hide resolved

engine/src/main/java/com/google/android/fhir/sync/SyncJobStatusSerializer.kt Outdated Show resolved Hide resolved

demo/src/main/java/com/google/android/fhir/demo/PatientListFragment.kt Show resolved Hide resolved

Santosh Pingle and others added 5 commits

December 26, 2023 11:55


          Address review comment.

d806e60


          Merge branch 'master' into sp/issue-2119-datastore

34bc508


          Address review comments.


          Address review comment.

adbb227


          Merge branch 'master' into sp/issue-2119-datastore

santosh-pingle requested a review from jingtang10

December 27, 2023 09:40

jingtang10 approved these changes

View reviewed changes

Collaborator

jingtang10 left a comment

thanks @santosh-pingle

engine/src/main/java/com/google/android/fhir/sync/SyncJobStatus.kt Outdated Show resolved Hide resolved

engine/src/main/java/com/google/android/fhir/sync/SyncJobStatus.kt Outdated Show resolved Hide resolved

engine/src/main/java/com/google/android/fhir/sync/SyncJobStatus.kt Show resolved Hide resolved

demo/src/main/java/com/google/android/fhir/demo/PatientListFragment.kt Show resolved Hide resolved

Santosh Pingle added 2 commits

January 2, 2024 15:09


          Address review comments.

018920f


          remove unwanted file.

69e4cfc

santosh-pingle mentioned this pull request

should there be a cancelled state here too? #2399

Open

santosh-pingle enabled auto-merge (squash)

January 2, 2024 13:02

santosh-pingle dismissed MJ1998’s stale review

January 2, 2024 13:04

Owner has already approved the pr, hence dismissing it.

santosh-pingle merged commit 2df5e02 into google:master

3 checks passed

hugomilosz pushed a commit to hugomilosz/android-fhir that referenced this pull request


          use preference datastore to monitor syncJobStatus. (google#2142)

a45509f

* Update syncJobStatus to preference datastore.

* add fhirdatastore file.

* code cleanup.

* unit tests

* unit test.

* Cancel ongoing coroutine job before launching new oneTimeSync in demo app.

* Fix android test, pass context instead of datastore in fhir engine configuration.

* fix tests.

* update kotlin doc.

* combine work state with syncjobstatus

* Address review comments.

* Address review comments.

* Update OneTimeSyncState and PeriodicSyncState.

* missing file.

* Stores sync job terminal state in the datastore.

* Address review comments.

* Address review comments.

* Address review comments.

* Address review comments.

* code clean up.

* Code clean up.

* Fix test.

* Fix test

* Fix tests.

* Address review comments.

* Address review comments.

* Remove DataStoreUtil.

* Address review comments.

* fix crash.

* refactoring names

* spotless apply

* private access specifier

* Address review comments.

* Address review comment.

* address review comments.

* fix tests.

* review comment.

* Removing existing unwanted call.

* Address review comments.

* Add test to assert succedded sync state.

* failed state was nit emitted.

* Update api doc.

* Address review comments.

* Review address comments.

* Address review comments.

* Address review comment.

* Address review comments.

* Address review comment.

* Address review comments.

* remove unwanted file.

---------

Co-authored-by: Santosh Pingle <spingle@google.com>

santosh-pingle mentioned this pull request

SyncJobStatus is not triggered for Finish state for android 13 #2046

Closed

sharon2719 pushed a commit to opensrp/android-fhir that referenced this pull request


          use preference datastore to monitor syncJobStatus. (google#2142)

8b29125

* Update syncJobStatus to preference datastore.

* add fhirdatastore file.

* code cleanup.

* unit tests

* unit test.

* Cancel ongoing coroutine job before launching new oneTimeSync in demo app.

* Fix android test, pass context instead of datastore in fhir engine configuration.

* fix tests.

* update kotlin doc.

* combine work state with syncjobstatus

* Address review comments.

* Address review comments.

* Update OneTimeSyncState and PeriodicSyncState.

* missing file.

* Stores sync job terminal state in the datastore.

* Address review comments.

* Address review comments.

* Address review comments.

* Address review comments.

* code clean up.

* Code clean up.

* Fix test.

* Fix test

* Fix tests.

* Address review comments.

* Address review comments.

* Remove DataStoreUtil.

* Address review comments.

* fix crash.

* refactoring names

* spotless apply

* private access specifier

* Address review comments.

* Address review comment.

* address review comments.

* fix tests.

* review comment.

* Removing existing unwanted call.

* Address review comments.

* Add test to assert succedded sync state.

* failed state was nit emitted.

* Update api doc.

* Address review comments.

* Review address comments.

* Address review comments.

* Address review comment.

* Address review comments.

* Address review comment.

* Address review comments.

* remove unwanted file.

---------

Co-authored-by: Santosh Pingle <spingle@google.com>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet