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: lliikkii7722-ops

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

@@ -26,6 +26,7 @@
 import java.time.Duration;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.fineract.client.models.GetNotificationsResponse;
+import org.apache.fineract.client.util.Calls;
 import org.apache.fineract.client.util.JSON;
 
 @Slf4j
@@ -42,10 +43,10 @@ private NotificationHelper() {}
     @Deprecated(forRemoval = true)
     public static GetNotificationsResponse getNotifications(final RequestSpecification requestSpec,
             final ResponseSpecification responseSpec) {
-        final String GET_NOTIFICATIONS_URL = NOTIFICATION_API_URL;
+
         log.info("-----------------------------GET NOTIFICATIONS-----------------------------------");
-        String response = Utils.performServerGet(requestSpec, responseSpec, GET_NOTIFICATIONS_URL);
-        return GSON.fromJson(response, GetNotificationsResponse.class);
+
+        return Calls.ok(() -> FineractClientHelper.getFineractClient().notifications().getAllNotifications(null, 1, 0, null, null));
     }
 
     // TODO: Rewrite to use fineract-client instead!

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

@@ -599,7 +599,9 @@ public static HashMap<String, Object> populateDefaultsShareRedeemFlatCharge() {
     @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");
+        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!
@@ -608,8 +610,10 @@ public static Integer createCharges(final RequestSpecification requestSpec, fina
     @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);
+
+        ChargeRequest chargeRequest = GSON.fromJson(payload, ChargeRequest.class);
+
+        return Calls.ok(FineractClientHelper.getFineractClient().charges().createCharge(chargeRequest));
     }
 
     // TODO: Rewrite to use fineract-client instead!