Load passwords by User#Id

shade-sdev · Oct 23, 2024 · 8977f94 · 8977f94
1 parent a5c2986
commit 8977f94
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 16 deletions.
diff --git a/src/main/kotlin/core/models/criteria/PasswordSearchCriteria.kt b/src/main/kotlin/core/models/criteria/PasswordSearchCriteria.kt
@@ -0,0 +1,9 @@
+package core.models.criteria
+
+import core.models.PasswordSort
+import java.util.*
+
+data class PasswordSearchCriteria(
+    val userId: UUID?,
+    val sort: PasswordSort
+)
diff --git a/src/main/kotlin/di/AppModule.kt b/src/main/kotlin/di/AppModule.kt
@@ -65,7 +65,7 @@ val viewModelModule = module {
 
     factory { ForgotPasswordScreenModel(get()) }
 
-    factory { SecVaultScreenModel(get()) }
+    factory { SecVaultScreenModel(get(), get()) }
 
     factory { PasswordMgntScreenModel(get(), get()) }
 

diff --git a/src/main/kotlin/repository/password/PasswordRepository.kt b/src/main/kotlin/repository/password/PasswordRepository.kt
@@ -1,13 +1,13 @@
 package repository.password
 
-import core.models.PasswordSort
 import core.models.Result
+import core.models.criteria.PasswordSearchCriteria
 import core.models.dto.PasswordDto
 import repository.password.projection.PasswordSummary
 
 interface PasswordRepository {
 
-    suspend fun findSummaries(sort: PasswordSort): Result<List<PasswordSummary>>
+    suspend fun findSummaries(searchCriteria: PasswordSearchCriteria): Result<List<PasswordSummary>>
 
     suspend fun save(password: PasswordDto): Result<Boolean>
 

diff --git a/src/main/kotlin/repository/password/impl/PasswordRepositoryImpl.kt b/src/main/kotlin/repository/password/impl/PasswordRepositoryImpl.kt
@@ -2,11 +2,13 @@ package repository.password.impl
 
 import core.models.PasswordSort
 import core.models.Result
+import core.models.criteria.PasswordSearchCriteria
 import core.models.dto.PasswordDto
 import kotlinx.coroutines.delay
 import org.jetbrains.exposed.sql.Database
 import org.jetbrains.exposed.sql.Expression
 import org.jetbrains.exposed.sql.SortOrder
+import org.jetbrains.exposed.sql.andWhere
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.slf4j.Logger
 import repository.common.errors.DatabaseError
@@ -20,28 +22,34 @@ class PasswordRepositoryImpl(
     private val logger: Logger
 ) : PasswordRepository {
 
-    override suspend fun findSummaries(sort: PasswordSort): Result<List<PasswordSummary>> {
+    override suspend fun findSummaries(searchCriteria: PasswordSearchCriteria): Result<List<PasswordSummary>> {
         delay(550)
         return try {
             return transaction(db) {
-                PasswordsTable.select(
+
+                val query = PasswordsTable.select(
                     listOf(
                         PasswordsTable.id,
                         PasswordsTable.name,
                         PasswordsTable.username,
                         PasswordsTable.email,
                         PasswordsTable.favorite
                     )
-                ).orderBy(toSort(sort), toOrder(sort))
-                    .map {
-                        PasswordSummary(
-                            id = it[PasswordsTable.id].value,
-                            name = it[PasswordsTable.name],
-                            username = it[PasswordsTable.username],
-                            email = it[PasswordsTable.email],
-                            favorite = it[PasswordsTable.favorite]
-                        )
-                    }
+                )
+
+                searchCriteria.userId?.let {
+                    query.andWhere { PasswordsTable.user eq it }
+                }
+
+                query.orderBy(toSort(searchCriteria.sort), toOrder(searchCriteria.sort)).map {
+                    PasswordSummary(
+                        id = it[PasswordsTable.id].value,
+                        name = it[PasswordsTable.name],
+                        username = it[PasswordsTable.username],
+                        email = it[PasswordsTable.email],
+                        favorite = it[PasswordsTable.favorite]
+                    )
+                }
             }.let { Result.Success(it) }
         } catch (e: Exception) {
             logger.error(e.message, e)

diff --git a/src/main/kotlin/viewmodel/SecVaultScreenModel.kt b/src/main/kotlin/viewmodel/SecVaultScreenModel.kt
@@ -2,10 +2,12 @@ package viewmodel
 
 import cafe.adriel.voyager.core.model.ScreenModel
 import cafe.adriel.voyager.core.model.screenModelScope
+import core.AppState
 import core.models.DefaultMenuItem
 import core.models.PasswordSort
 import core.models.Result
 import core.models.UiState
+import core.models.criteria.PasswordSearchCriteria
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -18,6 +20,7 @@ import repository.password.projection.PasswordSummary
 
 class SecVaultScreenModel(
     private val passwordRepository: PasswordRepository,
+    private val appState: AppState,
     private val dispatcher: CoroutineDispatcher = Dispatchers.IO
 ) : ScreenModel {
 
@@ -72,7 +75,8 @@ class SecVaultScreenModel(
     }
 
     private suspend fun loadPasswords(sort: PasswordSort) {
-        _passwordItems.value = when (val passwords = passwordRepository.findSummaries(sort)) {
+        val criteria = PasswordSearchCriteria(appState.getAuthenticatedUser?.id?.value, sort)
+        _passwordItems.value = when (val passwords = passwordRepository.findSummaries(criteria)) {
             is Result.Success -> {
                 _secVaultState.value = UiState.Success("Successfully loaded passwords")
                 passwords.data