From 0b4cef5699ab3c51e2a15b2ffa71713af215a4ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Tue, 18 Mar 2025 08:31:04 +0100 Subject: [PATCH 1/2] bugfix/Remove non-existing import --- obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala b/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala index a7709c9b00..d4e0518d4f 100644 --- a/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala +++ b/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala @@ -12,7 +12,6 @@ import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON.{jsonDynamicResourceDoc, _} import code.api.UKOpenBanking.v2_0_0.OBP_UKOpenBanking_200 import code.api.UKOpenBanking.v3_1_0.OBP_UKOpenBanking_310 -import code.api.berlin.group.v1.OBP_BERLIN_GROUP_1 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON._ import code.api.dynamic.endpoint.helper.practise.{DynamicEndpointCodeGenerator, PractiseEndpoint} import code.api.dynamic.endpoint.helper.{CompiledObjects, DynamicEndpointHelper, DynamicEndpoints} From e2242063f277c7ae61be12515438b9e76670eccf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Tue, 18 Mar 2025 09:50:03 +0100 Subject: [PATCH 2/2] test/Remove non-existing tests cases regarding Berlin Group v1 --- .../resources/props/sample.props.template | 1 - .../ResourceDocs1_4_0/ResourceDocsTest.scala | 22 ------------------- .../scala/code/util/ApiVersionUtilsTest.scala | 2 +- 3 files changed, 1 insertion(+), 24 deletions(-) diff --git a/obp-api/src/main/resources/props/sample.props.template b/obp-api/src/main/resources/props/sample.props.template index 8bbaabc037..232c6507d0 100644 --- a/obp-api/src/main/resources/props/sample.props.template +++ b/obp-api/src/main/resources/props/sample.props.template @@ -600,7 +600,6 @@ super_admin_user_ids=USER_ID1,USER_ID2, # "OBPv4.0.0" or "v4.0.0" # "OBPv3.1.0" or "v3.1.0" # "OBPv3.0.0" or "v3.0.0" -# "BGv1" or "v1" # "BGv1.3" or "v1.3" # "PAPIv2.1.1.1" or "v2.1.1.1" # "STETv1.4" or "v1.4" diff --git a/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/ResourceDocsTest.scala b/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/ResourceDocsTest.scala index 0e97b84358..b9ab1ad229 100644 --- a/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/ResourceDocsTest.scala +++ b/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/ResourceDocsTest.scala @@ -281,17 +281,6 @@ class ResourceDocsTest extends ResourceDocsV140ServerSetup with PropsReset with //This should not throw any exceptions responseDocs.resource_docs.map(responseDoc => stringToNodeSeq(responseDoc.description)) } - - - scenario(s"We will test ${ApiEndpoint1.name} Api -BGv1", ApiEndpoint1, VersionOfApi) { - val requestGetObp = (ResourceDocsV4_0Request / "resource-docs" / "BGv1" / "obp").GET - val responseGetObp = makeGetRequest(requestGetObp) - And("We should get 200 and the response can be extract to case classes") - val responseDocs = responseGetObp.body.extract[ResourceDocsJson] - responseGetObp.code should equal(200) - //This should not throw any exceptions - responseDocs.resource_docs.map(responseDoc => stringToNodeSeq(responseDoc.description)) - } scenario(s"We will test ${ApiEndpoint1.name} Api -v1.3", ApiEndpoint1, VersionOfApi) { val requestGetObp = (ResourceDocsV4_0Request / "resource-docs" / "v1.3" / "obp").GET @@ -550,17 +539,6 @@ class ResourceDocsTest extends ResourceDocsV140ServerSetup with PropsReset with responseDocs.resource_docs.map(responseDoc => stringToNodeSeq(responseDoc.description)) } - - scenario(s"We will test ${ApiEndpoint2.name} Api -BGv1", ApiEndpoint1, VersionOfApi) { - val requestGetObp = (ResourceDocsV1_4Request /"banks"/ testBankId1.value/ "resource-docs" / "BGv1" / "obp").GET - val responseGetObp = makeGetRequest(requestGetObp) - And("We should get 200 and the response can be extract to case classes") - val responseDocs = responseGetObp.body.extract[ResourceDocsJson] - responseGetObp.code should equal(200) - //This should not throw any exceptions - responseDocs.resource_docs.map(responseDoc => stringToNodeSeq(responseDoc.description)) - } - scenario(s"We will test ${ApiEndpoint2.name} Api -v1.3", ApiEndpoint1, VersionOfApi) { val requestGetObp = (ResourceDocsV1_4Request /"banks"/ testBankId1.value/ "resource-docs" / "v1.3" / "obp").GET val responseGetObp = makeGetRequest(requestGetObp) diff --git a/obp-api/src/test/scala/code/util/ApiVersionUtilsTest.scala b/obp-api/src/test/scala/code/util/ApiVersionUtilsTest.scala index 1a14ed8965..a7b008233a 100644 --- a/obp-api/src/test/scala/code/util/ApiVersionUtilsTest.scala +++ b/obp-api/src/test/scala/code/util/ApiVersionUtilsTest.scala @@ -20,6 +20,6 @@ class ApiVersionUtilsTest extends V400ServerSetup { versions.map(version => ApiVersionUtils.valueOf(version.fullyQualifiedVersion)) //NOTE, when we added the new version, better fix this number manually. and also check the versions - versions.length shouldBe(24) + versions.length shouldBe(23) }} } \ No newline at end of file