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 356864a65..e7dc68c5c 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 @@ -230,7 +230,7 @@ object MessageDocsSwaggerDefinitions currency = currencyExample.value, description = Some(transactionDescriptionExample.value), startDate = DateWithDayExampleObject, - finishDate = DateWithDayExampleObject, + finishDate = Some(DateWithDayExampleObject), balance = BigDecimal(balanceAmountExample.value), status = transactionStatusExample.value, ) 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 bc52ac497..d03236dd0 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 @@ -1550,7 +1550,7 @@ trait RabbitMQConnector_vOct2024 extends Connector with MdcLoggable { currency=currencyExample.value, description=Some(transactionDescriptionExample.value), startDate=toDate(transactionStartDateExample), - finishDate=toDate(transactionFinishDateExample), + finishDate=Some(toDate(transactionFinishDateExample)), balance=BigDecimal(balanceExample.value), status=transactionStatusExample.value ))) @@ -1685,7 +1685,7 @@ trait RabbitMQConnector_vOct2024 extends Connector with MdcLoggable { currency=currencyExample.value, description=Some(transactionDescriptionExample.value), startDate=toDate(transactionStartDateExample), - finishDate=toDate(transactionFinishDateExample), + finishDate=Some(toDate(transactionFinishDateExample)), balance=BigDecimal(balanceExample.value), status=transactionStatusExample.value)) ), 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 5ef91390e..6bfee72bd 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 @@ -1498,7 +1498,7 @@ trait RestConnector_vMar2019 extends Connector with MdcLoggable { currency=currencyExample.value, description=Some(transactionDescriptionExample.value), startDate=toDate(transactionStartDateExample), - finishDate=toDate(transactionFinishDateExample), + finishDate=Some(toDate(transactionFinishDateExample)), balance=BigDecimal(balanceExample.value), status=transactionStatusExample.value))) ), @@ -1632,7 +1632,7 @@ trait RestConnector_vMar2019 extends Connector with MdcLoggable { currency=currencyExample.value, description=Some(transactionDescriptionExample.value), startDate=toDate(transactionStartDateExample), - finishDate=toDate(transactionFinishDateExample), + finishDate=Some(toDate(transactionFinishDateExample)), balance=BigDecimal(balanceExample.value), status=transactionStatusExample.value)) ), 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 65a541190..0ab7b583b 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 @@ -1479,7 +1479,7 @@ trait StoredProcedureConnector_vDec2019 extends Connector with MdcLoggable { currency=currencyExample.value, description=Some(transactionDescriptionExample.value), startDate=toDate(transactionStartDateExample), - finishDate=toDate(transactionFinishDateExample), + finishDate=Some(toDate(transactionFinishDateExample)), balance=BigDecimal(balanceExample.value), status=transactionStatusExample.value))) ), @@ -1613,7 +1613,7 @@ trait StoredProcedureConnector_vDec2019 extends Connector with MdcLoggable { currency=currencyExample.value, description=Some(transactionDescriptionExample.value), startDate=toDate(transactionStartDateExample), - finishDate=toDate(transactionFinishDateExample), + finishDate=Some(toDate(transactionFinishDateExample)), balance=BigDecimal(balanceExample.value), status=transactionStatusExample.value)) ), diff --git a/obp-api/src/main/scala/code/management/ImporterAPI.scala b/obp-api/src/main/scala/code/management/ImporterAPI.scala index c29b5f37d..3a0fa9e28 100644 --- a/obp-api/src/main/scala/code/management/ImporterAPI.scala +++ b/obp-api/src/main/scala/code/management/ImporterAPI.scala @@ -1,8 +1,10 @@ package code.management + import java.util.Date import code.api.util.ErrorMessages._ import code.api.util.{APIUtil, CustomJsonFormats} +import code.api.util.APIUtil.DateWithMsExampleObject import code.bankconnectors.{Connector, LocalMappedConnectorInternal} import code.tesobe.ErrorMessage import code.util.Helper.{MdcLoggable, ObpS} @@ -93,7 +95,7 @@ object ImporterAPI extends RestHelper with MdcLoggable { val detailsJson = JObject(List( JField("type_en", JString(t.transactionType)), JField("type", JString(t.transactionType)), JField("posted", JString(formatDate(t.startDate))), - JField("completed", JString(formatDate(t.finishDate))), + JField("completed", JString(formatDate(t.finishDate.getOrElse(DateWithMsExampleObject)))), JField("other_data", JString("")), JField("new_balance", JObject(List( JField("currency", JString(t.currency)), JField("amount", JString(t.balance.toString))))), diff --git a/obp-api/src/main/scala/code/model/View.scala b/obp-api/src/main/scala/code/model/View.scala index dfc822818..1c86969d7 100644 --- a/obp-api/src/main/scala/code/model/View.scala +++ b/obp-api/src/main/scala/code/model/View.scala @@ -160,7 +160,7 @@ case class ViewExtended(val view: View) { else None val transactionFinishDate = - if (view.canSeeTransactionFinishDate) Some(transaction.finishDate) + if (view.canSeeTransactionFinishDate) transaction.finishDate else None val transactionBalance = diff --git a/obp-api/src/main/scala/code/transaction/MappedTransaction.scala b/obp-api/src/main/scala/code/transaction/MappedTransaction.scala index 5ff7ab1bb..9edfcc0a4 100644 --- a/obp-api/src/main/scala/code/transaction/MappedTransaction.scala +++ b/obp-api/src/main/scala/code/transaction/MappedTransaction.scala @@ -154,7 +154,7 @@ class MappedTransaction extends LongKeyedMapper[MappedTransaction] with IdPK wit transactionCurrency, transactionDescription, tStartDate.get, - tFinishDate.get, + Some(tFinishDate.get), newBalance, status.get)) } diff --git a/obp-api/src/test/scala/code/api/v2_1_0/SandboxDataLoadingTest.scala b/obp-api/src/test/scala/code/api/v2_1_0/SandboxDataLoadingTest.scala index 52a81616a..69b603677 100644 --- a/obp-api/src/test/scala/code/api/v2_1_0/SandboxDataLoadingTest.scala +++ b/obp-api/src/test/scala/code/api/v2_1_0/SandboxDataLoadingTest.scala @@ -334,7 +334,7 @@ class SandboxDataLoadingTest extends FlatSpec with SendServerRequests with Match } foundTransaction.startDate.getTime should equal(toDate(transaction.details.posted).getTime) - foundTransaction.finishDate.getTime should equal(toDate(transaction.details.completed).getTime) + foundTransaction.finishDate.head.getTime should equal(toDate(transaction.details.completed).getTime) //a counterparty should exist val otherAcc = foundTransaction.otherAccount diff --git a/obp-api/src/test/scala/code/management/ImporterTest.scala b/obp-api/src/test/scala/code/management/ImporterTest.scala index 1b7b8d9a9..acad983da 100644 --- a/obp-api/src/test/scala/code/management/ImporterTest.scala +++ b/obp-api/src/test/scala/code/management/ImporterTest.scala @@ -145,7 +145,7 @@ class ImporterTest extends ServerSetup with MdcLoggable with DefaultConnectorTes //compare time as a long to avoid issues comparing Dates, e.g. java.util.Date vs java.sql.Date t.startDate.getTime should equal(importJsonDateFormat.parse(startDate).getTime) - t.finishDate.getTime should equal(importJsonDateFormat.parse(endDate).getTime) + t.finishDate.head.getTime should equal(importJsonDateFormat.parse(endDate).getTime) } scenario("Attempting to import transactions without using a secret key") { 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 ba46de514..5a300bf6a 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 @@ -1138,7 +1138,7 @@ case class Transaction( // The date the transaction was initiated startDate : Date, // The date when the money finished changing hands - finishDate : Date, + finishDate : Option[Date], //the new balance for the bank account balance : BigDecimal, status: String