mirror of
https://github.com/stashapp/stash.git
synced 2026-05-09 05:05:29 +02:00
Merge pull request #4 from slick-daddy/codex/create-new-branch-patch-4
Add 'aliases' filter to Group (GraphQL, backend, tests, and UI)
This commit is contained in:
parent
01a7583364
commit
5cb3760b06
5 changed files with 51 additions and 0 deletions
|
|
@ -423,6 +423,8 @@ input GroupFilterType {
|
|||
NOT: GroupFilterType
|
||||
|
||||
name: StringCriterionInput
|
||||
"Filter by aliases"
|
||||
aliases: StringCriterionInput
|
||||
director: StringCriterionInput
|
||||
synopsis: StringCriterionInput
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package models
|
|||
type GroupFilterType struct {
|
||||
OperatorFilter[GroupFilterType]
|
||||
Name *StringCriterionInput `json:"name"`
|
||||
Aliases *StringCriterionInput `json:"aliases"`
|
||||
Director *StringCriterionInput `json:"director"`
|
||||
Synopsis *StringCriterionInput `json:"synopsis"`
|
||||
// Filter by duration (in seconds)
|
||||
|
|
|
|||
|
|
@ -64,6 +64,7 @@ func (qb *groupFilterHandler) criterionHandler() criterionHandler {
|
|||
groupFilter := qb.groupFilter
|
||||
return compoundHandler{
|
||||
stringCriterionHandler(groupFilter.Name, "groups.name"),
|
||||
stringCriterionHandler(groupFilter.Aliases, "groups.aliases"),
|
||||
stringCriterionHandler(groupFilter.Director, "groups.director"),
|
||||
stringCriterionHandler(groupFilter.Synopsis, "groups.description"),
|
||||
intCriterionHandler(groupFilter.Rating100, "groups.rating", nil),
|
||||
|
|
|
|||
|
|
@ -885,6 +885,52 @@ func TestGroupQueryURL(t *testing.T) {
|
|||
verifyGroupQuery(t, filter, verifyFn)
|
||||
}
|
||||
|
||||
func TestGroupQueryAliases(t *testing.T) {
|
||||
const groupIdx = 1
|
||||
groupAliases := getGroupStringValue(groupIdx, aliasesField)
|
||||
|
||||
aliasesCriterion := models.StringCriterionInput{
|
||||
Value: groupAliases,
|
||||
Modifier: models.CriterionModifierEquals,
|
||||
}
|
||||
|
||||
filter := models.GroupFilterType{
|
||||
Aliases: &aliasesCriterion,
|
||||
}
|
||||
|
||||
verifyFn := func(n *models.Group) {
|
||||
t.Helper()
|
||||
verifyString(t, n.Aliases, aliasesCriterion)
|
||||
}
|
||||
|
||||
verifyGroupQuery(t, filter, verifyFn)
|
||||
|
||||
aliasesCriterion.Modifier = models.CriterionModifierNotEquals
|
||||
verifyGroupQuery(t, filter, verifyFn)
|
||||
|
||||
aliasesCriterion.Modifier = models.CriterionModifierIncludes
|
||||
aliasesCriterion.Value = "oup_1_alia"
|
||||
verifyGroupQuery(t, filter, verifyFn)
|
||||
|
||||
aliasesCriterion.Modifier = models.CriterionModifierExcludes
|
||||
aliasesCriterion.Value = "not-present-alias-substring"
|
||||
verifyGroupQuery(t, filter, verifyFn)
|
||||
|
||||
aliasesCriterion.Modifier = models.CriterionModifierMatchesRegex
|
||||
aliasesCriterion.Value = "group_.*1_aliases"
|
||||
verifyGroupQuery(t, filter, verifyFn)
|
||||
|
||||
aliasesCriterion.Modifier = models.CriterionModifierNotMatchesRegex
|
||||
verifyGroupQuery(t, filter, verifyFn)
|
||||
|
||||
aliasesCriterion.Modifier = models.CriterionModifierIsNull
|
||||
aliasesCriterion.Value = ""
|
||||
verifyGroupQuery(t, filter, verifyFn)
|
||||
|
||||
aliasesCriterion.Modifier = models.CriterionModifierNotNull
|
||||
verifyGroupQuery(t, filter, verifyFn)
|
||||
}
|
||||
|
||||
func TestGroupQueryURLExcludes(t *testing.T) {
|
||||
withRollbackTxn(func(ctx context.Context) error {
|
||||
mqb := db.Group
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@ const criterionOptions = [
|
|||
GroupIsMissingCriterionOption,
|
||||
createStringCriterionOption("url"),
|
||||
createStringCriterionOption("name"),
|
||||
createStringCriterionOption("aliases"),
|
||||
createStringCriterionOption("director"),
|
||||
createStringCriterionOption("synopsis"),
|
||||
createDurationCriterionOption("duration"),
|
||||
|
|
|
|||
Loading…
Reference in a new issue