Skip to content
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

Jump to bottom

fix: fix sub/subcollection to add children in an AND junction #12

Merged
merged 2 commits into from
Jul 8, 2024
Merged

fix: fix sub/subcollection to add children in an AND junction #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2682ac8
fix: fix sub/subcollection to add children in an AND junction
Idane Jul 6, 2024
d4d3dd4
Fix test
Idane Jul 6, 2024
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
10 changes: 8 additions & 2 deletions ...ramework-core/src/main/java/dev/krud/crudframework/modelfilter/dsl/FilterFieldsBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,15 +657,21 @@ class FilterFieldsBuilder<RootType : PersistentEntity>(private val filterFields:
val filterFieldsBuilder = FilterFieldsBuilder<ChildType>(fieldPrefix = prefix)
setup(filterFieldsBuilder)

filterFields += filterFieldsBuilder.build()
filterFields += FilterField().apply {
this.children = filterFieldsBuilder.build()
this.operation = FilterFieldOperation.And
}
}

infix fun <ChildType : PersistentEntity> KProperty1<RootType, Collection<ChildType>?>.SubCollection(setup: FilterFieldsBuilder<ChildType>.() -> Unit) {
val prefix = if (fieldPrefix.isEmpty()) name else "$fieldPrefix/$name"
val filterFieldsBuilder = FilterFieldsBuilder<ChildType>(fieldPrefix = prefix)
setup(filterFieldsBuilder)

filterFields += filterFieldsBuilder.build()
filterFields += FilterField().apply {
this.children = filterFieldsBuilder.build()
this.operation = FilterFieldOperation.And
}
}

fun and(setup: FilterFieldsBuilder<RootType>.() -> Unit) {
Expand Down
32 changes: 16 additions & 16 deletions ...framework-core/src/test/java/dev/krud/crudframework/modelfilter/dsl/FilterFieldDslTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ class FilterFieldDslTest {
TestClazz::testSubClazz.Sub {
TestSubClazz::testString Equal "value"
}
}.children.first()
}.children.first().children.first()

filterField.runAssertions(
"testSubClazz.testString",
Expand All @@ -623,7 +623,7 @@ class FilterFieldDslTest {
TestSubSubClazz::testString Equal "value"
}
}
}.children.first()
}.children.first().children.first().children.first()

filterField.runAssertions(
"testSubClazz/testSubSubClazz.testString",
Expand All @@ -642,7 +642,7 @@ class FilterFieldDslTest {
TestSubClazz::testString Equal "value"
}
}
}.children.first().children.first()
}.children.first().children.first().children.first()

filterField.runAssertions(
"testSubClazz.testString",
Expand All @@ -663,7 +663,7 @@ class FilterFieldDslTest {
}
}
}
}.children.first().children.first()
}.children.first().children.first().children.first().children.first()

filterField.runAssertions(
"testSubClazz/testSubSubClazz.testString",
Expand All @@ -682,7 +682,7 @@ class FilterFieldDslTest {
TestSubClazz::testString Equal "value"
}
}
}.children.first().children.first()
}.children.first().children.first().children.first()

filterField.runAssertions(
"testSubClazz.testString",
Expand All @@ -703,7 +703,7 @@ class FilterFieldDslTest {
}
}
}
}.children.first().children.first()
}.children.first().children.first().children.first().children.first()

filterField.runAssertions(
"testSubClazz/testSubSubClazz.testString",
Expand All @@ -722,7 +722,7 @@ class FilterFieldDslTest {
TestSubClazz::testString Equal "value"
}
}
}.children.first().children.first()
}.children.first().children.first().children.first()

filterField.runAssertions(
"testSubClazz.testString",
Expand All @@ -743,7 +743,7 @@ class FilterFieldDslTest {
}
}
}
}.children.first().children.first()
}.children.first().children.first().children.first().children.first()

filterField.runAssertions(
"testSubClazz/testSubSubClazz.testString",
Expand All @@ -761,7 +761,7 @@ class FilterFieldDslTest {
TestClazz::testSubClazz.Sub {
this.add(fieldToAdd)
}
}.children.first()
}.children.first().children.first()

filterField.runAssertions(
"testSubClazz.testString",
Expand All @@ -781,7 +781,7 @@ class FilterFieldDslTest {
this.add(fieldToAdd)
}
}
}.children.first()
}.children.first().children.first().children.first()

filterField.runAssertions(
"testSubClazz/testSubSubClazz.testString",
Expand All @@ -801,7 +801,7 @@ class FilterFieldDslTest {
this.add(fieldToAdd)
}
}
}.children.first().children.first()
}.children.first().children.first().children.first()

filterField.runAssertions(
"testSubClazz.testString",
Expand All @@ -823,7 +823,7 @@ class FilterFieldDslTest {
}
}
}
}.children.first().children.first()
}.children.first().children.first().children.first().children.first()

filterField.runAssertions(
"testSubClazz/testSubSubClazz.testString",
Expand All @@ -843,7 +843,7 @@ class FilterFieldDslTest {
this.add(fieldToAdd)
}
}
}.children.first().children.first()
}.children.first().children.first().children.first()

filterField.runAssertions(
"testSubClazz.testString",
Expand All @@ -865,7 +865,7 @@ class FilterFieldDslTest {
}
}
}
}.children.first().children.first()
}.children.first().children.first().children.first().children.first()

filterField.runAssertions(
"testSubClazz/testSubSubClazz.testString",
Expand All @@ -885,7 +885,7 @@ class FilterFieldDslTest {
this.add(fieldToAdd)
}
}
}.children.first().children.first()
}.children.first().children.first().children.first()

filterField.runAssertions(
"testSubClazz.testString",
Expand All @@ -907,7 +907,7 @@ class FilterFieldDslTest {
}
}
}
}.children.first().children.first()
}.children.first().children.first().children.first().children.first()

filterField.runAssertions(
"testSubClazz/testSubSubClazz.testString",
Expand Down
Loading