fix: Add _v1 to artifacts_by_project and projects_by_collection (#1339)

* Update references * Rename user_namespace to project_namespace and collection_namespace
opensource-observer · May 1, 2024 · 747b452 · 747b452
1 parent 8b0678a
commit 747b452
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 9 deletions.
diff --git a/warehouse/dbt/models/intermediate/directory/int_projects_by_collection.sql b/warehouse/dbt/models/intermediate/directory/int_projects_by_collection.sql
@@ -2,7 +2,7 @@ SELECT
   ptc.collection_id,
   p.id AS project_id,
   p.slug AS project_slug,
-  p.namespace AS user_namespace,
+  p.namespace AS project_namespace,
   p.name AS project_name
 FROM {{ ref('stg_ossd__projects_by_collection') }} AS ptc
 INNER JOIN {{ ref('stg_ossd__current_projects') }} AS p

diff --git a/.../marts/directory/artifacts_by_project.sql → ...rts/directory/artifacts_by_project_v1.sql b/.../marts/directory/artifacts_by_project.sql → ...rts/directory/artifacts_by_project_v1.sql
@@ -5,12 +5,14 @@
 }}
 
 SELECT
-  atp.project_id AS project_id,
-  p.project_slug AS project_slug,
   atp.artifact_id AS artifact_id,
   atp.artifact_namespace AS artifact_namespace,
   atp.artifact_type AS artifact_type,
-  atp.artifact_name AS artifact_name
+  atp.artifact_name AS artifact_name,
+  p.project_id,
+  p.project_namespace,
+  p.project_slug,
+  p.project_name
 FROM {{ ref('stg_ossd__artifacts_by_project') }} AS atp
 LEFT JOIN {{ ref('projects_v1') }} AS p
   ON atp.project_id = p.project_id
diff --git a/warehouse/dbt/models/marts/directory/collections_v1.sql b/warehouse/dbt/models/marts/directory/collections_v1.sql
@@ -6,7 +6,7 @@
 
 SELECT
   id AS collection_id,
-  namespace AS user_namespace,
+  namespace AS collection_namespace,
   slug AS collection_slug,
   name AS collection_name
 FROM {{ ref('stg_ossd__current_collections') }}
diff --git a/warehouse/dbt/models/marts/directory/deployers_by_project.sql b/warehouse/dbt/models/marts/directory/deployers_by_project.sql
@@ -10,5 +10,5 @@ SELECT
   atp.artifact_id AS artifact_id,
   atp.artifact_namespace AS artifact_namespace,
   atp.artifact_name AS artifact_name
-FROM {{ ref('artifacts_by_project') }} AS atp
+FROM {{ ref('artifacts_by_project_v1') }} AS atp
 WHERE atp.artifact_type = 'DEPLOYER'
diff --git a/...arts/directory/projects_by_collection.sql → ...s/directory/projects_by_collection_v1.sql b/...arts/directory/projects_by_collection.sql → ...s/directory/projects_by_collection_v1.sql
@@ -5,9 +5,11 @@
 }}
 SELECT
   pbc.project_id,
+  pbc.project_namespace,
   pbc.project_slug,
   pbc.project_name,
   c.collection_id,
+  c.collection_namespace,
   c.collection_slug,
   c.collection_name
 FROM {{ ref('int_projects_by_collection') }} AS pbc

diff --git a/warehouse/dbt/models/marts/directory/projects_v1.sql b/warehouse/dbt/models/marts/directory/projects_v1.sql
@@ -6,7 +6,7 @@
 
 SELECT
   project_id,
-  namespace AS user_namespace,
+  namespace AS project_namespace,
   project_slug,
   project_name
 FROM {{ ref('int_projects') }}
diff --git a/warehouse/dbt/models/marts/onchain_metrics/onchain_metrics_by_project_v2.sql b/warehouse/dbt/models/marts/onchain_metrics/onchain_metrics_by_project_v2.sql
@@ -92,7 +92,7 @@ contracts AS (
     project_id,
     artifact_namespace AS network,
     COUNT(DISTINCT artifact_name) AS num_contracts
-  FROM {{ ref('artifacts_by_project') }}
+  FROM {{ ref('artifacts_by_project_v1') }}
   WHERE artifact_type IN ('CONTRACT', 'FACTORY')
   GROUP BY 1, 2
 ),

diff --git a/warehouse/dbt/models/marts/project_metrics/beta/pm_contracts_deployed.sql b/warehouse/dbt/models/marts/project_metrics/beta/pm_contracts_deployed.sql
@@ -36,6 +36,6 @@ SELECT
   a.project_id,
   COUNT(DISTINCT a.artifact_id) AS amount
 FROM valid_contracts AS v
-LEFT JOIN {{ ref('artifacts_by_project') }} AS a
+LEFT JOIN {{ ref('artifacts_by_project_v1') }} AS a
   ON v.artifact_id = a.artifact_id
 GROUP BY 1