Chore: Deprecate folderIDs in FolderFilter (#77590)

Chore: Deprecate FolderID in FolderFilter
pull/77624/head
Kat Yang 2 years ago committed by GitHub
parent 225a69ba02
commit f40de8b613
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 11
      pkg/services/libraryelements/writers.go

@ -72,9 +72,10 @@ func writeExcludeSQL(query model.SearchLibraryElementsQuery, builder *db.SQLBuil
type FolderFilter struct { type FolderFilter struct {
includeGeneralFolder bool includeGeneralFolder bool
folderIDs []string // Deprecated: use FolderUID instead
folderUIDs []string folderIDs []string
parseError error folderUIDs []string
parseError error
} }
func parseFolderFilter(query model.SearchLibraryElementsQuery) FolderFilter { func parseFolderFilter(query model.SearchLibraryElementsQuery) FolderFilter {
@ -85,7 +86,7 @@ func parseFolderFilter(query model.SearchLibraryElementsQuery) FolderFilter {
result := FolderFilter{ result := FolderFilter{
includeGeneralFolder: true, includeGeneralFolder: true,
folderIDs: folderIDs, folderIDs: folderIDs, // nolint:staticcheck
folderUIDs: folderUIDs, folderUIDs: folderUIDs,
parseError: nil, parseError: nil,
} }
@ -98,6 +99,7 @@ func parseFolderFilter(query model.SearchLibraryElementsQuery) FolderFilter {
if hasFolderFilter { if hasFolderFilter {
result.includeGeneralFolder = false result.includeGeneralFolder = false
folderIDs = strings.Split(query.FolderFilter, ",") folderIDs = strings.Split(query.FolderFilter, ",")
// nolint:staticcheck
result.folderIDs = folderIDs result.folderIDs = folderIDs
for _, filter := range folderIDs { for _, filter := range folderIDs {
folderID, err := strconv.ParseInt(filter, 10, 64) 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 { func (f *FolderFilter) writeFolderFilterSQL(includeGeneral bool, builder *db.SQLBuilder) error {
var sql bytes.Buffer var sql bytes.Buffer
params := make([]any, 0) params := make([]any, 0)
// nolint:staticcheck
for _, filter := range f.folderIDs { for _, filter := range f.folderIDs {
folderID, err := strconv.ParseInt(filter, 10, 64) folderID, err := strconv.ParseInt(filter, 10, 64)
if err != nil { if err != nil {

Loading…
Cancel
Save