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

[FINERACT-1678] business step configuration fix

Browse Source
This commit is contained in:
taskain7
2022-10-04 09:48:12 +02:00
committed by Aleksandar Vidakovic
parent 44cab78cbb
commit f4979d2c9b
7 changed files with 146 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-tests/src/test/java/org/apache/fineract/integrationtests/BusinessConfigurationApiTest.java
+55 -15
View File
@@ -27,10 +27,12 @@ import io.restassured.http.ContentType;
import io.restassured.specification.RequestSpecification;
import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.apache.fineract.cob.data.BusinessStep;
import org.apache.fineract.cob.data.JobBusinessStepConfigData;
import org.apache.fineract.cob.data.JobBusinessStepDetail;
import org.apache.fineract.infrastructure.core.data.ApiParameterError;
import org.apache.fineract.integrationtests.common.BusinessStepConfigurationHelper;
import org.apache.fineract.integrationtests.common.Utils;
import org.junit.jupiter.api.Assertions;
@@ -44,6 +46,7 @@ public class BusinessConfigurationApiTest {
public static final String LOAN_JOB_NAME = "LOAN_CLOSE_OF_BUSINESS";
public static final String LOAN_CATEGORY_NAME = "loan";
public static final String APPLY_CHARGE_TO_OVERDUE_LOANS = "APPLY_CHARGE_TO_OVERDUE_LOANS";
public static final String NOT_BELONGING_BUSINESS_STEP_NAME = "APPLY_CHARGE_TO_OVERDUE_LOANS_2";
public static final String LOAN_DELINQUENCY_CLASSIFICATION = "LOAN_DELINQUENCY_CLASSIFICATION";
@BeforeEach
@@ -82,32 +85,69 @@ public class BusinessConfigurationApiTest {
public void shouldUpdateStepOrder() {
JobBusinessStepConfigData originalStepConfig = BusinessStepConfigurationHelper.getConfiguredBusinessStepsByJobName(requestSpec,
responseSpec, LOAN_JOB_NAME);
Long originalOrder = originalStepConfig.getBusinessSteps().stream() //
.filter(businessStep -> APPLY_CHARGE_TO_OVERDUE_LOANS.equals(businessStep.getStepName())) //
.findFirst().get().getOrder();
List<BusinessStep> requestBody = getBusinessSteps(originalOrder + 1);
List<BusinessStep> requestBody = new ArrayList<>();
requestBody.add(getBusinessSteps(1L, APPLY_CHARGE_TO_OVERDUE_LOANS));
BusinessStepConfigurationHelper.updateBusinessStepOrder(requestSpec, responseSpec, LOAN_JOB_NAME,
BusinessStepConfigurationHelper.toJsonString(requestBody));
JobBusinessStepConfigData newStepConfig = BusinessStepConfigurationHelper.getConfiguredBusinessStepsByJobName(requestSpec,
responseSpec, LOAN_JOB_NAME);
Long newOrder = newStepConfig.getBusinessSteps().stream() //
.filter(businessStep -> APPLY_CHARGE_TO_OVERDUE_LOANS.equals(businessStep.getStepName())) //
.findFirst().get().getOrder();
assertEquals(originalOrder + 1, newOrder);
BusinessStep applyChargeStep = newStepConfig.getBusinessSteps().stream()
.filter(businessStep -> APPLY_CHARGE_TO_OVERDUE_LOANS.equals(businessStep.getStepName())).findFirst().get();
assertEquals(1, newStepConfig.getBusinessSteps().size());
assertEquals(1L, applyChargeStep.getOrder());
requestBody.add(getBusinessSteps(2L, LOAN_DELINQUENCY_CLASSIFICATION));
List<BusinessStep> originalBusinessSteps = getBusinessSteps(originalOrder);
BusinessStepConfigurationHelper.updateBusinessStepOrder(requestSpec, responseSpec, LOAN_JOB_NAME,
BusinessStepConfigurationHelper.toJsonString(originalBusinessSteps));
BusinessStepConfigurationHelper.toJsonString(requestBody));
newStepConfig = BusinessStepConfigurationHelper.getConfiguredBusinessStepsByJobName(requestSpec, responseSpec, LOAN_JOB_NAME);
applyChargeStep = newStepConfig.getBusinessSteps().stream()
.filter(businessStep -> APPLY_CHARGE_TO_OVERDUE_LOANS.equals(businessStep.getStepName())).findFirst().get();
BusinessStep loanDelinquencyStep = newStepConfig.getBusinessSteps().stream()
.filter(businessStep -> LOAN_DELINQUENCY_CLASSIFICATION.equals(businessStep.getStepName())).findFirst().get();
assertEquals(2, newStepConfig.getBusinessSteps().size());
assertEquals(1L, applyChargeStep.getOrder());
assertEquals(2L, loanDelinquencyStep.getOrder());
requestBody.remove(1);
BusinessStepConfigurationHelper.updateBusinessStepOrder(requestSpec, responseSpec, LOAN_JOB_NAME,
BusinessStepConfigurationHelper.toJsonString(requestBody));
newStepConfig = BusinessStepConfigurationHelper.getConfiguredBusinessStepsByJobName(requestSpec, responseSpec, LOAN_JOB_NAME);
applyChargeStep = newStepConfig.getBusinessSteps().stream()
.filter(businessStep -> APPLY_CHARGE_TO_OVERDUE_LOANS.equals(businessStep.getStepName())).findFirst().get();
assertEquals(1, newStepConfig.getBusinessSteps().size());
assertEquals(1L, applyChargeStep.getOrder());
BusinessStepConfigurationHelper.updateBusinessStepOrder(requestSpec, responseSpec, LOAN_JOB_NAME,
BusinessStepConfigurationHelper.toJsonString(originalStepConfig.getBusinessSteps()));
}
private List<BusinessStep> getBusinessSteps(Long order) {
List<BusinessStep> businessSteps = new ArrayList<>();
@Test
public void shouldThrowErrorWhenABusinessStepDoesNotBelongToTheGivenJob() {
ResponseSpecification responseSpecForError = new ResponseSpecBuilder().expectStatusCode(400).build();
List<BusinessStep> requestBody = new ArrayList<>();
requestBody.add(getBusinessSteps(1L, NOT_BELONGING_BUSINESS_STEP_NAME));
ApiParameterError response = BusinessStepConfigurationHelper.updateBusinessStepOrderWithError(requestSpec, responseSpecForError,
LOAN_JOB_NAME, BusinessStepConfigurationHelper.toJsonString(requestBody));
assertEquals("[APPLY_CHARGE_TO_OVERDUE_LOANS_2] Business steps are not configurable for this job.", response.getDeveloperMessage());
}
@Test
public void shouldThrowErrorWhenBusinessStepListIsEmpty() {
ResponseSpecification responseSpecForError = new ResponseSpecBuilder().expectStatusCode(400).build();
List<BusinessStep> requestBody = Collections.emptyList();
ApiParameterError response = BusinessStepConfigurationHelper.updateBusinessStepOrderWithError(requestSpec, responseSpecForError,
LOAN_JOB_NAME, BusinessStepConfigurationHelper.toJsonString(requestBody));
assertEquals("A job needs to have 1 business step at least.", response.getDeveloperMessage());
}
private BusinessStep getBusinessSteps(Long order, String stepName) {
BusinessStep businessStep = new BusinessStep();
businessStep.setStepName(APPLY_CHARGE_TO_OVERDUE_LOANS);
businessStep.setStepName(stepName);
businessStep.setOrder(order);
businessSteps.add(businessStep);
return businessSteps;
return businessStep;
}
}
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/BusinessStepConfigurationHelper.java
+13
View File
@@ -27,6 +27,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.fineract.cob.data.BusinessStep;
import org.apache.fineract.cob.data.JobBusinessStepConfigData;
import org.apache.fineract.cob.data.JobBusinessStepDetail;
import org.apache.fineract.infrastructure.core.data.ApiParameterError;
@Slf4j
public final class BusinessStepConfigurationHelper {
@@ -47,6 +48,10 @@ public final class BusinessStepConfigurationHelper {
return new Gson().fromJson(json, new TypeToken<JobBusinessStepConfigData>() {}.getType());
}
private static ApiParameterError configuredApiParameterErrorFromJsonString(final String json) {
return new Gson().fromJson(json, new TypeToken<ApiParameterError>() {}.getType());
}
private static JobBusinessStepDetail availableBusinessStepFromJsonString(final String json) {
return new Gson().fromJson(json, new TypeToken<JobBusinessStepDetail>() {}.getType());
}
@@ -74,6 +79,14 @@ public final class BusinessStepConfigurationHelper {
log.info("BusinessStepConfigurationHelper Response: {}", response);
}
public static ApiParameterError updateBusinessStepOrderWithError(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec, String jobName, String jsonBodyToSend) {
String response = Utils.performServerPut(requestSpec, responseSpec,
BUSINESS_STEPS_API_URL_START + jobName + BUSINESS_STEPS_API_URL_END, jsonBodyToSend);
log.info("BusinessStepConfigurationHelper Response: {}", response);
return BusinessStepConfigurationHelper.configuredApiParameterErrorFromJsonString(response);
}
private static final class BusinessStepWrapper {
private List<BusinessStep> businessSteps;