Skip to content

feat: Add local date support #28

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
Jul 9, 2026
Merged

feat: Add local date support #28

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
6 changes: 6 additions & 0 deletions crud-framework-core/src/main/java/dev/krud/crudframework/modelfilter/FilterField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.time.LocalDate;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
Expand Down Expand Up @@ -177,6 +178,11 @@ private Object castToType(Object field) {
return field;
}
return new Date(Long.parseLong(field.toString()));
case LocalDate:
if(field instanceof LocalDate) {
return field;
}
return LocalDate.parse(field.toString());
case Boolean:
return Boolean.parseBoolean(field.toString());
case Object:
Expand Down
97 changes: 97 additions & 0 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 @@ -5,6 +5,7 @@ import dev.krud.crudframework.modelfilter.FilterField
import dev.krud.crudframework.modelfilter.dsl.annotation.FilterFieldDsl
import dev.krud.crudframework.modelfilter.enums.FilterFieldDataType
import dev.krud.crudframework.modelfilter.enums.FilterFieldOperation
import java.time.LocalDate
import java.util.Date
import java.util.UUID
import kotlin.reflect.KProperty
Expand Down Expand Up @@ -76,6 +77,15 @@ class FilterFieldsBuilder<RootType : PersistentEntity>(private val filterFields:
)
}

infix fun KProperty1<RootType, LocalDate?>.Equal(target: LocalDate) {
filterFields += FilterField(
effectiveName,
FilterFieldOperation.Equal,
FilterFieldDataType.LocalDate,
target
)
}

infix fun <EnumType : Enum<EnumType>> KProperty1<RootType, EnumType?>.Equal(target: EnumType) {
filterFields += FilterField(
effectiveName,
Expand Down Expand Up @@ -157,6 +167,15 @@ class FilterFieldsBuilder<RootType : PersistentEntity>(private val filterFields:
)
}

infix fun KProperty1<RootType, LocalDate?>.NotEqual(target: LocalDate) {
filterFields += FilterField(
effectiveName,
FilterFieldOperation.NotEqual,
FilterFieldDataType.LocalDate,
target
)
}

infix fun <EnumType : Enum<EnumType>> KProperty1<RootType, EnumType?>.NotEqual(target: EnumType) {
filterFields += FilterField(
effectiveName,
Expand Down Expand Up @@ -220,6 +239,15 @@ class FilterFieldsBuilder<RootType : PersistentEntity>(private val filterFields:
)
}

infix fun KProperty1<RootType, LocalDate?>.GreaterThan(target: LocalDate) {
filterFields += FilterField(
effectiveName,
FilterFieldOperation.GreaterThan,
FilterFieldDataType.LocalDate,
target
)
}

infix fun KProperty1<RootType, Int?>.GreaterOrEqual(target: Int) {
filterFields += FilterField(
effectiveName,
Expand Down Expand Up @@ -256,6 +284,15 @@ class FilterFieldsBuilder<RootType : PersistentEntity>(private val filterFields:
)
}

infix fun KProperty1<RootType, LocalDate?>.GreaterOrEqual(target: LocalDate) {
filterFields += FilterField(
effectiveName,
FilterFieldOperation.GreaterEqual,
FilterFieldDataType.LocalDate,
target
)
}

infix fun KProperty1<RootType, Int?>.LowerThan(target: Int) {
filterFields += FilterField(
effectiveName,
Expand Down Expand Up @@ -292,6 +329,15 @@ class FilterFieldsBuilder<RootType : PersistentEntity>(private val filterFields:
)
}

infix fun KProperty1<RootType, LocalDate?>.LowerThan(target: LocalDate) {
filterFields += FilterField(
effectiveName,
FilterFieldOperation.LowerThan,
FilterFieldDataType.LocalDate,
target
)
}

infix fun KProperty1<RootType, Int?>.LowerOrEqual(target: Int) {
filterFields += FilterField(
effectiveName,
Expand Down Expand Up @@ -328,6 +374,15 @@ class FilterFieldsBuilder<RootType : PersistentEntity>(private val filterFields:
)
}

infix fun KProperty1<RootType, LocalDate?>.LowerOrEqual(target: LocalDate) {
filterFields += FilterField(
effectiveName,
FilterFieldOperation.LowerEqual,
FilterFieldDataType.LocalDate,
target
)
}

@JvmName("stringRequireIn")
infix fun KProperty1<RootType, String?>.RequireIn(target: Collection<String>) {
if (target.isEmpty()) {
Expand Down Expand Up @@ -373,6 +428,15 @@ class FilterFieldsBuilder<RootType : PersistentEntity>(private val filterFields:
}
}

@JvmName("localDateRequireIn")
infix fun KProperty1<RootType, LocalDate?>.RequireIn(target: Collection<LocalDate>) {
if (target.isEmpty()) {
noop()
} else {
this.In(target)
}
}

@JvmName("enumRequireIn")
infix fun <EnumType : Enum<EnumType>> KProperty1<RootType, EnumType?>.RequireIn(target: Collection<EnumType>) {
if (target.isEmpty()) {
Expand Down Expand Up @@ -436,6 +500,15 @@ class FilterFieldsBuilder<RootType : PersistentEntity>(private val filterFields:
}
}

@JvmName("localDateRequireNotIn")
infix fun KProperty1<RootType, LocalDate?>.RequireNotIn(target: Collection<LocalDate>) {
if (target.isEmpty()) {
noop()
} else {
this.NotIn(target)
}
}

@JvmName("enumRequireNotIn")
infix fun <EnumType : Enum<EnumType>> KProperty1<RootType, EnumType?>.RequireNotIn(target: Collection<EnumType>) {
if (target.isEmpty()) {
Expand Down Expand Up @@ -504,6 +577,16 @@ class FilterFieldsBuilder<RootType : PersistentEntity>(private val filterFields:
)
}

@JvmName("localDateIn")
infix fun KProperty1<RootType, LocalDate?>.In(target: Collection<LocalDate>) {
filterFields += FilterField(
effectiveName,
FilterFieldOperation.In,
FilterFieldDataType.LocalDate,
*target.toTypedArray()
)
}

@JvmName("enumIn")
infix fun <EnumType : Enum<EnumType>> KProperty1<RootType, EnumType?>.In(target: Collection<EnumType>) {
filterFields += FilterField(
Expand Down Expand Up @@ -574,6 +657,16 @@ class FilterFieldsBuilder<RootType : PersistentEntity>(private val filterFields:
)
}

@JvmName("localDateNotIn")
infix fun KProperty1<RootType, LocalDate?>.NotIn(target: Collection<LocalDate>) {
filterFields += FilterField(
effectiveName,
FilterFieldOperation.NotIn,
FilterFieldDataType.LocalDate,
*target.toTypedArray()
)
}

@JvmName("enumNotIn")
infix fun <EnumType : Enum<EnumType>> KProperty1<RootType, EnumType?>.NotIn(target: Collection<EnumType>) {
filterFields += FilterField(
Expand Down Expand Up @@ -610,6 +703,10 @@ class FilterFieldsBuilder<RootType : PersistentEntity>(private val filterFields:
return BetweenBuilder(effectiveName, target, FilterFieldDataType.Date)
}

infix fun KProperty1<RootType, LocalDate?>.Between(target: LocalDate): BetweenBuilder<LocalDate> {
return BetweenBuilder(effectiveName, target, FilterFieldDataType.LocalDate)
}

infix fun KProperty1<RootType, *>.isNull(condition: Boolean) {
when (condition) {
true -> filterFields += FilterField(
Expand Down
4 changes: 4 additions & 0 deletions ...work-core/src/main/java/dev/krud/crudframework/modelfilter/enums/FilterFieldDataType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.math.BigDecimal;
import java.math.BigInteger;
import java.time.LocalDate;
import java.util.Date;
import java.util.EnumSet;
import java.util.HashMap;
Expand All @@ -15,6 +16,7 @@ public enum FilterFieldDataType {
Double(java.lang.Double.class),
Boolean(java.lang.Boolean.class),
Date(java.util.Date.class),
LocalDate(java.time.LocalDate.class),
Object(java.lang.Object.class),
Enum(java.lang.Enum.class),
UUID(java.util.UUID.class),
Expand Down Expand Up @@ -54,6 +56,8 @@ public static FilterFieldDataType get(Class clazz) {
return FilterFieldDataType.Double;
} else if (java.util.Date.class.equals(clazz)) {
return FilterFieldDataType.Date;
} else if (java.time.LocalDate.class.equals(clazz)) {
return FilterFieldDataType.LocalDate;
} else if (boolean.class.equals(clazz) || Boolean.class.equals(clazz)) {
return FilterFieldDataType.Boolean;
} else if (Enum.class.isAssignableFrom(clazz)) {
Expand Down
Loading