i

FINERACT-2571: Migrate charge creation helper to feign client

Migrate charge creation helper to feign client

FINERACT-2571: Migrate charge creation helper to feign client

Author: Likitha

integration-tests/src/test/java/org/apache/fineract/integrationtests/common/charges/ChargesHelper.java

@@ -598,18 +598,26 @@ public static HashMap<String, Object> populateDefaultsShareRedeemFlatCharge() {
     // org.apache.fineract.client.models.PostLoansLoanIdRequest)
     @Deprecated(forRemoval = true)
     public static Integer createCharges(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
-            final String request) {
-        return Utils.performServerPost(requestSpec, responseSpec, CREATE_CHARGES_URL, request, "resourceId");
+                                        final String request) {
+        ChargeRequest chargeRequest = GSON.fromJson(request, ChargeRequest.class);
+        PostChargesResponse response = Calls.ok(FineractClientHelper.getFineractClient().charges.createCharge(chargeRequest));
+        return response.getResourceId().intValue();
     }
 
     // TODO: Rewrite to use fineract-client instead!
     // Example: org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper.disburseLoan(java.lang.Long,
     // org.apache.fineract.client.models.PostLoansLoanIdRequest)
     @Deprecated(forRemoval = true)
     public static PostChargesResponse createLoanCharge(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
-            final String payload) {
-        final String response = Utils.performServerPost(requestSpec, responseSpec, CREATE_CHARGES_URL, payload, null);
-        return GSON.fromJson(response, PostChargesResponse.class);
+                                                       final String payload) {
+
+        ChargeRequest chargeRequest = GSON.fromJson(payload, ChargeRequest.class);
+
+        return Calls.ok(
+                FineractClientHelper.getFineractClient()
+                        .charges()
+                        .createCharge(chargeRequest)
+        );
     }
 
     // TODO: Rewrite to use fineract-client instead!