Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Use backfill specific event to prevent card revisions (#66401)

Riley Thompson8393eb2820b6
diff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.edn
index 5593084cc0d..d9b310a208f 100644
--- a/.clj-kondo/config/modules/config.edn
+++ b/.clj-kondo/config/modules/config.edn
@@ -1895,7 +1895,6 @@
:uses #{analyze
api
collections
- config
driver
events
graph
diff --git a/enterprise/backend/src/metabase_enterprise/dependencies/events.clj b/enterprise/backend/src/metabase_enterprise/dependencies/events.clj
index aaa111a3349..805ab3b3a7a 100644
--- a/enterprise/backend/src/metabase_enterprise/dependencies/events.clj
+++ b/enterprise/backend/src/metabase_enterprise/dependencies/events.clj
@@ -34,6 +34,8 @@
(derive ::card-deps :metabase/event)
(derive :event/card-create ::card-deps)
(derive :event/card-update ::card-deps)
+;; Backfill-only event that triggers dependency calculation without creating a revision (#66365)
+(derive :event/card-dependency-backfill ::card-deps)
(methodical/defmethod events/publish-event! ::card-deps
[_ {:keys [object]}]
diff --git a/enterprise/backend/src/metabase_enterprise/dependencies/task/backfill.clj b/enterprise/backend/src/metabase_enterprise/dependencies/task/backfill.clj
index a01e9a8e609..7ad7b6c83ed 100644
--- a/enterprise/backend/src/metabase_enterprise/dependencies/task/backfill.clj
+++ b/enterprise/backend/src/metabase_enterprise/dependencies/task/backfill.clj
@@ -15,7 +15,6 @@
[java-time.api :as t]
[metabase-enterprise.dependencies.models.dependency :as models.dependency]
[metabase-enterprise.dependencies.settings :as deps.settings]
- [metabase.config.core :as config]
[metabase.events.core :as events]
[metabase.premium-features.core :as premium-features]
[metabase.task.core :as task]
@@ -75,7 +74,7 @@
{:dependency_analysis_version target-version})]
(when-let [card (and (pos? update-count)
(t2/select-one :model/Card id))]
- (events/publish-event! :event/card-update {:object card :user-id config/internal-mb-user-id}))
+ (events/publish-event! :event/card-dependency-backfill {:object card}))
update-count))
(defn- backfill-entity!
diff --git a/enterprise/backend/test/metabase_enterprise/dependencies/task/backfill_test.clj b/enterprise/backend/test/metabase_enterprise/dependencies/task/backfill_test.clj
index 5f79a5919ee..f9f39735497 100644
--- a/enterprise/backend/test/metabase_enterprise/dependencies/task/backfill_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/dependencies/task/backfill_test.clj
@@ -229,3 +229,23 @@
(mt/with-clock (t/plus (t/zoned-date-time) (t/duration 2 :minutes))
(backfill-dependencies-single-trigger!))
(is (t2/exists? :model/Card :id card-id :dependency_analysis_version current-version)))))))
+
+(deftest backfill-card-does-not-cause-revision-test
+ (testing "backfilling a card does not create a new revision or audit log entry"
+ (backfill-all-existing-entities!)
+ (mt/with-premium-features #{:dependencies :audit-app}
+ (mt/with-temp [:model/Card {card-id :id
+ dep-version :dependency_analysis_version}
+ {:dependency_analysis_version 0, :dataset_query (mt/mbql-query orders)}]
+ (let [revision-count-before (t2/count :model/Revision :model "Card" :model_id card-id)
+ deps-before (t2/count :model/Dependency :from_entity_type :card :from_entity_id card-id)]
+ (is (= 0 dep-version))
+ (is (= 0 revision-count-before))
+ (is (= 0 deps-before))
+ (backfill-dependencies-single-trigger!)
+ (let [revision-count-after (t2/count :model/Revision :model "Card" :model_id card-id)
+ dep-version-after (t2/select-one-fn :dependency_analysis_version :model/Card :id card-id)
+ deps-after (t2/count :model/Dependency :from_entity_type :card :from_entity_id card-id)]
+ (is (= 0 revision-count-after))
+ (is (= 2 dep-version-after))
+ (is (= 1 deps-after))))))))