refactor(crossseed): remove legacy completion settings and related tests

This commit removes the CrossSeedCompletionSettings structure and its associated fields from various models, tests, and the database schema. The changes streamline the automation settings by eliminating deprecated completion configurations, ensuring a cleaner and more maintainable codebase. Additionally, a migration script is added to drop legacy completion columns from the database.

Author: s0up4200

internal/api/handlers/crossseed.go

@@ -32,42 +32,32 @@ type automationSettingsRequest struct {
 	Enabled                      bool                       `json:"enabled"`
 	RunIntervalMinutes           int                        `json:"runIntervalMinutes"`
 	StartPaused                  bool                       `json:"startPaused"`
-	Category                     *string                    `json:"category"`
-	IgnorePatterns               []string                   `json:"ignorePatterns"`
-	TargetInstanceIDs            []int                      `json:"targetInstanceIds"`
-	TargetIndexerIDs             []int                      `json:"targetIndexerIds"`
-	MaxResultsPerRun             int                        `json:"maxResultsPerRun"` // Deprecated: automation now processes full feeds and ignores this value
-	FindIndividualEpisodes       bool                       `json:"findIndividualEpisodes"`
-	SizeMismatchTolerancePercent float64                    `json:"sizeMismatchTolerancePercent"`
-	UseCategoryFromIndexer       bool                       `json:"useCategoryFromIndexer"`
-	UseCrossCategorySuffix       bool                       `json:"useCrossCategorySuffix"`
-	RunExternalProgramID         *int                       `json:"runExternalProgramId"`
-	Completion                   *completionSettingsRequest `json:"completion"`
-}
-
-type completionSettingsRequest struct {
-	Enabled           bool     `json:"enabled"`
-	Categories        []string `json:"categories"`
-	Tags              []string `json:"tags"`
-	ExcludeCategories []string `json:"excludeCategories"`
-	ExcludeTags       []string `json:"excludeTags"`
+	Category                     *string  `json:"category"`
+	IgnorePatterns               []string `json:"ignorePatterns"`
+	TargetInstanceIDs            []int    `json:"targetInstanceIds"`
+	TargetIndexerIDs             []int    `json:"targetIndexerIds"`
+	MaxResultsPerRun             int      `json:"maxResultsPerRun"` // Deprecated: automation now processes full feeds and ignores this value
+	FindIndividualEpisodes       bool     `json:"findIndividualEpisodes"`
+	SizeMismatchTolerancePercent float64  `json:"sizeMismatchTolerancePercent"`
+	UseCategoryFromIndexer       bool     `json:"useCategoryFromIndexer"`
+	UseCrossCategorySuffix       bool     `json:"useCrossCategorySuffix"`
+	RunExternalProgramID         *int     `json:"runExternalProgramId"`
 }
 
 type automationSettingsPatchRequest struct {
-	Enabled                      *bool                           `json:"enabled,omitempty"`
-	RunIntervalMinutes           *int                            `json:"runIntervalMinutes,omitempty"`
-	StartPaused                  *bool                           `json:"startPaused,omitempty"`
-	Category                     optionalString                  `json:"category"`
-	IgnorePatterns               *[]string                       `json:"ignorePatterns,omitempty"`
-	TargetInstanceIDs            *[]int                          `json:"targetInstanceIds,omitempty"`
-	TargetIndexerIDs             *[]int                          `json:"targetIndexerIds,omitempty"`
-	MaxResultsPerRun             *int                            `json:"maxResultsPerRun,omitempty"` // Deprecated: automation now processes full feeds and ignores this value
-	FindIndividualEpisodes       *bool                           `json:"findIndividualEpisodes,omitempty"`
-	SizeMismatchTolerancePercent *float64                        `json:"sizeMismatchTolerancePercent,omitempty"`
-	UseCategoryFromIndexer       *bool                           `json:"useCategoryFromIndexer,omitempty"`
-	UseCrossCategorySuffix       *bool                           `json:"useCrossCategorySuffix,omitempty"`
-	RunExternalProgramID         optionalInt                     `json:"runExternalProgramId"`
-	Completion                   *completionSettingsPatchRequest `json:"completion,omitempty"`
+	Enabled                      *bool          `json:"enabled,omitempty"`
+	RunIntervalMinutes           *int           `json:"runIntervalMinutes,omitempty"`
+	StartPaused                  *bool          `json:"startPaused,omitempty"`
+	Category                     optionalString `json:"category"`
+	IgnorePatterns               *[]string      `json:"ignorePatterns,omitempty"`
+	TargetInstanceIDs            *[]int         `json:"targetInstanceIds,omitempty"`
+	TargetIndexerIDs             *[]int         `json:"targetIndexerIds,omitempty"`
+	MaxResultsPerRun             *int           `json:"maxResultsPerRun,omitempty"` // Deprecated: automation now processes full feeds and ignores this value
+	FindIndividualEpisodes       *bool          `json:"findIndividualEpisodes,omitempty"`
+	SizeMismatchTolerancePercent *float64       `json:"sizeMismatchTolerancePercent,omitempty"`
+	UseCategoryFromIndexer       *bool          `json:"useCategoryFromIndexer,omitempty"`
+	UseCrossCategorySuffix       *bool          `json:"useCrossCategorySuffix,omitempty"`
+	RunExternalProgramID         optionalInt    `json:"runExternalProgramId"`
 	// Source-specific tagging
 	RSSAutomationTags    *[]string `json:"rssAutomationTags,omitempty"`
 	SeededSearchTags     *[]string `json:"seededSearchTags,omitempty"`
@@ -76,14 +66,6 @@ type automationSettingsPatchRequest struct {
 	InheritSourceTags    *bool     `json:"inheritSourceTags,omitempty"`
 }
 
-type completionSettingsPatchRequest struct {
-	Enabled           *bool     `json:"enabled,omitempty"`
-	Categories        *[]string `json:"categories,omitempty"`
-	Tags              *[]string `json:"tags,omitempty"`
-	ExcludeCategories *[]string `json:"excludeCategories,omitempty"`
-	ExcludeTags       *[]string `json:"excludeTags,omitempty"`
-}
-
 type optionalString struct {
 	Set   bool
 	Value *string
@@ -154,22 +136,13 @@ func (r automationSettingsPatchRequest) isEmpty() bool {
 		r.UseCategoryFromIndexer == nil &&
 		r.UseCrossCategorySuffix == nil &&
 		!r.RunExternalProgramID.Set &&
-		(r.Completion == nil || r.Completion.isEmpty()) &&
 		r.RSSAutomationTags == nil &&
 		r.SeededSearchTags == nil &&
 		r.CompletionSearchTags == nil &&
 		r.WebhookTags == nil &&
 		r.InheritSourceTags == nil
 }
 
-func (r completionSettingsPatchRequest) isEmpty() bool {
-	return r.Enabled == nil &&
-		r.Categories == nil &&
-		r.Tags == nil &&
-		r.ExcludeCategories == nil &&
-		r.ExcludeTags == nil
-}
-
 func applyAutomationSettingsPatch(settings *models.CrossSeedAutomationSettings, patch automationSettingsPatchRequest) {
 	if patch.Enabled != nil {
 		settings.Enabled = *patch.Enabled
@@ -219,9 +192,6 @@ func applyAutomationSettingsPatch(settings *models.CrossSeedAutomationSettings,
 	if patch.RunExternalProgramID.Set {
 		settings.RunExternalProgramID = patch.RunExternalProgramID.Value
 	}
-	if patch.Completion != nil {
-		applyCompletionSettingsPatch(&settings.Completion, patch.Completion)
-	}
 	// Source-specific tagging
 	if patch.RSSAutomationTags != nil {
 		settings.RSSAutomationTags = *patch.RSSAutomationTags
@@ -240,24 +210,6 @@ func applyAutomationSettingsPatch(settings *models.CrossSeedAutomationSettings,
 	}
 }
 
-func applyCompletionSettingsPatch(dest *models.CrossSeedCompletionSettings, patch *completionSettingsPatchRequest) {
-	if patch.Enabled != nil {
-		dest.Enabled = *patch.Enabled
-	}
-	if patch.Categories != nil {
-		dest.Categories = *patch.Categories
-	}
-	if patch.Tags != nil {
-		dest.Tags = *patch.Tags
-	}
-	if patch.ExcludeCategories != nil {
-		dest.ExcludeCategories = *patch.ExcludeCategories
-	}
-	if patch.ExcludeTags != nil {
-		dest.ExcludeTags = *patch.ExcludeTags
-	}
-}
-
 type automationRunRequest struct {
 	DryRun bool `json:"dryRun"`
 }
@@ -614,17 +566,6 @@ func (h *CrossSeedHandler) UpdateAutomationSettings(w http.ResponseWriter, r *ht
 		}
 	}
 
-	completion := models.DefaultCrossSeedCompletionSettings()
-	if req.Completion != nil {
-		completion = models.CrossSeedCompletionSettings{
-			Enabled:           req.Completion.Enabled,
-			Categories:        req.Completion.Categories,
-			Tags:              req.Completion.Tags,
-			ExcludeCategories: req.Completion.ExcludeCategories,
-			ExcludeTags:       req.Completion.ExcludeTags,
-		}
-	}
-
 	// Validate mutual exclusivity: cannot use both indexer category and .cross suffix
 	if req.UseCategoryFromIndexer && req.UseCrossCategorySuffix {
 		RespondError(w, http.StatusBadRequest, "Cannot enable both 'Use indexer name as category' and 'Add .cross category suffix'. These settings are mutually exclusive.")
@@ -645,7 +586,6 @@ func (h *CrossSeedHandler) UpdateAutomationSettings(w http.ResponseWriter, r *ht
 		UseCategoryFromIndexer:       req.UseCategoryFromIndexer,
 		UseCrossCategorySuffix:       req.UseCrossCategorySuffix,
 		RunExternalProgramID:         req.RunExternalProgramID,
-		Completion:                   completion,
 	}
 
 	updated, err := h.service.UpdateAutomationSettings(r.Context(), settings)

internal/api/handlers/crossseed_patch_test.go

@@ -28,13 +28,6 @@ func TestApplyAutomationSettingsPatch_MergesFields(t *testing.T) {
 		SizeMismatchTolerancePercent: 5.0,
 		UseCategoryFromIndexer:       false,
 		RunExternalProgramID:         ptrInt(42),
-		Completion: models.CrossSeedCompletionSettings{
-			Enabled:           false,
-			Categories:        []string{"tv"},
-			Tags:              []string{"cross-seed"},
-			ExcludeCategories: []string{"anime"},
-			ExcludeTags:       []string{"skip"},
-		},
 	}
 
 	newCategory := " movies "
@@ -53,13 +46,6 @@ func TestApplyAutomationSettingsPatch_MergesFields(t *testing.T) {
 		SizeMismatchTolerancePercent: ptrFloat(12.5),
 		UseCategoryFromIndexer:       ptrBool(true),
 		RunExternalProgramID:         optionalInt{Set: true, Value: nil},
-		Completion: &completionSettingsPatchRequest{
-			Enabled:           ptrBool(true),
-			Categories:        &[]string{"movies"},
-			Tags:              &[]string{"cross"},
-			ExcludeCategories: &[]string{"music"},
-			ExcludeTags:       &[]string{"x265"},
-		},
 	}
 
 	applyAutomationSettingsPatch(&existing, patch)
@@ -113,20 +99,6 @@ func TestApplyAutomationSettingsPatch_MergesFields(t *testing.T) {
 	if existing.RunExternalProgramID != nil {
 		t.Fatalf("expected runExternalProgramID to be nil")
 	}
-	if existing.Completion.Enabled != true ||
-		len(existing.Completion.Categories) != 1 ||
-		existing.Completion.Categories[0] != "movies" {
-		t.Fatalf("unexpected completion categories: %#v", existing.Completion)
-	}
-	if existing.Completion.Tags[0] != "cross" {
-		t.Fatalf("unexpected completion tags: %#v", existing.Completion.Tags)
-	}
-	if existing.Completion.ExcludeCategories[0] != "music" {
-		t.Fatalf("unexpected completion exclude categories: %#v", existing.Completion.ExcludeCategories)
-	}
-	if existing.Completion.ExcludeTags[0] != "x265" {
-		t.Fatalf("unexpected completion exclude tags: %#v", existing.Completion.ExcludeTags)
-	}
 }
 
 func TestApplyAutomationSettingsPatch_PreservesUnspecifiedFields(t *testing.T) {
@@ -138,10 +110,6 @@ func TestApplyAutomationSettingsPatch_PreservesUnspecifiedFields(t *testing.T) {
 		SeededSearchTags:     []string{"keep-seeded"},
 		CompletionSearchTags: []string{"keep-completion"},
 		WebhookTags:          []string{"keep-webhook"},
-		Completion: models.CrossSeedCompletionSettings{
-			Enabled: true,
-			Tags:    []string{"keep-tag"},
-		},
 	}
 
 	patch := automationSettingsPatchRequest{
@@ -166,9 +134,6 @@ func TestApplyAutomationSettingsPatch_PreservesUnspecifiedFields(t *testing.T) {
 	if len(existing.SeededSearchTags) != 1 || existing.SeededSearchTags[0] != "keep-seeded" {
 		t.Fatalf("expected seeded search tags to stay unchanged, got %#v", existing.SeededSearchTags)
 	}
-	if !existing.Completion.Enabled || existing.Completion.Tags[0] != "keep-tag" {
-		t.Fatalf("expected completion to stay unchanged, got %#v", existing.Completion)
-	}
 	if existing.SizeMismatchTolerancePercent != 20 {
 		t.Fatalf("expected updated tolerance to be 20, got %.2f", existing.SizeMismatchTolerancePercent)
 	}

internal/database/migrations/030_remove_legacy_completion_columns.sql

@@ -0,0 +1,66 @@
+-- Copyright (c) 2025, s0up and the autobrr contributors.
+-- SPDX-License-Identifier: GPL-2.0-or-later
+
+-- Remove legacy global completion columns from cross_seed_settings.
+-- These were replaced by per-instance settings in instance_crossseed_completion_settings (migration 029).
+
+-- SQLite does not support DROP COLUMN directly, so we must recreate the table.
+-- Step 1: Create new table without the completion columns
+CREATE TABLE cross_seed_settings_new (
+    id INTEGER PRIMARY KEY CHECK (id = 1),
+    enabled BOOLEAN NOT NULL DEFAULT 0,
+    run_interval_minutes INTEGER NOT NULL DEFAULT 120,
+    start_paused BOOLEAN NOT NULL DEFAULT 1,
+    category TEXT,
+    ignore_patterns TEXT NOT NULL DEFAULT '[]',
+    target_instance_ids TEXT NOT NULL DEFAULT '[]',
+    target_indexer_ids TEXT NOT NULL DEFAULT '[]',
+    max_results_per_run INTEGER NOT NULL DEFAULT 50,
+    find_individual_episodes BOOLEAN NOT NULL DEFAULT 0,
+    size_mismatch_tolerance_percent REAL NOT NULL DEFAULT 5.0,
+    use_category_from_indexer BOOLEAN NOT NULL DEFAULT 0,
+    run_external_program_id INTEGER REFERENCES external_programs(id) ON DELETE SET NULL,
+    rss_automation_tags TEXT NOT NULL DEFAULT '["cross-seed"]',
+    seeded_search_tags TEXT NOT NULL DEFAULT '["cross-seed"]',
+    completion_search_tags TEXT NOT NULL DEFAULT '["cross-seed"]',
+    webhook_tags TEXT NOT NULL DEFAULT '["cross-seed"]',
+    inherit_source_tags BOOLEAN NOT NULL DEFAULT 0,
+    use_cross_category_suffix BOOLEAN NOT NULL DEFAULT 1,
+    created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+-- Step 2: Copy data from old table (excluding dropped columns)
+INSERT INTO cross_seed_settings_new (
+    id, enabled, run_interval_minutes, start_paused, category,
+    ignore_patterns, target_instance_ids, target_indexer_ids,
+    max_results_per_run, find_individual_episodes, size_mismatch_tolerance_percent,
+    use_category_from_indexer, run_external_program_id,
+    rss_automation_tags, seeded_search_tags, completion_search_tags,
+    webhook_tags, inherit_source_tags, use_cross_category_suffix,
+    created_at, updated_at
+)
+SELECT
+    id, enabled, run_interval_minutes, start_paused, category,
+    ignore_patterns, target_instance_ids, target_indexer_ids,
+    max_results_per_run, find_individual_episodes, size_mismatch_tolerance_percent,
+    use_category_from_indexer, run_external_program_id,
+    rss_automation_tags, seeded_search_tags, completion_search_tags,
+    webhook_tags, inherit_source_tags, use_cross_category_suffix,
+    created_at, updated_at
+FROM cross_seed_settings;
+
+-- Step 3: Drop old table
+DROP TABLE cross_seed_settings;
+
+-- Step 4: Rename new table
+ALTER TABLE cross_seed_settings_new RENAME TO cross_seed_settings;
+
+-- Step 5: Recreate the update trigger
+CREATE TRIGGER IF NOT EXISTS trg_cross_seed_settings_updated
+AFTER UPDATE ON cross_seed_settings
+BEGIN
+    UPDATE cross_seed_settings
+    SET updated_at = CURRENT_TIMESTAMP
+    WHERE id = NEW.id;
+END;