Skip to content

fix: Problems with filters order #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thewizkid87 merged 1 commit into from
Jan 29, 2026
Merged

fix: Problems with filters order #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions crud-framework-core/src/main/java/dev/krud/crudframework/modelfilter/DynamicModelFilter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package dev.krud.crudframework.modelfilter

class DynamicModelFilter(
var start: Long? = null,
var limit: Long? = null,
var orders: MutableSet<OrderDTO> = mutableSetOf(),
val filterFields: MutableList<FilterField> = mutableListOf()
var start: Long? = null,
var limit: Long? = null,
var orders: MutableList<OrderDTO> = mutableListOf(),
val filterFields: MutableList<FilterField> = mutableListOf()
) {
val cacheKey: String get() = "CacheKey_" + this.javaClass.simpleName + "_" + this.hashCode()

constructor() : this(null, null, mutableSetOf(), mutableListOf())
constructor() : this(null, null, mutableListOf(), mutableListOf())

constructor(filterFields: MutableList<FilterField>) : this(null, null, mutableSetOf(), filterFields)
constructor(filterFields: MutableList<FilterField>) : this(null, null, mutableListOf(), filterFields)

fun add(filterField: FilterField): DynamicModelFilter {
filterFields.add(filterField)
Expand Down
2 changes: 1 addition & 1 deletion ...framework-core/src/main/java/dev/krud/crudframework/modelfilter/dsl/ModelFilterBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import dev.krud.crudframework.modelfilter.dsl.annotation.FilterFieldDsl

@FilterFieldDsl
class ModelFilterBuilder<RootType : PersistentEntity>(
var orders: MutableSet<OrderDTO> = mutableSetOf(),
var orders: MutableList<OrderDTO> = mutableListOf(),
var start: Long = 0,
var limit: Long = 10000,
var filterFields: MutableList<FilterField> = mutableListOf()
Expand Down
2 changes: 1 addition & 1 deletion ...-mongo-connector/src/main/java/dev/krud/crudframework/mongo/dao/AbstractMongoBaseDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ private boolean areValuesValid(FilterField filterField) {
}
}

protected void setOrder(Query query, Set<OrderDTO> orders) {
protected void setOrder(Query query, List<OrderDTO> orders) {
List<Sort.Order> sortOrders = new ArrayList<>();
for (OrderDTO order : orders) {
if(order.getBy() != null && !order.getBy().trim().isEmpty()) {
Expand Down