From f283a82159f1812bf3a4617ded42856cb7fa9d51 Mon Sep 17 00:00:00 2001 From: Qazi Abubakar Date: Fri, 8 Jan 2021 12:10:01 +0500 Subject: [PATCH 1/3] Overloaded the Vaccines constructor for backward compatibility Removed unused code --- .../immunization/domain/Vaccine.java | 21 +++++++++++++++++++ .../service/intent/VaccineIntentService.java | 4 ---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/opensrp-immunization/src/main/java/org/smartregister/immunization/domain/Vaccine.java b/opensrp-immunization/src/main/java/org/smartregister/immunization/domain/Vaccine.java index 39d0ba9d..018b9aec 100644 --- a/opensrp-immunization/src/main/java/org/smartregister/immunization/domain/Vaccine.java +++ b/opensrp-immunization/src/main/java/org/smartregister/immunization/domain/Vaccine.java @@ -51,6 +51,27 @@ public Vaccine(Long id, String baseEntityId, String name, Integer calculation, D this.outOfCatchment = outOfCatchment; } + public Vaccine(Long id, String baseEntityId, String programClientId, String name, Integer + calculation, Date date, String anmId, String locationId, String syncStatus, String + hia2Status, Long updatedAt, String eventId, String formSubmissionId, Integer + outOfCatchment, Date createdAt) { + this.id = id; + this.baseEntityId = baseEntityId; + this.programClientId = programClientId; + this.name = name; + this.calculation = calculation; + this.date = date; + this.anmId = anmId; + this.locationId = locationId; + this.syncStatus = syncStatus; + this.hia2Status = hia2Status; + this.updatedAt = updatedAt; + this.eventId = eventId; + this.formSubmissionId = formSubmissionId; + this.outOfCatchment = outOfCatchment; + this.createdAt = createdAt; + } + public Vaccine(Long id, String baseEntityId, String programClientId, String name, Integer calculation, Date date, String anmId, String locationId, String syncStatus, String hia2Status, Long updatedAt, String eventId, String formSubmissionId, Integer diff --git a/opensrp-immunization/src/main/java/org/smartregister/immunization/service/intent/VaccineIntentService.java b/opensrp-immunization/src/main/java/org/smartregister/immunization/service/intent/VaccineIntentService.java index 4be1ddea..7bd36793 100644 --- a/opensrp-immunization/src/main/java/org/smartregister/immunization/service/intent/VaccineIntentService.java +++ b/opensrp-immunization/src/main/java/org/smartregister/immunization/service/intent/VaccineIntentService.java @@ -138,12 +138,8 @@ protected void onHandleIntent(Intent intent) { //log out of catchment service since this is required in some of the hia2 report indicators if (vaccine.getBaseEntityId() == null || vaccine.getBaseEntityId().isEmpty() || new Integer(1).equals(vaccine.getOutOfCatchment())) { JsonFormUtils.createVaccineEvent(getApplicationContext(), vaccine, getEventTypeOutOfCatchment(), getEntityType(), jsonArray); - } - if (vaccine.getBaseEntityId() == null || vaccine.getBaseEntityId().isEmpty() || new Integer(1).equals(vaccine.getOutOfCatchment())) { - JsonFormUtils.createVaccineEvent(getApplicationContext(), vaccine, getEventTypeIsVoided(), getEntityType(), jsonArray); - } vaccineRepository.close(vaccine.getId()); } } From 1d6c9c707d51523ddb5d520f58599309e13f1227 Mon Sep 17 00:00:00 2001 From: Qazi Abubakar Date: Mon, 11 Jan 2021 11:19:31 +0500 Subject: [PATCH 2/3] Fixed tests --- .../smartregister/immunization/domain/VaccineScheduleTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/domain/VaccineScheduleTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/domain/VaccineScheduleTest.java index f73a977b..b1495d6d 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/domain/VaccineScheduleTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/domain/VaccineScheduleTest.java @@ -58,7 +58,7 @@ public class VaccineScheduleTest extends BaseUnitTest { private Vaccine newVaccine = new Vaccine(0l, VaccineTest.BASEENTITYID, VaccineTest.PROGRAMCLIENTID, magicOPV0, 0, new Date(), VaccineTest.ANMID, VaccineTest.LOCATIONID, VaccineTest.SYNCSTATUS, VaccineTest.HIA2STATUS, 0l, - VaccineTest.EVENTID, VaccineTest.FORMSUBMISSIONID, 0, new Date(), 1); + VaccineTest.EVENTID, VaccineTest.FORMSUBMISSIONID, 0, new Date()); @Before public void setUp() { From 3aa4c7690548864474723dd9afcb45c7e2c83dd9 Mon Sep 17 00:00:00 2001 From: Qazi Abubakar Date: Mon, 11 Jan 2021 11:37:49 +0500 Subject: [PATCH 3/3] Bumped up library version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 36a1de13..605c069d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -VERSION_NAME=3.0.3-SNAPSHOT +VERSION_NAME=3.0.4-SNAPSHOT VERSION_CODE=2 GROUP=org.smartregister POM_SETTING_DESCRIPTION=OpenSRP Client Immunization