artin/OBP-API
1
0
Fork 0
mirror of https://github.com/OpenBankProject/OBP-API.git synced 2026-02-06 16:56:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modify Kafka Connector so that Counterparties can optionally be read from OBP or Kafka # 397

Browse Source
This commit is contained in:
hongwei1 2017-02-20 15:34:48 +01:00
parent 4822dae917
commit 0fdcd7ae61
2 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release_notes.md
View File

@ -3,5 +3,5 @@
### Most recent changes at top of file
```
Date Commit Action
17/02/2017 cc42117 added new pair to props : # The internal redirect white list <--> allowed_internal_redirect_urls = /,/oauth/authorize
20/02/2017 d8b6907 added new pair to props : # If true, get counterparties from OBP db, else put message on Kafka queue. <--> get_counterparties_from_OBP_DB = true
```

55
src/main/scala/code/bankconnectors/KafkaMappedConnector.scala
View File

@ -33,7 +33,7 @@ import code.branches.MappedBranch
import code.fx.{FXRate, fx}
import code.management.ImporterAPI.ImporterTransaction
import code.metadata.comments.MappedComment
import code.metadata.counterparties.{Counterparties, CounterpartyTrait}
import code.metadata.counterparties.{Counterparties, CounterpartyTrait, MappedCounterparty}
import code.metadata.narrative.MappedNarrative
import code.metadata.tags.MappedTag
import code.metadata.transactionimages.MappedTransactionImage
@ -515,18 +515,23 @@ object KafkaMappedConnector extends Connector with Loggable {
// Get one counterparty by the Counterparty Id
override def getCounterpartyByCounterpartyId(counterpartyId: CounterpartyId): Box[CounterpartyTrait] = {
val req = Map(
"north" -> "getCounterpartyByCounterpartyId",
"version" -> formatVersion,
"name" -> AuthUser.getCurrentUserUsername,
"counterpartyId" -> counterpartyId.toString
)
// Since result is single account, we need only first list entry
implicit val formats = net.liftweb.json.DefaultFormats
val r = {
cachedCounterparty.getOrElseUpdate( req.toString, () => process(req).extract[KafkaInboundCounterparty])
if (Props.getBool("get_counterparties_from_OBP_DB", true)) {
MappedCounterparty.find(By(MappedCounterparty.mCounterPartyId, counterpartyId.value))
} else {
val req = Map(
"north" -> "getCounterpartyByCounterpartyId",
"version" -> formatVersion,
"name" -> AuthUser.getCurrentUserUsername,
"counterpartyId" -> counterpartyId.toString
)
// Since result is single account, we need only first list entry
implicit val formats = net.liftweb.json.DefaultFormats
val r = {
cachedCounterparty.getOrElseUpdate( req.toString, () => process(req).extract[KafkaInboundCounterparty])
}
Full(new KafkaCounterparty(r))
}
Full(new KafkaCounterparty(r))
}
@ -534,17 +539,25 @@ object KafkaMappedConnector extends Connector with Loggable {
override def getCounterpartyByIban(iban: String): Box[CounterpartyTrait] = {
val req = Map(
"north" -> "getCounterpartyByIban",
"version" -> formatVersion,
"name" -> AuthUser.getCurrentUserUsername,
"otherAccountRoutingAddress" -> iban,
"otherAccountRoutingScheme" -> "IBAN"
)
val r = process(req).extract[KafkaInboundCounterparty]
if (Props.getBool("get_counterparties_from_OBP_DB", true)) {
MappedCounterparty.find(
By(MappedCounterparty.mOtherAccountRoutingAddress, iban),
By(MappedCounterparty.mOtherAccountRoutingScheme, "IBAN")
)
} else {
val req = Map(
"north" -> "getCounterpartyByIban",
"version" -> formatVersion,
"name" -> AuthUser.getCurrentUserUsername,
"otherAccountRoutingAddress" -> iban,
"otherAccountRoutingScheme" -> "IBAN"
)
Full(new KafkaCounterparty(r))
val r = process(req).extract[KafkaInboundCounterparty]
Full(new KafkaCounterparty(r))
}
}
override def getPhysicalCards(user: User): List[PhysicalCard] =