From 68d19ca94438ef8b0ec64fe2dbe8d7cd11009dea Mon Sep 17 00:00:00 2001 From: hongwei Date: Mon, 11 Oct 2021 12:57:31 +0200 Subject: [PATCH] feature/remove the account_rules from FastFirehoseAccountJson --- .../util/migration/MigrationOfFastFireHoseView.scala | 4 ---- .../scala/code/api/v4_0_0/JSONFactory4.0.0.scala | 4 +--- .../code/bankconnectors/LocalMappedConnector.scala | 12 +----------- .../openbankproject/commons/model/BankingModel.scala | 1 - 4 files changed, 2 insertions(+), 19 deletions(-) diff --git a/obp-api/src/main/scala/code/api/util/migration/MigrationOfFastFireHoseView.scala b/obp-api/src/main/scala/code/api/util/migration/MigrationOfFastFireHoseView.scala index a18d5f988..0887964e0 100644 --- a/obp-api/src/main/scala/code/api/util/migration/MigrationOfFastFireHoseView.scala +++ b/obp-api/src/main/scala/code/api/util/migration/MigrationOfFastFireHoseView.scala @@ -61,10 +61,6 @@ object MigrationOfFastFireHoseView { | where | bankaccountrouting.accountid = mappedbankaccount.theaccountid | ), - | mappedbankaccount.accountrulescheme1 account_rule_scheme_1, - | mappedbankaccount.accountrulevalue1 account_rule_value_1, - | mappedbankaccount.accountrulescheme2 account_rule_scheme_2, - | mappedbankaccount.accountrulevalue2 account_rule_value_2, | (select | string_agg( | 'type:' diff --git a/obp-api/src/main/scala/code/api/v4_0_0/JSONFactory4.0.0.scala b/obp-api/src/main/scala/code/api/v4_0_0/JSONFactory4.0.0.scala index 450bae627..90ef594fd 100644 --- a/obp-api/src/main/scala/code/api/v4_0_0/JSONFactory4.0.0.scala +++ b/obp-api/src/main/scala/code/api/v4_0_0/JSONFactory4.0.0.scala @@ -211,7 +211,6 @@ case class FastFirehoseAccountJsonV400( product_code: String, balance: AmountOfMoneyJsonV121, account_routings: String , - account_rules: List[AccountRuleJsonV300], account_attributes: String ) @@ -1181,8 +1180,7 @@ object JSONFactory400 { account.productCode, AmountOfMoneyJsonV121(account.balance.currency, account.balance.amount), account.accountRoutings, - account.accountRules.map(rule => AccountRuleJsonV300(rule.scheme, rule.value)), - account.accountAttributes, + account.accountAttributes ) ) ) diff --git a/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala b/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala index a92e0a873..cf25e3a6a 100644 --- a/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala +++ b/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala @@ -857,17 +857,7 @@ object LocalMappedConnector extends Connector with MdcLoggable { amount = rs.stringOpt(8).map(_.toString).getOrElse(null) ), accountRoutings = rs.stringOpt(9).map(_.toString).getOrElse(null), - accountRules = List( - AccountRule( - rs.stringOpt(10).map(_.toString).getOrElse(null), - rs.stringOpt(11).map(_.toString).getOrElse(null) - ), - AccountRule( - rs.stringOpt(12).map(_.toString).getOrElse(null), - rs.stringOpt(13).map(_.toString).getOrElse(null) - ) - ), - accountAttributes = rs.stringOpt(14).map(_.toString).getOrElse(null) + accountAttributes = rs.stringOpt(10).map(_.toString).getOrElse(null) ) ).list().apply() sqlResult diff --git a/obp-commons/src/main/scala/com/openbankproject/commons/model/BankingModel.scala b/obp-commons/src/main/scala/com/openbankproject/commons/model/BankingModel.scala index 656dd0491..39db5f68d 100644 --- a/obp-commons/src/main/scala/com/openbankproject/commons/model/BankingModel.scala +++ b/obp-commons/src/main/scala/com/openbankproject/commons/model/BankingModel.scala @@ -387,7 +387,6 @@ case class FastFirehoseAccount( productCode: String, balance: AmountOfMoney, accountRoutings: String, - accountRules: List[AccountRule], accountAttributes: String )