Merge pull request #145 from OpenSRP/add_delete_vaccine_by_name

Add delete vaccine by name
opensrp · Oct 19, 2020 · b7c8b99 · b7c8b99
2 parents 3919fa3 + 05bfa29
commit b7c8b99
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=2.0.1-SNAPSHOT
+VERSION_NAME=2.0.2-SNAPSHOT
 VERSION_CODE=2
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Immunization

diff --git a/...munization/src/main/java/org/smartregister/immunization/repository/VaccineRepository.java b/...munization/src/main/java/org/smartregister/immunization/repository/VaccineRepository.java
@@ -236,7 +236,7 @@ public List<Vaccine> findUnSynced() {
         return vaccines;
     }
 
-    private List<Vaccine> readAllVaccines(Cursor cursor) {
+    public List<Vaccine> readAllVaccines(Cursor cursor) {
         List<Vaccine> vaccines = new ArrayList<>();
 
         try {
@@ -370,6 +370,15 @@ public List<Vaccine> findWithNullHia2Status() {
         return vaccines;
     }
 
+    public void deleteVaccine(String baseEntityId, String vaccineName) {
+        try {
+            getWritableDatabase().delete(VACCINE_TABLE_NAME, BASE_ENTITY_ID + " = ? AND " + NAME + " = ? ", new String[] {baseEntityId, vaccineName});
+            updateFtsSearch(baseEntityId, vaccineName);
+        } catch (Exception e) {
+            Timber.e(e);
+        }
+    }
+
     public void deleteVaccine(Long caseId) {
         try {
             Vaccine vaccine = find(caseId);

diff --git a/...zation/src/test/java/org/smartregister/immunization/repository/VaccineRepositoryTest.java b/...zation/src/test/java/org/smartregister/immunization/repository/VaccineRepositoryTest.java
@@ -166,6 +166,36 @@ public void verifyaddTestShouldCallInsertAndUpdate1Time() {
                         org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class));
     }
 
+    @Test
+    public void testReadAllReturnsListOfVaccines(){
+        String[] columns = new String[]{
+                VaccineRepository.ID_COLUMN,
+                VaccineRepository.BASE_ENTITY_ID,
+                VaccineRepository.PROGRAM_CLIENT_ID,
+                VaccineRepository.NAME,
+                VaccineRepository.CALCULATION,
+                VaccineRepository.DATE,
+                VaccineRepository.ANMID,
+                VaccineRepository.LOCATION_ID,
+                VaccineRepository.SYNC_STATUS,
+                VaccineRepository.HIA2_STATUS,
+                VaccineRepository.UPDATED_AT_COLUMN,
+                VaccineRepository.EVENT_ID,
+                VaccineRepository.FORMSUBMISSION_ID,
+                VaccineRepository.OUT_OF_AREA,
+                VaccineRepository.CREATED_AT,
+                VaccineRepository.TEAM,
+                VaccineRepository.TEAM_ID,
+                VaccineRepository.CHILD_LOCATION_ID
+        };
+
+        MatrixCursor cursor = new MatrixCursor(columns);
+        cursor.addRow(new Object[]{1l, "", "", magicName, magic10, magicTime, "", "", "", "", 1l, "", "", 1,magicTime,"","",""});
+
+        List<Vaccine> vaccines = vaccineRepository.readAllVaccines(cursor);
+        Assert.assertFalse(vaccines.isEmpty());
+    }
+
     @Test
     public void verifyUpdateTestCallsDatabaseUpdate1Time() {
         Vaccine vaccine = new Vaccine();
@@ -295,6 +325,16 @@ public void deleteVaccineTest() {
                         org.mockito.ArgumentMatchers.any(String[].class));
     }
 
+    @Test
+    public void deleteVaccineByBaseEntityIdAndName() {
+        VaccineRepository vaccineRepositoryspy = Mockito.spy(vaccineRepository);
+        Mockito.when(vaccineRepositoryspy.getWritableDatabase()).thenReturn(sqliteDatabase);
+        vaccineRepositoryspy.deleteVaccine("baseEntityID","opv_1");
+        Mockito.verify(sqliteDatabase, Mockito.times(1))
+                .delete(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.anyString(),
+                        org.mockito.ArgumentMatchers.any(String[].class));
+    }
+
     @Test
     public void findWithNullHia2StatusTest() {