chore(base): resolved merge-conflict

#5 [Story] Create User Sessions

knockoutwhistweb/app/model/sessions/AdvancedSession.scala

@@ -0,0 +1,14 @@
+package model.sessions
+
+import de.knockoutwhist.player.AbstractPlayer
+import de.knockoutwhist.utils.events.SimpleEvent
+
+import java.util.UUID
+
+case class AdvancedSession(id: UUID, player: AbstractPlayer) extends PlayerSession {
+  
+  def name: String = player.name
+  
+  override def updatePlayer(event: SimpleEvent): Unit = {
+  }
+}

knockoutwhistweb/app/model/sessions/PlayerSession.scala

@@ -0,0 +1,13 @@
+package model.sessions
+
+import de.knockoutwhist.utils.events.SimpleEvent
+
+import java.util.UUID
+
+trait PlayerSession {
+  
+  def id: UUID
+  def name: String
+  def updatePlayer(event: SimpleEvent): Unit
+  
+}

knockoutwhistweb/app/model/users/User.scala

@@ -0,0 +1,20 @@
+package model.users
+
+import java.util.UUID
+
+case class User(
+               internalId: Long,
+               id: UUID,
+               name: String,
+               passwordHash: String
+               ) {
+
+  def withName(newName: String): User = {
+    this.copy(name = newName)
+  }
+
+  private def withPasswordHash(newPasswordHash: String): User = {
+    this.copy(passwordHash = newPasswordHash)
+  }
+
+}