Merge pull request #996 from dhis2/hotbugfixing

fix: [HOTBUGFIXING] Release 0.17.4
dhis2 · Sep 26, 2019 · 398ed67 · 398ed67
2 parents 973b227 + 94b5103
commit 398ed67
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/core/build.gradle b/core/build.gradle
@@ -36,8 +36,8 @@ ext {
             buildToolsVersion: "28.0.3",
             minSdkVersion    : 19,
             targetSdkVersion : 28,
-            versionCode      : 173,
-            versionName      : "0.17.3-SNAPSHOT"
+            versionCode      : 174,
+            versionName      : "0.17.4-SNAPSHOT"
     ]
 
     libraries = [

diff --git a/core/gradle.properties b/core/gradle.properties
@@ -29,8 +29,8 @@
 # Properties which are consumed by plugins/gradle-mvn-push.gradle plugin.
 # They are used for publishing artifact to snapshot repository.
 
-VERSION_NAME=0.17.3-SNAPSHOT
-VERSION_CODE=173
+VERSION_NAME=0.17.4-SNAPSHOT
+VERSION_CODE=174
 
 GROUP=org.hisp.dhis
 

diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallFactory.java
@@ -56,8 +56,8 @@ final class EventEndpointCallFactory {
     Callable<List<Event>> getCall(final EventQuery eventQuery) {
         return () -> {
 
-            Call<Payload<Event>> call = service.getEvents(eventQuery.orgUnit(), eventQuery.program(),
-                    eventQuery.trackedEntityInstance(), EventFields.allFields, Boolean.TRUE,
+            Call<Payload<Event>> call = service.getEvents(eventQuery.orgUnit(), eventQuery.ouMode().name(),
+                    eventQuery.program(), eventQuery.trackedEntityInstance(), EventFields.allFields, Boolean.TRUE,
                     eventQuery.page(), eventQuery.pageSize(), eventQuery.lastUpdatedStartDate(), true);
 
             return apiCallExecutor.executePayloadCall(call);

diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.java b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.java
@@ -43,6 +43,7 @@
 
 interface EventService {
     String ORG_UNIT = "orgUnit";
+    String OU_MODE = "ouMode";
     String PROGRAM = "program";
     String TRACKED_ENTITY_INSTANCE = "trackedEntityInstance";
     String FIELDS = "fields";
@@ -61,6 +62,7 @@ interface EventService {
     @GET(EVENTS)
     Call<Payload<Event>> getEvents(
             @Query(ORG_UNIT) String orgUnit,
+            @Query(OU_MODE) String orgUnitMode,
             @Query(PROGRAM) String program,
             @Query(TRACKED_ENTITY_INSTANCE) String trackedEntityInstance,
             @Query(FIELDS) @Which Fields<Event> fields,

diff --git a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallShould.java b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallShould.java
@@ -108,7 +108,8 @@ public void realize_request_with_orgUnit_program_filters_when_included_in_query(
 
         RecordedRequest request = mockWebServer.takeRequest();
 
-        assertThat(request.getPath(), containsString("orgUnit=OU&program=P"));
+        assertThat(request.getPath(), containsString("orgUnit=OU"));
+        assertThat(request.getPath(), containsString("program=P"));
     }
 
     private Callable<List<Event>> givenAEventCallByUIds(int numUIds) {