Merge pull request #425 from navikt/2397-repo-not-shown-for-datasets

2397 repo not shown for datasets
navikt · Sep 6, 2024 · 29337bd · 29337bd
2 parents 74a7d8a + f1f7239
commit 29337bd
Show file tree

Hide file tree

Showing 26 changed files with 134 additions and 25 deletions.
diff --git a/pkg/database/gensql/dashboards.sql.go b/pkg/database/gensql/dashboards.sql.go
diff --git a/pkg/database/gensql/dataproducts.sql.go b/pkg/database/gensql/dataproducts.sql.go
diff --git a/pkg/database/gensql/dataproducts_v2.sql.go b/pkg/database/gensql/dataproducts_v2.sql.go
diff --git a/pkg/database/gensql/dataset_access.sql.go b/pkg/database/gensql/dataset_access.sql.go
diff --git a/pkg/database/gensql/dataset_access_requests.sql.go b/pkg/database/gensql/dataset_access_requests.sql.go
diff --git a/pkg/database/gensql/datasets.sql.go b/pkg/database/gensql/datasets.sql.go
diff --git a/pkg/database/gensql/datasets_v2.sql.go b/pkg/database/gensql/datasets_v2.sql.go
diff --git a/pkg/database/gensql/db.go b/pkg/database/gensql/db.go
diff --git a/pkg/database/gensql/insight_products.sql.go b/pkg/database/gensql/insight_products.sql.go
diff --git a/pkg/database/gensql/insight_products_v2.sql.go b/pkg/database/gensql/insight_products_v2.sql.go
diff --git a/pkg/database/gensql/joinable_views.sql.go b/pkg/database/gensql/joinable_views.sql.go
diff --git a/pkg/database/gensql/metabase_metadata.sql.go b/pkg/database/gensql/metabase_metadata.sql.go
diff --git a/pkg/database/gensql/models.go b/pkg/database/gensql/models.go
diff --git a/pkg/database/gensql/polly.sql.go b/pkg/database/gensql/polly.sql.go
diff --git a/pkg/database/gensql/querier.go b/pkg/database/gensql/querier.go
diff --git a/pkg/database/gensql/search.sql.go b/pkg/database/gensql/search.sql.go
diff --git a/pkg/database/gensql/sessions.sql.go b/pkg/database/gensql/sessions.sql.go
diff --git a/pkg/database/gensql/stories_v2.sql.go b/pkg/database/gensql/stories_v2.sql.go
diff --git a/pkg/database/gensql/story.sql.go b/pkg/database/gensql/story.sql.go
diff --git a/pkg/database/gensql/tags.sql.go b/pkg/database/gensql/tags.sql.go
diff --git a/pkg/database/gensql/team.sql.go b/pkg/database/gensql/team.sql.go
diff --git a/pkg/database/gensql/team_projects_cache.sql.go b/pkg/database/gensql/team_projects_cache.sql.go
diff --git a/pkg/database/gensql/teamkatalogen.sql.go b/pkg/database/gensql/teamkatalogen.sql.go
diff --git a/pkg/database/gensql/third_party_mappings.sql.go b/pkg/database/gensql/third_party_mappings.sql.go
diff --git a/pkg/database/migrations/0093_include_repo_in_dataset_view.sql b/pkg/database/migrations/0093_include_repo_in_dataset_view.sql
@@ -0,0 +1,106 @@
+-- +goose Up
+DROP VIEW dataset_view;
+
+CREATE VIEW dataset_view AS(
+    SELECT
+        ds.id as ds_id,
+        ds.name as ds_name,
+        ds.description as ds_description,
+        ds.created as ds_created,
+        ds.last_modified as ds_last_modified,
+        ds.slug as ds_slug,
+        ds.pii as pii,
+        ds.keywords as ds_keywords,
+        ds.repo as ds_repo,
+        dsrc.id AS bq_id,
+        dsrc.created as bq_created,
+        dsrc.last_modified as bq_last_modified,
+        dsrc.expires as bq_expires,
+        dsrc.description as bq_description,
+        dsrc.missing_since as bq_missing_since,
+        dsrc.pii_tags as pii_tags,
+        dsrc.project_id as bq_project,
+        dsrc.dataset as bq_dataset,
+        dsrc.table_name as bq_table_name,
+        dsrc.table_type as bq_table_type,
+        dsrc.pseudo_columns as pseudo_columns,
+        dsrc.schema as bq_schema,
+        ds.dataproduct_id as ds_dp_id,
+        dm.services as mapping_services,
+        da.id as access_id,
+        da.subject as access_subject,
+        da.owner as access_owner,
+        da.granter as access_granter,
+        da.expires as access_expires,
+        da.created as access_created,
+        da.revoked as access_revoked,
+        da.access_request_id as access_request_id,
+        mm.database_id as mb_database_id,
+        mm.deleted_at as mb_deleted_at
+    FROM
+        datasets ds
+        LEFT JOIN (
+            SELECT
+                *
+            FROM
+                datasource_bigquery
+            WHERE
+                is_reference = false
+        ) dsrc ON ds.id = dsrc.dataset_id
+        LEFT JOIN third_party_mappings dm ON ds.id = dm.dataset_id
+        LEFT JOIN dataset_access da ON ds.id = da.dataset_id
+        LEFT JOIN metabase_metadata mm ON ds.id = mm.dataset_id
+);
+
+-- +goose Down
+DROP VIEW dataset_view;
+
+CREATE VIEW dataset_view AS(
+    SELECT
+        ds.id as ds_id,
+        ds.name as ds_name,
+        ds.description as ds_description,
+        ds.created as ds_created,
+        ds.last_modified as ds_last_modified,
+        ds.slug as ds_slug,
+        ds.pii as pii,
+        ds.keywords as ds_keywords,
+        dsrc.id AS bq_id,
+        dsrc.created as bq_created,
+        dsrc.last_modified as bq_last_modified,
+        dsrc.expires as bq_expires,
+        dsrc.description as bq_description,
+        dsrc.missing_since as bq_missing_since,
+        dsrc.pii_tags as pii_tags,
+        dsrc.project_id as bq_project,
+        dsrc.dataset as bq_dataset,
+        dsrc.table_name as bq_table_name,
+        dsrc.table_type as bq_table_type,
+        dsrc.pseudo_columns as pseudo_columns,
+        dsrc.schema as bq_schema,
+        ds.dataproduct_id as ds_dp_id,
+        dm.services as mapping_services,
+        da.id as access_id,
+        da.subject as access_subject,
+        da.owner as access_owner,
+        da.granter as access_granter,
+        da.expires as access_expires,
+        da.created as access_created,
+        da.revoked as access_revoked,
+        da.access_request_id as access_request_id,
+        mm.database_id as mb_database_id,
+        mm.deleted_at as mb_deleted_at
+    FROM
+        datasets ds
+        LEFT JOIN (
+            SELECT
+                *
+            FROM
+                datasource_bigquery
+            WHERE
+                is_reference = false
+        ) dsrc ON ds.id = dsrc.dataset_id
+        LEFT JOIN third_party_mappings dm ON ds.id = dm.dataset_id
+        LEFT JOIN dataset_access da ON ds.id = da.dataset_id
+        LEFT JOIN metabase_metadata mm ON ds.id = mm.dataset_id
+);
diff --git a/pkg/service/core/storage/postgres/postgres_dataproduct.go b/pkg/service/core/storage/postgres/postgres_dataproduct.go
@@ -599,6 +599,7 @@ func (s *dataProductStorage) datasetFromSQL(dsrows []gensql.DatasetView) (*servi
 				Slug:              dsrow.DsSlug,
 				Keywords:          dsrow.DsKeywords,
 				DataproductID:     dsrow.DsDpID,
+				Repo:              nullStringToPtr(dsrow.DsRepo),
 				Mappings:          []string{},
 				Access:            []*service.Access{},
 				Datasource:        nil,