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

feature/added obpIdCheck for all post json body-fixed failed tests2

Browse Source
This commit is contained in:
hongwei 2023-10-23 13:10:10 +02:00
parent 5638f5885b
commit b37de16a5c
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
obp-api/src/main/scala/code/api/util/APIUtil.scala
View File

@ -1001,6 +1001,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{
val valueLength = value.length
val regex = """^([A-Za-z0-9\-._]+)$""".r
value match {
case _ if value.isEmpty => SILENCE_IS_GOLDEN
case regex(e) if(valueLength <= 36) => SILENCE_IS_GOLDEN
case regex(e) if(valueLength > 36) => ErrorMessages.InvalidValueLength+" The maximum OBP id length is 36. "
case _ => ErrorMessages.InvalidValueCharacters + " only A-Z, a-z, 0-9, -, _, ., and max length <= 32 "
@ -4854,7 +4855,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{
case JField(n, v) =>
(n == "id" || n == "user_id" || n == "bank_id" || n == "account_id" || n == "customer_id"
|| n == "branch_id" || n == "atm_id" || n == "transaction_id" || n == "transaction_request_id"
|| n == "card_id")&&v.isInstanceOf[JString]}
|| n == "card_id"|| n == "view_id")&&v.isInstanceOf[JString]}
.map(
jField => (jField.name, jField.value.asInstanceOf[JString].s)
)

21
obp-api/src/test/scala/code/util/APIUtilTest.scala
View File

@ -796,8 +796,9 @@ class APIUtilTest extends FeatureSpec with Matchers with GivenWhenThen with Prop
val id1 = "gh.29.uk"
val id2 = "1313_.121"
val id3 = APIUtil.generateUUID()
// error cases
val id7 = "" //the empty string
// error cases
val id4 = "+123313" //do not support +
val id5 = "@#$" //do not support @#$
val id6 = APIUtil.generateUUID() +"1" //the max length is 36
@ -805,20 +806,18 @@ class APIUtilTest extends FeatureSpec with Matchers with GivenWhenThen with Prop
val actualValue1 = APIUtil.checkObpId(id1)
val actualValue2 = APIUtil.checkObpId(id2)
val actualValue3 = APIUtil.checkObpId(id3)
val actualValue4 = APIUtil.checkObpId(id4)
val actualValue5 = APIUtil.checkObpId(id5)
val actualValue6 = APIUtil.checkObpId(id6)
val actualValue7 = APIUtil.checkObpId(id7)
val expectedValue1= SILENCE_IS_GOLDEN
val expectedValue2= SILENCE_IS_GOLDEN
val expectedValue3= SILENCE_IS_GOLDEN
actualValue1 should be(expectedValue1)
actualValue2 should be(expectedValue2)
actualValue3 should be(expectedValue3)
SILENCE_IS_GOLDEN should be(actualValue1)
SILENCE_IS_GOLDEN should be(actualValue2)
SILENCE_IS_GOLDEN should be(actualValue3)
SILENCE_IS_GOLDEN should be(actualValue7)
actualValue4 contains (InvalidValueCharacters) shouldBe (true)
actualValue5 contains (InvalidValueCharacters) shouldBe (true)
actualValue6 contains (InvalidValueLength) shouldBe (true)