Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 36568adf46 | |||
| 847f5d6b85 | |||
| 86d78c0f0c |
|
|
@ -505,6 +505,9 @@ issues:
|
|||
linters:
|
||||
- gosec
|
||||
- gocyclo
|
||||
- path: server_map.go
|
||||
linters:
|
||||
- mnd
|
||||
- path: _test\.go
|
||||
text: add-constant
|
||||
- path: bun/migrations
|
||||
|
|
|
|||
|
|
@ -1,33 +1,27 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"go/ast"
|
||||
"go/constant"
|
||||
"go/importer"
|
||||
"go/parser"
|
||||
"go/token"
|
||||
"go/types"
|
||||
"io/fs"
|
||||
"log"
|
||||
"os"
|
||||
"slices"
|
||||
"strings"
|
||||
|
||||
"golang.org/x/tools/go/packages"
|
||||
"gopkg.in/yaml.v3"
|
||||
)
|
||||
|
||||
func main() {
|
||||
if _, err := os.Stat("./go.mod"); errors.Is(err, os.ErrNotExist) {
|
||||
log.Fatalln("go.mod not found")
|
||||
}
|
||||
|
||||
if err := generateYAML("./internal/domain"); err != nil {
|
||||
if err := generateYAML("gitea.dwysokinski.me/twhelp/core/internal/domain"); err != nil {
|
||||
log.Fatalln(err)
|
||||
}
|
||||
}
|
||||
|
||||
func generateYAML(root string) error {
|
||||
m, err := getErrorCodesFromFolder(root)
|
||||
func generateYAML(pkgPattern string) error {
|
||||
m, err := getErrorCodesFromPackage(pkgPattern)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -48,6 +42,8 @@ func generateYAML(root string) error {
|
|||
enum = append(enum, c)
|
||||
}
|
||||
|
||||
slices.Sort(enum)
|
||||
|
||||
return yaml.NewEncoder(os.Stdout).Encode(struct {
|
||||
Type string `yaml:"type"`
|
||||
Description string `yaml:"description"`
|
||||
|
|
@ -60,27 +56,25 @@ func generateYAML(root string) error {
|
|||
}
|
||||
|
||||
//nolint:gocyclo
|
||||
func getErrorCodesFromFolder(root string) (map[string]string, error) {
|
||||
fset := token.NewFileSet()
|
||||
|
||||
astDomainPkg, err := parseDomainPackage(fset, root)
|
||||
func getErrorCodesFromPackage(pkgPattern string) (map[string]string, error) {
|
||||
pkg, err := packages.Load(&packages.Config{
|
||||
Tests: false,
|
||||
Mode: packages.NeedName |
|
||||
packages.NeedFiles |
|
||||
packages.NeedCompiledGoFiles |
|
||||
packages.NeedTypes |
|
||||
packages.NeedTypesInfo |
|
||||
packages.NeedSyntax,
|
||||
}, pkgPattern)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
conf := types.Config{Importer: importer.Default()}
|
||||
|
||||
files := make([]*ast.File, 0, len(astDomainPkg.Files))
|
||||
for _, f := range astDomainPkg.Files {
|
||||
files = append(files, f)
|
||||
if len(pkg) == 0 {
|
||||
return nil, fmt.Errorf("'%s': pkg not found", pkgPattern)
|
||||
}
|
||||
|
||||
domainPkg, err := conf.Check(astDomainPkg.Name, fset, files, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
scope := domainPkg.Scope()
|
||||
|
||||
domainPkg := pkg[0]
|
||||
scope := domainPkg.Types.Scope()
|
||||
m := make(map[string]string)
|
||||
|
||||
for _, n := range scope.Names() {
|
||||
|
|
@ -95,14 +89,21 @@ func getErrorCodesFromFolder(root string) (map[string]string, error) {
|
|||
continue
|
||||
}
|
||||
|
||||
f := astDomainPkg.Files[fset.File(c.Pos()).Name()]
|
||||
position := fset.Position(c.Pos())
|
||||
commentMap := ast.NewCommentMap(fset, f, f.Comments)
|
||||
filename := domainPkg.Fset.File(c.Pos()).Name()
|
||||
fileIdx := slices.IndexFunc(domainPkg.GoFiles, func(f string) bool {
|
||||
return f == filename
|
||||
})
|
||||
if fileIdx < 0 {
|
||||
return nil, fmt.Errorf("'%s': file not found", filename)
|
||||
}
|
||||
f := domainPkg.Syntax[fileIdx]
|
||||
position := domainPkg.Fset.Position(c.Pos())
|
||||
commentMap := ast.NewCommentMap(domainPkg.Fset, f, f.Comments)
|
||||
|
||||
var desc string
|
||||
|
||||
for _, decl := range f.Decls {
|
||||
declPosition := fset.Position(decl.Pos())
|
||||
declPosition := domainPkg.Fset.Position(decl.Pos())
|
||||
if declPosition.Filename != position.Filename || declPosition.Line != position.Line {
|
||||
continue
|
||||
}
|
||||
|
|
@ -123,27 +124,3 @@ func getErrorCodesFromFolder(root string) (map[string]string, error) {
|
|||
|
||||
return m, nil
|
||||
}
|
||||
|
||||
func parseDomainPackage(fset *token.FileSet, root string) (*ast.Package, error) {
|
||||
pkgs, err := parser.ParseDir(fset, root, func(info fs.FileInfo) bool {
|
||||
if info.IsDir() && info.Name() != root {
|
||||
return false
|
||||
}
|
||||
|
||||
if info.IsDir() || strings.HasSuffix(info.Name(), "_test.go") {
|
||||
return false
|
||||
}
|
||||
|
||||
return true
|
||||
}, parser.AllErrors|parser.ParseComments)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
astDomainPkg, ok := pkgs["domain"]
|
||||
if !ok {
|
||||
return nil, errors.New("domain pkg not found")
|
||||
}
|
||||
|
||||
return astDomainPkg, nil
|
||||
}
|
||||
|
|
|
|||
7
go.mod
7
go.mod
|
|
@ -10,7 +10,7 @@ require (
|
|||
github.com/cenkalti/backoff/v4 v4.3.0
|
||||
github.com/elliotchance/phpserialize v1.4.0
|
||||
github.com/ettle/strcase v0.2.0
|
||||
github.com/getkin/kin-openapi v0.124.0
|
||||
github.com/getkin/kin-openapi v0.125.0
|
||||
github.com/go-chi/chi/v5 v5.0.12
|
||||
github.com/go-chi/render v1.0.3
|
||||
github.com/google/go-cmp v0.6.0
|
||||
|
|
@ -28,7 +28,9 @@ require (
|
|||
github.com/uptrace/bun/extra/bundebug v1.2.1
|
||||
github.com/urfave/cli/v2 v2.27.2
|
||||
go.uber.org/automaxprocs v1.5.3
|
||||
golang.org/x/image v0.17.0
|
||||
golang.org/x/sync v0.7.0
|
||||
golang.org/x/tools v0.19.0
|
||||
gopkg.in/yaml.v3 v3.0.1
|
||||
)
|
||||
|
||||
|
|
@ -43,7 +45,7 @@ require (
|
|||
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/docker/cli v20.10.17+incompatible // indirect
|
||||
github.com/docker/docker v20.10.7+incompatible // indirect
|
||||
github.com/docker/docker v20.10.11+incompatible // indirect
|
||||
github.com/docker/go-connections v0.4.0 // indirect
|
||||
github.com/docker/go-units v0.4.0 // indirect
|
||||
github.com/dustin/go-humanize v1.0.1 // indirect
|
||||
|
|
@ -90,7 +92,6 @@ require (
|
|||
golang.org/x/crypto v0.21.0 // indirect
|
||||
golang.org/x/mod v0.16.0 // indirect
|
||||
golang.org/x/sys v0.18.0 // indirect
|
||||
golang.org/x/tools v0.19.0 // indirect
|
||||
gopkg.in/yaml.v2 v2.3.0 // indirect
|
||||
mellium.im/sasl v0.3.1 // indirect
|
||||
modernc.org/gc/v3 v3.0.0-20240304020402-f0dba7c97c2b // indirect
|
||||
|
|
|
|||
10
go.sum
10
go.sum
|
|
@ -40,8 +40,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
|
|||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/docker/cli v20.10.17+incompatible h1:eO2KS7ZFeov5UJeaDmIs1NFEDRf32PaqRpvoEkKBy5M=
|
||||
github.com/docker/cli v20.10.17+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
|
||||
github.com/docker/docker v20.10.7+incompatible h1:Z6O9Nhsjv+ayUEeI1IojKbYcsGdgYSNqxe1s2MYzUhQ=
|
||||
github.com/docker/docker v20.10.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
|
||||
github.com/docker/docker v20.10.11+incompatible h1:OqzI/g/W54LczvhnccGqniFoQghHx3pklbLuhfXpqGo=
|
||||
github.com/docker/docker v20.10.11+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
|
||||
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
|
||||
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
|
||||
github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
|
||||
|
|
@ -55,8 +55,8 @@ github.com/ettle/strcase v0.2.0/go.mod h1:DajmHElDSaX76ITe3/VHVyMin4LWSJN5Z909Wp
|
|||
github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
|
||||
github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
|
||||
github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
|
||||
github.com/getkin/kin-openapi v0.124.0 h1:VSFNMB9C9rTKBnQ/fpyDU8ytMTr4dWI9QovSKj9kz/M=
|
||||
github.com/getkin/kin-openapi v0.124.0/go.mod h1:wb1aSZA/iWmorQP9KTAS/phLj/t17B5jT7+fS8ed9NM=
|
||||
github.com/getkin/kin-openapi v0.125.0 h1:jyQCyf2qXS1qvs2U00xQzkGCqYPhEhZDmSmVt65fXno=
|
||||
github.com/getkin/kin-openapi v0.125.0/go.mod h1:wb1aSZA/iWmorQP9KTAS/phLj/t17B5jT7+fS8ed9NM=
|
||||
github.com/go-chi/chi/v5 v5.0.12 h1:9euLV5sTrTNTRUU9POmDUvfxyj6LAABLUcEWO+JJb4s=
|
||||
github.com/go-chi/chi/v5 v5.0.12/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
|
||||
github.com/go-chi/render v1.0.3 h1:AsXqd2a1/INaIfUSKq3G5uA8weYx20FOsM7uSoCyyt4=
|
||||
|
|
@ -233,6 +233,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
|
|||
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||
golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
|
||||
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
|
||||
golang.org/x/image v0.17.0 h1:nTRVVdajgB8zCMZVsViyzhnMKPwYeroEERRC64JuLco=
|
||||
golang.org/x/image v0.17.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
|
||||
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||
golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ func NewBaseEnnoblement(
|
|||
points int,
|
||||
createdAt time.Time,
|
||||
) (BaseEnnoblement, error) {
|
||||
if err := validateIntInRange(villageID, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(villageID, 1, math.MaxInt); err != nil {
|
||||
return BaseEnnoblement{}, ValidationError{
|
||||
Model: baseEnnoblementModelName,
|
||||
Field: "villageID",
|
||||
|
|
@ -34,7 +34,7 @@ func NewBaseEnnoblement(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(newOwnerID, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(newOwnerID, 0, math.MaxInt); err != nil {
|
||||
return BaseEnnoblement{}, ValidationError{
|
||||
Model: baseEnnoblementModelName,
|
||||
Field: "newOwnerID",
|
||||
|
|
@ -42,7 +42,7 @@ func NewBaseEnnoblement(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(newTribeID, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(newTribeID, 0, math.MaxInt); err != nil {
|
||||
return BaseEnnoblement{}, ValidationError{
|
||||
Model: baseEnnoblementModelName,
|
||||
Field: "newTribeID",
|
||||
|
|
@ -50,7 +50,7 @@ func NewBaseEnnoblement(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(oldOwnerID, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(oldOwnerID, 0, math.MaxInt); err != nil {
|
||||
return BaseEnnoblement{}, ValidationError{
|
||||
Model: baseEnnoblementModelName,
|
||||
Field: "oldOwnerID",
|
||||
|
|
@ -58,7 +58,7 @@ func NewBaseEnnoblement(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(oldTribeID, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(oldTribeID, 0, math.MaxInt); err != nil {
|
||||
return BaseEnnoblement{}, ValidationError{
|
||||
Model: baseEnnoblementModelName,
|
||||
Field: "oldTribeID",
|
||||
|
|
@ -66,7 +66,7 @@ func NewBaseEnnoblement(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(points, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(points, 0, math.MaxInt); err != nil {
|
||||
return BaseEnnoblement{}, ValidationError{
|
||||
Model: baseEnnoblementModelName,
|
||||
Field: "points",
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ func TestNewBaseEnnoblement(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "BaseEnnoblement",
|
||||
Field: "villageID",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -76,7 +76,7 @@ func TestNewBaseEnnoblement(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "BaseEnnoblement",
|
||||
Field: "newOwnerID",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -96,7 +96,7 @@ func TestNewBaseEnnoblement(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "BaseEnnoblement",
|
||||
Field: "newTribeID",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -116,7 +116,7 @@ func TestNewBaseEnnoblement(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "BaseEnnoblement",
|
||||
Field: "oldOwnerID",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -136,7 +136,7 @@ func TestNewBaseEnnoblement(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "BaseEnnoblement",
|
||||
Field: "oldTribeID",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -156,7 +156,7 @@ func TestNewBaseEnnoblement(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "BaseEnnoblement",
|
||||
Field: "points",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ func NewBasePlayer(
|
|||
od OpponentsDefeated,
|
||||
profileURL *url.URL,
|
||||
) (BasePlayer, error) {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return BasePlayer{}, ValidationError{
|
||||
Model: basePlayerModelName,
|
||||
Field: "id",
|
||||
|
|
@ -44,7 +44,7 @@ func NewBasePlayer(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(numVillages, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(numVillages, 0, math.MaxInt); err != nil {
|
||||
return BasePlayer{}, ValidationError{
|
||||
Model: basePlayerModelName,
|
||||
Field: "numVillages",
|
||||
|
|
@ -52,7 +52,7 @@ func NewBasePlayer(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(points, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(points, 0, math.MaxInt); err != nil {
|
||||
return BasePlayer{}, ValidationError{
|
||||
Model: basePlayerModelName,
|
||||
Field: "points",
|
||||
|
|
@ -60,7 +60,7 @@ func NewBasePlayer(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(rank, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(rank, 0, math.MaxInt); err != nil {
|
||||
return BasePlayer{}, ValidationError{
|
||||
Model: basePlayerModelName,
|
||||
Field: "rank",
|
||||
|
|
@ -68,7 +68,7 @@ func NewBasePlayer(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(tribeID, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(tribeID, 0, math.MaxInt); err != nil {
|
||||
return BasePlayer{}, ValidationError{
|
||||
Model: basePlayerModelName,
|
||||
Field: "tribeID",
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ func TestNewBasePlayer(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "BasePlayer",
|
||||
Field: "id",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -125,7 +125,7 @@ func TestNewBasePlayer(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "BasePlayer",
|
||||
Field: "numVillages",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -146,7 +146,7 @@ func TestNewBasePlayer(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "BasePlayer",
|
||||
Field: "points",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -167,7 +167,7 @@ func TestNewBasePlayer(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "BasePlayer",
|
||||
Field: "rank",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -188,7 +188,7 @@ func TestNewBasePlayer(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "BasePlayer",
|
||||
Field: "tribeID",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ func NewBaseTribe(
|
|||
od OpponentsDefeated,
|
||||
profileURL *url.URL,
|
||||
) (BaseTribe, error) {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return BaseTribe{}, ValidationError{
|
||||
Model: baseTribeModelName,
|
||||
Field: "id",
|
||||
|
|
@ -60,7 +60,7 @@ func NewBaseTribe(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(numMembers, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(numMembers, 0, math.MaxInt); err != nil {
|
||||
return BaseTribe{}, ValidationError{
|
||||
Model: baseTribeModelName,
|
||||
Field: "numMembers",
|
||||
|
|
@ -68,7 +68,7 @@ func NewBaseTribe(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(numVillages, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(numVillages, 0, math.MaxInt); err != nil {
|
||||
return BaseTribe{}, ValidationError{
|
||||
Model: baseTribeModelName,
|
||||
Field: "numVillages",
|
||||
|
|
@ -76,7 +76,7 @@ func NewBaseTribe(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(points, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(points, 0, math.MaxInt); err != nil {
|
||||
return BaseTribe{}, ValidationError{
|
||||
Model: baseTribeModelName,
|
||||
Field: "points",
|
||||
|
|
@ -84,7 +84,7 @@ func NewBaseTribe(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(allPoints, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(allPoints, 0, math.MaxInt); err != nil {
|
||||
return BaseTribe{}, ValidationError{
|
||||
Model: baseTribeModelName,
|
||||
Field: "allPoints",
|
||||
|
|
@ -92,7 +92,7 @@ func NewBaseTribe(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(rank, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(rank, 0, math.MaxInt); err != nil {
|
||||
return BaseTribe{}, ValidationError{
|
||||
Model: baseTribeModelName,
|
||||
Field: "rank",
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ func TestNewBaseTribe(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "BaseTribe",
|
||||
Field: "id",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -200,7 +200,7 @@ func TestNewBaseTribe(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "BaseTribe",
|
||||
Field: "numMembers",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -223,7 +223,7 @@ func TestNewBaseTribe(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "BaseTribe",
|
||||
Field: "numVillages",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -246,7 +246,7 @@ func TestNewBaseTribe(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "BaseTribe",
|
||||
Field: "points",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -269,7 +269,7 @@ func TestNewBaseTribe(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "BaseTribe",
|
||||
Field: "allPoints",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -292,7 +292,7 @@ func TestNewBaseTribe(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "BaseTribe",
|
||||
Field: "rank",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ func NewBaseVillage(
|
|||
playerID int,
|
||||
profileURL *url.URL,
|
||||
) (BaseVillage, error) {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return BaseVillage{}, ValidationError{
|
||||
Model: baseVillageModelName,
|
||||
Field: "id",
|
||||
|
|
@ -45,7 +45,7 @@ func NewBaseVillage(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(points, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(points, 0, math.MaxInt); err != nil {
|
||||
return BaseVillage{}, ValidationError{
|
||||
Model: baseVillageModelName,
|
||||
Field: "points",
|
||||
|
|
@ -53,7 +53,7 @@ func NewBaseVillage(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(x, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(x, 0, math.MaxInt); err != nil {
|
||||
return BaseVillage{}, ValidationError{
|
||||
Model: baseVillageModelName,
|
||||
Field: "x",
|
||||
|
|
@ -61,7 +61,7 @@ func NewBaseVillage(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(y, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(y, 0, math.MaxInt); err != nil {
|
||||
return BaseVillage{}, ValidationError{
|
||||
Model: baseVillageModelName,
|
||||
Field: "y",
|
||||
|
|
@ -77,7 +77,7 @@ func NewBaseVillage(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(bonus, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(bonus, 0, math.MaxInt); err != nil {
|
||||
return BaseVillage{}, ValidationError{
|
||||
Model: baseVillageModelName,
|
||||
Field: "bonus",
|
||||
|
|
@ -85,7 +85,7 @@ func NewBaseVillage(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(playerID, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(playerID, 0, math.MaxInt); err != nil {
|
||||
return BaseVillage{}, ValidationError{
|
||||
Model: baseVillageModelName,
|
||||
Field: "playerID",
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ func TestNewBaseVillage(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "BaseVillage",
|
||||
Field: "id",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -131,7 +131,7 @@ func TestNewBaseVillage(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "BaseVillage",
|
||||
Field: "points",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -153,7 +153,7 @@ func TestNewBaseVillage(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "BaseVillage",
|
||||
Field: "x",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -175,7 +175,7 @@ func TestNewBaseVillage(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "BaseVillage",
|
||||
Field: "y",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -243,7 +243,7 @@ func TestNewBaseVillage(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "BaseVillage",
|
||||
Field: "bonus",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -265,7 +265,7 @@ func TestNewBaseVillage(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "BaseVillage",
|
||||
Field: "playerID",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -20,7 +20,9 @@ func NewServerConfig(tb TestingTB) domain.ServerConfig {
|
|||
domain.ServerConfigBuildings{},
|
||||
domain.ServerConfigSnob{},
|
||||
domain.ServerConfigAlly{Limit: gofakeit.IntRange(1, 20)},
|
||||
domain.ServerConfigCoord{},
|
||||
domain.ServerConfigCoord{
|
||||
MapSize: gofakeit.IntRange(1000, 1000),
|
||||
},
|
||||
domain.ServerConfigSitter{},
|
||||
domain.ServerConfigSleep{},
|
||||
domain.ServerConfigNight{},
|
||||
|
|
|
|||
|
|
@ -37,6 +37,8 @@ func NewVillageCursor(tb TestingTB, opts ...func(cfg *VillageCursorConfig)) doma
|
|||
type VillageConfig struct {
|
||||
ID int
|
||||
ServerKey string
|
||||
X int
|
||||
Y int
|
||||
PlayerID int
|
||||
}
|
||||
|
||||
|
|
@ -46,6 +48,8 @@ func NewVillage(tb TestingTB, opts ...func(cfg *VillageConfig)) domain.Village {
|
|||
cfg := &VillageConfig{
|
||||
ID: RandID(),
|
||||
ServerKey: RandServerKey(),
|
||||
X: gofakeit.IntRange(1, 999),
|
||||
Y: gofakeit.IntRange(1, 999),
|
||||
PlayerID: gofakeit.IntRange(0, 10000),
|
||||
}
|
||||
|
||||
|
|
@ -58,8 +62,8 @@ func NewVillage(tb TestingTB, opts ...func(cfg *VillageConfig)) domain.Village {
|
|||
cfg.ServerKey,
|
||||
gofakeit.LetterN(50),
|
||||
gofakeit.IntRange(1, 10000),
|
||||
gofakeit.IntRange(1, 999),
|
||||
gofakeit.IntRange(1, 999),
|
||||
cfg.X,
|
||||
cfg.Y,
|
||||
gofakeit.LetterN(3),
|
||||
0,
|
||||
cfg.PlayerID,
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ func UnmarshalEnnoblementFromDatabase(
|
|||
points int,
|
||||
createdAt time.Time,
|
||||
) (Ennoblement, error) {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return Ennoblement{}, ValidationError{
|
||||
Model: ennoblementModelName,
|
||||
Field: "id",
|
||||
|
|
@ -265,7 +265,7 @@ type EnnoblementCursor struct {
|
|||
const ennoblementCursorModelName = "EnnoblementCursor"
|
||||
|
||||
func NewEnnoblementCursor(id int, serverKey string, createdAt time.Time) (EnnoblementCursor, error) {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return EnnoblementCursor{}, ValidationError{
|
||||
Model: ennoblementCursorModelName,
|
||||
Field: "id",
|
||||
|
|
@ -405,7 +405,7 @@ func (params *ListEnnoblementsParams) VillageIDs() []int {
|
|||
|
||||
func (params *ListEnnoblementsParams) SetVillageIDs(villageIDs []int) error {
|
||||
for i, id := range villageIDs {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return SliceElementValidationError{
|
||||
Model: listEnnoblementsParamsModelName,
|
||||
Field: "villageIDs",
|
||||
|
|
@ -426,7 +426,7 @@ func (params *ListEnnoblementsParams) PlayerIDs() []int {
|
|||
|
||||
func (params *ListEnnoblementsParams) SetPlayerIDs(playerIDs []int) error {
|
||||
for i, id := range playerIDs {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return SliceElementValidationError{
|
||||
Model: listEnnoblementsParamsModelName,
|
||||
Field: "playerIDs",
|
||||
|
|
@ -447,7 +447,7 @@ func (params *ListEnnoblementsParams) TribeIDs() []int {
|
|||
|
||||
func (params *ListEnnoblementsParams) SetTribeIDs(tribeIDs []int) error {
|
||||
for i, id := range tribeIDs {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return SliceElementValidationError{
|
||||
Model: listEnnoblementsParamsModelName,
|
||||
Field: "tribeIDs",
|
||||
|
|
@ -579,7 +579,7 @@ func (params *ListEnnoblementsParams) Limit() int {
|
|||
}
|
||||
|
||||
func (params *ListEnnoblementsParams) SetLimit(limit int) error {
|
||||
if err := validateIntInRange(limit, 1, EnnoblementListMaxLimit); err != nil {
|
||||
if err := validateInRange(limit, 1, EnnoblementListMaxLimit); err != nil {
|
||||
return ValidationError{
|
||||
Model: listEnnoblementsParamsModelName,
|
||||
Field: "limit",
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ func TestNewEnnoblementCursor(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "EnnoblementCursor",
|
||||
Field: "id",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -276,7 +276,7 @@ func TestListEnnoblementsParams_SetVillageIDs(t *testing.T) {
|
|||
Model: "ListEnnoblementsParams",
|
||||
Field: "villageIDs",
|
||||
Index: 3,
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -336,7 +336,7 @@ func TestListEnnoblementsParams_SetPlayerIDs(t *testing.T) {
|
|||
Model: "ListEnnoblementsParams",
|
||||
Field: "playerIDs",
|
||||
Index: 3,
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -396,7 +396,7 @@ func TestListEnnoblementsParams_SetTribeIDs(t *testing.T) {
|
|||
Model: "ListEnnoblementsParams",
|
||||
Field: "tribeIDs",
|
||||
Index: 3,
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -957,7 +957,7 @@ func TestListEnnoblementsParams_SetLimit(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "ListEnnoblementsParams",
|
||||
Field: "limit",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -971,7 +971,7 @@ func TestListEnnoblementsParams_SetLimit(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "ListEnnoblementsParams",
|
||||
Field: "limit",
|
||||
Err: domain.MaxLessEqualError{
|
||||
Err: domain.MaxLessEqualError[int]{
|
||||
Max: domain.EnnoblementListMaxLimit,
|
||||
Current: domain.EnnoblementListMaxLimit + 1,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ func NewTribesSyncedEventPayload(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(numTribes, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(numTribes, 0, math.MaxInt); err != nil {
|
||||
return TribesSyncedEventPayload{}, ValidationError{
|
||||
Model: tribesSyncedEventPayloadModelName,
|
||||
Field: "numTribes",
|
||||
|
|
@ -157,7 +157,7 @@ func NewTribesSyncedEventPayload(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(numActiveTribes, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(numActiveTribes, 0, math.MaxInt); err != nil {
|
||||
return TribesSyncedEventPayload{}, ValidationError{
|
||||
Model: tribesSyncedEventPayloadModelName,
|
||||
Field: "numActiveTribes",
|
||||
|
|
@ -239,7 +239,7 @@ func NewPlayersSyncedEventPayload(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(numPlayers, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(numPlayers, 0, math.MaxInt); err != nil {
|
||||
return PlayersSyncedEventPayload{}, ValidationError{
|
||||
Model: playersSyncedEventPayloadModelName,
|
||||
Field: "numPlayers",
|
||||
|
|
@ -247,7 +247,7 @@ func NewPlayersSyncedEventPayload(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(numActivePlayers, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(numActivePlayers, 0, math.MaxInt); err != nil {
|
||||
return PlayersSyncedEventPayload{}, ValidationError{
|
||||
Model: playersSyncedEventPayloadModelName,
|
||||
Field: "numActivePlayers",
|
||||
|
|
@ -333,7 +333,7 @@ func NewVillagesSyncedEventPayload(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(numVillages, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(numVillages, 0, math.MaxInt); err != nil {
|
||||
return VillagesSyncedEventPayload{}, ValidationError{
|
||||
Model: villagesSyncedEventPayloadModelName,
|
||||
Field: "numVillages",
|
||||
|
|
@ -341,7 +341,7 @@ func NewVillagesSyncedEventPayload(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(numPlayerVillages, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(numPlayerVillages, 0, math.MaxInt); err != nil {
|
||||
return VillagesSyncedEventPayload{}, ValidationError{
|
||||
Model: villagesSyncedEventPayloadModelName,
|
||||
Field: "numPlayerVillages",
|
||||
|
|
@ -349,7 +349,7 @@ func NewVillagesSyncedEventPayload(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(numBarbarianVillages, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(numBarbarianVillages, 0, math.MaxInt); err != nil {
|
||||
return VillagesSyncedEventPayload{}, ValidationError{
|
||||
Model: villagesSyncedEventPayloadModelName,
|
||||
Field: "numBarbarianVillages",
|
||||
|
|
@ -357,7 +357,7 @@ func NewVillagesSyncedEventPayload(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(numBonusVillages, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(numBonusVillages, 0, math.MaxInt); err != nil {
|
||||
return VillagesSyncedEventPayload{}, ValidationError{
|
||||
Model: villagesSyncedEventPayloadModelName,
|
||||
Field: "numBonusVillages",
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ func NewOpponentsDefeated(
|
|||
rankTotal int,
|
||||
scoreTotal int,
|
||||
) (OpponentsDefeated, error) {
|
||||
if err := validateIntInRange(rankAtt, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(rankAtt, 0, math.MaxInt); err != nil {
|
||||
return OpponentsDefeated{}, ValidationError{
|
||||
Model: opponentsDefeatedModelName,
|
||||
Field: "rankAtt",
|
||||
|
|
@ -33,7 +33,7 @@ func NewOpponentsDefeated(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(scoreAtt, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(scoreAtt, 0, math.MaxInt); err != nil {
|
||||
return OpponentsDefeated{}, ValidationError{
|
||||
Model: opponentsDefeatedModelName,
|
||||
Field: "scoreAtt",
|
||||
|
|
@ -41,7 +41,7 @@ func NewOpponentsDefeated(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(rankDef, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(rankDef, 0, math.MaxInt); err != nil {
|
||||
return OpponentsDefeated{}, ValidationError{
|
||||
Model: opponentsDefeatedModelName,
|
||||
Field: "rankDef",
|
||||
|
|
@ -49,7 +49,7 @@ func NewOpponentsDefeated(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(scoreDef, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(scoreDef, 0, math.MaxInt); err != nil {
|
||||
return OpponentsDefeated{}, ValidationError{
|
||||
Model: opponentsDefeatedModelName,
|
||||
Field: "scoreDef",
|
||||
|
|
@ -57,7 +57,7 @@ func NewOpponentsDefeated(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(rankSup, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(rankSup, 0, math.MaxInt); err != nil {
|
||||
return OpponentsDefeated{}, ValidationError{
|
||||
Model: opponentsDefeatedModelName,
|
||||
Field: "rankSup",
|
||||
|
|
@ -65,7 +65,7 @@ func NewOpponentsDefeated(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(scoreSup, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(scoreSup, 0, math.MaxInt); err != nil {
|
||||
return OpponentsDefeated{}, ValidationError{
|
||||
Model: opponentsDefeatedModelName,
|
||||
Field: "scoreSup",
|
||||
|
|
@ -73,7 +73,7 @@ func NewOpponentsDefeated(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(rankTotal, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(rankTotal, 0, math.MaxInt); err != nil {
|
||||
return OpponentsDefeated{}, ValidationError{
|
||||
Model: opponentsDefeatedModelName,
|
||||
Field: "rankTotal",
|
||||
|
|
@ -81,7 +81,7 @@ func NewOpponentsDefeated(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(scoreTotal, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(scoreTotal, 0, math.MaxInt); err != nil {
|
||||
return OpponentsDefeated{}, ValidationError{
|
||||
Model: opponentsDefeatedModelName,
|
||||
Field: "scoreTotal",
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ func TestNewOpponentsDefeated(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "OpponentsDefeated",
|
||||
Field: "rankAtt",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -79,7 +79,7 @@ func TestNewOpponentsDefeated(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "OpponentsDefeated",
|
||||
Field: "scoreAtt",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -100,7 +100,7 @@ func TestNewOpponentsDefeated(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "OpponentsDefeated",
|
||||
Field: "rankDef",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -121,7 +121,7 @@ func TestNewOpponentsDefeated(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "OpponentsDefeated",
|
||||
Field: "scoreDef",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -142,7 +142,7 @@ func TestNewOpponentsDefeated(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "OpponentsDefeated",
|
||||
Field: "rankSup",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -163,7 +163,7 @@ func TestNewOpponentsDefeated(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "OpponentsDefeated",
|
||||
Field: "scoreSup",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -184,7 +184,7 @@ func TestNewOpponentsDefeated(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "OpponentsDefeated",
|
||||
Field: "rankTotal",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -205,7 +205,7 @@ func TestNewOpponentsDefeated(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "OpponentsDefeated",
|
||||
Field: "scoreTotal",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ func UnmarshalPlayerFromDatabase(
|
|||
createdAt time.Time,
|
||||
deletedAt time.Time,
|
||||
) (Player, error) {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return Player{}, ValidationError{
|
||||
Model: playerModelName,
|
||||
Field: "id",
|
||||
|
|
@ -327,7 +327,7 @@ const playerMetaModelName = "PlayerMeta"
|
|||
// It should be used only for unmarshalling from the database!
|
||||
// You can't use UnmarshalPlayerMetaFromDatabase as constructor - It may put domain into the invalid state!
|
||||
func UnmarshalPlayerMetaFromDatabase(id int, name string, rawProfileURL string) (PlayerMeta, error) {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return PlayerMeta{}, ValidationError{
|
||||
Model: playerMetaModelName,
|
||||
Field: "id",
|
||||
|
|
@ -633,7 +633,7 @@ func NewPlayerCursor(
|
|||
mostPoints int,
|
||||
deletedAt time.Time,
|
||||
) (PlayerCursor, error) {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return PlayerCursor{}, ValidationError{
|
||||
Model: playerCursorModelName,
|
||||
Field: "id",
|
||||
|
|
@ -649,7 +649,7 @@ func NewPlayerCursor(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(odScoreAtt, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(odScoreAtt, 0, math.MaxInt); err != nil {
|
||||
return PlayerCursor{}, ValidationError{
|
||||
Model: playerCursorModelName,
|
||||
Field: "odScoreAtt",
|
||||
|
|
@ -657,7 +657,7 @@ func NewPlayerCursor(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(odScoreDef, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(odScoreDef, 0, math.MaxInt); err != nil {
|
||||
return PlayerCursor{}, ValidationError{
|
||||
Model: playerCursorModelName,
|
||||
Field: "odScoreDef",
|
||||
|
|
@ -665,7 +665,7 @@ func NewPlayerCursor(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(odScoreSup, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(odScoreSup, 0, math.MaxInt); err != nil {
|
||||
return PlayerCursor{}, ValidationError{
|
||||
Model: playerCursorModelName,
|
||||
Field: "odScoreSup",
|
||||
|
|
@ -673,7 +673,7 @@ func NewPlayerCursor(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(odScoreTotal, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(odScoreTotal, 0, math.MaxInt); err != nil {
|
||||
return PlayerCursor{}, ValidationError{
|
||||
Model: playerCursorModelName,
|
||||
Field: "odScoreTotal",
|
||||
|
|
@ -681,7 +681,7 @@ func NewPlayerCursor(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(points, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(points, 0, math.MaxInt); err != nil {
|
||||
return PlayerCursor{}, ValidationError{
|
||||
Model: playerCursorModelName,
|
||||
Field: "points",
|
||||
|
|
@ -689,7 +689,7 @@ func NewPlayerCursor(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(mostPoints, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(mostPoints, 0, math.MaxInt); err != nil {
|
||||
return PlayerCursor{}, ValidationError{
|
||||
Model: playerCursorModelName,
|
||||
Field: "mostPoints",
|
||||
|
|
@ -871,7 +871,7 @@ func (params *ListPlayersParams) IDs() []int {
|
|||
|
||||
func (params *ListPlayersParams) SetIDs(ids []int) error {
|
||||
for i, id := range ids {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return SliceElementValidationError{
|
||||
Model: listPlayersParamsModelName,
|
||||
Field: "ids",
|
||||
|
|
@ -968,7 +968,7 @@ func (params *ListPlayersParams) TribeIDs() []int {
|
|||
|
||||
func (params *ListPlayersParams) SetTribeIDs(tribeIDs []int) error {
|
||||
for i, id := range tribeIDs {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return SliceElementValidationError{
|
||||
Model: listPlayersParamsModelName,
|
||||
Field: "tribeIDs",
|
||||
|
|
@ -1091,7 +1091,7 @@ func (params *ListPlayersParams) Limit() int {
|
|||
}
|
||||
|
||||
func (params *ListPlayersParams) SetLimit(limit int) error {
|
||||
if err := validateIntInRange(limit, 1, PlayerListMaxLimit); err != nil {
|
||||
if err := validateInRange(limit, 1, PlayerListMaxLimit); err != nil {
|
||||
return ValidationError{
|
||||
Model: listPlayersParamsModelName,
|
||||
Field: "limit",
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ func UnmarshalPlayerSnapshotFromDatabase(
|
|||
date time.Time,
|
||||
createdAt time.Time,
|
||||
) (PlayerSnapshot, error) {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return PlayerSnapshot{}, ValidationError{
|
||||
Model: playerSnapshotModelName,
|
||||
Field: "id",
|
||||
|
|
@ -47,7 +47,7 @@ func UnmarshalPlayerSnapshotFromDatabase(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(playerID, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(playerID, 1, math.MaxInt); err != nil {
|
||||
return PlayerSnapshot{}, ValidationError{
|
||||
Model: playerSnapshotModelName,
|
||||
Field: "playerID",
|
||||
|
|
@ -275,7 +275,7 @@ type PlayerSnapshotCursor struct {
|
|||
const playerSnapshotCursorModelName = "PlayerSnapshotCursor"
|
||||
|
||||
func NewPlayerSnapshotCursor(id int, serverKey string, date time.Time) (PlayerSnapshotCursor, error) {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return PlayerSnapshotCursor{}, ValidationError{
|
||||
Model: playerSnapshotCursorModelName,
|
||||
Field: "id",
|
||||
|
|
@ -411,7 +411,7 @@ func (params *ListPlayerSnapshotsParams) PlayerIDs() []int {
|
|||
|
||||
func (params *ListPlayerSnapshotsParams) SetPlayerIDs(playerIDs []int) error {
|
||||
for i, id := range playerIDs {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return SliceElementValidationError{
|
||||
Model: listPlayerSnapshotsParamsModelName,
|
||||
Field: "playerIDs",
|
||||
|
|
@ -529,7 +529,7 @@ func (params *ListPlayerSnapshotsParams) Limit() int {
|
|||
}
|
||||
|
||||
func (params *ListPlayerSnapshotsParams) SetLimit(limit int) error {
|
||||
if err := validateIntInRange(limit, 1, PlayerSnapshotListMaxLimit); err != nil {
|
||||
if err := validateInRange(limit, 1, PlayerSnapshotListMaxLimit); err != nil {
|
||||
return ValidationError{
|
||||
Model: listPlayerSnapshotsParamsModelName,
|
||||
Field: "limit",
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ func TestNewPlayerSnapshotCursor(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "PlayerSnapshotCursor",
|
||||
Field: "id",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -282,7 +282,7 @@ func TestListPlayerSnapshotsParams_SetPlayerIDs(t *testing.T) {
|
|||
Model: "ListPlayerSnapshotsParams",
|
||||
Field: "playerIDs",
|
||||
Index: 3,
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -840,7 +840,7 @@ func TestListPlayerSnapshotsParams_SetLimit(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "ListPlayerSnapshotsParams",
|
||||
Field: "limit",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -854,7 +854,7 @@ func TestListPlayerSnapshotsParams_SetLimit(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "ListPlayerSnapshotsParams",
|
||||
Field: "limit",
|
||||
Err: domain.MaxLessEqualError{
|
||||
Err: domain.MaxLessEqualError[int]{
|
||||
Max: domain.PlayerSnapshotListMaxLimit,
|
||||
Current: domain.PlayerSnapshotListMaxLimit + 1,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -383,7 +383,7 @@ func TestNewPlayerCursor(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "PlayerCursor",
|
||||
Field: "id",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -405,7 +405,7 @@ func TestNewPlayerCursor(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "PlayerCursor",
|
||||
Field: "odScoreAtt",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -427,7 +427,7 @@ func TestNewPlayerCursor(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "PlayerCursor",
|
||||
Field: "odScoreDef",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -449,7 +449,7 @@ func TestNewPlayerCursor(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "PlayerCursor",
|
||||
Field: "odScoreSup",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -471,7 +471,7 @@ func TestNewPlayerCursor(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "PlayerCursor",
|
||||
Field: "odScoreTotal",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -493,7 +493,7 @@ func TestNewPlayerCursor(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "PlayerCursor",
|
||||
Field: "points",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -515,7 +515,7 @@ func TestNewPlayerCursor(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "PlayerCursor",
|
||||
Field: "mostPoints",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -613,7 +613,7 @@ func TestListPlayersParams_SetIDs(t *testing.T) {
|
|||
Model: "ListPlayersParams",
|
||||
Field: "ids",
|
||||
Index: 3,
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -884,7 +884,7 @@ func TestListPlayersParams_SetTribeIDs(t *testing.T) {
|
|||
Model: "ListPlayersParams",
|
||||
Field: "tribeIDs",
|
||||
Index: 3,
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -1529,7 +1529,7 @@ func TestListPlayersParams_SetLimit(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "ListPlayersParams",
|
||||
Field: "limit",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -1543,7 +1543,7 @@ func TestListPlayersParams_SetLimit(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "ListPlayersParams",
|
||||
Field: "limit",
|
||||
Err: domain.MaxLessEqualError{
|
||||
Err: domain.MaxLessEqualError[int]{
|
||||
Max: domain.PlayerListMaxLimit,
|
||||
Current: domain.PlayerListMaxLimit + 1,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -466,7 +466,7 @@ func (params *UpdateServerParams) NumTribes() NullInt {
|
|||
|
||||
func (params *UpdateServerParams) SetNumTribes(num NullInt) error {
|
||||
if num.Valid {
|
||||
if err := validateIntInRange(num.V, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(num.V, 0, math.MaxInt); err != nil {
|
||||
return ValidationError{
|
||||
Model: updateServerParamsModelName,
|
||||
Field: "numTribes",
|
||||
|
|
@ -486,7 +486,7 @@ func (params *UpdateServerParams) NumActiveTribes() NullInt {
|
|||
|
||||
func (params *UpdateServerParams) SetNumActiveTribes(num NullInt) error {
|
||||
if num.Valid {
|
||||
if err := validateIntInRange(num.V, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(num.V, 0, math.MaxInt); err != nil {
|
||||
return ValidationError{
|
||||
Model: updateServerParamsModelName,
|
||||
Field: "numActiveTribes",
|
||||
|
|
@ -506,7 +506,7 @@ func (params *UpdateServerParams) NumInactiveTribes() NullInt {
|
|||
|
||||
func (params *UpdateServerParams) SetNumInactiveTribes(num NullInt) error {
|
||||
if num.Valid {
|
||||
if err := validateIntInRange(num.V, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(num.V, 0, math.MaxInt); err != nil {
|
||||
return ValidationError{
|
||||
Model: updateServerParamsModelName,
|
||||
Field: "numInactiveTribes",
|
||||
|
|
@ -535,7 +535,7 @@ func (params *UpdateServerParams) NumPlayers() NullInt {
|
|||
|
||||
func (params *UpdateServerParams) SetNumPlayers(num NullInt) error {
|
||||
if num.Valid {
|
||||
if err := validateIntInRange(num.V, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(num.V, 0, math.MaxInt); err != nil {
|
||||
return ValidationError{
|
||||
Model: updateServerParamsModelName,
|
||||
Field: "numPlayers",
|
||||
|
|
@ -555,7 +555,7 @@ func (params *UpdateServerParams) NumActivePlayers() NullInt {
|
|||
|
||||
func (params *UpdateServerParams) SetNumActivePlayers(num NullInt) error {
|
||||
if num.Valid {
|
||||
if err := validateIntInRange(num.V, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(num.V, 0, math.MaxInt); err != nil {
|
||||
return ValidationError{
|
||||
Model: updateServerParamsModelName,
|
||||
Field: "numActivePlayers",
|
||||
|
|
@ -575,7 +575,7 @@ func (params *UpdateServerParams) NumInactivePlayers() NullInt {
|
|||
|
||||
func (params *UpdateServerParams) SetNumInactivePlayers(num NullInt) error {
|
||||
if num.Valid {
|
||||
if err := validateIntInRange(num.V, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(num.V, 0, math.MaxInt); err != nil {
|
||||
return ValidationError{
|
||||
Model: updateServerParamsModelName,
|
||||
Field: "numInactivePlayers",
|
||||
|
|
@ -604,7 +604,7 @@ func (params *UpdateServerParams) NumVillages() NullInt {
|
|||
|
||||
func (params *UpdateServerParams) SetNumVillages(numVillages NullInt) error {
|
||||
if numVillages.Valid {
|
||||
if err := validateIntInRange(numVillages.V, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(numVillages.V, 0, math.MaxInt); err != nil {
|
||||
return ValidationError{
|
||||
Model: updateServerParamsModelName,
|
||||
Field: "numVillages",
|
||||
|
|
@ -624,7 +624,7 @@ func (params *UpdateServerParams) NumPlayerVillages() NullInt {
|
|||
|
||||
func (params *UpdateServerParams) SetNumPlayerVillages(numPlayerVillages NullInt) error {
|
||||
if numPlayerVillages.Valid {
|
||||
if err := validateIntInRange(numPlayerVillages.V, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(numPlayerVillages.V, 0, math.MaxInt); err != nil {
|
||||
return ValidationError{
|
||||
Model: updateServerParamsModelName,
|
||||
Field: "numPlayerVillages",
|
||||
|
|
@ -644,7 +644,7 @@ func (params *UpdateServerParams) NumBarbarianVillages() NullInt {
|
|||
|
||||
func (params *UpdateServerParams) SetNumBarbarianVillages(numBarbarianVillages NullInt) error {
|
||||
if numBarbarianVillages.Valid {
|
||||
if err := validateIntInRange(numBarbarianVillages.V, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(numBarbarianVillages.V, 0, math.MaxInt); err != nil {
|
||||
return ValidationError{
|
||||
Model: updateServerParamsModelName,
|
||||
Field: "numBarbarianVillages",
|
||||
|
|
@ -664,7 +664,7 @@ func (params *UpdateServerParams) NumBonusVillages() NullInt {
|
|||
|
||||
func (params *UpdateServerParams) SetNumBonusVillages(numBonusVillages NullInt) error {
|
||||
if numBonusVillages.Valid {
|
||||
if err := validateIntInRange(numBonusVillages.V, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(numBonusVillages.V, 0, math.MaxInt); err != nil {
|
||||
return ValidationError{
|
||||
Model: updateServerParamsModelName,
|
||||
Field: "numBonusVillages",
|
||||
|
|
@ -1006,7 +1006,7 @@ func (params *ListServersParams) Limit() int {
|
|||
}
|
||||
|
||||
func (params *ListServersParams) SetLimit(limit int) error {
|
||||
if err := validateIntInRange(limit, 1, ServerListMaxLimit); err != nil {
|
||||
if err := validateInRange(limit, 1, ServerListMaxLimit); err != nil {
|
||||
return ValidationError{
|
||||
Model: listServersParamsModelName,
|
||||
Field: "limit",
|
||||
|
|
|
|||
385
internal/domain/server_map.go
Normal file
385
internal/domain/server_map.go
Normal file
|
|
@ -0,0 +1,385 @@
|
|||
package domain
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"image"
|
||||
"image/color"
|
||||
"image/png"
|
||||
"io"
|
||||
"strconv"
|
||||
|
||||
"golang.org/x/image/draw"
|
||||
"golang.org/x/image/font"
|
||||
"golang.org/x/image/font/basicfont"
|
||||
"golang.org/x/image/math/fixed"
|
||||
)
|
||||
|
||||
type ServerMapMarker struct {
|
||||
village VillageMeta
|
||||
color color.RGBA
|
||||
}
|
||||
|
||||
func NewServerMapMarker(village VillageMeta) ServerMapMarker {
|
||||
return ServerMapMarker{
|
||||
village: village,
|
||||
color: color.RGBA{R: 255, G: 99, B: 71, A: 255},
|
||||
}
|
||||
}
|
||||
|
||||
func (m *ServerMapMarker) Village() VillageMeta {
|
||||
return m.village
|
||||
}
|
||||
|
||||
func (m *ServerMapMarker) SetColor(c color.RGBA) error {
|
||||
m.color = c
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *ServerMapMarker) Color() color.RGBA {
|
||||
return m.color
|
||||
}
|
||||
|
||||
type ServerMapLegendEntry struct {
|
||||
color color.Color
|
||||
names []string
|
||||
}
|
||||
|
||||
func NewServerMapLegendEntry(c color.Color, names ...string) ServerMapLegendEntry {
|
||||
return ServerMapLegendEntry{color: c, names: names}
|
||||
}
|
||||
|
||||
func (e ServerMapLegendEntry) Color() color.Color {
|
||||
return e.color
|
||||
}
|
||||
|
||||
func (e ServerMapLegendEntry) Names() []string {
|
||||
return e.names
|
||||
}
|
||||
|
||||
type ServerMap struct {
|
||||
server Server
|
||||
size int
|
||||
markersCh <-chan ServerMapMarker
|
||||
backgroundColor color.RGBA
|
||||
scale float32
|
||||
centerX int
|
||||
centerY int
|
||||
continentGrid bool
|
||||
gridLineColor color.RGBA
|
||||
continentNumbers bool
|
||||
continentNumberColor color.RGBA
|
||||
legendEntries []ServerMapLegendEntry
|
||||
}
|
||||
|
||||
const serverMapModelName = "ServerMap"
|
||||
|
||||
func NewServerMap(server Server, markersCh <-chan ServerMapMarker) ServerMap {
|
||||
size := server.Config().Coord().MapSize
|
||||
|
||||
return ServerMap{
|
||||
server: server,
|
||||
size: size,
|
||||
markersCh: markersCh,
|
||||
backgroundColor: color.RGBA{
|
||||
A: 255,
|
||||
},
|
||||
scale: 1,
|
||||
centerX: size / 2,
|
||||
centerY: size / 2,
|
||||
continentGrid: true,
|
||||
gridLineColor: color.RGBA{R: 255, G: 255, B: 255, A: 255},
|
||||
continentNumbers: true,
|
||||
continentNumberColor: color.RGBA{R: 255, G: 255, B: 255, A: 255},
|
||||
}
|
||||
}
|
||||
|
||||
func (m *ServerMap) Scale() float32 {
|
||||
return m.scale
|
||||
}
|
||||
|
||||
const (
|
||||
serverMapMinScale = 1
|
||||
serverMapMaxScale = 5
|
||||
)
|
||||
|
||||
func (m *ServerMap) SetScale(scale float32) error {
|
||||
if err := validateInRange(scale, serverMapMinScale, serverMapMaxScale); err != nil {
|
||||
return ValidationError{
|
||||
Model: serverMapModelName,
|
||||
Field: "scale",
|
||||
Err: err,
|
||||
}
|
||||
}
|
||||
|
||||
m.scale = scale
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *ServerMap) BackgroundColor() color.RGBA {
|
||||
return m.backgroundColor
|
||||
}
|
||||
|
||||
func (m *ServerMap) SetBackgroundColor(backgroundColor color.RGBA) error {
|
||||
m.backgroundColor = backgroundColor
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *ServerMap) CenterX() int {
|
||||
return m.centerX
|
||||
}
|
||||
|
||||
func (m *ServerMap) SetCenterX(centerX int) error {
|
||||
m.centerX = centerX
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *ServerMap) CenterY() int {
|
||||
return m.centerY
|
||||
}
|
||||
|
||||
func (m *ServerMap) SetCenterY(centerY int) error {
|
||||
m.centerY = centerY
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *ServerMap) ContinentGrid() bool {
|
||||
return m.continentGrid
|
||||
}
|
||||
|
||||
func (m *ServerMap) SetContinentGrid(continentGrid bool) error {
|
||||
m.continentGrid = continentGrid
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *ServerMap) GridLineColor() color.RGBA {
|
||||
return m.gridLineColor
|
||||
}
|
||||
|
||||
func (m *ServerMap) SetGridLineColor(gridLineColor color.RGBA) error {
|
||||
m.gridLineColor = gridLineColor
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *ServerMap) ContinentNumbers() bool {
|
||||
return m.continentNumbers
|
||||
}
|
||||
|
||||
func (m *ServerMap) SetContinentNumbers(continentNumbers bool) error {
|
||||
m.continentNumbers = continentNumbers
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *ServerMap) ContinentNumberColor() color.RGBA {
|
||||
return m.continentNumberColor
|
||||
}
|
||||
|
||||
func (m *ServerMap) SetContinentNumberColor(continentNumberColor color.RGBA) error {
|
||||
m.continentNumberColor = continentNumberColor
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *ServerMap) LegendEntries() []ServerMapLegendEntry {
|
||||
return m.legendEntries
|
||||
}
|
||||
|
||||
func (m *ServerMap) SetLegendEntries(legendEntries []ServerMapLegendEntry) error {
|
||||
m.legendEntries = legendEntries
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *ServerMap) Generate(w io.Writer) error {
|
||||
r := image.Rectangle{Max: image.Point{X: m.size, Y: m.size}}
|
||||
imgHalfWidth := r.Dx() / 2
|
||||
imgHalfHeight := r.Dy() / 2
|
||||
|
||||
img := image.NewRGBA(r)
|
||||
|
||||
draw.Draw(img, img.Bounds(), image.NewUniform(m.backgroundColor), image.Point{}, draw.Src)
|
||||
m.drawContinentGrid(img)
|
||||
m.drawMarkers(img)
|
||||
m.drawContinentNumbers(img)
|
||||
legend, err := m.generateLegend()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
scaledImg := m.scaleImg(img)
|
||||
|
||||
final := image.NewRGBA(image.Rect(0, 0, r.Dx()+legend.Rect.Dx(), r.Dy()))
|
||||
draw.Draw(final, scaledImg.Rect, scaledImg, image.Point{
|
||||
X: int(float32(m.centerX)*m.scale) - imgHalfWidth,
|
||||
Y: int(float32(m.centerY)*m.scale) - imgHalfHeight,
|
||||
}, draw.Src)
|
||||
draw.Draw(final, image.Rect(r.Dx(), 0, final.Rect.Dx(), final.Rect.Dy()), legend, image.Point{}, draw.Src)
|
||||
|
||||
if err = png.Encode(w, final); err != nil {
|
||||
return fmt.Errorf("couldn't encode image: %w", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
const serverMapContinentDx = 100
|
||||
|
||||
func (m *ServerMap) drawContinentGrid(img *image.RGBA) {
|
||||
if !m.continentGrid {
|
||||
return
|
||||
}
|
||||
|
||||
for y := serverMapContinentDx; y < m.size; y += serverMapContinentDx {
|
||||
for x := range m.size {
|
||||
img.Set(x, y, m.gridLineColor)
|
||||
img.Set(y, x, m.gridLineColor)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const serverMapMarkerRectSideLength = 1
|
||||
|
||||
func (m *ServerMap) drawMarkers(img *image.RGBA) {
|
||||
for marker := range m.markersCh {
|
||||
village := marker.Village()
|
||||
x := village.X()
|
||||
y := village.Y()
|
||||
rect := image.Rect(x, y, x+serverMapMarkerRectSideLength, y+serverMapMarkerRectSideLength)
|
||||
draw.Draw(img, rect, &image.Uniform{C: marker.color}, image.Point{}, draw.Over)
|
||||
}
|
||||
}
|
||||
|
||||
func (m *ServerMap) drawContinentNumbers(img *image.RGBA) {
|
||||
if !m.continentNumbers {
|
||||
return
|
||||
}
|
||||
|
||||
continent := 0
|
||||
|
||||
d := &font.Drawer{
|
||||
Dst: img,
|
||||
Src: image.NewUniform(m.continentNumberColor),
|
||||
Face: basicfont.Face7x13,
|
||||
}
|
||||
|
||||
for y := serverMapContinentDx; y <= m.size; y += serverMapContinentDx {
|
||||
for x := serverMapContinentDx; x <= m.size; x += serverMapContinentDx {
|
||||
continentStr := strconv.Itoa(continent)
|
||||
|
||||
d.Dot = fixed.Point26_6{
|
||||
X: fixed.I(x) - d.MeasureString(continentStr),
|
||||
Y: fixed.I(y - 1),
|
||||
}
|
||||
|
||||
d.DrawString(continentStr)
|
||||
|
||||
continent++
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (m *ServerMap) scaleImg(img *image.RGBA) *image.RGBA {
|
||||
if m.scale == 1 {
|
||||
return img
|
||||
}
|
||||
|
||||
scaledSize := int(float32(m.size) * m.scale)
|
||||
scaledImg := image.NewRGBA(image.Rect(0, 0, scaledSize, scaledSize))
|
||||
draw.NearestNeighbor.Scale(scaledImg, scaledImg.Rect, img, img.Rect, draw.Over, nil)
|
||||
|
||||
return scaledImg
|
||||
}
|
||||
|
||||
const (
|
||||
serverMapLegendWidth = 400
|
||||
serverMapLegendPadding = 10
|
||||
serverMapColorWidth = 40
|
||||
serverMapSpaceColorText = 10
|
||||
serverMapLegendStringSeparator = " + "
|
||||
serverMapLegendStringOverflow = "..."
|
||||
serverMapLegendMaxStringLength = 45
|
||||
)
|
||||
|
||||
var ErrTooManyLegendEntries error = simpleError{
|
||||
msg: "too many legend entries",
|
||||
typ: ErrorTypeIncorrectInput,
|
||||
code: "too-many-legend-entries",
|
||||
}
|
||||
|
||||
func (m *ServerMap) generateLegend() (*image.RGBA, error) {
|
||||
if len(m.legendEntries) == 0 {
|
||||
return image.NewRGBA(image.Rectangle{}), nil
|
||||
}
|
||||
|
||||
img := image.NewRGBA(image.Rectangle{Max: image.Point{X: serverMapLegendWidth, Y: m.size}})
|
||||
d := &font.Drawer{
|
||||
Dst: img,
|
||||
Src: image.NewUniform(m.continentNumberColor),
|
||||
Face: basicfont.Face7x13,
|
||||
}
|
||||
lineHeight := basicfont.Face7x13.Metrics().Ascent.Ceil() + basicfont.Face7x13.Metrics().Descent.Ceil()
|
||||
lineMaxWidth := img.Rect.Dx() - serverMapLegendPadding*2 - serverMapColorWidth - serverMapSpaceColorText
|
||||
offset := serverMapLegendPadding
|
||||
|
||||
for _, e := range m.legendEntries {
|
||||
namesLen := len(e.Names())
|
||||
|
||||
currentWidth := 0
|
||||
line := ""
|
||||
var lines []string
|
||||
|
||||
for i, name := range e.Names() {
|
||||
if len(name) > serverMapLegendMaxStringLength {
|
||||
name = name[:serverMapLegendMaxStringLength-len(serverMapLegendStringOverflow)] + "..."
|
||||
}
|
||||
|
||||
if i != namesLen-1 {
|
||||
name += serverMapLegendStringSeparator
|
||||
}
|
||||
|
||||
strWidth := d.MeasureString(name).Ceil()
|
||||
|
||||
if currentWidth+strWidth > lineMaxWidth {
|
||||
lines = append(lines, line)
|
||||
currentWidth = 0
|
||||
line = ""
|
||||
}
|
||||
|
||||
line += name
|
||||
currentWidth += strWidth
|
||||
}
|
||||
|
||||
if line != "" {
|
||||
lines = append(lines, line)
|
||||
}
|
||||
|
||||
yMin := offset + (len(lines) * lineHeight / 2) - lineHeight/2
|
||||
|
||||
draw.Draw(
|
||||
img,
|
||||
image.Rect(
|
||||
serverMapLegendPadding,
|
||||
yMin,
|
||||
serverMapColorWidth+serverMapLegendPadding,
|
||||
yMin+lineHeight,
|
||||
),
|
||||
image.NewUniform(e.Color()),
|
||||
image.Point{},
|
||||
draw.Src,
|
||||
)
|
||||
|
||||
for i, l := range lines {
|
||||
d.Dot = fixed.Point26_6{
|
||||
X: fixed.I(serverMapColorWidth + serverMapLegendPadding + serverMapSpaceColorText),
|
||||
Y: fixed.I(offset + (i+1)*lineHeight),
|
||||
}
|
||||
d.DrawString(l)
|
||||
}
|
||||
|
||||
offset += (len(lines) * lineHeight) + serverMapLegendPadding
|
||||
|
||||
if offset > img.Bounds().Dy()-serverMapLegendPadding {
|
||||
return nil, ErrTooManyLegendEntries
|
||||
}
|
||||
}
|
||||
|
||||
return img, nil
|
||||
}
|
||||
155
internal/domain/server_map_test.go
Normal file
155
internal/domain/server_map_test.go
Normal file
|
|
@ -0,0 +1,155 @@
|
|||
package domain_test
|
||||
|
||||
import (
|
||||
"image/color"
|
||||
"io"
|
||||
"testing"
|
||||
|
||||
"gitea.dwysokinski.me/twhelp/core/internal/domain"
|
||||
"gitea.dwysokinski.me/twhelp/core/internal/domain/domaintest"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestServerMap_SetScale(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
type args struct {
|
||||
scale float32
|
||||
}
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
args args
|
||||
expectedErr error
|
||||
}{
|
||||
{
|
||||
name: "OK",
|
||||
args: args{
|
||||
scale: 1,
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "ERR: scale < 1",
|
||||
args: args{
|
||||
scale: 0.99,
|
||||
},
|
||||
expectedErr: domain.ValidationError{
|
||||
Model: "ServerMap",
|
||||
Field: "scale",
|
||||
Err: domain.MinGreaterEqualError[float32]{
|
||||
Min: 1,
|
||||
Current: 0.99,
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "ERR: scale > 5",
|
||||
args: args{
|
||||
scale: 5.00001,
|
||||
},
|
||||
expectedErr: domain.ValidationError{
|
||||
Model: "ServerMap",
|
||||
Field: "scale",
|
||||
Err: domain.MaxLessEqualError[float32]{
|
||||
Max: 5,
|
||||
Current: 5.00001,
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
params := domain.NewServerMap(domaintest.NewServer(t), make(chan domain.ServerMapMarker))
|
||||
|
||||
require.ErrorIs(t, params.SetScale(tt.args.scale), tt.expectedErr)
|
||||
if tt.expectedErr != nil {
|
||||
return
|
||||
}
|
||||
assert.InDelta(t, tt.args.scale, params.Scale(), 0.001)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestServerMap_Generate(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
t.Run("OK: default", func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
ch := make(chan domain.ServerMapMarker)
|
||||
|
||||
go func() {
|
||||
defer close(ch)
|
||||
for i := range 500 {
|
||||
ch <- domain.NewServerMapMarker(domaintest.NewVillage(t, func(cfg *domaintest.VillageConfig) {
|
||||
cfg.X = i
|
||||
cfg.Y = i
|
||||
}).Meta())
|
||||
}
|
||||
}()
|
||||
|
||||
m := domain.NewServerMap(domaintest.NewServer(t), ch)
|
||||
require.NoError(t, m.Generate(io.Discard))
|
||||
})
|
||||
|
||||
t.Run("OK: scale=2 legend", func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
ch := make(chan domain.ServerMapMarker)
|
||||
|
||||
go func() {
|
||||
defer close(ch)
|
||||
for i := range 500 {
|
||||
ch <- domain.NewServerMapMarker(domaintest.NewVillage(t, func(cfg *domaintest.VillageConfig) {
|
||||
cfg.X = i
|
||||
cfg.Y = i
|
||||
}).Meta())
|
||||
}
|
||||
}()
|
||||
|
||||
m := domain.NewServerMap(domaintest.NewServer(t), ch)
|
||||
require.NoError(t, m.SetLegendEntries([]domain.ServerMapLegendEntry{
|
||||
domain.NewServerMapLegendEntry(
|
||||
color.RGBA{R: 255, G: 204, B: 229, A: 255},
|
||||
"test22222^",
|
||||
"test222",
|
||||
),
|
||||
domain.NewServerMapLegendEntry(
|
||||
color.RGBA{R: 255, G: 255, B: 255, A: 255},
|
||||
"test22222^",
|
||||
"test2223",
|
||||
"longstringlongstringlongstringlongstring",
|
||||
"longstringlongstringlongstringlongstringlongstringlongstringlongstringlongstring",
|
||||
"longstringlongstring2",
|
||||
),
|
||||
}))
|
||||
require.NoError(t, m.SetScale(2))
|
||||
require.NoError(t, m.Generate(io.Discard))
|
||||
})
|
||||
|
||||
t.Run("OK: scale=2 centerX=250 centerY=250", func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
ch := make(chan domain.ServerMapMarker)
|
||||
|
||||
go func() {
|
||||
defer close(ch)
|
||||
for i := range 500 {
|
||||
ch <- domain.NewServerMapMarker(domaintest.NewVillage(t, func(cfg *domaintest.VillageConfig) {
|
||||
cfg.X = i
|
||||
cfg.Y = i
|
||||
}).Meta())
|
||||
}
|
||||
}()
|
||||
|
||||
m := domain.NewServerMap(domaintest.NewServer(t), ch)
|
||||
require.NoError(t, m.SetCenterX(250))
|
||||
require.NoError(t, m.SetCenterY(250))
|
||||
require.NoError(t, m.SetScale(2))
|
||||
require.NoError(t, m.Generate(io.Discard))
|
||||
})
|
||||
}
|
||||
|
|
@ -45,7 +45,7 @@ func UnmarshalServerSnapshotFromDatabase(
|
|||
date time.Time,
|
||||
createdAt time.Time,
|
||||
) (ServerSnapshot, error) {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return ServerSnapshot{}, ValidationError{
|
||||
Model: serverSnapshotModelName,
|
||||
Field: "id",
|
||||
|
|
@ -305,7 +305,7 @@ type ServerSnapshotCursor struct {
|
|||
const serverSnapshotCursorModelName = "ServerSnapshotCursor"
|
||||
|
||||
func NewServerSnapshotCursor(id int, serverKey string, date time.Time) (ServerSnapshotCursor, error) {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return ServerSnapshotCursor{}, ValidationError{
|
||||
Model: serverSnapshotCursorModelName,
|
||||
Field: "id",
|
||||
|
|
@ -536,7 +536,7 @@ func (params *ListServerSnapshotsParams) Limit() int {
|
|||
}
|
||||
|
||||
func (params *ListServerSnapshotsParams) SetLimit(limit int) error {
|
||||
if err := validateIntInRange(limit, 1, ServerSnapshotListMaxLimit); err != nil {
|
||||
if err := validateInRange(limit, 1, ServerSnapshotListMaxLimit); err != nil {
|
||||
return ValidationError{
|
||||
Model: listServerSnapshotsParamsModelName,
|
||||
Field: "limit",
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ func TestNewServerSnapshotCursor(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "ServerSnapshotCursor",
|
||||
Field: "id",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -769,7 +769,7 @@ func TestListServerSnapshotsParams_SetLimit(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "ListServerSnapshotsParams",
|
||||
Field: "limit",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -783,7 +783,7 @@ func TestListServerSnapshotsParams_SetLimit(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "ListServerSnapshotsParams",
|
||||
Field: "limit",
|
||||
Err: domain.MaxLessEqualError{
|
||||
Err: domain.MaxLessEqualError[int]{
|
||||
Max: domain.ServerSnapshotListMaxLimit,
|
||||
Current: domain.ServerSnapshotListMaxLimit + 1,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -201,7 +201,7 @@ func TestUpdateServerParams_SetNumTribes(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "UpdateServerParams",
|
||||
Field: "numTribes",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -264,7 +264,7 @@ func TestUpdateServerParams_SetNumActiveTribes(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "UpdateServerParams",
|
||||
Field: "numActiveTribes",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -327,7 +327,7 @@ func TestUpdateServerParams_SetNumInactiveTribes(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "UpdateServerParams",
|
||||
Field: "numInactiveTribes",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -390,7 +390,7 @@ func TestUpdateServerParams_SetNumPlayers(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "UpdateServerParams",
|
||||
Field: "numPlayers",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -453,7 +453,7 @@ func TestUpdateServerParams_SetNumActivePlayers(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "UpdateServerParams",
|
||||
Field: "numActivePlayers",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -516,7 +516,7 @@ func TestUpdateServerParams_SetNumInactivePlayers(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "UpdateServerParams",
|
||||
Field: "numInactivePlayers",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -579,7 +579,7 @@ func TestUpdateServerParams_SetNumVillages(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "UpdateServerParams",
|
||||
Field: "numVillages",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -642,7 +642,7 @@ func TestUpdateServerParams_SetNumPlayerVillages(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "UpdateServerParams",
|
||||
Field: "numPlayerVillages",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -705,7 +705,7 @@ func TestUpdateServerParams_SetNumBarbarianVillages(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "UpdateServerParams",
|
||||
Field: "numBarbarianVillages",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -768,7 +768,7 @@ func TestUpdateServerParams_SetNumBonusVillages(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "UpdateServerParams",
|
||||
Field: "numBonusVillages",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -1207,7 +1207,7 @@ func TestListServersParams_SetLimit(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "ListServersParams",
|
||||
Field: "limit",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -1221,7 +1221,7 @@ func TestListServersParams_SetLimit(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "ListServersParams",
|
||||
Field: "limit",
|
||||
Err: domain.MaxLessEqualError{
|
||||
Err: domain.MaxLessEqualError[int]{
|
||||
Max: domain.ServerListMaxLimit,
|
||||
Current: domain.ServerListMaxLimit + 1,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ func UnmarshalTribeFromDatabase(
|
|||
createdAt time.Time,
|
||||
deletedAt time.Time,
|
||||
) (Tribe, error) {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return Tribe{}, ValidationError{
|
||||
Model: tribeModelName,
|
||||
Field: "id",
|
||||
|
|
@ -296,7 +296,7 @@ const tribeMetaModelName = "TribeMeta"
|
|||
// It should be used only for unmarshalling from the database!
|
||||
// You can't use UnmarshalTribeMetaFromDatabase as constructor - It may put domain into the invalid state!
|
||||
func UnmarshalTribeMetaFromDatabase(id int, name string, tag string, rawProfileURL string) (TribeMeta, error) {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return TribeMeta{}, ValidationError{
|
||||
Model: tribeMetaModelName,
|
||||
Field: "id",
|
||||
|
|
@ -555,7 +555,7 @@ func NewTribeCursor(
|
|||
dominance float64,
|
||||
deletedAt time.Time,
|
||||
) (TribeCursor, error) {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return TribeCursor{}, ValidationError{
|
||||
Model: tribeCursorModelName,
|
||||
Field: "id",
|
||||
|
|
@ -571,7 +571,7 @@ func NewTribeCursor(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(odScoreAtt, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(odScoreAtt, 0, math.MaxInt); err != nil {
|
||||
return TribeCursor{}, ValidationError{
|
||||
Model: tribeCursorModelName,
|
||||
Field: "odScoreAtt",
|
||||
|
|
@ -579,7 +579,7 @@ func NewTribeCursor(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(odScoreDef, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(odScoreDef, 0, math.MaxInt); err != nil {
|
||||
return TribeCursor{}, ValidationError{
|
||||
Model: tribeCursorModelName,
|
||||
Field: "odScoreDef",
|
||||
|
|
@ -587,7 +587,7 @@ func NewTribeCursor(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(odScoreTotal, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(odScoreTotal, 0, math.MaxInt); err != nil {
|
||||
return TribeCursor{}, ValidationError{
|
||||
Model: tribeCursorModelName,
|
||||
Field: "odScoreTotal",
|
||||
|
|
@ -595,7 +595,7 @@ func NewTribeCursor(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(points, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(points, 0, math.MaxInt); err != nil {
|
||||
return TribeCursor{}, ValidationError{
|
||||
Model: tribeCursorModelName,
|
||||
Field: "points",
|
||||
|
|
@ -603,7 +603,7 @@ func NewTribeCursor(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(mostPoints, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(mostPoints, 0, math.MaxInt); err != nil {
|
||||
return TribeCursor{}, ValidationError{
|
||||
Model: tribeCursorModelName,
|
||||
Field: "mostPoints",
|
||||
|
|
@ -783,7 +783,7 @@ func (params *ListTribesParams) IDs() []int {
|
|||
|
||||
func (params *ListTribesParams) SetIDs(ids []int) error {
|
||||
for i, id := range ids {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return SliceElementValidationError{
|
||||
Model: listTribesParamsModelName,
|
||||
Field: "ids",
|
||||
|
|
@ -934,7 +934,7 @@ func (params *ListTribesParams) Limit() int {
|
|||
}
|
||||
|
||||
func (params *ListTribesParams) SetLimit(limit int) error {
|
||||
if err := validateIntInRange(limit, 1, TribeListMaxLimit); err != nil {
|
||||
if err := validateInRange(limit, 1, TribeListMaxLimit); err != nil {
|
||||
return ValidationError{
|
||||
Model: listTribesParamsModelName,
|
||||
Field: "limit",
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ func UnmarshalTribeChangeFromDatabase(
|
|||
newTribeID int,
|
||||
createdAt time.Time,
|
||||
) (TribeChange, error) {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return TribeChange{}, ValidationError{
|
||||
Model: tribeChangeModelName,
|
||||
Field: "id",
|
||||
|
|
@ -156,7 +156,7 @@ func NewCreateTribeChangeParams(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(playerID, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(playerID, 1, math.MaxInt); err != nil {
|
||||
return CreateTribeChangeParams{}, ValidationError{
|
||||
Model: createTribeChangeParamsModelName,
|
||||
Field: "playerID",
|
||||
|
|
@ -164,7 +164,7 @@ func NewCreateTribeChangeParams(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(oldTribeID, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(oldTribeID, 0, math.MaxInt); err != nil {
|
||||
return CreateTribeChangeParams{}, ValidationError{
|
||||
Model: createTribeChangeParamsModelName,
|
||||
Field: "oldTribeID",
|
||||
|
|
@ -172,7 +172,7 @@ func NewCreateTribeChangeParams(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(newTribeID, 0, math.MaxInt); err != nil {
|
||||
if err := validateInRange(newTribeID, 0, math.MaxInt); err != nil {
|
||||
return CreateTribeChangeParams{}, ValidationError{
|
||||
Model: createTribeChangeParamsModelName,
|
||||
Field: "newTribeID",
|
||||
|
|
@ -297,7 +297,7 @@ type TribeChangeCursor struct {
|
|||
const tribeChangeCursorModelName = "TribeChangeCursor"
|
||||
|
||||
func NewTribeChangeCursor(id int, serverKey string, createdAt time.Time) (TribeChangeCursor, error) {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return TribeChangeCursor{}, ValidationError{
|
||||
Model: tribeChangeCursorModelName,
|
||||
Field: "id",
|
||||
|
|
@ -436,7 +436,7 @@ func (params *ListTribeChangesParams) PlayerIDs() []int {
|
|||
|
||||
func (params *ListTribeChangesParams) SetPlayerIDs(playerIDs []int) error {
|
||||
for i, id := range playerIDs {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return SliceElementValidationError{
|
||||
Model: listTribeChangesParamsModelName,
|
||||
Field: "playerIDs",
|
||||
|
|
@ -457,7 +457,7 @@ func (params *ListTribeChangesParams) TribeIDs() []int {
|
|||
|
||||
func (params *ListTribeChangesParams) SetTribeIDs(tribeIDs []int) error {
|
||||
for i, id := range tribeIDs {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return SliceElementValidationError{
|
||||
Model: listTribeChangesParamsModelName,
|
||||
Field: "tribeIDs",
|
||||
|
|
@ -542,7 +542,7 @@ func (params *ListTribeChangesParams) Limit() int {
|
|||
}
|
||||
|
||||
func (params *ListTribeChangesParams) SetLimit(limit int) error {
|
||||
if err := validateIntInRange(limit, 1, TribeChangeListMaxLimit); err != nil {
|
||||
if err := validateInRange(limit, 1, TribeChangeListMaxLimit); err != nil {
|
||||
return ValidationError{
|
||||
Model: listTribeChangesParamsModelName,
|
||||
Field: "limit",
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ func TestNewCreateTribeChangeParams(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "CreateTribeChangeParams",
|
||||
Field: "playerID",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -70,7 +70,7 @@ func TestNewCreateTribeChangeParams(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "CreateTribeChangeParams",
|
||||
Field: "oldTribeID",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -87,7 +87,7 @@ func TestNewCreateTribeChangeParams(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "CreateTribeChangeParams",
|
||||
Field: "newTribeID",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -318,7 +318,7 @@ func TestNewTribeChangeCursor(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "TribeChangeCursor",
|
||||
Field: "id",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -453,7 +453,7 @@ func TestListTribeChangesParams_SetPlayerIDs(t *testing.T) {
|
|||
Model: "ListTribeChangesParams",
|
||||
Field: "playerIDs",
|
||||
Index: 3,
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -513,7 +513,7 @@ func TestListTribeChangesParams_SetTribeIDs(t *testing.T) {
|
|||
Model: "ListTribeChangesParams",
|
||||
Field: "tribeIDs",
|
||||
Index: 3,
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -1071,7 +1071,7 @@ func TestListTribeChangesParams_SetLimit(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "ListTribeChangesParams",
|
||||
Field: "limit",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -1085,7 +1085,7 @@ func TestListTribeChangesParams_SetLimit(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "ListTribeChangesParams",
|
||||
Field: "limit",
|
||||
Err: domain.MaxLessEqualError{
|
||||
Err: domain.MaxLessEqualError[int]{
|
||||
Max: domain.TribeChangeListMaxLimit,
|
||||
Current: domain.TribeChangeListMaxLimit + 1,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ func UnmarshalTribeSnapshotFromDatabase(
|
|||
date time.Time,
|
||||
createdAt time.Time,
|
||||
) (TribeSnapshot, error) {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return TribeSnapshot{}, ValidationError{
|
||||
Model: tribeSnapshotModelName,
|
||||
Field: "id",
|
||||
|
|
@ -51,7 +51,7 @@ func UnmarshalTribeSnapshotFromDatabase(
|
|||
}
|
||||
}
|
||||
|
||||
if err := validateIntInRange(tribeID, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(tribeID, 1, math.MaxInt); err != nil {
|
||||
return TribeSnapshot{}, ValidationError{
|
||||
Model: tribeSnapshotModelName,
|
||||
Field: "tribeID",
|
||||
|
|
@ -295,7 +295,7 @@ type TribeSnapshotCursor struct {
|
|||
const tribeSnapshotCursorModelName = "TribeSnapshotCursor"
|
||||
|
||||
func NewTribeSnapshotCursor(id int, serverKey string, date time.Time) (TribeSnapshotCursor, error) {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return TribeSnapshotCursor{}, ValidationError{
|
||||
Model: tribeSnapshotCursorModelName,
|
||||
Field: "id",
|
||||
|
|
@ -430,7 +430,7 @@ func (params *ListTribeSnapshotsParams) TribeIDs() []int {
|
|||
|
||||
func (params *ListTribeSnapshotsParams) SetTribeIDs(tribeIDs []int) error {
|
||||
for i, id := range tribeIDs {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return SliceElementValidationError{
|
||||
Model: listTribeSnapshotsParamsModelName,
|
||||
Field: "tribeIDs",
|
||||
|
|
@ -548,7 +548,7 @@ func (params *ListTribeSnapshotsParams) Limit() int {
|
|||
}
|
||||
|
||||
func (params *ListTribeSnapshotsParams) SetLimit(limit int) error {
|
||||
if err := validateIntInRange(limit, 1, TribeSnapshotListMaxLimit); err != nil {
|
||||
if err := validateInRange(limit, 1, TribeSnapshotListMaxLimit); err != nil {
|
||||
return ValidationError{
|
||||
Model: listTribeSnapshotsParamsModelName,
|
||||
Field: "limit",
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ func TestNewTribeSnapshotCursor(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "TribeSnapshotCursor",
|
||||
Field: "id",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -284,7 +284,7 @@ func TestListTribeSnapshotsParams_SetTribeIDs(t *testing.T) {
|
|||
Model: "ListTribeSnapshotsParams",
|
||||
Field: "tribeIDs",
|
||||
Index: 3,
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -842,7 +842,7 @@ func TestListTribeSnapshotsParams_SetLimit(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "ListTribeSnapshotsParams",
|
||||
Field: "limit",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -856,7 +856,7 @@ func TestListTribeSnapshotsParams_SetLimit(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "ListTribeSnapshotsParams",
|
||||
Field: "limit",
|
||||
Err: domain.MaxLessEqualError{
|
||||
Err: domain.MaxLessEqualError[int]{
|
||||
Max: domain.TribeSnapshotListMaxLimit,
|
||||
Current: domain.TribeSnapshotListMaxLimit + 1,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -342,7 +342,7 @@ func TestNewTribeCursor(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "TribeCursor",
|
||||
Field: "id",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -364,7 +364,7 @@ func TestNewTribeCursor(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "TribeCursor",
|
||||
Field: "odScoreAtt",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -386,7 +386,7 @@ func TestNewTribeCursor(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "TribeCursor",
|
||||
Field: "odScoreDef",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -408,7 +408,7 @@ func TestNewTribeCursor(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "TribeCursor",
|
||||
Field: "odScoreTotal",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -430,7 +430,7 @@ func TestNewTribeCursor(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "TribeCursor",
|
||||
Field: "points",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -452,7 +452,7 @@ func TestNewTribeCursor(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "TribeCursor",
|
||||
Field: "mostPoints",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 0,
|
||||
Current: -1,
|
||||
},
|
||||
|
|
@ -552,7 +552,7 @@ func TestListTribesParams_SetIDs(t *testing.T) {
|
|||
Model: "ListTribesParams",
|
||||
Field: "ids",
|
||||
Index: 3,
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -1164,7 +1164,7 @@ func TestListTribesParams_SetLimit(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "ListTribesParams",
|
||||
Field: "limit",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -1178,7 +1178,7 @@ func TestListTribesParams_SetLimit(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "ListTribesParams",
|
||||
Field: "limit",
|
||||
Err: domain.MaxLessEqualError{
|
||||
Err: domain.MaxLessEqualError[int]{
|
||||
Max: domain.TribeListMaxLimit,
|
||||
Current: domain.TribeListMaxLimit + 1,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -122,56 +122,56 @@ func (e SliceElementValidationError) Unwrap() error {
|
|||
return e.Err
|
||||
}
|
||||
|
||||
type MinGreaterEqualError struct {
|
||||
Min int
|
||||
Current int
|
||||
type MinGreaterEqualError[T float32 | float64 | int] struct {
|
||||
Min T
|
||||
Current T
|
||||
}
|
||||
|
||||
var _ ErrorWithParams = MinGreaterEqualError{}
|
||||
var _ ErrorWithParams = MinGreaterEqualError[int]{}
|
||||
|
||||
func (e MinGreaterEqualError) Error() string {
|
||||
return fmt.Sprintf("must be no less than %d (current: %d)", e.Min, e.Current)
|
||||
func (e MinGreaterEqualError[T]) Error() string {
|
||||
return fmt.Sprintf("must be no less than %v (current: %v)", e.Min, e.Current)
|
||||
}
|
||||
|
||||
func (e MinGreaterEqualError) Type() ErrorType {
|
||||
func (e MinGreaterEqualError[T]) Type() ErrorType {
|
||||
return ErrorTypeIncorrectInput
|
||||
}
|
||||
|
||||
const errorCodeMinGreaterEqual = "min-greater-equal"
|
||||
|
||||
func (e MinGreaterEqualError) Code() string {
|
||||
func (e MinGreaterEqualError[T]) Code() string {
|
||||
return errorCodeMinGreaterEqual
|
||||
}
|
||||
|
||||
func (e MinGreaterEqualError) Params() map[string]any {
|
||||
func (e MinGreaterEqualError[T]) Params() map[string]any {
|
||||
return map[string]any{
|
||||
"Min": e.Min,
|
||||
"Current": e.Current,
|
||||
}
|
||||
}
|
||||
|
||||
type MaxLessEqualError struct {
|
||||
Max int
|
||||
Current int
|
||||
type MaxLessEqualError[T float32 | float64 | int] struct {
|
||||
Max T
|
||||
Current T
|
||||
}
|
||||
|
||||
var _ ErrorWithParams = MaxLessEqualError{}
|
||||
var _ ErrorWithParams = MaxLessEqualError[int]{}
|
||||
|
||||
func (e MaxLessEqualError) Error() string {
|
||||
return fmt.Sprintf("must be no greater than %d (current: %d)", e.Max, e.Current)
|
||||
func (e MaxLessEqualError[T]) Error() string {
|
||||
return fmt.Sprintf("must be no greater than %v (current: %v)", e.Max, e.Current)
|
||||
}
|
||||
|
||||
func (e MaxLessEqualError) Type() ErrorType {
|
||||
func (e MaxLessEqualError[T]) Type() ErrorType {
|
||||
return ErrorTypeIncorrectInput
|
||||
}
|
||||
|
||||
const errorCodeMaxLessEqual = "max-less-equal"
|
||||
|
||||
func (e MaxLessEqualError) Code() string {
|
||||
func (e MaxLessEqualError[T]) Code() string {
|
||||
return errorCodeMaxLessEqual
|
||||
}
|
||||
|
||||
func (e MaxLessEqualError) Params() map[string]any {
|
||||
func (e MaxLessEqualError[T]) Params() map[string]any {
|
||||
return map[string]any{
|
||||
"Max": e.Max,
|
||||
"Current": e.Current,
|
||||
|
|
@ -356,16 +356,16 @@ func validateServerKey(key string) error {
|
|||
return validateStringLen(key, serverKeyMinLength, serverKeyMaxLength)
|
||||
}
|
||||
|
||||
func validateIntInRange(current, min, max int) error {
|
||||
func validateInRange[T float32 | float64 | int](current, min, max T) error {
|
||||
if current < min {
|
||||
return MinGreaterEqualError{
|
||||
return MinGreaterEqualError[T]{
|
||||
Min: min,
|
||||
Current: current,
|
||||
}
|
||||
}
|
||||
|
||||
if current > max {
|
||||
return MaxLessEqualError{
|
||||
return MaxLessEqualError[T]{
|
||||
Max: max,
|
||||
Current: current,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -269,7 +269,7 @@ func (params *ListVersionsParams) Limit() int {
|
|||
}
|
||||
|
||||
func (params *ListVersionsParams) SetLimit(limit int) error {
|
||||
if err := validateIntInRange(limit, 1, VersionListMaxLimit); err != nil {
|
||||
if err := validateInRange(limit, 1, VersionListMaxLimit); err != nil {
|
||||
return ValidationError{
|
||||
Model: listVersionsParamsModelName,
|
||||
Field: "limit",
|
||||
|
|
|
|||
|
|
@ -324,7 +324,7 @@ func TestListVersionsParams_SetLimit(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "ListVersionsParams",
|
||||
Field: "limit",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -338,7 +338,7 @@ func TestListVersionsParams_SetLimit(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "ListVersionsParams",
|
||||
Field: "limit",
|
||||
Err: domain.MaxLessEqualError{
|
||||
Err: domain.MaxLessEqualError[int]{
|
||||
Max: domain.VersionListMaxLimit,
|
||||
Current: domain.VersionListMaxLimit + 1,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ func UnmarshalVillageFromDatabase(
|
|||
rawProfileURL string,
|
||||
createdAt time.Time,
|
||||
) (Village, error) {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return Village{}, ValidationError{
|
||||
Model: villageModelName,
|
||||
Field: "id",
|
||||
|
|
@ -263,7 +263,7 @@ func UnmarshalVillageMetaFromDatabase(
|
|||
continent string,
|
||||
rawProfileURL string,
|
||||
) (VillageMeta, error) {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return VillageMeta{}, ValidationError{
|
||||
Model: villageMetaModelName,
|
||||
Field: "id",
|
||||
|
|
@ -423,7 +423,7 @@ type VillageCursor struct {
|
|||
const villageCursorModelName = "VillageCursor"
|
||||
|
||||
func NewVillageCursor(id int, serverKey string) (VillageCursor, error) {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return VillageCursor{}, ValidationError{
|
||||
Model: villageCursorModelName,
|
||||
Field: "id",
|
||||
|
|
@ -528,7 +528,7 @@ func (params *ListVillagesParams) IDs() []int {
|
|||
|
||||
func (params *ListVillagesParams) SetIDs(ids []int) error {
|
||||
for i, id := range ids {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return SliceElementValidationError{
|
||||
Model: listVillagesParamsModelName,
|
||||
Field: "ids",
|
||||
|
|
@ -623,7 +623,7 @@ func (params *ListVillagesParams) PlayerIDs() []int {
|
|||
|
||||
func (params *ListVillagesParams) SetPlayerIDs(playerIDs []int) error {
|
||||
for i, id := range playerIDs {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return SliceElementValidationError{
|
||||
Model: listVillagesParamsModelName,
|
||||
Field: "playerIDs",
|
||||
|
|
@ -644,7 +644,7 @@ func (params *ListVillagesParams) TribeIDs() []int {
|
|||
|
||||
func (params *ListVillagesParams) SetTribeIDs(tribeIDs []int) error {
|
||||
for i, id := range tribeIDs {
|
||||
if err := validateIntInRange(id, 1, math.MaxInt); err != nil {
|
||||
if err := validateInRange(id, 1, math.MaxInt); err != nil {
|
||||
return SliceElementValidationError{
|
||||
Model: listVillagesParamsModelName,
|
||||
Field: "tribeIDs",
|
||||
|
|
@ -711,7 +711,7 @@ func (params *ListVillagesParams) Limit() int {
|
|||
}
|
||||
|
||||
func (params *ListVillagesParams) SetLimit(limit int) error {
|
||||
if err := validateIntInRange(limit, 1, VillageListMaxLimit); err != nil {
|
||||
if err := validateInRange(limit, 1, VillageListMaxLimit); err != nil {
|
||||
return ValidationError{
|
||||
Model: listVillagesParamsModelName,
|
||||
Field: "limit",
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ func TestNewVillageCursor(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "VillageCursor",
|
||||
Field: "id",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -260,7 +260,7 @@ func TestListVillagesParams_SetIDs(t *testing.T) {
|
|||
Model: "ListVillagesParams",
|
||||
Field: "ids",
|
||||
Index: 3,
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -545,7 +545,7 @@ func TestListVillagesParams_SetPlayerIDs(t *testing.T) {
|
|||
Model: "ListVillagesParams",
|
||||
Field: "playerIDs",
|
||||
Index: 3,
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -605,7 +605,7 @@ func TestListVillagesParams_SetTribeIDs(t *testing.T) {
|
|||
Model: "ListVillagesParams",
|
||||
Field: "tribeIDs",
|
||||
Index: 3,
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -814,7 +814,7 @@ func TestListVillagesParams_SetLimit(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "ListVillagesParams",
|
||||
Field: "limit",
|
||||
Err: domain.MinGreaterEqualError{
|
||||
Err: domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: 0,
|
||||
},
|
||||
|
|
@ -828,7 +828,7 @@ func TestListVillagesParams_SetLimit(t *testing.T) {
|
|||
expectedErr: domain.ValidationError{
|
||||
Model: "ListVillagesParams",
|
||||
Field: "limit",
|
||||
Err: domain.MaxLessEqualError{
|
||||
Err: domain.MaxLessEqualError[int]{
|
||||
Max: domain.VillageListMaxLimit,
|
||||
Current: domain.VillageListMaxLimit + 1,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -258,7 +258,7 @@ func TestListEnnoblements(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MinGreaterEqualError{
|
||||
domainErr := domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -294,7 +294,7 @@ func TestListEnnoblements(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MaxLessEqualError{
|
||||
domainErr := domain.MaxLessEqualError[int]{
|
||||
Max: domain.EnnoblementListMaxLimit,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -866,7 +866,7 @@ func TestListPlayerEnnoblements(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MinGreaterEqualError{
|
||||
domainErr := domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -902,7 +902,7 @@ func TestListPlayerEnnoblements(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MaxLessEqualError{
|
||||
domainErr := domain.MaxLessEqualError[int]{
|
||||
Max: domain.EnnoblementListMaxLimit,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -1532,7 +1532,7 @@ func TestListTribeEnnoblements(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MinGreaterEqualError{
|
||||
domainErr := domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -1568,7 +1568,7 @@ func TestListTribeEnnoblements(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MaxLessEqualError{
|
||||
domainErr := domain.MaxLessEqualError[int]{
|
||||
Max: domain.EnnoblementListMaxLimit,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -2185,7 +2185,7 @@ func TestListVillageEnnoblements(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MinGreaterEqualError{
|
||||
domainErr := domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -2221,7 +2221,7 @@ func TestListVillageEnnoblements(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MaxLessEqualError{
|
||||
domainErr := domain.MaxLessEqualError[int]{
|
||||
Max: domain.EnnoblementListMaxLimit,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@ func TestListPlayerPlayerSnapshots(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MinGreaterEqualError{
|
||||
domainErr := domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -228,7 +228,7 @@ func TestListPlayerPlayerSnapshots(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MaxLessEqualError{
|
||||
domainErr := domain.MaxLessEqualError[int]{
|
||||
Max: domain.PlayerSnapshotListMaxLimit,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -370,7 +370,7 @@ func TestListVersionPlayers(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MinGreaterEqualError{
|
||||
domainErr := domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -406,7 +406,7 @@ func TestListVersionPlayers(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MaxLessEqualError{
|
||||
domainErr := domain.MaxLessEqualError[int]{
|
||||
Max: domain.PlayerListMaxLimit,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -680,7 +680,7 @@ func TestListVersionPlayers(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
id, err := strconv.Atoi(req.URL.Query().Get("id"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MinGreaterEqualError{
|
||||
domainErr := domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: id,
|
||||
}
|
||||
|
|
@ -1238,7 +1238,7 @@ func TestListServerPlayers(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MinGreaterEqualError{
|
||||
domainErr := domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -1274,7 +1274,7 @@ func TestListServerPlayers(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MaxLessEqualError{
|
||||
domainErr := domain.MaxLessEqualError[int]{
|
||||
Max: domain.PlayerListMaxLimit,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -1548,7 +1548,7 @@ func TestListServerPlayers(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
id, err := strconv.Atoi(req.URL.Query().Get("id"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MinGreaterEqualError{
|
||||
domainErr := domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: id,
|
||||
}
|
||||
|
|
@ -1988,7 +1988,7 @@ func TestListTribeMembers(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MinGreaterEqualError{
|
||||
domainErr := domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -2024,7 +2024,7 @@ func TestListTribeMembers(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MaxLessEqualError{
|
||||
domainErr := domain.MaxLessEqualError[int]{
|
||||
Max: domain.PlayerListMaxLimit,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -2418,7 +2418,7 @@ func TestGetPlayer(t *testing.T) {
|
|||
require.Len(t, pathSegments, 8)
|
||||
id, err := strconv.Atoi(pathSegments[7])
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MinGreaterEqualError{
|
||||
domainErr := domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: id,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -190,7 +190,7 @@ func TestListServerServerSnapshots(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MinGreaterEqualError{
|
||||
domainErr := domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -226,7 +226,7 @@ func TestListServerServerSnapshots(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MaxLessEqualError{
|
||||
domainErr := domain.MaxLessEqualError[int]{
|
||||
Max: domain.ServerSnapshotListMaxLimit,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@ func TestListServers(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MinGreaterEqualError{
|
||||
domainErr := domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -234,7 +234,7 @@ func TestListServers(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MaxLessEqualError{
|
||||
domainErr := domain.MaxLessEqualError[int]{
|
||||
Max: domain.ServerListMaxLimit,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -273,7 +273,7 @@ func TestListPlayerTribeChanges(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MinGreaterEqualError{
|
||||
domainErr := domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -309,7 +309,7 @@ func TestListPlayerTribeChanges(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MaxLessEqualError{
|
||||
domainErr := domain.MaxLessEqualError[int]{
|
||||
Max: domain.TribeChangeListMaxLimit,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -965,7 +965,7 @@ func TestListTribeMemberChanges(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MinGreaterEqualError{
|
||||
domainErr := domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -1001,7 +1001,7 @@ func TestListTribeMemberChanges(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MaxLessEqualError{
|
||||
domainErr := domain.MaxLessEqualError[int]{
|
||||
Max: domain.TribeChangeListMaxLimit,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@ func TestListTribeTribeSnapshots(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MinGreaterEqualError{
|
||||
domainErr := domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -228,7 +228,7 @@ func TestListTribeTribeSnapshots(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MaxLessEqualError{
|
||||
domainErr := domain.MaxLessEqualError[int]{
|
||||
Max: domain.TribeSnapshotListMaxLimit,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -327,7 +327,7 @@ func TestListTribes(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MinGreaterEqualError{
|
||||
domainErr := domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -363,7 +363,7 @@ func TestListTribes(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MaxLessEqualError{
|
||||
domainErr := domain.MaxLessEqualError[int]{
|
||||
Max: domain.TribeListMaxLimit,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -789,7 +789,7 @@ func TestGetTribe(t *testing.T) {
|
|||
require.Len(t, pathSegments, 8)
|
||||
id, err := strconv.Atoi(pathSegments[7])
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MinGreaterEqualError{
|
||||
domainErr := domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: id,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ func TestListVersions(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MinGreaterEqualError{
|
||||
domainErr := domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -182,7 +182,7 @@ func TestListVersions(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MaxLessEqualError{
|
||||
domainErr := domain.MaxLessEqualError[int]{
|
||||
Max: domain.VersionListMaxLimit,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -185,7 +185,7 @@ func TestListVillages(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MinGreaterEqualError{
|
||||
domainErr := domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -221,7 +221,7 @@ func TestListVillages(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MaxLessEqualError{
|
||||
domainErr := domain.MaxLessEqualError[int]{
|
||||
Max: domain.VillageListMaxLimit,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -629,7 +629,7 @@ func TestListPlayerVillages(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MinGreaterEqualError{
|
||||
domainErr := domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -665,7 +665,7 @@ func TestListPlayerVillages(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MaxLessEqualError{
|
||||
domainErr := domain.MaxLessEqualError[int]{
|
||||
Max: domain.VillageListMaxLimit,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -1042,7 +1042,7 @@ func TestListTribeVillages(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MinGreaterEqualError{
|
||||
domainErr := domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -1078,7 +1078,7 @@ func TestListTribeVillages(t *testing.T) {
|
|||
body := decodeJSON[apimodel.ErrorResponse](t, resp.Body)
|
||||
limit, err := strconv.Atoi(req.URL.Query().Get("limit"))
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MaxLessEqualError{
|
||||
domainErr := domain.MaxLessEqualError[int]{
|
||||
Max: domain.VillageListMaxLimit,
|
||||
Current: limit,
|
||||
}
|
||||
|
|
@ -1363,7 +1363,7 @@ func TestGetVillage(t *testing.T) {
|
|||
require.Len(t, pathSegments, 8)
|
||||
id, err := strconv.Atoi(pathSegments[7])
|
||||
require.NoError(t, err)
|
||||
domainErr := domain.MinGreaterEqualError{
|
||||
domainErr := domain.MinGreaterEqualError[int]{
|
||||
Min: 1,
|
||||
Current: id,
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user