From a2ee92aa742f3ffbfb4e4d0d6324d7fbeddd4a8c Mon Sep 17 00:00:00 2001 From: Ankita Ranjan Date: Tue, 30 Jul 2024 23:13:12 +0530 Subject: [PATCH] Sync fixes for bp --- ...af-b710-ca076b16bcb6_ph-ee-bulk-demo-6.csv | 11 + ...18-a2df-0e1e4c788ee9_ph-ee-bulk-demo-6.csv | 11 + ...f8-9c7b-7c1413bafeab_ph-ee-bulk-demo-6.csv | 11 + ...59-813e-0b22ab119737_ph-ee-bulk-demo-6.csv | 11 + ...27-ab35-f2f70a2b22f1_ph-ee-bulk-demo-6.csv | 11 + ...cd-83d9-1b6514442c6f_ph-ee-bulk-demo-6.csv | 11 + ...be-8613-04f0e7c7ef5a_ph-ee-bulk-demo-6.csv | 11 + ...57-9791-d15f6eab5443_ph-ee-bulk-demo-6.csv | 11 + ...b2-aa27-af5cf4f21ad2_ph-ee-bulk-demo-6.csv | 11 + ...cc-952a-5990022ec722_ph-ee-bulk-demo-6.csv | 11 + ...22-8fe4-2b07aaaa00b7_ph-ee-bulk-demo-6.csv | 11 + ...c9-b9b3-e153ecd685b5_ph-ee-bulk-demo-6.csv | 11 + ...be-8943-715548a8a1e6_ph-ee-bulk-demo-6.csv | 11 + ...51-9c88-f3858068c6d4_ph-ee-bulk-demo-6.csv | 11 + ...5b-85a0-f4292ce1c365_ph-ee-bulk-demo-6.csv | 11 + ...b2-b8f4-1b2a58a0a297_ph-ee-bulk-demo-6.csv | 11 + ...7e-a33b-470b9d40f712_ph-ee-bulk-demo-6.csv | 11 + ...ec-9bd0-fa21479f0df1_ph-ee-bulk-demo-6.csv | 11 + ...59-a0f7-24cbb90f9d77_ph-ee-bulk-demo-6.csv | 11 + ...37-8381-d5f40e018106_ph-ee-bulk-demo-6.csv | 11 + ...8b-9fde-6dc85c1556c6_ph-ee-bulk-demo-6.csv | 11 + ...00-b5b9-ce75351780fc_ph-ee-bulk-demo-6.csv | 11 + ...fd-b7cf-fb0423707e82_ph-ee-bulk-demo-6.csv | 11 + build.gradle | 2 +- ...ba-b971-49e597d93bb0_ph-ee-bulk-demo-6.csv | 11 + ...ab-9f20-7db38f09d8e7_ph-ee-bulk-demo-6.csv | 11 + ...99-8185-1ff49486a8f0_ph-ee-bulk-demo-6.csv | 11 + ...ff-a37c-d3a0e4497316_ph-ee-bulk-demo-6.csv | 11 + ...81-85c9-2420d405cc12_ph-ee-bulk-demo-6.csv | 11 + ...7e-b0c7-b2a73d3a26e8_ph-ee-bulk-demo-6.csv | 11 + ...84-b85c-5391f739f172_ph-ee-bulk-demo-6.csv | 11 + ...7b-85fc-89c54a03a736_ph-ee-bulk-demo-6.csv | 11 + .../bulk/BatchTransactionValidator.java | 97 ++++++++ .../bulk/BatchTransactionValidatorsEnum.java | 44 ++++ .../BatchTransactionsController.java | 61 +++-- .../mifos/processor/bulk/kafka/Consumers.java | 232 +++++++++--------- .../kafka/config/KafkaConsumerConfig.java | 78 +++--- .../kafka/config/KafkaProducerConfig.java | 68 ++--- .../bulk/kafka/config/KafkaTopicConfig.java | 80 +++--- src/main/resources/application.yaml | 20 +- 40 files changed, 765 insertions(+), 258 deletions(-) create mode 100644 004a791a-50f5-46af-b710-ca076b16bcb6_ph-ee-bulk-demo-6.csv create mode 100644 09984fda-7ebe-4618-a2df-0e1e4c788ee9_ph-ee-bulk-demo-6.csv create mode 100644 0a75f14d-8ca5-44f8-9c7b-7c1413bafeab_ph-ee-bulk-demo-6.csv create mode 100644 0ac617b3-f722-4659-813e-0b22ab119737_ph-ee-bulk-demo-6.csv create mode 100644 1d326d83-890e-4d27-ab35-f2f70a2b22f1_ph-ee-bulk-demo-6.csv create mode 100644 1e0027bc-b1ec-45cd-83d9-1b6514442c6f_ph-ee-bulk-demo-6.csv create mode 100644 22270496-eabc-4dbe-8613-04f0e7c7ef5a_ph-ee-bulk-demo-6.csv create mode 100644 3b7b4e0e-6ceb-4057-9791-d15f6eab5443_ph-ee-bulk-demo-6.csv create mode 100644 3e09554d-2745-44b2-aa27-af5cf4f21ad2_ph-ee-bulk-demo-6.csv create mode 100644 4218d03a-ad8b-41cc-952a-5990022ec722_ph-ee-bulk-demo-6.csv create mode 100644 437d21cc-dcc5-4d22-8fe4-2b07aaaa00b7_ph-ee-bulk-demo-6.csv create mode 100644 4a437390-2ea9-4dc9-b9b3-e153ecd685b5_ph-ee-bulk-demo-6.csv create mode 100644 628ad64c-689e-48be-8943-715548a8a1e6_ph-ee-bulk-demo-6.csv create mode 100644 6949a1a0-4556-4151-9c88-f3858068c6d4_ph-ee-bulk-demo-6.csv create mode 100644 7c4acade-1747-465b-85a0-f4292ce1c365_ph-ee-bulk-demo-6.csv create mode 100644 89ed5530-c567-4cb2-b8f4-1b2a58a0a297_ph-ee-bulk-demo-6.csv create mode 100644 9c0a6692-a533-407e-a33b-470b9d40f712_ph-ee-bulk-demo-6.csv create mode 100644 9cd12fef-4dd4-45ec-9bd0-fa21479f0df1_ph-ee-bulk-demo-6.csv create mode 100644 a454529f-1281-4b59-a0f7-24cbb90f9d77_ph-ee-bulk-demo-6.csv create mode 100644 a9781980-5bd8-4d37-8381-d5f40e018106_ph-ee-bulk-demo-6.csv create mode 100644 ab7584e7-f475-4d8b-9fde-6dc85c1556c6_ph-ee-bulk-demo-6.csv create mode 100644 b36f948c-a0b1-4f00-b5b9-ce75351780fc_ph-ee-bulk-demo-6.csv create mode 100644 b52c1eba-7444-46fd-b7cf-fb0423707e82_ph-ee-bulk-demo-6.csv create mode 100644 d131edc8-8a3d-49ba-b971-49e597d93bb0_ph-ee-bulk-demo-6.csv create mode 100644 ddd514a7-116f-4eab-9f20-7db38f09d8e7_ph-ee-bulk-demo-6.csv create mode 100644 e554c174-8482-4699-8185-1ff49486a8f0_ph-ee-bulk-demo-6.csv create mode 100644 eba9b8c4-3b45-45ff-a37c-d3a0e4497316_ph-ee-bulk-demo-6.csv create mode 100644 ec162987-fe74-4f81-85c9-2420d405cc12_ph-ee-bulk-demo-6.csv create mode 100644 ed66a395-d7ee-457e-b0c7-b2a73d3a26e8_ph-ee-bulk-demo-6.csv create mode 100644 edb3083b-dd1d-4884-b85c-5391f739f172_ph-ee-bulk-demo-6.csv create mode 100644 fcb7bd3e-c0f2-437b-85fc-89c54a03a736_ph-ee-bulk-demo-6.csv create mode 100644 src/main/java/org/mifos/processor/bulk/BatchTransactionValidator.java create mode 100644 src/main/java/org/mifos/processor/bulk/BatchTransactionValidatorsEnum.java diff --git a/004a791a-50f5-46af-b710-ca076b16bcb6_ph-ee-bulk-demo-6.csv b/004a791a-50f5-46af-b710-ca076b16bcb6_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/004a791a-50f5-46af-b710-ca076b16bcb6_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/09984fda-7ebe-4618-a2df-0e1e4c788ee9_ph-ee-bulk-demo-6.csv b/09984fda-7ebe-4618-a2df-0e1e4c788ee9_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/09984fda-7ebe-4618-a2df-0e1e4c788ee9_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/0a75f14d-8ca5-44f8-9c7b-7c1413bafeab_ph-ee-bulk-demo-6.csv b/0a75f14d-8ca5-44f8-9c7b-7c1413bafeab_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/0a75f14d-8ca5-44f8-9c7b-7c1413bafeab_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/0ac617b3-f722-4659-813e-0b22ab119737_ph-ee-bulk-demo-6.csv b/0ac617b3-f722-4659-813e-0b22ab119737_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/0ac617b3-f722-4659-813e-0b22ab119737_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/1d326d83-890e-4d27-ab35-f2f70a2b22f1_ph-ee-bulk-demo-6.csv b/1d326d83-890e-4d27-ab35-f2f70a2b22f1_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/1d326d83-890e-4d27-ab35-f2f70a2b22f1_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/1e0027bc-b1ec-45cd-83d9-1b6514442c6f_ph-ee-bulk-demo-6.csv b/1e0027bc-b1ec-45cd-83d9-1b6514442c6f_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/1e0027bc-b1ec-45cd-83d9-1b6514442c6f_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/22270496-eabc-4dbe-8613-04f0e7c7ef5a_ph-ee-bulk-demo-6.csv b/22270496-eabc-4dbe-8613-04f0e7c7ef5a_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/22270496-eabc-4dbe-8613-04f0e7c7ef5a_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/3b7b4e0e-6ceb-4057-9791-d15f6eab5443_ph-ee-bulk-demo-6.csv b/3b7b4e0e-6ceb-4057-9791-d15f6eab5443_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/3b7b4e0e-6ceb-4057-9791-d15f6eab5443_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/3e09554d-2745-44b2-aa27-af5cf4f21ad2_ph-ee-bulk-demo-6.csv b/3e09554d-2745-44b2-aa27-af5cf4f21ad2_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/3e09554d-2745-44b2-aa27-af5cf4f21ad2_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/4218d03a-ad8b-41cc-952a-5990022ec722_ph-ee-bulk-demo-6.csv b/4218d03a-ad8b-41cc-952a-5990022ec722_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/4218d03a-ad8b-41cc-952a-5990022ec722_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/437d21cc-dcc5-4d22-8fe4-2b07aaaa00b7_ph-ee-bulk-demo-6.csv b/437d21cc-dcc5-4d22-8fe4-2b07aaaa00b7_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/437d21cc-dcc5-4d22-8fe4-2b07aaaa00b7_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/4a437390-2ea9-4dc9-b9b3-e153ecd685b5_ph-ee-bulk-demo-6.csv b/4a437390-2ea9-4dc9-b9b3-e153ecd685b5_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/4a437390-2ea9-4dc9-b9b3-e153ecd685b5_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/628ad64c-689e-48be-8943-715548a8a1e6_ph-ee-bulk-demo-6.csv b/628ad64c-689e-48be-8943-715548a8a1e6_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/628ad64c-689e-48be-8943-715548a8a1e6_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/6949a1a0-4556-4151-9c88-f3858068c6d4_ph-ee-bulk-demo-6.csv b/6949a1a0-4556-4151-9c88-f3858068c6d4_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/6949a1a0-4556-4151-9c88-f3858068c6d4_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/7c4acade-1747-465b-85a0-f4292ce1c365_ph-ee-bulk-demo-6.csv b/7c4acade-1747-465b-85a0-f4292ce1c365_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/7c4acade-1747-465b-85a0-f4292ce1c365_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/89ed5530-c567-4cb2-b8f4-1b2a58a0a297_ph-ee-bulk-demo-6.csv b/89ed5530-c567-4cb2-b8f4-1b2a58a0a297_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/89ed5530-c567-4cb2-b8f4-1b2a58a0a297_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/9c0a6692-a533-407e-a33b-470b9d40f712_ph-ee-bulk-demo-6.csv b/9c0a6692-a533-407e-a33b-470b9d40f712_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/9c0a6692-a533-407e-a33b-470b9d40f712_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/9cd12fef-4dd4-45ec-9bd0-fa21479f0df1_ph-ee-bulk-demo-6.csv b/9cd12fef-4dd4-45ec-9bd0-fa21479f0df1_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/9cd12fef-4dd4-45ec-9bd0-fa21479f0df1_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/a454529f-1281-4b59-a0f7-24cbb90f9d77_ph-ee-bulk-demo-6.csv b/a454529f-1281-4b59-a0f7-24cbb90f9d77_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/a454529f-1281-4b59-a0f7-24cbb90f9d77_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/a9781980-5bd8-4d37-8381-d5f40e018106_ph-ee-bulk-demo-6.csv b/a9781980-5bd8-4d37-8381-d5f40e018106_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/a9781980-5bd8-4d37-8381-d5f40e018106_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/ab7584e7-f475-4d8b-9fde-6dc85c1556c6_ph-ee-bulk-demo-6.csv b/ab7584e7-f475-4d8b-9fde-6dc85c1556c6_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/ab7584e7-f475-4d8b-9fde-6dc85c1556c6_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/b36f948c-a0b1-4f00-b5b9-ce75351780fc_ph-ee-bulk-demo-6.csv b/b36f948c-a0b1-4f00-b5b9-ce75351780fc_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/b36f948c-a0b1-4f00-b5b9-ce75351780fc_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/b52c1eba-7444-46fd-b7cf-fb0423707e82_ph-ee-bulk-demo-6.csv b/b52c1eba-7444-46fd-b7cf-fb0423707e82_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/b52c1eba-7444-46fd-b7cf-fb0423707e82_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/build.gradle b/build.gradle index 29d95e1b..8895174e 100644 --- a/build.gradle +++ b/build.gradle @@ -80,7 +80,7 @@ dependencies { // miscellaneous dependency implementation 'com.google.code.gson:gson:2.8.9' implementation 'org.json:json:20210307' - implementation 'org.mifos:ph-ee-connector-common:1.8.1-SNAPSHOT' + implementation 'org.mifos:ph-ee-connector-common:1.9.1-SNAPSHOT' implementation 'org.apache.camel.springboot:camel-spring-boot-starter:3.4.0' implementation 'org.apache.camel:camel-undertow:3.4.0' implementation 'org.springframework.boot:spring-boot-starter:2.5.2' diff --git a/d131edc8-8a3d-49ba-b971-49e597d93bb0_ph-ee-bulk-demo-6.csv b/d131edc8-8a3d-49ba-b971-49e597d93bb0_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/d131edc8-8a3d-49ba-b971-49e597d93bb0_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/ddd514a7-116f-4eab-9f20-7db38f09d8e7_ph-ee-bulk-demo-6.csv b/ddd514a7-116f-4eab-9f20-7db38f09d8e7_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/ddd514a7-116f-4eab-9f20-7db38f09d8e7_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/e554c174-8482-4699-8185-1ff49486a8f0_ph-ee-bulk-demo-6.csv b/e554c174-8482-4699-8185-1ff49486a8f0_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/e554c174-8482-4699-8185-1ff49486a8f0_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/eba9b8c4-3b45-45ff-a37c-d3a0e4497316_ph-ee-bulk-demo-6.csv b/eba9b8c4-3b45-45ff-a37c-d3a0e4497316_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/eba9b8c4-3b45-45ff-a37c-d3a0e4497316_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/ec162987-fe74-4f81-85c9-2420d405cc12_ph-ee-bulk-demo-6.csv b/ec162987-fe74-4f81-85c9-2420d405cc12_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/ec162987-fe74-4f81-85c9-2420d405cc12_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/ed66a395-d7ee-457e-b0c7-b2a73d3a26e8_ph-ee-bulk-demo-6.csv b/ed66a395-d7ee-457e-b0c7-b2a73d3a26e8_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/ed66a395-d7ee-457e-b0c7-b2a73d3a26e8_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/edb3083b-dd1d-4884-b85c-5391f739f172_ph-ee-bulk-demo-6.csv b/edb3083b-dd1d-4884-b85c-5391f739f172_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/edb3083b-dd1d-4884-b85c-5391f739f172_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/fcb7bd3e-c0f2-437b-85fc-89c54a03a736_ph-ee-bulk-demo-6.csv b/fcb7bd3e-c0f2-437b-85fc-89c54a03a736_ph-ee-bulk-demo-6.csv new file mode 100644 index 00000000..9e7158ee --- /dev/null +++ b/fcb7bd3e-c0f2-437b-85fc-89c54a03a736_ph-ee-bulk-demo-6.csv @@ -0,0 +1,11 @@ +id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note +0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121681,accountNumber,0030010038731101961,850,USD,Test Payee Payment +1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121682,accountNumber,0030010038741201602,222,USD,Test Payee Payment +2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121683,accountNumber,0030010038731101963,850,USD,Test Payee Payment +3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121684,accountNumber,0030010038741201604,222,USD,Test Payee Payment +4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121685,accountNumber,0030010038731101965,850,USD,Test Payee Payment +5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121686,accountNumber,0030010038741201606,222,USD,Test Payee Payment +6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121687,accountNumber,0030010038731101967,850,USD,Test Payee Payment +7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121688,accountNumber,0030010038741201608,222,USD,Test Payee Payment +8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,0030010038791121689,accountNumber,0030010038731101969,850,USD,Test Payee Payment +9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,0030010038791121680,accountNumber,0030010038741201600,222,USD,Test Payee Payment \ No newline at end of file diff --git a/src/main/java/org/mifos/processor/bulk/BatchTransactionValidator.java b/src/main/java/org/mifos/processor/bulk/BatchTransactionValidator.java new file mode 100644 index 00000000..811b9d35 --- /dev/null +++ b/src/main/java/org/mifos/processor/bulk/BatchTransactionValidator.java @@ -0,0 +1,97 @@ +package org.mifos.processor.bulk; + + +import org.mifos.connector.common.channel.dto.PhErrorDTO; +import org.mifos.connector.common.exception.PaymentHubErrorCategory; +import org.mifos.connector.common.validation.ValidatorBuilder; +import org.mifos.processor.bulk.BatchTransactionValidatorsEnum; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import static org.mifos.connector.common.exception.PaymentHubError.ExtValidationError; + +@Component +public class BatchTransactionValidator { + + private static final String RESOURCE = "batchTransactionValidator"; + private static final String REQUEST_ID = "requestId"; + private static final int EXPECTED_REQUEST_ID_LENGTH = 15; + private static final String FILE_NAME = "fileName"; + private static final String PURPOSE = "purpose"; + private static final String TYPE = "type"; + private static final String TENANT = "tenant"; + private static final String REGISTERING_INSTITUTION_ID = "registeringInstitutionId"; + private static final String PROGRAM_ID = "programId"; + private static final String CALLBACK_URL = "callbackUrl"; + + public Logger logger = LoggerFactory.getLogger(this.getClass()); + + public PhErrorDTO validateBatchTransactions(String requestId, String fileName, String purpose, String type, + String tenant, String registeringInstitutionId, String programId, String callbackUrl) { + final ValidatorBuilder validatorBuilder = new ValidatorBuilder(); + logger.info("Inside validation"); + + // Check for requestId + validatorBuilder.reset().resource(RESOURCE).parameter(REQUEST_ID).value(requestId) + .isNullWithFailureCode(BatchTransactionValidatorsEnum.INVALID_REQUEST_ID) + .validateFieldMaxLengthWithFailureCodeAndErrorParams(EXPECTED_REQUEST_ID_LENGTH, + BatchTransactionValidatorsEnum.INVALID_REQUEST_ID_LENGTH); + + // Check for fileName (optional) + if (fileName != null) { + validatorBuilder.reset().resource(RESOURCE).parameter(FILE_NAME).value(fileName) + .validateFieldMaxLengthWithFailureCodeAndErrorParams(EXPECTED_REQUEST_ID_LENGTH, + BatchTransactionValidatorsEnum.INVALID_FILE_NAME_LENGTH); + } + + // Check for purpose + validatorBuilder.reset().resource(RESOURCE).parameter(PURPOSE).value(purpose) + .isNullWithFailureCode(BatchTransactionValidatorsEnum.INVALID_PURPOSE); + + // Check for type + validatorBuilder.reset().resource(RESOURCE).parameter(TYPE).value(type) + .isNullOrEmpty(); + + // Check for tenant + validatorBuilder.reset().resource(RESOURCE).parameter(TENANT).value(tenant) + .isNullWithFailureCode(BatchTransactionValidatorsEnum.INVALID_TENANT); + + // Check for registeringInstitutionId (optional) + if (registeringInstitutionId != null) { + validatorBuilder.reset().resource(RESOURCE).parameter(REGISTERING_INSTITUTION_ID).value(registeringInstitutionId) + .validateFieldMaxLengthWithFailureCodeAndErrorParams(EXPECTED_REQUEST_ID_LENGTH, + BatchTransactionValidatorsEnum.INVALID_REGISTERING_INSTITUTION_ID_LENGTH); + } + + // Check for programId (optional) + if (programId != null) { + validatorBuilder.reset().resource(RESOURCE).parameter(PROGRAM_ID).value(programId) + .validateFieldMaxLengthWithFailureCodeAndErrorParams(EXPECTED_REQUEST_ID_LENGTH, + BatchTransactionValidatorsEnum.INVALID_PROGRAM_ID_LENGTH); + } + + // Check for callbackUrl (optional) + if (callbackUrl != null) { + validatorBuilder.reset().resource(RESOURCE).parameter(CALLBACK_URL).value(callbackUrl) + .isNullWithFailureCode(BatchTransactionValidatorsEnum.INVALID_CALLBACK_URL) + .validateFieldMaxLengthWithFailureCodeAndErrorParams(2048, BatchTransactionValidatorsEnum.INVALID_CALLBACK_URL); + } + + // If errors exist, build and return PhErrorDTO + if (validatorBuilder.hasError()) { + logger.info("Found error"); + validatorBuilder.errorCategory(PaymentHubErrorCategory.Validation.toString()) + .errorCode(BatchTransactionValidatorsEnum.BATCH_TRANSACTION_VALIDATION_ERROR.getCode()) + .errorDescription(BatchTransactionValidatorsEnum.BATCH_TRANSACTION_VALIDATION_ERROR.getMessage()) + .developerMessage(BatchTransactionValidatorsEnum.BATCH_TRANSACTION_VALIDATION_ERROR.getMessage()) + .defaultUserMessage(BatchTransactionValidatorsEnum.BATCH_TRANSACTION_VALIDATION_ERROR.getMessage()); + + PhErrorDTO.PhErrorDTOBuilder phErrorDTOBuilder = new PhErrorDTO.PhErrorDTOBuilder(ExtValidationError.getErrorCode()); + phErrorDTOBuilder.fromValidatorBuilder(validatorBuilder); + return phErrorDTOBuilder.build(); + } + + return null; + } +} diff --git a/src/main/java/org/mifos/processor/bulk/BatchTransactionValidatorsEnum.java b/src/main/java/org/mifos/processor/bulk/BatchTransactionValidatorsEnum.java new file mode 100644 index 00000000..af69e615 --- /dev/null +++ b/src/main/java/org/mifos/processor/bulk/BatchTransactionValidatorsEnum.java @@ -0,0 +1,44 @@ +package org.mifos.processor.bulk; + +import org.mifos.connector.common.exception.PaymentHubErrorCategory; +import org.mifos.connector.common.validation.ValidationCodeType; +import org.springframework.stereotype.Component; + +public enum BatchTransactionValidatorsEnum implements ValidationCodeType { + + BATCH_TRANSACTION_VALIDATION_ERROR("error.msg.batch.transaction.validation.errors", "Batch transaction validation failed"), + INVALID_REQUEST_ID("error.msg.schema.request.id.cannot.be.null.or.empty", "Request ID cannot be null or empty"), + INVALID_REQUEST_ID_LENGTH("error.msg.schema.request.id.length.is.invalid", "Request ID length is invalid"), + INVALID_FILE_NAME_LENGTH("error.msg.schema.file.name.length.is.invalid", "File name length is invalid"), + INVALID_PURPOSE("error.msg.schema.purpose.cannot.be.null.or.empty", "Purpose cannot be null or empty"), + INVALID_TYPE("error.msg.schema.type.cannot.be.null.or.empty", "Type cannot be null or empty"), + INVALID_TENANT("error.msg.schema.tenant.cannot.be.null.or.empty", "Tenant cannot be null or empty"), + INVALID_REGISTERING_INSTITUTION_ID_LENGTH("error.msg.schema.registering.institution.id.length.is.invalid", "Registering Institution ID length is invalid"), + INVALID_PROGRAM_ID_LENGTH("error.msg.schema.program.id.length.is.invalid", "Program ID length is invalid"), + INVALID_CALLBACK_URL("error.msg.schema.callback.url.cannot.be.null.or.empty", "Callback URL cannot be null or empty"), + INVALID_CALLBACK_URL_LENGTH("error.msg.schema.callback.url.length.is.invalid", "Callback URL length is invalid"); + + private final String code; + private final String category; + private final String message; + + BatchTransactionValidatorsEnum(String code, String message) { + this.code = code; + this.category = PaymentHubErrorCategory.Validation.toString(); + this.message = message; + } + + public String getCode() { + return this.code; + } + + public String getCategory() { + return this.category; + } + + public String getMessage() { + return message; + } +} + + diff --git a/src/main/java/org/mifos/processor/bulk/api/implementation/BatchTransactionsController.java b/src/main/java/org/mifos/processor/bulk/api/implementation/BatchTransactionsController.java index 90df1c72..865c871a 100644 --- a/src/main/java/org/mifos/processor/bulk/api/implementation/BatchTransactionsController.java +++ b/src/main/java/org/mifos/processor/bulk/api/implementation/BatchTransactionsController.java @@ -12,21 +12,27 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.csv.CsvMapper; -import io.camunda.zeebe.client.api.command.ClientStatusException; -import io.grpc.Status; + +import java.io.IOException; import java.nio.charset.Charset; import java.util.List; import java.util.Optional; import java.util.UUID; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import io.camunda.zeebe.client.api.command.ClientStatusException; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; + import org.apache.camel.Exchange; import org.apache.camel.ProducerTemplate; import org.apache.commons.io.IOUtils; import org.json.JSONObject; +import org.mifos.connector.common.channel.dto.PhErrorDTO; import org.mifos.connector.common.interceptor.JWSUtil; +import org.mifos.processor.bulk.BatchTransactionValidator; import org.mifos.processor.bulk.api.definition.BatchTransactions; import org.mifos.processor.bulk.file.FileStorageService; import org.mifos.processor.bulk.format.RestRequestConvertor; @@ -36,6 +42,7 @@ import org.mifos.processor.bulk.utility.CsvWriter; import org.mifos.processor.bulk.utility.Headers; import org.mifos.processor.bulk.utility.SpringWrapperUtil; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.ExceptionHandler; @@ -60,16 +67,37 @@ public class BatchTransactionsController implements BatchTransactions { @Value("#{'${tenants}'.split(',')}") protected List tenants; + @Autowired private CsvMapper csvMapper; + @Autowired + private BatchTransactionValidator batchTransactionValidator; + @SneakyThrows @Override public String batchTransactions(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, String requestId, - String fileName, String purpose, String type, String tenant, String registeringInstitutionId, String programId, - String callbackUrl) { - + String fileName, String purpose, String type, String tenant, String registeringInstitutionId, String programId, + String callbackUrl) throws IOException { + + log.info("Executing the logic"); + PhErrorDTO error = batchTransactionValidator.validateBatchTransactions(requestId, fileName, purpose, type, tenant, + registeringInstitutionId, programId, callbackUrl); + if (error != null) { + httpServletResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST); + log.info("Error is - {}", error.toString()); + return error.toString(); + } else if (error == null) { + return callLogic(httpServletRequest, httpServletResponse, requestId, fileName, purpose, type, tenant, + registeringInstitutionId, programId, callbackUrl); + } + return requestId; + } + private String callLogic(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, String requestId, + String fileName, String purpose, String type, String tenant, String registeringInstitutionId, String programId, + String callbackUrl) throws IOException { log.info("Inside api logic"); + Headers.HeaderBuilder headerBuilder = new Headers.HeaderBuilder().addHeader(HEADER_CLIENT_CORRELATION_ID, requestId) .addHeader(PURPOSE, purpose).addHeader(HEADER_TYPE, type).addHeader(HEADER_PLATFORM_TENANT_ID, tenant) .addHeader(HEADER_REGISTERING_INSTITUTE_ID, registeringInstitutionId).addHeader(HEADER_PROGRAM_ID, programId) @@ -77,12 +105,12 @@ public String batchTransactions(HttpServletRequest httpServletRequest, HttpServl Optional validationResponse = isValidRequest(httpServletRequest, fileName, type); if (validationResponse.isPresent()) { - httpServletResponse.setStatus(httpServletResponse.SC_BAD_REQUEST); + httpServletResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST); return validationResponse.get(); } if (JWSUtil.isMultipartRequest(httpServletRequest)) { - log.info("This is file based request"); + log.info("This is a file-based request"); String localFileName = fileStorageService.save(JWSUtil.parseFormData(httpServletRequest), fileName); Headers headers = headerBuilder.addHeader(FILE_NAME, localFileName).build(); log.info("Headers passed: {}", headers.getHeaders()); @@ -91,7 +119,7 @@ public String batchTransactions(HttpServletRequest httpServletRequest, HttpServl httpServletResponse.setStatus(response.getStatus()); return response.getBody(); } else { - log.info("This is json based request"); + log.info("This is a JSON-based request"); String jsonString = IOUtils.toString(httpServletRequest.getInputStream(), Charset.defaultCharset()); List batchRequestDTOList = objectMapper.readValue(jsonString, new TypeReference<>() {}); List transactionList = restRequestConvertor.convertListFrom(batchRequestDTOList); @@ -104,14 +132,12 @@ public String batchTransactions(HttpServletRequest httpServletRequest, HttpServl httpServletResponse.setStatus(response.getStatus()); return response.getBody(); } - } @ExceptionHandler({ MultipartException.class }) public String handleMultipartException(HttpServletResponse httpServletResponse) { - httpServletResponse.setStatus(httpServletResponse.SC_BAD_REQUEST); - return getErrorResponse("File not uploaded", "There was no fie uploaded with the request. " + "Please upload a file and try again.", - 400); + httpServletResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST); + return getErrorResponse("File not uploaded", "There was no file uploaded with the request. Please upload a file and try again.", 400); } private CamelApiResponse sendRequestToCamel(Headers headers) { @@ -125,8 +151,8 @@ private CamelApiResponse sendRequestToCamel(Headers headers) { private String getErrorResponse(String information, String description, int code) { JSONObject json = new JSONObject(); - json.put("errorInformation", "File not uploaded"); - json.put("errorDescription", "There was no fie uploaded with the request. " + "Please upload a file and try again."); + json.put("errorInformation", information); + json.put("errorDescription", description); json.put("errorCode", code); return json.toString(); } @@ -140,11 +166,10 @@ private Optional isValidRequest(HttpServletRequest httpServletRequest, S String errorJson = getErrorResponse("Type mismatch", "The value of the header \"" + HEADER_TYPE + "\" doesn't match with the request content-type", 400); response = Optional.of(errorJson); - } - if (JWSUtil.isMultipartRequest(httpServletRequest) && fileName.isEmpty()) { + if (JWSUtil.isMultipartRequest(httpServletRequest) && (fileName == null || fileName.isEmpty())) { String errorJson = getErrorResponse("Header can't be empty", - "If the request is of type csv, the header \"" + FILE_NAME + "\"can't be empty", 400); + "If the request is of type csv, the header \"" + FILE_NAME + "\" can't be empty", 400); response = Optional.of(errorJson); } if (!type.equalsIgnoreCase("raw") && !type.equalsIgnoreCase("csv")) { @@ -158,7 +183,7 @@ private Optional isValidRequest(HttpServletRequest httpServletRequest, S private void checkAndThrowClientStatusException(Exchange exchange) { Exception cause = exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Exception.class); if (cause instanceof ClientStatusException) { - throw new ClientStatusException(Status.FAILED_PRECONDITION, cause); + throw new ClientStatusException(io.grpc.Status.FAILED_PRECONDITION, cause); } } } 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 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 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 consumerFactory() { - Map 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 kafkaListenerContainerFactory() { - ConcurrentKafkaListenerContainerFactory 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 consumerFactory() { +// Map 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 kafkaListenerContainerFactory() { +// ConcurrentKafkaListenerContainerFactory 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 producerFactory() { - Map 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 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 producerFactory() { +// Map 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 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 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 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/resources/application.yaml b/src/main/resources/application.yaml index 8ed37cf5..cf31b68e 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -1,5 +1,5 @@ camel: - server-port: 5000 + server-port: 5001 disable-ssl: false springboot: main-run-controller: true @@ -8,7 +8,7 @@ camel: auto-discover-object-mapper: true kafka: - bootstrapAddress: "kafka:9092" + #bootstrapAddress: "kafka:9092" topic: gsma: name: gsma @@ -27,7 +27,7 @@ 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" @@ -133,13 +133,13 @@ callback-phases: - 100 server: - ssl: - key-alias: "tomcat-https" - key-store: "classpath:keystore.jks" - key-store-type: JKS - key-password: "password" - key-store-password: "password" - port: 8443 +# ssl: +# key-alias: "tomcat-https" +# key-store: "classpath:keystore.jks" +# key-store-type: JKS +# key-password: "password" +# key-store-password: "password" + port: 8444 security: