Merge pull request #2413 from hongwei1/develop

refactor/tweaked the resource docs
OpenBankProject · Jul 12, 2024 · 9d219b3 · 9d219b3
2 parents 0eeb25e + a0a3f7d
commit 9d219b3
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 26 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
@@ -5232,28 +5232,6 @@ object SwaggerDefinitionsJSON {
     valid_from = Some(new Date()),
     time_to_live = Some(3600)
     )
-
-  val consentRequestFromAccountJson = ConsentRequestFromAccountJson (
-    bank_routing = bankRoutingJsonV121,
-    account_routing = accountRoutingJsonV121,
-    branch_routing = branchRoutingJsonV141
-  )
-
-  val consentRequestToAccountJson = ConsentRequestToAccountJson (
-    bank_routing = bankRoutingJsonV121,
-    account_routing = accountRoutingJsonV121,
-    branch_routing = branchRoutingJsonV141,
-    limit = postCounterpartyLimitV510
-  )
-
-  val postConsentRequestJsonV510 = PostConsentRequestJsonV510(
-    from_account = consentRequestFromAccountJson,
-    to_account = consentRequestToAccountJson,
-    email = Some(emailExample.value),
-    phone_number = Some(mobileNumberExample.value),
-    valid_from = Some(new Date()),
-    time_to_live = Some(3600)
-  )
 
   val createPhysicalCardJsonV500 = CreatePhysicalCardJsonV500(
     card_number = bankCardNumberExample.value,
@@ -5483,6 +5461,29 @@ object SwaggerDefinitionsJSON {
   )
 
   val postAccountAccessJsonV510 = PostAccountAccessJsonV510(userIdExample.value,viewIdExample.value)
+
+  val consentRequestFromAccountJson = ConsentRequestFromAccountJson (
+    bank_routing = bankRoutingJsonV121,
+    account_routing = accountRoutingJsonV121,
+    branch_routing = branchRoutingJsonV141
+  )
+
+  val consentRequestToAccountJson = ConsentRequestToAccountJson (
+    bank_routing = bankRoutingJsonV121,
+    account_routing = accountRoutingJsonV121,
+    branch_routing = branchRoutingJsonV141,
+    limit = postCounterpartyLimitV510
+  )
+
+  val postConsentRequestJsonV510 = PostConsentRequestJsonV510(
+    from_account = consentRequestFromAccountJson,
+    to_account = consentRequestToAccountJson,
+    email = Some(emailExample.value),
+    phone_number = Some(mobileNumberExample.value),
+    valid_from = Some(new Date()),
+    time_to_live = Some(3600)
+  )
+
 
   //The common error or success format.
   //Just some helper format to use in Json 

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
@@ -2768,7 +2768,7 @@ trait APIMethods510 {
       nameOf(createVRPConsentRequest),
       "POST",
       "/consumer/vrp-consent-requests",
-      "Create VRP Consent Request",
+      "Create Consent Request VRP",
       s"""
          |Client Authentication (mandatory)
          |

diff --git a/obp-api/src/main/scala/code/counterpartylimit/MappedCounterpartyLimit.scala b/obp-api/src/main/scala/code/counterpartylimit/MappedCounterpartyLimit.scala
@@ -102,9 +102,7 @@ class CounterpartyLimit extends CounterpartyLimitTrait with LongKeyedMapper[Coun
     override def dbNotNull_? = true
   }
 
-  object Currency extends MappedString(this, 255){
-    override def dbNotNull_? = true
-  }
+  object Currency extends MappedString(this, 255)
 
   object MaxSingleAmount extends MappedInt(this) {
     override def defaultValue = -1