diff --git a/liquibase/changelogs/changelog-master.xml b/liquibase/changelogs/changelog-master.xml
index 3f50dd1..f738a29 100644
--- a/liquibase/changelogs/changelog-master.xml
+++ b/liquibase/changelogs/changelog-master.xml
@@ -9,4 +9,5 @@
+
\ No newline at end of file
diff --git a/liquibase/changelogs/changeset/add-game-name.xml b/liquibase/changelogs/changeset/add-game-name.xml
new file mode 100644
index 0000000..b0a12b1
--- /dev/null
+++ b/liquibase/changelogs/changeset/add-game-name.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/storage/dao/postgresql/database_postgresql_games.go b/storage/dao/postgresql/database_postgresql_games.go
index 8315eac..0fabdcd 100755
--- a/storage/dao/postgresql/database_postgresql_games.go
+++ b/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.user_id, g.created_at, g.updated_at
+ SELECT g.id, g.server_id, g.name, g.user_id, g.created_at, g.updated_at
FROM public.game g
`
rows, err := db.session.Query(q)
@@ -25,7 +25,7 @@ func (db *DatabasePostgreSQL) GetAllGames() ([]*model.Game, error) {
game := model.Game{
Server: server,
}
- err := rows.Scan(&game.ID, &server.ID, &user.ID, &game.CreatedAt, &game.UpdatedAt)
+ err := rows.Scan(&game.ID, &server.ID, &game.Name, &user.ID, &game.CreatedAt, &game.UpdatedAt)
if err != nil {
return nil, err
}
@@ -36,7 +36,7 @@ func (db *DatabasePostgreSQL) GetAllGames() ([]*model.Game, error) {
func (db *DatabasePostgreSQL) GetGameByID(id string) (*model.Game, error) {
q := `
- SELECT g.id, g.server_id, g.user_id, g.created_at, g.updated_at
+ SELECT g.id, g.server_id, g.name, g.user_id, g.created_at, g.updated_at
FROM public.game g
WHERE g.id = $1
`
@@ -47,7 +47,7 @@ func (db *DatabasePostgreSQL) GetGameByID(id string) (*model.Game, error) {
game := model.Game{
Server: server,
}
- err := row.Scan(&game.ID, &server.ID, &user.ID, &game.CreatedAt, &game.UpdatedAt)
+ err := row.Scan(&game.ID, &server.ID, &game.Name, &user.ID, &game.CreatedAt, &game.UpdatedAt)
if errPq, ok := err.(*pq.Error); ok {
return nil, handlePgError(errPq)
}
@@ -60,14 +60,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)
+ (server_id, user_id, name)
VALUES
- ($1, $2)
+ ($1, $2, $3)
RETURNING id, created_at
`
err := db.session.
- QueryRow(q, game.Server.ID, game.User.ID).
+ QueryRow(q, game.Server.ID, game.User.ID, game.Name).
Scan(&game.ID, &game.CreatedAt)
if errPq, ok := err.(*pq.Error); ok {
return handlePgError(errPq)
diff --git a/storage/model/game.go b/storage/model/game.go
index c231e96..4ffa490 100644
--- a/storage/model/game.go
+++ b/storage/model/game.go
@@ -6,6 +6,7 @@ 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"`
CreatedAt time.Time `json:"createdAt"`