From c56ecd0ec774c288d40c9af0e6eaf5b8463288bc Mon Sep 17 00:00:00 2001 From: elnafateh Date: Tue, 16 Jun 2026 14:31:34 +0100 Subject: [PATCH] FINERACT-2165: replace null w executeVoid and restore error code assertion --- .../DisbursalAndRepaymentScheduleTest.java | 39 +++-- .../LoanReschedulingWithinCenterTest.java | 9 +- ...BetweenDisbursalAndFirstRepaymentTest.java | 3 +- .../PasswordPreferencesIntegrationTest.java | 40 +---- .../SkipRepaymentOnMonthFirstTest.java | 2 +- .../common/CalendarHelper.java | 160 +++++------------- .../common/PasswordPreferencesHelper.java | 86 ++-------- 7 files changed, 92 insertions(+), 247 deletions(-) diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/DisbursalAndRepaymentScheduleTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/DisbursalAndRepaymentScheduleTest.java index f6fbf64e315..f0736fdeeae 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/DisbursalAndRepaymentScheduleTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/DisbursalAndRepaymentScheduleTest.java @@ -157,14 +157,14 @@ public void testRescheduleJLGLoanSynk() { loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, this.loanId); LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap); - CalendarHelper.updateMeetingCalendarForGroup(this.requestSpec, this.responseSpec, this.groupId, this.groupCalendarId.toString(), - groupMeetingNewStartDate, "2", "2", "2"); // New - // meeting - // dates - // will be - // the - // tuesday - // after the + CalendarHelper.updateMeetingCalendarForGroup(this.groupId, this.groupCalendarId.toString(), groupMeetingNewStartDate, "2", "2", + "2"); // New + // meeting + // dates + // will be + // the + // tuesday + // after the // coming // monday @@ -284,16 +284,16 @@ public void testChangeGroupMeetingMaturedOnDate() { loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, this.loanId); LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap); - CalendarHelper.updateMeetingCalendarForGroup(this.requestSpec, this.responseSpec, this.groupId, this.groupCalendarId.toString(), - groupMeetingNewStartDate, "2", "2", "2"); // New - // meeting - // dates - // will be - // the - // tuesday - // after the - // coming - // monday + CalendarHelper.updateMeetingCalendarForGroup(this.groupId, this.groupCalendarId.toString(), groupMeetingNewStartDate, "2", "2", + "2"); // New + // meeting + // dates + // will be + // the + // tuesday + // after the + // coming + // monday Calendar expectedMaturityCalendar = Calendar.getInstance(); expectedMaturityCalendar.setFirstDayOfWeek(Calendar.MONDAY); @@ -340,8 +340,7 @@ private void createGroupEntityWithCalendar(final String frequency, final String final String startDate = groupActivationDate; - this.setGroupCalendarId(CalendarHelper.createMeetingCalendarForGroup(this.requestSpec, this.responseSpec, this.groupId, startDate, - frequency, interval, repeatsOnDay)); + this.setGroupCalendarId(CalendarHelper.createMeetingCalendarForGroup(this.groupId, startDate, frequency, interval, repeatsOnDay)); } /** diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanReschedulingWithinCenterTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanReschedulingWithinCenterTest.java index e3418fbba12..c041f9a52e1 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanReschedulingWithinCenterTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanReschedulingWithinCenterTest.java @@ -158,8 +158,7 @@ public void testCenterReschedulingLoansWithInterestRecalculationEnabled() { String oldMeetingDate = dateFormat.format(todaysdate.getTime()); todaysdate.add(Calendar.DAY_OF_MONTH, 1); final String centerMeetingNewStartDate = dateFormat.format(todaysdate.getTime()); - CalendarHelper.updateMeetingCalendarForCenter(this.requestSpec, this.responseSpec, centerId, calendarId.toString(), oldMeetingDate, - centerMeetingNewStartDate); + CalendarHelper.updateMeetingCalendarForCenter(centerId, calendarId.toString(), oldMeetingDate, centerMeetingNewStartDate); ArrayList loanRepaymnetSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, generalResponseSpec, loanId); // VERIFY RESCHEDULED DATE @@ -209,8 +208,7 @@ private Integer createCalendarMeeting(Integer centerId) { repeatsOnDay = 7; } - Integer calendarId = CalendarHelper.createMeetingForGroup(this.requestSpec, this.responseSpec, centerId, startDate, frequency, - interval, repeatsOnDay.toString()); + Integer calendarId = CalendarHelper.createMeetingForGroup(centerId, startDate, frequency, interval, repeatsOnDay.toString()); LOG.info("calendarId {}", calendarId); return calendarId; } @@ -308,8 +306,7 @@ public void testCenterReschedulingMultiTrancheLoansWithInterestRecalculationEnab String oldMeetingDate = dateFormat.format(todaysdate.getTime()); todaysdate.add(Calendar.DAY_OF_MONTH, 1); final String centerMeetingNewStartDate = dateFormat.format(todaysdate.getTime()); - CalendarHelper.updateMeetingCalendarForCenter(this.requestSpec, this.responseSpec, centerId, calendarId.toString(), oldMeetingDate, - centerMeetingNewStartDate); + CalendarHelper.updateMeetingCalendarForCenter(centerId, calendarId.toString(), oldMeetingDate, centerMeetingNewStartDate); ArrayList loanRepaymnetSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, generalResponseSpec, loanID); // VERIFY RESCHEDULED DATE diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/MinimumDaysBetweenDisbursalAndFirstRepaymentTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/MinimumDaysBetweenDisbursalAndFirstRepaymentTest.java index ba0b2702bdf..e94403b86b0 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/MinimumDaysBetweenDisbursalAndFirstRepaymentTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/MinimumDaysBetweenDisbursalAndFirstRepaymentTest.java @@ -219,8 +219,7 @@ private void createGroupEntityWithCalendar() { final String interval = "1"; // Every one week final String repeatsOnDay = "1"; // 1:Monday - this.setGroupCalendarId(CalendarHelper.createMeetingCalendarForGroup(this.requestSpec, this.responseSpec, this.groupId, startDate, - frequency, interval, repeatsOnDay)); + this.setGroupCalendarId(CalendarHelper.createMeetingCalendarForGroup(this.groupId, startDate, frequency, interval, repeatsOnDay)); } /** diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/PasswordPreferencesIntegrationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/PasswordPreferencesIntegrationTest.java index e93c812390c..468acdb9933 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/PasswordPreferencesIntegrationTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/PasswordPreferencesIntegrationTest.java @@ -19,15 +19,9 @@ package org.apache.fineract.integrationtests; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; -import io.restassured.builder.RequestSpecBuilder; -import io.restassured.builder.ResponseSpecBuilder; -import io.restassured.http.ContentType; -import io.restassured.specification.RequestSpecification; -import io.restassured.specification.ResponseSpecification; -import java.util.HashMap; -import java.util.List; -import org.apache.fineract.integrationtests.common.CommonConstants; +import org.apache.fineract.client.feign.util.CallFailedRuntimeException; import org.apache.fineract.integrationtests.common.PasswordPreferencesHelper; import org.apache.fineract.integrationtests.common.Utils; import org.junit.jupiter.api.AfterEach; @@ -36,51 +30,35 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@SuppressWarnings({ "rawtypes", "unchecked" }) public class PasswordPreferencesIntegrationTest { private static final Logger LOG = LoggerFactory.getLogger(PasswordPreferencesIntegrationTest.class); - private ResponseSpecification responseSpec; - private RequestSpecification requestSpec; - private ResponseSpecification generalResponseSpec; private int originalPasswordPolicyId; @BeforeEach public void setUp() { Utils.initializeRESTAssured(); - this.requestSpec = new RequestSpecBuilder().setContentType(ContentType.JSON).build(); - this.requestSpec.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey()); - this.responseSpec = new ResponseSpecBuilder().expectStatusCode(200).build(); - this.generalResponseSpec = new ResponseSpecBuilder().build(); - originalPasswordPolicyId = PasswordPreferencesHelper.getActivePasswordPreference(requestSpec, responseSpec); + originalPasswordPolicyId = PasswordPreferencesHelper.getActivePasswordPreference().getId().intValue(); } @AfterEach void tearDown() { - PasswordPreferencesHelper.updatePasswordPreferences(requestSpec, responseSpec, Integer.toString(originalPasswordPolicyId)); + PasswordPreferencesHelper.updatePasswordPreferences(Integer.toString(originalPasswordPolicyId)); } @Test public void updatePasswordPreferences() { String validationPolicyId = "2"; - PasswordPreferencesHelper.updatePasswordPreferences(requestSpec, responseSpec, validationPolicyId); - this.validateIfThePasswordIsUpdated(validationPolicyId); - } - - private void validateIfThePasswordIsUpdated(String validationPolicyId) { - Integer id = PasswordPreferencesHelper.getActivePasswordPreference(requestSpec, responseSpec); + PasswordPreferencesHelper.updatePasswordPreferences(validationPolicyId); + Integer id = PasswordPreferencesHelper.getActivePasswordPreference().getId().intValue(); assertEquals(validationPolicyId, id.toString()); LOG.info("---------------------------------PASSWORD PREFERENCE VALIDATED SUCCESSFULLY-----------------------------------------"); - } @Test public void updateWithInvalidPolicyId() { - String invalidValidationPolicyId = "2000"; - final List error = (List) PasswordPreferencesHelper.updateWithInvalidValidationPolicyId(requestSpec, generalResponseSpec, - invalidValidationPolicyId, CommonConstants.RESPONSE_ERROR); - assertEquals("error.msg.password.validation.policy.id.invalid", error.get(0).get("userMessageGlobalisationCode"), - "Password Validation Policy with identifier 2000 does not exist"); + final CallFailedRuntimeException exception = assertThrows(CallFailedRuntimeException.class, + () -> PasswordPreferencesHelper.updatePasswordPreferences("2000")); + assertEquals("error.msg.password.validation.policy.id.invalid", exception.getUserMessageGlobalisationCode()); } - } diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/SkipRepaymentOnMonthFirstTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/SkipRepaymentOnMonthFirstTest.java index 266ad381fd8..9bfd4e72368 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/SkipRepaymentOnMonthFirstTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/SkipRepaymentOnMonthFirstTest.java @@ -96,7 +96,7 @@ public void checkRepaymentSkipOnFirstDayOfMonth() { final String startDate = "15 September 2011"; final String frequency = "3"; // Monthly final String interval = "1"; // Every One Moth - Integer calendarID = CalendarHelper.createMeetingForGroup(requestSpec, responseSpec, groupID, startDate, frequency, interval, null); + Integer calendarID = CalendarHelper.createMeetingForGroup(groupID, startDate, frequency, interval, null); LOG.info("caladerId -------------------- {}", calendarID); final Integer loanProductID = createLoanProduct(); final Integer loanID = applyForLoanApplication(groupID, loanProductID, calendarID, clientID); diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/CalendarHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/CalendarHelper.java index 6848caedd67..879448d17e7 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/CalendarHelper.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/CalendarHelper.java @@ -18,147 +18,77 @@ */ package org.apache.fineract.integrationtests.common; +import static org.apache.fineract.client.feign.util.FeignCalls.ok; import static org.junit.jupiter.api.Assertions.assertEquals; -import com.google.gson.Gson; -import io.restassured.path.json.JsonPath; -import io.restassured.specification.RequestSpecification; -import io.restassured.specification.ResponseSpecification; -import java.util.HashMap; +import org.apache.fineract.client.models.CalendarRequest; +import org.apache.fineract.client.models.CommandProcessingResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public final class CalendarHelper { private static final Logger LOG = LoggerFactory.getLogger(CalendarHelper.class); - private static final String BASE_URL = "/fineract-provider/api/v1/"; - private static final String PARENT_ENTITY_NAME = "groups/"; - private static final String ENITY_NAME = "/calendars"; - private static final String CENTER_ENTITY = "centers/"; - private static final String EDIT_CALENDAR = "editcalendarbasedonmeetingdates/"; - private 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, - final Integer groupId, final String startDate, final String frequency, final String interval, final String repeatsOnDay) { + private CalendarHelper() {} + public static Integer createMeetingCalendarForGroup(final Integer groupId, final String startDate, final String frequency, + final String interval, final String repeatsOnDay) { LOG.info("---------------------------------CREATING A MEETING CALENDAR FOR THE GROUP------------------------------"); - - final String CALENDAR_RESOURCE_URL = BASE_URL + PARENT_ENTITY_NAME + groupId + ENITY_NAME + "?" + Utils.TENANT_IDENTIFIER; - - LOG.info("{}", CALENDAR_RESOURCE_URL); - - return Utils.performServerPost(requestSpec, responseSpec, CALENDAR_RESOURCE_URL, - getTestCalendarAsJSON(frequency, interval, repeatsOnDay, startDate), "resourceId"); + final CommandProcessingResult result = ok(() -> FineractFeignClientHelper.getFineractFeignClient().calendar() + .createCalendar("groups", groupId.longValue(), buildCalendarRequest(frequency, interval, repeatsOnDay, startDate))); + return result.getResourceId().intValue(); } - // TODO: Rewrite to use fineract-client instead! - // Example: org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper.disburseLoan(java.lang.Long, - // org.apache.fineract.client.models.PostLoansLoanIdRequest) - @Deprecated(forRemoval = true) - public static Integer updateMeetingCalendarForGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, - final Integer groupId, String calendarID, final String startDate, final String frequency, final String interval, - final String repeatsOnDay) { - + public static Integer updateMeetingCalendarForGroup(final Integer groupId, final String calendarID, final String startDate, + final String frequency, final String interval, final String repeatsOnDay) { LOG.info("---------------------------------UPDATING A MEETING CALENDAR FOR THE GROUP------------------------------"); + final CommandProcessingResult result = ok( + () -> FineractFeignClientHelper.getFineractFeignClient().calendar().updateCalendar("groups", groupId.longValue(), + Long.parseLong(calendarID), buildCalendarJson(frequency, interval, repeatsOnDay, startDate))); + return result.getResourceId().intValue(); + } - final String CALENDAR_RESOURCE_URL = BASE_URL + PARENT_ENTITY_NAME + groupId + ENITY_NAME + "/" + calendarID; - - LOG.info("{}", CALENDAR_RESOURCE_URL); - // TODO: check that resource id indeed exists in calendar update put. - return Utils.performServerPut(requestSpec, responseSpec, CALENDAR_RESOURCE_URL, - getTestCalendarAsJSON(frequency, interval, repeatsOnDay, startDate), "resourceId"); + public static Integer createMeetingForGroup(final Integer groupId, final String startDate, final String frequency, + final String interval, final String repeatsOnDay) { + LOG.info("---------------------------------CREATING A MEETING CALENDAR FOR THE GROUP------------------------------"); + final CommandProcessingResult result = ok(() -> FineractFeignClientHelper.getFineractFeignClient().calendar() + .createCalendar("centers", groupId.longValue(), buildCalendarRequest(frequency, interval, repeatsOnDay, startDate))); + return result.getResourceId().intValue(); } - // TODO: Rewrite to use fineract-client instead! - // Example: org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper.disburseLoan(java.lang.Long, - // org.apache.fineract.client.models.PostLoansLoanIdRequest) - @Deprecated(forRemoval = true) - public static String getTestCalendarAsJSON(final String frequency, final String interval, final String repeatsOnDay, + public static Integer updateMeetingCalendarForCenter(final Integer centerId, final String calendarID, final String oldDate, final String startDate) { - - final HashMap map = new HashMap<>(); - map.put("dateFormat", "dd MMMM yyyy"); - map.put("locale", "en"); - map.put("frequency", frequency); - map.put("interval", interval); - map.put("repeating", "true"); - map.put("repeatsOnDay", repeatsOnDay); - map.put("title", Utils.randomStringGenerator("groups_CollectionMeeting", 4)); - map.put("typeId", "1"); - map.put("startDate", startDate); - LOG.info("map : {}", map); - return new Gson().toJson(map); + LOG.info("---------------------------------UPDATING A MEETING CALENDAR FOR THE CENTER------------------------------"); + final CommandProcessingResult result = ok(() -> FineractFeignClientHelper.getFineractFeignClient().calendar().updateCalendar( + "centers", centerId.longValue(), Long.parseLong(calendarID), buildRescheduleMeetingJson(oldDate, startDate))); + return result.getResourceId().intValue(); } - // TODO: Rewrite to use fineract-client instead! - // Example: org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper.disburseLoan(java.lang.Long, - // org.apache.fineract.client.models.PostLoansLoanIdRequest) - @Deprecated(forRemoval = true) - public static void verifyCalendarCreatedOnServer(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, - final Integer generatedGroupId, final Integer generatedCalendarId) { + public static void verifyCalendarCreatedOnServer(final Integer generatedGroupId, final Integer generatedCalendarId) { LOG.info("------------------------------CHECK CALENDAR DETAILS------------------------------------\n"); - final String CLIENT_URL = "/fineract-provider/api/v1/groups/" + generatedGroupId + "?associations=all&" + Utils.TENANT_IDENTIFIER; - final String responseCalendarDetailsinJSON = Utils.performServerGet(requestSpec, responseSpec, CLIENT_URL, - "collectionMeetingCalendar"); - final Integer responseCalendarId = JsonPath.from(responseCalendarDetailsinJSON).get("id"); - assertEquals(generatedCalendarId, responseCalendarId, "ERROR IN CREATING THE CALENDAR"); + final Long id = ok(() -> FineractFeignClientHelper.getFineractFeignClient().calendar() + .retrieveCalendar(generatedCalendarId.longValue(), "groups", generatedGroupId.longValue())).getId(); + assertEquals(generatedCalendarId, id.intValue(), "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, - final Integer groupId, final String startDate, final String frequency, final String interval, final String repeatsOnDay) { - - LOG.info("---------------------------------CREATING A MEETING CALENDAR FOR THE GROUP------------------------------"); - - final String CALENDAR_RESOURCE_URL = BASE_URL + CENTER_ENTITY + groupId + ENITY_NAME + "?" + Utils.TENANT_IDENTIFIER; - - LOG.info("{}", CALENDAR_RESOURCE_URL); - - return Utils.performServerPost(requestSpec, responseSpec, CALENDAR_RESOURCE_URL, - getTestCalendarAsJSON(frequency, interval, repeatsOnDay, startDate), "resourceId"); + private static CalendarRequest buildCalendarRequest(final String frequency, final String interval, final String repeatsOnDay, + final String startDate) { + return new CalendarRequest().dateFormat("dd MMMM yyyy").locale("en").frequency(frequency).interval(interval).repeating("true") + .repeatsOnDay(repeatsOnDay).title(Utils.randomStringGenerator("groups_CollectionMeeting", 4)).typeId("1") + .startDate(startDate); } - // TODO: Rewrite to use fineract-client 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, - Integer centerId, String calendarID, String oldDate, String startDate) { - - LOG.info("---------------------------------UPADATING A MEETING CALENDAR FOR THE CENTER------------------------------"); - - final String CALENDAR_RESOURCE_URL = BASE_URL + CENTER_ENTITY + centerId + ENITY_NAME + "/" + calendarID + "?" - + Utils.TENANT_IDENTIFIER; - - LOG.info("{}", CALENDAR_RESOURCE_URL); - - return Utils.performServerPut(requestSpec, responseSpec, CALENDAR_RESOURCE_URL, getTestCalendarMeetingAsJSON(oldDate, startDate), - "resourceId"); - + private static String buildCalendarJson(final String frequency, final String interval, final String repeatsOnDay, + final String startDate) { + return String.format( + "{\"dateFormat\":\"dd MMMM yyyy\",\"locale\":\"en\",\"frequency\":\"%s\",\"interval\":\"%s\"," + + "\"repeating\":\"true\",\"repeatsOnDay\":\"%s\",\"title\":\"%s\",\"typeId\":\"1\",\"startDate\":\"%s\"}", + frequency, interval, repeatsOnDay, Utils.randomStringGenerator("groups_CollectionMeeting", 4), startDate); } - // TODO: Rewrite to use 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) { - final HashMap map = new HashMap<>(); - map.put("dateFormat", "dd MMMM yyyy"); - map.put("locale", "en"); - map.put("newMeetingDate", startDate); - map.put("presentMeetingDate", oldDate); - map.put("reschedulebasedOnMeetingDates", "true"); - LOG.info("map : {}", map); - return new Gson().toJson(map); + private static String buildRescheduleMeetingJson(final String oldDate, final String startDate) { + return String.format("{\"dateFormat\":\"dd MMMM yyyy\",\"locale\":\"en\",\"newMeetingDate\":\"%s\"," + + "\"presentMeetingDate\":\"%s\",\"reschedulebasedOnMeetingDates\":\"true\"}", startDate, oldDate); } } diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/PasswordPreferencesHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/PasswordPreferencesHelper.java index 67590de137b..02d8de6d5c5 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/PasswordPreferencesHelper.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/PasswordPreferencesHelper.java @@ -18,85 +18,27 @@ */ package org.apache.fineract.integrationtests.common; -import com.google.gson.Gson; -import io.restassured.specification.RequestSpecification; -import io.restassured.specification.ResponseSpecification; -import java.util.HashMap; +import static org.apache.fineract.client.feign.util.FeignCalls.executeVoid; +import static org.apache.fineract.client.feign.util.FeignCalls.ok; -public final class PasswordPreferencesHelper { - - private PasswordPreferencesHelper() { - - } - - 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, - String validationPolicyId) { - final String UPDATE_PASSWORD_PREFERENCES_URL = PASSWORD_PREFERENCES_URL + "?" + Utils.TENANT_IDENTIFIER; - // system.out.println("---------------------------------UPDATE PASSWORD - // PREFERENCE---------------------------------------------"); - return Utils.performServerPut(requestSpec, responseSpec, UPDATE_PASSWORD_PREFERENCES_URL, - updatePreferencesAsJson(validationPolicyId), ""); - } +import java.util.List; +import org.apache.fineract.client.models.GetPasswordPreferencesTemplateResponse; +import org.apache.fineract.client.models.PutPasswordPreferencesTemplateRequest; - // TODO: Rewrite to use fineract-client 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, - final ResponseSpecification responseSpec, String invalidValidationPolicyId, String jsonAttributeToGetback) { - final String UPDATE_PASSWORD_PREFERENCES_URL = PASSWORD_PREFERENCES_URL + "?" + Utils.TENANT_IDENTIFIER; - // system.out - // .println("---------------------------------UPDATE PASSWORD - // PREFERENCES WITH INVALID - // ID-----------------------------------------"); - return Utils.performServerPut(requestSpec, responseSpec, UPDATE_PASSWORD_PREFERENCES_URL, - updatePreferencesWithInvalidId(invalidValidationPolicyId), jsonAttributeToGetback); - } +public final class PasswordPreferencesHelper { - // TODO: Rewrite to use fineract-client 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) { - final HashMap map = new HashMap<>(); - map.put("validationPolicyId", validationPolicyId); - return new Gson().toJson(map); - } + private PasswordPreferencesHelper() {} - // TODO: Rewrite to use fineract-client 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) { - final HashMap map = new HashMap<>(); - map.put("validationPolicyId", invalidValidationPolicyId); - return new Gson().toJson(map); + public static void updatePasswordPreferences(String validationPolicyId) { + executeVoid(() -> FineractFeignClientHelper.getFineractFeignClient().passwordPreferences() + .update7(new PutPasswordPreferencesTemplateRequest().validationPolicyId(Long.parseLong(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 int getActivePasswordPreference(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { - return Utils.performServerGet(requestSpec, responseSpec, PASSWORD_PREFERENCES_URL + "?" + Utils.TENANT_IDENTIFIER, "id"); + public static GetPasswordPreferencesTemplateResponse getActivePasswordPreference() { + return ok(() -> FineractFeignClientHelper.getFineractFeignClient().passwordPreferences().retrieve2()); } - // TODO: Rewrite to use fineract-client 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 getAllPreferences(final RequestSpecification requestSpec, - final ResponseSpecification responseSpec) { - - return Utils.performServerGet(requestSpec, responseSpec, PASSWORD_PREFERENCES_URL + "/template" + "?" + Utils.TENANT_IDENTIFIER, - ""); - + public static List getAllPreferences() { + return ok(() -> FineractFeignClientHelper.getFineractFeignClient().passwordPreferences().template4()); } - }