adamsaghy commented on code in PR #5993:
URL: https://github.com/apache/fineract/pull/5993#discussion_r3435659815
##########
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<String, String> 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();
Review Comment:
Return the full response, not just the id.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
