kratisto/hamster-tycoon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add game name

Browse Source
This commit is contained in:
Jeffrey Duroyon
2020-07-22 00:49:36 +02:00
parent 90f86a02f4
commit 9978fbc9e3
4 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
liquibase/changelogs/changelog-master.xml
View File

@@ -9,4 +9,5 @@
<include file="changeset/create-game.xml" relativeToChangelogFile="true"/> <include file="changeset/create-game.xml" relativeToChangelogFile="true"/>
<include file="changeset/create-cage.xml" relativeToChangelogFile="true"/> <include file="changeset/create-cage.xml" relativeToChangelogFile="true"/>
<include file="changeset/create-hamster.xml" relativeToChangelogFile="true"/> <include file="changeset/create-hamster.xml" relativeToChangelogFile="true"/>
<include file="changeset/add-game-name.xml" relativeToChangelogFile="true"/>
</databaseChangeLog> </databaseChangeLog>

11
liquibase/changelogs/changeset/add-game-name.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<databaseChangeLog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
<changeSet id="add-game-name" author="kratisto">
<addColumn tableName="game">
<column name="name" type="varchar(255)"/>
</addColumn>
</changeSet>
</databaseChangeLog>

14
storage/dao/postgresql/database_postgresql_games.go
View File

@@ -9,7 +9,7 @@ import (
func (db *DatabasePostgreSQL) GetAllGames() ([]*model.Game, error) { func (db *DatabasePostgreSQL) GetAllGames() ([]*model.Game, error) {
q := ` 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 FROM public.game g
` `
rows, err := db.session.Query(q) rows, err := db.session.Query(q)
@@ -25,7 +25,7 @@ func (db *DatabasePostgreSQL) GetAllGames() ([]*model.Game, error) {
game := model.Game{ game := model.Game{
Server: server, 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 { if err != nil {
return nil, err return nil, err
} }
@@ -36,7 +36,7 @@ func (db *DatabasePostgreSQL) GetAllGames() ([]*model.Game, error) {
func (db *DatabasePostgreSQL) GetGameByID(id string) (*model.Game, error) { func (db *DatabasePostgreSQL) GetGameByID(id string) (*model.Game, error) {
q := ` 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 FROM public.game g
WHERE g.id = $1 WHERE g.id = $1
` `
@@ -47,7 +47,7 @@ func (db *DatabasePostgreSQL) GetGameByID(id string) (*model.Game, error) {
game := model.Game{ game := model.Game{
Server: server, 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 { if errPq, ok := err.(*pq.Error); ok {
return nil, handlePgError(errPq) 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 { func (db *DatabasePostgreSQL) CreateGame(game *model.Game) error {
q := ` q := `
INSERT INTO public.game INSERT INTO public.game
(server_id, user_id) (server_id, user_id, name)
VALUES VALUES
($1, $2) ($1, $2, $3)
RETURNING id, created_at RETURNING id, created_at
` `
err := db.session. 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) Scan(&game.ID, &game.CreatedAt)
if errPq, ok := err.(*pq.Error); ok { if errPq, ok := err.(*pq.Error); ok {
return handlePgError(errPq) return handlePgError(errPq)

1
storage/model/game.go
View File

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