Merge pull request #331 from OpenSRP/remove_deleted_vaccines

Remove deleted vaccines
opensrp · Nov 10, 2020 · 05b0d1e · 05b0d1e
2 parents 0a85679 + 0e5720c
commit 05b0d1e
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 9 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=1.5.21-SNAPSHOT
+VERSION_NAME=1.5.22-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Chw Core Library

diff --git a/opensrp-chw-core/src/main/java/org/smartregister/chw/core/dao/EventDao.java b/opensrp-chw-core/src/main/java/org/smartregister/chw/core/dao/EventDao.java
@@ -78,6 +78,15 @@ private static ECSyncHelper getEcSyncHelper() {
     }
 
     public static void deleteVaccineByFormSubmissionId(String submissionId) {
+        String sql0 = "delete from visit_details where visit_details_id in ( " +
+                " select vd.visit_details_id " +
+                " from visit_details vd  " +
+                " inner join visits v on v.visit_id = vd.visit_id " +
+                " inner join vaccines va on va.name = visit_key and va.base_entity_id = v.base_entity_id " +
+                " where va.formSubmissionId = '" + submissionId + "' " +
+                ")";
+        updateDB(sql0);
+
         String sql = "delete from vaccines where formSubmissionId = '" + submissionId + "'";
         updateDB(sql);
     }

diff --git a/opensrp-chw-core/src/main/java/org/smartregister/chw/core/sync/CoreClientProcessor.java b/opensrp-chw-core/src/main/java/org/smartregister/chw/core/sync/CoreClientProcessor.java
@@ -82,7 +82,7 @@ public static void addVaccine(VaccineRepository vaccineRepository, Vaccine vacci
             }
 
             // if its an updated vaccine, delete the previous object
-            vaccineRepository.deleteVaccine(vaccine.getBaseEntityId(), vaccine.getName());
+            //vaccineRepository.deleteVaccine(vaccine.getBaseEntityId(), vaccine.getName());
 
             // Add the vaccine
             vaccineRepository.add(vaccine);
@@ -327,12 +327,15 @@ protected void processEvents(ClientClassification clientClassification, Table va
 
     public void processDeleteEvent(Event event) {
         try {
+            String formSubmissionId = event.getDetails() == null ? "" : event.getDetails().get("deleted_form_submission_id");
             // delete from vaccine table
-            EventDao.deleteVaccineByFormSubmissionId(event.getFormSubmissionId());
-            // delete from visit table
-            EventDao.deleteVisitByFormSubmissionId(event.getFormSubmissionId());
-            // delete from recurring service table
-            EventDao.deleteServiceByFormSubmissionId(event.getFormSubmissionId());
+            if (StringUtils.isNotBlank(formSubmissionId)) {
+                EventDao.deleteVaccineByFormSubmissionId(formSubmissionId);
+                // delete from visit table
+                EventDao.deleteVisitByFormSubmissionId(formSubmissionId);
+                // delete from recurring service table
+                EventDao.deleteServiceByFormSubmissionId(formSubmissionId);
+            }
 
             Timber.d("Ending processDeleteEvent: %s", event.getEventId());
         } catch (Exception e) {

diff --git a/opensrp-chw-core/src/main/java/org/smartregister/chw/core/utils/VisitVaccineUtil.java b/opensrp-chw-core/src/main/java/org/smartregister/chw/core/utils/VisitVaccineUtil.java
@@ -53,10 +53,10 @@ public static Map<String, VaccineRepo.Vaccine> getAllVaccines() {
 
             List<VaccineRepo.Vaccine> allVacs = new ArrayList<>();
 
-            List<VaccineRepo.Vaccine> woman =   ImmunizationLibrary.getVaccineCacheMap().get("woman").vaccineRepo;
+            List<VaccineRepo.Vaccine> woman = ImmunizationLibrary.getVaccineCacheMap().get("woman").vaccineRepo;
             allVacs.addAll(woman);
 
-            List<VaccineRepo.Vaccine> child =   ImmunizationLibrary.getVaccineCacheMap().get("child").vaccineRepo;
+            List<VaccineRepo.Vaccine> child = ImmunizationLibrary.getVaccineCacheMap().get("child").vaccineRepo;
             allVacs.addAll(child);
 
             for (VaccineRepo.Vaccine vaccine : allVacs) {
@@ -281,6 +281,7 @@ public static List<Alert> getInMemoryAlerts(
         try {
             if (vaccineSchedules != null && vaccineSchedules.containsKey(vaccineCategory)) {
                 for (VaccineSchedule curSchedule : vaccineSchedules.get(vaccineCategory).values()) {
+                    if (curSchedule == null) continue;
                     Alert curAlert = curSchedule.getOfflineAlert(baseEntityId, dob.toDate(), issuedVaccines);
                     if (curAlert != null && curAlert.startDate() != null) {
                         generatedAlerts.add(curAlert);

diff --git a/opensrp-chw-core/src/test/java/org/smartregister/chw/core/sync/CoreClientProcessorTest.java b/opensrp-chw-core/src/test/java/org/smartregister/chw/core/sync/CoreClientProcessorTest.java
@@ -0,0 +1,31 @@
+package org.smartregister.chw.core.sync;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.smartregister.chw.core.BaseUnitTest;
+import org.smartregister.immunization.domain.Vaccine;
+import org.smartregister.immunization.repository.VaccineRepository;
+
+public class CoreClientProcessorTest extends BaseUnitTest {
+
+    @Mock
+    private VaccineRepository vaccineRepository;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    public void testAddVaccine() {
+        Vaccine vaccine = new Vaccine();
+        vaccine.setName("MEASLES 1");
+
+        CoreClientProcessor.addVaccine(vaccineRepository, vaccine);
+        Mockito.verify(vaccineRepository).add(vaccine);
+        Mockito.verify(vaccineRepository).updateFtsSearch(Mockito.any());
+    }
+}