diff --git a/pkg/cookiebanner/service.go b/pkg/cookiebanner/service.go index 448fbdd9c..6ed6c1c35 100644 --- a/pkg/cookiebanner/service.go +++ b/pkg/cookiebanner/service.go @@ -283,7 +283,7 @@ func (s *Service) CreateCookieBanner( } var categories coredata.CookieCategories - if err := categories.LoadAllByCookieBannerID(ctx, tx, banner.ID); err != nil { + if err := categories.LoadAllByCookieBannerID(ctx, tx, scope, banner.ID); err != nil { return fmt.Errorf("cannot load cookie categories: %w", err) } @@ -430,7 +430,7 @@ func (s *Service) UpdateCookieBanner( if consentChanged { var categories coredata.CookieCategories - if err := categories.LoadAllByCookieBannerID(ctx, tx, banner.ID); err != nil { + if err := categories.LoadAllByCookieBannerID(ctx, tx, scope, banner.ID); err != nil { return fmt.Errorf("cannot load cookie categories: %w", err) } @@ -635,7 +635,7 @@ func (s *Service) CreateCookieCategory( } var categories coredata.CookieCategories - if err := categories.LoadAllByCookieBannerID(ctx, tx, req.CookieBannerID); err != nil { + if err := categories.LoadAllByCookieBannerID(ctx, tx, scope, req.CookieBannerID); err != nil { return fmt.Errorf("cannot load cookie categories: %w", err) } @@ -779,7 +779,7 @@ func (s *Service) UpdateCookieCategory( } var categories coredata.CookieCategories - if err := categories.LoadAllByCookieBannerID(ctx, tx, category.CookieBannerID); err != nil { + if err := categories.LoadAllByCookieBannerID(ctx, tx, scope, category.CookieBannerID); err != nil { return fmt.Errorf("cannot load cookie categories: %w", err) } @@ -829,7 +829,7 @@ func (s *Service) DeleteCookieCategory( } var categories coredata.CookieCategories - if err := categories.LoadAllByCookieBannerID(ctx, tx, bannerID); err != nil { + if err := categories.LoadAllByCookieBannerID(ctx, tx, scope, bannerID); err != nil { return fmt.Errorf("cannot load cookie categories: %w", err) } diff --git a/pkg/coredata/cookie_category.go b/pkg/coredata/cookie_category.go index e266d221b..0d9e13111 100644 --- a/pkg/coredata/cookie_category.go +++ b/pkg/coredata/cookie_category.go @@ -212,6 +212,7 @@ WHERE func (c *CookieCategories) LoadAllByCookieBannerID( ctx context.Context, conn pg.Querier, + scope Scoper, cookieBannerID gid.GID, ) error { q := ` @@ -229,12 +230,16 @@ SELECT FROM cookie_categories WHERE - cookie_banner_id = @cookie_banner_id + %s + AND cookie_banner_id = @cookie_banner_id ORDER BY rank ASC, id ASC; ` + q = fmt.Sprintf(q, scope.SQLFragment()) + args := pgx.StrictNamedArgs{"cookie_banner_id": cookieBannerID} + maps.Copy(args, scope.SQLArguments()) rows, err := conn.Query(ctx, q, args) if err != nil {