From 194ae6d4139256e5684928282497a299ee8e807c Mon Sep 17 00:00:00 2001
From: hongwei1 <hongwei@tesobe.com>
Date: Wed, 12 Sep 2018 21:09:58 +0200
Subject: [PATCH] added `userOwners` on AuthInfo

---
 .../KafkaJsonFactory_vSept2018.scala          | 23 ++++++++++++++++++-
 .../KafkaMappedConnector_vSept2018.scala      | 16 +++++++++++--
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/code/bankconnectors/vSept2018/KafkaJsonFactory_vSept2018.scala b/src/main/scala/code/bankconnectors/vSept2018/KafkaJsonFactory_vSept2018.scala
index 90f416a30..e526077a3 100644
--- a/src/main/scala/code/bankconnectors/vSept2018/KafkaJsonFactory_vSept2018.scala
+++ b/src/main/scala/code/bankconnectors/vSept2018/KafkaJsonFactory_vSept2018.scala
@@ -149,7 +149,8 @@ case class ViewBasic(
 case class AccountBasic(
   id: String,
   accountRoutings: List[AccountRouting],
-  customerOwners: List[InternalBasicCustomer]
+  customerOwners: List[InternalBasicCustomer],
+  userOwners: List[InternalBasicUser]
 )
 
 case class AuthView(
@@ -229,8 +230,16 @@ case class InternalBasicCustomer(
   dateOfBirth: Date
 )
 
+case class InternalBasicUser(
+  userId:String,
+  emailAddress: String,
+  name: String
+)
+
 case class InternalBasicCustomers(customers: List[InternalBasicCustomer])
 
+case class InternalBasicUsers(users: List[InternalBasicUser])
+
 case class InternalCreateChallengeSept2018(
   errorCode: String,
   backendMessages: List[InboundStatusMessage],
@@ -402,7 +411,19 @@ object JsonFactory_vSept2018 {
     )
   }
   
+  def createUserJson(user : User) : InternalBasicUser = {
+    InternalBasicUser(
+      user.userId,
+      user.emailAddress,
+      user.name,
+    )
+  }
+  
   def createCustomersJson(customers : List[Customer]) : InternalBasicCustomers = {
     InternalBasicCustomers(customers.map(createCustomerJson))
   }
+  
+  def createUsersJson(users : List[User]) : InternalBasicUsers = {
+    InternalBasicUsers(users.map(createUserJson))
+  }
 }
\ No newline at end of file
diff --git a/src/main/scala/code/bankconnectors/vSept2018/KafkaMappedConnector_vSept2018.scala b/src/main/scala/code/bankconnectors/vSept2018/KafkaMappedConnector_vSept2018.scala
index 323c284bd..a0e654fa9 100644
--- a/src/main/scala/code/bankconnectors/vSept2018/KafkaMappedConnector_vSept2018.scala
+++ b/src/main/scala/code/bankconnectors/vSept2018/KafkaMappedConnector_vSept2018.scala
@@ -92,8 +92,13 @@ trait KafkaMappedConnector_vSept2018 extends Connector with KafkaHelper with Mdc
           view <- views
           account <- checkBankAccountExists(view.bankId, view.accountId, Some(cc)) ?~! {BankAccountNotFound}
           internalCustomers = JsonFactory_vSept2018.createCustomersJson(account.customerOwners.toList)
+          internalUsers = JsonFactory_vSept2018.createUsersJson(account.userOwners.toList)
           viewBasic = ViewBasic(view.viewId.value, view.name, view.description)
-          accountBasic =  AccountBasic(account.accountId.value, account.accountRoutings, internalCustomers.customers)
+          accountBasic =  AccountBasic(
+            account.accountId.value, 
+            account.accountRoutings, 
+            internalCustomers.customers,
+            internalUsers.users)
         }yield 
           AuthView(viewBasic, accountBasic)
       )
@@ -110,11 +115,18 @@ trait KafkaMappedConnector_vSept2018 extends Connector with KafkaHelper with Mdc
     legalName = "legalName",
     dateOfBirth = DateWithSecondsExampleObject
   )
+  val internalBasicUser = InternalBasicUser(
+    userId = "userId",
+    emailAddress = "emailAddress",
+    name = "name"
+  )
   val accountBasic = AccountBasic(
     "123123",
     List(AccountRouting("AccountNumber","2345 6789 1234"), 
          AccountRouting("IBAN","DE91 1000 0000 0123 4567 89")), 
-    List(internalBasicCustomer))
+    List(internalBasicCustomer),
+    List(internalBasicUser)
+  )
   val authView = AuthView(viewBasic, accountBasic)
   val authViews = List(authView)
   val authInfoExample = AuthInfo(