Skip to content

FINERACT-1772: Setting Fraud attribute for a loan account #2687

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
galovics merged 1 commit into from
Oct 21, 2022
Merged

FINERACT-1772: Setting Fraud attribute for a loan account #2687

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions ...ct-provider/src/main/java/org/apache/fineract/commands/service/CommandWrapperBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -994,6 +994,15 @@ public CommandWrapperBuilder updateLoanApplication(final Long loanId) {
return this;
}

public CommandWrapperBuilder markAsFraud(final Long loanId) {
this.actionName = "SETFRAUD";
this.entityName = "LOAN";
this.entityId = loanId;
this.loanId = loanId;
this.href = "/loans/" + loanId;
return this;
}

public CommandWrapperBuilder updateDisbusementDate(final Long loanId, final Long disbursementId) {
this.actionName = "UPDATE";
this.entityName = "DISBURSEMENTDETAIL";
Expand Down
5 changes: 5 additions & 0 deletions ...rovider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanApiConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,12 @@ public interface LoanApiConstants {

String TRANSACTION_AMOUNT_PARAMNAME = "transactionAmount";
String PAYMENT_TYPE_PARAMNAME = "paymentTypeId";
String FRAUD_ATTRIBUTE_NAME = "fraud";

// Commands
String CHARGEBACK_TRANSACTION_COMMAND = "chargeback";
String MARK_AS_FRAUD_COMMAND = "markAsFraud";

// Data Validator names
String LOAN_FRAUD_DATAVALIDATOR_PREFIX = "loans.fraud";
}
55 changes: 28 additions & 27 deletions ...rovider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.apache.fineract.commands.domain.CommandWrapper;
import org.apache.fineract.commands.service.CommandWrapperBuilder;
import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
Expand All @@ -75,6 +74,7 @@
import org.apache.fineract.infrastructure.core.serialization.ApiRequestJsonSerializationSettings;
import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer;
import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
import org.apache.fineract.infrastructure.core.service.CommandParameterUtil;
import org.apache.fineract.infrastructure.core.service.Page;
import org.apache.fineract.infrastructure.core.service.SearchParameters;
import org.apache.fineract.infrastructure.dataqueries.api.DataTableApiConstant;
Expand Down Expand Up @@ -759,7 +759,7 @@ public String calculateLoanScheduleOrSubmitLoanApplication(
@QueryParam("command") @Parameter(description = "command") final String commandParam, @Context final UriInfo uriInfo,
@Parameter(hidden = true) final String apiRequestBodyAsJson) {

if (is(commandParam, "calculateLoanSchedule")) {
if (CommandParameterUtil.is(commandParam, "calculateLoanSchedule")) {

final JsonElement parsedQuery = this.fromJsonHelper.parse(apiRequestBodyAsJson);
final JsonQuery query = JsonQuery.from(apiRequestBodyAsJson, parsedQuery, this.fromJsonHelper);
Expand All @@ -786,13 +786,18 @@ public String calculateLoanScheduleOrSubmitLoanApplication(
@ApiResponses({
@ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoansApiResourceSwagger.PutLoansLoanIdResponse.class))) })
public String modifyLoanApplication(@PathParam("loanId") @Parameter(description = "loanId") final Long loanId,
@QueryParam("command") @Parameter(description = "command") final String commandParam,
@Parameter(hidden = true) final String apiRequestBodyAsJson) {

final CommandWrapper commandRequest = new CommandWrapperBuilder().updateLoanApplication(loanId).withJson(apiRequestBodyAsJson)
.build();
final CommandWrapperBuilder builder = new CommandWrapperBuilder().withJson(apiRequestBodyAsJson);
CommandWrapper commandRequest = null;
if (CommandParameterUtil.is(commandParam, LoanApiConstants.MARK_AS_FRAUD_COMMAND)) {
commandRequest = builder.markAsFraud(loanId).build();
} else {
commandRequest = builder.updateLoanApplication(loanId).build();
}

final CommandProcessingResult result = this.commandsSourceWritePlatformService.logCommandSource(commandRequest);

return this.toApiJsonSerializer.serialize(result);
}

Expand Down Expand Up @@ -837,29 +842,29 @@ public String stateTransitions(@PathParam("loanId") @Parameter(description = "lo

final CommandWrapperBuilder builder = new CommandWrapperBuilder().withJson(apiRequestBodyAsJson);
CommandWrapper commandRequest = null;
if (is(commandParam, "reject")) {
if (CommandParameterUtil.is(commandParam, "reject")) {
commandRequest = builder.rejectLoanApplication(loanId).build();
} else if (is(commandParam, "withdrawnByApplicant")) {
} else if (CommandParameterUtil.is(commandParam, "withdrawnByApplicant")) {
commandRequest = builder.withdrawLoanApplication(loanId).build();
} else if (is(commandParam, "approve")) {
} else if (CommandParameterUtil.is(commandParam, "approve")) {
commandRequest = builder.approveLoanApplication(loanId).build();
} else if (is(commandParam, "disburse")) {
} else if (CommandParameterUtil.is(commandParam, "disburse")) {
commandRequest = builder.disburseLoanApplication(loanId).build();
} else if (is(commandParam, "disburseToSavings")) {
} else if (CommandParameterUtil.is(commandParam, "disburseToSavings")) {
commandRequest = builder.disburseLoanToSavingsApplication(loanId).build();
} else if (is(commandParam, "undoapproval")) {
} else if (CommandParameterUtil.is(commandParam, "undoapproval")) {
commandRequest = builder.undoLoanApplicationApproval(loanId).build();
} else if (is(commandParam, "undodisbursal")) {
} else if (CommandParameterUtil.is(commandParam, "undodisbursal")) {
commandRequest = builder.undoLoanApplicationDisbursal(loanId).build();
} else if (is(commandParam, "undolastdisbursal")) {
} else if (CommandParameterUtil.is(commandParam, "undolastdisbursal")) {
commandRequest = builder.undoLastDisbursalLoanApplication(loanId).build();
} else if (is(commandParam, "assignloanofficer")) {
} else if (CommandParameterUtil.is(commandParam, "assignloanofficer")) {
commandRequest = builder.assignLoanOfficer(loanId).build();
} else if (is(commandParam, "unassignloanofficer")) {
} else if (CommandParameterUtil.is(commandParam, "unassignloanofficer")) {
commandRequest = builder.unassignLoanOfficer(loanId).build();
} else if (is(commandParam, "recoverGuarantees")) {
} else if (CommandParameterUtil.is(commandParam, "recoverGuarantees")) {
commandRequest = new CommandWrapperBuilder().recoverFromGuarantor(loanId).build();
} else if (is(commandParam, "assigndelinquency")) {
} else if (CommandParameterUtil.is(commandParam, "assigndelinquency")) {
commandRequest = builder.assignDelinquency(loanId).build();
}

Expand All @@ -871,10 +876,6 @@ public String stateTransitions(@PathParam("loanId") @Parameter(description = "lo
return this.toApiJsonSerializer.serialize(result);
}

private boolean is(final String commandParam, final String commandValue) {
return StringUtils.isNotBlank(commandParam) && commandParam.trim().equalsIgnoreCase(commandValue);
}

@GET
@Path("downloadtemplate")
@Produces("application/vnd.ms-excel")
Expand Down Expand Up @@ -915,17 +916,17 @@ public String glimStateTransitions(@PathParam("glimId") final Long glimId, @Quer
final CommandWrapperBuilder builder = new CommandWrapperBuilder().withJson(apiRequestBodyAsJson);

CommandWrapper commandRequest = null;
if (is(commandParam, "reject")) {
if (CommandParameterUtil.is(commandParam, "reject")) {
commandRequest = builder.rejectGLIMApplication(glimId).build();
} else if (is(commandParam, "approve")) {
} else if (CommandParameterUtil.is(commandParam, "approve")) {
commandRequest = builder.approveGLIMLoanApplication(glimId).build();
} else if (is(commandParam, "disburse")) {
} else if (CommandParameterUtil.is(commandParam, "disburse")) {
commandRequest = builder.disburseGlimLoanApplication(glimId).build();
} else if (is(commandParam, "glimrepayment")) {
} else if (CommandParameterUtil.is(commandParam, "glimrepayment")) {
commandRequest = builder.repaymentGlimLoanApplication(glimId).build();
} else if (is(commandParam, "undodisbursal")) {
} else if (CommandParameterUtil.is(commandParam, "undodisbursal")) {
commandRequest = builder.undoGLIMLoanDisbursal(glimId).build();
} else if (is(commandParam, "undoapproval")) {
} else if (CommandParameterUtil.is(commandParam, "undoapproval")) {
commandRequest = builder.undoGLIMLoanApproval(glimId).build();
}

Expand Down
4 changes: 4 additions & 0 deletions .../src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResourceSwagger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,6 +972,8 @@ private GetLoansLoanIdCollectionData() {}
@Schema(description = "Set of charges")
public Set<GetLoansLoanIdLoanChargeData> charges;
public GetDelinquencyRangesResponse delinquencyRange;
@Schema(example = "false")
public Boolean fraud;
}

@Schema(description = "GetLoansResponse")
Expand Down Expand Up @@ -1169,6 +1171,8 @@ private PutLoansLoanIdRequest() {}
public String interestChargedFromDate;
@Schema(example = "true")
public Boolean isEqualAmortization;
@Schema(example = "true")
public Boolean fraud;
@Schema(example = "1")
public Integer graceOnArrearsAgeing;
@Schema(example = "1")
Expand Down
Loading