refactor: Use util method for SQL generation [DHIS2-16705]

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

@@ -340,38 +340,33 @@ private void populateTable(
     StringBuilder sql =
         new StringBuilder(replace("insert into ${tableName} (", Map.of("tableName", tableName)));
 
-    List<AnalyticsTableColumn> dimensions = partition.getMasterTable().getDimensionColumns();
     List<AnalyticsTableColumn> columns = partition.getMasterTable().getAnalyticsTableColumns();
+    List<AnalyticsTableColumn> dimensions = partition.getMasterTable().getDimensionColumns();
 
-    for (AnalyticsTableColumn col : columns) {
-      sql.append(quote(col.getName()) + ",");
-    }
-
-    sql = TextUtils.removeLastComma(sql).append(") select ");
-
-    for (AnalyticsTableColumn col : dimensions) {
-      sql.append(col.getSelectExpression() + ",");
-    }
+    sql.append(toCommaSeparated(columns, col -> quote(col.getName())));
+    sql.append(") select ");
+    sql.append(toCommaSeparated(dimensions, AnalyticsTableColumn::getSelectExpression));
+    sql.append(",");
 
     sql.append(
         replaceQualify(
             """
-            ${approvalSelectExpression} \
-            as approvallevel, \
-            ${valueExpression} * ps.daysno as daysxvalue, \
-            ps.daysno as daysno, \
-            ${valueExpression} as value, \
-            ${textValueExpression} as textvalue \
-            from ${datavalue} dv \
-            inner join analytics_rs_periodstructure ps on dv.periodid=ps.periodid \
-            inner join analytics_rs_dataelementstructure des on dv.dataelementid=des.dataelementid \
-            inner join analytics_rs_dataelementgroupsetstructure degs on dv.dataelementid=degs.dataelementid \
-            inner join analytics_rs_orgunitstructure ous on dv.sourceid=ous.organisationunitid \
-            inner join analytics_rs_organisationunitgroupsetstructure ougs on dv.sourceid=ougs.organisationunitid \
-            inner join analytics_rs_categorystructure dcs on dv.categoryoptioncomboid=dcs.categoryoptioncomboid \
-            inner join analytics_rs_categorystructure acs on dv.attributeoptioncomboid=acs.categoryoptioncomboid \
-            inner join analytics_rs_categoryoptioncomboname aon on dv.attributeoptioncomboid=aon.categoryoptioncomboid \
-            inner join analytics_rs_categoryoptioncomboname con on dv.categoryoptioncomboid=con.categoryoptioncomboid\s""",
+        ${approvalSelectExpression} \
+        as approvallevel, \
+        ${valueExpression} * ps.daysno as daysxvalue, \
+        ps.daysno as daysno, \
+        ${valueExpression} as value, \
+        ${textValueExpression} as textvalue \
+        from ${datavalue} dv \
+        inner join analytics_rs_periodstructure ps on dv.periodid=ps.periodid \
+        inner join analytics_rs_dataelementstructure des on dv.dataelementid=des.dataelementid \
+        inner join analytics_rs_dataelementgroupsetstructure degs on dv.dataelementid=degs.dataelementid \
+        inner join analytics_rs_orgunitstructure ous on dv.sourceid=ous.organisationunitid \
+        inner join analytics_rs_organisationunitgroupsetstructure ougs on dv.sourceid=ougs.organisationunitid \
+        inner join analytics_rs_categorystructure dcs on dv.categoryoptioncomboid=dcs.categoryoptioncomboid \
+        inner join analytics_rs_categorystructure acs on dv.attributeoptioncomboid=acs.categoryoptioncomboid \
+        inner join analytics_rs_categoryoptioncomboname aon on dv.attributeoptioncomboid=aon.categoryoptioncomboid \
+        inner join analytics_rs_categoryoptioncomboname con on dv.categoryoptioncomboid=con.categoryoptioncomboid\s""",
             Map.of(
                 "approvalSelectExpression", approvalSelectExpression,
                 "valueExpression", valueExpression,

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

@@ -57,7 +57,6 @@
 import org.hisp.dhis.analytics.table.setting.AnalyticsTableSettings;
 import org.hisp.dhis.category.CategoryService;
 import org.hisp.dhis.common.IdentifiableObjectManager;
-import org.hisp.dhis.commons.util.TextUtils;
 import org.hisp.dhis.dataapproval.DataApprovalLevelService;
 import org.hisp.dhis.db.sql.SqlBuilder;
 import org.hisp.dhis.organisationunit.OrganisationUnitService;
@@ -151,11 +150,11 @@ public boolean hasUpdatedLatestData(Date startDate, Date endDate) {
     String sql =
         replaceQualify(
             """
-        select cdr.datasetid \
-        from ${completedatasetregistration} cdr \
-        where cdr.lastupdated >= '${startDate}' \
-        and cdr.lastupdated < '${endDate}' \
-        limit 1;""",
+            select cdr.datasetid \
+            from ${completedatasetregistration} cdr \
+            where cdr.lastupdated >= '${startDate}' \
+            and cdr.lastupdated < '${endDate}' \
+            limit 1;""",
             Map.of("startDate", toLongDate(startDate), "endDate", toLongDate(endDate)));
 
     return !jdbcTemplate.queryForList(sql).isEmpty();
@@ -196,24 +195,14 @@ public void populateTable(AnalyticsTableUpdateParams params, AnalyticsTableParti
     String tableName = partition.getName();
     String partitionClause = getPartitionClause(partition);
 
-    String sql = "insert into " + tableName + " (";
-
     List<AnalyticsTableColumn> columns = partition.getMasterTable().getAnalyticsTableColumns();
 
-    for (AnalyticsTableColumn col : columns) {
-      sql += quote(col.getName()) + ",";
-    }
-
-    sql = TextUtils.removeLastComma(sql) + ") select ";
-
-    for (AnalyticsTableColumn col : columns) {
-      sql += col.getSelectExpression() + ",";
-    }
-
-    sql = TextUtils.removeLastComma(sql) + " ";
-
+    String sql = "insert into " + tableName + " (";
+    sql += toCommaSeparated(columns, col -> quote(col.getName()));
+    sql += ") select ";
+    sql += toCommaSeparated(columns, AnalyticsTableColumn::getSelectExpression);
+    sql += " ";
     // Database legacy fix
-
     sql = sql.replace("organisationunitid", "sourceid");
 
     sql +=

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

@@ -48,7 +48,6 @@
 import org.hisp.dhis.analytics.table.setting.AnalyticsTableSettings;
 import org.hisp.dhis.category.CategoryService;
 import org.hisp.dhis.common.IdentifiableObjectManager;
-import org.hisp.dhis.commons.util.TextUtils;
 import org.hisp.dhis.dataapproval.DataApprovalLevelService;
 import org.hisp.dhis.db.model.Logged;
 import org.hisp.dhis.db.sql.SqlBuilder;
@@ -159,21 +158,13 @@ protected List<String> getPartitionChecks(Integer year, Date endDate) {
   public void populateTable(AnalyticsTableUpdateParams params, AnalyticsTablePartition partition) {
     String tableName = partition.getName();
 
-    String sql = "insert into " + tableName + " (";
-
     List<AnalyticsTableColumn> columns = partition.getMasterTable().getAnalyticsTableColumns();
 
-    for (AnalyticsTableColumn col : columns) {
-      sql += quote(col.getName()) + ",";
-    }
-
-    sql = TextUtils.removeLastComma(sql) + ") select ";
-
-    for (AnalyticsTableColumn col : columns) {
-      sql += col.getSelectExpression() + ",";
-    }
-
-    sql = TextUtils.removeLastComma(sql) + " ";
+    String sql = "insert into " + tableName + " (";
+    sql += toCommaSeparated(columns, col -> quote(col.getName()));
+    sql += ") select ";
+    sql += toCommaSeparated(columns, AnalyticsTableColumn::getSelectExpression);
+    sql += " ";
 
     sql +=
         qualifyVariables(

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

@@ -49,7 +49,6 @@
 import org.hisp.dhis.analytics.table.setting.AnalyticsTableSettings;
 import org.hisp.dhis.category.CategoryService;
 import org.hisp.dhis.common.IdentifiableObjectManager;
-import org.hisp.dhis.commons.util.TextUtils;
 import org.hisp.dhis.dataapproval.DataApprovalLevelService;
 import org.hisp.dhis.db.model.Logged;
 import org.hisp.dhis.db.sql.SqlBuilder;
@@ -134,21 +133,13 @@ protected List<String> getPartitionChecks(Integer year, Date endDate) {
   public void populateTable(AnalyticsTableUpdateParams params, AnalyticsTablePartition partition) {
     String tableName = partition.getName();
 
-    String sql = replace("insert into ${tableName} (", Map.of("tableName", quote(tableName)));
-
     List<AnalyticsTableColumn> columns = partition.getMasterTable().getAnalyticsTableColumns();
 
-    for (AnalyticsTableColumn col : columns) {
-      sql += quote(col.getName()) + ",";
-    }
-
-    sql = TextUtils.removeLastComma(sql) + ") select ";
-
-    for (AnalyticsTableColumn col : columns) {
-      sql += col.getSelectExpression() + ",";
-    }
-
-    sql = TextUtils.removeLastComma(sql) + " ";
+    String sql = replace("insert into ${tableName} (", Map.of("tableName", quote(tableName)));
+    sql += toCommaSeparated(columns, col -> quote(col.getName()));
+    sql += ") select ";
+    sql += toCommaSeparated(columns, AnalyticsTableColumn::getSelectExpression);
+    sql += " ";
 
     sql +=
         qualifyVariables(

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

@@ -239,15 +239,12 @@ private void populateOwnershipTableInternal(AnalyticsTablePartition partition, S
    * @return a SQL select query.
    */
   private String getInputSql(Program program) {
-    StringBuilder sb = new StringBuilder("select ");
+    List<AnalyticsTableColumn> columns = getColumns();
 
-    for (AnalyticsTableColumn col : getColumns()) {
-      sb.append(col.getSelectExpression()).append(",");
-    }
-
-    sb.deleteCharAt(sb.length() - 1); // Remove the final ','.
+    StringBuilder sql = new StringBuilder("select ");
+    sql.append(toCommaSeparated(columns, AnalyticsTableColumn::getSelectExpression));
 
-    sb.append(
+    sql.append(
         replaceQualify(
             """
             \sfrom (\
@@ -272,7 +269,7 @@ and exists (\
                 "historyTableId", HISTORY_TABLE_ID,
                 "trackedEntityOwnTableId", TRACKED_ENTITY_OWN_TABLE_ID,
                 "programId", String.valueOf(program.getId()))));
-    return sb.toString();
+    return sql.toString();
   }
 
   private Map<String, Object> getRowMap(List<String> columnNames, ResultSet resultSet)

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

@@ -34,7 +34,6 @@
 import static org.hisp.dhis.analytics.table.JdbcEventAnalyticsTableManager.EXPORTABLE_EVENT_STATUSES;
 import static org.hisp.dhis.analytics.util.AnalyticsUtils.getColumnType;
 import static org.hisp.dhis.analytics.util.DisplayNameUtils.getDisplayName;
-import static org.hisp.dhis.commons.util.TextUtils.removeLastComma;
 import static org.hisp.dhis.db.model.DataType.BOOLEAN;
 import static org.hisp.dhis.db.model.DataType.CHARACTER_11;
 import static org.hisp.dhis.db.model.DataType.DOUBLE;
@@ -295,27 +294,19 @@ public void populateTable(AnalyticsTableUpdateParams params, AnalyticsTableParti
     List<AnalyticsTableColumn> columns = partition.getMasterTable().getAnalyticsTableColumns();
 
     StringBuilder sql = new StringBuilder("insert into " + tableName + " (");
-
-    for (AnalyticsTableColumn col : columns) {
-      sql.append(quote(col.getName()) + ",");
-    }
-
-    removeLastComma(sql).append(") select ");
-
-    for (AnalyticsTableColumn col : columns) {
-      sql.append(col.getSelectExpression() + ",");
-    }
+    sql.append(toCommaSeparated(columns, col -> quote(col.getName())));
+    sql.append(") select ");
+    sql.append(toCommaSeparated(columns, AnalyticsTableColumn::getSelectExpression));
 
     TrackedEntityType trackedEntityType = partition.getMasterTable().getTrackedEntityType();
 
-    removeLastComma(sql)
-        .append(
-            replaceQualify(
-                """
-                \sfrom ${trackedentity} te \
-                left join analytics_rs_orgunitstructure ous on te.organisationunitid=ous.organisationunitid \
-                left join analytics_rs_organisationunitgroupsetstructure ougs on te.organisationunitid=ougs.organisationunitid""",
-                Map.of()));
+    sql.append(
+        replaceQualify(
+            """
+            \sfrom ${trackedentity} te \
+            left join analytics_rs_orgunitstructure ous on te.organisationunitid=ous.organisationunitid \
+            left join analytics_rs_organisationunitgroupsetstructure ougs on te.organisationunitid=ougs.organisationunitid""",
+            Map.of()));
 
     ((List<TrackedEntityAttribute>)
             params.getExtraParam(trackedEntityType.getUid(), ALL_NON_CONFIDENTIAL_TET_ATTRIBUTES))

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

@@ -31,7 +31,6 @@
 import static java.lang.String.valueOf;
 import static org.hisp.dhis.analytics.AnalyticsTableType.TRACKED_ENTITY_INSTANCE_ENROLLMENTS;
 import static org.hisp.dhis.analytics.table.JdbcEventAnalyticsTableManager.EXPORTABLE_EVENT_STATUSES;
-import static org.hisp.dhis.commons.util.TextUtils.removeLastComma;
 import static org.hisp.dhis.db.model.DataType.CHARACTER_11;
 import static org.hisp.dhis.db.model.DataType.DOUBLE;
 import static org.hisp.dhis.db.model.DataType.GEOMETRY;
@@ -222,41 +221,33 @@ protected List<String> getPartitionChecks(Integer year, Date endDate) {
   @Override
   public void populateTable(AnalyticsTableUpdateParams params, AnalyticsTablePartition partition) {
     String tableName = partition.getName();
+    long tetId = partition.getMasterTable().getTrackedEntityType().getId();
 
     List<AnalyticsTableColumn> columns = partition.getMasterTable().getAnalyticsTableColumns();
 
     StringBuilder sql = new StringBuilder("insert into " + tableName + " (");
+    sql.append(toCommaSeparated(columns, col -> quote(col.getName())));
+    sql.append(") select ");
+    sql.append(toCommaSeparated(columns, AnalyticsTableColumn::getSelectExpression));
 
-    for (AnalyticsTableColumn col : columns) {
-      sql.append(quote(col.getName()) + ",");
-    }
-
-    removeLastComma(sql).append(") select ");
-
-    for (AnalyticsTableColumn col : columns) {
-      sql.append(col.getSelectExpression() + ",");
-    }
-
-    removeLastComma(sql)
-        .append(
-            replaceQualify(
-                """
-                \sfrom ${enrollment} en \
-                inner join ${trackedentity} te on en.trackedentityid=te.trackedentityid \
-                and te.deleted = false and te.trackedentitytypeid = ${trackedEntityTypeId} \
-                and te.lastupdated < '${startTime}' \
-                left join ${program} p on en.programid=p.programid \
-                left join analytics_rs_orgunitstructure ous on en.organisationunitid=ous.organisationunitid \
-                where exists (select 1 from ${event} ev where ev.deleted = false \
-                and ev.enrollmentid = en.enrollmentid \
-                and ev.status in (${statuses})) \
-                and en.occurreddate is not null \
-                and en.deleted = false\s""",
-                Map.of(
-                    "trackedEntityTypeId",
-                        valueOf(partition.getMasterTable().getTrackedEntityType().getId()),
-                    "startTime", toLongDate(params.getStartTime()),
-                    "statuses", join(",", EXPORTABLE_EVENT_STATUSES))));
+    sql.append(
+        replaceQualify(
+            """
+            \sfrom ${enrollment} en \
+            inner join ${trackedentity} te on en.trackedentityid=te.trackedentityid \
+            and te.deleted = false and te.trackedentitytypeid = ${trackedEntityTypeId} \
+            and te.lastupdated < '${startTime}' \
+            left join ${program} p on en.programid=p.programid \
+            left join analytics_rs_orgunitstructure ous on en.organisationunitid=ous.organisationunitid \
+            where exists (select 1 from ${event} ev where ev.deleted = false \
+            and ev.enrollmentid = en.enrollmentid \
+            and ev.status in (${statuses})) \
+            and en.occurreddate is not null \
+            and en.deleted = false\s""",
+            Map.of(
+                "trackedEntityTypeId", valueOf(tetId),
+                "startTime", toLongDate(params.getStartTime()),
+                "statuses", join(",", EXPORTABLE_EVENT_STATUSES))));
 
     invokeTimeAndLog(sql.toString(), "Populating table: '{}'", tableName);
   }