tei-capture-scope: extract the get orgUnitUids functionality to a method

dhis2 · May 16, 2018 · 5354d82 · 5354d82
1 parent 9df7f15
commit 5354d82
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/TrackerEntitiesDataCall.java b/core/src/main/java/org/hisp/dhis/android/core/calls/TrackerEntitiesDataCall.java
@@ -77,17 +77,7 @@ public Response call() throws Exception {
     private Response trackerCall(GenericCallData genericCallData) throws Exception {
         Response response = null;
 
-        Set<UserOrganisationUnitLinkModel> userOrganisationUnitLinks = userOrganisationUnitLinkStore.selectAll(
-                UserOrganisationUnitLinkModel.factory);
-
-        Set<String> organisationUnitUids = new HashSet<>();
-
-        for (UserOrganisationUnitLinkModel linkModel: userOrganisationUnitLinks) {
-            if (linkModel.organisationUnitScope().equals(
-                    OrganisationUnitModel.Scope.SCOPE_DATA_CAPTURE.name())) {
-                organisationUnitUids.add(linkModel.organisationUnit());
-            }
-        }
+        Set<String> organisationUnitUids = getOrgUnitUids();
 
         int pageSize = TeiQuery.Builder.create().build().getPageSize();
 
@@ -131,6 +121,22 @@ private Response trackerCall(GenericCallData genericCallData) throws Exception {
         return response;
     }
 
+    private Set<String> getOrgUnitUids() {
+        Set<UserOrganisationUnitLinkModel> userOrganisationUnitLinks = userOrganisationUnitLinkStore.selectAll(
+                UserOrganisationUnitLinkModel.factory);
+
+        Set<String> organisationUnitUids = new HashSet<>();
+
+        for (UserOrganisationUnitLinkModel linkModel: userOrganisationUnitLinks) {
+            if (linkModel.organisationUnitScope().equals(
+                    OrganisationUnitModel.Scope.SCOPE_DATA_CAPTURE.name())) {
+                organisationUnitUids.add(linkModel.organisationUnit());
+            }
+        }
+
+        return organisationUnitUids;
+    }
+
 
     public static TrackerEntitiesDataCall create(DatabaseAdapter databaseAdapter, Retrofit retrofit,
                                                  int teiLimitByOrgUnit) {