From 35e81ec36740ce5311b5ce150844dac70be3c5b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorben=20G=C3=BCnther?= Date: Sat, 5 Nov 2022 16:53:25 +0100 Subject: [PATCH] Move playersInQueue to resolver.go --- database/queue.go | 13 ------------- graph/resolver.go | 11 +++++++++++ graph/schema.resolvers.go | 4 ++-- 3 files changed, 13 insertions(+), 15 deletions(-) delete mode 100644 database/queue.go diff --git a/database/queue.go b/database/queue.go deleted file mode 100644 index 6070b7d..0000000 --- a/database/queue.go +++ /dev/null @@ -1,13 +0,0 @@ -package database - -// PlayersInQueue returns the number of players in the queue -func (db *DB) PlayersInQueue() (int, error) { - var players int - query := `SELECT COUNT(*) FILTER (WHERE queueing) FROM "User"` - err := db.DB.QueryRow(query).Scan(&players) - if err != nil { - return -1, err - } - - return players, nil -} diff --git a/graph/resolver.go b/graph/resolver.go index 5cbe5a4..565241a 100644 --- a/graph/resolver.go +++ b/graph/resolver.go @@ -17,3 +17,14 @@ type Resolver struct { Config *config.Config Logger *log.Logger } + +func (r *Resolver) playersInQueue() (int, error) { + var players int + query := `SELECT COUNT(*) FILTER (WHERE queueing) FROM "User"` + err := r.DB.DB.QueryRow(query).Scan(&players) + if err != nil { + return -1, err + } + + return players, nil +} diff --git a/graph/schema.resolvers.go b/graph/schema.resolvers.go index 307df77..7b5c3df 100644 --- a/graph/schema.resolvers.go +++ b/graph/schema.resolvers.go @@ -168,7 +168,7 @@ func (r *mutationResolver) UpdateUser(ctx context.Context, id int, input model.U // StartQueue is the resolver for the startQueue field. func (r *mutationResolver) StartQueue(ctx context.Context, teamspeakID string) (int, error) { - players, err := r.DB.PlayersInQueue() + players, err := r.playersInQueue() if err != nil { return players, err } @@ -250,7 +250,7 @@ func (r *mutationResolver) CancelQueue(ctx context.Context, teamspeakID string) return -1, errors.New("user not in queue") } - players, err := r.DB.PlayersInQueue() + players, err := r.playersInQueue() return players, err } -- 2.44.0