Slim dva-api to a pure HTTP orchestrator and split dva-processing

dva-api/api/src/main/kotlin/hu/bme/mit/ftsrg/dva/api/Application.kt

@@ -1,15 +1,10 @@
 package hu.bme.mit.ftsrg.dva.api
 
-import com.rabbitmq.client.Connection
-import com.rabbitmq.client.ConnectionFactory
 import hu.bme.mit.ftsrg.dva.api.db.*
 import hu.bme.mit.ftsrg.dva.api.err.addHandlers
-import hu.bme.mit.ftsrg.dva.api.rabbit.connectWithRetry
 import hu.bme.mit.ftsrg.dva.api.route.*
 import hu.bme.mit.ftsrg.dva.log.ReqestLogRepo
 import hu.bme.mit.ftsrg.dva.log.VerifRequestLogRepo
-import hu.bme.mit.ftsrg.dva.vla.TemplateRepo
-import hu.bme.mit.ftsrg.dva.vla.VLARepo
 import io.ktor.client.*
 import io.ktor.client.engine.cio.CIO
 import io.ktor.http.*
@@ -61,15 +56,7 @@ fun Application.installPlugins() {
 }
 
 fun Application.configureKoin() {
-    val rabbitHost = environment.config.property("rabbitmq.host").getString()
-
     val appModule = module {
-        single<Connection> {
-            ConnectionFactory().run {
-                host = rabbitHost
-                connectWithRetry(logger = log)
-            }
-        }
         single<HttpClient> {
             HttpClient(CIO) {
                 install(ClientContentNegotiation) {
@@ -80,20 +67,15 @@ fun Application.configureKoin() {
                 }
             }
         }
-        single<TemplateRepo> { PgTemplateRepo() }
         single<ReqestLogRepo> { PgRequestLogRepo() }
         single<VerifRequestLogRepo> { PgVerifRequestLogRepo() }
-        single<VLARepo> { PgVLARepo() }
     }
 
     serverInstall(Koin) { modules(appModule) }
 }
 
 fun Application.addRoutes() {
     docRoutes(openapiPath = environment.config.property("swagger.openapiFile").getString())
-    templateRoutes()
     aovRoutes()
-    vlaRoutes()
-    evaluationRoutes()
     infoRoutes()
 }

dva-api/api/src/main/kotlin/hu/bme/mit/ftsrg/dva/api/route/aovRoutes.kt

@@ -3,6 +3,7 @@ package hu.bme.mit.ftsrg.dva.api.route
 import com.rabbitmq.client.Connection
 import com.rabbitmq.client.MessageProperties
 import hu.bme.mit.ftsrg.dva.api.resource.Attestations
+import hu.bme.mit.ftsrg.dva.dto.ErrDTO
 import hu.bme.mit.ftsrg.dva.dto.IDDTO
 import hu.bme.mit.ftsrg.dva.dto.aov.ACAPyPresentationRequestDTO
 import hu.bme.mit.ftsrg.dva.dto.aov.ACAPyPresentationResponseDTO
@@ -103,18 +104,25 @@ fun Application.aovRoutes() {
                         )
                     )
                 }
-            val acaPyResp: ACAPyPresentationResponseDTO = resp.body()
+            if (!resp.status.isSuccess()) {
+                call.respond(
+                    resp.status,
+                    ErrDTO(type = "ACAPY_${resp.status.value}", title = resp.bodyAsText()),
+                )
+            } else {
+                val acaPyResp: ACAPyPresentationResponseDTO = resp.body()
 
-            if (verifLogEntity != null) {
-                verifsRepo.update(
-                    VerifRequestLogPatch(
-                        id = verifLogEntity.id,
-                        presentationRequestData = acaPyResp.aov,
+                if (verifLogEntity != null) {
+                    verifsRepo.update(
+                        VerifRequestLogPatch(
+                            id = verifLogEntity.id,
+                            presentationRequestData = acaPyResp.aov,
+                        )
                     )
-                )
-            }
+                }
 
-            call.respond(status = resp.status, message = acaPyResp)
+                call.respond(status = resp.status, message = acaPyResp)
+            }
         }
     }
 }