fix: Remove unnecessary subquery for event data value [DHIS2-18417]

dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractEventJdbcTableManager.java

@@ -150,20 +150,18 @@ protected String getSelectExpressionForAttribute(ValueType valueType, String col
    * @return a select expression appropriate for the given value type and context.
    */
   private String getSelectExpression(ValueType valueType, String columnExpression, boolean isTea) {
-    String doubleType = sqlBuilder.dataTypeDouble();
-
     if (valueType.isDecimal()) {
-      return "cast(" + columnExpression + " as " + doubleType + ")";
+      return getCastExpression(columnExpression, NUMERIC_REGEXP, sqlBuilder.dataTypeDouble());
     } else if (valueType.isInteger()) {
-      return "cast(" + columnExpression + " as bigint)";
+      return getCastExpression(columnExpression, NUMERIC_REGEXP, sqlBuilder.dataTypeBigInt());
     } else if (valueType.isBoolean()) {
       return "case when "
           + columnExpression
           + " = 'true' then 1 when "
           + columnExpression
           + " = 'false' then 0 else null end";
     } else if (valueType.isDate()) {
-      return "cast(" + columnExpression + " as " + sqlBuilder.dataTypeTimestamp() + ")";
+      return getCastExpression(columnExpression, DATE_REGEXP, sqlBuilder.dataTypeTimestamp());
     } else if (valueType.isGeo() && isSpatialSupport()) {
       return "ST_GeomFromGeoJSON('{\"type\":\"Point\", \"coordinates\":' || ("
           + columnExpression
@@ -179,6 +177,20 @@ private String getSelectExpression(ValueType valueType, String columnExpression,
     }
   }
 
+  /**
+   * Returns a cast expression which includes a value filter for the given value type.
+   *
+   * @param columnExpression the column expression.
+   * @param filterRegex the value type filter regular expression.
+   * @param dataType the SQL data type.
+   * @return a cast and validate expression.
+   */
+  String getCastExpression(String columnExpression, String filterRegex, String dataType) {
+    String filter = sqlBuilder.regexpMatch(columnExpression, filterRegex);
+    return String.format(
+        "case when %s then cast(%s as %s) else null end", filter, columnExpression, dataType);
+  }
+
   @Override
   public boolean validState() {
     return tableIsNotEmpty("event");

dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java

@@ -672,7 +672,7 @@ private String getSelectForInsert(
     String sqlTemplate =
         dataElement.getValueType().isOrganisationUnit()
             ? "(select ${selectExpression} ${dataClause})${closingParentheses} as ${uid}"
-            : "(select ${selectExpression} from ${event} where eventid=ev.eventid ${dataClause})${closingParentheses} as ${uid}";
+            : "${selectExpression}${closingParentheses} as ${uid}";
 
     return replaceQualify(
         sqlTemplate,

dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/table/AbstractEventJdbcTableManagerTest.java

@@ -0,0 +1,104 @@
+/*
+ * 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.analytics.table;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.hisp.dhis.common.ValueType;
+import org.hisp.dhis.db.sql.PostgreSqlBuilder;
+import org.hisp.dhis.db.sql.SqlBuilder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Spy;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+class AbstractEventJdbcTableManagerTest {
+
+  @Spy private SqlBuilder sqlBuilder = new PostgreSqlBuilder();
+
+  @InjectMocks private JdbcEventAnalyticsTableManager manager;
+
+  @Test
+  void testGetCastExpression() {
+    String expected =
+        """
+        case when eventdatavalues #>> '{GieVkTxp4HH, value}' ~* '^(-?[0-9]+)(\\.[0-9]+)?$' \
+        then cast(eventdatavalues #>> '{GieVkTxp4HH, value}' as double precision) \
+        else null end""";
+
+    String actual =
+        manager.getCastExpression(
+            "eventdatavalues #>> '{GieVkTxp4HH, value}'",
+            "'^(-?[0-9]+)(\\.[0-9]+)?$'",
+            "double precision");
+
+    assertEquals(expected, actual);
+  }
+
+  @Test
+  void testGetSelectExpressionNumber() {
+    String expected =
+        """
+        case when eventdatavalues #>> '{GieVkTxp4HH, value}' ~* '^(-?[0-9]+)(\\.[0-9]+)?$' \
+        then cast(eventdatavalues #>> '{GieVkTxp4HH, value}' as double precision) \
+        else null end""";
+
+    String actual =
+        manager.getSelectExpression(ValueType.NUMBER, "eventdatavalues #>> '{GieVkTxp4HH, value}'");
+
+    assertEquals(expected, actual);
+  }
+
+  @Test
+  void testGetSelectExpressionDate() {
+    String expected =
+        """
+        case when eventdatavalues #>> '{AL04Wbutskk, value}' ~* '^\\d{4}-\\d{2}-\\d{2}(\\s|T)?((\\d{2}:)(\\d{2}:)?(\\d{2}))?(|.(\\d{3})|.(\\d{3})Z)?$' \
+        then cast(eventdatavalues #>> '{AL04Wbutskk, value}' as timestamp) \
+        else null end""";
+
+    String actual =
+        manager.getSelectExpression(ValueType.DATE, "eventdatavalues #>> '{AL04Wbutskk, value}'");
+
+    assertEquals(expected, actual);
+  }
+
+  @Test
+  void testGetSelectExpressionText() {
+    String expected =
+        """
+        eventdatavalues #>> '{FwUzmc49Pcr, value}'""";
+
+    String actual =
+        manager.getSelectExpression(ValueType.TEXT, "eventdatavalues #>> '{FwUzmc49Pcr, value}'");
+
+    assertEquals(expected, actual);
+  }
+}