From ebe2f98b89f6a52d3213ffbcdbcb047465e36c2a Mon Sep 17 00:00:00 2001
From: Apurb Rajdhan <103931815+apurbraj@users.noreply.github.com>
Date: Tue, 2 Jan 2024 23:41:17 +0530
Subject: [PATCH 01/16] Changing account lookup bpmn to lion

---
 src/main/resources/application.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index c4012d69..4c12f789 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -229,7 +229,7 @@ bpmns:
         batch-transactions: "bulk_processor-{dfspid}"
     - id: "rhino"
       flows:
-        batch-transactions: "bulk_processor_account_lookup-{dfspid}"
+        batch-transactions: "bulk_processor-{dfspid}"
     - id: "lion"
       flows:
-        batch-transactions: "bulk_processor-{dfspid}"
+        batch-transactions: "bulk_processor_account_lookup-{dfspid}"

From e3e2f19b3432b9d52ba7c9feb426d656d1ace08a Mon Sep 17 00:00:00 2001
From: Apurb Rajdhan <103931815+apurbraj@users.noreply.github.com>
Date: Mon, 8 Jan 2024 18:00:49 +0530
Subject: [PATCH 02/16] Fix splitting

---
 .../org/mifos/processor/bulk/camel/routes/SplittingRoute.java  | 3 ++-
 .../bulk/zeebe/worker/BatchAccountLookupCallbackWorker.java    | 1 +
 .../org/mifos/processor/bulk/zeebe/worker/SplittingWorker.java | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java b/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java
index 8edfd624..b6cf7a03 100644
--- a/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java
+++ b/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java
@@ -69,7 +69,8 @@ public void configure() throws Exception {
             List<String> subBatchFile = new ArrayList<>();
             Set<String> distinctPayeeIds = transactionList.stream().map(Transaction::getPayeeDfspId).collect(Collectors.toSet());
             logger.info("Payee id {}", distinctPayeeIds);
-            if (partyLookupEnabled && !distinctPayeeIds.isEmpty()) {
+            Boolean batchAccountLookup = (Boolean) exchange.getProperty("batchAccountLookup");
+            if (partyLookupEnabled && batchAccountLookup) {
                 // Create a map to store transactions for each payeeid
                 Map<String, List<Transaction>> transactionsByPayeeId = new HashMap<>();
 
diff --git a/src/main/java/org/mifos/processor/bulk/zeebe/worker/BatchAccountLookupCallbackWorker.java b/src/main/java/org/mifos/processor/bulk/zeebe/worker/BatchAccountLookupCallbackWorker.java
index 4a94084e..f99c070b 100644
--- a/src/main/java/org/mifos/processor/bulk/zeebe/worker/BatchAccountLookupCallbackWorker.java
+++ b/src/main/java/org/mifos/processor/bulk/zeebe/worker/BatchAccountLookupCallbackWorker.java
@@ -34,6 +34,7 @@ public void setup() {
             String filename = (String) variables.get(FILE_NAME);
             String batchAccountLookupCallback = (String) variables.get("batchAccountLookupCallback");
             variables.put(PARTY_LOOKUP_FAILED, false);
+            variables.put("batchAccountLookup", true);
             exchange.setProperty(SERVER_FILE_NAME, filename);
             exchange.setProperty("batchAccountLookupCallback", batchAccountLookupCallback);
             exchange.setProperty("workflowInstanceKey", job.getProcessInstanceKey());
diff --git a/src/main/java/org/mifos/processor/bulk/zeebe/worker/SplittingWorker.java b/src/main/java/org/mifos/processor/bulk/zeebe/worker/SplittingWorker.java
index 8ba21146..1b59f9e8 100644
--- a/src/main/java/org/mifos/processor/bulk/zeebe/worker/SplittingWorker.java
+++ b/src/main/java/org/mifos/processor/bulk/zeebe/worker/SplittingWorker.java
@@ -45,6 +45,8 @@ public void setup() {
             exchange.setProperty(SERVER_FILE_NAME, filename);
             exchange.setProperty(ZEEBE_VARIABLE, variables);
             exchange.setProperty("partyLookupFailed", partyLookupFailed);
+            exchange.setProperty("batchAccountLookup", variables.get("batchAccountLookup")!=null?variables.get("batchAccountLookup"):false);
+
             exchange.setProperty(SUB_BATCH_DETAILS, new ArrayList<SubBatchEntity>());
 
             try {

From 161794a1045f8400d8b1f7407c3b4876f9436f7c Mon Sep 17 00:00:00 2001
From: Apurb Rajdhan <103931815+apurbraj@users.noreply.github.com>
Date: Mon, 8 Jan 2024 18:07:09 +0530
Subject: [PATCH 03/16] checkstyle fix

---
 .../org/mifos/processor/bulk/zeebe/worker/SplittingWorker.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/mifos/processor/bulk/zeebe/worker/SplittingWorker.java b/src/main/java/org/mifos/processor/bulk/zeebe/worker/SplittingWorker.java
index 1b59f9e8..f3bd3088 100644
--- a/src/main/java/org/mifos/processor/bulk/zeebe/worker/SplittingWorker.java
+++ b/src/main/java/org/mifos/processor/bulk/zeebe/worker/SplittingWorker.java
@@ -45,7 +45,8 @@ public void setup() {
             exchange.setProperty(SERVER_FILE_NAME, filename);
             exchange.setProperty(ZEEBE_VARIABLE, variables);
             exchange.setProperty("partyLookupFailed", partyLookupFailed);
-            exchange.setProperty("batchAccountLookup", variables.get("batchAccountLookup")!=null?variables.get("batchAccountLookup"):false);
+            exchange.setProperty("batchAccountLookup",
+                    variables.get("batchAccountLookup") != null ? variables.get("batchAccountLookup") : false);
 
             exchange.setProperty(SUB_BATCH_DETAILS, new ArrayList<SubBatchEntity>());
 

From d5f89c84c079ba64978158fdd12ea74d946f337f Mon Sep 17 00:00:00 2001
From: abhinav <abhinav@Abhinavs-MacBook-Pro.local>
Date: Thu, 1 Feb 2024 11:35:25 +0530
Subject: [PATCH 04/16] BatchId in transfers table logic updtae

Removed unnecssary cvs

enabled kafka port
---
 Dockerfile                                    |  5 ---
 .../bulk/camel/routes/InitSubBatchRoute.java  |  2 +-
 .../bulk/camel/routes/SplittingRoute.java     | 38 +++++++++++++++++--
 .../processor/bulk/schema/Transaction.java    | 18 ++++++++-
 .../bulk/zeebe/worker/InitSubBatchWorker.java | 15 ++++----
 src/main/resources/application.yaml           | 24 ++++++------
 6 files changed, 70 insertions(+), 32 deletions(-)
 delete mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 4bad37e3..00000000
--- a/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM openjdk:17
-EXPOSE 5000
-
-COPY build/libs/*.jar .
-CMD java -jar *.jar
diff --git a/src/main/java/org/mifos/processor/bulk/camel/routes/InitSubBatchRoute.java b/src/main/java/org/mifos/processor/bulk/camel/routes/InitSubBatchRoute.java
index 8983c5bf..d3e4d7d5 100644
--- a/src/main/java/org/mifos/processor/bulk/camel/routes/InitSubBatchRoute.java
+++ b/src/main/java/org/mifos/processor/bulk/camel/routes/InitSubBatchRoute.java
@@ -115,7 +115,7 @@ public void configure() throws Exception {
                     PaymentModeMapping mapping = paymentModeConfiguration.getByMode(paymentMode);
 
                     String tenantName = exchange.getProperty(TENANT_NAME, String.class);
-                    tenantName = mapping.getDebulkingDfspid() == null ? tenantName : mapping.getDebulkingDfspid();
+                    //tenantName = mapping.getDebulkingDfspid() == null ? tenantName : mapping.getDebulkingDfspid();
                     Map<String, Object> variables = exchange.getProperty(ZEEBE_VARIABLE, Map.class);
                     variables.put(PAYMENT_MODE, paymentMode);
                     variables.put(DEBULKINGDFSPID, mapping.getDebulkingDfspid() == null ? tenantName : mapping.getDebulkingDfspid());
diff --git a/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java b/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java
index b6cf7a03..e40ba11a 100644
--- a/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java
+++ b/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java
@@ -1,5 +1,7 @@
 package org.mifos.processor.bulk.camel.routes;
 
+import static org.mifos.processor.bulk.camel.config.CamelProperties.OVERRIDE_HEADER;
+import static org.mifos.processor.bulk.camel.config.CamelProperties.RESULT_TRANSACTION_LIST;
 import static org.mifos.processor.bulk.camel.config.CamelProperties.LOCAL_FILE_PATH;
 import static org.mifos.processor.bulk.camel.config.CamelProperties.REGISTERING_INSTITUTE_ID;
 import static org.mifos.processor.bulk.camel.config.CamelProperties.SERVER_FILE_NAME;
@@ -75,14 +77,37 @@ public void configure() throws Exception {
                 Map<String, List<Transaction>> transactionsByPayeeId = new HashMap<>();
 
                 // Split the list based on distinct payeeids
+                Map<String, String> subBatchIdPayeeMap= new HashMap<>();
+                Map<String, List<Transaction>> subBatchIdMap= new HashMap<>();
+                List<String> subBatchIdList = new ArrayList<>();
+                List<Transaction> updatedTransactionList = new ArrayList<Transaction>();
                 for (String payeeId : distinctPayeeIds) {
                     List<Transaction> transactionsForPayee = transactionList.stream()
                             .filter(transaction -> payeeId.equals(transaction.getPayeeDfspId())).collect(Collectors.toList());
 
                     transactionsByPayeeId.put(payeeId, transactionsForPayee);
+                    String subBatchId = UUID.randomUUID().toString();
+                    subBatchIdList.add(subBatchId);
+                    subBatchIdPayeeMap.put(payeeId, subBatchId);
+                    subBatchIdMap.put(subBatchId, transactionsForPayee);
                 }
 
-                for (String payeeId : distinctPayeeIds) {
+//                //mapping subBatchId in transactionList
+                for (String subBatchId: subBatchIdList)
+                {
+                  List<Transaction> transactions = subBatchIdMap.get(subBatchId);
+                  for(Transaction transaction: transactions)
+                  {
+                      for(Transaction originalTransaction: transactionList){
+                          if (originalTransaction.equals(transaction))
+                          {
+                              originalTransaction.setBatchId(subBatchId);
+                              updatedTransactionList.add(originalTransaction);
+                          }
+                      }
+                  }
+                }
+                    for (String payeeId : distinctPayeeIds) {
                     List<Transaction> transactionsForSpecificPayee = transactionsByPayeeId.get(payeeId);
                     String filename = UUID.randomUUID() + "_" + "sub-batch-" + payeeId + ".csv";
                     logger.info("Created sub-batch with file name {}", filename);
@@ -91,10 +116,13 @@ public void configure() throws Exception {
                     File file = new File(filename);
                     SequenceWriter writer = csvMapper.writerWithSchemaFor(Transaction.class).with(csvSchema).writeValues(file);
                     for (Transaction transaction : transactionsForSpecificPayee) {
+                        transaction.setBatchId(subBatchIdPayeeMap.get(payeeId));
                         writer.write(transaction);
                     }
+                    exchange.setProperty(RESULT_TRANSACTION_LIST, updatedTransactionList);
                     subBatchFile.add(filename);
-                }
+                    exchange.setProperty(TRANSACTION_LIST, updatedTransactionList);
+                    }
             } else {
                 List<String> lines = new ArrayList<>();
                 String line = null;
@@ -128,7 +156,9 @@ public void configure() throws Exception {
             exchange.setProperty(SUB_BATCH_COUNT, subBatchFile.size());
             exchange.setProperty(SUB_BATCH_CREATED, true);
             exchange.setProperty(SERVER_SUB_BATCH_FILE_NAME_ARRAY, new ArrayList<String>());
-        });
+        }).log("updating orignal").setProperty(LOCAL_FILE_PATH, exchangeProperty(SERVER_FILE_NAME))
+                .setProperty(OVERRIDE_HEADER, constant(true)) // default header in CSV file will be used
+                .to("direct:update-file-v2").to("direct:upload-file");
 
         // Iterate through each CSVs of sub-batches and uploads in cloud
         from("direct:upload-sub-batch-file").id("direct:upload-sub-batch-file").log("Starting upload of sub-batch file")
@@ -166,7 +196,7 @@ public void configure() throws Exception {
 
                     SubBatchEntity subBatchEntity = getDefaultSubBatchEntity();
                     subBatchEntity.setBatchId((String) zeebeVariables.get(BATCH_ID));
-                    subBatchEntity.setSubBatchId(UUID.randomUUID().toString());
+                    subBatchEntity.setSubBatchId(transactionList.get(0).getBatchId());
                     subBatchEntity.setRequestId((String) zeebeVariables.get(REQUEST_ID));
                     subBatchEntity.setCorrelationId((String) zeebeVariables.get(CLIENT_CORRELATION_ID));
                     subBatchEntity.setPayerFsp((String) zeebeVariables.get(PAYER_IDENTIFIER));
diff --git a/src/main/java/org/mifos/processor/bulk/schema/Transaction.java b/src/main/java/org/mifos/processor/bulk/schema/Transaction.java
index 7c8f9514..c6d5cf8e 100644
--- a/src/main/java/org/mifos/processor/bulk/schema/Transaction.java
+++ b/src/main/java/org/mifos/processor/bulk/schema/Transaction.java
@@ -6,12 +6,13 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import lombok.Getter;
 import lombok.Setter;
+import java.util.Objects;
 
 @Getter
 @Setter
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonPropertyOrder({ "id", "request_id", "payment_mode", "account_number", "payer_identifier_type", "payer_identifier",
-        "payee_identifier_type", "payee_identifier", "amount", "currency", "note", "program_shortcode", "cycle", "payee_dfsp_id" })
+        "payee_identifier_type", "payee_identifier", "amount", "currency", "note", "program_shortcode", "cycle", "payee_dfsp_id", "batch_id" })
 public class Transaction implements CsvSchema {
 
     @JsonProperty("id")
@@ -32,6 +33,19 @@ public class Transaction implements CsvSchema {
     @JsonProperty("currency")
     private String currency;
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Transaction that = (Transaction) o;
+        return id == that.id && Objects.equals(requestId, that.requestId) && Objects.equals(paymentMode, that.paymentMode) && Objects.equals(accountNumber, that.accountNumber) && Objects.equals(amount, that.amount) && Objects.equals(currency, that.currency) && Objects.equals(note, that.note) && Objects.equals(payerIdentifierType, that.payerIdentifierType) && Objects.equals(payerIdentifier, that.payerIdentifier) && Objects.equals(payeeIdentifierType, that.payeeIdentifierType) && Objects.equals(payeeIdentifier, that.payeeIdentifier) && Objects.equals(payeeDfspId, that.payeeDfspId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, requestId, paymentMode, accountNumber, amount, currency, note, payerIdentifierType, payerIdentifier, payeeIdentifierType, payeeIdentifier, payeeDfspId);
+    }
+
     @JsonProperty("note")
     private String note;
 
@@ -56,7 +70,7 @@ public class Transaction implements CsvSchema {
     @JsonProperty("payee_dfsp_id")
     private String payeeDfspId;
 
-    @JsonIgnore
+    @JsonProperty("batch_id")
     private String batchId;
 
     @Override
diff --git a/src/main/java/org/mifos/processor/bulk/zeebe/worker/InitSubBatchWorker.java b/src/main/java/org/mifos/processor/bulk/zeebe/worker/InitSubBatchWorker.java
index 2acacf11..98a5250a 100644
--- a/src/main/java/org/mifos/processor/bulk/zeebe/worker/InitSubBatchWorker.java
+++ b/src/main/java/org/mifos/processor/bulk/zeebe/worker/InitSubBatchWorker.java
@@ -72,15 +72,15 @@ public void setup() {
 
             String fileName = subBatches.remove(0);
             SubBatchEntity subBatchEntity = null;
-
-            for (SubBatchEntity subBatch : subBatchEntityList) {
-                if (subBatch.getRequestFile().contains(fileName)) {
-                    subBatchEntity = subBatch;
-                    logger.info("SubBatchEntity found");
+            if(isSplittingEnabled) {
+                for (SubBatchEntity subBatch : subBatchEntityList) {
+                    if (subBatch.getRequestFile().contains(fileName)) {
+                        subBatchEntity = subBatch;
+                        logger.info("SubBatchEntity found");
+                    }
                 }
+                logger.debug("BatchEntity for this subbatch is {}", objectMapper.writeValueAsString(subBatchEntity));
             }
-            logger.debug("BatchEntity for this subbatch is {}", objectMapper.writeValueAsString(subBatchEntity));
-
             Exchange exchange = new DefaultExchange(camelContext);
             exchange.setProperty(TENANT_NAME, variables.get(TENANT_ID));
             exchange.setProperty(SERVER_FILE_NAME, fileName);
@@ -94,7 +94,6 @@ public void setup() {
 
             Boolean subBatchFailed = exchange.getProperty(INIT_SUB_BATCH_FAILED, Boolean.class);
             if (subBatchFailed != null && subBatchFailed) {
-                failureSubBatches.add(fileName);
             } else {
                 successSubBatches.add(fileName);
             }
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index 4c12f789..c17b9a35 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -8,7 +8,7 @@ camel:
         auto-discover-object-mapper: true
 
 kafka:
-  bootstrapAddress: "kafka:9092"
+    bootstrapAddress: "kafka:9092"
   topic:
     gsma:
       name: gsma
@@ -27,10 +27,10 @@ zeebe:
     #    number-of-workers: 8
     #    evenly-allocated-max-jobs: "#{${zeebe.client.max-execution-threads} / ${zeebe.client.number-of-workers}}"
   broker:
-    contactpoint: "zeebe-zeebe-gateway:26500"
+    contactpoint: "localhost:26500"
 
 operations-app:
-  contactpoint: "https://ops-bk.sandbox.mifos.io"
+  contactpoint: "http://localhost:"
   username: "mifos"
   password: "password"
   endpoints:
@@ -40,20 +40,20 @@ operations-app:
     batch-aggregate: "/api/v1/batch/"
 
 mock-payment-schema:
-  contactpoint: "http://ph-ee-connector-mock-payment-schema:8080"
+  contactpoint: "https://mockpaymentschema.sandbox.fynarfin.io/"
   endpoints:
     authorization: "/batches/"
 
 channel:
-  hostname: "https://ph-ee-connector-channel:8443"
+  hostname: "http://channel.sandbox.fynarfin.io/"
 
 cloud:
   aws:
     enabled: true
-    s3BaseUrl: "https://s3.ap-south-1.amazonaws.com"
+    s3BaseUrl: http://localhost:9000
     credentials:
       access-key: ${AWS_ACCESS_KEY:access_key_from_aws}
-      secret-key: ${AWS_SECRET_KEY:secret_key_from_aws}
+      secret-key: ${AWS_SECRET_KEY:access_key_from_aws}
 
     region:
       static: ap-south-1
@@ -92,15 +92,15 @@ config:
   partylookup:
     enable: true
   authorization:
-    enabled: true
+    enabled: false
   approval:
     enable: true
   ordering:
-    enable: true
+    enable: false
     field: "payerIdentifier"
   splitting:
-    enable: false
-    sub-batch-size: 5
+    enable: true
+    sub-batch-size: 20
   formatting:
     enable: false
     standard: "DEFAULT"
@@ -149,7 +149,7 @@ security:
       enable: true
 
 identity_account_mapper:
-  hostname : "http://ph-ee-identity-account-mapper:80"
+  hostname : "http://localhost:8081"
   account_lookup: /beneficiary
   account_lookup_callback: /accountLookupCallback
   batch_account_lookup: /accountLookup

From 33d24a2c1cddbb3b54d01ce1e2030f499946c3ee Mon Sep 17 00:00:00 2001
From: abhinav <abhinav@Abhinavs-MacBook-Pro.local>
Date: Thu, 1 Feb 2024 12:06:15 +0530
Subject: [PATCH 05/16] Added dockerfile, and rmeoved commented code

Spliiting on

Spliiting on
---
 Dockerfile                                    |  5 +++++
 .../bulk/camel/routes/InitSubBatchRoute.java  |  1 -
 src/main/resources/application.yaml           | 20 +++++++++----------
 3 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..ac38c28a
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,5 @@
+FROM openjdk:17
+EXPOSE 5000
+
+COPY build/libs/*.jar .
+CMD java -jar *.jar
\ No newline at end of file
diff --git a/src/main/java/org/mifos/processor/bulk/camel/routes/InitSubBatchRoute.java b/src/main/java/org/mifos/processor/bulk/camel/routes/InitSubBatchRoute.java
index d3e4d7d5..5b876233 100644
--- a/src/main/java/org/mifos/processor/bulk/camel/routes/InitSubBatchRoute.java
+++ b/src/main/java/org/mifos/processor/bulk/camel/routes/InitSubBatchRoute.java
@@ -115,7 +115,6 @@ public void configure() throws Exception {
                     PaymentModeMapping mapping = paymentModeConfiguration.getByMode(paymentMode);
 
                     String tenantName = exchange.getProperty(TENANT_NAME, String.class);
-                    //tenantName = mapping.getDebulkingDfspid() == null ? tenantName : mapping.getDebulkingDfspid();
                     Map<String, Object> variables = exchange.getProperty(ZEEBE_VARIABLE, Map.class);
                     variables.put(PAYMENT_MODE, paymentMode);
                     variables.put(DEBULKINGDFSPID, mapping.getDebulkingDfspid() == null ? tenantName : mapping.getDebulkingDfspid());
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index c17b9a35..fcdb8844 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -8,7 +8,7 @@ camel:
         auto-discover-object-mapper: true
 
 kafka:
-    bootstrapAddress: "kafka:9092"
+  bootstrapAddress: "kafka:9092"
   topic:
     gsma:
       name: gsma
@@ -27,10 +27,10 @@ zeebe:
     #    number-of-workers: 8
     #    evenly-allocated-max-jobs: "#{${zeebe.client.max-execution-threads} / ${zeebe.client.number-of-workers}}"
   broker:
-    contactpoint: "localhost:26500"
+    contactpoint: "zeebe-zeebe-gateway:26500"
 
 operations-app:
-  contactpoint: "http://localhost:"
+  contactpoint: "https://ops-bk.sandbox.mifos.io"
   username: "mifos"
   password: "password"
   endpoints:
@@ -40,20 +40,20 @@ operations-app:
     batch-aggregate: "/api/v1/batch/"
 
 mock-payment-schema:
-  contactpoint: "https://mockpaymentschema.sandbox.fynarfin.io/"
+  contactpoint: "http://ph-ee-connector-mock-payment-schema:8080"
   endpoints:
     authorization: "/batches/"
 
 channel:
-  hostname: "http://channel.sandbox.fynarfin.io/"
+  hostname: "https://ph-ee-connector-channel:8443"
 
 cloud:
   aws:
     enabled: true
-    s3BaseUrl: http://localhost:9000
+    s3BaseUrl: "https://s3.ap-south-1.amazonaws.com"
     credentials:
       access-key: ${AWS_ACCESS_KEY:access_key_from_aws}
-      secret-key: ${AWS_SECRET_KEY:access_key_from_aws}
+      secret-key: ${AWS_SECRET_KEY:secret_key_from_aws}
 
     region:
       static: ap-south-1
@@ -92,11 +92,11 @@ config:
   partylookup:
     enable: true
   authorization:
-    enabled: false
+    enabled: true
   approval:
     enable: true
   ordering:
-    enable: false
+    enable: true
     field: "payerIdentifier"
   splitting:
     enable: true
@@ -149,7 +149,7 @@ security:
       enable: true
 
 identity_account_mapper:
-  hostname : "http://localhost:8081"
+  hostname : "http://ph-ee-identity-account-mapper:80"
   account_lookup: /beneficiary
   account_lookup_callback: /accountLookupCallback
   batch_account_lookup: /accountLookup

From be2cbac3dc09304df482cd5fda69d9c71747a246 Mon Sep 17 00:00:00 2001
From: abhinav <abhinav@Abhinavs-MacBook-Pro.local>
Date: Thu, 1 Feb 2024 16:10:14 +0530
Subject: [PATCH 06/16] Fixed spotless issues

---
 .../bulk/camel/routes/SplittingRoute.java     | 38 +++++++++----------
 .../processor/bulk/schema/Transaction.java    | 23 ++++++++---
 .../bulk/zeebe/worker/InitSubBatchWorker.java |  3 +-
 3 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java b/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java
index e40ba11a..252ac0f1 100644
--- a/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java
+++ b/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java
@@ -1,9 +1,9 @@
 package org.mifos.processor.bulk.camel.routes;
 
-import static org.mifos.processor.bulk.camel.config.CamelProperties.OVERRIDE_HEADER;
-import static org.mifos.processor.bulk.camel.config.CamelProperties.RESULT_TRANSACTION_LIST;
 import static org.mifos.processor.bulk.camel.config.CamelProperties.LOCAL_FILE_PATH;
+import static org.mifos.processor.bulk.camel.config.CamelProperties.OVERRIDE_HEADER;
 import static org.mifos.processor.bulk.camel.config.CamelProperties.REGISTERING_INSTITUTE_ID;
+import static org.mifos.processor.bulk.camel.config.CamelProperties.RESULT_TRANSACTION_LIST;
 import static org.mifos.processor.bulk.camel.config.CamelProperties.SERVER_FILE_NAME;
 import static org.mifos.processor.bulk.camel.config.CamelProperties.SERVER_SUB_BATCH_FILE_NAME_ARRAY;
 import static org.mifos.processor.bulk.camel.config.CamelProperties.SUB_BATCH_COUNT;
@@ -77,14 +77,13 @@ public void configure() throws Exception {
                 Map<String, List<Transaction>> transactionsByPayeeId = new HashMap<>();
 
                 // Split the list based on distinct payeeids
-                Map<String, String> subBatchIdPayeeMap= new HashMap<>();
-                Map<String, List<Transaction>> subBatchIdMap= new HashMap<>();
+                Map<String, String> subBatchIdPayeeMap = new HashMap<>();
+                Map<String, List<Transaction>> subBatchIdMap = new HashMap<>();
                 List<String> subBatchIdList = new ArrayList<>();
                 List<Transaction> updatedTransactionList = new ArrayList<Transaction>();
                 for (String payeeId : distinctPayeeIds) {
                     List<Transaction> transactionsForPayee = transactionList.stream()
                             .filter(transaction -> payeeId.equals(transaction.getPayeeDfspId())).collect(Collectors.toList());
-
                     transactionsByPayeeId.put(payeeId, transactionsForPayee);
                     String subBatchId = UUID.randomUUID().toString();
                     subBatchIdList.add(subBatchId);
@@ -92,22 +91,19 @@ public void configure() throws Exception {
                     subBatchIdMap.put(subBatchId, transactionsForPayee);
                 }
 
-//                //mapping subBatchId in transactionList
-                for (String subBatchId: subBatchIdList)
-                {
-                  List<Transaction> transactions = subBatchIdMap.get(subBatchId);
-                  for(Transaction transaction: transactions)
-                  {
-                      for(Transaction originalTransaction: transactionList){
-                          if (originalTransaction.equals(transaction))
-                          {
-                              originalTransaction.setBatchId(subBatchId);
-                              updatedTransactionList.add(originalTransaction);
-                          }
-                      }
-                  }
+                // mapping subBatchId in transactionList
+                for (String subBatchId : subBatchIdList) {
+                    List<Transaction> transactions = subBatchIdMap.get(subBatchId);
+                    for (Transaction transaction : transactions) {
+                        for (Transaction originalTransaction : transactionList) {
+                            if (originalTransaction.equals(transaction)) {
+                                originalTransaction.setBatchId(subBatchId);
+                                updatedTransactionList.add(originalTransaction);
+                            }
+                        }
+                    }
                 }
-                    for (String payeeId : distinctPayeeIds) {
+                for (String payeeId : distinctPayeeIds) {
                     List<Transaction> transactionsForSpecificPayee = transactionsByPayeeId.get(payeeId);
                     String filename = UUID.randomUUID() + "_" + "sub-batch-" + payeeId + ".csv";
                     logger.info("Created sub-batch with file name {}", filename);
@@ -122,7 +118,7 @@ public void configure() throws Exception {
                     exchange.setProperty(RESULT_TRANSACTION_LIST, updatedTransactionList);
                     subBatchFile.add(filename);
                     exchange.setProperty(TRANSACTION_LIST, updatedTransactionList);
-                    }
+                }
             } else {
                 List<String> lines = new ArrayList<>();
                 String line = null;
diff --git a/src/main/java/org/mifos/processor/bulk/schema/Transaction.java b/src/main/java/org/mifos/processor/bulk/schema/Transaction.java
index c6d5cf8e..e16716f5 100644
--- a/src/main/java/org/mifos/processor/bulk/schema/Transaction.java
+++ b/src/main/java/org/mifos/processor/bulk/schema/Transaction.java
@@ -4,15 +4,16 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.Objects;
 import lombok.Getter;
 import lombok.Setter;
-import java.util.Objects;
 
 @Getter
 @Setter
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonPropertyOrder({ "id", "request_id", "payment_mode", "account_number", "payer_identifier_type", "payer_identifier",
-        "payee_identifier_type", "payee_identifier", "amount", "currency", "note", "program_shortcode", "cycle", "payee_dfsp_id", "batch_id" })
+        "payee_identifier_type", "payee_identifier", "amount", "currency", "note", "program_shortcode", "cycle", "payee_dfsp_id",
+        "batch_id" })
 public class Transaction implements CsvSchema {
 
     @JsonProperty("id")
@@ -35,15 +36,25 @@ public class Transaction implements CsvSchema {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
         Transaction that = (Transaction) o;
-        return id == that.id && Objects.equals(requestId, that.requestId) && Objects.equals(paymentMode, that.paymentMode) && Objects.equals(accountNumber, that.accountNumber) && Objects.equals(amount, that.amount) && Objects.equals(currency, that.currency) && Objects.equals(note, that.note) && Objects.equals(payerIdentifierType, that.payerIdentifierType) && Objects.equals(payerIdentifier, that.payerIdentifier) && Objects.equals(payeeIdentifierType, that.payeeIdentifierType) && Objects.equals(payeeIdentifier, that.payeeIdentifier) && Objects.equals(payeeDfspId, that.payeeDfspId);
+        return id == that.id && Objects.equals(requestId, that.requestId) && Objects.equals(paymentMode, that.paymentMode)
+                && Objects.equals(accountNumber, that.accountNumber) && Objects.equals(amount, that.amount)
+                && Objects.equals(currency, that.currency) && Objects.equals(note, that.note)
+                && Objects.equals(payerIdentifierType, that.payerIdentifierType) && Objects.equals(payerIdentifier, that.payerIdentifier)
+                && Objects.equals(payeeIdentifierType, that.payeeIdentifierType) && Objects.equals(payeeIdentifier, that.payeeIdentifier)
+                && Objects.equals(payeeDfspId, that.payeeDfspId);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, requestId, paymentMode, accountNumber, amount, currency, note, payerIdentifierType, payerIdentifier, payeeIdentifierType, payeeIdentifier, payeeDfspId);
+        return Objects.hash(id, requestId, paymentMode, accountNumber, amount, currency, note, payerIdentifierType, payerIdentifier,
+                payeeIdentifierType, payeeIdentifier, payeeDfspId);
     }
 
     @JsonProperty("note")
diff --git a/src/main/java/org/mifos/processor/bulk/zeebe/worker/InitSubBatchWorker.java b/src/main/java/org/mifos/processor/bulk/zeebe/worker/InitSubBatchWorker.java
index 98a5250a..55734bef 100644
--- a/src/main/java/org/mifos/processor/bulk/zeebe/worker/InitSubBatchWorker.java
+++ b/src/main/java/org/mifos/processor/bulk/zeebe/worker/InitSubBatchWorker.java
@@ -72,7 +72,7 @@ public void setup() {
 
             String fileName = subBatches.remove(0);
             SubBatchEntity subBatchEntity = null;
-            if(isSplittingEnabled) {
+            if (isSplittingEnabled) {
                 for (SubBatchEntity subBatch : subBatchEntityList) {
                     if (subBatch.getRequestFile().contains(fileName)) {
                         subBatchEntity = subBatch;
@@ -94,6 +94,7 @@ public void setup() {
 
             Boolean subBatchFailed = exchange.getProperty(INIT_SUB_BATCH_FAILED, Boolean.class);
             if (subBatchFailed != null && subBatchFailed) {
+                failureSubBatches.add(fileName);
             } else {
                 successSubBatches.add(fileName);
             }

From fc0dac00deb456b623272b25ba89f7bf1d0d9986 Mon Sep 17 00:00:00 2001
From: abhinav <abhinav@Abhinavs-MacBook-Pro.local>
Date: Thu, 1 Feb 2024 11:35:25 +0530
Subject: [PATCH 07/16] BatchId in transfers table logic updtae

Removed unnecssary cvs

enabled kafka port
---
 .../bulk/camel/routes/SplittingRoute.java     |  4 ++--
 .../bulk/zeebe/worker/InitSubBatchWorker.java |  1 -
 src/main/resources/application.yaml           | 20 +++++++++----------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java b/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java
index 252ac0f1..604ccb97 100644
--- a/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java
+++ b/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java
@@ -1,9 +1,9 @@
 package org.mifos.processor.bulk.camel.routes;
 
-import static org.mifos.processor.bulk.camel.config.CamelProperties.LOCAL_FILE_PATH;
 import static org.mifos.processor.bulk.camel.config.CamelProperties.OVERRIDE_HEADER;
-import static org.mifos.processor.bulk.camel.config.CamelProperties.REGISTERING_INSTITUTE_ID;
 import static org.mifos.processor.bulk.camel.config.CamelProperties.RESULT_TRANSACTION_LIST;
+import static org.mifos.processor.bulk.camel.config.CamelProperties.LOCAL_FILE_PATH;
+import static org.mifos.processor.bulk.camel.config.CamelProperties.REGISTERING_INSTITUTE_ID;
 import static org.mifos.processor.bulk.camel.config.CamelProperties.SERVER_FILE_NAME;
 import static org.mifos.processor.bulk.camel.config.CamelProperties.SERVER_SUB_BATCH_FILE_NAME_ARRAY;
 import static org.mifos.processor.bulk.camel.config.CamelProperties.SUB_BATCH_COUNT;
diff --git a/src/main/java/org/mifos/processor/bulk/zeebe/worker/InitSubBatchWorker.java b/src/main/java/org/mifos/processor/bulk/zeebe/worker/InitSubBatchWorker.java
index 55734bef..ff143c6d 100644
--- a/src/main/java/org/mifos/processor/bulk/zeebe/worker/InitSubBatchWorker.java
+++ b/src/main/java/org/mifos/processor/bulk/zeebe/worker/InitSubBatchWorker.java
@@ -94,7 +94,6 @@ public void setup() {
 
             Boolean subBatchFailed = exchange.getProperty(INIT_SUB_BATCH_FAILED, Boolean.class);
             if (subBatchFailed != null && subBatchFailed) {
-                failureSubBatches.add(fileName);
             } else {
                 successSubBatches.add(fileName);
             }
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index fcdb8844..c17b9a35 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -8,7 +8,7 @@ camel:
         auto-discover-object-mapper: true
 
 kafka:
-  bootstrapAddress: "kafka:9092"
+    bootstrapAddress: "kafka:9092"
   topic:
     gsma:
       name: gsma
@@ -27,10 +27,10 @@ zeebe:
     #    number-of-workers: 8
     #    evenly-allocated-max-jobs: "#{${zeebe.client.max-execution-threads} / ${zeebe.client.number-of-workers}}"
   broker:
-    contactpoint: "zeebe-zeebe-gateway:26500"
+    contactpoint: "localhost:26500"
 
 operations-app:
-  contactpoint: "https://ops-bk.sandbox.mifos.io"
+  contactpoint: "http://localhost:"
   username: "mifos"
   password: "password"
   endpoints:
@@ -40,20 +40,20 @@ operations-app:
     batch-aggregate: "/api/v1/batch/"
 
 mock-payment-schema:
-  contactpoint: "http://ph-ee-connector-mock-payment-schema:8080"
+  contactpoint: "https://mockpaymentschema.sandbox.fynarfin.io/"
   endpoints:
     authorization: "/batches/"
 
 channel:
-  hostname: "https://ph-ee-connector-channel:8443"
+  hostname: "http://channel.sandbox.fynarfin.io/"
 
 cloud:
   aws:
     enabled: true
-    s3BaseUrl: "https://s3.ap-south-1.amazonaws.com"
+    s3BaseUrl: http://localhost:9000
     credentials:
       access-key: ${AWS_ACCESS_KEY:access_key_from_aws}
-      secret-key: ${AWS_SECRET_KEY:secret_key_from_aws}
+      secret-key: ${AWS_SECRET_KEY:access_key_from_aws}
 
     region:
       static: ap-south-1
@@ -92,11 +92,11 @@ config:
   partylookup:
     enable: true
   authorization:
-    enabled: true
+    enabled: false
   approval:
     enable: true
   ordering:
-    enable: true
+    enable: false
     field: "payerIdentifier"
   splitting:
     enable: true
@@ -149,7 +149,7 @@ security:
       enable: true
 
 identity_account_mapper:
-  hostname : "http://ph-ee-identity-account-mapper:80"
+  hostname : "http://localhost:8081"
   account_lookup: /beneficiary
   account_lookup_callback: /accountLookupCallback
   batch_account_lookup: /accountLookup

From 88200c0a00da1dc20b038da09f565cfb37f1caab Mon Sep 17 00:00:00 2001
From: abhinav <abhinav@Abhinavs-MacBook-Pro.local>
Date: Thu, 1 Feb 2024 16:23:04 +0530
Subject: [PATCH 08/16] Fixed spotless issues

---
 .../org/mifos/processor/bulk/camel/routes/SplittingRoute.java   | 2 --
 .../mifos/processor/bulk/zeebe/worker/InitSubBatchWorker.java   | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java b/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java
index 604ccb97..c1d4cfb2 100644
--- a/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java
+++ b/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java
@@ -1,7 +1,5 @@
 package org.mifos.processor.bulk.camel.routes;
 
-import static org.mifos.processor.bulk.camel.config.CamelProperties.OVERRIDE_HEADER;
-import static org.mifos.processor.bulk.camel.config.CamelProperties.RESULT_TRANSACTION_LIST;
 import static org.mifos.processor.bulk.camel.config.CamelProperties.LOCAL_FILE_PATH;
 import static org.mifos.processor.bulk.camel.config.CamelProperties.REGISTERING_INSTITUTE_ID;
 import static org.mifos.processor.bulk.camel.config.CamelProperties.SERVER_FILE_NAME;
diff --git a/src/main/java/org/mifos/processor/bulk/zeebe/worker/InitSubBatchWorker.java b/src/main/java/org/mifos/processor/bulk/zeebe/worker/InitSubBatchWorker.java
index ff143c6d..55734bef 100644
--- a/src/main/java/org/mifos/processor/bulk/zeebe/worker/InitSubBatchWorker.java
+++ b/src/main/java/org/mifos/processor/bulk/zeebe/worker/InitSubBatchWorker.java
@@ -94,6 +94,7 @@ public void setup() {
 
             Boolean subBatchFailed = exchange.getProperty(INIT_SUB_BATCH_FAILED, Boolean.class);
             if (subBatchFailed != null && subBatchFailed) {
+                failureSubBatches.add(fileName);
             } else {
                 successSubBatches.add(fileName);
             }

From 9cef49fe17535a1713109591454a61de6794a699 Mon Sep 17 00:00:00 2001
From: abhinav <abhinav@Abhinavs-MacBook-Pro.local>
Date: Fri, 2 Feb 2024 17:04:09 +0530
Subject: [PATCH 09/16] yaml file configiration changes

---
 src/main/resources/application.yaml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index c17b9a35..fcdb8844 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -8,7 +8,7 @@ camel:
         auto-discover-object-mapper: true
 
 kafka:
-    bootstrapAddress: "kafka:9092"
+  bootstrapAddress: "kafka:9092"
   topic:
     gsma:
       name: gsma
@@ -27,10 +27,10 @@ zeebe:
     #    number-of-workers: 8
     #    evenly-allocated-max-jobs: "#{${zeebe.client.max-execution-threads} / ${zeebe.client.number-of-workers}}"
   broker:
-    contactpoint: "localhost:26500"
+    contactpoint: "zeebe-zeebe-gateway:26500"
 
 operations-app:
-  contactpoint: "http://localhost:"
+  contactpoint: "https://ops-bk.sandbox.mifos.io"
   username: "mifos"
   password: "password"
   endpoints:
@@ -40,20 +40,20 @@ operations-app:
     batch-aggregate: "/api/v1/batch/"
 
 mock-payment-schema:
-  contactpoint: "https://mockpaymentschema.sandbox.fynarfin.io/"
+  contactpoint: "http://ph-ee-connector-mock-payment-schema:8080"
   endpoints:
     authorization: "/batches/"
 
 channel:
-  hostname: "http://channel.sandbox.fynarfin.io/"
+  hostname: "https://ph-ee-connector-channel:8443"
 
 cloud:
   aws:
     enabled: true
-    s3BaseUrl: http://localhost:9000
+    s3BaseUrl: "https://s3.ap-south-1.amazonaws.com"
     credentials:
       access-key: ${AWS_ACCESS_KEY:access_key_from_aws}
-      secret-key: ${AWS_SECRET_KEY:access_key_from_aws}
+      secret-key: ${AWS_SECRET_KEY:secret_key_from_aws}
 
     region:
       static: ap-south-1
@@ -92,11 +92,11 @@ config:
   partylookup:
     enable: true
   authorization:
-    enabled: false
+    enabled: true
   approval:
     enable: true
   ordering:
-    enable: false
+    enable: true
     field: "payerIdentifier"
   splitting:
     enable: true
@@ -149,7 +149,7 @@ security:
       enable: true
 
 identity_account_mapper:
-  hostname : "http://localhost:8081"
+  hostname : "http://ph-ee-identity-account-mapper:80"
   account_lookup: /beneficiary
   account_lookup_callback: /accountLookupCallback
   batch_account_lookup: /accountLookup

From c6351e19b2b73c5d06ecd86ceb29a3b1c338c724 Mon Sep 17 00:00:00 2001
From: abhinav <abhinav@Abhinavs-MacBook-Pro.local>
Date: Sat, 3 Feb 2024 12:05:01 +0530
Subject: [PATCH 10/16] Updated service url

---
 src/main/resources/application.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index fcdb8844..6fb575db 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -218,7 +218,6 @@ gov-stack-client:
   header-key: "X-GovStack-Client"
   header-value: "PAYMENT-BB"
 
-
 bpmns:
   tenants:
     - id: "gorilla"

From b2bfb5cd97cb7eb77f54892d1d78ff7cf920bfd9 Mon Sep 17 00:00:00 2001
From: abhinav <abhinav@Abhinavs-MacBook-Pro.local>
Date: Mon, 5 Feb 2024 00:22:42 +0530
Subject: [PATCH 11/16] updatetd csv schema

---
 ...47b3-a986-52a07760e277_sub-batch-rhino.csv |   3 +
 ...abc-430c-bf72-cd707bca4d12_sub-batch-2.csv |   3 +
 ...4964-9446-ce198e2cde58_sub-batch-rhino.csv |   3 +
 ...d1-ab01-f9ebf09a6a71_sub-batch-gorilla.csv |   5 +
 ...b1f-48f8-b594-bf0a07fe301c_sub-batch-1.csv |   7 +
 ...411-4091-8259-bbf381ed24ac_sub-batch-2.csv |   2 +
 ...840-4d14-a3ef-736184bbb5f2_sub-batch-2.csv |   1 +
 ...801-42cb-999c-b20fa607c608_sub-batch-2.csv |   3 +
 ...86c-4cda-9eb5-d17c9c6ba6a0_sub-batch-1.csv |   3 +
 ...b6-4a3a-ab20-e9f299011a46_bulk_payment.csv |   7 +
 ...96-a62a-ffc8c7aba3b4_sub-batch-gorilla.csv |   5 +
 ...400a-861c-41160db28443_sub-batch-rhino.csv |   3 +
 ...4e16-98fa-71bd4cabc356_sub-batch-rhino.csv |   3 +
 ...aa-4209-b12d-65397e4cf2f2_bulk_payment.csv |   7 +
 ...237-4ebf-bab9-ddf8772ed7da_sub-batch-1.csv |   7 +
 ...90a-433c-a284-0aa6c496e468_sub-batch-1.csv |   7 +
 ...71-4c5b-8b7e-6343994a3aeb_bulk_payment.csv |   7 +
 ...4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv |   3 +
 ...66-bda4-4fac0c2225a4_sub-batch-gorilla.csv |   5 +
 ...24-9466-49012908deaa_sub-batch-gorilla.csv |   5 +
 ...4644-9035-e741e0372301_sub-batch-rhino.csv |   3 +
 ...4eb1-8a82-62efeba005c4_sub-batch-rhino.csv |   3 +
 ...30-a3ce-76fee69164b5_sub-batch-gorilla.csv |   5 +
 ...a15-4b9c-b185-eed488b16835_sub-batch-1.csv |   6 +
 ...dd-b595-4fa3e2aa6e59_sub-batch-gorilla.csv |   5 +
 ...00e-4a62-bd61-2f24c592d072_sub-batch-2.csv |   2 +
 ...7d-8af4-0486f8dca8a6_sub-batch-gorilla.csv |   5 +
 ...c8-b8aa-a0f18d97fcee_sub-batch-gorilla.csv |   5 +
 ...a1-4c53-84a5-3f4976962811_bulk_payment.csv |   7 +
 ...e19-44fe-848f-5e1076b1ee74_sub-batch-2.csv |   3 +
 ...b6-4d8b-9844-cdbdc07bd30a_bulk_payment.csv |   7 +
 ...0b-acc1-8e2d4803d2ff_ph-ee-bulk-demo-6.csv |   3 +
 ...0f5-4bd1-9a5b-e7a398c02b2f_sub-batch-2.csv |   3 +
 ...20-bcd8-daf9b2c9ad06_sub-batch-gorilla.csv |   5 +
 ...48-bbe5-6b4a2836d091_sub-batch-gorilla.csv |   5 +
 ...337-40ec-b306-ccc909ebb457_sub-batch-2.csv |   2 +
 ...4aad-8b41-a8249d60a97b_sub-batch-rhino.csv |   3 +
 ...00e-4a62-bd61-2f24c592d072_sub-batch-2.csv |   2 +
 ...2b-8a89-1d20fdb0243b_sub-batch-gorilla.csv |   5 +
 ...42e0-b8f0-8f7c587d2ebd_sub-batch-rhino.csv |   3 +
 ...09a-4f48-a0ce-a581d48ff530_sub-batch-1.csv |   6 +
 ...d5-af56-1c68c93a6f63_sub-batch-gorilla.csv |   5 +
 ...4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv |   3 +
 ...49b2-829b-d9d132dc6615_sub-batch-rhino.csv |   3 +
 ...4a87-a527-7c6693d41e10_sub-batch-rhino.csv |   3 +
 ...acd-4c82-bff1-46e1620d3da3_sub-batch-1.csv |   6 +
 ...00-9bd7-d665c9cd0ac6_sub-batch-gorilla.csv |   5 +
 ...4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv |   3 +
 ...94-9686-1674d39cc1c0_sub-batch-gorilla.csv |   5 +
 ...f1-4a45-95ae-6e4e049adc38_bulk_payment.csv |   7 +
 ...b73-47ed-b872-e90b3ad1f4e8_sub-batch-1.csv |   3 +
 ...8c9-44d4-b3d1-5c2fc13c1700_sub-batch-1.csv |   6 +
 ...4264-b277-8d16ae3c4613_sub-batch-rhino.csv |   3 +
 ...4124-929d-04fbf1e1a731_sub-batch-rhino.csv |   3 +
 ...4d0a-ab9e-3e215fcedae1_sub-batch-rhino.csv |   3 +
 ...400a-861c-41160db28443_sub-batch-rhino.csv |   3 +
 ...f5-43c0-b1b4-3c53c664a7d5_bulk_payment.csv |   7 +
 ...8a-8396-7a4e0331490b_sub-batch-gorilla.csv |   5 +
 ...c5-4ebf-a0c1-b121a4e7f35b_bulk_payment.csv |   7 +
 ...d4-8524-7801ea3543fa_sub-batch-gorilla.csv |   5 +
 ...b7d-4900-9539-2b0609c11b0c_sub-batch-1.csv |   7 +
 ...24-9466-49012908deaa_sub-batch-gorilla.csv |   5 +
 ...24-9466-49012908deaa_sub-batch-gorilla.csv |   5 +
 ...b12-4098-92b6-55a89c20bbba_sub-batch-1.csv |   1 +
 ...4286-89dc-4a7163c3d366_sub-batch-rhino.csv |   3 +
 ...f0-4bd7-aa9b-47773a79f487_bulk_payment.csv |   7 +
 ...337-40ec-b306-ccc909ebb457_sub-batch-2.csv |   2 +
 ...d6-9d66-c7b98f829d91_sub-batch-gorilla.csv |   5 +
 ...4edd-8e2c-fd3417a33930_sub-batch-rhino.csv |   3 +
 ...47-8ac0-1125bcb78d5f_sub-batch-gorilla.csv |   5 +
 ...4236-b784-0e43c3805527_sub-batch-rhino.csv |   3 +
 ...5d-4b06-9a05-5c51a542efcb_bulk_payment.csv |   7 +
 ...09a-4f48-a0ce-a581d48ff530_sub-batch-1.csv |   6 +
 ...24-9466-49012908deaa_sub-batch-gorilla.csv |   5 +
 ...63-4bec-8870-6d2f2d05afa9_bulk_payment.csv |   7 +
 ...c0-4a0a-b64d-cdaa79d4993e_bulk_payment.csv |   7 +
 ...45e2-90dd-3c8d14e00a95_sub-batch-rhino.csv |   3 +
 ...24-9466-49012908deaa_sub-batch-gorilla.csv |   5 +
 ...41ea-8345-7c45da9811ed_sub-batch-rhino.csv |   3 +
 ...3b-962d-5970c58a7dfe_sub-batch-gorilla.csv |   5 +
 ...4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv |   3 +
 ...74-ab12-e024d45bb8ab_sub-batch-gorilla.csv |   5 +
 ...400a-861c-41160db28443_sub-batch-rhino.csv |   3 +
 ...4ff6-8f9f-2b3c9b4411d2_sub-batch-rhino.csv |   3 +
 ...90-408d-bb17-eacf86146983_bulk_payment.csv |   7 +
 ...980-4a06-8e29-d2d474f0546a_sub-batch-2.csv |   2 +
 ...15a-4a32-8d7f-e60b318b7043_sub-batch-2.csv |   3 +
 ...82-ad2a-a684b95d5320_sub-batch-gorilla.csv |   5 +
 ...400a-861c-41160db28443_sub-batch-rhino.csv |   3 +
 ...acd-4c82-bff1-46e1620d3da3_sub-batch-1.csv |   6 +
 ...f49-44c0-bbf6-5d60d7d843b1_sub-batch-2.csv |   3 +
 .../bulk/camel/routes/SplittingRoute.java     |  35 ++-
 .../mifos/processor/bulk/kafka/Consumers.java | 232 +++++++++---------
 .../kafka/config/KafkaConsumerConfig.java     |  78 +++---
 .../kafka/config/KafkaProducerConfig.java     |  68 ++---
 .../bulk/kafka/config/KafkaTopicConfig.java   |  80 +++---
 .../bulk/utility/TransactionUtil.java         |  36 +++
 src/main/resources/application.yaml           |   8 +-
 98 files changed, 693 insertions(+), 243 deletions(-)
 create mode 100644 01f5d1c2-ed0e-47b3-a986-52a07760e277_sub-batch-rhino.csv
 create mode 100644 04622991-aabc-430c-bf72-cd707bca4d12_sub-batch-2.csv
 create mode 100644 04c96688-fa6a-4964-9446-ce198e2cde58_sub-batch-rhino.csv
 create mode 100644 0f248ce7-9ce3-4fd1-ab01-f9ebf09a6a71_sub-batch-gorilla.csv
 create mode 100644 0f40c6d5-4b1f-48f8-b594-bf0a07fe301c_sub-batch-1.csv
 create mode 100644 10c76e29-3411-4091-8259-bbf381ed24ac_sub-batch-2.csv
 create mode 100644 18ab458a-5840-4d14-a3ef-736184bbb5f2_sub-batch-2.csv
 create mode 100644 19dcd9b2-4801-42cb-999c-b20fa607c608_sub-batch-2.csv
 create mode 100644 1aee1930-c86c-4cda-9eb5-d17c9c6ba6a0_sub-batch-1.csv
 create mode 100644 1db59e7f-3eb6-4a3a-ab20-e9f299011a46_bulk_payment.csv
 create mode 100644 20f24d57-17b6-4196-a62a-ffc8c7aba3b4_sub-batch-gorilla.csv
 create mode 100644 20f721d6-93ea-41f4-a45b-1633731817da_d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv
 create mode 100644 21a33fd0-2728-4e16-98fa-71bd4cabc356_sub-batch-rhino.csv
 create mode 100644 24dc160a-baaa-4209-b12d-65397e4cf2f2_bulk_payment.csv
 create mode 100644 252beba6-0237-4ebf-bab9-ddf8772ed7da_sub-batch-1.csv
 create mode 100644 274766c9-790a-433c-a284-0aa6c496e468_sub-batch-1.csv
 create mode 100644 2762913c-0771-4c5b-8b7e-6343994a3aeb_bulk_payment.csv
 create mode 100644 27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv
 create mode 100644 2819dca5-a2a7-4766-bda4-4fac0c2225a4_sub-batch-gorilla.csv
 create mode 100644 2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
 create mode 100644 2c09b0d4-298a-4644-9035-e741e0372301_sub-batch-rhino.csv
 create mode 100644 30f4d99a-ab34-4eb1-8a82-62efeba005c4_sub-batch-rhino.csv
 create mode 100644 3158c520-55b9-4330-a3ce-76fee69164b5_sub-batch-gorilla.csv
 create mode 100644 338596c9-6a15-4b9c-b185-eed488b16835_sub-batch-1.csv
 create mode 100644 33c9b676-f55a-47dd-b595-4fa3e2aa6e59_sub-batch-gorilla.csv
 create mode 100644 3a973cb6-30a9-45bc-9b2d-2e06caf0a194_5a79ac5f-c00e-4a62-bd61-2f24c592d072_sub-batch-2.csv
 create mode 100644 40c91795-8705-427d-8af4-0486f8dca8a6_sub-batch-gorilla.csv
 create mode 100644 42d9f96c-ddfa-4cc8-b8aa-a0f18d97fcee_sub-batch-gorilla.csv
 create mode 100644 44ec4e09-0da1-4c53-84a5-3f4976962811_bulk_payment.csv
 create mode 100644 467c8a17-8e19-44fe-848f-5e1076b1ee74_sub-batch-2.csv
 create mode 100644 48decda4-f5b6-4d8b-9844-cdbdc07bd30a_bulk_payment.csv
 create mode 100644 49af284f-a5b6-430b-acc1-8e2d4803d2ff_ph-ee-bulk-demo-6.csv
 create mode 100644 4d8781bd-30f5-4bd1-9a5b-e7a398c02b2f_sub-batch-2.csv
 create mode 100644 4e864887-5d85-4520-bcd8-daf9b2c9ad06_sub-batch-gorilla.csv
 create mode 100644 55d53127-6df4-4448-bbe5-6b4a2836d091_sub-batch-gorilla.csv
 create mode 100644 5846bf25-7337-40ec-b306-ccc909ebb457_sub-batch-2.csv
 create mode 100644 58bbb029-f3c6-4aad-8b41-a8249d60a97b_sub-batch-rhino.csv
 create mode 100644 5a79ac5f-c00e-4a62-bd61-2f24c592d072_sub-batch-2.csv
 create mode 100644 5c755633-7b3e-4d2b-8a89-1d20fdb0243b_sub-batch-gorilla.csv
 create mode 100644 5d12672e-a4ee-42e0-b8f0-8f7c587d2ebd_sub-batch-rhino.csv
 create mode 100644 5d45eab9-009a-4f48-a0ce-a581d48ff530_sub-batch-1.csv
 create mode 100644 6071ba69-32ba-49d5-af56-1c68c93a6f63_sub-batch-gorilla.csv
 create mode 100644 6a35c1d2-42fc-4f40-bfef-7476a5352d2a_27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv
 create mode 100644 6e697f5e-3be1-49b2-829b-d9d132dc6615_sub-batch-rhino.csv
 create mode 100644 6f6fa931-1715-4a87-a527-7c6693d41e10_sub-batch-rhino.csv
 create mode 100644 6fdcf7c1-07bf-4318-8f52-bf4f22025e11_ec0c518c-bacd-4c82-bff1-46e1620d3da3_sub-batch-1.csv
 create mode 100644 6ff0cec1-eefa-4a00-9bd7-d665c9cd0ac6_sub-batch-gorilla.csv
 create mode 100644 70f00aa9-2204-4e15-9a3c-a2d3449811e5_27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv
 create mode 100644 71b3d07a-1617-4e94-9686-1674d39cc1c0_sub-batch-gorilla.csv
 create mode 100644 79cc1e71-6cf1-4a45-95ae-6e4e049adc38_bulk_payment.csv
 create mode 100644 7b700e1b-3b73-47ed-b872-e90b3ad1f4e8_sub-batch-1.csv
 create mode 100644 7f72cb32-68c9-44d4-b3d1-5c2fc13c1700_sub-batch-1.csv
 create mode 100644 8123b544-4c74-4264-b277-8d16ae3c4613_sub-batch-rhino.csv
 create mode 100644 842ee21f-f665-4124-929d-04fbf1e1a731_sub-batch-rhino.csv
 create mode 100644 85b7379c-979c-4d0a-ab9e-3e215fcedae1_sub-batch-rhino.csv
 create mode 100644 86b5162a-78de-47df-b494-65c88d4c308b_d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv
 create mode 100644 8780cbd1-16f5-43c0-b1b4-3c53c664a7d5_bulk_payment.csv
 create mode 100644 8ecd9222-27c6-488a-8396-7a4e0331490b_sub-batch-gorilla.csv
 create mode 100644 908d01e5-4bc5-4ebf-a0c1-b121a4e7f35b_bulk_payment.csv
 create mode 100644 98f08d7f-dd82-48d4-8524-7801ea3543fa_sub-batch-gorilla.csv
 create mode 100644 9b8a3248-eb7d-4900-9539-2b0609c11b0c_sub-batch-1.csv
 create mode 100644 9e515093-03c9-4733-a693-3cea5354f9d5_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
 create mode 100644 a3c7555b-6a37-494c-b825-9b0d9bcc2f9b_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
 create mode 100644 a72f1ad3-bb12-4098-92b6-55a89c20bbba_sub-batch-1.csv
 create mode 100644 a78fffca-366a-4286-89dc-4a7163c3d366_sub-batch-rhino.csv
 create mode 100644 aa703090-a6f0-4bd7-aa9b-47773a79f487_bulk_payment.csv
 create mode 100644 aa7a8412-f681-4adf-aa18-2ff72f47f102_5846bf25-7337-40ec-b306-ccc909ebb457_sub-batch-2.csv
 create mode 100644 ab90a350-d417-40d6-9d66-c7b98f829d91_sub-batch-gorilla.csv
 create mode 100644 ac1f2aca-8e4c-4edd-8e2c-fd3417a33930_sub-batch-rhino.csv
 create mode 100644 ac2ce741-da3f-4f47-8ac0-1125bcb78d5f_sub-batch-gorilla.csv
 create mode 100644 ac82f801-c644-4236-b784-0e43c3805527_sub-batch-rhino.csv
 create mode 100644 ae4266e2-d65d-4b06-9a05-5c51a542efcb_bulk_payment.csv
 create mode 100644 b00e2cc4-7bee-45c2-a2f7-2e3127ca3031_5d45eab9-009a-4f48-a0ce-a581d48ff530_sub-batch-1.csv
 create mode 100644 b4dacda7-f064-438f-8a4b-4854674482be_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
 create mode 100644 b679e220-6763-4bec-8870-6d2f2d05afa9_bulk_payment.csv
 create mode 100644 bc46c116-2dc0-4a0a-b64d-cdaa79d4993e_bulk_payment.csv
 create mode 100644 be46e107-6ab9-45e2-90dd-3c8d14e00a95_sub-batch-rhino.csv
 create mode 100644 bea14bd3-8a40-4829-9f51-2590ddf651a3_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
 create mode 100644 c7697bf9-c533-41ea-8345-7c45da9811ed_sub-batch-rhino.csv
 create mode 100644 d040581e-2a16-4f3b-962d-5970c58a7dfe_sub-batch-gorilla.csv
 create mode 100644 d0d8b91a-a020-4f3c-9ab0-476876e81759_27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv
 create mode 100644 d671627e-529d-4e74-ab12-e024d45bb8ab_sub-batch-gorilla.csv
 create mode 100644 d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv
 create mode 100644 debffb76-36b2-4ff6-8f9f-2b3c9b4411d2_sub-batch-rhino.csv
 create mode 100644 e0a27f6b-b090-408d-bb17-eacf86146983_bulk_payment.csv
 create mode 100644 e1eae6bf-1980-4a06-8e29-d2d474f0546a_sub-batch-2.csv
 create mode 100644 e6950eac-515a-4a32-8d7f-e60b318b7043_sub-batch-2.csv
 create mode 100644 e7b1c485-d526-4982-ad2a-a684b95d5320_sub-batch-gorilla.csv
 create mode 100644 e9f37cc8-9177-4213-95e2-ffefdf41a56a_d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv
 create mode 100644 ec0c518c-bacd-4c82-bff1-46e1620d3da3_sub-batch-1.csv
 create mode 100644 eed36f80-df49-44c0-bbf6-5d60d7d843b1_sub-batch-2.csv
 create mode 100644 src/main/java/org/mifos/processor/bulk/utility/TransactionUtil.java

diff --git a/01f5d1c2-ed0e-47b3-a986-52a07760e277_sub-batch-rhino.csv b/01f5d1c2-ed0e-47b3-a986-52a07760e277_sub-batch-rhino.csv
new file mode 100644
index 00000000..cd185a51
--- /dev/null
+++ b/01f5d1c2-ed0e-47b3-a986-52a07760e277_sub-batch-rhino.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"b6aa32cd-06a8-42dc-a070-daab4a5a6cc0"
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"b6aa32cd-06a8-42dc-a070-daab4a5a6cc0"
diff --git a/04622991-aabc-430c-bf72-cd707bca4d12_sub-batch-2.csv b/04622991-aabc-430c-bf72-cd707bca4d12_sub-batch-2.csv
new file mode 100644
index 00000000..ae3909d4
--- /dev/null
+++ b/04622991-aabc-430c-bf72-cd707bca4d12_sub-batch-2.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
+
+5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment,fac50f42-60fc-4c50-ba79-792d81cb392f
diff --git a/04c96688-fa6a-4964-9446-ce198e2cde58_sub-batch-rhino.csv b/04c96688-fa6a-4964-9446-ce198e2cde58_sub-batch-rhino.csv
new file mode 100644
index 00000000..f2bdc005
--- /dev/null
+++ b/04c96688-fa6a-4964-9446-ce198e2cde58_sub-batch-rhino.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"3b2c84b1-431b-475d-857d-58bc2a1899cc"
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"3b2c84b1-431b-475d-857d-58bc2a1899cc"
diff --git a/0f248ce7-9ce3-4fd1-ab01-f9ebf09a6a71_sub-batch-gorilla.csv b/0f248ce7-9ce3-4fd1-ab01-f9ebf09a6a71_sub-batch-gorilla.csv
new file mode 100644
index 00000000..70dd9aa8
--- /dev/null
+++ b/0f248ce7-9ce3-4fd1-ab01-f9ebf09a6a71_sub-batch-gorilla.csv
@@ -0,0 +1,5 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"3e5a8ff7-2051-4974-ac82-f0fd27efcd2d"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"3e5a8ff7-2051-4974-ac82-f0fd27efcd2d"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"3e5a8ff7-2051-4974-ac82-f0fd27efcd2d"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"3e5a8ff7-2051-4974-ac82-f0fd27efcd2d"
diff --git a/0f40c6d5-4b1f-48f8-b594-bf0a07fe301c_sub-batch-1.csv b/0f40c6d5-4b1f-48f8-b594-bf0a07fe301c_sub-batch-1.csv
new file mode 100644
index 00000000..ffad80e4
--- /dev/null
+++ b/0f40c6d5-4b1f-48f8-b594-bf0a07fe301c_sub-batch-1.csv
@@ -0,0 +1,7 @@
+id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
+
+0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment,51596f33-d248-4829-9252-f55c709c82ba
+1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment,51596f33-d248-4829-9252-f55c709c82ba
+2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment,51596f33-d248-4829-9252-f55c709c82ba
+3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment,51596f33-d248-4829-9252-f55c709c82ba
+4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment,51596f33-d248-4829-9252-f55c709c82ba
diff --git a/10c76e29-3411-4091-8259-bbf381ed24ac_sub-batch-2.csv b/10c76e29-3411-4091-8259-bbf381ed24ac_sub-batch-2.csv
new file mode 100644
index 00000000..84dba38d
--- /dev/null
+++ b/10c76e29-3411-4091-8259-bbf381ed24ac_sub-batch-2.csv
@@ -0,0 +1,2 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,"Test Payee Payment",,,,,"03ffc7fe-e42d-4f49-9358-586a2a6a3cd7"
diff --git a/18ab458a-5840-4d14-a3ef-736184bbb5f2_sub-batch-2.csv b/18ab458a-5840-4d14-a3ef-736184bbb5f2_sub-batch-2.csv
new file mode 100644
index 00000000..b810552d
--- /dev/null
+++ b/18ab458a-5840-4d14-a3ef-736184bbb5f2_sub-batch-2.csv
@@ -0,0 +1 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
diff --git a/19dcd9b2-4801-42cb-999c-b20fa607c608_sub-batch-2.csv b/19dcd9b2-4801-42cb-999c-b20fa607c608_sub-batch-2.csv
new file mode 100644
index 00000000..b95805b3
--- /dev/null
+++ b/19dcd9b2-4801-42cb-999c-b20fa607c608_sub-batch-2.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
+
+5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment,4219c893-f7b3-4865-bbd0-8ae05f78e984
diff --git a/1aee1930-c86c-4cda-9eb5-d17c9c6ba6a0_sub-batch-1.csv b/1aee1930-c86c-4cda-9eb5-d17c9c6ba6a0_sub-batch-1.csv
new file mode 100644
index 00000000..34f80c49
--- /dev/null
+++ b/1aee1930-c86c-4cda-9eb5-d17c9c6ba6a0_sub-batch-1.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
+
+0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment,0f63e113-7235-4ad2-bd23-8ef1f84edf72
diff --git a/1db59e7f-3eb6-4a3a-ab20-e9f299011a46_bulk_payment.csv b/1db59e7f-3eb6-4a3a-ab20-e9f299011a46_bulk_payment.csv
new file mode 100644
index 00000000..3fbc8913
--- /dev/null
+++ b/1db59e7f-3eb6-4a3a-ab20-e9f299011a46_bulk_payment.csv
@@ -0,0 +1,7 @@
+id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
+0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
+1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
+2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment
+3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment
+4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment
+5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment
\ No newline at end of file
diff --git a/20f24d57-17b6-4196-a62a-ffc8c7aba3b4_sub-batch-gorilla.csv b/20f24d57-17b6-4196-a62a-ffc8c7aba3b4_sub-batch-gorilla.csv
new file mode 100644
index 00000000..a7ea364a
--- /dev/null
+++ b/20f24d57-17b6-4196-a62a-ffc8c7aba3b4_sub-batch-gorilla.csv
@@ -0,0 +1,5 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"62dbec54-0e03-4952-b3b4-206345504aca"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"62dbec54-0e03-4952-b3b4-206345504aca"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"62dbec54-0e03-4952-b3b4-206345504aca"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"62dbec54-0e03-4952-b3b4-206345504aca"
diff --git a/20f721d6-93ea-41f4-a45b-1633731817da_d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv b/20f721d6-93ea-41f4-a45b-1633731817da_d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv
new file mode 100644
index 00000000..85c56e9c
--- /dev/null
+++ b/20f721d6-93ea-41f4-a45b-1633731817da_d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"bb080fe6-e814-4f06-a3f0-a2228d2ef701"
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"bb080fe6-e814-4f06-a3f0-a2228d2ef701"
\ No newline at end of file
diff --git a/21a33fd0-2728-4e16-98fa-71bd4cabc356_sub-batch-rhino.csv b/21a33fd0-2728-4e16-98fa-71bd4cabc356_sub-batch-rhino.csv
new file mode 100644
index 00000000..595c7fb1
--- /dev/null
+++ b/21a33fd0-2728-4e16-98fa-71bd4cabc356_sub-batch-rhino.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"c13fae51-6201-4296-82a9-244bc8c5c18a"
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"c13fae51-6201-4296-82a9-244bc8c5c18a"
diff --git a/24dc160a-baaa-4209-b12d-65397e4cf2f2_bulk_payment.csv b/24dc160a-baaa-4209-b12d-65397e4cf2f2_bulk_payment.csv
new file mode 100644
index 00000000..3fbc8913
--- /dev/null
+++ b/24dc160a-baaa-4209-b12d-65397e4cf2f2_bulk_payment.csv
@@ -0,0 +1,7 @@
+id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
+0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
+1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
+2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment
+3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment
+4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment
+5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment
\ No newline at end of file
diff --git a/252beba6-0237-4ebf-bab9-ddf8772ed7da_sub-batch-1.csv b/252beba6-0237-4ebf-bab9-ddf8772ed7da_sub-batch-1.csv
new file mode 100644
index 00000000..d894eeba
--- /dev/null
+++ b/252beba6-0237-4ebf-bab9-ddf8772ed7da_sub-batch-1.csv
@@ -0,0 +1,7 @@
+id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
+
+0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment,7c6b35b4-680f-4065-b9f4-6521c215e854
+1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment,7c6b35b4-680f-4065-b9f4-6521c215e854
+2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment,7c6b35b4-680f-4065-b9f4-6521c215e854
+3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment,7c6b35b4-680f-4065-b9f4-6521c215e854
+4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment,7c6b35b4-680f-4065-b9f4-6521c215e854
diff --git a/274766c9-790a-433c-a284-0aa6c496e468_sub-batch-1.csv b/274766c9-790a-433c-a284-0aa6c496e468_sub-batch-1.csv
new file mode 100644
index 00000000..d8531d8e
--- /dev/null
+++ b/274766c9-790a-433c-a284-0aa6c496e468_sub-batch-1.csv
@@ -0,0 +1,7 @@
+id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
+
+0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment,d162df9e-cb3d-4551-b574-45743ac078e3
+1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment,d162df9e-cb3d-4551-b574-45743ac078e3
+2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment,d162df9e-cb3d-4551-b574-45743ac078e3
+3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment,d162df9e-cb3d-4551-b574-45743ac078e3
+4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment,d162df9e-cb3d-4551-b574-45743ac078e3
diff --git a/2762913c-0771-4c5b-8b7e-6343994a3aeb_bulk_payment.csv b/2762913c-0771-4c5b-8b7e-6343994a3aeb_bulk_payment.csv
new file mode 100644
index 00000000..3fbc8913
--- /dev/null
+++ b/2762913c-0771-4c5b-8b7e-6343994a3aeb_bulk_payment.csv
@@ -0,0 +1,7 @@
+id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
+0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
+1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
+2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment
+3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment
+4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment
+5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment
\ No newline at end of file
diff --git a/27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv b/27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv
new file mode 100644
index 00000000..9378da42
--- /dev/null
+++ b/27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"d0ae9951-4d7c-4b1f-a74b-e0e17d7ae495"
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"d0ae9951-4d7c-4b1f-a74b-e0e17d7ae495"
diff --git a/2819dca5-a2a7-4766-bda4-4fac0c2225a4_sub-batch-gorilla.csv b/2819dca5-a2a7-4766-bda4-4fac0c2225a4_sub-batch-gorilla.csv
new file mode 100644
index 00000000..7e422e66
--- /dev/null
+++ b/2819dca5-a2a7-4766-bda4-4fac0c2225a4_sub-batch-gorilla.csv
@@ -0,0 +1,5 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"70dbf128-260e-493e-a426-be04bc4a21e9"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"70dbf128-260e-493e-a426-be04bc4a21e9"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"70dbf128-260e-493e-a426-be04bc4a21e9"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"70dbf128-260e-493e-a426-be04bc4a21e9"
diff --git a/2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv b/2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
new file mode 100644
index 00000000..33b9dd22
--- /dev/null
+++ b/2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
@@ -0,0 +1,5 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
diff --git a/2c09b0d4-298a-4644-9035-e741e0372301_sub-batch-rhino.csv b/2c09b0d4-298a-4644-9035-e741e0372301_sub-batch-rhino.csv
new file mode 100644
index 00000000..fc4dc647
--- /dev/null
+++ b/2c09b0d4-298a-4644-9035-e741e0372301_sub-batch-rhino.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"5dc9e518-d8d5-421f-989d-40978aec3a79"
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"5dc9e518-d8d5-421f-989d-40978aec3a79"
diff --git a/30f4d99a-ab34-4eb1-8a82-62efeba005c4_sub-batch-rhino.csv b/30f4d99a-ab34-4eb1-8a82-62efeba005c4_sub-batch-rhino.csv
new file mode 100644
index 00000000..20001049
--- /dev/null
+++ b/30f4d99a-ab34-4eb1-8a82-62efeba005c4_sub-batch-rhino.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"a6ca1d79-ee41-40a8-b335-55bb048f19e1"
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"a6ca1d79-ee41-40a8-b335-55bb048f19e1"
diff --git a/3158c520-55b9-4330-a3ce-76fee69164b5_sub-batch-gorilla.csv b/3158c520-55b9-4330-a3ce-76fee69164b5_sub-batch-gorilla.csv
new file mode 100644
index 00000000..7ef99dab
--- /dev/null
+++ b/3158c520-55b9-4330-a3ce-76fee69164b5_sub-batch-gorilla.csv
@@ -0,0 +1,5 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"8a6e2655-105c-40c6-bcf3-d88a8579023a"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"8a6e2655-105c-40c6-bcf3-d88a8579023a"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"8a6e2655-105c-40c6-bcf3-d88a8579023a"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"8a6e2655-105c-40c6-bcf3-d88a8579023a"
diff --git a/338596c9-6a15-4b9c-b185-eed488b16835_sub-batch-1.csv b/338596c9-6a15-4b9c-b185-eed488b16835_sub-batch-1.csv
new file mode 100644
index 00000000..57109bcf
--- /dev/null
+++ b/338596c9-6a15-4b9c-b185-eed488b16835_sub-batch-1.csv
@@ -0,0 +1,6 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla
diff --git a/33c9b676-f55a-47dd-b595-4fa3e2aa6e59_sub-batch-gorilla.csv b/33c9b676-f55a-47dd-b595-4fa3e2aa6e59_sub-batch-gorilla.csv
new file mode 100644
index 00000000..4d30b7f3
--- /dev/null
+++ b/33c9b676-f55a-47dd-b595-4fa3e2aa6e59_sub-batch-gorilla.csv
@@ -0,0 +1,5 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"63326013-e3b8-42a2-be0c-47201f02fa37"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"63326013-e3b8-42a2-be0c-47201f02fa37"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"63326013-e3b8-42a2-be0c-47201f02fa37"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"63326013-e3b8-42a2-be0c-47201f02fa37"
diff --git a/3a973cb6-30a9-45bc-9b2d-2e06caf0a194_5a79ac5f-c00e-4a62-bd61-2f24c592d072_sub-batch-2.csv b/3a973cb6-30a9-45bc-9b2d-2e06caf0a194_5a79ac5f-c00e-4a62-bd61-2f24c592d072_sub-batch-2.csv
new file mode 100644
index 00000000..27e66473
--- /dev/null
+++ b/3a973cb6-30a9-45bc-9b2d-2e06caf0a194_5a79ac5f-c00e-4a62-bd61-2f24c592d072_sub-batch-2.csv
@@ -0,0 +1,2 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,,,,,"78e6541f-e04b-4224-9a19-735f0b9f70c3"
diff --git a/40c91795-8705-427d-8af4-0486f8dca8a6_sub-batch-gorilla.csv b/40c91795-8705-427d-8af4-0486f8dca8a6_sub-batch-gorilla.csv
new file mode 100644
index 00000000..9645c997
--- /dev/null
+++ b/40c91795-8705-427d-8af4-0486f8dca8a6_sub-batch-gorilla.csv
@@ -0,0 +1,5 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"c9d53528-0343-448c-86bc-1c8079c41621"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"c9d53528-0343-448c-86bc-1c8079c41621"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"c9d53528-0343-448c-86bc-1c8079c41621"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"c9d53528-0343-448c-86bc-1c8079c41621"
diff --git a/42d9f96c-ddfa-4cc8-b8aa-a0f18d97fcee_sub-batch-gorilla.csv b/42d9f96c-ddfa-4cc8-b8aa-a0f18d97fcee_sub-batch-gorilla.csv
new file mode 100644
index 00000000..932aadfe
--- /dev/null
+++ b/42d9f96c-ddfa-4cc8-b8aa-a0f18d97fcee_sub-batch-gorilla.csv
@@ -0,0 +1,5 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"65cd3a07-2173-4ea9-8d72-ab54c5339e93"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"65cd3a07-2173-4ea9-8d72-ab54c5339e93"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"65cd3a07-2173-4ea9-8d72-ab54c5339e93"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"65cd3a07-2173-4ea9-8d72-ab54c5339e93"
diff --git a/44ec4e09-0da1-4c53-84a5-3f4976962811_bulk_payment.csv b/44ec4e09-0da1-4c53-84a5-3f4976962811_bulk_payment.csv
new file mode 100644
index 00000000..3fbc8913
--- /dev/null
+++ b/44ec4e09-0da1-4c53-84a5-3f4976962811_bulk_payment.csv
@@ -0,0 +1,7 @@
+id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
+0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
+1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
+2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment
+3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment
+4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment
+5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment
\ No newline at end of file
diff --git a/467c8a17-8e19-44fe-848f-5e1076b1ee74_sub-batch-2.csv b/467c8a17-8e19-44fe-848f-5e1076b1ee74_sub-batch-2.csv
new file mode 100644
index 00000000..87538cc8
--- /dev/null
+++ b/467c8a17-8e19-44fe-848f-5e1076b1ee74_sub-batch-2.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
+
+5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment,670cef11-ceb7-4bd2-bc4d-51fa47551dc4
diff --git a/48decda4-f5b6-4d8b-9844-cdbdc07bd30a_bulk_payment.csv b/48decda4-f5b6-4d8b-9844-cdbdc07bd30a_bulk_payment.csv
new file mode 100644
index 00000000..3fbc8913
--- /dev/null
+++ b/48decda4-f5b6-4d8b-9844-cdbdc07bd30a_bulk_payment.csv
@@ -0,0 +1,7 @@
+id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
+0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
+1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
+2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment
+3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment
+4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment
+5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment
\ No newline at end of file
diff --git a/49af284f-a5b6-430b-acc1-8e2d4803d2ff_ph-ee-bulk-demo-6.csv b/49af284f-a5b6-430b-acc1-8e2d4803d2ff_ph-ee-bulk-demo-6.csv
new file mode 100644
index 00000000..6f2a8069
--- /dev/null
+++ b/49af284f-a5b6-430b-acc1-8e2d4803d2ff_ph-ee-bulk-demo-6.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"f1e22fe3-9740-4fba-97b6-78f43bfa7f2f",slcb,,accountNumber,003001003879112168,accountNumber,003001003873110196,850,USD,"Test Payee Payment",,,,
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",slcb,,accountNumber,003001003879112168,accountNumber,003001003874120160,222,USD,"Test Payee Payment",,,,
diff --git a/4d8781bd-30f5-4bd1-9a5b-e7a398c02b2f_sub-batch-2.csv b/4d8781bd-30f5-4bd1-9a5b-e7a398c02b2f_sub-batch-2.csv
new file mode 100644
index 00000000..25405742
--- /dev/null
+++ b/4d8781bd-30f5-4bd1-9a5b-e7a398c02b2f_sub-batch-2.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
+
+5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment,637636c5-7c8c-4692-a3c4-b8cdfce4fac4
diff --git a/4e864887-5d85-4520-bcd8-daf9b2c9ad06_sub-batch-gorilla.csv b/4e864887-5d85-4520-bcd8-daf9b2c9ad06_sub-batch-gorilla.csv
new file mode 100644
index 00000000..624fdb38
--- /dev/null
+++ b/4e864887-5d85-4520-bcd8-daf9b2c9ad06_sub-batch-gorilla.csv
@@ -0,0 +1,5 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"bbb82eaf-28e5-47ea-a170-c53dd5fa8051"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"bbb82eaf-28e5-47ea-a170-c53dd5fa8051"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"bbb82eaf-28e5-47ea-a170-c53dd5fa8051"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"bbb82eaf-28e5-47ea-a170-c53dd5fa8051"
diff --git a/55d53127-6df4-4448-bbe5-6b4a2836d091_sub-batch-gorilla.csv b/55d53127-6df4-4448-bbe5-6b4a2836d091_sub-batch-gorilla.csv
new file mode 100644
index 00000000..78c7fcad
--- /dev/null
+++ b/55d53127-6df4-4448-bbe5-6b4a2836d091_sub-batch-gorilla.csv
@@ -0,0 +1,5 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"b57f643b-6dfb-47da-b34f-cac6455b845f"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"b57f643b-6dfb-47da-b34f-cac6455b845f"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"b57f643b-6dfb-47da-b34f-cac6455b845f"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"b57f643b-6dfb-47da-b34f-cac6455b845f"
diff --git a/5846bf25-7337-40ec-b306-ccc909ebb457_sub-batch-2.csv b/5846bf25-7337-40ec-b306-ccc909ebb457_sub-batch-2.csv
new file mode 100644
index 00000000..69792057
--- /dev/null
+++ b/5846bf25-7337-40ec-b306-ccc909ebb457_sub-batch-2.csv
@@ -0,0 +1,2 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,,,,,"3eee9c23-9318-4d25-a156-617ab0644c88"
diff --git a/58bbb029-f3c6-4aad-8b41-a8249d60a97b_sub-batch-rhino.csv b/58bbb029-f3c6-4aad-8b41-a8249d60a97b_sub-batch-rhino.csv
new file mode 100644
index 00000000..42a9204b
--- /dev/null
+++ b/58bbb029-f3c6-4aad-8b41-a8249d60a97b_sub-batch-rhino.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"2e18ae16-0653-4b00-8d40-b109561122f1"
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"2e18ae16-0653-4b00-8d40-b109561122f1"
diff --git a/5a79ac5f-c00e-4a62-bd61-2f24c592d072_sub-batch-2.csv b/5a79ac5f-c00e-4a62-bd61-2f24c592d072_sub-batch-2.csv
new file mode 100644
index 00000000..4157ecd8
--- /dev/null
+++ b/5a79ac5f-c00e-4a62-bd61-2f24c592d072_sub-batch-2.csv
@@ -0,0 +1,2 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,,,,,"78e6541f-e04b-4224-9a19-735f0b9f70c3"
diff --git a/5c755633-7b3e-4d2b-8a89-1d20fdb0243b_sub-batch-gorilla.csv b/5c755633-7b3e-4d2b-8a89-1d20fdb0243b_sub-batch-gorilla.csv
new file mode 100644
index 00000000..2efbf6d6
--- /dev/null
+++ b/5c755633-7b3e-4d2b-8a89-1d20fdb0243b_sub-batch-gorilla.csv
@@ -0,0 +1,5 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"c60a11fb-bdb5-4689-8d7f-fd9e84b3c489"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"c60a11fb-bdb5-4689-8d7f-fd9e84b3c489"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"c60a11fb-bdb5-4689-8d7f-fd9e84b3c489"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"c60a11fb-bdb5-4689-8d7f-fd9e84b3c489"
diff --git a/5d12672e-a4ee-42e0-b8f0-8f7c587d2ebd_sub-batch-rhino.csv b/5d12672e-a4ee-42e0-b8f0-8f7c587d2ebd_sub-batch-rhino.csv
new file mode 100644
index 00000000..c15b05c8
--- /dev/null
+++ b/5d12672e-a4ee-42e0-b8f0-8f7c587d2ebd_sub-batch-rhino.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"31d1a280-793b-4b3a-acfd-57ada9d50e61"
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"31d1a280-793b-4b3a-acfd-57ada9d50e61"
diff --git a/5d45eab9-009a-4f48-a0ce-a581d48ff530_sub-batch-1.csv b/5d45eab9-009a-4f48-a0ce-a581d48ff530_sub-batch-1.csv
new file mode 100644
index 00000000..22f7c0c3
--- /dev/null
+++ b/5d45eab9-009a-4f48-a0ce-a581d48ff530_sub-batch-1.csv
@@ -0,0 +1,6 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,,,,,"877c3254-af31-4c38-b903-52b76825010d"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,,,,,"877c3254-af31-4c38-b903-52b76825010d"
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,,,,,"877c3254-af31-4c38-b903-52b76825010d"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,,,,,"877c3254-af31-4c38-b903-52b76825010d"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,,,,,"877c3254-af31-4c38-b903-52b76825010d"
diff --git a/6071ba69-32ba-49d5-af56-1c68c93a6f63_sub-batch-gorilla.csv b/6071ba69-32ba-49d5-af56-1c68c93a6f63_sub-batch-gorilla.csv
new file mode 100644
index 00000000..f49de248
--- /dev/null
+++ b/6071ba69-32ba-49d5-af56-1c68c93a6f63_sub-batch-gorilla.csv
@@ -0,0 +1,5 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"36ecbbe7-8486-4d33-bf34-08c9a528180a"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"36ecbbe7-8486-4d33-bf34-08c9a528180a"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"36ecbbe7-8486-4d33-bf34-08c9a528180a"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"36ecbbe7-8486-4d33-bf34-08c9a528180a"
diff --git a/6a35c1d2-42fc-4f40-bfef-7476a5352d2a_27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv b/6a35c1d2-42fc-4f40-bfef-7476a5352d2a_27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv
new file mode 100644
index 00000000..640af4e4
--- /dev/null
+++ b/6a35c1d2-42fc-4f40-bfef-7476a5352d2a_27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"d0ae9951-4d7c-4b1f-a74b-e0e17d7ae495"
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"d0ae9951-4d7c-4b1f-a74b-e0e17d7ae495"
\ No newline at end of file
diff --git a/6e697f5e-3be1-49b2-829b-d9d132dc6615_sub-batch-rhino.csv b/6e697f5e-3be1-49b2-829b-d9d132dc6615_sub-batch-rhino.csv
new file mode 100644
index 00000000..ea228dbb
--- /dev/null
+++ b/6e697f5e-3be1-49b2-829b-d9d132dc6615_sub-batch-rhino.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"782d2b4c-0d72-4ad3-a5f6-80634c60c991"
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"782d2b4c-0d72-4ad3-a5f6-80634c60c991"
diff --git a/6f6fa931-1715-4a87-a527-7c6693d41e10_sub-batch-rhino.csv b/6f6fa931-1715-4a87-a527-7c6693d41e10_sub-batch-rhino.csv
new file mode 100644
index 00000000..1180e767
--- /dev/null
+++ b/6f6fa931-1715-4a87-a527-7c6693d41e10_sub-batch-rhino.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"b817ae94-3b72-4ac7-9364-7df4c3439888"
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"b817ae94-3b72-4ac7-9364-7df4c3439888"
diff --git a/6fdcf7c1-07bf-4318-8f52-bf4f22025e11_ec0c518c-bacd-4c82-bff1-46e1620d3da3_sub-batch-1.csv b/6fdcf7c1-07bf-4318-8f52-bf4f22025e11_ec0c518c-bacd-4c82-bff1-46e1620d3da3_sub-batch-1.csv
new file mode 100644
index 00000000..365c9d72
--- /dev/null
+++ b/6fdcf7c1-07bf-4318-8f52-bf4f22025e11_ec0c518c-bacd-4c82-bff1-46e1620d3da3_sub-batch-1.csv
@@ -0,0 +1,6 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",mojaloop,,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,,,,,"40e522ac-8253-4e20-94c6-4a56c1f45e3a"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",mojaloop,,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,,,,,"40e522ac-8253-4e20-94c6-4a56c1f45e3a"
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,,,,,"40e522ac-8253-4e20-94c6-4a56c1f45e3a"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",mojaloop,,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,,,,,"40e522ac-8253-4e20-94c6-4a56c1f45e3a"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",mojaloop,,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,,,,,"40e522ac-8253-4e20-94c6-4a56c1f45e3a"
diff --git a/6ff0cec1-eefa-4a00-9bd7-d665c9cd0ac6_sub-batch-gorilla.csv b/6ff0cec1-eefa-4a00-9bd7-d665c9cd0ac6_sub-batch-gorilla.csv
new file mode 100644
index 00000000..24c56d89
--- /dev/null
+++ b/6ff0cec1-eefa-4a00-9bd7-d665c9cd0ac6_sub-batch-gorilla.csv
@@ -0,0 +1,5 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"bc43e090-ee60-4056-b85e-e99bc8f750fe"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"bc43e090-ee60-4056-b85e-e99bc8f750fe"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"bc43e090-ee60-4056-b85e-e99bc8f750fe"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"bc43e090-ee60-4056-b85e-e99bc8f750fe"
diff --git a/70f00aa9-2204-4e15-9a3c-a2d3449811e5_27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv b/70f00aa9-2204-4e15-9a3c-a2d3449811e5_27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv
new file mode 100644
index 00000000..640af4e4
--- /dev/null
+++ b/70f00aa9-2204-4e15-9a3c-a2d3449811e5_27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"d0ae9951-4d7c-4b1f-a74b-e0e17d7ae495"
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"d0ae9951-4d7c-4b1f-a74b-e0e17d7ae495"
\ No newline at end of file
diff --git a/71b3d07a-1617-4e94-9686-1674d39cc1c0_sub-batch-gorilla.csv b/71b3d07a-1617-4e94-9686-1674d39cc1c0_sub-batch-gorilla.csv
new file mode 100644
index 00000000..f79d76ed
--- /dev/null
+++ b/71b3d07a-1617-4e94-9686-1674d39cc1c0_sub-batch-gorilla.csv
@@ -0,0 +1,5 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"727135b2-75d3-4f81-8acb-69ecf7d8c283"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"727135b2-75d3-4f81-8acb-69ecf7d8c283"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"727135b2-75d3-4f81-8acb-69ecf7d8c283"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"727135b2-75d3-4f81-8acb-69ecf7d8c283"
diff --git a/79cc1e71-6cf1-4a45-95ae-6e4e049adc38_bulk_payment.csv b/79cc1e71-6cf1-4a45-95ae-6e4e049adc38_bulk_payment.csv
new file mode 100644
index 00000000..3fbc8913
--- /dev/null
+++ b/79cc1e71-6cf1-4a45-95ae-6e4e049adc38_bulk_payment.csv
@@ -0,0 +1,7 @@
+id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
+0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
+1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
+2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment
+3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment
+4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment
+5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment
\ No newline at end of file
diff --git a/7b700e1b-3b73-47ed-b872-e90b3ad1f4e8_sub-batch-1.csv b/7b700e1b-3b73-47ed-b872-e90b3ad1f4e8_sub-batch-1.csv
new file mode 100644
index 00000000..3ec717ce
--- /dev/null
+++ b/7b700e1b-3b73-47ed-b872-e90b3ad1f4e8_sub-batch-1.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
+
+0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment,38e1a856-1c47-4d1b-9365-a984e6170124
diff --git a/7f72cb32-68c9-44d4-b3d1-5c2fc13c1700_sub-batch-1.csv b/7f72cb32-68c9-44d4-b3d1-5c2fc13c1700_sub-batch-1.csv
new file mode 100644
index 00000000..ec1ca829
--- /dev/null
+++ b/7f72cb32-68c9-44d4-b3d1-5c2fc13c1700_sub-batch-1.csv
@@ -0,0 +1,6 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,"Test Payee Payment",,,,,"265b25a6-6870-4de7-ad1e-6fad0775cb19"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,"Test Payee Payment",,,,,"265b25a6-6870-4de7-ad1e-6fad0775cb19"
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,"Test Payee Payment",,,,,"265b25a6-6870-4de7-ad1e-6fad0775cb19"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,"Test Payee Payment",,,,,"265b25a6-6870-4de7-ad1e-6fad0775cb19"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,"Test Payee Payment",,,,,"265b25a6-6870-4de7-ad1e-6fad0775cb19"
diff --git a/8123b544-4c74-4264-b277-8d16ae3c4613_sub-batch-rhino.csv b/8123b544-4c74-4264-b277-8d16ae3c4613_sub-batch-rhino.csv
new file mode 100644
index 00000000..a656f5f7
--- /dev/null
+++ b/8123b544-4c74-4264-b277-8d16ae3c4613_sub-batch-rhino.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"6119191c-139e-436f-b624-fe3a921cafe8"
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"6119191c-139e-436f-b624-fe3a921cafe8"
diff --git a/842ee21f-f665-4124-929d-04fbf1e1a731_sub-batch-rhino.csv b/842ee21f-f665-4124-929d-04fbf1e1a731_sub-batch-rhino.csv
new file mode 100644
index 00000000..c6210215
--- /dev/null
+++ b/842ee21f-f665-4124-929d-04fbf1e1a731_sub-batch-rhino.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"7a119afc-ed74-4fcc-be11-04702c698d7c"
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"7a119afc-ed74-4fcc-be11-04702c698d7c"
diff --git a/85b7379c-979c-4d0a-ab9e-3e215fcedae1_sub-batch-rhino.csv b/85b7379c-979c-4d0a-ab9e-3e215fcedae1_sub-batch-rhino.csv
new file mode 100644
index 00000000..3d52682c
--- /dev/null
+++ b/85b7379c-979c-4d0a-ab9e-3e215fcedae1_sub-batch-rhino.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"f144a8a2-872c-4c89-aa10-3a406edcc3aa"
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"f144a8a2-872c-4c89-aa10-3a406edcc3aa"
diff --git a/86b5162a-78de-47df-b494-65c88d4c308b_d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv b/86b5162a-78de-47df-b494-65c88d4c308b_d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv
new file mode 100644
index 00000000..85c56e9c
--- /dev/null
+++ b/86b5162a-78de-47df-b494-65c88d4c308b_d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"bb080fe6-e814-4f06-a3f0-a2228d2ef701"
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"bb080fe6-e814-4f06-a3f0-a2228d2ef701"
\ No newline at end of file
diff --git a/8780cbd1-16f5-43c0-b1b4-3c53c664a7d5_bulk_payment.csv b/8780cbd1-16f5-43c0-b1b4-3c53c664a7d5_bulk_payment.csv
new file mode 100644
index 00000000..3fbc8913
--- /dev/null
+++ b/8780cbd1-16f5-43c0-b1b4-3c53c664a7d5_bulk_payment.csv
@@ -0,0 +1,7 @@
+id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
+0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
+1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
+2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment
+3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment
+4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment
+5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment
\ No newline at end of file
diff --git a/8ecd9222-27c6-488a-8396-7a4e0331490b_sub-batch-gorilla.csv b/8ecd9222-27c6-488a-8396-7a4e0331490b_sub-batch-gorilla.csv
new file mode 100644
index 00000000..54ef9564
--- /dev/null
+++ b/8ecd9222-27c6-488a-8396-7a4e0331490b_sub-batch-gorilla.csv
@@ -0,0 +1,5 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"74d2b2bd-9d02-41e3-97fa-83872ce2e509"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"74d2b2bd-9d02-41e3-97fa-83872ce2e509"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"74d2b2bd-9d02-41e3-97fa-83872ce2e509"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"74d2b2bd-9d02-41e3-97fa-83872ce2e509"
diff --git a/908d01e5-4bc5-4ebf-a0c1-b121a4e7f35b_bulk_payment.csv b/908d01e5-4bc5-4ebf-a0c1-b121a4e7f35b_bulk_payment.csv
new file mode 100644
index 00000000..3fbc8913
--- /dev/null
+++ b/908d01e5-4bc5-4ebf-a0c1-b121a4e7f35b_bulk_payment.csv
@@ -0,0 +1,7 @@
+id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
+0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
+1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
+2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment
+3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment
+4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment
+5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment
\ No newline at end of file
diff --git a/98f08d7f-dd82-48d4-8524-7801ea3543fa_sub-batch-gorilla.csv b/98f08d7f-dd82-48d4-8524-7801ea3543fa_sub-batch-gorilla.csv
new file mode 100644
index 00000000..34aa5585
--- /dev/null
+++ b/98f08d7f-dd82-48d4-8524-7801ea3543fa_sub-batch-gorilla.csv
@@ -0,0 +1,5 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"a58760a2-52c4-4f7a-89ab-cc9a3e329e5a"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"a58760a2-52c4-4f7a-89ab-cc9a3e329e5a"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"a58760a2-52c4-4f7a-89ab-cc9a3e329e5a"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"a58760a2-52c4-4f7a-89ab-cc9a3e329e5a"
diff --git a/9b8a3248-eb7d-4900-9539-2b0609c11b0c_sub-batch-1.csv b/9b8a3248-eb7d-4900-9539-2b0609c11b0c_sub-batch-1.csv
new file mode 100644
index 00000000..2ae24018
--- /dev/null
+++ b/9b8a3248-eb7d-4900-9539-2b0609c11b0c_sub-batch-1.csv
@@ -0,0 +1,7 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,"Test Payee Payment",,,,,d523808c-d94c-4511-b7f0-9db52e85c74d
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,"Test Payee Payment",,,,,d523808c-d94c-4511-b7f0-9db52e85c74d
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,"Test Payee Payment",,,,,d523808c-d94c-4511-b7f0-9db52e85c74d
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,"Test Payee Payment",,,,,d523808c-d94c-4511-b7f0-9db52e85c74d
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,"Test Payee Payment",,,,,d523808c-d94c-4511-b7f0-9db52e85c74d
diff --git a/9e515093-03c9-4733-a693-3cea5354f9d5_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv b/9e515093-03c9-4733-a693-3cea5354f9d5_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
new file mode 100644
index 00000000..d5805da4
--- /dev/null
+++ b/9e515093-03c9-4733-a693-3cea5354f9d5_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
@@ -0,0 +1,5 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",mojaloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",mojaloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",mojaloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",mojaloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
\ No newline at end of file
diff --git a/a3c7555b-6a37-494c-b825-9b0d9bcc2f9b_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv b/a3c7555b-6a37-494c-b825-9b0d9bcc2f9b_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
new file mode 100644
index 00000000..d5805da4
--- /dev/null
+++ b/a3c7555b-6a37-494c-b825-9b0d9bcc2f9b_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
@@ -0,0 +1,5 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",mojaloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",mojaloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",mojaloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",mojaloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
\ No newline at end of file
diff --git a/a72f1ad3-bb12-4098-92b6-55a89c20bbba_sub-batch-1.csv b/a72f1ad3-bb12-4098-92b6-55a89c20bbba_sub-batch-1.csv
new file mode 100644
index 00000000..b810552d
--- /dev/null
+++ b/a72f1ad3-bb12-4098-92b6-55a89c20bbba_sub-batch-1.csv
@@ -0,0 +1 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
diff --git a/a78fffca-366a-4286-89dc-4a7163c3d366_sub-batch-rhino.csv b/a78fffca-366a-4286-89dc-4a7163c3d366_sub-batch-rhino.csv
new file mode 100644
index 00000000..3eade6d7
--- /dev/null
+++ b/a78fffca-366a-4286-89dc-4a7163c3d366_sub-batch-rhino.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"8fac54e9-e785-4d8d-93f2-58791e98b808"
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"8fac54e9-e785-4d8d-93f2-58791e98b808"
diff --git a/aa703090-a6f0-4bd7-aa9b-47773a79f487_bulk_payment.csv b/aa703090-a6f0-4bd7-aa9b-47773a79f487_bulk_payment.csv
new file mode 100644
index 00000000..3fbc8913
--- /dev/null
+++ b/aa703090-a6f0-4bd7-aa9b-47773a79f487_bulk_payment.csv
@@ -0,0 +1,7 @@
+id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
+0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
+1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
+2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment
+3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment
+4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment
+5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment
\ No newline at end of file
diff --git a/aa7a8412-f681-4adf-aa18-2ff72f47f102_5846bf25-7337-40ec-b306-ccc909ebb457_sub-batch-2.csv b/aa7a8412-f681-4adf-aa18-2ff72f47f102_5846bf25-7337-40ec-b306-ccc909ebb457_sub-batch-2.csv
new file mode 100644
index 00000000..b6c92c1b
--- /dev/null
+++ b/aa7a8412-f681-4adf-aa18-2ff72f47f102_5846bf25-7337-40ec-b306-ccc909ebb457_sub-batch-2.csv
@@ -0,0 +1,2 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,,,,,"3eee9c23-9318-4d25-a156-617ab0644c88"
diff --git a/ab90a350-d417-40d6-9d66-c7b98f829d91_sub-batch-gorilla.csv b/ab90a350-d417-40d6-9d66-c7b98f829d91_sub-batch-gorilla.csv
new file mode 100644
index 00000000..85a4f95a
--- /dev/null
+++ b/ab90a350-d417-40d6-9d66-c7b98f829d91_sub-batch-gorilla.csv
@@ -0,0 +1,5 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"a251ee4b-85e3-4568-9ec6-eb59d233cfe1"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"a251ee4b-85e3-4568-9ec6-eb59d233cfe1"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"a251ee4b-85e3-4568-9ec6-eb59d233cfe1"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"a251ee4b-85e3-4568-9ec6-eb59d233cfe1"
diff --git a/ac1f2aca-8e4c-4edd-8e2c-fd3417a33930_sub-batch-rhino.csv b/ac1f2aca-8e4c-4edd-8e2c-fd3417a33930_sub-batch-rhino.csv
new file mode 100644
index 00000000..f35f8311
--- /dev/null
+++ b/ac1f2aca-8e4c-4edd-8e2c-fd3417a33930_sub-batch-rhino.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"ab11a182-125b-4e6b-ba16-4006058c2fe0"
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"ab11a182-125b-4e6b-ba16-4006058c2fe0"
diff --git a/ac2ce741-da3f-4f47-8ac0-1125bcb78d5f_sub-batch-gorilla.csv b/ac2ce741-da3f-4f47-8ac0-1125bcb78d5f_sub-batch-gorilla.csv
new file mode 100644
index 00000000..d8f9bf70
--- /dev/null
+++ b/ac2ce741-da3f-4f47-8ac0-1125bcb78d5f_sub-batch-gorilla.csv
@@ -0,0 +1,5 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"5d78f2da-0a1a-4bf4-b8e0-6a6daea81412"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"5d78f2da-0a1a-4bf4-b8e0-6a6daea81412"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"5d78f2da-0a1a-4bf4-b8e0-6a6daea81412"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"5d78f2da-0a1a-4bf4-b8e0-6a6daea81412"
diff --git a/ac82f801-c644-4236-b784-0e43c3805527_sub-batch-rhino.csv b/ac82f801-c644-4236-b784-0e43c3805527_sub-batch-rhino.csv
new file mode 100644
index 00000000..0a7e2a87
--- /dev/null
+++ b/ac82f801-c644-4236-b784-0e43c3805527_sub-batch-rhino.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"82ac5c05-289d-4872-a0f5-c91796efa7e4"
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"82ac5c05-289d-4872-a0f5-c91796efa7e4"
diff --git a/ae4266e2-d65d-4b06-9a05-5c51a542efcb_bulk_payment.csv b/ae4266e2-d65d-4b06-9a05-5c51a542efcb_bulk_payment.csv
new file mode 100644
index 00000000..3fbc8913
--- /dev/null
+++ b/ae4266e2-d65d-4b06-9a05-5c51a542efcb_bulk_payment.csv
@@ -0,0 +1,7 @@
+id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
+0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
+1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
+2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment
+3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment
+4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment
+5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment
\ No newline at end of file
diff --git a/b00e2cc4-7bee-45c2-a2f7-2e3127ca3031_5d45eab9-009a-4f48-a0ce-a581d48ff530_sub-batch-1.csv b/b00e2cc4-7bee-45c2-a2f7-2e3127ca3031_5d45eab9-009a-4f48-a0ce-a581d48ff530_sub-batch-1.csv
new file mode 100644
index 00000000..36613936
--- /dev/null
+++ b/b00e2cc4-7bee-45c2-a2f7-2e3127ca3031_5d45eab9-009a-4f48-a0ce-a581d48ff530_sub-batch-1.csv
@@ -0,0 +1,6 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",mojaloop,,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,,,,,"877c3254-af31-4c38-b903-52b76825010d"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",mojaloop,,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,,,,,"877c3254-af31-4c38-b903-52b76825010d"
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,,,,,"877c3254-af31-4c38-b903-52b76825010d"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",mojaloop,,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,,,,,"877c3254-af31-4c38-b903-52b76825010d"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",mojaloop,,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,,,,,"877c3254-af31-4c38-b903-52b76825010d"
diff --git a/b4dacda7-f064-438f-8a4b-4854674482be_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv b/b4dacda7-f064-438f-8a4b-4854674482be_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
new file mode 100644
index 00000000..d5805da4
--- /dev/null
+++ b/b4dacda7-f064-438f-8a4b-4854674482be_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
@@ -0,0 +1,5 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",mojaloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",mojaloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",mojaloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",mojaloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
\ No newline at end of file
diff --git a/b679e220-6763-4bec-8870-6d2f2d05afa9_bulk_payment.csv b/b679e220-6763-4bec-8870-6d2f2d05afa9_bulk_payment.csv
new file mode 100644
index 00000000..3fbc8913
--- /dev/null
+++ b/b679e220-6763-4bec-8870-6d2f2d05afa9_bulk_payment.csv
@@ -0,0 +1,7 @@
+id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
+0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
+1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
+2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment
+3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment
+4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment
+5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment
\ No newline at end of file
diff --git a/bc46c116-2dc0-4a0a-b64d-cdaa79d4993e_bulk_payment.csv b/bc46c116-2dc0-4a0a-b64d-cdaa79d4993e_bulk_payment.csv
new file mode 100644
index 00000000..3fbc8913
--- /dev/null
+++ b/bc46c116-2dc0-4a0a-b64d-cdaa79d4993e_bulk_payment.csv
@@ -0,0 +1,7 @@
+id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
+0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
+1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
+2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment
+3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment
+4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment
+5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment
\ No newline at end of file
diff --git a/be46e107-6ab9-45e2-90dd-3c8d14e00a95_sub-batch-rhino.csv b/be46e107-6ab9-45e2-90dd-3c8d14e00a95_sub-batch-rhino.csv
new file mode 100644
index 00000000..25b6d0cb
--- /dev/null
+++ b/be46e107-6ab9-45e2-90dd-3c8d14e00a95_sub-batch-rhino.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"34e1a8ad-bae2-4e57-a2b3-11c17cc87123"
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"34e1a8ad-bae2-4e57-a2b3-11c17cc87123"
diff --git a/bea14bd3-8a40-4829-9f51-2590ddf651a3_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv b/bea14bd3-8a40-4829-9f51-2590ddf651a3_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
new file mode 100644
index 00000000..d5805da4
--- /dev/null
+++ b/bea14bd3-8a40-4829-9f51-2590ddf651a3_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
@@ -0,0 +1,5 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",mojaloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",mojaloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",mojaloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",mojaloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
\ No newline at end of file
diff --git a/c7697bf9-c533-41ea-8345-7c45da9811ed_sub-batch-rhino.csv b/c7697bf9-c533-41ea-8345-7c45da9811ed_sub-batch-rhino.csv
new file mode 100644
index 00000000..932e9f7f
--- /dev/null
+++ b/c7697bf9-c533-41ea-8345-7c45da9811ed_sub-batch-rhino.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"d8e03c0a-2c8c-46e3-8035-9cbe58b82887"
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"d8e03c0a-2c8c-46e3-8035-9cbe58b82887"
diff --git a/d040581e-2a16-4f3b-962d-5970c58a7dfe_sub-batch-gorilla.csv b/d040581e-2a16-4f3b-962d-5970c58a7dfe_sub-batch-gorilla.csv
new file mode 100644
index 00000000..e8c644a6
--- /dev/null
+++ b/d040581e-2a16-4f3b-962d-5970c58a7dfe_sub-batch-gorilla.csv
@@ -0,0 +1,5 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"b910bcfa-6140-443c-a39c-3f2639f7e331"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"b910bcfa-6140-443c-a39c-3f2639f7e331"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"b910bcfa-6140-443c-a39c-3f2639f7e331"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"b910bcfa-6140-443c-a39c-3f2639f7e331"
diff --git a/d0d8b91a-a020-4f3c-9ab0-476876e81759_27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv b/d0d8b91a-a020-4f3c-9ab0-476876e81759_27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv
new file mode 100644
index 00000000..640af4e4
--- /dev/null
+++ b/d0d8b91a-a020-4f3c-9ab0-476876e81759_27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"d0ae9951-4d7c-4b1f-a74b-e0e17d7ae495"
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"d0ae9951-4d7c-4b1f-a74b-e0e17d7ae495"
\ No newline at end of file
diff --git a/d671627e-529d-4e74-ab12-e024d45bb8ab_sub-batch-gorilla.csv b/d671627e-529d-4e74-ab12-e024d45bb8ab_sub-batch-gorilla.csv
new file mode 100644
index 00000000..c55dff52
--- /dev/null
+++ b/d671627e-529d-4e74-ab12-e024d45bb8ab_sub-batch-gorilla.csv
@@ -0,0 +1,5 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"35b15509-9dfa-4344-adff-23e357b2483a"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"35b15509-9dfa-4344-adff-23e357b2483a"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"35b15509-9dfa-4344-adff-23e357b2483a"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"35b15509-9dfa-4344-adff-23e357b2483a"
diff --git a/d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv b/d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv
new file mode 100644
index 00000000..0278b132
--- /dev/null
+++ b/d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"bb080fe6-e814-4f06-a3f0-a2228d2ef701"
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"bb080fe6-e814-4f06-a3f0-a2228d2ef701"
diff --git a/debffb76-36b2-4ff6-8f9f-2b3c9b4411d2_sub-batch-rhino.csv b/debffb76-36b2-4ff6-8f9f-2b3c9b4411d2_sub-batch-rhino.csv
new file mode 100644
index 00000000..c55ae7d7
--- /dev/null
+++ b/debffb76-36b2-4ff6-8f9f-2b3c9b4411d2_sub-batch-rhino.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"dd209561-9664-46bb-ac2e-acf8a16f6b65"
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"dd209561-9664-46bb-ac2e-acf8a16f6b65"
diff --git a/e0a27f6b-b090-408d-bb17-eacf86146983_bulk_payment.csv b/e0a27f6b-b090-408d-bb17-eacf86146983_bulk_payment.csv
new file mode 100644
index 00000000..3fbc8913
--- /dev/null
+++ b/e0a27f6b-b090-408d-bb17-eacf86146983_bulk_payment.csv
@@ -0,0 +1,7 @@
+id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
+0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
+1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
+2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment
+3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment
+4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment
+5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment
\ No newline at end of file
diff --git a/e1eae6bf-1980-4a06-8e29-d2d474f0546a_sub-batch-2.csv b/e1eae6bf-1980-4a06-8e29-d2d474f0546a_sub-batch-2.csv
new file mode 100644
index 00000000..b30eaf7c
--- /dev/null
+++ b/e1eae6bf-1980-4a06-8e29-d2d474f0546a_sub-batch-2.csv
@@ -0,0 +1,2 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino
diff --git a/e6950eac-515a-4a32-8d7f-e60b318b7043_sub-batch-2.csv b/e6950eac-515a-4a32-8d7f-e60b318b7043_sub-batch-2.csv
new file mode 100644
index 00000000..ff7de2ab
--- /dev/null
+++ b/e6950eac-515a-4a32-8d7f-e60b318b7043_sub-batch-2.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,"Test Payee Payment",,,,,8c06d9e4-a2fb-4eb2-9bb5-0270e4f7f907
diff --git a/e7b1c485-d526-4982-ad2a-a684b95d5320_sub-batch-gorilla.csv b/e7b1c485-d526-4982-ad2a-a684b95d5320_sub-batch-gorilla.csv
new file mode 100644
index 00000000..04b6d8ae
--- /dev/null
+++ b/e7b1c485-d526-4982-ad2a-a684b95d5320_sub-batch-gorilla.csv
@@ -0,0 +1,5 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"5ccf13a7-904a-430d-9cf1-9180c859f760"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"5ccf13a7-904a-430d-9cf1-9180c859f760"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"5ccf13a7-904a-430d-9cf1-9180c859f760"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"5ccf13a7-904a-430d-9cf1-9180c859f760"
diff --git a/e9f37cc8-9177-4213-95e2-ffefdf41a56a_d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv b/e9f37cc8-9177-4213-95e2-ffefdf41a56a_d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv
new file mode 100644
index 00000000..85c56e9c
--- /dev/null
+++ b/e9f37cc8-9177-4213-95e2-ffefdf41a56a_d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"bb080fe6-e814-4f06-a3f0-a2228d2ef701"
+5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"bb080fe6-e814-4f06-a3f0-a2228d2ef701"
\ No newline at end of file
diff --git a/ec0c518c-bacd-4c82-bff1-46e1620d3da3_sub-batch-1.csv b/ec0c518c-bacd-4c82-bff1-46e1620d3da3_sub-batch-1.csv
new file mode 100644
index 00000000..e6114863
--- /dev/null
+++ b/ec0c518c-bacd-4c82-bff1-46e1620d3da3_sub-batch-1.csv
@@ -0,0 +1,6 @@
+id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
+0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,,,,,"40e522ac-8253-4e20-94c6-4a56c1f45e3a"
+1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,,,,,"40e522ac-8253-4e20-94c6-4a56c1f45e3a"
+2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,,,,,"40e522ac-8253-4e20-94c6-4a56c1f45e3a"
+3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,,,,,"40e522ac-8253-4e20-94c6-4a56c1f45e3a"
+4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,,,,,"40e522ac-8253-4e20-94c6-4a56c1f45e3a"
diff --git a/eed36f80-df49-44c0-bbf6-5d60d7d843b1_sub-batch-2.csv b/eed36f80-df49-44c0-bbf6-5d60d7d843b1_sub-batch-2.csv
new file mode 100644
index 00000000..b297df6c
--- /dev/null
+++ b/eed36f80-df49-44c0-bbf6-5d60d7d843b1_sub-batch-2.csv
@@ -0,0 +1,3 @@
+id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
+
+5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment,9c41ab69-24b7-45ea-b886-b28c2b929045
diff --git a/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java b/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java
index c1d4cfb2..1d23b6da 100644
--- a/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java
+++ b/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java
@@ -19,10 +19,8 @@
 import com.fasterxml.jackson.databind.SequenceWriter;
 import com.fasterxml.jackson.dataformat.csv.CsvMapper;
 import com.fasterxml.jackson.dataformat.csv.CsvSchema;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
+
+import java.io.*;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -34,6 +32,8 @@
 import org.apache.camel.LoggingLevel;
 import org.mifos.processor.bulk.schema.SubBatchEntity;
 import org.mifos.processor.bulk.schema.Transaction;
+import org.mifos.processor.bulk.utility.TransactionUtil;
+import org.mifos.processor.bulk.utility.Utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -69,6 +69,7 @@ public void configure() throws Exception {
             List<String> subBatchFile = new ArrayList<>();
             Set<String> distinctPayeeIds = transactionList.stream().map(Transaction::getPayeeDfspId).collect(Collectors.toSet());
             logger.info("Payee id {}", distinctPayeeIds);
+            logger.info("Number of payeeId {}", distinctPayeeIds.size());
             Boolean batchAccountLookup = (Boolean) exchange.getProperty("batchAccountLookup");
             if (partyLookupEnabled && batchAccountLookup) {
                 // Create a map to store transactions for each payeeid
@@ -88,7 +89,7 @@ public void configure() throws Exception {
                     subBatchIdPayeeMap.put(payeeId, subBatchId);
                     subBatchIdMap.put(subBatchId, transactionsForPayee);
                 }
-
+                logger.info("Number of SubBatch based on payeeId {}", subBatchIdList.size());
                 // mapping subBatchId in transactionList
                 for (String subBatchId : subBatchIdList) {
                     List<Transaction> transactions = subBatchIdMap.get(subBatchId);
@@ -133,16 +134,30 @@ public void configure() throws Exception {
                 }
 
                 int subBatchCount = 1;
+                CsvSchema csvSchema = csvMapper.schemaFor(Transaction.class);
+                csvSchema = csvSchema.withHeader();
                 for (int i = 0; i < lines.size(); i += subBatchSize) {
+                    String subBatchId = UUID.randomUUID().toString();
                     String filename = UUID.randomUUID() + "_" + "sub-batch-" + subBatchCount + ".csv";
-                    FileWriter writer = new FileWriter(filename);
-                    writer.write(header);
+                    logger.info("SubBatch Id {}", subBatchId);
+
+                    List<Transaction> subBatchTransactions = new ArrayList<>();
                     for (int j = i; j < Math.min(i + subBatchSize, lines.size()); j++) {
-                        writer.write(lines.get(j) + System.lineSeparator());
+                        Transaction transaction = TransactionUtil.parseLineToTransaction(lines.get(j));
+                        assert transaction != null;
+                        transaction.setBatchId(subBatchId); // Set the subBatchId for the transaction
+                        subBatchTransactions.add(transaction);
+                    }
+
+                    // Write the list of Transactions to the file
+                    File file = new File(filename);
+                    try (SequenceWriter writer = csvMapper.writer(csvSchema).writeValues(file)) {
+                        writer.writeAll(subBatchTransactions);
+                    } catch (IOException e) {
+                        logger.error("Failed to write sub-batch file: " + filename, e);
                     }
-                    writer.close();
                     logger.info("Created sub-batch with file name {}", filename);
-                    subBatchFile.add(filename);
+                    subBatchFile.add(filename); // Ensure this list is declared and accessible
                     subBatchCount++;
                 }
             }
diff --git a/src/main/java/org/mifos/processor/bulk/kafka/Consumers.java b/src/main/java/org/mifos/processor/bulk/kafka/Consumers.java
index 03769b77..b45588c6 100644
--- a/src/main/java/org/mifos/processor/bulk/kafka/Consumers.java
+++ b/src/main/java/org/mifos/processor/bulk/kafka/Consumers.java
@@ -1,116 +1,116 @@
-package org.mifos.processor.bulk.kafka;
-
-import static org.mifos.connector.common.mojaloop.type.InitiatorType.CONSUMER;
-import static org.mifos.connector.common.mojaloop.type.Scenario.TRANSFER;
-import static org.mifos.connector.common.mojaloop.type.TransactionRole.PAYER;
-import static org.mifos.processor.bulk.zeebe.ZeebeVariables.BATCH_ID;
-import static org.mifos.processor.bulk.zeebe.ZeebeVariables.GSMA_CHANNEL_REQUEST;
-import static org.mifos.processor.bulk.zeebe.ZeebeVariables.INITIATOR_FSPID;
-import static org.mifos.processor.bulk.zeebe.ZeebeVariables.IS_RTP_REQUEST;
-import static org.mifos.processor.bulk.zeebe.ZeebeVariables.PARTY_ID;
-import static org.mifos.processor.bulk.zeebe.ZeebeVariables.PARTY_ID_TYPE;
-import static org.mifos.processor.bulk.zeebe.ZeebeVariables.PARTY_LOOKUP_FSPID;
-import static org.mifos.processor.bulk.zeebe.ZeebeVariables.TENANT_ID;
-import static org.mifos.processor.bulk.zeebe.ZeebeVariables.TRANSACTION_TYPE;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import java.util.HashMap;
-import java.util.Map;
-import lombok.extern.slf4j.Slf4j;
-import org.mifos.connector.common.channel.dto.TransactionChannelRequestDTO;
-import org.mifos.connector.common.gsma.dto.GSMATransaction;
-import org.mifos.connector.common.gsma.dto.GsmaParty;
-import org.mifos.connector.common.mojaloop.dto.MoneyData;
-import org.mifos.connector.common.mojaloop.dto.Party;
-import org.mifos.connector.common.mojaloop.dto.PartyIdInfo;
-import org.mifos.connector.common.mojaloop.dto.TransactionType;
-import org.mifos.connector.common.mojaloop.type.IdentifierType;
-import org.mifos.processor.bulk.schema.TransactionOlder;
-import org.mifos.processor.bulk.zeebe.ZeebeProcessStarter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.kafka.annotation.KafkaListener;
-import org.springframework.stereotype.Service;
-
-@Service
-@Slf4j
-public class Consumers {
-
-    @Value("${bpmn.flows.international-remittance-payer}")
-    private String internationalRemittancePayer;
-
-    @Autowired
-    private ObjectMapper objectMapper;
-
-    @Autowired
-    private ZeebeProcessStarter zeebeProcessStarter;
-
-    @KafkaListener(topics = "${kafka.topic.gsma.name}", groupId = "group_id")
-    public void listenTopicGsma(String message) throws JsonProcessingException {
-        log.debug("Received Message in topic GSMA and group group_id: {}", message);
-        TransactionOlder transaction = objectMapper.readValue(message, TransactionOlder.class);
-        String tenantId = "ibank-usa";
-
-        GSMATransaction gsmaChannelRequest = new GSMATransaction();
-        gsmaChannelRequest.setAmount(transaction.getAmount());
-        gsmaChannelRequest.setCurrency(transaction.getCurrency());
-        gsmaChannelRequest.setRequestingLei("ibank-usa");
-        gsmaChannelRequest.setReceivingLei("ibank-india");
-        GsmaParty creditParty = new GsmaParty();
-        creditParty.setKey("msisdn");
-        creditParty.setValue(transaction.getAccountNumber());
-        GsmaParty debitParty = new GsmaParty();
-        debitParty.setKey("msisdn");
-        debitParty.setValue(transaction.getAccountNumber());
-        gsmaChannelRequest.setCreditParty(new GsmaParty[] { creditParty });
-        gsmaChannelRequest.setDebitParty(new GsmaParty[] { debitParty });
-        // gsmaChannelRequest.setInternationalTransferInformation().setReceivingAmount(gsmaChannelRequest.getAmount());
-
-        TransactionChannelRequestDTO channelRequest = new TransactionChannelRequestDTO(); // Fineract Object
-        Party payee = new Party(new PartyIdInfo(IdentifierType.MSISDN, transaction.getAccountNumber()));
-        Party payer = new Party(new PartyIdInfo(IdentifierType.MSISDN, "7543010"));
-
-        MoneyData moneyData = new MoneyData();
-        moneyData.setAmount(transaction.getAmount());
-        moneyData.setCurrency(transaction.getCurrency());
-
-        channelRequest.setPayer(payer);
-        channelRequest.setPayee(payee);
-        channelRequest.setAmount(moneyData);
-
-        TransactionType transactionType = new TransactionType();
-        transactionType.setInitiator(PAYER);
-        transactionType.setInitiatorType(CONSUMER);
-        transactionType.setScenario(TRANSFER);
-
-        Map<String, Object> extraVariables = new HashMap<>();
-        extraVariables.put(IS_RTP_REQUEST, false);
-        extraVariables.put(TRANSACTION_TYPE, "inttransfer");
-        extraVariables.put(TENANT_ID, tenantId);
-
-        extraVariables.put(BATCH_ID, transaction.getBatchId());
-
-        String tenantSpecificBpmn = internationalRemittancePayer.replace("{dfspid}", tenantId);
-        channelRequest.setTransactionType(transactionType);
-
-        PartyIdInfo requestedParty = (boolean) extraVariables.get(IS_RTP_REQUEST) ? channelRequest.getPayer().getPartyIdInfo()
-                : channelRequest.getPayee().getPartyIdInfo();
-        extraVariables.put(PARTY_ID_TYPE, requestedParty.getPartyIdType());
-        extraVariables.put(PARTY_ID, requestedParty.getPartyIdentifier());
-
-        extraVariables.put(GSMA_CHANNEL_REQUEST, objectMapper.writeValueAsString(gsmaChannelRequest));
-        extraVariables.put(PARTY_LOOKUP_FSPID, gsmaChannelRequest.getReceivingLei());
-        extraVariables.put(INITIATOR_FSPID, gsmaChannelRequest.getRequestingLei());
-
-        String transactionId = zeebeProcessStarter.startZeebeWorkflow(tenantSpecificBpmn, objectMapper.writeValueAsString(channelRequest),
-                extraVariables);
-
-        log.debug("GSMA Transaction Started with:{} ", transactionId);
-    }
-
-    @KafkaListener(topics = "${kafka.topic.slcb.name}", groupId = "group_id")
-    public void listenTopicSlcb(String message) {
-        log.debug("Received Message in topic SLCB and group group_id:{} ", message);
-    }
-}
+//package org.mifos.processor.bulk.kafka;
+//
+//import static org.mifos.connector.common.mojaloop.type.InitiatorType.CONSUMER;
+//import static org.mifos.connector.common.mojaloop.type.Scenario.TRANSFER;
+//import static org.mifos.connector.common.mojaloop.type.TransactionRole.PAYER;
+//import static org.mifos.processor.bulk.zeebe.ZeebeVariables.BATCH_ID;
+//import static org.mifos.processor.bulk.zeebe.ZeebeVariables.GSMA_CHANNEL_REQUEST;
+//import static org.mifos.processor.bulk.zeebe.ZeebeVariables.INITIATOR_FSPID;
+//import static org.mifos.processor.bulk.zeebe.ZeebeVariables.IS_RTP_REQUEST;
+//import static org.mifos.processor.bulk.zeebe.ZeebeVariables.PARTY_ID;
+//import static org.mifos.processor.bulk.zeebe.ZeebeVariables.PARTY_ID_TYPE;
+//import static org.mifos.processor.bulk.zeebe.ZeebeVariables.PARTY_LOOKUP_FSPID;
+//import static org.mifos.processor.bulk.zeebe.ZeebeVariables.TENANT_ID;
+//import static org.mifos.processor.bulk.zeebe.ZeebeVariables.TRANSACTION_TYPE;
+//
+//import com.fasterxml.jackson.core.JsonProcessingException;
+//import com.fasterxml.jackson.databind.ObjectMapper;
+//import java.util.HashMap;
+//import java.util.Map;
+//import lombok.extern.slf4j.Slf4j;
+//import org.mifos.connector.common.channel.dto.TransactionChannelRequestDTO;
+//import org.mifos.connector.common.gsma.dto.GSMATransaction;
+//import org.mifos.connector.common.gsma.dto.GsmaParty;
+//import org.mifos.connector.common.mojaloop.dto.MoneyData;
+//import org.mifos.connector.common.mojaloop.dto.Party;
+//import org.mifos.connector.common.mojaloop.dto.PartyIdInfo;
+//import org.mifos.connector.common.mojaloop.dto.TransactionType;
+//import org.mifos.connector.common.mojaloop.type.IdentifierType;
+//import org.mifos.processor.bulk.schema.TransactionOlder;
+//import org.mifos.processor.bulk.zeebe.ZeebeProcessStarter;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.kafka.annotation.KafkaListener;
+//import org.springframework.stereotype.Service;
+//
+//@Service
+//@Slf4j
+//public class Consumers {
+//
+//    @Value("${bpmn.flows.international-remittance-payer}")
+//    private String internationalRemittancePayer;
+//
+//    @Autowired
+//    private ObjectMapper objectMapper;
+//
+//    @Autowired
+//    private ZeebeProcessStarter zeebeProcessStarter;
+//
+//    @KafkaListener(topics = "${kafka.topic.gsma.name}", groupId = "group_id")
+//    public void listenTopicGsma(String message) throws JsonProcessingException {
+//        log.debug("Received Message in topic GSMA and group group_id: {}", message);
+//        TransactionOlder transaction = objectMapper.readValue(message, TransactionOlder.class);
+//        String tenantId = "ibank-usa";
+//
+//        GSMATransaction gsmaChannelRequest = new GSMATransaction();
+//        gsmaChannelRequest.setAmount(transaction.getAmount());
+//        gsmaChannelRequest.setCurrency(transaction.getCurrency());
+//        gsmaChannelRequest.setRequestingLei("ibank-usa");
+//        gsmaChannelRequest.setReceivingLei("ibank-india");
+//        GsmaParty creditParty = new GsmaParty();
+//        creditParty.setKey("msisdn");
+//        creditParty.setValue(transaction.getAccountNumber());
+//        GsmaParty debitParty = new GsmaParty();
+//        debitParty.setKey("msisdn");
+//        debitParty.setValue(transaction.getAccountNumber());
+//        gsmaChannelRequest.setCreditParty(new GsmaParty[] { creditParty });
+//        gsmaChannelRequest.setDebitParty(new GsmaParty[] { debitParty });
+//        // gsmaChannelRequest.setInternationalTransferInformation().setReceivingAmount(gsmaChannelRequest.getAmount());
+//
+//        TransactionChannelRequestDTO channelRequest = new TransactionChannelRequestDTO(); // Fineract Object
+//        Party payee = new Party(new PartyIdInfo(IdentifierType.MSISDN, transaction.getAccountNumber()));
+//        Party payer = new Party(new PartyIdInfo(IdentifierType.MSISDN, "7543010"));
+//
+//        MoneyData moneyData = new MoneyData();
+//        moneyData.setAmount(transaction.getAmount());
+//        moneyData.setCurrency(transaction.getCurrency());
+//
+//        channelRequest.setPayer(payer);
+//        channelRequest.setPayee(payee);
+//        channelRequest.setAmount(moneyData);
+//
+//        TransactionType transactionType = new TransactionType();
+//        transactionType.setInitiator(PAYER);
+//        transactionType.setInitiatorType(CONSUMER);
+//        transactionType.setScenario(TRANSFER);
+//
+//        Map<String, Object> extraVariables = new HashMap<>();
+//        extraVariables.put(IS_RTP_REQUEST, false);
+//        extraVariables.put(TRANSACTION_TYPE, "inttransfer");
+//        extraVariables.put(TENANT_ID, tenantId);
+//
+//        extraVariables.put(BATCH_ID, transaction.getBatchId());
+//
+//        String tenantSpecificBpmn = internationalRemittancePayer.replace("{dfspid}", tenantId);
+//        channelRequest.setTransactionType(transactionType);
+//
+//        PartyIdInfo requestedParty = (boolean) extraVariables.get(IS_RTP_REQUEST) ? channelRequest.getPayer().getPartyIdInfo()
+//                : channelRequest.getPayee().getPartyIdInfo();
+//        extraVariables.put(PARTY_ID_TYPE, requestedParty.getPartyIdType());
+//        extraVariables.put(PARTY_ID, requestedParty.getPartyIdentifier());
+//
+//        extraVariables.put(GSMA_CHANNEL_REQUEST, objectMapper.writeValueAsString(gsmaChannelRequest));
+//        extraVariables.put(PARTY_LOOKUP_FSPID, gsmaChannelRequest.getReceivingLei());
+//        extraVariables.put(INITIATOR_FSPID, gsmaChannelRequest.getRequestingLei());
+//
+//        String transactionId = zeebeProcessStarter.startZeebeWorkflow(tenantSpecificBpmn, objectMapper.writeValueAsString(channelRequest),
+//                extraVariables);
+//
+//        log.debug("GSMA Transaction Started with:{} ", transactionId);
+//    }
+//
+//    @KafkaListener(topics = "${kafka.topic.slcb.name}", groupId = "group_id")
+//    public void listenTopicSlcb(String message) {
+//        log.debug("Received Message in topic SLCB and group group_id:{} ", message);
+//    }
+//}
diff --git a/src/main/java/org/mifos/processor/bulk/kafka/config/KafkaConsumerConfig.java b/src/main/java/org/mifos/processor/bulk/kafka/config/KafkaConsumerConfig.java
index e9694b89..bb04a764 100644
--- a/src/main/java/org/mifos/processor/bulk/kafka/config/KafkaConsumerConfig.java
+++ b/src/main/java/org/mifos/processor/bulk/kafka/config/KafkaConsumerConfig.java
@@ -1,39 +1,39 @@
-package org.mifos.processor.bulk.kafka.config;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.common.serialization.StringDeserializer;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.kafka.annotation.EnableKafka;
-import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory;
-import org.springframework.kafka.core.ConsumerFactory;
-import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
-
-@EnableKafka
-@Configuration
-public class KafkaConsumerConfig {
-
-    @Value(value = "${kafka.bootstrapAddress}")
-    private String bootstrapAddress;
-
-    @Bean
-    public ConsumerFactory<String, String> consumerFactory() {
-        Map<String, Object> props = new HashMap<>();
-        props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress);
-        props.put(ConsumerConfig.GROUP_ID_CONFIG, "group_id");
-        props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
-        props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
-        return new DefaultKafkaConsumerFactory<>(props);
-    }
-
-    @Bean
-    public ConcurrentKafkaListenerContainerFactory<String, String> kafkaListenerContainerFactory() {
-        ConcurrentKafkaListenerContainerFactory<String, String> factory = new ConcurrentKafkaListenerContainerFactory<>();
-        factory.setConsumerFactory(consumerFactory());
-        return factory;
-    }
-
-}
+//package org.mifos.processor.bulk.kafka.config;
+//
+//import java.util.HashMap;
+//import java.util.Map;
+//import org.apache.kafka.clients.consumer.ConsumerConfig;
+//import org.apache.kafka.common.serialization.StringDeserializer;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.kafka.annotation.EnableKafka;
+//import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory;
+//import org.springframework.kafka.core.ConsumerFactory;
+//import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
+//
+//@EnableKafka
+//@Configuration
+//public class KafkaConsumerConfig {
+//
+//    @Value(value = "${kafka.bootstrapAddress}")
+//    private String bootstrapAddress;
+//
+//    @Bean
+//    public ConsumerFactory<String, String> consumerFactory() {
+//        Map<String, Object> props = new HashMap<>();
+//        props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress);
+//        props.put(ConsumerConfig.GROUP_ID_CONFIG, "group_id");
+//        props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
+//        props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
+//        return new DefaultKafkaConsumerFactory<>(props);
+//    }
+//
+//    @Bean
+//    public ConcurrentKafkaListenerContainerFactory<String, String> kafkaListenerContainerFactory() {
+//        ConcurrentKafkaListenerContainerFactory<String, String> factory = new ConcurrentKafkaListenerContainerFactory<>();
+//        factory.setConsumerFactory(consumerFactory());
+//        return factory;
+//    }
+//
+//}
diff --git a/src/main/java/org/mifos/processor/bulk/kafka/config/KafkaProducerConfig.java b/src/main/java/org/mifos/processor/bulk/kafka/config/KafkaProducerConfig.java
index 11b9aa2a..5caa219d 100644
--- a/src/main/java/org/mifos/processor/bulk/kafka/config/KafkaProducerConfig.java
+++ b/src/main/java/org/mifos/processor/bulk/kafka/config/KafkaProducerConfig.java
@@ -1,34 +1,34 @@
-package org.mifos.processor.bulk.kafka.config;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.kafka.clients.producer.ProducerConfig;
-import org.apache.kafka.common.serialization.StringSerializer;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.kafka.core.DefaultKafkaProducerFactory;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.core.ProducerFactory;
-
-@Configuration
-public class KafkaProducerConfig {
-
-    @Value(value = "${kafka.bootstrapAddress}")
-    private String bootstrapAddress;
-
-    @Bean
-    public ProducerFactory<String, String> producerFactory() {
-        Map<String, Object> configProps = new HashMap<>();
-        configProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress);
-        configProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
-        configProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
-        return new DefaultKafkaProducerFactory<>(configProps);
-    }
-
-    @Bean
-    public KafkaTemplate<String, String> kafkaTemplate() {
-        return new KafkaTemplate<>(producerFactory());
-    }
-
-}
+//package org.mifos.processor.bulk.kafka.config;
+//
+//import java.util.HashMap;
+//import java.util.Map;
+//import org.apache.kafka.clients.producer.ProducerConfig;
+//import org.apache.kafka.common.serialization.StringSerializer;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.kafka.core.DefaultKafkaProducerFactory;
+//import org.springframework.kafka.core.KafkaTemplate;
+//import org.springframework.kafka.core.ProducerFactory;
+//
+//@Configuration
+//public class KafkaProducerConfig {
+//
+//    @Value(value = "${kafka.bootstrapAddress}")
+//    private String bootstrapAddress;
+//
+//    @Bean
+//    public ProducerFactory<String, String> producerFactory() {
+//        Map<String, Object> configProps = new HashMap<>();
+//        configProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress);
+//        configProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
+//        configProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
+//        return new DefaultKafkaProducerFactory<>(configProps);
+//    }
+//
+//    @Bean
+//    public KafkaTemplate<String, String> kafkaTemplate() {
+//        return new KafkaTemplate<>(producerFactory());
+//    }
+//
+//}
diff --git a/src/main/java/org/mifos/processor/bulk/kafka/config/KafkaTopicConfig.java b/src/main/java/org/mifos/processor/bulk/kafka/config/KafkaTopicConfig.java
index 7d2f2ff7..f7dd2735 100644
--- a/src/main/java/org/mifos/processor/bulk/kafka/config/KafkaTopicConfig.java
+++ b/src/main/java/org/mifos/processor/bulk/kafka/config/KafkaTopicConfig.java
@@ -1,40 +1,40 @@
-package org.mifos.processor.bulk.kafka.config;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.kafka.clients.admin.AdminClientConfig;
-import org.apache.kafka.clients.admin.NewTopic;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.kafka.core.KafkaAdmin;
-
-@Configuration
-public class KafkaTopicConfig {
-
-    @Value(value = "${kafka.bootstrapAddress}")
-    private String bootstrapAddress;
-
-    @Value(value = "${kafka.topic.gsma.name}")
-    private String gsmaTopicName;
-
-    @Value(value = "${kafka.topic.slcb.name}")
-    private String slcbTopicName;
-
-    @Bean
-    public KafkaAdmin kafkaAdmin() {
-        Map<String, Object> configs = new HashMap<>();
-        configs.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress);
-        return new KafkaAdmin(configs);
-    }
-
-    @Bean
-    public NewTopic gsmaTopic() {
-        return new NewTopic(gsmaTopicName, 1, (short) 1);
-    }
-
-    @Bean
-    public NewTopic slcbTopic() {
-        return new NewTopic(slcbTopicName, 1, (short) 1);
-    }
-}
+//package org.mifos.processor.bulk.kafka.config;
+//
+//import java.util.HashMap;
+//import java.util.Map;
+//import org.apache.kafka.clients.admin.AdminClientConfig;
+//import org.apache.kafka.clients.admin.NewTopic;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.kafka.core.KafkaAdmin;
+//
+//@Configuration
+//public class KafkaTopicConfig {
+//
+//    @Value(value = "${kafka.bootstrapAddress}")
+//    private String bootstrapAddress;
+//
+//    @Value(value = "${kafka.topic.gsma.name}")
+//    private String gsmaTopicName;
+//
+//    @Value(value = "${kafka.topic.slcb.name}")
+//    private String slcbTopicName;
+//
+//    @Bean
+//    public KafkaAdmin kafkaAdmin() {
+//        Map<String, Object> configs = new HashMap<>();
+//        configs.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress);
+//        return new KafkaAdmin(configs);
+//    }
+//
+//    @Bean
+//    public NewTopic gsmaTopic() {
+//        return new NewTopic(gsmaTopicName, 1, (short) 1);
+//    }
+//
+//    @Bean
+//    public NewTopic slcbTopic() {
+//        return new NewTopic(slcbTopicName, 1, (short) 1);
+//    }
+//}
diff --git a/src/main/java/org/mifos/processor/bulk/utility/TransactionUtil.java b/src/main/java/org/mifos/processor/bulk/utility/TransactionUtil.java
new file mode 100644
index 00000000..b76ff3fb
--- /dev/null
+++ b/src/main/java/org/mifos/processor/bulk/utility/TransactionUtil.java
@@ -0,0 +1,36 @@
+package org.mifos.processor.bulk.utility;
+
+import org.mifos.processor.bulk.schema.Transaction;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TransactionUtil {
+
+    private static final Logger logger = LoggerFactory.getLogger(TransactionUtil.class);
+
+    public static Transaction parseLineToTransaction(String line) {
+        try {
+            String[] parts = line.split(",", -1);
+            Transaction transaction = new Transaction();
+
+            if (parts.length > 0 && !parts[0].isEmpty()) transaction.setId(Integer.parseInt(parts[0]));
+            if (parts.length > 1) transaction.setRequestId(parts[1]);
+            if (parts.length > 2) transaction.setPaymentMode(parts[2]);
+            if (parts.length > 4) transaction.setPayerIdentifierType(parts[3]);
+            if (parts.length > 5) transaction.setPayerIdentifier(parts[4]);
+            if (parts.length > 6) transaction.setPayeeIdentifierType(parts[5]);
+            if (parts.length > 7) transaction.setPayeeIdentifier(parts[6]);
+            if (parts.length > 8) transaction.setAmount(parts[7]);
+            if (parts.length > 9) transaction.setCurrency(parts[8]);
+            if (parts.length > 10) transaction.setNote(parts[9]);
+            if (parts.length > 11) transaction.setProgramShortCode(parts[10]);
+            if (parts.length > 12) transaction.setCycle(parts[11]);
+            if (parts.length > 13) transaction.setPayeeDfspId(parts[12]);
+
+            return transaction;
+        } catch (Exception e) {
+            logger.error("Error parsing line to Transaction object: {}", line, e);
+            return null;
+        }
+    }
+}
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index 6fb575db..e69b2e47 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -92,15 +92,15 @@ config:
   partylookup:
     enable: true
   authorization:
-    enabled: true
+    enabled: false
   approval:
     enable: true
   ordering:
-    enable: true
+    enable: false
     field: "payerIdentifier"
   splitting:
     enable: true
-    sub-batch-size: 20
+    sub-batch-size: 5
   formatting:
     enable: false
     standard: "DEFAULT"
@@ -159,7 +159,7 @@ bulk_processor:
   hostname : "https://ph-ee-connector-bulk:8443"
 
 csv:
-  columnNames: "id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,account_number,program_shortcode,cycle,payee_dfsp_id"
+  columnNames: "id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,account_number,program_shortcode,cycle,payee_dfsp_id,batch_id"
   size : 100000 # in bytes
 
 budget-account:

From 8c9f5afc7407e6c62b7bf9f7038a7c36caee02df Mon Sep 17 00:00:00 2001
From: abhinav <abhinav@Abhinavs-MacBook-Pro.local>
Date: Mon, 5 Feb 2024 00:23:41 +0530
Subject: [PATCH 12/16] deleted csv fies

---
 01f5d1c2-ed0e-47b3-a986-52a07760e277_sub-batch-rhino.csv   | 3 ---
 04622991-aabc-430c-bf72-cd707bca4d12_sub-batch-2.csv       | 3 ---
 04c96688-fa6a-4964-9446-ce198e2cde58_sub-batch-rhino.csv   | 3 ---
 0f248ce7-9ce3-4fd1-ab01-f9ebf09a6a71_sub-batch-gorilla.csv | 5 -----
 0f40c6d5-4b1f-48f8-b594-bf0a07fe301c_sub-batch-1.csv       | 7 -------
 10c76e29-3411-4091-8259-bbf381ed24ac_sub-batch-2.csv       | 2 --
 18ab458a-5840-4d14-a3ef-736184bbb5f2_sub-batch-2.csv       | 1 -
 19dcd9b2-4801-42cb-999c-b20fa607c608_sub-batch-2.csv       | 3 ---
 1aee1930-c86c-4cda-9eb5-d17c9c6ba6a0_sub-batch-1.csv       | 3 ---
 1db59e7f-3eb6-4a3a-ab20-e9f299011a46_bulk_payment.csv      | 7 -------
 20f24d57-17b6-4196-a62a-ffc8c7aba3b4_sub-batch-gorilla.csv | 5 -----
 ...6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv | 3 ---
 21a33fd0-2728-4e16-98fa-71bd4cabc356_sub-batch-rhino.csv   | 3 ---
 24dc160a-baaa-4209-b12d-65397e4cf2f2_bulk_payment.csv      | 7 -------
 252beba6-0237-4ebf-bab9-ddf8772ed7da_sub-batch-1.csv       | 7 -------
 274766c9-790a-433c-a284-0aa6c496e468_sub-batch-1.csv       | 7 -------
 2762913c-0771-4c5b-8b7e-6343994a3aeb_bulk_payment.csv      | 7 -------
 27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv   | 3 ---
 2819dca5-a2a7-4766-bda4-4fac0c2225a4_sub-batch-gorilla.csv | 5 -----
 2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv | 5 -----
 2c09b0d4-298a-4644-9035-e741e0372301_sub-batch-rhino.csv   | 3 ---
 30f4d99a-ab34-4eb1-8a82-62efeba005c4_sub-batch-rhino.csv   | 3 ---
 3158c520-55b9-4330-a3ce-76fee69164b5_sub-batch-gorilla.csv | 5 -----
 338596c9-6a15-4b9c-b185-eed488b16835_sub-batch-1.csv       | 6 ------
 33c9b676-f55a-47dd-b595-4fa3e2aa6e59_sub-batch-gorilla.csv | 5 -----
 ...94_5a79ac5f-c00e-4a62-bd61-2f24c592d072_sub-batch-2.csv | 2 --
 40c91795-8705-427d-8af4-0486f8dca8a6_sub-batch-gorilla.csv | 5 -----
 42d9f96c-ddfa-4cc8-b8aa-a0f18d97fcee_sub-batch-gorilla.csv | 5 -----
 44ec4e09-0da1-4c53-84a5-3f4976962811_bulk_payment.csv      | 7 -------
 467c8a17-8e19-44fe-848f-5e1076b1ee74_sub-batch-2.csv       | 3 ---
 48decda4-f5b6-4d8b-9844-cdbdc07bd30a_bulk_payment.csv      | 7 -------
 49af284f-a5b6-430b-acc1-8e2d4803d2ff_ph-ee-bulk-demo-6.csv | 3 ---
 4d8781bd-30f5-4bd1-9a5b-e7a398c02b2f_sub-batch-2.csv       | 3 ---
 4e864887-5d85-4520-bcd8-daf9b2c9ad06_sub-batch-gorilla.csv | 5 -----
 55d53127-6df4-4448-bbe5-6b4a2836d091_sub-batch-gorilla.csv | 5 -----
 5846bf25-7337-40ec-b306-ccc909ebb457_sub-batch-2.csv       | 2 --
 58bbb029-f3c6-4aad-8b41-a8249d60a97b_sub-batch-rhino.csv   | 3 ---
 5a79ac5f-c00e-4a62-bd61-2f24c592d072_sub-batch-2.csv       | 2 --
 5c755633-7b3e-4d2b-8a89-1d20fdb0243b_sub-batch-gorilla.csv | 5 -----
 5d12672e-a4ee-42e0-b8f0-8f7c587d2ebd_sub-batch-rhino.csv   | 3 ---
 5d45eab9-009a-4f48-a0ce-a581d48ff530_sub-batch-1.csv       | 6 ------
 6071ba69-32ba-49d5-af56-1c68c93a6f63_sub-batch-gorilla.csv | 5 -----
 ...7b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv | 3 ---
 6e697f5e-3be1-49b2-829b-d9d132dc6615_sub-batch-rhino.csv   | 3 ---
 6f6fa931-1715-4a87-a527-7c6693d41e10_sub-batch-rhino.csv   | 3 ---
 ...11_ec0c518c-bacd-4c82-bff1-46e1620d3da3_sub-batch-1.csv | 6 ------
 6ff0cec1-eefa-4a00-9bd7-d665c9cd0ac6_sub-batch-gorilla.csv | 5 -----
 ...7b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv | 3 ---
 71b3d07a-1617-4e94-9686-1674d39cc1c0_sub-batch-gorilla.csv | 5 -----
 79cc1e71-6cf1-4a45-95ae-6e4e049adc38_bulk_payment.csv      | 7 -------
 7b700e1b-3b73-47ed-b872-e90b3ad1f4e8_sub-batch-1.csv       | 3 ---
 7f72cb32-68c9-44d4-b3d1-5c2fc13c1700_sub-batch-1.csv       | 6 ------
 8123b544-4c74-4264-b277-8d16ae3c4613_sub-batch-rhino.csv   | 3 ---
 842ee21f-f665-4124-929d-04fbf1e1a731_sub-batch-rhino.csv   | 3 ---
 85b7379c-979c-4d0a-ab9e-3e215fcedae1_sub-batch-rhino.csv   | 3 ---
 ...6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv | 3 ---
 8780cbd1-16f5-43c0-b1b4-3c53c664a7d5_bulk_payment.csv      | 7 -------
 8ecd9222-27c6-488a-8396-7a4e0331490b_sub-batch-gorilla.csv | 5 -----
 908d01e5-4bc5-4ebf-a0c1-b121a4e7f35b_bulk_payment.csv      | 7 -------
 98f08d7f-dd82-48d4-8524-7801ea3543fa_sub-batch-gorilla.csv | 5 -----
 9b8a3248-eb7d-4900-9539-2b0609c11b0c_sub-batch-1.csv       | 7 -------
 ...025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv | 5 -----
 ...025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv | 5 -----
 a72f1ad3-bb12-4098-92b6-55a89c20bbba_sub-batch-1.csv       | 1 -
 a78fffca-366a-4286-89dc-4a7163c3d366_sub-batch-rhino.csv   | 3 ---
 aa703090-a6f0-4bd7-aa9b-47773a79f487_bulk_payment.csv      | 7 -------
 ...02_5846bf25-7337-40ec-b306-ccc909ebb457_sub-batch-2.csv | 2 --
 ab90a350-d417-40d6-9d66-c7b98f829d91_sub-batch-gorilla.csv | 5 -----
 ac1f2aca-8e4c-4edd-8e2c-fd3417a33930_sub-batch-rhino.csv   | 3 ---
 ac2ce741-da3f-4f47-8ac0-1125bcb78d5f_sub-batch-gorilla.csv | 5 -----
 ac82f801-c644-4236-b784-0e43c3805527_sub-batch-rhino.csv   | 3 ---
 ae4266e2-d65d-4b06-9a05-5c51a542efcb_bulk_payment.csv      | 7 -------
 ...31_5d45eab9-009a-4f48-a0ce-a581d48ff530_sub-batch-1.csv | 6 ------
 ...025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv | 5 -----
 b679e220-6763-4bec-8870-6d2f2d05afa9_bulk_payment.csv      | 7 -------
 bc46c116-2dc0-4a0a-b64d-cdaa79d4993e_bulk_payment.csv      | 7 -------
 be46e107-6ab9-45e2-90dd-3c8d14e00a95_sub-batch-rhino.csv   | 3 ---
 ...025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv | 5 -----
 c7697bf9-c533-41ea-8345-7c45da9811ed_sub-batch-rhino.csv   | 3 ---
 d040581e-2a16-4f3b-962d-5970c58a7dfe_sub-batch-gorilla.csv | 5 -----
 ...7b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv | 3 ---
 d671627e-529d-4e74-ab12-e024d45bb8ab_sub-batch-gorilla.csv | 5 -----
 d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv   | 3 ---
 debffb76-36b2-4ff6-8f9f-2b3c9b4411d2_sub-batch-rhino.csv   | 3 ---
 e0a27f6b-b090-408d-bb17-eacf86146983_bulk_payment.csv      | 7 -------
 e1eae6bf-1980-4a06-8e29-d2d474f0546a_sub-batch-2.csv       | 2 --
 e6950eac-515a-4a32-8d7f-e60b318b7043_sub-batch-2.csv       | 3 ---
 e7b1c485-d526-4982-ad2a-a684b95d5320_sub-batch-gorilla.csv | 5 -----
 ...6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv | 3 ---
 ec0c518c-bacd-4c82-bff1-46e1620d3da3_sub-batch-1.csv       | 6 ------
 eed36f80-df49-44c0-bbf6-5d60d7d843b1_sub-batch-2.csv       | 3 ---
 91 files changed, 399 deletions(-)
 delete mode 100644 01f5d1c2-ed0e-47b3-a986-52a07760e277_sub-batch-rhino.csv
 delete mode 100644 04622991-aabc-430c-bf72-cd707bca4d12_sub-batch-2.csv
 delete mode 100644 04c96688-fa6a-4964-9446-ce198e2cde58_sub-batch-rhino.csv
 delete mode 100644 0f248ce7-9ce3-4fd1-ab01-f9ebf09a6a71_sub-batch-gorilla.csv
 delete mode 100644 0f40c6d5-4b1f-48f8-b594-bf0a07fe301c_sub-batch-1.csv
 delete mode 100644 10c76e29-3411-4091-8259-bbf381ed24ac_sub-batch-2.csv
 delete mode 100644 18ab458a-5840-4d14-a3ef-736184bbb5f2_sub-batch-2.csv
 delete mode 100644 19dcd9b2-4801-42cb-999c-b20fa607c608_sub-batch-2.csv
 delete mode 100644 1aee1930-c86c-4cda-9eb5-d17c9c6ba6a0_sub-batch-1.csv
 delete mode 100644 1db59e7f-3eb6-4a3a-ab20-e9f299011a46_bulk_payment.csv
 delete mode 100644 20f24d57-17b6-4196-a62a-ffc8c7aba3b4_sub-batch-gorilla.csv
 delete mode 100644 20f721d6-93ea-41f4-a45b-1633731817da_d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv
 delete mode 100644 21a33fd0-2728-4e16-98fa-71bd4cabc356_sub-batch-rhino.csv
 delete mode 100644 24dc160a-baaa-4209-b12d-65397e4cf2f2_bulk_payment.csv
 delete mode 100644 252beba6-0237-4ebf-bab9-ddf8772ed7da_sub-batch-1.csv
 delete mode 100644 274766c9-790a-433c-a284-0aa6c496e468_sub-batch-1.csv
 delete mode 100644 2762913c-0771-4c5b-8b7e-6343994a3aeb_bulk_payment.csv
 delete mode 100644 27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv
 delete mode 100644 2819dca5-a2a7-4766-bda4-4fac0c2225a4_sub-batch-gorilla.csv
 delete mode 100644 2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
 delete mode 100644 2c09b0d4-298a-4644-9035-e741e0372301_sub-batch-rhino.csv
 delete mode 100644 30f4d99a-ab34-4eb1-8a82-62efeba005c4_sub-batch-rhino.csv
 delete mode 100644 3158c520-55b9-4330-a3ce-76fee69164b5_sub-batch-gorilla.csv
 delete mode 100644 338596c9-6a15-4b9c-b185-eed488b16835_sub-batch-1.csv
 delete mode 100644 33c9b676-f55a-47dd-b595-4fa3e2aa6e59_sub-batch-gorilla.csv
 delete mode 100644 3a973cb6-30a9-45bc-9b2d-2e06caf0a194_5a79ac5f-c00e-4a62-bd61-2f24c592d072_sub-batch-2.csv
 delete mode 100644 40c91795-8705-427d-8af4-0486f8dca8a6_sub-batch-gorilla.csv
 delete mode 100644 42d9f96c-ddfa-4cc8-b8aa-a0f18d97fcee_sub-batch-gorilla.csv
 delete mode 100644 44ec4e09-0da1-4c53-84a5-3f4976962811_bulk_payment.csv
 delete mode 100644 467c8a17-8e19-44fe-848f-5e1076b1ee74_sub-batch-2.csv
 delete mode 100644 48decda4-f5b6-4d8b-9844-cdbdc07bd30a_bulk_payment.csv
 delete mode 100644 49af284f-a5b6-430b-acc1-8e2d4803d2ff_ph-ee-bulk-demo-6.csv
 delete mode 100644 4d8781bd-30f5-4bd1-9a5b-e7a398c02b2f_sub-batch-2.csv
 delete mode 100644 4e864887-5d85-4520-bcd8-daf9b2c9ad06_sub-batch-gorilla.csv
 delete mode 100644 55d53127-6df4-4448-bbe5-6b4a2836d091_sub-batch-gorilla.csv
 delete mode 100644 5846bf25-7337-40ec-b306-ccc909ebb457_sub-batch-2.csv
 delete mode 100644 58bbb029-f3c6-4aad-8b41-a8249d60a97b_sub-batch-rhino.csv
 delete mode 100644 5a79ac5f-c00e-4a62-bd61-2f24c592d072_sub-batch-2.csv
 delete mode 100644 5c755633-7b3e-4d2b-8a89-1d20fdb0243b_sub-batch-gorilla.csv
 delete mode 100644 5d12672e-a4ee-42e0-b8f0-8f7c587d2ebd_sub-batch-rhino.csv
 delete mode 100644 5d45eab9-009a-4f48-a0ce-a581d48ff530_sub-batch-1.csv
 delete mode 100644 6071ba69-32ba-49d5-af56-1c68c93a6f63_sub-batch-gorilla.csv
 delete mode 100644 6a35c1d2-42fc-4f40-bfef-7476a5352d2a_27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv
 delete mode 100644 6e697f5e-3be1-49b2-829b-d9d132dc6615_sub-batch-rhino.csv
 delete mode 100644 6f6fa931-1715-4a87-a527-7c6693d41e10_sub-batch-rhino.csv
 delete mode 100644 6fdcf7c1-07bf-4318-8f52-bf4f22025e11_ec0c518c-bacd-4c82-bff1-46e1620d3da3_sub-batch-1.csv
 delete mode 100644 6ff0cec1-eefa-4a00-9bd7-d665c9cd0ac6_sub-batch-gorilla.csv
 delete mode 100644 70f00aa9-2204-4e15-9a3c-a2d3449811e5_27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv
 delete mode 100644 71b3d07a-1617-4e94-9686-1674d39cc1c0_sub-batch-gorilla.csv
 delete mode 100644 79cc1e71-6cf1-4a45-95ae-6e4e049adc38_bulk_payment.csv
 delete mode 100644 7b700e1b-3b73-47ed-b872-e90b3ad1f4e8_sub-batch-1.csv
 delete mode 100644 7f72cb32-68c9-44d4-b3d1-5c2fc13c1700_sub-batch-1.csv
 delete mode 100644 8123b544-4c74-4264-b277-8d16ae3c4613_sub-batch-rhino.csv
 delete mode 100644 842ee21f-f665-4124-929d-04fbf1e1a731_sub-batch-rhino.csv
 delete mode 100644 85b7379c-979c-4d0a-ab9e-3e215fcedae1_sub-batch-rhino.csv
 delete mode 100644 86b5162a-78de-47df-b494-65c88d4c308b_d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv
 delete mode 100644 8780cbd1-16f5-43c0-b1b4-3c53c664a7d5_bulk_payment.csv
 delete mode 100644 8ecd9222-27c6-488a-8396-7a4e0331490b_sub-batch-gorilla.csv
 delete mode 100644 908d01e5-4bc5-4ebf-a0c1-b121a4e7f35b_bulk_payment.csv
 delete mode 100644 98f08d7f-dd82-48d4-8524-7801ea3543fa_sub-batch-gorilla.csv
 delete mode 100644 9b8a3248-eb7d-4900-9539-2b0609c11b0c_sub-batch-1.csv
 delete mode 100644 9e515093-03c9-4733-a693-3cea5354f9d5_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
 delete mode 100644 a3c7555b-6a37-494c-b825-9b0d9bcc2f9b_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
 delete mode 100644 a72f1ad3-bb12-4098-92b6-55a89c20bbba_sub-batch-1.csv
 delete mode 100644 a78fffca-366a-4286-89dc-4a7163c3d366_sub-batch-rhino.csv
 delete mode 100644 aa703090-a6f0-4bd7-aa9b-47773a79f487_bulk_payment.csv
 delete mode 100644 aa7a8412-f681-4adf-aa18-2ff72f47f102_5846bf25-7337-40ec-b306-ccc909ebb457_sub-batch-2.csv
 delete mode 100644 ab90a350-d417-40d6-9d66-c7b98f829d91_sub-batch-gorilla.csv
 delete mode 100644 ac1f2aca-8e4c-4edd-8e2c-fd3417a33930_sub-batch-rhino.csv
 delete mode 100644 ac2ce741-da3f-4f47-8ac0-1125bcb78d5f_sub-batch-gorilla.csv
 delete mode 100644 ac82f801-c644-4236-b784-0e43c3805527_sub-batch-rhino.csv
 delete mode 100644 ae4266e2-d65d-4b06-9a05-5c51a542efcb_bulk_payment.csv
 delete mode 100644 b00e2cc4-7bee-45c2-a2f7-2e3127ca3031_5d45eab9-009a-4f48-a0ce-a581d48ff530_sub-batch-1.csv
 delete mode 100644 b4dacda7-f064-438f-8a4b-4854674482be_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
 delete mode 100644 b679e220-6763-4bec-8870-6d2f2d05afa9_bulk_payment.csv
 delete mode 100644 bc46c116-2dc0-4a0a-b64d-cdaa79d4993e_bulk_payment.csv
 delete mode 100644 be46e107-6ab9-45e2-90dd-3c8d14e00a95_sub-batch-rhino.csv
 delete mode 100644 bea14bd3-8a40-4829-9f51-2590ddf651a3_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
 delete mode 100644 c7697bf9-c533-41ea-8345-7c45da9811ed_sub-batch-rhino.csv
 delete mode 100644 d040581e-2a16-4f3b-962d-5970c58a7dfe_sub-batch-gorilla.csv
 delete mode 100644 d0d8b91a-a020-4f3c-9ab0-476876e81759_27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv
 delete mode 100644 d671627e-529d-4e74-ab12-e024d45bb8ab_sub-batch-gorilla.csv
 delete mode 100644 d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv
 delete mode 100644 debffb76-36b2-4ff6-8f9f-2b3c9b4411d2_sub-batch-rhino.csv
 delete mode 100644 e0a27f6b-b090-408d-bb17-eacf86146983_bulk_payment.csv
 delete mode 100644 e1eae6bf-1980-4a06-8e29-d2d474f0546a_sub-batch-2.csv
 delete mode 100644 e6950eac-515a-4a32-8d7f-e60b318b7043_sub-batch-2.csv
 delete mode 100644 e7b1c485-d526-4982-ad2a-a684b95d5320_sub-batch-gorilla.csv
 delete mode 100644 e9f37cc8-9177-4213-95e2-ffefdf41a56a_d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv
 delete mode 100644 ec0c518c-bacd-4c82-bff1-46e1620d3da3_sub-batch-1.csv
 delete mode 100644 eed36f80-df49-44c0-bbf6-5d60d7d843b1_sub-batch-2.csv

diff --git a/01f5d1c2-ed0e-47b3-a986-52a07760e277_sub-batch-rhino.csv b/01f5d1c2-ed0e-47b3-a986-52a07760e277_sub-batch-rhino.csv
deleted file mode 100644
index cd185a51..00000000
--- a/01f5d1c2-ed0e-47b3-a986-52a07760e277_sub-batch-rhino.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"b6aa32cd-06a8-42dc-a070-daab4a5a6cc0"
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"b6aa32cd-06a8-42dc-a070-daab4a5a6cc0"
diff --git a/04622991-aabc-430c-bf72-cd707bca4d12_sub-batch-2.csv b/04622991-aabc-430c-bf72-cd707bca4d12_sub-batch-2.csv
deleted file mode 100644
index ae3909d4..00000000
--- a/04622991-aabc-430c-bf72-cd707bca4d12_sub-batch-2.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-
-5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment,fac50f42-60fc-4c50-ba79-792d81cb392f
diff --git a/04c96688-fa6a-4964-9446-ce198e2cde58_sub-batch-rhino.csv b/04c96688-fa6a-4964-9446-ce198e2cde58_sub-batch-rhino.csv
deleted file mode 100644
index f2bdc005..00000000
--- a/04c96688-fa6a-4964-9446-ce198e2cde58_sub-batch-rhino.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"3b2c84b1-431b-475d-857d-58bc2a1899cc"
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"3b2c84b1-431b-475d-857d-58bc2a1899cc"
diff --git a/0f248ce7-9ce3-4fd1-ab01-f9ebf09a6a71_sub-batch-gorilla.csv b/0f248ce7-9ce3-4fd1-ab01-f9ebf09a6a71_sub-batch-gorilla.csv
deleted file mode 100644
index 70dd9aa8..00000000
--- a/0f248ce7-9ce3-4fd1-ab01-f9ebf09a6a71_sub-batch-gorilla.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"3e5a8ff7-2051-4974-ac82-f0fd27efcd2d"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"3e5a8ff7-2051-4974-ac82-f0fd27efcd2d"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"3e5a8ff7-2051-4974-ac82-f0fd27efcd2d"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"3e5a8ff7-2051-4974-ac82-f0fd27efcd2d"
diff --git a/0f40c6d5-4b1f-48f8-b594-bf0a07fe301c_sub-batch-1.csv b/0f40c6d5-4b1f-48f8-b594-bf0a07fe301c_sub-batch-1.csv
deleted file mode 100644
index ffad80e4..00000000
--- a/0f40c6d5-4b1f-48f8-b594-bf0a07fe301c_sub-batch-1.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-
-0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment,51596f33-d248-4829-9252-f55c709c82ba
-1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment,51596f33-d248-4829-9252-f55c709c82ba
-2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment,51596f33-d248-4829-9252-f55c709c82ba
-3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment,51596f33-d248-4829-9252-f55c709c82ba
-4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment,51596f33-d248-4829-9252-f55c709c82ba
diff --git a/10c76e29-3411-4091-8259-bbf381ed24ac_sub-batch-2.csv b/10c76e29-3411-4091-8259-bbf381ed24ac_sub-batch-2.csv
deleted file mode 100644
index 84dba38d..00000000
--- a/10c76e29-3411-4091-8259-bbf381ed24ac_sub-batch-2.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,"Test Payee Payment",,,,,"03ffc7fe-e42d-4f49-9358-586a2a6a3cd7"
diff --git a/18ab458a-5840-4d14-a3ef-736184bbb5f2_sub-batch-2.csv b/18ab458a-5840-4d14-a3ef-736184bbb5f2_sub-batch-2.csv
deleted file mode 100644
index b810552d..00000000
--- a/18ab458a-5840-4d14-a3ef-736184bbb5f2_sub-batch-2.csv
+++ /dev/null
@@ -1 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
diff --git a/19dcd9b2-4801-42cb-999c-b20fa607c608_sub-batch-2.csv b/19dcd9b2-4801-42cb-999c-b20fa607c608_sub-batch-2.csv
deleted file mode 100644
index b95805b3..00000000
--- a/19dcd9b2-4801-42cb-999c-b20fa607c608_sub-batch-2.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-
-5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment,4219c893-f7b3-4865-bbd0-8ae05f78e984
diff --git a/1aee1930-c86c-4cda-9eb5-d17c9c6ba6a0_sub-batch-1.csv b/1aee1930-c86c-4cda-9eb5-d17c9c6ba6a0_sub-batch-1.csv
deleted file mode 100644
index 34f80c49..00000000
--- a/1aee1930-c86c-4cda-9eb5-d17c9c6ba6a0_sub-batch-1.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-
-0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment,0f63e113-7235-4ad2-bd23-8ef1f84edf72
diff --git a/1db59e7f-3eb6-4a3a-ab20-e9f299011a46_bulk_payment.csv b/1db59e7f-3eb6-4a3a-ab20-e9f299011a46_bulk_payment.csv
deleted file mode 100644
index 3fbc8913..00000000
--- a/1db59e7f-3eb6-4a3a-ab20-e9f299011a46_bulk_payment.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
-1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
-2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment
-3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment
-4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment
-5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment
\ No newline at end of file
diff --git a/20f24d57-17b6-4196-a62a-ffc8c7aba3b4_sub-batch-gorilla.csv b/20f24d57-17b6-4196-a62a-ffc8c7aba3b4_sub-batch-gorilla.csv
deleted file mode 100644
index a7ea364a..00000000
--- a/20f24d57-17b6-4196-a62a-ffc8c7aba3b4_sub-batch-gorilla.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"62dbec54-0e03-4952-b3b4-206345504aca"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"62dbec54-0e03-4952-b3b4-206345504aca"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"62dbec54-0e03-4952-b3b4-206345504aca"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"62dbec54-0e03-4952-b3b4-206345504aca"
diff --git a/20f721d6-93ea-41f4-a45b-1633731817da_d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv b/20f721d6-93ea-41f4-a45b-1633731817da_d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv
deleted file mode 100644
index 85c56e9c..00000000
--- a/20f721d6-93ea-41f4-a45b-1633731817da_d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"bb080fe6-e814-4f06-a3f0-a2228d2ef701"
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"bb080fe6-e814-4f06-a3f0-a2228d2ef701"
\ No newline at end of file
diff --git a/21a33fd0-2728-4e16-98fa-71bd4cabc356_sub-batch-rhino.csv b/21a33fd0-2728-4e16-98fa-71bd4cabc356_sub-batch-rhino.csv
deleted file mode 100644
index 595c7fb1..00000000
--- a/21a33fd0-2728-4e16-98fa-71bd4cabc356_sub-batch-rhino.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"c13fae51-6201-4296-82a9-244bc8c5c18a"
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"c13fae51-6201-4296-82a9-244bc8c5c18a"
diff --git a/24dc160a-baaa-4209-b12d-65397e4cf2f2_bulk_payment.csv b/24dc160a-baaa-4209-b12d-65397e4cf2f2_bulk_payment.csv
deleted file mode 100644
index 3fbc8913..00000000
--- a/24dc160a-baaa-4209-b12d-65397e4cf2f2_bulk_payment.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
-1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
-2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment
-3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment
-4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment
-5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment
\ No newline at end of file
diff --git a/252beba6-0237-4ebf-bab9-ddf8772ed7da_sub-batch-1.csv b/252beba6-0237-4ebf-bab9-ddf8772ed7da_sub-batch-1.csv
deleted file mode 100644
index d894eeba..00000000
--- a/252beba6-0237-4ebf-bab9-ddf8772ed7da_sub-batch-1.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-
-0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment,7c6b35b4-680f-4065-b9f4-6521c215e854
-1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment,7c6b35b4-680f-4065-b9f4-6521c215e854
-2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment,7c6b35b4-680f-4065-b9f4-6521c215e854
-3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment,7c6b35b4-680f-4065-b9f4-6521c215e854
-4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment,7c6b35b4-680f-4065-b9f4-6521c215e854
diff --git a/274766c9-790a-433c-a284-0aa6c496e468_sub-batch-1.csv b/274766c9-790a-433c-a284-0aa6c496e468_sub-batch-1.csv
deleted file mode 100644
index d8531d8e..00000000
--- a/274766c9-790a-433c-a284-0aa6c496e468_sub-batch-1.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-
-0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment,d162df9e-cb3d-4551-b574-45743ac078e3
-1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment,d162df9e-cb3d-4551-b574-45743ac078e3
-2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment,d162df9e-cb3d-4551-b574-45743ac078e3
-3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment,d162df9e-cb3d-4551-b574-45743ac078e3
-4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment,d162df9e-cb3d-4551-b574-45743ac078e3
diff --git a/2762913c-0771-4c5b-8b7e-6343994a3aeb_bulk_payment.csv b/2762913c-0771-4c5b-8b7e-6343994a3aeb_bulk_payment.csv
deleted file mode 100644
index 3fbc8913..00000000
--- a/2762913c-0771-4c5b-8b7e-6343994a3aeb_bulk_payment.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
-1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
-2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment
-3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment
-4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment
-5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment
\ No newline at end of file
diff --git a/27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv b/27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv
deleted file mode 100644
index 9378da42..00000000
--- a/27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"d0ae9951-4d7c-4b1f-a74b-e0e17d7ae495"
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"d0ae9951-4d7c-4b1f-a74b-e0e17d7ae495"
diff --git a/2819dca5-a2a7-4766-bda4-4fac0c2225a4_sub-batch-gorilla.csv b/2819dca5-a2a7-4766-bda4-4fac0c2225a4_sub-batch-gorilla.csv
deleted file mode 100644
index 7e422e66..00000000
--- a/2819dca5-a2a7-4766-bda4-4fac0c2225a4_sub-batch-gorilla.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"70dbf128-260e-493e-a426-be04bc4a21e9"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"70dbf128-260e-493e-a426-be04bc4a21e9"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"70dbf128-260e-493e-a426-be04bc4a21e9"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"70dbf128-260e-493e-a426-be04bc4a21e9"
diff --git a/2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv b/2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
deleted file mode 100644
index 33b9dd22..00000000
--- a/2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
diff --git a/2c09b0d4-298a-4644-9035-e741e0372301_sub-batch-rhino.csv b/2c09b0d4-298a-4644-9035-e741e0372301_sub-batch-rhino.csv
deleted file mode 100644
index fc4dc647..00000000
--- a/2c09b0d4-298a-4644-9035-e741e0372301_sub-batch-rhino.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"5dc9e518-d8d5-421f-989d-40978aec3a79"
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"5dc9e518-d8d5-421f-989d-40978aec3a79"
diff --git a/30f4d99a-ab34-4eb1-8a82-62efeba005c4_sub-batch-rhino.csv b/30f4d99a-ab34-4eb1-8a82-62efeba005c4_sub-batch-rhino.csv
deleted file mode 100644
index 20001049..00000000
--- a/30f4d99a-ab34-4eb1-8a82-62efeba005c4_sub-batch-rhino.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"a6ca1d79-ee41-40a8-b335-55bb048f19e1"
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"a6ca1d79-ee41-40a8-b335-55bb048f19e1"
diff --git a/3158c520-55b9-4330-a3ce-76fee69164b5_sub-batch-gorilla.csv b/3158c520-55b9-4330-a3ce-76fee69164b5_sub-batch-gorilla.csv
deleted file mode 100644
index 7ef99dab..00000000
--- a/3158c520-55b9-4330-a3ce-76fee69164b5_sub-batch-gorilla.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"8a6e2655-105c-40c6-bcf3-d88a8579023a"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"8a6e2655-105c-40c6-bcf3-d88a8579023a"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"8a6e2655-105c-40c6-bcf3-d88a8579023a"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"8a6e2655-105c-40c6-bcf3-d88a8579023a"
diff --git a/338596c9-6a15-4b9c-b185-eed488b16835_sub-batch-1.csv b/338596c9-6a15-4b9c-b185-eed488b16835_sub-batch-1.csv
deleted file mode 100644
index 57109bcf..00000000
--- a/338596c9-6a15-4b9c-b185-eed488b16835_sub-batch-1.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla
diff --git a/33c9b676-f55a-47dd-b595-4fa3e2aa6e59_sub-batch-gorilla.csv b/33c9b676-f55a-47dd-b595-4fa3e2aa6e59_sub-batch-gorilla.csv
deleted file mode 100644
index 4d30b7f3..00000000
--- a/33c9b676-f55a-47dd-b595-4fa3e2aa6e59_sub-batch-gorilla.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"63326013-e3b8-42a2-be0c-47201f02fa37"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"63326013-e3b8-42a2-be0c-47201f02fa37"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"63326013-e3b8-42a2-be0c-47201f02fa37"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"63326013-e3b8-42a2-be0c-47201f02fa37"
diff --git a/3a973cb6-30a9-45bc-9b2d-2e06caf0a194_5a79ac5f-c00e-4a62-bd61-2f24c592d072_sub-batch-2.csv b/3a973cb6-30a9-45bc-9b2d-2e06caf0a194_5a79ac5f-c00e-4a62-bd61-2f24c592d072_sub-batch-2.csv
deleted file mode 100644
index 27e66473..00000000
--- a/3a973cb6-30a9-45bc-9b2d-2e06caf0a194_5a79ac5f-c00e-4a62-bd61-2f24c592d072_sub-batch-2.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,,,,,"78e6541f-e04b-4224-9a19-735f0b9f70c3"
diff --git a/40c91795-8705-427d-8af4-0486f8dca8a6_sub-batch-gorilla.csv b/40c91795-8705-427d-8af4-0486f8dca8a6_sub-batch-gorilla.csv
deleted file mode 100644
index 9645c997..00000000
--- a/40c91795-8705-427d-8af4-0486f8dca8a6_sub-batch-gorilla.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"c9d53528-0343-448c-86bc-1c8079c41621"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"c9d53528-0343-448c-86bc-1c8079c41621"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"c9d53528-0343-448c-86bc-1c8079c41621"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"c9d53528-0343-448c-86bc-1c8079c41621"
diff --git a/42d9f96c-ddfa-4cc8-b8aa-a0f18d97fcee_sub-batch-gorilla.csv b/42d9f96c-ddfa-4cc8-b8aa-a0f18d97fcee_sub-batch-gorilla.csv
deleted file mode 100644
index 932aadfe..00000000
--- a/42d9f96c-ddfa-4cc8-b8aa-a0f18d97fcee_sub-batch-gorilla.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"65cd3a07-2173-4ea9-8d72-ab54c5339e93"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"65cd3a07-2173-4ea9-8d72-ab54c5339e93"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"65cd3a07-2173-4ea9-8d72-ab54c5339e93"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"65cd3a07-2173-4ea9-8d72-ab54c5339e93"
diff --git a/44ec4e09-0da1-4c53-84a5-3f4976962811_bulk_payment.csv b/44ec4e09-0da1-4c53-84a5-3f4976962811_bulk_payment.csv
deleted file mode 100644
index 3fbc8913..00000000
--- a/44ec4e09-0da1-4c53-84a5-3f4976962811_bulk_payment.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
-1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
-2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment
-3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment
-4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment
-5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment
\ No newline at end of file
diff --git a/467c8a17-8e19-44fe-848f-5e1076b1ee74_sub-batch-2.csv b/467c8a17-8e19-44fe-848f-5e1076b1ee74_sub-batch-2.csv
deleted file mode 100644
index 87538cc8..00000000
--- a/467c8a17-8e19-44fe-848f-5e1076b1ee74_sub-batch-2.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-
-5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment,670cef11-ceb7-4bd2-bc4d-51fa47551dc4
diff --git a/48decda4-f5b6-4d8b-9844-cdbdc07bd30a_bulk_payment.csv b/48decda4-f5b6-4d8b-9844-cdbdc07bd30a_bulk_payment.csv
deleted file mode 100644
index 3fbc8913..00000000
--- a/48decda4-f5b6-4d8b-9844-cdbdc07bd30a_bulk_payment.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
-1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
-2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment
-3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment
-4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment
-5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment
\ No newline at end of file
diff --git a/49af284f-a5b6-430b-acc1-8e2d4803d2ff_ph-ee-bulk-demo-6.csv b/49af284f-a5b6-430b-acc1-8e2d4803d2ff_ph-ee-bulk-demo-6.csv
deleted file mode 100644
index 6f2a8069..00000000
--- a/49af284f-a5b6-430b-acc1-8e2d4803d2ff_ph-ee-bulk-demo-6.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"f1e22fe3-9740-4fba-97b6-78f43bfa7f2f",slcb,,accountNumber,003001003879112168,accountNumber,003001003873110196,850,USD,"Test Payee Payment",,,,
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",slcb,,accountNumber,003001003879112168,accountNumber,003001003874120160,222,USD,"Test Payee Payment",,,,
diff --git a/4d8781bd-30f5-4bd1-9a5b-e7a398c02b2f_sub-batch-2.csv b/4d8781bd-30f5-4bd1-9a5b-e7a398c02b2f_sub-batch-2.csv
deleted file mode 100644
index 25405742..00000000
--- a/4d8781bd-30f5-4bd1-9a5b-e7a398c02b2f_sub-batch-2.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-
-5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment,637636c5-7c8c-4692-a3c4-b8cdfce4fac4
diff --git a/4e864887-5d85-4520-bcd8-daf9b2c9ad06_sub-batch-gorilla.csv b/4e864887-5d85-4520-bcd8-daf9b2c9ad06_sub-batch-gorilla.csv
deleted file mode 100644
index 624fdb38..00000000
--- a/4e864887-5d85-4520-bcd8-daf9b2c9ad06_sub-batch-gorilla.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"bbb82eaf-28e5-47ea-a170-c53dd5fa8051"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"bbb82eaf-28e5-47ea-a170-c53dd5fa8051"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"bbb82eaf-28e5-47ea-a170-c53dd5fa8051"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"bbb82eaf-28e5-47ea-a170-c53dd5fa8051"
diff --git a/55d53127-6df4-4448-bbe5-6b4a2836d091_sub-batch-gorilla.csv b/55d53127-6df4-4448-bbe5-6b4a2836d091_sub-batch-gorilla.csv
deleted file mode 100644
index 78c7fcad..00000000
--- a/55d53127-6df4-4448-bbe5-6b4a2836d091_sub-batch-gorilla.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"b57f643b-6dfb-47da-b34f-cac6455b845f"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"b57f643b-6dfb-47da-b34f-cac6455b845f"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"b57f643b-6dfb-47da-b34f-cac6455b845f"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"b57f643b-6dfb-47da-b34f-cac6455b845f"
diff --git a/5846bf25-7337-40ec-b306-ccc909ebb457_sub-batch-2.csv b/5846bf25-7337-40ec-b306-ccc909ebb457_sub-batch-2.csv
deleted file mode 100644
index 69792057..00000000
--- a/5846bf25-7337-40ec-b306-ccc909ebb457_sub-batch-2.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,,,,,"3eee9c23-9318-4d25-a156-617ab0644c88"
diff --git a/58bbb029-f3c6-4aad-8b41-a8249d60a97b_sub-batch-rhino.csv b/58bbb029-f3c6-4aad-8b41-a8249d60a97b_sub-batch-rhino.csv
deleted file mode 100644
index 42a9204b..00000000
--- a/58bbb029-f3c6-4aad-8b41-a8249d60a97b_sub-batch-rhino.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"2e18ae16-0653-4b00-8d40-b109561122f1"
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"2e18ae16-0653-4b00-8d40-b109561122f1"
diff --git a/5a79ac5f-c00e-4a62-bd61-2f24c592d072_sub-batch-2.csv b/5a79ac5f-c00e-4a62-bd61-2f24c592d072_sub-batch-2.csv
deleted file mode 100644
index 4157ecd8..00000000
--- a/5a79ac5f-c00e-4a62-bd61-2f24c592d072_sub-batch-2.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,,,,,"78e6541f-e04b-4224-9a19-735f0b9f70c3"
diff --git a/5c755633-7b3e-4d2b-8a89-1d20fdb0243b_sub-batch-gorilla.csv b/5c755633-7b3e-4d2b-8a89-1d20fdb0243b_sub-batch-gorilla.csv
deleted file mode 100644
index 2efbf6d6..00000000
--- a/5c755633-7b3e-4d2b-8a89-1d20fdb0243b_sub-batch-gorilla.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"c60a11fb-bdb5-4689-8d7f-fd9e84b3c489"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"c60a11fb-bdb5-4689-8d7f-fd9e84b3c489"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"c60a11fb-bdb5-4689-8d7f-fd9e84b3c489"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"c60a11fb-bdb5-4689-8d7f-fd9e84b3c489"
diff --git a/5d12672e-a4ee-42e0-b8f0-8f7c587d2ebd_sub-batch-rhino.csv b/5d12672e-a4ee-42e0-b8f0-8f7c587d2ebd_sub-batch-rhino.csv
deleted file mode 100644
index c15b05c8..00000000
--- a/5d12672e-a4ee-42e0-b8f0-8f7c587d2ebd_sub-batch-rhino.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"31d1a280-793b-4b3a-acfd-57ada9d50e61"
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"31d1a280-793b-4b3a-acfd-57ada9d50e61"
diff --git a/5d45eab9-009a-4f48-a0ce-a581d48ff530_sub-batch-1.csv b/5d45eab9-009a-4f48-a0ce-a581d48ff530_sub-batch-1.csv
deleted file mode 100644
index 22f7c0c3..00000000
--- a/5d45eab9-009a-4f48-a0ce-a581d48ff530_sub-batch-1.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,,,,,"877c3254-af31-4c38-b903-52b76825010d"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,,,,,"877c3254-af31-4c38-b903-52b76825010d"
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,,,,,"877c3254-af31-4c38-b903-52b76825010d"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,,,,,"877c3254-af31-4c38-b903-52b76825010d"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,,,,,"877c3254-af31-4c38-b903-52b76825010d"
diff --git a/6071ba69-32ba-49d5-af56-1c68c93a6f63_sub-batch-gorilla.csv b/6071ba69-32ba-49d5-af56-1c68c93a6f63_sub-batch-gorilla.csv
deleted file mode 100644
index f49de248..00000000
--- a/6071ba69-32ba-49d5-af56-1c68c93a6f63_sub-batch-gorilla.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"36ecbbe7-8486-4d33-bf34-08c9a528180a"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"36ecbbe7-8486-4d33-bf34-08c9a528180a"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"36ecbbe7-8486-4d33-bf34-08c9a528180a"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"36ecbbe7-8486-4d33-bf34-08c9a528180a"
diff --git a/6a35c1d2-42fc-4f40-bfef-7476a5352d2a_27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv b/6a35c1d2-42fc-4f40-bfef-7476a5352d2a_27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv
deleted file mode 100644
index 640af4e4..00000000
--- a/6a35c1d2-42fc-4f40-bfef-7476a5352d2a_27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"d0ae9951-4d7c-4b1f-a74b-e0e17d7ae495"
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"d0ae9951-4d7c-4b1f-a74b-e0e17d7ae495"
\ No newline at end of file
diff --git a/6e697f5e-3be1-49b2-829b-d9d132dc6615_sub-batch-rhino.csv b/6e697f5e-3be1-49b2-829b-d9d132dc6615_sub-batch-rhino.csv
deleted file mode 100644
index ea228dbb..00000000
--- a/6e697f5e-3be1-49b2-829b-d9d132dc6615_sub-batch-rhino.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"782d2b4c-0d72-4ad3-a5f6-80634c60c991"
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"782d2b4c-0d72-4ad3-a5f6-80634c60c991"
diff --git a/6f6fa931-1715-4a87-a527-7c6693d41e10_sub-batch-rhino.csv b/6f6fa931-1715-4a87-a527-7c6693d41e10_sub-batch-rhino.csv
deleted file mode 100644
index 1180e767..00000000
--- a/6f6fa931-1715-4a87-a527-7c6693d41e10_sub-batch-rhino.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"b817ae94-3b72-4ac7-9364-7df4c3439888"
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"b817ae94-3b72-4ac7-9364-7df4c3439888"
diff --git a/6fdcf7c1-07bf-4318-8f52-bf4f22025e11_ec0c518c-bacd-4c82-bff1-46e1620d3da3_sub-batch-1.csv b/6fdcf7c1-07bf-4318-8f52-bf4f22025e11_ec0c518c-bacd-4c82-bff1-46e1620d3da3_sub-batch-1.csv
deleted file mode 100644
index 365c9d72..00000000
--- a/6fdcf7c1-07bf-4318-8f52-bf4f22025e11_ec0c518c-bacd-4c82-bff1-46e1620d3da3_sub-batch-1.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",mojaloop,,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,,,,,"40e522ac-8253-4e20-94c6-4a56c1f45e3a"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",mojaloop,,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,,,,,"40e522ac-8253-4e20-94c6-4a56c1f45e3a"
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,,,,,"40e522ac-8253-4e20-94c6-4a56c1f45e3a"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",mojaloop,,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,,,,,"40e522ac-8253-4e20-94c6-4a56c1f45e3a"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",mojaloop,,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,,,,,"40e522ac-8253-4e20-94c6-4a56c1f45e3a"
diff --git a/6ff0cec1-eefa-4a00-9bd7-d665c9cd0ac6_sub-batch-gorilla.csv b/6ff0cec1-eefa-4a00-9bd7-d665c9cd0ac6_sub-batch-gorilla.csv
deleted file mode 100644
index 24c56d89..00000000
--- a/6ff0cec1-eefa-4a00-9bd7-d665c9cd0ac6_sub-batch-gorilla.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"bc43e090-ee60-4056-b85e-e99bc8f750fe"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"bc43e090-ee60-4056-b85e-e99bc8f750fe"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"bc43e090-ee60-4056-b85e-e99bc8f750fe"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"bc43e090-ee60-4056-b85e-e99bc8f750fe"
diff --git a/70f00aa9-2204-4e15-9a3c-a2d3449811e5_27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv b/70f00aa9-2204-4e15-9a3c-a2d3449811e5_27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv
deleted file mode 100644
index 640af4e4..00000000
--- a/70f00aa9-2204-4e15-9a3c-a2d3449811e5_27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"d0ae9951-4d7c-4b1f-a74b-e0e17d7ae495"
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"d0ae9951-4d7c-4b1f-a74b-e0e17d7ae495"
\ No newline at end of file
diff --git a/71b3d07a-1617-4e94-9686-1674d39cc1c0_sub-batch-gorilla.csv b/71b3d07a-1617-4e94-9686-1674d39cc1c0_sub-batch-gorilla.csv
deleted file mode 100644
index f79d76ed..00000000
--- a/71b3d07a-1617-4e94-9686-1674d39cc1c0_sub-batch-gorilla.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"727135b2-75d3-4f81-8acb-69ecf7d8c283"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"727135b2-75d3-4f81-8acb-69ecf7d8c283"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"727135b2-75d3-4f81-8acb-69ecf7d8c283"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"727135b2-75d3-4f81-8acb-69ecf7d8c283"
diff --git a/79cc1e71-6cf1-4a45-95ae-6e4e049adc38_bulk_payment.csv b/79cc1e71-6cf1-4a45-95ae-6e4e049adc38_bulk_payment.csv
deleted file mode 100644
index 3fbc8913..00000000
--- a/79cc1e71-6cf1-4a45-95ae-6e4e049adc38_bulk_payment.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
-1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
-2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment
-3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment
-4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment
-5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment
\ No newline at end of file
diff --git a/7b700e1b-3b73-47ed-b872-e90b3ad1f4e8_sub-batch-1.csv b/7b700e1b-3b73-47ed-b872-e90b3ad1f4e8_sub-batch-1.csv
deleted file mode 100644
index 3ec717ce..00000000
--- a/7b700e1b-3b73-47ed-b872-e90b3ad1f4e8_sub-batch-1.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-
-0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment,38e1a856-1c47-4d1b-9365-a984e6170124
diff --git a/7f72cb32-68c9-44d4-b3d1-5c2fc13c1700_sub-batch-1.csv b/7f72cb32-68c9-44d4-b3d1-5c2fc13c1700_sub-batch-1.csv
deleted file mode 100644
index ec1ca829..00000000
--- a/7f72cb32-68c9-44d4-b3d1-5c2fc13c1700_sub-batch-1.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,"Test Payee Payment",,,,,"265b25a6-6870-4de7-ad1e-6fad0775cb19"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,"Test Payee Payment",,,,,"265b25a6-6870-4de7-ad1e-6fad0775cb19"
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,"Test Payee Payment",,,,,"265b25a6-6870-4de7-ad1e-6fad0775cb19"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,"Test Payee Payment",,,,,"265b25a6-6870-4de7-ad1e-6fad0775cb19"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,"Test Payee Payment",,,,,"265b25a6-6870-4de7-ad1e-6fad0775cb19"
diff --git a/8123b544-4c74-4264-b277-8d16ae3c4613_sub-batch-rhino.csv b/8123b544-4c74-4264-b277-8d16ae3c4613_sub-batch-rhino.csv
deleted file mode 100644
index a656f5f7..00000000
--- a/8123b544-4c74-4264-b277-8d16ae3c4613_sub-batch-rhino.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"6119191c-139e-436f-b624-fe3a921cafe8"
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"6119191c-139e-436f-b624-fe3a921cafe8"
diff --git a/842ee21f-f665-4124-929d-04fbf1e1a731_sub-batch-rhino.csv b/842ee21f-f665-4124-929d-04fbf1e1a731_sub-batch-rhino.csv
deleted file mode 100644
index c6210215..00000000
--- a/842ee21f-f665-4124-929d-04fbf1e1a731_sub-batch-rhino.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"7a119afc-ed74-4fcc-be11-04702c698d7c"
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"7a119afc-ed74-4fcc-be11-04702c698d7c"
diff --git a/85b7379c-979c-4d0a-ab9e-3e215fcedae1_sub-batch-rhino.csv b/85b7379c-979c-4d0a-ab9e-3e215fcedae1_sub-batch-rhino.csv
deleted file mode 100644
index 3d52682c..00000000
--- a/85b7379c-979c-4d0a-ab9e-3e215fcedae1_sub-batch-rhino.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"f144a8a2-872c-4c89-aa10-3a406edcc3aa"
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"f144a8a2-872c-4c89-aa10-3a406edcc3aa"
diff --git a/86b5162a-78de-47df-b494-65c88d4c308b_d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv b/86b5162a-78de-47df-b494-65c88d4c308b_d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv
deleted file mode 100644
index 85c56e9c..00000000
--- a/86b5162a-78de-47df-b494-65c88d4c308b_d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"bb080fe6-e814-4f06-a3f0-a2228d2ef701"
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"bb080fe6-e814-4f06-a3f0-a2228d2ef701"
\ No newline at end of file
diff --git a/8780cbd1-16f5-43c0-b1b4-3c53c664a7d5_bulk_payment.csv b/8780cbd1-16f5-43c0-b1b4-3c53c664a7d5_bulk_payment.csv
deleted file mode 100644
index 3fbc8913..00000000
--- a/8780cbd1-16f5-43c0-b1b4-3c53c664a7d5_bulk_payment.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
-1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
-2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment
-3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment
-4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment
-5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment
\ No newline at end of file
diff --git a/8ecd9222-27c6-488a-8396-7a4e0331490b_sub-batch-gorilla.csv b/8ecd9222-27c6-488a-8396-7a4e0331490b_sub-batch-gorilla.csv
deleted file mode 100644
index 54ef9564..00000000
--- a/8ecd9222-27c6-488a-8396-7a4e0331490b_sub-batch-gorilla.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"74d2b2bd-9d02-41e3-97fa-83872ce2e509"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"74d2b2bd-9d02-41e3-97fa-83872ce2e509"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"74d2b2bd-9d02-41e3-97fa-83872ce2e509"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"74d2b2bd-9d02-41e3-97fa-83872ce2e509"
diff --git a/908d01e5-4bc5-4ebf-a0c1-b121a4e7f35b_bulk_payment.csv b/908d01e5-4bc5-4ebf-a0c1-b121a4e7f35b_bulk_payment.csv
deleted file mode 100644
index 3fbc8913..00000000
--- a/908d01e5-4bc5-4ebf-a0c1-b121a4e7f35b_bulk_payment.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
-1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
-2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment
-3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment
-4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment
-5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment
\ No newline at end of file
diff --git a/98f08d7f-dd82-48d4-8524-7801ea3543fa_sub-batch-gorilla.csv b/98f08d7f-dd82-48d4-8524-7801ea3543fa_sub-batch-gorilla.csv
deleted file mode 100644
index 34aa5585..00000000
--- a/98f08d7f-dd82-48d4-8524-7801ea3543fa_sub-batch-gorilla.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"a58760a2-52c4-4f7a-89ab-cc9a3e329e5a"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"a58760a2-52c4-4f7a-89ab-cc9a3e329e5a"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"a58760a2-52c4-4f7a-89ab-cc9a3e329e5a"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"a58760a2-52c4-4f7a-89ab-cc9a3e329e5a"
diff --git a/9b8a3248-eb7d-4900-9539-2b0609c11b0c_sub-batch-1.csv b/9b8a3248-eb7d-4900-9539-2b0609c11b0c_sub-batch-1.csv
deleted file mode 100644
index 2ae24018..00000000
--- a/9b8a3248-eb7d-4900-9539-2b0609c11b0c_sub-batch-1.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,"Test Payee Payment",,,,,d523808c-d94c-4511-b7f0-9db52e85c74d
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,"Test Payee Payment",,,,,d523808c-d94c-4511-b7f0-9db52e85c74d
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,"Test Payee Payment",,,,,d523808c-d94c-4511-b7f0-9db52e85c74d
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,"Test Payee Payment",,,,,d523808c-d94c-4511-b7f0-9db52e85c74d
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,"Test Payee Payment",,,,,d523808c-d94c-4511-b7f0-9db52e85c74d
diff --git a/9e515093-03c9-4733-a693-3cea5354f9d5_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv b/9e515093-03c9-4733-a693-3cea5354f9d5_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
deleted file mode 100644
index d5805da4..00000000
--- a/9e515093-03c9-4733-a693-3cea5354f9d5_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",mojaloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",mojaloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",mojaloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",mojaloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
\ No newline at end of file
diff --git a/a3c7555b-6a37-494c-b825-9b0d9bcc2f9b_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv b/a3c7555b-6a37-494c-b825-9b0d9bcc2f9b_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
deleted file mode 100644
index d5805da4..00000000
--- a/a3c7555b-6a37-494c-b825-9b0d9bcc2f9b_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",mojaloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",mojaloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",mojaloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",mojaloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
\ No newline at end of file
diff --git a/a72f1ad3-bb12-4098-92b6-55a89c20bbba_sub-batch-1.csv b/a72f1ad3-bb12-4098-92b6-55a89c20bbba_sub-batch-1.csv
deleted file mode 100644
index b810552d..00000000
--- a/a72f1ad3-bb12-4098-92b6-55a89c20bbba_sub-batch-1.csv
+++ /dev/null
@@ -1 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
diff --git a/a78fffca-366a-4286-89dc-4a7163c3d366_sub-batch-rhino.csv b/a78fffca-366a-4286-89dc-4a7163c3d366_sub-batch-rhino.csv
deleted file mode 100644
index 3eade6d7..00000000
--- a/a78fffca-366a-4286-89dc-4a7163c3d366_sub-batch-rhino.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"8fac54e9-e785-4d8d-93f2-58791e98b808"
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"8fac54e9-e785-4d8d-93f2-58791e98b808"
diff --git a/aa703090-a6f0-4bd7-aa9b-47773a79f487_bulk_payment.csv b/aa703090-a6f0-4bd7-aa9b-47773a79f487_bulk_payment.csv
deleted file mode 100644
index 3fbc8913..00000000
--- a/aa703090-a6f0-4bd7-aa9b-47773a79f487_bulk_payment.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
-1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
-2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment
-3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment
-4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment
-5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment
\ No newline at end of file
diff --git a/aa7a8412-f681-4adf-aa18-2ff72f47f102_5846bf25-7337-40ec-b306-ccc909ebb457_sub-batch-2.csv b/aa7a8412-f681-4adf-aa18-2ff72f47f102_5846bf25-7337-40ec-b306-ccc909ebb457_sub-batch-2.csv
deleted file mode 100644
index b6c92c1b..00000000
--- a/aa7a8412-f681-4adf-aa18-2ff72f47f102_5846bf25-7337-40ec-b306-ccc909ebb457_sub-batch-2.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,,,,,"3eee9c23-9318-4d25-a156-617ab0644c88"
diff --git a/ab90a350-d417-40d6-9d66-c7b98f829d91_sub-batch-gorilla.csv b/ab90a350-d417-40d6-9d66-c7b98f829d91_sub-batch-gorilla.csv
deleted file mode 100644
index 85a4f95a..00000000
--- a/ab90a350-d417-40d6-9d66-c7b98f829d91_sub-batch-gorilla.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"a251ee4b-85e3-4568-9ec6-eb59d233cfe1"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"a251ee4b-85e3-4568-9ec6-eb59d233cfe1"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"a251ee4b-85e3-4568-9ec6-eb59d233cfe1"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"a251ee4b-85e3-4568-9ec6-eb59d233cfe1"
diff --git a/ac1f2aca-8e4c-4edd-8e2c-fd3417a33930_sub-batch-rhino.csv b/ac1f2aca-8e4c-4edd-8e2c-fd3417a33930_sub-batch-rhino.csv
deleted file mode 100644
index f35f8311..00000000
--- a/ac1f2aca-8e4c-4edd-8e2c-fd3417a33930_sub-batch-rhino.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"ab11a182-125b-4e6b-ba16-4006058c2fe0"
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"ab11a182-125b-4e6b-ba16-4006058c2fe0"
diff --git a/ac2ce741-da3f-4f47-8ac0-1125bcb78d5f_sub-batch-gorilla.csv b/ac2ce741-da3f-4f47-8ac0-1125bcb78d5f_sub-batch-gorilla.csv
deleted file mode 100644
index d8f9bf70..00000000
--- a/ac2ce741-da3f-4f47-8ac0-1125bcb78d5f_sub-batch-gorilla.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"5d78f2da-0a1a-4bf4-b8e0-6a6daea81412"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"5d78f2da-0a1a-4bf4-b8e0-6a6daea81412"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"5d78f2da-0a1a-4bf4-b8e0-6a6daea81412"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"5d78f2da-0a1a-4bf4-b8e0-6a6daea81412"
diff --git a/ac82f801-c644-4236-b784-0e43c3805527_sub-batch-rhino.csv b/ac82f801-c644-4236-b784-0e43c3805527_sub-batch-rhino.csv
deleted file mode 100644
index 0a7e2a87..00000000
--- a/ac82f801-c644-4236-b784-0e43c3805527_sub-batch-rhino.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"82ac5c05-289d-4872-a0f5-c91796efa7e4"
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"82ac5c05-289d-4872-a0f5-c91796efa7e4"
diff --git a/ae4266e2-d65d-4b06-9a05-5c51a542efcb_bulk_payment.csv b/ae4266e2-d65d-4b06-9a05-5c51a542efcb_bulk_payment.csv
deleted file mode 100644
index 3fbc8913..00000000
--- a/ae4266e2-d65d-4b06-9a05-5c51a542efcb_bulk_payment.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
-1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
-2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment
-3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment
-4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment
-5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment
\ No newline at end of file
diff --git a/b00e2cc4-7bee-45c2-a2f7-2e3127ca3031_5d45eab9-009a-4f48-a0ce-a581d48ff530_sub-batch-1.csv b/b00e2cc4-7bee-45c2-a2f7-2e3127ca3031_5d45eab9-009a-4f48-a0ce-a581d48ff530_sub-batch-1.csv
deleted file mode 100644
index 36613936..00000000
--- a/b00e2cc4-7bee-45c2-a2f7-2e3127ca3031_5d45eab9-009a-4f48-a0ce-a581d48ff530_sub-batch-1.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",mojaloop,,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,,,,,"877c3254-af31-4c38-b903-52b76825010d"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",mojaloop,,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,,,,,"877c3254-af31-4c38-b903-52b76825010d"
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,,,,,"877c3254-af31-4c38-b903-52b76825010d"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",mojaloop,,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,,,,,"877c3254-af31-4c38-b903-52b76825010d"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",mojaloop,,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,,,,,"877c3254-af31-4c38-b903-52b76825010d"
diff --git a/b4dacda7-f064-438f-8a4b-4854674482be_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv b/b4dacda7-f064-438f-8a4b-4854674482be_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
deleted file mode 100644
index d5805da4..00000000
--- a/b4dacda7-f064-438f-8a4b-4854674482be_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",mojaloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",mojaloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",mojaloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",mojaloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
\ No newline at end of file
diff --git a/b679e220-6763-4bec-8870-6d2f2d05afa9_bulk_payment.csv b/b679e220-6763-4bec-8870-6d2f2d05afa9_bulk_payment.csv
deleted file mode 100644
index 3fbc8913..00000000
--- a/b679e220-6763-4bec-8870-6d2f2d05afa9_bulk_payment.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
-1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
-2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment
-3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment
-4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment
-5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment
\ No newline at end of file
diff --git a/bc46c116-2dc0-4a0a-b64d-cdaa79d4993e_bulk_payment.csv b/bc46c116-2dc0-4a0a-b64d-cdaa79d4993e_bulk_payment.csv
deleted file mode 100644
index 3fbc8913..00000000
--- a/bc46c116-2dc0-4a0a-b64d-cdaa79d4993e_bulk_payment.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
-1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
-2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment
-3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment
-4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment
-5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment
\ No newline at end of file
diff --git a/be46e107-6ab9-45e2-90dd-3c8d14e00a95_sub-batch-rhino.csv b/be46e107-6ab9-45e2-90dd-3c8d14e00a95_sub-batch-rhino.csv
deleted file mode 100644
index 25b6d0cb..00000000
--- a/be46e107-6ab9-45e2-90dd-3c8d14e00a95_sub-batch-rhino.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"34e1a8ad-bae2-4e57-a2b3-11c17cc87123"
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"34e1a8ad-bae2-4e57-a2b3-11c17cc87123"
diff --git a/bea14bd3-8a40-4829-9f51-2590ddf651a3_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv b/bea14bd3-8a40-4829-9f51-2590ddf651a3_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
deleted file mode 100644
index d5805da4..00000000
--- a/bea14bd3-8a40-4829-9f51-2590ddf651a3_2b3025d7-f50d-4a24-9466-49012908deaa_sub-batch-gorilla.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",mojaloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",mojaloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",mojaloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",mojaloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"75a42fc1-3399-499c-8874-cda235194482"
\ No newline at end of file
diff --git a/c7697bf9-c533-41ea-8345-7c45da9811ed_sub-batch-rhino.csv b/c7697bf9-c533-41ea-8345-7c45da9811ed_sub-batch-rhino.csv
deleted file mode 100644
index 932e9f7f..00000000
--- a/c7697bf9-c533-41ea-8345-7c45da9811ed_sub-batch-rhino.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"d8e03c0a-2c8c-46e3-8035-9cbe58b82887"
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"d8e03c0a-2c8c-46e3-8035-9cbe58b82887"
diff --git a/d040581e-2a16-4f3b-962d-5970c58a7dfe_sub-batch-gorilla.csv b/d040581e-2a16-4f3b-962d-5970c58a7dfe_sub-batch-gorilla.csv
deleted file mode 100644
index e8c644a6..00000000
--- a/d040581e-2a16-4f3b-962d-5970c58a7dfe_sub-batch-gorilla.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"b910bcfa-6140-443c-a39c-3f2639f7e331"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"b910bcfa-6140-443c-a39c-3f2639f7e331"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"b910bcfa-6140-443c-a39c-3f2639f7e331"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"b910bcfa-6140-443c-a39c-3f2639f7e331"
diff --git a/d0d8b91a-a020-4f3c-9ab0-476876e81759_27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv b/d0d8b91a-a020-4f3c-9ab0-476876e81759_27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv
deleted file mode 100644
index 640af4e4..00000000
--- a/d0d8b91a-a020-4f3c-9ab0-476876e81759_27b7a6ea-1c92-4b6e-b9fb-fd8aba502566_sub-batch-rhino.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"d0ae9951-4d7c-4b1f-a74b-e0e17d7ae495"
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"d0ae9951-4d7c-4b1f-a74b-e0e17d7ae495"
\ No newline at end of file
diff --git a/d671627e-529d-4e74-ab12-e024d45bb8ab_sub-batch-gorilla.csv b/d671627e-529d-4e74-ab12-e024d45bb8ab_sub-batch-gorilla.csv
deleted file mode 100644
index c55dff52..00000000
--- a/d671627e-529d-4e74-ab12-e024d45bb8ab_sub-batch-gorilla.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"35b15509-9dfa-4344-adff-23e357b2483a"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"35b15509-9dfa-4344-adff-23e357b2483a"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"35b15509-9dfa-4344-adff-23e357b2483a"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"35b15509-9dfa-4344-adff-23e357b2483a"
diff --git a/d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv b/d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv
deleted file mode 100644
index 0278b132..00000000
--- a/d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"bb080fe6-e814-4f06-a3f0-a2228d2ef701"
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"bb080fe6-e814-4f06-a3f0-a2228d2ef701"
diff --git a/debffb76-36b2-4ff6-8f9f-2b3c9b4411d2_sub-batch-rhino.csv b/debffb76-36b2-4ff6-8f9f-2b3c9b4411d2_sub-batch-rhino.csv
deleted file mode 100644
index c55ae7d7..00000000
--- a/debffb76-36b2-4ff6-8f9f-2b3c9b4411d2_sub-batch-rhino.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"dd209561-9664-46bb-ac2e-acf8a16f6b65"
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"dd209561-9664-46bb-ac2e-acf8a16f6b65"
diff --git a/e0a27f6b-b090-408d-bb17-eacf86146983_bulk_payment.csv b/e0a27f6b-b090-408d-bb17-eacf86146983_bulk_payment.csv
deleted file mode 100644
index 3fbc8913..00000000
--- a/e0a27f6b-b090-408d-bb17-eacf86146983_bulk_payment.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
-1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
-2,f1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,Test Payee Payment
-3,q1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,Test Payee Payment
-4,a2aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,Test Payee Payment
-5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment
\ No newline at end of file
diff --git a/e1eae6bf-1980-4a06-8e29-d2d474f0546a_sub-batch-2.csv b/e1eae6bf-1980-4a06-8e29-d2d474f0546a_sub-batch-2.csv
deleted file mode 100644
index b30eaf7c..00000000
--- a/e1eae6bf-1980-4a06-8e29-d2d474f0546a_sub-batch-2.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino
diff --git a/e6950eac-515a-4a32-8d7f-e60b318b7043_sub-batch-2.csv b/e6950eac-515a-4a32-8d7f-e60b318b7043_sub-batch-2.csv
deleted file mode 100644
index ff7de2ab..00000000
--- a/e6950eac-515a-4a32-8d7f-e60b318b7043_sub-batch-2.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,"Test Payee Payment",,,,,8c06d9e4-a2fb-4eb2-9bb5-0270e4f7f907
diff --git a/e7b1c485-d526-4982-ad2a-a684b95d5320_sub-batch-gorilla.csv b/e7b1c485-d526-4982-ad2a-a684b95d5320_sub-batch-gorilla.csv
deleted file mode 100644
index 04b6d8ae..00000000
--- a/e7b1c485-d526-4982-ad2a-a684b95d5320_sub-batch-gorilla.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,850,USD,"Test Payee Payment",,,gorilla,"5ccf13a7-904a-430d-9cf1-9180c859f760"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,222,USD,"Test Payee Payment",,,gorilla,"5ccf13a7-904a-430d-9cf1-9180c859f760"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,,750,USD,"Test Payee Payment",,,gorilla,"5ccf13a7-904a-430d-9cf1-9180c859f760"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,,122,USD,"Test Payee Payment",,,gorilla,"5ccf13a7-904a-430d-9cf1-9180c859f760"
diff --git a/e9f37cc8-9177-4213-95e2-ffefdf41a56a_d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv b/e9f37cc8-9177-4213-95e2-ffefdf41a56a_d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv
deleted file mode 100644
index 85c56e9c..00000000
--- a/e9f37cc8-9177-4213-95e2-ffefdf41a56a_d6d2dda0-758d-400a-861c-41160db28443_sub-batch-rhino.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,,840,USD,"Test Payee Payment",,,rhino,"bb080fe6-e814-4f06-a3f0-a2228d2ef701"
-5,"z1e22fe3-9740-4fba-97b6-78f43bfa7f0f",mojaloop,,accountNumber,003001003879112168,accountNumber,,740,USD,"Test Payee Payment",,,rhino,"bb080fe6-e814-4f06-a3f0-a2228d2ef701"
\ No newline at end of file
diff --git a/ec0c518c-bacd-4c82-bff1-46e1620d3da3_sub-batch-1.csv b/ec0c518c-bacd-4c82-bff1-46e1620d3da3_sub-batch-1.csv
deleted file mode 100644
index e6114863..00000000
--- a/ec0c518c-bacd-4c82-bff1-46e1620d3da3_sub-batch-1.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-id,request_id,payment_mode,account_number,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note,program_shortcode,cycle,payee_dfsp_id,batch_id
-0,"g1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,,,,,"40e522ac-8253-4e20-94c6-4a56c1f45e3a"
-1,"72aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,,,,,"40e522ac-8253-4e20-94c6-4a56c1f45e3a"
-2,"f1e22fe3-9740-4fba-97b6-78f43bfa7f0f",closedloop,,accountNumber,003001003879112168,accountNumber,3001003873110195,840,USD,,,,,"40e522ac-8253-4e20-94c6-4a56c1f45e3a"
-3,"q1e22fe3-9740-4fba-97b6-78f43bfa7f2f",closedloop,,accountNumber,003001003879112168,accountNumber,3001003873110196,750,USD,,,,,"40e522ac-8253-4e20-94c6-4a56c1f45e3a"
-4,"a2aa3ea4-e6f6-4880-877f-39f6ac4d052e",closedloop,,accountNumber,003001003879112168,accountNumber,3001003874120160,122,USD,,,,,"40e522ac-8253-4e20-94c6-4a56c1f45e3a"
diff --git a/eed36f80-df49-44c0-bbf6-5d60d7d843b1_sub-batch-2.csv b/eed36f80-df49-44c0-bbf6-5d60d7d843b1_sub-batch-2.csv
deleted file mode 100644
index b297df6c..00000000
--- a/eed36f80-df49-44c0-bbf6-5d60d7d843b1_sub-batch-2.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-
-5,z1e22fe3-9740-4fba-97b6-78f43bfa7f0f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110195,740,USD,Test Payee Payment,9c41ab69-24b7-45ea-b886-b28c2b929045

From 34c168b647b65a2c4d05646165cf362491f1e84d Mon Sep 17 00:00:00 2001
From: abhinav <abhinav@Abhinavs-MacBook-Pro.local>
Date: Mon, 5 Feb 2024 00:37:42 +0530
Subject: [PATCH 13/16] checkstyle changes

---
 .../bulk/camel/routes/SplittingRoute.java     |  11 +-
 .../mifos/processor/bulk/kafka/Consumers.java | 232 +++++++++---------
 .../kafka/config/KafkaConsumerConfig.java     |  78 +++---
 .../kafka/config/KafkaProducerConfig.java     |  68 ++---
 .../bulk/kafka/config/KafkaTopicConfig.java   |  80 +++---
 .../bulk/utility/TransactionParser.java       |  66 +++++
 .../bulk/utility/TransactionUtil.java         |  36 ---
 7 files changed, 301 insertions(+), 270 deletions(-)
 create mode 100644 src/main/java/org/mifos/processor/bulk/utility/TransactionParser.java
 delete mode 100644 src/main/java/org/mifos/processor/bulk/utility/TransactionUtil.java

diff --git a/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java b/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java
index 1d23b6da..33a94b0b 100644
--- a/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java
+++ b/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java
@@ -19,8 +19,10 @@
 import com.fasterxml.jackson.databind.SequenceWriter;
 import com.fasterxml.jackson.dataformat.csv.CsvMapper;
 import com.fasterxml.jackson.dataformat.csv.CsvSchema;
-
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -32,8 +34,7 @@
 import org.apache.camel.LoggingLevel;
 import org.mifos.processor.bulk.schema.SubBatchEntity;
 import org.mifos.processor.bulk.schema.Transaction;
-import org.mifos.processor.bulk.utility.TransactionUtil;
-import org.mifos.processor.bulk.utility.Utils;
+import org.mifos.processor.bulk.utility.TransactionParser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -143,7 +144,7 @@ public void configure() throws Exception {
 
                     List<Transaction> subBatchTransactions = new ArrayList<>();
                     for (int j = i; j < Math.min(i + subBatchSize, lines.size()); j++) {
-                        Transaction transaction = TransactionUtil.parseLineToTransaction(lines.get(j));
+                        Transaction transaction = TransactionParser.parseLineToTransaction(lines.get(j));
                         assert transaction != null;
                         transaction.setBatchId(subBatchId); // Set the subBatchId for the transaction
                         subBatchTransactions.add(transaction);
diff --git a/src/main/java/org/mifos/processor/bulk/kafka/Consumers.java b/src/main/java/org/mifos/processor/bulk/kafka/Consumers.java
index b45588c6..03769b77 100644
--- a/src/main/java/org/mifos/processor/bulk/kafka/Consumers.java
+++ b/src/main/java/org/mifos/processor/bulk/kafka/Consumers.java
@@ -1,116 +1,116 @@
-//package org.mifos.processor.bulk.kafka;
-//
-//import static org.mifos.connector.common.mojaloop.type.InitiatorType.CONSUMER;
-//import static org.mifos.connector.common.mojaloop.type.Scenario.TRANSFER;
-//import static org.mifos.connector.common.mojaloop.type.TransactionRole.PAYER;
-//import static org.mifos.processor.bulk.zeebe.ZeebeVariables.BATCH_ID;
-//import static org.mifos.processor.bulk.zeebe.ZeebeVariables.GSMA_CHANNEL_REQUEST;
-//import static org.mifos.processor.bulk.zeebe.ZeebeVariables.INITIATOR_FSPID;
-//import static org.mifos.processor.bulk.zeebe.ZeebeVariables.IS_RTP_REQUEST;
-//import static org.mifos.processor.bulk.zeebe.ZeebeVariables.PARTY_ID;
-//import static org.mifos.processor.bulk.zeebe.ZeebeVariables.PARTY_ID_TYPE;
-//import static org.mifos.processor.bulk.zeebe.ZeebeVariables.PARTY_LOOKUP_FSPID;
-//import static org.mifos.processor.bulk.zeebe.ZeebeVariables.TENANT_ID;
-//import static org.mifos.processor.bulk.zeebe.ZeebeVariables.TRANSACTION_TYPE;
-//
-//import com.fasterxml.jackson.core.JsonProcessingException;
-//import com.fasterxml.jackson.databind.ObjectMapper;
-//import java.util.HashMap;
-//import java.util.Map;
-//import lombok.extern.slf4j.Slf4j;
-//import org.mifos.connector.common.channel.dto.TransactionChannelRequestDTO;
-//import org.mifos.connector.common.gsma.dto.GSMATransaction;
-//import org.mifos.connector.common.gsma.dto.GsmaParty;
-//import org.mifos.connector.common.mojaloop.dto.MoneyData;
-//import org.mifos.connector.common.mojaloop.dto.Party;
-//import org.mifos.connector.common.mojaloop.dto.PartyIdInfo;
-//import org.mifos.connector.common.mojaloop.dto.TransactionType;
-//import org.mifos.connector.common.mojaloop.type.IdentifierType;
-//import org.mifos.processor.bulk.schema.TransactionOlder;
-//import org.mifos.processor.bulk.zeebe.ZeebeProcessStarter;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.kafka.annotation.KafkaListener;
-//import org.springframework.stereotype.Service;
-//
-//@Service
-//@Slf4j
-//public class Consumers {
-//
-//    @Value("${bpmn.flows.international-remittance-payer}")
-//    private String internationalRemittancePayer;
-//
-//    @Autowired
-//    private ObjectMapper objectMapper;
-//
-//    @Autowired
-//    private ZeebeProcessStarter zeebeProcessStarter;
-//
-//    @KafkaListener(topics = "${kafka.topic.gsma.name}", groupId = "group_id")
-//    public void listenTopicGsma(String message) throws JsonProcessingException {
-//        log.debug("Received Message in topic GSMA and group group_id: {}", message);
-//        TransactionOlder transaction = objectMapper.readValue(message, TransactionOlder.class);
-//        String tenantId = "ibank-usa";
-//
-//        GSMATransaction gsmaChannelRequest = new GSMATransaction();
-//        gsmaChannelRequest.setAmount(transaction.getAmount());
-//        gsmaChannelRequest.setCurrency(transaction.getCurrency());
-//        gsmaChannelRequest.setRequestingLei("ibank-usa");
-//        gsmaChannelRequest.setReceivingLei("ibank-india");
-//        GsmaParty creditParty = new GsmaParty();
-//        creditParty.setKey("msisdn");
-//        creditParty.setValue(transaction.getAccountNumber());
-//        GsmaParty debitParty = new GsmaParty();
-//        debitParty.setKey("msisdn");
-//        debitParty.setValue(transaction.getAccountNumber());
-//        gsmaChannelRequest.setCreditParty(new GsmaParty[] { creditParty });
-//        gsmaChannelRequest.setDebitParty(new GsmaParty[] { debitParty });
-//        // gsmaChannelRequest.setInternationalTransferInformation().setReceivingAmount(gsmaChannelRequest.getAmount());
-//
-//        TransactionChannelRequestDTO channelRequest = new TransactionChannelRequestDTO(); // Fineract Object
-//        Party payee = new Party(new PartyIdInfo(IdentifierType.MSISDN, transaction.getAccountNumber()));
-//        Party payer = new Party(new PartyIdInfo(IdentifierType.MSISDN, "7543010"));
-//
-//        MoneyData moneyData = new MoneyData();
-//        moneyData.setAmount(transaction.getAmount());
-//        moneyData.setCurrency(transaction.getCurrency());
-//
-//        channelRequest.setPayer(payer);
-//        channelRequest.setPayee(payee);
-//        channelRequest.setAmount(moneyData);
-//
-//        TransactionType transactionType = new TransactionType();
-//        transactionType.setInitiator(PAYER);
-//        transactionType.setInitiatorType(CONSUMER);
-//        transactionType.setScenario(TRANSFER);
-//
-//        Map<String, Object> extraVariables = new HashMap<>();
-//        extraVariables.put(IS_RTP_REQUEST, false);
-//        extraVariables.put(TRANSACTION_TYPE, "inttransfer");
-//        extraVariables.put(TENANT_ID, tenantId);
-//
-//        extraVariables.put(BATCH_ID, transaction.getBatchId());
-//
-//        String tenantSpecificBpmn = internationalRemittancePayer.replace("{dfspid}", tenantId);
-//        channelRequest.setTransactionType(transactionType);
-//
-//        PartyIdInfo requestedParty = (boolean) extraVariables.get(IS_RTP_REQUEST) ? channelRequest.getPayer().getPartyIdInfo()
-//                : channelRequest.getPayee().getPartyIdInfo();
-//        extraVariables.put(PARTY_ID_TYPE, requestedParty.getPartyIdType());
-//        extraVariables.put(PARTY_ID, requestedParty.getPartyIdentifier());
-//
-//        extraVariables.put(GSMA_CHANNEL_REQUEST, objectMapper.writeValueAsString(gsmaChannelRequest));
-//        extraVariables.put(PARTY_LOOKUP_FSPID, gsmaChannelRequest.getReceivingLei());
-//        extraVariables.put(INITIATOR_FSPID, gsmaChannelRequest.getRequestingLei());
-//
-//        String transactionId = zeebeProcessStarter.startZeebeWorkflow(tenantSpecificBpmn, objectMapper.writeValueAsString(channelRequest),
-//                extraVariables);
-//
-//        log.debug("GSMA Transaction Started with:{} ", transactionId);
-//    }
-//
-//    @KafkaListener(topics = "${kafka.topic.slcb.name}", groupId = "group_id")
-//    public void listenTopicSlcb(String message) {
-//        log.debug("Received Message in topic SLCB and group group_id:{} ", message);
-//    }
-//}
+package org.mifos.processor.bulk.kafka;
+
+import static org.mifos.connector.common.mojaloop.type.InitiatorType.CONSUMER;
+import static org.mifos.connector.common.mojaloop.type.Scenario.TRANSFER;
+import static org.mifos.connector.common.mojaloop.type.TransactionRole.PAYER;
+import static org.mifos.processor.bulk.zeebe.ZeebeVariables.BATCH_ID;
+import static org.mifos.processor.bulk.zeebe.ZeebeVariables.GSMA_CHANNEL_REQUEST;
+import static org.mifos.processor.bulk.zeebe.ZeebeVariables.INITIATOR_FSPID;
+import static org.mifos.processor.bulk.zeebe.ZeebeVariables.IS_RTP_REQUEST;
+import static org.mifos.processor.bulk.zeebe.ZeebeVariables.PARTY_ID;
+import static org.mifos.processor.bulk.zeebe.ZeebeVariables.PARTY_ID_TYPE;
+import static org.mifos.processor.bulk.zeebe.ZeebeVariables.PARTY_LOOKUP_FSPID;
+import static org.mifos.processor.bulk.zeebe.ZeebeVariables.TENANT_ID;
+import static org.mifos.processor.bulk.zeebe.ZeebeVariables.TRANSACTION_TYPE;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.HashMap;
+import java.util.Map;
+import lombok.extern.slf4j.Slf4j;
+import org.mifos.connector.common.channel.dto.TransactionChannelRequestDTO;
+import org.mifos.connector.common.gsma.dto.GSMATransaction;
+import org.mifos.connector.common.gsma.dto.GsmaParty;
+import org.mifos.connector.common.mojaloop.dto.MoneyData;
+import org.mifos.connector.common.mojaloop.dto.Party;
+import org.mifos.connector.common.mojaloop.dto.PartyIdInfo;
+import org.mifos.connector.common.mojaloop.dto.TransactionType;
+import org.mifos.connector.common.mojaloop.type.IdentifierType;
+import org.mifos.processor.bulk.schema.TransactionOlder;
+import org.mifos.processor.bulk.zeebe.ZeebeProcessStarter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.kafka.annotation.KafkaListener;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class Consumers {
+
+    @Value("${bpmn.flows.international-remittance-payer}")
+    private String internationalRemittancePayer;
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    @Autowired
+    private ZeebeProcessStarter zeebeProcessStarter;
+
+    @KafkaListener(topics = "${kafka.topic.gsma.name}", groupId = "group_id")
+    public void listenTopicGsma(String message) throws JsonProcessingException {
+        log.debug("Received Message in topic GSMA and group group_id: {}", message);
+        TransactionOlder transaction = objectMapper.readValue(message, TransactionOlder.class);
+        String tenantId = "ibank-usa";
+
+        GSMATransaction gsmaChannelRequest = new GSMATransaction();
+        gsmaChannelRequest.setAmount(transaction.getAmount());
+        gsmaChannelRequest.setCurrency(transaction.getCurrency());
+        gsmaChannelRequest.setRequestingLei("ibank-usa");
+        gsmaChannelRequest.setReceivingLei("ibank-india");
+        GsmaParty creditParty = new GsmaParty();
+        creditParty.setKey("msisdn");
+        creditParty.setValue(transaction.getAccountNumber());
+        GsmaParty debitParty = new GsmaParty();
+        debitParty.setKey("msisdn");
+        debitParty.setValue(transaction.getAccountNumber());
+        gsmaChannelRequest.setCreditParty(new GsmaParty[] { creditParty });
+        gsmaChannelRequest.setDebitParty(new GsmaParty[] { debitParty });
+        // gsmaChannelRequest.setInternationalTransferInformation().setReceivingAmount(gsmaChannelRequest.getAmount());
+
+        TransactionChannelRequestDTO channelRequest = new TransactionChannelRequestDTO(); // Fineract Object
+        Party payee = new Party(new PartyIdInfo(IdentifierType.MSISDN, transaction.getAccountNumber()));
+        Party payer = new Party(new PartyIdInfo(IdentifierType.MSISDN, "7543010"));
+
+        MoneyData moneyData = new MoneyData();
+        moneyData.setAmount(transaction.getAmount());
+        moneyData.setCurrency(transaction.getCurrency());
+
+        channelRequest.setPayer(payer);
+        channelRequest.setPayee(payee);
+        channelRequest.setAmount(moneyData);
+
+        TransactionType transactionType = new TransactionType();
+        transactionType.setInitiator(PAYER);
+        transactionType.setInitiatorType(CONSUMER);
+        transactionType.setScenario(TRANSFER);
+
+        Map<String, Object> extraVariables = new HashMap<>();
+        extraVariables.put(IS_RTP_REQUEST, false);
+        extraVariables.put(TRANSACTION_TYPE, "inttransfer");
+        extraVariables.put(TENANT_ID, tenantId);
+
+        extraVariables.put(BATCH_ID, transaction.getBatchId());
+
+        String tenantSpecificBpmn = internationalRemittancePayer.replace("{dfspid}", tenantId);
+        channelRequest.setTransactionType(transactionType);
+
+        PartyIdInfo requestedParty = (boolean) extraVariables.get(IS_RTP_REQUEST) ? channelRequest.getPayer().getPartyIdInfo()
+                : channelRequest.getPayee().getPartyIdInfo();
+        extraVariables.put(PARTY_ID_TYPE, requestedParty.getPartyIdType());
+        extraVariables.put(PARTY_ID, requestedParty.getPartyIdentifier());
+
+        extraVariables.put(GSMA_CHANNEL_REQUEST, objectMapper.writeValueAsString(gsmaChannelRequest));
+        extraVariables.put(PARTY_LOOKUP_FSPID, gsmaChannelRequest.getReceivingLei());
+        extraVariables.put(INITIATOR_FSPID, gsmaChannelRequest.getRequestingLei());
+
+        String transactionId = zeebeProcessStarter.startZeebeWorkflow(tenantSpecificBpmn, objectMapper.writeValueAsString(channelRequest),
+                extraVariables);
+
+        log.debug("GSMA Transaction Started with:{} ", transactionId);
+    }
+
+    @KafkaListener(topics = "${kafka.topic.slcb.name}", groupId = "group_id")
+    public void listenTopicSlcb(String message) {
+        log.debug("Received Message in topic SLCB and group group_id:{} ", message);
+    }
+}
diff --git a/src/main/java/org/mifos/processor/bulk/kafka/config/KafkaConsumerConfig.java b/src/main/java/org/mifos/processor/bulk/kafka/config/KafkaConsumerConfig.java
index bb04a764..e9694b89 100644
--- a/src/main/java/org/mifos/processor/bulk/kafka/config/KafkaConsumerConfig.java
+++ b/src/main/java/org/mifos/processor/bulk/kafka/config/KafkaConsumerConfig.java
@@ -1,39 +1,39 @@
-//package org.mifos.processor.bulk.kafka.config;
-//
-//import java.util.HashMap;
-//import java.util.Map;
-//import org.apache.kafka.clients.consumer.ConsumerConfig;
-//import org.apache.kafka.common.serialization.StringDeserializer;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.kafka.annotation.EnableKafka;
-//import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory;
-//import org.springframework.kafka.core.ConsumerFactory;
-//import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
-//
-//@EnableKafka
-//@Configuration
-//public class KafkaConsumerConfig {
-//
-//    @Value(value = "${kafka.bootstrapAddress}")
-//    private String bootstrapAddress;
-//
-//    @Bean
-//    public ConsumerFactory<String, String> consumerFactory() {
-//        Map<String, Object> props = new HashMap<>();
-//        props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress);
-//        props.put(ConsumerConfig.GROUP_ID_CONFIG, "group_id");
-//        props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
-//        props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
-//        return new DefaultKafkaConsumerFactory<>(props);
-//    }
-//
-//    @Bean
-//    public ConcurrentKafkaListenerContainerFactory<String, String> kafkaListenerContainerFactory() {
-//        ConcurrentKafkaListenerContainerFactory<String, String> factory = new ConcurrentKafkaListenerContainerFactory<>();
-//        factory.setConsumerFactory(consumerFactory());
-//        return factory;
-//    }
-//
-//}
+package org.mifos.processor.bulk.kafka.config;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.common.serialization.StringDeserializer;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.kafka.annotation.EnableKafka;
+import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory;
+import org.springframework.kafka.core.ConsumerFactory;
+import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
+
+@EnableKafka
+@Configuration
+public class KafkaConsumerConfig {
+
+    @Value(value = "${kafka.bootstrapAddress}")
+    private String bootstrapAddress;
+
+    @Bean
+    public ConsumerFactory<String, String> consumerFactory() {
+        Map<String, Object> props = new HashMap<>();
+        props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress);
+        props.put(ConsumerConfig.GROUP_ID_CONFIG, "group_id");
+        props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
+        props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
+        return new DefaultKafkaConsumerFactory<>(props);
+    }
+
+    @Bean
+    public ConcurrentKafkaListenerContainerFactory<String, String> kafkaListenerContainerFactory() {
+        ConcurrentKafkaListenerContainerFactory<String, String> factory = new ConcurrentKafkaListenerContainerFactory<>();
+        factory.setConsumerFactory(consumerFactory());
+        return factory;
+    }
+
+}
diff --git a/src/main/java/org/mifos/processor/bulk/kafka/config/KafkaProducerConfig.java b/src/main/java/org/mifos/processor/bulk/kafka/config/KafkaProducerConfig.java
index 5caa219d..11b9aa2a 100644
--- a/src/main/java/org/mifos/processor/bulk/kafka/config/KafkaProducerConfig.java
+++ b/src/main/java/org/mifos/processor/bulk/kafka/config/KafkaProducerConfig.java
@@ -1,34 +1,34 @@
-//package org.mifos.processor.bulk.kafka.config;
-//
-//import java.util.HashMap;
-//import java.util.Map;
-//import org.apache.kafka.clients.producer.ProducerConfig;
-//import org.apache.kafka.common.serialization.StringSerializer;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.kafka.core.DefaultKafkaProducerFactory;
-//import org.springframework.kafka.core.KafkaTemplate;
-//import org.springframework.kafka.core.ProducerFactory;
-//
-//@Configuration
-//public class KafkaProducerConfig {
-//
-//    @Value(value = "${kafka.bootstrapAddress}")
-//    private String bootstrapAddress;
-//
-//    @Bean
-//    public ProducerFactory<String, String> producerFactory() {
-//        Map<String, Object> configProps = new HashMap<>();
-//        configProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress);
-//        configProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
-//        configProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
-//        return new DefaultKafkaProducerFactory<>(configProps);
-//    }
-//
-//    @Bean
-//    public KafkaTemplate<String, String> kafkaTemplate() {
-//        return new KafkaTemplate<>(producerFactory());
-//    }
-//
-//}
+package org.mifos.processor.bulk.kafka.config;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.common.serialization.StringSerializer;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.kafka.core.DefaultKafkaProducerFactory;
+import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.kafka.core.ProducerFactory;
+
+@Configuration
+public class KafkaProducerConfig {
+
+    @Value(value = "${kafka.bootstrapAddress}")
+    private String bootstrapAddress;
+
+    @Bean
+    public ProducerFactory<String, String> producerFactory() {
+        Map<String, Object> configProps = new HashMap<>();
+        configProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress);
+        configProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
+        configProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
+        return new DefaultKafkaProducerFactory<>(configProps);
+    }
+
+    @Bean
+    public KafkaTemplate<String, String> kafkaTemplate() {
+        return new KafkaTemplate<>(producerFactory());
+    }
+
+}
diff --git a/src/main/java/org/mifos/processor/bulk/kafka/config/KafkaTopicConfig.java b/src/main/java/org/mifos/processor/bulk/kafka/config/KafkaTopicConfig.java
index f7dd2735..7d2f2ff7 100644
--- a/src/main/java/org/mifos/processor/bulk/kafka/config/KafkaTopicConfig.java
+++ b/src/main/java/org/mifos/processor/bulk/kafka/config/KafkaTopicConfig.java
@@ -1,40 +1,40 @@
-//package org.mifos.processor.bulk.kafka.config;
-//
-//import java.util.HashMap;
-//import java.util.Map;
-//import org.apache.kafka.clients.admin.AdminClientConfig;
-//import org.apache.kafka.clients.admin.NewTopic;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.kafka.core.KafkaAdmin;
-//
-//@Configuration
-//public class KafkaTopicConfig {
-//
-//    @Value(value = "${kafka.bootstrapAddress}")
-//    private String bootstrapAddress;
-//
-//    @Value(value = "${kafka.topic.gsma.name}")
-//    private String gsmaTopicName;
-//
-//    @Value(value = "${kafka.topic.slcb.name}")
-//    private String slcbTopicName;
-//
-//    @Bean
-//    public KafkaAdmin kafkaAdmin() {
-//        Map<String, Object> configs = new HashMap<>();
-//        configs.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress);
-//        return new KafkaAdmin(configs);
-//    }
-//
-//    @Bean
-//    public NewTopic gsmaTopic() {
-//        return new NewTopic(gsmaTopicName, 1, (short) 1);
-//    }
-//
-//    @Bean
-//    public NewTopic slcbTopic() {
-//        return new NewTopic(slcbTopicName, 1, (short) 1);
-//    }
-//}
+package org.mifos.processor.bulk.kafka.config;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.kafka.clients.admin.AdminClientConfig;
+import org.apache.kafka.clients.admin.NewTopic;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.kafka.core.KafkaAdmin;
+
+@Configuration
+public class KafkaTopicConfig {
+
+    @Value(value = "${kafka.bootstrapAddress}")
+    private String bootstrapAddress;
+
+    @Value(value = "${kafka.topic.gsma.name}")
+    private String gsmaTopicName;
+
+    @Value(value = "${kafka.topic.slcb.name}")
+    private String slcbTopicName;
+
+    @Bean
+    public KafkaAdmin kafkaAdmin() {
+        Map<String, Object> configs = new HashMap<>();
+        configs.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress);
+        return new KafkaAdmin(configs);
+    }
+
+    @Bean
+    public NewTopic gsmaTopic() {
+        return new NewTopic(gsmaTopicName, 1, (short) 1);
+    }
+
+    @Bean
+    public NewTopic slcbTopic() {
+        return new NewTopic(slcbTopicName, 1, (short) 1);
+    }
+}
diff --git a/src/main/java/org/mifos/processor/bulk/utility/TransactionParser.java b/src/main/java/org/mifos/processor/bulk/utility/TransactionParser.java
new file mode 100644
index 00000000..03f4138f
--- /dev/null
+++ b/src/main/java/org/mifos/processor/bulk/utility/TransactionParser.java
@@ -0,0 +1,66 @@
+package org.mifos.processor.bulk.utility;
+
+import org.mifos.processor.bulk.schema.Transaction;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public final class TransactionParser {
+
+    private static final Logger logger = LoggerFactory.getLogger(TransactionParser.class);
+
+    private TransactionParser() {
+        throw new IllegalStateException("Utility class");
+    }
+
+    public static Transaction parseLineToTransaction(String line) {
+        try {
+            String[] parts = line.split(",", -1);
+            Transaction transaction = new Transaction();
+
+            if (parts.length > 0 && !parts[0].isEmpty()) {
+                transaction.setId(Integer.parseInt(parts[0]));
+            }
+            if (parts.length > 1) {
+                transaction.setRequestId(parts[1]);
+            }
+            if (parts.length > 2) {
+                transaction.setPaymentMode(parts[2]);
+            }
+            if (parts.length > 4) {
+                transaction.setPayerIdentifierType(parts[3]);
+            }
+            if (parts.length > 5) {
+                transaction.setPayerIdentifier(parts[4]);
+            }
+            if (parts.length > 6) {
+                transaction.setPayeeIdentifierType(parts[5]);
+            }
+            if (parts.length > 7) {
+                transaction.setPayeeIdentifier(parts[6]);
+            }
+            if (parts.length > 8) {
+                transaction.setAmount(parts[7]);
+            }
+            if (parts.length > 9) {
+                transaction.setCurrency(parts[8]);
+            }
+            if (parts.length > 10) {
+                transaction.setNote(parts[9]);
+            }
+            if (parts.length > 11) {
+                transaction.setProgramShortCode(parts[10]);
+            }
+            if (parts.length > 12) {
+                transaction.setCycle(parts[11]);
+            }
+            if (parts.length > 13) {
+                transaction.setPayeeDfspId(parts[12]);
+            }
+
+            return transaction;
+        } catch (Exception e) {
+            logger.error("Error parsing line to Transaction object: {}", line, e);
+            return null;
+        }
+    }
+}
diff --git a/src/main/java/org/mifos/processor/bulk/utility/TransactionUtil.java b/src/main/java/org/mifos/processor/bulk/utility/TransactionUtil.java
deleted file mode 100644
index b76ff3fb..00000000
--- a/src/main/java/org/mifos/processor/bulk/utility/TransactionUtil.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.mifos.processor.bulk.utility;
-
-import org.mifos.processor.bulk.schema.Transaction;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TransactionUtil {
-
-    private static final Logger logger = LoggerFactory.getLogger(TransactionUtil.class);
-
-    public static Transaction parseLineToTransaction(String line) {
-        try {
-            String[] parts = line.split(",", -1);
-            Transaction transaction = new Transaction();
-
-            if (parts.length > 0 && !parts[0].isEmpty()) transaction.setId(Integer.parseInt(parts[0]));
-            if (parts.length > 1) transaction.setRequestId(parts[1]);
-            if (parts.length > 2) transaction.setPaymentMode(parts[2]);
-            if (parts.length > 4) transaction.setPayerIdentifierType(parts[3]);
-            if (parts.length > 5) transaction.setPayerIdentifier(parts[4]);
-            if (parts.length > 6) transaction.setPayeeIdentifierType(parts[5]);
-            if (parts.length > 7) transaction.setPayeeIdentifier(parts[6]);
-            if (parts.length > 8) transaction.setAmount(parts[7]);
-            if (parts.length > 9) transaction.setCurrency(parts[8]);
-            if (parts.length > 10) transaction.setNote(parts[9]);
-            if (parts.length > 11) transaction.setProgramShortCode(parts[10]);
-            if (parts.length > 12) transaction.setCycle(parts[11]);
-            if (parts.length > 13) transaction.setPayeeDfspId(parts[12]);
-
-            return transaction;
-        } catch (Exception e) {
-            logger.error("Error parsing line to Transaction object: {}", line, e);
-            return null;
-        }
-    }
-}

From 55aec6d687ab26aa87c43bdc70f50935e62adb07 Mon Sep 17 00:00:00 2001
From: Abhinav Mishra <abhinav@fynarfin.in>
Date: Tue, 19 Mar 2024 19:10:03 +0530
Subject: [PATCH 14/16] Init sub-batch fix

---
 c20db108-f2fe-4151-a526-b353cee18e41_bulk_payment.csv | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 c20db108-f2fe-4151-a526-b353cee18e41_bulk_payment.csv

diff --git a/c20db108-f2fe-4151-a526-b353cee18e41_bulk_payment.csv b/c20db108-f2fe-4151-a526-b353cee18e41_bulk_payment.csv
new file mode 100644
index 00000000..41dbe119
--- /dev/null
+++ b/c20db108-f2fe-4151-a526-b353cee18e41_bulk_payment.csv
@@ -0,0 +1,6 @@
+id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
+0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
+1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
+2,a1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,003001003879112168,accountNumber,3001003873110196,950,USD,Test Payee Payment
+3,b2aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,003001003879112168,accountNumber,3001003874120160,322,USD,Test Payee Payment
+4,c1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,003001003879112168,accountNumber,3001003873110195,940,USD,Test Payee Payment
\ No newline at end of file

From 691b782b29fc7968a2a49820e3b25aa6d3971792 Mon Sep 17 00:00:00 2001
From: Anover000 <ankit@fynarfin.io>
Date: Fri, 22 Mar 2024 17:37:44 +0530
Subject: [PATCH 15/16] raw body fix

---
 .../processor/bulk/camel/routes/SplittingRoute.java      | 2 ++
 .../org/mifos/processor/bulk/schema/Transaction.java     | 4 ++--
 src/main/resources/application.yaml                      | 9 +++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java b/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java
index 33a94b0b..6aaf3db1 100644
--- a/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java
+++ b/src/main/java/org/mifos/processor/bulk/camel/routes/SplittingRoute.java
@@ -1,7 +1,9 @@
 package org.mifos.processor.bulk.camel.routes;
 
 import static org.mifos.processor.bulk.camel.config.CamelProperties.LOCAL_FILE_PATH;
+import static org.mifos.processor.bulk.camel.config.CamelProperties.OVERRIDE_HEADER;
 import static org.mifos.processor.bulk.camel.config.CamelProperties.REGISTERING_INSTITUTE_ID;
+import static org.mifos.processor.bulk.camel.config.CamelProperties.RESULT_TRANSACTION_LIST;
 import static org.mifos.processor.bulk.camel.config.CamelProperties.SERVER_FILE_NAME;
 import static org.mifos.processor.bulk.camel.config.CamelProperties.SERVER_SUB_BATCH_FILE_NAME_ARRAY;
 import static org.mifos.processor.bulk.camel.config.CamelProperties.SUB_BATCH_COUNT;
diff --git a/src/main/java/org/mifos/processor/bulk/schema/Transaction.java b/src/main/java/org/mifos/processor/bulk/schema/Transaction.java
index e16716f5..79b12798 100644
--- a/src/main/java/org/mifos/processor/bulk/schema/Transaction.java
+++ b/src/main/java/org/mifos/processor/bulk/schema/Transaction.java
@@ -11,9 +11,9 @@
 @Getter
 @Setter
 @JsonIgnoreProperties(ignoreUnknown = true)
-@JsonPropertyOrder({ "id", "request_id", "payment_mode", "account_number", "payer_identifier_type", "payer_identifier",
+@JsonPropertyOrder({ "id", "request_id", "payment_mode", "payer_identifier_type", "payer_identifier",
         "payee_identifier_type", "payee_identifier", "amount", "currency", "note", "program_shortcode", "cycle", "payee_dfsp_id",
-        "batch_id" })
+        "batch_id", "account_number" })
 public class Transaction implements CsvSchema {
 
     @JsonProperty("id")
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index e69b2e47..8cc060f9 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -92,11 +92,11 @@ config:
   partylookup:
     enable: true
   authorization:
-    enabled: false
+    enabled: true
   approval:
     enable: true
   ordering:
-    enable: false
+    enable: true
     field: "payerIdentifier"
   splitting:
     enable: true
@@ -218,6 +218,7 @@ gov-stack-client:
   header-key: "X-GovStack-Client"
   header-value: "PAYMENT-BB"
 
+
 bpmns:
   tenants:
     - id: "gorilla"
@@ -228,7 +229,7 @@ bpmns:
         batch-transactions: "bulk_processor-{dfspid}"
     - id: "rhino"
       flows:
-        batch-transactions: "bulk_processor-{dfspid}"
+        batch-transactions: "bulk_processor_account_lookup-{dfspid}"
     - id: "lion"
       flows:
-        batch-transactions: "bulk_processor_account_lookup-{dfspid}"
+        batch-transactions: "bulk_processor-{dfspid}"
\ No newline at end of file

From f12220b4639c968a9d6aa0a7a5de081c05fed03c Mon Sep 17 00:00:00 2001
From: abhinavm117 <150892830+abhinavm117@users.noreply.github.com>
Date: Mon, 25 Mar 2024 19:57:51 +0530
Subject: [PATCH 16/16] Delete
 c20db108-f2fe-4151-a526-b353cee18e41_bulk_payment.csv

Unnecessary file, review comment
---
 c20db108-f2fe-4151-a526-b353cee18e41_bulk_payment.csv | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 c20db108-f2fe-4151-a526-b353cee18e41_bulk_payment.csv

diff --git a/c20db108-f2fe-4151-a526-b353cee18e41_bulk_payment.csv b/c20db108-f2fe-4151-a526-b353cee18e41_bulk_payment.csv
deleted file mode 100644
index 41dbe119..00000000
--- a/c20db108-f2fe-4151-a526-b353cee18e41_bulk_payment.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-0,g1e22fe3-9740-4fba-97b6-78f43bfa7f2f,closedloop,accountNumber,003001003879112168,accountNumber,3001003873110196,850,USD,Test Payee Payment
-1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,closedloop,accountNumber,003001003879112168,accountNumber,3001003874120160,222,USD,Test Payee Payment
-2,a1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,003001003879112168,accountNumber,3001003873110196,950,USD,Test Payee Payment
-3,b2aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,003001003879112168,accountNumber,3001003874120160,322,USD,Test Payee Payment
-4,c1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,003001003879112168,accountNumber,3001003873110195,940,USD,Test Payee Payment
\ No newline at end of file