[MM-24522] remove duplication in OR and IncludeDeletedChannels params for search (#14573)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
2b1da58e6d
Коммит
f12ca27bac
@@ -4,6 +4,7 @@
|
||||
package model
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"regexp"
|
||||
"strings"
|
||||
"time"
|
||||
@@ -367,3 +368,13 @@ func ParseSearchParams(text string, timeZoneOffset int) []*SearchParams {
|
||||
|
||||
return paramsList
|
||||
}
|
||||
|
||||
func IsSearchParamsListValid(paramsList []*SearchParams) *AppError {
|
||||
// All SearchParams should have same IncludeDeletedChannels value.
|
||||
for _, params := range paramsList {
|
||||
if params.IncludeDeletedChannels != paramsList[0].IncludeDeletedChannels {
|
||||
return NewAppError("IsSearchParamsListValid", "model.search_params_list.is_valid.include_deleted_channels.app_error", nil, "", http.StatusInternalServerError)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -1618,3 +1618,19 @@ func TestGetAfterDateMillis(t *testing.T) {
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestIsSearchParamsListValid(t *testing.T) {
|
||||
var err *AppError
|
||||
|
||||
err = IsSearchParamsListValid([]*SearchParams{{IncludeDeletedChannels: true}, {IncludeDeletedChannels: true}})
|
||||
assert.Nil(t, err)
|
||||
|
||||
err = IsSearchParamsListValid([]*SearchParams{{IncludeDeletedChannels: true}, {IncludeDeletedChannels: false}})
|
||||
assert.NotNil(t, err)
|
||||
|
||||
err = IsSearchParamsListValid([]*SearchParams{{IncludeDeletedChannels: true}})
|
||||
assert.Nil(t, err)
|
||||
|
||||
err = IsSearchParamsListValid([]*SearchParams{})
|
||||
assert.Nil(t, err)
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user