adamsaghy commented on code in PR #3226:
URL: https://github.com/apache/fineract/pull/3226#discussion_r1235539854
##########
fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java:
##########
@@ -214,6 +214,185 @@ public List<JsonObject> queryDataTable(String datatable,
final String columnFilt
return results;
}
+ @Override
+ public Page<JsonObject>
queryDataTableSearch(PagedRequest<DatatableSearchRequest> searchRequest) {
+
+ Objects.requireNonNull(searchRequest, "Search Request Should not be
Empty");
+ Optional<DatatableSearchRequest> request = searchRequest.getRequest();
+ List<String> resultColumns =
request.map(DatatableSearchRequest::getResultColumns).orElse(Collections.emptyList());
+ List<ColumnFilter> columnFilters =
request.map(DatatableSearchRequest::getColumnFilters).orElse(Collections.emptyList());
+ String datatable =
request.map(DatatableSearchRequest::getDatatable).orElse(null);
+ Pageable pageable = searchRequest.toPageable();
+
+
this.context.authenticatedUser().validateHasDatatableReadPermission(datatable);
+
+ List<JsonObject> results = new ArrayList<>();
+ AtomicInteger totalElements = new AtomicInteger(0);
+ if (CollectionUtils.isNotEmpty(columnFilters) &&
CollectionUtils.isNotEmpty(resultColumns)) {
+
+ String resultColumn =
resultColumns.stream().collect(Collectors.joining(","));
+
+ validateSqlInjectionForDynamicQuery(columnFilters, datatable,
resultColumn);
+
+ List<ResultsetColumnHeaderData> resultsetColumnHeaderData =
genericDataService.fillResultsetColumnHeaders(datatable);
+
+ if (CollectionUtils.isNotEmpty(resultsetColumnHeaderData)) {
+
+ Map<String, String> dataTableColumnMap =
resultsetColumnHeaderData.stream()
+
.collect(Collectors.toMap(ResultsetColumnHeaderData::getColumnName,
ResultsetColumnHeaderData::getColumnType));
+ columnFilters.forEach(column -> {
+ validateRequestParamsSearch(column.getColumnName(),
column.getColumnValue(), column.getColumnOperation(), resultColumn,
+ dataTableColumnMap);
+ });
+
+ AtomicInteger count = new AtomicInteger(0);
+
+ // Attach the selection
+ StringBuilder sqlBuilder = new StringBuilder();
+ if (databaseTypeResolver.isPostgreSQL()) {
+ sqlBuilder.append("SELECT
").append(escapeFieldNames(resultColumn)).append(" FROM ")
+ .append(sqlGenerator.escape(datatable));
+ } else if (databaseTypeResolver.isMySQL()) {
+ sqlBuilder.append("SELECT ").append(resultColumn).append("
FROM ").append(datatable);
+ } else {
+ throw new IllegalStateException("Database type is not
supported");
+ }
+
+ // Build base query with filters but without the selection
+ String baseFilterQuery =
buildBaseQueryWithFilters(columnFilters, dataTableColumnMap, count);
+
+ // Attach the count selection
+ StringBuilder countQueryBuilder = new StringBuilder();
+ countQueryBuilder.append(" SELECT COUNT(*) FROM
").append(datatable);
+
+ // Attach the WHERE clause
+ if (baseFilterQuery.length() > 0) {
+ sqlBuilder.append(" WHERE ").append(baseFilterQuery);
+ countQueryBuilder.append(" WHERE
").append(baseFilterQuery);
+ }
+
+ // Attach the ORDER
+ attachOrdering(sqlBuilder, pageable.getSort());
+ // Attach the PAGINATION
+ applyPagination(sqlBuilder, pageable);
+
+ SqlRowSet rowSet =
jdbcTemplate.queryForRowSet(sqlBuilder.toString());
+
+ // Execute the count Query
+
totalElements.set(jdbcTemplate.queryForObject(countQueryBuilder.toString(),
Integer.class));
+ String[] resultColumnNames = resultColumn.split(",");
+
+ while (rowSet.next()) {
+ extractResults(rowSet, resultColumnNames, results);
+ }
+
+ }
+ }
+ return PageableExecutionUtils.getPage(results, pageable, () ->
totalElements.get());
+
+ }
+
+ private void applyPagination(StringBuilder query, Pageable pageable) {
+ if (pageable.isPaged()) {
+ query.append(sqlGenerator.limit(pageable.getPageSize(), (int)
pageable.getOffset()));
+ } else {
+ query.append(sqlGenerator.limit(pageable.getPageSize()));
Review Comment:
if it is not paged, why to limit? however `PageRequest` is used behind the
curtains which is always paged, so its always true, no?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
