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

Update to clone query filters

Browse Source
This commit is contained in:
darin.kelkhoff
2022-09-28 14:49:46 -05:00
parent 70ded4c887
commit 720200b6cf
4 changed files with 86 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/GenerateReportAction.java
View File

@ -222,7 +222,7 @@ public class GenerateReportAction
*******************************************************************************/
private void gatherData(ReportInput reportInput, QReportDataSource dataSource, QReportView tableView, List<QReportView> pivotViews, List<QReportView> variantViews) throws QException
{
QQueryFilter queryFilter = dataSource.getQueryFilter();
QQueryFilter queryFilter = dataSource.getQueryFilter().clone();
setInputValuesInQueryFilter(reportInput, queryFilter);
////////////////////////////////////////////////////////////////////////////////////////

27
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/QFilterCriteria.java
View File

@ -23,6 +23,7 @@ package com.kingsrook.qqq.backend.core.model.actions.tables.query;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@ -30,7 +31,7 @@ import java.util.List;
* A single criteria Component of a Query
*
*******************************************************************************/
public class QFilterCriteria implements Serializable
public class QFilterCriteria implements Serializable, Cloneable
{
private String fieldName;
private QCriteriaOperator operator;
@ -38,6 +39,30 @@ public class QFilterCriteria implements Serializable
/*******************************************************************************
**
*******************************************************************************/
@Override
public QFilterCriteria clone()
{
try
{
QFilterCriteria clone = (QFilterCriteria) super.clone();
if(values != null)
{
clone.values = new ArrayList<>();
clone.values.addAll(values);
}
return clone;
}
catch(CloneNotSupportedException e)
{
throw new AssertionError();
}
}
/*******************************************************************************
**
*******************************************************************************/

20
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/QFilterOrderBy.java
View File

@ -29,13 +29,31 @@ import java.io.Serializable;
** Bean representing an element of a query order-by clause.
**
*******************************************************************************/
public class QFilterOrderBy implements Serializable
public class QFilterOrderBy implements Serializable, Cloneable
{
private String fieldName;
private boolean isAscending = true;
/*******************************************************************************
**
*******************************************************************************/
@Override
public QFilterOrderBy clone()
{
try
{
return (QFilterOrderBy) super.clone();
}
catch(CloneNotSupportedException e)
{
throw new AssertionError();
}
}
/*******************************************************************************
** Default no-arg constructor
*******************************************************************************/

42
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/QQueryFilter.java
View File

@ -31,10 +31,48 @@ import java.util.List;
* Full "filter" for a query - a list of criteria and order-bys
*
*******************************************************************************/
public class QQueryFilter implements Serializable
public class QQueryFilter implements Serializable, Cloneable
{
private List<QFilterCriteria> criteria = new ArrayList<>();
private List<QFilterOrderBy> orderBys = new ArrayList<>();
private List<QFilterOrderBy> orderBys = new ArrayList<>();
/*******************************************************************************
**
*******************************************************************************/
@Override
public QQueryFilter clone()
{
try
{
QQueryFilter clone = (QQueryFilter) super.clone();
if(criteria != null)
{
clone.criteria = new ArrayList<>();
for(QFilterCriteria criterion : criteria)
{
clone.criteria.add(criterion.clone());
}
}
if(orderBys != null)
{
clone.orderBys = new ArrayList<>();
for(QFilterOrderBy orderBy : orderBys)
{
clone.orderBys.add(orderBy.clone());
}
}
return clone;
}
catch(CloneNotSupportedException e)
{
throw new AssertionError();
}
}