From fd2d0d23ccf6265ef2c71bb1a5613b7f13974649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Fri, 3 Nov 2023 16:51:09 +0100 Subject: [PATCH] feature/Flush all data from Redis at wipeTestData function --- .../setup/LocalMappedConnectorTestSetup.scala | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/obp-api/src/test/scala/code/setup/LocalMappedConnectorTestSetup.scala b/obp-api/src/test/scala/code/setup/LocalMappedConnectorTestSetup.scala index 1dd79e549..943b1b71d 100644 --- a/obp-api/src/test/scala/code/setup/LocalMappedConnectorTestSetup.scala +++ b/obp-api/src/test/scala/code/setup/LocalMappedConnectorTestSetup.scala @@ -1,8 +1,7 @@ package code.setup -import java.util.Date - import bootstrap.liftweb.ToSchemify +import code.api.cache.Redis import code.api.util.APIUtil import code.api.util.ErrorMessages._ import code.entitlement.Entitlement @@ -11,6 +10,7 @@ import code.model._ import code.model.dataAccess._ import code.transaction.MappedTransaction import code.transactionrequests.MappedTransactionRequest +import code.util.Helper.MdcLoggable import com.openbankproject.commons.model._ import com.openbankproject.commons.model.enums.AccountRoutingScheme import net.liftweb.common.Box @@ -18,9 +18,10 @@ import net.liftweb.mapper.{By, MetaMapper} import net.liftweb.util.Helpers._ import org.iban4j +import java.util.Date import scala.util.Random -trait LocalMappedConnectorTestSetup extends TestConnectorSetupWithStandardPermissions { +trait LocalMappedConnectorTestSetup extends TestConnectorSetupWithStandardPermissions with MdcLoggable{ //TODO: replace all these helpers with connector agnostic methods like createRandomBank // that call Connector.createBank etc. // (same in LocalRecordConnectorTestSetup) @@ -177,5 +178,15 @@ trait LocalMappedConnectorTestSetup extends TestConnectorSetupWithStandardPermis //empty the relational db tables after each test ToSchemify.models.filterNot(exclusion).foreach(_.bulkDelete_!!()) ToSchemify.modelsRemotedata.filterNot(exclusion).foreach(_.bulkDelete_!!()) + + // Flush all data from Redis + try { + Redis.jedis.connect() + Redis.jedis.flushDB() + } catch { + case e: Throwable => + logger.warn("------------| Redis issue during flushing data |------------") + logger.warn(e) + } } }