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

bugfixes

Browse Source
This commit is contained in:
Dawid Wysokiński 2020-06-04 17:45:56 +02:00
parent c87433061d
commit 51e1df3b93
5 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
graphql/resolvers/ennoblement.go
View File

@ -13,9 +13,7 @@ func (r *ennoblementResolver) NewOwner(ctx context.Context, obj *models.Ennoblem
return obj.NewOwner, nil
}
rctx := graphql.GetFieldContext(ctx)
server, ok := rctx.Parent.Parent.Args["server"].(string)
if ok {
if server, ok := getServer(graphql.GetFieldContext(ctx)); ok {
dataloaders := middleware.DataLoadersFromContext(ctx)
if dataloaders != nil {
if dataloader, ok := dataloaders[server]; ok {
@ -35,9 +33,7 @@ func (r *ennoblementResolver) OldOwner(ctx context.Context, obj *models.Ennoblem
return obj.OldOwner, nil
}
rctx := graphql.GetFieldContext(ctx)
server, ok := rctx.Parent.Parent.Args["server"].(string)
if ok {
if server, ok := getServer(graphql.GetFieldContext(ctx)); ok {
dataloaders := middleware.DataLoadersFromContext(ctx)
if dataloaders != nil {
if dataloader, ok := dataloaders[server]; ok {
@ -57,9 +53,7 @@ func (r *ennoblementResolver) Village(ctx context.Context, obj *models.Ennobleme
return obj.Village, nil
}
rctx := graphql.GetFieldContext(ctx)
server, ok := rctx.Parent.Parent.Args["server"].(string)
if ok {
if server, ok := getServer(graphql.GetFieldContext(ctx)); ok {
dataloaders := middleware.DataLoadersFromContext(ctx)
if dataloaders != nil {
if dataloader, ok := dataloaders[server]; ok {

17
graphql/resolvers/helpers.go Normal file
View File

@ -0,0 +1,17 @@
package resolvers
import "github.com/99designs/gqlgen/graphql"
func getServer(rctx *graphql.FieldContext) (string, bool) {
server := ""
ok := false
parent := rctx.Parent
for parent != nil {
server, ok = parent.Args["server"].(string)
if ok {
break
}
parent = parent.Parent
}
return server, ok
}

4
graphql/resolvers/player.go
View File

@ -14,9 +14,7 @@ func (r *playerResolver) Tribe(ctx context.Context, obj *models.Player) (*models
return obj.Tribe, nil
}
rctx := graphql.GetFieldContext(ctx)
server, ok := rctx.Parent.Parent.Parent.Args["server"].(string)
if ok {
if server, ok := getServer(graphql.GetFieldContext(ctx)); ok {
dataloaders := middleware.DataLoadersFromContext(ctx)
if dataloaders != nil {
if dataloader, ok := dataloaders[server]; ok {

4
graphql/resolvers/village.go
View File

@ -14,9 +14,7 @@ func (r *villageResolver) Player(ctx context.Context, obj *models.Village) (*mod
return obj.Player, nil
}
rctx := graphql.GetFieldContext(ctx)
server, ok := rctx.Parent.Parent.Parent.Args["server"].(string)
if ok {
if server, ok := getServer(graphql.GetFieldContext(ctx)); ok {
dataloaders := middleware.DataLoadersFromContext(ctx)
if dataloaders != nil {
if dataloader, ok := dataloaders[server]; ok {

2
utils/sanitize_sort.go
View File

@ -6,7 +6,7 @@ func SanitizeSort(sort string) string {
trimmed := strings.TrimSpace(sort)
splitted := strings.Split(trimmed, " ")
length := len(splitted)
if length < 1 {
if length != 2 {
return ""
}
keyword := "ASC"