From b0182792e33a1422fa741fe174b4d459dbc5c200 Mon Sep 17 00:00:00 2001 From: simonredfern Date: Sat, 27 Dec 2025 22:57:28 +0100 Subject: [PATCH] consumers/current adding consumer name etc --- obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala | 5 ++++- .../src/main/scala/code/api/v6_0_0/JSONFactory6.0.0.scala | 3 +++ obp-api/src/test/scala/code/api/v6_0_0/ConsumerTest.scala | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala b/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala index 2b7606504..57858c522 100644 --- a/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala +++ b/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala @@ -567,6 +567,9 @@ trait APIMethods600 { |""", EmptyBody, CurrentConsumerJsonV600( + app_name = "SOFI", + app_type = "Web", + description = "Account Management", consumer_id = "123", call_counters = redisCallCountersJsonV600 ), @@ -597,7 +600,7 @@ trait APIMethods600 { currentConsumerCallCounters <- Future(RateLimitingUtil.consumerRateLimitState(consumer.consumerId.get).toList) callCountersJson = createRedisCallCountersJson(currentConsumerCallCounters) } yield { - (CurrentConsumerJsonV600(consumer.consumerId.get, callCountersJson), HttpCode.`200`(callContext)) + (CurrentConsumerJsonV600(consumer.name.get, consumer.appType.get, consumer.description.get, consumer.consumerId.get, callCountersJson), HttpCode.`200`(callContext)) } } } diff --git a/obp-api/src/main/scala/code/api/v6_0_0/JSONFactory6.0.0.scala b/obp-api/src/main/scala/code/api/v6_0_0/JSONFactory6.0.0.scala index 1f57e9a79..fb25bf2f8 100644 --- a/obp-api/src/main/scala/code/api/v6_0_0/JSONFactory6.0.0.scala +++ b/obp-api/src/main/scala/code/api/v6_0_0/JSONFactory6.0.0.scala @@ -68,6 +68,9 @@ case class TokenJSON( ) case class CurrentConsumerJsonV600( + app_name: String, + app_type: String, + description: String, consumer_id: String, call_counters: RedisCallCountersJsonV600 ) diff --git a/obp-api/src/test/scala/code/api/v6_0_0/ConsumerTest.scala b/obp-api/src/test/scala/code/api/v6_0_0/ConsumerTest.scala index 2e675d231..b8e7bdfb1 100644 --- a/obp-api/src/test/scala/code/api/v6_0_0/ConsumerTest.scala +++ b/obp-api/src/test/scala/code/api/v6_0_0/ConsumerTest.scala @@ -94,6 +94,12 @@ class ConsumerTest extends V600ServerSetup { consumerJson.consumer_id should not be empty consumerJson.consumer_id should not be null consumerJson.consumer_id shouldBe a[String] + // consumerJson.app_name should not be empty (can be empty) + consumerJson.app_name shouldBe a[String] + // consumerJson.app_type should not be empty (can be empty) + consumerJson.app_type shouldBe a[String] + // consumerJson.description should not be empty (can be empty) + consumerJson.description shouldBe a[String] consumerJson.call_counters should not be null consumerJson.call_counters.per_second should not be null consumerJson.call_counters.per_minute should not be null