From ec1174faa51fceeb0054b7a50c9a76213383797c Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Wed, 18 May 2022 20:20:40 +0200
Subject: [PATCH 01/27] Attempting to make Typing game wokr

---
 .../vibester/activity/PartyRoomActivity.kt    | 70 +++++++++++++++++++
 .../main/res/layout/activity_party_room.xml   | 12 ++++
 2 files changed, 82 insertions(+)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
index d5e6792fe..004304bb9 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
@@ -1,19 +1,31 @@
 package ch.sdp.vibester.activity
 
 import android.content.ContentValues
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.util.Log
+import android.widget.Button
 import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
 import ch.sdp.vibester.R
+import ch.sdp.vibester.api.LastfmApiInterface
+import ch.sdp.vibester.api.LastfmMethod
+import ch.sdp.vibester.api.LastfmUri
+import ch.sdp.vibester.database.AppPreferences
 import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.database.Database
+import ch.sdp.vibester.helper.GameManager
 import ch.sdp.vibester.helper.PartyRoom
 import ch.sdp.vibester.user.User
 import com.google.firebase.database.DataSnapshot
 import com.google.firebase.database.DatabaseError
 import com.google.firebase.database.ValueEventListener
+import com.google.gson.Gson
 import dagger.hilt.android.AndroidEntryPoint
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -21,6 +33,8 @@ class PartyRoomActivity : AppCompatActivity() {
     @Inject
     lateinit var dataGetter: DataGetter
 
+    lateinit var gameManager: GameManager
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_party_room)
@@ -33,6 +47,23 @@ class PartyRoomActivity : AppCompatActivity() {
         else {
             fetchData(roomName)
         }
+
+        val startGame = findViewById<Button>(R.id.startGame)
+
+        startGame.setOnClickListener {
+            setGameManager()
+
+            Log.w("DEBUG", gameManager.gameSize.toString())
+            Log.w("DEBUG", gameManager.getSongList().toString())
+
+            Thread.sleep(3000)
+
+            val newIntent = Intent(this, TypingGameActivity::class.java)
+            newIntent.putExtra("gameManager", gameManager)
+            newIntent.putExtra("Difficulty", R.string.easy.toString())
+
+            startActivity(newIntent)
+        }
     }
 
     private fun updateUI(partyRoom: PartyRoom) {
@@ -46,4 +77,43 @@ class PartyRoomActivity : AppCompatActivity() {
     private fun createRoom(roomName: String) {
         dataGetter.createRoom(roomName, this::updateUI)
     }
+
+    private fun setGameManager() {
+        gameManager = GameManager()
+        gameManager.setGameSize(1)
+
+        chooseGenre(method = LastfmMethod.BY_ARTIST.method, artist = "Imagine Dragons", mode = R.string.imagine_dragons)
+//        setGameSongList
+
+    }
+
+    private fun setGameSongList(uri: LastfmUri) {
+        val service = LastfmApiInterface.createLastfmService()
+        val call = service.getSongList(uri.convertToHashmap())
+        call.enqueue(object : Callback<Any> {
+            override fun onFailure(call: Call<Any>, t: Throwable?) {}
+            override fun onResponse(call: Call<Any>, response: Response<Any>) {
+                /* TODO: OFFLINE
+                gameManager.setInternet()
+                gameManager.setContext(context)
+                 */
+
+                gameManager.setGameSongList(Gson().toJson(response.body()), uri.method)
+                Log.w("DEBUG", gameManager.getSongList().toString())
+            }
+        })
+    }
+
+    private fun chooseGenre(method: String = "", artist: String = "", tag: String = "", mode: Int = 0) {
+        val uri = LastfmUri()
+
+        uri.method = method
+        uri.artist = artist
+        uri.tag = tag
+
+        gameManager.gameMode = getString(mode)
+        AppPreferences.setStr(getString(R.string.preferences_game_genre), getString(mode))
+
+        setGameSongList(uri)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_party_room.xml b/app/src/main/res/layout/activity_party_room.xml
index f136e7fc0..5fb37b3f8 100644
--- a/app/src/main/res/layout/activity_party_room.xml
+++ b/app/src/main/res/layout/activity_party_room.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:visibility="visible"
     tools:context=".activity.PartyRoomActivity">
 
     <TextView
@@ -18,4 +19,15 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.275" />
+
+    <Button
+        android:id="@+id/startGame"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="134dp"
+        android:text="start game"
+        android:visibility="visible"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/emails" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 4b21dc8f8d0456ed394f3fd16257d79f3306091b Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Wed, 18 May 2022 22:40:13 +0200
Subject: [PATCH 02/27] Managed to play songs

---
 .../vibester/activity/PartyRoomActivity.kt    | 28 ++++++++++---------
 .../ch/sdp/vibester/database/DataGetter.kt    | 13 ++++++++-
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
index 004304bb9..95cd014d6 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
@@ -27,6 +27,7 @@ import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 import javax.inject.Inject
+import kotlin.properties.Delegates
 
 @AndroidEntryPoint
 class PartyRoomActivity : AppCompatActivity() {
@@ -35,6 +36,8 @@ class PartyRoomActivity : AppCompatActivity() {
 
     lateinit var gameManager: GameManager
 
+    var gameStarted: Boolean = false
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_party_room)
@@ -52,17 +55,6 @@ class PartyRoomActivity : AppCompatActivity() {
 
         startGame.setOnClickListener {
             setGameManager()
-
-            Log.w("DEBUG", gameManager.gameSize.toString())
-            Log.w("DEBUG", gameManager.getSongList().toString())
-
-            Thread.sleep(3000)
-
-            val newIntent = Intent(this, TypingGameActivity::class.java)
-            newIntent.putExtra("gameManager", gameManager)
-            newIntent.putExtra("Difficulty", R.string.easy.toString())
-
-            startActivity(newIntent)
         }
     }
 
@@ -83,8 +75,16 @@ class PartyRoomActivity : AppCompatActivity() {
         gameManager.setGameSize(1)
 
         chooseGenre(method = LastfmMethod.BY_ARTIST.method, artist = "Imagine Dragons", mode = R.string.imagine_dragons)
-//        setGameSongList
+    }
+
+    private fun launchGame(newGameManager: GameManager) {
+        val newIntent = Intent(this, TypingGameActivity::class.java)
+        newIntent.putExtra("gameManager", newGameManager)
+        newIntent.putExtra("Difficulty", R.string.easy.toString())
 
+        Log.w("DEBUG", "KA BLET")
+
+        startActivity(newIntent)
     }
 
     private fun setGameSongList(uri: LastfmUri) {
@@ -98,8 +98,10 @@ class PartyRoomActivity : AppCompatActivity() {
                 gameManager.setContext(context)
                  */
 
+                //Maybe only save URI?
+
                 gameManager.setGameSongList(Gson().toJson(response.body()), uri.method)
-                Log.w("DEBUG", gameManager.getSongList().toString())
+                launchGame(gameManager)
             }
         })
     }
diff --git a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
index cc1a24922..c40b6e06c 100644
--- a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -3,6 +3,7 @@ package ch.sdp.vibester.database
 import android.content.ContentValues
 import android.util.Log
 import ch.sdp.vibester.auth.FireBaseAuthenticator
+import ch.sdp.vibester.helper.GameManager
 import ch.sdp.vibester.helper.PartyRoom
 import ch.sdp.vibester.user.User
 import com.google.firebase.auth.FirebaseUser
@@ -223,4 +224,14 @@ class DataGetter @Inject constructor() {
             }
         })
     }
-}
\ No newline at end of file
+
+    fun saveSongList(roomID: String, songList: MutableList<Pair<String, String>>) {
+        dbRoomRef.child("${roomID}/songList").setValue(songList)
+    }
+
+    fun updateStartGame(roomID: String, value: Boolean) {
+        dbRoomRef.child("${roomID}/songList").setValue(value)
+    }
+
+}
+

From 02d0c0c8f2e3b983cf30ee684aebce7b01e4f473 Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Thu, 19 May 2022 08:18:05 +0200
Subject: [PATCH 03/27] Working on syncing songs

---
 .../vibester/activity/PartyRoomActivity.kt    | 11 ++++--
 .../ch/sdp/vibester/database/DataGetter.kt    | 34 +++++++++++++++++--
 .../sdp/vibester/helper/ArtistIdentifier.kt   | 10 ++++++
 .../java/ch/sdp/vibester/helper/PartyRoom.kt  |  9 +++++
 4 files changed, 59 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/ch/sdp/vibester/helper/ArtistIdentifier.kt

diff --git a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
index 95cd014d6..74daaf79d 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
@@ -15,6 +15,7 @@ import ch.sdp.vibester.api.LastfmUri
 import ch.sdp.vibester.database.AppPreferences
 import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.database.Database
+import ch.sdp.vibester.helper.ArtistIdentifier
 import ch.sdp.vibester.helper.GameManager
 import ch.sdp.vibester.helper.PartyRoom
 import ch.sdp.vibester.user.User
@@ -54,7 +55,9 @@ class PartyRoomActivity : AppCompatActivity() {
         val startGame = findViewById<Button>(R.id.startGame)
 
         startGame.setOnClickListener {
+//            dataGetter.dowloadSongList(roomName, this::launchGame)
             setGameManager()
+//            dataGetter.updateSongList("room1", gameManager.getSongList())
         }
     }
 
@@ -82,8 +85,6 @@ class PartyRoomActivity : AppCompatActivity() {
         newIntent.putExtra("gameManager", newGameManager)
         newIntent.putExtra("Difficulty", R.string.easy.toString())
 
-        Log.w("DEBUG", "KA BLET")
-
         startActivity(newIntent)
     }
 
@@ -98,9 +99,9 @@ class PartyRoomActivity : AppCompatActivity() {
                 gameManager.setContext(context)
                  */
 
-                //Maybe only save URI?
 
                 gameManager.setGameSongList(Gson().toJson(response.body()), uri.method)
+                Log.w("DEBUG", gameManager.getSongList().toString())
                 launchGame(gameManager)
             }
         })
@@ -118,4 +119,8 @@ class PartyRoomActivity : AppCompatActivity() {
 
         setGameSongList(uri)
     }
+
+    private fun dowloadSongList() {
+
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
index c40b6e06c..75f45735c 100644
--- a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -2,7 +2,9 @@ package ch.sdp.vibester.database
 
 import android.content.ContentValues
 import android.util.Log
+import ch.sdp.vibester.R
 import ch.sdp.vibester.auth.FireBaseAuthenticator
+import ch.sdp.vibester.helper.ArtistIdentifier
 import ch.sdp.vibester.helper.GameManager
 import ch.sdp.vibester.helper.PartyRoom
 import ch.sdp.vibester.user.User
@@ -225,13 +227,41 @@ class DataGetter @Inject constructor() {
         })
     }
 
-    fun saveSongList(roomID: String, songList: MutableList<Pair<String, String>>) {
+    fun updateSongList(roomID: String, songList: MutableList<Pair<String, String>>) {
         dbRoomRef.child("${roomID}/songList").setValue(songList)
     }
 
     fun updateStartGame(roomID: String, value: Boolean) {
-        dbRoomRef.child("${roomID}/songList").setValue(value)
+        dbRoomRef.child("${roomID}/gameStarted").setValue(value)
     }
 
+//    fun dowloadSongList(roomName: String, callback: (GameManager) -> Unit) {
+//        val queryRooms = dbRoomRef
+//            .orderByChild("roomName")
+//            .equalTo(roomName)
+//
+//        //Hardcoding for now
+//        val gameManager = GameManager()
+//        gameManager.setGameSize(1)
+//        gameManager.gameMode = R.string.imagine_dragons.toString()
+//
+//        queryRooms.addValueEventListener(object : ValueEventListener {
+//            override fun onDataChange(dataSnapshot: DataSnapshot) {
+//                for (snapshot in dataSnapshot.children) {
+//                    val songList = snapshot.getValue(MutableList<Pair<String, String>>)
+//                    if(songList != null) {
+//                        val songList = songList
+//                        gameManager.gameSongList = songList
+//
+//                        callback(gameManager)
+//                    }
+//                }
+//            }
+//            override fun onCancelled(error: DatabaseError) {
+//                Log.w(ContentValues.TAG, "dowloadSongList:onCancelled", error.toException())
+//            }
+//        })
+//    }
+
 }
 
diff --git a/app/src/main/java/ch/sdp/vibester/helper/ArtistIdentifier.kt b/app/src/main/java/ch/sdp/vibester/helper/ArtistIdentifier.kt
new file mode 100644
index 000000000..eee58b649
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/helper/ArtistIdentifier.kt
@@ -0,0 +1,10 @@
+package ch.sdp.vibester.helper
+
+import ch.sdp.vibester.R
+import ch.sdp.vibester.api.LastfmMethod
+
+class ArtistIdentifier {
+    var method: String = LastfmMethod.BY_ARTIST.method
+    var artist: String = "Imagine Dragons"
+    var mode: Int = R.string.imagine_dragons
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/helper/PartyRoom.kt b/app/src/main/java/ch/sdp/vibester/helper/PartyRoom.kt
index e831fd286..bf1db9f3f 100644
--- a/app/src/main/java/ch/sdp/vibester/helper/PartyRoom.kt
+++ b/app/src/main/java/ch/sdp/vibester/helper/PartyRoom.kt
@@ -5,6 +5,7 @@ class PartyRoom() {
     private lateinit var roomName: String
     private lateinit var userEmails: MutableList<String>
     private lateinit var roomID: String
+//    var gameSongList: MutableList<Pair<String, String>> = mutableListOf()
 
     fun addUserEmail(email: String) {
         userEmails.add(email)
@@ -33,4 +34,12 @@ class PartyRoom() {
     fun setEmailList(userEmails: MutableList<String>) {
         this.userEmails = userEmails
     }
+
+//    fun getSongList(): MutableList<Pair<String, String>> {
+//        return gameSongList
+//    }
+//
+//    fun setSongList(gameSongList: MutableList<Pair<String, String>>) {
+//        this.gameSongList = gameSongList
+//    }
 }
\ No newline at end of file

From 5e8c92814153fe3380338dc7c6ad6ffe812206a8 Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Thu, 19 May 2022 22:15:32 +0200
Subject: [PATCH 04/27] Managed to read songs

---
 .../vibester/activity/PartyRoomActivity.kt    |  5 +++
 .../ch/sdp/vibester/database/DataGetter.kt    | 43 ++++++++++++++-----
 2 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
index 74daaf79d..cc42105b0 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
@@ -80,7 +80,12 @@ class PartyRoomActivity : AppCompatActivity() {
         chooseGenre(method = LastfmMethod.BY_ARTIST.method, artist = "Imagine Dragons", mode = R.string.imagine_dragons)
     }
 
+    private fun test() {
+        Log.w("DEBUG LMAO", "HELLO HELLO")
+    }
+
     private fun launchGame(newGameManager: GameManager) {
+
         val newIntent = Intent(this, TypingGameActivity::class.java)
         newIntent.putExtra("gameManager", newGameManager)
         newIntent.putExtra("Difficulty", R.string.easy.toString())
diff --git a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
index 75f45735c..e4d838910 100644
--- a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -13,7 +13,9 @@ import com.google.firebase.database.DataSnapshot
 import com.google.firebase.database.DatabaseError
 import com.google.firebase.database.ValueEventListener
 import com.google.firebase.database.ktx.getValue
+import java.util.*
 import javax.inject.Inject
+import kotlin.collections.ArrayList
 
 /**
  * The users class which handled all the interactions with the database that are linked to users
@@ -202,7 +204,7 @@ class DataGetter @Inject constructor() {
      * @param callback the function to be called when the data of the appropriate user is available
      */
 
-    fun getRoomData(roomName: String, callback: (PartyRoom) -> Unit) {
+    fun getRoomData(roomName: String, partyRoomCallback: (PartyRoom) -> Unit ) {
         val queryRooms = dbRoomRef
             .orderByChild("roomName")
             .equalTo(roomName)
@@ -210,6 +212,7 @@ class DataGetter @Inject constructor() {
         queryRooms.addValueEventListener(object : ValueEventListener {
             override fun onDataChange(dataSnapshot: DataSnapshot) {
                 for (snapshot in dataSnapshot.children) {
+//                    Log.w("DEBUG LMAO", snapshot.value.toString())
                     val partyRoom: PartyRoom? = snapshot.getValue(PartyRoom::class.java)
                     if(partyRoom != null) {
                         val currUserEmail = getCurrentUser()?.email!!
@@ -217,8 +220,14 @@ class DataGetter @Inject constructor() {
                             partyRoom.addUserEmail(currUserEmail)
                             updateRoomUserList(partyRoom)
                         }
-                        callback(partyRoom)
+                        partyRoomCallback(partyRoom)
                     }
+                    val songList = snapshot.getValue() as Map<String, Object>
+                    val testList = songList["songList"] as List<*>
+//                    Log.w("DEBUG LOL", testList[0].)
+                    val pairTest: Map<String, String> = testList[0] as Map<String, String>
+//                    Log.w("DEBUG LOL", pairTest.getOrDefault("first", "hello"))
+//                    Log.w("DEBUG gg", songList["songList"].toString())
                 }
             }
             override fun onCancelled(error: DatabaseError) {
@@ -234,9 +243,12 @@ class DataGetter @Inject constructor() {
     fun updateStartGame(roomID: String, value: Boolean) {
         dbRoomRef.child("${roomID}/gameStarted").setValue(value)
     }
-
-//    fun dowloadSongList(roomName: String, callback: (GameManager) -> Unit) {
-//        val queryRooms = dbRoomRef
+//callback: (GameManager) -> Unit
+//    fun dowloadSongList(roomName: String, callback: () -> Unit) {
+//
+//    Log.w("DEBUG LMAO", "I get to here")
+//
+//    val queryRooms = dbRoomRef
 //            .orderByChild("roomName")
 //            .equalTo(roomName)
 //
@@ -245,16 +257,24 @@ class DataGetter @Inject constructor() {
 //        gameManager.setGameSize(1)
 //        gameManager.gameMode = R.string.imagine_dragons.toString()
 //
+//    Log.w("DEBUG LMAO", "I get to here22")
+//
 //        queryRooms.addValueEventListener(object : ValueEventListener {
 //            override fun onDataChange(dataSnapshot: DataSnapshot) {
 //                for (snapshot in dataSnapshot.children) {
-//                    val songList = snapshot.getValue(MutableList<Pair<String, String>>)
-//                    if(songList != null) {
-//                        val songList = songList
-//                        gameManager.gameSongList = songList
-//
-//                        callback(gameManager)
+////                    callback()
+//                    val partyRoom: PartyRoom? = snapshot.getValue(PartyRoom::class.java)
+//                    if (partyRoom != null) {
+//                        Log.w("DEBUG LMAO", partyRoom.getRoomName())
 //                    }
+//                    Log.w("DEBUG LMAO", snapshot.value.toString())
+////                    val songList = snapshot.getValue(MutableList<Pair<String, String>>)
+////                    if(songList != null) {
+////                        val songList = songList
+////                        gameManager.gameSongList = songList
+////
+////                        callback(gameManager)
+////                    }
 //                }
 //            }
 //            override fun onCancelled(error: DatabaseError) {
@@ -265,3 +285,4 @@ class DataGetter @Inject constructor() {
 
 }
 
+

From 37289948905405be7bee02ee3d5df557026c908c Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Thu, 19 May 2022 23:01:04 +0200
Subject: [PATCH 05/27] Managed to read songs

---
 .../vibester/activity/PartyRoomActivity.kt    | 25 +++++++++++---
 .../ch/sdp/vibester/database/DataGetter.kt    | 33 ++++++++++++++-----
 2 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
index cc42105b0..09e04cbeb 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
@@ -55,9 +55,12 @@ class PartyRoomActivity : AppCompatActivity() {
         val startGame = findViewById<Button>(R.id.startGame)
 
         startGame.setOnClickListener {
-//            dataGetter.dowloadSongList(roomName, this::launchGame)
-            setGameManager()
-//            dataGetter.updateSongList("room1", gameManager.getSongList())
+            if(!gameStarted) {
+
+            }
+            else {
+                setGameManager()
+            }
         }
     }
 
@@ -66,7 +69,7 @@ class PartyRoomActivity : AppCompatActivity() {
     }
 
     private fun fetchData(roomName: String) {
-        dataGetter.getRoomData(roomName, this::updateUI)
+        dataGetter.getRoomData(roomName, true, this::updateUI, this::setSongs)
     }
 
     private fun createRoom(roomName: String) {
@@ -125,7 +128,19 @@ class PartyRoomActivity : AppCompatActivity() {
         setGameSongList(uri)
     }
 
-    private fun dowloadSongList() {
+    private fun setSongs(gameSongList: MutableList<Pair<String, String>>) {
+        val newGameManager = GameManager()
+        newGameManager.setGameSize(1)
+        newGameManager.gameMode = getString(R.string.imagine_dragons)
+
+        newGameManager.gameSongList = gameSongList
+
+        Log.w("DEBUG LMAO", newGameManager.gameSongList.toString())
 
+        launchGame(newGameManager)
     }
+//
+//    private fun dowloadSongList(gameSongList: MutableList<Pair<String, String>>) {
+//
+//    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
index e4d838910..4c7e47aa2 100644
--- a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -204,15 +204,23 @@ class DataGetter @Inject constructor() {
      * @param callback the function to be called when the data of the appropriate user is available
      */
 
-    fun getRoomData(roomName: String, partyRoomCallback: (PartyRoom) -> Unit ) {
+    fun getRoomData(roomName: String,
+                    startGame: Boolean,
+                    partyRoomCallback: (PartyRoom) -> Unit,
+                    songListCallback: (MutableList<Pair<String, String>>) -> Unit) {
+
+        Log.w("DEBUG", "I get to here")
+
         val queryRooms = dbRoomRef
             .orderByChild("roomName")
             .equalTo(roomName)
 
+        Log.w("DEBUG", "I get to here22")
+
+
         queryRooms.addValueEventListener(object : ValueEventListener {
             override fun onDataChange(dataSnapshot: DataSnapshot) {
                 for (snapshot in dataSnapshot.children) {
-//                    Log.w("DEBUG LMAO", snapshot.value.toString())
                     val partyRoom: PartyRoom? = snapshot.getValue(PartyRoom::class.java)
                     if(partyRoom != null) {
                         val currUserEmail = getCurrentUser()?.email!!
@@ -222,12 +230,21 @@ class DataGetter @Inject constructor() {
                         }
                         partyRoomCallback(partyRoom)
                     }
-                    val songList = snapshot.getValue() as Map<String, Object>
-                    val testList = songList["songList"] as List<*>
-//                    Log.w("DEBUG LOL", testList[0].)
-                    val pairTest: Map<String, String> = testList[0] as Map<String, String>
-//                    Log.w("DEBUG LOL", pairTest.getOrDefault("first", "hello"))
-//                    Log.w("DEBUG gg", songList["songList"].toString())
+                    if(startGame) {
+                        val snapshotMap = snapshot.getValue() as Map<String, Object>
+                        val songList = snapshotMap["songList"] as List<*>
+                        var gameSongList: MutableList<Pair<String, String>> = mutableListOf()
+                        for (song in songList) {
+                            val tempPair: Map<String, String> = song as Map<String, String>
+                            gameSongList.add(
+                                Pair(
+                                    tempPair.getOrDefault("first", ""),
+                                    tempPair.getOrDefault("second", "")
+                                )
+                            )
+                        }
+                        songListCallback(gameSongList)
+                    }
                 }
             }
             override fun onCancelled(error: DatabaseError) {

From df70d370b38d96c784f516803c5065413d61cd40 Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Thu, 19 May 2022 23:43:40 +0200
Subject: [PATCH 06/27] Synced songs with database

---
 .../vibester/activity/PartyRoomActivity.kt    | 45 ++++++-------
 .../ch/sdp/vibester/database/DataGetter.kt    | 65 ++++++-------------
 2 files changed, 43 insertions(+), 67 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
index 09e04cbeb..d6c83b7e5 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
@@ -37,8 +37,6 @@ class PartyRoomActivity : AppCompatActivity() {
 
     lateinit var gameManager: GameManager
 
-    var gameStarted: Boolean = false
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_party_room)
@@ -50,17 +48,18 @@ class PartyRoomActivity : AppCompatActivity() {
         }
         else {
             fetchData(roomName)
+            fetchGameStarted(roomName, this::startGame)
         }
 
         val startGame = findViewById<Button>(R.id.startGame)
 
         startGame.setOnClickListener {
-            if(!gameStarted) {
-
-            }
-            else {
-                setGameManager()
-            }
+//            if(true) {
+//
+//            }
+//            else {
+//                setGameManager()
+//            }
         }
     }
 
@@ -76,6 +75,16 @@ class PartyRoomActivity : AppCompatActivity() {
         dataGetter.createRoom(roomName, this::updateUI)
     }
 
+    private fun fetchGameStarted(roomName: String, callback: (Boolean) -> Unit) {
+        dataGetter.readStartGame(roomName, callback)
+    }
+
+    private fun startGame(gameStarted: Boolean) {
+        if(gameStarted) {
+            launchGame(gameManager)
+        }
+    }
+
     private fun setGameManager() {
         gameManager = GameManager()
         gameManager.setGameSize(1)
@@ -83,9 +92,6 @@ class PartyRoomActivity : AppCompatActivity() {
         chooseGenre(method = LastfmMethod.BY_ARTIST.method, artist = "Imagine Dragons", mode = R.string.imagine_dragons)
     }
 
-    private fun test() {
-        Log.w("DEBUG LMAO", "HELLO HELLO")
-    }
 
     private fun launchGame(newGameManager: GameManager) {
 
@@ -129,18 +135,13 @@ class PartyRoomActivity : AppCompatActivity() {
     }
 
     private fun setSongs(gameSongList: MutableList<Pair<String, String>>) {
-        val newGameManager = GameManager()
-        newGameManager.setGameSize(1)
-        newGameManager.gameMode = getString(R.string.imagine_dragons)
-
-        newGameManager.gameSongList = gameSongList
+//        val newGameManager = GameManager()
+        gameManager = GameManager()
+        gameManager.setGameSize(1)
+        gameManager.gameMode = getString(R.string.imagine_dragons)
 
-        Log.w("DEBUG LMAO", newGameManager.gameSongList.toString())
+        gameManager.gameSongList = gameSongList
 
-        launchGame(newGameManager)
     }
-//
-//    private fun dowloadSongList(gameSongList: MutableList<Pair<String, String>>) {
-//
-//    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
index 4c7e47aa2..e22e0e89d 100644
--- a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -16,7 +16,6 @@ import com.google.firebase.database.ktx.getValue
 import java.util.*
 import javax.inject.Inject
 import kotlin.collections.ArrayList
-
 /**
  * The users class which handled all the interactions with the database that are linked to users
  */
@@ -209,15 +208,10 @@ class DataGetter @Inject constructor() {
                     partyRoomCallback: (PartyRoom) -> Unit,
                     songListCallback: (MutableList<Pair<String, String>>) -> Unit) {
 
-        Log.w("DEBUG", "I get to here")
-
         val queryRooms = dbRoomRef
             .orderByChild("roomName")
             .equalTo(roomName)
 
-        Log.w("DEBUG", "I get to here22")
-
-
         queryRooms.addValueEventListener(object : ValueEventListener {
             override fun onDataChange(dataSnapshot: DataSnapshot) {
                 for (snapshot in dataSnapshot.children) {
@@ -260,46 +254,27 @@ class DataGetter @Inject constructor() {
     fun updateStartGame(roomID: String, value: Boolean) {
         dbRoomRef.child("${roomID}/gameStarted").setValue(value)
     }
-//callback: (GameManager) -> Unit
-//    fun dowloadSongList(roomName: String, callback: () -> Unit) {
-//
-//    Log.w("DEBUG LMAO", "I get to here")
-//
-//    val queryRooms = dbRoomRef
-//            .orderByChild("roomName")
-//            .equalTo(roomName)
-//
-//        //Hardcoding for now
-//        val gameManager = GameManager()
-//        gameManager.setGameSize(1)
-//        gameManager.gameMode = R.string.imagine_dragons.toString()
-//
-//    Log.w("DEBUG LMAO", "I get to here22")
-//
-//        queryRooms.addValueEventListener(object : ValueEventListener {
-//            override fun onDataChange(dataSnapshot: DataSnapshot) {
-//                for (snapshot in dataSnapshot.children) {
-////                    callback()
-//                    val partyRoom: PartyRoom? = snapshot.getValue(PartyRoom::class.java)
-//                    if (partyRoom != null) {
-//                        Log.w("DEBUG LMAO", partyRoom.getRoomName())
-//                    }
-//                    Log.w("DEBUG LMAO", snapshot.value.toString())
-////                    val songList = snapshot.getValue(MutableList<Pair<String, String>>)
-////                    if(songList != null) {
-////                        val songList = songList
-////                        gameManager.gameSongList = songList
-////
-////                        callback(gameManager)
-////                    }
-//                }
-//            }
-//            override fun onCancelled(error: DatabaseError) {
-//                Log.w(ContentValues.TAG, "dowloadSongList:onCancelled", error.toException())
-//            }
-//        })
-//    }
+
+    fun readStartGame(roomName: String, callback: (Boolean) -> Unit) {
+        val queryRooms = dbRoomRef
+            .orderByChild("roomName")
+            .equalTo(roomName)
+
+        queryRooms.addValueEventListener(object : ValueEventListener {
+            override fun onDataChange(dataSnapshot: DataSnapshot) {
+                for (snapshot in dataSnapshot.children) {
+                    val snapshotMap = snapshot.getValue() as Map<String, Object>
+                    val gameStarted: Boolean = snapshotMap["gameStarted"] as Boolean
+                    callback(gameStarted)
+                }
+            }
+            override fun onCancelled(error: DatabaseError) {
+                Log.w(ContentValues.TAG, "getRoomData:onCancelled", error.toException())
+            }
+        })
 
 }
+}
+
 
 

From 77dda785b7c589f0b8c45b2b7632e7c325a7dc37 Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Sun, 22 May 2022 13:34:13 +0200
Subject: [PATCH 07/27] Synced songs with database

---
 .../ch/sdp/vibester/activity/PartyRoomActivity.kt   | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
index d6c83b7e5..9028edc64 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
@@ -37,6 +37,8 @@ class PartyRoomActivity : AppCompatActivity() {
 
     lateinit var gameManager: GameManager
 
+
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_party_room)
@@ -48,19 +50,15 @@ class PartyRoomActivity : AppCompatActivity() {
         }
         else {
             fetchData(roomName)
-            fetchGameStarted(roomName, this::startGame)
         }
 
         val startGame = findViewById<Button>(R.id.startGame)
 
         startGame.setOnClickListener {
-//            if(true) {
-//
-//            }
-//            else {
-//                setGameManager()
-//            }
+            dataGetter.updateStartGame("room1", true)
         }
+
+        fetchGameStarted(roomName, this::startGame)
     }
 
     private fun updateUI(partyRoom: PartyRoom) {
@@ -135,7 +133,6 @@ class PartyRoomActivity : AppCompatActivity() {
     }
 
     private fun setSongs(gameSongList: MutableList<Pair<String, String>>) {
-//        val newGameManager = GameManager()
         gameManager = GameManager()
         gameManager.setGameSize(1)
         gameManager.gameMode = getString(R.string.imagine_dragons)

From b21fde1c62fa9d43e2a3d9b63d6e5c36cba95160 Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Mon, 23 May 2022 11:32:09 +0200
Subject: [PATCH 08/27] Started tests

---
 .../activity/ChoosePartyRoomActivityTest.kt   |  6 +++-
 .../activity/PartyRoomActivityTest.kt         | 34 ++++++++++++-------
 .../vibester/activity/PartyRoomActivity.kt    | 12 ++-----
 3 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt
index cafae8e9b..dedfe6e48 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt
@@ -47,9 +47,13 @@ class ChoosePartyRoomActivityTest {
             lastArg<(PartyRoom) -> Unit>().invoke(partyRoom)
         }
 
-        every {mockUsersRepo.getRoomData(any(), any())} answers {
+        every {mockUsersRepo.getRoomData(any(), any(), any(), any())} answers {
             lastArg<(PartyRoom) -> Unit>().invoke(partyRoom)
         }
+
+        every { mockUsersRepo.readStartGame(any(), any()) } answers {
+            false
+        }
     }
 
     @After
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
index f59de9619..42b7e7e0c 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
@@ -1,8 +1,7 @@
 package ch.sdp.vibester.activity
 
-/*
+
 import android.content.Intent
-import android.provider.Telephony
 import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso
@@ -13,7 +12,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
 import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.helper.PartyRoom
-import ch.sdp.vibester.user.User
 import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
@@ -42,30 +40,38 @@ class PartyRoomActivityTest {
     @JvmField
     val mockUsersRepo = mockk<DataGetter>()
 
-    private fun createMockInvocation(partyRoom: PartyRoom) {
+    private fun createMockInvocation(partyRoom: PartyRoom, songList: MutableList<Pair<String, String>>) {
         every {mockUsersRepo.createRoom(any(), any())} answers {
             lastArg<(PartyRoom) -> Unit>().invoke(partyRoom)
         }
 
-        every {mockUsersRepo.getRoomData(any(), any())} answers {
-            lastArg<(PartyRoom) -> Unit>().invoke(partyRoom)
+        every {mockUsersRepo.getRoomData(any(), any(), any(), any())} answers {
+            thirdArg<(PartyRoom) -> Unit>().invoke(partyRoom)
+            lastArg<(MutableList<Pair<String, String>>) -> Unit>().invoke(songList)
         }
+
+        every { mockUsersRepo.readStartGame(any(), any()) } answers {
+            false
+        }
+
+        every { mockUsersRepo.updateSongList(any(), any()) } answers {}
     }
 
     @After
     fun clean() {
         Intents.release()
     }
-/*
+
     @Test
     fun correctCreation() {
         var mockRoomName = "mockName"
         var mockUserEmailList = mutableListOf<String>("email1, email2")
+        var mockSongList = mutableListOf<Pair<String, String>>(Pair("mockSong1", "mockSong2"))
         var mockPartyRoom = PartyRoom()
 
         mockPartyRoom.setEmailList(mockUserEmailList)
 
-        createMockInvocation(mockPartyRoom)
+        createMockInvocation(mockPartyRoom, mockSongList)
 
         val intent = Intent(ApplicationProvider.getApplicationContext(), PartyRoomActivity::class.java)
         intent.putExtra("roomName", mockRoomName)
@@ -77,17 +83,16 @@ class PartyRoomActivityTest {
             .check(ViewAssertions.matches(ViewMatchers.withText(mockUserEmailList.toString())))
     }
 
- */
-/*
     @Test
     fun correctJoin() {
         var mockRoomName = "mockName"
         var mockUserEmailList = mutableListOf<String>("email1, email2")
+        var mockSongList = mutableListOf<Pair<String, String>>(Pair("mockSong1", "mockSong2"))
         var mockPartyRoom = PartyRoom()
 
         mockPartyRoom.setEmailList(mockUserEmailList)
 
-        createMockInvocation(mockPartyRoom)
+        createMockInvocation(mockPartyRoom, mockSongList)
 
         val intent = Intent(ApplicationProvider.getApplicationContext(), PartyRoomActivity::class.java)
         intent.putExtra("roomName", mockRoomName)
@@ -99,7 +104,10 @@ class PartyRoomActivityTest {
             .check(ViewAssertions.matches(ViewMatchers.withText(mockUserEmailList.toString())))
     }
 
- */
+    @Test
+    fun correctSongList() {
+
+    }
+
 }
 
- */
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
index 9028edc64..c7cea0895 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
@@ -47,6 +47,7 @@ class PartyRoomActivity : AppCompatActivity() {
         val createPartyRoom = intent.getBooleanExtra("createRoom", false)
         if(createPartyRoom) {
             createRoom(roomName)
+            setGameManager()
         }
         else {
             fetchData(roomName)
@@ -106,15 +107,8 @@ class PartyRoomActivity : AppCompatActivity() {
         call.enqueue(object : Callback<Any> {
             override fun onFailure(call: Call<Any>, t: Throwable?) {}
             override fun onResponse(call: Call<Any>, response: Response<Any>) {
-                /* TODO: OFFLINE
-                gameManager.setInternet()
-                gameManager.setContext(context)
-                 */
-
-
                 gameManager.setGameSongList(Gson().toJson(response.body()), uri.method)
-                Log.w("DEBUG", gameManager.getSongList().toString())
-                launchGame(gameManager)
+                dataGetter.updateSongList("room1", gameManager.getSongList())
             }
         })
     }
@@ -127,8 +121,6 @@ class PartyRoomActivity : AppCompatActivity() {
         uri.tag = tag
 
         gameManager.gameMode = getString(mode)
-        AppPreferences.setStr(getString(R.string.preferences_game_genre), getString(mode))
-
         setGameSongList(uri)
     }
 

From 1c845b8d56e9037cae971317dce53c7583f2ce62 Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Mon, 23 May 2022 12:13:47 +0200
Subject: [PATCH 09/27] Added tests

---
 .../activity/PartyRoomActivityTest.kt         | 40 +++++++++++++++----
 .../vibester/activity/PartyRoomActivity.kt    |  4 +-
 .../ch/sdp/vibester/database/DataGetter.kt    | 25 ++++++++++--
 3 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
index 42b7e7e0c..9dcd1b33c 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
@@ -5,12 +5,15 @@ import android.content.Intent
 import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso
+import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.assertion.ViewAssertions
 import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.matcher.IntentMatchers
 import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
 import ch.sdp.vibester.database.DataGetter
+import ch.sdp.vibester.helper.GameManager
 import ch.sdp.vibester.helper.PartyRoom
 import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidRule
@@ -22,6 +25,7 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import kotlin.concurrent.thread
 
 @RunWith(AndroidJUnit4::class)
 @HiltAndroidTest
@@ -40,21 +44,23 @@ class PartyRoomActivityTest {
     @JvmField
     val mockUsersRepo = mockk<DataGetter>()
 
-    private fun createMockInvocation(partyRoom: PartyRoom, songList: MutableList<Pair<String, String>>) {
+    private fun createMockInvocation(partyRoom: PartyRoom, songList: MutableList<Pair<String, String>>, startGame: Boolean) {
         every {mockUsersRepo.createRoom(any(), any())} answers {
             lastArg<(PartyRoom) -> Unit>().invoke(partyRoom)
         }
 
-        every {mockUsersRepo.getRoomData(any(), any(), any(), any())} answers {
-            thirdArg<(PartyRoom) -> Unit>().invoke(partyRoom)
+        every {mockUsersRepo.getRoomData(any(), any(), any())} answers {
+            secondArg<(PartyRoom) -> Unit>().invoke(partyRoom)
             lastArg<(MutableList<Pair<String, String>>) -> Unit>().invoke(songList)
         }
 
         every { mockUsersRepo.readStartGame(any(), any()) } answers {
-            false
+            secondArg<(Boolean) -> Unit>().invoke(startGame)
         }
 
         every { mockUsersRepo.updateSongList(any(), any()) } answers {}
+
+        every { mockUsersRepo.updateStartGame(any(), any())} answers {}
     }
 
     @After
@@ -71,7 +77,7 @@ class PartyRoomActivityTest {
 
         mockPartyRoom.setEmailList(mockUserEmailList)
 
-        createMockInvocation(mockPartyRoom, mockSongList)
+        createMockInvocation(mockPartyRoom, mockSongList, false)
 
         val intent = Intent(ApplicationProvider.getApplicationContext(), PartyRoomActivity::class.java)
         intent.putExtra("roomName", mockRoomName)
@@ -92,7 +98,7 @@ class PartyRoomActivityTest {
 
         mockPartyRoom.setEmailList(mockUserEmailList)
 
-        createMockInvocation(mockPartyRoom, mockSongList)
+        createMockInvocation(mockPartyRoom, mockSongList, false)
 
         val intent = Intent(ApplicationProvider.getApplicationContext(), PartyRoomActivity::class.java)
         intent.putExtra("roomName", mockRoomName)
@@ -105,8 +111,28 @@ class PartyRoomActivityTest {
     }
 
     @Test
-    fun correctSongList() {
+    fun correctDifficulty() {
+        var mockRoomName = "mockRoom"
+        var mockUserEmailList = mutableListOf<String>("email1, email2")
+        var mockSongList = mutableListOf<Pair<String, String>>(Pair("mockSong1", "mockSong2"))
+        var mockPartyRoom = PartyRoom()
+        val gameManager = GameManager()
+
+        mockPartyRoom.setEmailList(mockUserEmailList)
+
+        createMockInvocation(mockPartyRoom, mockSongList, true)
+
+        val intent = Intent(ApplicationProvider.getApplicationContext(), PartyRoomActivity::class.java)
+        intent.putExtra("roomName", mockRoomName)
+        intent.putExtra("createRoom", true)
+
+        val scn: ActivityScenario<CreateProfileActivity> = ActivityScenario.launch(intent)
+
+        Espresso.onView(ViewMatchers.withId(R.id.startGame)).perform(ViewActions.click())
+
 
+        Intents.intended(IntentMatchers.hasComponent(TypingGameActivity ::class.java.name))
+        Intents.intended(IntentMatchers.hasExtra("Difficulty", R.string.easy.toString()))
     }
 
 }
diff --git a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
index c7cea0895..f8ecfbb53 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
@@ -67,7 +67,7 @@ class PartyRoomActivity : AppCompatActivity() {
     }
 
     private fun fetchData(roomName: String) {
-        dataGetter.getRoomData(roomName, true, this::updateUI, this::setSongs)
+        dataGetter.getRoomData(roomName, this::updateUI, this::setSongs)
     }
 
     private fun createRoom(roomName: String) {
@@ -121,6 +121,8 @@ class PartyRoomActivity : AppCompatActivity() {
         uri.tag = tag
 
         gameManager.gameMode = getString(mode)
+        AppPreferences.setStr(getString(R.string.preferences_game_genre), getString(mode))
+
         setGameSongList(uri)
     }
 
diff --git a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
index e22e0e89d..0612a5915 100644
--- a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -200,11 +200,12 @@ class DataGetter @Inject constructor() {
     /**
      * This functions fetches the data of the given user from the database
      * @param roomName the name of the room to retrieve data from
-     * @param callback the function to be called when the data of the appropriate user is available
+     * @param partyRoomCallback the function to be called when the data of the appropriate room data is available
+     * @param songListCallback the function to be called when the data of the appropriate song list is available
+
      */
 
     fun getRoomData(roomName: String,
-                    startGame: Boolean,
                     partyRoomCallback: (PartyRoom) -> Unit,
                     songListCallback: (MutableList<Pair<String, String>>) -> Unit) {
 
@@ -224,7 +225,6 @@ class DataGetter @Inject constructor() {
                         }
                         partyRoomCallback(partyRoom)
                     }
-                    if(startGame) {
                         val snapshotMap = snapshot.getValue() as Map<String, Object>
                         val songList = snapshotMap["songList"] as List<*>
                         var gameSongList: MutableList<Pair<String, String>> = mutableListOf()
@@ -238,7 +238,6 @@ class DataGetter @Inject constructor() {
                             )
                         }
                         songListCallback(gameSongList)
-                    }
                 }
             }
             override fun onCancelled(error: DatabaseError) {
@@ -247,14 +246,32 @@ class DataGetter @Inject constructor() {
         })
     }
 
+    /**
+     * This functions that updates the song list of the room
+     * @param roomID ID of the room
+     * @param songList the new song list
+     */
+
     fun updateSongList(roomID: String, songList: MutableList<Pair<String, String>>) {
         dbRoomRef.child("${roomID}/songList").setValue(songList)
     }
 
+    /**
+     * This functions that updates the the start game field
+     * @param roomID ID of the room
+     * @param value the new value to store
+     */
+
     fun updateStartGame(roomID: String, value: Boolean) {
         dbRoomRef.child("${roomID}/gameStarted").setValue(value)
     }
 
+    /**
+     * This functions reads the start of the game field and calls the appropriate functions
+     * @param roomName name of the room
+     * @param callback callback to be called when the read value is available
+     */
+
     fun readStartGame(roomName: String, callback: (Boolean) -> Unit) {
         val queryRooms = dbRoomRef
             .orderByChild("roomName")

From 0b61eb389f9cbdbff7bce5ecfed6da67c5901733 Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Mon, 23 May 2022 13:00:08 +0200
Subject: [PATCH 10/27] Added tests

---
 .../activity/ChoosePartyRoomActivityTest.kt   |  2 +-
 .../activity/PartyRoomActivityTest.kt         | 31 +++++++++++++++----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt
index dedfe6e48..cdfb12858 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt
@@ -47,7 +47,7 @@ class ChoosePartyRoomActivityTest {
             lastArg<(PartyRoom) -> Unit>().invoke(partyRoom)
         }
 
-        every {mockUsersRepo.getRoomData(any(), any(), any(), any())} answers {
+        every {mockUsersRepo.getRoomData(any(), any(), any())} answers {
             lastArg<(PartyRoom) -> Unit>().invoke(partyRoom)
         }
 
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
index 9dcd1b33c..421869a6a 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
@@ -1,6 +1,7 @@
 package ch.sdp.vibester.activity
 
 
+import android.content.Context
 import android.content.Intent
 import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
@@ -12,6 +13,7 @@ import androidx.test.espresso.intent.matcher.IntentMatchers
 import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
+import ch.sdp.vibester.database.AppPreferences
 import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.helper.GameManager
 import ch.sdp.vibester.helper.PartyRoom
@@ -70,6 +72,8 @@ class PartyRoomActivityTest {
 
     @Test
     fun correctCreation() {
+        val ctx: Context = ApplicationProvider.getApplicationContext()
+
         var mockRoomName = "mockName"
         var mockUserEmailList = mutableListOf<String>("email1, email2")
         var mockSongList = mutableListOf<Pair<String, String>>(Pair("mockSong1", "mockSong2"))
@@ -79,7 +83,12 @@ class PartyRoomActivityTest {
 
         createMockInvocation(mockPartyRoom, mockSongList, false)
 
-        val intent = Intent(ApplicationProvider.getApplicationContext(), PartyRoomActivity::class.java)
+        AppPreferences.init(ctx)
+        AppPreferences.setStr(ctx.getString(R.string.preferences_game_mode), "local_typing")
+        AppPreferences.setStr(ctx.getString(R.string.preferences_game_genre), "imagine dragons")
+
+
+        val intent = Intent(ctx, PartyRoomActivity::class.java)
         intent.putExtra("roomName", mockRoomName)
         intent.putExtra("createRoom", true)
 
@@ -91,6 +100,8 @@ class PartyRoomActivityTest {
 
     @Test
     fun correctJoin() {
+        val ctx: Context = ApplicationProvider.getApplicationContext()
+
         var mockRoomName = "mockName"
         var mockUserEmailList = mutableListOf<String>("email1, email2")
         var mockSongList = mutableListOf<Pair<String, String>>(Pair("mockSong1", "mockSong2"))
@@ -100,7 +111,11 @@ class PartyRoomActivityTest {
 
         createMockInvocation(mockPartyRoom, mockSongList, false)
 
-        val intent = Intent(ApplicationProvider.getApplicationContext(), PartyRoomActivity::class.java)
+        AppPreferences.init(ctx)
+        AppPreferences.setStr(ctx.getString(R.string.preferences_game_mode), "local_typing")
+        AppPreferences.setStr(ctx.getString(R.string.preferences_game_genre), "imagine dragons")
+
+        val intent = Intent(ctx, PartyRoomActivity::class.java)
         intent.putExtra("roomName", mockRoomName)
         intent.putExtra("createRoom", false)
 
@@ -112,25 +127,29 @@ class PartyRoomActivityTest {
 
     @Test
     fun correctDifficulty() {
+        val ctx: Context = ApplicationProvider.getApplicationContext()
+
         var mockRoomName = "mockRoom"
         var mockUserEmailList = mutableListOf<String>("email1, email2")
         var mockSongList = mutableListOf<Pair<String, String>>(Pair("mockSong1", "mockSong2"))
         var mockPartyRoom = PartyRoom()
         val gameManager = GameManager()
 
+        AppPreferences.init(ctx)
+        AppPreferences.setStr(ctx.getString(R.string.preferences_game_mode), "local_typing")
+        AppPreferences.setStr(ctx.getString(R.string.preferences_game_genre), "imagine dragons")
+
+
         mockPartyRoom.setEmailList(mockUserEmailList)
 
         createMockInvocation(mockPartyRoom, mockSongList, true)
 
-        val intent = Intent(ApplicationProvider.getApplicationContext(), PartyRoomActivity::class.java)
+        val intent = Intent(ctx, PartyRoomActivity::class.java)
         intent.putExtra("roomName", mockRoomName)
         intent.putExtra("createRoom", true)
 
         val scn: ActivityScenario<CreateProfileActivity> = ActivityScenario.launch(intent)
 
-        Espresso.onView(ViewMatchers.withId(R.id.startGame)).perform(ViewActions.click())
-
-
         Intents.intended(IntentMatchers.hasComponent(TypingGameActivity ::class.java.name))
         Intents.intended(IntentMatchers.hasExtra("Difficulty", R.string.easy.toString()))
     }

From 86f2487235af9c558218310976da617915487d82 Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Thu, 26 May 2022 13:12:13 +0200
Subject: [PATCH 11/27] Strated refactoring of room creation

---
 .../activity/ChoosePartyRoomActivityTest.kt    | 18 ++++++++++++++++++
 .../vibester/activity/PartyRoomActivityTest.kt |  1 -
 .../sdp/vibester/activity/PartyRoomActivity.kt | 17 +++++++++++------
 .../ch/sdp/vibester/database/DataGetter.kt     | 12 +++++++-----
 .../main/res/layout/activity_party_room.xml    | 12 ++++++++++++
 5 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt
index cdfb12858..bcb80fa44 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt
@@ -1,5 +1,7 @@
 package ch.sdp.vibester.activity
 
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions
@@ -9,6 +11,7 @@ import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
+import ch.sdp.vibester.database.AppPreferences
 import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.helper.PartyRoom
 import ch.sdp.vibester.user.User
@@ -54,6 +57,9 @@ class ChoosePartyRoomActivityTest {
         every { mockUsersRepo.readStartGame(any(), any()) } answers {
             false
         }
+
+        every { mockUsersRepo.updateSongList(any(), any()) } answers {}
+
     }
 
     @After
@@ -63,6 +69,8 @@ class ChoosePartyRoomActivityTest {
 
     @Test
     fun correctJoinPartyIntent() {
+        val ctx: Context = ApplicationProvider.getApplicationContext()
+
         val roomName = "testRoomName"
         var mockUserEmailList = mutableListOf<String>("email1, email2")
         var mockPartyRoom = PartyRoom()
@@ -71,6 +79,10 @@ class ChoosePartyRoomActivityTest {
 
         createMockInvocation(mockPartyRoom)
 
+        AppPreferences.init(ctx)
+        AppPreferences.setStr(ctx.getString(R.string.preferences_game_mode), "local_typing")
+        AppPreferences.setStr(ctx.getString(R.string.preferences_game_genre), "imagine dragons")
+
         onView(ViewMatchers.withId(R.id.roomNameInput)).perform(
             ViewActions.typeText("testRoomName"),
             ViewActions.closeSoftKeyboard()
@@ -84,6 +96,8 @@ class ChoosePartyRoomActivityTest {
 
     @Test
     fun correctCreatePartyIntent() {
+        val ctx: Context = ApplicationProvider.getApplicationContext()
+
         val roomName = "testRoomName"
         var mockUserEmailList = mutableListOf<String>("email1, email2")
         var mockPartyRoom = PartyRoom()
@@ -92,6 +106,10 @@ class ChoosePartyRoomActivityTest {
 
         createMockInvocation(mockPartyRoom)
 
+        AppPreferences.init(ctx)
+        AppPreferences.setStr(ctx.getString(R.string.preferences_game_mode), "local_typing")
+        AppPreferences.setStr(ctx.getString(R.string.preferences_game_genre), "imagine dragons")
+
         onView(ViewMatchers.withId(R.id.roomNameInput)).perform(
             ViewActions.typeText("testRoomName"),
             ViewActions.closeSoftKeyboard()
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
index 421869a6a..d5b660849 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
@@ -27,7 +27,6 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import kotlin.concurrent.thread
 
 @RunWith(AndroidJUnit4::class)
 @HiltAndroidTest
diff --git a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
index f8ecfbb53..ce3680f7c 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
@@ -37,6 +37,8 @@ class PartyRoomActivity : AppCompatActivity() {
 
     lateinit var gameManager: GameManager
 
+    lateinit var roomID: String
+
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -48,22 +50,25 @@ class PartyRoomActivity : AppCompatActivity() {
         if(createPartyRoom) {
             createRoom(roomName)
             setGameManager()
+            dataGetter.updateStartGame(roomID, false)
         }
         else {
             fetchData(roomName)
         }
 
-        val startGame = findViewById<Button>(R.id.startGame)
+//        val startGame = findViewById<Button>(R.id.startGame)
 
-        startGame.setOnClickListener {
-            dataGetter.updateStartGame("room1", true)
-        }
+//        startGame.setOnClickListener {
+//            dataGetter.updateStartGame("room1", true)
+//        }
 
-        fetchGameStarted(roomName, this::startGame)
+//        fetchGameStarted(roomID, this::startGame)
     }
 
-    private fun updateUI(partyRoom: PartyRoom) {
+    private fun updateUI(partyRoom: PartyRoom, roomID: String) {
+        this.roomID = roomID
         findViewById<TextView>(R.id.emails).text = partyRoom.getEmailList().toString()
+        findViewById<TextView>(R.id.roomId).text = roomID
     }
 
     private fun fetchData(roomName: String) {
diff --git a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
index 0612a5915..9e435e38e 100644
--- a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -117,7 +117,7 @@ class DataGetter @Inject constructor() {
      * @param roomName the name of the new room
      * @param callback function to be called when the room has been created
      */
-    fun createRoom(roomName: String,  callback: (PartyRoom) -> Unit) {
+    fun createRoom(roomName: String,  callback: (PartyRoom, String) -> Unit) {
         val partyRoom = PartyRoom()
         partyRoom.setRoomName(roomName)
         partyRoom.setEmailList(mutableListOf(authenticator.getCurrUser()?.email!!))
@@ -127,7 +127,9 @@ class DataGetter @Inject constructor() {
             partyRoom.setRoomID(key)
         }
         ref.setValue(partyRoom)
-        callback(partyRoom)
+        if (key != null) {
+            callback(partyRoom, key)
+        }
     }
 
 
@@ -206,7 +208,7 @@ class DataGetter @Inject constructor() {
      */
 
     fun getRoomData(roomName: String,
-                    partyRoomCallback: (PartyRoom) -> Unit,
+                    partyRoomCallback: (PartyRoom, String) -> Unit,
                     songListCallback: (MutableList<Pair<String, String>>) -> Unit) {
 
         val queryRooms = dbRoomRef
@@ -223,9 +225,9 @@ class DataGetter @Inject constructor() {
                             partyRoom.addUserEmail(currUserEmail)
                             updateRoomUserList(partyRoom)
                         }
-                        partyRoomCallback(partyRoom)
+                        partyRoomCallback(partyRoom, partyRoom.getRoomID())
                     }
-                        val snapshotMap = snapshot.getValue() as Map<String, Object>
+                        val snapshotMap = snapshot.value as Map<String, Object>
                         val songList = snapshotMap["songList"] as List<*>
                         var gameSongList: MutableList<Pair<String, String>> = mutableListOf()
                         for (song in songList) {
diff --git a/app/src/main/res/layout/activity_party_room.xml b/app/src/main/res/layout/activity_party_room.xml
index 5fb37b3f8..8d44b02fc 100644
--- a/app/src/main/res/layout/activity_party_room.xml
+++ b/app/src/main/res/layout/activity_party_room.xml
@@ -20,6 +20,18 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.275" />
 
+    <TextView
+        android:id="@+id/roomId"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="@string/PartyRoom_joinedPeople"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.36" />
+
     <Button
         android:id="@+id/startGame"
         android:layout_width="wrap_content"

From 5e8bc98b6047310d3c1b854c18bec4aff1bdb5cd Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Thu, 26 May 2022 14:32:06 +0200
Subject: [PATCH 12/27] Strated refactoring of room creation

---
 .../vibester/activity/PartyRoomActivity.kt    | 35 +++++-----
 .../ch/sdp/vibester/database/DataGetter.kt    | 66 +++++++++----------
 .../java/ch/sdp/vibester/helper/PartyRoom.kt  |  9 ---
 3 files changed, 50 insertions(+), 60 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
index ce3680f7c..0c9ce5fc6 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
@@ -45,24 +45,26 @@ class PartyRoomActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_party_room)
 
-        val roomName = intent.getStringExtra("roomName").toString()
+//        val roomID = intent.getStringExtra("roomName").toString()
         val createPartyRoom = intent.getBooleanExtra("createRoom", false)
         if(createPartyRoom) {
-            createRoom(roomName)
+            createRoom()
             setGameManager()
             dataGetter.updateStartGame(roomID, false)
         }
         else {
-            fetchData(roomName)
+            this.roomID = intent.getStringExtra("roomName").toString()
+//            Log.w("DEBUG LMAO1", roomID)
+            fetchData(roomID)
         }
 
-//        val startGame = findViewById<Button>(R.id.startGame)
+        val startGame = findViewById<Button>(R.id.startGame)
 
-//        startGame.setOnClickListener {
-//            dataGetter.updateStartGame("room1", true)
-//        }
+        startGame.setOnClickListener {
+            dataGetter.updateStartGame(roomID, true)
+        }
 
-//        fetchGameStarted(roomID, this::startGame)
+        fetchGameStarted(roomID, this::startGame)
     }
 
     private fun updateUI(partyRoom: PartyRoom, roomID: String) {
@@ -71,12 +73,13 @@ class PartyRoomActivity : AppCompatActivity() {
         findViewById<TextView>(R.id.roomId).text = roomID
     }
 
-    private fun fetchData(roomName: String) {
-        dataGetter.getRoomData(roomName, this::updateUI, this::setSongs)
+    private fun fetchData(roomID: String) {
+        Log.w("DEBUG LMAO2", roomID)
+        dataGetter.getRoomData(roomID, this::updateUI, this::setSongs)
     }
 
-    private fun createRoom(roomName: String) {
-        dataGetter.createRoom(roomName, this::updateUI)
+    private fun createRoom() {
+        dataGetter.createRoom(this::updateUI)
     }
 
     private fun fetchGameStarted(roomName: String, callback: (Boolean) -> Unit) {
@@ -89,7 +92,7 @@ class PartyRoomActivity : AppCompatActivity() {
         }
     }
 
-    private fun setGameManager() {
+    private fun  setGameManager() {
         gameManager = GameManager()
         gameManager.setGameSize(1)
 
@@ -106,14 +109,14 @@ class PartyRoomActivity : AppCompatActivity() {
         startActivity(newIntent)
     }
 
-    private fun setGameSongList(uri: LastfmUri) {
+    private fun setGameSongList(uri: LastfmUri, roomID: String) {
         val service = LastfmApiInterface.createLastfmService()
         val call = service.getSongList(uri.convertToHashmap())
         call.enqueue(object : Callback<Any> {
             override fun onFailure(call: Call<Any>, t: Throwable?) {}
             override fun onResponse(call: Call<Any>, response: Response<Any>) {
                 gameManager.setGameSongList(Gson().toJson(response.body()), uri.method)
-                dataGetter.updateSongList("room1", gameManager.getSongList())
+                dataGetter.updateSongList(roomID, gameManager.getSongList())
             }
         })
     }
@@ -128,7 +131,7 @@ class PartyRoomActivity : AppCompatActivity() {
         gameManager.gameMode = getString(mode)
         AppPreferences.setStr(getString(R.string.preferences_game_genre), getString(mode))
 
-        setGameSongList(uri)
+        setGameSongList(uri, roomID)
     }
 
     private fun setSongs(gameSongList: MutableList<Pair<String, String>>) {
diff --git a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
index 9e435e38e..0fb970e5a 100644
--- a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -1,11 +1,9 @@
 package ch.sdp.vibester.database
 
 import android.content.ContentValues
+import android.content.ContentValues.TAG
 import android.util.Log
-import ch.sdp.vibester.R
 import ch.sdp.vibester.auth.FireBaseAuthenticator
-import ch.sdp.vibester.helper.ArtistIdentifier
-import ch.sdp.vibester.helper.GameManager
 import ch.sdp.vibester.helper.PartyRoom
 import ch.sdp.vibester.user.User
 import com.google.firebase.auth.FirebaseUser
@@ -117,9 +115,8 @@ class DataGetter @Inject constructor() {
      * @param roomName the name of the new room
      * @param callback function to be called when the room has been created
      */
-    fun createRoom(roomName: String,  callback: (PartyRoom, String) -> Unit) {
+    fun createRoom(callback: (PartyRoom, String) -> Unit) {
         val partyRoom = PartyRoom()
-        partyRoom.setRoomName(roomName)
         partyRoom.setEmailList(mutableListOf(authenticator.getCurrUser()?.email!!))
         val ref = dbRoomRef.push()
         val key = ref.key
@@ -201,19 +198,21 @@ class DataGetter @Inject constructor() {
 
     /**
      * This functions fetches the data of the given user from the database
-     * @param roomName the name of the room to retrieve data from
+     * @param roomID the name of the room to retrieve data from
      * @param partyRoomCallback the function to be called when the data of the appropriate room data is available
      * @param songListCallback the function to be called when the data of the appropriate song list is available
 
      */
 
-    fun getRoomData(roomName: String,
+    fun getRoomData(roomID: String,
                     partyRoomCallback: (PartyRoom, String) -> Unit,
                     songListCallback: (MutableList<Pair<String, String>>) -> Unit) {
 
         val queryRooms = dbRoomRef
-            .orderByChild("roomName")
-            .equalTo(roomName)
+            .orderByChild("roomID")
+            .equalTo(roomID)
+
+        Log.w("DEBUG LMAO3", roomID)
 
         queryRooms.addValueEventListener(object : ValueEventListener {
             override fun onDataChange(dataSnapshot: DataSnapshot) {
@@ -227,19 +226,19 @@ class DataGetter @Inject constructor() {
                         }
                         partyRoomCallback(partyRoom, partyRoom.getRoomID())
                     }
-                        val snapshotMap = snapshot.value as Map<String, Object>
-                        val songList = snapshotMap["songList"] as List<*>
-                        var gameSongList: MutableList<Pair<String, String>> = mutableListOf()
-                        for (song in songList) {
-                            val tempPair: Map<String, String> = song as Map<String, String>
-                            gameSongList.add(
-                                Pair(
-                                    tempPair.getOrDefault("first", ""),
-                                    tempPair.getOrDefault("second", "")
-                                )
+                    val snapshotMap = snapshot.value as Map<String, Object>
+                    val songList = snapshotMap["songList"] as List<*>
+                    var gameSongList: MutableList<Pair<String, String>> = mutableListOf()
+                    for (song in songList) {
+                        val tempPair: Map<String, String> = song as Map<String, String>
+                        gameSongList.add(
+                            Pair(
+                                tempPair.getOrDefault("first", ""),
+                                tempPair.getOrDefault("second", "")
                             )
-                        }
-                        songListCallback(gameSongList)
+                        )
+                    }
+                    songListCallback(gameSongList)
                 }
             }
             override fun onCancelled(error: DatabaseError) {
@@ -270,28 +269,25 @@ class DataGetter @Inject constructor() {
 
     /**
      * This functions reads the start of the game field and calls the appropriate functions
-     * @param roomName name of the room
+     * @param roomID ID of the room
      * @param callback callback to be called when the read value is available
      */
 
-    fun readStartGame(roomName: String, callback: (Boolean) -> Unit) {
-        val queryRooms = dbRoomRef
-            .orderByChild("roomName")
-            .equalTo(roomName)
+    fun readStartGame(roomID: String, callback: (Boolean) -> Unit) {
+        val queryRooms = dbRoomRef.child(roomID).child("gameStarted")
 
-        queryRooms.addValueEventListener(object : ValueEventListener {
+        val startGameListener = object : ValueEventListener {
             override fun onDataChange(dataSnapshot: DataSnapshot) {
-                for (snapshot in dataSnapshot.children) {
-                    val snapshotMap = snapshot.getValue() as Map<String, Object>
-                    val gameStarted: Boolean = snapshotMap["gameStarted"] as Boolean
-                    callback(gameStarted)
+                val value = dataSnapshot.getValue<Boolean>()
+                if (value != null) {
+                    callback(value)
                 }
             }
-            override fun onCancelled(error: DatabaseError) {
-                Log.w(ContentValues.TAG, "getRoomData:onCancelled", error.toException())
+            override fun onCancelled(databaseError: DatabaseError) {
+                Log.w(TAG, "loadPost:onCancelled", databaseError.toException())
             }
-        })
-
+        }
+        queryRooms.addValueEventListener(startGameListener)
 }
 }
 
diff --git a/app/src/main/java/ch/sdp/vibester/helper/PartyRoom.kt b/app/src/main/java/ch/sdp/vibester/helper/PartyRoom.kt
index bf1db9f3f..a3527cfb7 100644
--- a/app/src/main/java/ch/sdp/vibester/helper/PartyRoom.kt
+++ b/app/src/main/java/ch/sdp/vibester/helper/PartyRoom.kt
@@ -2,7 +2,6 @@ package ch.sdp.vibester.helper
 
 
 class PartyRoom() {
-    private lateinit var roomName: String
     private lateinit var userEmails: MutableList<String>
     private lateinit var roomID: String
 //    var gameSongList: MutableList<Pair<String, String>> = mutableListOf()
@@ -23,14 +22,6 @@ class PartyRoom() {
         return userEmails
     }
 
-    fun getRoomName(): String {
-        return roomName
-    }
-
-    fun setRoomName(roomName: String) {
-        this.roomName = roomName
-    }
-
     fun setEmailList(userEmails: MutableList<String>) {
         this.userEmails = userEmails
     }

From 6268a4932dff12875d2c6306a0f7d08ba50ad89b Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Thu, 26 May 2022 14:32:15 +0200
Subject: [PATCH 13/27] Strated refactoring of room creation

---
 app/src/main/java/ch/sdp/vibester/database/DataGetter.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
index 0fb970e5a..cd653f1ec 100644
--- a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -280,7 +280,7 @@ class DataGetter @Inject constructor() {
             override fun onDataChange(dataSnapshot: DataSnapshot) {
                 val value = dataSnapshot.getValue<Boolean>()
                 if (value != null) {
-                    callback(value)
+                    -N3-L-7G1XFADgCMT1Jt                    callback(value)
                 }
             }
             override fun onCancelled(databaseError: DatabaseError) {

From 1fd2f5404ab65d644ce44b12ce988322c2a4b13c Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Thu, 26 May 2022 14:32:27 +0200
Subject: [PATCH 14/27] Strated refactoring of room creation

---
 app/src/main/java/ch/sdp/vibester/database/DataGetter.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
index cd653f1ec..925bfffe9 100644
--- a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -280,7 +280,7 @@ class DataGetter @Inject constructor() {
             override fun onDataChange(dataSnapshot: DataSnapshot) {
                 val value = dataSnapshot.getValue<Boolean>()
                 if (value != null) {
-                    -N3-L-7G1XFADgCMT1Jt                    callback(value)
+                  callback(value)
                 }
             }
             override fun onCancelled(databaseError: DatabaseError) {

From 59d62708a199eeea0e426486d800f72bd5c4e9cd Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Thu, 26 May 2022 14:56:15 +0200
Subject: [PATCH 15/27] Refactored tests

---
 .../java/ch/sdp/vibester/PartyRoomTest.kt         | 10 ----------
 .../activity/ChoosePartyRoomActivityTest.kt       | 15 ++++++++-------
 .../vibester/activity/PartyRoomActivityTest.kt    | 15 +++++++--------
 .../vibester/activity/ChoosePartyRoomActivity.kt  |  2 +-
 .../ch/sdp/vibester/activity/PartyRoomActivity.kt |  5 +----
 5 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/PartyRoomTest.kt b/app/src/androidTest/java/ch/sdp/vibester/PartyRoomTest.kt
index c54f8802e..ad2489de2 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/PartyRoomTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/PartyRoomTest.kt
@@ -6,16 +6,6 @@ import junit.framework.Assert.assertTrue
 import org.junit.Test
 
 class PartyRoomTest {
-    @Test
-    fun correctSetRoom() {
-        val roomName = "testRoom"
-        val testPartyRoom = PartyRoom()
-
-        testPartyRoom.setRoomName(roomName)
-
-        assertEquals(testPartyRoom.getRoomName(), roomName)
-    }
-
     @Test
     fun correctSetEmailList() {
         val emailList = mutableListOf("email1, email2")
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt
index bcb80fa44..18bd477b8 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt
@@ -46,20 +46,21 @@ class ChoosePartyRoomActivityTest {
     val mockUsersRepo = mockk<DataGetter>()
 
     private fun createMockInvocation(partyRoom: PartyRoom) {
-        every {mockUsersRepo.createRoom(any(), any())} answers {
-            lastArg<(PartyRoom) -> Unit>().invoke(partyRoom)
+        every {mockUsersRepo.createRoom(any())} answers {
+            firstArg<(PartyRoom, String) -> Unit>().invoke(partyRoom, "")
         }
 
-        every {mockUsersRepo.getRoomData(any(), any(), any())} answers {
-            lastArg<(PartyRoom) -> Unit>().invoke(partyRoom)
-        }
 
         every { mockUsersRepo.readStartGame(any(), any()) } answers {
             false
         }
 
+        every { mockUsersRepo.updateStartGame(any(), any()) } answers {}
+
         every { mockUsersRepo.updateSongList(any(), any()) } answers {}
 
+        every {mockUsersRepo.getRoomData(any(), any(), any())} answers {}
+
     }
 
     @After
@@ -90,7 +91,7 @@ class ChoosePartyRoomActivityTest {
         onView(ViewMatchers.withId(R.id.joinParty)).perform(ViewActions.click())
 
         Intents.intended(IntentMatchers.hasComponent(PartyRoomActivity ::class.java.name))
-        Intents.intended(IntentMatchers.hasExtra("roomName", roomName))
+        Intents.intended(IntentMatchers.hasExtra("roomID", roomName))
         Intents.intended(IntentMatchers.hasExtra("createRoom", false))
     }
 
@@ -117,7 +118,7 @@ class ChoosePartyRoomActivityTest {
         onView(ViewMatchers.withId(R.id.createParty)).perform(ViewActions.click())
 
         Intents.intended(IntentMatchers.hasComponent(PartyRoomActivity ::class.java.name))
-        Intents.intended(IntentMatchers.hasExtra("roomName", roomName))
+        Intents.intended(IntentMatchers.hasExtra("roomID", roomName))
         Intents.intended(IntentMatchers.hasExtra("createRoom", true))
     }
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
index d5b660849..b9afa691f 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
@@ -45,13 +45,13 @@ class PartyRoomActivityTest {
     @JvmField
     val mockUsersRepo = mockk<DataGetter>()
 
-    private fun createMockInvocation(partyRoom: PartyRoom, songList: MutableList<Pair<String, String>>, startGame: Boolean) {
-        every {mockUsersRepo.createRoom(any(), any())} answers {
-            lastArg<(PartyRoom) -> Unit>().invoke(partyRoom)
+    private fun createMockInvocation(partyRoom: PartyRoom, songList: MutableList<Pair<String, String>>, startGame: Boolean, roomID: String) {
+        every {mockUsersRepo.createRoom(any())} answers {
+            firstArg<(PartyRoom, String) -> Unit>().invoke(partyRoom, roomID)
         }
 
         every {mockUsersRepo.getRoomData(any(), any(), any())} answers {
-            secondArg<(PartyRoom) -> Unit>().invoke(partyRoom)
+            secondArg<(PartyRoom, String) -> Unit>().invoke(partyRoom, roomID)
             lastArg<(MutableList<Pair<String, String>>) -> Unit>().invoke(songList)
         }
 
@@ -80,7 +80,7 @@ class PartyRoomActivityTest {
 
         mockPartyRoom.setEmailList(mockUserEmailList)
 
-        createMockInvocation(mockPartyRoom, mockSongList, false)
+        createMockInvocation(mockPartyRoom, mockSongList, false, mockRoomName)
 
         AppPreferences.init(ctx)
         AppPreferences.setStr(ctx.getString(R.string.preferences_game_mode), "local_typing")
@@ -108,7 +108,7 @@ class PartyRoomActivityTest {
 
         mockPartyRoom.setEmailList(mockUserEmailList)
 
-        createMockInvocation(mockPartyRoom, mockSongList, false)
+        createMockInvocation(mockPartyRoom, mockSongList, false, mockRoomName)
 
         AppPreferences.init(ctx)
         AppPreferences.setStr(ctx.getString(R.string.preferences_game_mode), "local_typing")
@@ -132,7 +132,6 @@ class PartyRoomActivityTest {
         var mockUserEmailList = mutableListOf<String>("email1, email2")
         var mockSongList = mutableListOf<Pair<String, String>>(Pair("mockSong1", "mockSong2"))
         var mockPartyRoom = PartyRoom()
-        val gameManager = GameManager()
 
         AppPreferences.init(ctx)
         AppPreferences.setStr(ctx.getString(R.string.preferences_game_mode), "local_typing")
@@ -141,7 +140,7 @@ class PartyRoomActivityTest {
 
         mockPartyRoom.setEmailList(mockUserEmailList)
 
-        createMockInvocation(mockPartyRoom, mockSongList, true)
+        createMockInvocation(mockPartyRoom, mockSongList, true, mockRoomName)
 
         val intent = Intent(ctx, PartyRoomActivity::class.java)
         intent.putExtra("roomName", mockRoomName)
diff --git a/app/src/main/java/ch/sdp/vibester/activity/ChoosePartyRoomActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/ChoosePartyRoomActivity.kt
index 30be3d926..9622b8dd4 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/ChoosePartyRoomActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/ChoosePartyRoomActivity.kt
@@ -30,7 +30,7 @@ class ChoosePartyRoomActivity : AppCompatActivity() {
 
     private fun switchToRoom(roomName: String, createRoom: Boolean) {
         val newIntent = Intent(this, PartyRoomActivity::class.java)
-        newIntent.putExtra("roomName", roomName)
+        newIntent.putExtra("roomID", roomName)
         newIntent.putExtra("createRoom", createRoom)
 
         startActivity(newIntent)
diff --git a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
index 0c9ce5fc6..9308e97b0 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
@@ -45,7 +45,6 @@ class PartyRoomActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_party_room)
 
-//        val roomID = intent.getStringExtra("roomName").toString()
         val createPartyRoom = intent.getBooleanExtra("createRoom", false)
         if(createPartyRoom) {
             createRoom()
@@ -53,8 +52,7 @@ class PartyRoomActivity : AppCompatActivity() {
             dataGetter.updateStartGame(roomID, false)
         }
         else {
-            this.roomID = intent.getStringExtra("roomName").toString()
-//            Log.w("DEBUG LMAO1", roomID)
+            this.roomID = intent.getStringExtra("roomID").toString()
             fetchData(roomID)
         }
 
@@ -74,7 +72,6 @@ class PartyRoomActivity : AppCompatActivity() {
     }
 
     private fun fetchData(roomID: String) {
-        Log.w("DEBUG LMAO2", roomID)
         dataGetter.getRoomData(roomID, this::updateUI, this::setSongs)
     }
 

From 56d2579ead9cec05195eb54ebc44d99dc39e8123 Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Thu, 26 May 2022 15:55:42 +0200
Subject: [PATCH 16/27] Improving test coverage

---
 .../activity/PartyRoomActivityTest.kt         | 30 +++++++++++++++++++
 .../main/res/layout/activity_party_room.xml   |  1 -
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
index b9afa691f..e8399b06f 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
@@ -152,5 +152,35 @@ class PartyRoomActivityTest {
         Intents.intended(IntentMatchers.hasExtra("Difficulty", R.string.easy.toString()))
     }
 
+    @Test
+    fun correctRoomID() {
+        val ctx: Context = ApplicationProvider.getApplicationContext()
+
+        var mockRoomID = "mockRoom"
+        var mockUserEmailList = mutableListOf<String>("email1, email2")
+        var mockSongList = mutableListOf<Pair<String, String>>(Pair("mockSong1", "mockSong2"))
+        var mockPartyRoom = PartyRoom()
+
+        AppPreferences.init(ctx)
+        AppPreferences.setStr(ctx.getString(R.string.preferences_game_mode), "local_typing")
+        AppPreferences.setStr(ctx.getString(R.string.preferences_game_genre), "imagine dragons")
+
+
+        mockPartyRoom.setEmailList(mockUserEmailList)
+
+        createMockInvocation(mockPartyRoom, mockSongList, false, mockRoomID)
+
+        val intent = Intent(ctx, PartyRoomActivity::class.java)
+        intent.putExtra("roomName", mockRoomID)
+        intent.putExtra("createRoom", false)
+
+        val scn: ActivityScenario<CreateProfileActivity> = ActivityScenario.launch(intent)
+
+        Espresso.onView(ViewMatchers.withId(R.id.roomId))
+            .check(ViewAssertions.matches(ViewMatchers.withText(mockRoomID)))
+
+
+    }
+
 }
 
diff --git a/app/src/main/res/layout/activity_party_room.xml b/app/src/main/res/layout/activity_party_room.xml
index 8d44b02fc..17ca6d46b 100644
--- a/app/src/main/res/layout/activity_party_room.xml
+++ b/app/src/main/res/layout/activity_party_room.xml
@@ -25,7 +25,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:text="@string/PartyRoom_joinedPeople"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

From 2ce29a45e096770195d471e32603d5af38b4cd00 Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Thu, 26 May 2022 17:05:10 +0200
Subject: [PATCH 17/27] Fixed comments

---
 .../java/ch/sdp/vibester/activity/PartyRoomActivity.kt |  1 -
 .../main/java/ch/sdp/vibester/database/DataGetter.kt   |  5 +----
 .../java/ch/sdp/vibester/helper/ArtistIdentifier.kt    | 10 ----------
 3 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 app/src/main/java/ch/sdp/vibester/helper/ArtistIdentifier.kt

diff --git a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
index ce5bac499..c4253bf4e 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
@@ -58,7 +58,6 @@ class PartyRoomActivity : AppCompatActivity() {
         val startGame = findViewById<Button>(R.id.startGame)
 
         startGame.setOnClickListener {
-//            dataGetter.updateStartGame(roomID, true)
             dataGetter.updateRoomField(roomID, "gameStarted", true)
         }
 
diff --git a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
index 1d386f6ee..51193dffd 100644
--- a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -293,7 +293,4 @@ class DataGetter @Inject constructor() {
         }
         queryRooms.addValueEventListener(startGameListener)
 }
-}
-
-
-
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/helper/ArtistIdentifier.kt b/app/src/main/java/ch/sdp/vibester/helper/ArtistIdentifier.kt
deleted file mode 100644
index b2bd539e8..000000000
--- a/app/src/main/java/ch/sdp/vibester/helper/ArtistIdentifier.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-//package ch.sdp.vibester.helper
-//
-//import ch.sdp.vibester.R
-//import ch.sdp.vibester.api.LastfmMethod
-//
-//class ArtistIdentifier {
-//    var method: String = LastfmMethod.BY_ARTIST.method
-//    var artist: String = "Imagine Dragons"
-//    var mode: Int = R.string.imagine_dragons
-//}
\ No newline at end of file

From d67906e1b707b4714936ba55823c348515237fc0 Mon Sep 17 00:00:00 2001
From: laurislopata <40314248+laurislopata@users.noreply.github.com>
Date: Thu, 26 May 2022 17:07:07 +0200
Subject: [PATCH 18/27] Update
 app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt

Co-authored-by: Maxime <61186830+MaximeZmt@users.noreply.github.com>
---
 .../ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt
index 9bf0e53b0..43defdf21 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt
@@ -46,7 +46,7 @@ class ChoosePartyRoomActivityTest {
     val mockUsersRepo = mockk<DataGetter>()
 
     private fun createMockInvocation(partyRoom: PartyRoom) {
-        every {mockUsersRepo.createRoom(any())} answers {
+        every { mockUsersRepo.createRoom(any()) } answers {
             firstArg<(PartyRoom, String) -> Unit>().invoke(partyRoom, "")
         }
 

From 2247f47a52f623b2e39d6c3dfaa777871bab0f37 Mon Sep 17 00:00:00 2001
From: laurislopata <40314248+laurislopata@users.noreply.github.com>
Date: Thu, 26 May 2022 17:07:13 +0200
Subject: [PATCH 19/27] Update
 app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt

Co-authored-by: Maxime <61186830+MaximeZmt@users.noreply.github.com>
---
 .../ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt
index 43defdf21..c95d6337b 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt
@@ -58,7 +58,7 @@ class ChoosePartyRoomActivityTest {
         every { mockUsersRepo.updateRoomField<Boolean>(any(), any(), any()) } answers {}
         every { mockUsersRepo.updateRoomField<MutableList<Pair<String, String>>>(any(), any(), any()) } answers {}
 
-        every {mockUsersRepo.getRoomData(any(), any(), any())} answers {}
+        every { mockUsersRepo.getRoomData(any(), any(), any()) } answers {}
 
     }
 

From bcaf7913282afe197e4403ab9f625beceec65a31 Mon Sep 17 00:00:00 2001
From: laurislopata <40314248+laurislopata@users.noreply.github.com>
Date: Thu, 26 May 2022 17:07:21 +0200
Subject: [PATCH 20/27] Update
 app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt

Co-authored-by: Maxime <61186830+MaximeZmt@users.noreply.github.com>
---
 .../java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
index 1d6049200..9b8aed2dd 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
@@ -50,7 +50,7 @@ class PartyRoomActivityTest {
             firstArg<(PartyRoom, String) -> Unit>().invoke(partyRoom, roomID)
         }
 
-        every {mockUsersRepo.getRoomData(any(), any(), any())} answers {
+        every { mockUsersRepo.getRoomData(any(), any(), any()) } answers {
             secondArg<(PartyRoom, String) -> Unit>().invoke(partyRoom, roomID)
             lastArg<(MutableList<Pair<String, String>>) -> Unit>().invoke(songList)
         }

From 17ab001bedc1ccf464565d0eebbbe7222d191a3f Mon Sep 17 00:00:00 2001
From: laurislopata <40314248+laurislopata@users.noreply.github.com>
Date: Thu, 26 May 2022 17:07:29 +0200
Subject: [PATCH 21/27] Update
 app/src/main/java/ch/sdp/vibester/database/DataGetter.kt

Co-authored-by: Maxime <61186830+MaximeZmt@users.noreply.github.com>
---
 app/src/main/java/ch/sdp/vibester/database/DataGetter.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
index 51193dffd..1c186579f 100644
--- a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -267,7 +267,6 @@ class DataGetter @Inject constructor() {
      * @param fieldName name of the field to update
      * @param value new value to write to the database
      */
-
     fun <T> updateRoomField(roomID: String, fieldName: String, value: T) {
         dbRoomRef.child("${roomID}/${fieldName}").setValue(value)
     }

From 0532822c639e66efa24b1b59433692c39d56a307 Mon Sep 17 00:00:00 2001
From: laurislopata <40314248+laurislopata@users.noreply.github.com>
Date: Thu, 26 May 2022 17:07:39 +0200
Subject: [PATCH 22/27] Update
 app/src/main/java/ch/sdp/vibester/database/DataGetter.kt

Co-authored-by: Maxime <61186830+MaximeZmt@users.noreply.github.com>
---
 app/src/main/java/ch/sdp/vibester/database/DataGetter.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
index 1c186579f..9afbc9e6d 100644
--- a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -270,12 +270,12 @@ class DataGetter @Inject constructor() {
     fun <T> updateRoomField(roomID: String, fieldName: String, value: T) {
         dbRoomRef.child("${roomID}/${fieldName}").setValue(value)
     }
+    
     /**
      * This functions reads the start of the game field and calls the appropriate functions
      * @param roomID ID of the room
      * @param callback callback to be called when the read value is available
      */
-
     fun readStartGame(roomID: String, callback: (Boolean) -> Unit) {
         val queryRooms = dbRoomRef.child(roomID).child("gameStarted")
 

From 4734c9be93c6637f3b361fc8ba5a6b590bced906 Mon Sep 17 00:00:00 2001
From: laurislopata <40314248+laurislopata@users.noreply.github.com>
Date: Thu, 26 May 2022 17:19:46 +0200
Subject: [PATCH 23/27] Update
 app/src/main/java/ch/sdp/vibester/database/DataGetter.kt

Co-authored-by: zwierski <44404546+zwierski@users.noreply.github.com>
---
 .../main/java/ch/sdp/vibester/database/DataGetter.kt   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
index 9afbc9e6d..985b71760 100644
--- a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -220,7 +220,15 @@ class DataGetter @Inject constructor() {
 
      */
 
-    fun getRoomData(roomID: String,
+        /**
+     * This functions fetches the data of the given user from the database
+     * @param roomName the name of the room to retrieve data from
+     * @param callback the function to be called when the data of the appropriate user is available
+     * @param roomID the name of the room to retrieve data from
+     * @param partyRoomCallback the function to be called when the data of the appropriate room data is available
+     * @param songListCallback the function to be called when the data of the appropriate song list is available
+     */
+    fun getRoomData(roomName: String, callback: (PartyRoom) -> Unit) {
                     partyRoomCallback: (PartyRoom, String) -> Unit,
                     songListCallback: (MutableList<Pair<String, String>>) -> Unit) {
 

From b224e0b8d571f5754bf52a855231e73289af89cc Mon Sep 17 00:00:00 2001
From: laurislopata <40314248+laurislopata@users.noreply.github.com>
Date: Thu, 26 May 2022 17:19:54 +0200
Subject: [PATCH 24/27] Update
 app/src/main/java/ch/sdp/vibester/database/DataGetter.kt

Co-authored-by: zwierski <44404546+zwierski@users.noreply.github.com>
---
 app/src/main/java/ch/sdp/vibester/database/DataGetter.kt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
index 985b71760..c24127bbd 100644
--- a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -269,6 +269,12 @@ class DataGetter @Inject constructor() {
         })
     }
 
+    /**
+     * This functions that updates the field of a room entry
+     * @param roomID ID of the room
+     * @param fieldName name of the field to update
+     * @param value new value to write to the database
+     */
     /**
      * This functions that updates the field of a room entry
      * @param roomID ID of the room

From 00dc5815d421b7cfac7b63b1622f920cfe293b07 Mon Sep 17 00:00:00 2001
From: laurislopata <40314248+laurislopata@users.noreply.github.com>
Date: Thu, 26 May 2022 17:20:03 +0200
Subject: [PATCH 25/27] Update
 app/src/main/java/ch/sdp/vibester/database/DataGetter.kt

Co-authored-by: zwierski <44404546+zwierski@users.noreply.github.com>
---
 app/src/main/java/ch/sdp/vibester/database/DataGetter.kt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
index c24127bbd..5be5d903a 100644
--- a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -285,6 +285,11 @@ class DataGetter @Inject constructor() {
         dbRoomRef.child("${roomID}/${fieldName}").setValue(value)
     }
     
+    /**
+     * This functions reads the start of the game field and calls the appropriate functions
+     * @param roomID ID of the room
+     * @param callback callback to be called when the read value is available
+     */
     /**
      * This functions reads the start of the game field and calls the appropriate functions
      * @param roomID ID of the room

From 65727c96fb9f9d3d0671e978e529e206fb29bd74 Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Thu, 26 May 2022 17:30:43 +0200
Subject: [PATCH 26/27] Fixed compilation issue

---
 .../main/java/ch/sdp/vibester/database/DataGetter.kt | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
index 5be5d903a..d2bec1a0c 100644
--- a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -212,23 +212,13 @@ class DataGetter @Inject constructor() {
         return authenticator.getCurrUser()
     }
 
-    /**
-     * This functions fetches the data of the given user from the database
-     * @param roomID the name of the room to retrieve data from
-     * @param partyRoomCallback the function to be called when the data of the appropriate room data is available
-     * @param songListCallback the function to be called when the data of the appropriate song list is available
-
-     */
-
         /**
      * This functions fetches the data of the given user from the database
-     * @param roomName the name of the room to retrieve data from
-     * @param callback the function to be called when the data of the appropriate user is available
      * @param roomID the name of the room to retrieve data from
      * @param partyRoomCallback the function to be called when the data of the appropriate room data is available
      * @param songListCallback the function to be called when the data of the appropriate song list is available
      */
-    fun getRoomData(roomName: String, callback: (PartyRoom) -> Unit) {
+    fun getRoomData(roomID: String,
                     partyRoomCallback: (PartyRoom, String) -> Unit,
                     songListCallback: (MutableList<Pair<String, String>>) -> Unit) {
 

From b939207ee60a4ceec58f7fda09097a964e06f5a6 Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Thu, 26 May 2022 18:03:06 +0200
Subject: [PATCH 27/27] Fixing CI tests

---
 .../java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
index 9b8aed2dd..4aa8c7cfc 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
@@ -75,7 +75,7 @@ class PartyRoomActivityTest {
         val ctx: Context = ApplicationProvider.getApplicationContext()
 
         var mockRoomName = "mockName"
-        var mockUserEmailList = mutableListOf<String>("email1, email2")
+        var mockUserEmailList = mutableListOf<String>("Email1", "Email2")
         var mockSongList = mutableListOf<Pair<String, String>>(Pair("mockSong1", "mockSong2"))
         var mockPartyRoom = PartyRoom()