bugfixes
This commit is contained in:
parent
c87433061d
commit
51e1df3b93
|
@ -13,9 +13,7 @@ func (r *ennoblementResolver) NewOwner(ctx context.Context, obj *models.Ennoblem
|
||||||
return obj.NewOwner, nil
|
return obj.NewOwner, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
rctx := graphql.GetFieldContext(ctx)
|
if server, ok := getServer(graphql.GetFieldContext(ctx)); ok {
|
||||||
server, ok := rctx.Parent.Parent.Args["server"].(string)
|
|
||||||
if ok {
|
|
||||||
dataloaders := middleware.DataLoadersFromContext(ctx)
|
dataloaders := middleware.DataLoadersFromContext(ctx)
|
||||||
if dataloaders != nil {
|
if dataloaders != nil {
|
||||||
if dataloader, ok := dataloaders[server]; ok {
|
if dataloader, ok := dataloaders[server]; ok {
|
||||||
|
@ -35,9 +33,7 @@ func (r *ennoblementResolver) OldOwner(ctx context.Context, obj *models.Ennoblem
|
||||||
return obj.OldOwner, nil
|
return obj.OldOwner, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
rctx := graphql.GetFieldContext(ctx)
|
if server, ok := getServer(graphql.GetFieldContext(ctx)); ok {
|
||||||
server, ok := rctx.Parent.Parent.Args["server"].(string)
|
|
||||||
if ok {
|
|
||||||
dataloaders := middleware.DataLoadersFromContext(ctx)
|
dataloaders := middleware.DataLoadersFromContext(ctx)
|
||||||
if dataloaders != nil {
|
if dataloaders != nil {
|
||||||
if dataloader, ok := dataloaders[server]; ok {
|
if dataloader, ok := dataloaders[server]; ok {
|
||||||
|
@ -57,9 +53,7 @@ func (r *ennoblementResolver) Village(ctx context.Context, obj *models.Ennobleme
|
||||||
return obj.Village, nil
|
return obj.Village, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
rctx := graphql.GetFieldContext(ctx)
|
if server, ok := getServer(graphql.GetFieldContext(ctx)); ok {
|
||||||
server, ok := rctx.Parent.Parent.Args["server"].(string)
|
|
||||||
if ok {
|
|
||||||
dataloaders := middleware.DataLoadersFromContext(ctx)
|
dataloaders := middleware.DataLoadersFromContext(ctx)
|
||||||
if dataloaders != nil {
|
if dataloaders != nil {
|
||||||
if dataloader, ok := dataloaders[server]; ok {
|
if dataloader, ok := dataloaders[server]; ok {
|
||||||
|
|
17
graphql/resolvers/helpers.go
Normal file
17
graphql/resolvers/helpers.go
Normal 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
|
||||||
|
}
|
|
@ -14,9 +14,7 @@ func (r *playerResolver) Tribe(ctx context.Context, obj *models.Player) (*models
|
||||||
return obj.Tribe, nil
|
return obj.Tribe, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
rctx := graphql.GetFieldContext(ctx)
|
if server, ok := getServer(graphql.GetFieldContext(ctx)); ok {
|
||||||
server, ok := rctx.Parent.Parent.Parent.Args["server"].(string)
|
|
||||||
if ok {
|
|
||||||
dataloaders := middleware.DataLoadersFromContext(ctx)
|
dataloaders := middleware.DataLoadersFromContext(ctx)
|
||||||
if dataloaders != nil {
|
if dataloaders != nil {
|
||||||
if dataloader, ok := dataloaders[server]; ok {
|
if dataloader, ok := dataloaders[server]; ok {
|
||||||
|
|
|
@ -14,9 +14,7 @@ func (r *villageResolver) Player(ctx context.Context, obj *models.Village) (*mod
|
||||||
return obj.Player, nil
|
return obj.Player, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
rctx := graphql.GetFieldContext(ctx)
|
if server, ok := getServer(graphql.GetFieldContext(ctx)); ok {
|
||||||
server, ok := rctx.Parent.Parent.Parent.Args["server"].(string)
|
|
||||||
if ok {
|
|
||||||
dataloaders := middleware.DataLoadersFromContext(ctx)
|
dataloaders := middleware.DataLoadersFromContext(ctx)
|
||||||
if dataloaders != nil {
|
if dataloaders != nil {
|
||||||
if dataloader, ok := dataloaders[server]; ok {
|
if dataloader, ok := dataloaders[server]; ok {
|
||||||
|
|
|
@ -6,7 +6,7 @@ func SanitizeSort(sort string) string {
|
||||||
trimmed := strings.TrimSpace(sort)
|
trimmed := strings.TrimSpace(sort)
|
||||||
splitted := strings.Split(trimmed, " ")
|
splitted := strings.Split(trimmed, " ")
|
||||||
length := len(splitted)
|
length := len(splitted)
|
||||||
if length < 1 {
|
if length != 2 {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
keyword := "ASC"
|
keyword := "ASC"
|
||||||
|
|
Reference in New Issue
Block a user