From d7d4e2be9d506e31f2f8e4080663fbb65485e11d Mon Sep 17 00:00:00 2001
From: efim <efim.nefedov@nordigy.ru>
Date: Fri, 28 Apr 2023 11:54:51 +0400
Subject: [PATCH] bugfix: need to recognize owner after relogin

playerid is not stable right now, need to use nickname
---
 .../sunshine/planningpoker/Auth.scala         |  2 +-
 .../sunshine/planningpoker/RoomService.scala  |  2 +-
 .../sunshine/planningpoker/Models.scala       |  4 +--
 .../sunshine/planningpoker/TestModels.scala   | 28 +++++++++----------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/backend/src/main/scala/industries/sunshine/planningpoker/Auth.scala b/backend/src/main/scala/industries/sunshine/planningpoker/Auth.scala
index f9971bd..7b02155 100644
--- a/backend/src/main/scala/industries/sunshine/planningpoker/Auth.scala
+++ b/backend/src/main/scala/industries/sunshine/planningpoker/Auth.scala
@@ -82,6 +82,6 @@ object Auth {
 
   def make[F[_]: Sync](): F[Auth[F]] =
     for {
-      sessionsMap <- Ref.of[F, SessionsMap](TestModels.testSessions)
+      sessionsMap <- Ref.of[F, SessionsMap](Map.empty)
     } yield new SimpleAuth(sessionsMap)
 }
diff --git a/backend/src/main/scala/industries/sunshine/planningpoker/RoomService.scala b/backend/src/main/scala/industries/sunshine/planningpoker/RoomService.scala
index f3f7520..e216384 100644
--- a/backend/src/main/scala/industries/sunshine/planningpoker/RoomService.scala
+++ b/backend/src/main/scala/industries/sunshine/planningpoker/RoomService.scala
@@ -59,7 +59,7 @@ class InMemoryRoomService[F[_]: Concurrent](stateRef: Ref[F, Map[RoomID, (Room,
             val newRoom = Room(
               roomId,
               players = List(ownerPlayer),
-              owner = ownerPlayer.id,
+              owner = ownerPlayer.name,
               password = roomPassword,
               allowedCards = List("XS", "S", "M", "L", "XL"), // TODO accept from front
               round = RoundState.Voting(Map.empty),
diff --git a/common/src/main/scala/industries/sunshine/planningpoker/Models.scala b/common/src/main/scala/industries/sunshine/planningpoker/Models.scala
index 3197318..7d0f693 100644
--- a/common/src/main/scala/industries/sunshine/planningpoker/Models.scala
+++ b/common/src/main/scala/industries/sunshine/planningpoker/Models.scala
@@ -59,7 +59,7 @@ object Models {
   final case class Room(
       id: RoomID,
       players: List[Player],
-      owner: PlayerID, // TODO switch to nickname
+      owner: String, // TODO switch to nickname
       password: String,
       allowedCards: List[String],
       round: RoundState,
@@ -74,7 +74,7 @@ object Models {
             me.id,
             allowedCards,
             round.toViewFor(playerId),
-            playerId == owner
+            me.name == owner
           )
         )
     }
diff --git a/common/src/main/scala/industries/sunshine/planningpoker/TestModels.scala b/common/src/main/scala/industries/sunshine/planningpoker/TestModels.scala
index 3b788ae..7da765f 100644
--- a/common/src/main/scala/industries/sunshine/planningpoker/TestModels.scala
+++ b/common/src/main/scala/industries/sunshine/planningpoker/TestModels.scala
@@ -8,21 +8,21 @@ object TestModels {
   val birdy = Player("birdy", PlayerID(11))
   val horsey = Player("horsey", PlayerID(12))
 
-  val testRoomBackend = Room(
-    id = RoomID("testroom"),
-    players = List(me, birdy, pony, horsey),
-    owner = me.id,
-    password = "password",
-    allowedCards = List("xs", "s", "m", "l", "xl"),
-    round = RoundState.Viewing(
-      Map(me.id -> "xs", pony.id -> "l", birdy.id -> "s", horsey.id -> "m")
-    ),
-    playersPasswords = Map("me" -> "nickpassword") // nickname into password
-  )
+  // val testRoomBackend = Room(
+  //   id = RoomID("testroom"),
+  //   players = List(me, birdy, pony, horsey),
+  //   owner = me.id,
+  //   password = "password",
+  //   allowedCards = List("xs", "s", "m", "l", "xl"),
+  //   round = RoundState.Viewing(
+  //     Map(me.id -> "xs", pony.id -> "l", birdy.id -> "s", horsey.id -> "m")
+  //   ),
+  //   playersPasswords = Map("me" -> "nickpassword") // nickname into password
+  // )
 
-  val testSessionId = 1L
-  val testSessions = Map(testSessionId -> (testRoomBackend.id, me.id))
-  val testRooms = Map(testRoomBackend.id -> testRoomBackend)
+  // val testSessionId = 1L
+  // val testSessions = Map(testSessionId -> (testRoomBackend.id, me.id))
+  // val testRooms = Map(testRoomBackend.id -> testRoomBackend)
 
   val testChangesList = List(
     RoomStateView(