possible fix for KPI

Author: eng-dedalus

knowagedao/src/main/java/it/eng/spagobi/kpi/job/ProcessKpiJob.java

@@ -22,6 +22,7 @@
 
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.log4j.Logger;
+import org.hibernate.SQLQuery;
 import org.hibernate.Session;
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -698,6 +699,7 @@ private static KpiValueExecLog computeKpi(ParsedKpi parsedKpi, List<AggregateMea
 		KpiValueExecLog result = new KpiValueExecLog();
 		Session session = HibernateSessionManager.getCurrentSession();
 		ISQLDialect dialect = SQLDialectFactory.getSQLDialect(session);
+		List<Map<String, Number>> rowsMeasureValues = new ArrayList<>();
 
 		try {
 			logger.info(DateFormat.getInstance().format(new Date()) + " Processing Kpi Job...");
@@ -722,9 +724,13 @@ private static KpiValueExecLog computeKpi(ParsedKpi parsedKpi, List<AggregateMea
 					}
 					// sb.append("[" + field.getValue() + "]");
 				}
+				Map<String, Number> mv = new HashMap<>();
+				mv.put("M" + mainMeasure, measureValue);
+				rowsMeasureValues.add(mv);
+
 				// we are casting measures as float values because formulas are not working on Oracle and Postgres the
 				// same way, for example: 1283 / 48204 is returning 0.0266... on Oracle and 0 on Postgres
-				String rowFormula = parsedKpi.formula.replaceFirst("M" + mainMeasure + "([^\\d].*)*$", dialect.getCastingToFloatFormula(measureValue) + "$1");
+				String rowFormula = parsedKpi.formula;
 				rowsFormulae.add(rowFormula);
 				rowsAttributesValues.add(rowAttributesValues);
 				// sb.append("###");
@@ -760,6 +766,7 @@ private static KpiValueExecLog computeKpi(ParsedKpi parsedKpi, List<AggregateMea
 							row = qr.iterator.next();
 						}
 					}
+					rowsMeasureValues.get(r).put("M" + m, measureValue);
 					String rowFormula = rowsFormulae.get(r);
 					// we are casting measures as float values because formulas are not working on Oracle and Postgres the
 					// same way, for example: 1283 / 48204 is returning 0.0266... on Oracle and 0 on Postgres
@@ -821,8 +828,22 @@ private static KpiValueExecLog computeKpi(ParsedKpi parsedKpi, List<AggregateMea
 				Object theMonth = ifNull(temporalValues.get("MONTH"), CARDINALITY_ALL);
 				Object theQuarter = ifNull(temporalValues.get("QUARTER"), CARDINALITY_ALL);
 				Object theYear = ifNull(temporalValues.get("YEAR"), CARDINALITY_ALL);
-				String insertSql = "INSERT INTO SBI_KPI_VALUE (id, kpi_id, kpi_version, logical_key, time_run, computed_value,"
-						+ " the_day, the_week, the_month, the_quarter, the_year, state) VALUES (?,  ?, ?, ?" + ",?, coalesce(? , ?) ,?,?,?,?,?,?)";
+
+				String evalSql = "SELECT COALESCE((" + parsedKpi.formula.replaceAll("\\bM(\\d+)\\b", ":M$1") + "), 0) AS V FROM dual";
+				SQLQuery q = session.createSQLQuery(evalSql);
+
+				for (int m = 0; m < parsedKpi.measures.size(); m++) {
+					Number mvVal = rowsMeasureValues.get(r).get("M" + m);
+					q.setParameter("M" + m, mvVal);
+				}
+
+				Number computedValue = (Number) q.uniqueResult();
+
+
+				String insertSql =
+						"INSERT INTO SBI_KPI_VALUE (id, kpi_id, kpi_version, logical_key, time_run, computed_value,"
+								+ " the_day, the_week, the_month, the_quarter, the_year, state) "
+								+ "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
 				String whereCondition = "kpi_id = " + parsedKpi.id + " AND kpi_version = " + parsedKpi.version + " AND logical_key = '"
 						+ logicalKey.toString().replaceAll("'", "''") + "'" + " AND the_day = '" + theDay + "' AND the_week = '" + theWeek + "'"
 						+ " AND the_month = '" + theMonth + "' AND the_quarter = '" + theQuarter + "' AND the_year = '" + theYear + "'";
@@ -835,17 +856,21 @@ private static KpiValueExecLog computeKpi(ParsedKpi parsedKpi, List<AggregateMea
 
 				logger.debug("PERFORMING INSERT: " + insertSql);
 
-				try {
-					session.createSQLQuery(insertSql).setParameter(0, ++lastId).setParameter(1, parsedKpi.id).setParameter(2, parsedKpi.version)
-							.setParameter(3, logicalKey.toString().replaceAll("'", "''")).setParameter(4, timeRun).setParameter(5, (nullValue ? "0" : value))
-							.setParameter(6, 0).setParameter(7, theDay).setParameter(8, theWeek).setParameter(9, theMonth).setParameter(10, theQuarter).setParameter(11, theYear)
-							.setParameter(12, (nullValue ? "1" : "0")).executeUpdate();
-				} catch (Exception ex) {
-					session.createSQLQuery(insertSql).setParameter(0, ++lastId).setParameter(1, parsedKpi.id).setParameter(2, parsedKpi.version)
-							.setParameter(3, logicalKey.toString().replaceAll("'", "''")).setParameter(4, timeRun).setParameter(5, (nullValue ? "0" : value))
-							.setParameter(6, '0').setParameter(7, theDay).setParameter(8, theWeek).setParameter(9, theMonth).setParameter(10, theQuarter).setParameter(11, theYear)
-							.setParameter(12, (nullValue ? "1" : "0")).executeUpdate();
-				}
+				session.createSQLQuery(insertSql)
+						.setParameter(0, ++lastId)
+						.setParameter(1, parsedKpi.id)
+						.setParameter(2, parsedKpi.version)
+						.setParameter(3, logicalKey.toString().replaceAll("'", "''"))
+						.setParameter(4, timeRun)
+						.setParameter(5, computedValue) // numeric bind
+						.setParameter(6, theDay)
+						.setParameter(7, theWeek)
+						.setParameter(8, theMonth)
+						.setParameter(9, theQuarter)
+						.setParameter(10, theYear)
+						.setParameter(11, (nullValue ? "1" : "0"))
+						.executeUpdate();
+
 				session.getTransaction().commit();
 			}