fix: reports aggregation query to select sample_event and sample_resp…

…onse correctly (#5360)
rudderlabs · Dec 10, 2024 · cd94dac · cd94dac
1 parent f05fa25
commit cd94dac
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/enterprise/reporting/reporting.go b/enterprise/reporting/reporting.go
@@ -248,11 +248,11 @@ func (r *DefaultReporter) getReports(currentMs, aggregationIntervalMin int64, sy
     SELECT 
         %s, MAX(reported_at),
         COALESCE(
-            (ARRAY_AGG(sample_response ORDER BY id DESC) FILTER (WHERE sample_event != '{}'::jsonb))[1], 
+            (ARRAY_AGG(sample_response ORDER BY id DESC) FILTER (WHERE (sample_event != '{}'::jsonb AND sample_event IS NOT NULL) OR (sample_response IS NOT NULL AND sample_response != '')))[1],
             ''
         ) AS sample_response,
         COALESCE(
-            (ARRAY_AGG(sample_event ORDER BY id DESC) FILTER (WHERE sample_event != '{}'::jsonb))[1], 
+            (ARRAY_AGG(sample_event ORDER BY id DESC) FILTER (WHERE (sample_event != '{}'::jsonb AND sample_event IS NOT NULL) OR (sample_response IS NOT NULL AND sample_response != '')))[1],
             '{}'::jsonb
         ) AS sample_event,
         SUM(count),