Merge pull request #2456 from hongwei1/develop

refactor/separate the RabbitMq setting

obp-api/src/main/scala/code/bankconnectors/rabbitmq/RabbitMQUtils.scala

@@ -35,12 +35,14 @@ object RabbitMQUtils extends MdcLoggable{
   val truststorePath = APIUtil.getPropsValue("truststore.path").getOrElse("")
   val truststorePassword = APIUtil.getPropsValue("keystore.password").getOrElse(APIUtil.initPasswd)
 
-  val args = new util.HashMap[String, AnyRef]()
+  val rpcQueueArgs = new util.HashMap[String, AnyRef]()
+  rpcQueueArgs.put("x-message-ttl", Integer.valueOf(60000))
+
+  val rpcReplyToQueueArgs = new util.HashMap[String, AnyRef]()
   //60s  It sets the time (in milliseconds) after which the queue will 
   // automatically be deleted if it is not used, i.e., if no consumer is connected to it during that time.
-  args.put("x-expires", Integer.valueOf(60000))
-  args.put("x-message-ttl", Integer.valueOf(60000))
-  //args.put("x-queue-type", "quorum") // use the classic first.
+  rpcReplyToQueueArgs.put("x-expires", Integer.valueOf(60000))
+  rpcReplyToQueueArgs.put("x-message-ttl", Integer.valueOf(60000))
 
 
   private implicit val formats = code.api.util.CustomJsonFormats.nullTolerateFormats
@@ -90,15 +92,15 @@ object RabbitMQUtils extends MdcLoggable{
       true,            // durable: non-persis, here set durable = true
       false,           // exclusive: non-excl4, here set exclusive = false
       false,           // autoDelete: delete, here set autoDelete = false 
-      args             // extra arguments,
+      rpcQueueArgs     // extra arguments,
     )
 
     val replyQueueName:String = channel.queueDeclare(
       s"${RPC_REPLY_TO_QUEUE_NAME_PREFIX}_${messageId.replace("obp_","")}_${UUID.randomUUID.toString}",  // Queue name, it will be a unique name for each queue
       false,            // durable: non-persis, here set durable = false
       true,           // exclusive: non-excl4, here set exclusive = true
       true,           // autoDelete: delete, here set autoDelete = true 
-      args             // extra arguments,
+      rpcReplyToQueueArgs // extra arguments,
     ).getQueue
 
     val rabbitResponseJsonFuture  = {

obp-api/src/main/scala/code/consent/ConsentProvider.scala

@@ -180,6 +180,11 @@ trait ConsentTrait {
    * Specified end date and time for the transaction query period. If the field does not contain information or if it is not sent in the request, the end date will be 90 calendar days prior to the creation of the consent.
    */
   def transactionToDateTime: Date
+
+  /**
+   * this will be a UUID later. now only use the primacyKey.toString for it.  
+   */
+  def consentReferenceId: String
 }
 
 object ConsentStatus extends Enumeration {

obp-api/src/main/scala/code/consent/MappedConsent.scala

@@ -321,6 +321,7 @@ class MappedConsent extends ConsentTrait with LongKeyedMapper[MappedConsent] wit
   override def transactionToDateTime= mTransactionToDateTime.get    
   override def creationDateTime= createdAt.get    
   override def statusUpdateDateTime= mStatusUpdateDateTime.get    
+  override def consentReferenceId = id.get.toString  
 
 }