Skip to content

FINERACT-2571: Migrate charge creation helper to feign client #5703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lliikkii7722-ops wants to merge 1 commit into
base: develop
Choose a base branch
from
+11 −6
Open

FINERACT-2571: Migrate charge creation helper to feign client #5703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ...n-tests/src/test/java/org/apache/fineract/integrationtests/common/NotificationHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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!
Expand Down
10 changes: 7 additions & 3 deletions ...ests/src/test/java/org/apache/fineract/integrationtests/common/charges/ChargesHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand All @@ -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!
Expand Down
Loading