fix: Analytics API returns invalid totalAggregationType [2.42-DHIS2-1…

…8045] (#18569)

* fix: Analytics API returns invalid totalAggregationType [2.42-DHIS2-18045]

* QA issue

(cherry picked from commit 3f32483)

dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseDimensionalItemObject.java

@@ -115,7 +115,9 @@ public String getDimensionItem(IdScheme idScheme) {
 
   @Override
   public TotalAggregationType getTotalAggregationType() {
-    return TotalAggregationType.SUM;
+    return getAggregationType() == AggregationType.NONE
+        ? TotalAggregationType.NONE
+        : TotalAggregationType.SUM;
   }
 
   // -------------------------------------------------------------------------

dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/TotalAggregationType.java

@@ -28,6 +28,7 @@
 package org.hisp.dhis.common;
 
 public enum TotalAggregationType {
+  NONE,
   SUM,
   AVERAGE
 }

dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/common/BaseDimensionalItemObjectTest.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2004-2024, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.common;
+
+import static org.junit.jupiter.api.Assertions.assertSame;
+
+import org.hisp.dhis.analytics.AggregationType;
+import org.junit.jupiter.api.Test;
+
+class BaseDimensionalItemObjectTest {
+  @Test
+  void testWhenBaseDimensionalItemObjectAggregationTypeIsNoneTotalAggregationTypeIsNone() {
+    // given
+    BaseDimensionalItemObject baseDimensionalItemObject = new BaseDimensionalItemObject();
+
+    // when
+    baseDimensionalItemObject.setAggregationType(AggregationType.NONE);
+
+    // then
+    assertSame(TotalAggregationType.NONE, baseDimensionalItemObject.getTotalAggregationType());
+  }
+
+  @Test
+  void testWhenBaseDimensionalItemObjectAggregationTypeIsNotNoneTotalAggregationTypeIsSum() {
+    // given
+    BaseDimensionalItemObject baseDimensionalItemObject = new BaseDimensionalItemObject();
+
+    // when
+    baseDimensionalItemObject.setAggregationType(AggregationType.AVERAGE_SUM_ORG_UNIT);
+
+    // then
+    assertSame(TotalAggregationType.SUM, baseDimensionalItemObject.getTotalAggregationType());
+  }
+}