gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[libeufin] branch master updated (7abbdf1 -> e50a6fc)


From: gnunet
Subject: [libeufin] branch master updated (7abbdf1 -> e50a6fc)
Date: Tue, 16 Jun 2020 15:50:48 +0200

This is an automated email from the git hooks/post-receive script.

dold pushed a change to branch master
in repository libeufin.

    from 7abbdf1  fix FTBFS
     new f0b8d05  fetching
     new e50a6fc  do not leak HTTP client

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 nexus/src/main/kotlin/tech/libeufin/nexus/JSON.kt        |  4 ++++
 nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt        |  2 +-
 .../main/kotlin/tech/libeufin/nexus/ebics/EbicsNexus.kt  | 16 ++++++++++++++++
 nexus/src/main/kotlin/tech/libeufin/nexus/taler.kt       |  7 +++----
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/JSON.kt 
b/nexus/src/main/kotlin/tech/libeufin/nexus/JSON.kt
index c5d7c3a..cff2b05 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/JSON.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/JSON.kt
@@ -143,9 +143,13 @@ abstract class FetchSpecJson(
     val bankConnection: String?
 )
 
+@JsonTypeName("latest")
 class FetchSpecLatestJson(level: FetchLevel, bankConnection: String?) : 
FetchSpecJson(level, bankConnection)
+@JsonTypeName("all")
 class FetchSpecAllJson(level: FetchLevel, bankConnection: String?) : 
FetchSpecJson(level, bankConnection)
+@JsonTypeName("since-last")
 class FetchSpecSinceLastJson(level: FetchLevel, bankConnection: String?) : 
FetchSpecJson(level, bankConnection)
+@JsonTypeName("previous-days")
 class FetchSpecPreviousDaysJson(level: FetchLevel, bankConnection: String?, 
val number: Int) :
     FetchSpecJson(level, bankConnection)
 
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt 
b/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
index 80b9e43..3b2a0fd 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
@@ -853,7 +853,7 @@ fun serverMain(dbName: String) {
             }
 
             route("/facades/{fcid}/taler") {
-                talerFacadeRoutes(this)
+                talerFacadeRoutes(this, client)
             }
             /**
              * Hello endpoint.
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/EbicsNexus.kt 
b/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/EbicsNexus.kt
index 57d531a..abbcaf1 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/EbicsNexus.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/EbicsNexus.kt
@@ -48,6 +48,7 @@ import tech.libeufin.util.*
 import tech.libeufin.util.ebics_h004.HTDResponseOrderData
 import java.io.ByteArrayOutputStream
 import java.security.interfaces.RSAPrivateCrtKey
+import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 import java.util.*
@@ -78,6 +79,21 @@ suspend fun fetchEbicsBySpec(fetchSpec: FetchSpecJson, 
client: HttpClient, bankC
                 }
             }
         }
+        is FetchSpecAllJson -> {
+            val p = EbicsStandardOrderParams(EbicsDateRange(LocalDate.EPOCH, 
LocalDate.now()))
+            when (fetchSpec.level) {
+                FetchLevel.ALL -> {
+                    specs.add(EbicsFetchSpec("C52", p))
+                    specs.add(EbicsFetchSpec("C53", p))
+                }
+                FetchLevel.REPORT -> {
+                    specs.add(EbicsFetchSpec("C52", p))
+                }
+                FetchLevel.STATEMENT -> {
+                    specs.add(EbicsFetchSpec("C53", p))
+                }
+            }
+        }
     }
     for (spec in specs) {
         fetchEbicsC5x(spec.orderType, client, bankConnectionId, 
spec.orderParams, subscriberDetails)
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/taler.kt 
b/nexus/src/main/kotlin/tech/libeufin/nexus/taler.kt
index 9e78f33..11ca8a9 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/taler.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/taler.kt
@@ -327,7 +327,7 @@ private suspend fun talerTransfer(call: ApplicationCall) {
 }
 
 // /taler/admin/add-incoming
-private suspend fun talerAddIncoming(call: ApplicationCall): Unit {
+private suspend fun talerAddIncoming(call: ApplicationCall, httpClient: 
HttpClient): Unit {
     val addIncomingData = call.receive<TalerAdminAddIncoming>()
     val debtor = parsePayto(addIncomingData.debit_account)
     val res = transaction {
@@ -342,7 +342,6 @@ private suspend fun talerAddIncoming(call: 
ApplicationCall): Unit {
             val facadeHolderName = facadeBankAccount.accountHolder
         }
     }
-    val httpClient = HttpClient()
     /** forward the payment information to the sandbox.  */
     httpClient.post<String>(
         urlString = "http://localhost:5000/admin/payments";,
@@ -629,13 +628,13 @@ private suspend fun historyIncoming(call: 
ApplicationCall): Unit {
     return call.respond(TextContent(customConverter(history), 
ContentType.Application.Json))
 }
 
-fun talerFacadeRoutes(route: Route) {
+fun talerFacadeRoutes(route: Route, httpClient: HttpClient) {
     route.post("/transfer") {
         talerTransfer(call)
         return@post
     }
     route.post("/admin/add-incoming") {
-        talerAddIncoming(call)
+        talerAddIncoming(call, httpClient)
         return@post
     }
     route.get("/history/outgoing") {

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]