mirror of
https://github.com/Kingsrook/qqq.git
synced 2025-07-18 13:10:44 +00:00
Add percents to ColumnStats
This commit is contained in:
@ -23,6 +23,8 @@ package com.kingsrook.qqq.backend.core.processes.implementations.columnstats;
|
|||||||
|
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.math.RoundingMode;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
@ -303,14 +305,18 @@ public class ColumnStatsStep implements BackendStep
|
|||||||
/////////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////////
|
||||||
// just in case any of these don't fit in an integer, use decimal for them all //
|
// just in case any of these don't fit in an integer, use decimal for them all //
|
||||||
/////////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////////
|
||||||
|
Aggregate countTotalRowsAggregate = new Aggregate(table.getPrimaryKeyField(), AggregateOperator.COUNT).withFieldType(QFieldType.DECIMAL);
|
||||||
Aggregate countNonNullAggregate = new Aggregate(fieldName, AggregateOperator.COUNT).withFieldType(QFieldType.DECIMAL);
|
Aggregate countNonNullAggregate = new Aggregate(fieldName, AggregateOperator.COUNT).withFieldType(QFieldType.DECIMAL);
|
||||||
Aggregate countDistinctAggregate = new Aggregate(fieldName, AggregateOperator.COUNT_DISTINCT).withFieldType(QFieldType.DECIMAL);
|
Aggregate countDistinctAggregate = new Aggregate(fieldName, AggregateOperator.COUNT_DISTINCT).withFieldType(QFieldType.DECIMAL);
|
||||||
Aggregate sumAggregate = new Aggregate(fieldName, AggregateOperator.SUM).withFieldType(QFieldType.DECIMAL);
|
Aggregate sumAggregate = new Aggregate(fieldName, AggregateOperator.SUM).withFieldType(QFieldType.DECIMAL);
|
||||||
Aggregate avgAggregate = new Aggregate(fieldName, AggregateOperator.AVG).withFieldType(QFieldType.DECIMAL);
|
Aggregate avgAggregate = new Aggregate(fieldName, AggregateOperator.AVG).withFieldType(QFieldType.DECIMAL);
|
||||||
Aggregate minAggregate = new Aggregate(fieldName, AggregateOperator.MIN);
|
Aggregate minAggregate = new Aggregate(fieldName, AggregateOperator.MIN);
|
||||||
Aggregate maxAggregate = new Aggregate(fieldName, AggregateOperator.MAX);
|
Aggregate maxAggregate = new Aggregate(fieldName, AggregateOperator.MAX);
|
||||||
|
|
||||||
AggregateInput statsAggregateInput = new AggregateInput();
|
AggregateInput statsAggregateInput = new AggregateInput();
|
||||||
|
statsAggregateInput.withAggregate(countTotalRowsAggregate);
|
||||||
statsAggregateInput.withAggregate(countNonNullAggregate);
|
statsAggregateInput.withAggregate(countNonNullAggregate);
|
||||||
|
|
||||||
if(doCountDistinct)
|
if(doCountDistinct)
|
||||||
{
|
{
|
||||||
statsAggregateInput.withAggregate(countDistinctAggregate);
|
statsAggregateInput.withAggregate(countDistinctAggregate);
|
||||||
@ -332,6 +338,7 @@ public class ColumnStatsStep implements BackendStep
|
|||||||
statsAggregateInput.withAggregate(maxAggregate);
|
statsAggregateInput.withAggregate(maxAggregate);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BigDecimal totalRows = null;
|
||||||
if(CollectionUtils.nullSafeHasContents(statsAggregateInput.getAggregates()))
|
if(CollectionUtils.nullSafeHasContents(statsAggregateInput.getAggregates()))
|
||||||
{
|
{
|
||||||
statsAggregateInput.setTableName(tableName);
|
statsAggregateInput.setTableName(tableName);
|
||||||
@ -346,6 +353,8 @@ public class ColumnStatsStep implements BackendStep
|
|||||||
{
|
{
|
||||||
AggregateResult statsAggregateResult = statsAggregateOutput.getResults().get(0);
|
AggregateResult statsAggregateResult = statsAggregateOutput.getResults().get(0);
|
||||||
|
|
||||||
|
totalRows = ValueUtils.getValueAsBigDecimal(statsAggregateResult.getAggregateValue(countTotalRowsAggregate));
|
||||||
|
|
||||||
statsRecord.setValue(countNonNullField.getName(), statsAggregateResult.getAggregateValue(countNonNullAggregate));
|
statsRecord.setValue(countNonNullField.getName(), statsAggregateResult.getAggregateValue(countNonNullAggregate));
|
||||||
if(doCountDistinct)
|
if(doCountDistinct)
|
||||||
{
|
{
|
||||||
@ -388,6 +397,27 @@ public class ColumnStatsStep implements BackendStep
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/////////////////////
|
||||||
|
// figure count%'s //
|
||||||
|
/////////////////////
|
||||||
|
if(totalRows == null)
|
||||||
|
{
|
||||||
|
totalRows = new BigDecimal(valueCounts.stream().mapToInt(r -> r.getValueInteger("count")).sum());
|
||||||
|
}
|
||||||
|
|
||||||
|
if(totalRows != null && totalRows.compareTo(BigDecimal.ZERO) > 0)
|
||||||
|
{
|
||||||
|
BigDecimal oneHundred = new BigDecimal(100);
|
||||||
|
for(QRecord valueCount : valueCounts)
|
||||||
|
{
|
||||||
|
BigDecimal percent = new BigDecimal(Objects.requireNonNullElse(valueCount.getValueInteger("count"), 0)).divide(totalRows, 4, RoundingMode.HALF_UP).multiply(oneHundred).setScale(2, RoundingMode.HALF_UP);
|
||||||
|
valueCount.setValue("percent", percent);
|
||||||
|
}
|
||||||
|
|
||||||
|
QFieldMetaData percentField = new QFieldMetaData("percent", QFieldType.DECIMAL).withDisplayFormat(DisplayFormat.PERCENT_POINT2).withLabel("Percent");
|
||||||
|
QValueFormatter.setDisplayValuesInRecords(Map.of(fieldName, field, "percent", percentField), valueCounts);
|
||||||
|
}
|
||||||
|
|
||||||
QInstanceEnricher qInstanceEnricher = new QInstanceEnricher(null);
|
QInstanceEnricher qInstanceEnricher = new QInstanceEnricher(null);
|
||||||
fields.forEach(qInstanceEnricher::enrichField);
|
fields.forEach(qInstanceEnricher::enrichField);
|
||||||
|
|
||||||
|
@ -1,7 +1,29 @@
|
|||||||
|
/*
|
||||||
|
* QQQ - Low-code Application Framework for Engineers.
|
||||||
|
* Copyright (C) 2021-2023. Kingsrook, LLC
|
||||||
|
* 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
|
||||||
|
* contact@kingsrook.com
|
||||||
|
* https://github.com/Kingsrook/
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
package com.kingsrook.qqq.backend.core.processes.implementations.columnstats;
|
package com.kingsrook.qqq.backend.core.processes.implementations.columnstats;
|
||||||
|
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
import java.math.BigDecimal;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import com.kingsrook.qqq.backend.core.BaseTest;
|
import com.kingsrook.qqq.backend.core.BaseTest;
|
||||||
@ -53,9 +75,20 @@ class ColumnStatsStepTest extends BaseTest
|
|||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
List<QRecord> valueCounts = (List<QRecord>) values.get("valueCounts");
|
List<QRecord> valueCounts = (List<QRecord>) values.get("valueCounts");
|
||||||
|
|
||||||
assertThat(valueCounts.get(0).getValues()).hasFieldOrPropertyWithValue("lastName", "Simpson").hasFieldOrPropertyWithValue("count", 3);
|
assertThat(valueCounts.get(0).getValues())
|
||||||
assertThat(valueCounts.get(1).getValues()).hasFieldOrPropertyWithValue("lastName", null).hasFieldOrPropertyWithValue("count", 2); // here's the assert for the "" and null record above.
|
.hasFieldOrPropertyWithValue("lastName", "Simpson")
|
||||||
assertThat(valueCounts.get(2).getValues()).hasFieldOrPropertyWithValue("lastName", "Flanders").hasFieldOrPropertyWithValue("count", 1);
|
.hasFieldOrPropertyWithValue("count", 3)
|
||||||
|
.hasFieldOrPropertyWithValue("percent", new BigDecimal("50.00"));
|
||||||
|
|
||||||
|
assertThat(valueCounts.get(1).getValues())
|
||||||
|
.hasFieldOrPropertyWithValue("lastName", null)
|
||||||
|
.hasFieldOrPropertyWithValue("count", 2) // here's the assert for the "" and null record above.
|
||||||
|
.hasFieldOrPropertyWithValue("percent", new BigDecimal("33.33"));
|
||||||
|
|
||||||
|
assertThat(valueCounts.get(2).getValues())
|
||||||
|
.hasFieldOrPropertyWithValue("lastName", "Flanders")
|
||||||
|
.hasFieldOrPropertyWithValue("count", 1)
|
||||||
|
.hasFieldOrPropertyWithValue("percent", new BigDecimal("16.67"));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
Reference in New Issue
Block a user