Merge pull request #1502 from nazeer1100126/Mifosx_1523_-_Loan_Rescheduling
Mifosx 1523 loan rescheduling
This commit is contained in:
pramod
@@ -306,5 +306,4 @@ public class CommandWrapper {
|
||||
return this.actionName.equalsIgnoreCase("UPDATE") && this.entityName.equalsIgnoreCase("DISBURSEMENTDETAIL")
|
||||
&& this.entityId == null;
|
||||
}
|
||||
|
||||
}
|
||||
-1
@@ -2457,5 +2457,4 @@ public class CommandWrapperBuilder {
|
||||
this.href = "/clients/" + clientId + "/transactions/" + transactionId + "?command=undo";
|
||||
return this;
|
||||
}
|
||||
|
||||
}
|
||||
+2
@@ -13,6 +13,8 @@ public class RescheduleLoansApiConstants {
|
||||
|
||||
public final static String ENTITY_NAME = "RESCHEDULELOAN";
|
||||
|
||||
public static final String LOAN_RESCHEDULE_REASON = "LoanRescheduleReason";
|
||||
|
||||
// general
|
||||
public static final String localeParamName = "locale";
|
||||
public static final String dateFormatParamName = "dateFormat";
|
||||
|
||||
+24
-8
@@ -69,23 +69,39 @@ public class RescheduleLoansApiResource {
|
||||
}
|
||||
|
||||
@GET
|
||||
@Path("{requestId}")
|
||||
@Path("template")
|
||||
@Consumes({ MediaType.APPLICATION_JSON })
|
||||
@Produces({ MediaType.APPLICATION_JSON })
|
||||
public String readLoanRescheduleRequest(@Context final UriInfo uriInfo, @PathParam("requestId") final Long requestId,
|
||||
public String retrieveTemplate(@Context final UriInfo uriInfo) {
|
||||
|
||||
this.platformSecurityContext.authenticatedUser().validateHasReadPermission(RescheduleLoansApiConstants.ENTITY_NAME);
|
||||
final ApiRequestJsonSerializationSettings settings = this.apiRequestParameterHelper.process(uriInfo.getQueryParameters());
|
||||
|
||||
LoanRescheduleRequestData loanRescheduleReasons = null;
|
||||
loanRescheduleReasons = this.loanRescheduleRequestReadPlatformService
|
||||
.retrieveAllRescheduleReasons(RescheduleLoansApiConstants.LOAN_RESCHEDULE_REASON);
|
||||
|
||||
return this.loanRescheduleRequestToApiJsonSerializer.serialize(settings, loanRescheduleReasons);
|
||||
}
|
||||
|
||||
@GET
|
||||
@Path("{scheduleId}")
|
||||
@Consumes({ MediaType.APPLICATION_JSON })
|
||||
@Produces({ MediaType.APPLICATION_JSON })
|
||||
public String readLoanRescheduleRequest(@Context final UriInfo uriInfo, @PathParam("scheduleId") final Long scheduleId,
|
||||
@QueryParam("command") final String command) {
|
||||
this.platformSecurityContext.authenticatedUser().validateHasReadPermission(RescheduleLoansApiConstants.ENTITY_NAME);
|
||||
|
||||
final ApiRequestJsonSerializationSettings settings = this.apiRequestParameterHelper.process(uriInfo.getQueryParameters());
|
||||
|
||||
if (compareIgnoreCase(command, "previewLoanReschedule")) {
|
||||
final LoanRescheduleModel loanRescheduleModel = this.loanReschedulePreviewPlatformService.previewLoanReschedule(requestId);
|
||||
final LoanRescheduleModel loanRescheduleModel = this.loanReschedulePreviewPlatformService.previewLoanReschedule(scheduleId);
|
||||
|
||||
return this.loanRescheduleToApiJsonSerializer.serialize(settings, loanRescheduleModel.toData(), new HashSet<String>());
|
||||
}
|
||||
|
||||
final LoanRescheduleRequestData loanRescheduleRequestData = this.loanRescheduleRequestReadPlatformService
|
||||
.readLoanRescheduleRequest(requestId);
|
||||
.readLoanRescheduleRequest(scheduleId);
|
||||
|
||||
return this.loanRescheduleRequestToApiJsonSerializer.serialize(settings, loanRescheduleRequestData);
|
||||
}
|
||||
@@ -103,20 +119,20 @@ public class RescheduleLoansApiResource {
|
||||
}
|
||||
|
||||
@POST
|
||||
@Path("{requestId}")
|
||||
@Path("{scheduleId}")
|
||||
@Consumes({ MediaType.APPLICATION_JSON })
|
||||
@Produces({ MediaType.APPLICATION_JSON })
|
||||
public String updateLoanRescheduleRequest(@PathParam("requestId") final Long requestId, @QueryParam("command") final String command,
|
||||
public String updateLoanRescheduleRequest(@PathParam("scheduleId") final Long scheduleId, @QueryParam("command") final String command,
|
||||
final String apiRequestBodyAsJson) {
|
||||
CommandWrapper commandWrapper = null;
|
||||
|
||||
if (compareIgnoreCase(command, "approve")) {
|
||||
commandWrapper = new CommandWrapperBuilder().approveLoanRescheduleRequest(RescheduleLoansApiConstants.ENTITY_NAME, requestId)
|
||||
commandWrapper = new CommandWrapperBuilder().approveLoanRescheduleRequest(RescheduleLoansApiConstants.ENTITY_NAME, scheduleId)
|
||||
.withJson(apiRequestBodyAsJson).build();
|
||||
}
|
||||
|
||||
else if (compareIgnoreCase(command, "reject")) {
|
||||
commandWrapper = new CommandWrapperBuilder().rejectLoanRescheduleRequest(RescheduleLoansApiConstants.ENTITY_NAME, requestId)
|
||||
commandWrapper = new CommandWrapperBuilder().rejectLoanRescheduleRequest(RescheduleLoansApiConstants.ENTITY_NAME, scheduleId)
|
||||
.withJson(apiRequestBodyAsJson).build();
|
||||
}
|
||||
|
||||
|
||||
+174
-171
@@ -6,197 +6,200 @@
|
||||
package org.mifosplatform.portfolio.loanaccount.rescheduleloan.data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Collection;
|
||||
|
||||
import org.joda.time.LocalDate;
|
||||
import org.mifosplatform.infrastructure.codes.data.CodeValueData;
|
||||
|
||||
/**
|
||||
* Immutable data object representing loan reschedule request data.
|
||||
/**
|
||||
* Immutable data object representing loan reschedule request data.
|
||||
**/
|
||||
public class LoanRescheduleRequestData {
|
||||
|
||||
private final Long id;
|
||||
private final Long loanId;
|
||||
private final Long clientId;
|
||||
private final String clientName;
|
||||
private final String loanAccountNumber;
|
||||
private final LoanRescheduleRequestStatusEnumData statusEnum;
|
||||
private final Integer rescheduleFromInstallment;
|
||||
private final Integer graceOnPrincipal;
|
||||
private final Integer graceOnInterest;
|
||||
private final LocalDate rescheduleFromDate;
|
||||
private final Integer extraTerms;
|
||||
private final BigDecimal interestRate;
|
||||
private final Boolean recalculateInterest;
|
||||
private final CodeValueData rescheduleReasonCodeValue;
|
||||
private final LoanRescheduleRequestTimelineData timeline;
|
||||
private final String rescheduleReasonComment;
|
||||
private final LocalDate adjustedDueDate;
|
||||
|
||||
/**
|
||||
* LoanRescheduleRequestData constructor
|
||||
**/
|
||||
private LoanRescheduleRequestData(Long id, Long loanId, LoanRescheduleRequestStatusEnumData statusEnum,
|
||||
Integer rescheduleFromInstallment, Integer graceOnPrincipal, Integer graceOnInterest,
|
||||
LocalDate rescheduleFromDate, LocalDate adjustedDueDate, Integer extraTerms, BigDecimal interestRate,
|
||||
CodeValueData rescheduleReasonCodeValue, String rescheduleReasonComment, LoanRescheduleRequestTimelineData timeline,
|
||||
final String clientName, final String loanAccountNumber, final Long clientId, final Boolean recalculateInterest) {
|
||||
|
||||
this.id = id;
|
||||
this.loanId = loanId;
|
||||
this.statusEnum = statusEnum;
|
||||
this.rescheduleFromInstallment = rescheduleFromInstallment;
|
||||
this.graceOnPrincipal = graceOnPrincipal;
|
||||
this.graceOnInterest = graceOnInterest;
|
||||
this.rescheduleFromDate = rescheduleFromDate;
|
||||
this.extraTerms = extraTerms;
|
||||
this.interestRate = interestRate;
|
||||
this.rescheduleReasonCodeValue = rescheduleReasonCodeValue;
|
||||
this.rescheduleReasonComment = rescheduleReasonComment;
|
||||
this.adjustedDueDate = adjustedDueDate;
|
||||
this.timeline = timeline;
|
||||
this.clientName = clientName;
|
||||
this.loanAccountNumber = loanAccountNumber;
|
||||
this.clientId = clientId;
|
||||
this.recalculateInterest = recalculateInterest;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return an instance of the LoanRescheduleRequestData class
|
||||
**/
|
||||
public static LoanRescheduleRequestData instance(Long id, Long loanId, LoanRescheduleRequestStatusEnumData statusEnum,
|
||||
Integer rescheduleFromInstallment, Integer graceOnPrincipal, Integer graceOnInterest,
|
||||
LocalDate rescheduleFromDate, LocalDate adjustedDueDate, Integer extraTerms, BigDecimal interestRate,
|
||||
CodeValueData rescheduleReasonCodeValue, String rescheduleReasonComment, LoanRescheduleRequestTimelineData timeline,
|
||||
final String clientName, final String loanAccountNumber, final Long clientId, final Boolean recalculateInterest) {
|
||||
|
||||
return new LoanRescheduleRequestData(id, loanId, statusEnum, rescheduleFromInstallment, graceOnPrincipal, graceOnInterest,
|
||||
rescheduleFromDate, adjustedDueDate, extraTerms, interestRate, rescheduleReasonCodeValue, rescheduleReasonComment,
|
||||
timeline, clientName, loanAccountNumber, clientId, recalculateInterest);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the id
|
||||
*/
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
private final Long id;
|
||||
private final Long loanId;
|
||||
private final Long clientId;
|
||||
private final String clientName;
|
||||
private final String loanAccountNumber;
|
||||
private final LoanRescheduleRequestStatusEnumData statusEnum;
|
||||
private final Integer rescheduleFromInstallment;
|
||||
private final Integer graceOnPrincipal;
|
||||
private final Integer graceOnInterest;
|
||||
private final LocalDate rescheduleFromDate;
|
||||
private final Integer extraTerms;
|
||||
private final BigDecimal interestRate;
|
||||
private final Boolean recalculateInterest;
|
||||
private final CodeValueData rescheduleReasonCodeValue;
|
||||
private final LoanRescheduleRequestTimelineData timeline;
|
||||
private final String rescheduleReasonComment;
|
||||
private final LocalDate adjustedDueDate;
|
||||
private final Collection<CodeValueData> rescheduleReasons;
|
||||
|
||||
/**
|
||||
* LoanRescheduleRequestData constructor
|
||||
**/
|
||||
private LoanRescheduleRequestData(Long id, Long loanId, LoanRescheduleRequestStatusEnumData statusEnum,
|
||||
Integer rescheduleFromInstallment, Integer graceOnPrincipal, Integer graceOnInterest, LocalDate rescheduleFromDate,
|
||||
LocalDate adjustedDueDate, Integer extraTerms, BigDecimal interestRate, CodeValueData rescheduleReasonCodeValue,
|
||||
String rescheduleReasonComment, LoanRescheduleRequestTimelineData timeline, final String clientName,
|
||||
final String loanAccountNumber, final Long clientId, final Boolean recalculateInterest, Collection<CodeValueData> rescheduleReasons) {
|
||||
|
||||
/**
|
||||
* @return the loanId
|
||||
*/
|
||||
public Long getLoanId() {
|
||||
return loanId;
|
||||
}
|
||||
this.id = id;
|
||||
this.loanId = loanId;
|
||||
this.statusEnum = statusEnum;
|
||||
this.rescheduleFromInstallment = rescheduleFromInstallment;
|
||||
this.graceOnPrincipal = graceOnPrincipal;
|
||||
this.graceOnInterest = graceOnInterest;
|
||||
this.rescheduleFromDate = rescheduleFromDate;
|
||||
this.extraTerms = extraTerms;
|
||||
this.interestRate = interestRate;
|
||||
this.rescheduleReasonCodeValue = rescheduleReasonCodeValue;
|
||||
this.rescheduleReasonComment = rescheduleReasonComment;
|
||||
this.adjustedDueDate = adjustedDueDate;
|
||||
this.timeline = timeline;
|
||||
this.clientName = clientName;
|
||||
this.loanAccountNumber = loanAccountNumber;
|
||||
this.clientId = clientId;
|
||||
this.recalculateInterest = recalculateInterest;
|
||||
this.rescheduleReasons = rescheduleReasons ;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the statusEnum
|
||||
*/
|
||||
public LoanRescheduleRequestStatusEnumData getStatusEnum() {
|
||||
return statusEnum;
|
||||
}
|
||||
/**
|
||||
* @return an instance of the LoanRescheduleRequestData class
|
||||
**/
|
||||
public static LoanRescheduleRequestData instance(Long id, Long loanId, LoanRescheduleRequestStatusEnumData statusEnum,
|
||||
Integer rescheduleFromInstallment, Integer graceOnPrincipal, Integer graceOnInterest, LocalDate rescheduleFromDate,
|
||||
LocalDate adjustedDueDate, Integer extraTerms, BigDecimal interestRate, CodeValueData rescheduleReasonCodeValue,
|
||||
String rescheduleReasonComment, LoanRescheduleRequestTimelineData timeline, final String clientName,
|
||||
final String loanAccountNumber, final Long clientId, final Boolean recalculateInterest, Collection<CodeValueData> rescheduleReasons) {
|
||||
|
||||
/**
|
||||
* @return the reschedule from installment number
|
||||
*/
|
||||
public Integer getRescheduleFromInstallment() {
|
||||
return rescheduleFromInstallment;
|
||||
}
|
||||
return new LoanRescheduleRequestData(id, loanId, statusEnum, rescheduleFromInstallment, graceOnPrincipal, graceOnInterest,
|
||||
rescheduleFromDate, adjustedDueDate, extraTerms, interestRate, rescheduleReasonCodeValue, rescheduleReasonComment,
|
||||
timeline, clientName, loanAccountNumber, clientId, recalculateInterest, rescheduleReasons);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the graceOnPrincipal
|
||||
*/
|
||||
public Integer getGraceOnPrincipal() {
|
||||
return graceOnPrincipal;
|
||||
}
|
||||
/**
|
||||
* @return the id
|
||||
*/
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the graceOnInterest
|
||||
*/
|
||||
public Integer getGraceOnInterest() {
|
||||
return graceOnInterest;
|
||||
}
|
||||
/**
|
||||
* @return the loanId
|
||||
*/
|
||||
public Long getLoanId() {
|
||||
return loanId;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the reschedule from date
|
||||
*/
|
||||
public LocalDate getRescheduleFromDate() {
|
||||
return rescheduleFromDate;
|
||||
}
|
||||
/**
|
||||
* @return the statusEnum
|
||||
*/
|
||||
public LoanRescheduleRequestStatusEnumData getStatusEnum() {
|
||||
return statusEnum;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the extraTerms
|
||||
*/
|
||||
public Integer getExtraTerms() {
|
||||
return extraTerms;
|
||||
}
|
||||
/**
|
||||
* @return the reschedule from installment number
|
||||
*/
|
||||
public Integer getRescheduleFromInstallment() {
|
||||
return rescheduleFromInstallment;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the interestRate
|
||||
*/
|
||||
public BigDecimal getInterestRate() {
|
||||
return interestRate;
|
||||
}
|
||||
/**
|
||||
* @return the graceOnPrincipal
|
||||
*/
|
||||
public Integer getGraceOnPrincipal() {
|
||||
return graceOnPrincipal;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the rescheduleReasonCodeValueId
|
||||
*/
|
||||
public CodeValueData getRescheduleReasonCodeValueId() {
|
||||
return rescheduleReasonCodeValue;
|
||||
}
|
||||
/**
|
||||
* @return the graceOnInterest
|
||||
*/
|
||||
public Integer getGraceOnInterest() {
|
||||
return graceOnInterest;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the rescheduleReasonText
|
||||
*/
|
||||
public String getRescheduleReasonComment() {
|
||||
return rescheduleReasonComment;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the timeline
|
||||
**/
|
||||
public LoanRescheduleRequestTimelineData getTimeline() {
|
||||
return this.timeline;
|
||||
}
|
||||
/**
|
||||
* @return the reschedule from date
|
||||
*/
|
||||
public LocalDate getRescheduleFromDate() {
|
||||
return rescheduleFromDate;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the adjustedDueDate
|
||||
*/
|
||||
public LocalDate getAdjustedDueDate() {
|
||||
return adjustedDueDate;
|
||||
}
|
||||
/**
|
||||
* @return the extraTerms
|
||||
*/
|
||||
public Integer getExtraTerms() {
|
||||
return extraTerms;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the clientName
|
||||
*/
|
||||
public String getClientName() {
|
||||
return clientName;
|
||||
}
|
||||
/**
|
||||
* @return the interestRate
|
||||
*/
|
||||
public BigDecimal getInterestRate() {
|
||||
return interestRate;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the loanAccountNumber
|
||||
*/
|
||||
public String getLoanAccountNumber() {
|
||||
return loanAccountNumber;
|
||||
}
|
||||
/**
|
||||
* @return the rescheduleReasonCodeValueId
|
||||
*/
|
||||
public CodeValueData getRescheduleReasonCodeValueId() {
|
||||
return rescheduleReasonCodeValue;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the clientId
|
||||
*/
|
||||
public Long getClientId() {
|
||||
return clientId;
|
||||
}
|
||||
/**
|
||||
* @return the rescheduleReasonText
|
||||
*/
|
||||
public String getRescheduleReasonComment() {
|
||||
return rescheduleReasonComment;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the recalculateInterest
|
||||
*/
|
||||
public Boolean getRecalculateInterest() {
|
||||
boolean value = false;
|
||||
|
||||
if(recalculateInterest != null) {
|
||||
value = recalculateInterest;
|
||||
}
|
||||
|
||||
return value;
|
||||
}
|
||||
/**
|
||||
* @return the timeline
|
||||
**/
|
||||
public LoanRescheduleRequestTimelineData getTimeline() {
|
||||
return this.timeline;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the adjustedDueDate
|
||||
*/
|
||||
public LocalDate getAdjustedDueDate() {
|
||||
return adjustedDueDate;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the clientName
|
||||
*/
|
||||
public String getClientName() {
|
||||
return clientName;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the loanAccountNumber
|
||||
*/
|
||||
public String getLoanAccountNumber() {
|
||||
return loanAccountNumber;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the clientId
|
||||
*/
|
||||
public Long getClientId() {
|
||||
return clientId;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the recalculateInterest
|
||||
*/
|
||||
public Boolean getRecalculateInterest() {
|
||||
boolean value = false;
|
||||
|
||||
if (recalculateInterest != null) {
|
||||
value = recalculateInterest;
|
||||
}
|
||||
|
||||
return value;
|
||||
}
|
||||
}
|
||||
|
||||
+36
-24
@@ -10,28 +10,40 @@ import java.util.List;
|
||||
import org.mifosplatform.portfolio.loanaccount.rescheduleloan.data.LoanRescheduleRequestData;
|
||||
|
||||
public interface LoanRescheduleRequestReadPlatformService {
|
||||
|
||||
/**
|
||||
* get all loan reschedule requests by loan ID
|
||||
*
|
||||
* @param loanId the loan identifier
|
||||
* @return list of LoanRescheduleRequestData objects
|
||||
**/
|
||||
public List<LoanRescheduleRequestData> readLoanRescheduleRequests(Long loanId);
|
||||
|
||||
/**
|
||||
* get a single loan reschedule request by ID (primary key)
|
||||
*
|
||||
* @param requestId the loan reschedule request identifier
|
||||
* @return a LoanRescheduleRequestData object
|
||||
**/
|
||||
public LoanRescheduleRequestData readLoanRescheduleRequest(Long requestId);
|
||||
|
||||
/**
|
||||
* get all loan reschedule requests filter by loan ID and status enum
|
||||
*
|
||||
* @param loanId the loan identifier
|
||||
* @return list of LoanRescheduleRequestData objects
|
||||
**/
|
||||
public List<LoanRescheduleRequestData> readLoanRescheduleRequests(Long loanId, Integer statusEnum);
|
||||
|
||||
/**
|
||||
* get all loan reschedule requests by loan ID
|
||||
*
|
||||
* @param loanId
|
||||
* the loan identifier
|
||||
* @return list of LoanRescheduleRequestData objects
|
||||
**/
|
||||
public List<LoanRescheduleRequestData> readLoanRescheduleRequests(Long loanId);
|
||||
|
||||
/**
|
||||
* get a single loan reschedule request by ID (primary key)
|
||||
*
|
||||
* @param requestId
|
||||
* the loan reschedule request identifier
|
||||
* @return a LoanRescheduleRequestData object
|
||||
**/
|
||||
public LoanRescheduleRequestData readLoanRescheduleRequest(Long requestId);
|
||||
|
||||
/**
|
||||
* get all loan reschedule requests filter by loan ID and status enum
|
||||
*
|
||||
* @param loanId
|
||||
* the loan identifier
|
||||
* @return list of LoanRescheduleRequestData objects
|
||||
**/
|
||||
public List<LoanRescheduleRequestData> readLoanRescheduleRequests(Long loanId, Integer statusEnum);
|
||||
|
||||
/**
|
||||
* get all loan reschedule reasons
|
||||
*
|
||||
* @param loanRescheduleReason
|
||||
* the loan reschedule reason
|
||||
* @return list of LoanRescheduleRequestData objects
|
||||
**/
|
||||
public LoanRescheduleRequestData retrieveAllRescheduleReasons(String loanRescheduleReason);
|
||||
}
|
||||
|
||||
+150
-126
@@ -8,10 +8,13 @@ package org.mifosplatform.portfolio.loanaccount.rescheduleloan.service;
|
||||
import java.math.BigDecimal;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
import org.joda.time.LocalDate;
|
||||
import org.mifosplatform.infrastructure.codes.data.CodeValueData;
|
||||
import org.mifosplatform.infrastructure.codes.service.CodeValueReadPlatformService;
|
||||
import org.mifosplatform.infrastructure.core.domain.JdbcSupport;
|
||||
import org.mifosplatform.infrastructure.core.service.RoutingDataSource;
|
||||
import org.mifosplatform.portfolio.loanaccount.domain.Loan;
|
||||
@@ -29,83 +32,84 @@ import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
public class LoanRescheduleRequestReadPlatformServiceImpl implements LoanRescheduleRequestReadPlatformService {
|
||||
|
||||
private final JdbcTemplate jdbcTemplate;
|
||||
private final LoanRepository loanRepository;
|
||||
private final LoanRescheduleRequestRowMapper loanRescheduleRequestRowMapper = new LoanRescheduleRequestRowMapper();
|
||||
|
||||
@Autowired
|
||||
public LoanRescheduleRequestReadPlatformServiceImpl(final RoutingDataSource dataSource,
|
||||
LoanRepository loanRepository) {
|
||||
this.jdbcTemplate = new JdbcTemplate(dataSource);
|
||||
this.loanRepository = loanRepository;
|
||||
}
|
||||
|
||||
private static final class LoanRescheduleRequestRowMapper implements RowMapper<LoanRescheduleRequestData> {
|
||||
|
||||
private final String schema;
|
||||
|
||||
public LoanRescheduleRequestRowMapper() {
|
||||
final StringBuilder sqlBuilder = new StringBuilder(200);
|
||||
|
||||
sqlBuilder.append("lr.id as id, lr.loan_id as loanId, lr.status_enum as statusEnum, ");
|
||||
sqlBuilder.append("mc.display_name as clientName, ");
|
||||
sqlBuilder.append("mc.id as clientId, ");
|
||||
sqlBuilder.append("ml.account_no as loanAccountNumber, ");
|
||||
sqlBuilder.append("lr.reschedule_from_installment as rescheduleFromInstallment, ");
|
||||
sqlBuilder.append("lr.grace_on_principal as graceOnPrincipal, ");
|
||||
sqlBuilder.append("lr.grace_on_interest as graceOnInterest, ");
|
||||
sqlBuilder.append("lr.reschedule_from_date as rescheduleFromDate, ");
|
||||
sqlBuilder.append("lr.adjusted_due_date as adjustedDueDate, ");
|
||||
sqlBuilder.append("lr.extra_terms as extraTerms, ");
|
||||
sqlBuilder.append("lr.recalculate_interest as recalculateInterest, ");
|
||||
sqlBuilder.append("lr.interest_rate as interestRate, ");
|
||||
sqlBuilder.append("lr.reschedule_reason_cv_id as rescheduleReasonCvId, ");
|
||||
sqlBuilder.append("cv.code_value as rescheduleReasonCvValue, ");
|
||||
sqlBuilder.append("lr.reschedule_reason_comment as rescheduleReasonComment, ");
|
||||
|
||||
sqlBuilder.append("lr.submitted_on_date as submittedOnDate, ");
|
||||
sqlBuilder.append("sbu.username as submittedByUsername, ");
|
||||
sqlBuilder.append("sbu.firstname as submittedByFirstname, ");
|
||||
sqlBuilder.append("sbu.lastname as submittedByLastname, ");
|
||||
|
||||
sqlBuilder.append("lr.approved_on_date as approvedOnDate, ");
|
||||
sqlBuilder.append("abu.username as approvedByUsername, ");
|
||||
sqlBuilder.append("abu.firstname as approvedByFirstname, ");
|
||||
sqlBuilder.append("abu.lastname as approvedByLastname, ");
|
||||
|
||||
sqlBuilder.append("lr.rejected_on_date as rejectedOnDate, ");
|
||||
sqlBuilder.append("rbu.username as rejectedByUsername, ");
|
||||
sqlBuilder.append("rbu.firstname as rejectedByFirstname, ");
|
||||
sqlBuilder.append("rbu.lastname as rejectedByLastname ");
|
||||
|
||||
sqlBuilder.append("from " + loanRescheduleRequestTableName() + " lr ");
|
||||
sqlBuilder.append("left join m_code_value cv on cv.id = lr.reschedule_reason_cv_id ");
|
||||
sqlBuilder.append("left join m_appuser sbu on sbu.id = lr.submitted_by_user_id ");
|
||||
sqlBuilder.append("left join m_appuser abu on abu.id = lr.approved_by_user_id ");
|
||||
sqlBuilder.append("left join m_appuser rbu on rbu.id = lr.rejected_by_user_id ");
|
||||
sqlBuilder.append("left join m_loan ml on ml.id = lr.loan_id ");
|
||||
sqlBuilder.append("left join m_client mc on mc.id = ml.client_id ");
|
||||
|
||||
this.schema = sqlBuilder.toString();
|
||||
}
|
||||
|
||||
public String schema() {
|
||||
|
||||
private final JdbcTemplate jdbcTemplate;
|
||||
private final LoanRepository loanRepository;
|
||||
private final LoanRescheduleRequestRowMapper loanRescheduleRequestRowMapper = new LoanRescheduleRequestRowMapper();
|
||||
private final CodeValueReadPlatformService codeValueReadPlatformService;
|
||||
|
||||
@Autowired
|
||||
public LoanRescheduleRequestReadPlatformServiceImpl(final RoutingDataSource dataSource, LoanRepository loanRepository,
|
||||
final CodeValueReadPlatformService codeValueReadPlatformService) {
|
||||
this.jdbcTemplate = new JdbcTemplate(dataSource);
|
||||
this.loanRepository = loanRepository;
|
||||
this.codeValueReadPlatformService = codeValueReadPlatformService;
|
||||
}
|
||||
|
||||
private static final class LoanRescheduleRequestRowMapper implements RowMapper<LoanRescheduleRequestData> {
|
||||
|
||||
private final String schema;
|
||||
|
||||
public LoanRescheduleRequestRowMapper() {
|
||||
final StringBuilder sqlBuilder = new StringBuilder(200);
|
||||
|
||||
sqlBuilder.append("lr.id as id, lr.loan_id as loanId, lr.status_enum as statusEnum, ");
|
||||
sqlBuilder.append("mc.display_name as clientName, ");
|
||||
sqlBuilder.append("mc.id as clientId, ");
|
||||
sqlBuilder.append("ml.account_no as loanAccountNumber, ");
|
||||
sqlBuilder.append("lr.reschedule_from_installment as rescheduleFromInstallment, ");
|
||||
sqlBuilder.append("lr.grace_on_principal as graceOnPrincipal, ");
|
||||
sqlBuilder.append("lr.grace_on_interest as graceOnInterest, ");
|
||||
sqlBuilder.append("lr.reschedule_from_date as rescheduleFromDate, ");
|
||||
sqlBuilder.append("lr.adjusted_due_date as adjustedDueDate, ");
|
||||
sqlBuilder.append("lr.extra_terms as extraTerms, ");
|
||||
sqlBuilder.append("lr.recalculate_interest as recalculateInterest, ");
|
||||
sqlBuilder.append("lr.interest_rate as interestRate, ");
|
||||
sqlBuilder.append("lr.reschedule_reason_cv_id as rescheduleReasonCvId, ");
|
||||
sqlBuilder.append("cv.code_value as rescheduleReasonCvValue, ");
|
||||
sqlBuilder.append("lr.reschedule_reason_comment as rescheduleReasonComment, ");
|
||||
|
||||
sqlBuilder.append("lr.submitted_on_date as submittedOnDate, ");
|
||||
sqlBuilder.append("sbu.username as submittedByUsername, ");
|
||||
sqlBuilder.append("sbu.firstname as submittedByFirstname, ");
|
||||
sqlBuilder.append("sbu.lastname as submittedByLastname, ");
|
||||
|
||||
sqlBuilder.append("lr.approved_on_date as approvedOnDate, ");
|
||||
sqlBuilder.append("abu.username as approvedByUsername, ");
|
||||
sqlBuilder.append("abu.firstname as approvedByFirstname, ");
|
||||
sqlBuilder.append("abu.lastname as approvedByLastname, ");
|
||||
|
||||
sqlBuilder.append("lr.rejected_on_date as rejectedOnDate, ");
|
||||
sqlBuilder.append("rbu.username as rejectedByUsername, ");
|
||||
sqlBuilder.append("rbu.firstname as rejectedByFirstname, ");
|
||||
sqlBuilder.append("rbu.lastname as rejectedByLastname ");
|
||||
|
||||
sqlBuilder.append("from " + loanRescheduleRequestTableName() + " lr ");
|
||||
sqlBuilder.append("left join m_code_value cv on cv.id = lr.reschedule_reason_cv_id ");
|
||||
sqlBuilder.append("left join m_appuser sbu on sbu.id = lr.submitted_by_user_id ");
|
||||
sqlBuilder.append("left join m_appuser abu on abu.id = lr.approved_by_user_id ");
|
||||
sqlBuilder.append("left join m_appuser rbu on rbu.id = lr.rejected_by_user_id ");
|
||||
sqlBuilder.append("left join m_loan ml on ml.id = lr.loan_id ");
|
||||
sqlBuilder.append("left join m_client mc on mc.id = ml.client_id ");
|
||||
|
||||
this.schema = sqlBuilder.toString();
|
||||
}
|
||||
|
||||
public String schema() {
|
||||
return this.schema;
|
||||
}
|
||||
|
||||
public String loanRescheduleRequestTableName() {
|
||||
return "m_loan_reschedule_request";
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("unused")
|
||||
public LoanRescheduleRequestData mapRow(final ResultSet rs, final int rowNum) throws SQLException {
|
||||
final Long id = rs.getLong("id");
|
||||
|
||||
public String loanRescheduleRequestTableName() {
|
||||
return "m_loan_reschedule_request";
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("unused")
|
||||
public LoanRescheduleRequestData mapRow(final ResultSet rs, final int rowNum) throws SQLException {
|
||||
final Long id = rs.getLong("id");
|
||||
final Long loanId = rs.getLong("loanId");
|
||||
final Integer statusEnumId = JdbcSupport.getInteger(rs, "statusEnum");
|
||||
final LoanRescheduleRequestStatusEnumData statusEnum = LoanRescheduleRequestEnumerations
|
||||
.status(statusEnumId);
|
||||
final LoanRescheduleRequestStatusEnumData statusEnum = LoanRescheduleRequestEnumerations.status(statusEnumId);
|
||||
final String clientName = rs.getString("clientName");
|
||||
final String loanAccountNumber = rs.getString("loanAccountNumber");
|
||||
final Long clientId = rs.getLong("clientId");
|
||||
@@ -118,76 +122,96 @@ public class LoanRescheduleRequestReadPlatformServiceImpl implements LoanResched
|
||||
final BigDecimal interestRate = rs.getBigDecimal("interestRate");
|
||||
final Long rescheduleReasonCvId = JdbcSupport.getLong(rs, "rescheduleReasonCvId");
|
||||
final String rescheduleReasonCvValue = rs.getString("rescheduleReasonCvValue");
|
||||
final CodeValueData rescheduleReasonCodeValue = CodeValueData
|
||||
.instance(rescheduleReasonCvId, rescheduleReasonCvValue);
|
||||
final CodeValueData rescheduleReasonCodeValue = CodeValueData.instance(rescheduleReasonCvId, rescheduleReasonCvValue);
|
||||
final String rescheduleReasonComment = rs.getString("rescheduleReasonComment");
|
||||
final Boolean recalculateInterest = rs.getBoolean("recalculateInterest");
|
||||
|
||||
|
||||
final LocalDate submittedOnDate = JdbcSupport.getLocalDate(rs, "submittedOnDate");
|
||||
final String submittedByUsername = rs.getString("submittedByUsername");
|
||||
final String submittedByFirstname = rs.getString("submittedByFirstname");
|
||||
final String submittedByLastname = rs.getString("submittedByLastname");
|
||||
|
||||
|
||||
final LocalDate approvedOnDate = JdbcSupport.getLocalDate(rs, "approvedOnDate");
|
||||
final String approvedByUsername = rs.getString("approvedByUsername");
|
||||
final String approvedByFirstname = rs.getString("approvedByFirstname");
|
||||
final String approvedByLastname = rs.getString("approvedByLastname");
|
||||
|
||||
|
||||
final LocalDate rejectedOnDate = JdbcSupport.getLocalDate(rs, "rejectedOnDate");
|
||||
final String rejectedByUsername = rs.getString("rejectedByUsername");
|
||||
final String rejectedByFirstname = rs.getString("rejectedByFirstname");
|
||||
final String rejectedByLastname = rs.getString("rejectedByLastname");
|
||||
|
||||
final LoanRescheduleRequestTimelineData timeline = new LoanRescheduleRequestTimelineData(submittedOnDate,
|
||||
submittedByUsername, submittedByFirstname, submittedByLastname, approvedOnDate, approvedByUsername,
|
||||
approvedByFirstname, approvedByLastname, rejectedOnDate, rejectedByUsername, rejectedByFirstname,
|
||||
rejectedByLastname);
|
||||
final Collection<CodeValueData> rescheduleReasons = null;
|
||||
final LoanRescheduleRequestTimelineData timeline = new LoanRescheduleRequestTimelineData(submittedOnDate, submittedByUsername,
|
||||
submittedByFirstname, submittedByLastname, approvedOnDate, approvedByUsername, approvedByFirstname, approvedByLastname,
|
||||
rejectedOnDate, rejectedByUsername, rejectedByFirstname, rejectedByLastname);
|
||||
|
||||
return LoanRescheduleRequestData.instance(id, loanId, statusEnum, rescheduleFromInstallment, graceOnPrincipal,
|
||||
graceOnInterest, rescheduleFromDate, adjustedDueDate, extraTerms, interestRate, rescheduleReasonCodeValue,
|
||||
rescheduleReasonComment, timeline, clientName, loanAccountNumber, clientId, recalculateInterest);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<LoanRescheduleRequestData> readLoanRescheduleRequests(Long loanId) {
|
||||
final Loan loan = this.loanRepository.findOne(loanId);
|
||||
|
||||
if(loan == null) {
|
||||
throw new LoanNotFoundException(loanId);
|
||||
return LoanRescheduleRequestData.instance(id, loanId, statusEnum, rescheduleFromInstallment, graceOnPrincipal, graceOnInterest,
|
||||
rescheduleFromDate, adjustedDueDate, extraTerms, interestRate, rescheduleReasonCodeValue, rescheduleReasonComment,
|
||||
timeline, clientName, loanAccountNumber, clientId, recalculateInterest, rescheduleReasons);
|
||||
}
|
||||
|
||||
final String sql = "select " + this.loanRescheduleRequestRowMapper.schema() + " where lr.loan_id = ?";
|
||||
|
||||
return this.jdbcTemplate.query(sql, this.loanRescheduleRequestRowMapper, new Object[] { loanId });
|
||||
}
|
||||
|
||||
@Override
|
||||
public LoanRescheduleRequestData readLoanRescheduleRequest(Long requestId) {
|
||||
|
||||
try {
|
||||
final String sql = "select " + this.loanRescheduleRequestRowMapper.schema() + " where lr.id = ?";
|
||||
|
||||
return this.jdbcTemplate.queryForObject(sql, this.loanRescheduleRequestRowMapper, new Object[] { requestId });
|
||||
}
|
||||
|
||||
catch(final EmptyResultDataAccessException e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<LoanRescheduleRequestData> readLoanRescheduleRequests(Long loanId, Integer statusEnum) {
|
||||
final Loan loan = this.loanRepository.findOne(loanId);
|
||||
|
||||
if(loan == null) {
|
||||
throw new LoanNotFoundException(loanId);
|
||||
@Override
|
||||
public List<LoanRescheduleRequestData> readLoanRescheduleRequests(Long loanId) {
|
||||
final Loan loan = this.loanRepository.findOne(loanId);
|
||||
|
||||
if (loan == null) { throw new LoanNotFoundException(loanId); }
|
||||
|
||||
final String sql = "select " + this.loanRescheduleRequestRowMapper.schema() + " where lr.loan_id = ?";
|
||||
|
||||
return this.jdbcTemplate.query(sql, this.loanRescheduleRequestRowMapper, new Object[] { loanId });
|
||||
}
|
||||
|
||||
@Override
|
||||
public LoanRescheduleRequestData readLoanRescheduleRequest(Long requestId) {
|
||||
|
||||
try {
|
||||
final String sql = "select " + this.loanRescheduleRequestRowMapper.schema() + " where lr.id = ?";
|
||||
|
||||
return this.jdbcTemplate.queryForObject(sql, this.loanRescheduleRequestRowMapper, new Object[] { requestId });
|
||||
}
|
||||
|
||||
final String sql = "select " + this.loanRescheduleRequestRowMapper.schema() + " where lr.loan_id = ?"
|
||||
+ " and lr.status_enum = ?";
|
||||
|
||||
return this.jdbcTemplate.query(sql, this.loanRescheduleRequestRowMapper, new Object[] { loanId, statusEnum });
|
||||
}
|
||||
|
||||
catch (final EmptyResultDataAccessException e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<LoanRescheduleRequestData> readLoanRescheduleRequests(Long loanId, Integer statusEnum) {
|
||||
final Loan loan = this.loanRepository.findOne(loanId);
|
||||
|
||||
if (loan == null) { throw new LoanNotFoundException(loanId); }
|
||||
|
||||
final String sql = "select " + this.loanRescheduleRequestRowMapper.schema() + " where lr.loan_id = ?" + " and lr.status_enum = ?";
|
||||
|
||||
return this.jdbcTemplate.query(sql, this.loanRescheduleRequestRowMapper, new Object[] { loanId, statusEnum });
|
||||
}
|
||||
|
||||
@Override
|
||||
public LoanRescheduleRequestData retrieveAllRescheduleReasons(String loanRescheduleReason) {
|
||||
final List<CodeValueData> rescheduleReasons = new ArrayList<>(
|
||||
this.codeValueReadPlatformService.retrieveCodeValuesByCode(loanRescheduleReason));
|
||||
final Long id = null;
|
||||
final Long loanId = null;
|
||||
final LoanRescheduleRequestStatusEnumData statusEnum = null;
|
||||
final Integer rescheduleFromInstallment = null;
|
||||
final Integer graceOnPrincipal = null;
|
||||
final Integer graceOnInterest = null;
|
||||
final LocalDate rescheduleFromDate = null;
|
||||
final LocalDate adjustedDueDate = null;
|
||||
final Integer extraTerms = null;
|
||||
final BigDecimal interestRate = null;
|
||||
final CodeValueData rescheduleReasonCodeValue = null;
|
||||
final String rescheduleReasonComment = null;
|
||||
final LoanRescheduleRequestTimelineData timeline = null;
|
||||
final String clientName = null;
|
||||
final String loanAccountNumber = null;
|
||||
final Long clientId = null;
|
||||
final Boolean recalculateInterest = null;
|
||||
|
||||
return LoanRescheduleRequestData.instance(id, loanId, statusEnum, rescheduleFromInstallment, graceOnPrincipal, graceOnInterest,
|
||||
rescheduleFromDate, adjustedDueDate, extraTerms, interestRate, rescheduleReasonCodeValue, rescheduleReasonComment,
|
||||
timeline, clientName, loanAccountNumber, clientId, recalculateInterest, rescheduleReasons);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user