twhelp
/
api
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove deprecated LangVersion

This commit is contained in:
Dawid Wysokiński 2020-12-25 12:42:46 +01:00
parent 4a58bff0f6
commit f6009dacb2
13 changed files with 21 additions and 399 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -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-20201225102309-31dd9dda110c
github.com/tribalwarshelp/shared v0.0.0-20201225112152-d1d8bc92fc33
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

16
go.sum
View File

@ -1,7 +1,5 @@
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/99designs/gqlgen v0.11.3 h1:oFSxl1DFS9X///uHV3y6CEfpcXWrDUxVblR4Xib2bs4=
github.com/99designs/gqlgen v0.11.3/go.mod h1:RgX5GRRdDWNkh4pBrdzNpNPFVsdoUFY2+adM6nb1N+4=
github.com/99designs/gqlgen v0.13.0 h1:haLTcUp3Vwp80xMVEg5KRNwzfUrgFdRmtBY8fuB8scA=
github.com/99designs/gqlgen v0.13.0/go.mod h1:NV130r6f4tpRWuAI+zsrSdooO/eWUv+Gyyoi3rEfXIk=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@ -107,8 +105,6 @@ github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
github.com/gorilla/mux v1.6.1/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
github.com/gorilla/websocket v1.2.0 h1:VJtLvh6VQym50czpZzx07z/kw9EgAxI3x1ZB8taTMQQ=
github.com/gorilla/websocket v1.2.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo=
@ -198,14 +194,8 @@ github.com/tribalwarshelp/map-generator v0.0.0-20200801113621-fb8892ceb243 h1:ke
github.com/tribalwarshelp/map-generator v0.0.0-20200801113621-fb8892ceb243/go.mod h1:hVGbToOex7CV5+DAV6QfVMx1XDgp30DOoyOapbr+Vj4=
github.com/tribalwarshelp/shared v0.0.0-20200622084436-3a768c8bf574 h1:y2EoH6zRK9Uc0AeswnJRYUUIQYcSLZB5VDFuxPCKxNM=
github.com/tribalwarshelp/shared v0.0.0-20200622084436-3a768c8bf574/go.mod h1:tf+2yTHasV6jAF3V2deZ9slNoCyBzC0fMdTjI7clf6Y=
github.com/tribalwarshelp/shared v0.0.0-20201031105753-5d4d8b307747 h1:ef1VuyVNNxa6ALTPS5X8dPEsAI7KuA3/umNNkrI4fIk=
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/tribalwarshelp/shared v0.0.0-20201225102309-31dd9dda110c h1:ArwHE/mF3yaOhM/XMYnlh8bCOcsQeOwOfA3SJWOIlhM=
github.com/tribalwarshelp/shared v0.0.0-20201225102309-31dd9dda110c/go.mod h1:Lxk6zaQhPTPrgz9ksMgg51m8XgflrCo/kRBx2cM3yfk=
github.com/tribalwarshelp/shared v0.0.0-20201225112152-d1d8bc92fc33 h1:ItFd9kzpvO69r3Ta7S8+3OT6Wc56Ga5MEGBYW7DotUE=
github.com/tribalwarshelp/shared v0.0.0-20201225112152-d1d8bc92fc33/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=
@ -214,8 +204,6 @@ github.com/urfave/cli/v2 v2.1.1 h1:Qt8FeAtxE/vfdrLmR3rxR6JRE0RoVmbXu8+6kZtYU4k=
github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
github.com/vektah/dataloaden v0.2.1-0.20190515034641-a19b9a6e7c9e h1:+w0Zm/9gaWpEAyDlU1eKOuk5twTjAjuevXqcJJw8hrg=
github.com/vektah/dataloaden v0.2.1-0.20190515034641-a19b9a6e7c9e/go.mod h1:/HUdMve7rvxZma+2ZELQeNh88+003LL7Pf/CZ089j8U=
github.com/vektah/gqlparser/v2 v2.0.1 h1:xgl5abVnsd4hkN9rk65OJID9bfcLSMuTaTcZj777q1o=
github.com/vektah/gqlparser/v2 v2.0.1/go.mod h1:SyUiHgLATUR8BiYURfTirrTcGpcE+4XkV2se04Px1Ms=
github.com/vektah/gqlparser/v2 v2.1.0 h1:uiKJ+T5HMGGQM2kRKQ8Pxw8+Zq9qhhZhz/lieYvCMns=
github.com/vektah/gqlparser/v2 v2.1.0/go.mod h1:SyUiHgLATUR8BiYURfTirrTcGpcE+4XkV2se04Px1Ms=
github.com/vmihailenco/bufpool v0.1.5/go.mod h1:fL9i/PRTuS7AELqAHwSU1Zf1c70xhkhGe/cD5ud9pJk=

6
graphql/dataloaders/data_loaders.go
View File

@ -12,7 +12,7 @@ import (
)
type DataLoaders struct {
VersionByTag VersionLoader
VersionByCode *VersionLoader
}
type Config struct {
@ -24,8 +24,8 @@ type Config struct {
func NewDataLoaders(cfg Config) *DataLoaders {
return &DataLoaders{
VersionByTag: VersionLoader{
wait: 2 * time.Millisecond,
VersionByCode: &VersionLoader{
wait: 4 * time.Millisecond,
maxBatch: 0,
fetch: func(keys []string) ([]*models.Version, []error) {
codes := []models.VersionCode{}

12
graphql/dataloaders/server_data_loaders.go
View File

@ -11,14 +11,14 @@ import (
)
type ServerDataLoaders struct {
PlayerByID PlayerLoader
TribeByID TribeLoader
VillageByID VillageLoader
PlayerByID *PlayerLoader
TribeByID *TribeLoader
VillageByID *VillageLoader
}
func NewServerDataLoaders(server string, cfg Config) *ServerDataLoaders {
return &ServerDataLoaders{
PlayerByID: PlayerLoader{
PlayerByID: &PlayerLoader{
wait: 2 * time.Millisecond,
maxBatch: 0,
fetch: func(ids []int) ([]*models.Player, []error) {
@ -45,7 +45,7 @@ func NewServerDataLoaders(server string, cfg Config) *ServerDataLoaders {
return inOrder, nil
},
},
TribeByID: TribeLoader{
TribeByID: &TribeLoader{
wait: 2 * time.Millisecond,
maxBatch: 0,
fetch: func(ids []int) ([]*models.Tribe, []error) {
@ -72,7 +72,7 @@ func NewServerDataLoaders(server string, cfg Config) *ServerDataLoaders {
return inOrder, nil
},
},
VillageByID: VillageLoader{
VillageByID: &VillageLoader{
wait: 2 * time.Millisecond,
maxBatch: 0,
fetch: func(ids []int) ([]*models.Village, []error) {

8
graphql/dataloaders/version_data_loaders.go
View File

@ -8,13 +8,13 @@ import (
)
type VersionDataLoaders struct {
PlayerServersByID PlayerServersLoader
PlayerNameChangesByID PlayerNameChangesLoader
PlayerServersByID *PlayerServersLoader
PlayerNameChangesByID *PlayerNameChangesLoader
}
func NewVersionDataLoaders(versionCode models.VersionCode, cfg Config) *VersionDataLoaders {
return &VersionDataLoaders{
PlayerServersByID: PlayerServersLoader{
PlayerServersByID: &PlayerServersLoader{
wait: 2 * time.Millisecond,
maxBatch: 0,
fetch: func(keys []int) ([][]string, []error) {
@ -29,7 +29,7 @@ func NewVersionDataLoaders(versionCode models.VersionCode, cfg Config) *VersionD
return inOrder, nil
},
},
PlayerNameChangesByID: PlayerNameChangesLoader{
PlayerNameChangesByID: &PlayerNameChangesLoader{
wait: 2 * time.Millisecond,
maxBatch: 0,
fetch: func(keys []int) ([][]*models.PlayerNameChange, []error) {

330
graphql/generated/generated.go
View File

@ -46,7 +46,6 @@ type ResolverRoot interface {
Server() ServerResolver
TribeChangeRecord() TribeChangeRecordResolver
TribeHistoryRecord() TribeHistoryRecordResolver
Version() VersionResolver
Village() VillageResolver
}
@ -250,8 +249,6 @@ type ComplexityRoot struct {
DailyPlayerStats func(childComplexity int, server string, filter *models.DailyPlayerStatsFilter, limit *int, offset *int, sort []string) int
DailyTribeStats func(childComplexity int, server string, filter *models.DailyTribeStatsFilter, limit *int, offset *int, sort []string) int
Ennoblements func(childComplexity int, server string, filter *models.EnnoblementFilter, limit *int, offset *int, sort []string) int
LangVersion func(childComplexity int, tag models.VersionCode) int
LangVersions func(childComplexity int, filter *models.VersionFilter) int
LiveEnnoblements func(childComplexity int, server string) int
Player func(childComplexity int, server string, id int) int
PlayerHistory func(childComplexity int, server string, filter *models.PlayerHistoryFilter, limit *int, offset *int, sort []string) int
@ -277,7 +274,6 @@ type ComplexityRoot struct {
DataUpdatedAt func(childComplexity int) int
HistoryUpdatedAt func(childComplexity int) int
Key func(childComplexity int) int
LangVersion func(childComplexity int) int
NumberOfPlayers func(childComplexity int) int
NumberOfTribes func(childComplexity int) int
NumberOfVillages func(childComplexity int) int
@ -558,7 +554,6 @@ type ComplexityRoot struct {
Code func(childComplexity int) int
Host func(childComplexity int) int
Name func(childComplexity int) int
Tag func(childComplexity int) int
Timezone func(childComplexity int) int
}
@ -628,15 +623,12 @@ type QueryResolver interface {
SearchTribe(ctx context.Context, version string, query string, limit *int, offset *int, sort []string) (*FoundTribeList, error)
TribeChanges(ctx context.Context, server string, filter *models.TribeChangeFilter, limit *int, offset *int, sort []string) (*TribeChanges, error)
TribeHistory(ctx context.Context, server string, filter *models.TribeHistoryFilter, limit *int, offset *int, sort []string) (*TribeHistory, error)
LangVersions(ctx context.Context, filter *models.VersionFilter) (*VersionList, error)
LangVersion(ctx context.Context, tag models.VersionCode) (*models.Version, error)
Versions(ctx context.Context, filter *models.VersionFilter, limit *int, offset *int, sort []string) (*VersionList, error)
Version(ctx context.Context, code models.VersionCode) (*models.Version, error)
Villages(ctx context.Context, server string, filter *models.VillageFilter, limit *int, offset *int, sort []string) (*VillageList, error)
Village(ctx context.Context, server string, id int) (*models.Village, error)
}
type ServerResolver interface {
LangVersion(ctx context.Context, obj *models.Server) (*models.Version, error)
Version(ctx context.Context, obj *models.Server) (*models.Version, error)
}
type TribeChangeRecordResolver interface {
@ -647,9 +639,6 @@ type TribeChangeRecordResolver interface {
type TribeHistoryRecordResolver interface {
Tribe(ctx context.Context, obj *models.TribeHistory) (*models.Tribe, error)
}
type VersionResolver interface {
Tag(ctx context.Context, obj *models.Version) (models.VersionCode, error)
}
type VillageResolver interface {
Player(ctx context.Context, obj *models.Village) (*models.Player, error)
}
@ -1671,30 +1660,6 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
return e.complexity.Query.Ennoblements(childComplexity, args["server"].(string), args["filter"].(*models.EnnoblementFilter), args["limit"].(*int), args["offset"].(*int), args["sort"].([]string)), true
case "Query.langVersion":
if e.complexity.Query.LangVersion == nil {
break
}
args, err := ec.field_Query_langVersion_args(context.TODO(), rawArgs)
if err != nil {
return 0, false
}
return e.complexity.Query.LangVersion(childComplexity, args["tag"].(models.VersionCode)), true
case "Query.langVersions":
if e.complexity.Query.LangVersions == nil {
break
}
args, err := ec.field_Query_langVersions_args(context.TODO(), rawArgs)
if err != nil {
return 0, false
}
return e.complexity.Query.LangVersions(childComplexity, args["filter"].(*models.VersionFilter)), true
case "Query.liveEnnoblements":
if e.complexity.Query.LiveEnnoblements == nil {
break
@ -1934,13 +1899,6 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
return e.complexity.Server.Key(childComplexity), true
case "Server.langVersion":
if e.complexity.Server.LangVersion == nil {
break
}
return e.complexity.Server.LangVersion(childComplexity), true
case "Server.numberOfPlayers":
if e.complexity.Server.NumberOfPlayers == nil {
break
@ -3355,13 +3313,6 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
return e.complexity.Version.Name(childComplexity), true
case "Version.tag":
if e.complexity.Version.Tag == nil {
break
}
return e.complexity.Version.Tag(childComplexity), true
case "Version.timezone":
if e.complexity.Version.Timezone == nil {
break
@ -3965,9 +3916,6 @@ type Server {
numberOfTribes: Int!
numberOfVillages: Int!
langVersion: Version
@goField(forceResolver: true)
@deprecated(reason: "Use ` + "`" + `version` + "`" + `.")
version: Version @goField(forceResolver: true)
config: ServerConfig!
@ -3993,8 +3941,6 @@ input ServerFilter {
status: [ServerStatus!]
statusNEQ: [ServerStatus!]
langVersionTag: [VersionCode!] @deprecated(reason: "Use ` + "`" + `versionCode` + "`" + `.")
langVersionTagNEQ: [VersionCode!] @deprecated(reason: "Use ` + "`" + `versionCodeNEQ` + "`" + `.")
versionCode: [VersionCode!]
versionCodeNEQ: [VersionCode!]
@ -4565,9 +4511,6 @@ type UnitConfig {
}
type Version {
tag: VersionCode!
@goField(forceResolver: true)
@deprecated(reason: "Use ` + "`" + `code` + "`" + `.")
code: VersionCode!
name: String!
host: String!
@ -4575,8 +4518,6 @@ type Version {
}
input VersionFilter {
tag: [VersionCode!] @deprecated(reason: "Use ` + "`" + `code` + "`" + `.")
tagNEQ: [VersionCode!] @deprecated(reason: "Use ` + "`" + `codeNEQ` + "`" + `.")
code: [VersionCode!]
codeNEQ: [VersionCode!]
@ -4605,9 +4546,6 @@ type VersionList {
}
extend type Query {
langVersions(filter: VersionFilter): VersionList!
@deprecated(reason: "Use ` + "`" + `versions` + "`" + `.")
langVersion(tag: VersionCode!): Version @deprecated(reason: "Use ` + "`" + `version` + "`" + `.")
versions(
filter: VersionFilter
limit: Int
@ -4866,36 +4804,6 @@ func (ec *executionContext) field_Query_ennoblements_args(ctx context.Context, r
return args, nil
}
func (ec *executionContext) field_Query_langVersion_args(ctx context.Context, rawArgs map[string]interface{}) (map[string]interface{}, error) {
var err error
args := map[string]interface{}{}
var arg0 models.VersionCode
if tmp, ok := rawArgs["tag"]; ok {
ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("tag"))
arg0, err = ec.unmarshalNVersionCode2githubᚗcomᚋtribalwarshelpᚋsharedᚋmodelsᚐVersionCode(ctx, tmp)
if err != nil {
return nil, err
}
}
args["tag"] = arg0
return args, nil
}
func (ec *executionContext) field_Query_langVersions_args(ctx context.Context, rawArgs map[string]interface{}) (map[string]interface{}, error) {
var err error
args := map[string]interface{}{}
var arg0 *models.VersionFilter
if tmp, ok := rawArgs["filter"]; ok {
ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("filter"))
arg0, err = ec.unmarshalOVersionFilter2ᚖgithubᚗcomᚋtribalwarshelpᚋsharedᚋmodelsᚐVersionFilter(ctx, tmp)
if err != nil {
return nil, err
}
}
args["filter"] = arg0
return args, nil
}
func (ec *executionContext) field_Query_liveEnnoblements_args(ctx context.Context, rawArgs map[string]interface{}) (map[string]interface{}, error) {
var err error
args := map[string]interface{}{}
@ -11030,87 +10938,6 @@ func (ec *executionContext) _Query_tribeHistory(ctx context.Context, field graph
return ec.marshalNTribeHistory2ᚖgithubᚗcomᚋtribalwarshelpᚋapiᚋgraphqlᚋgeneratedᚐTribeHistory(ctx, field.Selections, res)
}
func (ec *executionContext) _Query_langVersions(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) {
defer func() {
if r := recover(); r != nil {
ec.Error(ctx, ec.Recover(ctx, r))
ret = graphql.Null
}
}()
fc := &graphql.FieldContext{
Object: "Query",
Field: field,
Args: nil,
IsMethod: true,
IsResolver: true,
}
ctx = graphql.WithFieldContext(ctx, fc)
rawArgs := field.ArgumentMap(ec.Variables)
args, err := ec.field_Query_langVersions_args(ctx, rawArgs)
if err != nil {
ec.Error(ctx, err)
return graphql.Null
}
fc.Args = args
resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
ctx = rctx // use context from middleware stack in children
return ec.resolvers.Query().LangVersions(rctx, args["filter"].(*models.VersionFilter))
})
if err != nil {
ec.Error(ctx, err)
return graphql.Null
}
if resTmp == nil {
if !graphql.HasFieldError(ctx, fc) {
ec.Errorf(ctx, "must not be null")
}
return graphql.Null
}
res := resTmp.(*VersionList)
fc.Result = res
return ec.marshalNVersionList2ᚖgithubᚗcomᚋtribalwarshelpᚋapiᚋgraphqlᚋgeneratedᚐVersionList(ctx, field.Selections, res)
}
func (ec *executionContext) _Query_langVersion(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) {
defer func() {
if r := recover(); r != nil {
ec.Error(ctx, ec.Recover(ctx, r))
ret = graphql.Null
}
}()
fc := &graphql.FieldContext{
Object: "Query",
Field: field,
Args: nil,
IsMethod: true,
IsResolver: true,
}
ctx = graphql.WithFieldContext(ctx, fc)
rawArgs := field.ArgumentMap(ec.Variables)
args, err := ec.field_Query_langVersion_args(ctx, rawArgs)
if err != nil {
ec.Error(ctx, err)
return graphql.Null
}
fc.Args = args
resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
ctx = rctx // use context from middleware stack in children
return ec.resolvers.Query().LangVersion(rctx, args["tag"].(models.VersionCode))
})
if err != nil {
ec.Error(ctx, err)
return graphql.Null
}
if resTmp == nil {
return graphql.Null
}
res := resTmp.(*models.Version)
fc.Result = res
return ec.marshalOVersion2ᚖgithubᚗcomᚋtribalwarshelpᚋsharedᚋmodelsᚐVersion(ctx, field.Selections, res)
}
func (ec *executionContext) _Query_versions(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) {
defer func() {
if r := recover(); r != nil {
@ -11519,38 +11346,6 @@ func (ec *executionContext) _Server_numberOfVillages(ctx context.Context, field
return ec.marshalNInt2int(ctx, field.Selections, res)
}
func (ec *executionContext) _Server_langVersion(ctx context.Context, field graphql.CollectedField, obj *models.Server) (ret graphql.Marshaler) {
defer func() {
if r := recover(); r != nil {
ec.Error(ctx, ec.Recover(ctx, r))
ret = graphql.Null
}
}()
fc := &graphql.FieldContext{
Object: "Server",
Field: field,
Args: nil,
IsMethod: true,
IsResolver: true,
}
ctx = graphql.WithFieldContext(ctx, fc)
resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
ctx = rctx // use context from middleware stack in children
return ec.resolvers.Server().LangVersion(rctx, obj)
})
if err != nil {
ec.Error(ctx, err)
return graphql.Null
}
if resTmp == nil {
return graphql.Null
}
res := resTmp.(*models.Version)
fc.Result = res
return ec.marshalOVersion2ᚖgithubᚗcomᚋtribalwarshelpᚋsharedᚋmodelsᚐVersion(ctx, field.Selections, res)
}
func (ec *executionContext) _Server_version(ctx context.Context, field graphql.CollectedField, obj *models.Server) (ret graphql.Marshaler) {
defer func() {
if r := recover(); r != nil {
@ -18483,41 +18278,6 @@ func (ec *executionContext) _UnitConfig_militia(ctx context.Context, field graph
return ec.marshalNUnit2githubᚗcomᚋtribalwarshelpᚋsharedᚋmodelsᚐUnit(ctx, field.Selections, res)
}
func (ec *executionContext) _Version_tag(ctx context.Context, field graphql.CollectedField, obj *models.Version) (ret graphql.Marshaler) {
defer func() {
if r := recover(); r != nil {
ec.Error(ctx, ec.Recover(ctx, r))
ret = graphql.Null
}
}()
fc := &graphql.FieldContext{
Object: "Version",
Field: field,
Args: nil,
IsMethod: true,
IsResolver: true,
}
ctx = graphql.WithFieldContext(ctx, fc)
resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
ctx = rctx // use context from middleware stack in children
return ec.resolvers.Version().Tag(rctx, obj)
})
if err != nil {
ec.Error(ctx, err)
return graphql.Null
}
if resTmp == nil {
if !graphql.HasFieldError(ctx, fc) {
ec.Errorf(ctx, "must not be null")
}
return graphql.Null
}
res := resTmp.(models.VersionCode)
fc.Result = res
return ec.marshalNVersionCode2githubᚗcomᚋtribalwarshelpᚋsharedᚋmodelsᚐVersionCode(ctx, field.Selections, res)
}
func (ec *executionContext) _Version_code(ctx context.Context, field graphql.CollectedField, obj *models.Version) (ret graphql.Marshaler) {
defer func() {
if r := recover(); r != nil {
@ -21343,22 +21103,6 @@ func (ec *executionContext) unmarshalInputServerFilter(ctx context.Context, obj
if err != nil {
return it, err
}
case "langVersionTag":
var err error
ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("langVersionTag"))
it.LangVersionTag, err = ec.unmarshalOVersionCode2ᚕgithubᚗcomᚋtribalwarshelpᚋsharedᚋmodelsᚐVersionCodeᚄ(ctx, v)
if err != nil {
return it, err
}
case "langVersionTagNEQ":
var err error
ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("langVersionTagNEQ"))
it.LangVersionTagNEQ, err = ec.unmarshalOVersionCode2ᚕgithubᚗcomᚋtribalwarshelpᚋsharedᚋmodelsᚐVersionCodeᚄ(ctx, v)
if err != nil {
return it, err
}
case "versionCode":
var err error
@ -22423,22 +22167,6 @@ func (ec *executionContext) unmarshalInputVersionFilter(ctx context.Context, obj
for k, v := range asMap {
switch k {
case "tag":
var err error
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 "tagNEQ":
var err error
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
}
case "code":
var err error
@ -24162,31 +23890,6 @@ func (ec *executionContext) _Query(ctx context.Context, sel ast.SelectionSet) gr
}
return res
})
case "langVersions":
field := field
out.Concurrently(i, func() (res graphql.Marshaler) {
defer func() {
if r := recover(); r != nil {
ec.Error(ctx, ec.Recover(ctx, r))
}
}()
res = ec._Query_langVersions(ctx, field)
if res == graphql.Null {
atomic.AddUint32(&invalids, 1)
}
return res
})
case "langVersion":
field := field
out.Concurrently(i, func() (res graphql.Marshaler) {
defer func() {
if r := recover(); r != nil {
ec.Error(ctx, ec.Recover(ctx, r))
}
}()
res = ec._Query_langVersion(ctx, field)
return res
})
case "versions":
field := field
out.Concurrently(i, func() (res graphql.Marshaler) {
@ -24288,17 +23991,6 @@ func (ec *executionContext) _Server(ctx context.Context, sel ast.SelectionSet, o
if out.Values[i] == graphql.Null {
atomic.AddUint32(&invalids, 1)
}
case "langVersion":
field := field
out.Concurrently(i, func() (res graphql.Marshaler) {
defer func() {
if r := recover(); r != nil {
ec.Error(ctx, ec.Recover(ctx, r))
}
}()
res = ec._Server_langVersion(ctx, field, obj)
return res
})
case "version":
field := field
out.Concurrently(i, func() (res graphql.Marshaler) {
@ -25878,39 +25570,25 @@ func (ec *executionContext) _Version(ctx context.Context, sel ast.SelectionSet,
switch field.Name {
case "__typename":
out.Values[i] = graphql.MarshalString("Version")
case "tag":
field := field
out.Concurrently(i, func() (res graphql.Marshaler) {
defer func() {
if r := recover(); r != nil {
ec.Error(ctx, ec.Recover(ctx, r))
}
}()
res = ec._Version_tag(ctx, field, obj)
if res == graphql.Null {
atomic.AddUint32(&invalids, 1)
}
return res
})
case "code":
out.Values[i] = ec._Version_code(ctx, field, obj)
if out.Values[i] == graphql.Null {
atomic.AddUint32(&invalids, 1)
invalids++
}
case "name":
out.Values[i] = ec._Version_name(ctx, field, obj)
if out.Values[i] == graphql.Null {
atomic.AddUint32(&invalids, 1)
invalids++
}
case "host":
out.Values[i] = ec._Version_host(ctx, field, obj)
if out.Values[i] == graphql.Null {
atomic.AddUint32(&invalids, 1)
invalids++
}
case "timezone":
out.Values[i] = ec._Version_timezone(ctx, field, obj)
if out.Values[i] == graphql.Null {
atomic.AddUint32(&invalids, 1)
invalids++
}
default:
panic("unknown field " + strconv.Quote(field.Name))

3
graphql/resolvers/resolver.go
View File

@ -61,9 +61,6 @@ func (r *Resolver) DailyPlayerStatsRecord() generated.DailyPlayerStatsRecordReso
func (r *Resolver) DailyTribeStatsRecord() generated.DailyTribeStatsRecordResolver {
return &dailyTribeStatsRecordResolver{r}
}
func (r *Resolver) Version() generated.VersionResolver {
return &versionResolver{r}
}
type queryResolver struct{ *Resolver }
type playerResolver struct{ *Resolver }

6
graphql/resolvers/server.go
View File

@ -13,16 +13,12 @@ import (
func (r *serverResolver) Version(ctx context.Context, obj *models.Server) (*models.Version, error) {
loaders := middleware.DataLoadersFromContext(ctx)
if loaders != nil {
lv, _ := loaders.VersionByTag.Load(obj.VersionCode.String())
lv, _ := loaders.VersionByCode.Load(obj.VersionCode.String())
return lv, nil
}
return nil, nil
}
func (r *serverResolver) LangVersion(ctx context.Context, obj *models.Server) (*models.Version, error) {
return r.Version(ctx, obj)
}
func (r *queryResolver) Servers(ctx context.Context,
f *models.ServerFilter,
limit *int,

12
graphql/resolvers/version.go
View File

@ -8,10 +8,6 @@ import (
"github.com/tribalwarshelp/shared/models"
)
func (r *versionResolver) Tag(ctx context.Context, obj *models.Version) (models.VersionCode, error) {
return obj.Code, nil
}
func (r *queryResolver) Versions(ctx context.Context,
f *models.VersionFilter,
limit *int,
@ -32,11 +28,3 @@ func (r *queryResolver) Versions(ctx context.Context,
func (r *queryResolver) Version(ctx context.Context, code models.VersionCode) (*models.Version, error) {
return r.VersionUcase.GetByCode(ctx, code)
}
func (r *queryResolver) LangVersions(ctx context.Context, filter *models.VersionFilter) (*generated.VersionList, error) {
return r.Versions(ctx, filter, nil, nil, []string{})
}
func (r *queryResolver) LangVersion(ctx context.Context, tag models.VersionCode) (*models.Version, error) {
return r.Version(ctx, tag)
}

5
graphql/schema/server.graphql
View File

@ -10,9 +10,6 @@ type Server {
numberOfTribes: Int!
numberOfVillages: Int!
langVersion: Version
@goField(forceResolver: true)
@deprecated(reason: "Use `version`.")
version: Version @goField(forceResolver: true)
config: ServerConfig!
@ -38,8 +35,6 @@ input ServerFilter {
status: [ServerStatus!]
statusNEQ: [ServerStatus!]
langVersionTag: [VersionCode!] @deprecated(reason: "Use `versionCode`.")
langVersionTagNEQ: [VersionCode!] @deprecated(reason: "Use `versionCodeNEQ`.")
versionCode: [VersionCode!]
versionCodeNEQ: [VersionCode!]

8
graphql/schema/version.graphql
View File

@ -20,9 +20,6 @@ enum VersionCode {
}
type Version {
tag: VersionCode!
@goField(forceResolver: true)
@deprecated(reason: "Use `code`.")
code: VersionCode!
name: String!
host: String!
@ -30,8 +27,6 @@ type Version {
}
input VersionFilter {
tag: [VersionCode!] @deprecated(reason: "Use `code`.")
tagNEQ: [VersionCode!] @deprecated(reason: "Use `codeNEQ`.")
code: [VersionCode!]
codeNEQ: [VersionCode!]
@ -60,9 +55,6 @@ type VersionList {
}
extend type Query {
langVersions(filter: VersionFilter): VersionList!
@deprecated(reason: "Use `versions`.")
langVersion(tag: VersionCode!): Version @deprecated(reason: "Use `version`.")
versions(
filter: VersionFilter
limit: Int

6
server/usecase/server_usecase.go
View File

@ -35,12 +35,6 @@ func (ucase *usecase) Fetch(ctx context.Context, cfg server.FetchConfig) ([]*mod
if !middleware.CanExceedLimit(ctx) && (cfg.Limit > server.PaginationLimit || cfg.Limit <= 0) {
cfg.Limit = server.PaginationLimit
}
if len(cfg.Filter.LangVersionTag) > 0 {
cfg.Filter.VersionCode = append(cfg.Filter.VersionCode, cfg.Filter.LangVersionTag...)
}
if len(cfg.Filter.LangVersionTagNEQ) > 0 {
cfg.Filter.VersionCodeNEQ = append(cfg.Filter.VersionCode, cfg.Filter.LangVersionTagNEQ...)
}
cfg.Sort = utils.SanitizeSortExpressions(cfg.Sort)
return ucase.repo.Fetch(ctx, cfg)
}

6
version/usecase/version_usecase.go
View File

@ -37,12 +37,6 @@ func (ucase *usecase) Fetch(ctx context.Context, cfg version.FetchConfig) ([]*mo
if !middleware.CanExceedLimit(ctx) && (cfg.Limit > version.PaginationLimit || cfg.Limit <= 0) {
cfg.Limit = version.PaginationLimit
}
if len(cfg.Filter.Tag) > 0 {
cfg.Filter.Code = append(cfg.Filter.Code, cfg.Filter.Tag...)
}
if len(cfg.Filter.TagNEQ) > 0 {
cfg.Filter.CodeNEQ = append(cfg.Filter.Code, cfg.Filter.TagNEQ...)
}
cfg.Sort = utils.SanitizeSortExpressions(cfg.Sort)
return ucase.repo.Fetch(ctx, cfg)
}