From 5ed7b355483d88b47ef45032177657ba4f005f76 Mon Sep 17 00:00:00 2001 From: vend Date: Thu, 23 Sep 2021 12:32:32 +0500 Subject: [PATCH 1/6] vaccine outreach column populated --- .../src/main/java/org/smartregister/child/util/Utils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opensrp-child/src/main/java/org/smartregister/child/util/Utils.java b/opensrp-child/src/main/java/org/smartregister/child/util/Utils.java index 806ba2191..c543c82fd 100644 --- a/opensrp-child/src/main/java/org/smartregister/child/util/Utils.java +++ b/opensrp-child/src/main/java/org/smartregister/child/util/Utils.java @@ -211,7 +211,7 @@ public static void addVaccine(VaccineRepository vaccineRepository, Vaccine vacci String providerId = allSharedPreferences.fetchRegisteredANM(); vaccine.setTeam(allSharedPreferences.fetchDefaultTeam(providerId)); vaccine.setTeamId(allSharedPreferences.fetchDefaultTeamId(providerId)); - + vaccine.setOutreach(vaccine.getLocationId().equals(allSharedPreferences.fetchDefaultLocalityId(providerId))? 0 : 1); vaccine.setName(vaccine.getName().trim()); // Add the vaccine vaccineRepository.add(vaccine); From f06aa2caa5e91cbb77782901b49510007fdd63c5 Mon Sep 17 00:00:00 2001 From: vend Date: Wed, 20 Oct 2021 11:54:19 +0500 Subject: [PATCH 2/6] immunization library updated --- opensrp-child/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opensrp-child/build.gradle b/opensrp-child/build.gradle index 94904fcee..b54b3d03f 100644 --- a/opensrp-child/build.gradle +++ b/opensrp-child/build.gradle @@ -140,7 +140,7 @@ dependencies { exclude group: 'com.android.support', module: 'appcompat-v7' } - api('org.smartregister:opensrp-client-immunization:4.0.0-SNAPSHOT@aar') { + api('org.smartregister:opensrp-client-immunization:4.0.1-SNAPSHOT@aar') { transitive = true exclude group: 'org.smartregister', module: 'opensrp-client-core' exclude group: 'org.smartregister', module: 'opensrp-client-native-form' From 40ff0b9ea8af9f0edc48179a82b38a19dcbffd9f Mon Sep 17 00:00:00 2001 From: vend Date: Wed, 17 Nov 2021 18:59:16 +0500 Subject: [PATCH 3/6] test updated for the outreach enhancement --- .../test/java/org/smartregister/child/utils/UtilsTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/opensrp-child/src/test/java/org/smartregister/child/utils/UtilsTest.java b/opensrp-child/src/test/java/org/smartregister/child/utils/UtilsTest.java index 2a0583368..0a3bf8079 100644 --- a/opensrp-child/src/test/java/org/smartregister/child/utils/UtilsTest.java +++ b/opensrp-child/src/test/java/org/smartregister/child/utils/UtilsTest.java @@ -138,9 +138,11 @@ public void getCombinedVaccineWithNonNullArgument() { public void addVaccineWithVaccineRepositoryOrVaccineNotNull() { Vaccine vaccine = new Vaccine(); vaccine.setName("testvaccine"); + vaccine.setLocationId("location1"); + vaccine.setOutreach(1); + Assert.assertNotNull(vaccine); Utils.addVaccine(vaccineRepository, vaccine); - Mockito.verify(vaccineRepository, Mockito.times(1)).add(vaccineArgumentCaptor.capture()); - Assert.assertEquals(vaccine, vaccineArgumentCaptor.getValue()); + Mockito.verify(vaccineRepository, Mockito.times(1)).add(vaccine); } @Test From 42e46ba8412fc254dfbc3ae8bbe2c120475c0989 Mon Sep 17 00:00:00 2001 From: vend Date: Fri, 19 Nov 2021 17:01:17 +0500 Subject: [PATCH 4/6] increased the heap memory of ci jvm --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 16154ec94..4997e1aee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Run unit tests with Gradle - run: ./gradlew :opensrp-child:jacocoTestReport --stacktrace -Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError" + run: ./gradlew :opensrp-child:jacocoTestReport --stacktrace -Dorg.gradle.jvmargs="-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError" - name: Generate Javadoc with Gradle run: ./gradlew javadoc - name: Upload coverage to Coveralls with Gradle From 63a245d58694e2ba81bcc6b8814dc48e9da1c9bb Mon Sep 17 00:00:00 2001 From: Martin Ndegwa Date: Mon, 22 Nov 2021 19:29:42 +0300 Subject: [PATCH 5/6] Increase gradles java process memory max size --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 16154ec94..3d565f9fa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,10 +25,10 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Run unit tests with Gradle - run: ./gradlew :opensrp-child:jacocoTestReport --stacktrace -Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError" + run: ./gradlew :opensrp-child:jacocoTestReport --stacktrace -Dorg.gradle.jvmargs="-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError" - name: Generate Javadoc with Gradle run: ./gradlew javadoc - name: Upload coverage to Coveralls with Gradle run: ./gradlew :opensrp-child:coveralls --stacktrace env: - COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }} \ No newline at end of file + COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }} From e4c8e78037b2797dbc2d8f6cbcd4272c658f7720 Mon Sep 17 00:00:00 2001 From: vend Date: Tue, 23 Nov 2021 19:08:08 +0500 Subject: [PATCH 6/6] upgraded dependency of immunization --- opensrp-child/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opensrp-child/build.gradle b/opensrp-child/build.gradle index b54b3d03f..b7a7b51b5 100644 --- a/opensrp-child/build.gradle +++ b/opensrp-child/build.gradle @@ -140,7 +140,7 @@ dependencies { exclude group: 'com.android.support', module: 'appcompat-v7' } - api('org.smartregister:opensrp-client-immunization:4.0.1-SNAPSHOT@aar') { + api('org.smartregister:opensrp-client-immunization:4.0.2-SNAPSHOT@aar') { transitive = true exclude group: 'org.smartregister', module: 'opensrp-client-core' exclude group: 'org.smartregister', module: 'opensrp-client-native-form'