feat(web): move from react-router to @tanstack/router

internal/database/filter_test.go

@@ -205,11 +205,10 @@ func TestFilterRepo_Delete(t *testing.T) {
 			err = repo.Delete(context.Background(), createdFilters[0].ID)
 			assert.NoError(t, err)
 
-			// Verify that the filter is deleted
+			// Verify that the filter is deleted and return error ErrRecordNotFound
 			filter, err := repo.FindByID(context.Background(), createdFilters[0].ID)
-			assert.NoError(t, err)
-			assert.NotNil(t, filter)
-			assert.Equal(t, 0, filter.ID)
+			assert.ErrorIs(t, err, domain.ErrRecordNotFound)
+			assert.Nil(t, filter)
 		})
 
 		t.Run(fmt.Sprintf("Delete_Fails_No_Record [%s]", dbType), func(t *testing.T) {
@@ -451,12 +450,11 @@ func TestFilterRepo_FindByID(t *testing.T) {
 			_ = repo.Delete(context.Background(), createdFilters[0].ID)
 		})
 
-		// TODO: This should succeed, but it fails because we are not handling the error correctly. Fix this.
 		t.Run(fmt.Sprintf("FindByID_Fails_Invalid_ID [%s]", dbType), func(t *testing.T) {
 			// Test using an invalid ID
 			filter, err := repo.FindByID(context.Background(), -1)
-			assert.NoError(t, err)   // should return an error
-			assert.NotNil(t, filter) // should be nil
+			assert.ErrorIs(t, err, domain.ErrRecordNotFound) // should return an error
+			assert.Nil(t, filter)                            // should be nil
 		})
 
 	}

internal/domain/filter.go

@@ -174,86 +174,75 @@
 )
 
 type FilterUpdate struct {
-	ID                               int                     `json:"id"`
-	Name                             *string                 `json:"name,omitempty"`
-	Enabled                          *bool                   `json:"enabled,omitempty"`
-	MinSize                          *string                 `json:"min_size,omitempty"`
-	MaxSize                          *string                 `json:"max_size,omitempty"`
-	Delay                            *int                    `json:"delay,omitempty"`
-	Priority                         *int32                  `json:"priority,omitempty"`
-	MaxDownloads                     *int                    `json:"max_downloads,omitempty"`
-	MaxDownloadsUnit                 *FilterMaxDownloadsUnit `json:"max_downloads_unit,omitempty"`
-	MatchReleases                    *string                 `json:"match_releases,omitempty"`
-	ExceptReleases                   *string                 `json:"except_releases,omitempty"`
-	UseRegex                         *bool                   `json:"use_regex,omitempty"`
-	MatchReleaseGroups               *string                 `json:"match_release_groups,omitempty"`
-	ExceptReleaseGroups              *string                 `json:"except_release_groups,omitempty"`
-	MatchReleaseTags                 *string                 `json:"match_release_tags,omitempty"`
-	ExceptReleaseTags                *string                 `json:"except_release_tags,omitempty"`
-	UseRegexReleaseTags              *bool                   `json:"use_regex_release_tags,omitempty"`
-	MatchDescription                 *string                 `json:"match_description,omitempty"`
-	ExceptDescription                *string                 `json:"except_description,omitempty"`
-	UseRegexDescription              *bool                   `json:"use_regex_description,omitempty"`
-	Scene                            *bool                   `json:"scene,omitempty"`
-	Origins                          *[]string               `json:"origins,omitempty"`
-	ExceptOrigins                    *[]string               `json:"except_origins,omitempty"`
-	Bonus                            *[]string               `json:"bonus,omitempty"`
-	Freeleech                        *bool                   `json:"freeleech,omitempty"`
-	FreeleechPercent                 *string                 `json:"freeleech_percent,omitempty"`
-	SmartEpisode                     *bool                   `json:"smart_episode,omitempty"`
-	Shows                            *string                 `json:"shows,omitempty"`
-	Seasons                          *string                 `json:"seasons,omitempty"`
-	Episodes                         *string                 `json:"episodes,omitempty"`
-	Resolutions                      *[]string               `json:"resolutions,omitempty"` // SD, 480i, 480p, 576p, 720p, 810p, 1080i, 1080p.
-	Codecs                           *[]string               `json:"codecs,omitempty"`      // XviD, DivX, x264, h.264 (or h264), mpeg2 (or mpeg-2), VC-1 (or VC1), WMV, Remux, h.264 Remux (or h264 Remux), VC-1 Remux (or VC1 Remux).
-	Sources                          *[]string               `json:"sources,omitempty"`     // DSR, PDTV, HDTV, HR.PDTV, HR.HDTV, DVDRip, DVDScr, BDr, BD5, BD9, BDRip, BRRip, DVDR, MDVDR, HDDVD, HDDVDRip, BluRay, WEB-DL, TVRip, CAM, R5, TELESYNC, TS, TELECINE, TC. TELESYNC and TS are synonyms (you don't need both). Same for TELECINE and TC
-	Containers                       *[]string               `json:"containers,omitempty"`
-	MatchHDR                         *[]string               `json:"match_hdr,omitempty"`
-	ExceptHDR                        *[]string               `json:"except_hdr,omitempty"`
-	MatchOther                       *[]string               `json:"match_other,omitempty"`
-	ExceptOther                      *[]string               `json:"except_other,omitempty"`
-	Years                            *string                 `json:"years,omitempty"`
-	Artists                          *string                 `json:"artists,omitempty"`
-	Albums                           *string                 `json:"albums,omitempty"`
-	MatchReleaseTypes                *[]string               `json:"match_release_types,omitempty"` // Album,Single,EP
-	ExceptReleaseTypes               *string                 `json:"except_release_types,omitempty"`
-	Formats                          *[]string               `json:"formats,omitempty"` // MP3, FLAC, Ogg, AAC, AC3, DTS
-	Quality                          *[]string               `json:"quality,omitempty"` // 192, 320, APS (VBR), V2 (VBR), V1 (VBR), APX (VBR), V0 (VBR), q8.x (VBR), Lossless, 24bit Lossless, Other
-	Media                            *[]string               `json:"media,omitempty"`   // CD, DVD, Vinyl, Soundboard, SACD, DAT, Cassette, WEB, Other
-	PerfectFlac                      *bool                   `json:"perfect_flac,omitempty"`
-	Cue                              *bool                   `json:"cue,omitempty"`
-	Log                              *bool                   `json:"log,omitempty"`
-	LogScore                         *int                    `json:"log_score,omitempty"`
-	MatchCategories                  *string                 `json:"match_categories,omitempty"`
-	ExceptCategories                 *string                 `json:"except_categories,omitempty"`
-	MatchUploaders                   *string                 `json:"match_uploaders,omitempty"`
-	ExceptUploaders                  *string                 `json:"except_uploaders,omitempty"`
-	MatchLanguage                    *[]string               `json:"match_language,omitempty"`
-	ExceptLanguage                   *[]string               `json:"except_language,omitempty"`
-	Tags                             *string                 `json:"tags,omitempty"`
-	ExceptTags                       *string                 `json:"except_tags,omitempty"`
-	TagsAny                          *string                 `json:"tags_any,omitempty"`
-	ExceptTagsAny                    *string                 `json:"except_tags_any,omitempty"`
-	TagsMatchLogic                   *string                 `json:"tags_match_logic,omitempty"`
-	ExceptTagsMatchLogic             *string                 `json:"except_tags_match_logic,omitempty"`
-	MinSeeders                       *int                    `json:"min_seeders,omitempty"`
-	MaxSeeders                       *int                    `json:"max_seeders,omitempty"`
-	MinLeechers                      *int                    `json:"min_leechers,omitempty"`
-	MaxLeechers                      *int                    `json:"max_leechers,omitempty"`
-	ExternalScriptEnabled            *bool                   `json:"external_script_enabled,omitempty"`
-	ExternalScriptCmd                *string                 `json:"external_script_cmd,omitempty"`
-	ExternalScriptArgs               *string                 `json:"external_script_args,omitempty"`
-	ExternalScriptExpectStatus       *int                    `json:"external_script_expect_status,omitempty"`
-	ExternalWebhookEnabled           *bool                   `json:"external_webhook_enabled,omitempty"`
-	ExternalWebhookHost              *string                 `json:"external_webhook_host,omitempty"`
-	ExternalWebhookData              *string                 `json:"external_webhook_data,omitempty"`
-	ExternalWebhookExpectStatus      *int                    `json:"external_webhook_expect_status,omitempty"`
-	ExternalWebhookRetryStatus       *string                 `json:"external_webhook_retry_status,omitempty"`
-	ExternalWebhookRetryAttempts     *int                    `json:"external_webhook_retry_attempts,omitempty"`
-	ExternalWebhookRetryDelaySeconds *int                    `json:"external_webhook_retry_delay_seconds,omitempty"`
-	Actions                          []*Action               `json:"actions,omitempty"`
-	External                         []FilterExternal        `json:"external,omitempty"`
-	Indexers                         []Indexer               `json:"indexers,omitempty"`
+	ID                   int                     `json:"id"`
+	Name                 *string                 `json:"name,omitempty"`
+	Enabled              *bool                   `json:"enabled,omitempty"`
+	MinSize              *string                 `json:"min_size,omitempty"`
+	MaxSize              *string                 `json:"max_size,omitempty"`
+	Delay                *int                    `json:"delay,omitempty"`
+	Priority             *int32                  `json:"priority,omitempty"`
+	MaxDownloads         *int                    `json:"max_downloads,omitempty"`
+	MaxDownloadsUnit     *FilterMaxDownloadsUnit `json:"max_downloads_unit,omitempty"`
+	MatchReleases        *string                 `json:"match_releases,omitempty"`
+	ExceptReleases       *string                 `json:"except_releases,omitempty"`
+	UseRegex             *bool                   `json:"use_regex,omitempty"`
+	MatchReleaseGroups   *string                 `json:"match_release_groups,omitempty"`
+	ExceptReleaseGroups  *string                 `json:"except_release_groups,omitempty"`
+	MatchReleaseTags     *string                 `json:"match_release_tags,omitempty"`
+	ExceptReleaseTags    *string                 `json:"except_release_tags,omitempty"`
+	UseRegexReleaseTags  *bool                   `json:"use_regex_release_tags,omitempty"`
+	MatchDescription     *string                 `json:"match_description,omitempty"`
+	ExceptDescription    *string                 `json:"except_description,omitempty"`
+	UseRegexDescription  *bool                   `json:"use_regex_description,omitempty"`
+	Scene                *bool                   `json:"scene,omitempty"`
+	Origins              *[]string               `json:"origins,omitempty"`
+	ExceptOrigins        *[]string               `json:"except_origins,omitempty"`
+	Bonus                *[]string               `json:"bonus,omitempty"`
+	Freeleech            *bool                   `json:"freeleech,omitempty"`
+	FreeleechPercent     *string                 `json:"freeleech_percent,omitempty"`
+	SmartEpisode         *bool                   `json:"smart_episode,omitempty"`
+	Shows                *string                 `json:"shows,omitempty"`
+	Seasons              *string                 `json:"seasons,omitempty"`
+	Episodes             *string                 `json:"episodes,omitempty"`
+	Resolutions          *[]string               `json:"resolutions,omitempty"` // SD, 480i, 480p, 576p, 720p, 810p, 1080i, 1080p.
+	Codecs               *[]string               `json:"codecs,omitempty"`      // XviD, DivX, x264, h.264 (or h264), mpeg2 (or mpeg-2), VC-1 (or VC1), WMV, Remux, h.264 Remux (or h264 Remux), VC-1 Remux (or VC1 Remux).
+	Sources              *[]string               `json:"sources,omitempty"`     // DSR, PDTV, HDTV, HR.PDTV, HR.HDTV, DVDRip, DVDScr, BDr, BD5, BD9, BDRip, BRRip, DVDR, MDVDR, HDDVD, HDDVDRip, BluRay, WEB-DL, TVRip, CAM, R5, TELESYNC, TS, TELECINE, TC. TELESYNC and TS are synonyms (you don't need both). Same for TELECINE and TC
+	Containers           *[]string               `json:"containers,omitempty"`
+	MatchHDR             *[]string               `json:"match_hdr,omitempty"`
+	ExceptHDR            *[]string               `json:"except_hdr,omitempty"`
+	MatchOther           *[]string               `json:"match_other,omitempty"`
+	ExceptOther          *[]string               `json:"except_other,omitempty"`
+	Years                *string                 `json:"years,omitempty"`
+	Artists              *string                 `json:"artists,omitempty"`
+	Albums               *string                 `json:"albums,omitempty"`
+	MatchReleaseTypes    *[]string               `json:"match_release_types,omitempty"` // Album,Single,EP
+	ExceptReleaseTypes   *string                 `json:"except_release_types,omitempty"`
+	Formats              *[]string               `json:"formats,omitempty"` // MP3, FLAC, Ogg, AAC, AC3, DTS
+	Quality              *[]string               `json:"quality,omitempty"` // 192, 320, APS (VBR), V2 (VBR), V1 (VBR), APX (VBR), V0 (VBR), q8.x (VBR), Lossless, 24bit Lossless, Other
+	Media                *[]string               `json:"media,omitempty"`   // CD, DVD, Vinyl, Soundboard, SACD, DAT, Cassette, WEB, Other
+	PerfectFlac          *bool                   `json:"perfect_flac,omitempty"`
+	Cue                  *bool                   `json:"cue,omitempty"`
+	Log                  *bool                   `json:"log,omitempty"`
+	LogScore             *int                    `json:"log_score,omitempty"`
+	MatchCategories      *string                 `json:"match_categories,omitempty"`
+	ExceptCategories     *string                 `json:"except_categories,omitempty"`
+	MatchUploaders       *string                 `json:"match_uploaders,omitempty"`
+	ExceptUploaders      *string                 `json:"except_uploaders,omitempty"`
+	MatchLanguage        *[]string               `json:"match_language,omitempty"`
+	ExceptLanguage       *[]string               `json:"except_language,omitempty"`
+	Tags                 *string                 `json:"tags,omitempty"`
+	ExceptTags           *string                 `json:"except_tags,omitempty"`
+	TagsAny              *string                 `json:"tags_any,omitempty"`
+	ExceptTagsAny        *string                 `json:"except_tags_any,omitempty"`
+	TagsMatchLogic       *string                 `json:"tags_match_logic,omitempty"`
+	ExceptTagsMatchLogic *string                 `json:"except_tags_match_logic,omitempty"`
+	MinSeeders           *int                    `json:"min_seeders,omitempty"`
+	MaxSeeders           *int                    `json:"max_seeders,omitempty"`
+	MinLeechers          *int                    `json:"min_leechers,omitempty"`
+	MaxLeechers          *int                    `json:"max_leechers,omitempty"`
+	Actions              []*Action               `json:"actions,omitempty"`
+	External             []FilterExternal        `json:"external,omitempty"`
+	Indexers             []Indexer               `json:"indexers,omitempty"`
 }
 
 func (f *Filter) Validate() error {
@@ -726,7 +715,7 @@
 				return false
 			}
 
 			max, err := strconv.ParseInt(minMax[1], 10, 32)
 			if err != nil {
 				return false
 			}

internal/filter/service.go

@@ -124,6 +124,12 @@ func (s *service) FindByID(ctx context.Context, filterID int) (*domain.Filter, e
 		return nil, err
 	}
 
+	externalFilters, err := s.repo.FindExternalFiltersByID(ctx, filter.ID)
+	if err != nil {
+		s.log.Error().Err(err).Msgf("could not find external filters for filter id: %v", filter.ID)
+	}
+	filter.External = externalFilters
+
 	actions, err := s.actionRepo.FindByFilterID(ctx, filter.ID, nil)
 	if err != nil {
 		s.log.Error().Err(err).Msgf("could not find filter actions for filter id: %v", filter.ID)
@@ -142,9 +148,25 @@ func (s *service) FindByID(ctx context.Context, filterID int) (*domain.Filter, e
 
 func (s *service) FindByIndexerIdentifier(ctx context.Context, indexer string) ([]*domain.Filter, error) {
 	// get filters for indexer
+	filters, err := s.repo.FindByIndexerIdentifier(ctx, indexer)
+	if err != nil {
+		return nil, err
+	}
+
 	// we do not load actions here since we do not need it at this stage
 	// only load those after filter has matched
-	return s.repo.FindByIndexerIdentifier(ctx, indexer)
+	for _, filter := range filters {
+		filter := filter
+
+		externalFilters, err := s.repo.FindExternalFiltersByID(ctx, filter.ID)
+		if err != nil {
+			s.log.Error().Err(err).Msgf("could not find external filters for filter id: %v", filter.ID)
+		}
+		filter.External = externalFilters
+
+	}
+
+	return filters, nil
 }
 
 func (s *service) GetDownloadsByFilterId(ctx context.Context, filterID int) (*domain.FilterDownloads, error) {