From bf6f4a69363f2614c9bf9bd40a8d592cee3d6f0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toma=C5=BE=20Jerman?= Date: Thu, 22 Sep 2022 17:26:17 +0200 Subject: [PATCH] Remove deleted records from DAL pipeline processing --- compose/service/record.go | 2 +- system/reporting/reporting.go | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/compose/service/record.go b/compose/service/record.go index 71461dd69..ded8129aa 100644 --- a/compose/service/record.go +++ b/compose/service/record.go @@ -1801,7 +1801,7 @@ func recordReportToDalPipeline(m *types.Module, metrics, dimensions, f string) ( pp = dal.Pipeline{ &dal.Datasource{ Ident: "ds", - Filter: filter.Generic(filter.WithExpression(f)), + Filter: filter.Generic(filter.WithExpression(f), filter.WithStateConstraint("deletedAt", filter.StateExcluded)), ModelRef: dal.ModelRef{ ConnectionID: m.Config.DAL.ConnectionID, ResourceID: m.ID, diff --git a/system/reporting/reporting.go b/system/reporting/reporting.go index 25472701e..7400658af 100644 --- a/system/reporting/reporting.go +++ b/system/reporting/reporting.go @@ -459,6 +459,12 @@ func convStepLoad(pr modelFinder, step types.ReportStepLoad, defs FrameDefinitio return } + // @todo refactor this out after we support other resources with potentially missing soft delete fields + f, err = f.MergeFilters(filter.Generic(filter.WithStateConstraint("deletedAt", filter.StateExcluded))) + if err != nil { + return + } + // Make pipeline step return &dal.Datasource{ Ident: step.Name,