gCubeSystem
/
accounting-analytics-persistence-postgresql
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed query bug. Added test

This commit is contained in:
Luca Frosini 2021-11-23 10:41:27 +01:00
parent 0c2345f27d
commit eb2c3ba723
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/org/gcube/accounting/analytics/persistence/postgresql/Query.java
View File

@ -402,14 +402,26 @@ public class Query extends PostgreSQLQuery {
stringBuffer.append(" FROM ");
stringBuffer.append(recordToDBFields.getTableName());
boolean addAnd = false;
if(temporalConstraint!=null) {
addTemporalConstraintToQuery();
stringBuffer.append(" AND ");
addAnd = true;
}
if(filters!=null && filters.size()>0) {
if(addAnd) {
stringBuffer.append(" AND ");
}
addFilters();
stringBuffer.append(" AND ");
addAnd = true;
}
if(contexts!=null && contexts.size()>0) {
if(addAnd) {
stringBuffer.append(" AND ");
}
addContextFilter();
addAnd = false;
}
addContextFilter();

16
src/test/java/org/gcube/accounting/analytics/persistence/postgresql/AccountingPersistenceQueryPostgreSQLTest.java
View File

@ -206,13 +206,27 @@ public class AccountingPersistenceQueryPostgreSQLTest extends ContextTest {
accountingPersistenceQueryPostgreSQL.setRequestedRecords(clz);
accountingPersistenceQueryPostgreSQL.setTemporalConstraint(temporalConstraint);
accountingPersistenceQueryPostgreSQL.setFilters(filters);
SortedSet<NumberedFilter> numberedFilters = accountingPersistenceQueryPostgreSQL.getFilterValues(key);
for(NumberedFilter numberedFilter : numberedFilters) {
logger.debug("{}", numberedFilter);
}
accountingPersistenceQueryPostgreSQL.setFilters(filters);
numberedFilters = accountingPersistenceQueryPostgreSQL.getFilterValues(key);
for(NumberedFilter numberedFilter : numberedFilters) {
logger.debug("{}", numberedFilter);
}
accountingPersistenceQueryPostgreSQL.setFilters(null);
logger.debug("----Only first 3 results");
numberedFilters = accountingPersistenceQueryPostgreSQL.getFilterValues(key, 3);
for(NumberedFilter numberedFilter : numberedFilters) {
logger.debug("{}", numberedFilter);
}
accountingPersistenceQueryPostgreSQL.setFilters(filters);
logger.debug("----Only first 3 results");
numberedFilters = accountingPersistenceQueryPostgreSQL.getFilterValues(key, 3);
for(NumberedFilter numberedFilter : numberedFilters) {