From b2ce80da69ced0bd6c19dba5c55b6dbede00cbf9 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 29 Mar 2023 15:40:34 +0200
Subject: [PATCH] Add a db query to get all the Sessions.

---
 .../android/libraries/sessionstorage/api/SessionStore.kt    | 1 +
 .../sessionstorage/impl/memory/InMemorySessionStore.kt      | 4 ++++
 .../libraries/sessionstorage/impl/DatabaseSessionStore.kt   | 6 ++++++
 .../element/android/libraries/matrix/session/SessionData.sq | 3 +++
 .../sessionstorage/impl/DatabaseSessionStoreTests.kt        | 3 ++-
 5 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/SessionStore.kt b/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/SessionStore.kt
index de0ec2f727..1637bd809f 100644
--- a/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/SessionStore.kt
+++ b/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/SessionStore.kt
@@ -22,6 +22,7 @@ interface SessionStore {
     fun isLoggedIn(): Flow<Boolean>
     suspend fun storeData(sessionData: SessionData)
     suspend fun getSession(sessionId: String): SessionData?
+    suspend fun getAllSessions(): List<SessionData>
     suspend fun getLatestSession(): SessionData?
     suspend fun removeSession(sessionId: String)
 }
diff --git a/libraries/session-storage/impl-memory/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/memory/InMemorySessionStore.kt b/libraries/session-storage/impl-memory/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/memory/InMemorySessionStore.kt
index b73ffdeb9a..ce5b6e24f2 100644
--- a/libraries/session-storage/impl-memory/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/memory/InMemorySessionStore.kt
+++ b/libraries/session-storage/impl-memory/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/memory/InMemorySessionStore.kt
@@ -38,6 +38,10 @@ class InMemorySessionStore : SessionStore {
         return sessionDataFlow.value.takeIf { it?.userId == sessionId }
     }
 
+    override suspend fun getAllSessions(): List<SessionData> {
+        return listOfNotNull(sessionDataFlow.value)
+    }
+
     override suspend fun getLatestSession(): SessionData? {
         return sessionDataFlow.value
     }
diff --git a/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStore.kt b/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStore.kt
index 6c32bcd1f3..15c3024712 100644
--- a/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStore.kt
+++ b/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStore.kt
@@ -53,6 +53,12 @@ class DatabaseSessionStore @Inject constructor(
             ?.toApiModel()
     }
 
+    override suspend fun getAllSessions(): List<SessionData> {
+        return database.sessionDataQueries.selectAll()
+            .executeAsList()
+            .map { it.toApiModel() }
+    }
+
     override suspend fun removeSession(sessionId: String) {
         database.sessionDataQueries.removeSession(sessionId)
     }
diff --git a/libraries/session-storage/impl/src/main/sqldelight/io/element/android/libraries/matrix/session/SessionData.sq b/libraries/session-storage/impl/src/main/sqldelight/io/element/android/libraries/matrix/session/SessionData.sq
index d8fb15338c..ea8471a36a 100644
--- a/libraries/session-storage/impl/src/main/sqldelight/io/element/android/libraries/matrix/session/SessionData.sq
+++ b/libraries/session-storage/impl/src/main/sqldelight/io/element/android/libraries/matrix/session/SessionData.sq
@@ -10,6 +10,9 @@ CREATE TABLE SessionData (
 selectFirst:
 SELECT * FROM SessionData LIMIT 1;
 
+selectAll:
+SELECT * FROM SessionData;
+
 selectByUserId:
 SELECT * FROM SessionData WHERE userId = ?;
 
diff --git a/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStoreTests.kt b/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStoreTests.kt
index 885c04af78..0260604f6e 100644
--- a/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStoreTests.kt
+++ b/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStoreTests.kt
@@ -57,6 +57,7 @@ class DatabaseSessionStoreTests {
         databaseSessionStore.storeData(aSessionData.toApiModel())
 
         assertThat(database.sessionDataQueries.selectFirst().executeAsOneOrNull()).isEqualTo(aSessionData)
+        assertThat(database.sessionDataQueries.selectAll().executeAsList().size).isEqualTo(1)
     }
 
     @Test
@@ -88,6 +89,7 @@ class DatabaseSessionStoreTests {
         val foundSession = databaseSessionStore.getSession(aSessionData.userId)?.toDbModel()
 
         assertThat(foundSession).isEqualTo(aSessionData)
+        assertThat(database.sessionDataQueries.selectAll().executeAsList().size).isEqualTo(2)
     }
 
     @Test
@@ -107,5 +109,4 @@ class DatabaseSessionStoreTests {
 
         assertThat(database.sessionDataQueries.selectByUserId(aSessionData.userId).executeAsOneOrNull()).isNull()
     }
-
 }