Skip to content

CCCT-2687 Migrate Connect Network Stack To ConnectRepository #3871

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

Merged
shubham1g5 merged 10 commits into from
Aug 18, 2026
Merged

CCCT-2687 Migrate Connect Network Stack To ConnectRepository #3871

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5dca348
Migrate ConnectJobIntroFragment to ConnectJobIntroViewModel
shubham1g5 Aug 7, 2026
ed3ce5f
Migrate claim-job flow from ConnectJobClaimController into ConnectLea…
shubham1g5 Aug 7, 2026
4245662
Add network access methods to ConnectRepository
shubham1g5 Aug 14, 2026
5698d6f
Migrate all Connect network call sites from ConnectApiHandler/Connect…
shubham1g5 Aug 14, 2026
16f66d6
Delete ConnectApiHandler, ApiConnect, ConnectApiClient; clean up ApiS…
shubham1g5 Aug 7, 2026
f4a86ef
Replace ConnectRepository mocks with real HTTP mocks in fragment and …
shubham1g5 Aug 14, 2026
b3dec0c
minor fixes on tests
shubham1g5 Aug 18, 2026
1b2be3e
natural language for test names
shubham1g5 Aug 18, 2026
95f1bfe
Merge ConnectJobHelper with ConnectJobUtils
shubham1g5 Aug 18, 2026
f836fcb
Merge branch 'master' into ccct-2687_connect_network_stack
shubham1g5 Aug 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 20 additions & 27 deletions app/src/org/commcare/activities/CommCareSetupActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,13 @@
import org.commcare.CommCareApp;
import org.commcare.CommCareApplication;
import org.commcare.android.database.connect.models.ConnectJobRecord;
import org.commcare.android.database.connect.models.ConnectUserRecord;
import org.commcare.connect.ConnectConstants;
import org.commcare.connect.repository.ConnectRepository;
import org.commcare.connect.ConnectNavHelper;
import org.commcare.connect.PersonalIdManager;
import org.commcare.personalId.UnlockPolicy;
import org.commcare.connect.database.ConnectJobUtils;
import org.commcare.connect.database.ConnectUserDatabaseUtil;
import org.commcare.connect.network.PersonalIdOrConnectApiErrorHandler;
import org.commcare.connect.network.connect.ConnectApiHandler;
import org.commcare.dalvik.BuildConfig;
import org.commcare.dalvik.R;
import org.commcare.engine.resource.AppInstallStatus;
Expand Down Expand Up @@ -999,30 +998,24 @@ public void checkManagedConfiguration() {
}

private void refreshOpportunities() {
CommCareActivity activity = this;
ConnectUserRecord user = ConnectUserDatabaseUtil.getUser(activity);
new ConnectApiHandler<List<ConnectJobRecord>>() {

@Override
public void onFailure(@NonNull PersonalIdOrConnectApiErrorCodes errorCode, @Nullable Throwable t) {
String error = PersonalIdOrConnectApiErrorHandler.handle(activity, errorCode, t);
Toast.makeText(activity, error, Toast.LENGTH_LONG).show();
}

@Override
public void onSuccess(List<ConnectJobRecord> jobs) {
boolean connectAccess = !jobs.isEmpty();
String toastMessage = getString(R.string.setup_refresh_opportunities_no_jobs);
if (connectAccess) {
ConnectUserDatabaseUtil.turnOnConnectAccess(activity);

updateConnectButton();
refreshDrawer();

toastMessage = getString(R.string.setup_refresh_opportunities_with_jobs);
ConnectRepository.getInstance(this).retrieveOpportunitiesForJava(
(success, error) -> {
if (success) {
boolean connectAccess = !ConnectJobUtils.getCompositeJobs(
this, ConnectJobRecord.STATUS_ALL_JOBS, null).isEmpty();
if (connectAccess) {
ConnectUserDatabaseUtil.turnOnConnectAccess(this);
updateConnectButton();
refreshDrawer();
}
String toastMessage = connectAccess
? getString(R.string.setup_refresh_opportunities_with_jobs)
: getString(R.string.setup_refresh_opportunities_no_jobs);
Toast.makeText(this, toastMessage, Toast.LENGTH_LONG).show();
} else {
Toast.makeText(this, error, Toast.LENGTH_LONG).show();
}
}
Toast.makeText(activity, toastMessage, Toast.LENGTH_LONG).show();
}
}.getConnectOpportunities(activity, user);
);
}
}
3 changes: 2 additions & 1 deletion app/src/org/commcare/activities/StandardHomeActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.commcare.CommCareNoficationManager;
import org.commcare.connect.ConnectJobHelper;
import org.commcare.android.database.connect.models.ConnectJobRecord;
import org.commcare.connect.repository.ConnectRepository;
import org.commcare.connect.ConnectNavHelper;
import org.commcare.connect.EmailOfferHelper;
import org.commcare.dalvik.R;
Expand Down Expand Up @@ -369,7 +370,7 @@ void refreshCCUpdateOption() {
public void fetchJobProgressOverNetwork() {
ConnectJobRecord job = getActiveJob();
if(job != null && job.getStatus() == ConnectJobRecord.STATUS_DELIVERING) {
ConnectJobHelper.INSTANCE.updateDeliveryProgress(this, job, (success, error) -> {
ConnectRepository.getInstance(this).updateDeliveryProgressForJava(job, (success, error) -> {
if (success) {
uiController.updateConnectJobProgress();
}
Expand Down
80 changes: 0 additions & 80 deletions app/src/org/commcare/connect/ConnectJobClaimController.kt
View file
Open in desktop

This file was deleted.

150 changes: 0 additions & 150 deletions app/src/org/commcare/connect/ConnectJobHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,9 @@
package org.commcare.connect

@OrangeAndGreen OrangeAndGreen Aug 18, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To consider: There's almost nothing left in this class and I'm thinking it would make sense for the remaining methods to be merged into ConnectJobUtils. There are a couple static helper methods at the end of that class already, and two of the remaining three methods in this class lean pretty heavily on ConnectJobUtils anyway.

One downside to that though is that Helper is Kotlin and Utils is Java, so maybe better would be to prioritize converting Utils to Kotlin in a separate ticket and then merging the Helper functions over.

@shubham1g5 shubham1g5 Aug 18, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good call - 95f1bfe


import android.content.Context
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.commcare.CommCareApplication
import org.commcare.android.database.connect.models.ConnectJobRecord
import org.commcare.connect.database.ConnectJobUtils
import org.commcare.connect.database.ConnectUserDatabaseUtil
import org.commcare.connect.network.PersonalIdOrConnectApiErrorHandler
import org.commcare.connect.network.connect.ConnectApiHandler
import org.commcare.connect.network.connect.ConnectNetworkClient
import org.commcare.connect.network.connect.models.ConnectPaymentConfirmationModel
import org.commcare.connect.network.connect.models.applyToJob
import org.commcare.google.services.analytics.AnalyticsParamValue.FINISH_DELIVERY
import org.commcare.google.services.analytics.AnalyticsParamValue.PAID_DELIVERY
import org.commcare.google.services.analytics.AnalyticsParamValue.START_DELIVERY
import org.commcare.google.services.analytics.FirebaseAnalyticsUtil

object ConnectJobHelper {
fun getJobForSeatedApp(context: Context): ConnectJobRecord? {
Expand All @@ -38,142 +24,6 @@ object ConnectJobHelper {
return !record.isLearning || job.status != ConnectJobRecord.STATUS_DELIVERING
}

fun updateJobProgress(
context: Context,
job: ConnectJobRecord,
listener: ConnectActivityCompleteListener,
) {
when (job.status) {
ConnectJobRecord.STATUS_LEARNING -> {
updateLearningProgress(context, job, listener)
}

ConnectJobRecord.STATUS_DELIVERING -> {
updateDeliveryProgress(context, job, listener)
}

else -> {
listener.connectActivityComplete(true)
}
}
}

fun updateLearningProgress(
context: Context,
job: ConnectJobRecord,
listener: ConnectActivityCompleteListener,
) {
val user = ConnectUserDatabaseUtil.getUser(context)!!
CoroutineScope(Dispatchers.IO).launch {
val result = ConnectNetworkClient.getInstance().getLearningProgress(user, job)
result.fold(
onSuccess = { model ->
model.applyToJob(job, context)
if (job.passedAssessment()) {
FirebaseAnalyticsUtil.reportCccApiLearnProgress(true)
}
withContext(Dispatchers.Main) {
listener.connectActivityComplete(true)
}
},
onFailure = {
FirebaseAnalyticsUtil.reportCccApiLearnProgress(false)
withContext(Dispatchers.Main) {
listener.connectActivityComplete(false)
}
},
)
}
}

fun updateDeliveryProgress(
context: Context,
job: ConnectJobRecord,
listener: ConnectActivityCompleteListener,
) {
val user = ConnectUserDatabaseUtil.getUser(context)!!
CoroutineScope(Dispatchers.IO).launch {
val result = ConnectNetworkClient.getInstance().getDeliveryProgress(user, job)
result.fold(
onSuccess = { model ->
val events = mutableSetOf<String?>()
if (model.updatedJob) {
events.add(START_DELIVERY)
}
if (model.hasDeliveries && job.getDeliveryProgressPercentage() == 100) {
events.add(FINISH_DELIVERY)
}
if (model.hasPayment && job.payments.isNotEmpty()) {
events.add(PAID_DELIVERY)
}

model.applyToJob(job, context)

events.forEach { event ->
FirebaseAnalyticsUtil.reportCccApiDeliveryProgress(true, event)
}
withContext(Dispatchers.Main) {
listener.connectActivityComplete(true)
}
},
onFailure = {
FirebaseAnalyticsUtil.reportCccApiDeliveryProgress(false, null)
withContext(Dispatchers.Main) {
listener.connectActivityComplete(false)
}
},
)
}
}

fun updatePaymentsConfirmed(
context: Context,
paymentConfirmations: List<ConnectPaymentConfirmationModel>,
listener: ConnectActivityCompleteListener,
) {
val user = ConnectUserDatabaseUtil.getUser(context)

object : ConnectApiHandler<Boolean>() {
override fun onSuccess(data: Boolean) {
for (paymentConfirmation in paymentConfirmations) {
paymentConfirmation.payment.confirmed = paymentConfirmation.toConfirm
ConnectJobUtils.storePayment(context, paymentConfirmation.payment)
}

FirebaseAnalyticsUtil.reportCccApiPaymentConfirmation(true)
listener.connectActivityComplete(true)
}

override fun onFailure(
errorCode: PersonalIdOrConnectApiErrorCodes,
t: Throwable?,
) {
val error = PersonalIdOrConnectApiErrorHandler.handle(context, errorCode, t)
FirebaseAnalyticsUtil.reportCccApiPaymentConfirmation(false)
listener.connectActivityComplete(false, error)
}
}.setPaymentConfirmations(context, user, paymentConfirmations)
}

fun retrieveOpportunities(
context: Context,
listener: ConnectActivityCompleteListener,
) {
val user = ConnectUserDatabaseUtil.getUser(context)
object : ConnectApiHandler<List<ConnectJobRecord>>() {
override fun onFailure(
errorCode: PersonalIdOrConnectApiErrorCodes,
t: Throwable?,
) {
listener.connectActivityComplete(false)
}

override fun onSuccess(data: List<ConnectJobRecord>) {
listener.connectActivityComplete(true)
}
}.getConnectOpportunities(context, user!!)
}

fun resolveGenericOpportunityDestination(
currentAction: String?,
job: ConnectJobRecord?,
Expand Down
Loading
Loading