feat: export /tracker/event using different idSchemes

dhis2 · Nov 7, 2024 · 3e781a9 · 3e781a9
1 parent 583b273
commit 3e781a9
Show file tree

Hide file tree

Showing 24 changed files with 4,919 additions and 569 deletions.
diff --git a/...rvices/dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/TrackerIdSchemeParam.java b/...rvices/dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/TrackerIdSchemeParam.java
@@ -113,4 +113,20 @@ public MetadataIdentifier toMetadataIdentifier(String identifier) {
     }
     return MetadataIdentifier.of(this.idScheme, identifier, null);
   }
+
+  /**
+   * Returns this {@link TrackerIdSchemeParam} as expected in a request parameter which makes it
+   * usable in tests. It is also a more readable format than what lombok produces.
+   */
+  @Override
+  public String toString() {
+    if (this.idScheme == null) {
+      return "";
+    }
+    if (this.idScheme == TrackerIdScheme.ATTRIBUTE) {
+      return this.idScheme.name() + ":" + this.attributeUid;
+    }
+
+    return this.idScheme.name();
+  }
 }
diff --git a/...ervice-tracker/src/main/java/org/hisp/dhis/tracker/export/event/EventOperationParams.java b/...ervice-tracker/src/main/java/org/hisp/dhis/tracker/export/event/EventOperationParams.java
@@ -41,7 +41,6 @@
 import lombok.Getter;
 import org.hisp.dhis.category.CategoryOptionCombo;
 import org.hisp.dhis.common.AssignedUserSelectionMode;
-import org.hisp.dhis.common.IdSchemes;
 import org.hisp.dhis.common.OrganisationUnitSelectionMode;
 import org.hisp.dhis.common.QueryFilter;
 import org.hisp.dhis.common.SortDirection;
@@ -110,8 +109,6 @@ public class EventOperationParams {
 
   private CategoryOptionCombo categoryOptionCombo;
 
-  @Builder.Default private IdSchemes idSchemes = new IdSchemes();
-
   private boolean includeRelationships;
 
   /**

diff --git a/...-tracker/src/main/java/org/hisp/dhis/tracker/export/event/EventOperationParamsMapper.java b/...-tracker/src/main/java/org/hisp/dhis/tracker/export/event/EventOperationParamsMapper.java
@@ -136,7 +136,6 @@ public EventQueryParams map(
         .setEnrollmentOccurredAfter(operationParams.getEnrollmentOccurredAfter())
         .setEventStatus(operationParams.getEventStatus())
         .setCategoryOptionCombo(attributeOptionCombo)
-        .setIdSchemes(operationParams.getIdSchemes())
         .setIncludeAttributes(false)
         .setIncludeAllDataElements(false)
         .setEvents(operationParams.getEvents())

diff --git a/...is-service-tracker/src/main/java/org/hisp/dhis/tracker/export/event/EventQueryParams.java b/...is-service-tracker/src/main/java/org/hisp/dhis/tracker/export/event/EventQueryParams.java
@@ -40,7 +40,6 @@
 import org.apache.commons.collections4.SetUtils;
 import org.hisp.dhis.category.CategoryOptionCombo;
 import org.hisp.dhis.common.AssignedUserQueryParam;
-import org.hisp.dhis.common.IdSchemes;
 import org.hisp.dhis.common.OrganisationUnitSelectionMode;
 import org.hisp.dhis.common.QueryFilter;
 import org.hisp.dhis.common.SortDirection;
@@ -103,8 +102,6 @@ class EventQueryParams {
 
   private CategoryOptionCombo categoryOptionCombo;
 
-  private IdSchemes idSchemes = new IdSchemes();
-
   private boolean includeRelationships;
 
   /**
@@ -376,15 +373,6 @@ public EventQueryParams setEnrollmentOccurredAfter(Date enrollmentOccurredAfter)
     return this;
   }
 
-  public IdSchemes getIdSchemes() {
-    return idSchemes;
-  }
-
-  public EventQueryParams setIdSchemes(IdSchemes idSchemes) {
-    this.idSchemes = idSchemes;
-    return this;
-  }
-
   public boolean isIncludeAttributes() {
     return includeAttributes;
   }
@@ -560,7 +548,7 @@ public boolean isOrganisationUnitMode(OrganisationUnitSelectionMode mode) {
 
   public boolean isPathOrganisationUnitMode() {
     return orgUnitMode != null
-        && (orgUnitMode.equals(OrganisationUnitSelectionMode.DESCENDANTS)
-            || orgUnitMode.equals(OrganisationUnitSelectionMode.CHILDREN));
+        && (OrganisationUnitSelectionMode.DESCENDANTS.equals(orgUnitMode)
+            || OrganisationUnitSelectionMode.CHILDREN.equals(orgUnitMode));
   }
 }