Remove cookie_patterns legacy, migrate to tracker_patterns

Delete coredata.CookiePattern and all associated CRUD methods, rename shared types (CookiePatternOrderField, CookiePatternFilter, CookiePatternMatchType) to TrackerPattern equivalents, and migrate all API surfaces (GraphQL, MCP, CLI, n8n) to tracker_pattern naming. The worker was already migrated in the base branch; this commit completes the removal by dropping the old GraphQL schema/resolvers, service methods, CLI commands, and n8n operations that operated on the legacy cookie_patterns table. Signed-off-by: Émile Ré <emile@getprobo.com>
2026-05-06 10:21:33 +04:00
parent 21f92352d5
commit af6e420f54
39 changed files with 1008 additions and 2475 deletions
--- a/pkg/server/api/mcp/v1/schema.resolvers.go
+++ b/pkg/server/api/mcp/v1/schema.resolvers.go
@@ -4941,49 +4941,50 @@ func (r *Resolver) ReorderCookieCategoryTool(ctx context.Context, req *mcp.CallT
 	return nil, types.ReorderCookieCategoryOutput{CookieCategory: types.NewCookieCategory(category)}, nil
 }

-func (r *Resolver) ListCookiePatternsTool(ctx context.Context, req *mcp.CallToolRequest, input *types.ListCookiePatternsInput) (*mcp.CallToolResult, types.ListCookiePatternsOutput, error) {
-	r.MustAuthorize(ctx, input.CookieCategoryID, probo.ActionCookiePatternList)
+func (r *Resolver) ListTrackerPatternsTool(ctx context.Context, req *mcp.CallToolRequest, input *types.ListTrackerPatternsInput) (*mcp.CallToolResult, types.ListTrackerPatternsOutput, error) {
+	r.MustAuthorize(ctx, input.CookieCategoryID, probo.ActionTrackerPatternList)
 	scope := coredata.NewScopeFromObjectID(input.CookieCategoryID)
-	cursor := types.NewCursor(input.Size, input.Cursor, page.OrderBy[coredata.CookiePatternOrderField]{Field: coredata.CookiePatternOrderFieldCreatedAt, Direction: page.OrderDirectionAsc})
-	patterns, err := r.cookieBanner.ListCookiePatternsForCategory(ctx, scope, input.CookieCategoryID, cursor)
+	cursor := types.NewCursor(input.Size, input.Cursor, page.OrderBy[coredata.TrackerPatternOrderField]{Field: coredata.TrackerPatternOrderFieldCreatedAt, Direction: page.OrderDirectionAsc})
+	patterns, err := r.cookieBanner.ListTrackerPatternsForCategory(ctx, scope, input.CookieCategoryID, cursor)
 	if err != nil {
-		panic(fmt.Errorf("cannot list cookie patterns: %w", err))
+		panic(fmt.Errorf("cannot list tracker patterns: %w", err))
 	}
 	p := page.NewPage(patterns, cursor)
-	return nil, types.NewListCookiePatternsOutput(p), nil
+	return nil, types.NewListTrackerPatternsOutput(p), nil
 }

-func (r *Resolver) GetCookiePatternTool(ctx context.Context, req *mcp.CallToolRequest, input *types.GetCookiePatternInput) (*mcp.CallToolResult, types.GetCookiePatternOutput, error) {
-	r.MustAuthorize(ctx, input.ID, probo.ActionCookiePatternGet)
+func (r *Resolver) GetTrackerPatternTool(ctx context.Context, req *mcp.CallToolRequest, input *types.GetTrackerPatternInput) (*mcp.CallToolResult, types.GetTrackerPatternOutput, error) {
+	r.MustAuthorize(ctx, input.ID, probo.ActionTrackerPatternGet)
 	scope := coredata.NewScopeFromObjectID(input.ID)
-	pattern, err := r.cookieBanner.GetCookiePattern(ctx, scope, input.ID)
+	pattern, err := r.cookieBanner.GetTrackerPattern(ctx, scope, input.ID)
 	if err != nil {
-		return nil, types.GetCookiePatternOutput{}, fmt.Errorf("cannot get cookie pattern: %w", err)
+		return nil, types.GetTrackerPatternOutput{}, fmt.Errorf("cannot get tracker pattern: %w", err)
 	}
-	return nil, types.GetCookiePatternOutput{CookiePattern: types.NewCookiePattern(pattern)}, nil
+	return nil, types.GetTrackerPatternOutput{TrackerPattern: types.NewTrackerPattern(pattern)}, nil
 }

-func (r *Resolver) AddCookiePatternTool(ctx context.Context, req *mcp.CallToolRequest, input *types.AddCookiePatternInput) (*mcp.CallToolResult, types.AddCookiePatternOutput, error) {
-	r.MustAuthorize(ctx, input.CookieCategoryID, probo.ActionCookiePatternCreate)
+func (r *Resolver) AddTrackerPatternTool(ctx context.Context, req *mcp.CallToolRequest, input *types.AddTrackerPatternInput) (*mcp.CallToolResult, types.AddTrackerPatternOutput, error) {
+	r.MustAuthorize(ctx, input.CookieCategoryID, probo.ActionTrackerPatternCreate)
 	scope := coredata.NewScopeFromObjectID(input.CookieCategoryID)
-	pattern, err := r.cookieBanner.CreateCookiePattern(ctx, scope, cookiebanner.CreateCookiePatternRequest{
+	pattern, err := r.cookieBanner.CreateTrackerPattern(ctx, scope, cookiebanner.CreateTrackerPatternRequest{
 		CookieCategoryID: input.CookieCategoryID,
+		TrackerType:      coredata.TrackerType(input.TrackerType),
 		Pattern:          input.Pattern,
-		MatchType:        coredata.CookiePatternMatchType(input.MatchType),
+		MatchType:        coredata.TrackerPatternMatchType(input.MatchType),
 		DisplayName:      input.DisplayName,
 		MaxAgeSeconds:    input.MaxAgeSeconds,
 		Description:      input.Description,
 	})
 	if err != nil {
-		return nil, types.AddCookiePatternOutput{}, fmt.Errorf("cannot create cookie pattern: %w", err)
+		return nil, types.AddTrackerPatternOutput{}, fmt.Errorf("cannot create tracker pattern: %w", err)
 	}
-	return nil, types.AddCookiePatternOutput{CookiePattern: types.NewCookiePattern(pattern)}, nil
+	return nil, types.AddTrackerPatternOutput{TrackerPattern: types.NewTrackerPattern(pattern)}, nil
 }

-func (r *Resolver) UpdateCookiePatternTool(ctx context.Context, req *mcp.CallToolRequest, input *types.UpdateCookiePatternInput) (*mcp.CallToolResult, types.UpdateCookiePatternOutput, error) {
-	r.MustAuthorize(ctx, input.ID, probo.ActionCookiePatternUpdate)
+func (r *Resolver) UpdateTrackerPatternTool(ctx context.Context, req *mcp.CallToolRequest, input *types.UpdateTrackerPatternInput) (*mcp.CallToolResult, types.UpdateTrackerPatternOutput, error) {
+	r.MustAuthorize(ctx, input.ID, probo.ActionTrackerPatternUpdate)
 	scope := coredata.NewScopeFromObjectID(input.ID)
-	updateReq := cookiebanner.UpdateCookiePatternRequest{CookiePatternID: input.ID}
+	updateReq := cookiebanner.UpdateTrackerPatternRequest{TrackerPatternID: input.ID}
 	if v := UnwrapOmittable(input.DisplayName); v != nil && *v != nil {
 		updateReq.DisplayName = *v
 	}
@@ -4997,33 +4998,33 @@ func (r *Resolver) UpdateCookiePatternTool(ctx context.Context, req *mcp.CallToo
 	if v := UnwrapOmittable(input.Excluded); v != nil && *v != nil {
 		updateReq.Excluded = *v
 	}
-	pattern, err := r.cookieBanner.UpdateCookiePattern(ctx, scope, updateReq)
+	pattern, err := r.cookieBanner.UpdateTrackerPattern(ctx, scope, updateReq)
 	if err != nil {
-		return nil, types.UpdateCookiePatternOutput{}, fmt.Errorf("cannot update cookie pattern: %w", err)
+		return nil, types.UpdateTrackerPatternOutput{}, fmt.Errorf("cannot update tracker pattern: %w", err)
 	}
-	return nil, types.UpdateCookiePatternOutput{CookiePattern: types.NewCookiePattern(pattern)}, nil
+	return nil, types.UpdateTrackerPatternOutput{TrackerPattern: types.NewTrackerPattern(pattern)}, nil
 }

-func (r *Resolver) DeleteCookiePatternTool(ctx context.Context, req *mcp.CallToolRequest, input *types.DeleteCookiePatternInput) (*mcp.CallToolResult, types.DeleteCookiePatternOutput, error) {
-	r.MustAuthorize(ctx, input.ID, probo.ActionCookiePatternDelete)
+func (r *Resolver) DeleteTrackerPatternTool(ctx context.Context, req *mcp.CallToolRequest, input *types.DeleteTrackerPatternInput) (*mcp.CallToolResult, types.DeleteTrackerPatternOutput, error) {
+	r.MustAuthorize(ctx, input.ID, probo.ActionTrackerPatternDelete)
 	scope := coredata.NewScopeFromObjectID(input.ID)
-	if err := r.cookieBanner.DeleteCookiePattern(ctx, scope, input.ID); err != nil {
-		return nil, types.DeleteCookiePatternOutput{}, fmt.Errorf("cannot delete cookie pattern: %w", err)
+	if err := r.cookieBanner.DeleteTrackerPattern(ctx, scope, input.ID); err != nil {
+		return nil, types.DeleteTrackerPatternOutput{}, fmt.Errorf("cannot delete tracker pattern: %w", err)
 	}
-	return nil, types.DeleteCookiePatternOutput{DeletedID: input.ID}, nil
+	return nil, types.DeleteTrackerPatternOutput{DeletedID: input.ID}, nil
 }

-func (r *Resolver) MoveCookiePatternToCategoryTool(ctx context.Context, req *mcp.CallToolRequest, input *types.MoveCookiePatternToCategoryInput) (*mcp.CallToolResult, types.MoveCookiePatternToCategoryOutput, error) {
-	r.MustAuthorize(ctx, input.CookiePatternID, probo.ActionCookiePatternUpdate)
-	scope := coredata.NewScopeFromObjectID(input.CookiePatternID)
-	result, err := r.cookieBanner.MoveCookiePatternToCategory(ctx, scope, cookiebanner.MoveCookiePatternToCategoryRequest{
-		CookiePatternID:        input.CookiePatternID,
+func (r *Resolver) MoveTrackerPatternToCategoryTool(ctx context.Context, req *mcp.CallToolRequest, input *types.MoveTrackerPatternToCategoryInput) (*mcp.CallToolResult, types.MoveTrackerPatternToCategoryOutput, error) {
+	r.MustAuthorize(ctx, input.TrackerPatternID, probo.ActionTrackerPatternUpdate)
+	scope := coredata.NewScopeFromObjectID(input.TrackerPatternID)
+	result, err := r.cookieBanner.MoveTrackerPatternToCategory(ctx, scope, cookiebanner.MoveTrackerPatternToCategoryRequest{
+		TrackerPatternID:       input.TrackerPatternID,
 		TargetCookieCategoryID: input.TargetCookieCategoryID,
 	})
 	if err != nil {
-		return nil, types.MoveCookiePatternToCategoryOutput{}, fmt.Errorf("cannot move cookie pattern: %w", err)
+		return nil, types.MoveTrackerPatternToCategoryOutput{}, fmt.Errorf("cannot move tracker pattern: %w", err)
 	}
-	return nil, types.MoveCookiePatternToCategoryOutput{CookiePattern: types.NewCookiePattern(result.CookiePattern)}, nil
+	return nil, types.MoveTrackerPatternToCategoryOutput{TrackerPattern: types.NewTrackerPattern(result.TrackerPattern)}, nil
 }

 func (r *Resolver) PublishCookieBannerVersionTool(ctx context.Context, req *mcp.CallToolRequest, input *types.PublishCookieBannerVersionInput) (*mcp.CallToolResult, types.PublishCookieBannerVersionOutput, error) {
--- a/pkg/server/api/mcp/v1/specification.yaml
+++ b/pkg/server/api/mcp/v1/specification.yaml
@@ -9132,13 +9132,14 @@ components:
          format: date-time
          description: Last update timestamp

-    CookiePattern:
+    TrackerPattern:
      type: object
      required:
        - id
        - organization_id
        - cookie_banner_id
        - cookie_category_id
+        - tracker_type
        - pattern
        - match_type
        - display_name
@@ -9150,7 +9151,7 @@ components:
      properties:
        id:
          $ref: "#/components/schemas/GID"
-          description: Cookie pattern ID
+          description: Tracker pattern ID
        organization_id:
          $ref: "#/components/schemas/GID"
          description: Organization ID
@@ -9160,9 +9161,13 @@ components:
        cookie_category_id:
          $ref: "#/components/schemas/GID"
          description: Cookie category ID
+        tracker_type:
+          type: string
+          enum: [COOKIE, LOCAL_STORAGE, SESSION_STORAGE, PIXEL]
+          description: Type of tracker
        pattern:
          type: string
-          description: Cookie name pattern
+          description: Tracker name pattern
        match_type:
          type: string
          enum: [EXACT, PREFIX]
@@ -9630,7 +9635,7 @@ components:
        cookie_category:
          $ref: "#/components/schemas/CookieCategory"

-    ListCookiePatternsInput:
+    ListTrackerPatternsInput:
      type: object
      required:
        - cookie_category_id
@@ -9642,19 +9647,19 @@ components:
        cursor:
          $ref: "#/components/schemas/CursorKey"

-    ListCookiePatternsOutput:
+    ListTrackerPatternsOutput:
      type: object
      required:
-        - cookie_patterns
+        - tracker_patterns
      properties:
        next_cursor:
          $ref: "#/components/schemas/CursorKey"
-        cookie_patterns:
+        tracker_patterns:
          type: array
          items:
-            $ref: "#/components/schemas/CookiePattern"
+            $ref: "#/components/schemas/TrackerPattern"

-    GetCookiePatternInput:
+    GetTrackerPatternInput:
      type: object
      required:
        - id
@@ -9662,18 +9667,19 @@ components:
        id:
          $ref: "#/components/schemas/GID"

-    GetCookiePatternOutput:
+    GetTrackerPatternOutput:
      type: object
      required:
-        - cookie_pattern
+        - tracker_pattern
      properties:
-        cookie_pattern:
-          $ref: "#/components/schemas/CookiePattern"
+        tracker_pattern:
+          $ref: "#/components/schemas/TrackerPattern"

-    AddCookiePatternInput:
+    AddTrackerPatternInput:
      type: object
      required:
        - cookie_category_id
+        - tracker_type
        - pattern
        - match_type
        - display_name
@@ -9681,6 +9687,9 @@ components:
      properties:
        cookie_category_id:
          $ref: "#/components/schemas/GID"
+        tracker_type:
+          type: string
+          enum: [COOKIE, LOCAL_STORAGE, SESSION_STORAGE, PIXEL]
        pattern:
          type: string
        match_type:
@@ -9693,15 +9702,15 @@ components:
        description:
          type: string

-    AddCookiePatternOutput:
+    AddTrackerPatternOutput:
      type: object
      required:
-        - cookie_pattern
+        - tracker_pattern
      properties:
-        cookie_pattern:
-          $ref: "#/components/schemas/CookiePattern"
+        tracker_pattern:
+          $ref: "#/components/schemas/TrackerPattern"

-    UpdateCookiePatternInput:
+    UpdateTrackerPatternInput:
      type: object
      required:
        - id
@@ -9729,15 +9738,15 @@ components:
            - "null"
          go.probo.inc/mcpgen/omittable: true

-    UpdateCookiePatternOutput:
+    UpdateTrackerPatternOutput:
      type: object
      required:
-        - cookie_pattern
+        - tracker_pattern
      properties:
-        cookie_pattern:
-          $ref: "#/components/schemas/CookiePattern"
+        tracker_pattern:
+          $ref: "#/components/schemas/TrackerPattern"

-    DeleteCookiePatternInput:
+    DeleteTrackerPatternInput:
      type: object
      required:
        - id
@@ -9745,7 +9754,7 @@ components:
        id:
          $ref: "#/components/schemas/GID"

-    DeleteCookiePatternOutput:
+    DeleteTrackerPatternOutput:
      type: object
      required:
        - deleted_id
@@ -9753,24 +9762,24 @@ components:
        deleted_id:
          $ref: "#/components/schemas/GID"

-    MoveCookiePatternToCategoryInput:
+    MoveTrackerPatternToCategoryInput:
      type: object
      required:
-        - cookie_pattern_id
+        - tracker_pattern_id
        - target_cookie_category_id
      properties:
-        cookie_pattern_id:
+        tracker_pattern_id:
          $ref: "#/components/schemas/GID"
        target_cookie_category_id:
          $ref: "#/components/schemas/GID"

-    MoveCookiePatternToCategoryOutput:
+    MoveTrackerPatternToCategoryOutput:
      type: object
      required:
-        - cookie_pattern
+        - tracker_pattern
      properties:
-        cookie_pattern:
-          $ref: "#/components/schemas/CookiePattern"
+        tracker_pattern:
+          $ref: "#/components/schemas/TrackerPattern"

    PublishCookieBannerVersionInput:
      type: object
@@ -12019,57 +12028,57 @@ tools:
      $ref: "#/components/schemas/ReorderCookieCategoryInput"
    outputSchema:
      $ref: "#/components/schemas/ReorderCookieCategoryOutput"
-  - name: listCookiePatterns
-    description: List all cookie patterns for a category
+  - name: listTrackerPatterns
+    description: List all tracker patterns for a category
    hints:
      readonly: true
      idempotent: true
    inputSchema:
-      $ref: "#/components/schemas/ListCookiePatternsInput"
+      $ref: "#/components/schemas/ListTrackerPatternsInput"
    outputSchema:
-      $ref: "#/components/schemas/ListCookiePatternsOutput"
-  - name: getCookiePattern
-    description: Get a cookie pattern by ID
+      $ref: "#/components/schemas/ListTrackerPatternsOutput"
+  - name: getTrackerPattern
+    description: Get a tracker pattern by ID
    hints:
      readonly: true
      idempotent: true
    inputSchema:
-      $ref: "#/components/schemas/GetCookiePatternInput"
+      $ref: "#/components/schemas/GetTrackerPatternInput"
    outputSchema:
-      $ref: "#/components/schemas/GetCookiePatternOutput"
-  - name: addCookiePattern
-    description: Create a new cookie pattern for a category
+      $ref: "#/components/schemas/GetTrackerPatternOutput"
+  - name: addTrackerPattern
+    description: Create a new tracker pattern for a category
    hints:
      readonly: false
    inputSchema:
-      $ref: "#/components/schemas/AddCookiePatternInput"
+      $ref: "#/components/schemas/AddTrackerPatternInput"
    outputSchema:
-      $ref: "#/components/schemas/AddCookiePatternOutput"
-  - name: updateCookiePattern
-    description: Update an existing cookie pattern
+      $ref: "#/components/schemas/AddTrackerPatternOutput"
+  - name: updateTrackerPattern
+    description: Update an existing tracker pattern
    hints:
      readonly: false
    inputSchema:
-      $ref: "#/components/schemas/UpdateCookiePatternInput"
+      $ref: "#/components/schemas/UpdateTrackerPatternInput"
    outputSchema:
-      $ref: "#/components/schemas/UpdateCookiePatternOutput"
-  - name: deleteCookiePattern
-    description: Delete a cookie pattern
+      $ref: "#/components/schemas/UpdateTrackerPatternOutput"
+  - name: deleteTrackerPattern
+    description: Delete a tracker pattern
    hints:
      readonly: false
      destructive: true
    inputSchema:
-      $ref: "#/components/schemas/DeleteCookiePatternInput"
+      $ref: "#/components/schemas/DeleteTrackerPatternInput"
    outputSchema:
-      $ref: "#/components/schemas/DeleteCookiePatternOutput"
-  - name: moveCookiePatternToCategory
-    description: Move a cookie pattern to a different category
+      $ref: "#/components/schemas/DeleteTrackerPatternOutput"
+  - name: moveTrackerPatternToCategory
+    description: Move a tracker pattern to a different category
    hints:
      readonly: false
    inputSchema:
-      $ref: "#/components/schemas/MoveCookiePatternToCategoryInput"
+      $ref: "#/components/schemas/MoveTrackerPatternToCategoryInput"
    outputSchema:
-      $ref: "#/components/schemas/MoveCookiePatternToCategoryOutput"
+      $ref: "#/components/schemas/MoveTrackerPatternToCategoryOutput"
  - name: publishCookieBannerVersion
    description: Publish the current draft version of a cookie banner
    hints:
--- a/pkg/server/api/mcp/v1/types/tracker_pattern.go
+++ b/pkg/server/api/mcp/v1/types/tracker_pattern.go
@@ -19,18 +19,24 @@ import (
 	"go.probo.inc/probo/pkg/page"
 )

-func NewCookiePattern(p *coredata.CookiePattern) *CookiePattern {
-	return &CookiePattern{
+func NewTrackerPattern(p *coredata.TrackerPattern) *TrackerPattern {
+	var source TrackerPatternSource
+	if p.Source != nil {
+		source = TrackerPatternSource(*p.Source)
+	}
+
+	return &TrackerPattern{
 		ID:               p.ID,
 		OrganizationID:   p.OrganizationID,
 		CookieBannerID:   p.CookieBannerID,
 		CookieCategoryID: p.CookieCategoryID,
+		TrackerType:      TrackerPatternTrackerType(p.TrackerType),
 		Pattern:          p.Pattern,
-		MatchType:        CookiePatternMatchType(p.MatchType),
+		MatchType:        TrackerPatternMatchType(p.MatchType),
 		DisplayName:      p.DisplayName,
 		MaxAgeSeconds:    p.MaxAgeSeconds,
 		Description:      p.Description,
-		Source:           CookiePatternSource(p.Source),
+		Source:           source,
 		Excluded:         p.Excluded,
 		LastMatchedAt:    p.LastMatchedAt,
 		CreatedAt:        p.CreatedAt,
@@ -38,10 +44,10 @@ func NewCookiePattern(p *coredata.CookiePattern) *CookiePattern {
 	}
 }

-func NewListCookiePatternsOutput(pg *page.Page[*coredata.CookiePattern, coredata.CookiePatternOrderField]) ListCookiePatternsOutput {
-	patterns := make([]*CookiePattern, 0, len(pg.Data))
+func NewListTrackerPatternsOutput(pg *page.Page[*coredata.TrackerPattern, coredata.TrackerPatternOrderField]) ListTrackerPatternsOutput {
+	patterns := make([]*TrackerPattern, 0, len(pg.Data))
 	for _, p := range pg.Data {
-		patterns = append(patterns, NewCookiePattern(p))
+		patterns = append(patterns, NewTrackerPattern(p))
 	}

 	var nextCursor *page.CursorKey
@@ -50,8 +56,8 @@ func NewListCookiePatternsOutput(pg *page.Page[*coredata.CookiePattern, coredata
 		nextCursor = &cursorKey
 	}

-	return ListCookiePatternsOutput{
-		NextCursor:     nextCursor,
-		CookiePatterns: patterns,
+	return ListTrackerPatternsOutput{
+		NextCursor:      nextCursor,
+		TrackerPatterns: patterns,
 	}
 }