artin/OBP-API
1
0
Fork 0
mirror of https://github.com/OpenBankProject/OBP-API.git synced 2026-02-06 17:17:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed the tests failded for hasOwnerView

Browse Source
This commit is contained in:
hongwei1 2018-02-23 09:15:23 +01:00
parent 1ab142396c
commit 8bba8f65e0
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/scala/code/model/User.scala
View File

@ -41,6 +41,7 @@ import code.views.Views
import code.entitlement.Entitlement
import code.model.dataAccess.{ResourceUser, ViewImpl, ViewPrivileges}
import code.users.Users
import code.util.Helper.MdcLoggable
import net.liftweb.mapper.By
case class UserId(val value : Long) {
@ -50,7 +51,7 @@ case class UserId(val value : Long) {
// TODO Document clearly the difference between this and AuthUser
trait User {
trait User extends MdcLoggable {
def resourceUserId : UserId
def userId: String
@ -96,7 +97,14 @@ trait User {
*/
def hasOwnerView(bankAccount: BankAccount): Boolean ={
//find the bankAccount owner view object
val viewImpl = ViewImpl.find(ViewId("owner"),BankIdAccountId(bankAccount.bankId, bankAccount.accountId)).orNull
val viewImplBox = ViewImpl.find(ViewId("owner"),BankIdAccountId(bankAccount.bankId, bankAccount.accountId))
val viewImpl = viewImplBox match {
case Full(v) => v
case _ =>
logger.warn(s"It is strange. This bankAccount(${bankAccount.bankId}, ${bankAccount.accountId}) do not have `owner` view.")
return false
}
//check the ViewPrivileges by user and viewImpl
!(ViewPrivileges.count(By(ViewPrivileges.user, this.resourceUserId.value), By(ViewPrivileges.view, viewImpl.id)) == 0)
}