twhelp
/
golang-sdk
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug with nil pointers, correct typos

This commit is contained in:
Dawid Wysokiński 2020-07-09 13:18:33 +02:00
parent 0880d8996b
commit a1079e7a18
5 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sdk/lang_versions.go
View File

@ -14,7 +14,7 @@ type LangVersions struct {
func (lv *LangVersions) Read(tag models.LanguageTag) (*models.LangVersion, error) {
resp := struct {
LangVersion *models.LangVersion `json:"langVersion" gqlgen:"langVersion"`
LangVersion models.LangVersion `json:"langVersion" gqlgen:"langVersion"`
}{}
query := fmt.Sprintf(`
query langVersion($tag: LanguageTag!) {
@ -27,20 +27,20 @@ func (lv *LangVersions) Read(tag models.LanguageTag) (*models.LangVersion, error
if err != nil {
return nil, errors.Wrap(err, "twhelp sdk")
}
return resp.LangVersion, nil
return &resp.LangVersion, nil
}
type LangVersionsList struct {
type LangVersionList struct {
Items []*models.LangVersion `json:"items" gqlgen:"items"`
Total int `json:"total" gqlgen:"total"`
}
func (lv *LangVersions) Browse(filter *models.LangVersionFilter) (*LangVersionsList, error) {
func (lv *LangVersions) Browse(filter *models.LangVersionFilter) (*LangVersionList, error) {
if filter == nil {
filter = &models.LangVersionFilter{}
}
resp := struct {
LangVersions *LangVersionsList `json:"langVersions" gqlgen:"langVersions"`
LangVersions LangVersionList `json:"langVersions" gqlgen:"langVersions"`
}{}
query := fmt.Sprintf(`
query langVersions($filter: LangVersionFilter) {
@ -57,5 +57,5 @@ func (lv *LangVersions) Browse(filter *models.LangVersionFilter) (*LangVersionsL
if err != nil {
return nil, errors.Wrap(err, "twhelp sdk")
}
return resp.LangVersions, nil
return &resp.LangVersions, nil
}

12
sdk/players.go
View File

@ -36,7 +36,7 @@ func (ps *Players) Read(server string, id int, include *PlayerInclude) (*models.
include = &PlayerInclude{}
}
resp := struct {
Player *models.Player `json:"player" gqlgen:"player"`
Player models.Player `json:"player" gqlgen:"player"`
}{}
query := fmt.Sprintf(`
@ -51,15 +51,15 @@ func (ps *Players) Read(server string, id int, include *PlayerInclude) (*models.
if err != nil {
return nil, errors.Wrap(err, "twhelp sdk")
}
return resp.Player, nil
return &resp.Player, nil
}
type PlayersList struct {
type PlayerList struct {
Items []*models.Player `json:"items" gqlgen:"items"`
Total int `json:"total" gqlgen:"total"`
}
func (ps *Players) Browse(server string, filter *models.PlayerFilter, include *PlayerInclude) (*PlayersList, error) {
func (ps *Players) Browse(server string, filter *models.PlayerFilter, include *PlayerInclude) (*PlayerList, error) {
if server == "" {
return nil, ErrServerNameIsEmpty
}
@ -70,7 +70,7 @@ func (ps *Players) Browse(server string, filter *models.PlayerFilter, include *P
include = &PlayerInclude{}
}
resp := struct {
Players *PlayersList `json:"players" gqlgen:"players"`
Players PlayerList `json:"players" gqlgen:"players"`
}{}
query := fmt.Sprintf(`
query players($server: String!, $filter: PlayerFilter) {
@ -88,5 +88,5 @@ func (ps *Players) Browse(server string, filter *models.PlayerFilter, include *P
if err != nil {
return nil, errors.Wrap(err, "twhelp sdk")
}
return resp.Players, nil
return &resp.Players, nil
}

17
sdk/servers.go
View File

@ -33,7 +33,7 @@ func (ss *Servers) Read(key string, incl *ServerInclude) (*models.Server, error)
incl = &ServerInclude{}
}
resp := struct {
Server *models.Server `json:"server" gqlgen:"server"`
Server models.Server `json:"server" gqlgen:"server"`
}{}
query := fmt.Sprintf(`
query server($key: String!) {
@ -54,15 +54,15 @@ func (ss *Servers) Read(key string, incl *ServerInclude) (*models.Server, error)
if err != nil {
return nil, errors.Wrap(err, "twhelp sdk")
}
return resp.Server, nil
return &resp.Server, nil
}
type ServersList struct {
type ServerList struct {
Items []*models.Server `json:"items" gqlgen:"items"`
Total int `json:"total" gqlgen:"total"`
}
func (ss *Servers) Browse(filter *models.ServerFilter, incl *ServerInclude) (*ServersList, error) {
func (ss *Servers) Browse(filter *models.ServerFilter, incl *ServerInclude) (*ServerList, error) {
if incl == nil {
incl = &ServerInclude{}
}
@ -70,18 +70,21 @@ func (ss *Servers) Browse(filter *models.ServerFilter, incl *ServerInclude) (*Se
filter = &models.ServerFilter{}
}
resp := struct {
Servers *ServersList `json:"servers" gqlgen:"servers"`
Servers ServerList `json:"servers" gqlgen:"servers"`
}{}
query := fmt.Sprintf(`
query servers($filter: ServerFilter) {
servers(filter: $filter) {
items {
items {
key
status
dataUpdatedAt
historyUpdatedAt
statsUpdatedAt
numberOfTribes
numberOfPlayers
numberOfVillages
%s
}
total
@ -93,5 +96,5 @@ func (ss *Servers) Browse(filter *models.ServerFilter, incl *ServerInclude) (*Se
if err != nil {
return nil, errors.Wrap(err, "twhelp sdk")
}
return resp.Servers, nil
return &resp.Servers, nil
}

12
sdk/tribes.go
View File

@ -14,7 +14,7 @@ type Tribes struct {
func (ts *Tribes) Read(server string, id int) (*models.Tribe, error) {
resp := struct {
Tribe *models.Tribe `json:"tribe" gqlgen:"tribe"`
Tribe models.Tribe `json:"tribe" gqlgen:"tribe"`
}{}
query := fmt.Sprintf(`
query tribe($server: String!, $id: Int!) {
@ -27,20 +27,20 @@ func (ts *Tribes) Read(server string, id int) (*models.Tribe, error) {
if err != nil {
return nil, errors.Wrap(err, "twhelp sdk")
}
return resp.Tribe, nil
return &resp.Tribe, nil
}
type TribesList struct {
type TribeList struct {
Items []*models.Tribe `json:"items" gqlgen:"items"`
Total int `json:"total" gqlgen:"total"`
}
func (ts *Tribes) Browse(server string, filter *models.TribeFilter) (*TribesList, error) {
func (ts *Tribes) Browse(server string, filter *models.TribeFilter) (*TribeList, error) {
if filter == nil {
filter = &models.TribeFilter{}
}
resp := struct {
Tribes *TribesList `json:"tribes" gqlgen:"tribes"`
Tribes TribeList `json:"tribes" gqlgen:"tribes"`
}{}
query := fmt.Sprintf(`
query tribes($server: String!, $filter: TribeFilter) {
@ -57,5 +57,5 @@ func (ts *Tribes) Browse(server string, filter *models.TribeFilter) (*TribesList
if err != nil {
return nil, errors.Wrap(err, "twhelp sdk")
}
return resp.Tribes, nil
return &resp.Tribes, nil
}

12
sdk/villages.go
View File

@ -38,7 +38,7 @@ func (vs *Villages) Read(server string, id int, include *VillageInclude) (*model
include = &VillageInclude{}
}
resp := struct {
Village *models.Village `json:"village" gqlgen:"village"`
Village models.Village `json:"village" gqlgen:"village"`
}{}
query := fmt.Sprintf(`
@ -53,15 +53,15 @@ func (vs *Villages) Read(server string, id int, include *VillageInclude) (*model
if err != nil {
return nil, errors.Wrap(err, "twhelp sdk")
}
return resp.Village, nil
return &resp.Village, nil
}
type VillagesList struct {
type VillageList struct {
Items []*models.Village `json:"items" gqlgen:"items"`
Total int `json:"total" gqlgen:"total"`
}
func (vs *Villages) Browse(server string, filter *models.VillageFilter, include *VillageInclude) (*VillagesList, error) {
func (vs *Villages) Browse(server string, filter *models.VillageFilter, include *VillageInclude) (*VillageList, error) {
if server == "" {
return nil, ErrServerNameIsEmpty
}
@ -72,7 +72,7 @@ func (vs *Villages) Browse(server string, filter *models.VillageFilter, include
include = &VillageInclude{}
}
resp := struct {
Villages *VillagesList
Villages VillageList
}{}
query := fmt.Sprintf(`
query villages($server: String!, $filter: VillageFilter) {
@ -90,5 +90,5 @@ func (vs *Villages) Browse(server string, filter *models.VillageFilter, include
if err != nil {
return nil, errors.Wrap(err, "twhelp sdk")
}
return resp.Villages, nil
return &resp.Villages, nil
}