From 150dabd528a99e92de826bd8a92dafa14d60c75a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Tue, 4 Mar 2025 17:07:45 +0100 Subject: [PATCH] docfix/Get rid of account balances hard coded values --- .../group/v1_3/JSONFactory_BERLIN_GROUP_1_3.scala | 11 +++++------ obp-api/src/main/scala/code/api/util/APIUtil.scala | 6 +++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/obp-api/src/main/scala/code/api/berlin/group/v1_3/JSONFactory_BERLIN_GROUP_1_3.scala b/obp-api/src/main/scala/code/api/berlin/group/v1_3/JSONFactory_BERLIN_GROUP_1_3.scala index 828bd66d7..42705fdb4 100644 --- a/obp-api/src/main/scala/code/api/berlin/group/v1_3/JSONFactory_BERLIN_GROUP_1_3.scala +++ b/obp-api/src/main/scala/code/api/berlin/group/v1_3/JSONFactory_BERLIN_GROUP_1_3.scala @@ -105,9 +105,9 @@ object JSONFactory_BERLIN_GROUP_1_3 extends CustomJsonFormats { case class AccountBalance( balanceAmount : AmountOfMoneyV13 = AmountOfMoneyV13("EUR","123"), balanceType: String = "closingBooked", - lastChangeDateTime: String = "2020-07-02T10:23:57.814Z", - lastCommittedTransaction: String = "string", - referenceDate: String = "2020-07-02", + lastChangeDateTime: Option[String] = None, + lastCommittedTransaction: Option[String] = None, + referenceDate: Option[String] = None, ) case class FromAccount( @@ -401,9 +401,8 @@ object JSONFactory_BERLIN_GROUP_1_3 extends CustomJsonFormats { `balances` = accountBalances.balances.map(accountBalance => AccountBalance( balanceAmount = AmountOfMoneyV13(accountBalance.balance.currency, accountBalance.balance.amount), balanceType = accountBalance.balanceType, - lastChangeDateTime = APIUtil.dateOrNull(bankAccount.lastUpdate), - referenceDate = APIUtil.dateOrNull(bankAccount.lastUpdate), - lastCommittedTransaction = "String" + lastChangeDateTime = APIUtil.dateOrNone(bankAccount.lastUpdate), + referenceDate = APIUtil.dateOrNone(bankAccount.lastUpdate), ) )) } diff --git a/obp-api/src/main/scala/code/api/util/APIUtil.scala b/obp-api/src/main/scala/code/api/util/APIUtil.scala index ee1cafd10..b6ffc5304 100644 --- a/obp-api/src/main/scala/code/api/util/APIUtil.scala +++ b/obp-api/src/main/scala/code/api/util/APIUtil.scala @@ -930,11 +930,11 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ case _ => OBPId } - def dateOrNull(date : Date) = + def dateOrNone(date : Date): Option[String] = if(date == null) - null + None else - APIUtil.DateWithMsRollback.format(date) + Some(APIUtil.DateWithMsRollback.format(date)) def stringOrNull(text : String) = if(text == null || text.isEmpty)