summaryrefslogtreecommitdiff
path: root/api
diff options
context:
space:
mode:
Diffstat (limited to 'api')
-rw-r--r--api/database/database.go2
-rw-r--r--api/database/models.go2
-rw-r--r--api/handlers/handlers.go14
3 files changed, 9 insertions, 9 deletions
diff --git a/api/database/database.go b/api/database/database.go
index 0ba40aa..4470c58 100644
--- a/api/database/database.go
+++ b/api/database/database.go
@@ -17,7 +17,7 @@ func InitDb(dsn string) (*gorm.DB, error) {
db, err = gorm.Open(postgres.Open(dsn), &gorm.Config{})
if err == nil {
- db.AutoMigrate(&User{}, &Play{})
+ db.AutoMigrate(&User{}, &Game{})
}
return db, err
diff --git a/api/database/models.go b/api/database/models.go
index 900c7b3..a6e76c5 100644
--- a/api/database/models.go
+++ b/api/database/models.go
@@ -10,7 +10,7 @@ type User struct {
UpdatedAt time.Time `json:"updated_at"`
}
-type Play struct {
+type Game struct {
ID int `json:"id"`
Player1ID int `json:"-"`
Player1 User `gorm:"foreignKey:Player1ID" json:"player1"`
diff --git a/api/handlers/handlers.go b/api/handlers/handlers.go
index fe2ca58..601b770 100644
--- a/api/handlers/handlers.go
+++ b/api/handlers/handlers.go
@@ -8,13 +8,13 @@ import (
"github.com/boozec/rahanna/api/auth"
"github.com/boozec/rahanna/api/database"
+ "github.com/boozec/rahanna/network"
utils "github.com/boozec/rahanna/pkg"
- "github.com/boozec/rahanna/relay"
"golang.org/x/crypto/bcrypt"
"gorm.io/gorm"
)
-type NewPlayRequest struct {
+type NewGameRequest struct {
IP string `json:"ip"`
}
@@ -121,8 +121,8 @@ func NewPlay(w http.ResponseWriter, r *http.Request) {
db, _ := database.GetDb()
- name := relay.NewSession()
- play := database.Play{
+ name := network.NewSession()
+ play := database.Game{
Player1ID: claims.UserID,
Player2ID: nil,
Name: name,
@@ -139,8 +139,8 @@ func NewPlay(w http.ResponseWriter, r *http.Request) {
json.NewEncoder(w).Encode(map[string]string{"name": name})
}
-func EnterPlay(w http.ResponseWriter, r *http.Request) {
- slog.Info("POST /enter-play")
+func EnterGame(w http.ResponseWriter, r *http.Request) {
+ slog.Info("POST /enter-game")
claims, err := auth.ValidateJWT(r.Header.Get("Authorization"))
if err != nil {
@@ -165,7 +165,7 @@ func EnterPlay(w http.ResponseWriter, r *http.Request) {
db, _ := database.GetDb()
- var play database.Play
+ var play database.Game
result := db.Where("name = ? AND player2_id IS NULL", payload.Name).First(&play)
if result.Error != nil {