refactor/OBPv510 added currency to CounterpartyLimit Model

OpenBankProject · Jul 12, 2024 · ec2c10e · ec2c10e
1 parent d9f0bce
commit ec2c10e
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 0 deletions.
diff --git a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala
@@ -5470,6 +5470,7 @@ object SwaggerDefinitionsJSON {
     account_id = accountIdExample.value,
     view_id = viewIdExample.value,
     counterparty_id = counterpartyIdExample.value,
+    currency = currencyExample.value,
     max_single_amount = maxSingleAmountExample.value.toInt,
     max_monthly_amount = maxMonthlyAmountExample.value.toInt,
     max_number_of_monthly_transactions = maxNumberOfMonthlyTransactionsExample.value.toInt,

diff --git a/obp-api/src/main/scala/code/api/util/NewStyle.scala b/obp-api/src/main/scala/code/api/util/NewStyle.scala
@@ -4068,6 +4068,7 @@ object NewStyle extends MdcLoggable{
       accountId: String,
       viewId: String,
       counterpartyId: String,
+      currency: String,
       maxSingleAmount: Int,
       maxMonthlyAmount: Int,
       maxNumberOfMonthlyTransactions: Int,
@@ -4080,6 +4081,7 @@ object NewStyle extends MdcLoggable{
         accountId: String,
         viewId: String,
         counterpartyId: String,
+        currency: String,
         maxSingleAmount: Int,
         maxMonthlyAmount: Int,
         maxNumberOfMonthlyTransactions: Int,

diff --git a/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala b/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala
@@ -2351,6 +2351,7 @@ trait APIMethods510 {
               accountId.value,
               viewId.value,
               counterpartyId.value,
+              postCounterpartyLimitV510.currency,
               postCounterpartyLimitV510.max_single_amount,
               postCounterpartyLimitV510.max_monthly_amount,
               postCounterpartyLimitV510.max_number_of_monthly_transactions,
@@ -2398,6 +2399,7 @@ trait APIMethods510 {
               accountId.value,
               viewId.value,
               counterpartyId.value,
+              postCounterpartyLimitV510.currency,
               postCounterpartyLimitV510.max_single_amount,
               postCounterpartyLimitV510.max_monthly_amount,
               postCounterpartyLimitV510.max_number_of_monthly_transactions,

diff --git a/obp-api/src/main/scala/code/api/v5_1_0/JSONFactory5.1.0.scala b/obp-api/src/main/scala/code/api/v5_1_0/JSONFactory5.1.0.scala
@@ -177,6 +177,7 @@ case class CounterpartyLimitV510(
   account_id: String,
   view_id: String,
   counterparty_id: String,
+  currency: String,
   max_single_amount: Int,
   max_monthly_amount: Int,
   max_number_of_monthly_transactions: Int,

diff --git a/obp-api/src/main/scala/code/bankconnectors/Connector.scala b/obp-api/src/main/scala/code/bankconnectors/Connector.scala
@@ -2693,6 +2693,7 @@ trait Connector extends MdcLoggable {
     accountId: String,
     viewId: String,
     counterpartyId: String,
+    currency: String,
     maxSingleAmount: Int,
     maxMonthlyAmount: Int,
     maxNumberOfMonthlyTransactions: Int,

diff --git a/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala b/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala
@@ -5947,6 +5947,7 @@ object LocalMappedConnector extends Connector with MdcLoggable {
     accountId: String,
     viewId: String,
     counterpartyId: String,
+    currency: String,
     maxSingleAmount: Int,
     maxMonthlyAmount: Int,
     maxNumberOfMonthlyTransactions: Int,
@@ -5957,6 +5958,7 @@ object LocalMappedConnector extends Connector with MdcLoggable {
       accountId: String,
       viewId: String,
       counterpartyId: String,
+      currency: String,
       maxSingleAmount: Int,
       maxMonthlyAmount: Int,
       maxNumberOfMonthlyTransactions: Int,

diff --git a/obp-api/src/main/scala/code/counterpartylimit/CounterpartyLimit.scala b/obp-api/src/main/scala/code/counterpartylimit/CounterpartyLimit.scala
@@ -34,6 +34,7 @@ trait CounterpartyLimitProviderTrait {
     accountId: String,
     viewId: String,
     counterpartyId: String,
+    currency: String,
     maxSingleAmount: Int,
     maxMonthlyAmount: Int,
     maxNumberOfMonthlyTransactions: Int,
@@ -48,6 +49,7 @@ trait CounterpartyLimitTrait extends JsonAble{
   def viewId: String
   def counterpartyId: String
 
+  def currency: String
   def maxSingleAmount: Int
   def maxMonthlyAmount: Int
   def maxNumberOfMonthlyTransactions: Int

diff --git a/obp-api/src/main/scala/code/counterpartylimit/MappedCounterpartyLimit.scala b/obp-api/src/main/scala/code/counterpartylimit/MappedCounterpartyLimit.scala
@@ -46,6 +46,7 @@ object MappedCounterpartyLimitProvider extends CounterpartyLimitProviderTrait {
     accountId: String,
     viewId: String,
     counterpartyId: String,
+    currency: String,
     maxSingleAmount: Int,
     maxMonthlyAmount: Int,
     maxNumberOfMonthlyTransactions: Int,
@@ -58,6 +59,7 @@ object MappedCounterpartyLimitProvider extends CounterpartyLimitProviderTrait {
         counterpartyLimit.AccountId(accountId)
         counterpartyLimit.ViewId(viewId)
         counterpartyLimit.CounterpartyId(counterpartyId)
+        counterpartyLimit.Currency(currency)
         counterpartyLimit.MaxSingleAmount(maxSingleAmount)
         counterpartyLimit.MaxMonthlyAmount(maxMonthlyAmount)
         counterpartyLimit.MaxNumberOfMonthlyTransactions(maxNumberOfMonthlyTransactions)
@@ -100,6 +102,9 @@ class CounterpartyLimit extends CounterpartyLimitTrait with LongKeyedMapper[Coun
     override def dbNotNull_? = true
   }
 
+  object Currency extends MappedString(this, 255){
+    override def dbNotNull_? = true
+  }
 
   object MaxSingleAmount extends MappedInt(this) {
     override def defaultValue = -1
@@ -123,6 +128,7 @@ class CounterpartyLimit extends CounterpartyLimitTrait with LongKeyedMapper[Coun
   def accountId: String = AccountId.get
   def viewId: String = ViewId.get
   def counterpartyId: String = CounterpartyId.get
+  def currency: String = Currency.get
 
   def maxSingleAmount: Int = MaxSingleAmount.get
   def maxMonthlyAmount: Int = MaxMonthlyAmount.get
@@ -136,6 +142,7 @@ class CounterpartyLimit extends CounterpartyLimitTrait with LongKeyedMapper[Coun
       ("account_id",accountId) ~ 
       ("view_id",viewId) ~ 
       ("counterparty_id",counterpartyId) ~ 
+      ("currency",currency) ~ 
       ("max_single_amount", maxSingleAmount) ~ 
       ("max_monthly_amount", maxMonthlyAmount) ~ 
       ("max_number_of_monthly_transactions", maxNumberOfMonthlyTransactions) ~