From 8af17ea7b977d3e094ffc20215dc9d6488fbd07f Mon Sep 17 00:00:00 2001 From: mahmud6390 Date: Thu, 31 Jan 2019 14:16:25 +0600 Subject: [PATCH 1/3] code refacor and update core version --- build.gradle | 2 -- opensrp-immunization/build.gradle | 2 +- .../org/smartregister/immunization/util/VaccinatorUtils.java | 1 - sample/build.gradle | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 8a303bc8..87efcbde 100644 --- a/build.gradle +++ b/build.gradle @@ -45,8 +45,6 @@ subprojects { jcenter() mavenCentral() maven { url 'https://jitpack.io' } - maven { url "http://nexus.motechproject.org/content/repositories/drishti" } - maven { url "http://nexus.motechproject.org/content/repositories/snapshots" } maven { url "http://acra.googlecode.com/svn/repository/releases" } maven { url "http://repo.maven.apache.org/maven2" } maven { url "http://cloudant.github.io/cloudant-sync-eap/repository" } diff --git a/opensrp-immunization/build.gradle b/opensrp-immunization/build.gradle index 7c17edac..d3bf7184 100644 --- a/opensrp-immunization/build.gradle +++ b/opensrp-immunization/build.gradle @@ -86,7 +86,7 @@ tasks.withType(Test) { } dependencies { - implementation('org.smartregister:opensrp-client-core:1.3.5-SNAPSHOT@aar') { + implementation('org.smartregister:opensrp-client-core:1.5.16-SNAPSHOT@aar') { transitive = true exclude group: 'com.github.bmelnychuk', module: 'atv' } diff --git a/opensrp-immunization/src/main/java/org/smartregister/immunization/util/VaccinatorUtils.java b/opensrp-immunization/src/main/java/org/smartregister/immunization/util/VaccinatorUtils.java index 36cb22c3..e3a9823c 100644 --- a/opensrp-immunization/src/main/java/org/smartregister/immunization/util/VaccinatorUtils.java +++ b/opensrp-immunization/src/main/java/org/smartregister/immunization/util/VaccinatorUtils.java @@ -80,7 +80,6 @@ import static org.smartregister.util.Utils.convertDateFormat; import static org.smartregister.util.Utils.getPreference; import static org.smartregister.util.Utils.getValue; - /** * Class containing some static utility methods. */ diff --git a/sample/build.gradle b/sample/build.gradle index ed3f9e61..0b044159 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -73,7 +73,7 @@ android { dependencies { testImplementation 'junit:junit:4.12' - implementation('org.smartregister:opensrp-client-core:1.3.5-SNAPSHOT@aar') { + implementation('org.smartregister:opensrp-client-core:1.5.16-SNAPSHOT@aar') { transitive = true exclude group: 'com.github.bmelnychuk', module: 'atv' } From 6ee6b4fb8b7a3d96b7784f2faa330cb9f8219ab9 Mon Sep 17 00:00:00 2001 From: rkodev <43806892+rkodev@users.noreply.github.com> Date: Thu, 31 Jan 2019 12:09:16 +0300 Subject: [PATCH 2/3] Braking changes fix. Core v1.5.16 --- .../immunization/util/VaccinatorUtils.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/opensrp-immunization/src/main/java/org/smartregister/immunization/util/VaccinatorUtils.java b/opensrp-immunization/src/main/java/org/smartregister/immunization/util/VaccinatorUtils.java index e3a9823c..03f3efb5 100644 --- a/opensrp-immunization/src/main/java/org/smartregister/immunization/util/VaccinatorUtils.java +++ b/opensrp-immunization/src/main/java/org/smartregister/immunization/util/VaccinatorUtils.java @@ -78,8 +78,8 @@ import static org.smartregister.util.Utils.addToList; import static org.smartregister.util.Utils.addToRow; import static org.smartregister.util.Utils.convertDateFormat; -import static org.smartregister.util.Utils.getPreference; import static org.smartregister.util.Utils.getValue; + /** * Class containing some static utility methods. */ @@ -90,7 +90,7 @@ public static HashMap providerDetails() { org.smartregister.Context context = ImmunizationLibrary.getInstance().context(); org.smartregister.util.Log.logDebug("ANM DETAILS" + context.anmController().get()); org.smartregister.util.Log.logDebug("USER DETAILS" + context.allSettings().fetchUserInformation()); - org.smartregister.util.Log.logDebug("TEAM DETAILS" + getPreference(context.applicationContext(), "team", "{}")); + org.smartregister.util.Log.logDebug("TEAM DETAILS" + context.allSharedPreferences().getPreference("team")); String locationJson = context.anmLocationController().get(); LocationTree locationTree = AssetHandler.jsonStringToJava(locationJson, LocationTree.class); @@ -117,7 +117,7 @@ public static HashMap providerDetails() { } try { - JSONObject tm = new JSONObject(getPreference(context.applicationContext(), "team", "{}")); + JSONObject tm = new JSONObject(context.allSharedPreferences().getPreference("team")); map.put("provider_name", tm.getJSONObject("person").getString("display")); map.put("provider_identifier", tm.getString("identifier")); map.put("provider_team", tm.getJSONObject("team").getString("teamName")); @@ -130,7 +130,7 @@ public static HashMap providerDetails() { public static ArrayList> getWasted(String startDate, String endDate, String type) { String sqlWasted = "select sum (total_wasted)as total_wasted from stock where `report` ='" + type + "' and `date` between '" + startDate + "' and '" + endDate + "'"; - return ImmunizationLibrary.getInstance().context().commonrepository("stock").rawQuery(sqlWasted); + return ImmunizationLibrary.getInstance().context().commonrepository("stock").rawQuery(sqlWasted, new String[]{}); } public static int getWasted(String startDate, String endDate, String type, String... variables) { @@ -154,7 +154,7 @@ public static ArrayList> getUsed(String startDate, Strin q += " ) e "; Log.i("DD", q); - return ImmunizationLibrary.getInstance().context().commonrepository(table).rawQuery(q); + return ImmunizationLibrary.getInstance().context().commonrepository(table).rawQuery(q, new String[]{}); } public static int getTotalUsed(String startDate, String endDate, String table, String... vaccines) { From 665dce75510ef07494e676e3d5d139c70e0cc731 Mon Sep 17 00:00:00 2001 From: rkodev <43806892+rkodev@users.noreply.github.com> Date: Thu, 31 Jan 2019 12:39:21 +0300 Subject: [PATCH 3/3] Breaking Changes - Test --- .../immunization/utils/VaccinatorUtilsTest.java | 6 ++++-- .../immunization/sample/repository/SampleRepository.java | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/VaccinatorUtilsTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/VaccinatorUtilsTest.java index e504faee..bedd9716 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/VaccinatorUtilsTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/VaccinatorUtilsTest.java @@ -41,6 +41,8 @@ import java.util.Date; import java.util.List; +import static org.mockito.ArgumentMatchers.eq; + /** * Created by onaio on 29/08/2017. */ @@ -80,7 +82,7 @@ public void verifygetwastedcallssqlmethodonce() { PowerMockito.when(ImmunizationLibrary.getInstance().context().commonrepository(org.mockito.ArgumentMatchers.anyString())).thenReturn(commonRepository); VaccinatorUtils.getWasted("", "", ""); VaccinatorUtils.getWasted("", "", "", ""); - Mockito.verify(commonRepository, Mockito.times(1)).rawQuery(org.mockito.ArgumentMatchers.anyString()); + Mockito.verify(commonRepository, Mockito.times(1)).rawQuery(org.mockito.ArgumentMatchers.anyString(), eq(new String[]{})); } @Test @@ -90,7 +92,7 @@ public void verifyGetUsedcallssqlmethodonce() { PowerMockito.when(ImmunizationLibrary.getInstance().context()).thenReturn(context); PowerMockito.when(ImmunizationLibrary.getInstance().context().commonrepository(org.mockito.ArgumentMatchers.anyString())).thenReturn(commonRepository); VaccinatorUtils.getUsed("", "", "", new String[]{"", ""}); - Mockito.verify(commonRepository, Mockito.times(1)).rawQuery(org.mockito.ArgumentMatchers.anyString()); + Mockito.verify(commonRepository, Mockito.times(1)).rawQuery(org.mockito.ArgumentMatchers.anyString(), eq(new String[]{})); } @Test diff --git a/sample/src/main/java/org/smartregister/immunization/sample/repository/SampleRepository.java b/sample/src/main/java/org/smartregister/immunization/sample/repository/SampleRepository.java index cfa3626b..39be3771 100644 --- a/sample/src/main/java/org/smartregister/immunization/sample/repository/SampleRepository.java +++ b/sample/src/main/java/org/smartregister/immunization/sample/repository/SampleRepository.java @@ -40,9 +40,9 @@ public SampleRepository(Context context, org.smartregister.Context openSRPContex public void onCreate(SQLiteDatabase database) { super.onCreate(database); EventClientRepository.createTable(database, EventClientRepository.Table.client, EventClientRepository.client_column.values()); - EventClientRepository.createTable(database, EventClientRepository.Table.address, EventClientRepository.address_column.values()); + //EventClientRepository.createTable(database, EventClientRepository.Table.address, EventClientRepository.address_column.values()); EventClientRepository.createTable(database, EventClientRepository.Table.event, EventClientRepository.event_column.values()); - EventClientRepository.createTable(database, EventClientRepository.Table.obs, EventClientRepository.obs_column.values()); + //EventClientRepository.createTable(database, EventClientRepository.Table.obs, EventClientRepository.obs_column.values()); VaccineRepository.createTable(database); VaccineNameRepository.createTable(database); @@ -151,7 +151,7 @@ private void upgradeToVersion2(SQLiteDatabase db) { db.execSQL(VaccineRepository.UPDATE_TABLE_ADD_OUT_OF_AREA_COL); db.execSQL(VaccineRepository.UPDATE_TABLE_ADD_OUT_OF_AREA_COL_INDEX); - EventClientRepository.createTable(db, EventClientRepository.Table.path_reports, EventClientRepository.report_column.values()); + //EventClientRepository.createTable(db, EventClientRepository.Table.path_reports, EventClientRepository.report_column.values()); db.execSQL(VaccineRepository.UPDATE_TABLE_ADD_HIA2_STATUS_COL); IMDatabaseUtils.accessAssetsAndFillDataBaseForVaccineTypes(context, db);