From 75051c5e0455377f374c8b34594c192074ff0977 Mon Sep 17 00:00:00 2001 From: Kichiyaki Date: Fri, 8 Jan 2021 17:54:51 +0100 Subject: [PATCH] add two new field to the TribeFilterOr model (Tag, Name) --- models/tribe.go | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/models/tribe.go b/models/tribe.go index 75d8fc4..ae19b20 100644 --- a/models/tribe.go +++ b/models/tribe.go @@ -33,9 +33,11 @@ type Tribe struct { } type TribeFilterOr struct { - ID []int `json:"id" xml:"id" gqlgen:"id"` - TagIEQ string `json:"tagIEQ" xml:"tagIEQ" gqlgen:"tagIEQ"` - NameIEQ string `json:"nameIEQ" xml:"nameIEQ" gqlgen:"nameIEQ"` + ID []int `json:"id" xml:"id" gqlgen:"id"` + Tag []string `json:"tag" xml:"tag" gqlgen:"tag"` + TagIEQ string `json:"tagIEQ" xml:"tagIEQ" gqlgen:"tagIEQ"` + Name []string `json:"name" xml:"name" gqlgen:"name"` + NameIEQ string `json:"nameIEQ" xml:"nameIEQ" gqlgen:"nameIEQ"` } func (f *TribeFilterOr) WhereWithAlias(q *orm.Query, alias string) *orm.Query { @@ -43,9 +45,15 @@ func (f *TribeFilterOr) WhereWithAlias(q *orm.Query, alias string) *orm.Query { if !isZero(f.ID) { q = q.WhereOr(buildConditionArray(addAliasToColumnName("id", alias)), pg.Array(f.ID)) } + if !isZero(f.Tag) { + q = q.WhereOr(buildConditionArray(addAliasToColumnName("tag", alias)), pg.Array(f.Tag)) + } if !isZero(f.TagIEQ) { q = q.WhereOr(buildConditionIEQ(addAliasToColumnName("tag", alias)), f.TagIEQ) } + if !isZero(f.Name) { + q = q.WhereOr(buildConditionArray(addAliasToColumnName("name", alias)), pg.Array(f.Name)) + } if !isZero(f.NameIEQ) { q = q.WhereOr(buildConditionIEQ(addAliasToColumnName("name", alias)), f.NameIEQ) }