Adds Task Persistance Layer by shubham1g5 · Pull Request #3785 · dimagi/commcare-android

shubham1g5 · 2026-07-02T11:19:49Z

Product Description

https://dimagi.atlassian.net/browse/CCCT-2539
No visible UI changes

Technical Summary

Implements first part of OCS task spec
Stores tasks in DB and migrate current preferences methods to use DB instead.

Safety Assurance

Safety story

Verified locally that all current tasks behavious works as today and the PR doesn't cause any changes in current functionality around tasks

Automated test coverage

Tests are added for new functionality on DB and parse layers.

Labels and Review

Do we need to enhance the manual QA test coverage ? If yes, RELEASES.md is updated accordingly
Does the PR introduce any major changes worth communicating ? If yes, RELEASES.md is updated accordingly
Risk label is set correctly
The set of people pinged as reviewers is appropriate for the level of risk of the change

coderabbitai · 2026-07-02T11:21:14Z

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 15d11568-1e95-4bb1-a2ac-60bcfd79918f

📥 Commits

Reviewing files that changed from the base of the PR and between beb94f9 and 2e6dd2e.

📒 Files selected for processing (14)

app/src/org/commcare/activities/StandardHomeActivityUIController.java
app/src/org/commcare/android/database/connect/models/ConnectJobPaymentRecord.java
app/src/org/commcare/android/database/connect/models/ConnectJobRecord.java
app/src/org/commcare/android/database/connect/models/ConnectTaskRecord.kt
app/src/org/commcare/connect/database/ConnectTaskUtils.kt
app/src/org/commcare/connect/network/connect/models/DeliveryAppProgressResponseModel.kt
app/src/org/commcare/connect/network/connect/models/ParsedConnectTask.kt
app/src/org/commcare/connect/network/connect/parser/DeliveryAppProgressResponseParser.kt
app/src/org/commcare/fragments/connect/ConnectDeliveryProgressFragment.java
app/src/org/commcare/models/database/connect/ConnectDatabaseUpgrader.java
app/src/org/commcare/models/database/connect/DatabaseConnectOpenHelper.java
app/src/org/commcare/preferences/ConnectJobPreferences.kt
app/src/org/commcare/utils/JsonExtensions.kt
app/src/org/commcare/views/connect/ConnectViewUtils.kt

💤 Files with no reviewable changes (1)

app/src/org/commcare/connect/network/connect/models/ParsedConnectTask.kt

👮 Files not reviewed due to content moderation or server errors (13)

app/src/org/commcare/activities/StandardHomeActivityUIController.java
app/src/org/commcare/android/database/connect/models/ConnectJobRecord.java
app/src/org/commcare/android/database/connect/models/ConnectJobPaymentRecord.java
app/src/org/commcare/preferences/ConnectJobPreferences.kt
app/src/org/commcare/connect/database/ConnectTaskUtils.kt
app/src/org/commcare/models/database/connect/DatabaseConnectOpenHelper.java
app/src/org/commcare/models/database/connect/ConnectDatabaseUpgrader.java
app/src/org/commcare/connect/network/connect/parser/DeliveryAppProgressResponseParser.kt
app/src/org/commcare/fragments/connect/ConnectDeliveryProgressFragment.java
app/src/org/commcare/views/connect/ConnectViewUtils.kt
app/src/org/commcare/utils/JsonExtensions.kt
app/src/org/commcare/android/database/connect/models/ConnectTaskRecord.kt
app/src/org/commcare/connect/network/connect/models/DeliveryAppProgressResponseModel.kt

📝 Walkthrough

[!WARNING]

Walkthrough skipped

File diffs could not be summarized.

✨ Finishing Touches

📝 Generate docstrings

Create stacked PR
Commit on current branch

🧪 Generate unit tests (beta)

Create PR with unit tests
Commit unit tests in branch ccct-2539_data_layer_tasks

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

codecov · 2026-07-03T08:30:43Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 26.14%. Comparing base (09f6484) to head (9bacba5).
⚠️ Report is 173 commits behind head on master.

Additional details and impacted files

@@             Coverage Diff              @@
##             master    #3785      +/-   ##
============================================
+ Coverage     25.95%   26.14%   +0.19%     
- Complexity     4406     4462      +56     
============================================
  Files           953      954       +1     
  Lines         57334    57383      +49     
  Branches       6823     6830       +7     
============================================
+ Hits          14879    15002     +123     
+ Misses        40623    40545      -78     
- Partials       1832     1836       +4

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

- ConnectTaskRecord: DB model with all fields; fromJson uses correct JSON key names (assigned_task_id, task_name, etc.) and parses date_created via ConnectDateUtils.parseServerTimestamp - ConnectDatabaseSchemaManager: bumps to v27, adds connect_tasks table - ConnectDatabaseUpgrader: adds v27 migration path - ConnectDateUtils: adds parseServerTimestamp for ISO-8601 timestamps Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Legacy relearn-task prefs (isRelearnTaskPending, setRelearnTaskPending, getRelearnTasksCompletedTimeMs, setRelearnTasksCompletedTime) are deprecated now that task state is persisted in ConnectTaskRecord. Adds getTaskModifiedTime / updateTaskModifiedTime backed by KEY_TASK_LAST_MODIFIED_TIME for ConnectTaskUtils to record when task state last changed. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

ConnectTaskUtils provides storeTasks (insert/update/delete to match incoming payload), hasPendingTask, getPendingTaskOfType, hasPendingTaskOfType, and shouldShowTasksCompletedMessage — replacing the equivalent logic that was inlined in ConnectJobRecord. DeliveryAppProgressResponseParser now builds ConnectTaskRecord directly via ConnectTaskRecord.fromJson (removing the ParsedConnectTask shim). DeliveryAppProgressResponseModel.applyToJob calls ConnectTaskUtils.storeTasks instead of syncRelearnTasksPrefs. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

ConnectTaskUtilsTest covers storeTasks (insert, update, no-op, delete), query helpers, and shouldShowTasksCompletedMessage. Uses the real in-memory Robolectric DB via CommCareTestApplication — no static mocks. DeliveryAppProgressResponseParserTest covers JSON → ConnectTaskRecord parsing end-to-end. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

shubham1g5 · 2026-07-03T13:39:42Z

+        }
+    }
+
    fun formatNotificationTime(


changes in the method are formatting only and can be skipped while review

conroy-ricketts · 2026-07-03T14:46:09Z

+            val task = ConnectTaskRecord()
+            task.jobUUID = job.jobUUID
+            task.taskId = json.getString("assigned_task_id")
+            task.name = json.getString("task_name")
+            task.description = json.optString("task_description", "")
+            task.status = json.getString("status")
+            task.connectChannelId = json.optString("connect_channel_id", "")
+            task.type = json.optString("task_type", "")
+            if (json.hasNonNull("due_date")) {
+                task.dueDate = DateUtils.parseDate(json.getString("due_date"))
+            }
+            if (json.hasNonNull("date_created")) {
+                task.dateCreated = ConnectDateUtils.parseServerTimestamp(
+                    json.getString("date_created"),
+                ) ?: Date()
+            }
+            return task


Should these keys be the same constants used on the Record's fields?

not really, DB level fields and related constants are different from API payload and should not be used inter-changeably.

conroy-ricketts

All looks great to me, would love a second set of eyes before merge

Jignesh-dimagi · 2026-07-06T14:40:31Z

+            setRelearnTaskPending(incoming.any { it.status == "assigned" })
+            resetRelearnTasksCompletedTime()


Since we are migrating from SharedPreferences to a local database, do we still need to store these specific values in preferences?

These preferences are still in use to provide backward compatibility for some edge cases as currently we can't make sure whether someone has re-synced tasks after taking an update or not, once we release 2.64 these can be removed.

Jignesh-dimagi · 2026-07-07T07:00:48Z

+        for (orphan in existing.filter { it.taskId !in incomingIds }) {
+            storage.remove(orphan)
+            changed = true
+        }


Now that orphan tasks are removed from the DB during sync, if the payload stops sending the completed task the banner disappears immediately. In the previous implementation it was kept for up to 6 hours after completion.

Can confirm here that the server payload does retain completed tasks.

Jignesh-dimagi · 2026-07-07T07:14:44Z

+    fun shouldShowTasksCompletedMessage(
+        context: Context,
+        job: ConnectJobRecord,
+    ): Boolean {
+        if (hasPendingTask(context, job.jobUUID)) return false
+        val mostRecent = getMostRecentlyCompletedTask(context, job.jobUUID) ?: return false
+        val timeElapsed = Date().time - mostRecent.dateModified.time
+        return timeElapsed < TASKS_COMPLETED_MESSAGE_WINDOW_MS && job.status == ConnectJobRecord.STATUS_DELIVERING
+    }


ConnectTaskRecord.fromJson parses date_created but not date_modified. The deleted ParsedConnectTask.fromJson did parse it.
This function measures the 6h window from now (dateModified) and not when the worker actually completed it.

I am checking with server team if it's possible to get date_modified in the payload (we do not currently) . If they confirm, I will update the parsing to account for date_modified.

Although even without date, the dateModified is written to the db row based on whether a task model has changed in storeTasks so this implementation should still be correct as dateModified is derived locally by comparing the model fields for task and detecting a change. As such the net effect here would be that the completed message banner would appear to the user until 6 hour since they synced a completed task which I think is acceptable behaviour. Thoughts ?

I am now parsing date_modified from server payload - 7fe8ea9

Jignesh-dimagi · 2026-07-07T07:26:48Z

+                task.dueDate = DateUtils.parseDate(json.getString("due_date"))
+            }
+            if (json.hasNonNull("date_created")) {
+                task.dateCreated = ConnectDateUtils.parseServerTimestamp(


Can we use DateUtils.parseDateTime as its achieving same thing?

makes sense - ae89fa6

…s accordingly

…task upsert

Jignesh-dimagi

LGTM

shubham1g5 added the skip-integration-tests Skip android tests. label Jul 3, 2026

shubham1g5 force-pushed the ccct-2539_data_layer_tasks branch 2 times, most recently from cfc92b7 to 7741e3c Compare July 3, 2026 11:38

shubham1g5 mentioned this pull request Jul 3, 2026

Extract ConnectDatabaseSchemaManager And Add Connect DB Test Hook #3789

Merged

shubham1g5 force-pushed the ccct-2539_data_layer_tasks branch from 256106e to 7d599a9 Compare July 3, 2026 13:18

shubham1g5 changed the base branch from master to connect_db_wiring_change July 3, 2026 13:19

shubham1g5 and others added 5 commits July 3, 2026 19:02

Add JsonExtensions.hasNonNull; apply to existing records

aadb21c

shubham1g5 force-pushed the ccct-2539_data_layer_tasks branch from 7d599a9 to 106bec4 Compare July 3, 2026 13:36

shubham1g5 commented Jul 3, 2026

View reviewed changes

shubham1g5 marked this pull request as ready for review July 3, 2026 13:43

shubham1g5 requested review from Jignesh-dimagi, OrangeAndGreen and conroy-ricketts July 3, 2026 13:45

conroy-ricketts reviewed Jul 3, 2026

View reviewed changes

Base automatically changed from connect_db_wiring_change to master July 6, 2026 04:55

conroy-ricketts previously approved these changes Jul 6, 2026

View reviewed changes

Jignesh-dimagi reviewed Jul 7, 2026

View reviewed changes

replace parseServerTimeStamp with DateUtils.parseDate and update test…

ae89fa6

…s accordingly

shubham1g5 dismissed conroy-ricketts’s stale review via ae89fa6 July 7, 2026 09:07

shubham1g5 requested a review from Jignesh-dimagi July 7, 2026 09:15

conroy-ricketts previously approved these changes Jul 7, 2026

View reviewed changes

parse task date_modified from server instead and use it to decide on …

7fe8ea9

…task upsert

shubham1g5 dismissed conroy-ricketts’s stale review via 7fe8ea9 July 8, 2026 10:30

fix tests to include date_modified to single out unique tasks

69b8bf0

ktlint

9bacba5

Jignesh-dimagi approved these changes Jul 8, 2026

View reviewed changes

shubham1g5 merged commit bad2663 into master Jul 8, 2026
10 checks passed

shubham1g5 deleted the ccct-2539_data_layer_tasks branch July 8, 2026 11:05

		setRelearnTaskPending(incoming.any { it.status == "assigned" })
		resetRelearnTasksCompletedTime()

Uh oh!

Uh oh!

Conversation

shubham1g5 commented Jul 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Product Description

Technical Summary

Safety Assurance

Safety story

Automated test coverage

Labels and Review

Uh oh!

coderabbitai Bot commented Jul 2, 2026

Walkthrough skipped

Uh oh!

codecov Bot commented Jul 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

conroy-ricketts left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Jignesh-dimagi left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

shubham1g5 commented Jul 2, 2026 •

edited

Loading

codecov Bot commented Jul 3, 2026 •

edited

Loading