QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 13:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for instant fields as well as AbstractFilterExpressions

Browse Source
This commit is contained in:
darin.kelkhoff
2023-10-16 08:15:14 -05:00
parent 7339ad90cc
commit 118433178d
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/modules/backend/implementations/utils/BackendQueryFilterUtils.java
View File

@ -24,15 +24,18 @@ package com.kingsrook.qqq.backend.core.modules.backend.implementations.utils;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.Instant;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.ListIterator;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import com.kingsrook.qqq.backend.core.model.actions.tables.query.QFilterCriteria; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QFilterCriteria;
import com.kingsrook.qqq.backend.core.model.actions.tables.query.QFilterOrderBy; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QFilterOrderBy;
import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter;
import com.kingsrook.qqq.backend.core.model.actions.tables.query.expressions.AbstractFilterExpression;
import com.kingsrook.qqq.backend.core.model.data.QRecord; import com.kingsrook.qqq.backend.core.model.data.QRecord;
import com.kingsrook.qqq.backend.core.utils.CollectionUtils; import com.kingsrook.qqq.backend.core.utils.CollectionUtils;
import com.kingsrook.qqq.backend.core.utils.ValueUtils; import com.kingsrook.qqq.backend.core.utils.ValueUtils;
@ -127,6 +130,16 @@ public class BackendQueryFilterUtils
@SuppressWarnings("checkstyle:indentation") @SuppressWarnings("checkstyle:indentation")
public static boolean doesCriteriaMatch(QFilterCriteria criterion, String fieldName, Serializable value) public static boolean doesCriteriaMatch(QFilterCriteria criterion, String fieldName, Serializable value)
{ {
ListIterator<Serializable> valueListIterator = criterion.getValues().listIterator();
while(valueListIterator.hasNext())
{
Serializable criteriaValue = valueListIterator.next();
if(criteriaValue instanceof AbstractFilterExpression<?> expression)
{
valueListIterator.set(expression.evaluate());
}
}
boolean criterionMatches = switch(criterion.getOperator()) boolean criterionMatches = switch(criterion.getOperator())
{ {
case EQUALS -> testEquals(criterion, value); case EQUALS -> testEquals(criterion, value);
@ -287,26 +300,15 @@ public class BackendQueryFilterUtils
if(b instanceof LocalDate || a instanceof LocalDate) if(b instanceof LocalDate || a instanceof LocalDate)
{ {
LocalDate valueDate; LocalDate valueDate = ValueUtils.getValueAsLocalDate(b);
if(b instanceof LocalDate ld) LocalDate criterionDate = ValueUtils.getValueAsLocalDate(a);
{ return (valueDate.isAfter(criterionDate));
valueDate = ld;
}
else
{
valueDate = ValueUtils.getValueAsLocalDate(b);
} }
LocalDate criterionDate; if(b instanceof Instant || a instanceof Instant)
if(a instanceof LocalDate ld)
{ {
criterionDate = ld; Instant valueDate = ValueUtils.getValueAsInstant(b);
} Instant criterionDate = ValueUtils.getValueAsInstant(a);
else
{
criterionDate = ValueUtils.getValueAsLocalDate(a);
}
return (valueDate.isAfter(criterionDate)); return (valueDate.isAfter(criterionDate));
} }