[KNOWAGE-9530] fix drilldown

Author: eng-dedalus

knowage-core/src/main/java/it/eng/spagobi/api/common/AbstractDataSetResource.java

@@ -25,13 +25,7 @@
 import java.nio.file.Paths;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -174,19 +168,19 @@ protected Integer[] getIdsAsIntegers(String ids) {
 	public String getDataStore(String label, String parameters, Map<String, Object> drivers, String selections,
 			String likeSelections, int maxRowCount, String aggregations, String summaryRow, int offset, int fetchSize,
 			Boolean isNearRealtime, Set<String> indexes, String widgetName, boolean useGroupBy) {
-		return getDataStore(label, parameters, drivers, selections, likeSelections, maxRowCount, aggregations,
+		return getDataStore(label, parameters, drivers, selections, likeSelections, null, maxRowCount, aggregations,
 				summaryRow, offset, fetchSize, isNearRealtime, null, indexes, widgetName, useGroupBy);
 	}
 
 	public String getDataStore(String label, String parameters, Map<String, Object> drivers, String selections,
 			String likeSelections, int maxRowCount, String aggregations, String summaryRow, int offset, int fetchSize,
 			Set<String> indexes, String widgetName, boolean useGroupBy) {
-		return getDataStore(label, parameters, drivers, selections, likeSelections, maxRowCount, aggregations,
+		return getDataStore(label, parameters, drivers, selections, likeSelections, null, maxRowCount, aggregations,
 				summaryRow, offset, fetchSize, null, null, indexes, widgetName, useGroupBy);
 	}
 
 	public String getDataStore(String label, String parameters, Map<String, Object> drivers, String selections,
-			String likeSelections, int maxRowCount, String aggregations, String summaryRow, int offset, int fetchSize,
+			String likeSelections, String drilldown, int maxRowCount, String aggregations, String summaryRow, int offset, int fetchSize,
 			Boolean isNearRealtime, String options, Set<String> indexes, String widgetName, boolean useGroupBy) {
 		LOGGER.debug("IN");
 		DatasetManagementAPI datasetManagementAPI = getDatasetManagementAPI();
@@ -290,12 +284,22 @@ public String getDataStore(String label, String parameters, Map<String, Object>
 				}
 			}
 
+			List<Filter> drilldownFilters = new ArrayList<>(0);
+			if (drilldown != null && !drilldown.equals("")) {
+				JSONObject drilldownObject = new JSONObject(drilldown);
+				if (drilldownObject.names() != null) {
+					drilldownFilters.addAll(getDrilldownFilters(label, drilldownObject, columnAliasToName));
+				}
+			}
+
 			Monitor timingMinMax = MonitorFactory.start("Knowage.AbstractDataSetResource.getDataStore:calculateMinMax");
 			Map<String, String> parametersMap = DataSetUtilities.getParametersMap(parameters);
 			filters = datasetManagementAPI.calculateMinMaxFilters(dataSet, isNearRealtime, parametersMap, filters,
 					likeFilters, indexes);
 			timingMinMax.stop();
 
+			filters.addAll(drilldownFilters);
+
 			Filter where = datasetManagementAPI.getWhereFilter(filters, likeFilters);
 
 			timing.stop();
@@ -346,7 +350,8 @@ public String getDataStore(String label, String parameters, Map<String, Object>
 		}
 	}
 
-    public String getDataStoreAI(String label, String parameters, Map<String, Object> drivers, String selections,
+
+	public String getDataStoreAI(String label, String parameters, Map<String, Object> drivers, String selections,
                                String likeSelections, Integer maxRowCount, String aggregations, String summaryRow, int offset, int fetchSize, Integer maxRows,
                                Boolean isNearRealtime, String options, Set<String> indexes) {
         LOGGER.debug("IN");
@@ -1126,6 +1131,47 @@ protected List<SimpleFilter> getLikeFilters(String datasetLabel, JSONObject like
 		return likeFilters;
 	}
 
+
+	private List<Filter> getDrilldownFilters(String datasetLabel, JSONObject drilldownObject, Map<String, String> columnAliasToName) throws JSONException {
+
+		List<Filter> drilldownFilters = new ArrayList<>(0);
+
+		if (drilldownObject.has(datasetLabel)) {
+			IDataSet dataSet = getDataSetDAO().loadDataSetByLabel(datasetLabel);
+			boolean isAnEmptySelection = false;
+
+			JSONObject drilldownObjectJSONObject = drilldownObject.getJSONObject(datasetLabel);
+			Iterator<String> it = drilldownObjectJSONObject.keys();
+			while (it.hasNext()) {
+				String columns = it.next();
+				String value = drilldownObjectJSONObject.getString(columns);
+				if (value == null || value.isEmpty()) {
+					isAnEmptySelection = true;
+					break;
+				}
+
+				List<String> columnsList = getColumnList(columns, dataSet, columnAliasToName);
+				List<Projection> projections = new ArrayList<>(columnsList.size());
+				for (String columnName : columnsList) {
+					projections.add(new Projection(dataSet, columnName));
+				}
+
+				for (Projection projection : projections) {
+					SimpleFilter filter = new InFilter(projection, value);
+					drilldownFilters.add(filter);
+				}
+			}
+
+			if (isAnEmptySelection) {
+				drilldownFilters.clear();
+				drilldownFilters.add(new UnsatisfiedFilter());
+			}
+		}
+
+		return drilldownFilters;
+	}
+
+
 	protected List<String> getColumnList(String columns, IDataSet dataSet,
 			Map<String, String> columnAliasToColumnName) {
 		List<String> columnList = new ArrayList<>(Arrays.asList(columns.trim().replaceAll("\\s+", " ").split("\\s?,\\s?")));

knowage-core/src/main/java/it/eng/spagobi/api/v2/DataSetResource.java

@@ -718,6 +718,7 @@ public String getDataStorePostWithJsonInBody(@PathParam("label") String label, S
 			Map<String, Object> driversRuntimeMap = null;
 			String selections = null;
 			String likeSelections = null;
+			String drilldown = null;
 			String aggregations = null;
 			String summaryRow = null;
 			String options = null;
@@ -738,6 +739,9 @@ public String getDataStorePostWithJsonInBody(@PathParam("label") String label, S
 				JSONObject jsonLikeSelections = jsonBody.optJSONObject("likeSelections");
 				likeSelections = jsonLikeSelections != null ? jsonLikeSelections.toString() : null;
 
+				JSONObject jsonDrilldown = jsonBody.optJSONObject("drilldown");
+				drilldown = jsonDrilldown != null ? jsonDrilldown.toString() : null;
+
 				JSONObject jsonAggregations = jsonBody.optJSONObject("aggregations");
 				aggregations = jsonAggregations != null ? jsonAggregations.toString() : null;
 
@@ -771,7 +775,7 @@ public String getDataStorePostWithJsonInBody(@PathParam("label") String label, S
 				}
 			}
 			timing.stop();
-			return getDataStore(label, parameters, driversRuntimeMap, selections, likeSelections, maxRowCount,
+			return getDataStore(label, parameters, driversRuntimeMap, selections, likeSelections, drilldown, maxRowCount,
 					aggregations, summaryRow, offset, fetchSize, isNearRealtime, options, columns, widgetName, useGroupBy);
 		} catch (CatalogFunctionException e) {
 			throw e;