diff --git a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/MessageDocsSwaggerDefinitions.scala b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/MessageDocsSwaggerDefinitions.scala index e7dc68c5c..2decaab96 100644 --- a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/MessageDocsSwaggerDefinitions.scala +++ b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/MessageDocsSwaggerDefinitions.scala @@ -232,7 +232,7 @@ object MessageDocsSwaggerDefinitions startDate = DateWithDayExampleObject, finishDate = Some(DateWithDayExampleObject), balance = BigDecimal(balanceAmountExample.value), - status = transactionStatusExample.value, + status = Some(transactionStatusExample.value), ) val accountRouting = AccountRouting("","") diff --git a/obp-api/src/main/scala/code/bankconnectors/rabbitmq/RabbitMQConnector_vOct2024.scala b/obp-api/src/main/scala/code/bankconnectors/rabbitmq/RabbitMQConnector_vOct2024.scala index d03236dd0..c644945b7 100644 --- a/obp-api/src/main/scala/code/bankconnectors/rabbitmq/RabbitMQConnector_vOct2024.scala +++ b/obp-api/src/main/scala/code/bankconnectors/rabbitmq/RabbitMQConnector_vOct2024.scala @@ -1552,7 +1552,7 @@ trait RabbitMQConnector_vOct2024 extends Connector with MdcLoggable { startDate=toDate(transactionStartDateExample), finishDate=Some(toDate(transactionFinishDateExample)), balance=BigDecimal(balanceExample.value), - status=transactionStatusExample.value + status=Some(transactionStatusExample.value) ))) ), adapterImplementation = Some(AdapterImplementation("- Core", 1)) @@ -1687,7 +1687,7 @@ trait RabbitMQConnector_vOct2024 extends Connector with MdcLoggable { startDate=toDate(transactionStartDateExample), finishDate=Some(toDate(transactionFinishDateExample)), balance=BigDecimal(balanceExample.value), - status=transactionStatusExample.value)) + status=Some(transactionStatusExample.value))) ), adapterImplementation = Some(AdapterImplementation("- Core", 1)) ) diff --git a/obp-api/src/main/scala/code/bankconnectors/rest/RestConnector_vMar2019.scala b/obp-api/src/main/scala/code/bankconnectors/rest/RestConnector_vMar2019.scala index 6bfee72bd..53a3b7200 100644 --- a/obp-api/src/main/scala/code/bankconnectors/rest/RestConnector_vMar2019.scala +++ b/obp-api/src/main/scala/code/bankconnectors/rest/RestConnector_vMar2019.scala @@ -1500,7 +1500,7 @@ trait RestConnector_vMar2019 extends Connector with MdcLoggable { startDate=toDate(transactionStartDateExample), finishDate=Some(toDate(transactionFinishDateExample)), balance=BigDecimal(balanceExample.value), - status=transactionStatusExample.value))) + status=Some(transactionStatusExample.value)))) ), adapterImplementation = Some(AdapterImplementation("- Core", 1)) ) @@ -1634,7 +1634,7 @@ trait RestConnector_vMar2019 extends Connector with MdcLoggable { startDate=toDate(transactionStartDateExample), finishDate=Some(toDate(transactionFinishDateExample)), balance=BigDecimal(balanceExample.value), - status=transactionStatusExample.value)) + status=Some(transactionStatusExample.value))) ), adapterImplementation = Some(AdapterImplementation("- Core", 1)) ) diff --git a/obp-api/src/main/scala/code/bankconnectors/storedprocedure/StoredProcedureConnector_vDec2019.scala b/obp-api/src/main/scala/code/bankconnectors/storedprocedure/StoredProcedureConnector_vDec2019.scala index 0ab7b583b..d3a89839a 100644 --- a/obp-api/src/main/scala/code/bankconnectors/storedprocedure/StoredProcedureConnector_vDec2019.scala +++ b/obp-api/src/main/scala/code/bankconnectors/storedprocedure/StoredProcedureConnector_vDec2019.scala @@ -1481,7 +1481,7 @@ trait StoredProcedureConnector_vDec2019 extends Connector with MdcLoggable { startDate=toDate(transactionStartDateExample), finishDate=Some(toDate(transactionFinishDateExample)), balance=BigDecimal(balanceExample.value), - status=transactionStatusExample.value))) + status=Some(transactionStatusExample.value)))) ), adapterImplementation = Some(AdapterImplementation("- Core", 1)) ) @@ -1615,7 +1615,7 @@ trait StoredProcedureConnector_vDec2019 extends Connector with MdcLoggable { startDate=toDate(transactionStartDateExample), finishDate=Some(toDate(transactionFinishDateExample)), balance=BigDecimal(balanceExample.value), - status=transactionStatusExample.value)) + status=Some(transactionStatusExample.value))) ), adapterImplementation = Some(AdapterImplementation("- Core", 1)) ) diff --git a/obp-api/src/main/scala/code/model/ModeratedBankingData.scala b/obp-api/src/main/scala/code/model/ModeratedBankingData.scala index 7314db295..569b48f99 100644 --- a/obp-api/src/main/scala/code/model/ModeratedBankingData.scala +++ b/obp-api/src/main/scala/code/model/ModeratedBankingData.scala @@ -57,7 +57,7 @@ class ModeratedTransaction( //the filteredBlance type in this class is a string rather than Big decimal like in Transaction trait for snippet (display) reasons. //the view should be able to return a sign (- or +) or the real value. casting signs into big decimal is not possible val balance : String, - val status : String + val status : Moderated[String] ) { def dateOption2JString(date: Option[Date]) : JString = { diff --git a/obp-api/src/main/scala/code/model/View.scala b/obp-api/src/main/scala/code/model/View.scala index 8f653f891..1ced4ecf8 100644 --- a/obp-api/src/main/scala/code/model/View.scala +++ b/obp-api/src/main/scala/code/model/View.scala @@ -178,7 +178,7 @@ case class ViewExtended(val view: View) { val transactionStatus = if (viewPermissions.exists(_ == CAN_SEE_TRANSACTION_STATUS)) transaction.status - else "" + else None new ModeratedTransaction( UUID = transactionUUID, diff --git a/obp-api/src/main/scala/code/transaction/MappedTransaction.scala b/obp-api/src/main/scala/code/transaction/MappedTransaction.scala index d17879a24..378f74dd7 100644 --- a/obp-api/src/main/scala/code/transaction/MappedTransaction.scala +++ b/obp-api/src/main/scala/code/transaction/MappedTransaction.scala @@ -156,7 +156,7 @@ class MappedTransaction extends LongKeyedMapper[MappedTransaction] with IdPK wit tStartDate.get, Some(tFinishDate.get), newBalance, - status.get)) + Some(status.get))) } } diff --git a/obp-api/src/test/scala/code/api/berlin/group/v1_3/JSONFactory_BERLIN_GROUP_1_3Test.scala b/obp-api/src/test/scala/code/api/berlin/group/v1_3/JSONFactory_BERLIN_GROUP_1_3Test.scala index 8e0cda195..7b77900ba 100644 --- a/obp-api/src/test/scala/code/api/berlin/group/v1_3/JSONFactory_BERLIN_GROUP_1_3Test.scala +++ b/obp-api/src/test/scala/code/api/berlin/group/v1_3/JSONFactory_BERLIN_GROUP_1_3Test.scala @@ -91,7 +91,7 @@ class JSONFactory_BERLIN_GROUP_1_3Test extends FeatureSpec with Matchers with Gi startDate = Some(new java.util.Date()), finishDate = Some(new java.util.Date()), balance = "900.00", - status = "booked" + status = Some("booked") ) } diff --git a/obp-api/src/test/scala/code/connector/RestConnector_vMar2019_frozen_meta_data b/obp-api/src/test/scala/code/connector/RestConnector_vMar2019_frozen_meta_data index a802ceacd..ffdf640c9 100644 Binary files a/obp-api/src/test/scala/code/connector/RestConnector_vMar2019_frozen_meta_data and b/obp-api/src/test/scala/code/connector/RestConnector_vMar2019_frozen_meta_data differ diff --git a/obp-commons/src/main/scala/com/openbankproject/commons/model/CommonModel.scala b/obp-commons/src/main/scala/com/openbankproject/commons/model/CommonModel.scala index 5a300bf6a..c81aac363 100644 --- a/obp-commons/src/main/scala/com/openbankproject/commons/model/CommonModel.scala +++ b/obp-commons/src/main/scala/com/openbankproject/commons/model/CommonModel.scala @@ -1141,7 +1141,7 @@ case class Transaction( finishDate : Option[Date], //the new balance for the bank account balance : BigDecimal, - status: String + status : Option[String] ) { val bankId = thisAccount.bankId