From f40de8b61361bdcf060376b240d2492050aa2e02 Mon Sep 17 00:00:00 2001 From: Kat Yang <69819079+yangkb09@users.noreply.github.com> Date: Fri, 3 Nov 2023 10:12:40 -0400 Subject: [PATCH] Chore: Deprecate folderIDs in FolderFilter (#77590) Chore: Deprecate FolderID in FolderFilter --- pkg/services/libraryelements/writers.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkg/services/libraryelements/writers.go b/pkg/services/libraryelements/writers.go index 9d29b1a4b84..73b8744f634 100644 --- a/pkg/services/libraryelements/writers.go +++ b/pkg/services/libraryelements/writers.go @@ -72,9 +72,10 @@ func writeExcludeSQL(query model.SearchLibraryElementsQuery, builder *db.SQLBuil type FolderFilter struct { includeGeneralFolder bool - folderIDs []string - folderUIDs []string - parseError error + // Deprecated: use FolderUID instead + folderIDs []string + folderUIDs []string + parseError error } func parseFolderFilter(query model.SearchLibraryElementsQuery) FolderFilter { @@ -85,7 +86,7 @@ func parseFolderFilter(query model.SearchLibraryElementsQuery) FolderFilter { result := FolderFilter{ includeGeneralFolder: true, - folderIDs: folderIDs, + folderIDs: folderIDs, // nolint:staticcheck folderUIDs: folderUIDs, parseError: nil, } @@ -98,6 +99,7 @@ func parseFolderFilter(query model.SearchLibraryElementsQuery) FolderFilter { if hasFolderFilter { result.includeGeneralFolder = false folderIDs = strings.Split(query.FolderFilter, ",") + // nolint:staticcheck result.folderIDs = folderIDs for _, filter := range folderIDs { folderID, err := strconv.ParseInt(filter, 10, 64) @@ -130,6 +132,7 @@ func parseFolderFilter(query model.SearchLibraryElementsQuery) FolderFilter { func (f *FolderFilter) writeFolderFilterSQL(includeGeneral bool, builder *db.SQLBuilder) error { var sql bytes.Buffer params := make([]any, 0) + // nolint:staticcheck for _, filter := range f.folderIDs { folderID, err := strconv.ParseInt(filter, 10, 64) if err != nil {