summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcello Stanisci <stanisci.m@gmail.com>2020-04-01 17:39:30 +0200
committerMarcello Stanisci <stanisci.m@gmail.com>2020-04-01 17:39:30 +0200
commit4c5b0777547c726cde56b7979e116bcf96c994fd (patch)
treea49a765a1f4f1005ef24fbe6459f2d1ec65c0c50
parentc1980ed1dc57702aad1b6fea92eadfa187420f41 (diff)
downloadlibeufin-4c5b0777547c726cde56b7979e116bcf96c994fd.tar.gz
libeufin-4c5b0777547c726cde56b7979e116bcf96c994fd.tar.bz2
libeufin-4c5b0777547c726cde56b7979e116bcf96c994fd.zip
fix validation issues
-rw-r--r--nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt3
-rw-r--r--sandbox/src/main/kotlin/tech/libeufin/sandbox/EbicsProtocolBackend.kt43
2 files changed, 26 insertions, 20 deletions
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
index be134337..2649c040 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
@@ -819,7 +819,6 @@ fun main() {
}
}
}
-
post("/ebics/subscribers/{id}/sendC54") {
val id = expectId(call.parameters["id"])
val paramsJson = call.receive<EbicsStandardOrderParamsJson>()
@@ -843,7 +842,6 @@ fun main() {
}
return@post
}
-
get("/ebics/subscribers/{id}/sendHTD") {
val customerIdAtNexus = expectId(call.parameters["id"])
val subscriberData = getSubscriberDetailsFromId(customerIdAtNexus)
@@ -870,7 +868,6 @@ fun main() {
}
return@get
}
-
post("/ebics/subscribers/{id}/sendHAA") {
val id = expectId(call.parameters["id"])
val subscriberData = getSubscriberDetailsFromId(id)
diff --git a/sandbox/src/main/kotlin/tech/libeufin/sandbox/EbicsProtocolBackend.kt b/sandbox/src/main/kotlin/tech/libeufin/sandbox/EbicsProtocolBackend.kt
index 0a59fd0a..fce26af3 100644
--- a/sandbox/src/main/kotlin/tech/libeufin/sandbox/EbicsProtocolBackend.kt
+++ b/sandbox/src/main/kotlin/tech/libeufin/sandbox/EbicsProtocolBackend.kt
@@ -180,7 +180,7 @@ fun buildCamtString(history: SizedIterable<BankTransactionEntity>, type: Int): S
root("Document") {
attribute("xmlns", "urn:iso:std:iso:20022:tech:xsd:camt.053.001.02")
attribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance")
- attribute("xmlns:schemaLocation", "urn:iso:std:iso:20022:tech:xsd:camt.053.001.02 camt.053.001.02.xsd")
+ attribute("xsi:schemaLocation", "urn:iso:std:iso:20022:tech:xsd:camt.053.001.02 camt.053.001.02.xsd")
element("BkToCstmrStmt") {
element("GrpHdr") {
element("MsgId") {
@@ -199,9 +199,15 @@ fun buildCamtString(history: SizedIterable<BankTransactionEntity>, type: Int): S
}
}
element(if (type == 52) "Rpt" else "Stmt") {
- element("Id")
- element("ElctrncSeqNb")
- element("LglSeqNb")
+ element("Id") {
+ text("0")
+ }
+ element("ElctrncSeqNb") {
+ text("0")
+ }
+ element("LglSeqNb") {
+ text("0")
+ }
element("CreDtTm") {
text(now.toZonedString())
}
@@ -217,9 +223,9 @@ fun buildCamtString(history: SizedIterable<BankTransactionEntity>, type: Int): S
element("Ownr/Nm") {
text("Max Mustermann")
}
- element("Svcr/FinInstn") {
+ element("Svcr/FinInstnId") {
element("BIC") {
- text("XY")
+ text("GENODEM1GLS")
}
element("Nm") {
text("Libeufin Bank")
@@ -253,7 +259,7 @@ fun buildCamtString(history: SizedIterable<BankTransactionEntity>, type: Int): S
}
element("Dt/Dt") {
// date of this balance
- now.toDashedDate()
+ text(now.toDashedDate())
}
}
element("Bal") {
@@ -277,7 +283,10 @@ fun buildCamtString(history: SizedIterable<BankTransactionEntity>, type: Int): S
}
// history.forEach {
element("Ntry") {
- element("Amt")
+ element("Amt") {
+ attribute("Ccy", "EUR")
+ text(Amount(1).toPlainString())
+ }
element("CdtDbtInd") {
text("DBIT")
}
@@ -287,7 +296,7 @@ fun buildCamtString(history: SizedIterable<BankTransactionEntity>, type: Int): S
* "Status of an entry on the books of the account servicer" */
text("BOOK")
}
- element("BookDt/Dt") {
+ element("BookgDt/Dt") {
text(now.toDashedDate())
} // date of the booking
element("ValDt/Dt") {
@@ -311,13 +320,13 @@ fun buildCamtString(history: SizedIterable<BankTransactionEntity>, type: Int): S
text("ESCT")
}
}
- element("Prtry") {
- element("Cd") {
- text("0")
- }
- element("Issr") {
- text("XY")
- }
+ }
+ element("Prtry") {
+ element("Cd") {
+ text("0")
+ }
+ element("Issr") {
+ text("XY")
}
}
}
@@ -376,7 +385,7 @@ fun buildCamtString(history: SizedIterable<BankTransactionEntity>, type: Int): S
}
element("RltdAgts") {
element("CdtrAgt/FinInstnId/BIC") {
- text("SOGEDEFF")
+ text("GENODEM1GLS")
}
}
element("RmtInf/Ustrd") {