Compare commits

...

4 Commits

2 changed files with 8 additions and 7 deletions

View File

@ -4,7 +4,7 @@
<groupId>dev.struchkov.haiti.filter</groupId>
<artifactId>haiti-filter-quarkus-reactive</artifactId>
<version>1.3.0-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Haiti Filter Reactive Quarkus</name>
@ -28,7 +28,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus.platform.version>3.0.3.Final</quarkus.platform.version>
<quarkus.platform.version>3.4.3</quarkus.platform.version>
<haiti.filter.jooq.version>1.1.0</haiti.filter.jooq.version>
<!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
<postgresql.ver>42.6.0</postgresql.ver>

View File

@ -15,6 +15,7 @@ import org.jooq.DSLContext;
import org.jooq.Query;
import org.jooq.conf.ParamType;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
@ -32,7 +33,7 @@ public class QuarkusFilter<ID> {
private final PgPool pgPool;
private final CriteriaJooqFilter jooqFilter;
private PageableOffset offset;
// private final List<String> sortFieldNames = new ArrayList<>();
private final List<String> sortFieldNames = new ArrayList<>();
private QuarkusFilter(PgPool pgPool, String table, DSLContext dslContext) {
dslContext.settings().withParamType(ParamType.NAMED_OR_INLINED);
@ -85,7 +86,7 @@ public class QuarkusFilter<ID> {
public QuarkusFilter<ID> sort(SortContainer container) {
if (container != null && container.getFieldName() != null) {
jooqFilter.sort(container);
// sortFieldNames.add(container.getFieldName());
sortFieldNames.add(container.getFieldName());
}
return this;
}
@ -93,7 +94,7 @@ public class QuarkusFilter<ID> {
public QuarkusFilter<ID> sort(String field, SortType sortType) {
if (field != null) {
jooqFilter.sort(field, sortType);
// sortFieldNames.add(field);
sortFieldNames.add(field);
}
return this;
}
@ -101,7 +102,7 @@ public class QuarkusFilter<ID> {
public QuarkusFilter<ID> sort(String field) {
if (field != null) {
jooqFilter.sort(field);
// sortFieldNames.add(field);
sortFieldNames.add(field);
}
return this;
}
@ -147,7 +148,7 @@ public class QuarkusFilter<ID> {
for (String idField : idFields) {
jooqFilter.groupBy(tableName + "." + idField);
}
// jooqFilter.groupBy(sortFieldNames);
jooqFilter.groupBy(sortFieldNames);
distinctCount = true;
final Uni<Long> count = count();
final Uni<List<ID>> content = build(mapper, idFields);