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

add ennoblement

This commit is contained in:
Dawid Wysokiński 2020-06-03 17:21:28 +02:00
parent 3bffcfa0d3
commit 1f153b3fe5
18 changed files with 941 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ennoblement/constants.go Normal file
View File

@ -0,0 +1,5 @@
package ennoblement
const (
EndpointGetConquer = "/interface.php?func=get_conquer&since=%d"
)

11
ennoblement/repository.go Normal file
View File

@ -0,0 +1,11 @@
package ennoblement
import (
"context"
"github.com/tribalwarshelp/shared/models"
)
type Repository interface {
Fetch(ctx context.Context, server string) ([]*models.Ennoblement, error)
}

51
ennoblement/repository/helpers.go Normal file
View File

@ -0,0 +1,51 @@
package repository
import (
"encoding/csv"
"fmt"
"net/http"
"strconv"
"time"
"github.com/pkg/errors"
"github.com/tribalwarshelp/shared/models"
)
func getCSVData(url string) ([][]string, error) {
resp, err := http.Get(url)
if err != nil {
return nil, err
}
defer resp.Body.Close()
return csv.NewReader(resp.Body).ReadAll()
}
func parseLine(line []string, timezone string) (*models.Ennoblement, error) {
loc, err := time.LoadLocation(timezone)
if err != nil {
return nil, fmt.Errorf("Invalid timezone: %s", timezone)
}
if len(line) != 4 {
return nil, fmt.Errorf("Invalid line format (should be village_id,timestamp,new_owner,old_owner)")
}
e := &models.Ennoblement{}
e.VillageID, err = strconv.Atoi(line[0])
if err != nil {
return nil, errors.Wrap(err, "*models.Ennoblement.VillageID")
}
timestamp, err := strconv.Atoi(line[1])
if err != nil {
return nil, errors.Wrap(err, "timestamp")
}
e.EnnobledAt = time.Unix(int64(timestamp), 0).In(loc)
e.NewOwnerID, err = strconv.Atoi(line[2])
if err != nil {
return nil, errors.Wrap(err, "*models.Ennoblement.NewOwnerID")
}
e.OldOwnerID, err = strconv.Atoi(line[2])
if err != nil {
return nil, errors.Wrap(err, "*models.Ennoblement.OldOwnerID")
}
return e, nil
}

54
ennoblement/repository/pg_repository.go Normal file
View File

@ -0,0 +1,54 @@
package repository
import (
"context"
"fmt"
"time"
"github.com/tribalwarshelp/api/ennoblement"
"github.com/go-pg/pg/v10"
"github.com/pkg/errors"
"github.com/tribalwarshelp/shared/models"
)
type pgRepository struct {
*pg.DB
}
func NewPGRepository(db *pg.DB) ennoblement.Repository {
return &pgRepository{db}
}
func (repo *pgRepository) Fetch(ctx context.Context, server string) ([]*models.Ennoblement, error) {
s := &models.Server{}
if err := repo.Model(s).Where("key = ?", server).Relation("LangVersion").Select(); err != nil {
if err == pg.ErrNoRows {
return nil, fmt.Errorf("Server not found")
}
return nil, errors.Wrap(err, "Internal server error")
}
if s.Status == models.ServerStatusClosed {
return nil, fmt.Errorf("Server is " + models.ServerStatusClosed.String())
}
url := "https://" + s.Key + "." + s.LangVersion.Host +
fmt.Sprintf(ennoblement.EndpointGetConquer, time.Now().Add(-1*time.Hour).Unix())
lines, err := getCSVData(url)
if err != nil {
return nil, errors.Wrap(err, "Cannot fetch ennoblements")
}
e := []*models.Ennoblement{}
for _, line := range lines {
ennoblement, err := parseLine(line, s.LangVersion.Timezone)
if err != nil {
continue
}
e = append(e, ennoblement)
}
return e, nil
}

11
ennoblement/usecase.go Normal file
View File

@ -0,0 +1,11 @@
package ennoblement
import (
"context"
"github.com/tribalwarshelp/shared/models"
)
type Usecase interface {
Fetch(ctx context.Context, server string) ([]*models.Ennoblement, error)
}

22
ennoblement/usecase/usecase.go Normal file
View File

@ -0,0 +1,22 @@
package usecase
import (
"context"
"github.com/tribalwarshelp/api/ennoblement"
"github.com/tribalwarshelp/shared/models"
)
type usecase struct {
repo ennoblement.Repository
}
func New(repo ennoblement.Repository) ennoblement.Usecase {
return &usecase{
repo,
}
}
func (ucase *usecase) Fetch(ctx context.Context, server string) ([]*models.Ennoblement, error) {
return ucase.repo.Fetch(ctx, server)
}

2
go.mod
View File

@ -12,7 +12,7 @@ require (
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/pkg/errors v0.9.1
github.com/segmentio/encoding v0.1.13 // indirect
github.com/tribalwarshelp/shared v0.0.0-20200602122915-bb9a531672b6
github.com/tribalwarshelp/shared v0.0.0-20200603143626-e91530ae0889
github.com/vektah/gqlparser/v2 v2.0.1
golang.org/x/net v0.0.0-20200602114024-627f9648deb9 // indirect
golang.org/x/sys v0.0.0-20200602100848-8d3cce7afc34 // indirect

7
go.sum
View File

@ -59,6 +59,8 @@ github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1
github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
github.com/go-playground/validator/v10 v10.3.0 h1:nZU+7q+yJoFmwvNgv/LnPUkwPal62+b2xXj0AU1Es7o=
github.com/go-playground/validator/v10 v10.3.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
github.com/go-redis/redis/v8 v8.0.0-beta.2 h1:9S28J9QMBotgI3tGgXbX1Wk9i8QYC3Orw4bTLoPrQeI=
github.com/go-redis/redis/v8 v8.0.0-beta.2/go.mod h1:o1M7JtsgfDYyv3o+gBn/jJ1LkqpnCrmil7PSppZGBak=
github.com/gogo/protobuf v1.0.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
@ -158,8 +160,8 @@ github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc h1:9lRDQMhESg+zvGYmW5DyG0UqvY96Bu5QYsTLvCHdrgo=
github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc/go.mod h1:bciPuU6GHm1iF1pBvUfxfsH0Wmnc2VbpgvbI9ZWuIRs=
github.com/tribalwarshelp/shared v0.0.0-20200602122915-bb9a531672b6 h1:vrqEpEwkKg63/hV5cIGgmDvdcAdDm4pR0N14nC3eCjQ=
github.com/tribalwarshelp/shared v0.0.0-20200602122915-bb9a531672b6/go.mod h1:tf+2yTHasV6jAF3V2deZ9slNoCyBzC0fMdTjI7clf6Y=
github.com/tribalwarshelp/shared v0.0.0-20200603143626-e91530ae0889 h1:6wXJ4Hdh7NlLlTiAtQknHIZYoTZfYtU8nBXQvhUMRik=
github.com/tribalwarshelp/shared v0.0.0-20200603143626-e91530ae0889/go.mod h1:Ej+yG8aDKHPLRUVYxn7bT9zA0sdZZoGGgVJAAPGCK/o=
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=
@ -181,6 +183,7 @@ github.com/vmihailenco/msgpack/v5 v5.0.0-alpha.2/go.mod h1:LDfrk4wJpSFwkzNOJxrCW
github.com/vmihailenco/tagparser v0.1.0/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
github.com/vmihailenco/tagparser v0.1.1 h1:quXMXlA39OCbd2wAdTsGDlK9RkOk6Wuw+x37wVyIuWY=
github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
go.opentelemetry.io/otel v0.5.0/go.mod h1:jzBIgIzK43Iu1BpDAXwqOd6UPsSAk+ewVZ5ofSXw4Ek=
go.opentelemetry.io/otel v0.6.0 h1:+vkHm/XwJ7ekpISV2Ixew93gCrxTbuwTF5rSewnLLgw=
go.opentelemetry.io/otel v0.6.0/go.mod h1:jzBIgIzK43Iu1BpDAXwqOd6UPsSAk+ewVZ5ofSXw4Ek=
golang.org/x/crypto v0.0.0-20180910181607-0e37d006457b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=

38
graphql/dataloaders/dataloaders.go
View File

@ -2,22 +2,24 @@ package dataloaders
import (
"context"
"log"
"time"
"github.com/tribalwarshelp/api/player"
"github.com/tribalwarshelp/api/tribe"
"github.com/tribalwarshelp/api/village"
"github.com/tribalwarshelp/shared/models"
)
type DataLoaders struct {
PlayerByID PlayerLoader
TribeByID TribeLoader
PlayerByID PlayerLoader
TribeByID TribeLoader
VillageByID VillageLoader
}
type Config struct {
PlayerRepo player.Repository
TribeRepo tribe.Repository
PlayerRepo player.Repository
TribeRepo tribe.Repository
VillageRepo village.Repository
}
func New(server string, cfg Config) *DataLoaders {
@ -26,7 +28,6 @@ func New(server string, cfg Config) *DataLoaders {
wait: 2 * time.Millisecond,
maxBatch: 0,
fetch: func(ids []int) ([]*models.Player, []error) {
log.Println("playerbyid", ids)
players, _, err := cfg.PlayerRepo.Fetch(context.Background(), server, &models.PlayerFilter{
ID: ids,
})
@ -51,7 +52,6 @@ func New(server string, cfg Config) *DataLoaders {
wait: 2 * time.Millisecond,
maxBatch: 0,
fetch: func(ids []int) ([]*models.Tribe, []error) {
log.Println("tribebyid", ids)
tribes, _, err := cfg.TribeRepo.Fetch(context.Background(), server, &models.TribeFilter{
ID: ids,
})
@ -69,6 +69,30 @@ func New(server string, cfg Config) *DataLoaders {
sorted[i] = tribeByID[id]
}
return sorted, nil
},
},
VillageByID: VillageLoader{
wait: 2 * time.Millisecond,
maxBatch: 0,
fetch: func(ids []int) ([]*models.Village, []error) {
villages, _, err := cfg.VillageRepo.Fetch(context.Background(), server, &models.VillageFilter{
ID: ids,
})
if err != nil {
return nil, []error{err}
}
villageByID := make(map[int]*models.Village)
for _, village := range villages {
villageByID[village.ID] = village
}
sorted := make([]*models.Village, len(ids))
for i, id := range ids {
sorted[i] = villageByID[id]
}
return sorted, nil
},
},

224
graphql/dataloaders/villageloader_gen.go Normal file
View File

@ -0,0 +1,224 @@
// Code generated by github.com/vektah/dataloaden, DO NOT EDIT.
package dataloaders
import (
"sync"
"time"
"github.com/tribalwarshelp/shared/models"
)
// VillageLoaderConfig captures the config to create a new VillageLoader
type VillageLoaderConfig struct {
// Fetch is a method that provides the data for the loader
Fetch func(keys []int) ([]*models.Village, []error)
// Wait is how long wait before sending a batch
Wait time.Duration
// MaxBatch will limit the maximum number of keys to send in one batch, 0 = not limit
MaxBatch int
}
// NewVillageLoader creates a new VillageLoader given a fetch, wait, and maxBatch
func NewVillageLoader(config VillageLoaderConfig) *VillageLoader {
return &VillageLoader{
fetch: config.Fetch,
wait: config.Wait,
maxBatch: config.MaxBatch,
}
}
// VillageLoader batches and caches requests
type VillageLoader struct {
// this method provides the data for the loader
fetch func(keys []int) ([]*models.Village, []error)
// how long to done before sending a batch
wait time.Duration
// this will limit the maximum number of keys to send in one batch, 0 = no limit
maxBatch int
// INTERNAL
// lazily created cache
cache map[int]*models.Village
// the current batch. keys will continue to be collected until timeout is hit,
// then everything will be sent to the fetch method and out to the listeners
batch *villageLoaderBatch
// mutex to prevent races
mu sync.Mutex
}
type villageLoaderBatch struct {
keys []int
data []*models.Village
error []error
closing bool
done chan struct{}
}
// Load a Village by key, batching and caching will be applied automatically
func (l *VillageLoader) Load(key int) (*models.Village, error) {
return l.LoadThunk(key)()
}
// LoadThunk returns a function that when called will block waiting for a Village.
// This method should be used if you want one goroutine to make requests to many
// different data loaders without blocking until the thunk is called.
func (l *VillageLoader) LoadThunk(key int) func() (*models.Village, error) {
l.mu.Lock()
if it, ok := l.cache[key]; ok {
l.mu.Unlock()
return func() (*models.Village, error) {
return it, nil
}
}
if l.batch == nil {
l.batch = &villageLoaderBatch{done: make(chan struct{})}
}
batch := l.batch
pos := batch.keyIndex(l, key)
l.mu.Unlock()
return func() (*models.Village, error) {
<-batch.done
var data *models.Village
if pos < len(batch.data) {
data = batch.data[pos]
}
var err error
// its convenient to be able to return a single error for everything
if len(batch.error) == 1 {
err = batch.error[0]
} else if batch.error != nil {
err = batch.error[pos]
}
if err == nil {
l.mu.Lock()
l.unsafeSet(key, data)
l.mu.Unlock()
}
return data, err
}
}
// LoadAll fetches many keys at once. It will be broken into appropriate sized
// sub batches depending on how the loader is configured
func (l *VillageLoader) LoadAll(keys []int) ([]*models.Village, []error) {
results := make([]func() (*models.Village, error), len(keys))
for i, key := range keys {
results[i] = l.LoadThunk(key)
}
villages := make([]*models.Village, len(keys))
errors := make([]error, len(keys))
for i, thunk := range results {
villages[i], errors[i] = thunk()
}
return villages, errors
}
// LoadAllThunk returns a function that when called will block waiting for a Villages.
// This method should be used if you want one goroutine to make requests to many
// different data loaders without blocking until the thunk is called.
func (l *VillageLoader) LoadAllThunk(keys []int) func() ([]*models.Village, []error) {
results := make([]func() (*models.Village, error), len(keys))
for i, key := range keys {
results[i] = l.LoadThunk(key)
}
return func() ([]*models.Village, []error) {
villages := make([]*models.Village, len(keys))
errors := make([]error, len(keys))
for i, thunk := range results {
villages[i], errors[i] = thunk()
}
return villages, errors
}
}
// Prime the cache with the provided key and value. If the key already exists, no change is made
// and false is returned.
// (To forcefully prime the cache, clear the key first with loader.clear(key).prime(key, value).)
func (l *VillageLoader) Prime(key int, value *models.Village) bool {
l.mu.Lock()
var found bool
if _, found = l.cache[key]; !found {
// make a copy when writing to the cache, its easy to pass a pointer in from a loop var
// and end up with the whole cache pointing to the same value.
cpy := *value
l.unsafeSet(key, &cpy)
}
l.mu.Unlock()
return !found
}
// Clear the value at key from the cache, if it exists
func (l *VillageLoader) Clear(key int) {
l.mu.Lock()
delete(l.cache, key)
l.mu.Unlock()
}
func (l *VillageLoader) unsafeSet(key int, value *models.Village) {
if l.cache == nil {
l.cache = map[int]*models.Village{}
}
l.cache[key] = value
}
// keyIndex will return the location of the key in the batch, if its not found
// it will add the key to the batch
func (b *villageLoaderBatch) keyIndex(l *VillageLoader, key int) int {
for i, existingKey := range b.keys {
if key == existingKey {
return i
}
}
pos := len(b.keys)
b.keys = append(b.keys, key)
if pos == 0 {
go b.startTimer(l)
}
if l.maxBatch != 0 && pos >= l.maxBatch-1 {
if !b.closing {
b.closing = true
l.batch = nil
go b.end(l)
}
}
return pos
}
func (b *villageLoaderBatch) startTimer(l *VillageLoader) {
time.Sleep(l.wait)
l.mu.Lock()
// we must have hit a batch limit and are already finalizing this batch
if b.closing {
l.mu.Unlock()
return
}
l.batch = nil
l.mu.Unlock()
b.end(l)
}
func (b *villageLoaderBatch) end(l *VillageLoader) {
b.data, b.error = l.fetch(b.keys)
close(b.done)
}

30
graphql/delivery/http/handler.go
View File

@ -4,31 +4,45 @@ import (
"fmt"
"github.com/99designs/gqlgen/graphql/handler"
"github.com/99designs/gqlgen/graphql/handler/extension"
"github.com/99designs/gqlgen/graphql/handler/lru"
"github.com/99designs/gqlgen/graphql/handler/transport"
"github.com/99designs/gqlgen/graphql/playground"
"github.com/gin-gonic/gin"
"github.com/tribalwarshelp/api/graphql/generated"
"github.com/tribalwarshelp/api/graphql/resolvers"
)
func Attach(g *gin.RouterGroup, r *resolvers.Resolver) error {
if r == nil {
type Config struct {
RouterGroup *gin.RouterGroup
Resolver *resolvers.Resolver
}
func Attach(cfg Config) error {
if cfg.Resolver == nil {
return fmt.Errorf("Graphql resolver cannot be nil")
}
g.POST("/graphql", graphqlHandler(r))
g.GET("/", playgroundHandler())
cfg.RouterGroup.POST("/graphql", graphqlHandler(cfg.Resolver))
cfg.RouterGroup.GET("/", playgroundHandler())
return nil
}
// Defining the Graphql handler
func graphqlHandler(r *resolvers.Resolver) gin.HandlerFunc {
// NewExecutableSchema and Config are in the generated.go file
// Resolver is in the resolver.go file
cfg := generated.Config{Resolvers: r}
h := handler.NewDefaultServer(generated.NewExecutableSchema(cfg))
srv := handler.New(generated.NewExecutableSchema(cfg))
srv.AddTransport(transport.GET{})
srv.AddTransport(transport.POST{})
srv.AddTransport(transport.MultipartForm{})
srv.Use(extension.Introspection{})
srv.Use(extension.AutomaticPersistedQuery{
Cache: lru.New(100),
})
return func(c *gin.Context) {
c.Header("Cache-Control", "no-store, must-revalidate")
h.ServeHTTP(c.Writer, c.Request)
srv.ServeHTTP(c.Writer, c.Request)
}
}

387
graphql/generated/generated.go
View File

@ -9,6 +9,7 @@ import (
"strconv"
"sync"
"sync/atomic"
"time"
"github.com/99designs/gqlgen/graphql"
"github.com/99designs/gqlgen/graphql/introspection"
@ -35,6 +36,7 @@ type Config struct {
}
type ResolverRoot interface {
Ennoblement() EnnoblementResolver
Player() PlayerResolver
Query() QueryResolver
Village() VillageResolver
@ -44,6 +46,13 @@ type DirectiveRoot struct {
}
type ComplexityRoot struct {
Ennoblement struct {
EnnobledAt func(childComplexity int) int
NewOwner func(childComplexity int) int
OldOwner func(childComplexity int) int
Village func(childComplexity int) int
}
LangVersion struct {
Host func(childComplexity int) int
Name func(childComplexity int) int
@ -80,6 +89,7 @@ type ComplexityRoot struct {
}
Query struct {
Ennoblements func(childComplexity int, server string) int
LangVersion func(childComplexity int, tag models.LanguageTag) int
LangVersions func(childComplexity int, filter *models.LangVersionFilter) int
Player func(childComplexity int, server string, id int) int
@ -143,10 +153,16 @@ type ComplexityRoot struct {
}
}
type EnnoblementResolver interface {
Village(ctx context.Context, obj *models.Ennoblement) (*models.Village, error)
NewOwner(ctx context.Context, obj *models.Ennoblement) (*models.Player, error)
OldOwner(ctx context.Context, obj *models.Ennoblement) (*models.Player, error)
}
type PlayerResolver interface {
Tribe(ctx context.Context, obj *models.Player) (*models.Tribe, error)
}
type QueryResolver interface {
Ennoblements(ctx context.Context, server string) ([]*models.Ennoblement, error)
LangVersions(ctx context.Context, filter *models.LangVersionFilter) (*LangVersionList, error)
LangVersion(ctx context.Context, tag models.LanguageTag) (*models.LangVersion, error)
Players(ctx context.Context, server string, filter *models.PlayerFilter) (*PlayerList, error)
@ -177,6 +193,34 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
_ = ec
switch typeName + "." + field {
case "Ennoblement.ennobledAt":
if e.complexity.Ennoblement.EnnobledAt == nil {
break
}
return e.complexity.Ennoblement.EnnobledAt(childComplexity), true
case "Ennoblement.newOwner":
if e.complexity.Ennoblement.NewOwner == nil {
break
}
return e.complexity.Ennoblement.NewOwner(childComplexity), true
case "Ennoblement.oldOwner":
if e.complexity.Ennoblement.OldOwner == nil {
break
}
return e.complexity.Ennoblement.OldOwner(childComplexity), true
case "Ennoblement.village":
if e.complexity.Ennoblement.Village == nil {
break
}
return e.complexity.Ennoblement.Village(childComplexity), true
case "LangVersion.host":
if e.complexity.LangVersion.Host == nil {
break
@ -338,6 +382,18 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
return e.complexity.PlayerList.Total(childComplexity), true
case "Query.ennoblements":
if e.complexity.Query.Ennoblements == nil {
break
}
args, err := ec.field_Query_ennoblements_args(context.TODO(), rawArgs)
if err != nil {
return 0, false
}
return e.complexity.Query.Ennoblements(childComplexity, args["server"].(string)), true
case "Query.langVersion":
if e.complexity.Query.LangVersion == nil {
break
@ -736,6 +792,17 @@ var sources = []*ast.Source{
forceResolver: Boolean
name: String
) on INPUT_FIELD_DEFINITION | FIELD_DEFINITION
`, BuiltIn: false},
&ast.Source{Name: "schema/ennoblement.graphql", Input: `type Ennoblement {
village: Village @goField(forceResolver: true)
newOwner: Player @goField(forceResolver: true)
oldOwner: Player @goField(forceResolver: true)
ennobledAt: Time!
}
extend type Query {
ennoblements(server: String!): [Ennoblement!]
}
`, BuiltIn: false},
&ast.Source{Name: "schema/lang_version.graphql", Input: `enum LanguageTag {
PL
@ -885,6 +952,8 @@ extend type Query {
players(server: String!, filter: PlayerFilter): PlayerList!
player(server: String!, id: Int!): Player
}
`, BuiltIn: false},
&ast.Source{Name: "schema/scalars.graphql", Input: `scalar Time
`, BuiltIn: false},
&ast.Source{Name: "schema/server.graphql", Input: `enum ServerStatus {
OPEN
@ -1112,6 +1181,20 @@ func (ec *executionContext) field_Query___type_args(ctx context.Context, rawArgs
return args, nil
}
func (ec *executionContext) field_Query_ennoblements_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 {
arg0, err = ec.unmarshalNString2string(ctx, tmp)
if err != nil {
return nil, err
}
}
args["server"] = arg0
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{}{}
@ -1336,6 +1419,133 @@ func (ec *executionContext) field___Type_fields_args(ctx context.Context, rawArg
// region **************************** field.gotpl *****************************
func (ec *executionContext) _Ennoblement_village(ctx context.Context, field graphql.CollectedField, obj *models.Ennoblement) (ret graphql.Marshaler) {
defer func() {
if r := recover(); r != nil {
ec.Error(ctx, ec.Recover(ctx, r))
ret = graphql.Null
}
}()
fc := &graphql.FieldContext{
Object: "Ennoblement",
Field: field,
Args: nil,
IsMethod: 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.Ennoblement().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) _Ennoblement_newOwner(ctx context.Context, field graphql.CollectedField, obj *models.Ennoblement) (ret graphql.Marshaler) {
defer func() {
if r := recover(); r != nil {
ec.Error(ctx, ec.Recover(ctx, r))
ret = graphql.Null
}
}()
fc := &graphql.FieldContext{
Object: "Ennoblement",
Field: field,
Args: nil,
IsMethod: 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.Ennoblement().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) _Ennoblement_oldOwner(ctx context.Context, field graphql.CollectedField, obj *models.Ennoblement) (ret graphql.Marshaler) {
defer func() {
if r := recover(); r != nil {
ec.Error(ctx, ec.Recover(ctx, r))
ret = graphql.Null
}
}()
fc := &graphql.FieldContext{
Object: "Ennoblement",
Field: field,
Args: nil,
IsMethod: 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.Ennoblement().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) _Ennoblement_ennobledAt(ctx context.Context, field graphql.CollectedField, obj *models.Ennoblement) (ret graphql.Marshaler) {
defer func() {
if r := recover(); r != nil {
ec.Error(ctx, ec.Recover(ctx, r))
ret = graphql.Null
}
}()
fc := &graphql.FieldContext{
Object: "Ennoblement",
Field: field,
Args: nil,
IsMethod: 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) _LangVersion_tag(ctx context.Context, field graphql.CollectedField, obj *models.LangVersion) (ret graphql.Marshaler) {
defer func() {
if r := recover(); r != nil {
@ -2109,6 +2319,44 @@ func (ec *executionContext) _PlayerList_total(ctx context.Context, field graphql
return ec.marshalNInt2int(ctx, field.Selections, res)
}
func (ec *executionContext) _Query_ennoblements(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,
}
ctx = graphql.WithFieldContext(ctx, fc)
rawArgs := field.ArgumentMap(ec.Variables)
args, err := ec.field_Query_ennoblements_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().Ennoblements(rctx, args["server"].(string))
})
if err != nil {
ec.Error(ctx, err)
return graphql.Null
}
if resTmp == nil {
return graphql.Null
}
res := resTmp.([]*models.Ennoblement)
fc.Result = res
return ec.marshalOEnnoblement2ᚕᚖgithubᚗcomᚋtribalwarshelpᚋsharedᚋmodelsᚐEnnoblementᚄ(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 {
@ -5834,6 +6082,66 @@ func (ec *executionContext) unmarshalInputVillageFilter(ctx context.Context, obj
// region **************************** object.gotpl ****************************
var ennoblementImplementors = []string{"Ennoblement"}
func (ec *executionContext) _Ennoblement(ctx context.Context, sel ast.SelectionSet, obj *models.Ennoblement) graphql.Marshaler {
fields := graphql.CollectFields(ec.OperationContext, sel, ennoblementImplementors)
out := graphql.NewFieldSet(fields)
var invalids uint32
for i, field := range fields {
switch field.Name {
case "__typename":
out.Values[i] = graphql.MarshalString("Ennoblement")
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._Ennoblement_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._Ennoblement_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._Ennoblement_oldOwner(ctx, field, obj)
return res
})
case "ennobledAt":
out.Values[i] = ec._Ennoblement_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 langVersionImplementors = []string{"LangVersion"}
func (ec *executionContext) _LangVersion(ctx context.Context, sel ast.SelectionSet, obj *models.LangVersion) graphql.Marshaler {
@ -6052,6 +6360,17 @@ func (ec *executionContext) _Query(ctx context.Context, sel ast.SelectionSet) gr
switch field.Name {
case "__typename":
out.Values[i] = graphql.MarshalString("Query")
case "ennoblements":
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_ennoblements(ctx, field)
return res
})
case "langVersions":
field := field
out.Concurrently(i, func() (res graphql.Marshaler) {
@ -6758,6 +7077,20 @@ func (ec *executionContext) marshalNBoolean2ᚖbool(ctx context.Context, sel ast
return ec.marshalNBoolean2bool(ctx, sel, *v)
}
func (ec *executionContext) marshalNEnnoblement2githubᚗcomᚋtribalwarshelpᚋsharedᚋmodelsᚐEnnoblement(ctx context.Context, sel ast.SelectionSet, v models.Ennoblement) graphql.Marshaler {
return ec._Ennoblement(ctx, sel, &v)
}
func (ec *executionContext) marshalNEnnoblement2ᚖgithubᚗcomᚋtribalwarshelpᚋsharedᚋmodelsᚐEnnoblement(ctx context.Context, sel ast.SelectionSet, v *models.Ennoblement) graphql.Marshaler {
if v == nil {
if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) {
ec.Errorf(ctx, "must not be null")
}
return graphql.Null
}
return ec._Ennoblement(ctx, sel, v)
}
func (ec *executionContext) unmarshalNInt2int(ctx context.Context, v interface{}) (int, error) {
return graphql.UnmarshalInt(v)
}
@ -6888,6 +7221,20 @@ func (ec *executionContext) marshalNString2string(ctx context.Context, sel ast.S
return res
}
func (ec *executionContext) unmarshalNTime2timeᚐTime(ctx context.Context, v interface{}) (time.Time, error) {
return graphql.UnmarshalTime(v)
}
func (ec *executionContext) marshalNTime2timeᚐTime(ctx context.Context, sel ast.SelectionSet, v time.Time) graphql.Marshaler {
res := graphql.MarshalTime(v)
if res == graphql.Null {
if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) {
ec.Errorf(ctx, "must not be null")
}
}
return res
}
func (ec *executionContext) marshalNTribe2githubᚗcomᚋtribalwarshelpᚋsharedᚋmodelsᚐTribe(ctx context.Context, sel ast.SelectionSet, v models.Tribe) graphql.Marshaler {
return ec._Tribe(ctx, sel, &v)
}
@ -7193,6 +7540,46 @@ func (ec *executionContext) marshalOBoolean2ᚖbool(ctx context.Context, sel ast
return ec.marshalOBoolean2bool(ctx, sel, *v)
}
func (ec *executionContext) marshalOEnnoblement2ᚕᚖgithubᚗcomᚋtribalwarshelpᚋsharedᚋmodelsᚐEnnoblementᚄ(ctx context.Context, sel ast.SelectionSet, v []*models.Ennoblement) 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.marshalNEnnoblement2ᚖgithubᚗcomᚋtribalwarshelpᚋsharedᚋmodelsᚐEnnoblement(ctx, sel, v[i])
}
if isLen1 {
f(i)
} else {
go f(i)
}
}
wg.Wait()
return ret
}
func (ec *executionContext) unmarshalOInt2int(ctx context.Context, v interface{}) (int, error) {
return graphql.UnmarshalInt(v)
}

2
graphql/gqlgen.yml
View File

@ -36,3 +36,5 @@ models:
model: github.com/tribalwarshelp/shared/models.Village
VillageFilter:
model: github.com/tribalwarshelp/shared/models.VillageFilter
Ennoblement:
model: github.com/tribalwarshelp/shared/models.Ennoblement

81
graphql/resolvers/ennoblement.go Normal file
View File

@ -0,0 +1,81 @@
package resolvers
import (
"context"
"log"
"github.com/99designs/gqlgen/graphql"
"github.com/tribalwarshelp/api/middleware"
"github.com/tribalwarshelp/shared/models"
)
func (r *ennoblementResolver) NewOwner(ctx context.Context, obj *models.Ennoblement) (*models.Player, error) {
if obj.NewOwner != nil {
return obj.NewOwner, nil
}
rctx := graphql.GetFieldContext(ctx)
server, ok := rctx.Parent.Parent.Args["server"].(string)
if ok {
dataloaders := middleware.DataLoadersFromContext(ctx)
if dataloaders != nil {
if dataloader, ok := dataloaders[server]; ok {
player, _ := dataloader.PlayerByID.Load(obj.NewOwnerID)
if player != nil {
return player, nil
}
}
}
}
return nil, nil
}
func (r *ennoblementResolver) OldOwner(ctx context.Context, obj *models.Ennoblement) (*models.Player, error) {
if obj.OldOwner != nil {
return obj.OldOwner, nil
}
rctx := graphql.GetFieldContext(ctx)
server, ok := rctx.Parent.Parent.Args["server"].(string)
if ok {
dataloaders := middleware.DataLoadersFromContext(ctx)
if dataloaders != nil {
if dataloader, ok := dataloaders[server]; ok {
player, _ := dataloader.PlayerByID.Load(obj.OldOwnerID)
if player != nil {
return player, nil
}
}
}
}
return nil, nil
}
func (r *ennoblementResolver) Village(ctx context.Context, obj *models.Ennoblement) (*models.Village, error) {
if obj.Village != nil {
return obj.Village, nil
}
rctx := graphql.GetFieldContext(ctx)
server, ok := rctx.Parent.Parent.Args["server"].(string)
if ok {
dataloaders := middleware.DataLoadersFromContext(ctx)
if dataloaders != nil {
if dataloader, ok := dataloaders[server]; ok {
log.Print("?")
village, _ := dataloader.VillageByID.Load(obj.VillageID)
if village != nil {
return village, nil
}
}
}
}
return nil, nil
}
func (r *queryResolver) Ennoblements(ctx context.Context, server string) ([]*models.Ennoblement, error) {
return r.EnnoblementUcase.Fetch(ctx, server)
}

10
graphql/resolvers/resolver.go
View File

@ -1,6 +1,7 @@
package resolvers
import (
"github.com/tribalwarshelp/api/ennoblement"
"github.com/tribalwarshelp/api/graphql/generated"
"github.com/tribalwarshelp/api/langversion"
"github.com/tribalwarshelp/api/player"
@ -15,13 +16,16 @@ type Resolver struct {
PlayerUcase player.Usecase
TribeUcase tribe.Usecase
VillageUcase village.Usecase
EnnoblementUcase ennoblement.Usecase
}
// 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) 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} }
type queryResolver struct{ *Resolver }
type playerResolver struct{ *Resolver }
type villageResolver struct{ *Resolver }
type ennoblementResolver struct{ *Resolver }

10
graphql/schema/ennoblement.graphql Normal file
View File

@ -0,0 +1,10 @@
type Ennoblement {
village: Village @goField(forceResolver: true)
newOwner: Player @goField(forceResolver: true)
oldOwner: Player @goField(forceResolver: true)
ennobledAt: Time!
}
extend type Query {
ennoblements(server: String!): [Ennoblement!]
}

1
graphql/schema/scalars.graphql Normal file
View File

@ -0,0 +1 @@
scalar Time

24
main.go
View File

@ -15,6 +15,8 @@ import (
"github.com/tribalwarshelp/api/graphql/dataloaders"
ennoblementrepo "github.com/tribalwarshelp/api/ennoblement/repository"
ennoblementucase "github.com/tribalwarshelp/api/ennoblement/usecase"
langversionrepo "github.com/tribalwarshelp/api/langversion/repository"
langversionucase "github.com/tribalwarshelp/api/langversion/usecase"
"github.com/tribalwarshelp/api/middleware"
@ -65,19 +67,25 @@ func main() {
tribeRepo := triberepo.NewPGRepository(db)
playerRepo := playerrepo.NewPGRepository(db)
villageRepo := villagerepo.NewPGRepository(db)
ennoblementRepo := ennoblementrepo.NewPGRepository(db)
router := gin.Default()
v1 := router.Group("")
v1.Use(middleware.DataLoadersToContext(serverRepo, dataloaders.Config{
PlayerRepo: playerRepo,
TribeRepo: tribeRepo,
PlayerRepo: playerRepo,
TribeRepo: tribeRepo,
VillageRepo: villageRepo,
}))
httpdelivery.Attach(v1, &resolvers.Resolver{
LangVersionUcase: langversionucase.New(langversionRepo),
ServerUcase: serverucase.New(serverRepo),
TribeUcase: tribeucase.New(tribeRepo),
PlayerUcase: playerucase.New(playerRepo),
VillageUcase: villageucase.New(villageRepo),
httpdelivery.Attach(httpdelivery.Config{
RouterGroup: v1,
Resolver: &resolvers.Resolver{
LangVersionUcase: langversionucase.New(langversionRepo),
ServerUcase: serverucase.New(serverRepo),
TribeUcase: tribeucase.New(tribeRepo),
PlayerUcase: playerucase.New(playerRepo),
VillageUcase: villageucase.New(villageRepo),
EnnoblementUcase: ennoblementucase.New(ennoblementRepo),
},
})
srv := &http.Server{