Merge pull request #590 from walt-id/fix-transaction-in-did-listing

Fix transaction block in did listing
walt-id · Jul 8, 2024 · 04d36ec · 04d36ec
2 parents d344e24 + be7bb62
commit 04d36ec
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...vices/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/SSIKit2WalletService.kt b/...vices/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/SSIKit2WalletService.kt
@@ -339,7 +339,7 @@ class SSIKit2WalletService(
         return result.did
     }
 
-    override suspend fun listDids() = transaction { DidsService.list(walletId) }
+    override suspend fun listDids() =  DidsService.list(walletId)
 
     override suspend fun loadDid(did: String): JsonObject =
         DidsService.get(walletId, did)?.let { Json.parseToJsonElement(it.document).jsonObject }

diff --git a/...d-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/dids/DidService.kt b/...d-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/dids/DidService.kt
@@ -15,7 +15,8 @@ object DidsService {
             .singleOrNull()?.let { WalletDid(it) }
     }
 
-    fun list(wallet: UUID): List<WalletDid> = WalletDids.selectAll().where { WalletDids.wallet eq wallet }.map { WalletDid(it) }
+    fun list(wallet: UUID): List<WalletDid> =
+        transaction { WalletDids.selectAll().where { WalletDids.wallet eq wallet }.map { WalletDid(it) } }
 
     fun getWalletsForDid(did: String): List<UUID> = transaction {
         WalletDids.selectAll().where { WalletDids.did eq did }.map {

diff --git a/...ices/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/DidController.kt b/...ices/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/DidController.kt
@@ -11,7 +11,6 @@ import io.ktor.server.application.*
 import io.ktor.server.response.*
 import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.json.JsonObject
-import org.jetbrains.exposed.sql.transactions.transaction
 
 fun Application.dids() = walletRoute {
     route("dids", {
@@ -26,7 +25,7 @@ fun Application.dids() = walletRoute {
                 }
             }
         }) {
-            context.respond(getWalletService().run { transaction { runBlocking { listDids() } } })
+            context.respond(getWalletService().run {  runBlocking { listDids() }  })
         }
 
         route("{did}", {