Haiti/haiti-filter-reactive-quarkus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bugfix/sort-group' into develop
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source 
# Conflicts:
#	pom.xml
This commit is contained in:
Struchkov Mark 2023-05-23 16:06:13 +03:00
commit 972ac2b3c3
Signed by: upagge
GPG Key ID: D3018BE7BA428CA6
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -312,7 +312,7 @@
<url>https://github.com/haiti-projects/haiti-filter-reactive-quarkus</url>
<developerConnection>scm:git:https://github.com/haiti-projects/haiti-filter-reactive-quarkus.git
</developerConnection>
<tag>HEAD</tag>
<tag>HEAD</tag>
</scm>
<developers>

11
src/main/java/dev/struchkov/haiti/filter/quarkus/QuarkusFilter.java
View File

@ -14,7 +14,6 @@ import org.jooq.DSLContext;
import org.jooq.Query;
import org.jooq.conf.ParamType;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.function.Consumer;
@ -30,7 +29,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);
@ -83,7 +82,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;
}
@ -91,7 +90,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;
}
@ -99,7 +98,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;
}
@ -136,7 +135,7 @@ public class QuarkusFilter<ID> {
public Uni<FilterResult<ID>> filterResult(Class<ID> idType, String idField) {
jooqFilter.groupBy(tableName + "." + idField);
jooqFilter.groupBy(sortFieldNames);
// jooqFilter.groupBy(sortFieldNames);
distinctCount = true;
final Uni<Long> count = count();
final Uni<List<ID>> content = build(idType, idField);