CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 10 Packages Projects Releases Wiki Activity

FINERACT-2165: Mark all the RestAssured solutions as deprecated in the integration tests module

Browse Source
This commit is contained in:
Adam Saghy
2025-01-22 21:40:10 +01:00
parent 6348140716
commit a9d76ef3dd
78 changed files with 4398 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/AuditHelper.java
+32
View File
@@ -49,11 +49,19 @@ public class AuditHelper {
private ResponseSpecification responseSpec; private ResponseSpecification responseSpec;
private RequestSpecification requestSpec; private RequestSpecification requestSpec;
// 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 AuditHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public AuditHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
} }
// 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 List getAuditDetails(final Integer resourceId, final String actionName, final String entityName) { public List getAuditDetails(final Integer resourceId, final String actionName, final String entityName) {
final String AUDIT_URL = AUDIT_BASE_URL + "&entityName=" + entityName + "&resourceId=" + resourceId + "&actionName=" + actionName final String AUDIT_URL = AUDIT_BASE_URL + "&entityName=" + entityName + "&resourceId=" + resourceId + "&actionName=" + actionName
+ "&orderBy=id&sortBy=DSC"; + "&orderBy=id&sortBy=DSC";
@@ -61,12 +69,20 @@ public class AuditHelper {
return responseAudits; return responseAudits;
} }
// 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 List getAuditDetails(final int limit) { public List getAuditDetails(final int limit) {
final String AUDIT_URL = AUDIT_BASE_URL + "&paged=true&limit=" + Integer.toString(limit); final String AUDIT_URL = AUDIT_BASE_URL + "&paged=true&limit=" + Integer.toString(limit);
LinkedHashMap responseAudits = Utils.performServerGet(requestSpec, responseSpec, AUDIT_URL, ""); LinkedHashMap responseAudits = Utils.performServerGet(requestSpec, responseSpec, AUDIT_URL, "");
return (List) responseAudits.get("pageItems"); return (List) responseAudits.get("pageItems");
} }
// 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 LinkedHashMap getAuditSearchTemplate() { public LinkedHashMap getAuditSearchTemplate() {
return Utils.performServerGet(requestSpec, responseSpec, AUDITSEARCH_BASE_URL, "$"); return Utils.performServerGet(requestSpec, responseSpec, AUDITSEARCH_BASE_URL, "$");
} }
@@ -75,6 +91,10 @@ public class AuditHelper {
* Some audit actions can only be done once Eg: Creation of a client with id 123, hence we verify number of audits * Some audit actions can only be done once Eg: Creation of a client with id 123, hence we verify number of audits
* For such operations is "equal" to 1 always * For such operations is "equal" to 1 always
*/ */
// 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 void verifyOneAuditOnly(List<HashMap<String, Object>> auditsToCheck, Integer id, String actionName, String entityType) { public void verifyOneAuditOnly(List<HashMap<String, Object>> auditsToCheck, Integer id, String actionName, String entityType) {
LOG.info("------------------------------CHECK IF AUDIT CREATED------------------------------------\n"); LOG.info("------------------------------CHECK IF AUDIT CREATED------------------------------------\n");
assertEquals(1, auditsToCheck.size(), "More than one audit created"); assertEquals(1, auditsToCheck.size(), "More than one audit created");
@@ -85,6 +105,10 @@ public class AuditHelper {
assertEquals(expected, actual, "Error in creating audit!"); assertEquals(expected, actual, "Error in creating audit!");
} }
// 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 void verifyMultipleAuditsOnserver(List<HashMap<String, Object>> auditsRecievedInitial, public void verifyMultipleAuditsOnserver(List<HashMap<String, Object>> auditsRecievedInitial,
List<HashMap<String, Object>> auditsRecieved, Integer id, String actionName, String entityType) { List<HashMap<String, Object>> auditsRecieved, Integer id, String actionName, String entityType) {
LOG.info("------------------------------CHECK IF AUDIT CREATED------------------------------------\n"); LOG.info("------------------------------CHECK IF AUDIT CREATED------------------------------------\n");
@@ -102,10 +126,18 @@ public class AuditHelper {
assertEquals(expected, actual, "Error in creating audit!"); assertEquals(expected, actual, "Error in creating audit!");
} }
// 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 void verifyLimitParameterfor(final int limit) { public void verifyLimitParameterfor(final int limit) {
assertEquals(limit, getAuditDetails(limit).size(), "Incorrect number of audits recieved for limit: " + Integer.toString(limit)); assertEquals(limit, getAuditDetails(limit).size(), "Incorrect number of audits recieved for limit: " + Integer.toString(limit));
} }
// 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 void verifyOrderBysupported(final String orderByValue) { public void verifyOrderBysupported(final String orderByValue) {
final String AUDIT_URL = AUDIT_BASE_URL + "&paged=true&orderBy=" + orderByValue; final String AUDIT_URL = AUDIT_BASE_URL + "&paged=true&orderBy=" + orderByValue;
Utils.performServerGet(requestSpec, responseSpec, AUDIT_URL, ""); Utils.performServerGet(requestSpec, responseSpec, AUDIT_URL, "");
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/BatchHelper.java
+28
View File
@@ -71,6 +71,10 @@ public final class BatchHelper {
* @param batchRequests * @param batchRequests
* @return JSON String of BatchRequest * @return JSON String of BatchRequest
*/ */
// 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 String toJsonString(final List<BatchRequest> batchRequests) { public static String toJsonString(final List<BatchRequest> batchRequests) {
return new Gson().toJson(batchRequests); return new Gson().toJson(batchRequests);
} }
@@ -81,6 +85,10 @@ public final class BatchHelper {
* @param * @param
* @return Map * @return Map
*/ */
// 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 Map generateMapFromJsonString(final String jsonString) { public static Map generateMapFromJsonString(final String jsonString) {
return new Gson().fromJson(jsonString, Map.class); return new Gson().fromJson(jsonString, Map.class);
} }
@@ -91,6 +99,10 @@ public final class BatchHelper {
* @param json * @param json
* @return {@code List<BatchResponse>} * @return {@code List<BatchResponse>}
*/ */
// 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)
private static List<BatchResponse> fromJsonString(final String json) { private static List<BatchResponse> fromJsonString(final String json) {
return new Gson().fromJson(json, new TypeToken<List<BatchResponse>>() {}.getType()); return new Gson().fromJson(json, new TypeToken<List<BatchResponse>>() {}.getType());
} }
@@ -104,6 +116,10 @@ public final class BatchHelper {
* @param jsonifiedBatchRequests * @param jsonifiedBatchRequests
* @return a list of BatchResponse * @return a list of BatchResponse
*/ */
// 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 List<BatchResponse> postBatchRequestsWithoutEnclosingTransaction(final RequestSpecification requestSpec, public static List<BatchResponse> postBatchRequestsWithoutEnclosingTransaction(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final String jsonifiedBatchRequests) { final ResponseSpecification responseSpec, final String jsonifiedBatchRequests) {
final String response = Utils.performServerPost(requestSpec, responseSpec, BATCH_API_WITHOUT_ENCLOSING_URL_EXT, final String response = Utils.performServerPost(requestSpec, responseSpec, BATCH_API_WITHOUT_ENCLOSING_URL_EXT,
@@ -112,6 +128,10 @@ public final class BatchHelper {
return BatchHelper.fromJsonString(response); return BatchHelper.fromJsonString(response);
} }
// 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 ErrorResponse postBatchRequestsWithoutEnclosingTransactionError(final RequestSpecification requestSpec, public static ErrorResponse postBatchRequestsWithoutEnclosingTransactionError(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final String jsonifiedBatchRequests) { final ResponseSpecification responseSpec, final String jsonifiedBatchRequests) {
final String response = Utils.performServerPost(requestSpec, responseSpec, BATCH_API_WITHOUT_ENCLOSING_URL_EXT, final String response = Utils.performServerPost(requestSpec, responseSpec, BATCH_API_WITHOUT_ENCLOSING_URL_EXT,
@@ -129,6 +149,10 @@ public final class BatchHelper {
* @param jsonifiedBatchRequests * @param jsonifiedBatchRequests
* @return a list of BatchResponse * @return a list of BatchResponse
*/ */
// 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 List<BatchResponse> postBatchRequestsWithEnclosingTransaction(final RequestSpecification requestSpec, public static List<BatchResponse> postBatchRequestsWithEnclosingTransaction(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final String jsonifiedBatchRequests) { final ResponseSpecification responseSpec, final String jsonifiedBatchRequests) {
final String response = Utils.performServerPost(requestSpec, responseSpec, BATCH_API_URL_EXT, jsonifiedBatchRequests, null); final String response = Utils.performServerPost(requestSpec, responseSpec, BATCH_API_URL_EXT, jsonifiedBatchRequests, null);
@@ -141,6 +165,10 @@ public final class BatchHelper {
* @param * @param
* @return {@code List<BatchResponse>} * @return {@code List<BatchResponse>}
*/ */
// 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 List<BatchResponse> postWithSingleRequest(final RequestSpecification requestSpec, public static List<BatchResponse> postWithSingleRequest(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final BatchRequest br) { final ResponseSpecification responseSpec, final BatchRequest br) {
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/BusinessDateHelper.java
+12
View File
@@ -38,6 +38,10 @@ public final class BusinessDateHelper extends IntegrationTest {
public BusinessDateHelper() {} public BusinessDateHelper() {}
// 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 HashMap updateBusinessDate(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static HashMap updateBusinessDate(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final BusinessDateType type, final LocalDate date) { final BusinessDateType type, final LocalDate date) {
final String BUSINESS_DATE_API = "/fineract-provider/api/v1/businessdate?" + Utils.TENANT_IDENTIFIER; final String BUSINESS_DATE_API = "/fineract-provider/api/v1/businessdate?" + Utils.TENANT_IDENTIFIER;
@@ -52,6 +56,10 @@ public final class BusinessDateHelper extends IntegrationTest {
return ok(fineract().businessDateManagement.updateBusinessDate(request)); return ok(fineract().businessDateManagement.updateBusinessDate(request));
} }
// 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 BusinessDateResponse getBusinessDateByType(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public BusinessDateResponse getBusinessDateByType(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final BusinessDateType type) { final BusinessDateType type) {
final String BUSINESS_DATE_API = "/fineract-provider/api/v1/businessdate/" + type.name() + "?" + Utils.TENANT_IDENTIFIER; final String BUSINESS_DATE_API = "/fineract-provider/api/v1/businessdate/" + type.name() + "?" + Utils.TENANT_IDENTIFIER;
@@ -68,6 +76,10 @@ public final class BusinessDateHelper extends IntegrationTest {
return ok(fineract().businessDateManagement.getBusinessDates()); return ok(fineract().businessDateManagement.getBusinessDates());
} }
// 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)
private static String buildBusinessDateRequest(BusinessDateType type, LocalDate date) { private static String buildBusinessDateRequest(BusinessDateType type, LocalDate date) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
map.put("type", type.name()); map.put("type", type.name());
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/BusinessStepConfigurationHelper.java
+32
View File
@@ -40,22 +40,42 @@ public final class BusinessStepConfigurationHelper {
} }
// 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 String toJsonString(final List<BusinessStep> batchRequests) { public static String toJsonString(final List<BusinessStep> batchRequests) {
return new Gson().toJson(new BusinessStepWrapper(batchRequests)); return new Gson().toJson(new BusinessStepWrapper(batchRequests));
} }
// 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)
private static JobBusinessStepConfigData configuredBusinessStepFromJsonString(final String json) { private static JobBusinessStepConfigData configuredBusinessStepFromJsonString(final String json) {
return new Gson().fromJson(json, new TypeToken<JobBusinessStepConfigData>() {}.getType()); return new Gson().fromJson(json, new TypeToken<JobBusinessStepConfigData>() {}.getType());
} }
// 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)
private static ApiParameterError configuredApiParameterErrorFromJsonString(final String json) { private static ApiParameterError configuredApiParameterErrorFromJsonString(final String json) {
return new Gson().fromJson(json, new TypeToken<ApiParameterError>() {}.getType()); return new Gson().fromJson(json, new TypeToken<ApiParameterError>() {}.getType());
} }
// 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)
private static JobBusinessStepDetail availableBusinessStepFromJsonString(final String json) { private static JobBusinessStepDetail availableBusinessStepFromJsonString(final String json) {
return new Gson().fromJson(json, new TypeToken<JobBusinessStepDetail>() {}.getType()); return new Gson().fromJson(json, new TypeToken<JobBusinessStepDetail>() {}.getType());
} }
// 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 JobBusinessStepConfigData getConfiguredBusinessStepsByJobName(final RequestSpecification requestSpec, public static JobBusinessStepConfigData getConfiguredBusinessStepsByJobName(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, String jobName) { final ResponseSpecification responseSpec, String jobName) {
final String response = Utils.performServerGet(requestSpec, responseSpec, final String response = Utils.performServerGet(requestSpec, responseSpec,
@@ -64,6 +84,10 @@ public final class BusinessStepConfigurationHelper {
return BusinessStepConfigurationHelper.configuredBusinessStepFromJsonString(response); return BusinessStepConfigurationHelper.configuredBusinessStepFromJsonString(response);
} }
// 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 JobBusinessStepDetail getAvailableBusinessStepsByJobName(final RequestSpecification requestSpec, public static JobBusinessStepDetail getAvailableBusinessStepsByJobName(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, String jobName) { final ResponseSpecification responseSpec, String jobName) {
final String response = Utils.performServerGet(requestSpec, responseSpec, final String response = Utils.performServerGet(requestSpec, responseSpec,
@@ -72,6 +96,10 @@ public final class BusinessStepConfigurationHelper {
return BusinessStepConfigurationHelper.availableBusinessStepFromJsonString(response); return BusinessStepConfigurationHelper.availableBusinessStepFromJsonString(response);
} }
// 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 void updateBusinessStepOrder(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static void updateBusinessStepOrder(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
String jobName, String jsonBodyToSend) { String jobName, String jsonBodyToSend) {
String response = Utils.performServerPut(requestSpec, responseSpec, String response = Utils.performServerPut(requestSpec, responseSpec,
@@ -79,6 +107,10 @@ public final class BusinessStepConfigurationHelper {
log.info("BusinessStepConfigurationHelper Response: {}", response); log.info("BusinessStepConfigurationHelper Response: {}", response);
} }
// 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 ApiParameterError updateBusinessStepOrderWithError(final RequestSpecification requestSpec, public static ApiParameterError updateBusinessStepOrderWithError(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, String jobName, String jsonBodyToSend) { final ResponseSpecification responseSpec, String jobName, String jsonBodyToSend) {
String response = Utils.performServerPut(requestSpec, responseSpec, String response = Utils.performServerPut(requestSpec, responseSpec,
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/CalendarHelper.java
+28
View File
@@ -41,6 +41,10 @@ public final class CalendarHelper {
} }
// 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 Integer createMeetingCalendarForGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createMeetingCalendarForGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer groupId, final String startDate, final String frequency, final String interval, final String repeatsOnDay) { final Integer groupId, final String startDate, final String frequency, final String interval, final String repeatsOnDay) {
@@ -54,6 +58,10 @@ public final class CalendarHelper {
getTestCalendarAsJSON(frequency, interval, repeatsOnDay, startDate), "resourceId"); getTestCalendarAsJSON(frequency, interval, repeatsOnDay, startDate), "resourceId");
} }
// 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 Integer updateMeetingCalendarForGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer updateMeetingCalendarForGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer groupId, String calendarID, final String startDate, final String frequency, final String interval, final Integer groupId, String calendarID, final String startDate, final String frequency, final String interval,
final String repeatsOnDay) { final String repeatsOnDay) {
@@ -68,6 +76,10 @@ public final class CalendarHelper {
getTestCalendarAsJSON(frequency, interval, repeatsOnDay, startDate), "resourceId"); getTestCalendarAsJSON(frequency, interval, repeatsOnDay, startDate), "resourceId");
} }
// 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 String getTestCalendarAsJSON(final String frequency, final String interval, final String repeatsOnDay, public static String getTestCalendarAsJSON(final String frequency, final String interval, final String repeatsOnDay,
final String startDate) { final String startDate) {
@@ -85,6 +97,10 @@ public final class CalendarHelper {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 void verifyCalendarCreatedOnServer(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static void verifyCalendarCreatedOnServer(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer generatedGroupId, final Integer generatedCalendarId) { final Integer generatedGroupId, final Integer generatedCalendarId) {
LOG.info("------------------------------CHECK CALENDAR DETAILS------------------------------------\n"); LOG.info("------------------------------CHECK CALENDAR DETAILS------------------------------------\n");
@@ -95,6 +111,10 @@ public final class CalendarHelper {
assertEquals(generatedCalendarId, responseCalendarId, "ERROR IN CREATING THE CALENDAR"); assertEquals(generatedCalendarId, responseCalendarId, "ERROR IN CREATING THE CALENDAR");
} }
// 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 Integer createMeetingForGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createMeetingForGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer groupId, final String startDate, final String frequency, final String interval, final String repeatsOnDay) { final Integer groupId, final String startDate, final String frequency, final String interval, final String repeatsOnDay) {
@@ -108,6 +128,10 @@ public final class CalendarHelper {
getTestCalendarAsJSON(frequency, interval, repeatsOnDay, startDate), "resourceId"); getTestCalendarAsJSON(frequency, interval, repeatsOnDay, startDate), "resourceId");
} }
// 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 Integer updateMeetingCalendarForCenter(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer updateMeetingCalendarForCenter(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
Integer centerId, String calendarID, String oldDate, String startDate) { Integer centerId, String calendarID, String oldDate, String startDate) {
@@ -123,6 +147,10 @@ public final class CalendarHelper {
} }
// 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)
private static String getTestCalendarMeetingAsJSON(String oldDate, String startDate) { private static String getTestCalendarMeetingAsJSON(String oldDate, String startDate) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
map.put("dateFormat", "dd MMMM yyyy"); map.put("dateFormat", "dd MMMM yyyy");
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/CenterHelper.java
+100
View File
@@ -43,6 +43,10 @@ public final class CenterHelper {
} }
// 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 CenterDomain retrieveByID(int id, final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static CenterDomain retrieveByID(int id, final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
final String GET_CENTER_BY_ID_URL = CENTERS_URL + "/" + id + "?associations=groupMembers&" + Utils.TENANT_IDENTIFIER; final String GET_CENTER_BY_ID_URL = CENTERS_URL + "/" + id + "?associations=groupMembers&" + Utils.TENANT_IDENTIFIER;
LOG.info("------------------------ RETRIEVING CENTER AT {}-------------------------", id); LOG.info("------------------------ RETRIEVING CENTER AT {}-------------------------", id);
@@ -51,6 +55,10 @@ public final class CenterHelper {
return new Gson().fromJson(jsonData, new TypeToken<CenterDomain>() {}.getType()); return new Gson().fromJson(jsonData, new TypeToken<CenterDomain>() {}.getType());
} }
// 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 ArrayList<CenterDomain> paginatedListCenters(final RequestSpecification requestSpec, public static ArrayList<CenterDomain> paginatedListCenters(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
final String GET_CENTER = CENTERS_URL + "?paged=true&limit=-1&" + Utils.TENANT_IDENTIFIER; final String GET_CENTER = CENTERS_URL + "?paged=true&limit=-1&" + Utils.TENANT_IDENTIFIER;
@@ -60,6 +68,10 @@ public final class CenterHelper {
return new Gson().fromJson(jsonData, new TypeToken<ArrayList<CenterDomain>>() {}.getType()); return new Gson().fromJson(jsonData, new TypeToken<ArrayList<CenterDomain>>() {}.getType());
} }
// 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 ArrayList<CenterDomain> listCenters(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static ArrayList<CenterDomain> listCenters(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
final String GET_CENTER = CENTERS_URL + "?limit=-1&" + Utils.TENANT_IDENTIFIER; final String GET_CENTER = CENTERS_URL + "?limit=-1&" + Utils.TENANT_IDENTIFIER;
LOG.info("------------------------ RETRIEVING CENTERS-------------------------"); LOG.info("------------------------ RETRIEVING CENTERS-------------------------");
@@ -68,6 +80,10 @@ public final class CenterHelper {
return new Gson().fromJson(jsonData, new TypeToken<ArrayList<CenterDomain>>() {}.getType()); return new Gson().fromJson(jsonData, new TypeToken<ArrayList<CenterDomain>>() {}.getType());
} }
// 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 ArrayList<CenterDomain> listCentersOrdered(final RequestSpecification requestSpec, public static ArrayList<CenterDomain> listCentersOrdered(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
final String GET_CENTER = CENTERS_URL + "?limit=-1&orderBy=id&sortOrder=asc&" + Utils.TENANT_IDENTIFIER; final String GET_CENTER = CENTERS_URL + "?limit=-1&orderBy=id&sortOrder=asc&" + Utils.TENANT_IDENTIFIER;
@@ -77,21 +93,37 @@ public final class CenterHelper {
return new Gson().fromJson(jsonData, new TypeToken<ArrayList<CenterDomain>>() {}.getType()); return new Gson().fromJson(jsonData, new TypeToken<ArrayList<CenterDomain>>() {}.getType());
} }
// 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 int createCenter(final String name, final int officeId, final RequestSpecification requestSpec, public static int createCenter(final String name, final int officeId, final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
return createCenter(name, officeId, null, -1, null, null, requestSpec, responseSpec); return createCenter(name, officeId, null, -1, null, null, requestSpec, responseSpec);
} }
// 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 int createCenter(final String name, final int officeId, final String activationDate, public static int createCenter(final String name, final int officeId, final String activationDate,
final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
return createCenter(name, officeId, null, -1, null, activationDate, requestSpec, responseSpec); return createCenter(name, officeId, null, -1, null, activationDate, requestSpec, responseSpec);
} }
// 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 int createCenter(final String name, final int officeId, final String externalId, final int staffId, public static int createCenter(final String name, final int officeId, final String externalId, final int staffId,
final int[] groupMembers, final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { final int[] groupMembers, final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
return createCenter(name, officeId, externalId, staffId, groupMembers, null, requestSpec, responseSpec); return createCenter(name, officeId, externalId, staffId, groupMembers, null, requestSpec, responseSpec);
} }
// 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 int createCenter(final String name, final int officeId, final String externalId, final int staffId, public static int createCenter(final String name, final int officeId, final String externalId, final int staffId,
final int[] groupMembers, final String activationDate, final RequestSpecification requestSpec, final int[] groupMembers, final String activationDate, final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
@@ -121,6 +153,10 @@ public final class CenterHelper {
return Utils.performServerPost(requestSpec, responseSpec, CREATE_CENTER_URL, new Gson().toJson(hm), "resourceId"); return Utils.performServerPost(requestSpec, responseSpec, CREATE_CENTER_URL, new Gson().toJson(hm), "resourceId");
} }
// 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 HashMap<String, String> updateCenter(final int id, HashMap request, final RequestSpecification requestSpec, public static HashMap<String, String> updateCenter(final int id, HashMap request, final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
final String UPDATE_CENTER_URL = CENTERS_URL + "/" + id + "?" + Utils.TENANT_IDENTIFIER; final String UPDATE_CENTER_URL = CENTERS_URL + "/" + id + "?" + Utils.TENANT_IDENTIFIER;
@@ -130,6 +166,10 @@ public final class CenterHelper {
return hash; return hash;
} }
// 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 int[] associateGroups(final int id, final int[] groupMembers, final RequestSpecification requestSpec, public static int[] associateGroups(final int id, final int[] groupMembers, final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
final String ASSOCIATE_GROUP_CENTER_URL = CENTERS_URL + "/" + id + "?command=associateGroups&" + Utils.TENANT_IDENTIFIER; final String ASSOCIATE_GROUP_CENTER_URL = CENTERS_URL + "/" + id + "?command=associateGroups&" + Utils.TENANT_IDENTIFIER;
@@ -147,30 +187,50 @@ public final class CenterHelper {
return ret; return ret;
} }
// 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 void deleteCenter(final int id, final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static void deleteCenter(final int id, final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
final String DELETE_CENTER_URL = CENTERS_URL + "/" + id + "?" + Utils.TENANT_IDENTIFIER; final String DELETE_CENTER_URL = CENTERS_URL + "/" + id + "?" + Utils.TENANT_IDENTIFIER;
LOG.info("---------------------------------DELETING CENTER AT {}--------------------------------------------", id); LOG.info("---------------------------------DELETING CENTER AT {}--------------------------------------------", id);
Utils.performServerDelete(requestSpec, responseSpec, DELETE_CENTER_URL, ""); Utils.performServerDelete(requestSpec, responseSpec, DELETE_CENTER_URL, "");
} }
// 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 Integer createCenter(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createCenter(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
@SuppressWarnings("unused") final boolean active) { @SuppressWarnings("unused") final boolean active) {
LOG.info("---------------------------------CREATING A CENTER---------------------------------------------"); LOG.info("---------------------------------CREATING A CENTER---------------------------------------------");
return createCenter(requestSpec, responseSpec, "CREATED_DATE"); return createCenter(requestSpec, responseSpec, "CREATED_DATE");
} }
// 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 Integer createCenter(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createCenter(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String activationDate) { final String activationDate) {
LOG.info("---------------------------------CREATING A CENTER---------------------------------------------"); LOG.info("---------------------------------CREATING A CENTER---------------------------------------------");
return Utils.performServerPost(requestSpec, responseSpec, CREATE_CENTER_URL, getTestCenterAsJSON(true, activationDate), "groupId"); return Utils.performServerPost(requestSpec, responseSpec, CREATE_CENTER_URL, getTestCenterAsJSON(true, activationDate), "groupId");
} }
// 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 Integer createCenter(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static Integer createCenter(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
LOG.info("---------------------------------CREATING A CENTER---------------------------------------------"); LOG.info("---------------------------------CREATING A CENTER---------------------------------------------");
return Utils.performServerPost(requestSpec, responseSpec, CREATE_CENTER_URL, getTestCenterAsJSON(true, CenterHelper.CREATED_DATE), return Utils.performServerPost(requestSpec, responseSpec, CREATE_CENTER_URL, getTestCenterAsJSON(true, CenterHelper.CREATED_DATE),
"groupId"); "groupId");
} }
// 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 int createCenterWithStaffId(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static int createCenterWithStaffId(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer staffId) { final Integer staffId) {
LOG.info("---------------------------------CREATING A CENTER---------------------------------------------"); LOG.info("---------------------------------CREATING A CENTER---------------------------------------------");
@@ -178,6 +238,10 @@ public final class CenterHelper {
getTestCenterWithStaffAsJSON(true, CenterHelper.CREATED_DATE, staffId), "groupId"); getTestCenterWithStaffAsJSON(true, CenterHelper.CREATED_DATE, staffId), "groupId");
} }
// 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 void verifyCenterCreatedOnServer(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static void verifyCenterCreatedOnServer(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer generatedCenterID) { final Integer generatedCenterID) {
LOG.info("------------------------------CHECK CENTER DETAILS------------------------------------\n"); LOG.info("------------------------------CHECK CENTER DETAILS------------------------------------\n");
@@ -186,6 +250,10 @@ public final class CenterHelper {
assertEquals(generatedCenterID, responseCenterID, "ERROR IN CREATING THE CENTER"); assertEquals(generatedCenterID, responseCenterID, "ERROR IN CREATING THE CENTER");
} }
// 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 void verifyCenterActivatedOnServer(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static void verifyCenterActivatedOnServer(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer generatedCenterID, final boolean generatedCenterStatus) { final Integer generatedCenterID, final boolean generatedCenterStatus) {
LOG.info("------------------------------CHECK CENTER STATUS------------------------------------\n"); LOG.info("------------------------------CHECK CENTER STATUS------------------------------------\n");
@@ -194,6 +262,10 @@ public final class CenterHelper {
assertEquals(generatedCenterStatus, responseCenterStatus, "ERROR IN ACTIVATING THE CENTER"); assertEquals(generatedCenterStatus, responseCenterStatus, "ERROR IN ACTIVATING THE CENTER");
} }
// 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 Integer activateCenter(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer activateCenter(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String centerId) { final String centerId) {
final String CENTER_ASSOCIATE_URL = "/fineract-provider/api/v1/centers/" + centerId + "?command=activate&" final String CENTER_ASSOCIATE_URL = "/fineract-provider/api/v1/centers/" + centerId + "?command=activate&"
@@ -202,6 +274,10 @@ public final class CenterHelper {
return Utils.performServerPost(requestSpec, responseSpec, CENTER_ASSOCIATE_URL, activateCenterAsJSON(""), "groupId"); return Utils.performServerPost(requestSpec, responseSpec, CENTER_ASSOCIATE_URL, activateCenterAsJSON(""), "groupId");
} }
// 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 String getTestCenterWithStaffAsJSON(final boolean active, final String activationDate, final Integer staffId) { public static String getTestCenterWithStaffAsJSON(final boolean active, final String activationDate, final Integer staffId) {
Integer id = null; Integer id = null;
@@ -220,6 +296,10 @@ public final class CenterHelper {
externalId, staffId, officeID, officeName, hierarchy, groupMembers); externalId, staffId, officeID, officeName, hierarchy, groupMembers);
} }
// 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 String getTestCenterAsJSON(final boolean active, final String activationDate) { public static String getTestCenterAsJSON(final boolean active, final String activationDate) {
Integer id = null; Integer id = null;
@@ -240,6 +320,10 @@ public final class CenterHelper {
} }
// 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 String assignStaffAsJSON(final Long staffId) { public static String assignStaffAsJSON(final Long staffId) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("staffId", staffId); map.put("staffId", staffId);
@@ -247,6 +331,10 @@ public final class CenterHelper {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 String unassignStaffAsJSON(final Long staffId) { public static String unassignStaffAsJSON(final Long staffId) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("staffId", staffId); map.put("staffId", staffId);
@@ -254,6 +342,10 @@ public final class CenterHelper {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 String activateCenterAsJSON(final String activationDate) { public static String activateCenterAsJSON(final String activationDate) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
map.put("dateFormat", "dd MMMM yyyy"); map.put("dateFormat", "dd MMMM yyyy");
@@ -272,6 +364,10 @@ public final class CenterHelper {
return Utils.uniqueRandomStringGenerator(prefix, lenOfRandomSuffix); return Utils.uniqueRandomStringGenerator(prefix, lenOfRandomSuffix);
} }
// 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 Object assignStaff(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, final String groupId, public static Object assignStaff(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, final String groupId,
final Long staffId) { final Long staffId) {
final String GROUP_ASSIGN_STAFF_URL = "/fineract-provider/api/v1/groups/" + groupId + "?" + Utils.TENANT_IDENTIFIER final String GROUP_ASSIGN_STAFF_URL = "/fineract-provider/api/v1/groups/" + groupId + "?" + Utils.TENANT_IDENTIFIER
@@ -280,6 +376,10 @@ public final class CenterHelper {
return Utils.performServerPost(requestSpec, responseSpec, GROUP_ASSIGN_STAFF_URL, assignStaffAsJSON(staffId), "changes"); return Utils.performServerPost(requestSpec, responseSpec, GROUP_ASSIGN_STAFF_URL, assignStaffAsJSON(staffId), "changes");
} }
// 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 Object unassignStaff(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Object unassignStaff(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String groupId, final Long staffId) { final String groupId, final Long staffId) {
final String GROUP_ASSIGN_STAFF_URL = "/fineract-provider/api/v1/groups/" + groupId + "?" + Utils.TENANT_IDENTIFIER final String GROUP_ASSIGN_STAFF_URL = "/fineract-provider/api/v1/groups/" + groupId + "?" + Utils.TENANT_IDENTIFIER
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/ClientHelper.java
+332
View File
@@ -96,6 +96,10 @@ public class ClientHelper extends IntegrationTest {
private final RequestSpecification requestSpec; private final RequestSpecification requestSpec;
private final ResponseSpecification responseSpec; private final ResponseSpecification responseSpec;
// 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 Integer createClient(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createClient(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
PostClientsRequest request) { PostClientsRequest request) {
log.info("---------------------------------CREATING A CLIENT---------------------------------------------"); log.info("---------------------------------CREATING A CLIENT---------------------------------------------");
@@ -143,6 +147,10 @@ public class ClientHelper extends IntegrationTest {
return ok(fineract().clientSearchV2.searchByText(request)); return ok(fineract().clientSearchV2.searchByText(request));
} }
// 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 PostClientsResponse addClientAsPerson(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static PostClientsResponse addClientAsPerson(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String jsonPayload) { final String jsonPayload) {
final String response = Utils.performServerPost(requestSpec, responseSpec, CREATE_CLIENT_URL, jsonPayload); final String response = Utils.performServerPost(requestSpec, responseSpec, CREATE_CLIENT_URL, jsonPayload);
@@ -150,6 +158,10 @@ public class ClientHelper extends IntegrationTest {
return GSON.fromJson(response, PostClientsResponse.class); return GSON.fromJson(response, PostClientsResponse.class);
} }
// 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 PutClientsClientIdResponse updateClient(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static PutClientsClientIdResponse updateClient(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String externalId, final String jsonPayload) { final String externalId, final String jsonPayload) {
final String url = CLIENT_EXTERNALID_URL + "/" + externalId + "?" + Utils.TENANT_IDENTIFIER; final String url = CLIENT_EXTERNALID_URL + "/" + externalId + "?" + Utils.TENANT_IDENTIFIER;
@@ -158,6 +170,10 @@ public class ClientHelper extends IntegrationTest {
return GSON.fromJson(response, PutClientsClientIdResponse.class); return GSON.fromJson(response, PutClientsClientIdResponse.class);
} }
// 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 DeleteClientsClientIdResponse deleteClient(final RequestSpecification requestSpec, public static DeleteClientsClientIdResponse deleteClient(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final String externalId) { final ResponseSpecification responseSpec, final String externalId) {
final String url = CLIENT_EXTERNALID_URL + "/" + externalId + "?" + Utils.TENANT_IDENTIFIER; final String url = CLIENT_EXTERNALID_URL + "/" + externalId + "?" + Utils.TENANT_IDENTIFIER;
@@ -166,6 +182,10 @@ public class ClientHelper extends IntegrationTest {
return GSON.fromJson(response, DeleteClientsClientIdResponse.class); return GSON.fromJson(response, DeleteClientsClientIdResponse.class);
} }
// 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 GetClientsClientIdAccountsResponse getClientAccounts(final RequestSpecification requestSpec, public static GetClientsClientIdAccountsResponse getClientAccounts(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final String externalId) { final ResponseSpecification responseSpec, final String externalId) {
final String url = CLIENT_EXTERNALID_URL + "/" + externalId + "/accounts?" + Utils.TENANT_IDENTIFIER; final String url = CLIENT_EXTERNALID_URL + "/" + externalId + "/accounts?" + Utils.TENANT_IDENTIFIER;
@@ -174,6 +194,10 @@ public class ClientHelper extends IntegrationTest {
return GSON.fromJson(response, GetClientsClientIdAccountsResponse.class); return GSON.fromJson(response, GetClientsClientIdAccountsResponse.class);
} }
// 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 GetClientTransferProposalDateResponse getProposedTransferDate(final RequestSpecification requestSpec, public static GetClientTransferProposalDateResponse getProposedTransferDate(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final String externalId) { final ResponseSpecification responseSpec, final String externalId) {
final String url = CLIENT_EXTERNALID_URL + "/" + externalId + "/transferproposaldate?" + Utils.TENANT_IDENTIFIER; final String url = CLIENT_EXTERNALID_URL + "/" + externalId + "/transferproposaldate?" + Utils.TENANT_IDENTIFIER;
@@ -182,6 +206,10 @@ public class ClientHelper extends IntegrationTest {
return GSON.fromJson(response, GetClientTransferProposalDateResponse.class); return GSON.fromJson(response, GetClientTransferProposalDateResponse.class);
} }
// 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 List<GetObligeeData> getObligeeData(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static List<GetObligeeData> getObligeeData(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String externalId) { final String externalId) {
final String url = CLIENT_EXTERNALID_URL + "/" + externalId + "/obligeedetails?" + Utils.TENANT_IDENTIFIER; final String url = CLIENT_EXTERNALID_URL + "/" + externalId + "/obligeedetails?" + Utils.TENANT_IDENTIFIER;
@@ -190,15 +218,27 @@ public class ClientHelper extends IntegrationTest {
return GSON.fromJson(response, new TypeToken<List<GetObligeeData>>() {}.getType()); return GSON.fromJson(response, new TypeToken<List<GetObligeeData>>() {}.getType());
} }
// 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 Integer createClient(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static Integer createClient(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
return createClient(requestSpec, responseSpec, DEFAULT_DATE); return createClient(requestSpec, responseSpec, DEFAULT_DATE);
} }
// 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 Integer createClient(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createClient(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String activationDate) { final String activationDate) {
return createClient(requestSpec, responseSpec, activationDate, "1"); return createClient(requestSpec, responseSpec, activationDate, "1");
} }
// 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 Integer createClient(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createClient(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String activationDate, final String officeId) { final String activationDate, final String officeId) {
log.info("---------------------------------CREATING A CLIENT---------------------------------------------"); log.info("---------------------------------CREATING A CLIENT---------------------------------------------");
@@ -206,6 +246,10 @@ public class ClientHelper extends IntegrationTest {
"clientId"); "clientId");
} }
// 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 PostClientsResponse createClient(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static PostClientsResponse createClient(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String activationDate, final String officeId, final String externalId) { final String activationDate, final String officeId, final String externalId) {
log.info("---------------------------------CREATING A CLIENT---------------------------------------------"); log.info("---------------------------------CREATING A CLIENT---------------------------------------------");
@@ -214,6 +258,10 @@ public class ClientHelper extends IntegrationTest {
return GSON.fromJson(response, PostClientsResponse.class); return GSON.fromJson(response, PostClientsResponse.class);
} }
// 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 PostClientClientIdAddressesResponse createClientAddress(final RequestSpecification requestSpec, public static PostClientClientIdAddressesResponse createClientAddress(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, long clientId, long addressTypeId, PostClientClientIdAddressesRequest request) { final ResponseSpecification responseSpec, long clientId, long addressTypeId, PostClientClientIdAddressesRequest request) {
final String CREATE_CLIENT_ADDRESS_URL = "/fineract-provider/api/v1/client/" + clientId + "/addresses?type=" + addressTypeId + "&" final String CREATE_CLIENT_ADDRESS_URL = "/fineract-provider/api/v1/client/" + clientId + "/addresses?type=" + addressTypeId + "&"
@@ -224,15 +272,27 @@ public class ClientHelper extends IntegrationTest {
return GSON.fromJson(response, PostClientClientIdAddressesResponse.class); return GSON.fromJson(response, PostClientClientIdAddressesResponse.class);
} }
// 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 Integer createClientPending(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static Integer createClientPending(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
return createClientPending(requestSpec, responseSpec, "04 March 2014"); return createClientPending(requestSpec, responseSpec, "04 March 2014");
} }
// 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 Integer createClientPending(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createClientPending(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String submittedOnDate) { final String submittedOnDate) {
return createClientPending(requestSpec, responseSpec, submittedOnDate, "1"); return createClientPending(requestSpec, responseSpec, submittedOnDate, "1");
} }
// 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 Integer createClientPending(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createClientPending(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String submittedOnDate, final String officeId) { final String submittedOnDate, final String officeId) {
log.info("---------------------------------CREATING A CLIENT IN PENDING---------------------------------------------"); log.info("---------------------------------CREATING A CLIENT IN PENDING---------------------------------------------");
@@ -240,12 +300,20 @@ public class ClientHelper extends IntegrationTest {
"clientId"); "clientId");
} }
// 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 Object createClientPendingWithError(final String jsonAttributeToGetBack) { public Object createClientPendingWithError(final String jsonAttributeToGetBack) {
log.info("---------------------------------CREATING A CLIENT IN PENDING WITH ERROR---------------------------------------------"); log.info("---------------------------------CREATING A CLIENT IN PENDING WITH ERROR---------------------------------------------");
return Utils.performServerPost(this.requestSpec, this.responseSpec, CREATE_CLIENT_URL, return Utils.performServerPost(this.requestSpec, this.responseSpec, CREATE_CLIENT_URL,
getTestClientAsJSONPending("04 March 2014", "1"), jsonAttributeToGetBack); getTestClientAsJSONPending("04 March 2014", "1"), jsonAttributeToGetBack);
} }
// 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 Integer createClientPendingWithDatatable(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createClientPendingWithDatatable(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String registeredTableName) { final String registeredTableName) {
log.info("-------------------------- CREATING A CLIENT IN PENDING WITH DATATABLES --------------------------------"); log.info("-------------------------- CREATING A CLIENT IN PENDING WITH DATATABLES --------------------------------");
@@ -253,15 +321,27 @@ public class ClientHelper extends IntegrationTest {
getTestPendingClientWithDatatableAsJson(registeredTableName), "clientId"); getTestPendingClientWithDatatableAsJson(registeredTableName), "clientId");
} }
// 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 Integer createClientAsPerson(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static Integer createClientAsPerson(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
return createClientAsPerson(requestSpec, responseSpec, DEFAULT_DATE); return createClientAsPerson(requestSpec, responseSpec, DEFAULT_DATE);
} }
// 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 Integer createClientAsPerson(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createClientAsPerson(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String activationDate) { final String activationDate) {
return createClientAsPerson(requestSpec, responseSpec, activationDate, "1"); return createClientAsPerson(requestSpec, responseSpec, activationDate, "1");
} }
// 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 Integer createClientAsPerson(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createClientAsPerson(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String activationDate, final String officeId) { final String activationDate, final String officeId) {
@@ -271,6 +351,10 @@ public class ClientHelper extends IntegrationTest {
"clientId"); "clientId");
} }
// 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 PostClientsResponse createClientAsPersonWithDatatable(final RequestSpecification requestSpec, public static PostClientsResponse createClientAsPersonWithDatatable(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final String activationDate, final String officeId, final ResponseSpecification responseSpec, final String activationDate, final String officeId,
final HashMap<String, Object> datatables) { final HashMap<String, Object> datatables) {
@@ -280,15 +364,27 @@ public class ClientHelper extends IntegrationTest {
return GSON.fromJson(response, PostClientsResponse.class); return GSON.fromJson(response, PostClientsResponse.class);
} }
// 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 Integer createClientAsEntity(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static Integer createClientAsEntity(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
return createClientAsEntity(requestSpec, responseSpec, DEFAULT_DATE); return createClientAsEntity(requestSpec, responseSpec, DEFAULT_DATE);
} }
// 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 Integer createClientAsEntity(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createClientAsEntity(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String activationDate) { final String activationDate) {
return createClientAsEntity(requestSpec, responseSpec, activationDate, "1"); return createClientAsEntity(requestSpec, responseSpec, activationDate, "1");
} }
// 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 Integer createClientAsEntity(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createClientAsEntity(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String activationDate, final String officeId) { final String activationDate, final String officeId) {
@@ -302,6 +398,10 @@ public class ClientHelper extends IntegrationTest {
getTestEntityClientAsJSON(activationDate, officeId, soleProprietorCodeValueId), "clientId"); getTestEntityClientAsJSON(activationDate, officeId, soleProprietorCodeValueId), "clientId");
} }
// 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 Integer createClientForAccountPreference(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createClientForAccountPreference(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer clientType, String jsonAttributeToGetBack) { final Integer clientType, String jsonAttributeToGetBack) {
final String activationDate = DEFAULT_DATE; final String activationDate = DEFAULT_DATE;
@@ -312,6 +412,10 @@ public class ClientHelper extends IntegrationTest {
getTestClientWithClientTypeAsJSON(activationDate, officeId, clientType.toString()), jsonAttributeToGetBack); getTestClientWithClientTypeAsJSON(activationDate, officeId, clientType.toString()), jsonAttributeToGetBack);
} }
// 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 Object assignStaffToClient(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Object assignStaffToClient(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String clientId, final String staffId) { final String clientId, final String staffId) {
final String CLIENT_ASSIGN_STAFF_URL = "/fineract-provider/api/v1/clients/" + clientId + "?" + Utils.TENANT_IDENTIFIER final String CLIENT_ASSIGN_STAFF_URL = "/fineract-provider/api/v1/clients/" + clientId + "?" + Utils.TENANT_IDENTIFIER
@@ -321,15 +425,27 @@ public class ClientHelper extends IntegrationTest {
return Utils.performServerPost(requestSpec, responseSpec, CLIENT_ASSIGN_STAFF_URL, assignStaffToClientAsJson(staffId), "changes"); return Utils.performServerPost(requestSpec, responseSpec, CLIENT_ASSIGN_STAFF_URL, assignStaffToClientAsJson(staffId), "changes");
} }
// 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 Integer getClientsStaffId(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer getClientsStaffId(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String clientId) { final String clientId) {
return (Integer) getClient(requestSpec, responseSpec, clientId, "staffId"); return (Integer) getClient(requestSpec, responseSpec, clientId, "staffId");
} }
// 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 HashMap<String, Object> setInitialClientValues(final String officeId, final Long legalFormId) { public static HashMap<String, Object> setInitialClientValues(final String officeId, final Long legalFormId) {
return setInitialClientValues(officeId, legalFormId, UUID.randomUUID().toString()); return setInitialClientValues(officeId, legalFormId, UUID.randomUUID().toString());
} }
// 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 HashMap<String, Object> setInitialClientValues(final String officeId, final Long legalFormId, final String externalId) { public static HashMap<String, Object> setInitialClientValues(final String officeId, final Long legalFormId, final String externalId) {
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
map.put("officeId", officeId); map.put("officeId", officeId);
@@ -344,6 +460,10 @@ public class ClientHelper extends IntegrationTest {
return map; return map;
} }
// 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 String getBasicClientAsJSON(final String officeId, final Long legalFormId, final String externalId) { public static String getBasicClientAsJSON(final String officeId, final Long legalFormId, final String externalId) {
HashMap<String, Object> map = setInitialClientValues(officeId, legalFormId, externalId); HashMap<String, Object> map = setInitialClientValues(officeId, legalFormId, externalId);
map.put("active", "true"); map.put("active", "true");
@@ -353,6 +473,10 @@ public class ClientHelper extends IntegrationTest {
return basicClientAsJson; return basicClientAsJson;
} }
// 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 String getTestClientAsJSON(final String dateOfJoining, final String officeId) { public static String getTestClientAsJSON(final String dateOfJoining, final String officeId) {
HashMap<String, Object> map = setInitialClientValues(officeId, LEGALFORM_ID_PERSON); HashMap<String, Object> map = setInitialClientValues(officeId, LEGALFORM_ID_PERSON);
map.put("active", "true"); map.put("active", "true");
@@ -362,6 +486,10 @@ public class ClientHelper extends IntegrationTest {
return testClientAsJson; return testClientAsJson;
} }
// 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 String getTestClientAsJSONPending(final String submittedOnDate, final String officeId) { public static String getTestClientAsJSONPending(final String submittedOnDate, final String officeId) {
HashMap<String, Object> map = setInitialClientValues(officeId, LEGALFORM_ID_PERSON); HashMap<String, Object> map = setInitialClientValues(officeId, LEGALFORM_ID_PERSON);
map.put("active", "false"); map.put("active", "false");
@@ -370,6 +498,10 @@ public class ClientHelper extends IntegrationTest {
return GSON.toJson(map); return GSON.toJson(map);
} }
// 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 String getTestPendingClientWithDatatableAsJson(final String registeredTableName) { public static String getTestPendingClientWithDatatableAsJson(final String registeredTableName) {
HashMap<String, Object> map = setInitialClientValues("1", LEGALFORM_ID_PERSON); HashMap<String, Object> map = setInitialClientValues("1", LEGALFORM_ID_PERSON);
map.put("active", "false"); map.put("active", "false");
@@ -379,6 +511,10 @@ public class ClientHelper extends IntegrationTest {
return requestJson; return requestJson;
} }
// 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 String getTestDatatableAsJson(HashMap<String, Object> map, final String registeredTableName) { public static String getTestDatatableAsJson(HashMap<String, Object> map, final String registeredTableName) {
List<HashMap<String, Object>> datatablesListMap = new ArrayList<>(); List<HashMap<String, Object>> datatablesListMap = new ArrayList<>();
HashMap<String, Object> datatableMap = new HashMap<>(); HashMap<String, Object> datatableMap = new HashMap<>();
@@ -396,6 +532,10 @@ public class ClientHelper extends IntegrationTest {
return GSON.toJson(map); return GSON.toJson(map);
} }
// 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 String getTestPersonClientAsJSON(final String dateOfJoining, final String officeId) { public static String getTestPersonClientAsJSON(final String dateOfJoining, final String officeId) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("officeId", officeId); map.put("officeId", officeId);
@@ -411,6 +551,10 @@ public class ClientHelper extends IntegrationTest {
return GSON.toJson(map); return GSON.toJson(map);
} }
// 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 String getTestPersonClientAsJSON(final String dateOfJoining, final String officeId, public static String getTestPersonClientAsJSON(final String dateOfJoining, final String officeId,
final HashMap<String, Object> datatables) { final HashMap<String, Object> datatables) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
@@ -430,6 +574,10 @@ public class ClientHelper extends IntegrationTest {
return GSON.toJson(map); return GSON.toJson(map);
} }
// 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 String getTestEntityClientAsJSON(final String dateOfJoining, final String officeId, public static String getTestEntityClientAsJSON(final String dateOfJoining, final String officeId,
final Integer soleProprietorCodeValueId) { final Integer soleProprietorCodeValueId) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
@@ -450,6 +598,10 @@ public class ClientHelper extends IntegrationTest {
return GSON.toJson(map); return GSON.toJson(map);
} }
// 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 String getTestClientWithClientTypeAsJSON(final String dateOfJoining, final String officeId, final String clientType) { public static String getTestClientWithClientTypeAsJSON(final String dateOfJoining, final String officeId, final String clientType) {
HashMap<String, Object> map = setInitialClientValues("1", LEGALFORM_ID_PERSON); HashMap<String, Object> map = setInitialClientValues("1", LEGALFORM_ID_PERSON);
map.put("active", "true"); map.put("active", "true");
@@ -459,6 +611,10 @@ public class ClientHelper extends IntegrationTest {
return GSON.toJson(map); return GSON.toJson(map);
} }
// 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 String assignStaffToClientAsJson(final String staffId) { public static String assignStaffToClientAsJson(final String staffId) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
map.put("staffId", staffId); map.put("staffId", staffId);
@@ -466,6 +622,10 @@ public class ClientHelper extends IntegrationTest {
return GSON.toJson(map); return GSON.toJson(map);
} }
// 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 void verifyClientCreatedOnServer(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static void verifyClientCreatedOnServer(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer clientId) { final Integer clientId) {
log.info("------------------------------CHECK CLIENT DETAILS------------------------------------\n"); log.info("------------------------------CHECK CLIENT DETAILS------------------------------------\n");
@@ -474,12 +634,20 @@ public class ClientHelper extends IntegrationTest {
assertEquals(clientId, responseClientID, "ERROR IN CREATING THE CLIENT"); assertEquals(clientId, responseClientID, "ERROR IN CREATING THE CLIENT");
} }
// 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 GetClientsClientIdResponse getClient(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static GetClientsClientIdResponse getClient(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final int clientId) { final int clientId) {
String clientResponseStr = (String) getClient(requestSpec, responseSpec, Integer.toString(clientId), null); String clientResponseStr = (String) getClient(requestSpec, responseSpec, Integer.toString(clientId), null);
return GSON.fromJson(clientResponseStr, GetClientsClientIdResponse.class); return GSON.fromJson(clientResponseStr, GetClientsClientIdResponse.class);
} }
// 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 GetClientsClientIdResponse getClientByExternalId(final RequestSpecification requestSpec, public static GetClientsClientIdResponse getClientByExternalId(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final String externalId) { final ResponseSpecification responseSpec, final String externalId) {
final String url = CLIENT_EXTERNALID_URL + "/" + externalId + "?" + Utils.TENANT_IDENTIFIER; final String url = CLIENT_EXTERNALID_URL + "/" + externalId + "?" + Utils.TENANT_IDENTIFIER;
@@ -487,6 +655,10 @@ public class ClientHelper extends IntegrationTest {
return GSON.fromJson(response, GetClientsClientIdResponse.class); return GSON.fromJson(response, GetClientsClientIdResponse.class);
} }
// 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 List<GetClientClientIdAddressesResponse> getClientAddresses(final RequestSpecification requestSpec, public static List<GetClientClientIdAddressesResponse> getClientAddresses(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final int clientId) { final ResponseSpecification responseSpec, final int clientId) {
final String GET_CLIENT_ADDRESSES_URL = "/fineract-provider/api/v1/client/" + clientId + "/addresses?" + Utils.TENANT_IDENTIFIER; final String GET_CLIENT_ADDRESSES_URL = "/fineract-provider/api/v1/client/" + clientId + "/addresses?" + Utils.TENANT_IDENTIFIER;
@@ -495,6 +667,10 @@ public class ClientHelper extends IntegrationTest {
return GSON.fromJson(clientResponseStr, new TypeToken<List<GetClientClientIdAddressesResponse>>() {}.getType()); return GSON.fromJson(clientResponseStr, new TypeToken<List<GetClientClientIdAddressesResponse>>() {}.getType());
} }
// 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 Object getClient(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, final String clientId, public static Object getClient(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, final String clientId,
final String jsonReturn) { final String jsonReturn) {
final String GET_CLIENT_URL = "/fineract-provider/api/v1/clients/" + clientId + "?" + Utils.TENANT_IDENTIFIER; final String GET_CLIENT_URL = "/fineract-provider/api/v1/clients/" + clientId + "?" + Utils.TENANT_IDENTIFIER;
@@ -502,6 +678,10 @@ public class ClientHelper extends IntegrationTest {
return Utils.performServerGet(requestSpec, responseSpec, GET_CLIENT_URL, jsonReturn); return Utils.performServerGet(requestSpec, responseSpec, GET_CLIENT_URL, jsonReturn);
} }
// 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 HashMap<String, Object> getClientAuditFields(final RequestSpecification requestSpec, public static HashMap<String, Object> getClientAuditFields(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final Integer clientId, final String jsonReturn) { final ResponseSpecification responseSpec, final Integer clientId, final String jsonReturn) {
final String GET_CLIENT_URL = "/fineract-provider/api/v1/internal/client/" + clientId + "/audit?" + Utils.TENANT_IDENTIFIER; final String GET_CLIENT_URL = "/fineract-provider/api/v1/internal/client/" + clientId + "/audit?" + Utils.TENANT_IDENTIFIER;
@@ -509,6 +689,10 @@ public class ClientHelper extends IntegrationTest {
return Utils.performServerGet(requestSpec, responseSpec, GET_CLIENT_URL, jsonReturn); return Utils.performServerGet(requestSpec, responseSpec, GET_CLIENT_URL, jsonReturn);
} }
// 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)
/* Client status is a map.So adding SuppressWarnings */ /* Client status is a map.So adding SuppressWarnings */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static HashMap<String, Object> getClientStatus(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static HashMap<String, Object> getClientStatus(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
@@ -516,6 +700,10 @@ public class ClientHelper extends IntegrationTest {
return (HashMap<String, Object>) getClient(requestSpec, responseSpec, clientId, "status"); return (HashMap<String, Object>) getClient(requestSpec, responseSpec, clientId, "status");
} }
// 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 String getCloseClientAsJSON() { public String getCloseClientAsJSON() {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
@@ -538,6 +726,10 @@ public class ClientHelper extends IntegrationTest {
return clientJson; return clientJson;
} }
// 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 String getReactivateClientAsJSON() { public String getReactivateClientAsJSON() {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
map.put("locale", CommonConstants.LOCALE); map.put("locale", CommonConstants.LOCALE);
@@ -548,6 +740,10 @@ public class ClientHelper extends IntegrationTest {
return clientJson; return clientJson;
} }
// 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)
private String getUndoRejectClientAsJSON(final String date) { private String getUndoRejectClientAsJSON(final String date) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
map.put("locale", CommonConstants.LOCALE); map.put("locale", CommonConstants.LOCALE);
@@ -559,6 +755,10 @@ public class ClientHelper extends IntegrationTest {
} }
// 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)
private String getUndoWithdrawnClientAsJSON(final String date) { private String getUndoWithdrawnClientAsJSON(final String date) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
map.put("locale", CommonConstants.LOCALE); map.put("locale", CommonConstants.LOCALE);
@@ -570,6 +770,10 @@ public class ClientHelper extends IntegrationTest {
} }
// 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 String getRejectClientAsJSON() { public String getRejectClientAsJSON() {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
/* Retrieve Code id for the Code "ClientRejectReason" */ /* Retrieve Code id for the Code "ClientRejectReason" */
@@ -592,6 +796,10 @@ public class ClientHelper extends IntegrationTest {
} }
// 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 String getActivateClientAsJSON(String date) { public static String getActivateClientAsJSON(String date) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
map.put("locale", CommonConstants.LOCALE); map.put("locale", CommonConstants.LOCALE);
@@ -602,6 +810,10 @@ public class ClientHelper extends IntegrationTest {
return clientJson; return clientJson;
} }
// 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)
private String getWithdrawClientAsJSON() { private String getWithdrawClientAsJSON() {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
/* Retrieve Code id for the Code "ClientWithdrawReason" */ /* Retrieve Code id for the Code "ClientWithdrawReason" */
@@ -623,6 +835,10 @@ public class ClientHelper extends IntegrationTest {
return clientJson; return clientJson;
} }
// 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 String getSpecifiedDueDateChargesClientAsJSON(final String chargeId, final String dueDate) { public static String getSpecifiedDueDateChargesClientAsJSON(final String chargeId, final String dueDate) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
map.put("locale", "en_GB"); map.put("locale", "en_GB");
@@ -634,6 +850,10 @@ public class ClientHelper extends IntegrationTest {
return json; return json;
} }
// 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 String getPayChargeJSON(final String date, String amount) { public static String getPayChargeJSON(final String date, String amount) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
map.put("locale", "en_GB"); map.put("locale", "en_GB");
@@ -645,6 +865,10 @@ public class ClientHelper extends IntegrationTest {
return json; return json;
} }
// 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 String getPayChargeJSONWithExternalId(final String date, String amount, String externalId) { public static String getPayChargeJSONWithExternalId(final String date, String amount, String externalId) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
map.put("locale", "en_GB"); map.put("locale", "en_GB");
@@ -657,6 +881,10 @@ public class ClientHelper extends IntegrationTest {
return json; return json;
} }
// 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 String getWaiveChargeJSON(final String amount, String clientChargeId) { public static String getWaiveChargeJSON(final String amount, String clientChargeId) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
map.put("locale", "en_GB"); map.put("locale", "en_GB");
@@ -667,48 +895,84 @@ public class ClientHelper extends IntegrationTest {
return json; return json;
} }
// 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 HashMap<String, Object> closeClient(final Integer clientId) { public HashMap<String, Object> closeClient(final Integer clientId) {
log.info("--------------------------------- CLOSE CLIENT -------------------------------"); log.info("--------------------------------- CLOSE CLIENT -------------------------------");
return performClientActions(createClientOperationURL(CLOSE_CLIENT_COMMAND, clientId), getCloseClientAsJSON(), clientId); return performClientActions(createClientOperationURL(CLOSE_CLIENT_COMMAND, clientId), getCloseClientAsJSON(), clientId);
} }
// 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 HashMap<String, Object> reactivateClient(final Integer clientId) { public HashMap<String, Object> reactivateClient(final Integer clientId) {
log.info("--------------------------------- REACTIVATE CLIENT -------------------------------"); log.info("--------------------------------- REACTIVATE CLIENT -------------------------------");
return performClientActions(createClientOperationURL(REACTIVATE_CLIENT_COMMAND, clientId), getReactivateClientAsJSON(), clientId); return performClientActions(createClientOperationURL(REACTIVATE_CLIENT_COMMAND, clientId), getReactivateClientAsJSON(), clientId);
} }
// 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 HashMap<String, Object> rejectClient(final Integer clientId) { public HashMap<String, Object> rejectClient(final Integer clientId) {
log.info("--------------------------------- REJECT CLIENT -------------------------------"); log.info("--------------------------------- REJECT CLIENT -------------------------------");
return performClientActions(createClientOperationURL(REJECT_CLIENT_COMMAND, clientId), getRejectClientAsJSON(), clientId); return performClientActions(createClientOperationURL(REJECT_CLIENT_COMMAND, clientId), getRejectClientAsJSON(), clientId);
} }
// 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 HashMap<String, Object> activateClient(final Integer clientId) { public HashMap<String, Object> activateClient(final Integer clientId) {
log.info("--------------------------------- ACTIVATE CLIENT -------------------------------"); log.info("--------------------------------- ACTIVATE CLIENT -------------------------------");
return performClientActions(createClientOperationURL(ACTIVATE_CLIENT_COMMAND, clientId), return performClientActions(createClientOperationURL(ACTIVATE_CLIENT_COMMAND, clientId),
getActivateClientAsJSON(CREATED_DATE_PLUS_ONE), clientId); getActivateClientAsJSON(CREATED_DATE_PLUS_ONE), clientId);
} }
// 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 HashMap<String, Object> withdrawClient(final Integer clientId) { public HashMap<String, Object> withdrawClient(final Integer clientId) {
log.info("--------------------------------- WITHDRAWN CLIENT -------------------------------"); log.info("--------------------------------- WITHDRAWN CLIENT -------------------------------");
return performClientActions(createClientOperationURL(WITHDRAW_CLIENT_COMMAND, clientId), getWithdrawClientAsJSON(), clientId); return performClientActions(createClientOperationURL(WITHDRAW_CLIENT_COMMAND, clientId), getWithdrawClientAsJSON(), clientId);
} }
// 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)
private String createClientOperationURL(final String command, final Integer clientId) { private String createClientOperationURL(final String command, final Integer clientId) {
return CLIENT_URL + "/" + clientId + "?command=" + command + "&" + Utils.TENANT_IDENTIFIER; return CLIENT_URL + "/" + clientId + "?command=" + command + "&" + Utils.TENANT_IDENTIFIER;
} }
// 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 HashMap<String, Object> undoReject(final Integer clientId) { public HashMap<String, Object> undoReject(final Integer clientId) {
log.info("--------------------------------- UNDO REJECT CLIENT -------------------------------"); log.info("--------------------------------- UNDO REJECT CLIENT -------------------------------");
return performClientActions(createClientOperationURL(UNDOREJECT_CLIENT_COMMAND, clientId), return performClientActions(createClientOperationURL(UNDOREJECT_CLIENT_COMMAND, clientId),
getUndoRejectClientAsJSON(CREATED_DATE_PLUS_TWO), clientId); getUndoRejectClientAsJSON(CREATED_DATE_PLUS_TWO), clientId);
} }
// 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 HashMap<String, Object> undoWithdrawn(final Integer clientId) { public HashMap<String, Object> undoWithdrawn(final Integer clientId) {
log.info("--------------------------------- UNDO WITHDRAWN CLIENT -------------------------------"); log.info("--------------------------------- UNDO WITHDRAWN CLIENT -------------------------------");
return performClientActions(createClientOperationURL(UNDOWITHDRAWN_CLIENT_COMMAND, clientId), return performClientActions(createClientOperationURL(UNDOWITHDRAWN_CLIENT_COMMAND, clientId),
getUndoWithdrawnClientAsJSON(CREATED_DATE_PLUS_TWO), clientId); getUndoWithdrawnClientAsJSON(CREATED_DATE_PLUS_TWO), clientId);
} }
// 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 ArrayList<HashMap<String, Object>> undoRejectedclient(final Integer clientId, final String jsonAttributeToGetBack, public ArrayList<HashMap<String, Object>> undoRejectedclient(final Integer clientId, final String jsonAttributeToGetBack,
final String rejectedDate) { final String rejectedDate) {
log.info("----------------------------------UNDO REJECT CLIENT ----------------------------------"); log.info("----------------------------------UNDO REJECT CLIENT ----------------------------------");
@@ -716,6 +980,10 @@ public class ClientHelper extends IntegrationTest {
getUndoRejectClientAsJSON(rejectedDate), jsonAttributeToGetBack); getUndoRejectClientAsJSON(rejectedDate), jsonAttributeToGetBack);
} }
// 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 ArrayList<HashMap<String, Object>> undoWithdrawclient(final Integer clientId, final String jsonAttributeToGetBack, public ArrayList<HashMap<String, Object>> undoWithdrawclient(final Integer clientId, final String jsonAttributeToGetBack,
final String rejectedDate) { final String rejectedDate) {
log.info("----------------------------------UNDO WITHDRAW CLIENT ----------------------------------"); log.info("----------------------------------UNDO WITHDRAW CLIENT ----------------------------------");
@@ -723,23 +991,39 @@ public class ClientHelper extends IntegrationTest {
getUndoWithdrawnClientAsJSON(rejectedDate), jsonAttributeToGetBack); getUndoWithdrawnClientAsJSON(rejectedDate), jsonAttributeToGetBack);
} }
// 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 ArrayList<HashMap<String, Object>> activateClient(final Integer clientId, final String jsonAttributeToGetBack) { public ArrayList<HashMap<String, Object>> activateClient(final Integer clientId, final String jsonAttributeToGetBack) {
log.info("--------------------------------- ACTIVATE CLIENT -------------------------------"); log.info("--------------------------------- ACTIVATE CLIENT -------------------------------");
return performClientActionsWithValidationErrors(createClientOperationURL(ACTIVATE_CLIENT_COMMAND, clientId), return performClientActionsWithValidationErrors(createClientOperationURL(ACTIVATE_CLIENT_COMMAND, clientId),
getActivateClientAsJSON(CREATED_DATE_PLUS_ONE), jsonAttributeToGetBack); getActivateClientAsJSON(CREATED_DATE_PLUS_ONE), jsonAttributeToGetBack);
} }
// 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 HashMap<String, Object> activateClientWithDiffDateOption(final Integer clientId, final String activationDate) { public HashMap<String, Object> activateClientWithDiffDateOption(final Integer clientId, final String activationDate) {
log.info("--------------------------------- ACTIVATE CLIENT -------------------------------"); log.info("--------------------------------- ACTIVATE CLIENT -------------------------------");
return performClientActions(createClientOperationURL(ACTIVATE_CLIENT_COMMAND, clientId), getActivateClientAsJSON(activationDate), return performClientActions(createClientOperationURL(ACTIVATE_CLIENT_COMMAND, clientId), getActivateClientAsJSON(activationDate),
clientId); clientId);
} }
// 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)
private ArrayList<HashMap<String, Object>> performClientActionsWithValidationErrors(final String postURLForClient, private ArrayList<HashMap<String, Object>> performClientActionsWithValidationErrors(final String postURLForClient,
final String jsonToBeSent, final String jsonAttributeToGetBack) { final String jsonToBeSent, final String jsonAttributeToGetBack) {
return Utils.performServerPost(this.requestSpec, this.responseSpec, postURLForClient, jsonToBeSent, jsonAttributeToGetBack); return Utils.performServerPost(this.requestSpec, this.responseSpec, postURLForClient, jsonToBeSent, jsonAttributeToGetBack);
} }
// 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)
private HashMap<String, Object> performClientActions(final String postURLForClient, final String jsonToBeSent, final Integer clientId) { private HashMap<String, Object> performClientActions(final String postURLForClient, final String jsonToBeSent, final Integer clientId) {
Utils.performServerPost(this.requestSpec, this.responseSpec, postURLForClient, jsonToBeSent, CommonConstants.RESPONSE_STATUS); Utils.performServerPost(this.requestSpec, this.responseSpec, postURLForClient, jsonToBeSent, CommonConstants.RESPONSE_STATUS);
HashMap<String, Object> response = ClientHelper.getClientStatus(requestSpec, responseSpec, String.valueOf(clientId)); HashMap<String, Object> response = ClientHelper.getClientStatus(requestSpec, responseSpec, String.valueOf(clientId));
@@ -747,6 +1031,10 @@ public class ClientHelper extends IntegrationTest {
return response; return response;
} }
// 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 PostClientsClientIdResponse performClientActionUsingExternalId(final RequestSpecification requestSpec, public static PostClientsClientIdResponse performClientActionUsingExternalId(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final String externalId, final String command, final String jsonPayload) { final ResponseSpecification responseSpec, final String externalId, final String command, final String jsonPayload) {
final String url = CLIENT_EXTERNALID_URL + "/" + externalId + "?" + Utils.TENANT_IDENTIFIER + "&command=" + command; final String url = CLIENT_EXTERNALID_URL + "/" + externalId + "?" + Utils.TENANT_IDENTIFIER + "&command=" + command;
@@ -754,6 +1042,10 @@ public class ClientHelper extends IntegrationTest {
return GSON.fromJson(response, PostClientsClientIdResponse.class); return GSON.fromJson(response, PostClientsClientIdResponse.class);
} }
// 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 Integer addChargesForClient(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer addChargesForClient(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer clientId, final String request) { final Integer clientId, final String request) {
log.info("--------------------------------- ADD CHARGES FOR Client --------------------------------"); log.info("--------------------------------- ADD CHARGES FOR Client --------------------------------");
@@ -762,6 +1054,10 @@ public class ClientHelper extends IntegrationTest {
return (Integer) response.get("resourceId"); return (Integer) response.get("resourceId");
} }
// 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 String payChargesForClients(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static String payChargesForClients(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer clientId, final Integer clientChargeId, final String json) { final Integer clientId, final Integer clientChargeId, final String json) {
log.info("--------------------------------- PAY CHARGES FOR CLIENT --------------------------------"); log.info("--------------------------------- PAY CHARGES FOR CLIENT --------------------------------");
@@ -771,6 +1067,10 @@ public class ClientHelper extends IntegrationTest {
return response.get("transactionId") != null ? response.get("transactionId").toString() : null; return response.get("transactionId") != null ? response.get("transactionId").toString() : null;
} }
// 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 String payChargesForClientsTransactionExternalId(final RequestSpecification requestSpec, public static String payChargesForClientsTransactionExternalId(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final Integer clientId, final Integer clientChargeId, final String json) { final ResponseSpecification responseSpec, final Integer clientId, final Integer clientChargeId, final String json) {
log.info("--------------------------------- PAY CHARGES FOR CLIENT --------------------------------"); log.info("--------------------------------- PAY CHARGES FOR CLIENT --------------------------------");
@@ -780,6 +1080,10 @@ public class ClientHelper extends IntegrationTest {
return response.get("subResourceExternalId") != null ? response.get("subResourceExternalId").toString() : null; return response.get("subResourceExternalId") != null ? response.get("subResourceExternalId").toString() : null;
} }
// 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 String waiveChargesForClients(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static String waiveChargesForClients(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer clientId, final Integer clientChargeId, final String json) { final Integer clientId, final Integer clientChargeId, final String json) {
log.info("--------------------------------- WAIVE CHARGES FOR CLIENT --------------------------------"); log.info("--------------------------------- WAIVE CHARGES FOR CLIENT --------------------------------");
@@ -790,6 +1094,10 @@ public class ClientHelper extends IntegrationTest {
return response.get("transactionId").toString(); return response.get("transactionId").toString();
} }
// 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 Integer revertClientChargeTransaction(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer revertClientChargeTransaction(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String clientId, String clientChargeId) { final String clientId, String clientChargeId) {
log.info("---------------------------------UNDO TRANSACTION---------------------------------------------"); log.info("---------------------------------UNDO TRANSACTION---------------------------------------------");
@@ -801,6 +1109,10 @@ public class ClientHelper extends IntegrationTest {
} }
// 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 Object getClientCharge(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Object getClientCharge(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String clientId, final String clientChargeId) { final String clientId, final String clientChargeId) {
log.info("---------------------------------GET CLIENT CHARGE---------------------------------------------"); log.info("---------------------------------GET CLIENT CHARGE---------------------------------------------");
@@ -809,6 +1121,10 @@ public class ClientHelper extends IntegrationTest {
return Utils.performServerGet(requestSpec, responseSpec, CHARGES_URL, "amountOutstanding"); return Utils.performServerGet(requestSpec, responseSpec, CHARGES_URL, "amountOutstanding");
} }
// 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 Boolean getClientTransactions(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Boolean getClientTransactions(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String clientId, final String transactionId) { final String clientId, final String transactionId) {
log.info("---------------------------------GET CLIENT CHARGE TRANSACTIONS---------------------------------------------"); log.info("---------------------------------GET CLIENT CHARGE TRANSACTIONS---------------------------------------------");
@@ -841,6 +1157,10 @@ public class ClientHelper extends IntegrationTest {
return ok(fineract().clientTransactions.undoClientTransaction1(clientId, transactionExternalId, "undo")); return ok(fineract().clientTransactions.undoClientTransaction1(clientId, transactionExternalId, "undo"));
} }
// 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 Workbook getClientEntityWorkbook(GlobalEntityType clientsEntity, String dateFormat) throws IOException { public Workbook getClientEntityWorkbook(GlobalEntityType clientsEntity, String dateFormat) throws IOException {
requestSpec.header(HttpHeaders.CONTENT_TYPE, "application/vnd.ms-excel"); requestSpec.header(HttpHeaders.CONTENT_TYPE, "application/vnd.ms-excel");
byte[] byteArray = Utils.performGetBinaryResponse(requestSpec, responseSpec, CLIENT_URL + "/downloadtemplate" + "?" byte[] byteArray = Utils.performGetBinaryResponse(requestSpec, responseSpec, CLIENT_URL + "/downloadtemplate" + "?"
@@ -850,12 +1170,20 @@ public class ClientHelper extends IntegrationTest {
return workbook; return workbook;
} }
// 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 String getOutputTemplateLocation(final String importDocumentId) { public String getOutputTemplateLocation(final String importDocumentId) {
requestSpec.header(HttpHeaders.CONTENT_TYPE, MediaType.TEXT_PLAIN); requestSpec.header(HttpHeaders.CONTENT_TYPE, MediaType.TEXT_PLAIN);
return Utils.performServerOutputTemplateLocationGet(requestSpec, responseSpec, return Utils.performServerOutputTemplateLocationGet(requestSpec, responseSpec,
"/fineract-provider/api/v1/imports/getOutputTemplateLocation" + "?" + Utils.TENANT_IDENTIFIER, importDocumentId); "/fineract-provider/api/v1/imports/getOutputTemplateLocation" + "?" + Utils.TENANT_IDENTIFIER, importDocumentId);
} }
// 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 String importClientEntityTemplate(File file) { public String importClientEntityTemplate(File file) {
String locale = "en"; String locale = "en";
String dateFormat = "dd MMMM yyyy"; String dateFormat = "dd MMMM yyyy";
@@ -865,6 +1193,10 @@ public class ClientHelper extends IntegrationTest {
legalFormType, file, locale, dateFormat); legalFormType, file, locale, dateFormat);
} }
// 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 List getClientWithStatus(final int limit, final String status) { public List getClientWithStatus(final int limit, final String status) {
final String URL = "/fineract-provider/api/v1/clients?paged=true&status=" + status + "&limit=" + Integer.toString(limit) + "&" final String URL = "/fineract-provider/api/v1/clients?paged=true&status=" + status + "&limit=" + Integer.toString(limit) + "&"
+ Utils.TENANT_IDENTIFIER; + Utils.TENANT_IDENTIFIER;
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/CollateralManagementHelper.java
+48
View File
@@ -34,11 +34,19 @@ public class CollateralManagementHelper {
private final RequestSpecification requestSpec; private final RequestSpecification requestSpec;
private final ResponseSpecification responseSpec; private final ResponseSpecification responseSpec;
// 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 CollateralManagementHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public CollateralManagementHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
} }
// 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 Integer createClientCollateral(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createClientCollateral(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String clientId, final Integer collateralId) { final String clientId, final Integer collateralId) {
LOG.info("---------------------------------CREATING A CLIENT_COLLATERAL---------------------------------------------"); LOG.info("---------------------------------CREATING A CLIENT_COLLATERAL---------------------------------------------");
@@ -48,6 +56,10 @@ public class CollateralManagementHelper {
clientCollateralAsJson(collateralId, BigDecimal.valueOf(100)), "resourceId"); clientCollateralAsJson(collateralId, BigDecimal.valueOf(100)), "resourceId");
} }
// 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 Object getClientCollateralData(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Object getClientCollateralData(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer collateralId, final String clientId) { final Integer collateralId, final String clientId) {
final String CLIENT_COLLATERAL_URL = "/fineract-provider/api/v1/clients" + clientId + "/collaterals/" + collateralId + "?" final String CLIENT_COLLATERAL_URL = "/fineract-provider/api/v1/clients" + clientId + "/collaterals/" + collateralId + "?"
@@ -55,6 +67,10 @@ public class CollateralManagementHelper {
return Utils.performServerGet(requestSpec, responseSpec, CLIENT_COLLATERAL_URL, "quantity"); return Utils.performServerGet(requestSpec, responseSpec, CLIENT_COLLATERAL_URL, "quantity");
} }
// 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 String clientCollateralAsJson(final Integer collateralId, final BigDecimal quantity) { public static String clientCollateralAsJson(final Integer collateralId, final BigDecimal quantity) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
map.put("collateralId", collateralId.toString()); map.put("collateralId", collateralId.toString());
@@ -64,6 +80,10 @@ public class CollateralManagementHelper {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 Integer createCollateralProduct(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static Integer createCollateralProduct(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
LOG.info("---------------------------------CREATING A COLLATERAL_PRODUCT---------------------------------------------"); LOG.info("---------------------------------CREATING A COLLATERAL_PRODUCT---------------------------------------------");
final String COLLATERAL_PRODUCT_URL = "/fineract-provider/api/v1/collateral-management" + "?" + Utils.TENANT_IDENTIFIER; final String COLLATERAL_PRODUCT_URL = "/fineract-provider/api/v1/collateral-management" + "?" + Utils.TENANT_IDENTIFIER;
@@ -73,6 +93,10 @@ public class CollateralManagementHelper {
"resourceId"); "resourceId");
} }
// 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 String collateralProductAsJson(final String name, final String currency, final String unitType, final String quality, public static String collateralProductAsJson(final String name, final String currency, final String unitType, final String quality,
final BigDecimal pctToBase, final BigDecimal baseAmount, final String locale) { final BigDecimal pctToBase, final BigDecimal baseAmount, final String locale) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
@@ -87,6 +111,10 @@ public class CollateralManagementHelper {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 Integer updateCollateralProduct(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer updateCollateralProduct(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer collateralId) { final Integer collateralId) {
LOG.info("---------------------------------UPDATING A COLLATERAL_PRODUCT---------------------------------------------"); LOG.info("---------------------------------UPDATING A COLLATERAL_PRODUCT---------------------------------------------");
@@ -98,6 +126,10 @@ public class CollateralManagementHelper {
"resourceId"); "resourceId");
} }
// 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 String updateCollateralProductAsString(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static String updateCollateralProductAsString(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer collateralId) { final Integer collateralId) {
@@ -111,6 +143,10 @@ public class CollateralManagementHelper {
return value; return value;
} }
// 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 String updateCollateralProductAsJson(final String name, final String currency, final String unitType, public static String updateCollateralProductAsJson(final String name, final String currency, final String unitType,
final String quality, final BigDecimal pctToBase, final BigDecimal baseAmount, final String locale) { final String quality, final BigDecimal pctToBase, final BigDecimal baseAmount, final String locale) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
@@ -124,6 +160,10 @@ public class CollateralManagementHelper {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 HashMap updateClientCollateral(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static HashMap updateClientCollateral(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer collateralId) { final Integer collateralId) {
final Integer clientID = ClientHelper.createClient(requestSpec, responseSpec); final Integer clientID = ClientHelper.createClient(requestSpec, responseSpec);
@@ -135,6 +175,10 @@ public class CollateralManagementHelper {
"changes"); "changes");
} }
// 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 String updateClientCollateralAsString(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static String updateClientCollateralAsString(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer collateralId) { final Integer collateralId) {
@@ -148,6 +192,10 @@ public class CollateralManagementHelper {
return value; return value;
} }
// 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 String updateClientCollateralAsJson(final BigDecimal quantity) { public static String updateClientCollateralAsJson(final BigDecimal quantity) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
map.put("quantity", quantity.toString()); map.put("quantity", quantity.toString());
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/CreditBureauConfigurationHelper.java
+56 -1
View File
@@ -38,11 +38,19 @@ public class CreditBureauConfigurationHelper {
private final RequestSpecification requestSpec; private final RequestSpecification requestSpec;
private final ResponseSpecification responseSpec; private final ResponseSpecification responseSpec;
// 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 CreditBureauConfigurationHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public CreditBureauConfigurationHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
} }
// 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 List<Map<String, Object>> getCreditBureauConfiguration(RequestSpecification requestSpec, public static List<Map<String, Object>> getCreditBureauConfiguration(RequestSpecification requestSpec,
ResponseSpecification responseSpec, String creditBureauId) { ResponseSpecification responseSpec, String creditBureauId) {
LOG.info("---------------------------------GET A CREDIT_BUREAU_CONFIGURATION---------------------------------------------"); LOG.info("---------------------------------GET A CREDIT_BUREAU_CONFIGURATION---------------------------------------------");
@@ -51,11 +59,19 @@ public class CreditBureauConfigurationHelper {
return JsonPath.from(Utils.performServerGet(requestSpec, responseSpec, CREDITBUREAU_CONFIGURATION_URL)).getList(""); return JsonPath.from(Utils.performServerGet(requestSpec, responseSpec, CREDITBUREAU_CONFIGURATION_URL)).getList("");
} }
// 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 Integer createCreditBureauConfiguration(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createCreditBureauConfiguration(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
String configKey) { String configKey) {
return createCreditBureauConfiguration(requestSpec, responseSpec, "1", configKey); return createCreditBureauConfiguration(requestSpec, responseSpec, "1", configKey);
} }
// 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 Integer createCreditBureauConfiguration(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createCreditBureauConfiguration(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String creditBureauId, String configKey, String value, String description) { final String creditBureauId, String configKey, String value, String description) {
LOG.info("---------------------------------CREATING A CREDIT_BUREAU_CONFIGURATION---------------------------------------------"); LOG.info("---------------------------------CREATING A CREDIT_BUREAU_CONFIGURATION---------------------------------------------");
@@ -65,6 +81,10 @@ public class CreditBureauConfigurationHelper {
creditBureauConfigurationAsJson(configKey, value, description), "resourceId"); creditBureauConfigurationAsJson(configKey, value, description), "resourceId");
} }
// 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 Integer createCreditBureauConfiguration(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createCreditBureauConfiguration(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String creditBureauId, String configKey) { final String creditBureauId, String configKey) {
LOG.info("---------------------------------CREATING A CREDIT_BUREAU_CONFIGURATION---------------------------------------------"); LOG.info("---------------------------------CREATING A CREDIT_BUREAU_CONFIGURATION---------------------------------------------");
@@ -76,7 +96,10 @@ public class CreditBureauConfigurationHelper {
* ResponseSpecification responseSpec, final Integer ConfigurationId) { return * ResponseSpecification responseSpec, final Integer ConfigurationId) { return
* updateCreditBureauConfiguration(requestSpec, responseSpec, ConfigurationId); } * updateCreditBureauConfiguration(requestSpec, responseSpec, ConfigurationId); }
*/ */
// 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 String updateCreditBureauConfiguration(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static String updateCreditBureauConfiguration(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer ConfigurationId) { final Integer ConfigurationId) {
@@ -91,6 +114,10 @@ public class CreditBureauConfigurationHelper {
return value; return value;
} }
// 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 Object updateCreditBureauConfiguration(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Object updateCreditBureauConfiguration(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer ConfigurationId, String configKey, final String updateConfigKeyValue) { final Integer ConfigurationId, String configKey, final String updateConfigKeyValue) {
LOG.info("---------------------------------UPDATING A CREDIT_BUREAU_CONFIGURATION---------------------------------------------"); LOG.info("---------------------------------UPDATING A CREDIT_BUREAU_CONFIGURATION---------------------------------------------");
@@ -100,6 +127,10 @@ public class CreditBureauConfigurationHelper {
updateCreditBureauConfigurationAsJson(configKey, updateConfigKeyValue), "changes"); updateCreditBureauConfigurationAsJson(configKey, updateConfigKeyValue), "changes");
} }
// 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 Object getOrganizationCreditBureauConfiguration(final RequestSpecification requestSpec, public static Object getOrganizationCreditBureauConfiguration(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
LOG.info("---------------------------------GETTING A CREDIT_BUREAU_CONFIGURATION---------------------------------------------"); LOG.info("---------------------------------GETTING A CREDIT_BUREAU_CONFIGURATION---------------------------------------------");
@@ -108,6 +139,10 @@ public class CreditBureauConfigurationHelper {
return Utils.performServerGet(requestSpec, responseSpec, CREDITBUREAU_CONFIGURATION_URL, null); return Utils.performServerGet(requestSpec, responseSpec, CREDITBUREAU_CONFIGURATION_URL, null);
} }
// 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 Object addOrganisationCreditBureau(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Object addOrganisationCreditBureau(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String creditBureauId, String alias, boolean isActive) { final String creditBureauId, String alias, boolean isActive) {
LOG.info("---------------------------------CREATING A CREDIT_BUREAU_CONFIGURATION---------------------------------------------"); LOG.info("---------------------------------CREATING A CREDIT_BUREAU_CONFIGURATION---------------------------------------------");
@@ -116,6 +151,10 @@ public class CreditBureauConfigurationHelper {
return Utils.performServerPost(requestSpec, responseSpec, URL, addOrganizationCreditBureauCreateAsJson(alias, isActive), null); return Utils.performServerPost(requestSpec, responseSpec, URL, addOrganizationCreditBureauCreateAsJson(alias, isActive), null);
} }
// 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 Object updateOrganisationCreditBureau(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Object updateOrganisationCreditBureau(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String creditBureauId, boolean isActive) { final String creditBureauId, boolean isActive) {
LOG.info("---------------------------------CREATING A CREDIT_BUREAU_CONFIGURATION---------------------------------------------"); LOG.info("---------------------------------CREATING A CREDIT_BUREAU_CONFIGURATION---------------------------------------------");
@@ -124,6 +163,10 @@ public class CreditBureauConfigurationHelper {
null); null);
} }
// 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 String addOrganizationCreditBureauCreateAsJson(final String alias, final boolean isActive) { public static String addOrganizationCreditBureauCreateAsJson(final String alias, final boolean isActive) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("alias", alias); map.put("alias", alias);
@@ -132,6 +175,10 @@ public class CreditBureauConfigurationHelper {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 String updateOrganizationCreditBureauCreateAsJson(final String creditBureauId, final boolean isActive) { public static String updateOrganizationCreditBureauCreateAsJson(final String creditBureauId, final boolean isActive) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("creditBureauId", creditBureauId); map.put("creditBureauId", creditBureauId);
@@ -140,6 +187,10 @@ public class CreditBureauConfigurationHelper {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 String creditBureauConfigurationAsJson(final String configkey, final String value, final String description) { public static String creditBureauConfigurationAsJson(final String configkey, final String value, final String description) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
map.put("configkey", configkey); map.put("configkey", configkey);
@@ -149,6 +200,10 @@ public class CreditBureauConfigurationHelper {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 String updateCreditBureauConfigurationAsJson(final String configKey, final String value) { public static String updateCreditBureauConfigurationAsJson(final String configKey, final String value) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
if (configKey != null) { if (configKey != null) {
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/CreditBureauIntegrationHelper.java
+12
View File
@@ -34,11 +34,19 @@ public class CreditBureauIntegrationHelper {
private final RequestSpecification requestSpec; private final RequestSpecification requestSpec;
private final ResponseSpecification responseSpec; private final ResponseSpecification responseSpec;
// 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 CreditBureauIntegrationHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public CreditBureauIntegrationHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
} }
// 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 Object getCreditReport(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Object getCreditReport(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String creditBureauId, String nrc) { final String creditBureauId, String nrc) {
LOG.info("---------------------------------CREATING A CREDIT_BUREAU_CONFIGURATION---------------------------------------------"); LOG.info("---------------------------------CREATING A CREDIT_BUREAU_CONFIGURATION---------------------------------------------");
@@ -58,6 +66,10 @@ public class CreditBureauIntegrationHelper {
.asString(); .asString();
} }
// 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 String createGetCreditReportAsJson(final String creditBureauId, final String nrc) { public static String createGetCreditReportAsJson(final String creditBureauId, final String nrc) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
map.put("creditBureauID", creditBureauId); map.put("creditBureauID", creditBureauId);
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/CurrenciesHelper.java
+20
View File
@@ -37,6 +37,10 @@ public final class CurrenciesHelper {
private static final Logger LOG = LoggerFactory.getLogger(CurrenciesHelper.class); private static final Logger LOG = LoggerFactory.getLogger(CurrenciesHelper.class);
private static final String CURRENCIES_URL = "/fineract-provider/api/v1/currencies"; private static final String CURRENCIES_URL = "/fineract-provider/api/v1/currencies";
// 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 ArrayList<CurrencyDomain> getAllCurrencies(final RequestSpecification requestSpec, public static ArrayList<CurrencyDomain> getAllCurrencies(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
final String GET_ALL_CURRENCIES_URL = CURRENCIES_URL + "?" + Utils.TENANT_IDENTIFIER; final String GET_ALL_CURRENCIES_URL = CURRENCIES_URL + "?" + Utils.TENANT_IDENTIFIER;
@@ -49,6 +53,10 @@ public final class CurrenciesHelper {
return new Gson().fromJson(jsonData, new TypeToken<ArrayList<CurrencyDomain>>() {}.getType()); return new Gson().fromJson(jsonData, new TypeToken<ArrayList<CurrencyDomain>>() {}.getType());
} }
// 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 ArrayList<CurrencyDomain> getSelectedCurrencies(final RequestSpecification requestSpec, public static ArrayList<CurrencyDomain> getSelectedCurrencies(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
final String GET_ALL_SELECTED_CURRENCIES_URL = CURRENCIES_URL + "?fields=selectedCurrencyOptions" + "&" + Utils.TENANT_IDENTIFIER; final String GET_ALL_SELECTED_CURRENCIES_URL = CURRENCIES_URL + "?fields=selectedCurrencyOptions" + "&" + Utils.TENANT_IDENTIFIER;
@@ -58,6 +66,10 @@ public final class CurrenciesHelper {
return new Gson().fromJson(jsonData, new TypeToken<ArrayList<CurrencyDomain>>() {}.getType()); return new Gson().fromJson(jsonData, new TypeToken<ArrayList<CurrencyDomain>>() {}.getType());
} }
// 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 CurrencyDomain getCurrencybyCode(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static CurrencyDomain getCurrencybyCode(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String code) { final String code) {
ArrayList<CurrencyDomain> currenciesList = getAllCurrencies(requestSpec, responseSpec); ArrayList<CurrencyDomain> currenciesList = getAllCurrencies(requestSpec, responseSpec);
@@ -69,6 +81,10 @@ public final class CurrenciesHelper {
return null; return null;
} }
// 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 ArrayList<String> updateSelectedCurrencies(final RequestSpecification requestSpec, public static ArrayList<String> updateSelectedCurrencies(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final ArrayList<String> currencies) { final ResponseSpecification responseSpec, final ArrayList<String> currencies) {
final String CURRENCIES_UPDATE_URL = CURRENCIES_URL + "?" + Utils.TENANT_IDENTIFIER; final String CURRENCIES_UPDATE_URL = CURRENCIES_URL + "?" + Utils.TENANT_IDENTIFIER;
@@ -77,6 +93,10 @@ public final class CurrenciesHelper {
return (ArrayList<String>) hash.get("currencies"); return (ArrayList<String>) hash.get("currencies");
} }
// 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)
private static String currenciesToJSON(final ArrayList<String> currencies) { private static String currenciesToJSON(final ArrayList<String> currencies) {
HashMap map = new HashMap<>(); HashMap map = new HashMap<>();
map.put("currencies", currencies); map.put("currencies", currencies);
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/ExternalEventConfigurationHelper.java
+20
View File
@@ -35,6 +35,10 @@ public class ExternalEventConfigurationHelper {
private static final String EXTERNAL_EVENT_CONFIGURATION_URL = "/fineract-provider/api/v1/externalevents/configuration?" private static final String EXTERNAL_EVENT_CONFIGURATION_URL = "/fineract-provider/api/v1/externalevents/configuration?"
+ Utils.TENANT_IDENTIFIER; + Utils.TENANT_IDENTIFIER;
// 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 ArrayList<Map<String, Object>> getAllExternalEventConfigurations(RequestSpecification requestSpec, public static ArrayList<Map<String, Object>> getAllExternalEventConfigurations(RequestSpecification requestSpec,
ResponseSpecification responseSpec) { ResponseSpecification responseSpec) {
Map<String, ArrayList<Map<String, Object>>> response = Utils.performServerGet(requestSpec, responseSpec, Map<String, ArrayList<Map<String, Object>>> response = Utils.performServerGet(requestSpec, responseSpec,
@@ -42,6 +46,10 @@ public class ExternalEventConfigurationHelper {
return response.get(EXTERNAL_EVENT_CONFIGURATION); return response.get(EXTERNAL_EVENT_CONFIGURATION);
} }
// 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 ArrayList<Map<String, Object>> getDefaultExternalEventConfigurations() { public static ArrayList<Map<String, Object>> getDefaultExternalEventConfigurations() {
ArrayList<Map<String, Object>> defaults = new ArrayList<>(); ArrayList<Map<String, Object>> defaults = new ArrayList<>();
@@ -578,6 +586,10 @@ public class ExternalEventConfigurationHelper {
return defaults; return defaults;
} }
// 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 String getExternalEventConfigurationsForUpdateJSON() { public static String getExternalEventConfigurationsForUpdateJSON() {
Map<String, Map<String, Boolean>> configurationsForUpdate = new HashMap<>(); Map<String, Map<String, Boolean>> configurationsForUpdate = new HashMap<>();
@@ -593,6 +605,10 @@ public class ExternalEventConfigurationHelper {
} }
// 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 Map<String, Boolean> updateExternalEventConfigurations(RequestSpecification requestSpec, public static Map<String, Boolean> updateExternalEventConfigurations(RequestSpecification requestSpec,
ResponseSpecification responseSpec, String json) { ResponseSpecification responseSpec, String json) {
Map<String, Map<String, Boolean>> response = Utils.performServerPut(requestSpec, responseSpec, EXTERNAL_EVENT_CONFIGURATION_URL, Map<String, Map<String, Boolean>> response = Utils.performServerPut(requestSpec, responseSpec, EXTERNAL_EVENT_CONFIGURATION_URL,
@@ -600,6 +616,10 @@ public class ExternalEventConfigurationHelper {
return response.get(EXTERNAL_EVENT_CONFIGURATION_RESPONSE); return response.get(EXTERNAL_EVENT_CONFIGURATION_RESPONSE);
} }
// 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 void resetDefaultConfigurations(RequestSpecification requestSpec, ResponseSpecification responseSpec) { public static void resetDefaultConfigurations(RequestSpecification requestSpec, ResponseSpecification responseSpec) {
Map<String, Map<String, Boolean>> configurationsForReset = new HashMap<>(); Map<String, Map<String, Boolean>> configurationsForReset = new HashMap<>();
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/ExternalServicesConfigurationHelper.java
+16
View File
@@ -29,11 +29,19 @@ public class ExternalServicesConfigurationHelper {
private final RequestSpecification requestSpec; private final RequestSpecification requestSpec;
private final ResponseSpecification responseSpec; private final ResponseSpecification responseSpec;
// 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 ExternalServicesConfigurationHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public ExternalServicesConfigurationHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
} }
// 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 ArrayList<HashMap> getExternalServicesConfigurationByServiceName(final RequestSpecification requestSpec, public static ArrayList<HashMap> getExternalServicesConfigurationByServiceName(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final String serviceName) { final ResponseSpecification responseSpec, final String serviceName) {
final String GET_EXTERNAL_SERVICES_CONFIG_BY_SERVICE_NAME_URL = "/fineract-provider/api/v1/externalservice/" + serviceName + "?" final String GET_EXTERNAL_SERVICES_CONFIG_BY_SERVICE_NAME_URL = "/fineract-provider/api/v1/externalservice/" + serviceName + "?"
@@ -44,6 +52,10 @@ public class ExternalServicesConfigurationHelper {
return Utils.performServerGet(requestSpec, responseSpec, GET_EXTERNAL_SERVICES_CONFIG_BY_SERVICE_NAME_URL, ""); return Utils.performServerGet(requestSpec, responseSpec, GET_EXTERNAL_SERVICES_CONFIG_BY_SERVICE_NAME_URL, "");
} }
// 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 HashMap updateValueForExternaServicesConfiguration(final RequestSpecification requestSpec, public static HashMap updateValueForExternaServicesConfiguration(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final String serviceName, final String name, final String value) { final ResponseSpecification responseSpec, final String serviceName, final String name, final String value) {
final String EXTERNAL_SERVICES_CONFIG_UPDATE_URL = "/fineract-provider/api/v1/externalservice/" + serviceName + "?" final String EXTERNAL_SERVICES_CONFIG_UPDATE_URL = "/fineract-provider/api/v1/externalservice/" + serviceName + "?"
@@ -57,6 +69,10 @@ public class ExternalServicesConfigurationHelper {
return (HashMap) map.get("changes"); return (HashMap) map.get("changes");
} }
// 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 String updateExternalServicesConfigUpdateValueAsJSON(final String name, final String value) { public static String updateExternalServicesConfigUpdateValueAsJSON(final String name, final String value) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
map.put(name, value); map.put(name, value);
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/GroupHelper.java
+124
View File
@@ -43,34 +43,58 @@ public class GroupHelper {
public static final String DATE_FORMAT = "dd MMMM yyyy"; public static final String DATE_FORMAT = "dd MMMM yyyy";
public static final String DATE_TIME_FORMAT = "dd MMMM yyyy HH:mm"; public static final String DATE_TIME_FORMAT = "dd MMMM yyyy HH:mm";
// 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 GroupHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public GroupHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
} }
// 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 Integer createGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
@SuppressWarnings("unused") final boolean active) { @SuppressWarnings("unused") final boolean active) {
LOG.info("---------------------------------CREATING A GROUP---------------------------------------------"); LOG.info("---------------------------------CREATING A GROUP---------------------------------------------");
return createGroup(requestSpec, responseSpec, "04 March 2011"); return createGroup(requestSpec, responseSpec, "04 March 2011");
} }
// 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 Integer createGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String activationDate) { final String activationDate) {
LOG.info("---------------------------------CREATING A GROUP---------------------------------------------"); LOG.info("---------------------------------CREATING A GROUP---------------------------------------------");
return Utils.performServerPost(requestSpec, responseSpec, CREATE_GROUP_URL, getTestGroupAsJSON(true, activationDate), "groupId"); return Utils.performServerPost(requestSpec, responseSpec, CREATE_GROUP_URL, getTestGroupAsJSON(true, activationDate), "groupId");
} }
// 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 Integer createGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static Integer createGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
LOG.info("---------------------------------CREATING A GROUP---------------------------------------------"); LOG.info("---------------------------------CREATING A GROUP---------------------------------------------");
return Utils.performServerPost(requestSpec, responseSpec, CREATE_GROUP_URL, getTestGroupAsJSON(false, ""), "groupId"); return Utils.performServerPost(requestSpec, responseSpec, CREATE_GROUP_URL, getTestGroupAsJSON(false, ""), "groupId");
} }
// 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 Object createGroupWithError(final String jsonAttributeToGetBack) { public Object createGroupWithError(final String jsonAttributeToGetBack) {
LOG.info("---------------------------------CREATING A GROUP WITH ERROR---------------------------------------------"); LOG.info("---------------------------------CREATING A GROUP WITH ERROR---------------------------------------------");
return Utils.performServerPost(this.requestSpec, this.responseSpec, CREATE_GROUP_URL, getTestGroupAsJSON(false, ""), return Utils.performServerPost(this.requestSpec, this.responseSpec, CREATE_GROUP_URL, getTestGroupAsJSON(false, ""),
jsonAttributeToGetBack); jsonAttributeToGetBack);
} }
// 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 Integer createGroupPendingWithDatatable(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createGroupPendingWithDatatable(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String registeredTableName) { final String registeredTableName) {
LOG.info("-------------------------- CREATING A GROUP WITH DATATABLES --------------------------------"); LOG.info("-------------------------- CREATING A GROUP WITH DATATABLES --------------------------------");
@@ -78,6 +102,10 @@ public class GroupHelper {
"groupId"); "groupId");
} }
// 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 Integer associateClient(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer associateClient(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String groupId, final String clientMember) { final String groupId, final String clientMember) {
final String GROUP_ASSOCIATE_URL = "/fineract-provider/api/v1/groups/" + groupId + "?command=associateClients&" final String GROUP_ASSOCIATE_URL = "/fineract-provider/api/v1/groups/" + groupId + "?command=associateClients&"
@@ -86,6 +114,10 @@ public class GroupHelper {
return Utils.performServerPost(requestSpec, responseSpec, GROUP_ASSOCIATE_URL, associateClientAsJSON(clientMember), "groupId"); return Utils.performServerPost(requestSpec, responseSpec, GROUP_ASSOCIATE_URL, associateClientAsJSON(clientMember), "groupId");
} }
// 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 Integer disAssociateClient(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer disAssociateClient(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String groupId, final String clientMember) { final String groupId, final String clientMember) {
final String GROUP_ASSOCIATE_URL = "/fineract-provider/api/v1/groups/" + groupId + "?command=disassociateClients&" final String GROUP_ASSOCIATE_URL = "/fineract-provider/api/v1/groups/" + groupId + "?command=disassociateClients&"
@@ -94,6 +126,10 @@ public class GroupHelper {
return Utils.performServerPost(requestSpec, responseSpec, GROUP_ASSOCIATE_URL, associateClientAsJSON(clientMember), "groupId"); return Utils.performServerPost(requestSpec, responseSpec, GROUP_ASSOCIATE_URL, associateClientAsJSON(clientMember), "groupId");
} }
// 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 Integer activateGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer activateGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String groupId) { final String groupId) {
final String GROUP_ASSOCIATE_URL = "/fineract-provider/api/v1/groups/" + groupId + "?command=activate&" + Utils.TENANT_IDENTIFIER; final String GROUP_ASSOCIATE_URL = "/fineract-provider/api/v1/groups/" + groupId + "?command=activate&" + Utils.TENANT_IDENTIFIER;
@@ -101,6 +137,10 @@ public class GroupHelper {
return Utils.performServerPost(requestSpec, responseSpec, GROUP_ASSOCIATE_URL, activateGroupAsJSON(""), "groupId"); return Utils.performServerPost(requestSpec, responseSpec, GROUP_ASSOCIATE_URL, activateGroupAsJSON(""), "groupId");
} }
// 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 Integer updateGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, final String name, public static Integer updateGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, final String name,
final String groupId) { final String groupId) {
final String GROUP_ASSOCIATE_URL = "/fineract-provider/api/v1/groups/" + groupId + "?" + Utils.TENANT_IDENTIFIER; final String GROUP_ASSOCIATE_URL = "/fineract-provider/api/v1/groups/" + groupId + "?" + Utils.TENANT_IDENTIFIER;
@@ -108,6 +148,10 @@ public class GroupHelper {
return Utils.performServerPut(requestSpec, responseSpec, GROUP_ASSOCIATE_URL, updateGroupAsJSON(name), "groupId"); return Utils.performServerPut(requestSpec, responseSpec, GROUP_ASSOCIATE_URL, updateGroupAsJSON(name), "groupId");
} }
// 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 Integer deleteGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer deleteGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String groupId) { final String groupId) {
final String GROUP_ASSOCIATE_URL = "/fineract-provider/api/v1/groups/" + groupId + "?" + Utils.TENANT_IDENTIFIER; final String GROUP_ASSOCIATE_URL = "/fineract-provider/api/v1/groups/" + groupId + "?" + Utils.TENANT_IDENTIFIER;
@@ -115,6 +159,10 @@ public class GroupHelper {
return Utils.performServerDelete(requestSpec, responseSpec, GROUP_ASSOCIATE_URL, "groupId"); return Utils.performServerDelete(requestSpec, responseSpec, GROUP_ASSOCIATE_URL, "groupId");
} }
// 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 Object assignStaff(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, final String groupId, public static Object assignStaff(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, final String groupId,
final Long staffId) { final Long staffId) {
final String GROUP_ASSIGN_STAFF_URL = "/fineract-provider/api/v1/groups/" + groupId + "?" + Utils.TENANT_IDENTIFIER final String GROUP_ASSIGN_STAFF_URL = "/fineract-provider/api/v1/groups/" + groupId + "?" + Utils.TENANT_IDENTIFIER
@@ -123,6 +171,10 @@ public class GroupHelper {
return Utils.performServerPost(requestSpec, responseSpec, GROUP_ASSIGN_STAFF_URL, assignStaffAsJSON(staffId), "changes"); return Utils.performServerPost(requestSpec, responseSpec, GROUP_ASSIGN_STAFF_URL, assignStaffAsJSON(staffId), "changes");
} }
// 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 Object assignStaffInheritStaffForClientAccounts(final RequestSpecification requestSpec, public static Object assignStaffInheritStaffForClientAccounts(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final String groupId, final String staffId) { final ResponseSpecification responseSpec, final String groupId, final String staffId) {
final String GROUP_ASSIGN_STAFF_URL = "/fineract-provider/api/v1/groups/" + groupId + "?" + Utils.TENANT_IDENTIFIER final String GROUP_ASSIGN_STAFF_URL = "/fineract-provider/api/v1/groups/" + groupId + "?" + Utils.TENANT_IDENTIFIER
@@ -132,6 +184,10 @@ public class GroupHelper {
assignStaffAndInheritStaffForClientAccountsAsJSON(staffId), "changes"); assignStaffAndInheritStaffForClientAccountsAsJSON(staffId), "changes");
} }
// 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 String getTestGroupAsJSON(final boolean active, final String activationDate) { public static String getTestGroupAsJSON(final boolean active, final String activationDate) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
map.put("officeId", "1"); map.put("officeId", "1");
@@ -151,6 +207,10 @@ public class GroupHelper {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 String associateClientAsJSON(final String clientMember) { public static String associateClientAsJSON(final String clientMember) {
final HashMap<String, List<String>> map = new HashMap<>(); final HashMap<String, List<String>> map = new HashMap<>();
final List<String> list = new ArrayList<>(); final List<String> list = new ArrayList<>();
@@ -160,6 +220,10 @@ public class GroupHelper {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 String activateGroupAsJSON(final String activationDate) { public static String activateGroupAsJSON(final String activationDate) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
map.put("dateFormat", "dd MMMM yyyy"); map.put("dateFormat", "dd MMMM yyyy");
@@ -174,6 +238,10 @@ public class GroupHelper {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 String updateGroupAsJSON(final String name) { public static String updateGroupAsJSON(final String name) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
map.put("name", name); map.put("name", name);
@@ -181,6 +249,10 @@ public class GroupHelper {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 String assignStaffAsJSON(final Long staffId) { public static String assignStaffAsJSON(final Long staffId) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("staffId", staffId); map.put("staffId", staffId);
@@ -188,6 +260,10 @@ public class GroupHelper {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 String assignStaffAndInheritStaffForClientAccountsAsJSON(final String staffId) { public static String assignStaffAndInheritStaffForClientAccountsAsJSON(final String staffId) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
map.put("staffId", staffId); map.put("staffId", staffId);
@@ -196,6 +272,10 @@ public class GroupHelper {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 void verifyGroupCreatedOnServer(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static void verifyGroupCreatedOnServer(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer generatedGroupID) { final Integer generatedGroupID) {
LOG.info("------------------------------CHECK GROUP DETAILS------------------------------------\n"); LOG.info("------------------------------CHECK GROUP DETAILS------------------------------------\n");
@@ -204,6 +284,10 @@ public class GroupHelper {
assertEquals(generatedGroupID, responseGroupID, "ERROR IN CREATING THE GROUP"); assertEquals(generatedGroupID, responseGroupID, "ERROR IN CREATING THE GROUP");
} }
// 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 void verifyGroupDetails(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static void verifyGroupDetails(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer generatedGroupID, final String field, final String expectedValue) { final Integer generatedGroupID, final String field, final String expectedValue) {
LOG.info("------------------------------CHECK GROUP DETAILS------------------------------------\n"); LOG.info("------------------------------CHECK GROUP DETAILS------------------------------------\n");
@@ -212,6 +296,10 @@ public class GroupHelper {
assertEquals(expectedValue, responseValue, "ERROR IN CREATING THE GROUP"); assertEquals(expectedValue, responseValue, "ERROR IN CREATING THE GROUP");
} }
// 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 void verifyGroupActivatedOnServer(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static void verifyGroupActivatedOnServer(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer generatedGroupID, final boolean generatedGroupStatus) { final Integer generatedGroupID, final boolean generatedGroupStatus) {
LOG.info("------------------------------CHECK GROUP STATUS------------------------------------\n"); LOG.info("------------------------------CHECK GROUP STATUS------------------------------------\n");
@@ -220,6 +308,10 @@ public class GroupHelper {
assertEquals(generatedGroupStatus, responseGroupStatus, "ERROR IN ACTIVATING THE GROUP"); assertEquals(generatedGroupStatus, responseGroupStatus, "ERROR IN ACTIVATING THE GROUP");
} }
// 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 void verifyGroupMembers(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static void verifyGroupMembers(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer generatedGroupID, final Integer groupMember) { final Integer generatedGroupID, final Integer groupMember) {
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
@@ -231,6 +323,10 @@ public class GroupHelper {
assertTrue(list.toString().contains("id=" + groupMember.toString()), "ERROR IN GROUP MEMBER"); assertTrue(list.toString().contains("id=" + groupMember.toString()), "ERROR IN GROUP MEMBER");
} }
// 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 void verifyOrphanGroupDetails(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static void verifyOrphanGroupDetails(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
int officeId) { int officeId) {
LOG.info("------------------------------CHECK ORPHAN GROUP DETAILS------------------------------------\n"); LOG.info("------------------------------CHECK ORPHAN GROUP DETAILS------------------------------------\n");
@@ -240,6 +336,10 @@ public class GroupHelper {
assertEquals("[]", responseValue); // Since, all groups got center as Parent, OrphanGroups is null. assertEquals("[]", responseValue); // Since, all groups got center as Parent, OrphanGroups is null.
} }
// 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 void verifyEmptyGroupMembers(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static void verifyEmptyGroupMembers(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer generatedGroupID) { final Integer generatedGroupID) {
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
@@ -251,6 +351,10 @@ public class GroupHelper {
assertEquals(list, null, "GROUP MEMBER LIST NOT EMPTY"); assertEquals(list, null, "GROUP MEMBER LIST NOT EMPTY");
} }
// 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 void verifyGroupDeleted(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static void verifyGroupDeleted(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer generatedGroupID) { final Integer generatedGroupID) {
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
@@ -260,6 +364,10 @@ public class GroupHelper {
assertFalse(list.toString().contains("id=" + generatedGroupID.toString()), "GROUP NOT DELETED"); assertFalse(list.toString().contains("id=" + generatedGroupID.toString()), "GROUP NOT DELETED");
} }
// 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)
// Glim_Gsim_testing // Glim_Gsim_testing
public static List<String> verifyRetrieveGlimAccountsByGroupId(final RequestSpecification requestSpec, public static List<String> verifyRetrieveGlimAccountsByGroupId(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final Integer groupID) { final ResponseSpecification responseSpec, final Integer groupID) {
@@ -271,6 +379,10 @@ public class GroupHelper {
return list; return list;
} }
// 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 List<String> verifyRetrieveGlimAccountsByGlimId(final RequestSpecification requestSpec, public static List<String> verifyRetrieveGlimAccountsByGlimId(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final Integer glimId) { final ResponseSpecification responseSpec, final Integer glimId) {
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
@@ -281,6 +393,10 @@ public class GroupHelper {
return list; return list;
} }
// 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 List<String> verifyRetrieveGsimAccounts(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static List<String> verifyRetrieveGsimAccounts(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer groupID) { final Integer groupID) {
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
@@ -295,6 +411,10 @@ public class GroupHelper {
return Utils.uniqueRandomStringGenerator(prefix, lenOfRandomSuffix); return Utils.uniqueRandomStringGenerator(prefix, lenOfRandomSuffix);
} }
// 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 String getTestGroupWithDatatableAsJson(final String registeredTableName) { public static String getTestGroupWithDatatableAsJson(final String registeredTableName) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("officeId", "1"); map.put("officeId", "1");
@@ -309,6 +429,10 @@ public class GroupHelper {
return requestJson; return requestJson;
} }
// 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 String getTestDatatableAsJson(HashMap<String, Object> map, final String registeredTableName) { public static String getTestDatatableAsJson(HashMap<String, Object> map, final String registeredTableName) {
List<HashMap<String, Object>> datatablesListMap = new ArrayList<>(); List<HashMap<String, Object>> datatablesListMap = new ArrayList<>();
HashMap<String, Object> datatableMap = new HashMap<>(); HashMap<String, Object> datatableMap = new HashMap<>();
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/HolidayHelper.java
+36
View File
@@ -39,11 +39,19 @@ public class HolidayHelper {
private final RequestSpecification requestSpec; private final RequestSpecification requestSpec;
private final ResponseSpecification responseSpec; private final ResponseSpecification responseSpec;
// 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 HolidayHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public HolidayHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
} }
// 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 String getCreateHolidayDataAsJSON() { public static String getCreateHolidayDataAsJSON() {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
List<HashMap<String, String>> offices = new ArrayList<HashMap<String, String>>(); List<HashMap<String, String>> offices = new ArrayList<HashMap<String, String>>();
@@ -64,6 +72,10 @@ public class HolidayHelper {
return HolidayCreateJson; return HolidayCreateJson;
} }
// 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 String getCreateType1HolidayDataAsJSON() { public static String getCreateType1HolidayDataAsJSON() {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
List<HashMap<String, String>> offices = new ArrayList<HashMap<String, String>>(); List<HashMap<String, String>> offices = new ArrayList<HashMap<String, String>>();
@@ -83,6 +95,10 @@ public class HolidayHelper {
return HolidayCreateJson; return HolidayCreateJson;
} }
// 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 String getActivateHolidayDataAsJSON() { public static String getActivateHolidayDataAsJSON() {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
String activateHoliday = new Gson().toJson(map); String activateHoliday = new Gson().toJson(map);
@@ -90,20 +106,36 @@ public class HolidayHelper {
return activateHoliday; return activateHoliday;
} }
// 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 Integer createHolidays(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static Integer createHolidays(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
return Utils.performServerPost(requestSpec, responseSpec, CREATE_HOLIDAY_URL, getCreateHolidayDataAsJSON(), "resourceId"); return Utils.performServerPost(requestSpec, responseSpec, CREATE_HOLIDAY_URL, getCreateHolidayDataAsJSON(), "resourceId");
} }
// 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 Integer createTyoe1Holidays(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static Integer createTyoe1Holidays(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
return Utils.performServerPost(requestSpec, responseSpec, CREATE_HOLIDAY_URL, getCreateType1HolidayDataAsJSON(), "resourceId"); return Utils.performServerPost(requestSpec, responseSpec, CREATE_HOLIDAY_URL, getCreateType1HolidayDataAsJSON(), "resourceId");
} }
// 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 Integer activateHolidays(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer activateHolidays(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String holidayID) { final String holidayID) {
final String ACTIVATE_HOLIDAY_URL = HOLIDAYS_URL + "/" + holidayID + "?command=activate&" + Utils.TENANT_IDENTIFIER; final String ACTIVATE_HOLIDAY_URL = HOLIDAYS_URL + "/" + holidayID + "?command=activate&" + Utils.TENANT_IDENTIFIER;
return Utils.performServerPost(requestSpec, responseSpec, ACTIVATE_HOLIDAY_URL, getActivateHolidayDataAsJSON(), "resourceId"); return Utils.performServerPost(requestSpec, responseSpec, ACTIVATE_HOLIDAY_URL, getActivateHolidayDataAsJSON(), "resourceId");
} }
// 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 HashMap getHolidayById(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static HashMap getHolidayById(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String holidayID) { final String holidayID) {
final String GET_HOLIDAY_BY_ID_URL = HOLIDAYS_URL + "/" + holidayID + "?" + Utils.TENANT_IDENTIFIER; final String GET_HOLIDAY_BY_ID_URL = HOLIDAYS_URL + "/" + holidayID + "?" + Utils.TENANT_IDENTIFIER;
@@ -112,6 +144,10 @@ public class HolidayHelper {
return response; return response;
} }
// 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 Integer deleteHoliday(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer deleteHoliday(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer holidayID) { final Integer holidayID) {
final String DELETE_HOLIDAY_URL = HOLIDAYS_URL + "/" + holidayID + "?" + Utils.TENANT_IDENTIFIER; final String DELETE_HOLIDAY_URL = HOLIDAYS_URL + "/" + holidayID + "?" + Utils.TENANT_IDENTIFIER;
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/HookHelper.java
+33 -1
View File
@@ -37,17 +37,29 @@ public class HookHelper {
private static final String CREATE_HOOK_URL = "/fineract-provider/api/v1/hooks?" + Utils.TENANT_IDENTIFIER; private static final String CREATE_HOOK_URL = "/fineract-provider/api/v1/hooks?" + Utils.TENANT_IDENTIFIER;
// 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 HookHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public HookHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
} }
// 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 Integer createHook(final String payloadURL) { public Integer createHook(final String payloadURL) {
LOG.info("---------------------------------CREATING A HOOK---------------------------------------------"); LOG.info("---------------------------------CREATING A HOOK---------------------------------------------");
return Utils.performServerPost(requestSpec, responseSpec, CREATE_HOOK_URL, getTestHookAsJson(payloadURL), "resourceId"); return Utils.performServerPost(requestSpec, responseSpec, CREATE_HOOK_URL, getTestHookAsJson(payloadURL), "resourceId");
} }
public String getTestHookAsJson(final String payloadURL) { // 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)
private String getTestHookAsJson(final String payloadURL) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("name", "Web"); map.put("name", "Web");
map.put("displayName", Utils.randomStringGenerator("Hook_DisplayName_", 5)); map.put("displayName", Utils.randomStringGenerator("Hook_DisplayName_", 5));
@@ -66,18 +78,30 @@ public class HookHelper {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 Integer updateHook(final String payloadURL, final Long hookId) { public Integer updateHook(final String payloadURL, final Long hookId) {
LOG.info("---------------------------------UPDATING HOOK---------------------------------------------"); LOG.info("---------------------------------UPDATING HOOK---------------------------------------------");
final String UPDATE_HOOK_URL = "/fineract-provider/api/v1/hooks/" + hookId + "?" + Utils.TENANT_IDENTIFIER; final String UPDATE_HOOK_URL = "/fineract-provider/api/v1/hooks/" + hookId + "?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerPut(this.requestSpec, this.responseSpec, UPDATE_HOOK_URL, getTestHookAsJson(payloadURL), "resourceId"); return Utils.performServerPut(this.requestSpec, this.responseSpec, UPDATE_HOOK_URL, getTestHookAsJson(payloadURL), "resourceId");
} }
// 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 Integer deleteHook(final Long hookId) { public Integer deleteHook(final Long hookId) {
LOG.info("---------------------------------DELETING HOOK---------------------------------------------"); LOG.info("---------------------------------DELETING HOOK---------------------------------------------");
final String DELETE_HOOK_URL = "/fineract-provider/api/v1/hooks/" + hookId + "?" + Utils.TENANT_IDENTIFIER; final String DELETE_HOOK_URL = "/fineract-provider/api/v1/hooks/" + hookId + "?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerDelete(this.requestSpec, this.responseSpec, DELETE_HOOK_URL, "resourceId"); return Utils.performServerDelete(this.requestSpec, this.responseSpec, DELETE_HOOK_URL, "resourceId");
} }
// 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 void verifyHookCreatedOnServer(final Long hookId) { public void verifyHookCreatedOnServer(final Long hookId) {
LOG.info("------------------------------CHECK CREATE HOOK DETAILS------------------------------------\n"); LOG.info("------------------------------CHECK CREATE HOOK DETAILS------------------------------------\n");
final String GET_URL = "/fineract-provider/api/v1/hooks/" + hookId + "?" + Utils.TENANT_IDENTIFIER; final String GET_URL = "/fineract-provider/api/v1/hooks/" + hookId + "?" + Utils.TENANT_IDENTIFIER;
@@ -85,6 +109,10 @@ public class HookHelper {
assertEquals(hookId.toString(), responseHookId.toString()); assertEquals(hookId.toString(), responseHookId.toString());
} }
// 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 void verifyUpdateHook(final String updateURL, final Long hookId) { public void verifyUpdateHook(final String updateURL, final Long hookId) {
LOG.info("------------------------------CHECK UPDATE HOOK DETAILS------------------------------------\n"); LOG.info("------------------------------CHECK UPDATE HOOK DETAILS------------------------------------\n");
final String GET_URL = "/fineract-provider/api/v1/hooks/" + hookId + "?" + Utils.TENANT_IDENTIFIER; final String GET_URL = "/fineract-provider/api/v1/hooks/" + hookId + "?" + Utils.TENANT_IDENTIFIER;
@@ -94,6 +122,10 @@ public class HookHelper {
assertEquals(updateURL, hash.get("fieldValue")); assertEquals(updateURL, hash.get("fieldValue"));
} }
// 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 void verifyDeleteHook(final Long hookId) { public void verifyDeleteHook(final Long hookId) {
LOG.info("------------------------------CHECK DELETE HOOK DETAILS------------------------------------\n"); LOG.info("------------------------------CHECK DELETE HOOK DETAILS------------------------------------\n");
final String GET_URL = "/fineract-provider/api/v1/hooks/" + hookId + "?" + Utils.TENANT_IDENTIFIER; final String GET_URL = "/fineract-provider/api/v1/hooks/" + hookId + "?" + Utils.TENANT_IDENTIFIER;
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/IdempotencyHelper.java
+28
View File
@@ -40,18 +40,34 @@ public final class IdempotencyHelper {
} }
// 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 String toJsonString(final List<BusinessStep> batchRequests) { public static String toJsonString(final List<BusinessStep> batchRequests) {
return new Gson().toJson(new BusinessStepWrapper(batchRequests)); return new Gson().toJson(new BusinessStepWrapper(batchRequests));
} }
// 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 JobBusinessStepConfigData configuredBusinessStepFromJsonString(final String json) { public static JobBusinessStepConfigData configuredBusinessStepFromJsonString(final String json) {
return new Gson().fromJson(json, new TypeToken<JobBusinessStepConfigData>() {}.getType()); return new Gson().fromJson(json, new TypeToken<JobBusinessStepConfigData>() {}.getType());
} }
// 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)
private static JobBusinessStepDetail availableBusinessStepFromJsonString(final String json) { private static JobBusinessStepDetail availableBusinessStepFromJsonString(final String json) {
return new Gson().fromJson(json, new TypeToken<JobBusinessStepDetail>() {}.getType()); return new Gson().fromJson(json, new TypeToken<JobBusinessStepDetail>() {}.getType());
} }
// 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 JobBusinessStepConfigData getConfiguredBusinessStepsByJobName(final RequestSpecification requestSpec, public static JobBusinessStepConfigData getConfiguredBusinessStepsByJobName(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, String jobName) { final ResponseSpecification responseSpec, String jobName) {
final String response = Utils.performServerGet(requestSpec, responseSpec, final String response = Utils.performServerGet(requestSpec, responseSpec,
@@ -60,6 +76,10 @@ public final class IdempotencyHelper {
return configuredBusinessStepFromJsonString(response); return configuredBusinessStepFromJsonString(response);
} }
// 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 JobBusinessStepDetail getAvailableBusinessStepsByJobName(final RequestSpecification requestSpec, public static JobBusinessStepDetail getAvailableBusinessStepsByJobName(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, String jobName) { final ResponseSpecification responseSpec, String jobName) {
final String response = Utils.performServerGet(requestSpec, responseSpec, final String response = Utils.performServerGet(requestSpec, responseSpec,
@@ -68,6 +88,10 @@ public final class IdempotencyHelper {
return availableBusinessStepFromJsonString(response); return availableBusinessStepFromJsonString(response);
} }
// 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 Response updateBusinessStepOrder(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Response updateBusinessStepOrder(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
String jobName, String jsonBodyToSend, String idempotencyKey) { String jobName, String jsonBodyToSend, String idempotencyKey) {
Response response = Utils.performServerPutRaw(requestSpec, responseSpec, Response response = Utils.performServerPutRaw(requestSpec, responseSpec,
@@ -77,6 +101,10 @@ public final class IdempotencyHelper {
return response; return response;
} }
// 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 Response updateBusinessStepOrderWithError(final RequestSpecification requestSpec, public static Response updateBusinessStepOrderWithError(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, String jobName, String jsonBodyToSend, String idempotencyKey) { final ResponseSpecification responseSpec, String jobName, String jsonBodyToSend, String idempotencyKey) {
String url = BUSINESS_STEPS_API_URL_START + jobName + BUSINESS_STEPS_API_URL_END; String url = BUSINESS_STEPS_API_URL_START + jobName + BUSINESS_STEPS_API_URL_END;
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/LoanRescheduleRequestHelper.java
+24
View File
@@ -41,34 +41,58 @@ public class LoanRescheduleRequestHelper extends IntegrationTest {
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
} }
// 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 Integer createLoanRescheduleRequest(final String requestJSON) { public Integer createLoanRescheduleRequest(final String requestJSON) {
final String URL = LOAN_RESCHEDULE_REQUEST_URL + "?" + Utils.TENANT_IDENTIFIER; final String URL = LOAN_RESCHEDULE_REQUEST_URL + "?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerPost(this.requestSpec, this.responseSpec, URL, requestJSON, "resourceId"); return Utils.performServerPost(this.requestSpec, this.responseSpec, URL, requestJSON, "resourceId");
} }
// 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 HashMap createLoanRescheduleRequestWithFullResponse(final String requestJSON) { public HashMap createLoanRescheduleRequestWithFullResponse(final String requestJSON) {
final String URL = LOAN_RESCHEDULE_REQUEST_URL + "?" + Utils.TENANT_IDENTIFIER; final String URL = LOAN_RESCHEDULE_REQUEST_URL + "?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerPost(this.requestSpec, this.responseSpec, URL, requestJSON, ""); return Utils.performServerPost(this.requestSpec, this.responseSpec, URL, requestJSON, "");
} }
// 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 Integer rejectLoanRescheduleRequest(final Integer requestId, final String requestJSON) { public Integer rejectLoanRescheduleRequest(final Integer requestId, final String requestJSON) {
final String URL = LOAN_RESCHEDULE_REQUEST_URL + "/" + requestId + "?" + Utils.TENANT_IDENTIFIER + "&command=reject"; final String URL = LOAN_RESCHEDULE_REQUEST_URL + "/" + requestId + "?" + Utils.TENANT_IDENTIFIER + "&command=reject";
return Utils.performServerPost(this.requestSpec, this.responseSpec, URL, requestJSON, "resourceId"); return Utils.performServerPost(this.requestSpec, this.responseSpec, URL, requestJSON, "resourceId");
} }
// 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 Integer approveLoanRescheduleRequest(final Integer requestId, final String requestJSON) { public Integer approveLoanRescheduleRequest(final Integer requestId, final String requestJSON) {
final String URL = LOAN_RESCHEDULE_REQUEST_URL + "/" + requestId + "?" + Utils.TENANT_IDENTIFIER + "&command=approve"; final String URL = LOAN_RESCHEDULE_REQUEST_URL + "/" + requestId + "?" + Utils.TENANT_IDENTIFIER + "&command=approve";
return Utils.performServerPost(this.requestSpec, this.responseSpec, URL, requestJSON, "resourceId"); return Utils.performServerPost(this.requestSpec, this.responseSpec, URL, requestJSON, "resourceId");
} }
// 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 Object getLoanRescheduleRequest(final Integer requestId, final String param) { public Object getLoanRescheduleRequest(final Integer requestId, final String param) {
final String URL = LOAN_RESCHEDULE_REQUEST_URL + "/" + requestId + "?" + Utils.TENANT_IDENTIFIER; final String URL = LOAN_RESCHEDULE_REQUEST_URL + "/" + requestId + "?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerGet(requestSpec, responseSpec, URL, param); return Utils.performServerGet(requestSpec, responseSpec, URL, param);
} }
// 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 void verifyCreationOfLoanRescheduleRequest(final Integer requestId) { public void verifyCreationOfLoanRescheduleRequest(final Integer requestId) {
final String URL = LOAN_RESCHEDULE_REQUEST_URL + "/" + requestId + "?" + Utils.TENANT_IDENTIFIER; final String URL = LOAN_RESCHEDULE_REQUEST_URL + "/" + requestId + "?" + Utils.TENANT_IDENTIFIER;
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/NotesHelper.java
+72
View File
@@ -36,24 +36,40 @@ public final class NotesHelper {
private static final String CLIENT_URL = "/fineract-provider/api/v1/clients"; private static final String CLIENT_URL = "/fineract-provider/api/v1/clients";
// 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 Integer createClientNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, Integer clientId, public static Integer createClientNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, Integer clientId,
String request) { String request) {
String createClientNoteURL = CLIENT_URL + "/" + clientId + "/notes?" + Utils.TENANT_IDENTIFIER; String createClientNoteURL = CLIENT_URL + "/" + clientId + "/notes?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerPost(requestSpec, responseSpec, createClientNoteURL, request, "resourceId"); return Utils.performServerPost(requestSpec, responseSpec, createClientNoteURL, request, "resourceId");
} }
// 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 String getClientNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, Integer clientId, public static String getClientNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, Integer clientId,
Integer noteId) { Integer noteId) {
String getClientNoteURL = CLIENT_URL + "/" + clientId + "/notes/" + noteId + "?" + Utils.TENANT_IDENTIFIER; String getClientNoteURL = CLIENT_URL + "/" + clientId + "/notes/" + noteId + "?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerGet(requestSpec, responseSpec, getClientNoteURL, "note"); return Utils.performServerGet(requestSpec, responseSpec, getClientNoteURL, "note");
} }
// 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 Integer updateClientNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, Integer clientId, public static Integer updateClientNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, Integer clientId,
Integer noteId, String request) { Integer noteId, String request) {
String updateClientNoteURL = CLIENT_URL + "/" + clientId + "/notes/" + noteId + "?" + Utils.TENANT_IDENTIFIER; String updateClientNoteURL = CLIENT_URL + "/" + clientId + "/notes/" + noteId + "?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerPut(requestSpec, responseSpec, updateClientNoteURL, request, "resourceId"); return Utils.performServerPut(requestSpec, responseSpec, updateClientNoteURL, request, "resourceId");
} }
// 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 void deleteClientNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, Integer clientId, public static void deleteClientNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, Integer clientId,
Integer noteId) { Integer noteId) {
String deleteClientNoteURL = CLIENT_URL + "/" + clientId + "/notes/" + noteId + "?" + Utils.TENANT_IDENTIFIER; String deleteClientNoteURL = CLIENT_URL + "/" + clientId + "/notes/" + noteId + "?" + Utils.TENANT_IDENTIFIER;
@@ -62,24 +78,40 @@ public final class NotesHelper {
private static final String GROUP_URL = "/fineract-provider/api/v1/groups"; private static final String GROUP_URL = "/fineract-provider/api/v1/groups";
// 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 Integer createGroupNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, Integer groupId, public static Integer createGroupNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, Integer groupId,
String request) { String request) {
String createGroupNoteURL = GROUP_URL + "/" + groupId + "/notes?" + Utils.TENANT_IDENTIFIER; String createGroupNoteURL = GROUP_URL + "/" + groupId + "/notes?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerPost(requestSpec, responseSpec, createGroupNoteURL, request, "resourceId"); return Utils.performServerPost(requestSpec, responseSpec, createGroupNoteURL, request, "resourceId");
} }
// 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 String getGroupNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, Integer groupId, public static String getGroupNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, Integer groupId,
Integer noteId) { Integer noteId) {
String getGroupNoteURL = GROUP_URL + "/" + groupId + "/notes/" + noteId + "?" + Utils.TENANT_IDENTIFIER; String getGroupNoteURL = GROUP_URL + "/" + groupId + "/notes/" + noteId + "?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerGet(requestSpec, responseSpec, getGroupNoteURL, "note"); return Utils.performServerGet(requestSpec, responseSpec, getGroupNoteURL, "note");
} }
// 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 Integer updateGroupNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, Integer groupId, public static Integer updateGroupNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, Integer groupId,
Integer noteId, String request) { Integer noteId, String request) {
String updateGroupNoteURL = GROUP_URL + "/" + groupId + "/notes/" + noteId + "?" + Utils.TENANT_IDENTIFIER; String updateGroupNoteURL = GROUP_URL + "/" + groupId + "/notes/" + noteId + "?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerPut(requestSpec, responseSpec, updateGroupNoteURL, request, "resourceId"); return Utils.performServerPut(requestSpec, responseSpec, updateGroupNoteURL, request, "resourceId");
} }
// 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 void deleteGroupNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, Integer groupId, public static void deleteGroupNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, Integer groupId,
Integer noteId) { Integer noteId) {
String deleteGroupNoteURL = GROUP_URL + "/" + groupId + "/notes/" + noteId + "?" + Utils.TENANT_IDENTIFIER; String deleteGroupNoteURL = GROUP_URL + "/" + groupId + "/notes/" + noteId + "?" + Utils.TENANT_IDENTIFIER;
@@ -88,23 +120,39 @@ public final class NotesHelper {
private static final String LOAN_URL = "/fineract-provider/api/v1/loans"; private static final String LOAN_URL = "/fineract-provider/api/v1/loans";
// 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 Integer createLoanNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, Integer loanId, public static Integer createLoanNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, Integer loanId,
String request) { String request) {
String createLoanNoteURL = LOAN_URL + "/" + loanId + "/notes?" + Utils.TENANT_IDENTIFIER; String createLoanNoteURL = LOAN_URL + "/" + loanId + "/notes?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerPost(requestSpec, responseSpec, createLoanNoteURL, request, "resourceId"); return Utils.performServerPost(requestSpec, responseSpec, createLoanNoteURL, request, "resourceId");
} }
// 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 String getLoanNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, Integer loanId, Integer noteId) { public static String getLoanNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, Integer loanId, Integer noteId) {
String getLoanNoteURL = LOAN_URL + "/" + loanId + "/notes/" + noteId + "?" + Utils.TENANT_IDENTIFIER; String getLoanNoteURL = LOAN_URL + "/" + loanId + "/notes/" + noteId + "?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerGet(requestSpec, responseSpec, getLoanNoteURL, "note"); return Utils.performServerGet(requestSpec, responseSpec, getLoanNoteURL, "note");
} }
// 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 Integer updateLoanNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, Integer loanId, public static Integer updateLoanNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, Integer loanId,
Integer noteId, String updateRequest) { Integer noteId, String updateRequest) {
String updateLoanNoteURL = LOAN_URL + "/" + loanId + "/notes/" + noteId + "?" + Utils.TENANT_IDENTIFIER; String updateLoanNoteURL = LOAN_URL + "/" + loanId + "/notes/" + noteId + "?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerPut(requestSpec, responseSpec, updateLoanNoteURL, updateRequest, "resourceId"); return Utils.performServerPut(requestSpec, responseSpec, updateLoanNoteURL, updateRequest, "resourceId");
} }
// 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 void deleteLoanNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, Integer loanId, public static void deleteLoanNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, Integer loanId,
Integer noteId) { Integer noteId) {
String deleteLoanNoteURL = LOAN_URL + "/" + loanId + "/notes/" + noteId + "?" + Utils.TENANT_IDENTIFIER; String deleteLoanNoteURL = LOAN_URL + "/" + loanId + "/notes/" + noteId + "?" + Utils.TENANT_IDENTIFIER;
@@ -113,12 +161,20 @@ public final class NotesHelper {
private static final String LOAN_TRANSACTION_URL = "/fineract-provider/api/v1/loanTransactions"; private static final String LOAN_TRANSACTION_URL = "/fineract-provider/api/v1/loanTransactions";
// 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 Integer createLoanTransactionNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, public static Integer createLoanTransactionNote(RequestSpecification requestSpec, ResponseSpecification responseSpec,
Integer loanTransactionId, String request) { Integer loanTransactionId, String request) {
String createLoanTransactionNoteURL = LOAN_TRANSACTION_URL + "/" + loanTransactionId + "/notes?" + Utils.TENANT_IDENTIFIER; String createLoanTransactionNoteURL = LOAN_TRANSACTION_URL + "/" + loanTransactionId + "/notes?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerPost(requestSpec, responseSpec, createLoanTransactionNoteURL, request, "resourceId"); return Utils.performServerPost(requestSpec, responseSpec, createLoanTransactionNoteURL, request, "resourceId");
} }
// 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 String getLoanTransactionNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, public static String getLoanTransactionNote(RequestSpecification requestSpec, ResponseSpecification responseSpec,
Integer loanTransactionId, Integer noteId) { Integer loanTransactionId, Integer noteId) {
String getLoanTransactionNoteURL = LOAN_TRANSACTION_URL + "/" + loanTransactionId + "/notes/" + noteId + "?" String getLoanTransactionNoteURL = LOAN_TRANSACTION_URL + "/" + loanTransactionId + "/notes/" + noteId + "?"
@@ -126,6 +182,10 @@ public final class NotesHelper {
return Utils.performServerGet(requestSpec, responseSpec, getLoanTransactionNoteURL, "note"); return Utils.performServerGet(requestSpec, responseSpec, getLoanTransactionNoteURL, "note");
} }
// 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 Integer updateLoanTransactionNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, public static Integer updateLoanTransactionNote(RequestSpecification requestSpec, ResponseSpecification responseSpec,
Integer loanTransactionId, Integer noteId, String updateRequest) { Integer loanTransactionId, Integer noteId, String updateRequest) {
String updateLoanTransactionNoteURL = LOAN_TRANSACTION_URL + "/" + loanTransactionId + "/notes/" + noteId + "?" String updateLoanTransactionNoteURL = LOAN_TRANSACTION_URL + "/" + loanTransactionId + "/notes/" + noteId + "?"
@@ -133,6 +193,10 @@ public final class NotesHelper {
return Utils.performServerPut(requestSpec, responseSpec, updateLoanTransactionNoteURL, updateRequest, "resourceId"); return Utils.performServerPut(requestSpec, responseSpec, updateLoanTransactionNoteURL, updateRequest, "resourceId");
} }
// 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 void deleteLoanTransactionNote(RequestSpecification requestSpec, ResponseSpecification responseSpec, public static void deleteLoanTransactionNote(RequestSpecification requestSpec, ResponseSpecification responseSpec,
Integer loanTransactionId, Integer noteId) { Integer loanTransactionId, Integer noteId) {
String deleteLoanTransactionNoteURL = LOAN_TRANSACTION_URL + "/" + loanTransactionId + "/notes/" + noteId + "?" String deleteLoanTransactionNoteURL = LOAN_TRANSACTION_URL + "/" + loanTransactionId + "/notes/" + noteId + "?"
@@ -142,6 +206,10 @@ public final class NotesHelper {
private static final String SAVINGS_URL = "/fineract-provider/api/v1/savings"; private static final String SAVINGS_URL = "/fineract-provider/api/v1/savings";
// 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 PostResourceTypeResourceIdNotesResponse createSavingsNote(RequestSpecification requestSpec, public static PostResourceTypeResourceIdNotesResponse createSavingsNote(RequestSpecification requestSpec,
ResponseSpecification responseSpec, Integer savingsId, String request) { ResponseSpecification responseSpec, Integer savingsId, String request) {
final String noteURL = SAVINGS_URL + "/" + savingsId + "/notes?" + Utils.TENANT_IDENTIFIER; final String noteURL = SAVINGS_URL + "/" + savingsId + "/notes?" + Utils.TENANT_IDENTIFIER;
@@ -149,6 +217,10 @@ public final class NotesHelper {
return GSON.fromJson(response, PostResourceTypeResourceIdNotesResponse.class); return GSON.fromJson(response, PostResourceTypeResourceIdNotesResponse.class);
} }
// 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 GetResourceTypeResourceIdNotesNoteIdResponse getSavingsNote(RequestSpecification requestSpec, public static GetResourceTypeResourceIdNotesNoteIdResponse getSavingsNote(RequestSpecification requestSpec,
ResponseSpecification responseSpec, Integer savingsId, Integer noteId) { ResponseSpecification responseSpec, Integer savingsId, Integer noteId) {
final String noteURL = SAVINGS_URL + "/" + savingsId + "/notes/" + noteId + "?" + Utils.TENANT_IDENTIFIER; final String noteURL = SAVINGS_URL + "/" + savingsId + "/notes/" + noteId + "?" + Utils.TENANT_IDENTIFIER;
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/NotificationHelper.java
+8
View File
@@ -36,6 +36,10 @@ public final class NotificationHelper {
private NotificationHelper() {} private NotificationHelper() {}
// 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 GetNotificationsResponse getNotifications(final RequestSpecification requestSpec, public static GetNotificationsResponse getNotifications(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
final String GET_NOTIFICATIONS_URL = NOTIFICATION_API_URL; final String GET_NOTIFICATIONS_URL = NOTIFICATION_API_URL;
@@ -44,6 +48,10 @@ public final class NotificationHelper {
return GSON.fromJson(response, GetNotificationsResponse.class); return GSON.fromJson(response, GetNotificationsResponse.class);
} }
// 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 boolean areNotificationsAvailable(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static boolean areNotificationsAvailable(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
return getNotifications(requestSpec, responseSpec).getPageItems().size() > 0; return getNotifications(requestSpec, responseSpec).getPageItems().size() > 0;
} }
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/OfficeHelper.java
+44
View File
@@ -50,35 +50,59 @@ public class OfficeHelper extends IntegrationTest {
private final RequestSpecification requestSpec; private final RequestSpecification requestSpec;
private final ResponseSpecification responseSpec; private final ResponseSpecification responseSpec;
// 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 OfficeHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public OfficeHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
} }
// 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 OfficeDomain retrieveOfficeByID(int id) { public OfficeDomain retrieveOfficeByID(int id) {
Object get = Utils.performServerGet(requestSpec, responseSpec, OFFICE_URL + "/" + id + "?" + Utils.TENANT_IDENTIFIER, ""); Object get = Utils.performServerGet(requestSpec, responseSpec, OFFICE_URL + "/" + id + "?" + Utils.TENANT_IDENTIFIER, "");
final String json = new Gson().toJson(get); final String json = new Gson().toJson(get);
return new Gson().fromJson(json, new TypeToken<OfficeDomain>() {}.getType()); return new Gson().fromJson(json, new TypeToken<OfficeDomain>() {}.getType());
} }
// 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 GetOfficesResponse getHeadOffice(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static GetOfficesResponse getHeadOffice(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
String response = Utils.performServerGet(requestSpec, responseSpec, String response = Utils.performServerGet(requestSpec, responseSpec,
OFFICE_URL + "/" + HEAD_OFFICE_ID + "?" + Utils.TENANT_IDENTIFIER); OFFICE_URL + "/" + HEAD_OFFICE_ID + "?" + Utils.TENANT_IDENTIFIER);
return GSON.fromJson(response, GetOfficesResponse.class); return GSON.fromJson(response, GetOfficesResponse.class);
} }
// 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 Integer createOffice(final String openingDate) { public Integer createOffice(final String openingDate) {
String json = getAsJSON(openingDate); String json = getAsJSON(openingDate);
return Utils.performServerPost(this.requestSpec, this.responseSpec, OFFICE_URL + "?" + Utils.TENANT_IDENTIFIER, json, return Utils.performServerPost(this.requestSpec, this.responseSpec, OFFICE_URL + "?" + Utils.TENANT_IDENTIFIER, json,
CommonConstants.RESPONSE_RESOURCE_ID); CommonConstants.RESPONSE_RESOURCE_ID);
} }
// 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 Integer createOfficeWithExternalId(String externalId, final String openingDate) { public Integer createOfficeWithExternalId(String externalId, final String openingDate) {
String json = getAsJSON(externalId, openingDate); String json = getAsJSON(externalId, openingDate);
return Utils.performServerPost(this.requestSpec, this.responseSpec, OFFICE_URL + "?" + Utils.TENANT_IDENTIFIER, json, return Utils.performServerPost(this.requestSpec, this.responseSpec, OFFICE_URL + "?" + Utils.TENANT_IDENTIFIER, json,
CommonConstants.RESPONSE_RESOURCE_ID); CommonConstants.RESPONSE_RESOURCE_ID);
} }
// 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 Integer updateOffice(int id, String name, String openingDate) { public Integer updateOffice(int id, String name, String openingDate) {
final HashMap<String, String> map = new HashMap<String, String>(); final HashMap<String, String> map = new HashMap<String, String>();
map.put("name", name); map.put("name", name);
@@ -104,10 +128,18 @@ public class OfficeHelper extends IntegrationTest {
.execute(); .execute();
} }
// 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 String getAsJSON(final String openingDate) { public static String getAsJSON(final String openingDate) {
return getAsJSON(null, openingDate); return getAsJSON(null, openingDate);
} }
// 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 String getAsJSON(String externalId, final String openingDate) { public static String getAsJSON(String externalId, final String openingDate) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
map.put("parentId", "1"); map.put("parentId", "1");
@@ -122,6 +154,10 @@ public class OfficeHelper extends IntegrationTest {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 String importOfficeTemplate(File file) { public String importOfficeTemplate(File file) {
String locale = "en"; String locale = "en";
String dateFormat = "dd MMMM yyyy"; String dateFormat = "dd MMMM yyyy";
@@ -131,12 +167,20 @@ public class OfficeHelper extends IntegrationTest {
} }
// 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 String getOutputTemplateLocation(final String importDocumentId) { public String getOutputTemplateLocation(final String importDocumentId) {
requestSpec.header(HttpHeaders.CONTENT_TYPE, MediaType.TEXT_PLAIN); requestSpec.header(HttpHeaders.CONTENT_TYPE, MediaType.TEXT_PLAIN);
return Utils.performServerOutputTemplateLocationGet(requestSpec, responseSpec, return Utils.performServerOutputTemplateLocationGet(requestSpec, responseSpec,
"/fineract-provider/api/v1/imports/getOutputTemplateLocation" + "?" + Utils.TENANT_IDENTIFIER, importDocumentId); "/fineract-provider/api/v1/imports/getOutputTemplateLocation" + "?" + Utils.TENANT_IDENTIFIER, importDocumentId);
} }
// 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 Workbook getOfficeWorkBook(final String dateFormat) throws IOException { public Workbook getOfficeWorkBook(final String dateFormat) throws IOException {
requestSpec.header(HttpHeaders.CONTENT_TYPE, "application/vnd.ms-excel"); requestSpec.header(HttpHeaders.CONTENT_TYPE, "application/vnd.ms-excel");
byte[] byteArray = Utils.performGetBinaryResponse(requestSpec, responseSpec, byte[] byteArray = Utils.performGetBinaryResponse(requestSpec, responseSpec,
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/PasswordPreferencesHelper.java
+24
View File
@@ -31,6 +31,10 @@ public final class PasswordPreferencesHelper {
private static final String PASSWORD_PREFERENCES_URL = "/fineract-provider/api/v1/passwordpreferences"; private static final String PASSWORD_PREFERENCES_URL = "/fineract-provider/api/v1/passwordpreferences";
// 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 Object updatePasswordPreferences(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Object updatePasswordPreferences(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
String validationPolicyId) { String validationPolicyId) {
final String UPDATE_PASSWORD_PREFERENCES_URL = PASSWORD_PREFERENCES_URL + "?" + Utils.TENANT_IDENTIFIER; final String UPDATE_PASSWORD_PREFERENCES_URL = PASSWORD_PREFERENCES_URL + "?" + Utils.TENANT_IDENTIFIER;
@@ -40,6 +44,10 @@ public final class PasswordPreferencesHelper {
updatePreferencesAsJson(validationPolicyId), ""); updatePreferencesAsJson(validationPolicyId), "");
} }
// 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 Object updateWithInvalidValidationPolicyId(final RequestSpecification requestSpec, public static Object updateWithInvalidValidationPolicyId(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, String invalidValidationPolicyId, String jsonAttributeToGetback) { final ResponseSpecification responseSpec, String invalidValidationPolicyId, String jsonAttributeToGetback) {
final String UPDATE_PASSWORD_PREFERENCES_URL = PASSWORD_PREFERENCES_URL + "?" + Utils.TENANT_IDENTIFIER; final String UPDATE_PASSWORD_PREFERENCES_URL = PASSWORD_PREFERENCES_URL + "?" + Utils.TENANT_IDENTIFIER;
@@ -51,22 +59,38 @@ public final class PasswordPreferencesHelper {
updatePreferencesWithInvalidId(invalidValidationPolicyId), jsonAttributeToGetback); updatePreferencesWithInvalidId(invalidValidationPolicyId), jsonAttributeToGetback);
} }
// 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 String updatePreferencesAsJson(String validationPolicyId) { public static String updatePreferencesAsJson(String validationPolicyId) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("validationPolicyId", validationPolicyId); map.put("validationPolicyId", validationPolicyId);
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 String updatePreferencesWithInvalidId(String invalidValidationPolicyId) { public static String updatePreferencesWithInvalidId(String invalidValidationPolicyId) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("validationPolicyId", invalidValidationPolicyId); map.put("validationPolicyId", invalidValidationPolicyId);
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 int getActivePasswordPreference(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static int getActivePasswordPreference(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
return Utils.performServerGet(requestSpec, responseSpec, PASSWORD_PREFERENCES_URL + "?" + Utils.TENANT_IDENTIFIER, "id"); return Utils.performServerGet(requestSpec, responseSpec, PASSWORD_PREFERENCES_URL + "?" + Utils.TENANT_IDENTIFIER, "id");
} }
// 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 HashMap<String, Object> getAllPreferences(final RequestSpecification requestSpec, public static HashMap<String, Object> getAllPreferences(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/PaymentTypeHelper.java
+4
View File
@@ -68,6 +68,10 @@ public final class PaymentTypeHelper extends IntegrationTest {
return ok(fineract().paymentTypes.retrieveOnePaymentType(paymentTypeId)); return ok(fineract().paymentTypes.retrieveOnePaymentType(paymentTypeId));
} }
// 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 PaymentTypeDomain retrieveById(RequestSpecification requestSpec, ResponseSpecification responseSpec, final Long paymentTypeId) { public PaymentTypeDomain retrieveById(RequestSpecification requestSpec, ResponseSpecification responseSpec, final Long paymentTypeId) {
final String GET_PAYMENTTYPE_URL = PAYMENTTYPE_URL + "/" + paymentTypeId + "?" + Utils.TENANT_IDENTIFIER; final String GET_PAYMENTTYPE_URL = PAYMENTTYPE_URL + "/" + paymentTypeId + "?" + Utils.TENANT_IDENTIFIER;
log.info("-------------------------------GETTING PAYMENT TYPE-------------------------------------------"); log.info("-------------------------------GETTING PAYMENT TYPE-------------------------------------------");
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/ProductMixHelper.java
+12
View File
@@ -33,17 +33,29 @@ public class ProductMixHelper {
private final RequestSpecification requestSpec; private final RequestSpecification requestSpec;
private final ResponseSpecification responseSpec; private final ResponseSpecification responseSpec;
// 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 ProductMixHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public ProductMixHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
} }
// 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 ArrayList getProductsMixList() { public ArrayList getProductsMixList() {
final String GET_PRODUCT_MIX_URL = PRODUCT_MIX_URL + "?" + Utils.TENANT_IDENTIFIER; final String GET_PRODUCT_MIX_URL = PRODUCT_MIX_URL + "?" + Utils.TENANT_IDENTIFIER;
LOG.info("------------------------ RETRIEVING PRODUCT MIX -------------------------"); LOG.info("------------------------ RETRIEVING PRODUCT MIX -------------------------");
return Utils.performServerGet(this.requestSpec, this.responseSpec, GET_PRODUCT_MIX_URL, ""); return Utils.performServerGet(this.requestSpec, this.responseSpec, GET_PRODUCT_MIX_URL, "");
} }
// 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 HashMap getProductMixTemplate() { public HashMap getProductMixTemplate() {
final String GET_PRODUCT_MIX_URL = PRODUCT_MIX_URL + "/template?isProductMixTemplate=true&" + Utils.TENANT_IDENTIFIER; final String GET_PRODUCT_MIX_URL = PRODUCT_MIX_URL + "/template?isProductMixTemplate=true&" + Utils.TENANT_IDENTIFIER;
LOG.info("-------------------- RETRIEVING PRODUCT MIX TEMPLATE ---------------------"); LOG.info("-------------------- RETRIEVING PRODUCT MIX TEMPLATE ---------------------");
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/SchedulerJobHelper.java
+48
View File
@@ -58,12 +58,20 @@ public class SchedulerJobHelper extends IntegrationTest {
private final ResponseSpecification response200Spec; private final ResponseSpecification response200Spec;
private final ResponseSpecification response202Spec; private final ResponseSpecification response202Spec;
// 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 SchedulerJobHelper(final RequestSpecification requestSpec) { public SchedulerJobHelper(final RequestSpecification requestSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.response200Spec = new ResponseSpecBuilder().expectStatusCode(200).build(); this.response200Spec = new ResponseSpecBuilder().expectStatusCode(200).build();
this.response202Spec = new ResponseSpecBuilder().expectStatusCode(202).build(); this.response202Spec = new ResponseSpecBuilder().expectStatusCode(202).build();
} }
// 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)
private List<Map<String, Object>> getAllSchedulerJobs() { private List<Map<String, Object>> getAllSchedulerJobs() {
final String GET_ALL_SCHEDULER_JOBS_URL = "/fineract-provider/api/v1/jobs?" + Utils.TENANT_IDENTIFIER; final String GET_ALL_SCHEDULER_JOBS_URL = "/fineract-provider/api/v1/jobs?" + Utils.TENANT_IDENTIFIER;
LOG.info("------------------------ RETRIEVING ALL SCHEDULER JOBS -------------------------"); LOG.info("------------------------ RETRIEVING ALL SCHEDULER JOBS -------------------------");
@@ -84,6 +92,10 @@ public class SchedulerJobHelper extends IntegrationTest {
return getAllSchedulerJobDetails(map -> (String) map.get("displayName")); return getAllSchedulerJobDetails(map -> (String) map.get("displayName"));
} }
// 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 Map<String, Object> getSchedulerJobById(int jobId) { public Map<String, Object> getSchedulerJobById(int jobId) {
final String GET_SCHEDULER_JOB_BY_ID_URL = "/fineract-provider/api/v1/jobs/" + jobId + "?" + Utils.TENANT_IDENTIFIER; final String GET_SCHEDULER_JOB_BY_ID_URL = "/fineract-provider/api/v1/jobs/" + jobId + "?" + Utils.TENANT_IDENTIFIER;
LOG.info("------------------------ RETRIEVING SCHEDULER JOB BY ID -------------------------"); LOG.info("------------------------ RETRIEVING SCHEDULER JOB BY ID -------------------------");
@@ -93,6 +105,10 @@ public class SchedulerJobHelper extends IntegrationTest {
return response; return response;
} }
// 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)
private Map<String, Object> getSchedulerJobByShortName(String shortName) { private Map<String, Object> getSchedulerJobByShortName(String shortName) {
final String GET_SCHEDULER_JOB_URL = "/fineract-provider/api/v1/jobs/" + SHORT_NAME_PARAM + "/" + shortName + "?" final String GET_SCHEDULER_JOB_URL = "/fineract-provider/api/v1/jobs/" + SHORT_NAME_PARAM + "/" + shortName + "?"
+ Utils.TENANT_IDENTIFIER; + Utils.TENANT_IDENTIFIER;
@@ -102,6 +118,10 @@ public class SchedulerJobHelper extends IntegrationTest {
return response; return response;
} }
// 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 Boolean getSchedulerStatus() { public Boolean getSchedulerStatus() {
final String GET_SCHEDULER_STATUS_URL = "/fineract-provider/api/v1/scheduler?" + Utils.TENANT_IDENTIFIER; final String GET_SCHEDULER_STATUS_URL = "/fineract-provider/api/v1/scheduler?" + Utils.TENANT_IDENTIFIER;
LOG.info("------------------------ RETRIEVING SCHEDULER STATUS -------------------------"); LOG.info("------------------------ RETRIEVING SCHEDULER STATUS -------------------------");
@@ -114,6 +134,10 @@ public class SchedulerJobHelper extends IntegrationTest {
ok(fineract().jobsScheduler.changeSchedulerStatus(command)); ok(fineract().jobsScheduler.changeSchedulerStatus(command));
} }
// 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 Map<String, Object> updateSchedulerJob(int jobId, final boolean active) { public Map<String, Object> updateSchedulerJob(int jobId, final boolean active) {
final String UPDATE_SCHEDULER_JOB_URL = "/fineract-provider/api/v1/jobs/" + jobId + "?" + Utils.TENANT_IDENTIFIER; final String UPDATE_SCHEDULER_JOB_URL = "/fineract-provider/api/v1/jobs/" + jobId + "?" + Utils.TENANT_IDENTIFIER;
LOG.info("------------------------ UPDATING SCHEDULER JOB -------------------------"); LOG.info("------------------------ UPDATING SCHEDULER JOB -------------------------");
@@ -126,6 +150,10 @@ public class SchedulerJobHelper extends IntegrationTest {
ok(fineract().jobs.updateJobDetail(jobId, request)); ok(fineract().jobs.updateJobDetail(jobId, request));
} }
// 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)
private static String updateSchedulerJobAsJSON(final boolean active) { private static String updateSchedulerJobAsJSON(final boolean active) {
final Map<String, String> map = new HashMap<>(); final Map<String, String> map = new HashMap<>();
map.put("active", Boolean.toString(active)); map.put("active", Boolean.toString(active));
@@ -138,17 +166,29 @@ public class SchedulerJobHelper extends IntegrationTest {
runSchedulerJob(jobId, responseSpec); runSchedulerJob(jobId, responseSpec);
} }
// 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 void runSchedulerJob(int jobId, ResponseSpecification responseSpec) { public void runSchedulerJob(int jobId, ResponseSpecification responseSpec) {
final String RUN_SCHEDULER_JOB_URL = "/fineract-provider/api/v1/jobs/" + jobId + "?command=executeJob&" + Utils.TENANT_IDENTIFIER; final String RUN_SCHEDULER_JOB_URL = "/fineract-provider/api/v1/jobs/" + jobId + "?command=executeJob&" + Utils.TENANT_IDENTIFIER;
LOG.info("------------------------ RUN SCHEDULER JOB -------------------------"); LOG.info("------------------------ RUN SCHEDULER JOB -------------------------");
Utils.performServerPost(requestSpec, responseSpec, RUN_SCHEDULER_JOB_URL, runSchedulerJobAsJSON(), null); Utils.performServerPost(requestSpec, responseSpec, RUN_SCHEDULER_JOB_URL, runSchedulerJobAsJSON(), null);
} }
// 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 void runSchedulerJobByShortName(String shortName) { public void runSchedulerJobByShortName(String shortName) {
final ResponseSpecification responseSpec = new ResponseSpecBuilder().expectStatusCode(202).build(); final ResponseSpecification responseSpec = new ResponseSpecBuilder().expectStatusCode(202).build();
runSchedulerJobByShortName(shortName, responseSpec); runSchedulerJobByShortName(shortName, responseSpec);
} }
// 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 void runSchedulerJobByShortName(String shortName, ResponseSpecification responseSpec) { public void runSchedulerJobByShortName(String shortName, ResponseSpecification responseSpec) {
final String RUN_SCHEDULER_JOB_URL = "/fineract-provider/api/v1/jobs/" + SHORT_NAME_PARAM + "/" + shortName + "?command=executeJob&" final String RUN_SCHEDULER_JOB_URL = "/fineract-provider/api/v1/jobs/" + SHORT_NAME_PARAM + "/" + shortName + "?command=executeJob&"
+ Utils.TENANT_IDENTIFIER; + Utils.TENANT_IDENTIFIER;
@@ -156,6 +196,10 @@ public class SchedulerJobHelper extends IntegrationTest {
Utils.performServerPost(requestSpec, responseSpec, RUN_SCHEDULER_JOB_URL, runSchedulerJobAsJSON(), null); Utils.performServerPost(requestSpec, responseSpec, RUN_SCHEDULER_JOB_URL, runSchedulerJobAsJSON(), null);
} }
// 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)
private static String runSchedulerJobAsJSON() { private static String runSchedulerJobAsJSON() {
final Map<String, String> map = new HashMap<>(); final Map<String, String> map = new HashMap<>();
String runSchedulerJob = new Gson().toJson(map); String runSchedulerJob = new Gson().toJson(map);
@@ -174,6 +218,10 @@ public class SchedulerJobHelper extends IntegrationTest {
"No such named Job (see org.apache.fineract.infrastructure.jobs.service.JobName enum):" + jobName); "No such named Job (see org.apache.fineract.infrastructure.jobs.service.JobName enum):" + jobName);
} }
// 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 int getSchedulerJobIdByShortName(String shortName) { public int getSchedulerJobIdByShortName(String shortName) {
Map<String, Object> jobMap = getSchedulerJobByShortName(shortName); Map<String, Object> jobMap = getSchedulerJobByShortName(shortName);
final String GET_SCHEDULER_JOB_URL = "/fineract-provider/api/v1/jobs/" + SHORT_NAME_PARAM + "/" + shortName + "?" final String GET_SCHEDULER_JOB_URL = "/fineract-provider/api/v1/jobs/" + SHORT_NAME_PARAM + "/" + shortName + "?"
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/SearchHelper.java
+4
View File
@@ -39,6 +39,10 @@ public final class SearchHelper {
private static final String SEARCH_URL = "/fineract-provider/api/v1/search?" + Utils.TENANT_IDENTIFIER; private static final String SEARCH_URL = "/fineract-provider/api/v1/search?" + Utils.TENANT_IDENTIFIER;
// 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 ArrayList<GetSearchResponse> getSearch(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static ArrayList<GetSearchResponse> getSearch(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String query, final Boolean exactMatch, final String resources) { final String query, final Boolean exactMatch, final String resources) {
final String urlSearch = SEARCH_URL + "&exactMatch=" + exactMatch.toString() + "&query=" + query + "&resource=" + resources; final String urlSearch = SEARCH_URL + "&exactMatch=" + exactMatch.toString() + "&query=" + query + "&resource=" + resources;
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/StandingInstructionsHelper.java
+20
View File
@@ -57,11 +57,19 @@ public class StandingInstructionsHelper {
private RequestSpecification requestSpec; private RequestSpecification requestSpec;
private ResponseSpecification responseSpec; private ResponseSpecification responseSpec;
// 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 StandingInstructionsHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public StandingInstructionsHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
} }
// 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 String build(final String clientId, final String fromAccountId, final String toAccountId, final String fromAccountType, public String build(final String clientId, final String fromAccountId, final String toAccountId, final String fromAccountType,
final String toAccountType, final String validFrom, final String validTo, final String monthDay) { final String toAccountType, final String validFrom, final String validTo, final String monthDay) {
@@ -94,6 +102,10 @@ public class StandingInstructionsHelper {
return savingsApplicationJSON; return savingsApplicationJSON;
} }
// 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 Integer createStandingInstruction(final String clientId, final String fromAccountId, final String toAccountId, public Integer createStandingInstruction(final String clientId, final String fromAccountId, final String toAccountId,
final String fromAccountType, final String toAccountType, final String validFrom, final String validTo, final String monthDay) { final String fromAccountType, final String toAccountType, final String validFrom, final String validTo, final String monthDay) {
log.info("-------------------------------- CREATE STANDING INSTRUCTIONS --------------------------------"); log.info("-------------------------------- CREATE STANDING INSTRUCTIONS --------------------------------");
@@ -103,6 +115,10 @@ public class StandingInstructionsHelper {
standingInstructionAsJSON, "resourceId"); standingInstructionAsJSON, "resourceId");
} }
// 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 HashMap getStandingInstructionById(final String standingInstructionId) { public HashMap getStandingInstructionById(final String standingInstructionId) {
log.info("----------------------------- RETRIEVING STANDING INSTRUCTION BY ID---------------------------"); log.info("----------------------------- RETRIEVING STANDING INSTRUCTION BY ID---------------------------");
@@ -111,6 +127,10 @@ public class StandingInstructionsHelper {
return Utils.performServerGet(this.requestSpec, this.responseSpec, GET_STANDING_INSTRUCTION_BY_ID_URL, ""); return Utils.performServerGet(this.requestSpec, this.responseSpec, GET_STANDING_INSTRUCTION_BY_ID_URL, "");
} }
// 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 List<HashMap> getStandingInstructionHistory(Integer fromSavingsId, Integer fromAccountType, Integer fromClientId, public List<HashMap> getStandingInstructionHistory(Integer fromSavingsId, Integer fromAccountType, Integer fromClientId,
Integer transferType) { Integer transferType) {
final String STANDING_INSTRUCTIONS_HISTORY_URL = STANDING_INSTRUCTIONS_RUN_HISTORY_URL + "?" + Utils.TENANT_IDENTIFIER final String STANDING_INSTRUCTIONS_HISTORY_URL = STANDING_INSTRUCTIONS_RUN_HISTORY_URL + "?" + Utils.TENANT_IDENTIFIER
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/SurveyHelper.java
+16
View File
@@ -36,16 +36,28 @@ public final class SurveyHelper {
private static final Logger LOG = LoggerFactory.getLogger(SurveyHelper.class); private static final Logger LOG = LoggerFactory.getLogger(SurveyHelper.class);
private static final String FULFIL_SURVEY_URL = "/fineract-provider/api/v1/survey/ppi_kenya_2009/clientId?" + Utils.TENANT_IDENTIFIER; private static final String FULFIL_SURVEY_URL = "/fineract-provider/api/v1/survey/ppi_kenya_2009/clientId?" + Utils.TENANT_IDENTIFIER;
// 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 Integer fulfilSurvey(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static Integer fulfilSurvey(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
return fulfilSurvey(requestSpec, responseSpec, "04 March 2011"); return fulfilSurvey(requestSpec, responseSpec, "04 March 2011");
} }
// 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 Integer fulfilSurvey(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer fulfilSurvey(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String activationDate) { final String activationDate) {
LOG.info("---------------------------------FULFIL PPI ---------------------------------------------"); LOG.info("---------------------------------FULFIL PPI ---------------------------------------------");
return Utils.performServerPost(requestSpec, responseSpec, FULFIL_SURVEY_URL, getTestPPIAsJSON(), "clientId"); return Utils.performServerPost(requestSpec, responseSpec, FULFIL_SURVEY_URL, getTestPPIAsJSON(), "clientId");
} }
// 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 String getTestPPIAsJSON() { public static String getTestPPIAsJSON() {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
@@ -68,6 +80,10 @@ public final class SurveyHelper {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 void verifySurveyCreatedOnServer(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static void verifySurveyCreatedOnServer(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer generatedClientID) { final Integer generatedClientID) {
LOG.info("------------------------------CHECK CLIENT DETAILS------------------------------------\n"); LOG.info("------------------------------CHECK CLIENT DETAILS------------------------------------\n");
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/TaxComponentHelper.java
+12
View File
@@ -35,6 +35,10 @@ public final class TaxComponentHelper {
private static final Logger LOG = LoggerFactory.getLogger(TaxComponentHelper.class); private static final Logger LOG = LoggerFactory.getLogger(TaxComponentHelper.class);
private static final String CREATE_TAX_COMPONENT_URL = "/fineract-provider/api/v1/taxes/component?" + Utils.TENANT_IDENTIFIER; private static final String CREATE_TAX_COMPONENT_URL = "/fineract-provider/api/v1/taxes/component?" + Utils.TENANT_IDENTIFIER;
// 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 Integer createTaxComponent(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createTaxComponent(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String percentage, final Integer liabilityAccountId) { final String percentage, final Integer liabilityAccountId) {
LOG.info("---------------------------------CREATING A TAX COMPONENT---------------------------------------------"); LOG.info("---------------------------------CREATING A TAX COMPONENT---------------------------------------------");
@@ -42,6 +46,10 @@ public final class TaxComponentHelper {
getTaxComponentAsJSON(percentage, liabilityAccountId), "resourceId"); getTaxComponentAsJSON(percentage, liabilityAccountId), "resourceId");
} }
// 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 String getTaxComponentAsJSON(final String percentage, final Integer creditAccountId) { public static String getTaxComponentAsJSON(final String percentage, final Integer creditAccountId) {
final HashMap<String, String> map = getBasicTaxComponentMap(percentage); final HashMap<String, String> map = getBasicTaxComponentMap(percentage);
if (creditAccountId != null) { if (creditAccountId != null) {
@@ -52,6 +60,10 @@ public final class TaxComponentHelper {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 HashMap<String, String> getBasicTaxComponentMap(final String percentage) { public static HashMap<String, String> getBasicTaxComponentMap(final String percentage) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
map.put("name", randomNameGenerator("Tax_component_Name_", 5)); map.put("name", randomNameGenerator("Tax_component_Name_", 5));
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/TaxGroupHelper.java
+16
View File
@@ -37,6 +37,10 @@ public final class TaxGroupHelper {
private static final Logger LOG = LoggerFactory.getLogger(TaxGroupHelper.class); private static final Logger LOG = LoggerFactory.getLogger(TaxGroupHelper.class);
private static final String CREATE_TAX_COMPONENT_URL = "/fineract-provider/api/v1/taxes/group?" + Utils.TENANT_IDENTIFIER; private static final String CREATE_TAX_COMPONENT_URL = "/fineract-provider/api/v1/taxes/group?" + Utils.TENANT_IDENTIFIER;
// 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 Integer createTaxGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createTaxGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Collection<Integer> taxComponentIds) { final Collection<Integer> taxComponentIds) {
LOG.info("---------------------------------CREATING A TAX GROUP---------------------------------------------"); LOG.info("---------------------------------CREATING A TAX GROUP---------------------------------------------");
@@ -44,6 +48,10 @@ public final class TaxGroupHelper {
"resourceId"); "resourceId");
} }
// 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 String getTaxGroupAsJSON(final Collection<Integer> taxComponentIds) { public static String getTaxGroupAsJSON(final Collection<Integer> taxComponentIds) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("name", randomNameGenerator("Tax_component_Name_", 5)); map.put("name", randomNameGenerator("Tax_component_Name_", 5));
@@ -53,6 +61,10 @@ public final class TaxGroupHelper {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 List<HashMap<String, String>> getTaxGroupComponents(final Collection<Integer> taxComponentIds) { public static List<HashMap<String, String>> getTaxGroupComponents(final Collection<Integer> taxComponentIds) {
List<HashMap<String, String>> taxGroupComponents = new ArrayList<>(); List<HashMap<String, String>> taxGroupComponents = new ArrayList<>();
for (Integer taxComponentId : taxComponentIds) { for (Integer taxComponentId : taxComponentIds) {
@@ -61,6 +73,10 @@ public final class TaxGroupHelper {
return taxGroupComponents; return taxGroupComponents;
} }
// 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 HashMap<String, String> getTaxComponentMap(final Integer taxComponentId) { public static HashMap<String, String> getTaxComponentMap(final Integer taxComponentId) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
map.put("taxComponentId", String.valueOf(taxComponentId)); map.put("taxComponentId", String.valueOf(taxComponentId));
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/Utils.java
+23
View File
@@ -101,6 +101,7 @@ public final class Utils {
private Utils() {} private Utils() {}
@Deprecated(forRemoval = true)
public static void initializeRESTAssured() { public static void initializeRESTAssured() {
RestAssured.baseURI = ConfigProperties.Backend.PROTOCOL + "://" + ConfigProperties.Backend.HOST; RestAssured.baseURI = ConfigProperties.Backend.PROTOCOL + "://" + ConfigProperties.Backend.HOST;
RestAssured.port = ConfigProperties.Backend.PORT; RestAssured.port = ConfigProperties.Backend.PORT;
@@ -108,12 +109,14 @@ public final class Utils {
RestAssured.useRelaxedHTTPSValidation(); RestAssured.useRelaxedHTTPSValidation();
} }
@Deprecated(forRemoval = true)
public static RequestSpecification initializeDefaultRequestSpecification() { public static RequestSpecification initializeDefaultRequestSpecification() {
RequestSpecification requestSpec = new RequestSpecBuilder().setContentType(ContentType.JSON).build(); RequestSpecification requestSpec = new RequestSpecBuilder().setContentType(ContentType.JSON).build();
requestSpec.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey()); requestSpec.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey());
return requestSpec; return requestSpec;
} }
@Deprecated(forRemoval = true)
public static ResponseSpecification initializeDefaultResponseSpecification() { public static ResponseSpecification initializeDefaultResponseSpecification() {
return new ResponseSpecBuilder().expectStatusCode(200).build(); return new ResponseSpecBuilder().expectStatusCode(200).build();
} }
@@ -176,10 +179,12 @@ public final class Utils {
} }
} }
@Deprecated(forRemoval = true)
public static String loginIntoServerAndGetBase64EncodedAuthenticationKey() { public static String loginIntoServerAndGetBase64EncodedAuthenticationKey() {
return loginIntoServerAndGetBase64EncodedAuthenticationKey(ConfigProperties.Backend.USERNAME, ConfigProperties.Backend.PASSWORD); return loginIntoServerAndGetBase64EncodedAuthenticationKey(ConfigProperties.Backend.USERNAME, ConfigProperties.Backend.PASSWORD);
} }
@Deprecated(forRemoval = true)
public static String loginIntoServerAndGetBase64EncodedAuthenticationKey(String username, String password) { public static String loginIntoServerAndGetBase64EncodedAuthenticationKey(String username, String password) {
awaitSpringBootActuatorHealthyUp(); awaitSpringBootActuatorHealthyUp();
try { try {
@@ -202,16 +207,19 @@ public final class Utils {
} }
} }
@Deprecated(forRemoval = true)
public static String performServerGet(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static String performServerGet(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String url) { final String url) {
return performServerGet(requestSpec, responseSpec, url, null); return performServerGet(requestSpec, responseSpec, url, null);
} }
@Deprecated(forRemoval = true)
public static Response performServerGetRaw(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Response performServerGetRaw(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String getURL, Function<RequestSpecification, RequestSpecification> requestMapper) { final String getURL, Function<RequestSpecification, RequestSpecification> requestMapper) {
return requestMapper.apply(given().spec(requestSpec)).expect().spec(responseSpec).log().ifError().when().get(getURL).andReturn(); return requestMapper.apply(given().spec(requestSpec)).expect().spec(responseSpec).log().ifError().when().get(getURL).andReturn();
} }
@Deprecated(forRemoval = true)
public static <T> T performServerGet(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static <T> T performServerGet(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String getURL, final String jsonAttributeToGetBack) { final String getURL, final String jsonAttributeToGetBack) {
final String json = given().spec(requestSpec).expect().spec(responseSpec).log().ifError().when().get(getURL).andReturn().asString(); final String json = given().spec(requestSpec).expect().spec(responseSpec).log().ifError().when().get(getURL).andReturn().asString();
@@ -221,6 +229,7 @@ public final class Utils {
return (T) JsonPath.from(json).get(jsonAttributeToGetBack); return (T) JsonPath.from(json).get(jsonAttributeToGetBack);
} }
@Deprecated(forRemoval = true)
public static <T> T performServerPatch(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static <T> T performServerPatch(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String getURL, final String jsonAttributeToGetBack) { final String getURL, final String jsonAttributeToGetBack) {
final String json = given().spec(requestSpec).expect().spec(responseSpec).log().ifError().when().patch(getURL).andReturn() final String json = given().spec(requestSpec).expect().spec(responseSpec).log().ifError().when().patch(getURL).andReturn()
@@ -231,6 +240,7 @@ public final class Utils {
return (T) JsonPath.from(json).get(jsonAttributeToGetBack); return (T) JsonPath.from(json).get(jsonAttributeToGetBack);
} }
@Deprecated(forRemoval = true)
public static List<String> performServerGetList(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static List<String> performServerGetList(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String getURL, final String jsonAttributeToGetBack) { final String getURL, final String jsonAttributeToGetBack) {
final JsonPath jsonPath = given().spec(requestSpec).expect().spec(responseSpec).log().ifError().when().get(getURL).jsonPath(); final JsonPath jsonPath = given().spec(requestSpec).expect().spec(responseSpec).log().ifError().when().get(getURL).jsonPath();
@@ -238,6 +248,7 @@ public final class Utils {
return items; return items;
} }
@Deprecated(forRemoval = true)
public static JsonElement performServerGetArray(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static JsonElement performServerGetArray(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String getURL, final int position, final String jsonAttributeToGetBack) { final String getURL, final int position, final String jsonAttributeToGetBack) {
final JsonPath jsonPath = given().spec(requestSpec).expect().spec(responseSpec).log().ifError().when().get(getURL).jsonPath(); final JsonPath jsonPath = given().spec(requestSpec).expect().spec(responseSpec).log().ifError().when().get(getURL).jsonPath();
@@ -245,21 +256,25 @@ public final class Utils {
return gson.fromJson(((ArrayList) items.get(position).get(jsonAttributeToGetBack)).toString(), JsonArray.class); return gson.fromJson(((ArrayList) items.get(position).get(jsonAttributeToGetBack)).toString(), JsonArray.class);
} }
@Deprecated(forRemoval = true)
public static String performGetTextResponse(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static String performGetTextResponse(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String getURL) { final String getURL) {
return given().spec(requestSpec).expect().spec(responseSpec).log().ifError().when().get(getURL).andReturn().asString(); return given().spec(requestSpec).expect().spec(responseSpec).log().ifError().when().get(getURL).andReturn().asString();
} }
@Deprecated(forRemoval = true)
public static byte[] performGetBinaryResponse(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static byte[] performGetBinaryResponse(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String getURL) { final String getURL) {
return given().spec(requestSpec).expect().spec(responseSpec).log().ifError().when().get(getURL).andReturn().asByteArray(); return given().spec(requestSpec).expect().spec(responseSpec).log().ifError().when().get(getURL).andReturn().asByteArray();
} }
@Deprecated(forRemoval = true)
public static String performServerPost(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static String performServerPost(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String postURL, final String jsonBodyToSend) { final String postURL, final String jsonBodyToSend) {
return performServerPost(requestSpec, responseSpec, postURL, jsonBodyToSend, null); return performServerPost(requestSpec, responseSpec, postURL, jsonBodyToSend, null);
} }
@Deprecated(forRemoval = true)
public static <T> T performServerPost(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static <T> T performServerPost(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String postURL, final String jsonBodyToSend, final String jsonAttributeToGetBack) { final String postURL, final String jsonBodyToSend, final String jsonAttributeToGetBack) {
LOG.info("JSON {}", jsonBodyToSend); LOG.info("JSON {}", jsonBodyToSend);
@@ -274,16 +289,19 @@ public final class Utils {
return (T) JsonPath.from(json).get(jsonAttributeToGetBack); return (T) JsonPath.from(json).get(jsonAttributeToGetBack);
} }
@Deprecated(forRemoval = true)
public static Response performServerPutRaw(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Response performServerPutRaw(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String putURL, Function<RequestSpecification, RequestSpecification> bodyMapper) { final String putURL, Function<RequestSpecification, RequestSpecification> bodyMapper) {
return bodyMapper.apply(given().spec(requestSpec)).expect().spec(responseSpec).log().ifError().when().put(putURL).andReturn(); return bodyMapper.apply(given().spec(requestSpec)).expect().spec(responseSpec).log().ifError().when().put(putURL).andReturn();
} }
@Deprecated(forRemoval = true)
public static String performServerPut(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static String performServerPut(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String putURL, final String jsonBodyToSend) { final String putURL, final String jsonBodyToSend) {
return performServerPut(requestSpec, responseSpec, putURL, jsonBodyToSend, null); return performServerPut(requestSpec, responseSpec, putURL, jsonBodyToSend, null);
} }
@Deprecated(forRemoval = true)
public static <T> T performServerPut(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static <T> T performServerPut(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String putURL, final String jsonBodyToSend, final String jsonAttributeToGetBack) { final String putURL, final String jsonBodyToSend, final String jsonAttributeToGetBack) {
final String json = given().spec(requestSpec).body(jsonBodyToSend).expect().spec(responseSpec).log().ifError().when().put(putURL) final String json = given().spec(requestSpec).body(jsonBodyToSend).expect().spec(responseSpec).log().ifError().when().put(putURL)
@@ -294,6 +312,7 @@ public final class Utils {
return (T) JsonPath.from(json).get(jsonAttributeToGetBack); return (T) JsonPath.from(json).get(jsonAttributeToGetBack);
} }
@Deprecated(forRemoval = true)
public static <T> T performServerDelete(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static <T> T performServerDelete(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String deleteURL, final String jsonAttributeToGetBack) { final String deleteURL, final String jsonAttributeToGetBack) {
final String json = given().spec(requestSpec).expect().spec(responseSpec).log().ifError().when().delete(deleteURL).andReturn() final String json = given().spec(requestSpec).expect().spec(responseSpec).log().ifError().when().delete(deleteURL).andReturn()
@@ -304,6 +323,7 @@ public final class Utils {
return (T) JsonPath.from(json).get(jsonAttributeToGetBack); return (T) JsonPath.from(json).get(jsonAttributeToGetBack);
} }
@Deprecated(forRemoval = true)
public static <T> T performServerDelete(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static <T> T performServerDelete(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String deleteURL, final String jsonBodyToSend, final String jsonAttributeToGetBack) { final String deleteURL, final String jsonBodyToSend, final String jsonAttributeToGetBack) {
final String json = given().spec(requestSpec).body(jsonBodyToSend).expect().spec(responseSpec).log().ifError().when() final String json = given().spec(requestSpec).body(jsonBodyToSend).expect().spec(responseSpec).log().ifError().when()
@@ -440,6 +460,7 @@ public final class Utils {
return null; return null;
} }
@Deprecated(forRemoval = true)
public static String performServerTemplatePost(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static String performServerTemplatePost(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String postURL, final String legalFormType, final File file, final String locale, final String dateFormat) { final String postURL, final String legalFormType, final File file, final String locale, final String dateFormat) {
@@ -449,6 +470,7 @@ public final class Utils {
return importDocumentId; return importDocumentId;
} }
@Deprecated(forRemoval = true)
public static String performServerOutputTemplateLocationGet(final RequestSpecification requestSpec, public static String performServerOutputTemplateLocationGet(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final String getURL, final String importDocumentId) { final ResponseSpecification responseSpec, final String getURL, final String importDocumentId) {
final String templateLocation = given().spec(requestSpec).queryParam("importDocumentId", importDocumentId).expect() final String templateLocation = given().spec(requestSpec).queryParam("importDocumentId", importDocumentId).expect()
@@ -456,6 +478,7 @@ public final class Utils {
return templateLocation.substring(1, templateLocation.length() - 1); return templateLocation.substring(1, templateLocation.length() - 1);
} }
@Deprecated(forRemoval = true)
public static String emptyJson() { public static String emptyJson() {
return "{}"; return "{}";
} }
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/WorkingDaysHelper.java
+32
View File
@@ -37,12 +37,20 @@ public final class WorkingDaysHelper {
private static final String WORKINGDAYS_URL = "/fineract-provider/api/v1/workingdays"; private static final String WORKINGDAYS_URL = "/fineract-provider/api/v1/workingdays";
private static final SecureRandom random = new SecureRandom(); private static final SecureRandom random = new SecureRandom();
// 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 Object updateWorkingDays(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static Object updateWorkingDays(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
final String UPDATE_WORKINGDAYS_URL = WORKINGDAYS_URL + "?" + Utils.TENANT_IDENTIFIER; final String UPDATE_WORKINGDAYS_URL = WORKINGDAYS_URL + "?" + Utils.TENANT_IDENTIFIER;
LOG.info("---------------------------------UPDATE WORKINGDAY---------------------------------------------"); LOG.info("---------------------------------UPDATE WORKINGDAY---------------------------------------------");
return Utils.performServerPut(requestSpec, responseSpec, UPDATE_WORKINGDAYS_URL, updateWorkingDaysAsJson(), ""); return Utils.performServerPut(requestSpec, responseSpec, UPDATE_WORKINGDAYS_URL, updateWorkingDaysAsJson(), "");
} }
// 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 Object updateWorkingDaysWithWrongRecurrence(final RequestSpecification requestSpec, public static Object updateWorkingDaysWithWrongRecurrence(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, String jsonAttributeToGetback) { final ResponseSpecification responseSpec, String jsonAttributeToGetback) {
final String UPDATE_WORKINGDAYS_URL = WORKINGDAYS_URL + "?" + Utils.TENANT_IDENTIFIER; final String UPDATE_WORKINGDAYS_URL = WORKINGDAYS_URL + "?" + Utils.TENANT_IDENTIFIER;
@@ -51,12 +59,20 @@ public final class WorkingDaysHelper {
jsonAttributeToGetback); jsonAttributeToGetback);
} }
// 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 Object updateWorkingDaysWeekDays(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static Object updateWorkingDaysWeekDays(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
final String UPDATE_WORKINGDAYS_URL = WORKINGDAYS_URL + "?" + Utils.TENANT_IDENTIFIER; final String UPDATE_WORKINGDAYS_URL = WORKINGDAYS_URL + "?" + Utils.TENANT_IDENTIFIER;
LOG.info("---------------------------------UPDATE WORKINGDAY---------------------------------------------"); LOG.info("---------------------------------UPDATE WORKINGDAY---------------------------------------------");
return Utils.performServerPut(requestSpec, responseSpec, UPDATE_WORKINGDAYS_URL, updateWorkingWeekDaysDaysAsJson(), ""); return Utils.performServerPut(requestSpec, responseSpec, UPDATE_WORKINGDAYS_URL, updateWorkingWeekDaysDaysAsJson(), "");
} }
// 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)
@SuppressFBWarnings(value = { @SuppressFBWarnings(value = {
"DMI_RANDOM_USED_ONLY_ONCE" }, justification = "False positive for random object created and used only once") "DMI_RANDOM_USED_ONLY_ONCE" }, justification = "False positive for random object created and used only once")
public static String updateWorkingWeekDaysDaysAsJson() { public static String updateWorkingWeekDaysDaysAsJson() {
@@ -69,6 +85,10 @@ public final class WorkingDaysHelper {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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)
@SuppressFBWarnings(value = { @SuppressFBWarnings(value = {
"DMI_RANDOM_USED_ONLY_ONCE" }, justification = "False positive for random object created and used only once") "DMI_RANDOM_USED_ONLY_ONCE" }, justification = "False positive for random object created and used only once")
public static String updateWorkingDaysAsJson() { public static String updateWorkingDaysAsJson() {
@@ -81,6 +101,10 @@ public final class WorkingDaysHelper {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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)
@SuppressFBWarnings(value = { @SuppressFBWarnings(value = {
"DMI_RANDOM_USED_ONLY_ONCE" }, justification = "False positive for random object created and used only once") "DMI_RANDOM_USED_ONLY_ONCE" }, justification = "False positive for random object created and used only once")
public static String updateWorkingDayWithWrongRecur() { public static String updateWorkingDayWithWrongRecur() {
@@ -93,11 +117,19 @@ public final class WorkingDaysHelper {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 int workingDaysId(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static int workingDaysId(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
HashMap<String, Object> workingDays = getAllWorkingDays(requestSpec, responseSpec); HashMap<String, Object> workingDays = getAllWorkingDays(requestSpec, responseSpec);
return (int) workingDays.get("id"); return (int) workingDays.get("id");
} }
// 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 HashMap<String, Object> getAllWorkingDays(final RequestSpecification requestSpec, public static HashMap<String, Object> getAllWorkingDays(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/accounting/AccountHelper.java
+32
View File
@@ -36,6 +36,10 @@ public class AccountHelper extends IntegrationTest {
private final RequestSpecification requestSpec; private final RequestSpecification requestSpec;
private final ResponseSpecification responseSpec; private final ResponseSpecification responseSpec;
// 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 AccountHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public AccountHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
@@ -61,6 +65,10 @@ public class AccountHelper extends IntegrationTest {
return this.createEquityAccount(null); return this.createEquityAccount(null);
} }
// 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 Account createAssetAccount(String accountName) { public Account createAssetAccount(String accountName) {
final String assetAccountJSON = new GLAccountBuilder().withName(accountName).withAccountTypeAsAsset().build(); final String assetAccountJSON = new GLAccountBuilder().withName(accountName).withAccountTypeAsAsset().build();
final Integer accountID = Utils.performServerPost(this.requestSpec, this.responseSpec, CREATE_GL_ACCOUNT_URL, assetAccountJSON, final Integer accountID = Utils.performServerPost(this.requestSpec, this.responseSpec, CREATE_GL_ACCOUNT_URL, assetAccountJSON,
@@ -68,6 +76,10 @@ public class AccountHelper extends IntegrationTest {
return new Account(accountID, Account.AccountType.ASSET); return new Account(accountID, Account.AccountType.ASSET);
} }
// 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 Account createIncomeAccount(String accountName) { public Account createIncomeAccount(String accountName) {
final String assetAccountJSON = new GLAccountBuilder().withName(accountName).withAccountTypeAsIncome().build(); final String assetAccountJSON = new GLAccountBuilder().withName(accountName).withAccountTypeAsIncome().build();
final Integer accountID = Utils.performServerPost(this.requestSpec, this.responseSpec, CREATE_GL_ACCOUNT_URL, assetAccountJSON, final Integer accountID = Utils.performServerPost(this.requestSpec, this.responseSpec, CREATE_GL_ACCOUNT_URL, assetAccountJSON,
@@ -75,6 +87,10 @@ public class AccountHelper extends IntegrationTest {
return new Account(accountID, Account.AccountType.INCOME); return new Account(accountID, Account.AccountType.INCOME);
} }
// 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 Account createExpenseAccount(String accountName) { public Account createExpenseAccount(String accountName) {
final String assetAccountJSON = new GLAccountBuilder().withName(accountName).withAccountTypeAsExpense().build(); final String assetAccountJSON = new GLAccountBuilder().withName(accountName).withAccountTypeAsExpense().build();
final Integer accountID = Utils.performServerPost(this.requestSpec, this.responseSpec, CREATE_GL_ACCOUNT_URL, assetAccountJSON, final Integer accountID = Utils.performServerPost(this.requestSpec, this.responseSpec, CREATE_GL_ACCOUNT_URL, assetAccountJSON,
@@ -82,6 +98,10 @@ public class AccountHelper extends IntegrationTest {
return new Account(accountID, Account.AccountType.EXPENSE); return new Account(accountID, Account.AccountType.EXPENSE);
} }
// 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 Account createLiabilityAccount(String accountName) { public Account createLiabilityAccount(String accountName) {
final String liabilityAccountJSON = new GLAccountBuilder().withName(accountName).withAccountTypeAsLiability().build(); final String liabilityAccountJSON = new GLAccountBuilder().withName(accountName).withAccountTypeAsLiability().build();
final Integer accountID = Utils.performServerPost(this.requestSpec, this.responseSpec, CREATE_GL_ACCOUNT_URL, liabilityAccountJSON, final Integer accountID = Utils.performServerPost(this.requestSpec, this.responseSpec, CREATE_GL_ACCOUNT_URL, liabilityAccountJSON,
@@ -89,6 +109,10 @@ public class AccountHelper extends IntegrationTest {
return new Account(accountID, Account.AccountType.LIABILITY); return new Account(accountID, Account.AccountType.LIABILITY);
} }
// 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 Account createEquityAccount(String accountName) { public Account createEquityAccount(String accountName) {
final String equityAccountJSON = new GLAccountBuilder().withName(accountName).withAccountTypeAsAsEquity().build(); final String equityAccountJSON = new GLAccountBuilder().withName(accountName).withAccountTypeAsAsEquity().build();
final Integer accountID = Utils.performServerPost(this.requestSpec, this.responseSpec, CREATE_GL_ACCOUNT_URL, equityAccountJSON, final Integer accountID = Utils.performServerPost(this.requestSpec, this.responseSpec, CREATE_GL_ACCOUNT_URL, equityAccountJSON,
@@ -96,6 +120,10 @@ public class AccountHelper extends IntegrationTest {
return new Account(accountID, Account.AccountType.EQUITY); return new Account(accountID, Account.AccountType.EQUITY);
} }
// 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 ArrayList getAccountingWithRunningBalances() { public ArrayList getAccountingWithRunningBalances() {
final String GET_RUNNING_BALANCE_URL = "/fineract-provider/api/v1/glaccounts?fetchRunningBalance=true"; final String GET_RUNNING_BALANCE_URL = "/fineract-provider/api/v1/glaccounts?fetchRunningBalance=true";
final ArrayList<HashMap> accountRunningBalance = Utils.performServerGet(this.requestSpec, this.responseSpec, final ArrayList<HashMap> accountRunningBalance = Utils.performServerGet(this.requestSpec, this.responseSpec,
@@ -103,6 +131,10 @@ public class AccountHelper extends IntegrationTest {
return accountRunningBalance; return accountRunningBalance;
} }
// 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 HashMap getAccountingWithRunningBalanceById(final String accountId) { public HashMap getAccountingWithRunningBalanceById(final String accountId) {
final String GET_RUNNING_BALANCE_URL = "/fineract-provider/api/v1/glaccounts/" + accountId + "?fetchRunningBalance=true"; final String GET_RUNNING_BALANCE_URL = "/fineract-provider/api/v1/glaccounts/" + accountId + "?fetchRunningBalance=true";
final HashMap accountRunningBalance = Utils.performServerGet(this.requestSpec, this.responseSpec, GET_RUNNING_BALANCE_URL, ""); final HashMap accountRunningBalance = Utils.performServerGet(this.requestSpec, this.responseSpec, GET_RUNNING_BALANCE_URL, "");
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/accounting/AccountRuleHelper.java
+12
View File
@@ -38,17 +38,29 @@ public class AccountRuleHelper {
private final RequestSpecification requestSpec; private final RequestSpecification requestSpec;
private final ResponseSpecification responseSpec; private final ResponseSpecification responseSpec;
// 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 AccountRuleHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public AccountRuleHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
} }
// 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 ArrayList<GetAccountRulesResponse> getAccountingRules() { public ArrayList<GetAccountRulesResponse> getAccountingRules() {
final String response = Utils.performServerGet(this.requestSpec, this.responseSpec, ACCOUNTINGRULES_URL); final String response = Utils.performServerGet(this.requestSpec, this.responseSpec, ACCOUNTINGRULES_URL);
Type accountRuleListType = new TypeToken<ArrayList<GetAccountRulesResponse>>() {}.getType(); Type accountRuleListType = new TypeToken<ArrayList<GetAccountRulesResponse>>() {}.getType();
return GSON.fromJson(response, accountRuleListType); return GSON.fromJson(response, accountRuleListType);
} }
// 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 PostAccountingRulesResponse createAccountRule(final Long officeId, final Account accountToCredit, final Account accountToDebit) { public PostAccountingRulesResponse createAccountRule(final Long officeId, final Account accountToCredit, final Account accountToDebit) {
final String assetAccountJSON = new AccountingRuleBuilder() final String assetAccountJSON = new AccountingRuleBuilder()
.withGLAccounts(accountToCredit.getAccountID(), accountToDebit.getAccountID()).withOffice(officeId).build(); .withGLAccounts(accountToCredit.getAccountID(), accountToDebit.getAccountID()).withOffice(officeId).build();
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/accounting/FinancialActivityAccountHelper.java
+20
View File
@@ -39,6 +39,10 @@ public class FinancialActivityAccountHelper extends IntegrationTest {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
} }
// 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 Object createFinancialActivityAccount(Integer financialActivityId, Integer glAccountId, public Object createFinancialActivityAccount(Integer financialActivityId, Integer glAccountId,
final ResponseSpecification responseSpecification, String jsonBack) { final ResponseSpecification responseSpecification, String jsonBack) {
String json = FinancialActivityAccountsMappingBuilder.build(financialActivityId, glAccountId); String json = FinancialActivityAccountsMappingBuilder.build(financialActivityId, glAccountId);
@@ -46,6 +50,10 @@ public class FinancialActivityAccountHelper extends IntegrationTest {
FINANCIAL_ACTIVITY_ACCOUNT_MAPPING_URL + "?" + Utils.TENANT_IDENTIFIER, json, jsonBack); FINANCIAL_ACTIVITY_ACCOUNT_MAPPING_URL + "?" + Utils.TENANT_IDENTIFIER, json, jsonBack);
} }
// 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 Object updateFinancialActivityAccount(Integer financialActivityAccountId, Integer financialActivityId, Integer glAccountId, public Object updateFinancialActivityAccount(Integer financialActivityAccountId, Integer financialActivityId, Integer glAccountId,
final ResponseSpecification responseSpecification, String jsonBack) { final ResponseSpecification responseSpecification, String jsonBack) {
String json = FinancialActivityAccountsMappingBuilder.build(financialActivityId, glAccountId); String json = FinancialActivityAccountsMappingBuilder.build(financialActivityId, glAccountId);
@@ -53,17 +61,29 @@ public class FinancialActivityAccountHelper extends IntegrationTest {
FINANCIAL_ACTIVITY_ACCOUNT_MAPPING_URL + "/" + financialActivityAccountId + "?" + Utils.TENANT_IDENTIFIER, json, jsonBack); FINANCIAL_ACTIVITY_ACCOUNT_MAPPING_URL + "/" + financialActivityAccountId + "?" + Utils.TENANT_IDENTIFIER, json, jsonBack);
} }
// 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 HashMap getFinancialActivityAccount(final Integer financialActivityAccountId, public HashMap getFinancialActivityAccount(final Integer financialActivityAccountId,
final ResponseSpecification responseSpecification) { final ResponseSpecification responseSpecification) {
final String url = FINANCIAL_ACTIVITY_ACCOUNT_MAPPING_URL + "/" + financialActivityAccountId + "?" + Utils.TENANT_IDENTIFIER; final String url = FINANCIAL_ACTIVITY_ACCOUNT_MAPPING_URL + "/" + financialActivityAccountId + "?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerGet(requestSpec, responseSpecification, url, ""); return Utils.performServerGet(requestSpec, responseSpecification, url, "");
} }
// 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 List<HashMap> getAllFinancialActivityAccounts(final ResponseSpecification responseSpecification) { public List<HashMap> getAllFinancialActivityAccounts(final ResponseSpecification responseSpecification) {
final String url = FINANCIAL_ACTIVITY_ACCOUNT_MAPPING_URL + "?" + Utils.TENANT_IDENTIFIER; final String url = FINANCIAL_ACTIVITY_ACCOUNT_MAPPING_URL + "?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerGet(this.requestSpec, responseSpecification, url, ""); return Utils.performServerGet(this.requestSpec, responseSpecification, url, "");
} }
// 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 Integer deleteFinancialActivityAccount(final Integer financialActivityAccountId, public Integer deleteFinancialActivityAccount(final Integer financialActivityAccountId,
final ResponseSpecification responseSpecification, String jsonBack) { final ResponseSpecification responseSpecification, String jsonBack) {
final String url = FINANCIAL_ACTIVITY_ACCOUNT_MAPPING_URL + "/" + financialActivityAccountId + "?" + Utils.TENANT_IDENTIFIER; final String url = FINANCIAL_ACTIVITY_ACCOUNT_MAPPING_URL + "/" + financialActivityAccountId + "?" + Utils.TENANT_IDENTIFIER;
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/accounting/JournalEntryHelper.java
+32
View File
@@ -39,6 +39,10 @@ public class JournalEntryHelper {
private final ResponseSpecification responseSpec; private final ResponseSpecification responseSpec;
private static final Gson GSON = new JSON().getGson(); private static final Gson GSON = new JSON().getGson();
// 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 JournalEntryHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public JournalEntryHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
@@ -80,6 +84,10 @@ public class JournalEntryHelper {
return getJournalEntryTransactionId(account, date, accountEntries); return getJournalEntryTransactionId(account, date, accountEntries);
} }
// 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)
private void checkJournalEntry(final Integer officeId, final Account account, final String date, final JournalEntry... accountEntries) { private void checkJournalEntry(final Integer officeId, final Account account, final String date, final JournalEntry... accountEntries) {
final String url = createURLForGettingAccountEntries(account, date, officeId); final String url = createURLForGettingAccountEntries(account, date, officeId);
final ArrayList<HashMap> response = Utils.performServerGet(this.requestSpec, this.responseSpec, url, "pageItems"); final ArrayList<HashMap> response = Utils.performServerGet(this.requestSpec, this.responseSpec, url, "pageItems");
@@ -99,6 +107,10 @@ public class JournalEntryHelper {
} }
} }
// 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)
private String getJournalEntryTransactionId(final Account account, final String date, final JournalEntry... accountEntries) { private String getJournalEntryTransactionId(final Account account, final String date, final JournalEntry... accountEntries) {
final String url = createURLForGettingAccountEntries(account, date, null); final String url = createURLForGettingAccountEntries(account, date, null);
final ArrayList<HashMap> response = Utils.performServerGet(this.requestSpec, this.responseSpec, url, "pageItems"); final ArrayList<HashMap> response = Utils.performServerGet(this.requestSpec, this.responseSpec, url, "pageItems");
@@ -115,6 +127,10 @@ public class JournalEntryHelper {
return ""; return "";
} }
// 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)
private String createURLForGettingAccountEntries(final Account account, final String date, final Integer officeId) { private String createURLForGettingAccountEntries(final Account account, final String date, final Integer officeId) {
String url = new String("/fineract-provider/api/v1/journalentries?glAccountId=" + account.getAccountID() + "&type=" String url = new String("/fineract-provider/api/v1/journalentries?glAccountId=" + account.getAccountID() + "&type="
+ account.getAccountType() + "&fromDate=" + date + "&toDate=" + date + "&tenantIdentifier=default" + account.getAccountType() + "&fromDate=" + date + "&toDate=" + date + "&tenantIdentifier=default"
@@ -125,17 +141,29 @@ public class JournalEntryHelper {
return url; return url;
} }
// 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 ArrayList<HashMap> getJournalEntriesByTransactionId(final String transactionId) { public ArrayList<HashMap> getJournalEntriesByTransactionId(final String transactionId) {
final String url = createURLForGettingAccountEntriesByTransactionId(transactionId); final String url = createURLForGettingAccountEntriesByTransactionId(transactionId);
final ArrayList<HashMap> response = Utils.performServerGet(this.requestSpec, this.responseSpec, url, "pageItems"); final ArrayList<HashMap> response = Utils.performServerGet(this.requestSpec, this.responseSpec, url, "pageItems");
return response; return response;
} }
// 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)
private String createURLForGettingAccountEntriesByTransactionId(final String transactionId) { private String createURLForGettingAccountEntriesByTransactionId(final String transactionId) {
return new String("/fineract-provider/api/v1/journalentries?transactionId=" + transactionId + "&tenantIdentifier=default" return new String("/fineract-provider/api/v1/journalentries?transactionId=" + transactionId + "&tenantIdentifier=default"
+ "&orderBy=id&sortOrder=desc&locale=en&dateFormat=dd MMMM yyyy"); + "&orderBy=id&sortOrder=desc&locale=en&dateFormat=dd MMMM yyyy");
} }
// 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 GetJournalEntriesTransactionIdResponse getJournalEntries(final String transactionId) { public GetJournalEntriesTransactionIdResponse getJournalEntries(final String transactionId) {
log.info("Getting GL Journal entries for transaction id {}", transactionId); log.info("Getting GL Journal entries for transaction id {}", transactionId);
final String url = createURLForGettingAccountEntriesByTransactionId(transactionId); final String url = createURLForGettingAccountEntriesByTransactionId(transactionId);
@@ -144,6 +172,10 @@ public class JournalEntryHelper {
return GSON.fromJson(response, GetJournalEntriesTransactionIdResponse.class); return GSON.fromJson(response, GetJournalEntriesTransactionIdResponse.class);
} }
// 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 GetJournalEntriesTransactionIdResponse getJournalEntriesForLoan(final Long loanId) { public GetJournalEntriesTransactionIdResponse getJournalEntriesForLoan(final Long loanId) {
log.info("Getting GL Journal entries for loan id {}", loanId); log.info("Getting GL Journal entries for loan id {}", loanId);
final String url = "/fineract-provider/api/v1/journalentries?loanId=" + loanId + "&tenantIdentifier=default" final String url = "/fineract-provider/api/v1/journalentries?loanId=" + loanId + "&tenantIdentifier=default"
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/accounting/PeriodicAccrualAccountingHelper.java
+12
View File
@@ -30,16 +30,28 @@ public class PeriodicAccrualAccountingHelper {
private final RequestSpecification requestSpec; private final RequestSpecification requestSpec;
private final ResponseSpecification responseSpec; private final ResponseSpecification responseSpec;
// 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 PeriodicAccrualAccountingHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public PeriodicAccrualAccountingHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
} }
// 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 Object runPeriodicAccrualAccounting(String date) { public Object runPeriodicAccrualAccounting(String date) {
String json = getRunPeriodicAccrual(date); String json = getRunPeriodicAccrual(date);
return Utils.performServerPost(this.requestSpec, this.responseSpec, PERIODIC_ACCRUAL_URL + "?" + Utils.TENANT_IDENTIFIER, json, ""); return Utils.performServerPost(this.requestSpec, this.responseSpec, PERIODIC_ACCRUAL_URL + "?" + Utils.TENANT_IDENTIFIER, json, "");
} }
// 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)
private String getRunPeriodicAccrual(String date) { private String getRunPeriodicAccrual(String date) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
map.put("dateFormat", "dd MMMM yyyy"); map.put("dateFormat", "dd MMMM yyyy");
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/charges/ChargesHelper.java
+229 -1
View File
@@ -89,6 +89,10 @@ public final class ChargesHelper extends IntegrationTest {
private static final Gson GSON = new JSON().getGson(); private static final Gson GSON = new JSON().getGson();
// 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 String getSavingsSpecifiedDueDateJSON() { public static String getSavingsSpecifiedDueDateJSON() {
final HashMap<String, Object> map = populateDefaultsForSavings(); final HashMap<String, Object> map = populateDefaultsForSavings();
map.put("chargeTimeType", CHARGE_SPECIFIED_DUE_DATE); map.put("chargeTimeType", CHARGE_SPECIFIED_DUE_DATE);
@@ -98,18 +102,34 @@ public final class ChargesHelper extends IntegrationTest {
return chargesCreateJson; return chargesCreateJson;
} }
// 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 String getSavingsActivationFeeJSON() { public static String getSavingsActivationFeeJSON() {
return getSavingsJSON(AMOUNT, CURRENCY_CODE, ChargeTimeType.SAVINGS_ACTIVATION); return getSavingsJSON(AMOUNT, CURRENCY_CODE, ChargeTimeType.SAVINGS_ACTIVATION);
} }
// 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 String getSavingsNoActivityFeeJSON() { public static String getSavingsNoActivityFeeJSON() {
return getSavingsJSON(AMOUNT, CURRENCY_CODE, ChargeTimeType.SAVINGS_NOACTIVITY_FEE); return getSavingsJSON(AMOUNT, CURRENCY_CODE, ChargeTimeType.SAVINGS_NOACTIVITY_FEE);
} }
// 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 String getSavingsWithdrawalFeeJSON() { public static String getSavingsWithdrawalFeeJSON() {
return getSavingsJSON(AMOUNT, CURRENCY_CODE, ChargeTimeType.WITHDRAWAL_FEE); return getSavingsJSON(AMOUNT, CURRENCY_CODE, ChargeTimeType.WITHDRAWAL_FEE);
} }
// 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 String getSavingsJSON(String amount, String currencyCode, ChargeTimeType timeType) { public static String getSavingsJSON(String amount, String currencyCode, ChargeTimeType timeType) {
final HashMap<String, Object> map = populateDefaultsForSavings(amount.toString(), currencyCode); final HashMap<String, Object> map = populateDefaultsForSavings(amount.toString(), currencyCode);
map.put("chargeTimeType", timeType.getValue()); map.put("chargeTimeType", timeType.getValue());
@@ -118,6 +138,10 @@ public final class ChargesHelper extends IntegrationTest {
return chargesCreateJson; return chargesCreateJson;
} }
// 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 String getSavingsAnnualFeeJSON() { public static String getSavingsAnnualFeeJSON() {
final HashMap<String, Object> map = populateDefaultsForSavings(); final HashMap<String, Object> map = populateDefaultsForSavings();
map.put("feeOnMonthDay", ChargesHelper.FEE_ON_MONTH_DAY); map.put("feeOnMonthDay", ChargesHelper.FEE_ON_MONTH_DAY);
@@ -127,6 +151,10 @@ public final class ChargesHelper extends IntegrationTest {
return chargesCreateJson; return chargesCreateJson;
} }
// 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 String getSavingsMonthlyFeeJSON() { public static String getSavingsMonthlyFeeJSON() {
final HashMap<String, Object> map = populateDefaultsForSavings(); final HashMap<String, Object> map = populateDefaultsForSavings();
map.put("feeOnMonthDay", ChargesHelper.FEE_ON_MONTH_DAY); map.put("feeOnMonthDay", ChargesHelper.FEE_ON_MONTH_DAY);
@@ -137,6 +165,10 @@ public final class ChargesHelper extends IntegrationTest {
return chargesCreateJson; return chargesCreateJson;
} }
// 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 String getSavingsWeeklyFeeJSON() { public static String getSavingsWeeklyFeeJSON() {
final HashMap<String, Object> map = populateDefaultsForSavings(); final HashMap<String, Object> map = populateDefaultsForSavings();
map.put("chargeTimeType", WEEKLY_FEE); map.put("chargeTimeType", WEEKLY_FEE);
@@ -146,6 +178,10 @@ public final class ChargesHelper extends IntegrationTest {
return chargesCreateJson; return chargesCreateJson;
} }
// 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 String getSavingsOverdraftFeeJSON() { public static String getSavingsOverdraftFeeJSON() {
final HashMap<String, Object> map = populateDefaultsForSavings(); final HashMap<String, Object> map = populateDefaultsForSavings();
map.put("chargeTimeType", CHARGE_OVERDRAFT_FEE); map.put("chargeTimeType", CHARGE_OVERDRAFT_FEE);
@@ -154,10 +190,14 @@ public final class ChargesHelper extends IntegrationTest {
return chargesCreateJson; return chargesCreateJson;
} }
public static HashMap<String, Object> populateDefaultsForSavings() { private static HashMap<String, Object> populateDefaultsForSavings() {
return populateDefaultsForSavings(AMOUNT, CURRENCY_CODE); return populateDefaultsForSavings(AMOUNT, CURRENCY_CODE);
} }
// 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 HashMap<String, Object> populateDefaultsForSavings(String amount, String currencyCode) { public static HashMap<String, Object> populateDefaultsForSavings(String amount, String currencyCode) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("active", ChargesHelper.ACTIVE); map.put("active", ChargesHelper.ACTIVE);
@@ -171,18 +211,34 @@ public final class ChargesHelper extends IntegrationTest {
return map; return map;
} }
// 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 String getLoanDisbursementJSON() { public static String getLoanDisbursementJSON() {
return getLoanDisbursementJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, ChargesHelper.AMOUNT); return getLoanDisbursementJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, ChargesHelper.AMOUNT);
} }
// 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 String getLoanDisbursementJSON(final Integer chargeCalculationType, final String amount) { public static String getLoanDisbursementJSON(final Integer chargeCalculationType, final String amount) {
return getLoanDisbursementJSON(chargeCalculationType, amount, ChargesHelper.CHARGE_PAYMENT_MODE_REGULAR); return getLoanDisbursementJSON(chargeCalculationType, amount, ChargesHelper.CHARGE_PAYMENT_MODE_REGULAR);
} }
// 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 String getLoanDisbursementAccountTransferJSON(final Integer chargeCalculationType, final String amount) { public static String getLoanDisbursementAccountTransferJSON(final Integer chargeCalculationType, final String amount) {
return getLoanDisbursementJSON(chargeCalculationType, amount, ChargesHelper.CHARGE_PAYMENT_MODE_ACCOUNT_TRANSFER); return getLoanDisbursementJSON(chargeCalculationType, amount, ChargesHelper.CHARGE_PAYMENT_MODE_ACCOUNT_TRANSFER);
} }
// 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 String getLoanDisbursementJSON(final Integer chargeCalculationType, final String amount, final Integer paymentmode) { public static String getLoanDisbursementJSON(final Integer chargeCalculationType, final String amount, final Integer paymentmode) {
final HashMap<String, Object> map = populateDefaultsForLoan(); final HashMap<String, Object> map = populateDefaultsForLoan();
map.put("chargeTimeType", CHARGE_DISBURSEMENT_FEE); map.put("chargeTimeType", CHARGE_DISBURSEMENT_FEE);
@@ -194,10 +250,18 @@ public final class ChargesHelper extends IntegrationTest {
return chargesCreateJson; return chargesCreateJson;
} }
// 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 String paymentTypeCharge(Integer amount, final boolean enablePaymentType, final Long paymentTypeId) { public static String paymentTypeCharge(Integer amount, final boolean enablePaymentType, final Long paymentTypeId) {
return paymentTypeChargeJSON(amount, enablePaymentType, paymentTypeId); return paymentTypeChargeJSON(amount, enablePaymentType, paymentTypeId);
} }
// 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 String paymentTypeChargeJSON(Integer amount, final boolean enablePaymentType, final Long paymentTypeId) { public static String paymentTypeChargeJSON(Integer amount, final boolean enablePaymentType, final Long paymentTypeId) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("active", ChargesHelper.ACTIVE); map.put("active", ChargesHelper.ACTIVE);
@@ -215,24 +279,44 @@ public final class ChargesHelper extends IntegrationTest {
return paymentTypeJson; return paymentTypeJson;
} }
// 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 String getLoanSpecifiedDueDateJSON() { public static String getLoanSpecifiedDueDateJSON() {
return getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, ChargesHelper.AMOUNT, ChargesHelper.PENALTY); return getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, ChargesHelper.AMOUNT, ChargesHelper.PENALTY);
} }
// 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 String getLoanSpecifiedDueDateJSON(final Integer chargeCalculationType, final String amount, boolean penalty) { public static String getLoanSpecifiedDueDateJSON(final Integer chargeCalculationType, final String amount, boolean penalty) {
return getLoanSpecifiedDueDateJSON(chargeCalculationType, amount, penalty, ChargesHelper.CHARGE_PAYMENT_MODE_REGULAR); return getLoanSpecifiedDueDateJSON(chargeCalculationType, amount, penalty, ChargesHelper.CHARGE_PAYMENT_MODE_REGULAR);
} }
// 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 String getLoanSpecifiedDueDateJSON(final Integer chargeCalculationType, final String amount, boolean penalty, public static String getLoanSpecifiedDueDateJSON(final Integer chargeCalculationType, final String amount, boolean penalty,
String currencyCode) { String currencyCode) {
return getLoanSpecifiedDueDateJSON(chargeCalculationType, amount, penalty, ChargesHelper.CHARGE_PAYMENT_MODE_REGULAR, currencyCode); return getLoanSpecifiedDueDateJSON(chargeCalculationType, amount, penalty, ChargesHelper.CHARGE_PAYMENT_MODE_REGULAR, currencyCode);
} }
// 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 String getLoanSpecifiedDueDateJSON(final Integer chargeCalculationType, final String amount, final boolean penalty, public static String getLoanSpecifiedDueDateJSON(final Integer chargeCalculationType, final String amount, final boolean penalty,
final Integer paymentMode) { final Integer paymentMode) {
return getLoanSpecifiedDueDateJSON(chargeCalculationType, amount, penalty, paymentMode, ChargesHelper.CURRENCY_CODE); return getLoanSpecifiedDueDateJSON(chargeCalculationType, amount, penalty, paymentMode, ChargesHelper.CURRENCY_CODE);
} }
// 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 String getLoanSpecifiedDueDateJSON(final Integer chargeCalculationType, final String amount, final boolean penalty, public static String getLoanSpecifiedDueDateJSON(final Integer chargeCalculationType, final String amount, final boolean penalty,
final Integer paymentMode, final String currencyCode) { final Integer paymentMode, final String currencyCode) {
final HashMap<String, Object> map = populateDefaultsForLoan(); final HashMap<String, Object> map = populateDefaultsForLoan();
@@ -248,6 +332,10 @@ public final class ChargesHelper extends IntegrationTest {
return chargesCreateJson; return chargesCreateJson;
} }
// 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 String getLoanSpecificInstallmentFeeJSON() { public static String getLoanSpecificInstallmentFeeJSON() {
final HashMap<String, Object> map = populateDefaultsForLoan(); final HashMap<String, Object> map = populateDefaultsForLoan();
map.put("chargeTimeType", CHARGE_INSTALLMENT_FEE); map.put("chargeTimeType", CHARGE_INSTALLMENT_FEE);
@@ -261,20 +349,36 @@ public final class ChargesHelper extends IntegrationTest {
return chargesCreateJson; return chargesCreateJson;
} }
// 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 String getLoanSpecifiedDueDateWithAccountTransferJSON(final Integer chargeCalculationType, final String amount, public static String getLoanSpecifiedDueDateWithAccountTransferJSON(final Integer chargeCalculationType, final String amount,
boolean penalty) { boolean penalty) {
return getLoanSpecifiedDueDateJSON(chargeCalculationType, amount, penalty, ChargesHelper.CHARGE_PAYMENT_MODE_ACCOUNT_TRANSFER); return getLoanSpecifiedDueDateJSON(chargeCalculationType, amount, penalty, ChargesHelper.CHARGE_PAYMENT_MODE_ACCOUNT_TRANSFER);
} }
// 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 String getLoanSpecifiedDueDateWithAccountTransferJSON() { public static String getLoanSpecifiedDueDateWithAccountTransferJSON() {
return getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, ChargesHelper.AMOUNT, ChargesHelper.PENALTY, return getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, ChargesHelper.AMOUNT, ChargesHelper.PENALTY,
ChargesHelper.CHARGE_PAYMENT_MODE_ACCOUNT_TRANSFER); ChargesHelper.CHARGE_PAYMENT_MODE_ACCOUNT_TRANSFER);
} }
// 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 String getLoanInstallmentJSON(final Integer chargeCalculationType, final String amount, boolean penalty) { public static String getLoanInstallmentJSON(final Integer chargeCalculationType, final String amount, boolean penalty) {
return getLoanInstallmentJSON(chargeCalculationType, amount, penalty, ChargesHelper.CHARGE_PAYMENT_MODE_REGULAR); return getLoanInstallmentJSON(chargeCalculationType, amount, penalty, ChargesHelper.CHARGE_PAYMENT_MODE_REGULAR);
} }
// 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 String getLoanOverdueInstallmentJSON(final String amount) { public static String getLoanOverdueInstallmentJSON(final String amount) {
final HashMap<String, Object> map = populateDefaultsForLoan(); final HashMap<String, Object> map = populateDefaultsForLoan();
map.put("chargeId", CHARGE_OVERDUE_INSTALLMENT_FEE); map.put("chargeId", CHARGE_OVERDUE_INSTALLMENT_FEE);
@@ -285,6 +389,10 @@ public final class ChargesHelper extends IntegrationTest {
return chargesCreateJson; return chargesCreateJson;
} }
// 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 String getLoanInstallmentJSON(final Integer chargeCalculationType, final String amount, final boolean penalty, public static String getLoanInstallmentJSON(final Integer chargeCalculationType, final String amount, final boolean penalty,
final Integer paymentMode) { final Integer paymentMode) {
final HashMap<String, Object> map = populateDefaultsForLoan(); final HashMap<String, Object> map = populateDefaultsForLoan();
@@ -299,15 +407,27 @@ public final class ChargesHelper extends IntegrationTest {
return chargesCreateJson; return chargesCreateJson;
} }
// 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 String getLoanInstallmentWithAccountTransferJSON(final Integer chargeCalculationType, final String amount, public static String getLoanInstallmentWithAccountTransferJSON(final Integer chargeCalculationType, final String amount,
boolean penalty) { boolean penalty) {
return getLoanInstallmentJSON(chargeCalculationType, amount, penalty, ChargesHelper.CHARGE_PAYMENT_MODE_ACCOUNT_TRANSFER); return getLoanInstallmentJSON(chargeCalculationType, amount, penalty, ChargesHelper.CHARGE_PAYMENT_MODE_ACCOUNT_TRANSFER);
} }
// 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 String getLoanInstallmentFeeJSON() { public static String getLoanInstallmentFeeJSON() {
return getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, ChargesHelper.AMOUNT, ChargesHelper.PENALTY); return getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, ChargesHelper.AMOUNT, ChargesHelper.PENALTY);
} }
// 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 String getShareAccountActivationChargeJson() { public static String getShareAccountActivationChargeJson() {
HashMap<String, Object> map = populateDefaultsShareActivationCharge(); HashMap<String, Object> map = populateDefaultsShareActivationCharge();
String chargesCreateJson = new Gson().toJson(map); String chargesCreateJson = new Gson().toJson(map);
@@ -315,6 +435,10 @@ public final class ChargesHelper extends IntegrationTest {
return chargesCreateJson; return chargesCreateJson;
} }
// 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 String getShareAccountPurchaseChargeJson() { public static String getShareAccountPurchaseChargeJson() {
HashMap<String, Object> map = populateDefaultsSharePurchaseFlatCharge(); HashMap<String, Object> map = populateDefaultsSharePurchaseFlatCharge();
String chargesCreateJson = new Gson().toJson(map); String chargesCreateJson = new Gson().toJson(map);
@@ -322,6 +446,10 @@ public final class ChargesHelper extends IntegrationTest {
return chargesCreateJson; return chargesCreateJson;
} }
// 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 String getShareAccountRedeemChargeJson() { public static String getShareAccountRedeemChargeJson() {
HashMap<String, Object> map = populateDefaultsShareRedeemFlatCharge(); HashMap<String, Object> map = populateDefaultsShareRedeemFlatCharge();
String chargesCreateJson = new Gson().toJson(map); String chargesCreateJson = new Gson().toJson(map);
@@ -329,6 +457,10 @@ public final class ChargesHelper extends IntegrationTest {
return chargesCreateJson; return chargesCreateJson;
} }
// 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 String getLoanOverdueFeeJSON() { public static String getLoanOverdueFeeJSON() {
final HashMap<String, Object> map = populateDefaultsForLoan(); final HashMap<String, Object> map = populateDefaultsForLoan();
map.put("penalty", ChargesHelper.PENALTY); map.put("penalty", ChargesHelper.PENALTY);
@@ -342,6 +474,10 @@ public final class ChargesHelper extends IntegrationTest {
return chargesCreateJson; return chargesCreateJson;
} }
// 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 String getLoanOverdueFeeJSONWithCalculationTypePercentage(String penaltyPercentageAmount) { public static String getLoanOverdueFeeJSONWithCalculationTypePercentage(String penaltyPercentageAmount) {
final HashMap<String, Object> map = populateDefaultsForLoan(); final HashMap<String, Object> map = populateDefaultsForLoan();
map.put("penalty", ChargesHelper.PENALTY); map.put("penalty", ChargesHelper.PENALTY);
@@ -354,6 +490,10 @@ public final class ChargesHelper extends IntegrationTest {
return chargesCreateJson; return chargesCreateJson;
} }
// 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 HashMap<String, Object> populateDefaultsForLoan() { public static HashMap<String, Object> populateDefaultsForLoan() {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("active", ChargesHelper.ACTIVE); map.put("active", ChargesHelper.ACTIVE);
@@ -367,6 +507,10 @@ public final class ChargesHelper extends IntegrationTest {
return map; return map;
} }
// 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 HashMap<String, Object> populateDefaultsClientCharge() { public static HashMap<String, Object> populateDefaultsClientCharge() {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("active", ChargesHelper.ACTIVE); map.put("active", ChargesHelper.ACTIVE);
@@ -381,6 +525,10 @@ public final class ChargesHelper extends IntegrationTest {
return map; return map;
} }
// 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 HashMap<String, Object> populateDefaultsShareActivationCharge() { public static HashMap<String, Object> populateDefaultsShareActivationCharge() {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("active", ChargesHelper.ACTIVE); map.put("active", ChargesHelper.ACTIVE);
@@ -394,6 +542,10 @@ public final class ChargesHelper extends IntegrationTest {
return map; return map;
} }
// 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 HashMap<String, Object> populateDefaultsSharePurchaseFlatCharge() { public static HashMap<String, Object> populateDefaultsSharePurchaseFlatCharge() {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("active", ChargesHelper.ACTIVE); map.put("active", ChargesHelper.ACTIVE);
@@ -407,6 +559,10 @@ public final class ChargesHelper extends IntegrationTest {
return map; return map;
} }
// 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 HashMap<String, Object> populateDefaultsShareRedeemFlatCharge() { public static HashMap<String, Object> populateDefaultsShareRedeemFlatCharge() {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("active", ChargesHelper.ACTIVE); map.put("active", ChargesHelper.ACTIVE);
@@ -420,44 +576,76 @@ public final class ChargesHelper extends IntegrationTest {
return map; return map;
} }
// 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 Integer createCharges(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createCharges(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String request) { final String request) {
return Utils.performServerPost(requestSpec, responseSpec, CREATE_CHARGES_URL, request, "resourceId"); return Utils.performServerPost(requestSpec, responseSpec, CREATE_CHARGES_URL, request, "resourceId");
} }
// 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, public static PostChargesResponse createLoanCharge(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String payload) { final String payload) {
final String response = Utils.performServerPost(requestSpec, responseSpec, CREATE_CHARGES_URL, payload, null); final String response = Utils.performServerPost(requestSpec, responseSpec, CREATE_CHARGES_URL, payload, null);
return GSON.fromJson(response, PostChargesResponse.class); return GSON.fromJson(response, PostChargesResponse.class);
} }
// 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 ArrayList<HashMap> getCharges(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static ArrayList<HashMap> getCharges(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
return (ArrayList) Utils.performServerGet(requestSpec, responseSpec, CHARGES_URL + "?" + Utils.TENANT_IDENTIFIER, ""); return (ArrayList) Utils.performServerGet(requestSpec, responseSpec, CHARGES_URL + "?" + Utils.TENANT_IDENTIFIER, "");
} }
// 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 HashMap getChargeById(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static HashMap getChargeById(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer chargeId) { final Integer chargeId) {
return Utils.performServerGet(requestSpec, responseSpec, CHARGES_URL + "/" + chargeId + "?" + Utils.TENANT_IDENTIFIER, ""); return Utils.performServerGet(requestSpec, responseSpec, CHARGES_URL + "/" + chargeId + "?" + Utils.TENANT_IDENTIFIER, "");
} }
// 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 HashMap getChargeChanges(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static HashMap getChargeChanges(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer chargeId) { final Integer chargeId) {
return Utils.performServerGet(requestSpec, responseSpec, CHARGES_URL + "/" + chargeId + "?" + Utils.TENANT_IDENTIFIER, return Utils.performServerGet(requestSpec, responseSpec, CHARGES_URL + "/" + chargeId + "?" + Utils.TENANT_IDENTIFIER,
CommonConstants.RESPONSE_CHANGES); CommonConstants.RESPONSE_CHANGES);
} }
// 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 HashMap updateCharges(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static HashMap updateCharges(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer chargeId, final String request) { final Integer chargeId, final String request) {
return Utils.performServerPut(requestSpec, responseSpec, CHARGES_URL + "/" + chargeId + "?" + Utils.TENANT_IDENTIFIER, request, return Utils.performServerPut(requestSpec, responseSpec, CHARGES_URL + "/" + chargeId + "?" + Utils.TENANT_IDENTIFIER, request,
CommonConstants.RESPONSE_CHANGES); CommonConstants.RESPONSE_CHANGES);
} }
// 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 Integer deleteCharge(final ResponseSpecification responseSpec, final RequestSpecification requestSpec, public static Integer deleteCharge(final ResponseSpecification responseSpec, final RequestSpecification requestSpec,
final Integer chargeId) { final Integer chargeId) {
return Utils.performServerDelete(requestSpec, responseSpec, CHARGES_URL + "/" + chargeId + "?" + Utils.TENANT_IDENTIFIER, return Utils.performServerDelete(requestSpec, responseSpec, CHARGES_URL + "/" + chargeId + "?" + Utils.TENANT_IDENTIFIER,
CommonConstants.RESPONSE_RESOURCE_ID); CommonConstants.RESPONSE_RESOURCE_ID);
} }
// 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 String getModifyChargeJSON() { public static String getModifyChargeJSON() {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("locale", CommonConstants.LOCALE); map.put("locale", CommonConstants.LOCALE);
@@ -467,6 +655,10 @@ public final class ChargesHelper extends IntegrationTest {
return json; return json;
} }
// 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 String getModifyWithdrawalFeeSavingsChargeJSON() { public static String getModifyWithdrawalFeeSavingsChargeJSON() {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("locale", CommonConstants.LOCALE); map.put("locale", CommonConstants.LOCALE);
@@ -476,6 +668,10 @@ public final class ChargesHelper extends IntegrationTest {
return json; return json;
} }
// 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 String getModifyChargeAsPecentageAmountJSON() { public static String getModifyChargeAsPecentageAmountJSON() {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("locale", CommonConstants.LOCALE); map.put("locale", CommonConstants.LOCALE);
@@ -486,6 +682,10 @@ public final class ChargesHelper extends IntegrationTest {
return json; return json;
} }
// 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 String getModifyChargeAsPecentageLoanAmountWithInterestJSON() { public static String getModifyChargeAsPecentageLoanAmountWithInterestJSON() {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("locale", CommonConstants.LOCALE); map.put("locale", CommonConstants.LOCALE);
@@ -496,6 +696,10 @@ public final class ChargesHelper extends IntegrationTest {
return json; return json;
} }
// 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 String getModifyChargeAsPercentageInterestJSON() { public static String getModifyChargeAsPercentageInterestJSON() {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("locale", CommonConstants.LOCALE); map.put("locale", CommonConstants.LOCALE);
@@ -506,6 +710,10 @@ public final class ChargesHelper extends IntegrationTest {
return json; return json;
} }
// 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 String getModifyChargeFeeFrequencyAsDaysJSON() { public static String getModifyChargeFeeFrequencyAsDaysJSON() {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("locale", CommonConstants.LOCALE); map.put("locale", CommonConstants.LOCALE);
@@ -516,6 +724,10 @@ public final class ChargesHelper extends IntegrationTest {
return json; return json;
} }
// 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 String getModifyChargeFeeFrequencyAsWeeksJSON() { public static String getModifyChargeFeeFrequencyAsWeeksJSON() {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("locale", CommonConstants.LOCALE); map.put("locale", CommonConstants.LOCALE);
@@ -526,6 +738,10 @@ public final class ChargesHelper extends IntegrationTest {
return json; return json;
} }
// 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 String getModifyChargeFeeFrequencyAsMonthsJSON() { public static String getModifyChargeFeeFrequencyAsMonthsJSON() {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("locale", CommonConstants.LOCALE); map.put("locale", CommonConstants.LOCALE);
@@ -536,6 +752,10 @@ public final class ChargesHelper extends IntegrationTest {
return json; return json;
} }
// 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 String getModifyChargeFeeFrequencyAsYearsJSON() { public static String getModifyChargeFeeFrequencyAsYearsJSON() {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("locale", CommonConstants.LOCALE); map.put("locale", CommonConstants.LOCALE);
@@ -546,6 +766,10 @@ public final class ChargesHelper extends IntegrationTest {
return json; return json;
} }
// 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 String getChargeSpecifiedDueDateJSON() { public static String getChargeSpecifiedDueDateJSON() {
final HashMap<String, Object> map = populateDefaultsClientCharge(); final HashMap<String, Object> map = populateDefaultsClientCharge();
String chargesCreateJson = new Gson().toJson(map); String chargesCreateJson = new Gson().toJson(map);
@@ -553,6 +777,10 @@ public final class ChargesHelper extends IntegrationTest {
return chargesCreateJson; return chargesCreateJson;
} }
// 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 String applyCharge(RequestSpecification requestSpec, ResponseSpecification responseSpec, String chargeId, String json) { public static String applyCharge(RequestSpecification requestSpec, ResponseSpecification responseSpec, String chargeId, String json) {
return Utils.performServerPost(requestSpec, responseSpec, CHARGES_URL + "/" + chargeId + "?" + Utils.TENANT_IDENTIFIER, json, return Utils.performServerPost(requestSpec, responseSpec, CHARGES_URL + "/" + chargeId + "?" + Utils.TENANT_IDENTIFIER, json,
"status"); "status");
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/commands/MakercheckersHelper.java
+16
View File
@@ -38,11 +38,19 @@ public class MakercheckersHelper {
private final RequestSpecification requestSpec; private final RequestSpecification requestSpec;
private final ResponseSpecification responseSpec; private final ResponseSpecification responseSpec;
// 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 MakercheckersHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public MakercheckersHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
} }
// 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 List<Map<String, Object>> getMakerCheckerList(Map<String, String> queryParams) { public List<Map<String, Object>> getMakerCheckerList(Map<String, String> queryParams) {
StringBuilder url = new StringBuilder(MAKERCHECKER_URL).append("?").append(Utils.TENANT_IDENTIFIER); StringBuilder url = new StringBuilder(MAKERCHECKER_URL).append("?").append(Utils.TENANT_IDENTIFIER);
if (queryParams != null) { if (queryParams != null) {
@@ -55,10 +63,18 @@ public class MakercheckersHelper {
return GSON.fromJson(response, makerCheckerList); return GSON.fromJson(response, makerCheckerList);
} }
// 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 void approveMakerCheckerEntry(Long auditId) { public void approveMakerCheckerEntry(Long auditId) {
approveMakerCheckerEntry(this.requestSpec, this.responseSpec, auditId); approveMakerCheckerEntry(this.requestSpec, this.responseSpec, auditId);
} }
// 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 HashMap<?, ?> approveMakerCheckerEntry(RequestSpecification requestSpec, ResponseSpecification responseSpec, public static HashMap<?, ?> approveMakerCheckerEntry(RequestSpecification requestSpec, ResponseSpecification responseSpec,
Long auditId) { Long auditId) {
String url = MAKERCHECKER_URL + "/" + auditId + "?command=approve&" + Utils.TENANT_IDENTIFIER; String url = MAKERCHECKER_URL + "/" + auditId + "?command=approve&" + Utils.TENANT_IDENTIFIER;
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/externalevents/ExternalEventHelper.java
+16
View File
@@ -70,6 +70,10 @@ public final class ExternalEventHelper {
} }
} }
// 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 List<ExternalEventDTO> getAllExternalEvents(final RequestSpecification requestSpec, public static List<ExternalEventDTO> getAllExternalEvents(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
final String url = "/fineract-provider/api/v1/internal/externalevents?" + Utils.TENANT_IDENTIFIER; final String url = "/fineract-provider/api/v1/internal/externalevents?" + Utils.TENANT_IDENTIFIER;
@@ -78,6 +82,10 @@ public final class ExternalEventHelper {
return GSON.fromJson(response, new TypeToken<List<ExternalEventDTO>>() {}.getType()); return GSON.fromJson(response, new TypeToken<List<ExternalEventDTO>>() {}.getType());
} }
// 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 List<ExternalEventDTO> getAllExternalEvents(final RequestSpecification requestSpec, public static List<ExternalEventDTO> getAllExternalEvents(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, Filter filter) { final ResponseSpecification responseSpec, Filter filter) {
final String url = "/fineract-provider/api/v1/internal/externalevents?" + filter.toQueryParams() + Utils.TENANT_IDENTIFIER; final String url = "/fineract-provider/api/v1/internal/externalevents?" + filter.toQueryParams() + Utils.TENANT_IDENTIFIER;
@@ -86,12 +94,20 @@ public final class ExternalEventHelper {
return GSON.fromJson(response, new TypeToken<List<ExternalEventDTO>>() {}.getType()); return GSON.fromJson(response, new TypeToken<List<ExternalEventDTO>>() {}.getType());
} }
// 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 void deleteAllExternalEvents(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static void deleteAllExternalEvents(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
final String url = "/fineract-provider/api/v1/internal/externalevents?" + Utils.TENANT_IDENTIFIER; final String url = "/fineract-provider/api/v1/internal/externalevents?" + Utils.TENANT_IDENTIFIER;
log.info("-----------------------------DELETE ALL EXTERNAL EVENTS PARTITIONS----------------------------------------"); log.info("-----------------------------DELETE ALL EXTERNAL EVENTS PARTITIONS----------------------------------------");
Utils.performServerDelete(requestSpec, responseSpec, url, null); Utils.performServerDelete(requestSpec, responseSpec, url, null);
} }
// 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 void changeEventState(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, String eventName, public static void changeEventState(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, String eventName,
boolean status) { boolean status) {
final Map<String, Boolean> updatedConfigurations = ExternalEventConfigurationHelper.updateExternalEventConfigurations(requestSpec, final Map<String, Boolean> updatedConfigurations = ExternalEventConfigurationHelper.updateExternalEventConfigurations(requestSpec,
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositAccountHelper.java
+136
View File
@@ -37,6 +37,10 @@ public class FixedDepositAccountHelper {
private final RequestSpecification requestSpec; private final RequestSpecification requestSpec;
private final ResponseSpecification responseSpec; private final ResponseSpecification responseSpec;
// 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 FixedDepositAccountHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public FixedDepositAccountHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
@@ -100,6 +104,10 @@ public class FixedDepositAccountHelper {
private Integer maturityInstructionId; private Integer maturityInstructionId;
private List<HashMap<String, String>> charges; private List<HashMap<String, String>> charges;
// 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 String build(final String clientId, final String productId, final String penalInterestType) { public String build(final String clientId, final String productId, final String penalInterestType) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
@@ -138,6 +146,10 @@ public class FixedDepositAccountHelper {
return fixedDepositAccountJson; return fixedDepositAccountJson;
} }
// 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 Integer applyFixedDepositApplicationGetId(final String fixedDepositAccountAsJson, final RequestSpecification requestSpec, public static Integer applyFixedDepositApplicationGetId(final String fixedDepositAccountAsJson, final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
LOG.info("--------------------- APPLYING FOR FIXED DEPOSIT ACCOUNT ------------------------"); LOG.info("--------------------- APPLYING FOR FIXED DEPOSIT ACCOUNT ------------------------");
@@ -145,12 +157,20 @@ public class FixedDepositAccountHelper {
CommonConstants.RESPONSE_RESOURCE_ID); CommonConstants.RESPONSE_RESOURCE_ID);
} }
// 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 String applyFixedDepositApplication(final String fixedDepositAccountAsJson, final RequestSpecification requestSpec, public static String applyFixedDepositApplication(final String fixedDepositAccountAsJson, final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
LOG.info("--------------------- APPLYING FOR FIXED DEPOSIT ACCOUNT ------------------------"); LOG.info("--------------------- APPLYING FOR FIXED DEPOSIT ACCOUNT ------------------------");
return Utils.performServerPost(requestSpec, responseSpec, APPLY_FIXED_DEPOSIT_ACCOUNT_URL, fixedDepositAccountAsJson); return Utils.performServerPost(requestSpec, responseSpec, APPLY_FIXED_DEPOSIT_ACCOUNT_URL, fixedDepositAccountAsJson);
} }
// 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 HashMap getFixedDepositAccountById(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static HashMap getFixedDepositAccountById(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer accountID) { final Integer accountID) {
final String GET_FIXED_DEPOSIT_BY_ID_URL = FIXED_DEPOSIT_ACCOUNT_URL + "/" + accountID + "?" + Utils.TENANT_IDENTIFIER; final String GET_FIXED_DEPOSIT_BY_ID_URL = FIXED_DEPOSIT_ACCOUNT_URL + "/" + accountID + "?" + Utils.TENANT_IDENTIFIER;
@@ -158,20 +178,36 @@ public class FixedDepositAccountHelper {
return Utils.performServerGet(requestSpec, responseSpec, GET_FIXED_DEPOSIT_BY_ID_URL, ""); return Utils.performServerGet(requestSpec, responseSpec, GET_FIXED_DEPOSIT_BY_ID_URL, "");
} }
// 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 HashMap getFixedDepositSummary(final Integer accountID) { public HashMap getFixedDepositSummary(final Integer accountID) {
return getFixedDepositDetails(accountID, "summary"); return getFixedDepositDetails(accountID, "summary");
} }
// 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 HashMap getFixedDepositDetails(final Integer accountID) { public HashMap getFixedDepositDetails(final Integer accountID) {
return getFixedDepositDetails(accountID, ""); return getFixedDepositDetails(accountID, "");
} }
// 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)
private HashMap getFixedDepositDetails(final Integer accountID, final String jsonAttributeToGetBack) { private HashMap getFixedDepositDetails(final Integer accountID, final String jsonAttributeToGetBack) {
final String URL = FIXED_DEPOSIT_ACCOUNT_URL + "/" + accountID + "?" + Utils.TENANT_IDENTIFIER; final String URL = FIXED_DEPOSIT_ACCOUNT_URL + "/" + accountID + "?" + Utils.TENANT_IDENTIFIER;
final HashMap response = Utils.performServerGet(requestSpec, responseSpec, URL, jsonAttributeToGetBack); final HashMap response = Utils.performServerGet(requestSpec, responseSpec, URL, jsonAttributeToGetBack);
return response; return response;
} }
// 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 Float getInterestRate(ArrayList<ArrayList<HashMap>> interestSlabData, Integer depositPeriod) { public static Float getInterestRate(ArrayList<ArrayList<HashMap>> interestSlabData, Integer depositPeriod) {
Float annualInterestRate = 0.0f; Float annualInterestRate = 0.0f;
@@ -187,6 +223,10 @@ public class FixedDepositAccountHelper {
return annualInterestRate; return annualInterestRate;
} }
// 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 Float getPrincipalAfterCompoundingInterest(Calendar currentDate, Float principal, Integer depositPeriod, public static Float getPrincipalAfterCompoundingInterest(Calendar currentDate, Float principal, Integer depositPeriod,
double interestPerDay, Integer compoundingInterval, Integer postingInterval) { double interestPerDay, Integer compoundingInterval, Integer postingInterval) {
@@ -217,6 +257,10 @@ public class FixedDepositAccountHelper {
return principal; return principal;
} }
// 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 HashMap updateFixedDepositAccount(final String clientID, final String productID, final String accountID, final String validFrom, public HashMap updateFixedDepositAccount(final String clientID, final String productID, final String accountID, final String validFrom,
final String validTo, final String penalInterestType, final String submittedOnDate) { final String validTo, final String penalInterestType, final String submittedOnDate) {
@@ -229,6 +273,10 @@ public class FixedDepositAccountHelper {
CommonConstants.RESPONSE_CHANGES); CommonConstants.RESPONSE_CHANGES);
} }
// 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 HashMap updateInterestCalculationConfigForFixedDeposit(final String clientID, final String productID, final String accountID, public HashMap updateInterestCalculationConfigForFixedDeposit(final String clientID, final String productID, final String accountID,
final String submittedOnDate, final String validFrom, final String validTo, final String numberOfDaysPerYear, final String submittedOnDate, final String validFrom, final String validTo, final String numberOfDaysPerYear,
final String penalInterestType, final String interestCalculationType, final String interestCompoundingPeriodType, final String penalInterestType, final String interestCalculationType, final String interestCompoundingPeriodType,
@@ -247,12 +295,20 @@ public class FixedDepositAccountHelper {
CommonConstants.RESPONSE_CHANGES); CommonConstants.RESPONSE_CHANGES);
} }
// 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 HashMap approveFixedDeposit(final Integer fixedDepositAccountID, final String approvedOnDate) { public HashMap approveFixedDeposit(final Integer fixedDepositAccountID, final String approvedOnDate) {
LOG.info("--------------------------------- APPROVING FIXED DEPOSIT APPLICATION ------------------------------------"); LOG.info("--------------------------------- APPROVING FIXED DEPOSIT APPLICATION ------------------------------------");
return performFixedDepositApplicationActions(createFixedDepositOperationURL(APPROVE_FIXED_DEPOSIT_COMMAND, fixedDepositAccountID), return performFixedDepositApplicationActions(createFixedDepositOperationURL(APPROVE_FIXED_DEPOSIT_COMMAND, fixedDepositAccountID),
getApproveFixedDepositAccountAsJSON(approvedOnDate)); getApproveFixedDepositAccountAsJSON(approvedOnDate));
} }
// 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 HashMap undoApproval(final Integer fixedDepositAccountID) { public HashMap undoApproval(final Integer fixedDepositAccountID) {
LOG.info("--------------------------------- UNDO APPROVING FIXED DEPOSIT APPLICATION -------------------------------"); LOG.info("--------------------------------- UNDO APPROVING FIXED DEPOSIT APPLICATION -------------------------------");
final String undoBodyJson = "{'note':'UNDO APPROVAL'}"; final String undoBodyJson = "{'note':'UNDO APPROVAL'}";
@@ -260,12 +316,20 @@ public class FixedDepositAccountHelper {
createFixedDepositOperationURL(UNDO_APPROVAL_FIXED_DEPOSIT_COMMAND, fixedDepositAccountID), undoBodyJson); createFixedDepositOperationURL(UNDO_APPROVAL_FIXED_DEPOSIT_COMMAND, fixedDepositAccountID), undoBodyJson);
} }
// 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 HashMap rejectApplication(final Integer fixedDepositAccountID, final String rejectedOnDate) { public HashMap rejectApplication(final Integer fixedDepositAccountID, final String rejectedOnDate) {
LOG.info("--------------------------------- REJECT FIXED DEPOSIT APPLICATION -------------------------------"); LOG.info("--------------------------------- REJECT FIXED DEPOSIT APPLICATION -------------------------------");
return performFixedDepositApplicationActions(createFixedDepositOperationURL(REJECT_FIXED_DEPOSIT_COMMAND, fixedDepositAccountID), return performFixedDepositApplicationActions(createFixedDepositOperationURL(REJECT_FIXED_DEPOSIT_COMMAND, fixedDepositAccountID),
getRejectedFixedDepositAsJSON(rejectedOnDate)); getRejectedFixedDepositAsJSON(rejectedOnDate));
} }
// 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 HashMap withdrawApplication(final Integer fixedDepositAccountID, final String withdrawApplicationOnDate) { public HashMap withdrawApplication(final Integer fixedDepositAccountID, final String withdrawApplicationOnDate) {
LOG.info("--------------------------------- Withdraw FIXED DEPOSIT APPLICATION -------------------------------"); LOG.info("--------------------------------- Withdraw FIXED DEPOSIT APPLICATION -------------------------------");
return performFixedDepositApplicationActions( return performFixedDepositApplicationActions(
@@ -273,12 +337,20 @@ public class FixedDepositAccountHelper {
getWithdrawnFixedDepositAccountAsJSON(withdrawApplicationOnDate)); getWithdrawnFixedDepositAccountAsJSON(withdrawApplicationOnDate));
} }
// 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 HashMap activateFixedDeposit(final Integer fixedDepositAccountID, final String activationDate) { public HashMap activateFixedDeposit(final Integer fixedDepositAccountID, final String activationDate) {
LOG.info("---------------------------------- ACTIVATING FIXED DEPOSIT APPLICATION ----------------------------------"); LOG.info("---------------------------------- ACTIVATING FIXED DEPOSIT APPLICATION ----------------------------------");
return performFixedDepositApplicationActions(createFixedDepositOperationURL(ACTIVATE_FIXED_DEPOSIT_COMMAND, fixedDepositAccountID), return performFixedDepositApplicationActions(createFixedDepositOperationURL(ACTIVATE_FIXED_DEPOSIT_COMMAND, fixedDepositAccountID),
getActivatedFixedDepositAccountAsJSON(activationDate)); getActivatedFixedDepositAccountAsJSON(activationDate));
} }
// 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 Object deleteFixedDepositApplication(final Integer fixedDepositAccountID, final String jsonAttributeToGetBack) { public Object deleteFixedDepositApplication(final Integer fixedDepositAccountID, final String jsonAttributeToGetBack) {
LOG.info("---------------------------------- DELETE FIXED DEPOSIT APPLICATION ----------------------------------"); LOG.info("---------------------------------- DELETE FIXED DEPOSIT APPLICATION ----------------------------------");
return Utils.performServerDelete(this.requestSpec, this.responseSpec, return Utils.performServerDelete(this.requestSpec, this.responseSpec,
@@ -286,6 +358,10 @@ public class FixedDepositAccountHelper {
} }
// 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 Integer calculateInterestForFixedDeposit(final Integer fixedDepositAccountId) { public Integer calculateInterestForFixedDeposit(final Integer fixedDepositAccountId) {
LOG.info("--------------------------------- CALCULATING INTEREST FOR FIXED DEPOSIT --------------------------------"); LOG.info("--------------------------------- CALCULATING INTEREST FOR FIXED DEPOSIT --------------------------------");
return (Integer) performFixedDepositActions( return (Integer) performFixedDepositActions(
@@ -293,6 +369,10 @@ public class FixedDepositAccountHelper {
getCalculatedInterestForFixedDepositApplicationAsJSON(), CommonConstants.RESPONSE_RESOURCE_ID); getCalculatedInterestForFixedDepositApplicationAsJSON(), CommonConstants.RESPONSE_RESOURCE_ID);
} }
// 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 Integer postInterestForFixedDeposit(final Integer fixedDepositAccountId) { public Integer postInterestForFixedDeposit(final Integer fixedDepositAccountId) {
LOG.info("--------------------------------- POST INTEREST FOR FIXED DEPOSIT --------------------------------"); LOG.info("--------------------------------- POST INTEREST FOR FIXED DEPOSIT --------------------------------");
return (Integer) performFixedDepositActions( return (Integer) performFixedDepositActions(
@@ -300,6 +380,10 @@ public class FixedDepositAccountHelper {
getCalculatedInterestForFixedDepositApplicationAsJSON(), CommonConstants.RESPONSE_RESOURCE_ID); getCalculatedInterestForFixedDepositApplicationAsJSON(), CommonConstants.RESPONSE_RESOURCE_ID);
} }
// 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 HashMap calculatePrematureAmountForFixedDeposit(final Integer fixedDepositAccountId, final String closedOnDate) { public HashMap calculatePrematureAmountForFixedDeposit(final Integer fixedDepositAccountId, final String closedOnDate) {
LOG.info("--------------------- CALCULATING PREMATURE AMOUNT FOR FIXED DEPOSIT ----------------------------"); LOG.info("--------------------- CALCULATING PREMATURE AMOUNT FOR FIXED DEPOSIT ----------------------------");
return (HashMap) performFixedDepositActions( return (HashMap) performFixedDepositActions(
@@ -307,6 +391,10 @@ public class FixedDepositAccountHelper {
getCalculatedPrematureAmountForFixedDepositAccountAsJSON(closedOnDate), ""); getCalculatedPrematureAmountForFixedDepositAccountAsJSON(closedOnDate), "");
} }
// 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 Object prematureCloseForFixedDeposit(final Integer fixedDepositAccountId, final String closedOnDate, final String closureType, public Object prematureCloseForFixedDeposit(final Integer fixedDepositAccountId, final String closedOnDate, final String closureType,
final Integer toSavingsId, final String jsonAttributeToGetBack) { final Integer toSavingsId, final String jsonAttributeToGetBack) {
LOG.info("--------------------- PREMATURE CLOSE FOR FIXED DEPOSIT ----------------------------"); LOG.info("--------------------- PREMATURE CLOSE FOR FIXED DEPOSIT ----------------------------");
@@ -314,6 +402,10 @@ public class FixedDepositAccountHelper {
getPrematureCloseForFixedDepositAccountAsJSON(closedOnDate, closureType, toSavingsId), jsonAttributeToGetBack); getPrematureCloseForFixedDepositAccountAsJSON(closedOnDate, closureType, toSavingsId), jsonAttributeToGetBack);
} }
// 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)
private String getApproveFixedDepositAccountAsJSON(final String approvedOnDate) { private String getApproveFixedDepositAccountAsJSON(final String approvedOnDate) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("locale", CommonConstants.LOCALE); map.put("locale", CommonConstants.LOCALE);
@@ -325,6 +417,10 @@ public class FixedDepositAccountHelper {
return fixedDepositAccountApproveJson; return fixedDepositAccountApproveJson;
} }
// 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)
private String getRejectedFixedDepositAsJSON(final String rejectedOnDate) { private String getRejectedFixedDepositAsJSON(final String rejectedOnDate) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("locale", CommonConstants.LOCALE); map.put("locale", CommonConstants.LOCALE);
@@ -336,6 +432,10 @@ public class FixedDepositAccountHelper {
return fixedDepositAccountJson; return fixedDepositAccountJson;
} }
// 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)
private String getWithdrawnFixedDepositAccountAsJSON(final String withdrawnApplicationOnDate) { private String getWithdrawnFixedDepositAccountAsJSON(final String withdrawnApplicationOnDate) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("locale", CommonConstants.LOCALE); map.put("locale", CommonConstants.LOCALE);
@@ -347,6 +447,10 @@ public class FixedDepositAccountHelper {
return fixedDepositAccountJson; return fixedDepositAccountJson;
} }
// 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)
private String getActivatedFixedDepositAccountAsJSON(final String activationDate) { private String getActivatedFixedDepositAccountAsJSON(final String activationDate) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("locale", CommonConstants.LOCALE); map.put("locale", CommonConstants.LOCALE);
@@ -357,6 +461,10 @@ public class FixedDepositAccountHelper {
return fixedDepositAccountActivateJson; return fixedDepositAccountActivateJson;
} }
// 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)
private String getCalculatedInterestForFixedDepositApplicationAsJSON() { private String getCalculatedInterestForFixedDepositApplicationAsJSON() {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
String fixedDepositAccountCalculatedInterestJson = new Gson().toJson(map); String fixedDepositAccountCalculatedInterestJson = new Gson().toJson(map);
@@ -364,6 +472,10 @@ public class FixedDepositAccountHelper {
return fixedDepositAccountCalculatedInterestJson; return fixedDepositAccountCalculatedInterestJson;
} }
// 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)
private String getCalculatedPrematureAmountForFixedDepositAccountAsJSON(final String closedOnDate) { private String getCalculatedPrematureAmountForFixedDepositAccountAsJSON(final String closedOnDate) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("locale", CommonConstants.LOCALE); map.put("locale", CommonConstants.LOCALE);
@@ -374,6 +486,10 @@ public class FixedDepositAccountHelper {
return fixedDepositAccountPrematureClosureJson; return fixedDepositAccountPrematureClosureJson;
} }
// 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)
private String getPrematureCloseForFixedDepositAccountAsJSON(final String closedOnDate, final String closureType, private String getPrematureCloseForFixedDepositAccountAsJSON(final String closedOnDate, final String closureType,
final Integer toSavingsId) { final Integer toSavingsId) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
@@ -390,15 +506,27 @@ public class FixedDepositAccountHelper {
return fixedDepositAccountPrematureCloseJson; return fixedDepositAccountPrematureCloseJson;
} }
// 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)
private String createFixedDepositOperationURL(final String command, final Integer fixedDepositAccountID) { private String createFixedDepositOperationURL(final String command, final Integer fixedDepositAccountID) {
return FIXED_DEPOSIT_ACCOUNT_URL + "/" + fixedDepositAccountID + "?command=" + command + "&" + Utils.TENANT_IDENTIFIER; return FIXED_DEPOSIT_ACCOUNT_URL + "/" + fixedDepositAccountID + "?command=" + command + "&" + Utils.TENANT_IDENTIFIER;
} }
// 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)
private Object performFixedDepositActions(final String postURLForFixedDeposit, final String jsonToBeSent, private Object performFixedDepositActions(final String postURLForFixedDeposit, final String jsonToBeSent,
final String jsonAttributeToGetBack) { final String jsonAttributeToGetBack) {
return Utils.performServerPost(this.requestSpec, this.responseSpec, postURLForFixedDeposit, jsonToBeSent, jsonAttributeToGetBack); return Utils.performServerPost(this.requestSpec, this.responseSpec, postURLForFixedDeposit, jsonToBeSent, jsonAttributeToGetBack);
} }
// 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)
private HashMap performFixedDepositApplicationActions(final String postURLForFixedDepositAction, final String jsonToBeSent) { private HashMap performFixedDepositApplicationActions(final String postURLForFixedDepositAction, final String jsonToBeSent) {
HashMap status = null; HashMap status = null;
final HashMap response = Utils.performServerPost(this.requestSpec, this.responseSpec, postURLForFixedDepositAction, jsonToBeSent, final HashMap response = Utils.performServerPost(this.requestSpec, this.responseSpec, postURLForFixedDepositAction, jsonToBeSent,
@@ -409,10 +537,18 @@ public class FixedDepositAccountHelper {
return status; return status;
} }
// 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)
private String createFixedDepositCalculateInterestURL(final String command, final Integer fixedDepositAccountID) { private String createFixedDepositCalculateInterestURL(final String command, final Integer fixedDepositAccountID) {
return FIXED_DEPOSIT_ACCOUNT_URL + "/" + fixedDepositAccountID + "?command=" + command + "&" + Utils.TENANT_IDENTIFIER; return FIXED_DEPOSIT_ACCOUNT_URL + "/" + fixedDepositAccountID + "?command=" + command + "&" + Utils.TENANT_IDENTIFIER;
} }
// 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 ArrayList retrieveAllFixedDepositAccounts(final RequestSpecification requestSpec, public static ArrayList retrieveAllFixedDepositAccounts(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
LOG.info("-------------------- RETRIEVING ALL FIXED DEPOSIT ACCOUNTS ---------------------"); LOG.info("-------------------- RETRIEVING ALL FIXED DEPOSIT ACCOUNTS ---------------------");
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositProductHelper.java
+48
View File
@@ -38,6 +38,10 @@ public class FixedDepositProductHelper {
private final RequestSpecification requestSpec; private final RequestSpecification requestSpec;
private final ResponseSpecification responseSpec; private final ResponseSpecification responseSpec;
// 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 FixedDepositProductHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public FixedDepositProductHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
@@ -98,10 +102,18 @@ public class FixedDepositProductHelper {
private Boolean withHoldTax = false; private Boolean withHoldTax = false;
private String taxGroupId = null; private String taxGroupId = null;
// 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 String build(final String validFrom, final String validTo) { public String build(final String validFrom, final String validTo) {
return build(validFrom, validTo, true); return build(validFrom, validTo, true);
} }
// 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 String build(final String validFrom, final String validTo, final boolean withCharts) { public String build(final String validFrom, final String validTo, final boolean withCharts) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
@@ -157,6 +169,10 @@ public class FixedDepositProductHelper {
return FixedDepositProductCreateJson; return FixedDepositProductCreateJson;
} }
// 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 List<HashMap<String, String>> constructChartSlabWithPeriodRange() { public List<HashMap<String, String>> constructChartSlabWithPeriodRange() {
List<HashMap<String, String>> chartSlabs = new ArrayList<HashMap<String, String>>(); List<HashMap<String, String>> chartSlabs = new ArrayList<HashMap<String, String>>();
HashMap<String, String> chartSlabsMap1 = new HashMap<>(); HashMap<String, String> chartSlabsMap1 = new HashMap<>();
@@ -196,6 +212,10 @@ public class FixedDepositProductHelper {
return chartSlabs; return chartSlabs;
} }
// 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 List<HashMap<String, String>> constructChartSlabWithPeriodAndAmountRange() { public List<HashMap<String, String>> constructChartSlabWithPeriodAndAmountRange() {
List<HashMap<String, String>> chartSlabs = new ArrayList<HashMap<String, String>>(); List<HashMap<String, String>> chartSlabs = new ArrayList<HashMap<String, String>>();
HashMap<String, String> chartSlabsMap1 = new HashMap<>(); HashMap<String, String> chartSlabsMap1 = new HashMap<>();
@@ -283,6 +303,10 @@ public class FixedDepositProductHelper {
return chartSlabs; return chartSlabs;
} }
// 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 List<HashMap<String, String>> constructChartSlabWithAmountAndPeriodRange() { public List<HashMap<String, String>> constructChartSlabWithAmountAndPeriodRange() {
this.isPrimaryGroupingByAmount = true; this.isPrimaryGroupingByAmount = true;
List<HashMap<String, String>> chartSlabs = new ArrayList<HashMap<String, String>>(); List<HashMap<String, String>> chartSlabs = new ArrayList<HashMap<String, String>>();
@@ -329,6 +353,10 @@ public class FixedDepositProductHelper {
return chartSlabs; return chartSlabs;
} }
// 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 List<HashMap<String, String>> constructChartSlabWithAmountRange() { public List<HashMap<String, String>> constructChartSlabWithAmountRange() {
this.isPrimaryGroupingByAmount = true; this.isPrimaryGroupingByAmount = true;
List<HashMap<String, String>> chartSlabs = new ArrayList<HashMap<String, String>>(); List<HashMap<String, String>> chartSlabs = new ArrayList<HashMap<String, String>>();
@@ -397,6 +425,10 @@ public class FixedDepositProductHelper {
return this; return this;
} }
// 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)
private Map<String, String> getAccountMappingForCashBased() { private Map<String, String> getAccountMappingForCashBased() {
final Map<String, String> map = new HashMap<>(); final Map<String, String> map = new HashMap<>();
if (accountList != null) { if (accountList != null) {
@@ -424,6 +456,10 @@ public class FixedDepositProductHelper {
return map; return map;
} }
// 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 Integer createFixedDepositProduct(final String fixedDepositProductCreateJson, final RequestSpecification requestSpec, public static Integer createFixedDepositProduct(final String fixedDepositProductCreateJson, final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
LOG.info("--------------------- CREATING FIXED DEPOSIT PRODUCT ------------------------"); LOG.info("--------------------- CREATING FIXED DEPOSIT PRODUCT ------------------------");
@@ -431,6 +467,10 @@ public class FixedDepositProductHelper {
CommonConstants.RESPONSE_RESOURCE_ID); CommonConstants.RESPONSE_RESOURCE_ID);
} }
// 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 ArrayList retrieveAllFixedDepositProducts(final RequestSpecification requestSpec, public static ArrayList retrieveAllFixedDepositProducts(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
LOG.info("-------------------- RETRIEVING ALL FIXED DEPOSIT PRODUCTS ---------------------"); LOG.info("-------------------- RETRIEVING ALL FIXED DEPOSIT PRODUCTS ---------------------");
@@ -439,6 +479,10 @@ public class FixedDepositProductHelper {
return response; return response;
} }
// 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 HashMap retrieveFixedDepositProductById(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static HashMap retrieveFixedDepositProductById(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String productId) { final String productId) {
LOG.info("------------------------ RETRIEVING FIXED DEPOSIT PRODUCT BY ID ------------------------"); LOG.info("------------------------ RETRIEVING FIXED DEPOSIT PRODUCT BY ID ------------------------");
@@ -447,6 +491,10 @@ public class FixedDepositProductHelper {
return response; return response;
} }
// 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 ArrayList getInterestRateChartSlabsByProductId(final RequestSpecification requestSpec, public static ArrayList getInterestRateChartSlabsByProductId(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final Integer productId) { final ResponseSpecification responseSpec, final Integer productId) {
LOG.info("-------------------- RETRIEVE INTEREST CHART BY PRODUCT ID ---------------------"); LOG.info("-------------------- RETRIEVE INTEREST CHART BY PRODUCT ID ---------------------");
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/loans/CobHelper.java
+8
View File
@@ -30,6 +30,10 @@ public final class CobHelper {
private CobHelper() {} private CobHelper() {}
// 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 List<Map<String, Object>> getCobPartitions(final RequestSpecification requestSpec, public static List<Map<String, Object>> getCobPartitions(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, int partitionSize, final String jsonReturn) { final ResponseSpecification responseSpec, int partitionSize, final String jsonReturn) {
final String url = "/fineract-provider/api/v1/internal/cob/partitions/" + partitionSize + "?" + Utils.TENANT_IDENTIFIER; final String url = "/fineract-provider/api/v1/internal/cob/partitions/" + partitionSize + "?" + Utils.TENANT_IDENTIFIER;
@@ -37,6 +41,10 @@ public final class CobHelper {
return Utils.performServerGet(requestSpec, responseSpec, url, jsonReturn); return Utils.performServerGet(requestSpec, responseSpec, url, jsonReturn);
} }
// 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 void fastForwardLoansLastCOBDate(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static void fastForwardLoansLastCOBDate(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer loanId, final String cobDate) { final Integer loanId, final String cobDate) {
final String url = "/fineract-provider/api/v1/internal/cob/fast-forward-cob-date-of-loan/" + loanId + "?" + Utils.TENANT_IDENTIFIER; final String url = "/fineract-provider/api/v1/internal/cob/fast-forward-cob-date-of-loan/" + loanId + "?" + Utils.TENANT_IDENTIFIER;
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/loans/LoanAccountLockHelper.java
+12
View File
@@ -32,15 +32,27 @@ public class LoanAccountLockHelper extends IntegrationTest {
private final RequestSpecification requestSpec; private final RequestSpecification requestSpec;
private final ResponseSpecification responseSpec; private final ResponseSpecification responseSpec;
// 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 LoanAccountLockHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public LoanAccountLockHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
} }
// 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 String placeSoftLockOnLoanAccount(Integer loanId, String lockOwner) { public String placeSoftLockOnLoanAccount(Integer loanId, String lockOwner) {
return placeSoftLockOnLoanAccount(loanId, lockOwner, null); return placeSoftLockOnLoanAccount(loanId, lockOwner, null);
} }
// 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 String placeSoftLockOnLoanAccount(Integer loanId, String lockOwner, String error) { public String placeSoftLockOnLoanAccount(Integer loanId, String lockOwner, String error) {
return Utils.performServerPost(requestSpec, responseSpec, return Utils.performServerPost(requestSpec, responseSpec,
INTERNAL_PLACE_LOCK_ON_LOAN_ACCOUNT_URL + loanId + "/place-lock/" + lockOwner + "?" + Utils.TENANT_IDENTIFIER, error); INTERNAL_PLACE_LOCK_ON_LOAN_ACCOUNT_URL + loanId + "/place-lock/" + lockOwner + "?" + Utils.TENANT_IDENTIFIER, error);
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/loans/LoanTransactionHelper.java
+720
View File
File diff suppressed because it is too large Load Diff
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/organisation/CampaignsHelper.java
+44
View File
@@ -45,11 +45,19 @@ public class CampaignsHelper {
private static final String BUSINESS_RULE_OPTIONS = "businessRulesOptions"; private static final String BUSINESS_RULE_OPTIONS = "businessRulesOptions";
// 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 CampaignsHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public CampaignsHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
} }
// 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 Integer createCampaign(String reportName, Integer triggerType) { public Integer createCampaign(String reportName, Integer triggerType) {
log.info("---------------------------------CREATING A CAMPAIGN---------------------------------------------"); log.info("---------------------------------CREATING A CAMPAIGN---------------------------------------------");
final String CREATE_SMS_CAMPAIGNS_URL = SMS_CAMPAIGNS_URL + "?" + Utils.TENANT_IDENTIFIER; final String CREATE_SMS_CAMPAIGNS_URL = SMS_CAMPAIGNS_URL + "?" + Utils.TENANT_IDENTIFIER;
@@ -57,6 +65,10 @@ public class CampaignsHelper {
"resourceId"); "resourceId");
} }
// 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 void verifyCampaignCreatedOnServer(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public void verifyCampaignCreatedOnServer(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer generatedCampaignId) { final Integer generatedCampaignId) {
log.info("------------------------------CHECK CAMPAIGN DETAILS------------------------------------\n"); log.info("------------------------------CHECK CAMPAIGN DETAILS------------------------------------\n");
@@ -65,6 +77,10 @@ public class CampaignsHelper {
assertEquals(generatedCampaignId, responseCampaignId, "ERROR IN CREATING THE CAMPAIGN"); assertEquals(generatedCampaignId, responseCampaignId, "ERROR IN CREATING THE CAMPAIGN");
} }
// 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 Integer updateCampaign(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public Integer updateCampaign(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer generatedCampaignId, String reportName, Integer triggerType) { final Integer generatedCampaignId, String reportName, Integer triggerType) {
log.info("------------------------------UPDATE CAMPAIGN DETAILS------------------------------------\n"); log.info("------------------------------UPDATE CAMPAIGN DETAILS------------------------------------\n");
@@ -73,6 +89,10 @@ public class CampaignsHelper {
"resourceId"); "resourceId");
} }
// 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 Integer deleteCampaign(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public Integer deleteCampaign(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer generatedCampaignId) { final Integer generatedCampaignId) {
log.info("------------------------------DELETE CAMPAIGN DETAILS------------------------------------\n"); log.info("------------------------------DELETE CAMPAIGN DETAILS------------------------------------\n");
@@ -80,6 +100,10 @@ public class CampaignsHelper {
return Utils.performServerDelete(requestSpec, responseSpec, DELETE_SMS_CAMPAIGNS_URL, "resourceId"); return Utils.performServerDelete(requestSpec, responseSpec, DELETE_SMS_CAMPAIGNS_URL, "resourceId");
} }
// 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 Integer performActionsOnCampaign(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public Integer performActionsOnCampaign(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer generatedCampaignId, String command) { final Integer generatedCampaignId, String command) {
log.info("------------------------------PERFORM ACTION ON CAMPAIGN DETAILS------------------------------------\n"); log.info("------------------------------PERFORM ACTION ON CAMPAIGN DETAILS------------------------------------\n");
@@ -90,6 +114,10 @@ public class CampaignsHelper {
"resourceId"); "resourceId");
} }
// 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 Object performActionsOnCampaignWithFailure(final Integer generatedCampaignId, String command, String actionDate, public Object performActionsOnCampaignWithFailure(final Integer generatedCampaignId, String command, String actionDate,
String responseJsonAttribute) { String responseJsonAttribute) {
log.info("--------------------------PERFORM ACTION ON CAMPAIGN DETAILS WITH FAILURE-------------------------------\n"); log.info("--------------------------PERFORM ACTION ON CAMPAIGN DETAILS WITH FAILURE-------------------------------\n");
@@ -99,6 +127,10 @@ public class CampaignsHelper {
getJSONForCampaignAction(command, actionDate), responseJsonAttribute); getJSONForCampaignAction(command, actionDate), responseJsonAttribute);
} }
// 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 String getCreateCampaignJSON(String reportName, Integer triggerType) { public String getCreateCampaignJSON(String reportName, Integer triggerType) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
final HashMap<String, Object> paramValueMap = new HashMap<>(); final HashMap<String, Object> paramValueMap = new HashMap<>();
@@ -127,6 +159,10 @@ public class CampaignsHelper {
return json; return json;
} }
// 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 String getUpdateCampaignJSON(String reportName, Integer triggerType) { public String getUpdateCampaignJSON(String reportName, Integer triggerType) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
final HashMap<String, Object> paramValueMap = new HashMap<>(); final HashMap<String, Object> paramValueMap = new HashMap<>();
@@ -153,6 +189,10 @@ public class CampaignsHelper {
return json; return json;
} }
// 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 String getJSONForCampaignAction(String command, String actionDate) { public String getJSONForCampaignAction(String command, String actionDate) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
String dateString = "close".equalsIgnoreCase(command) ? "closureDate" : "activationDate"; String dateString = "close".equalsIgnoreCase(command) ? "closureDate" : "activationDate";
@@ -168,6 +208,10 @@ public class CampaignsHelper {
return getReports(BUSINESS_RULE_OPTIONS); return getReports(BUSINESS_RULE_OPTIONS);
} }
// 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)
private List<ReportData> getReports(String jsonAttributeToGetBack) { private List<ReportData> getReports(String jsonAttributeToGetBack) {
log.info("--------------------------------- GET REPORTS OPTIONS -------------------------------"); log.info("--------------------------------- GET REPORTS OPTIONS -------------------------------");
Assert.notNull(jsonAttributeToGetBack, "jsonAttributeToGetBack may not be null"); Assert.notNull(jsonAttributeToGetBack, "jsonAttributeToGetBack may not be null");
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/organisation/CurrencyHelper.java
+16
View File
@@ -48,6 +48,10 @@ public class CurrencyHelper {
private final RequestSpecification requestSpec; private final RequestSpecification requestSpec;
private final ResponseSpecification responseSpec; private final ResponseSpecification responseSpec;
// 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 CurrencyHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public CurrencyHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
@@ -61,6 +65,10 @@ public class CurrencyHelper {
return getCurrencies(CURRENCY_URL_SELECTED, PERMITTED_CURRENCY_ARRAY_SELECTED); return getCurrencies(CURRENCY_URL_SELECTED, PERMITTED_CURRENCY_ARRAY_SELECTED);
} }
// 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)
private ArrayList<Currency> getCurrencies(final String getUrl, final List<String> permittedCurrencyArrays) { private ArrayList<Currency> getCurrencies(final String getUrl, final List<String> permittedCurrencyArrays) {
LOG.info("--------------------------------- GET CURRENCY OPTIONS -------------------------------"); LOG.info("--------------------------------- GET CURRENCY OPTIONS -------------------------------");
final String json = given().spec(requestSpec).expect().spec(responseSpec).log().ifError().when().get(getUrl).andReturn().asString(); final String json = given().spec(requestSpec).expect().spec(responseSpec).log().ifError().when().get(getUrl).andReturn().asString();
@@ -78,6 +86,10 @@ public class CurrencyHelper {
return currencyList; return currencyList;
} }
// 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 List<String> updateCurrencies(final List<String> currencies) { public List<String> updateCurrencies(final List<String> currencies) {
LOG.info("--------------------------------- UPDATE CURRENCY OPTIONS -------------------------------"); LOG.info("--------------------------------- UPDATE CURRENCY OPTIONS -------------------------------");
final String json = given().spec(requestSpec).body(getUpdateJSON(currencies)).expect().spec(responseSpec).log().ifError().when() final String json = given().spec(requestSpec).body(getUpdateJSON(currencies)).expect().spec(responseSpec).log().ifError().when()
@@ -89,6 +101,10 @@ public class CurrencyHelper {
return responseMap.get("changes").get("currencies"); return responseMap.get("changes").get("currencies");
} }
// 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)
private String getUpdateJSON(final List<String> currencies) { private String getUpdateJSON(final List<String> currencies) {
final HashMap<String, List<String>> map = new HashMap<>(); final HashMap<String, List<String>> map = new HashMap<>();
map.put("currencies", currencies); map.put("currencies", currencies);
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/organisation/EntityDatatableChecksHelper.java
+24
View File
@@ -38,17 +38,29 @@ public class EntityDatatableChecksHelper {
private static final Gson GSON = new JSON().getGson(); private static final Gson GSON = new JSON().getGson();
// 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 EntityDatatableChecksHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public EntityDatatableChecksHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
} }
// 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 Integer createEntityDatatableCheck(final String apptableName, final String datatableName, final int status, public Integer createEntityDatatableCheck(final String apptableName, final String datatableName, final int status,
final Integer productId) { final Integer productId) {
return Utils.performServerPost(this.requestSpec, this.responseSpec, DATATABLE_CHECK_URL + "?" + Utils.TENANT_IDENTIFIER, return Utils.performServerPost(this.requestSpec, this.responseSpec, DATATABLE_CHECK_URL + "?" + Utils.TENANT_IDENTIFIER,
getTestEdcAsJSON(apptableName, datatableName, status, productId), "resourceId"); getTestEdcAsJSON(apptableName, datatableName, status, productId), "resourceId");
} }
// 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 PostEntityDatatableChecksTemplateResponse addEntityDatatableCheck(final String apptableName, final String datatableName, public PostEntityDatatableChecksTemplateResponse addEntityDatatableCheck(final String apptableName, final String datatableName,
final int status, final Integer productId) { final int status, final Integer productId) {
final String response = Utils.performServerPost(this.requestSpec, this.responseSpec, final String response = Utils.performServerPost(this.requestSpec, this.responseSpec,
@@ -57,15 +69,27 @@ public class EntityDatatableChecksHelper {
return GSON.fromJson(response, PostEntityDatatableChecksTemplateResponse.class); return GSON.fromJson(response, PostEntityDatatableChecksTemplateResponse.class);
} }
// 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 Integer deleteEntityDatatableCheck(final Integer entityDatatableCheckId) { public Integer deleteEntityDatatableCheck(final Integer entityDatatableCheckId) {
return Utils.performServerDelete(requestSpec, responseSpec, return Utils.performServerDelete(requestSpec, responseSpec,
DATATABLE_CHECK_URL + "/" + entityDatatableCheckId + "?" + Utils.TENANT_IDENTIFIER, "resourceId"); DATATABLE_CHECK_URL + "/" + entityDatatableCheckId + "?" + Utils.TENANT_IDENTIFIER, "resourceId");
} }
// 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 String retrieveEntityDatatableCheck() { public String retrieveEntityDatatableCheck() {
return Utils.performServerGet(requestSpec, responseSpec, DATATABLE_CHECK_URL + "?" + Utils.TENANT_IDENTIFIER, null); return Utils.performServerGet(requestSpec, responseSpec, DATATABLE_CHECK_URL + "?" + Utils.TENANT_IDENTIFIER, null);
} }
// 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 String getTestEdcAsJSON(final String apptableName, final String datatableName, final int status, public static String getTestEdcAsJSON(final String apptableName, final String datatableName, final int status,
final Integer productId) { final Integer productId) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/organisation/StaffHelper.java
+52
View File
@@ -42,12 +42,20 @@ public final class StaffHelper {
public static final String GROUP_ID = "groupId"; public static final String GROUP_ID = "groupId";
// 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 Integer transferStaffToGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer transferStaffToGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer groupId, final Integer staffToTransfer, final String note) { final Integer groupId, final Integer staffToTransfer, final String note) {
final String url = TRANSFER_STAFF_URL + "/" + groupId + "?command=transferStaff&" + Utils.TENANT_IDENTIFIER; final String url = TRANSFER_STAFF_URL + "/" + groupId + "?command=transferStaff&" + Utils.TENANT_IDENTIFIER;
return Utils.performServerPost(requestSpec, responseSpec, url, transferStaffToGroupAsJSON(staffToTransfer, note), GROUP_ID); return Utils.performServerPost(requestSpec, responseSpec, url, transferStaffToGroupAsJSON(staffToTransfer, note), GROUP_ID);
} }
// 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 String transferStaffToGroupAsJSON(final Integer staffToTransferId, final String note) { public static String transferStaffToGroupAsJSON(final Integer staffToTransferId, final String note) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("staffId", staffToTransferId); map.put("staffId", staffToTransferId);
@@ -56,43 +64,75 @@ public final class StaffHelper {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 Integer createStaff(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static Integer createStaff(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
return (Integer) createStaffWithJson(requestSpec, responseSpec, createStaffAsJSON()).get("resourceId"); return (Integer) createStaffWithJson(requestSpec, responseSpec, createStaffAsJSON()).get("resourceId");
} }
// 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 Map<String, Object> createStaffMap(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static Map<String, Object> createStaffMap(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
return createStaffWithJson(requestSpec, responseSpec, createStaffAsJSON()); return createStaffWithJson(requestSpec, responseSpec, createStaffAsJSON());
} }
// 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 Map<String, Object> createStaffWithJson(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Map<String, Object> createStaffWithJson(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String json) { final String json) {
final String url = CREATE_STAFF_URL + "?" + Utils.TENANT_IDENTIFIER; final String url = CREATE_STAFF_URL + "?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerPost(requestSpec, responseSpec, url, json, ""); return Utils.performServerPost(requestSpec, responseSpec, url, json, "");
} }
// 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 Map<String, Object> getStaff(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Map<String, Object> getStaff(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer staffId) { final Integer staffId) {
final String url = CREATE_STAFF_URL + "/" + staffId + "?" + Utils.TENANT_IDENTIFIER; final String url = CREATE_STAFF_URL + "/" + staffId + "?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerGet(requestSpec, responseSpec, url, ""); return Utils.performServerGet(requestSpec, responseSpec, url, "");
} }
// 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 List<Map<String, Object>> getStaffList(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static List<Map<String, Object>> getStaffList(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
final String url = CREATE_STAFF_URL + "?" + Utils.TENANT_IDENTIFIER; final String url = CREATE_STAFF_URL + "?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerGet(requestSpec, responseSpec, url, ""); return Utils.performServerGet(requestSpec, responseSpec, url, "");
} }
// 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 List<Map<String, Object>> getStaffListWithState(final RequestSpecification requestSpec, public static List<Map<String, Object>> getStaffListWithState(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final String status) { final ResponseSpecification responseSpec, final String status) {
final String url = CREATE_STAFF_URL + "?" + Utils.TENANT_IDENTIFIER + "&status=" + status; final String url = CREATE_STAFF_URL + "?" + Utils.TENANT_IDENTIFIER + "&status=" + status;
return Utils.performServerGet(requestSpec, responseSpec, url, ""); return Utils.performServerGet(requestSpec, responseSpec, url, "");
} }
// 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 List<Map<String, Object>> getStaffListWithLoanOfficerStatus(final RequestSpecification requestSpec, public static List<Map<String, Object>> getStaffListWithLoanOfficerStatus(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final String loanOfficerStatus) { final ResponseSpecification responseSpec, final String loanOfficerStatus) {
final String url = CREATE_STAFF_URL + "?" + Utils.TENANT_IDENTIFIER + "&loanOfficersOnly=" + loanOfficerStatus; final String url = CREATE_STAFF_URL + "?" + Utils.TENANT_IDENTIFIER + "&loanOfficersOnly=" + loanOfficerStatus;
return Utils.performServerGet(requestSpec, responseSpec, url, ""); return Utils.performServerGet(requestSpec, responseSpec, url, "");
} }
// 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 Map<String, Object> updateStaff(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Map<String, Object> updateStaff(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer staffId, final Map<String, Object> changes) { final Integer staffId, final Map<String, Object> changes) {
final String url = CREATE_STAFF_URL + "/" + staffId + "?" + Utils.TENANT_IDENTIFIER; final String url = CREATE_STAFF_URL + "/" + staffId + "?" + Utils.TENANT_IDENTIFIER;
@@ -100,6 +140,10 @@ public final class StaffHelper {
return Utils.performServerPut(requestSpec, responseSpec, url, json, ""); return Utils.performServerPut(requestSpec, responseSpec, url, json, "");
} }
// 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 String createStaffAsJSON() { public static String createStaffAsJSON() {
final Map<String, Object> map = getMapWithJoiningDate(); final Map<String, Object> map = getMapWithJoiningDate();
@@ -113,6 +157,10 @@ public final class StaffHelper {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 Map<String, Object> getMapWithJoiningDate() { public static Map<String, Object> getMapWithJoiningDate() {
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
@@ -123,6 +171,10 @@ public final class StaffHelper {
return map; return map;
} }
// 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 String createStaffWithJSONFields(String... fields) { public static String createStaffWithJSONFields(String... fields) {
final Map<String, Object> map = getMapWithJoiningDate(); final Map<String, Object> map = getMapWithJoiningDate();
final List<String> fieldList = Arrays.asList(fields); final List<String> fieldList = Arrays.asList(fields);
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/products/DelinquencyBucketsHelper.java
+36
View File
@@ -51,6 +51,10 @@ public class DelinquencyBucketsHelper {
protected DelinquencyBucketsHelper() {} protected DelinquencyBucketsHelper() {}
// 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 ArrayList<GetDelinquencyBucketsResponse> getDelinquencyBuckets(final RequestSpecification requestSpec, public static ArrayList<GetDelinquencyBucketsResponse> getDelinquencyBuckets(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
String response = Utils.performServerGet(requestSpec, responseSpec, DELINQUENCY_BUCKETS_URL + "?" + Utils.TENANT_IDENTIFIER); String response = Utils.performServerGet(requestSpec, responseSpec, DELINQUENCY_BUCKETS_URL + "?" + Utils.TENANT_IDENTIFIER);
@@ -59,6 +63,10 @@ public class DelinquencyBucketsHelper {
return GSON.fromJson(response, delinquencyBucketListType); return GSON.fromJson(response, delinquencyBucketListType);
} }
// 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 GetDelinquencyBucketsResponse getDelinquencyBucket(final RequestSpecification requestSpec, public static GetDelinquencyBucketsResponse getDelinquencyBucket(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final Integer resourceId) { final ResponseSpecification responseSpec, final Integer resourceId) {
String response = Utils.performServerGet(requestSpec, responseSpec, String response = Utils.performServerGet(requestSpec, responseSpec,
@@ -66,6 +74,10 @@ public class DelinquencyBucketsHelper {
return GSON.fromJson(response, GetDelinquencyBucketsResponse.class); return GSON.fromJson(response, GetDelinquencyBucketsResponse.class);
} }
// 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 PostDelinquencyBucketResponse createDelinquencyBucket(final RequestSpecification requestSpec, public static PostDelinquencyBucketResponse createDelinquencyBucket(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final String json) { final ResponseSpecification responseSpec, final String json) {
log.info("JSON: {}", json); log.info("JSON: {}", json);
@@ -74,6 +86,10 @@ public class DelinquencyBucketsHelper {
return GSON.fromJson(response, PostDelinquencyBucketResponse.class); return GSON.fromJson(response, PostDelinquencyBucketResponse.class);
} }
// 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 PutDelinquencyBucketResponse updateDelinquencyBucket(final RequestSpecification requestSpec, public static PutDelinquencyBucketResponse updateDelinquencyBucket(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final Integer resourceId, final String json) { final ResponseSpecification responseSpec, final Integer resourceId, final String json) {
log.info("JSON: {}", json); log.info("JSON: {}", json);
@@ -82,6 +98,10 @@ public class DelinquencyBucketsHelper {
return GSON.fromJson(response, PutDelinquencyBucketResponse.class); return GSON.fromJson(response, PutDelinquencyBucketResponse.class);
} }
// 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 DeleteDelinquencyBucketResponse deleteDelinquencyBucket(final RequestSpecification requestSpec, public static DeleteDelinquencyBucketResponse deleteDelinquencyBucket(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final Integer resourceId) { final ResponseSpecification responseSpec, final Integer resourceId) {
final String response = Utils.performServerDelete(requestSpec, responseSpec, final String response = Utils.performServerDelete(requestSpec, responseSpec,
@@ -89,6 +109,10 @@ public class DelinquencyBucketsHelper {
return GSON.fromJson(response, DeleteDelinquencyBucketResponse.class); return GSON.fromJson(response, DeleteDelinquencyBucketResponse.class);
} }
// 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 String getAsJSON(final List<Integer> rangeIds) { public static String getAsJSON(final List<Integer> rangeIds) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("name", Utils.uniqueRandomStringGenerator("Delinquency_Bucket_", 4)); map.put("name", Utils.uniqueRandomStringGenerator("Delinquency_Bucket_", 4));
@@ -96,6 +120,10 @@ public class DelinquencyBucketsHelper {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 Integer createDelinquencyBucket(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createDelinquencyBucket(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
List<Pair<Integer, Integer>> ranges) { List<Pair<Integer, Integer>> ranges) {
List<Integer> rangeIds = ranges.stream().map(r -> createDelinquencyRange(requestSpec, responseSpec, r)).toList(); List<Integer> rangeIds = ranges.stream().map(r -> createDelinquencyRange(requestSpec, responseSpec, r)).toList();
@@ -106,6 +134,10 @@ public class DelinquencyBucketsHelper {
return delinquencyBucketResponse.getResourceId(); return delinquencyBucketResponse.getResourceId();
} }
// 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 Integer createDelinquencyRange(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createDelinquencyRange(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
Pair<Integer, Integer> range) { Pair<Integer, Integer> range) {
String jsonRange = DelinquencyRangesHelper.getAsJSON(range.getLeft(), range.getRight()); String jsonRange = DelinquencyRangesHelper.getAsJSON(range.getLeft(), range.getRight());
@@ -114,6 +146,10 @@ public class DelinquencyBucketsHelper {
return delinquencyRangeResponse.getResourceId(); return delinquencyRangeResponse.getResourceId();
} }
// 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 Integer createDelinquencyBucket(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static Integer createDelinquencyBucket(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
ArrayList<Integer> rangeIds = new ArrayList<>(); ArrayList<Integer> rangeIds = new ArrayList<>();
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/products/DelinquencyRangesHelper.java
+24
View File
@@ -43,6 +43,10 @@ public class DelinquencyRangesHelper {
protected DelinquencyRangesHelper() {} protected DelinquencyRangesHelper() {}
// 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 ArrayList<GetDelinquencyRangesResponse> getDelinquencyRanges(final RequestSpecification requestSpec, public static ArrayList<GetDelinquencyRangesResponse> getDelinquencyRanges(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
String response = Utils.performServerGet(requestSpec, responseSpec, DELINQUENCY_RANGES_URL + "?" + Utils.TENANT_IDENTIFIER); String response = Utils.performServerGet(requestSpec, responseSpec, DELINQUENCY_RANGES_URL + "?" + Utils.TENANT_IDENTIFIER);
@@ -51,6 +55,10 @@ public class DelinquencyRangesHelper {
return GSON.fromJson(response, delinquencyRangeListType); return GSON.fromJson(response, delinquencyRangeListType);
} }
// 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 GetDelinquencyRangesResponse getDelinquencyRange(final RequestSpecification requestSpec, public static GetDelinquencyRangesResponse getDelinquencyRange(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final Integer resourceId) { final ResponseSpecification responseSpec, final Integer resourceId) {
String response = Utils.performServerGet(requestSpec, responseSpec, String response = Utils.performServerGet(requestSpec, responseSpec,
@@ -59,6 +67,10 @@ public class DelinquencyRangesHelper {
return GSON.fromJson(response, GetDelinquencyRangesResponse.class); return GSON.fromJson(response, GetDelinquencyRangesResponse.class);
} }
// 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 PostDelinquencyRangeResponse createDelinquencyRange(final RequestSpecification requestSpec, public static PostDelinquencyRangeResponse createDelinquencyRange(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final String json) { final ResponseSpecification responseSpec, final String json) {
final String response = Utils.performServerPost(requestSpec, responseSpec, DELINQUENCY_RANGES_URL + "?" + Utils.TENANT_IDENTIFIER, final String response = Utils.performServerPost(requestSpec, responseSpec, DELINQUENCY_RANGES_URL + "?" + Utils.TENANT_IDENTIFIER,
@@ -67,6 +79,10 @@ public class DelinquencyRangesHelper {
return GSON.fromJson(response, PostDelinquencyRangeResponse.class); return GSON.fromJson(response, PostDelinquencyRangeResponse.class);
} }
// 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 PutDelinquencyRangeResponse updateDelinquencyRange(final RequestSpecification requestSpec, public static PutDelinquencyRangeResponse updateDelinquencyRange(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final Integer resourceId, final String json) { final ResponseSpecification responseSpec, final Integer resourceId, final String json) {
final String response = Utils.performServerPut(requestSpec, responseSpec, final String response = Utils.performServerPut(requestSpec, responseSpec,
@@ -75,6 +91,10 @@ public class DelinquencyRangesHelper {
return GSON.fromJson(response, PutDelinquencyRangeResponse.class); return GSON.fromJson(response, PutDelinquencyRangeResponse.class);
} }
// 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 DeleteDelinquencyRangeResponse deleteDelinquencyRange(final RequestSpecification requestSpec, public static DeleteDelinquencyRangeResponse deleteDelinquencyRange(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final Integer resourceId) { final ResponseSpecification responseSpec, final Integer resourceId) {
final String response = Utils.performServerDelete(requestSpec, responseSpec, final String response = Utils.performServerDelete(requestSpec, responseSpec,
@@ -83,6 +103,10 @@ public class DelinquencyRangesHelper {
return GSON.fromJson(response, DeleteDelinquencyRangeResponse.class); return GSON.fromJson(response, DeleteDelinquencyRangeResponse.class);
} }
// 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 String getAsJSON(Integer minimumAgeDays, Integer maximumAgeDays) { public static String getAsJSON(Integer minimumAgeDays, Integer maximumAgeDays) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("classification", Utils.uniqueRandomStringGenerator("Delinquency__" + minimumAgeDays + "_" + maximumAgeDays + "__", 4)); map.put("classification", Utils.uniqueRandomStringGenerator("Delinquency__" + minimumAgeDays + "_" + maximumAgeDays + "__", 4));
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/provisioning/ProvisioningHelper.java
+20
View File
@@ -39,6 +39,10 @@ public final class ProvisioningHelper {
} }
// 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)
@SuppressFBWarnings(value = { @SuppressFBWarnings(value = {
"DMI_RANDOM_USED_ONLY_ONCE" }, justification = "False positive for random object created and used only once") "DMI_RANDOM_USED_ONLY_ONCE" }, justification = "False positive for random object created and used only once")
public static Map createProvisioingCriteriaJson(ArrayList<Integer> loanProducts, ArrayList categories, Account liability, public static Map createProvisioingCriteriaJson(ArrayList<Integer> loanProducts, ArrayList categories, Account liability,
@@ -55,6 +59,10 @@ public final class ProvisioningHelper {
return map; return map;
} }
// 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 String createProvisioningEntryJson() { public static String createProvisioningEntryJson() {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("createjournalentries", Boolean.FALSE); map.put("createjournalentries", Boolean.FALSE);
@@ -66,6 +74,10 @@ public final class ProvisioningHelper {
return provisioningEntryCreateJson; return provisioningEntryCreateJson;
} }
// 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 String createProvisioningEntryJsonWithJournalsEnabled() { public static String createProvisioningEntryJsonWithJournalsEnabled() {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("createjournalentries", Boolean.TRUE); map.put("createjournalentries", Boolean.TRUE);
@@ -77,6 +89,10 @@ public final class ProvisioningHelper {
return provisioningEntryCreateJson; return provisioningEntryCreateJson;
} }
// 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)
private static ArrayList<HashMap<String, Integer>> addLoanProducts(ArrayList<Integer> loanProducts) { private static ArrayList<HashMap<String, Integer>> addLoanProducts(ArrayList<Integer> loanProducts) {
ArrayList<HashMap<String, Integer>> list = new ArrayList<>(); ArrayList<HashMap<String, Integer>> list = new ArrayList<>();
for (int i = 0; i < loanProducts.size(); i++) { for (int i = 0; i < loanProducts.size(); i++) {
@@ -87,6 +103,10 @@ public final class ProvisioningHelper {
return list; return list;
} }
// 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 ArrayList<HashMap<String, Object>> addProvisioningCategories(ArrayList categories, Account liability, Account expense) { public static ArrayList<HashMap<String, Object>> addProvisioningCategories(ArrayList categories, Account liability, Account expense) {
ArrayList<HashMap<String, Object>> list = new ArrayList<>(); ArrayList<HashMap<String, Object>> list = new ArrayList<>();
int minStart = 0; int minStart = 0;
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/provisioning/ProvisioningTransactionHelper.java
+44
View File
@@ -35,55 +35,99 @@ public class ProvisioningTransactionHelper {
private final RequestSpecification requestSpec; private final RequestSpecification requestSpec;
private final ResponseSpecification responseSpec; private final ResponseSpecification responseSpec;
// 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 ProvisioningTransactionHelper(RequestSpecification requestSpec, ResponseSpecification responeSpec) { public ProvisioningTransactionHelper(RequestSpecification requestSpec, ResponseSpecification responeSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responeSpec; this.responseSpec = responeSpec;
} }
// 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 ArrayList retrieveAllProvisioningCategories() { public ArrayList retrieveAllProvisioningCategories() {
return Utils.performServerGet(requestSpec, responseSpec, PROVISIONING_CATEGORY_URL, ""); return Utils.performServerGet(requestSpec, responseSpec, PROVISIONING_CATEGORY_URL, "");
} }
// 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 Integer createProvisioningCriteria(final String provsioningCriteriaJson) { public Integer createProvisioningCriteria(final String provsioningCriteriaJson) {
return Utils.performServerPost(this.requestSpec, this.responseSpec, CREATE_PROVISIONING_CRITERIA_URL, provsioningCriteriaJson, return Utils.performServerPost(this.requestSpec, this.responseSpec, CREATE_PROVISIONING_CRITERIA_URL, provsioningCriteriaJson,
"resourceId"); "resourceId");
} }
// 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 Map retrieveProvisioningCriteria(final Integer criteriaId) { public Map retrieveProvisioningCriteria(final Integer criteriaId) {
String url = "/fineract-provider/api/v1/provisioningcriteria/" + criteriaId + "?" + Utils.TENANT_IDENTIFIER; String url = "/fineract-provider/api/v1/provisioningcriteria/" + criteriaId + "?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerGet(requestSpec, responseSpec, url, ""); return Utils.performServerGet(requestSpec, responseSpec, url, "");
} }
// 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 Integer updateProvisioningCriteria(final Integer criteriaId, final String provsioningCriteriaJson) { public Integer updateProvisioningCriteria(final Integer criteriaId, final String provsioningCriteriaJson) {
String url = "/fineract-provider/api/v1/provisioningcriteria/" + criteriaId + "?" + Utils.TENANT_IDENTIFIER; String url = "/fineract-provider/api/v1/provisioningcriteria/" + criteriaId + "?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerPut(this.requestSpec, this.responseSpec, url, provsioningCriteriaJson, "resourceId"); return Utils.performServerPut(this.requestSpec, this.responseSpec, url, provsioningCriteriaJson, "resourceId");
} }
// 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 Integer deleteProvisioningCriteria(final Integer criteriaId) { public Integer deleteProvisioningCriteria(final Integer criteriaId) {
String url = "/fineract-provider/api/v1/provisioningcriteria/" + criteriaId + "?" + Utils.TENANT_IDENTIFIER; String url = "/fineract-provider/api/v1/provisioningcriteria/" + criteriaId + "?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerDelete(this.requestSpec, this.responseSpec, url, "resourceId"); return Utils.performServerDelete(this.requestSpec, this.responseSpec, url, "resourceId");
} }
// 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 Integer createProvisioningEntries(final String provsioningCriteriaJson) { public Integer createProvisioningEntries(final String provsioningCriteriaJson) {
return Utils.performServerPost(this.requestSpec, this.responseSpec, CREATE_PROVISIONING_ENTRY_URL, provsioningCriteriaJson, return Utils.performServerPost(this.requestSpec, this.responseSpec, CREATE_PROVISIONING_ENTRY_URL, provsioningCriteriaJson,
"resourceId"); "resourceId");
} }
// 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 Integer updateProvisioningEntry(final String command, final Integer entryId, String jsonBody) { public Integer updateProvisioningEntry(final String command, final Integer entryId, String jsonBody) {
String url = "/fineract-provider/api/v1/provisioningentries/" + entryId + "?command=" + command + "&" + Utils.TENANT_IDENTIFIER; String url = "/fineract-provider/api/v1/provisioningentries/" + entryId + "?command=" + command + "&" + Utils.TENANT_IDENTIFIER;
return Utils.performServerPost(requestSpec, responseSpec, url, jsonBody, "resourceId"); return Utils.performServerPost(requestSpec, responseSpec, url, jsonBody, "resourceId");
} }
// 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 Map retrieveProvisioningEntry(final Integer provisioningEntry) { public Map retrieveProvisioningEntry(final Integer provisioningEntry) {
String url = "/fineract-provider/api/v1/provisioningentries/" + provisioningEntry + "?" + Utils.TENANT_IDENTIFIER; String url = "/fineract-provider/api/v1/provisioningentries/" + provisioningEntry + "?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerGet(requestSpec, responseSpec, url, ""); return Utils.performServerGet(requestSpec, responseSpec, url, "");
} }
// 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 Map retrieveProvisioningEntries(final Integer provisioningEntry) { public Map retrieveProvisioningEntries(final Integer provisioningEntry) {
String url = "/fineract-provider/api/v1/provisioningentries/entries?entryId=" + provisioningEntry + "&" + Utils.TENANT_IDENTIFIER; String url = "/fineract-provider/api/v1/provisioningentries/entries?entryId=" + provisioningEntry + "&" + Utils.TENANT_IDENTIFIER;
return Utils.performServerGet(requestSpec, responseSpec, url, ""); return Utils.performServerGet(requestSpec, responseSpec, url, "");
} }
// 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 Map retrieveAllProvisioningEntries() { public Map retrieveAllProvisioningEntries() {
String url = "/fineract-provider/api/v1/provisioningentries?dateFormat=dd MMMM yyyy" + "&" + "locale=en" + "&" String url = "/fineract-provider/api/v1/provisioningentries?dateFormat=dd MMMM yyyy" + "&" + "locale=en" + "&"
+ Utils.TENANT_IDENTIFIER; + Utils.TENANT_IDENTIFIER;
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/rates/RatesHelper.java
+32
View File
@@ -39,30 +39,54 @@ public final class RatesHelper {
private static final Integer PRODUCT_APPLY_LOAN = 1; private static final Integer PRODUCT_APPLY_LOAN = 1;
private static final Boolean ACTIVE = true; private static final Boolean ACTIVE = true;
// 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 ArrayList<HashMap> getRates(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static ArrayList<HashMap> getRates(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
return (ArrayList) Utils.performServerGet(requestSpec, responseSpec, RATES_URL + "?" + Utils.TENANT_IDENTIFIER, ""); return (ArrayList) Utils.performServerGet(requestSpec, responseSpec, RATES_URL + "?" + Utils.TENANT_IDENTIFIER, "");
} }
// 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 Integer createRates(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createRates(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String request) { final String request) {
return Utils.performServerPost(requestSpec, responseSpec, CREATE_RATES_URL, request, "resourceId"); return Utils.performServerPost(requestSpec, responseSpec, CREATE_RATES_URL, request, "resourceId");
} }
// 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 HashMap getRateById(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static HashMap getRateById(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer rateId) { final Integer rateId) {
return Utils.performServerGet(requestSpec, responseSpec, RATES_URL + "/" + rateId + "?" + Utils.TENANT_IDENTIFIER, ""); return Utils.performServerGet(requestSpec, responseSpec, RATES_URL + "/" + rateId + "?" + Utils.TENANT_IDENTIFIER, "");
} }
// 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 HashMap updateRates(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static HashMap updateRates(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer rateId, final String request) { final Integer rateId, final String request) {
return Utils.performServerPut(requestSpec, responseSpec, RATES_URL + "/" + rateId + "?" + Utils.TENANT_IDENTIFIER, request, return Utils.performServerPut(requestSpec, responseSpec, RATES_URL + "/" + rateId + "?" + Utils.TENANT_IDENTIFIER, request,
CommonConstants.RESPONSE_CHANGES); CommonConstants.RESPONSE_CHANGES);
} }
// 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 String getLoanRateJSON() { public static String getLoanRateJSON() {
return getLoanRateJSON(RatesHelper.PRODUCT_APPLY_LOAN, RatesHelper.PERCENTAGE); return getLoanRateJSON(RatesHelper.PRODUCT_APPLY_LOAN, RatesHelper.PERCENTAGE);
} }
// 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 String getLoanRateJSON(final Integer productApply, final String percentage) { public static String getLoanRateJSON(final Integer productApply, final String percentage) {
final HashMap<String, Object> map = populateDefaultsForLoan(); final HashMap<String, Object> map = populateDefaultsForLoan();
map.put("percentage", percentage); map.put("percentage", percentage);
@@ -71,6 +95,10 @@ public final class RatesHelper {
return crateRateJSON; return crateRateJSON;
} }
// 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 HashMap<String, Object> populateDefaultsForLoan() { public static HashMap<String, Object> populateDefaultsForLoan() {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("active", RatesHelper.ACTIVE); map.put("active", RatesHelper.ACTIVE);
@@ -81,6 +109,10 @@ public final class RatesHelper {
return map; return map;
} }
// 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 String getModifyRateJSON() { public static String getModifyRateJSON() {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("percentage", "15.0"); map.put("percentage", "15.0");
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositAccountHelper.java
+140
View File
@@ -39,6 +39,10 @@ public class RecurringDepositAccountHelper {
private final RequestSpecification requestSpec; private final RequestSpecification requestSpec;
private final ResponseSpecification responseSpec; private final ResponseSpecification responseSpec;
// 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 RecurringDepositAccountHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public RecurringDepositAccountHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
@@ -108,6 +112,10 @@ public class RecurringDepositAccountHelper {
private String expectedFirstDepositOnDate = ""; private String expectedFirstDepositOnDate = "";
private boolean isCalendarInherited = false; private boolean isCalendarInherited = false;
// 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 String build(final String clientId, final String productId, final String penalInterestType) { public String build(final String clientId, final String productId, final String penalInterestType) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
@@ -147,6 +155,10 @@ public class RecurringDepositAccountHelper {
return recurringDepositAccountJson; return recurringDepositAccountJson;
} }
// 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 Integer applyRecurringDepositApplication(final String recurringDepositAccountAsJson, public static Integer applyRecurringDepositApplication(final String recurringDepositAccountAsJson,
final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
LOG.info("--------------------- APPLYING FOR RECURRING DEPOSIT ACCOUNT ------------------------"); LOG.info("--------------------- APPLYING FOR RECURRING DEPOSIT ACCOUNT ------------------------");
@@ -154,6 +166,10 @@ public class RecurringDepositAccountHelper {
CommonConstants.RESPONSE_RESOURCE_ID); CommonConstants.RESPONSE_RESOURCE_ID);
} }
// 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 HashMap getRecurringDepositAccountById(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static HashMap getRecurringDepositAccountById(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer accountID) { final Integer accountID) {
final String GET_RECURRING_DEPOSIT_BY_ID_URL = RECURRING_DEPOSIT_ACCOUNT_URL + "/" + accountID + "?" + Utils.TENANT_IDENTIFIER; final String GET_RECURRING_DEPOSIT_BY_ID_URL = RECURRING_DEPOSIT_ACCOUNT_URL + "/" + accountID + "?" + Utils.TENANT_IDENTIFIER;
@@ -161,12 +177,20 @@ public class RecurringDepositAccountHelper {
return Utils.performServerGet(requestSpec, responseSpec, GET_RECURRING_DEPOSIT_BY_ID_URL, ""); return Utils.performServerGet(requestSpec, responseSpec, GET_RECURRING_DEPOSIT_BY_ID_URL, "");
} }
// 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 HashMap getRecurringDepositSummary(final Integer accountID) { public HashMap getRecurringDepositSummary(final Integer accountID) {
final String URL = RECURRING_DEPOSIT_ACCOUNT_URL + "/" + accountID + "?" + Utils.TENANT_IDENTIFIER; final String URL = RECURRING_DEPOSIT_ACCOUNT_URL + "/" + accountID + "?" + Utils.TENANT_IDENTIFIER;
final HashMap response = Utils.performServerGet(requestSpec, responseSpec, URL, "summary"); final HashMap response = Utils.performServerGet(requestSpec, responseSpec, URL, "summary");
return response; return response;
} }
// 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 Float getInterestRate(ArrayList<ArrayList<HashMap>> interestSlabData, Integer depositPeriod) { public static Float getInterestRate(ArrayList<ArrayList<HashMap>> interestSlabData, Integer depositPeriod) {
Float annualInterestRate = 0.0f; Float annualInterestRate = 0.0f;
@@ -214,6 +238,10 @@ public class RecurringDepositAccountHelper {
return principal; return principal;
} }
// 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 HashMap updateRecurringDepositAccount(final String clientID, final String productID, final String accountID, public HashMap updateRecurringDepositAccount(final String clientID, final String productID, final String accountID,
final String validFrom, final String validTo, final String penalInterestType, final String submittedOnDate) { final String validFrom, final String validTo, final String penalInterestType, final String submittedOnDate) {
@@ -232,6 +260,10 @@ public class RecurringDepositAccountHelper {
CommonConstants.RESPONSE_CHANGES); CommonConstants.RESPONSE_CHANGES);
} }
// 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 HashMap updateInterestCalculationConfigForRecurringDeposit(final String clientID, final String productID, final String accountID, public HashMap updateInterestCalculationConfigForRecurringDeposit(final String clientID, final String productID, final String accountID,
final String submittedOnDate, final String validFrom, final String validTo, final String numberOfDaysPerYear, final String submittedOnDate, final String validFrom, final String validTo, final String numberOfDaysPerYear,
final String penalInterestType, final String interestCalculationType, final String interestCompoundingPeriodType, final String penalInterestType, final String interestCalculationType, final String interestCompoundingPeriodType,
@@ -251,6 +283,10 @@ public class RecurringDepositAccountHelper {
CommonConstants.RESPONSE_CHANGES); CommonConstants.RESPONSE_CHANGES);
} }
// 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 Integer updateTransactionForRecurringDeposit(final Integer accountID, final Integer transactionId, final String transactionDate, public Integer updateTransactionForRecurringDeposit(final Integer accountID, final Integer transactionId, final String transactionDate,
final Float transactionAmount) { final Float transactionAmount) {
LOG.info("--------------------------------- UPDATE RECURRING DEPOSIT TRANSACTION ------------------------------------"); LOG.info("--------------------------------- UPDATE RECURRING DEPOSIT TRANSACTION ------------------------------------");
@@ -260,6 +296,10 @@ public class RecurringDepositAccountHelper {
getUpdateTransactionAsJSON(transactionDate, transactionAmount), CommonConstants.RESPONSE_RESOURCE_ID); getUpdateTransactionAsJSON(transactionDate, transactionAmount), CommonConstants.RESPONSE_RESOURCE_ID);
} }
// 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 Integer undoTransactionForRecurringDeposit(final Integer accountID, final Integer transactionId, final String transactionDate, public Integer undoTransactionForRecurringDeposit(final Integer accountID, final Integer transactionId, final String transactionDate,
final Float transactionAmount) { final Float transactionAmount) {
LOG.info("--------------------------------- UNDO RECURRING DEPOSIT TRANSACTION ------------------------------------"); LOG.info("--------------------------------- UNDO RECURRING DEPOSIT TRANSACTION ------------------------------------");
@@ -268,6 +308,10 @@ public class RecurringDepositAccountHelper {
getUpdateTransactionAsJSON(transactionDate, transactionAmount), CommonConstants.RESPONSE_RESOURCE_ID); getUpdateTransactionAsJSON(transactionDate, transactionAmount), CommonConstants.RESPONSE_RESOURCE_ID);
} }
// 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 HashMap approveRecurringDeposit(final Integer recurringDepositAccountID, final String approvedOnDate) { public HashMap approveRecurringDeposit(final Integer recurringDepositAccountID, final String approvedOnDate) {
LOG.info("--------------------------------- APPROVING RECURRING DEPOSIT APPLICATION ------------------------------------"); LOG.info("--------------------------------- APPROVING RECURRING DEPOSIT APPLICATION ------------------------------------");
return performRecurringDepositApplicationActions( return performRecurringDepositApplicationActions(
@@ -275,6 +319,10 @@ public class RecurringDepositAccountHelper {
getApproveRecurringDepositAccountAsJSON(approvedOnDate)); getApproveRecurringDepositAccountAsJSON(approvedOnDate));
} }
// 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 HashMap undoApproval(final Integer recurringDepositAccountID) { public HashMap undoApproval(final Integer recurringDepositAccountID) {
LOG.info("--------------------------------- UNDO APPROVING RECURRING DEPOSIT APPLICATION -------------------------------"); LOG.info("--------------------------------- UNDO APPROVING RECURRING DEPOSIT APPLICATION -------------------------------");
final String undoBodyJson = "{'note':'UNDO APPROVAL'}"; final String undoBodyJson = "{'note':'UNDO APPROVAL'}";
@@ -282,6 +330,10 @@ public class RecurringDepositAccountHelper {
createRecurringDepositOperationURL(UNDO_APPROVAL_RECURRING_DEPOSIT_COMMAND, recurringDepositAccountID), undoBodyJson); createRecurringDepositOperationURL(UNDO_APPROVAL_RECURRING_DEPOSIT_COMMAND, recurringDepositAccountID), undoBodyJson);
} }
// 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 HashMap rejectApplication(final Integer recurringDepositAccountID, final String rejectedOnDate) { public HashMap rejectApplication(final Integer recurringDepositAccountID, final String rejectedOnDate) {
LOG.info("--------------------------------- REJECT RECURRING DEPOSIT APPLICATION -------------------------------"); LOG.info("--------------------------------- REJECT RECURRING DEPOSIT APPLICATION -------------------------------");
return performRecurringDepositApplicationActions( return performRecurringDepositApplicationActions(
@@ -289,6 +341,10 @@ public class RecurringDepositAccountHelper {
getRejectedRecurringDepositAsJSON(rejectedOnDate)); getRejectedRecurringDepositAsJSON(rejectedOnDate));
} }
// 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 HashMap withdrawApplication(final Integer recurringDepositAccountID, final String withdrawApplicationOnDate) { public HashMap withdrawApplication(final Integer recurringDepositAccountID, final String withdrawApplicationOnDate) {
LOG.info("--------------------------------- WITHDRAW RECURRING DEPOSIT APPLICATION -------------------------------"); LOG.info("--------------------------------- WITHDRAW RECURRING DEPOSIT APPLICATION -------------------------------");
return performRecurringDepositApplicationActions( return performRecurringDepositApplicationActions(
@@ -296,6 +352,10 @@ public class RecurringDepositAccountHelper {
getWithdrawnRecurringDepositAccountAsJSON(withdrawApplicationOnDate)); getWithdrawnRecurringDepositAccountAsJSON(withdrawApplicationOnDate));
} }
// 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 HashMap activateRecurringDeposit(final Integer recurringDepositAccountID, final String activationDate) { public HashMap activateRecurringDeposit(final Integer recurringDepositAccountID, final String activationDate) {
LOG.info("---------------------------------- ACTIVATING RECURRING DEPOSIT APPLICATION ----------------------------------"); LOG.info("---------------------------------- ACTIVATING RECURRING DEPOSIT APPLICATION ----------------------------------");
return performRecurringDepositApplicationActions( return performRecurringDepositApplicationActions(
@@ -303,6 +363,10 @@ public class RecurringDepositAccountHelper {
getActivatedRecurringDepositAccountAsJSON(activationDate)); getActivatedRecurringDepositAccountAsJSON(activationDate));
} }
// 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 Object deleteRecurringDepositApplication(final Integer recurringDepositAccountID, final String jsonAttributeToGetBack) { public Object deleteRecurringDepositApplication(final Integer recurringDepositAccountID, final String jsonAttributeToGetBack) {
LOG.info("---------------------------------- DELETE RECURRING DEPOSIT APPLICATION ----------------------------------"); LOG.info("---------------------------------- DELETE RECURRING DEPOSIT APPLICATION ----------------------------------");
return Utils.performServerDelete(this.requestSpec, this.responseSpec, return Utils.performServerDelete(this.requestSpec, this.responseSpec,
@@ -310,6 +374,10 @@ public class RecurringDepositAccountHelper {
} }
// 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 Integer calculateInterestForRecurringDeposit(final Integer recurringDepositAccountId) { public Integer calculateInterestForRecurringDeposit(final Integer recurringDepositAccountId) {
LOG.info("--------------------------------- CALCULATING INTEREST FOR RECURRING DEPOSIT --------------------------------"); LOG.info("--------------------------------- CALCULATING INTEREST FOR RECURRING DEPOSIT --------------------------------");
return (Integer) performRecurringDepositActions( return (Integer) performRecurringDepositActions(
@@ -317,6 +385,10 @@ public class RecurringDepositAccountHelper {
getCalculatedInterestForRecurringDepositApplicationAsJSON(), CommonConstants.RESPONSE_RESOURCE_ID); getCalculatedInterestForRecurringDepositApplicationAsJSON(), CommonConstants.RESPONSE_RESOURCE_ID);
} }
// 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 Integer postInterestForRecurringDeposit(final Integer recurringDepositAccountId) { public Integer postInterestForRecurringDeposit(final Integer recurringDepositAccountId) {
LOG.info("--------------------------------- POST INTEREST FOR RECURRING DEPOSIT --------------------------------"); LOG.info("--------------------------------- POST INTEREST FOR RECURRING DEPOSIT --------------------------------");
return (Integer) performRecurringDepositActions( return (Integer) performRecurringDepositActions(
@@ -324,6 +396,10 @@ public class RecurringDepositAccountHelper {
getCalculatedInterestForRecurringDepositApplicationAsJSON(), CommonConstants.RESPONSE_RESOURCE_ID); getCalculatedInterestForRecurringDepositApplicationAsJSON(), CommonConstants.RESPONSE_RESOURCE_ID);
} }
// 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 Integer depositToRecurringDepositAccount(final Integer recurringDepositAccountId, final Float depositAmount, public Integer depositToRecurringDepositAccount(final Integer recurringDepositAccountId, final Float depositAmount,
final String depositedOnDate) { final String depositedOnDate) {
LOG.info("--------------------------------- DEPOSIT TO RECURRING DEPOSIT ACCOUNT --------------------------------"); LOG.info("--------------------------------- DEPOSIT TO RECURRING DEPOSIT ACCOUNT --------------------------------");
@@ -332,6 +408,10 @@ public class RecurringDepositAccountHelper {
getDepositToRecurringDepositAccountAsJSON(depositAmount, depositedOnDate), CommonConstants.RESPONSE_RESOURCE_ID); getDepositToRecurringDepositAccountAsJSON(depositAmount, depositedOnDate), CommonConstants.RESPONSE_RESOURCE_ID);
} }
// 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 HashMap calculatePrematureAmountForRecurringDeposit(final Integer recurringDepositAccountId, final String closedOnDate) { public HashMap calculatePrematureAmountForRecurringDeposit(final Integer recurringDepositAccountId, final String closedOnDate) {
LOG.info("--------------------- CALCULATING PREMATURE AMOUNT FOR RECURRING DEPOSIT ----------------------------"); LOG.info("--------------------- CALCULATING PREMATURE AMOUNT FOR RECURRING DEPOSIT ----------------------------");
return (HashMap) performRecurringDepositActions( return (HashMap) performRecurringDepositActions(
@@ -339,6 +419,10 @@ public class RecurringDepositAccountHelper {
getCalculatedPrematureAmountForRecurringDepositAccountAsJSON(closedOnDate), ""); getCalculatedPrematureAmountForRecurringDepositAccountAsJSON(closedOnDate), "");
} }
// 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 Object prematureCloseForRecurringDeposit(final Integer recurringDepositAccountId, final String closedOnDate, public Object prematureCloseForRecurringDeposit(final Integer recurringDepositAccountId, final String closedOnDate,
final String closureType, final Integer toSavingsId, final String jsonAttributeToGetBack) { final String closureType, final Integer toSavingsId, final String jsonAttributeToGetBack) {
LOG.info("--------------------- PREMATURE CLOSE FOR RECURRING DEPOSIT ----------------------------"); LOG.info("--------------------- PREMATURE CLOSE FOR RECURRING DEPOSIT ----------------------------");
@@ -347,6 +431,10 @@ public class RecurringDepositAccountHelper {
getPrematureCloseForRecurringDepositAccountAsJSON(closedOnDate, closureType, toSavingsId), jsonAttributeToGetBack); getPrematureCloseForRecurringDepositAccountAsJSON(closedOnDate, closureType, toSavingsId), jsonAttributeToGetBack);
} }
// 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)
private String getApproveRecurringDepositAccountAsJSON(final String approvedOnDate) { private String getApproveRecurringDepositAccountAsJSON(final String approvedOnDate) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("locale", CommonConstants.LOCALE); map.put("locale", CommonConstants.LOCALE);
@@ -358,6 +446,10 @@ public class RecurringDepositAccountHelper {
return recurringDepositAccountApproveJson; return recurringDepositAccountApproveJson;
} }
// 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)
private String getUpdateTransactionAsJSON(final String transactionDate, final Float transactionAmount) { private String getUpdateTransactionAsJSON(final String transactionDate, final Float transactionAmount) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("locale", CommonConstants.LOCALE); map.put("locale", CommonConstants.LOCALE);
@@ -369,6 +461,10 @@ public class RecurringDepositAccountHelper {
return updateTransactionJson; return updateTransactionJson;
} }
// 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)
private String getRejectedRecurringDepositAsJSON(final String rejectedOnDate) { private String getRejectedRecurringDepositAsJSON(final String rejectedOnDate) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("locale", CommonConstants.LOCALE); map.put("locale", CommonConstants.LOCALE);
@@ -380,6 +476,10 @@ public class RecurringDepositAccountHelper {
return recurringDepositAccountJson; return recurringDepositAccountJson;
} }
// 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)
private String getWithdrawnRecurringDepositAccountAsJSON(final String withdrawnApplicationOnDate) { private String getWithdrawnRecurringDepositAccountAsJSON(final String withdrawnApplicationOnDate) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("locale", CommonConstants.LOCALE); map.put("locale", CommonConstants.LOCALE);
@@ -391,6 +491,10 @@ public class RecurringDepositAccountHelper {
return recurringDepositAccountJson; return recurringDepositAccountJson;
} }
// 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)
private String getActivatedRecurringDepositAccountAsJSON(final String activationDate) { private String getActivatedRecurringDepositAccountAsJSON(final String activationDate) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("locale", CommonConstants.LOCALE); map.put("locale", CommonConstants.LOCALE);
@@ -401,6 +505,10 @@ public class RecurringDepositAccountHelper {
return recurringDepositAccountActivateJson; return recurringDepositAccountActivateJson;
} }
// 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)
private String getCalculatedInterestForRecurringDepositApplicationAsJSON() { private String getCalculatedInterestForRecurringDepositApplicationAsJSON() {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
String recurringDepositAccountCalculatedInterestJson = new Gson().toJson(map); String recurringDepositAccountCalculatedInterestJson = new Gson().toJson(map);
@@ -408,6 +516,10 @@ public class RecurringDepositAccountHelper {
return recurringDepositAccountCalculatedInterestJson; return recurringDepositAccountCalculatedInterestJson;
} }
// 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)
private String getCalculatedPrematureAmountForRecurringDepositAccountAsJSON(final String closedOnDate) { private String getCalculatedPrematureAmountForRecurringDepositAccountAsJSON(final String closedOnDate) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("locale", CommonConstants.LOCALE); map.put("locale", CommonConstants.LOCALE);
@@ -418,6 +530,10 @@ public class RecurringDepositAccountHelper {
return recurringDepositAccountPrematureClosureJson; return recurringDepositAccountPrematureClosureJson;
} }
// 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)
private String getDepositToRecurringDepositAccountAsJSON(final Float depositAmount, final String depositedOnDate) { private String getDepositToRecurringDepositAccountAsJSON(final Float depositAmount, final String depositedOnDate) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("locale", CommonConstants.LOCALE); map.put("locale", CommonConstants.LOCALE);
@@ -429,6 +545,10 @@ public class RecurringDepositAccountHelper {
return recurringDepositAccountPrematureClosureJson; return recurringDepositAccountPrematureClosureJson;
} }
// 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)
private String getPrematureCloseForRecurringDepositAccountAsJSON(final String closedOnDate, final String closureType, private String getPrematureCloseForRecurringDepositAccountAsJSON(final String closedOnDate, final String closureType,
final Integer toSavingsId) { final Integer toSavingsId) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
@@ -445,16 +565,28 @@ public class RecurringDepositAccountHelper {
return recurringDepositAccountPrematureCloseJson; return recurringDepositAccountPrematureCloseJson;
} }
// 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)
private String createRecurringDepositOperationURL(final String command, final Integer recurringDepositAccountID) { private String createRecurringDepositOperationURL(final String command, final Integer recurringDepositAccountID) {
return RECURRING_DEPOSIT_ACCOUNT_URL + "/" + recurringDepositAccountID + "?command=" + command + "&" + Utils.TENANT_IDENTIFIER; return RECURRING_DEPOSIT_ACCOUNT_URL + "/" + recurringDepositAccountID + "?command=" + command + "&" + Utils.TENANT_IDENTIFIER;
} }
// 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)
private Object performRecurringDepositActions(final String postURLForRecurringDeposit, final String jsonToBeSent, private Object performRecurringDepositActions(final String postURLForRecurringDeposit, final String jsonToBeSent,
final String jsonAttributeToGetBack) { final String jsonAttributeToGetBack) {
return Utils.performServerPost(this.requestSpec, this.responseSpec, postURLForRecurringDeposit, jsonToBeSent, return Utils.performServerPost(this.requestSpec, this.responseSpec, postURLForRecurringDeposit, jsonToBeSent,
jsonAttributeToGetBack); jsonAttributeToGetBack);
} }
// 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)
private HashMap performRecurringDepositApplicationActions(final String postURLForRecurringDepositAction, final String jsonToBeSent) { private HashMap performRecurringDepositApplicationActions(final String postURLForRecurringDepositAction, final String jsonToBeSent) {
HashMap status = null; HashMap status = null;
final HashMap response = Utils.performServerPost(this.requestSpec, this.responseSpec, postURLForRecurringDepositAction, final HashMap response = Utils.performServerPost(this.requestSpec, this.responseSpec, postURLForRecurringDepositAction,
@@ -465,10 +597,18 @@ public class RecurringDepositAccountHelper {
return status; return status;
} }
// 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)
private String createRecurringDepositCalculateInterestURL(final String command, final Integer recurringDepositAccountID) { private String createRecurringDepositCalculateInterestURL(final String command, final Integer recurringDepositAccountID) {
return RECURRING_DEPOSIT_ACCOUNT_URL + "/" + recurringDepositAccountID + "?command=" + command + "&" + Utils.TENANT_IDENTIFIER; return RECURRING_DEPOSIT_ACCOUNT_URL + "/" + recurringDepositAccountID + "?command=" + command + "&" + Utils.TENANT_IDENTIFIER;
} }
// 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)
private String createDepositToRecurringDepositURL(final String command, final Integer recurringDepositAccountID) { private String createDepositToRecurringDepositURL(final String command, final Integer recurringDepositAccountID) {
return RECURRING_DEPOSIT_ACCOUNT_URL + "/" + recurringDepositAccountID + "/transactions" + "?command=" + command + "&" return RECURRING_DEPOSIT_ACCOUNT_URL + "/" + recurringDepositAccountID + "/transactions" + "?command=" + command + "&"
+ Utils.TENANT_IDENTIFIER; + Utils.TENANT_IDENTIFIER;
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositProductHelper.java
+48
View File
@@ -40,6 +40,10 @@ public class RecurringDepositProductHelper {
private final ResponseSpecification responseSpec; private final ResponseSpecification responseSpec;
private static final Gson GSON = new JSON().getGson(); private static final Gson GSON = new JSON().getGson();
// 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 RecurringDepositProductHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public RecurringDepositProductHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
@@ -104,6 +108,10 @@ public class RecurringDepositProductHelper {
private Boolean withHoldTax = false; private Boolean withHoldTax = false;
private String taxGroupId = null; private String taxGroupId = null;
// 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 String build(final String validFrom, final String validTo) { public String build(final String validFrom, final String validTo) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
@@ -202,6 +210,10 @@ public class RecurringDepositProductHelper {
return this; return this;
} }
// 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)
private Map<String, String> getAccountMappingForCashBased() { private Map<String, String> getAccountMappingForCashBased() {
final Map<String, String> map = new HashMap<>(); final Map<String, String> map = new HashMap<>();
if (accountList != null) { if (accountList != null) {
@@ -229,6 +241,10 @@ public class RecurringDepositProductHelper {
return map; return map;
} }
// 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 Integer createRecurringDepositProduct(final String recurrungDepositProductCreateJson, public static Integer createRecurringDepositProduct(final String recurrungDepositProductCreateJson,
final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
LOG.info("------------------ CREATING RECURRING DEPOSIT PRODUCT--------------------"); LOG.info("------------------ CREATING RECURRING DEPOSIT PRODUCT--------------------");
@@ -236,6 +252,10 @@ public class RecurringDepositProductHelper {
"resourceId"); "resourceId");
} }
// 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 ArrayList retrieveAllRecurringDepositProducts(final RequestSpecification requestSpec, public static ArrayList retrieveAllRecurringDepositProducts(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
LOG.info("----------------- RETRIEVING ALL RECURRING DEPOSIT PRODUCTS---------------------------"); LOG.info("----------------- RETRIEVING ALL RECURRING DEPOSIT PRODUCTS---------------------------");
@@ -244,6 +264,10 @@ public class RecurringDepositProductHelper {
return response; return response;
} }
// 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 GetRecurringDepositProductsProductIdResponse getRecurringDepositProductById(final RequestSpecification requestSpec, public static GetRecurringDepositProductsProductIdResponse getRecurringDepositProductById(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final Integer productId) { final ResponseSpecification responseSpec, final Integer productId) {
LOG.info("-------------------- RETRIEVING RECURRING DEPOSIT PRODUCT BY ID --------------------------"); LOG.info("-------------------- RETRIEVING RECURRING DEPOSIT PRODUCT BY ID --------------------------");
@@ -252,6 +276,10 @@ public class RecurringDepositProductHelper {
return GSON.fromJson(response, GetRecurringDepositProductsProductIdResponse.class); return GSON.fromJson(response, GetRecurringDepositProductsProductIdResponse.class);
} }
// 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 HashMap retrieveRecurringDepositProductById(final RequestSpecification requestSpec, public static HashMap retrieveRecurringDepositProductById(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final String productId) { final ResponseSpecification responseSpec, final String productId) {
LOG.info("-------------------- RETRIEVING RECURRING DEPOSIT PRODUCT BY ID --------------------------"); LOG.info("-------------------- RETRIEVING RECURRING DEPOSIT PRODUCT BY ID --------------------------");
@@ -260,6 +288,10 @@ public class RecurringDepositProductHelper {
return response; return response;
} }
// 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 ArrayList getInterestRateChartSlabsByProductId(final RequestSpecification requestSpec, public static ArrayList getInterestRateChartSlabsByProductId(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final Integer productId) { final ResponseSpecification responseSpec, final Integer productId) {
LOG.info("-------------------- RETRIEVE INTEREST CHART BY PRODUCT ID ---------------------"); LOG.info("-------------------- RETRIEVE INTEREST CHART BY PRODUCT ID ---------------------");
@@ -268,6 +300,10 @@ public class RecurringDepositProductHelper {
return response; return response;
} }
// 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 List<HashMap<String, String>> constructChartSlabWithPeriodRange() { public List<HashMap<String, String>> constructChartSlabWithPeriodRange() {
List<HashMap<String, String>> chartSlabs = new ArrayList<HashMap<String, String>>(); List<HashMap<String, String>> chartSlabs = new ArrayList<HashMap<String, String>>();
HashMap<String, String> chartSlabsMap1 = new HashMap<>(); HashMap<String, String> chartSlabsMap1 = new HashMap<>();
@@ -307,6 +343,10 @@ public class RecurringDepositProductHelper {
return chartSlabs; return chartSlabs;
} }
// 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 List<HashMap<String, String>> constructChartSlabWithPeriodAndAmountRange() { public List<HashMap<String, String>> constructChartSlabWithPeriodAndAmountRange() {
List<HashMap<String, String>> chartSlabs = new ArrayList<HashMap<String, String>>(); List<HashMap<String, String>> chartSlabs = new ArrayList<HashMap<String, String>>();
HashMap<String, String> chartSlabsMap1 = new HashMap<>(); HashMap<String, String> chartSlabsMap1 = new HashMap<>();
@@ -394,6 +434,10 @@ public class RecurringDepositProductHelper {
return chartSlabs; return chartSlabs;
} }
// 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 List<HashMap<String, String>> constructChartSlabWithAmountAndPeriodRange() { public List<HashMap<String, String>> constructChartSlabWithAmountAndPeriodRange() {
this.isPrimaryGroupingByAmount = true; this.isPrimaryGroupingByAmount = true;
List<HashMap<String, String>> chartSlabs = new ArrayList<HashMap<String, String>>(); List<HashMap<String, String>> chartSlabs = new ArrayList<HashMap<String, String>>();
@@ -440,6 +484,10 @@ public class RecurringDepositProductHelper {
return chartSlabs; return chartSlabs;
} }
// 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 List<HashMap<String, String>> constructChartSlabWithAmountRange() { public List<HashMap<String, String>> constructChartSlabWithAmountRange() {
this.isPrimaryGroupingByAmount = true; this.isPrimaryGroupingByAmount = true;
List<HashMap<String, String>> chartSlabs = new ArrayList<HashMap<String, String>>(); List<HashMap<String, String>> chartSlabs = new ArrayList<HashMap<String, String>>();
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/savings/AccountTransferHelper.java
+32
View File
@@ -45,11 +45,19 @@ public class AccountTransferHelper {
private RequestSpecification requestSpec; private RequestSpecification requestSpec;
private ResponseSpecification responseSpec; private ResponseSpecification responseSpec;
// 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 AccountTransferHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public AccountTransferHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
} }
// 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 String build(final String fromAccountId, final String fromClientId, final String toAccountId, final String toClientId, public String build(final String fromAccountId, final String fromClientId, final String toAccountId, final String toClientId,
final String fromAccountType, final String toAccountType, final String transferAmount) { final String fromAccountType, final String toAccountType, final String transferAmount) {
@@ -77,6 +85,10 @@ public class AccountTransferHelper {
return this; return this;
} }
// 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 Integer accountTransfer(final Integer fromClientId, final Integer fromAccountId, final Integer toClientId, public Integer accountTransfer(final Integer fromClientId, final Integer fromAccountId, final Integer toClientId,
final Integer toAccountId, final String fromAccountType, final String toAccountType, final String transferAmount) { final Integer toAccountId, final String fromAccountType, final String toAccountType, final String transferAmount) {
LOG.info("--------------------------------ACCOUNT TRANSFER--------------------------------"); LOG.info("--------------------------------ACCOUNT TRANSFER--------------------------------");
@@ -88,6 +100,10 @@ public class AccountTransferHelper {
accountTransferJSON, "savingsId"); accountTransferJSON, "savingsId");
} }
// 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 Object nonExistentAccountTransfer(final Integer fromClientId, final Integer fromAccountId, final Integer toClientId, public Object nonExistentAccountTransfer(final Integer fromClientId, final Integer fromAccountId, final Integer toClientId,
final Integer toAccountId, final String fromAccountType, final String toAccountType, final String transferAmount) { final Integer toAccountId, final String fromAccountType, final String toAccountType, final String transferAmount) {
LOG.info("--------------------------------ACCOUNT TRANSFER--------------------------------"); LOG.info("--------------------------------ACCOUNT TRANSFER--------------------------------");
@@ -101,6 +117,10 @@ public class AccountTransferHelper {
accountTransferJSON, "savingsId"); accountTransferJSON, "savingsId");
} }
// 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 Object insufficientBalanceAccountTransfer(final Integer fromClientId, final Integer fromAccountId, final Integer toClientId, public Object insufficientBalanceAccountTransfer(final Integer fromClientId, final Integer fromAccountId, final Integer toClientId,
final Integer toAccountId, final String fromAccountType, final String toAccountType, final String transferAmount) { final Integer toAccountId, final String fromAccountType, final String toAccountType, final String transferAmount) {
LOG.info("--------------------------------ACCOUNT TRANSFER--------------------------------"); LOG.info("--------------------------------ACCOUNT TRANSFER--------------------------------");
@@ -114,6 +134,10 @@ public class AccountTransferHelper {
accountTransferJSON, "savingsId"); accountTransferJSON, "savingsId");
} }
// 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 Object invalidAccountTransfer(final Integer fromClientId, final Integer fromAccountId, final Integer toClientId, public Object invalidAccountTransfer(final Integer fromClientId, final Integer fromAccountId, final Integer toClientId,
final Integer toAccountId, final String fromAccountType, final String toAccountType, final String transferAmount) { final Integer toAccountId, final String fromAccountType, final String toAccountType, final String transferAmount) {
LOG.info("--------------------------------ACCOUNT TRANSFER--------------------------------"); LOG.info("--------------------------------ACCOUNT TRANSFER--------------------------------");
@@ -127,6 +151,10 @@ public class AccountTransferHelper {
accountTransferJSON, "savingsId"); accountTransferJSON, "savingsId");
} }
// 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 Object accountTransferWithInvalidDate(final Integer fromClientId, final Integer fromAccountId, final Integer toClientId, public Object accountTransferWithInvalidDate(final Integer fromClientId, final Integer fromAccountId, final Integer toClientId,
final Integer toAccountId, final String fromAccountType, final String toAccountType, final String transferAmount) { final Integer toAccountId, final String fromAccountType, final String toAccountType, final String transferAmount) {
LOG.info("--------------------------------ACCOUNT TRANSFER--------------------------------"); LOG.info("--------------------------------ACCOUNT TRANSFER--------------------------------");
@@ -138,6 +166,10 @@ public class AccountTransferHelper {
accountTransferJSON, "savingsId"); accountTransferJSON, "savingsId");
} }
// 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 Integer refundLoanByTransfer(final String date, final Integer fromClientId, final Integer fromAccountId, public Integer refundLoanByTransfer(final String date, final Integer fromClientId, final Integer fromAccountId,
final Integer toClientId, final Integer toAccountId, final String fromAccountType, final String toAccountType, final Integer toClientId, final Integer toAccountId, final String fromAccountType, final String toAccountType,
final String transferAmount) { final String transferAmount) {
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/savings/SavingsAccountHelper.java
+476
View File
File diff suppressed because it is too large Load Diff
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/savings/SavingsProductHelper.java
+24
View File
@@ -102,6 +102,10 @@ public class SavingsProductHelper {
private Integer gsimID = null; private Integer gsimID = null;
private String nominalAnnualInterestRateOverdraft = null; private String nominalAnnualInterestRateOverdraft = null;
// 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 String build() { public String build() {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
@@ -289,6 +293,10 @@ public class SavingsProductHelper {
return this; return this;
} }
// 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)
private Map<String, String> getAccountMappingForCashBased() { private Map<String, String> getAccountMappingForCashBased() {
final Map<String, String> map = new HashMap<>(); final Map<String, String> map = new HashMap<>();
if (accountList != null) { if (accountList != null) {
@@ -319,6 +327,10 @@ public class SavingsProductHelper {
return map; return map;
} }
// 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)
private Map<String, String> getAccountMappingForAccrualBased() { private Map<String, String> getAccountMappingForAccrualBased() {
final Map<String, String> map = new HashMap<>(); final Map<String, String> map = new HashMap<>();
if (accountList != null) { if (accountList != null) {
@@ -352,11 +364,19 @@ public class SavingsProductHelper {
return map; return map;
} }
// 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 Integer createSavingsProduct(final String savingsProductJSON, final RequestSpecification requestSpec, public static Integer createSavingsProduct(final String savingsProductJSON, final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
return Utils.performServerPost(requestSpec, responseSpec, CREATE_SAVINGS_PRODUCT_URL, savingsProductJSON, "resourceId"); return Utils.performServerPost(requestSpec, responseSpec, CREATE_SAVINGS_PRODUCT_URL, savingsProductJSON, "resourceId");
} }
// 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 void verifySavingsProductCreatedOnServer(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static void verifySavingsProductCreatedOnServer(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer generatedProductID) { final Integer generatedProductID) {
LOG.info("------------------------------CHECK CLIENT DETAILS------------------------------------\n"); LOG.info("------------------------------CHECK CLIENT DETAILS------------------------------------\n");
@@ -373,6 +393,10 @@ public class SavingsProductHelper {
return this; return this;
} }
// 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 GetSavingsProductsProductIdResponse getSavingsProductById(final RequestSpecification requestSpec, public static GetSavingsProductsProductIdResponse getSavingsProductById(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final Integer productId) { final ResponseSpecification responseSpec, final Integer productId) {
LOG.info("-------------------- RETRIEVING SAVINGS DEPOSIT PRODUCT BY ID --------------------------"); LOG.info("-------------------- RETRIEVING SAVINGS DEPOSIT PRODUCT BY ID --------------------------");
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/shares/ShareAccountHelper.java
+5 -1
View File
@@ -56,8 +56,12 @@ public class ShareAccountHelper {
private String lockinPeriodFrequencyType; private String lockinPeriodFrequencyType;
private List<Map<String, Object>> charges = null; private List<Map<String, Object>> charges = null;
// chargeId , amount
// chargeId , amount
// 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 String build() { public String build() {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("locale", LOCALE); map.put("locale", LOCALE);
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/shares/ShareAccountTransactionHelper.java
+16
View File
@@ -32,23 +32,39 @@ public final class ShareAccountTransactionHelper {
private static final String SHARE_ACCOUNT_URL = "/fineract-provider/api/v1/accounts/share"; private static final String SHARE_ACCOUNT_URL = "/fineract-provider/api/v1/accounts/share";
private static final String CREATE_SHARE_ACCOUNT_URL = SHARE_ACCOUNT_URL + "?" + Utils.TENANT_IDENTIFIER; private static final String CREATE_SHARE_ACCOUNT_URL = SHARE_ACCOUNT_URL + "?" + Utils.TENANT_IDENTIFIER;
// 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 Integer createShareAccount(final String shareProductJSON, final RequestSpecification requestSpec, public static Integer createShareAccount(final String shareProductJSON, final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
return Utils.performServerPost(requestSpec, responseSpec, CREATE_SHARE_ACCOUNT_URL, shareProductJSON, "resourceId"); return Utils.performServerPost(requestSpec, responseSpec, CREATE_SHARE_ACCOUNT_URL, shareProductJSON, "resourceId");
} }
// 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 Map<String, Object> retrieveShareAccount(final Integer shareProductId, final RequestSpecification requestSpec, public static Map<String, Object> retrieveShareAccount(final Integer shareProductId, final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
String url = SHARE_ACCOUNT_URL + "/" + shareProductId + "?" + Utils.TENANT_IDENTIFIER; String url = SHARE_ACCOUNT_URL + "/" + shareProductId + "?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerGet(requestSpec, responseSpec, url, ""); return Utils.performServerGet(requestSpec, responseSpec, url, "");
} }
// 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 Integer updateShareAccount(final Integer shareAccountId, final String shareAccountJson, public static Integer updateShareAccount(final Integer shareAccountId, final String shareAccountJson,
final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
String url = SHARE_ACCOUNT_URL + "/" + shareAccountId + "?" + Utils.TENANT_IDENTIFIER; String url = SHARE_ACCOUNT_URL + "/" + shareAccountId + "?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerPut(requestSpec, responseSpec, url, shareAccountJson, "resourceId"); return Utils.performServerPut(requestSpec, responseSpec, url, shareAccountJson, "resourceId");
} }
// 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 Integer postCommand(final String command, final Integer shareAccountId, String jsonBody, public static Integer postCommand(final String command, final Integer shareAccountId, String jsonBody,
final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
String url = SHARE_ACCOUNT_URL + "/" + shareAccountId + "?command=" + command + "&" + Utils.TENANT_IDENTIFIER; String url = SHARE_ACCOUNT_URL + "/" + shareAccountId + "?command=" + command + "&" + Utils.TENANT_IDENTIFIER;
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/shares/ShareDividendsTransactionHelper.java
+16
View File
@@ -32,12 +32,20 @@ public final class ShareDividendsTransactionHelper {
private static final String SHARE_PRODUCT_URL = "/fineract-provider/api/v1/shareproduct"; private static final String SHARE_PRODUCT_URL = "/fineract-provider/api/v1/shareproduct";
private static final String DIVIDEND = "dividend"; private static final String DIVIDEND = "dividend";
// 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 Integer createShareProductDividends(final Integer productId, final String dividendJson, public static Integer createShareProductDividends(final Integer productId, final String dividendJson,
final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
String url = SHARE_PRODUCT_URL + "/" + productId + "/" + DIVIDEND + "?" + Utils.TENANT_IDENTIFIER; String url = SHARE_PRODUCT_URL + "/" + productId + "/" + DIVIDEND + "?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerPost(requestSpec, responseSpec, url, dividendJson, "subResourceId"); return Utils.performServerPost(requestSpec, responseSpec, url, dividendJson, "subResourceId");
} }
// 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 Integer postCommand(final String command, final Integer productId, final Integer dividendId, String jsonBody, public static Integer postCommand(final String command, final Integer productId, final Integer dividendId, String jsonBody,
final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
String url = SHARE_PRODUCT_URL + "/" + productId + "/" + DIVIDEND + "/" + dividendId + "?command=" + command + "&" String url = SHARE_PRODUCT_URL + "/" + productId + "/" + DIVIDEND + "/" + dividendId + "?command=" + command + "&"
@@ -45,12 +53,20 @@ public final class ShareDividendsTransactionHelper {
return Utils.performServerPut(requestSpec, responseSpec, url, jsonBody, "resourceId"); return Utils.performServerPut(requestSpec, responseSpec, url, jsonBody, "resourceId");
} }
// 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 Map<String, Object> retrieveDividendDetails(final Integer productId, final Integer dividendId, public static Map<String, Object> retrieveDividendDetails(final Integer productId, final Integer dividendId,
final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
String url = SHARE_PRODUCT_URL + "/" + productId + "/" + DIVIDEND + "/" + dividendId + "?" + Utils.TENANT_IDENTIFIER; String url = SHARE_PRODUCT_URL + "/" + productId + "/" + DIVIDEND + "/" + dividendId + "?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerGet(requestSpec, responseSpec, url, ""); return Utils.performServerGet(requestSpec, responseSpec, url, "");
} }
// 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 Map<String, Object> retrieveAllDividends(final Integer productId, final RequestSpecification requestSpec, public static Map<String, Object> retrieveAllDividends(final Integer productId, final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
String url = SHARE_PRODUCT_URL + "/" + productId + "/" + DIVIDEND + "?" + Utils.TENANT_IDENTIFIER; String url = SHARE_PRODUCT_URL + "/" + productId + "/" + DIVIDEND + "?" + Utils.TENANT_IDENTIFIER;
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/shares/ShareProductHelper.java
+12
View File
@@ -65,6 +65,10 @@ public class ShareProductHelper {
private List<Map<String, String>> marketPrices = null; private List<Map<String, String>> marketPrices = null;
private Account[] accountList = null; private Account[] accountList = null;
// 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 String build() { public String build() {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("name", this.productName); map.put("name", this.productName);
@@ -143,6 +147,10 @@ public class ShareProductHelper {
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
// 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 void verifyShareProduct(Map<String, Object> shareProductData) { public void verifyShareProduct(Map<String, Object> shareProductData) {
String productName = (String) shareProductData.get("name"); String productName = (String) shareProductData.get("name");
Assertions.assertEquals(this.productName, productName); Assertions.assertEquals(this.productName, productName);
@@ -210,6 +218,10 @@ public class ShareProductHelper {
} }
// 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)
private Map<String, String> getAccountMappingForCashBased() { private Map<String, String> getAccountMappingForCashBased() {
final Map<String, String> map = new HashMap<>(); final Map<String, String> map = new HashMap<>();
if (accountList != null) { if (accountList != null) {
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/shares/ShareProductTransactionHelper.java
+12
View File
@@ -32,17 +32,29 @@ public final class ShareProductTransactionHelper {
private static final String SHARE_PRODUCT_URL = "/fineract-provider/api/v1/products/share"; private static final String SHARE_PRODUCT_URL = "/fineract-provider/api/v1/products/share";
private static final String CREATE_SHARE_PRODUCT_URL = SHARE_PRODUCT_URL + "?" + Utils.TENANT_IDENTIFIER; private static final String CREATE_SHARE_PRODUCT_URL = SHARE_PRODUCT_URL + "?" + Utils.TENANT_IDENTIFIER;
// 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 Integer createShareProduct(final String savingsProductJSON, final RequestSpecification requestSpec, public static Integer createShareProduct(final String savingsProductJSON, final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
return Utils.performServerPost(requestSpec, responseSpec, CREATE_SHARE_PRODUCT_URL, savingsProductJSON, "resourceId"); return Utils.performServerPost(requestSpec, responseSpec, CREATE_SHARE_PRODUCT_URL, savingsProductJSON, "resourceId");
} }
// 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 Map<String, Object> retrieveShareProduct(final Integer shareProductId, final RequestSpecification requestSpec, public static Map<String, Object> retrieveShareProduct(final Integer shareProductId, final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
String url = SHARE_PRODUCT_URL + "/" + shareProductId + "?" + Utils.TENANT_IDENTIFIER; String url = SHARE_PRODUCT_URL + "/" + shareProductId + "?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerGet(requestSpec, responseSpec, url, ""); return Utils.performServerGet(requestSpec, responseSpec, url, "");
} }
// 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 Integer updateShareProduct(final Integer shareProductId, final String provsioningCriteriaJson, public static Integer updateShareProduct(final Integer shareProductId, final String provsioningCriteriaJson,
final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
String url = SHARE_PRODUCT_URL + "/" + shareProductId + "?" + Utils.TENANT_IDENTIFIER; String url = SHARE_PRODUCT_URL + "/" + shareProductId + "?" + Utils.TENANT_IDENTIFIER;
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/system/AccountNumberPreferencesHelper.java
+52
View File
@@ -35,11 +35,19 @@ public class AccountNumberPreferencesHelper {
private static final String ACCOUNT_NUMBER_FORMATS_REQUEST_URL = "/fineract-provider/api/v1/accountnumberformats"; private static final String ACCOUNT_NUMBER_FORMATS_REQUEST_URL = "/fineract-provider/api/v1/accountnumberformats";
// 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 AccountNumberPreferencesHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public AccountNumberPreferencesHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
} }
// 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 Object createClientAccountNumberPreference(ResponseSpecification responseSpec, String jsonAttributeToGetBack) { public Object createClientAccountNumberPreference(ResponseSpecification responseSpec, String jsonAttributeToGetBack) {
LOG.info("---------------------------------CREATING CLIENT ACCOUNT NUMBER PREFERENCE------------------------------------------"); LOG.info("---------------------------------CREATING CLIENT ACCOUNT NUMBER PREFERENCE------------------------------------------");
@@ -50,6 +58,10 @@ public class AccountNumberPreferencesHelper {
return Utils.performServerPost(this.requestSpec, responseSpec, URL, requestJSON, jsonAttributeToGetBack); return Utils.performServerPost(this.requestSpec, responseSpec, URL, requestJSON, jsonAttributeToGetBack);
} }
// 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 Object createLoanAccountNumberPreference(ResponseSpecification responseSpec, String jsonAttributeToGetBack) { public Object createLoanAccountNumberPreference(ResponseSpecification responseSpec, String jsonAttributeToGetBack) {
LOG.info("---------------------------------CREATING LOAN ACCOUNT NUMBER PREFERENCE------------------------------------------"); LOG.info("---------------------------------CREATING LOAN ACCOUNT NUMBER PREFERENCE------------------------------------------");
@@ -59,6 +71,10 @@ public class AccountNumberPreferencesHelper {
return Utils.performServerPost(this.requestSpec, responseSpec, URL, requestJSON, jsonAttributeToGetBack); return Utils.performServerPost(this.requestSpec, responseSpec, URL, requestJSON, jsonAttributeToGetBack);
} }
// 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 Object createSavingsAccountNumberPreference(ResponseSpecification responseSpec, String jsonAttributeToGetBack) { public Object createSavingsAccountNumberPreference(ResponseSpecification responseSpec, String jsonAttributeToGetBack) {
LOG.info("---------------------------------CREATING SAVINGS ACCOUNT NUMBER PREFERENCE------------------------------------------"); LOG.info("---------------------------------CREATING SAVINGS ACCOUNT NUMBER PREFERENCE------------------------------------------");
@@ -69,6 +85,10 @@ public class AccountNumberPreferencesHelper {
} }
// 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 Object createGroupsAccountNumberPreference(ResponseSpecification responseSpec, String jsonAttributeToGetBack) { public Object createGroupsAccountNumberPreference(ResponseSpecification responseSpec, String jsonAttributeToGetBack) {
LOG.info("---------------------------------CREATING GROUPS ACCOUNT NUMBER PREFERENCE------------------------------------------"); LOG.info("---------------------------------CREATING GROUPS ACCOUNT NUMBER PREFERENCE------------------------------------------");
@@ -79,6 +99,10 @@ public class AccountNumberPreferencesHelper {
} }
// 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 Object createCenterAccountNumberPreference(ResponseSpecification responseSpec, String jsonAttributeToGetBack) { public Object createCenterAccountNumberPreference(ResponseSpecification responseSpec, String jsonAttributeToGetBack) {
LOG.info("---------------------------------CREATING CENTER ACCOUNT NUMBER PREFERENCE------------------------------------------"); LOG.info("---------------------------------CREATING CENTER ACCOUNT NUMBER PREFERENCE------------------------------------------");
@@ -89,6 +113,10 @@ public class AccountNumberPreferencesHelper {
} }
// 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 HashMap<String, Object> createAccountNumberPreferenceWithInvalidData(ResponseSpecification responseSpec, String accountType, public HashMap<String, Object> createAccountNumberPreferenceWithInvalidData(ResponseSpecification responseSpec, String accountType,
String prefixType, String jsonAttributeToGetBack) { String prefixType, String jsonAttributeToGetBack) {
@@ -99,6 +127,10 @@ public class AccountNumberPreferencesHelper {
} }
// 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 HashMap<String, Object> updateAccountNumberPreference(final Integer accountNumberFormatId, final String prefixType, public HashMap<String, Object> updateAccountNumberPreference(final Integer accountNumberFormatId, final String prefixType,
ResponseSpecification responseSpec, String jsonAttributeToGetBack) { ResponseSpecification responseSpec, String jsonAttributeToGetBack) {
@@ -110,6 +142,10 @@ public class AccountNumberPreferencesHelper {
} }
// 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 HashMap<String, Object> deleteAccountNumberPreference(final Integer accountNumberFormatId, ResponseSpecification responseSpec, public HashMap<String, Object> deleteAccountNumberPreference(final Integer accountNumberFormatId, ResponseSpecification responseSpec,
String jsonAttributeToGetBack) { String jsonAttributeToGetBack) {
@@ -120,18 +156,30 @@ public class AccountNumberPreferencesHelper {
return Utils.performServerDelete(this.requestSpec, responseSpec, URL, jsonAttributeToGetBack); return Utils.performServerDelete(this.requestSpec, responseSpec, URL, jsonAttributeToGetBack);
} }
// 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 Object getAccountNumberPreference(final Integer accountNumberFormatId, final String jsonAttributeToGetBack) { public Object getAccountNumberPreference(final Integer accountNumberFormatId, final String jsonAttributeToGetBack) {
final String URL = ACCOUNT_NUMBER_FORMATS_REQUEST_URL + "/" + accountNumberFormatId + "?" + Utils.TENANT_IDENTIFIER; final String URL = ACCOUNT_NUMBER_FORMATS_REQUEST_URL + "/" + accountNumberFormatId + "?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerGet(requestSpec, responseSpec, URL, jsonAttributeToGetBack); return Utils.performServerGet(requestSpec, responseSpec, URL, jsonAttributeToGetBack);
} }
// 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 ArrayList<HashMap<String, Object>> getAllAccountNumberPreferences() { public ArrayList<HashMap<String, Object>> getAllAccountNumberPreferences() {
final String URL = ACCOUNT_NUMBER_FORMATS_REQUEST_URL + "?" + Utils.TENANT_IDENTIFIER; final String URL = ACCOUNT_NUMBER_FORMATS_REQUEST_URL + "?" + Utils.TENANT_IDENTIFIER;
final ArrayList<HashMap<String, Object>> response = Utils.performServerGet(requestSpec, responseSpec, URL, ""); final ArrayList<HashMap<String, Object>> response = Utils.performServerGet(requestSpec, responseSpec, URL, "");
return response; return response;
} }
// 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 void verifyCreationOfAccountNumberPreferences(final Integer clientAccountNumberPreferenceId, public void verifyCreationOfAccountNumberPreferences(final Integer clientAccountNumberPreferenceId,
final Integer loanAccountNumberPreferenceId, final Integer savingsAccountNumberPreferenceId, final Integer loanAccountNumberPreferenceId, final Integer savingsAccountNumberPreferenceId,
final Integer groupsAccountNumberPreferenceId, final Integer centerAccountNumberPreferenceId, final Integer groupsAccountNumberPreferenceId, final Integer centerAccountNumberPreferenceId,
@@ -159,6 +207,10 @@ public class AccountNumberPreferencesHelper {
Utils.performServerGet(requestSpec, responseSpec, centerURL, "id"); Utils.performServerGet(requestSpec, responseSpec, centerURL, "id");
} }
// 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 void verifyUpdationOfAccountNumberPreferences(final Integer accountNumberPreferenceId, ResponseSpecification responseSpec, public void verifyUpdationOfAccountNumberPreferences(final Integer accountNumberPreferenceId, ResponseSpecification responseSpec,
RequestSpecification requestSpec) { RequestSpecification requestSpec) {
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/system/CodeHelper.java
+100
View File
@@ -53,6 +53,10 @@ public final class CodeHelper extends IntegrationTest {
public static final String CODE_VALUE_POSITION_ATTRIBUTE_NAME = "position"; public static final String CODE_VALUE_POSITION_ATTRIBUTE_NAME = "position";
public static final String CODE_VALUE_URL = "/fineract-provider/api/v1/codes/[codeId]/codevalues"; public static final String CODE_VALUE_URL = "/fineract-provider/api/v1/codes/[codeId]/codevalues";
// 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 Object createCode(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, final String codeName, public static Object createCode(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, final String codeName,
final String jsonAttributeToGetback) { final String jsonAttributeToGetback) {
@@ -60,6 +64,10 @@ public final class CodeHelper extends IntegrationTest {
jsonAttributeToGetback); jsonAttributeToGetback);
} }
// 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 Object updateCode(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, final Integer codeId, public static Object updateCode(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, final Integer codeId,
final String codeName, final String jsonAttributeToGetback) { final String codeName, final String jsonAttributeToGetback) {
@@ -67,6 +75,10 @@ public final class CodeHelper extends IntegrationTest {
getTestCodeAsJSON(codeName), jsonAttributeToGetback); getTestCodeAsJSON(codeName), jsonAttributeToGetback);
} }
// 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 Object getCodeById(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, final Integer codeId, public static Object getCodeById(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, final Integer codeId,
final String jsonAttributeToGetback) { final String jsonAttributeToGetback) {
@@ -75,6 +87,10 @@ public final class CodeHelper extends IntegrationTest {
} }
// 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 HashMap<String, Object> getCodeByName(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static HashMap<String, Object> getCodeByName(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String codeName) { final String codeName) {
@@ -93,6 +109,10 @@ public final class CodeHelper extends IntegrationTest {
return code; return code;
} }
// 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 HashMap<String, Object> getOrCreateCodeValueByCodeIdAndCodeName(final RequestSpecification requestSpec, public static HashMap<String, Object> getOrCreateCodeValueByCodeIdAndCodeName(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final Integer codeId, final String codeName, final Integer position) { final ResponseSpecification responseSpec, final Integer codeId, final String codeName, final Integer position) {
@@ -107,6 +127,10 @@ public final class CodeHelper extends IntegrationTest {
return filterCodesByName(allCodeValues, codeName); return filterCodesByName(allCodeValues, codeName);
} }
// 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)
private static HashMap<String, Object> filterCodesByName(ArrayList<HashMap<String, Object>> allCodeValues, String codeName) { private static HashMap<String, Object> filterCodesByName(ArrayList<HashMap<String, Object>> allCodeValues, String codeName) {
final HashMap<String, Object> codes = new HashMap<>(); final HashMap<String, Object> codes = new HashMap<>();
@@ -122,6 +146,10 @@ public final class CodeHelper extends IntegrationTest {
return codes; return codes;
} }
// 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 HashMap<String, Object> retrieveOrCreateCodeValue(Integer codeId, final RequestSpecification requestSpec, public static HashMap<String, Object> retrieveOrCreateCodeValue(Integer codeId, final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
Integer codeValueId = null; Integer codeValueId = null;
@@ -141,6 +169,10 @@ public final class CodeHelper extends IntegrationTest {
} }
// 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 ArrayList<HashMap<String, Object>> getAllCodes(final RequestSpecification requestSpec, public static ArrayList<HashMap<String, Object>> getAllCodes(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
@@ -148,6 +180,10 @@ public final class CodeHelper extends IntegrationTest {
} }
// 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 ArrayList<HashMap<String, Object>> getAllCodeValuesByCodeId(final RequestSpecification requestSpec, public static ArrayList<HashMap<String, Object>> getAllCodeValuesByCodeId(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final Integer codeId) { final ResponseSpecification responseSpec, final Integer codeId) {
@@ -155,6 +191,10 @@ public final class CodeHelper extends IntegrationTest {
CODE_VALUE_URL.replace("[codeId]", codeId.toString()) + "?" + Utils.TENANT_IDENTIFIER, ""); CODE_VALUE_URL.replace("[codeId]", codeId.toString()) + "?" + Utils.TENANT_IDENTIFIER, "");
} }
// 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 Object getSystemDefinedCodes(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static Object getSystemDefinedCodes(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
final String getResponse = given().spec(requestSpec).expect().spec(responseSpec).when() final String getResponse = given().spec(requestSpec).expect().spec(responseSpec).when()
@@ -167,12 +207,20 @@ public final class CodeHelper extends IntegrationTest {
} }
// 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 String getTestCodeAsJSON(final String codeName) { public static String getTestCodeAsJSON(final String codeName) {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
map.put(CODE_NAME_ATTRIBUTE_NAME, codeName); map.put(CODE_NAME_ATTRIBUTE_NAME, codeName);
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 String getTestCodeValueAsJSON(final String codeValueName, final String description, final Integer position) { public static String getTestCodeValueAsJSON(final String codeValueName, final String description, final Integer position) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put(CODE_VALUE_NAME_ATTRIBUTE_NAME, codeValueName); map.put(CODE_VALUE_NAME_ATTRIBUTE_NAME, codeValueName);
@@ -183,6 +231,10 @@ public final class CodeHelper extends IntegrationTest {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 Object deleteCodeById(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Object deleteCodeById(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer codeId, final String jsonAttributeToGetback) { final Integer codeId, final String jsonAttributeToGetback) {
@@ -191,6 +243,10 @@ public final class CodeHelper extends IntegrationTest {
} }
// 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 Integer createAddressTypeCodeValue(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createAddressTypeCodeValue(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String addressTypeName, final Integer position) { final String addressTypeName, final Integer position) {
HashMap<String, Object> code = getCodeByName(requestSpec, responseSpec, ADDRESS_TYPE_CODE_NAME); HashMap<String, Object> code = getCodeByName(requestSpec, responseSpec, ADDRESS_TYPE_CODE_NAME);
@@ -198,6 +254,10 @@ public final class CodeHelper extends IntegrationTest {
return createCodeValue(requestSpec, responseSpec, countryCode, addressTypeName, position); return createCodeValue(requestSpec, responseSpec, countryCode, addressTypeName, position);
} }
// 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 Integer createStateCodeValue(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createStateCodeValue(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String stateName, final Integer position) { final String stateName, final Integer position) {
HashMap<String, Object> code = getCodeByName(requestSpec, responseSpec, STATE_CODE_NAME); HashMap<String, Object> code = getCodeByName(requestSpec, responseSpec, STATE_CODE_NAME);
@@ -205,6 +265,10 @@ public final class CodeHelper extends IntegrationTest {
return createCodeValue(requestSpec, responseSpec, countryCode, stateName, position); return createCodeValue(requestSpec, responseSpec, countryCode, stateName, position);
} }
// 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 Integer createCountryCodeValue(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createCountryCodeValue(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String countryName, final Integer position) { final String countryName, final Integer position) {
HashMap<String, Object> code = getCodeByName(requestSpec, responseSpec, COUNTRY_CODE_NAME); HashMap<String, Object> code = getCodeByName(requestSpec, responseSpec, COUNTRY_CODE_NAME);
@@ -212,6 +276,10 @@ public final class CodeHelper extends IntegrationTest {
return createCodeValue(requestSpec, responseSpec, countryCode, countryName, position); return createCodeValue(requestSpec, responseSpec, countryCode, countryName, position);
} }
// 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 Integer createChargeOffCodeValue(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createChargeOffCodeValue(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String value, final Integer position) { final String value, final Integer position) {
HashMap<String, Object> code = getCodeByName(requestSpec, responseSpec, CHARGE_OFF_REASONS_CODE_NAME); HashMap<String, Object> code = getCodeByName(requestSpec, responseSpec, CHARGE_OFF_REASONS_CODE_NAME);
@@ -219,17 +287,29 @@ public final class CodeHelper extends IntegrationTest {
return createCodeValue(requestSpec, responseSpec, countryCode, value, position); return createCodeValue(requestSpec, responseSpec, countryCode, value, position);
} }
// 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 Integer createCodeValue(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createCodeValue(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer codeId, final String codeValueName, final Integer position) { final Integer codeId, final String codeValueName, final Integer position) {
return (Integer) createCodeValue(requestSpec, responseSpec, codeId, codeValueName, position, SUBRESPONSE_ID_ATTRIBUTE_NAME); return (Integer) createCodeValue(requestSpec, responseSpec, codeId, codeValueName, position, SUBRESPONSE_ID_ATTRIBUTE_NAME);
} }
// 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 Object createCodeValue(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Object createCodeValue(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer codeId, final String codeValueName, final Integer position, final String jsonAttributeToGetback) { final Integer codeId, final String codeValueName, final Integer position, final String jsonAttributeToGetback) {
String description = null; String description = null;
return createCodeValue(requestSpec, responseSpec, codeId, codeValueName, description, position, jsonAttributeToGetback); return createCodeValue(requestSpec, responseSpec, codeId, codeValueName, description, position, jsonAttributeToGetback);
} }
// 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 Object createCodeValue(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Object createCodeValue(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer codeId, final String codeValueName, final String description, final Integer position, final Integer codeId, final String codeValueName, final String description, final Integer position,
final String jsonAttributeToGetback) { final String jsonAttributeToGetback) {
@@ -239,6 +319,10 @@ public final class CodeHelper extends IntegrationTest {
getTestCodeValueAsJSON(codeValueName, description, position), jsonAttributeToGetback); getTestCodeValueAsJSON(codeValueName, description, position), jsonAttributeToGetback);
} }
// 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 List<HashMap<String, Object>> getCodeValuesForCode(final RequestSpecification requestSpec, public static List<HashMap<String, Object>> getCodeValuesForCode(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, final Integer codeId, final String jsonAttributeToGetback) { final ResponseSpecification responseSpec, final Integer codeId, final String jsonAttributeToGetback) {
@@ -247,6 +331,10 @@ public final class CodeHelper extends IntegrationTest {
} }
// 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 Object getCodeValueById(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Object getCodeValueById(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer codeId, final Integer codeValueId, final String jsonAttributeToGetback) { final Integer codeId, final Integer codeValueId, final String jsonAttributeToGetback) {
@@ -255,6 +343,10 @@ public final class CodeHelper extends IntegrationTest {
jsonAttributeToGetback); jsonAttributeToGetback);
} }
// 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 Object deleteCodeValueById(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Object deleteCodeValueById(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer codeId, final Integer codeValueId, final String jsonAttributeToGetback) { final Integer codeId, final Integer codeValueId, final String jsonAttributeToGetback) {
@@ -263,6 +355,10 @@ public final class CodeHelper extends IntegrationTest {
jsonAttributeToGetback); jsonAttributeToGetback);
} }
// 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 Object updateCodeValue(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Object updateCodeValue(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer codeId, final Integer codeValueId, final String codeValueName, final Integer position, final Integer codeId, final Integer codeValueId, final String codeValueName, final Integer position,
final String jsonAttributeToGetback) { final String jsonAttributeToGetback) {
@@ -271,6 +367,10 @@ public final class CodeHelper extends IntegrationTest {
jsonAttributeToGetback); jsonAttributeToGetback);
} }
// 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 Object updateCodeValue(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Object updateCodeValue(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer codeId, final Integer codeValueId, final String codeValueName, final String description, final Integer position, final Integer codeId, final Integer codeValueId, final String codeValueName, final String description, final Integer position,
final String jsonAttributeToGetback) { final String jsonAttributeToGetback) {
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/system/DatatableHelper.java
+100
View File
@@ -62,21 +62,37 @@ public class DatatableHelper extends IntegrationTest {
this(initializeDefaultRequestSpecification(), initializeDefaultResponseSpecification()); this(initializeDefaultRequestSpecification(), initializeDefaultResponseSpecification());
} }
// 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 DatatableHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public DatatableHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
} }
// 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 <T> T createDatatable(final String json, final String jsonAttributeToGetBack) { public <T> T createDatatable(final String json, final String jsonAttributeToGetBack) {
return Utils.performServerPost(this.requestSpec, this.responseSpec, DATATABLE_URL + "?" + Utils.TENANT_IDENTIFIER, json, return Utils.performServerPost(this.requestSpec, this.responseSpec, DATATABLE_URL + "?" + Utils.TENANT_IDENTIFIER, json,
jsonAttributeToGetBack); jsonAttributeToGetBack);
} }
// 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 String createDatatable(final String apptableName, final boolean multiRow) { public String createDatatable(final String apptableName, final boolean multiRow) {
return Utils.performServerPost(this.requestSpec, this.responseSpec, DATATABLE_URL + "?" + Utils.TENANT_IDENTIFIER, return Utils.performServerPost(this.requestSpec, this.responseSpec, DATATABLE_URL + "?" + Utils.TENANT_IDENTIFIER,
getTestDatatableAsJSON(apptableName, multiRow), "resourceIdentifier"); getTestDatatableAsJSON(apptableName, multiRow), "resourceIdentifier");
} }
// 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 PostDataTablesResponse createDatatable(final String json) { public PostDataTablesResponse createDatatable(final String json) {
final String response = Utils.performServerPost(this.requestSpec, this.responseSpec, DATATABLE_URL + "?" + Utils.TENANT_IDENTIFIER, final String response = Utils.performServerPost(this.requestSpec, this.responseSpec, DATATABLE_URL + "?" + Utils.TENANT_IDENTIFIER,
json); json);
@@ -87,6 +103,10 @@ public class DatatableHelper extends IntegrationTest {
return ok(fineract().dataTables.createDatatable(request)); return ok(fineract().dataTables.createDatatable(request));
} }
// 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 void verifyDatatableCreatedOnServer(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static void verifyDatatableCreatedOnServer(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String generatedDatatableName) { final String generatedDatatableName) {
LOG.info("------------------------------CHECK DATATABLE DETAILS------------------------------------\n"); LOG.info("------------------------------CHECK DATATABLE DETAILS------------------------------------\n");
@@ -99,12 +119,20 @@ public class DatatableHelper extends IntegrationTest {
return ok(fineract().dataTables.getDatatable(dataTableName)); return ok(fineract().dataTables.getDatatable(dataTableName));
} }
// 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 String runDatatableQuery(final String datatableName, final String columnFilter, final String valueFilter, public String runDatatableQuery(final String datatableName, final String columnFilter, final String valueFilter,
final String resultColumns) { final String resultColumns) {
return Utils.performServerGet(this.requestSpec, this.responseSpec, DATATABLE_URL + "/" + datatableName + "/query" + "?columnFilter=" return Utils.performServerGet(this.requestSpec, this.responseSpec, DATATABLE_URL + "/" + datatableName + "/query" + "?columnFilter="
+ columnFilter + "&valueFilter=" + valueFilter + "&resultColumns=" + resultColumns + "&" + Utils.TENANT_IDENTIFIER); + columnFilter + "&valueFilter=" + valueFilter + "&resultColumns=" + resultColumns + "&" + Utils.TENANT_IDENTIFIER);
} }
// 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 Map<String, Object> queryDatatable(String dataTableName, PagedLocalRequestAdvancedQueryData request) { public Map<String, Object> queryDatatable(String dataTableName, PagedLocalRequestAdvancedQueryData request) {
String response = ok(fineract().dataTables.advancedQuery(dataTableName, request)); String response = ok(fineract().dataTables.advancedQuery(dataTableName, request));
return JsonPath.from(response).get(""); return JsonPath.from(response).get("");
@@ -114,23 +142,39 @@ public class DatatableHelper extends IntegrationTest {
return ok(fineract().dataTables.updateDatatable(dataTableName, request)); return ok(fineract().dataTables.updateDatatable(dataTableName, request));
} }
// 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 PutDataTablesResponse updateDatatable(String dataTableName, final String json) { public PutDataTablesResponse updateDatatable(String dataTableName, final String json) {
final String response = Utils.performServerPut(this.requestSpec, this.responseSpec, final String response = Utils.performServerPut(this.requestSpec, this.responseSpec,
DATATABLE_URL + "/" + dataTableName + "?" + Utils.TENANT_IDENTIFIER, json); DATATABLE_URL + "/" + dataTableName + "?" + Utils.TENANT_IDENTIFIER, json);
return GSON.fromJson(response, PutDataTablesResponse.class); return GSON.fromJson(response, PutDataTablesResponse.class);
} }
// 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 String deleteDatatable(final String datatableName) { public String deleteDatatable(final String datatableName) {
return Utils.performServerDelete(this.requestSpec, this.responseSpec, return Utils.performServerDelete(this.requestSpec, this.responseSpec,
DATATABLE_URL + "/" + datatableName + "?" + Utils.TENANT_IDENTIFIER, "resourceIdentifier"); DATATABLE_URL + "/" + datatableName + "?" + Utils.TENANT_IDENTIFIER, "resourceIdentifier");
} }
// 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 <T> T createDatatableEntry(final String datatableName, final Integer apptableId, final boolean genericResultSet, public <T> T createDatatableEntry(final String datatableName, final Integer apptableId, final boolean genericResultSet,
final String json) { final String json) {
return Utils.performServerPost(this.requestSpec, this.responseSpec, DATATABLE_URL + "/" + datatableName + "/" + apptableId return Utils.performServerPost(this.requestSpec, this.responseSpec, DATATABLE_URL + "/" + datatableName + "/" + apptableId
+ "?genericResultSet=" + genericResultSet + "&" + Utils.TENANT_IDENTIFIER, json, ""); + "?genericResultSet=" + genericResultSet + "&" + Utils.TENANT_IDENTIFIER, json, "");
} }
// 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 Integer createDatatableEntry(final String apptableName, final String datatableName, final Integer apptableId, public Integer createDatatableEntry(final String apptableName, final String datatableName, final Integer apptableId,
final boolean genericResultSet, final String dateFormat, final String jsonAttributeToGetBack) { final boolean genericResultSet, final String dateFormat, final String jsonAttributeToGetBack) {
return Utils.performServerPost( return Utils.performServerPost(
@@ -139,6 +183,10 @@ public class DatatableHelper extends IntegrationTest {
getTestDatatableEntryAsJSON(dateFormat), jsonAttributeToGetBack); getTestDatatableEntryAsJSON(dateFormat), jsonAttributeToGetBack);
} }
// 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 PostDataTablesAppTableIdResponse addDatatableEntry(final String datatableName, final Integer apptableId, public PostDataTablesAppTableIdResponse addDatatableEntry(final String datatableName, final Integer apptableId,
final boolean genericResultSet, final String json) { final boolean genericResultSet, final String json) {
final String response = Utils.performServerPost(this.requestSpec, this.responseSpec, DATATABLE_URL + "/" + datatableName + "/" final String response = Utils.performServerPost(this.requestSpec, this.responseSpec, DATATABLE_URL + "/" + datatableName + "/"
@@ -146,11 +194,19 @@ public class DatatableHelper extends IntegrationTest {
return GSON.fromJson(response, PostDataTablesAppTableIdResponse.class); return GSON.fromJson(response, PostDataTablesAppTableIdResponse.class);
} }
// 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 String readDatatableEntry(final String datatableName, final Integer resourceId, final boolean genericResultset) { public String readDatatableEntry(final String datatableName, final Integer resourceId, final boolean genericResultset) {
return Utils.performServerGet(this.requestSpec, this.responseSpec, DATATABLE_URL + "/" + datatableName + "/" + resourceId return Utils.performServerGet(this.requestSpec, this.responseSpec, DATATABLE_URL + "/" + datatableName + "/" + resourceId
+ "?genericResultSet=" + String.valueOf(genericResultset) + "&" + Utils.TENANT_IDENTIFIER); + "?genericResultSet=" + String.valueOf(genericResultset) + "&" + Utils.TENANT_IDENTIFIER);
} }
// 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 <T> T readDatatableEntry(final String datatableName, final Integer resourceId, final boolean genericResultset, public <T> T readDatatableEntry(final String datatableName, final Integer resourceId, final boolean genericResultset,
final Integer datatableResourceId, final String jsonAttributeToGetBack) { final Integer datatableResourceId, final String jsonAttributeToGetBack) {
if (datatableResourceId == null) { if (datatableResourceId == null) {
@@ -164,6 +220,10 @@ public class DatatableHelper extends IntegrationTest {
} }
} }
// 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 Date readDatatableEntry(final String datatableName, final Integer resourceId, final boolean genericResultset, final int position, public Date readDatatableEntry(final String datatableName, final Integer resourceId, final boolean genericResultset, final int position,
final String jsonAttributeToGetBack) { final String jsonAttributeToGetBack) {
final JsonElement jsonElement = Utils.performServerGetArray(this.requestSpec, this.responseSpec, DATATABLE_URL + "/" + datatableName final JsonElement jsonElement = Utils.performServerGetArray(this.requestSpec, this.responseSpec, DATATABLE_URL + "/" + datatableName
@@ -172,18 +232,30 @@ public class DatatableHelper extends IntegrationTest {
return Utils.convertJsonElementAsDate(jsonElement); return Utils.convertJsonElementAsDate(jsonElement);
} }
// 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 <T> T updateDatatableEntry(final String datatableName, final Integer apptableId, final boolean genericResultSet, public <T> T updateDatatableEntry(final String datatableName, final Integer apptableId, final boolean genericResultSet,
final String json) { final String json) {
return Utils.performServerPut(this.requestSpec, this.responseSpec, DATATABLE_URL + "/" + datatableName + "/" + apptableId return Utils.performServerPut(this.requestSpec, this.responseSpec, DATATABLE_URL + "/" + datatableName + "/" + apptableId
+ "?genericResultSet=" + genericResultSet + "&" + Utils.TENANT_IDENTIFIER, json, ""); + "?genericResultSet=" + genericResultSet + "&" + Utils.TENANT_IDENTIFIER, json, "");
} }
// 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 <T> T updateDatatableEntry(final String datatableName, final Integer apptableId, final Integer entryId, public <T> T updateDatatableEntry(final String datatableName, final Integer apptableId, final Integer entryId,
final boolean genericResultSet, final String json) { final boolean genericResultSet, final String json) {
return Utils.performServerPut(this.requestSpec, this.responseSpec, DATATABLE_URL + "/" + datatableName + "/" + apptableId + "/" return Utils.performServerPut(this.requestSpec, this.responseSpec, DATATABLE_URL + "/" + datatableName + "/" + apptableId + "/"
+ entryId + "?genericResultSet=" + genericResultSet + "&" + Utils.TENANT_IDENTIFIER, json, ""); + entryId + "?genericResultSet=" + genericResultSet + "&" + Utils.TENANT_IDENTIFIER, json, "");
} }
// 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 PutDataTablesAppTableIdDatatableIdResponse updateDatatableEntry(final String datatableName, final Integer apptableId, public PutDataTablesAppTableIdDatatableIdResponse updateDatatableEntry(final String datatableName, final Integer apptableId,
final Integer entryId, final String json) { final Integer entryId, final String json) {
final String response = Utils.performServerPut(this.requestSpec, this.responseSpec, DATATABLE_URL + "/" + datatableName + "/" final String response = Utils.performServerPut(this.requestSpec, this.responseSpec, DATATABLE_URL + "/" + datatableName + "/"
@@ -191,6 +263,10 @@ public class DatatableHelper extends IntegrationTest {
return GSON.fromJson(response, PutDataTablesAppTableIdDatatableIdResponse.class); return GSON.fromJson(response, PutDataTablesAppTableIdDatatableIdResponse.class);
} }
// 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 PutDataTablesAppTableIdDatatableIdResponse updateDatatableEntry(final String datatableName, final Integer apptableId, public PutDataTablesAppTableIdDatatableIdResponse updateDatatableEntry(final String datatableName, final Integer apptableId,
final String json) { final String json) {
final String response = Utils.performServerPut(this.requestSpec, this.responseSpec, final String response = Utils.performServerPut(this.requestSpec, this.responseSpec,
@@ -198,12 +274,20 @@ public class DatatableHelper extends IntegrationTest {
return GSON.fromJson(response, PutDataTablesAppTableIdDatatableIdResponse.class); return GSON.fromJson(response, PutDataTablesAppTableIdDatatableIdResponse.class);
} }
// 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 Object deleteDatatableEntries(final String datatableName, final Integer apptableId, String jsonAttributeToGetBack) { public Object deleteDatatableEntries(final String datatableName, final Integer apptableId, String jsonAttributeToGetBack) {
final String deleteEntryUrl = DATATABLE_URL + "/" + datatableName + "/" + apptableId + "?genericResultSet=true" + "&" final String deleteEntryUrl = DATATABLE_URL + "/" + datatableName + "/" + apptableId + "?genericResultSet=true" + "&"
+ Utils.TENANT_IDENTIFIER; + Utils.TENANT_IDENTIFIER;
return Utils.performServerDelete(this.requestSpec, this.responseSpec, deleteEntryUrl, jsonAttributeToGetBack); return Utils.performServerDelete(this.requestSpec, this.responseSpec, deleteEntryUrl, jsonAttributeToGetBack);
} }
// 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 String getTestDatatableAsJSON(final String apptableName, final String datatableName, final String codeName, public static String getTestDatatableAsJSON(final String apptableName, final String datatableName, final String codeName,
final boolean multiRow) { final boolean multiRow) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
@@ -231,6 +315,10 @@ public class DatatableHelper extends IntegrationTest {
return requestJsonString; return requestJsonString;
} }
// 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 String getTestDatatableAsJSON(final String apptableName, final boolean multiRow) { public static String getTestDatatableAsJSON(final String apptableName, final boolean multiRow) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
final List<HashMap<String, Object>> datatableColumnsList = new ArrayList<>(); final List<HashMap<String, Object>> datatableColumnsList = new ArrayList<>();
@@ -248,6 +336,10 @@ public class DatatableHelper extends IntegrationTest {
return requestJsonString; return requestJsonString;
} }
// 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 String getTestDatatableEntryAsJSON(final String dateFormat) { public static String getTestDatatableEntryAsJSON(final String dateFormat) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("Spouse Name", Utils.randomStringGenerator("Spouse_Name_", 5)); map.put("Spouse Name", Utils.randomStringGenerator("Spouse_Name_", 5));
@@ -261,6 +353,10 @@ public class DatatableHelper extends IntegrationTest {
return requestJsonString; return requestJsonString;
} }
// 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 HashMap<String, Object> addDatatableColumn(List<HashMap<String, Object>> datatableColumnsList, String columnName, public static HashMap<String, Object> addDatatableColumn(List<HashMap<String, Object>> datatableColumnsList, String columnName,
String columnType, boolean isMandatory, Integer length, String codeName) { String columnType, boolean isMandatory, Integer length, String codeName) {
final HashMap<String, Object> datatableColumnMap = new HashMap<>(); final HashMap<String, Object> datatableColumnMap = new HashMap<>();
@@ -281,6 +377,10 @@ public class DatatableHelper extends IntegrationTest {
return datatableColumnMap; return datatableColumnMap;
} }
// 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 List<HashMap<String, Object>> addDatatableColumnWithUniqueAndIndex(List<HashMap<String, Object>> datatableColumnsList, public static List<HashMap<String, Object>> addDatatableColumnWithUniqueAndIndex(List<HashMap<String, Object>> datatableColumnsList,
String columnName, String columnType, boolean isMandatory, Integer length, String codeName, boolean isUnique, String columnName, String columnType, boolean isMandatory, Integer length, String codeName, boolean isUnique,
boolean isIndexed) { boolean isIndexed) {
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/xbrl/XBRLIntegrationTestHelper.java
+12
View File
@@ -33,17 +33,29 @@ public class XBRLIntegrationTestHelper {
private static final String GET_TAXONOMY_LIST_URL = "/fineract-provider/api/v1/mixtaxonomy?" + Utils.TENANT_IDENTIFIER; private static final String GET_TAXONOMY_LIST_URL = "/fineract-provider/api/v1/mixtaxonomy?" + Utils.TENANT_IDENTIFIER;
private static final String TAXONOMY_MAPPING_URL = "/fineract-provider/api/v1/mixmapping?" + Utils.TENANT_IDENTIFIER; private static final String TAXONOMY_MAPPING_URL = "/fineract-provider/api/v1/mixmapping?" + Utils.TENANT_IDENTIFIER;
// 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 XBRLIntegrationTestHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public XBRLIntegrationTestHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
} }
// 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 ArrayList getTaxonomyList() { public ArrayList getTaxonomyList() {
final ArrayList response = Utils.performServerGet(this.requestSpec, this.responseSpec, GET_TAXONOMY_LIST_URL, ""); final ArrayList response = Utils.performServerGet(this.requestSpec, this.responseSpec, GET_TAXONOMY_LIST_URL, "");
return response; return response;
} }
// 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 HashMap getTaxonomyMapping() { public HashMap getTaxonomyMapping() {
final HashMap response = Utils.performServerGet(this.requestSpec, this.responseSpec, TAXONOMY_MAPPING_URL, "config"); final HashMap response = Utils.performServerGet(this.requestSpec, this.responseSpec, TAXONOMY_MAPPING_URL, "config");
return response; return response;
integration-tests/src/test/java/org/apache/fineract/integrationtests/guarantor/GuarantorHelper.java
+28
View File
@@ -33,36 +33,64 @@ public class GuarantorHelper {
private final RequestSpecification requestSpec; private final RequestSpecification requestSpec;
private final ResponseSpecification responseSpec; private final ResponseSpecification responseSpec;
// 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 GuarantorHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public GuarantorHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
} }
// 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 Integer createGuarantor(final Integer loanId, final String guarantorJSON) { public Integer createGuarantor(final Integer loanId, final String guarantorJSON) {
return Utils.performServerPost(this.requestSpec, this.responseSpec, LOAN_URL + loanId + GUARANTOR_API_URL + TENANT, guarantorJSON, return Utils.performServerPost(this.requestSpec, this.responseSpec, LOAN_URL + loanId + GUARANTOR_API_URL + TENANT, guarantorJSON,
CommonConstants.RESPONSE_RESOURCE_ID); CommonConstants.RESPONSE_RESOURCE_ID);
} }
// 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 HashMap updateGuarantor(final Integer guarantorId, final Integer loanId, final String guarantorJSON) { public HashMap updateGuarantor(final Integer guarantorId, final Integer loanId, final String guarantorJSON) {
return Utils.performServerPut(this.requestSpec, this.responseSpec, LOAN_URL + loanId + GUARANTOR_API_URL + guarantorId + TENANT, return Utils.performServerPut(this.requestSpec, this.responseSpec, LOAN_URL + loanId + GUARANTOR_API_URL + guarantorId + TENANT,
guarantorJSON, CommonConstants.RESPONSE_CHANGES); guarantorJSON, CommonConstants.RESPONSE_CHANGES);
} }
// 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 HashMap deleteGuarantor(final Integer guarantorId, final Integer fundId, final Integer loanId) { public HashMap deleteGuarantor(final Integer guarantorId, final Integer fundId, final Integer loanId) {
return Utils.performServerDelete(this.requestSpec, this.responseSpec, return Utils.performServerDelete(this.requestSpec, this.responseSpec,
LOAN_URL + loanId + GUARANTOR_API_URL + guarantorId + TENANT + "&guarantorFundingId=" + fundId, ""); LOAN_URL + loanId + GUARANTOR_API_URL + guarantorId + TENANT + "&guarantorFundingId=" + fundId, "");
} }
// 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 HashMap deleteGuarantor(final Integer guarantorId, final Integer loanId) { public HashMap deleteGuarantor(final Integer guarantorId, final Integer loanId) {
return Utils.performServerDelete(this.requestSpec, this.responseSpec, LOAN_URL + loanId + GUARANTOR_API_URL + guarantorId + TENANT, return Utils.performServerDelete(this.requestSpec, this.responseSpec, LOAN_URL + loanId + GUARANTOR_API_URL + guarantorId + TENANT,
""); "");
} }
// 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 Object getGuarantor(final Integer guarantorId, final Integer loanId, final String jsonToGetBack) { public Object getGuarantor(final Integer guarantorId, final Integer loanId, final String jsonToGetBack) {
return Utils.performServerGet(this.requestSpec, this.responseSpec, LOAN_URL + loanId + GUARANTOR_API_URL + guarantorId + TENANT, return Utils.performServerGet(this.requestSpec, this.responseSpec, LOAN_URL + loanId + GUARANTOR_API_URL + guarantorId + TENANT,
jsonToGetBack); jsonToGetBack);
} }
// 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 List getAllGuarantor(final Integer loanId) { public List getAllGuarantor(final Integer loanId) {
return Utils.performServerGet(this.requestSpec, this.responseSpec, LOAN_URL + loanId + GUARANTOR_API_URL + TENANT, ""); return Utils.performServerGet(this.requestSpec, this.responseSpec, LOAN_URL + loanId + GUARANTOR_API_URL + TENANT, "");
} }
integration-tests/src/test/java/org/apache/fineract/integrationtests/inlinecob/InlineLoanCOBHelper.java
+16
View File
@@ -33,11 +33,19 @@ public class InlineLoanCOBHelper extends IntegrationTest {
private final RequestSpecification requestSpec; private final RequestSpecification requestSpec;
private final ResponseSpecification responseSpec; private final ResponseSpecification responseSpec;
// 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 InlineLoanCOBHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public InlineLoanCOBHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
} }
// 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 String executeInlineCOB(List<Long> loanIds) { public String executeInlineCOB(List<Long> loanIds) {
final String EXECUTE_INLINE_COB_API = "/fineract-provider/api/v1/jobs/LOAN_COB/inline"; final String EXECUTE_INLINE_COB_API = "/fineract-provider/api/v1/jobs/LOAN_COB/inline";
log.info("------------------EXECUTE INLINE COB----------------------"); log.info("------------------EXECUTE INLINE COB----------------------");
@@ -45,6 +53,10 @@ public class InlineLoanCOBHelper extends IntegrationTest {
return Utils.performServerPost(requestSpec, responseSpec, EXECUTE_INLINE_COB_API, buildInlineCOBRequest(loanIds)); return Utils.performServerPost(requestSpec, responseSpec, EXECUTE_INLINE_COB_API, buildInlineCOBRequest(loanIds));
} }
// 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 String executeInlineCOB(List<Long> loanIds, String responseAttribute) { public String executeInlineCOB(List<Long> loanIds, String responseAttribute) {
final String EXECUTE_INLINE_COB_API = "/fineract-provider/api/v1/jobs/LOAN_COB/inline"; final String EXECUTE_INLINE_COB_API = "/fineract-provider/api/v1/jobs/LOAN_COB/inline";
log.info("------------------EXECUTE INLINE COB----------------------"); log.info("------------------EXECUTE INLINE COB----------------------");
@@ -53,6 +65,10 @@ public class InlineLoanCOBHelper extends IntegrationTest {
responseAttribute); responseAttribute);
} }
// 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)
private static String buildInlineCOBRequest(List<Long> loanIds) { private static String buildInlineCOBRequest(List<Long> loanIds) {
final HashMap<String, List<Long>> map = new HashMap<>(); final HashMap<String, List<Long>> map = new HashMap<>();
map.put("loanIds", loanIds); map.put("loanIds", loanIds);
integration-tests/src/test/java/org/apache/fineract/integrationtests/interoperation/InteropHelper.java
+84
View File
@@ -66,6 +66,10 @@ public class InteropHelper {
private final BigDecimal amount; private final BigDecimal amount;
private final BigDecimal fee; private final BigDecimal fee;
// 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 InteropHelper(RequestSpecification requestSpec, ResponseSpecification responseSpec, String tenantId, String accountExternalId, public InteropHelper(RequestSpecification requestSpec, ResponseSpecification responseSpec, String tenantId, String accountExternalId,
String transactionCode, String currency, BigDecimal amount, BigDecimal fee) { String transactionCode, String currency, BigDecimal amount, BigDecimal fee) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
@@ -78,11 +82,19 @@ public class InteropHelper {
this.fee = fee; this.fee = fee;
} }
// 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 InteropHelper(RequestSpecification requestSpec, ResponseSpecification responseSpec, String accountExternalId, public InteropHelper(RequestSpecification requestSpec, ResponseSpecification responseSpec, String accountExternalId,
String transactionCode) { String transactionCode) {
this(requestSpec, responseSpec, Utils.DEFAULT_TENANT, accountExternalId, transactionCode, "TZS", BigDecimal.TEN, BigDecimal.ONE); this(requestSpec, responseSpec, Utils.DEFAULT_TENANT, accountExternalId, transactionCode, "TZS", BigDecimal.TEN, BigDecimal.ONE);
} }
// 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 InteropHelper(RequestSpecification requestSpec, ResponseSpecification responseSpec) { public InteropHelper(RequestSpecification requestSpec, ResponseSpecification responseSpec) {
this(requestSpec, responseSpec, UUID.randomUUID().toString(), UUID.randomUUID().toString()); this(requestSpec, responseSpec, UUID.randomUUID().toString(), UUID.randomUUID().toString());
} }
@@ -134,6 +146,10 @@ public class InteropHelper {
/** /**
* @return response json * @return response json
*/ */
// 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 String getHealth() { public String getHealth() {
String url = buildUrl(HEALTH_URL); String url = buildUrl(HEALTH_URL);
LOG.debug("Calling Interoperable GET Health: {}", url); LOG.debug("Calling Interoperable GET Health: {}", url);
@@ -146,6 +162,10 @@ public class InteropHelper {
/** /**
* @return response 'accountId' attribute * @return response 'accountId' attribute
*/ */
// 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 String getParty(InteropIdentifierType idType, String idValue) { public String getParty(InteropIdentifierType idType, String idValue) {
String url = buildUrl(PARTIES_URL + '/' + idType + '/' + idValue); String url = buildUrl(PARTIES_URL + '/' + idType + '/' + idValue);
LOG.debug("Calling Interoperable GET Party: {}", url); LOG.debug("Calling Interoperable GET Party: {}", url);
@@ -158,6 +178,10 @@ public class InteropHelper {
/** /**
* @return response 'accountId' attribute * @return response 'accountId' attribute
*/ */
// 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 String postParty(InteropIdentifierType idType, String idValue) { public String postParty(InteropIdentifierType idType, String idValue) {
String url = buildUrl(PARTIES_URL + '/' + idType + '/' + idValue); String url = buildUrl(PARTIES_URL + '/' + idType + '/' + idValue);
String request = buildPartiesJson(); String request = buildPartiesJson();
@@ -171,6 +195,10 @@ public class InteropHelper {
/** /**
* @return response 'accountId' attribute * @return response 'accountId' attribute
*/ */
// 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 String deleteParty(InteropIdentifierType idType, String idValue) { public String deleteParty(InteropIdentifierType idType, String idValue) {
String url = buildUrl(PARTIES_URL + '/' + idType + '/' + idValue); String url = buildUrl(PARTIES_URL + '/' + idType + '/' + idValue);
String request = buildPartiesJson(); String request = buildPartiesJson();
@@ -181,6 +209,10 @@ public class InteropHelper {
return getJsonAttribute(response, InteropUtil.PARAM_ACCOUNT_ID); return getJsonAttribute(response, InteropUtil.PARAM_ACCOUNT_ID);
} }
// 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)
private String buildPartiesJson() { private String buildPartiesJson() {
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
map.put(InteropUtil.PARAM_ACCOUNT_ID, accountExternalId); map.put(InteropUtil.PARAM_ACCOUNT_ID, accountExternalId);
@@ -190,6 +222,10 @@ public class InteropHelper {
/** /**
* @return response 'requestCode' attribute * @return response 'requestCode' attribute
*/ */
// 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 String getTransactionRequest(String requestCode) { public String getTransactionRequest(String requestCode) {
String url = buildUrl(TRANSACTIONS_URL + '/' + transactionCode + '/' + REQUESTS_URL_PARAM + '/' + requestCode); String url = buildUrl(TRANSACTIONS_URL + '/' + transactionCode + '/' + REQUESTS_URL_PARAM + '/' + requestCode);
LOG.debug("Calling Interoperable GET Request: {}", url); LOG.debug("Calling Interoperable GET Request: {}", url);
@@ -204,6 +240,10 @@ public class InteropHelper {
* PAYEE role is not valid for transaction request * PAYEE role is not valid for transaction request
* @return response json * @return response json
*/ */
// 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 String postTransactionRequest(String requestCode, InteropTransactionRole role) { public String postTransactionRequest(String requestCode, InteropTransactionRole role) {
String url = buildUrl(REQUESTS_URL); String url = buildUrl(REQUESTS_URL);
String request = buildTransactionRequestJson(requestCode, role); String request = buildTransactionRequestJson(requestCode, role);
@@ -214,6 +254,10 @@ public class InteropHelper {
return response; return response;
} }
// 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 String postTransactionRequest(String requestCode, InteropTransactionRole role, String request) { public String postTransactionRequest(String requestCode, InteropTransactionRole role, String request) {
String url = buildUrl(REQUESTS_URL); String url = buildUrl(REQUESTS_URL);
LOG.debug("Calling Interoperable POST Request: {}, body: {}", url, request); LOG.debug("Calling Interoperable POST Request: {}, body: {}", url, request);
@@ -223,6 +267,10 @@ public class InteropHelper {
return response; return response;
} }
// 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)
private String buildTransactionRequestJson(String requestCode, InteropTransactionRole role) { private String buildTransactionRequestJson(String requestCode, InteropTransactionRole role) {
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
map.put(InteropUtil.PARAM_TRANSACTION_CODE, transactionCode); map.put(InteropUtil.PARAM_TRANSACTION_CODE, transactionCode);
@@ -247,6 +295,10 @@ public class InteropHelper {
/** /**
* @return response 'quoteCode' attribute * @return response 'quoteCode' attribute
*/ */
// 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 String getQuote(String quoteCode) { public String getQuote(String quoteCode) {
String url = buildUrl(TRANSACTIONS_URL + '/' + transactionCode + '/' + QUOTES_URL_PARAM + '/' + quoteCode); String url = buildUrl(TRANSACTIONS_URL + '/' + transactionCode + '/' + QUOTES_URL_PARAM + '/' + quoteCode);
LOG.debug("Calling Interoperable GET Quote: {}", url); LOG.debug("Calling Interoperable GET Quote: {}", url);
@@ -259,6 +311,10 @@ public class InteropHelper {
/** /**
* @return response json * @return response json
*/ */
// 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 String postQuote(String quoteCode, InteropTransactionRole role) { public String postQuote(String quoteCode, InteropTransactionRole role) {
String url = buildUrl(QUOTES_URL); String url = buildUrl(QUOTES_URL);
String request = buildQuoteJson(quoteCode, role); String request = buildQuoteJson(quoteCode, role);
@@ -269,6 +325,10 @@ public class InteropHelper {
return response; return response;
} }
// 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)
private String buildQuoteJson(String quoteCode, InteropTransactionRole role) { private String buildQuoteJson(String quoteCode, InteropTransactionRole role) {
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
map.put(InteropUtil.PARAM_TRANSACTION_CODE, transactionCode); map.put(InteropUtil.PARAM_TRANSACTION_CODE, transactionCode);
@@ -295,6 +355,10 @@ public class InteropHelper {
/** /**
* @return response 'transferCode' attribute * @return response 'transferCode' attribute
*/ */
// 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 String getTransfer(String transferCode) { public String getTransfer(String transferCode) {
String url = buildUrl(TRANSACTIONS_URL + '/' + transactionCode + '/' + TRANSFERS_URL_PARAM + '/' + transferCode); String url = buildUrl(TRANSACTIONS_URL + '/' + transactionCode + '/' + TRANSFERS_URL_PARAM + '/' + transferCode);
LOG.debug("Calling Interoperable GET Transfer: {}", url); LOG.debug("Calling Interoperable GET Transfer: {}", url);
@@ -307,6 +371,10 @@ public class InteropHelper {
/** /**
* @return response json * @return response json
*/ */
// 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 String prepareTransfer(String transferCode) { public String prepareTransfer(String transferCode) {
return postTransfer(transferCode, InteropTransferActionType.PREPARE, InteropTransactionRole.PAYER); return postTransfer(transferCode, InteropTransferActionType.PREPARE, InteropTransactionRole.PAYER);
} }
@@ -314,6 +382,10 @@ public class InteropHelper {
/** /**
* @return response json * @return response json
*/ */
// 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 String createTransfer(String transferCode, InteropTransactionRole role) { public String createTransfer(String transferCode, InteropTransactionRole role) {
return postTransfer(transferCode, InteropTransferActionType.CREATE, role); return postTransfer(transferCode, InteropTransferActionType.CREATE, role);
} }
@@ -321,6 +393,10 @@ public class InteropHelper {
/** /**
* @return response json * @return response json
*/ */
// 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 String postTransfer(String transferCode, InteropTransferActionType action, InteropTransactionRole role) { public String postTransfer(String transferCode, InteropTransferActionType action, InteropTransactionRole role) {
String url = buildUrl(TRANSFERS_URL) + '&' + PARAM_TRANSFER_ACTION + '=' + action; String url = buildUrl(TRANSFERS_URL) + '&' + PARAM_TRANSFER_ACTION + '=' + action;
String request = buildTransferJson(transferCode, role); String request = buildTransferJson(transferCode, role);
@@ -331,6 +407,10 @@ public class InteropHelper {
return response; return response;
} }
// 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 String postTransferMissingAction(String transferCode, InteropTransactionRole role) { public String postTransferMissingAction(String transferCode, InteropTransactionRole role) {
String url = buildUrl(TRANSFERS_URL); String url = buildUrl(TRANSFERS_URL);
String request = buildTransferJson(transferCode, role); String request = buildTransferJson(transferCode, role);
@@ -341,6 +421,10 @@ public class InteropHelper {
return response; return response;
} }
// 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)
private String buildTransferJson(String transferCode, InteropTransactionRole role) { private String buildTransferJson(String transferCode, InteropTransactionRole role) {
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
map.put(InteropUtil.PARAM_TRANSACTION_CODE, transactionCode); map.put(InteropUtil.PARAM_TRANSACTION_CODE, transactionCode);
integration-tests/src/test/java/org/apache/fineract/integrationtests/organization/teller/CashierTransactionsHelper.java
+32
View File
@@ -39,6 +39,10 @@ public class CashierTransactionsHelper extends IntegrationTest {
private static final String CREATE_TELLER_URL = "/fineract-provider/api/v1/tellers"; private static final String CREATE_TELLER_URL = "/fineract-provider/api/v1/tellers";
private static final Logger LOG = LoggerFactory.getLogger(CashierTransactionsHelper.class); private static final Logger LOG = LoggerFactory.getLogger(CashierTransactionsHelper.class);
// 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 CashierTransactionsHelper(final RequestSpecification requestSpecification, final ResponseSpecification responseSpecification) { public CashierTransactionsHelper(final RequestSpecification requestSpecification, final ResponseSpecification responseSpecification) {
this.requestSpecification = requestSpecification; this.requestSpecification = requestSpecification;
this.responseSpecification = responseSpecification; this.responseSpecification = responseSpecification;
@@ -55,10 +59,18 @@ public class CashierTransactionsHelper extends IntegrationTest {
sortOrder)); sortOrder));
} }
// 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 Integer createTeller(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static Integer createTeller(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
return (Integer) createTellerWithJson(requestSpec, responseSpec, createTellerAsJSON()).get("resourceId"); return (Integer) createTellerWithJson(requestSpec, responseSpec, createTellerAsJSON()).get("resourceId");
} }
// 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 Map<String, Object> createTellerWithJson(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Map<String, Object> createTellerWithJson(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String json) { final String json) {
@@ -66,6 +78,10 @@ public class CashierTransactionsHelper extends IntegrationTest {
return Utils.performServerPost(requestSpec, responseSpec, url, json, ""); return Utils.performServerPost(requestSpec, responseSpec, url, json, "");
} }
// 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 String createTellerAsJSON() { public static String createTellerAsJSON() {
final Map<String, Object> map = getMapWithStartDate(); final Map<String, Object> map = getMapWithStartDate();
@@ -79,6 +95,10 @@ public class CashierTransactionsHelper extends IntegrationTest {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 Map<String, Object> getMapWithStartDate() { public static Map<String, Object> getMapWithStartDate() {
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
@@ -89,6 +109,10 @@ public class CashierTransactionsHelper extends IntegrationTest {
return map; return map;
} }
// 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 Integer createCashier(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static Integer createCashier(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
return (Integer) createCashierWithJson(requestSpec, responseSpec, createCashierAsJSON()).get("resourceId"); return (Integer) createCashierWithJson(requestSpec, responseSpec, createCashierAsJSON()).get("resourceId");
} }
@@ -99,6 +123,10 @@ public class CashierTransactionsHelper extends IntegrationTest {
return Utils.performServerPost(requestSpec, responseSpec, url, json, ""); return Utils.performServerPost(requestSpec, responseSpec, url, json, "");
} }
// 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 String createCashierAsJSON() { public static String createCashierAsJSON() {
final Map<String, Object> map = getMapWithDates(); final Map<String, Object> map = getMapWithDates();
@@ -109,6 +137,10 @@ public class CashierTransactionsHelper extends IntegrationTest {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 Map<String, Object> getMapWithDates() { public static Map<String, Object> getMapWithDates() {
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
integration-tests/src/test/java/org/apache/fineract/integrationtests/support/instancemode/InstanceModeHelper.java
+4
View File
@@ -30,6 +30,10 @@ public class InstanceModeHelper {
private static final Gson GSON = new JSON().getGson(); private static final Gson GSON = new JSON().getGson();
// 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 void changeMode(RequestSpecification requestSpec, ResponseSpecification responseSpec, boolean readEnabled, public static void changeMode(RequestSpecification requestSpec, ResponseSpecification responseSpec, boolean readEnabled,
boolean writeEnabled, boolean batchWorkerEnabled, boolean batchManagerEnabled) { boolean writeEnabled, boolean batchWorkerEnabled, boolean batchManagerEnabled) {
ChangeInstanceModeRequest request = new ChangeInstanceModeRequest().readEnabled(readEnabled).writeEnabled(writeEnabled) ChangeInstanceModeRequest request = new ChangeInstanceModeRequest().readEnabled(readEnabled).writeEnabled(writeEnabled)
integration-tests/src/test/java/org/apache/fineract/integrationtests/useradministration/roles/RolesHelper.java
+40
View File
@@ -49,10 +49,18 @@ public final class RolesHelper extends IntegrationTest {
private static final Gson GSON = new JSON().getGson(); private static final Gson GSON = new JSON().getGson();
// 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 Integer createRole(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static Integer createRole(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
return Utils.performServerPost(requestSpec, responseSpec, CREATE_ROLE_URL, getTestCreateRoleAsJSON(), "resourceId"); return Utils.performServerPost(requestSpec, responseSpec, CREATE_ROLE_URL, getTestCreateRoleAsJSON(), "resourceId");
} }
// 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 String getTestCreateRoleAsJSON() { public static String getTestCreateRoleAsJSON() {
final HashMap<String, String> map = new HashMap<>(); final HashMap<String, String> map = new HashMap<>();
map.put("name", Utils.uniqueRandomStringGenerator("Role_Name_", 5)); map.put("name", Utils.uniqueRandomStringGenerator("Role_Name_", 5));
@@ -60,33 +68,57 @@ public final class RolesHelper extends IntegrationTest {
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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 HashMap<String, Object> getRoleDetails(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static HashMap<String, Object> getRoleDetails(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer roleId) { final Integer roleId) {
final String GET_ROLE_URL = "/fineract-provider/api/v1/roles/" + roleId + "?" + Utils.TENANT_IDENTIFIER; final String GET_ROLE_URL = "/fineract-provider/api/v1/roles/" + roleId + "?" + Utils.TENANT_IDENTIFIER;
return Utils.performServerGet(requestSpec, responseSpec, GET_ROLE_URL, ""); return Utils.performServerGet(requestSpec, responseSpec, GET_ROLE_URL, "");
} }
// 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 Integer disableRole(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer disableRole(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer roleId) { final Integer roleId) {
return Utils.performServerPost(requestSpec, responseSpec, createRoleOperationURL(DISABLE_ROLE_COMMAND, roleId), "", "resourceId"); return Utils.performServerPost(requestSpec, responseSpec, createRoleOperationURL(DISABLE_ROLE_COMMAND, roleId), "", "resourceId");
} }
// 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 Integer enableRole(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer enableRole(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer roleId) { final Integer roleId) {
return Utils.performServerPost(requestSpec, responseSpec, createRoleOperationURL(ENABLE_ROLE_COMMAND, roleId), "", "resourceId"); return Utils.performServerPost(requestSpec, responseSpec, createRoleOperationURL(ENABLE_ROLE_COMMAND, roleId), "", "resourceId");
} }
// 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 Integer deleteRole(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer deleteRole(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer roleId) { final Integer roleId) {
return Utils.performServerDelete(requestSpec, responseSpec, createRoleOperationURL(ENABLE_ROLE_COMMAND, roleId), "resourceId"); return Utils.performServerDelete(requestSpec, responseSpec, createRoleOperationURL(ENABLE_ROLE_COMMAND, roleId), "resourceId");
} }
// 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 String addPermissionsToRole(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static String addPermissionsToRole(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer roleId, final Map<String, Boolean> permissionMap) { final Integer roleId, final Map<String, Boolean> permissionMap) {
return Utils.performServerPut(requestSpec, responseSpec, ROLE_URL + "/" + roleId + "/permissions?" + Utils.TENANT_IDENTIFIER, return Utils.performServerPut(requestSpec, responseSpec, ROLE_URL + "/" + roleId + "/permissions?" + Utils.TENANT_IDENTIFIER,
getAddPermissionsToRoleJSON(permissionMap)); getAddPermissionsToRoleJSON(permissionMap));
} }
// 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 List<PermissionData> getPermissions(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static List<PermissionData> getPermissions(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
boolean makerCheckerable) { boolean makerCheckerable) {
String response = Utils.performServerGet(requestSpec, responseSpec, String response = Utils.performServerGet(requestSpec, responseSpec,
@@ -99,12 +131,20 @@ public final class RolesHelper extends IntegrationTest {
return ok(fineract().permissions.updatePermissionsDetails(request)); return ok(fineract().permissions.updatePermissionsDetails(request));
} }
// 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)
private static String getAddPermissionsToRoleJSON(Map<String, Boolean> permissionMap) { private static String getAddPermissionsToRoleJSON(Map<String, Boolean> permissionMap) {
final HashMap<String, Map<String, Boolean>> map = new HashMap<>(); final HashMap<String, Map<String, Boolean>> map = new HashMap<>();
map.put("permissions", permissionMap); map.put("permissions", permissionMap);
return new Gson().toJson(map); return new Gson().toJson(map);
} }
// 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)
private static String createRoleOperationURL(final String command, final Integer roleId) { private static String createRoleOperationURL(final String command, final Integer roleId) {
return ROLE_URL + "/" + roleId + "?command=" + command + "&" + Utils.TENANT_IDENTIFIER; return ROLE_URL + "/" + roleId + "?command=" + command + "&" + Utils.TENANT_IDENTIFIER;
} }
integration-tests/src/test/java/org/apache/fineract/integrationtests/useradministration/users/UserHelper.java
+76
View File
@@ -51,23 +51,39 @@ public final class UserHelper {
private UserHelper() {} private UserHelper() {}
// 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 Integer createUser(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, int roleId, public static Integer createUser(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, int roleId,
int staffId) { int staffId) {
return Utils.performServerPost(requestSpec, responseSpec, CREATE_USER_URL, getTestCreateUserAsJSON(roleId, staffId), "resourceId"); return Utils.performServerPost(requestSpec, responseSpec, CREATE_USER_URL, getTestCreateUserAsJSON(roleId, staffId), "resourceId");
} }
// 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 Object createUser(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, int roleId, public static Object createUser(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, int roleId,
int staffId, String username, String attribute) { int staffId, String username, String attribute) {
return Utils.performServerPost(requestSpec, responseSpec, CREATE_USER_URL, getTestCreateUserAsJSON(roleId, staffId, username), return Utils.performServerPost(requestSpec, responseSpec, CREATE_USER_URL, getTestCreateUserAsJSON(roleId, staffId, username),
attribute); attribute);
} }
// 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 Object createUser(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, int roleId, public static Object createUser(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, int roleId,
int staffId, String username, String password, String attribute) { int staffId, String username, String password, String attribute) {
return Utils.performServerPost(requestSpec, responseSpec, CREATE_USER_URL, return Utils.performServerPost(requestSpec, responseSpec, CREATE_USER_URL,
getTestCreateUserAsJSON(roleId, staffId, username, password), attribute); getTestCreateUserAsJSON(roleId, staffId, username, password), attribute);
} }
// 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 PostUsersResponse createUser(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static PostUsersResponse createUser(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
PostUsersRequest request) { PostUsersRequest request) {
String requestBody = GSON.toJson(request); String requestBody = GSON.toJson(request);
@@ -75,6 +91,10 @@ public final class UserHelper {
return GSON.fromJson(response, PostUsersResponse.class); return GSON.fromJson(response, PostUsersResponse.class);
} }
// 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 JsonObject createUserWithJsonResponse(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static JsonObject createUserWithJsonResponse(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
PostUsersRequest request) { PostUsersRequest request) {
String requestBody = GSON.toJson(request); String requestBody = GSON.toJson(request);
@@ -82,12 +102,20 @@ public final class UserHelper {
return JsonParser.parseString(jsonResponse).getAsJsonObject(); return JsonParser.parseString(jsonResponse).getAsJsonObject();
} }
// 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 Object createUserForSelfService(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Object createUserForSelfService(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
int roleId, int staffId, int clientId, String attribute) { int roleId, int staffId, int clientId, String attribute) {
return Utils.performServerPost(requestSpec, responseSpec, CREATE_USER_URL, return Utils.performServerPost(requestSpec, responseSpec, CREATE_USER_URL,
getTestCreateUserAsJSONForSelfService(roleId, staffId, clientId), attribute); getTestCreateUserAsJSONForSelfService(roleId, staffId, clientId), attribute);
} }
// 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 Integer getUserId(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, String userName) { public static Integer getUserId(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, String userName) {
String json = Utils.performServerGet(requestSpec, responseSpec, CREATE_USER_URL, null); String json = Utils.performServerGet(requestSpec, responseSpec, CREATE_USER_URL, null);
Assertions.assertNotNull(json); Assertions.assertNotNull(json);
@@ -102,6 +130,10 @@ public final class UserHelper {
return null; return null;
} }
// 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 String getTestCreateUserAsJSON(int roleId, int staffId) { public static String getTestCreateUserAsJSON(int roleId, int staffId) {
return "{ \"username\": \"" + Utils.uniqueRandomStringGenerator("User_Name_", 3) return "{ \"username\": \"" + Utils.uniqueRandomStringGenerator("User_Name_", 3)
+ "\", \"firstname\": \"Test\", \"lastname\": \"User\", \"email\": \"whatever@mifos.org\"," + "\", \"firstname\": \"Test\", \"lastname\": \"User\", \"email\": \"whatever@mifos.org\","
@@ -109,12 +141,20 @@ public final class UserHelper {
+ "\"], \"sendPasswordToEmail\": false}"; + "\"], \"sendPasswordToEmail\": false}";
} }
// 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)
private static String getTestCreateUserAsJSON(int roleId, int staffId, String username) { private static String getTestCreateUserAsJSON(int roleId, int staffId, String username) {
return "{ \"username\": \"" + username + "\", \"firstname\": \"Test\", \"lastname\": \"User\", \"email\": \"whatever@mifos.org\"," return "{ \"username\": \"" + username + "\", \"firstname\": \"Test\", \"lastname\": \"User\", \"email\": \"whatever@mifos.org\","
+ " \"officeId\": \"1\", \"staffId\": " + "\"" + staffId + "\",\"roles\": [\"" + roleId + " \"officeId\": \"1\", \"staffId\": " + "\"" + staffId + "\",\"roles\": [\"" + roleId
+ "\"], \"sendPasswordToEmail\": false}"; + "\"], \"sendPasswordToEmail\": false}";
} }
// 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)
private static String getTestCreateUserAsJSON(int roleId, int staffId, String username, String password) { private static String getTestCreateUserAsJSON(int roleId, int staffId, String username, String password) {
return "{ \"username\": \"" + username + "\", \"firstname\": \"Test\", \"lastname\": \"User\", \"email\": \"whatever@mifos.org\"," return "{ \"username\": \"" + username + "\", \"firstname\": \"Test\", \"lastname\": \"User\", \"email\": \"whatever@mifos.org\","
+ " \"officeId\": \"1\", \"staffId\": " + "\"" + staffId + "\",\"roles\": [\"" + roleId + " \"officeId\": \"1\", \"staffId\": " + "\"" + staffId + "\",\"roles\": [\"" + roleId
@@ -122,11 +162,19 @@ public final class UserHelper {
+ "\"}"; + "\"}";
} }
// 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)
private static String getTestUpdateUserAsJSON(String username) { private static String getTestUpdateUserAsJSON(String username) {
return "{ \"username\": \"" + username + "\", \"firstname\": \"Test\", \"lastname\": \"User\", \"email\": \"whatever@mifos.org\"," return "{ \"username\": \"" + username + "\", \"firstname\": \"Test\", \"lastname\": \"User\", \"email\": \"whatever@mifos.org\","
+ " \"officeId\": \"1\"}"; + " \"officeId\": \"1\"}";
} }
// 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 String getTestCreateUserAsJSONForSelfService(int roleId, int staffId, int clientId) { public static String getTestCreateUserAsJSONForSelfService(int roleId, int staffId, int clientId) {
return "{ \"username\": \"" + Utils.uniqueRandomStringGenerator("User_Name_", 3) return "{ \"username\": \"" + Utils.uniqueRandomStringGenerator("User_Name_", 3)
+ "\", \"firstname\": \"Test\", \"lastname\": \"User\", \"email\": \"whatever@mifos.org\"," + "\", \"firstname\": \"Test\", \"lastname\": \"User\", \"email\": \"whatever@mifos.org\","
@@ -134,21 +182,37 @@ public final class UserHelper {
+ "\"], \"sendPasswordToEmail\": false," + "\"isSelfServiceUser\" : true," + "\"clients\" : [\"" + clientId + "\"]}"; + "\"], \"sendPasswordToEmail\": false," + "\"isSelfServiceUser\" : true," + "\"clients\" : [\"" + clientId + "\"]}";
} }
// 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 Integer deleteUser(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer deleteUser(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final Integer userId) { final Integer userId) {
return Utils.performServerDelete(requestSpec, responseSpec, createRoleOperationURL(userId), "resourceId"); return Utils.performServerDelete(requestSpec, responseSpec, createRoleOperationURL(userId), "resourceId");
} }
// 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 Object updateUser(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, int userId, public static Object updateUser(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, int userId,
String username, String attribute) { String username, String attribute) {
return Utils.performServerPut(requestSpec, responseSpec, createRoleOperationURL(userId), getTestUpdateUserAsJSON(username), return Utils.performServerPut(requestSpec, responseSpec, createRoleOperationURL(userId), getTestUpdateUserAsJSON(username),
attribute); attribute);
} }
// 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)
private static String createRoleOperationURL(final Integer userId) { private static String createRoleOperationURL(final Integer userId) {
return USER_URL + "/" + userId + "?" + Utils.TENANT_IDENTIFIER; return USER_URL + "/" + userId + "?" + Utils.TENANT_IDENTIFIER;
} }
// 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 RequestSpecification getSimpleUserWithoutBypassPermission(final RequestSpecification requestSpec, public static RequestSpecification getSimpleUserWithoutBypassPermission(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec) { final ResponseSpecification responseSpec) {
String password = SIMPLE_USER_PASSWORD; String password = SIMPLE_USER_PASSWORD;
@@ -170,6 +234,10 @@ public final class UserHelper {
return responseRequestSpec; return responseRequestSpec;
} }
// 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 PostUsersRequest buildUserRequest(ResponseSpecification responseSpec, RequestSpecification requestSpec, String password) { public static PostUsersRequest buildUserRequest(ResponseSpecification responseSpec, RequestSpecification requestSpec, String password) {
Integer roleId = RolesHelper.createRole(requestSpec, responseSpec); Integer roleId = RolesHelper.createRole(requestSpec, responseSpec);
String uniqueUsername = Utils.uniqueRandomStringGenerator("TestUser", 4); String uniqueUsername = Utils.uniqueRandomStringGenerator("TestUser", 4);
@@ -180,12 +248,20 @@ public final class UserHelper {
.roles(List.of(roleId.longValue())); .roles(List.of(roleId.longValue()));
} }
// 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)
private static String createSimpleRole(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { private static String createSimpleRole(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
Integer roleId = RolesHelper.createRole(requestSpec, responseSpec); Integer roleId = RolesHelper.createRole(requestSpec, responseSpec);
addRepaymentPermissionToRole(requestSpec, responseSpec, roleId); addRepaymentPermissionToRole(requestSpec, responseSpec, roleId);
return roleId.toString(); return roleId.toString();
} }
// 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)
private static void addRepaymentPermissionToRole(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, private static void addRepaymentPermissionToRole(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
Integer roleId) { Integer roleId) {
HashMap<String, Boolean> permissionMap = new HashMap<>(); HashMap<String, Boolean> permissionMap = new HashMap<>();
integration-tests/src/test/java/org/apache/fineract/integrationtests/variableinstallments/VariableInstallmentsDecliningBalanceHelper.java
+88
View File
@@ -39,6 +39,10 @@ public class VariableInstallmentsDecliningBalanceHelper {
private static final Logger LOG = LoggerFactory.getLogger(VariableInstallmentsDecliningBalanceHelper.class); private static final Logger LOG = LoggerFactory.getLogger(VariableInstallmentsDecliningBalanceHelper.class);
// 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 String createLoanProductWithoutVaribleConfig(final boolean multiDisburseLoan, final String accountingRule, public static String createLoanProductWithoutVaribleConfig(final boolean multiDisburseLoan, final String accountingRule,
final Account... accounts) { final Account... accounts) {
LOG.info("------------------------------CREATING NEW LOAN PRODUCT ---------------------------------------"); LOG.info("------------------------------CREATING NEW LOAN PRODUCT ---------------------------------------");
@@ -56,6 +60,10 @@ public class VariableInstallmentsDecliningBalanceHelper {
return loanProductJSON; return loanProductJSON;
} }
// 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 String createLoanProductWithVaribleConfig(final boolean multiDisburseLoan, final String accountingRule, public static String createLoanProductWithVaribleConfig(final boolean multiDisburseLoan, final String accountingRule,
final Account... accounts) { final Account... accounts) {
LOG.info("------------------------------CREATING NEW LOAN PRODUCT ---------------------------------------"); LOG.info("------------------------------CREATING NEW LOAN PRODUCT ---------------------------------------");
@@ -75,6 +83,10 @@ public class VariableInstallmentsDecliningBalanceHelper {
return loanProductJSON; return loanProductJSON;
} }
// 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 String createLoanProductWithVaribleConfigwithEqualPrincipal(final boolean multiDisburseLoan, final String accountingRule, public static String createLoanProductWithVaribleConfigwithEqualPrincipal(final boolean multiDisburseLoan, final String accountingRule,
final Account... accounts) { final Account... accounts) {
LOG.info("------------------------------CREATING NEW LOAN PRODUCT ---------------------------------------"); LOG.info("------------------------------CREATING NEW LOAN PRODUCT ---------------------------------------");
@@ -94,6 +106,10 @@ public class VariableInstallmentsDecliningBalanceHelper {
return loanProductJSON; return loanProductJSON;
} }
// 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 String applyForLoanApplication(final Integer clientID, final Integer loanProductID, List<HashMap> charges, public static String applyForLoanApplication(final Integer clientID, final Integer loanProductID, List<HashMap> charges,
final String savingsId, String principal, List<HashMap> collaterals) { final String savingsId, String principal, List<HashMap> collaterals) {
LOG.info("--------------------------------APPLYING FOR LOAN APPLICATION--------------------------------"); LOG.info("--------------------------------APPLYING FOR LOAN APPLICATION--------------------------------");
@@ -114,6 +130,10 @@ public class VariableInstallmentsDecliningBalanceHelper {
return loanApplicationJSON; return loanApplicationJSON;
} }
// 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 String applyForLoanApplicationWithEqualPrincipal(final Integer clientID, final Integer loanProductID, public static String applyForLoanApplicationWithEqualPrincipal(final Integer clientID, final Integer loanProductID,
List<HashMap> charges, final String savingsId, String principal, List<HashMap> collaterals) { List<HashMap> charges, final String savingsId, String principal, List<HashMap> collaterals) {
LOG.info("--------------------------------APPLYING FOR LOAN APPLICATION--------------------------------"); LOG.info("--------------------------------APPLYING FOR LOAN APPLICATION--------------------------------");
@@ -134,6 +154,10 @@ public class VariableInstallmentsDecliningBalanceHelper {
return loanApplicationJSON; return loanApplicationJSON;
} }
// 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 String createDeleteVariations(ArrayList<Map> deletedInstallments) { public static String createDeleteVariations(ArrayList<Map> deletedInstallments) {
Map<String, Object> toReturn = new HashMap<>(); Map<String, Object> toReturn = new HashMap<>();
toReturn.put("locale", "en"); toReturn.put("locale", "en");
@@ -145,6 +169,10 @@ public class VariableInstallmentsDecliningBalanceHelper {
return json; return json;
} }
// 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)
private static ArrayList createDeletedMap(ArrayList<Map> deletedItems) { private static ArrayList createDeletedMap(ArrayList<Map> deletedItems) {
ArrayList toReturn = new ArrayList<>(); ArrayList toReturn = new ArrayList<>();
for (Map map : deletedItems) { for (Map map : deletedItems) {
@@ -156,6 +184,10 @@ public class VariableInstallmentsDecliningBalanceHelper {
return toReturn; return toReturn;
} }
// 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 String createAddVariations() { public static String createAddVariations() {
Map<String, Object> toReturn = new HashMap<>(); Map<String, Object> toReturn = new HashMap<>();
toReturn.put("locale", "en"); toReturn.put("locale", "en");
@@ -167,6 +199,10 @@ public class VariableInstallmentsDecliningBalanceHelper {
return json; return json;
} }
// 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)
private static ArrayList createNewInstallments() { private static ArrayList createNewInstallments() {
ArrayList toReturn = new ArrayList<>(); ArrayList toReturn = new ArrayList<>();
Map tosend = new HashMap(); Map tosend = new HashMap();
@@ -176,6 +212,10 @@ public class VariableInstallmentsDecliningBalanceHelper {
return toReturn; return toReturn;
} }
// 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 String createModifiyVariations(Map firstSchedule) { public static String createModifiyVariations(Map firstSchedule) {
Map<String, Object> toReturn = new HashMap<>(); Map<String, Object> toReturn = new HashMap<>();
toReturn.put("locale", "en"); toReturn.put("locale", "en");
@@ -187,6 +227,10 @@ public class VariableInstallmentsDecliningBalanceHelper {
return json; return json;
} }
// 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)
private static ArrayList createNewInstallments(String date) { private static ArrayList createNewInstallments(String date) {
ArrayList toReturn = new ArrayList<>(); ArrayList toReturn = new ArrayList<>();
Map tosend = new HashMap(); Map tosend = new HashMap();
@@ -196,6 +240,10 @@ public class VariableInstallmentsDecliningBalanceHelper {
return toReturn; return toReturn;
} }
// 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)
private static ArrayList createModifyMap(Map firstSchedule) { private static ArrayList createModifyMap(Map firstSchedule) {
ArrayList toReturn = new ArrayList<>(); ArrayList toReturn = new ArrayList<>();
ArrayList dueDate = (ArrayList) firstSchedule.get("dueDate"); ArrayList dueDate = (ArrayList) firstSchedule.get("dueDate");
@@ -206,6 +254,10 @@ public class VariableInstallmentsDecliningBalanceHelper {
return toReturn; return toReturn;
} }
// 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 String createAllVariations() { public static String createAllVariations() {
Map<String, Object> toReturn = new HashMap<>(); Map<String, Object> toReturn = new HashMap<>();
toReturn.put("locale", "en"); toReturn.put("locale", "en");
@@ -219,6 +271,10 @@ public class VariableInstallmentsDecliningBalanceHelper {
return json; return json;
} }
// 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 String createAllVariationsWithEqualPrincipal() { public static String createAllVariationsWithEqualPrincipal() {
Map<String, Object> toReturn = new HashMap<>(); Map<String, Object> toReturn = new HashMap<>();
toReturn.put("locale", "en"); toReturn.put("locale", "en");
@@ -232,6 +288,10 @@ public class VariableInstallmentsDecliningBalanceHelper {
return json; return json;
} }
// 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)
private static ArrayList createNewInstallmentsWithPrincipal(String date) { private static ArrayList createNewInstallmentsWithPrincipal(String date) {
ArrayList toReturn = new ArrayList<>(); ArrayList toReturn = new ArrayList<>();
Map tosend = new HashMap(); Map tosend = new HashMap();
@@ -241,6 +301,10 @@ public class VariableInstallmentsDecliningBalanceHelper {
return toReturn; return toReturn;
} }
// 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)
private static ArrayList createModifyMapWithPrinciapl(String date) { private static ArrayList createModifyMapWithPrinciapl(String date) {
ArrayList toReturn = new ArrayList<>(); ArrayList toReturn = new ArrayList<>();
Map tosend = new HashMap(); Map tosend = new HashMap();
@@ -250,6 +314,10 @@ public class VariableInstallmentsDecliningBalanceHelper {
return toReturn; return toReturn;
} }
// 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)
private static ArrayList createDeletedMap(String date) { private static ArrayList createDeletedMap(String date) {
ArrayList toReturn = new ArrayList<>(); ArrayList toReturn = new ArrayList<>();
Map tosend = new HashMap(); Map tosend = new HashMap();
@@ -258,6 +326,10 @@ public class VariableInstallmentsDecliningBalanceHelper {
return toReturn; return toReturn;
} }
// 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)
private static ArrayList createModifyMap(String date) { private static ArrayList createModifyMap(String date) {
ArrayList toReturn = new ArrayList<>(); ArrayList toReturn = new ArrayList<>();
Map tosend = new HashMap(); Map tosend = new HashMap();
@@ -267,6 +339,10 @@ public class VariableInstallmentsDecliningBalanceHelper {
return toReturn; return toReturn;
} }
// 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 String createModifiyDateVariations(String[] date, String[] newdate, String[] principal) { public static String createModifiyDateVariations(String[] date, String[] newdate, String[] principal) {
Map<String, Object> toReturn = new HashMap<>(); Map<String, Object> toReturn = new HashMap<>();
toReturn.put("locale", "en"); toReturn.put("locale", "en");
@@ -278,6 +354,10 @@ public class VariableInstallmentsDecliningBalanceHelper {
return json; return json;
} }
// 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)
private static ArrayList createDateModifyMap(String[] date, String[] newdate, String[] installments) { private static ArrayList createDateModifyMap(String[] date, String[] newdate, String[] installments) {
ArrayList toReturn = new ArrayList<>(); ArrayList toReturn = new ArrayList<>();
for (int i = 0; i < date.length; i++) { for (int i = 0; i < date.length; i++) {
@@ -292,6 +372,10 @@ public class VariableInstallmentsDecliningBalanceHelper {
return toReturn; return toReturn;
} }
// 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 String formatDate(ArrayList list) { public static String formatDate(ArrayList list) {
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
cal.set(Calendar.YEAR, (int) list.get(0)); cal.set(Calendar.YEAR, (int) list.get(0));
@@ -306,6 +390,10 @@ public class VariableInstallmentsDecliningBalanceHelper {
return null; return null;
} }
// 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 ArrayList<Map> constructVerifyData(String[] dates, String[] installments) { public static ArrayList<Map> constructVerifyData(String[] dates, String[] installments) {
ArrayList<Map> toReturn = new ArrayList<>(); ArrayList<Map> toReturn = new ArrayList<>();
for (int i = 0; i < dates.length; i++) { for (int i = 0; i < dates.length; i++) {
integration-tests/src/test/java/org/apache/fineract/integrationtests/variableinstallments/VariableInstallmentsFlatHelper.java
+68
View File
@@ -39,6 +39,10 @@ public class VariableInstallmentsFlatHelper {
private static final Logger LOG = LoggerFactory.getLogger(VariableInstallmentsFlatHelper.class); private static final Logger LOG = LoggerFactory.getLogger(VariableInstallmentsFlatHelper.class);
// 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 String createLoanProductWithVaribleConfig(final boolean multiDisburseLoan, final String accountingRule, public static String createLoanProductWithVaribleConfig(final boolean multiDisburseLoan, final String accountingRule,
final Account... accounts) { final Account... accounts) {
LOG.info("------------------------------CREATING NEW LOAN PRODUCT ---------------------------------------"); LOG.info("------------------------------CREATING NEW LOAN PRODUCT ---------------------------------------");
@@ -56,6 +60,10 @@ public class VariableInstallmentsFlatHelper {
return loanProductJSON; return loanProductJSON;
} }
// 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 String applyForLoanApplication(final Integer clientID, final Integer loanProductID, List<HashMap> charges, public static String applyForLoanApplication(final Integer clientID, final Integer loanProductID, List<HashMap> charges,
final String savingsId, String principal, List<HashMap> collaterals) { final String savingsId, String principal, List<HashMap> collaterals) {
LOG.info("--------------------------------APPLYING FOR LOAN APPLICATION--------------------------------"); LOG.info("--------------------------------APPLYING FOR LOAN APPLICATION--------------------------------");
@@ -76,6 +84,10 @@ public class VariableInstallmentsFlatHelper {
return loanApplicationJSON; return loanApplicationJSON;
} }
// 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 String createDeleteVariations(ArrayList<Map> deletedInstallments) { public static String createDeleteVariations(ArrayList<Map> deletedInstallments) {
Map<String, Object> toReturn = new HashMap<>(); Map<String, Object> toReturn = new HashMap<>();
toReturn.put("locale", "en"); toReturn.put("locale", "en");
@@ -87,6 +99,10 @@ public class VariableInstallmentsFlatHelper {
return json; return json;
} }
// 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)
private static ArrayList createDeletedMap(ArrayList<Map> deletedItems) { private static ArrayList createDeletedMap(ArrayList<Map> deletedItems) {
ArrayList toReturn = new ArrayList<>(); ArrayList toReturn = new ArrayList<>();
for (Map map : deletedItems) { for (Map map : deletedItems) {
@@ -98,6 +114,10 @@ public class VariableInstallmentsFlatHelper {
return toReturn; return toReturn;
} }
// 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 String createAddVariations() { public static String createAddVariations() {
Map<String, Object> toReturn = new HashMap<>(); Map<String, Object> toReturn = new HashMap<>();
toReturn.put("locale", "en"); toReturn.put("locale", "en");
@@ -109,6 +129,10 @@ public class VariableInstallmentsFlatHelper {
return json; return json;
} }
// 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)
private static ArrayList createNewInstallments() { private static ArrayList createNewInstallments() {
ArrayList toReturn = new ArrayList<>(); ArrayList toReturn = new ArrayList<>();
Map tosend = new HashMap(); Map tosend = new HashMap();
@@ -118,6 +142,10 @@ public class VariableInstallmentsFlatHelper {
return toReturn; return toReturn;
} }
// 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 String createModifiyVariations(Map firstSchedule) { public static String createModifiyVariations(Map firstSchedule) {
Map<String, Object> toReturn = new HashMap<>(); Map<String, Object> toReturn = new HashMap<>();
toReturn.put("locale", "en"); toReturn.put("locale", "en");
@@ -129,6 +157,10 @@ public class VariableInstallmentsFlatHelper {
return json; return json;
} }
// 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)
private static ArrayList createNewInstallments(String date) { private static ArrayList createNewInstallments(String date) {
ArrayList toReturn = new ArrayList<>(); ArrayList toReturn = new ArrayList<>();
Map tosend = new HashMap(); Map tosend = new HashMap();
@@ -138,6 +170,10 @@ public class VariableInstallmentsFlatHelper {
return toReturn; return toReturn;
} }
// 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 String createModifiyDateVariations(String[] date, String[] newdate, String[] principal) { public static String createModifiyDateVariations(String[] date, String[] newdate, String[] principal) {
Map<String, Object> toReturn = new HashMap<>(); Map<String, Object> toReturn = new HashMap<>();
toReturn.put("locale", "en"); toReturn.put("locale", "en");
@@ -149,6 +185,10 @@ public class VariableInstallmentsFlatHelper {
return json; return json;
} }
// 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)
private static ArrayList createDateModifyMap(String[] date, String[] newdate, String[] principal) { private static ArrayList createDateModifyMap(String[] date, String[] newdate, String[] principal) {
ArrayList toReturn = new ArrayList<>(); ArrayList toReturn = new ArrayList<>();
for (int i = 0; i < date.length; i++) { for (int i = 0; i < date.length; i++) {
@@ -163,6 +203,10 @@ public class VariableInstallmentsFlatHelper {
return toReturn; return toReturn;
} }
// 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)
private static ArrayList createModifyMap(Map firstSchedule) { private static ArrayList createModifyMap(Map firstSchedule) {
ArrayList toReturn = new ArrayList<>(); ArrayList toReturn = new ArrayList<>();
ArrayList dueDate = (ArrayList) firstSchedule.get("dueDate"); ArrayList dueDate = (ArrayList) firstSchedule.get("dueDate");
@@ -173,6 +217,10 @@ public class VariableInstallmentsFlatHelper {
return toReturn; return toReturn;
} }
// 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 String createAllVariations() { public static String createAllVariations() {
Map<String, Object> toReturn = new HashMap<>(); Map<String, Object> toReturn = new HashMap<>();
toReturn.put("locale", "en"); toReturn.put("locale", "en");
@@ -186,6 +234,10 @@ public class VariableInstallmentsFlatHelper {
return json; return json;
} }
// 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)
private static ArrayList createDeletedMap(String date) { private static ArrayList createDeletedMap(String date) {
ArrayList toReturn = new ArrayList<>(); ArrayList toReturn = new ArrayList<>();
Map tosend = new HashMap(); Map tosend = new HashMap();
@@ -194,6 +246,10 @@ public class VariableInstallmentsFlatHelper {
return toReturn; return toReturn;
} }
// 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)
private static ArrayList createModifyMap(String date) { private static ArrayList createModifyMap(String date) {
ArrayList toReturn = new ArrayList<>(); ArrayList toReturn = new ArrayList<>();
Map tosend = new HashMap(); Map tosend = new HashMap();
@@ -203,6 +259,10 @@ public class VariableInstallmentsFlatHelper {
return toReturn; return toReturn;
} }
// 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 String formatDate(ArrayList list) { public static String formatDate(ArrayList list) {
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
cal.set(Calendar.YEAR, (int) list.get(0)); cal.set(Calendar.YEAR, (int) list.get(0));
@@ -213,10 +273,18 @@ public class VariableInstallmentsFlatHelper {
return requiredFormat.format(date); return requiredFormat.format(date);
} }
// 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 Map<String, Object> createModifyVarations() { public Map<String, Object> createModifyVarations() {
return null; return null;
} }
// 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 ArrayList<Map> constructVerifyData(String[] dates, String[] installments) { public static ArrayList<Map> constructVerifyData(String[] dates, String[] installments) {
ArrayList<Map> toReturn = new ArrayList<>(); ArrayList<Map> toReturn = new ArrayList<>();
for (int i = 0; i < dates.length; i++) { for (int i = 0; i < dates.length; i++) {
integration-tests/src/test/java/org/apache/fineract/integrationtests/variableinstallments/VariableIntallmentsTransactionHelper.java
+16
View File
@@ -34,21 +34,37 @@ public class VariableIntallmentsTransactionHelper {
private final RequestSpecification requestSpec; private final RequestSpecification requestSpec;
private final ResponseSpecification responseSpec; private final ResponseSpecification responseSpec;
// 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 VariableIntallmentsTransactionHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public VariableIntallmentsTransactionHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
this.requestSpec = requestSpec; this.requestSpec = requestSpec;
this.responseSpec = responseSpec; this.responseSpec = responseSpec;
} }
// 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 Map retrieveSchedule(Integer loanId) { public Map retrieveSchedule(Integer loanId) {
String url = URL + loanId + "?associations=repaymentSchedule&exclude=guarantors&" + Utils.TENANT_IDENTIFIER; String url = URL + loanId + "?associations=repaymentSchedule&exclude=guarantors&" + Utils.TENANT_IDENTIFIER;
return Utils.performServerGet(requestSpec, responseSpec, url, ""); return Utils.performServerGet(requestSpec, responseSpec, url, "");
} }
// 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 HashMap validateVariations(final String exceptions, Integer loanId) { public HashMap validateVariations(final String exceptions, Integer loanId) {
String url = URL + loanId + "/schedule?command=calculateLoanSchedule&" + Utils.TENANT_IDENTIFIER; String url = URL + loanId + "/schedule?command=calculateLoanSchedule&" + Utils.TENANT_IDENTIFIER;
return Utils.performServerPost(this.requestSpec, this.responseSpec, url, exceptions, ""); return Utils.performServerPost(this.requestSpec, this.responseSpec, url, exceptions, "");
} }
// 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 HashMap submitVariations(final String exceptions, Integer loanId) { public HashMap submitVariations(final String exceptions, Integer loanId) {
String url = URL + loanId + "/schedule?command=addVariations&" + Utils.TENANT_IDENTIFIER; String url = URL + loanId + "/schedule?command=addVariations&" + Utils.TENANT_IDENTIFIER;
return Utils.performServerPost(this.requestSpec, this.responseSpec, url, exceptions, ""); return Utils.performServerPost(this.requestSpec, this.responseSpec, url, exceptions, "");