metabase: isrestricted check must evaluate permission group id not co…

…llection id as collection is not removed when opening a restricted mb database
navikt · Nov 27, 2024 · a85c4f8 · a85c4f8
1 parent c7bb914
commit a85c4f8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/pkg/database/gensql/metabase_metadata.sql.go b/pkg/database/gensql/metabase_metadata.sql.go
diff --git a/pkg/database/queries/metabase_metadata.sql b/pkg/database/queries/metabase_metadata.sql
@@ -72,4 +72,4 @@ WITH sources_in_same_dataset AS (
 SELECT table_name FROM sources_in_same_dataset sds
 JOIN metabase_metadata mbm
 ON mbm.dataset_id = sds.dataset_id
-WHERE mbm.collection_id = 0 OR mbm.collection_id IS NULL;
+WHERE mbm.permission_group_id = 0;
diff --git a/pkg/service/core/service_metabase.go b/pkg/service/core/service_metabase.go
@@ -925,7 +925,7 @@ func (s *metabaseService) SyncTableVisibility(ctx context.Context, meta *service
 }
 
 func isRestrictedDatabase(meta *service.MetabaseMetadata) bool {
-	if meta.CollectionID != nil && *meta.CollectionID != 0 {
+	if meta.PermissionGroupID != nil && *meta.PermissionGroupID != 0 {
 		return true
 	}