wip

storage/dao/postgresql/database_postgresql_games.go

@@ -9,7 +9,7 @@ import (
 
 func (db *DatabasePostgreSQL) GetAllGames() ([]*model.Game, error) {
 	q := `
-		SELECT g.id, g.server_id, g.name, g.user_id, g.created_at, g.updated_at
+		SELECT g.id, g.name, g.user_id, g.created_at, g.updated_at
 		FROM public.game g
 	`
 	rows, err := db.session.Query(q)
@@ -20,12 +20,9 @@ func (db *DatabasePostgreSQL) GetAllGames() ([]*model.Game, error) {
 
 	games := make([]*model.Game, 0)
 	for rows.Next() {
-		server := model.Server{}
 		user := model.User{}
-		game := model.Game{
-			Server: server,
-		}
-		err := rows.Scan(&game.ID, &server.ID, &game.Name, &user.ID, &game.CreatedAt, &game.UpdatedAt)
+		game := model.Game{}
+		err := rows.Scan(&game.ID, &game.Name, &user.ID, &game.CreatedAt, &game.UpdatedAt)
 		if err != nil {
 			return nil, err
 		}
@@ -36,18 +33,14 @@ func (db *DatabasePostgreSQL) GetAllGames() ([]*model.Game, error) {
 
 func (db *DatabasePostgreSQL) GetGameByID(id string) (*model.Game, error) {
 	q := `
-		SELECT g.id, g.server_id, g.name, g.user_id, g.created_at, g.updated_at
+		SELECT g.id, g.name, g.user_id, g.created_at, g.updated_at
 		FROM public.game g
 		WHERE g.id = $1
 	`
 	row := db.session.QueryRow(q, id)
-
-	server := model.Server{}
 	user := model.User{}
-	game := model.Game{
-		Server: server,
-	}
-	err := row.Scan(&game.ID, &server.ID, &game.Name, &user.ID, &game.CreatedAt, &game.UpdatedAt)
+	game := model.Game{}
+	err := row.Scan(&game.ID, &game.Name, &user.ID, &game.CreatedAt, &game.UpdatedAt)
 	if errPq, ok := err.(*pq.Error); ok {
 		return nil, handlePgError(errPq)
 	}
@@ -60,14 +53,14 @@ func (db *DatabasePostgreSQL) GetGameByID(id string) (*model.Game, error) {
 func (db *DatabasePostgreSQL) CreateGame(game *model.Game) error {
 	q := `
 		INSERT INTO public.game
-			(server_id, user_id, name)
+			(user_id, name)
 		VALUES
-			($1, $2, $3)
+			($1, $2)
 		RETURNING id, created_at
 	`
 
 	err := db.session.
-		QueryRow(q, game.Server.ID, game.User.ID, game.Name).
+		QueryRow(q, game.User.ID, game.Name).
 		Scan(&game.ID, &game.CreatedAt)
 	if errPq, ok := err.(*pq.Error); ok {
 		return handlePgError(errPq)

storage/model/game.go

@@ -5,7 +5,6 @@ import "time"
 type Game struct {
 	ID          string     `json:"game_id"`
 	User        User       `json:"-"`
-	Server      Server     `json:"server"`
 	Name        string     `json:"name"`
 	Cages       []*Cage    `json:"cages"`
 	SoldHamster []*Hamster `json:"sold_hamsters"`

storage/model/server.go

@@ -1,5 +0,0 @@
-package model
-
-type Server struct {
-	ID string
-}