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

test/Fix delete product cascade test

Browse Source
This commit is contained in:
Marko Milić 2022-09-30 15:47:49 +02:00
parent f4a09a090d
commit e53e6836bb
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
obp-api/src/main/scala/deletion/DeleteAccountCascade.scala
View File

@ -14,7 +14,7 @@ import com.openbankproject.commons.model.{AccountId, BankId}
import deletion.DeletionUtil.databaseAtomicTask
import net.liftweb.common.{Box, Empty, Full}
import net.liftweb.db.DB
import net.liftweb.mapper.By
import net.liftweb.mapper.{By, ByList}
import net.liftweb.util.DefaultConnectionIdentifier
import scala.collection.immutable.List
@ -24,6 +24,7 @@ object DeleteAccountCascade {
def delete(bankId: BankId, accountId: AccountId): Boolean = {
val doneTasks =
deleteTransactions(bankId, accountId) ::
deleteEntitlements(bankId, accountId) ::
deleteAccountAccess(bankId, accountId) ::
deleteCustomViews(bankId, accountId) ::
deleteAccountAttributes(bankId, accountId) ::
@ -32,7 +33,6 @@ object DeleteAccountCascade {
deleteCards(accountId) ::
deleteAccountRoutings(bankId, accountId) ::
deleteAccount(bankId, accountId) ::
deleteEntitlements(bankId) ::
Nil
doneTasks.forall(_ == true)
}
@ -53,9 +53,11 @@ object DeleteAccountCascade {
By(MappedBankAccount.theAccountId, accountId.value)
)
}
private def deleteEntitlements(bankId: BankId): Boolean = {
private def deleteEntitlements(bankId: BankId, accountId: AccountId): Boolean = {
val userIds = AccountAccess.findAll(By(AccountAccess.account_id, accountId.value)).map(_.user_fk.foreign.map(_.userId).getOrElse(""))
MappedEntitlement.bulkDelete_!!(
By(MappedEntitlement.mBankId, bankId.value)
By(MappedEntitlement.mBankId, bankId.value),
ByList(MappedEntitlement.mUserId, userIds)
)
}

2
obp-api/src/test/scala/code/api/v4_0_0/DeleteProductCascadeTest.scala
View File

@ -84,7 +84,7 @@ class DeleteProductCascadeTest extends V400ServerSetup {
makeDeleteRequest(request400).code should equal(200)
When("We try to delete one more time")
makeDeleteRequest(request400).code should equal(404)
makeDeleteRequest(request400).code should equal(403)
}
}