fetch pa for teams from teamkatalogen api with cache

navikt · Dec 5, 2023 · d7e2e01 · d7e2e01
1 parent a4be208
commit d7e2e01
Show file tree

Hide file tree

Showing 19 changed files with 70 additions and 234 deletions.
diff --git a/pkg/database/dataproducts.go b/pkg/database/dataproducts.go
@@ -46,8 +46,8 @@ func (r *Repo) GetDataproductsByGroups(ctx context.Context, groups []string) ([]
 	return dps, nil
 }
 
-func (r *Repo) GetDataproductByProductArea(ctx context.Context, paID string) ([]*models.Dataproduct, error) {
-	dps, err := r.querier.GetDataproductsByProductArea(ctx, sql.NullString{String: paID, Valid: true})
+func (r *Repo) GetDataproductByProductArea(ctx context.Context, teamIDs []string) ([]*models.Dataproduct, error) {
+	dps, err := r.querier.GetDataproductsByProductArea(ctx, teamIDs)
 	if err != nil {
 		return nil, err
 	}

diff --git a/pkg/database/gensql/dataproducts.sql.go b/pkg/database/gensql/dataproducts.sql.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/models.go b/pkg/database/gensql/models.go
diff --git a/pkg/database/gensql/quarto.sql.go b/pkg/database/gensql/quarto.sql.go
diff --git a/pkg/database/gensql/querier.go b/pkg/database/gensql/querier.go
diff --git a/pkg/database/gensql/stories.sql.go b/pkg/database/gensql/stories.sql.go
diff --git a/pkg/database/gensql/teamcatalog_mapping.sql.go b/pkg/database/gensql/teamcatalog_mapping.sql.go
diff --git a/pkg/database/group.go b/pkg/database/group.go
diff --git a/pkg/database/insight_product.go b/pkg/database/insight_product.go
@@ -74,8 +74,8 @@ func (r *Repo) UpdateInsightProductMetadata(ctx context.Context, id uuid.UUID, n
 	return InsightProductSQLToGraphql(&dbProduct), nil
 }
 
-func (r *Repo) GetInsightProductsByProductArea(ctx context.Context, productAreaID string) ([]*models.InsightProduct, error) {
-	dbProducts, err := r.querier.GetInsightProductsByProductArea(ctx, ptrToNullString(&productAreaID))
+func (r *Repo) GetInsightProductsByProductArea(ctx context.Context, teamsInPA []string) ([]*models.InsightProduct, error) {
+	dbProducts, err := r.querier.GetInsightProductsByProductArea(ctx, teamsInPA)
 	if err != nil {
 		return nil, err
 	}

diff --git a/pkg/database/quarto.go b/pkg/database/quarto.go
@@ -63,9 +63,8 @@ func (r *Repo) GetQuartoStories(ctx context.Context) ([]*models.QuartoStory, err
 	return quartoGraphqls, err
 }
 
-func (r *Repo) GetQuartoStoriesByProductArea(ctx context.Context, paID string) ([]*models.QuartoStory, error) {
-	stories, err := r.querier.GetQuartoStoriesByProductArea(
-		ctx, sql.NullString{String: paID, Valid: true})
+func (r *Repo) GetQuartoStoriesByProductArea(ctx context.Context, teamsInPA []string) ([]*models.QuartoStory, error) {
+	stories, err := r.querier.GetQuartoStoriesByProductArea(ctx, teamsInPA)
 	if err != nil {
 		return nil, err
 	}
@@ -109,13 +108,7 @@ func (r *Repo) GetQuartoStoriesByGroups(ctx context.Context, groups []string) ([
 func (r *Repo) UpdateQuartoStoryMetadata(ctx context.Context, id uuid.UUID, name string, description string, keywords []string, teamkatalogenURL *string, productAreaID *string, teamID *string, group string) (
 	*models.QuartoStory, error,
 ) {
-	tx, err := r.db.Begin()
-	if err != nil {
-		return nil, err
-	}
-	querier := r.querier.WithTx(tx)
-
-	dbStory, err := querier.UpdateQuartoStory(ctx, gensql.UpdateQuartoStoryParams{
+	dbStory, err := r.querier.UpdateQuartoStory(ctx, gensql.UpdateQuartoStoryParams{
 		ID:               id,
 		Name:             name,
 		Description:      description,
@@ -125,20 +118,6 @@ func (r *Repo) UpdateQuartoStoryMetadata(ctx context.Context, id uuid.UUID, name
 		OwnerGroup:       group,
 	})
 	if err != nil {
-		if err := tx.Rollback(); err != nil {
-			r.log.WithError(err).Error("rolling back quarto metadata update")
-		}
-		return nil, err
-	}
-
-	if err := r.CreateTeamProductAreaMappingIfNotExists(ctx, tx, teamID, productAreaID); err != nil {
-		if err := tx.Rollback(); err != nil {
-			r.log.WithError(err).Error("rolling back quarto metadata update")
-		}
-		return nil, err
-	}
-
-	if err := tx.Commit(); err != nil {
 		return nil, err
 	}
 

diff --git a/pkg/database/queries/dataproducts.sql b/pkg/database/queries/dataproducts.sql
@@ -24,7 +24,7 @@ ORDER BY last_modified DESC;
 -- name: GetDataproductsByProductArea :many
 SELECT *
 FROM dataproducts
-WHERE team_id = ANY(SELECT team_id FROM team_productarea_mapping WHERE product_area_id = @product_area_id)
+WHERE team_id = ANY(@team_id::text[])
 ORDER BY created DESC;
 
 -- name: GetDataproductsByTeam :many

diff --git a/pkg/database/queries/insight_products.sql b/pkg/database/queries/insight_products.sql
@@ -56,7 +56,7 @@ SELECT
 FROM
     insight_product
 WHERE
-    team_id = ANY(SELECT team_id FROM team_productarea_mapping WHERE product_area_id = @product_area_id) 
+    team_id = ANY(@team_id::text[])
 ORDER BY
     last_modified DESC;
 

diff --git a/pkg/database/queries/quarto.sql b/pkg/database/queries/quarto.sql
@@ -59,7 +59,7 @@ ORDER BY last_modified DESC;
 -- name: GetQuartoStoriesByProductArea :many
 SELECT *
 FROM quarto_stories
-WHERE team_id = ANY(SELECT team_id FROM team_productarea_mapping WHERE product_area_id = @product_area_id)
+WHERE team_id = ANY(@team_id::text[])
 ORDER BY last_modified DESC;
 
 -- name: GetQuartoStoriesByTeam :many

diff --git a/pkg/database/queries/stories.sql b/pkg/database/queries/stories.sql
@@ -49,7 +49,7 @@ ORDER BY created DESC;
 -- name: GetStoriesByProductArea :many
 SELECT *
 FROM stories
-WHERE team_id = ANY(SELECT team_id FROM team_productarea_mapping WHERE product_area_id = @product_area_id) 
+WHERE team_id = ANY(@team_id::text[])
 ORDER BY created DESC;
 
 -- name: GetStoriesByTeam :many

diff --git a/pkg/database/queries/teamcatalog_mapping.sql b/pkg/database/queries/teamcatalog_mapping.sql