fix: ou item names in visualization [DHIS2-18337] (2.41) (#19541)

* fix: formatting [DHIS2-18337] Signed-off-by: Giuseppe Nespolino <[email protected]> fix: ou item names in visualization [DHIS2-18337] (#19523) * fix: ou item names in visualization [DHIS2-18337] Signed-off-by: Giuseppe Nespolino <[email protected]> * fix: formatting [DHIS2-18337] Signed-off-by: Giuseppe Nespolino <[email protected]> --------- Signed-off-by: Giuseppe Nespolino <[email protected]> (cherry picked from commit 476cb6e) Signed-off-by: Giuseppe Nespolino <[email protected]> * fix: formatting [DHIS2-18337] Signed-off-by: Giuseppe Nespolino <[email protected]> --------- Signed-off-by: Giuseppe Nespolino <[email protected]>
dhis2 · Dec 19, 2024 · d255ccd · d255ccd
1 parent 7d46c5b
commit d255ccd
Showing 1 changed file with 25 additions and 3 deletions.
diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java
@@ -121,6 +121,15 @@
 @JacksonXmlRootElement(localName = "analyticalObject", namespace = DxfNamespaces.DXF_2_0)
 public abstract class BaseAnalyticalObject extends BaseNameableObject implements AnalyticalObject {
 
+  private static final BaseDimensionalItemObject USER_OU_ITEM_OBJ =
+      buildDimItemObj(KEY_USER_ORGUNIT, "User organisation unit");
+
+  private static final BaseDimensionalItemObject USER_OU_CHILDREN_ITEM_OBJ =
+      buildDimItemObj(KEY_USER_ORGUNIT_CHILDREN, "User organisation unit children");
+
+  private static final BaseDimensionalItemObject USER_OU_GRANDCHILDREN_ITEM_OBJ =
+      buildDimItemObj(KEY_USER_ORGUNIT_GRANDCHILDREN, "User organisation unit grand children");
+
   public static final String NOT_A_VALID_DIMENSION = "Not a valid dimension: %s";
 
   /** Line and axis labels. */
@@ -320,6 +329,19 @@ public abstract void init(
       List<OrganisationUnit> organisationUnitsInGroups,
       I18nFormat format);
 
+  /**
+   * Returns the dimensional item object for the given dimension and name.
+   *
+   * @param uid the dimension uid.
+   * @param name the dimension name.
+   * @return the DimensionalObject.
+   */
+  private static BaseDimensionalItemObject buildDimItemObj(String uid, String name) {
+    BaseDimensionalItemObject itemObj = new BaseDimensionalItemObject(uid);
+    itemObj.setName(name);
+    return itemObj;
+  }
+
   @Override
   public abstract void populateAnalyticalProperties();
 
@@ -700,15 +722,15 @@ protected Optional<DimensionalObject> getDimensionalObject(String dimension) {
         ouList.addAll(transientOrganisationUnits);
 
         if (userOrganisationUnit) {
-          ouList.add(new BaseDimensionalItemObject(KEY_USER_ORGUNIT));
+          ouList.add(USER_OU_ITEM_OBJ);
         }
 
         if (userOrganisationUnitChildren) {
-          ouList.add(new BaseDimensionalItemObject(KEY_USER_ORGUNIT_CHILDREN));
+          ouList.add(USER_OU_CHILDREN_ITEM_OBJ);
         }
 
         if (userOrganisationUnitGrandChildren) {
-          ouList.add(new BaseDimensionalItemObject(KEY_USER_ORGUNIT_GRANDCHILDREN));
+          ouList.add(USER_OU_GRANDCHILDREN_ITEM_OBJ);
         }
 
         if (organisationUnitLevels != null && !organisationUnitLevels.isEmpty()) {