From 260055f601cc4019b37a202ca51a6e5be84d41ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20OLIVIER?=
 <76560097+cedric-orange@users.noreply.github.com>
Date: Fri, 14 Mar 2025 17:48:08 +0000
Subject: [PATCH] fix: filter dbt models to upload only current project

---
 macros/edr/dbt_artifacts/upload_dbt_columns.sql   | 2 +-
 macros/edr/dbt_artifacts/upload_dbt_exposures.sql | 2 +-
 macros/edr/dbt_artifacts/upload_dbt_models.sql    | 2 +-
 macros/edr/dbt_artifacts/upload_dbt_seeds.sql     | 2 +-
 macros/edr/dbt_artifacts/upload_dbt_snapshots.sql | 2 +-
 macros/edr/dbt_artifacts/upload_dbt_sources.sql   | 2 +-
 macros/edr/dbt_artifacts/upload_dbt_tests.sql     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/macros/edr/dbt_artifacts/upload_dbt_columns.sql b/macros/edr/dbt_artifacts/upload_dbt_columns.sql
index c87bb4c04..0b9c0cd42 100644
--- a/macros/edr/dbt_artifacts/upload_dbt_columns.sql
+++ b/macros/edr/dbt_artifacts/upload_dbt_columns.sql
@@ -1,7 +1,7 @@
 {%- macro upload_dbt_columns(should_commit=false, metadata_hashes=none) -%}
     {% set relation = elementary.get_elementary_relation('dbt_columns') %}
     {% if execute and relation %}
-        {% set tables = graph.nodes.values() | list + graph.sources.values() | list %}
+        {% set tables = graph.nodes.values() | selectattr("package_name", "equalto", project_name) | list + graph.sources.values() | list %}
         {% do elementary.upload_artifacts_to_table(relation, tables, elementary.flatten_table_columns, should_commit=should_commit, metadata_hashes=metadata_hashes) %}
     {%- endif -%}
     {{- return('') -}}
diff --git a/macros/edr/dbt_artifacts/upload_dbt_exposures.sql b/macros/edr/dbt_artifacts/upload_dbt_exposures.sql
index 713fa6852..37dc91f9b 100644
--- a/macros/edr/dbt_artifacts/upload_dbt_exposures.sql
+++ b/macros/edr/dbt_artifacts/upload_dbt_exposures.sql
@@ -1,7 +1,7 @@
 {%- macro upload_dbt_exposures(should_commit=false, metadata_hashes=none) -%}
     {% set relation = elementary.get_elementary_relation('dbt_exposures') %}
     {% if execute and relation %}
-        {% set exposures = graph.exposures.values() | selectattr('resource_type', '==', 'exposure') %}
+        {% set exposures = graph.exposures.values() | selectattr('resource_type', '==', 'exposure') | selectattr("package_name", "equalto", project_name) %}
         {% do elementary.upload_artifacts_to_table(relation, exposures, elementary.flatten_exposure, should_commit=should_commit, metadata_hashes=metadata_hashes) %}
     {%- endif -%}
     {{- return('') -}}
diff --git a/macros/edr/dbt_artifacts/upload_dbt_models.sql b/macros/edr/dbt_artifacts/upload_dbt_models.sql
index a4cca0906..4693c2c87 100644
--- a/macros/edr/dbt_artifacts/upload_dbt_models.sql
+++ b/macros/edr/dbt_artifacts/upload_dbt_models.sql
@@ -1,7 +1,7 @@
 {%- macro upload_dbt_models(should_commit=false, metadata_hashes=none) -%}
     {% set relation = elementary.get_elementary_relation('dbt_models') %}
     {% if execute and relation %}
-        {% set models = graph.nodes.values() | selectattr('resource_type', '==', 'model') %}
+        {% set models = graph.nodes.values() | selectattr('resource_type', '==', 'model' ) | selectattr("package_name", "equalto", project_name) %}
         {% do elementary.upload_artifacts_to_table(relation, models, elementary.flatten_model, should_commit=should_commit, metadata_hashes=metadata_hashes) %}
     {%- endif -%}
     {{- return('') -}}
diff --git a/macros/edr/dbt_artifacts/upload_dbt_seeds.sql b/macros/edr/dbt_artifacts/upload_dbt_seeds.sql
index 1652f0735..4f69a2c90 100644
--- a/macros/edr/dbt_artifacts/upload_dbt_seeds.sql
+++ b/macros/edr/dbt_artifacts/upload_dbt_seeds.sql
@@ -1,7 +1,7 @@
 {%- macro upload_dbt_seeds(should_commit=false, metadata_hashes=none) -%}
     {% set relation = elementary.get_elementary_relation('dbt_seeds') %}
     {% if execute and relation %}
-        {% set seeds = graph.nodes.values() | selectattr('resource_type', '==', 'seed') %}
+        {% set seeds = graph.nodes.values() | selectattr('resource_type', '==', 'seed') | selectattr("package_name", "equalto", project_name) %}
         {% do elementary.upload_artifacts_to_table(relation, seeds, elementary.flatten_seed, should_commit=should_commit, metadata_hashes=metadata_hashes) %}
     {%- endif -%}
     {{- return('') -}}
diff --git a/macros/edr/dbt_artifacts/upload_dbt_snapshots.sql b/macros/edr/dbt_artifacts/upload_dbt_snapshots.sql
index fc6948bcf..0e30810a4 100644
--- a/macros/edr/dbt_artifacts/upload_dbt_snapshots.sql
+++ b/macros/edr/dbt_artifacts/upload_dbt_snapshots.sql
@@ -1,7 +1,7 @@
 {%- macro upload_dbt_snapshots(should_commit=false, metadata_hashes=none) -%}
     {% set relation = elementary.get_elementary_relation('dbt_snapshots') %}
     {% if execute and relation %}
-        {% set snapshots = graph.nodes.values() | selectattr('resource_type', '==', 'snapshot') %}
+        {% set snapshots = graph.nodes.values() | selectattr('resource_type', '==', 'snapshot')  | selectattr("package_name", "equalto", project_name) %}
         {% do elementary.upload_artifacts_to_table(relation, snapshots, elementary.flatten_model, should_commit=should_commit, metadata_hashes=metadata_hashes) %}
     {%- endif -%}
     {{- return('') -}}
diff --git a/macros/edr/dbt_artifacts/upload_dbt_sources.sql b/macros/edr/dbt_artifacts/upload_dbt_sources.sql
index a34800e1e..c32236f28 100644
--- a/macros/edr/dbt_artifacts/upload_dbt_sources.sql
+++ b/macros/edr/dbt_artifacts/upload_dbt_sources.sql
@@ -1,7 +1,7 @@
 {%- macro upload_dbt_sources(should_commit=false, metadata_hashes=none) -%}
     {% set relation = elementary.get_elementary_relation('dbt_sources') %}
     {% if execute and relation %}
-        {% set sources = graph.sources.values() | selectattr('resource_type', '==', 'source') %}
+        {% set sources = graph.sources.values() | selectattr('resource_type', '==', 'source') | selectattr("package_name", "equalto", project_name) %}
         {% do elementary.upload_artifacts_to_table(relation, sources, elementary.flatten_source, should_commit=should_commit, metadata_hashes=metadata_hashes) %}
     {%- endif -%}
     {{- return('') -}}
diff --git a/macros/edr/dbt_artifacts/upload_dbt_tests.sql b/macros/edr/dbt_artifacts/upload_dbt_tests.sql
index 5a4ee5a85..7a5093edf 100644
--- a/macros/edr/dbt_artifacts/upload_dbt_tests.sql
+++ b/macros/edr/dbt_artifacts/upload_dbt_tests.sql
@@ -1,7 +1,7 @@
 {%- macro upload_dbt_tests(should_commit=false, metadata_hashes=none) -%}
     {% set relation = elementary.get_elementary_relation('dbt_tests') %}
     {% if execute and relation %}
-        {% set tests = graph.nodes.values() | selectattr('resource_type', '==', 'test') %}
+        {% set tests = graph.nodes.values() | selectattr('resource_type', '==', 'test') | selectattr("package_name", "equalto", project_name) %}
         {% do elementary.upload_artifacts_to_table(relation, tests, elementary.flatten_test, should_commit=should_commit, metadata_hashes=metadata_hashes) %}
     {%- endif -%}
     {{- return('') -}}