From d6fb301f5361d512865aaca2f103ab3ff330b1f2 Mon Sep 17 00:00:00 2001
From: hongwei <hongwei@tesobe.com>
Date: Wed, 15 Mar 2023 12:49:59 +0100
Subject: [PATCH] refactor/tweaked the ConsumerJSON to ConsumerJsonV210

---
 .../SwaggerDefinitionsJSON.scala              |   2 +-
 .../code/api/v2_1_0/JSONFactory2.1.0.scala    |   8 ++++----
 .../src/test/resources/frozen_type_meta_data  | Bin 141360 -> 141368 bytes
 3 files changed, 5 insertions(+), 5 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
index 1b29e850d..cd42c018e 100644
--- 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
@@ -2667,7 +2667,7 @@ object SwaggerDefinitionsJSON {
     roles = List(availableRoleJSON)
   )
 
-  val consumerJSON = ConsumerJSON(
+  val consumerJSON = ConsumerJsonV210(
     consumer_id = 1213,
     app_name = "SOFI",
     app_type = "Web",
diff --git a/obp-api/src/main/scala/code/api/v2_1_0/JSONFactory2.1.0.scala b/obp-api/src/main/scala/code/api/v2_1_0/JSONFactory2.1.0.scala
index d95c3981f..7d08b7c45 100644
--- a/obp-api/src/main/scala/code/api/v2_1_0/JSONFactory2.1.0.scala
+++ b/obp-api/src/main/scala/code/api/v2_1_0/JSONFactory2.1.0.scala
@@ -131,7 +131,7 @@ case class ResourceUserJSON(user_id: String,
                             username: String
                            )
 
-case class ConsumerJSON(consumer_id: Long,
+case class ConsumerJsonV210(consumer_id: Long,
                         app_name: String,
                         app_type: String,
                         description: String,
@@ -154,7 +154,7 @@ case class ConsumerPostJSON(app_name: String,
                             clientCertificate: String
                            )
 
-case class ConsumersJson(list: List[ConsumerJSON])
+case class ConsumersJson(list: List[ConsumerJsonV210])
 
 case class PostCounterpartyBespokeJson(
   key: String,
@@ -492,7 +492,7 @@ object JSONFactory210{
     TransactionRequestWithChargeJSONs210(trs.map(createTransactionRequestWithChargeJSON))
   }
 
-  def createConsumerJSON(c: Consumer): ConsumerJSON = {
+  def createConsumerJSON(c: Consumer): ConsumerJsonV210 = {
 
     val resourceUserJSON =  Users.users.vend.getUserByUserId(c.createdByUserId.toString()) match {
       case Full(resourceUser) => ResourceUserJSON(
@@ -505,7 +505,7 @@ object JSONFactory210{
       case _ => null
     }
 
-    ConsumerJSON(consumer_id=c.id.get,
+    ConsumerJsonV210(consumer_id=c.id.get,
       app_name=c.name.get,
       app_type=c.appType.toString(),
       description=c.description.get,
diff --git a/obp-api/src/test/resources/frozen_type_meta_data b/obp-api/src/test/resources/frozen_type_meta_data
index 99ced818b4cde4065f51e3f7317c4f88d064da4a..2b9fb0d2bbabade4c128284cad429ba2083c95b2 100644
GIT binary patch
delta 78
zcmV-U0I~nD&<MED2!ON!!Ag_w#yPhyOaaCh0Vb1SwiT0|I|vL)b8l`|GBGe+bO0xk
ktQ5B|WC5*~mo5JR2$P;W2a_>o6SwI~0Sy7S()s~jE#2cDE&u=k

delta 86
zcmV-c0IC1D&<L>52!ON!!Ag}p0S%LxI}8v?Q%_EFaR7b-HFpF6000V;Pxc^}?)d@i
sx4}vQ{}%xwm%(BI9tTrTPF-{WCz7lbxBg-Qt(KR0VgVPo`}zSrEob^5hyVZp