Process skipped clients

opensrp-giz-malawi/build.gradle

@@ -404,6 +404,8 @@ dependencies {
 
     implementation "androidx.multidex:multidex:2.0.1"
     testImplementation "androidx.work:work-testing:2.7.1"
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test:core:1.3.0'
 
 
     def robolectricVersion = '4.1'

opensrp-giz-malawi/src/main/AndroidManifest.xml

@@ -291,6 +291,7 @@
         <service android:name="org.smartregister.sync.intent.ExtendedSyncIntentService" />
         <service android:name="org.smartregister.sync.intent.SettingsSyncIntentService" />
         <service android:name="org.smartregister.sync.intent.SyncIntentService" />
+        <service android:name=".service.ReProcessSyncIntentService"/>
 
         <uses-library
             android:name="org.apache.http.legacy"

opensrp-giz-malawi/src/main/java/org/smartregister/giz/application/GizMalawiApplication.java

@@ -1,6 +1,7 @@
 package org.smartregister.giz.application;
 
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.text.TextUtils;
@@ -62,6 +63,7 @@
 import org.smartregister.giz.job.GizMalawiJobCreator;
 import org.smartregister.giz.processor.GizMalawiProcessorForJava;
 import org.smartregister.giz.processor.TripleResultProcessor;
+import org.smartregister.giz.recievers.GizReprocessSyncStatusReceiver;
 import org.smartregister.giz.repository.ChildAlertUpdatedRepository;
 import org.smartregister.giz.repository.ClientRegisterTypeRepository;
 import org.smartregister.giz.repository.DailyTalliesRepository;
@@ -364,6 +366,8 @@ public void onCreate() {
         initOfflineSchedules();
 
         SyncStatusBroadcastReceiver.init(this);
+        this.registerReceiver(new GizReprocessSyncStatusReceiver(),
+                new IntentFilter(SyncStatusBroadcastReceiver.ACTION_SYNC_STATUS));
         LocationHelper.init(GizUtils.ALLOWED_LEVELS, GizUtils.DEFAULT_LOCATION_LEVEL);
         jsonSpecHelper = new JsonSpecHelper(this);
 

opensrp-giz-malawi/src/main/java/org/smartregister/giz/job/GIZClientReprocessJob.java

@@ -0,0 +1,27 @@
+package org.smartregister.giz.job;
+
+import android.content.Intent;
+
+import androidx.annotation.NonNull;
+
+import com.evernote.android.job.Job;
+
+import org.jetbrains.annotations.NotNull;
+import org.smartregister.AllConstants;
+import org.smartregister.giz.service.ReProcessSyncIntentService;
+import org.smartregister.job.BaseJob;
+
+public class GIZClientReprocessJob extends BaseJob {
+
+    public static final String TAG = "GizReValidationJob";
+
+    @NonNull
+    @NotNull
+    @Override
+    protected Result onRunJob(@NonNull @NotNull Job.Params params) {
+        Intent intent = new Intent(getApplicationContext(), ReProcessSyncIntentService.class);
+        getApplicationContext().startService(intent);
+        return params != null && params.getExtras().getBoolean(AllConstants.INTENT_KEY.TO_RESCHEDULE, false) ? Result.RESCHEDULE : Result.SUCCESS;
+
+    }
+}

opensrp-giz-malawi/src/main/java/org/smartregister/giz/job/GizMalawiJobCreator.java

@@ -54,6 +54,8 @@ public Job create(@NonNull String tag) {
                 return new GizVaccineUpdateJob();
             case ImageUploadServiceJob.TAG:
                 return new ImageUploadServiceJob();
+            case  GIZClientReprocessJob.TAG:
+                return  new GIZClientReprocessJob();
 
             default:
                 Timber.w(GizMalawiJobCreator.class.getCanonicalName(), "%s is not declared in Job Creator", tag);

opensrp-giz-malawi/src/main/java/org/smartregister/giz/recievers/GizReprocessSyncStatusReceiver.java

@@ -0,0 +1,40 @@
+package org.smartregister.giz.recievers;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import org.smartregister.domain.FetchStatus;
+import org.smartregister.giz.job.GIZClientReprocessJob;
+
+import java.io.Serializable;
+
+import timber.log.Timber;
+
+import static org.smartregister.receiver.SyncStatusBroadcastReceiver.EXTRA_FETCH_STATUS;
+
+public class GizReprocessSyncStatusReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        Bundle data = intent.getExtras();
+        if (data != null) {
+            Serializable fetchStatusSerializable = data.getSerializable(EXTRA_FETCH_STATUS);
+            if (fetchStatusSerializable instanceof FetchStatus) {
+                FetchStatus fetchStatus = (FetchStatus) fetchStatusSerializable;
+                    if (fetchStatus.equals(FetchStatus.fetched)) {
+                        GIZClientReprocessJob.scheduleJobImmediately(GIZClientReprocessJob.TAG);
+                        Timber.d("Broadcast data fetched");
+                    } else if (fetchStatus.equals(FetchStatus.nothingFetched)) {
+                        Timber.d("Broadcast data not fetched");
+                    } else if (fetchStatus.equals(FetchStatus.noConnection)) {
+                        Timber.d("Broadcast data fetch failed");
+                    }
+
+                //}
+            }
+        }
+
+        System.out.println("Broadcast Recieved");
+    }
+}

opensrp-giz-malawi/src/main/java/org/smartregister/giz/repository/GizEventRepository.java

@@ -5,8 +5,14 @@
 import net.sqlcipher.Cursor;
 import net.sqlcipher.database.SQLiteDatabase;
 
+import org.smartregister.giz.util.GizUtils;
 import org.smartregister.repository.BaseRepository;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import timber.log.Timber;
+
 public class GizEventRepository extends BaseRepository {
 
     public boolean hasEvent(@NonNull String baseEntityId, @NonNull String eventType) {
@@ -21,4 +27,33 @@ public boolean hasEvent(@NonNull String baseEntityId, @NonNull String eventType)
         }
         return hasEvent;
     }
+
+    public void processSkippedClients() {
+        String missingClientRegister = "SELECT DISTINCT baseEntityId, formSubmissionId AS formSubmissionId FROM event WHERE baseEntityId IN (SELECT baseEntityId FROM client WHERE baseEntityId NOT IN (SELECT DISTINCT base_entity_id FROM client_register_type)) AND eventType LIKE '%Registration%'";
+        String missingECClient = "SELECT DISTINCT baseEntityId, formSubmissionId AS formSubmissionId FROM event WHERE baseEntityId IN (SELECT baseEntityId FROM client WHERE baseEntityId NOT IN (SELECT DISTINCT base_entity_id FROM ec_client)) AND eventType LIKE '%Registration%'";
+        List<String> formSubmissionIDs = new ArrayList<>();
+        addFormSubmissionIds(formSubmissionIDs, missingClientRegister);
+        addFormSubmissionIds(formSubmissionIDs, missingECClient);
+
+        try {
+            if (formSubmissionIDs.size() > 0)
+                GizUtils.initiateEventProcessing(formSubmissionIDs);
+        } catch (Exception e) {
+            Timber.e(e);
+        }
+    }
+
+
+    public void addFormSubmissionIds(List<String> ids, String query) {
+        SQLiteDatabase database = getReadableDatabase();
+        Cursor cursor = database.rawQuery(query, null);
+        int columnIndex = cursor.getColumnIndex("formSubmissionId");
+        if (cursor.getCount() > 0) {
+            cursor.moveToFirst();
+            do {
+                ids.add(cursor.getString(columnIndex));
+            } while (cursor.moveToNext());
+        }
+        cursor.close();
+    }
 }

opensrp-giz-malawi/src/main/java/org/smartregister/giz/service/ReProcessSyncIntentService.java

@@ -0,0 +1,27 @@
+package org.smartregister.giz.service;
+
+import android.app.IntentService;
+import android.content.Intent;
+
+import androidx.annotation.Nullable;
+
+import org.smartregister.giz.application.GizMalawiApplication;
+
+public class ReProcessSyncIntentService extends IntentService {
+
+    public static final String TAG = "ReProcessSyncIntentService";
+
+    public ReProcessSyncIntentService()
+    {
+        super(TAG);
+    }
+
+    public ReProcessSyncIntentService(String name) {
+        super(name);
+    }
+
+    @Override
+    protected void onHandleIntent(@Nullable Intent intent) {
+        GizMalawiApplication.getInstance().gizEventRepository().processSkippedClients();
+    }
+}

opensrp-giz-malawi/src/test/java/org/smartregister/giz/repository/GizEventRepositoryTest.java

@@ -0,0 +1,95 @@
+package org.smartregister.giz.repository;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.smartregister.giz.util.GizUtils;
+import org.smartregister.repository.Repository;
+import org.smartregister.view.activity.DrishtiApplication;
+
+import net.sqlcipher.Cursor;
+import net.sqlcipher.database.SQLiteDatabase;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({DrishtiApplication.class})
+public class GizEventRepositoryTest {
+
+    private GizEventRepository repository;
+    private static final String BASE_ENTITY_ID = "base_entity_id";
+    private static final String EVENT_TYPE = "event_type";
+    private static final String FORM_SUBMISSION_ID = "form_submission_id";
+
+    @Mock
+    private SQLiteDatabase sqLiteDatabase;
+
+    @Mock
+    private GizUtils gizUtils;
+
+    @Mock
+    private Cursor cursor;
+
+    @Mock
+    private Repository baseRepository;
+
+    @Mock
+    private DrishtiApplication drishtiApplication;
+
+    @Before
+    public void setUp() {
+        repository = new GizEventRepository();
+        MockitoAnnotations.initMocks(this);
+        PowerMockito.mockStatic(DrishtiApplication.class);
+        when(DrishtiApplication.getInstance()).thenReturn(drishtiApplication);
+        when(drishtiApplication.getRepository()).thenReturn(baseRepository);
+        when(baseRepository.getReadableDatabase()).thenReturn(sqLiteDatabase);
+    }
+
+    @Test
+    public void testHasEvent(){
+        when(sqLiteDatabase.query(
+                "event",
+                new String[]{"baseEntityId"},
+                "baseEntityId = ? and eventType = ? ",
+                new String[]{BASE_ENTITY_ID, EVENT_TYPE},
+                null,
+                null,
+                null,
+                "1"
+        )).thenReturn(cursor);
+
+        when(cursor.getCount()).thenReturn(1);
+
+        boolean hasEvent = repository.hasEvent(BASE_ENTITY_ID, EVENT_TYPE);
+
+        assertTrue(hasEvent);
+    }
+
+
+
+    @Test
+    public void testAddFormSubmissionIds() {
+        when(baseRepository.getReadableDatabase()).thenReturn(sqLiteDatabase);
+        when(sqLiteDatabase.rawQuery("query", null)).thenReturn(cursor);
+        when(cursor.getCount()).thenReturn(1);
+        when(cursor.getColumnIndex("formSubmissionId")).thenReturn(0);
+        when(cursor.moveToFirst()).thenReturn(true);
+        when(cursor.getString(0)).thenReturn("formSubmissionId");
+
+        List<String> formSubmissionIds = new ArrayList<>();
+        repository.addFormSubmissionIds(formSubmissionIds, "query");
+
+        assertFalse(formSubmissionIds.isEmpty());
+    }
+}