use make to initialize slices in the repositories

This commit is contained in:
Dawid Wysokiński 2021-05-06 17:01:22 +02:00
parent 6aab0e7b51
commit 9516140c0f
12 changed files with 16 additions and 16 deletions

View File

@ -22,7 +22,7 @@ func NewPGRepository(db *pg.DB) dailyplayerstats.Repository {
func (repo *pgRepository) Fetch(ctx context.Context, cfg dailyplayerstats.FetchConfig) ([]*twmodel.DailyPlayerStats, int, error) { func (repo *pgRepository) Fetch(ctx context.Context, cfg dailyplayerstats.FetchConfig) ([]*twmodel.DailyPlayerStats, int, error) {
var err error var err error
var data []*twmodel.DailyPlayerStats data := make([]*twmodel.DailyPlayerStats, 0)
total := 0 total := 0
query := repo. query := repo.
WithParam("SERVER", pg.Safe(cfg.Server)). WithParam("SERVER", pg.Safe(cfg.Server)).

View File

@ -22,7 +22,7 @@ func NewPGRepository(db *pg.DB) dailytribestats.Repository {
func (repo *pgRepository) Fetch(ctx context.Context, cfg dailytribestats.FetchConfig) ([]*twmodel.DailyTribeStats, int, error) { func (repo *pgRepository) Fetch(ctx context.Context, cfg dailytribestats.FetchConfig) ([]*twmodel.DailyTribeStats, int, error) {
var err error var err error
var data []*twmodel.DailyTribeStats data := make([]*twmodel.DailyTribeStats, 0)
total := 0 total := 0
query := repo. query := repo.
WithParam("SERVER", pg.Safe(cfg.Server)). WithParam("SERVER", pg.Safe(cfg.Server)).

View File

@ -23,7 +23,7 @@ func NewPGRepository(db *pg.DB) ennoblement.Repository {
func (repo *pgRepository) Fetch(ctx context.Context, cfg ennoblement.FetchConfig) ([]*twmodel.Ennoblement, int, error) { func (repo *pgRepository) Fetch(ctx context.Context, cfg ennoblement.FetchConfig) ([]*twmodel.Ennoblement, int, error) {
var err error var err error
total := 0 total := 0
var data []*twmodel.Ennoblement data := make([]*twmodel.Ennoblement, 0)
query := repo. query := repo.
WithParam("SERVER", pg.Safe(cfg.Server)). WithParam("SERVER", pg.Safe(cfg.Server)).
Model(&data). Model(&data).

View File

@ -23,7 +23,7 @@ func NewPGRepository(db *pg.DB) player.Repository {
func (repo *pgRepository) Fetch(ctx context.Context, cfg player.FetchConfig) ([]*twmodel.Player, int, error) { func (repo *pgRepository) Fetch(ctx context.Context, cfg player.FetchConfig) ([]*twmodel.Player, int, error) {
var err error var err error
var data []*twmodel.Player data := make([]*twmodel.Player, 0)
total := 0 total := 0
query := repo. query := repo.
WithParam("SERVER", pg.Safe(cfg.Server)). WithParam("SERVER", pg.Safe(cfg.Server)).
@ -60,7 +60,7 @@ type fetchPlayerServersQueryResult struct {
} }
func (repo *pgRepository) FetchNameChanges(ctx context.Context, code twmodel.VersionCode, playerID ...int) (map[int][]*twmodel.PlayerNameChange, error) { func (repo *pgRepository) FetchNameChanges(ctx context.Context, code twmodel.VersionCode, playerID ...int) (map[int][]*twmodel.PlayerNameChange, error) {
var data []*twmodel.PlayerNameChange data := make([]*twmodel.PlayerNameChange, 0)
if err := repo.Model(&data). if err := repo.Model(&data).
Context(ctx). Context(ctx).
Where("version_code = ?", code). Where("version_code = ?", code).
@ -78,7 +78,7 @@ func (repo *pgRepository) FetchNameChanges(ctx context.Context, code twmodel.Ver
} }
func (repo *pgRepository) FetchPlayerServers(ctx context.Context, code twmodel.VersionCode, playerID ...int) (map[int][]string, error) { func (repo *pgRepository) FetchPlayerServers(ctx context.Context, code twmodel.VersionCode, playerID ...int) (map[int][]string, error) {
var data []*fetchPlayerServersQueryResult data := make([]*fetchPlayerServersQueryResult, 0)
if err := repo.Model(&twmodel.PlayerToServer{}). if err := repo.Model(&twmodel.PlayerToServer{}).
Context(ctx). Context(ctx).
Column("player_id"). Column("player_id").
@ -110,7 +110,6 @@ func (repo *pgRepository) SearchPlayer(ctx context.Context, cfg player.SearchPla
} }
var query *orm.Query var query *orm.Query
var res []*twmodel.FoundPlayer
whereClause := "player.id = ?1 OR player.name ILIKE ?0" whereClause := "player.id = ?1 OR player.name ILIKE ?0"
if cfg.ID <= 0 { if cfg.ID <= 0 {
whereClause = "player.name ILIKE ?0" whereClause = "player.name ILIKE ?0"
@ -136,6 +135,7 @@ func (repo *pgRepository) SearchPlayer(ctx context.Context, cfg player.SearchPla
} }
var err error var err error
res := make([]*twmodel.FoundPlayer, 0)
count := 0 count := 0
if query != nil { if query != nil {
base := repo. base := repo.

View File

@ -23,7 +23,7 @@ func NewPGRepository(db *pg.DB) playerhistory.Repository {
func (repo *pgRepository) Fetch(ctx context.Context, cfg playerhistory.FetchConfig) ([]*twmodel.PlayerHistory, int, error) { func (repo *pgRepository) Fetch(ctx context.Context, cfg playerhistory.FetchConfig) ([]*twmodel.PlayerHistory, int, error) {
var err error var err error
total := 0 total := 0
var data []*twmodel.PlayerHistory data := make([]*twmodel.PlayerHistory, 0)
query := repo. query := repo.
WithParam("SERVER", pg.Safe(cfg.Server)). WithParam("SERVER", pg.Safe(cfg.Server)).
Model(&data). Model(&data).

View File

@ -28,7 +28,7 @@ func NewPGRepository(db *pg.DB) (server.Repository, error) {
func (repo *pgRepository) Fetch(ctx context.Context, cfg server.FetchConfig) ([]*twmodel.Server, int, error) { func (repo *pgRepository) Fetch(ctx context.Context, cfg server.FetchConfig) ([]*twmodel.Server, int, error) {
var err error var err error
total := 0 total := 0
var data []*twmodel.Server data := make([]*twmodel.Server, 0)
query := repo. query := repo.
Model(&data). Model(&data).
Context(ctx). Context(ctx).

View File

@ -22,7 +22,7 @@ func NewPGRepository(db *pg.DB) serverstats.Repository {
func (repo *pgRepository) Fetch(ctx context.Context, cfg serverstats.FetchConfig) ([]*twmodel.ServerStats, int, error) { func (repo *pgRepository) Fetch(ctx context.Context, cfg serverstats.FetchConfig) ([]*twmodel.ServerStats, int, error) {
var err error var err error
var data []*twmodel.ServerStats data := make([]*twmodel.ServerStats, 0)
total := 0 total := 0
query := repo. query := repo.
WithParam("SERVER", pg.Safe(cfg.Server)). WithParam("SERVER", pg.Safe(cfg.Server)).

View File

@ -23,7 +23,7 @@ func NewPGRepository(db *pg.DB) tribe.Repository {
func (repo *pgRepository) Fetch(ctx context.Context, cfg tribe.FetchConfig) ([]*twmodel.Tribe, int, error) { func (repo *pgRepository) Fetch(ctx context.Context, cfg tribe.FetchConfig) ([]*twmodel.Tribe, int, error) {
var err error var err error
var data []*twmodel.Tribe data := make([]*twmodel.Tribe, 0)
total := 0 total := 0
query := repo. query := repo.
WithParam("SERVER", pg.Safe(cfg.Server)). WithParam("SERVER", pg.Safe(cfg.Server)).
@ -66,7 +66,6 @@ func (repo *pgRepository) SearchTribe(ctx context.Context, cfg tribe.SearchTribe
} }
var query *orm.Query var query *orm.Query
var res []*twmodel.FoundTribe
for _, server := range servers { for _, server := range servers {
safeKey := pg.Safe(server.Key) safeKey := pg.Safe(server.Key)
otherQuery := repo. otherQuery := repo.
@ -85,6 +84,7 @@ func (repo *pgRepository) SearchTribe(ctx context.Context, cfg tribe.SearchTribe
var err error var err error
count := 0 count := 0
res := make([]*twmodel.FoundTribe, 0)
if query != nil { if query != nil {
base := repo. base := repo.
Model(). Model().

View File

@ -23,7 +23,7 @@ func NewPGRepository(db *pg.DB) tribechange.Repository {
func (repo *pgRepository) Fetch(ctx context.Context, cfg tribechange.FetchConfig) ([]*twmodel.TribeChange, int, error) { func (repo *pgRepository) Fetch(ctx context.Context, cfg tribechange.FetchConfig) ([]*twmodel.TribeChange, int, error) {
var err error var err error
total := 0 total := 0
var data []*twmodel.TribeChange data := make([]*twmodel.TribeChange, 0)
query := repo. query := repo.
WithParam("SERVER", pg.Safe(cfg.Server)). WithParam("SERVER", pg.Safe(cfg.Server)).
Model(&data). Model(&data).

View File

@ -23,7 +23,7 @@ func NewPGRepository(db *pg.DB) tribehistory.Repository {
func (repo *pgRepository) Fetch(ctx context.Context, cfg tribehistory.FetchConfig) ([]*twmodel.TribeHistory, int, error) { func (repo *pgRepository) Fetch(ctx context.Context, cfg tribehistory.FetchConfig) ([]*twmodel.TribeHistory, int, error) {
var err error var err error
total := 0 total := 0
var data []*twmodel.TribeHistory data := make([]*twmodel.TribeHistory, 0)
query := repo. query := repo.
WithParam("SERVER", pg.Safe(cfg.Server)). WithParam("SERVER", pg.Safe(cfg.Server)).
Model(&data). Model(&data).

View File

@ -27,7 +27,7 @@ func NewPGRepository(db *pg.DB) (version.Repository, error) {
func (repo *pgRepository) Fetch(ctx context.Context, cfg version.FetchConfig) ([]*twmodel.Version, int, error) { func (repo *pgRepository) Fetch(ctx context.Context, cfg version.FetchConfig) ([]*twmodel.Version, int, error) {
var err error var err error
var data []*twmodel.Version data := make([]*twmodel.Version, 0)
total := 0 total := 0
query := repo. query := repo.
Model(&data). Model(&data).

View File

@ -22,7 +22,7 @@ func NewPGRepository(db *pg.DB) village.Repository {
func (repo *pgRepository) Fetch(ctx context.Context, cfg village.FetchConfig) ([]*twmodel.Village, int, error) { func (repo *pgRepository) Fetch(ctx context.Context, cfg village.FetchConfig) ([]*twmodel.Village, int, error) {
var err error var err error
var data []*twmodel.Village data := make([]*twmodel.Village, 0)
query := repo. query := repo.
WithParam("SERVER", pg.Safe(cfg.Server)). WithParam("SERVER", pg.Safe(cfg.Server)).
Model(&data). Model(&data).