From d5cb7521322270254154f1e9c3f40f82c5e93ab6 Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Tue, 21 Feb 2023 14:45:24 -0600 Subject: [PATCH] Remove auditInput from the process values (so it doesn't get serialized to frontend) --- .../AbstractMergeDuplicatesTransformStep.java | 7 ++++--- .../mergeduplicates/MergeDuplicatesLoadStep.java | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/mergeduplicates/AbstractMergeDuplicatesTransformStep.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/mergeduplicates/AbstractMergeDuplicatesTransformStep.java index 06485b7e..0cd8b71b 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/mergeduplicates/AbstractMergeDuplicatesTransformStep.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/mergeduplicates/AbstractMergeDuplicatesTransformStep.java @@ -93,6 +93,7 @@ public abstract class AbstractMergeDuplicatesTransformStep extends AbstractTrans private Set> keysSeenInPreviousPages = new HashSet<>(); + /******************************************************************************* ** Do the main work for this process - merge a list of records. ** May also call addOtherTableIdsToDelete, addOtherTableFilterToDelete, @@ -257,8 +258,8 @@ public abstract class AbstractMergeDuplicatesTransformStep extends AbstractTrans filter.setBooleanOperator(QQueryFilter.BooleanOperator.OR); for(QRecord record : runBackendStepInput.getRecords()) { - List ukValues = new ArrayList<>(); - QQueryFilter subFilter = new QQueryFilter(); + List ukValues = new ArrayList<>(); + QQueryFilter subFilter = new QQueryFilter(); for(QFieldMetaData field : uniqueKeyFields) { ukValues.add(record.getValue(field.getName())); @@ -388,7 +389,7 @@ public abstract class AbstractMergeDuplicatesTransformStep extends AbstractTrans runBackendStepOutput.addValue("otherTableFiltersToDelete", otherTableFiltersToDelete); runBackendStepOutput.addValue("otherTableRecordsToStore", otherTableRecordsToStore); - if(config.doAutomaticAudits) + if(config.doAutomaticAudits && "execute".equals(runBackendStepInput.getStepName())) { runBackendStepOutput.addValue("auditInput", auditInput); } diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/mergeduplicates/MergeDuplicatesLoadStep.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/mergeduplicates/MergeDuplicatesLoadStep.java index 54f26ae6..572581bd 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/mergeduplicates/MergeDuplicatesLoadStep.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/mergeduplicates/MergeDuplicatesLoadStep.java @@ -126,6 +126,7 @@ public class MergeDuplicatesLoadStep extends LoadViaInsertOrUpdateStep { // todo exec async? new AuditAction().execute(auditInput); + runBackendStepInput.addValue("auditInput", null); } }