refactor/added the getNonPersonalUserAttributes method

This commit is contained in:
hongwei 2023-05-31 22:24:24 +08:00
parent 8d304c3396
commit d98789e751
5 changed files with 17 additions and 2 deletions

View File

@ -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]

View File

@ -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,
)

View File

@ -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]]] =

View File

@ -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)}
}

View File

@ -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)