From d98789e7514d4918837f58d7ea137b63b6685a12 Mon Sep 17 00:00:00 2001
From: hongwei <hongwei@tesobe.com>
Date: Wed, 31 May 2023 22:24:24 +0800
Subject: [PATCH] refactor/added the getNonPersonalUserAttributes method

---
 obp-api/src/main/scala/code/api/util/NewStyle.scala      | 9 +++++++++
 .../src/main/scala/code/api/v5_1_0/APIMethods510.scala   | 2 +-
 .../src/main/scala/code/bankconnectors/Connector.scala   | 3 +++
 .../scala/code/bankconnectors/LocalMappedConnector.scala | 3 +++
 .../test/scala/code/api/v5_1_0/UserAttributesTest.scala  | 2 +-
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/obp-api/src/main/scala/code/api/util/NewStyle.scala b/obp-api/src/main/scala/code/api/util/NewStyle.scala
index 09f66ba0c..f41002514 100644
--- a/obp-api/src/main/scala/code/api/util/NewStyle.scala
+++ b/obp-api/src/main/scala/code/api/util/NewStyle.scala
@@ -1904,6 +1904,15 @@ object NewStyle extends MdcLoggable{
       }
     } 
     
+    
+    def getNonPersonalUserAttributes(userId: String, callContext: Option[CallContext]): OBPReturnType[List[UserAttribute]] = {
+      Connector.connector.vend.getNonPersonalUserAttributes(
+        userId: String, callContext: Option[CallContext]
+      ) map {
+        i => (connectorEmptyResponse(i._1, callContext), i._2)
+      }
+    } 
+    
     def getUserAttributesByUsers(userIds: List[String], callContext: Option[CallContext]): OBPReturnType[List[UserAttribute]] = {
       Connector.connector.vend.getUserAttributesByUsers(
         userIds, callContext: Option[CallContext]
diff --git a/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala b/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala
index b3a55252e..721f255df 100644
--- a/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala
+++ b/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala
@@ -277,7 +277,7 @@ trait APIMethods510 {
           for {
             (_, callContext) <- authenticatedAccess(cc)
             (user, callContext) <- NewStyle.function.getUserByUserId(userId, callContext)
-            (userAttributes,callContext) <- NewStyle.function.getPersonalUserAttributes(
+            (userAttributes,callContext) <- NewStyle.function.getNonPersonalUserAttributes(
               user.userId,
               callContext,
             ) 
diff --git a/obp-api/src/main/scala/code/bankconnectors/Connector.scala b/obp-api/src/main/scala/code/bankconnectors/Connector.scala
index e9c63239f..d38abc3d0 100644
--- a/obp-api/src/main/scala/code/bankconnectors/Connector.scala
+++ b/obp-api/src/main/scala/code/bankconnectors/Connector.scala
@@ -2262,6 +2262,9 @@ trait Connector extends MdcLoggable {
     Future{(Failure(setUnimplementedError), callContext)}   
   
   def getPersonalUserAttributes(userId: String, callContext: Option[CallContext]): OBPReturnType[Box[List[UserAttribute]]] = 
+    Future{(Failure(setUnimplementedError), callContext)}  
+    
+  def getNonPersonalUserAttributes(userId: String, callContext: Option[CallContext]): OBPReturnType[Box[List[UserAttribute]]] = 
     Future{(Failure(setUnimplementedError), callContext)}   
   
   def getUserAttributesByUsers(userIds: List[String], callContext: Option[CallContext]): OBPReturnType[Box[List[UserAttribute]]] = 
diff --git a/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala b/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala
index 6b203ff7e..9e9131fd5 100644
--- a/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala
+++ b/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala
@@ -4084,6 +4084,9 @@ object LocalMappedConnector extends Connector with MdcLoggable {
     UserAttributeProvider.userAttributeProvider.vend.getUserAttributesByUser(userId: String) map {(_, callContext)}
   }
   
+  override def getNonPersonalUserAttributes(userId: String, callContext: Option[CallContext]): OBPReturnType[Box[List[UserAttribute]]] = {
+    UserAttributeProvider.userAttributeProvider.vend.getNonPersonalUserAttributes(userId: String) map {(_, callContext)}
+  }
   override def getPersonalUserAttributes(userId: String, callContext: Option[CallContext]): OBPReturnType[Box[List[UserAttribute]]] = {
     UserAttributeProvider.userAttributeProvider.vend.getPersonalUserAttributes(userId: String) map {(_, callContext)}
   }
diff --git a/obp-api/src/test/scala/code/api/v5_1_0/UserAttributesTest.scala b/obp-api/src/test/scala/code/api/v5_1_0/UserAttributesTest.scala
index 3614cc37c..b7c117582 100644
--- a/obp-api/src/test/scala/code/api/v5_1_0/UserAttributesTest.scala
+++ b/obp-api/src/test/scala/code/api/v5_1_0/UserAttributesTest.scala
@@ -96,7 +96,7 @@ class UserAttributesTest extends V510ServerSetup {
         jsonResponse.user_attributes.head.name shouldBe (batteryLevel)
         jsonResponse.user_attributes.head.user_attribute_id shouldBe (userAttributeId)
       }
-      val requestDeleteUserAttribute = (v5_1_0_Request / "users"/ userId/"attributes"/"non-personal"/userAttributeId).DELETE <@ (user1)
+      val requestDeleteUserAttribute = (v5_1_0_Request / "users"/ userId/"non-personal"/"attributes"/userAttributeId).DELETE <@ (user1)
       val responseDeleteUserAttribute = makeDeleteRequest(requestDeleteUserAttribute)
       Then("We should get a 204")
       responseDeleteUserAttribute.code should equal(204)