From c32e988e71bbbdf31493742d007b1ab08c43cd16 Mon Sep 17 00:00:00 2001 From: Kichiyaki Date: Sat, 7 Nov 2020 08:40:53 +0100 Subject: [PATCH] bump github.com/tribalwarshelp/shared --- go.mod | 2 +- go.sum | 2 ++ graphql/generated/generated.go | 17 ++++++++--------- graphql/schema/version.graphql | 5 ++--- version/usecase/version_usecase.go | 8 ++++---- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index 9940821..1b57ce1 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/segmentio/encoding v0.1.14 // indirect github.com/tribalwarshelp/map-generator v0.0.0-20200801113621-fb8892ceb243 - github.com/tribalwarshelp/shared v0.0.0-20201106181031-7c5891c02013 + github.com/tribalwarshelp/shared v0.0.0-20201107073846-5e8e2d44d75c github.com/vektah/gqlparser/v2 v2.1.0 go.opentelemetry.io/otel v0.9.0 // indirect golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 diff --git a/go.sum b/go.sum index 57d3892..d4503cc 100644 --- a/go.sum +++ b/go.sum @@ -202,6 +202,8 @@ github.com/tribalwarshelp/shared v0.0.0-20201031105753-5d4d8b307747 h1:ef1VuyVNN github.com/tribalwarshelp/shared v0.0.0-20201031105753-5d4d8b307747/go.mod h1:Lxk6zaQhPTPrgz9ksMgg51m8XgflrCo/kRBx2cM3yfk= github.com/tribalwarshelp/shared v0.0.0-20201106181031-7c5891c02013 h1:6KWK3MWsTfIIWeRfC6+Ba+GvlwbV9Mq+HefbE+QcU2s= github.com/tribalwarshelp/shared v0.0.0-20201106181031-7c5891c02013/go.mod h1:Lxk6zaQhPTPrgz9ksMgg51m8XgflrCo/kRBx2cM3yfk= +github.com/tribalwarshelp/shared v0.0.0-20201107073846-5e8e2d44d75c h1:Lgqaf1a5zBpCGlA3O0k/jTChI0nvYlXj882iQK2fFT4= +github.com/tribalwarshelp/shared v0.0.0-20201107073846-5e8e2d44d75c/go.mod h1:Lxk6zaQhPTPrgz9ksMgg51m8XgflrCo/kRBx2cM3yfk= github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs= diff --git a/graphql/generated/generated.go b/graphql/generated/generated.go index 58a9a4d..268257c 100644 --- a/graphql/generated/generated.go +++ b/graphql/generated/generated.go @@ -4208,9 +4208,8 @@ type Version { } input VersionFilter { - languageTag: [VersionCode!] @deprecated(reason: "Use ` + "`" + `code` + "`" + `.") - languageTagNEQ: [VersionCode!] @deprecated(reason: "Use ` + "`" + `codeNEQ` + "`" + `.") - + tag: [VersionCode!] @deprecated(reason: "Use ` + "`" + `code` + "`" + `.") + tagNEQ: [VersionCode!] @deprecated(reason: "Use ` + "`" + `codeNEQ` + "`" + `.") code: [VersionCode!] codeNEQ: [VersionCode!] @@ -20849,19 +20848,19 @@ func (ec *executionContext) unmarshalInputVersionFilter(ctx context.Context, obj for k, v := range asMap { switch k { - case "languageTag": + case "tag": var err error - ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("languageTag")) - it.LanguageTag, err = ec.unmarshalOVersionCode2ᚕgithubᚗcomᚋtribalwarshelpᚋsharedᚋmodelsᚐVersionCodeᚄ(ctx, v) + ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("tag")) + it.Tag, err = ec.unmarshalOVersionCode2ᚕgithubᚗcomᚋtribalwarshelpᚋsharedᚋmodelsᚐVersionCodeᚄ(ctx, v) if err != nil { return it, err } - case "languageTagNEQ": + case "tagNEQ": var err error - ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("languageTagNEQ")) - it.LanguageTagNEQ, err = ec.unmarshalOVersionCode2ᚕgithubᚗcomᚋtribalwarshelpᚋsharedᚋmodelsᚐVersionCodeᚄ(ctx, v) + ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("tagNEQ")) + it.TagNEQ, err = ec.unmarshalOVersionCode2ᚕgithubᚗcomᚋtribalwarshelpᚋsharedᚋmodelsᚐVersionCodeᚄ(ctx, v) if err != nil { return it, err } diff --git a/graphql/schema/version.graphql b/graphql/schema/version.graphql index c24a674..1a3dfe2 100644 --- a/graphql/schema/version.graphql +++ b/graphql/schema/version.graphql @@ -28,9 +28,8 @@ type Version { } input VersionFilter { - languageTag: [VersionCode!] @deprecated(reason: "Use `code`.") - languageTagNEQ: [VersionCode!] @deprecated(reason: "Use `codeNEQ`.") - + tag: [VersionCode!] @deprecated(reason: "Use `code`.") + tagNEQ: [VersionCode!] @deprecated(reason: "Use `codeNEQ`.") code: [VersionCode!] codeNEQ: [VersionCode!] diff --git a/version/usecase/version_usecase.go b/version/usecase/version_usecase.go index 6c58d4e..1a2228b 100644 --- a/version/usecase/version_usecase.go +++ b/version/usecase/version_usecase.go @@ -28,11 +28,11 @@ func (ucase *usecase) Fetch(ctx context.Context, filter *models.VersionFilter) ( if !middleware.MayExceedLimit(ctx) && (filter.Limit > version.PaginationLimit || filter.Limit <= 0) { filter.Limit = version.PaginationLimit } - if len(filter.LanguageTag) > 0 { - filter.Code = append(filter.Code, filter.LanguageTag...) + if len(filter.Tag) > 0 { + filter.Code = append(filter.Code, filter.Tag...) } - if len(filter.LanguageTagNEQ) > 0 { - filter.CodeNEQ = append(filter.Code, filter.LanguageTagNEQ...) + if len(filter.TagNEQ) > 0 { + filter.CodeNEQ = append(filter.Code, filter.TagNEQ...) } filter.Sort = utils.SanitizeSort(filter.Sort) return ucase.repo.Fetch(ctx, version.FetchConfig{