seznam vseh replayev - resolves #49

mytja · Oct 30, 2023 · 2971cad · 2971cad
1 parent 5b1f855
commit 2971cad
Show file tree

Hide file tree

Showing 15 changed files with 1,218 additions and 937 deletions.
diff --git a/backend/internal/lobby/server.go b/backend/internal/lobby/server.go
@@ -1,6 +1,7 @@
 package lobby
 
 import (
+	"fmt"
 	"github.com/gorilla/websocket"
 	"github.com/mytja/Tarok/backend/internal/helpers"
 	"github.com/mytja/Tarok/backend/internal/lobby_messages"
@@ -399,6 +400,23 @@ func (s *serverImpl) Authenticated(client Client) {
 			},
 		})
 	}
+
+	replays, err := s.db.GetGamesByUserID(id)
+	if err != nil {
+		return
+	}
+
+	for _, v := range replays {
+		client.Send(&lobby_messages.LobbyMessage{
+			Data: &lobby_messages.LobbyMessage_Replay{
+				Replay: &lobby_messages.Replay{
+					Url:       fmt.Sprintf("https://palcka.si/replay/%s?password=%s", v.GameID, v.Password),
+					GameId:    v.GameID,
+					CreatedAt: v.CreatedAt,
+				},
+			},
+		})
+	}
 }
 
 func (s *serverImpl) GetDB() sql.SQL {

diff --git a/backend/internal/lobby_messages/lobby_messages.pb.go b/backend/internal/lobby_messages/lobby_messages.pb.go
diff --git a/backend/internal/sql/game.go b/backend/internal/sql/game.go
@@ -16,6 +16,11 @@ func (db *sqlImpl) GetGame(id string) (game Game, err error) {
 	return game, err
 }
 
+func (db *sqlImpl) GetGamesByUserID(id string) (games []Game, err error) {
+	err = db.db.Select(&games, "SELECT * FROM game_user WHERE user_id=$1 ORDER BY created_at DESC", id)
+	return games, err
+}
+
 func (db *sqlImpl) InsertGame(game Game) (err error) {
 	_, err = db.db.NamedExec(
 		"INSERT INTO game_user (user_id, game_id, messages, password) VALUES (:user_id, :game_id, :messages, :password)",

diff --git a/backend/internal/sql/sql.go b/backend/internal/sql/sql.go
@@ -49,6 +49,7 @@ type SQL interface {
 	DeleteFriends(ID string) error
 
 	GetGame(id string) (game Game, err error)
+	GetGamesByUserID(id string) (games []Game, err error)
 	InsertGame(game Game) (err error)
 	GetGames() (games []Game, err error)
 }

diff --git a/backend/internal/ws/replay.go b/backend/internal/ws/replay.go
@@ -95,6 +95,11 @@ func (s *serverImpl) NextReplayStep(gameId string) {
 		return
 	}
 
+	if len(game.ReplayMessages) <= game.ReplayGame {
+		s.logger.Debugw("ne morem pridobiti igre", "replayState", game.ReplayState, "g", game.ReplayGame, "msg", len(game.ReplayMessages))
+		return
+	}
+
 	g := game.ReplayMessages[game.ReplayGame]
 
 	game.ReplayState++

diff --git a/messages/lobby_messages.proto b/messages/lobby_messages.proto
@@ -86,6 +86,12 @@ message FriendRequestAcceptDecline {
 message FriendRequestSend { string email = 1; }
 message RemoveFriend { string relationshipId = 1; }
 
+message Replay {
+  string url = 1;
+  string gameId = 2;
+  string createdAt = 3;
+}
+
 message LobbyMessage {
   string player_id = 1;
 
@@ -105,5 +111,7 @@ message LobbyMessage {
     FriendRequestAcceptDecline friend_request_accept_decline = 22;
     FriendRequestSend friend_request_send = 23;
     RemoveFriend remove_friend = 24;
+
+    Replay replay = 25;
   }
 }