Merge pull request #10 from tribalwarshelp/schema-cleanup
schema cleanup
This commit is contained in:
commit
b4ca01785f
|
@ -8,5 +8,4 @@ import (
|
|||
|
||||
type Usecase interface {
|
||||
Fetch(ctx context.Context, cfg FetchConfig) ([]*models.Ennoblement, int, error)
|
||||
FetchLiveEnnoblements(ctx context.Context, server string) ([]*models.LiveEnnoblement, error)
|
||||
}
|
||||
|
|
|
@ -2,8 +2,6 @@ package usecase
|
|||
|
||||
import (
|
||||
"context"
|
||||
"time"
|
||||
|
||||
"github.com/tribalwarshelp/api/ennoblement"
|
||||
"github.com/tribalwarshelp/api/middleware"
|
||||
"github.com/tribalwarshelp/api/utils"
|
||||
|
@ -29,36 +27,3 @@ func (ucase *usecase) Fetch(ctx context.Context, cfg ennoblement.FetchConfig) ([
|
|||
cfg.Sort = utils.SanitizeSorts(cfg.Sort)
|
||||
return ucase.repo.Fetch(ctx, cfg)
|
||||
}
|
||||
|
||||
func (ucase *usecase) FetchLiveEnnoblements(ctx context.Context, server string) ([]*models.LiveEnnoblement, error) {
|
||||
limit := 0
|
||||
if !middleware.CanExceedLimit(ctx) {
|
||||
limit = ennoblement.FetchLimit
|
||||
}
|
||||
ennoblements, _, err := ucase.repo.Fetch(ctx, ennoblement.FetchConfig{
|
||||
Server: server,
|
||||
Count: false,
|
||||
Filter: &models.EnnoblementFilter{
|
||||
EnnobledAtGTE: time.Now().Add(-1 * time.Hour),
|
||||
},
|
||||
Limit: limit,
|
||||
Sort: []string{"ennobled_at ASC"},
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return convertToLiveEnnoblements(ennoblements), nil
|
||||
}
|
||||
|
||||
func convertToLiveEnnoblements(ennoblements []*models.Ennoblement) []*models.LiveEnnoblement {
|
||||
lv := []*models.LiveEnnoblement{}
|
||||
for _, e := range ennoblements {
|
||||
lv = append(lv, &models.LiveEnnoblement{
|
||||
VillageID: e.VillageID,
|
||||
NewOwnerID: e.NewOwnerID,
|
||||
OldOwnerID: e.OldOwnerID,
|
||||
EnnobledAt: e.EnnobledAt,
|
||||
})
|
||||
}
|
||||
return lv
|
||||
}
|
||||
|
|
4
go.mod
4
go.mod
|
@ -19,10 +19,10 @@ require (
|
|||
github.com/onsi/gomega v1.10.4 // indirect
|
||||
github.com/pkg/errors v0.9.1
|
||||
github.com/tribalwarshelp/map-generator v0.0.0-20210106163923-fa048a59f5f2
|
||||
github.com/tribalwarshelp/shared v0.0.0-20210115163415-972e2df3f7db
|
||||
github.com/tribalwarshelp/shared v0.0.0-20210321105345-7a8582fd0b91
|
||||
github.com/vektah/gqlparser/v2 v2.1.0
|
||||
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
|
||||
golang.org/x/sys v0.0.0-20210223095934-7937bea0104d // indirect
|
||||
golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4 // indirect
|
||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
|
||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||
)
|
||||
|
|
6
go.sum
6
go.sum
|
@ -162,6 +162,8 @@ github.com/tribalwarshelp/map-generator v0.0.0-20210106163923-fa048a59f5f2/go.mo
|
|||
github.com/tribalwarshelp/shared v0.0.0-20210106162314-d3488036ca2f/go.mod h1:vtDs7EjEysk4dpFPfu3c4lkICXZYIRV0BrT7rsqG0dw=
|
||||
github.com/tribalwarshelp/shared v0.0.0-20210115163415-972e2df3f7db h1:RzMEF4BP3YJ7jJOyYO00TdeB6DY7g0Dp/8cQ8t6WKzw=
|
||||
github.com/tribalwarshelp/shared v0.0.0-20210115163415-972e2df3f7db/go.mod h1:vtDs7EjEysk4dpFPfu3c4lkICXZYIRV0BrT7rsqG0dw=
|
||||
github.com/tribalwarshelp/shared v0.0.0-20210321105345-7a8582fd0b91 h1:YxUIaDrLe3nE+8MHWxcGn1f/Ic0AfC/iS8/tnHAm2iE=
|
||||
github.com/tribalwarshelp/shared v0.0.0-20210321105345-7a8582fd0b91/go.mod h1:EnTN6KBL5jZZnan7cVOWIsAO3q+a1XNPpa9m6Pv3MeM=
|
||||
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=
|
||||
|
@ -238,8 +240,8 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w
|
|||
golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210105210732-16f7687f5001/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210223095934-7937bea0104d h1:u0GOGnBJ3EKE/tNqREhhGiCzE9jFXydDo2lf7hOwGuc=
|
||||
golang.org/x/sys v0.0.0-20210223095934-7937bea0104d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4 h1:EZ2mChiOa8udjfp6rRmswTbtZN/QzUQp4ptM4rnjHvc=
|
||||
golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
||||
|
|
|
@ -39,7 +39,6 @@ type ResolverRoot interface {
|
|||
DailyPlayerStatsRecord() DailyPlayerStatsRecordResolver
|
||||
DailyTribeStatsRecord() DailyTribeStatsRecordResolver
|
||||
Ennoblement() EnnoblementResolver
|
||||
LiveEnnoblement() LiveEnnoblementResolver
|
||||
Player() PlayerResolver
|
||||
PlayerHistoryRecord() PlayerHistoryRecordResolver
|
||||
Query() QueryResolver
|
||||
|
@ -176,13 +175,6 @@ type ComplexityRoot struct {
|
|||
Total func(childComplexity int) int
|
||||
}
|
||||
|
||||
LiveEnnoblement struct {
|
||||
EnnobledAt func(childComplexity int) int
|
||||
NewOwner func(childComplexity int) int
|
||||
OldOwner func(childComplexity int) int
|
||||
Village func(childComplexity int) int
|
||||
}
|
||||
|
||||
Player struct {
|
||||
BestRank func(childComplexity int) int
|
||||
BestRankAt func(childComplexity int) int
|
||||
|
@ -250,7 +242,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
|
||||
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
|
||||
Players func(childComplexity int, server string, filter *models.PlayerFilter, limit *int, offset *int, sort []string) int
|
||||
|
@ -592,11 +583,6 @@ type EnnoblementResolver interface {
|
|||
OldOwner(ctx context.Context, obj *models.Ennoblement) (*models.Player, error)
|
||||
OldOwnerTribe(ctx context.Context, obj *models.Ennoblement) (*models.Tribe, error)
|
||||
}
|
||||
type LiveEnnoblementResolver interface {
|
||||
Village(ctx context.Context, obj *models.LiveEnnoblement) (*models.Village, error)
|
||||
NewOwner(ctx context.Context, obj *models.LiveEnnoblement) (*models.Player, error)
|
||||
OldOwner(ctx context.Context, obj *models.LiveEnnoblement) (*models.Player, error)
|
||||
}
|
||||
type PlayerResolver interface {
|
||||
Tribe(ctx context.Context, obj *models.Player) (*models.Tribe, error)
|
||||
Servers(ctx context.Context, obj *models.Player) ([]string, error)
|
||||
|
@ -611,7 +597,6 @@ type QueryResolver interface {
|
|||
DailyPlayerStats(ctx context.Context, server string, filter *models.DailyPlayerStatsFilter, limit *int, offset *int, sort []string) (*DailyPlayerStats, error)
|
||||
DailyTribeStats(ctx context.Context, server string, filter *models.DailyTribeStatsFilter, limit *int, offset *int, sort []string) (*DailyTribeStats, error)
|
||||
Ennoblements(ctx context.Context, server string, filter *models.EnnoblementFilter, limit *int, offset *int, sort []string) (*EnnoblementList, error)
|
||||
LiveEnnoblements(ctx context.Context, server string) ([]*models.LiveEnnoblement, error)
|
||||
Players(ctx context.Context, server string, filter *models.PlayerFilter, limit *int, offset *int, sort []string) (*PlayerList, error)
|
||||
Player(ctx context.Context, server string, id int) (*models.Player, error)
|
||||
SearchPlayer(ctx context.Context, version string, name *string, id *int, limit *int, offset *int, sort []string) (*FoundPlayerList, error)
|
||||
|
@ -1268,34 +1253,6 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
|
|||
|
||||
return e.complexity.FoundTribeList.Total(childComplexity), true
|
||||
|
||||
case "LiveEnnoblement.ennobledAt":
|
||||
if e.complexity.LiveEnnoblement.EnnobledAt == nil {
|
||||
break
|
||||
}
|
||||
|
||||
return e.complexity.LiveEnnoblement.EnnobledAt(childComplexity), true
|
||||
|
||||
case "LiveEnnoblement.newOwner":
|
||||
if e.complexity.LiveEnnoblement.NewOwner == nil {
|
||||
break
|
||||
}
|
||||
|
||||
return e.complexity.LiveEnnoblement.NewOwner(childComplexity), true
|
||||
|
||||
case "LiveEnnoblement.oldOwner":
|
||||
if e.complexity.LiveEnnoblement.OldOwner == nil {
|
||||
break
|
||||
}
|
||||
|
||||
return e.complexity.LiveEnnoblement.OldOwner(childComplexity), true
|
||||
|
||||
case "LiveEnnoblement.village":
|
||||
if e.complexity.LiveEnnoblement.Village == nil {
|
||||
break
|
||||
}
|
||||
|
||||
return e.complexity.LiveEnnoblement.Village(childComplexity), true
|
||||
|
||||
case "Player.bestRank":
|
||||
if e.complexity.Player.BestRank == nil {
|
||||
break
|
||||
|
@ -1668,18 +1625,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.liveEnnoblements":
|
||||
if e.complexity.Query.LiveEnnoblements == nil {
|
||||
break
|
||||
}
|
||||
|
||||
args, err := ec.field_Query_liveEnnoblements_args(context.TODO(), rawArgs)
|
||||
if err != nil {
|
||||
return 0, false
|
||||
}
|
||||
|
||||
return e.complexity.Query.LiveEnnoblements(childComplexity, args["server"].(string)), true
|
||||
|
||||
case "Query.player":
|
||||
if e.complexity.Query.Player == nil {
|
||||
break
|
||||
|
@ -3639,18 +3584,6 @@ extend type Query {
|
|||
sort: [String!]
|
||||
): EnnoblementList!
|
||||
}
|
||||
`, BuiltIn: false},
|
||||
{Name: "schema/live_ennoblement.graphql", Input: `type LiveEnnoblement {
|
||||
village: Village @goField(forceResolver: true)
|
||||
newOwner: Player @goField(forceResolver: true)
|
||||
oldOwner: Player @goField(forceResolver: true)
|
||||
ennobledAt: Time!
|
||||
}
|
||||
|
||||
extend type Query {
|
||||
liveEnnoblements(server: String!): [LiveEnnoblement!]
|
||||
@deprecated(reason: "use ` + "`" + `ennoblements` + "`" + ` instead")
|
||||
}
|
||||
`, BuiltIn: false},
|
||||
{Name: "schema/player.graphql", Input: `type PlayerNameChange {
|
||||
oldName: String!
|
||||
|
@ -4724,21 +4657,6 @@ func (ec *executionContext) field_Query_ennoblements_args(ctx context.Context, r
|
|||
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{}{}
|
||||
var arg0 string
|
||||
if tmp, ok := rawArgs["server"]; ok {
|
||||
ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("server"))
|
||||
arg0, err = ec.unmarshalNString2string(ctx, tmp)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
args["server"] = arg0
|
||||
return args, nil
|
||||
}
|
||||
|
||||
func (ec *executionContext) field_Query_playerHistory_args(ctx context.Context, rawArgs map[string]interface{}) (map[string]interface{}, error) {
|
||||
var err error
|
||||
args := map[string]interface{}{}
|
||||
|
@ -8440,137 +8358,6 @@ func (ec *executionContext) _FoundTribeList_total(ctx context.Context, field gra
|
|||
return ec.marshalNInt2int(ctx, field.Selections, res)
|
||||
}
|
||||
|
||||
func (ec *executionContext) _LiveEnnoblement_village(ctx context.Context, field graphql.CollectedField, obj *models.LiveEnnoblement) (ret graphql.Marshaler) {
|
||||
defer func() {
|
||||
if r := recover(); r != nil {
|
||||
ec.Error(ctx, ec.Recover(ctx, r))
|
||||
ret = graphql.Null
|
||||
}
|
||||
}()
|
||||
fc := &graphql.FieldContext{
|
||||
Object: "LiveEnnoblement",
|
||||
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.LiveEnnoblement().Village(rctx, obj)
|
||||
})
|
||||
if err != nil {
|
||||
ec.Error(ctx, err)
|
||||
return graphql.Null
|
||||
}
|
||||
if resTmp == nil {
|
||||
return graphql.Null
|
||||
}
|
||||
res := resTmp.(*models.Village)
|
||||
fc.Result = res
|
||||
return ec.marshalOVillage2ᚖgithubᚗcomᚋtribalwarshelpᚋsharedᚋmodelsᚐVillage(ctx, field.Selections, res)
|
||||
}
|
||||
|
||||
func (ec *executionContext) _LiveEnnoblement_newOwner(ctx context.Context, field graphql.CollectedField, obj *models.LiveEnnoblement) (ret graphql.Marshaler) {
|
||||
defer func() {
|
||||
if r := recover(); r != nil {
|
||||
ec.Error(ctx, ec.Recover(ctx, r))
|
||||
ret = graphql.Null
|
||||
}
|
||||
}()
|
||||
fc := &graphql.FieldContext{
|
||||
Object: "LiveEnnoblement",
|
||||
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.LiveEnnoblement().NewOwner(rctx, obj)
|
||||
})
|
||||
if err != nil {
|
||||
ec.Error(ctx, err)
|
||||
return graphql.Null
|
||||
}
|
||||
if resTmp == nil {
|
||||
return graphql.Null
|
||||
}
|
||||
res := resTmp.(*models.Player)
|
||||
fc.Result = res
|
||||
return ec.marshalOPlayer2ᚖgithubᚗcomᚋtribalwarshelpᚋsharedᚋmodelsᚐPlayer(ctx, field.Selections, res)
|
||||
}
|
||||
|
||||
func (ec *executionContext) _LiveEnnoblement_oldOwner(ctx context.Context, field graphql.CollectedField, obj *models.LiveEnnoblement) (ret graphql.Marshaler) {
|
||||
defer func() {
|
||||
if r := recover(); r != nil {
|
||||
ec.Error(ctx, ec.Recover(ctx, r))
|
||||
ret = graphql.Null
|
||||
}
|
||||
}()
|
||||
fc := &graphql.FieldContext{
|
||||
Object: "LiveEnnoblement",
|
||||
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.LiveEnnoblement().OldOwner(rctx, obj)
|
||||
})
|
||||
if err != nil {
|
||||
ec.Error(ctx, err)
|
||||
return graphql.Null
|
||||
}
|
||||
if resTmp == nil {
|
||||
return graphql.Null
|
||||
}
|
||||
res := resTmp.(*models.Player)
|
||||
fc.Result = res
|
||||
return ec.marshalOPlayer2ᚖgithubᚗcomᚋtribalwarshelpᚋsharedᚋmodelsᚐPlayer(ctx, field.Selections, res)
|
||||
}
|
||||
|
||||
func (ec *executionContext) _LiveEnnoblement_ennobledAt(ctx context.Context, field graphql.CollectedField, obj *models.LiveEnnoblement) (ret graphql.Marshaler) {
|
||||
defer func() {
|
||||
if r := recover(); r != nil {
|
||||
ec.Error(ctx, ec.Recover(ctx, r))
|
||||
ret = graphql.Null
|
||||
}
|
||||
}()
|
||||
fc := &graphql.FieldContext{
|
||||
Object: "LiveEnnoblement",
|
||||
Field: field,
|
||||
Args: nil,
|
||||
IsMethod: false,
|
||||
IsResolver: false,
|
||||
}
|
||||
|
||||
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 obj.EnnobledAt, nil
|
||||
})
|
||||
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.(time.Time)
|
||||
fc.Result = res
|
||||
return ec.marshalNTime2timeᚐTime(ctx, field.Selections, res)
|
||||
}
|
||||
|
||||
func (ec *executionContext) _Player_id(ctx context.Context, field graphql.CollectedField, obj *models.Player) (ret graphql.Marshaler) {
|
||||
defer func() {
|
||||
if r := recover(); r != nil {
|
||||
|
@ -10359,45 +10146,6 @@ func (ec *executionContext) _Query_ennoblements(ctx context.Context, field graph
|
|||
return ec.marshalNEnnoblementList2ᚖgithubᚗcomᚋtribalwarshelpᚋapiᚋgraphqlᚋgeneratedᚐEnnoblementList(ctx, field.Selections, res)
|
||||
}
|
||||
|
||||
func (ec *executionContext) _Query_liveEnnoblements(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_liveEnnoblements_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().LiveEnnoblements(rctx, args["server"].(string))
|
||||
})
|
||||
if err != nil {
|
||||
ec.Error(ctx, err)
|
||||
return graphql.Null
|
||||
}
|
||||
if resTmp == nil {
|
||||
return graphql.Null
|
||||
}
|
||||
res := resTmp.([]*models.LiveEnnoblement)
|
||||
fc.Result = res
|
||||
return ec.marshalOLiveEnnoblement2ᚕᚖgithubᚗcomᚋtribalwarshelpᚋsharedᚋmodelsᚐLiveEnnoblementᚄ(ctx, field.Selections, res)
|
||||
}
|
||||
|
||||
func (ec *executionContext) _Query_players(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) {
|
||||
defer func() {
|
||||
if r := recover(); r != nil {
|
||||
|
@ -23094,66 +22842,6 @@ func (ec *executionContext) _FoundTribeList(ctx context.Context, sel ast.Selecti
|
|||
return out
|
||||
}
|
||||
|
||||
var liveEnnoblementImplementors = []string{"LiveEnnoblement"}
|
||||
|
||||
func (ec *executionContext) _LiveEnnoblement(ctx context.Context, sel ast.SelectionSet, obj *models.LiveEnnoblement) graphql.Marshaler {
|
||||
fields := graphql.CollectFields(ec.OperationContext, sel, liveEnnoblementImplementors)
|
||||
|
||||
out := graphql.NewFieldSet(fields)
|
||||
var invalids uint32
|
||||
for i, field := range fields {
|
||||
switch field.Name {
|
||||
case "__typename":
|
||||
out.Values[i] = graphql.MarshalString("LiveEnnoblement")
|
||||
case "village":
|
||||
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._LiveEnnoblement_village(ctx, field, obj)
|
||||
return res
|
||||
})
|
||||
case "newOwner":
|
||||
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._LiveEnnoblement_newOwner(ctx, field, obj)
|
||||
return res
|
||||
})
|
||||
case "oldOwner":
|
||||
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._LiveEnnoblement_oldOwner(ctx, field, obj)
|
||||
return res
|
||||
})
|
||||
case "ennobledAt":
|
||||
out.Values[i] = ec._LiveEnnoblement_ennobledAt(ctx, field, obj)
|
||||
if out.Values[i] == graphql.Null {
|
||||
atomic.AddUint32(&invalids, 1)
|
||||
}
|
||||
default:
|
||||
panic("unknown field " + strconv.Quote(field.Name))
|
||||
}
|
||||
}
|
||||
out.Dispatch()
|
||||
if invalids > 0 {
|
||||
return graphql.Null
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
var playerImplementors = []string{"Player"}
|
||||
|
||||
func (ec *executionContext) _Player(ctx context.Context, sel ast.SelectionSet, obj *models.Player) graphql.Marshaler {
|
||||
|
@ -23588,17 +23276,6 @@ func (ec *executionContext) _Query(ctx context.Context, sel ast.SelectionSet) gr
|
|||
}
|
||||
return res
|
||||
})
|
||||
case "liveEnnoblements":
|
||||
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_liveEnnoblements(ctx, field)
|
||||
return res
|
||||
})
|
||||
case "players":
|
||||
field := field
|
||||
out.Concurrently(i, func() (res graphql.Marshaler) {
|
||||
|
@ -26029,16 +25706,6 @@ func (ec *executionContext) marshalNInt2int(ctx context.Context, sel ast.Selecti
|
|||
return res
|
||||
}
|
||||
|
||||
func (ec *executionContext) marshalNLiveEnnoblement2ᚖgithubᚗcomᚋtribalwarshelpᚋsharedᚋmodelsᚐLiveEnnoblement(ctx context.Context, sel ast.SelectionSet, v *models.LiveEnnoblement) graphql.Marshaler {
|
||||
if v == nil {
|
||||
if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) {
|
||||
ec.Errorf(ctx, "must not be null")
|
||||
}
|
||||
return graphql.Null
|
||||
}
|
||||
return ec._LiveEnnoblement(ctx, sel, v)
|
||||
}
|
||||
|
||||
func (ec *executionContext) marshalNPlayer2ᚖgithubᚗcomᚋtribalwarshelpᚋsharedᚋmodelsᚐPlayer(ctx context.Context, sel ast.SelectionSet, v *models.Player) graphql.Marshaler {
|
||||
if v == nil {
|
||||
if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) {
|
||||
|
@ -26991,46 +26658,6 @@ func (ec *executionContext) marshalOInt2ᚖint(ctx context.Context, sel ast.Sele
|
|||
return graphql.MarshalInt(*v)
|
||||
}
|
||||
|
||||
func (ec *executionContext) marshalOLiveEnnoblement2ᚕᚖgithubᚗcomᚋtribalwarshelpᚋsharedᚋmodelsᚐLiveEnnoblementᚄ(ctx context.Context, sel ast.SelectionSet, v []*models.LiveEnnoblement) graphql.Marshaler {
|
||||
if v == nil {
|
||||
return graphql.Null
|
||||
}
|
||||
ret := make(graphql.Array, len(v))
|
||||
var wg sync.WaitGroup
|
||||
isLen1 := len(v) == 1
|
||||
if !isLen1 {
|
||||
wg.Add(len(v))
|
||||
}
|
||||
for i := range v {
|
||||
i := i
|
||||
fc := &graphql.FieldContext{
|
||||
Index: &i,
|
||||
Result: &v[i],
|
||||
}
|
||||
ctx := graphql.WithFieldContext(ctx, fc)
|
||||
f := func(i int) {
|
||||
defer func() {
|
||||
if r := recover(); r != nil {
|
||||
ec.Error(ctx, ec.Recover(ctx, r))
|
||||
ret = nil
|
||||
}
|
||||
}()
|
||||
if !isLen1 {
|
||||
defer wg.Done()
|
||||
}
|
||||
ret[i] = ec.marshalNLiveEnnoblement2ᚖgithubᚗcomᚋtribalwarshelpᚋsharedᚋmodelsᚐLiveEnnoblement(ctx, sel, v[i])
|
||||
}
|
||||
if isLen1 {
|
||||
f(i)
|
||||
} else {
|
||||
go f(i)
|
||||
}
|
||||
|
||||
}
|
||||
wg.Wait()
|
||||
return ret
|
||||
}
|
||||
|
||||
func (ec *executionContext) marshalOPlayer2ᚕᚖgithubᚗcomᚋtribalwarshelpᚋsharedᚋmodelsᚐPlayerᚄ(ctx context.Context, sel ast.SelectionSet, v []*models.Player) graphql.Marshaler {
|
||||
if v == nil {
|
||||
return graphql.Null
|
||||
|
|
|
@ -1,35 +0,0 @@
|
|||
package resolvers
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/tribalwarshelp/shared/models"
|
||||
)
|
||||
|
||||
func (r *liveEnnoblementResolver) NewOwner(ctx context.Context, obj *models.LiveEnnoblement) (*models.Player, error) {
|
||||
if obj.NewOwner != nil {
|
||||
return obj.NewOwner, nil
|
||||
}
|
||||
|
||||
return getPlayer(ctx, obj.NewOwnerID), nil
|
||||
}
|
||||
|
||||
func (r *liveEnnoblementResolver) OldOwner(ctx context.Context, obj *models.LiveEnnoblement) (*models.Player, error) {
|
||||
if obj.OldOwner != nil {
|
||||
return obj.OldOwner, nil
|
||||
}
|
||||
|
||||
return getPlayer(ctx, obj.OldOwnerID), nil
|
||||
}
|
||||
|
||||
func (r *liveEnnoblementResolver) Village(ctx context.Context, obj *models.LiveEnnoblement) (*models.Village, error) {
|
||||
if obj.Village != nil {
|
||||
return obj.Village, nil
|
||||
}
|
||||
|
||||
return getVillage(ctx, obj.VillageID), nil
|
||||
}
|
||||
|
||||
func (r *queryResolver) LiveEnnoblements(ctx context.Context, server string) ([]*models.LiveEnnoblement, error) {
|
||||
return r.EnnoblementUcase.FetchLiveEnnoblements(ctx, server)
|
||||
}
|
|
@ -36,12 +36,9 @@ type Resolver struct {
|
|||
}
|
||||
|
||||
// Query returns generated.QueryResolver implementation.
|
||||
func (r *Resolver) Query() generated.QueryResolver { return &queryResolver{r} }
|
||||
func (r *Resolver) Player() generated.PlayerResolver { return &playerResolver{r} }
|
||||
func (r *Resolver) Village() generated.VillageResolver { return &villageResolver{r} }
|
||||
func (r *Resolver) LiveEnnoblement() generated.LiveEnnoblementResolver {
|
||||
return &liveEnnoblementResolver{r}
|
||||
}
|
||||
func (r *Resolver) Query() generated.QueryResolver { return &queryResolver{r} }
|
||||
func (r *Resolver) Player() generated.PlayerResolver { return &playerResolver{r} }
|
||||
func (r *Resolver) Village() generated.VillageResolver { return &villageResolver{r} }
|
||||
func (r *Resolver) Ennoblement() generated.EnnoblementResolver { return &ennoblementResolver{r} }
|
||||
func (r *Resolver) Server() generated.ServerResolver { return &serverResolver{r} }
|
||||
func (r *Resolver) PlayerHistoryRecord() generated.PlayerHistoryRecordResolver {
|
||||
|
@ -64,7 +61,6 @@ type queryResolver struct{ *Resolver }
|
|||
type playerResolver struct{ *Resolver }
|
||||
type villageResolver struct{ *Resolver }
|
||||
type tribeResolver struct{ *Resolver }
|
||||
type liveEnnoblementResolver struct{ *Resolver }
|
||||
type ennoblementResolver struct{ *Resolver }
|
||||
type serverResolver struct{ *Resolver }
|
||||
type playerHistoryRecordResolver struct{ *Resolver }
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
type LiveEnnoblement {
|
||||
village: Village @goField(forceResolver: true)
|
||||
newOwner: Player @goField(forceResolver: true)
|
||||
oldOwner: Player @goField(forceResolver: true)
|
||||
ennobledAt: Time!
|
||||
}
|
||||
|
||||
extend type Query {
|
||||
liveEnnoblements(server: String!): [LiveEnnoblement!]
|
||||
@deprecated(reason: "use `ennoblements` instead")
|
||||
}
|
Reference in New Issue
Block a user