Commit 6e8c593a authored by Andrei Mihu's avatar Andrei Mihu
Browse files

Allow tournament creation operations to set the authoritative flag.

parent 74d4e8c9

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ The format is based on [keep a changelog](http://keepachangelog.com) and this pr 
## [Unreleased]

### Added

- New config options to enforce a single socket per user, and a single match per socket.

- Allow tournament creation operations to set the authoritative flag.



### Changed

- Build with Go 1.17.1 release.

go.mod

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ require ( 
	github.com/gorilla/mux v1.8.0

	github.com/gorilla/websocket v1.4.2

	github.com/grpc-ecosystem/grpc-gateway/v2 v2.3.0

	github.com/heroiclabs/nakama-common v1.17.0

	github.com/heroiclabs/nakama-common v0.0.0-20210927193149-32e907f95d02

	github.com/jackc/pgconn v1.8.1

	github.com/jackc/pgerrcode v0.0.0-20201024163028-a0d42d470451

	github.com/jackc/pgtype v1.7.0

go.sum

+2 −0
Original line number Diff line number Diff line
@@ -312,6 +312,8 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p 
github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=

github.com/heroiclabs/nakama-common v0.0.0-20210907132825-508fa27d8eeb h1:HDNmqExiGhrIZSEeYqi0gSyOd9xPE+0Vw4NUhG5/N44=

github.com/heroiclabs/nakama-common v0.0.0-20210907132825-508fa27d8eeb/go.mod h1:jzIGV5bI45ALRQFzHPkJn4Z0tV+xhtho1+pZhOXVAsk=

github.com/heroiclabs/nakama-common v0.0.0-20210927193149-32e907f95d02 h1:5mtyOeLIGrVl4+fRC7aFWQM+E2M2/gUjiOgRWC2RuI4=

github.com/heroiclabs/nakama-common v0.0.0-20210927193149-32e907f95d02/go.mod h1:jzIGV5bI45ALRQFzHPkJn4Z0tV+xhtho1+pZhOXVAsk=

github.com/heroiclabs/nakama-common v1.17.0 h1:DkL5HALtf9LJCAI/lgYddCyZ6PJjWxphOpwz746jiN0=

github.com/heroiclabs/nakama-common v1.17.0/go.mod h1:jzIGV5bI45ALRQFzHPkJn4Z0tV+xhtho1+pZhOXVAsk=

github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=

server/core_tournament.go

+2 −2
Original line number Diff line number Diff line
@@ -50,10 +50,10 @@ type TournamentListCursor struct { 


type LeaderboardListCursor = TournamentListCursor



func TournamentCreate(ctx context.Context, logger *zap.Logger, cache LeaderboardCache, scheduler LeaderboardScheduler, leaderboardId string, sortOrder, operator int, resetSchedule, metadata,

func TournamentCreate(ctx context.Context, logger *zap.Logger, cache LeaderboardCache, scheduler LeaderboardScheduler, leaderboardId string, authoritative bool, sortOrder, operator int, resetSchedule, metadata,

	title, description string, category, startTime, endTime, duration, maxSize, maxNumScore int, joinRequired bool) error {



	leaderboard, err := cache.CreateTournament(ctx, leaderboardId, sortOrder, operator, resetSchedule, metadata, title, description, category, startTime, endTime, duration, maxSize, maxNumScore, joinRequired)

	leaderboard, err := cache.CreateTournament(ctx, leaderboardId, authoritative, sortOrder, operator, resetSchedule, metadata, title, description, category, startTime, endTime, duration, maxSize, maxNumScore, joinRequired)



	if err != nil {

		return err

server/leaderboard_cache.go

+3 −3
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ type LeaderboardCache interface { 
	Create(ctx context.Context, id string, authoritative bool, sortOrder, operator int, resetSchedule, metadata string) (*Leaderboard, error)

	Insert(id string, authoritative bool, sortOrder, operator int, resetSchedule, metadata string, createTime int64)

	List(categoryStart, categoryEnd, limit int, cursor *LeaderboardListCursor) ([]*Leaderboard, *LeaderboardListCursor, error)

	CreateTournament(ctx context.Context, id string, sortOrder, operator int, resetSchedule, metadata, title, description string, category, startTime, endTime, duration, maxSize, maxNumScore int, joinRequired bool) (*Leaderboard, error)

	CreateTournament(ctx context.Context, id string, authoritative bool, sortOrder, operator int, resetSchedule, metadata, title, description string, category, startTime, endTime, duration, maxSize, maxNumScore int, joinRequired bool) (*Leaderboard, error)

	InsertTournament(id string, sortOrder, operator int, resetSchedule, metadata, title, description string, category, duration, maxSize, maxNumScore int, joinRequired bool, createTime, startTime, endTime int64)

	ListTournaments(now int64, categoryStart, categoryEnd int, startTime, endTime int64, limit int, cursor *TournamentListCursor) ([]*Leaderboard, *TournamentListCursor, error)

	Delete(ctx context.Context, id string) error
@@ -428,7 +428,7 @@ func (l *LocalLeaderboardCache) List(categoryStart, categoryEnd, limit int, curs 
	return list, newCursor, nil

}



func (l *LocalLeaderboardCache) CreateTournament(ctx context.Context, id string, sortOrder, operator int, resetSchedule, metadata, title, description string, category, startTime, endTime, duration, maxSize, maxNumScore int, joinRequired bool) (*Leaderboard, error) {

func (l *LocalLeaderboardCache) CreateTournament(ctx context.Context, id string, authoritative bool, sortOrder, operator int, resetSchedule, metadata, title, description string, category, startTime, endTime, duration, maxSize, maxNumScore int, joinRequired bool) (*Leaderboard, error) {

	resetCron, err := checkTournamentConfig(resetSchedule, startTime, endTime, duration, maxSize, maxNumScore)

	if err != nil {

		l.logger.Error("Error while creating tournament", zap.Error(err))
@@ -447,7 +447,7 @@ func (l *LocalLeaderboardCache) CreateTournament(ctx context.Context, id string, 
		return nil, fmt.Errorf("cannot create tournament as leaderboard is already in use")

	}



	params := []interface{}{id, true, sortOrder, operator, duration}

	params := []interface{}{id, authoritative, sortOrder, operator, duration}

	columns := "id, authoritative, sort_order, operator, duration"

	values := "$1, $2, $3, $4, $5"