From cafd08f461eaa2a3ac12c62cf6c82cee323a8abd Mon Sep 17 00:00:00 2001 From: hongwei1 Date: Fri, 21 Sep 2018 19:12:36 +0200 Subject: [PATCH 1/2] fixed the `callsLimit` tag to `apiTagConsumer` --- src/main/scala/code/api/v3_1_0/APIMethods310.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/code/api/v3_1_0/APIMethods310.scala b/src/main/scala/code/api/v3_1_0/APIMethods310.scala index 51581474b..a18b84d61 100644 --- a/src/main/scala/code/api/v3_1_0/APIMethods310.scala +++ b/src/main/scala/code/api/v3_1_0/APIMethods310.scala @@ -543,7 +543,7 @@ trait APIMethods310 { UnknownError ), Catalogs(notCore, notPSD2, notOBWG), - List(apiTagUser), + List(apiTagConsumer), Some(List(canSetCallLimit))) lazy val callsLimit : OBPEndpoint = { From b0a9dc00679bfea56f400b790f1f81930302f5bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Sat, 22 Sep 2018 17:24:43 +0200 Subject: [PATCH 2/2] Disabled getConsumer and getConsumers endpoints of v3.1.0 --- src/main/scala/code/api/v3_1_0/OBPAPI3_1_0.scala | 8 ++++---- src/test/scala/code/api/v3_1_0/ConsumerTest.scala | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/scala/code/api/v3_1_0/OBPAPI3_1_0.scala b/src/main/scala/code/api/v3_1_0/OBPAPI3_1_0.scala index 2b3b51b7f..78c0202e3 100644 --- a/src/main/scala/code/api/v3_1_0/OBPAPI3_1_0.scala +++ b/src/main/scala/code/api/v3_1_0/OBPAPI3_1_0.scala @@ -190,8 +190,8 @@ object OBPAPI3_1_0 extends OBPRestHelper with APIMethods130 with APIMethods140 w Implementations2_1_0.getTransactionRequests :: Implementations2_1_0.getRoles :: Implementations2_1_0.getEntitlementsByBankAndUser :: - // Implementations2_1_0.getConsumer :: - // Implementations2_1_0.getConsumers :: + Implementations2_1_0.getConsumer :: + Implementations2_1_0.getConsumers :: Implementations2_1_0.enableDisableConsumers :: Implementations2_1_0.addCardForBank :: // Implementations2_1_0.getUsers :: @@ -292,9 +292,9 @@ object OBPAPI3_1_0 extends OBPRestHelper with APIMethods130 with APIMethods140 w Implementations3_1_0.unlockUser :: Implementations3_1_0.callsLimit :: Implementations3_1_0.checkFundsAvailable :: - Implementations3_1_0.getConsumer :: + // Implementations3_1_0.getConsumer :: Implementations3_1_0.getConsumersForCurrentUser :: - Implementations3_1_0.getConsumers :: + // Implementations3_1_0.getConsumers :: Implementations3_1_0.createAccountWebHook :: Nil diff --git a/src/test/scala/code/api/v3_1_0/ConsumerTest.scala b/src/test/scala/code/api/v3_1_0/ConsumerTest.scala index 0fc00e70f..dc53ee19c 100644 --- a/src/test/scala/code/api/v3_1_0/ConsumerTest.scala +++ b/src/test/scala/code/api/v3_1_0/ConsumerTest.scala @@ -54,7 +54,7 @@ class ConsumerTest extends V310ServerSetup { object ApiEndpoint1 extends Tag(nameOf(Implementations3_1_0.getConsumer)) object ApiEndpoint2 extends Tag(nameOf(Implementations3_1_0.getConsumersForCurrentUser)) object ApiEndpoint3 extends Tag(nameOf(Implementations3_1_0.getConsumers)) - +/* feature("Get Consumer by CONSUMER_ID - v3.1.0") { scenario("We will Get Consumer by CONSUMER_ID without a proper Role " + ApiRole.canGetConsumers, ApiEndpoint1, VersionOfApi) { @@ -77,7 +77,7 @@ class ConsumerTest extends V310ServerSetup { response310.body.extract[ErrorMessage].error should equal (ConsumerNotFoundByConsumerId) } } - +*/ feature("Get Consumers for current user - v3.1.0") { scenario("We will Get Consumers for current user - NOT logged in", ApiEndpoint2, VersionOfApi) { @@ -98,7 +98,7 @@ class ConsumerTest extends V310ServerSetup { response310.body.extract[ConsumersJson] } } - +/* feature("Get Consumers - v3.1.0") { scenario("We will Get Consumers - User NOT logged in", ApiEndpoint3, VersionOfApi) { @@ -129,5 +129,5 @@ class ConsumerTest extends V310ServerSetup { response310.body.extract[ConsumersJson] } } - +*/ }