Merge pull request #2588 from hongwei1/feature/TweakTransactionStatus

Feature/tweak transaction status

Author: simonredfern

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("","")

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))
   )

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))
   )

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))
   )

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 = {

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,

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)))
     }
   }
 

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")
         )
       }
 

obp-api/src/test/scala/code/connector/RestConnector_vMar2019_frozen_meta_data

@@ -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