Skip to content

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

Embedding hub's checklist endpoint fails due to sample database changes (#64642)

Phoomparin Mano497ef8ebe12d
diff --git a/enterprise/backend/src/metabase_enterprise/embedding_hub/api.clj b/enterprise/backend/src/metabase_enterprise/embedding_hub/api.clj
index 437a0ef02c8..04d8be2f5a5 100644
--- a/enterprise/backend/src/metabase_enterprise/embedding_hub/api.clj
+++ b/enterprise/backend/src/metabase_enterprise/embedding_hub/api.clj
@@ -45,9 +45,11 @@
[:= :type "model"]
[:= :archived false]
[:or
- [:not-in :collection_id [(:id (audit/default-audit-collection)) {:select :id
- :from [(t2/table-name :model/Collection)]
- :where [:= :is_sample true]}]]
+ [:and
+ [:!= :collection_id (:id (audit/default-audit-collection))]
+ [:not-in :collection_id {:select :id
+ :from [(t2/table-name :model/Collection)]
+ :where [:= :is_sample true]}]]
[:is :collection_id nil]]]}))
(defn- embedding-hub-checklist []
diff --git a/enterprise/backend/test/metabase_enterprise/embedding_hub/api_test.clj b/enterprise/backend/test/metabase_enterprise/embedding_hub/api_test.clj
new file mode 100644
index 00000000000..331a4c22dd8
--- /dev/null
+++ b/enterprise/backend/test/metabase_enterprise/embedding_hub/api_test.clj
@@ -0,0 +1,42 @@
+(ns metabase-enterprise.embedding-hub.api-test
+ (:require
+ [clojure.test :refer :all]
+ [metabase.test :as mt]))
+
+(deftest has-user-created-models-test
+ (testing "has-user-created-models? correctly handles multiple sample collections (metabase#64627)"
+ (mt/with-premium-features #{:embedding}
+ (mt/with-temp [:model/Collection sample-collection-1 {:name "Sample Collection 1" :is_sample true}
+ :model/Collection sample-collection-2 {:name "Sample Collection 2" :is_sample true}
+ :model/Card user-model {:name "User Model"
+ :type "model"
+ :archived false
+ :collection_id nil
+ :dataset_query {:database (mt/id)
+ :type :query
+ :query {:source-table (mt/id :venues)}}}
+ :model/Card _sample-model-1 {:name "Sample Model 1"
+ :type "model"
+ :archived false
+ :collection_id (:id sample-collection-1)
+ :dataset_query {:database (mt/id)
+ :type :query
+ :query {:source-table (mt/id :venues)}}}
+ :model/Card _sample-model-2 {:name "Sample Model 2"
+ :type "model"
+ :archived false
+ :collection_id (:id sample-collection-2)
+ :dataset_query {:database (mt/id)
+ :type :query
+ :query {:source-table (mt/id :venues)}}}]
+ (testing "returns true when there is a model not in any sample collection"
+ (let [response (mt/user-http-request :crowberto :get 200 "/ee/embedding-hub/checklist")]
+ (is (true? (:create-models response))
+ "Should detect the user model with nil collection_id")))
+
+ (testing "returns false when all models are in sample collections"
+ ;; Temporarily archive the user model so only sample collection models remain active
+ (mt/with-temp-vals-in-db :model/Card (:id user-model) {:archived true}
+ (let [response (mt/user-http-request :crowberto :get 200 "/ee/embedding-hub/checklist")]
+ (is (false? (:create-models response))
+ "Should exclude models in both sample collections"))))))))