FINERACT-821 Enforces(1) RedundantModifier Checkstyle
This commit is contained in:
committed by
Petri Tuomola
parent
3434fd07c0
commit
4585978a40
+7
-7
@@ -20,11 +20,11 @@ package org.apache.fineract.integrationtests.common;
|
|||||||
|
|
||||||
public interface CommonConstants {
|
public interface CommonConstants {
|
||||||
|
|
||||||
public static final String LOCALE = "en";
|
String LOCALE = "en";
|
||||||
public static final String DATE_FORMAT = "dd MMMM yyyy";
|
String DATE_FORMAT = "dd MMMM yyyy";
|
||||||
public static final String RESPONSE_RESOURCE_ID = "resourceId";
|
String RESPONSE_RESOURCE_ID = "resourceId";
|
||||||
public static final String RESPONSE_CHANGES = "changes";
|
String RESPONSE_CHANGES = "changes";
|
||||||
public static final String RESPONSE_STATUS = "status";
|
String RESPONSE_STATUS = "status";
|
||||||
public static final String RESPONSE_ERROR = "errors";
|
String RESPONSE_ERROR = "errors";
|
||||||
public static final String RESPONSE_ERROR_MESSAGE_CODE = "userMessageGlobalisationCode";
|
String RESPONSE_ERROR_MESSAGE_CODE = "userMessageGlobalisationCode";
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -24,7 +24,7 @@ public class JournalEntry {
|
|||||||
|
|
||||||
CREDIT("CREDIT"), DEBIT("DEBIT");
|
CREDIT("CREDIT"), DEBIT("DEBIT");
|
||||||
|
|
||||||
private TransactionType(final String type) {
|
TransactionType(final String type) {
|
||||||
this.type = type;
|
this.type = type;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+4
-4
@@ -26,12 +26,12 @@ import org.apache.fineract.infrastructure.jobs.data.JobDetailHistoryData;
|
|||||||
|
|
||||||
public interface SchedulerJobRunnerReadService {
|
public interface SchedulerJobRunnerReadService {
|
||||||
|
|
||||||
public List<JobDetailData> findAllJobDeatils();
|
List<JobDetailData> findAllJobDeatils();
|
||||||
|
|
||||||
public JobDetailData retrieveOne(Long jobId);
|
JobDetailData retrieveOne(Long jobId);
|
||||||
|
|
||||||
public Page<JobDetailHistoryData> retrieveJobHistory(Long jobId, SearchParameters searchParameters);
|
Page<JobDetailHistoryData> retrieveJobHistory(Long jobId, SearchParameters searchParameters);
|
||||||
|
|
||||||
public boolean isUpdatesAllowed();
|
boolean isUpdatesAllowed();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -29,7 +29,7 @@ public enum ReportMailingJobPreviousRunStatus {
|
|||||||
private final String value;
|
private final String value;
|
||||||
private final Integer id;
|
private final Integer id;
|
||||||
|
|
||||||
private ReportMailingJobPreviousRunStatus(final Integer id, final String code, final String value) {
|
ReportMailingJobPreviousRunStatus(final Integer id, final String code, final String value) {
|
||||||
this.value = value;
|
this.value = value;
|
||||||
this.code = code;
|
this.code = code;
|
||||||
this.id = id;
|
this.id = id;
|
||||||
|
|||||||
+1
-1
@@ -39,7 +39,7 @@ public enum ReportMailingJobStretchyReportParamDateOption {
|
|||||||
* @param code
|
* @param code
|
||||||
* @param value
|
* @param value
|
||||||
*/
|
*/
|
||||||
private ReportMailingJobStretchyReportParamDateOption(final Integer id, final String code, final String value) {
|
ReportMailingJobStretchyReportParamDateOption(final Integer id, final String code, final String value) {
|
||||||
this.value = value;
|
this.value = value;
|
||||||
this.code = code;
|
this.code = code;
|
||||||
this.id = id;
|
this.id = id;
|
||||||
|
|||||||
+1
-1
@@ -28,7 +28,7 @@ public enum ReportMailingJobEmailAttachmentFileFormat {
|
|||||||
private final String value;
|
private final String value;
|
||||||
private final Integer id;
|
private final Integer id;
|
||||||
|
|
||||||
private ReportMailingJobEmailAttachmentFileFormat(final Integer id, final String code, final String value) {
|
ReportMailingJobEmailAttachmentFileFormat(final Integer id, final String code, final String value) {
|
||||||
this.value = value;
|
this.value = value;
|
||||||
this.code = code;
|
this.code = code;
|
||||||
this.id = id;
|
this.id = id;
|
||||||
|
|||||||
+1
-1
@@ -29,5 +29,5 @@ public interface ReportMailingJobRepository extends JpaRepository<ReportMailingJ
|
|||||||
*
|
*
|
||||||
* @return instances of {@link ReportMailingJob}
|
* @return instances of {@link ReportMailingJob}
|
||||||
*/
|
*/
|
||||||
public Collection<ReportMailingJob> findByIsActiveTrueAndIsDeletedFalse();
|
Collection<ReportMailingJob> findByIsActiveTrueAndIsDeletedFalse();
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -35,5 +35,5 @@ public interface ReportMailingJobConfigurationReadPlatformService {
|
|||||||
*
|
*
|
||||||
* @return ReportMailingJobConfigurationData object
|
* @return ReportMailingJobConfigurationData object
|
||||||
**/
|
**/
|
||||||
ReportMailingJobConfigurationData retrieveReportMailingJobConfiguration(final String name);
|
ReportMailingJobConfigurationData retrieveReportMailingJobConfiguration(String name);
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -28,5 +28,5 @@ public interface ReportMailingJobEmailService {
|
|||||||
* @param reportMailingJobEmailData
|
* @param reportMailingJobEmailData
|
||||||
* {@link ReportMailingJobEmailData} object
|
* {@link ReportMailingJobEmailData} object
|
||||||
*/
|
*/
|
||||||
void sendEmailWithAttachment(final ReportMailingJobEmailData reportMailingJobEmailData);
|
void sendEmailWithAttachment(ReportMailingJobEmailData reportMailingJobEmailData);
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -31,7 +31,7 @@ public interface SmsReadPlatformService {
|
|||||||
|
|
||||||
SmsData retrieveOne(Long resourceId);
|
SmsData retrieveOne(Long resourceId);
|
||||||
|
|
||||||
Collection<SmsData> retrieveAllPending(final Long campaignId, final Integer limit);
|
Collection<SmsData> retrieveAllPending(Long campaignId, Integer limit);
|
||||||
|
|
||||||
Collection<SmsData> retrieveAllSent(Integer limit);
|
Collection<SmsData> retrieveAllSent(Integer limit);
|
||||||
|
|
||||||
@@ -39,7 +39,7 @@ public interface SmsReadPlatformService {
|
|||||||
|
|
||||||
Collection<SmsData> retrieveAllFailed(Integer limit);
|
Collection<SmsData> retrieveAllFailed(Integer limit);
|
||||||
|
|
||||||
Page<SmsData> retrieveSmsByStatus(final Long campaignId, SearchParameters searchParameters, Integer status, Date dateFrom, Date dateTo);
|
Page<SmsData> retrieveSmsByStatus(Long campaignId, SearchParameters searchParameters, Integer status, Date dateFrom, Date dateTo);
|
||||||
|
|
||||||
List<Long> retrieveExternalIdsOfAllSent(Integer limit);
|
List<Long> retrieveExternalIdsOfAllSent(Integer limit);
|
||||||
|
|
||||||
|
|||||||
+8
-8
@@ -25,20 +25,20 @@ import org.apache.fineract.useradministration.domain.Role;
|
|||||||
|
|
||||||
public interface TopicDomainService {
|
public interface TopicDomainService {
|
||||||
|
|
||||||
public void createTopic(Office newOffice);
|
void createTopic(Office newOffice);
|
||||||
|
|
||||||
public void createTopic(Role newRole);
|
void createTopic(Role newRole);
|
||||||
|
|
||||||
public void updateTopic(Office updatedOffice, Map<String, Object> changes);
|
void updateTopic(Office updatedOffice, Map<String, Object> changes);
|
||||||
|
|
||||||
public void updateTopic(String previousRolename, Role updatedRole, Map<String, Object> changes);
|
void updateTopic(String previousRolename, Role updatedRole, Map<String, Object> changes);
|
||||||
|
|
||||||
public void deleteTopic(Role role);
|
void deleteTopic(Role role);
|
||||||
|
|
||||||
public void subscribeUserToTopic(AppUser newUser);
|
void subscribeUserToTopic(AppUser newUser);
|
||||||
|
|
||||||
public void updateUserSubscription(AppUser userToUpdate, Map<String, Object> changes);
|
void updateUserSubscription(AppUser userToUpdate, Map<String, Object> changes);
|
||||||
|
|
||||||
public void unsubcribeUserFromTopic(AppUser user);
|
void unsubcribeUserFromTopic(AppUser user);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -26,9 +26,9 @@ import org.apache.fineract.organisation.holiday.data.HolidayData;
|
|||||||
|
|
||||||
public interface HolidayReadPlatformService {
|
public interface HolidayReadPlatformService {
|
||||||
|
|
||||||
Collection<HolidayData> retrieveAllHolidaysBySearchParamerters(final Long officeId, Date fromDate, Date toDate);
|
Collection<HolidayData> retrieveAllHolidaysBySearchParamerters(Long officeId, Date fromDate, Date toDate);
|
||||||
|
|
||||||
HolidayData retrieveHoliday(final Long holidayId);
|
HolidayData retrieveHoliday(Long holidayId);
|
||||||
|
|
||||||
List<EnumOptionData> retrieveRepaymentScheduleUpdationTyeOptions();
|
List<EnumOptionData> retrieveRepaymentScheduleUpdationTyeOptions();
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -56,7 +56,7 @@ public class HolidayReadPlatformServiceImpl implements HolidayReadPlatformServic
|
|||||||
|
|
||||||
private final String schema;
|
private final String schema;
|
||||||
|
|
||||||
public HolidayMapper() {
|
HolidayMapper() {
|
||||||
final StringBuilder sqlBuilder = new StringBuilder(200);
|
final StringBuilder sqlBuilder = new StringBuilder(200);
|
||||||
sqlBuilder.append("h.id as id, h.name as name, h.description as description, h.from_date as fromDate, h.to_date as toDate, ");
|
sqlBuilder.append("h.id as id, h.name as name, h.description as description, h.from_date as fromDate, h.to_date as toDate, ");
|
||||||
sqlBuilder.append(
|
sqlBuilder.append(
|
||||||
|
|||||||
+22
-22
@@ -20,26 +20,26 @@ package org.apache.fineract.organisation.provisioning.constants;
|
|||||||
|
|
||||||
public interface ProvisioningCriteriaConstants {
|
public interface ProvisioningCriteriaConstants {
|
||||||
|
|
||||||
public static final String JSON_LOCALE_PARAM = "locale";
|
String JSON_LOCALE_PARAM = "locale";
|
||||||
public static final String JSON_CRITERIAID_PARAM = "criteriaId";
|
String JSON_CRITERIAID_PARAM = "criteriaId";
|
||||||
public static final String JSON_CRITERIANAME_PARAM = "criteriaName";
|
String JSON_CRITERIANAME_PARAM = "criteriaName";
|
||||||
public static final String JSON_LOANPRODUCTS_PARAM = "loanProducts";
|
String JSON_LOANPRODUCTS_PARAM = "loanProducts";
|
||||||
public static final String JSON_LOAN_PRODUCT_ID_PARAM = "id";
|
String JSON_LOAN_PRODUCT_ID_PARAM = "id";
|
||||||
public static final String JSON_LOAN_PRODUCTNAME_PARAM = "name";
|
String JSON_LOAN_PRODUCTNAME_PARAM = "name";
|
||||||
public static final String JSON_LOAN_PRODUCT_BORROWERCYCLE_PARAM = "includeInBorrowerCycle";
|
String JSON_LOAN_PRODUCT_BORROWERCYCLE_PARAM = "includeInBorrowerCycle";
|
||||||
public static final String JSON_PROVISIONING_DEFINITIONS_PARAM = "definitions";
|
String JSON_PROVISIONING_DEFINITIONS_PARAM = "definitions";
|
||||||
public static final String JSON_CATEOGRYID_PARAM = "categoryId";
|
String JSON_CATEOGRYID_PARAM = "categoryId";
|
||||||
public static final String JSON_CATEOGRYNAME_PARAM = "categoryName";
|
String JSON_CATEOGRYNAME_PARAM = "categoryName";
|
||||||
public static final String JSON_MINIMUM_AGE_PARAM = "minAge";
|
String JSON_MINIMUM_AGE_PARAM = "minAge";
|
||||||
public static final String JSON_MAXIMUM_AGE_PARAM = "maxAge";
|
String JSON_MAXIMUM_AGE_PARAM = "maxAge";
|
||||||
public static final String JSON_PROVISIONING_PERCENTAGE_PARAM = "provisioningPercentage";
|
String JSON_PROVISIONING_PERCENTAGE_PARAM = "provisioningPercentage";
|
||||||
public static final String JSON_LIABILITY_ACCOUNT_PARAM = "liabilityAccount";
|
String JSON_LIABILITY_ACCOUNT_PARAM = "liabilityAccount";
|
||||||
public static final String JSON_EXPENSE_ACCOUNT_PARAM = "expenseAccount";
|
String JSON_EXPENSE_ACCOUNT_PARAM = "expenseAccount";
|
||||||
public static final String DEFINITIONS_PARAM = "definitions";
|
String DEFINITIONS_PARAM = "definitions";
|
||||||
public static final String LOANPRODUCTS_PARAM = "loanProducts";
|
String LOANPRODUCTS_PARAM = "loanProducts";
|
||||||
public static final String GLACCOUNTS_PARAM = "glAccounts";
|
String GLACCOUNTS_PARAM = "glAccounts";
|
||||||
public static final String CRITERIA_PARAM = "criteriaName";
|
String CRITERIA_PARAM = "criteriaName";
|
||||||
public static final String CRITERIA_ID_PARAM = "criteriaId";
|
String CRITERIA_ID_PARAM = "criteriaId";
|
||||||
public static final String CRITERIA_NAME_PARAM = "criterianame";
|
String CRITERIA_NAME_PARAM = "criterianame";
|
||||||
public static final String CREATED_BY_PARAM = "createdby";
|
String CREATED_BY_PARAM = "createdby";
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-4
@@ -23,11 +23,11 @@ import org.apache.fineract.organisation.provisioning.data.ProvisioningCriteriaDa
|
|||||||
|
|
||||||
public interface ProvisioningCriteriaReadPlatformService {
|
public interface ProvisioningCriteriaReadPlatformService {
|
||||||
|
|
||||||
public ProvisioningCriteriaData retrievePrivisiongCriteriaTemplate();
|
ProvisioningCriteriaData retrievePrivisiongCriteriaTemplate();
|
||||||
|
|
||||||
public ProvisioningCriteriaData retrieveProvisioningCriteria(Long criteriaId);
|
ProvisioningCriteriaData retrieveProvisioningCriteria(Long criteriaId);
|
||||||
|
|
||||||
public Collection<ProvisioningCriteriaData> retrieveAllProvisioningCriterias();
|
Collection<ProvisioningCriteriaData> retrieveAllProvisioningCriterias();
|
||||||
|
|
||||||
public ProvisioningCriteriaData retrievePrivisiongCriteriaTemplate(ProvisioningCriteriaData data);
|
ProvisioningCriteriaData retrievePrivisiongCriteriaTemplate(ProvisioningCriteriaData data);
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -134,7 +134,7 @@ public class StaffReadPlatformServiceImpl implements StaffReadPlatformService {
|
|||||||
|
|
||||||
private final String schemaSql;
|
private final String schemaSql;
|
||||||
|
|
||||||
public StaffLookupMapper() {
|
StaffLookupMapper() {
|
||||||
|
|
||||||
final StringBuilder sqlBuilder = new StringBuilder(100);
|
final StringBuilder sqlBuilder = new StringBuilder(100);
|
||||||
sqlBuilder.append("s.id as id, s.display_name as displayName ");
|
sqlBuilder.append("s.id as id, s.display_name as displayName ");
|
||||||
|
|||||||
+2
-2
@@ -23,7 +23,7 @@ import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
|
|||||||
|
|
||||||
public interface StaffWritePlatformService {
|
public interface StaffWritePlatformService {
|
||||||
|
|
||||||
CommandProcessingResult createStaff(final JsonCommand command);
|
CommandProcessingResult createStaff(JsonCommand command);
|
||||||
|
|
||||||
CommandProcessingResult updateStaff(final Long staffId, final JsonCommand command);
|
CommandProcessingResult updateStaff(Long staffId, JsonCommand command);
|
||||||
}
|
}
|
||||||
|
|||||||
+18
-18
@@ -31,40 +31,40 @@ import org.apache.fineract.organisation.teller.data.TellerTransactionData;
|
|||||||
|
|
||||||
public interface TellerManagementReadPlatformService {
|
public interface TellerManagementReadPlatformService {
|
||||||
|
|
||||||
public Collection<TellerData> getTellers(Long officeId);
|
Collection<TellerData> getTellers(Long officeId);
|
||||||
|
|
||||||
public TellerData findTeller(Long tellerId);
|
TellerData findTeller(Long tellerId);
|
||||||
|
|
||||||
public CashierData findCashier(Long cashierId);
|
CashierData findCashier(Long cashierId);
|
||||||
|
|
||||||
public Collection<CashierData> getCashierData(Long officeId, Long tellerId, Long staffId, Date date);
|
Collection<CashierData> getCashierData(Long officeId, Long tellerId, Long staffId, Date date);
|
||||||
|
|
||||||
public Collection<CashierData> getTellerCashiers(Long tellerId, Date date);
|
Collection<CashierData> getTellerCashiers(Long tellerId, Date date);
|
||||||
|
|
||||||
public CashierData retrieveCashierTemplate(Long officeId, Long tellerId, boolean staffInSelectedOfficeOnly);
|
CashierData retrieveCashierTemplate(Long officeId, Long tellerId, boolean staffInSelectedOfficeOnly);
|
||||||
|
|
||||||
public CashierTransactionData retrieveCashierTxnTemplate(Long cashierId);
|
CashierTransactionData retrieveCashierTxnTemplate(Long cashierId);
|
||||||
|
|
||||||
public TellerTransactionData findTellerTransaction(Long transactionId);
|
TellerTransactionData findTellerTransaction(Long transactionId);
|
||||||
|
|
||||||
public Collection<TellerTransactionData> fetchTellerTransactionsByTellerId(Long tellerId, Date fromDate, Date toDate);
|
Collection<TellerTransactionData> fetchTellerTransactionsByTellerId(Long tellerId, Date fromDate, Date toDate);
|
||||||
|
|
||||||
public Collection<TellerJournalData> getJournals(Long officeId, Long tellerId, Long cashierId, Date dateFrom, Date dateTo);
|
Collection<TellerJournalData> getJournals(Long officeId, Long tellerId, Long cashierId, Date dateFrom, Date dateTo);
|
||||||
|
|
||||||
public Collection<TellerJournalData> fetchTellerJournals(Long tellerId, Long cashierId, Date fromDate, Date toDate);
|
Collection<TellerJournalData> fetchTellerJournals(Long tellerId, Long cashierId, Date fromDate, Date toDate);
|
||||||
|
|
||||||
public Collection<TellerData> retrieveAllTellersForDropdown(Long officeId);
|
Collection<TellerData> retrieveAllTellersForDropdown(Long officeId);
|
||||||
|
|
||||||
public Collection<TellerData> retrieveAllTellers(String sqlSearch, Long officeId, String status);
|
Collection<TellerData> retrieveAllTellers(String sqlSearch, Long officeId, String status);
|
||||||
|
|
||||||
public Collection<CashierData> getCashiersForTeller(Long tellerId, Date fromDate, Date toDate);
|
Collection<CashierData> getCashiersForTeller(Long tellerId, Date fromDate, Date toDate);
|
||||||
|
|
||||||
public Collection<CashierData> retrieveCashiersForTellers(String sqlSearch, Long tellerId);
|
Collection<CashierData> retrieveCashiersForTellers(String sqlSearch, Long tellerId);
|
||||||
|
|
||||||
public Page<CashierTransactionData> retrieveCashierTransactions(Long cashierId, boolean includeAllTellers, Date fromDate, Date toDate,
|
Page<CashierTransactionData> retrieveCashierTransactions(Long cashierId, boolean includeAllTellers, Date fromDate, Date toDate,
|
||||||
String currencyCode, final SearchParameters searchParameters);
|
String currencyCode, final SearchParameters searchParameters);
|
||||||
|
|
||||||
public CashierTransactionsWithSummaryData retrieveCashierTransactionsWithSummary(Long cashierId, boolean includeAllTellers,
|
CashierTransactionsWithSummaryData retrieveCashierTransactionsWithSummary(Long cashierId, boolean includeAllTellers, Date fromDate,
|
||||||
Date fromDate, Date toDate, String currencyCode, final SearchParameters searchParameters);
|
Date toDate, String currencyCode, final SearchParameters searchParameters);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -170,7 +170,7 @@ public class TellerManagementReadPlatformServiceImpl implements TellerManagement
|
|||||||
|
|
||||||
private final String schemaSql;
|
private final String schemaSql;
|
||||||
|
|
||||||
public TellerLookupMapper() {
|
TellerLookupMapper() {
|
||||||
|
|
||||||
final StringBuilder sqlBuilder = new StringBuilder(100);
|
final StringBuilder sqlBuilder = new StringBuilder(100);
|
||||||
sqlBuilder.append("t.id as id, t.name as teller_name ");
|
sqlBuilder.append("t.id as id, t.name as teller_name ");
|
||||||
|
|||||||
+5
-5
@@ -39,7 +39,7 @@ public interface TellerWritePlatformService {
|
|||||||
* @throws org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException
|
* @throws org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException
|
||||||
* @throws org.apache.fineract.infrastructure.core.exception.InvalidJsonException
|
* @throws org.apache.fineract.infrastructure.core.exception.InvalidJsonException
|
||||||
*/
|
*/
|
||||||
public CommandProcessingResult createTeller(JsonCommand command);
|
CommandProcessingResult createTeller(JsonCommand command);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Modifies a new teller.
|
* Modifies a new teller.
|
||||||
@@ -53,7 +53,7 @@ public interface TellerWritePlatformService {
|
|||||||
* @throws org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException
|
* @throws org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException
|
||||||
* @throws org.apache.fineract.infrastructure.core.exception.InvalidJsonException
|
* @throws org.apache.fineract.infrastructure.core.exception.InvalidJsonException
|
||||||
*/
|
*/
|
||||||
public CommandProcessingResult modifyTeller(Long tellerId, JsonCommand command);
|
CommandProcessingResult modifyTeller(Long tellerId, JsonCommand command);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* deletes a new teller.
|
* deletes a new teller.
|
||||||
@@ -64,7 +64,7 @@ public interface TellerWritePlatformService {
|
|||||||
* @throws org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException
|
* @throws org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException
|
||||||
* @throws org.apache.fineract.infrastructure.core.exception.InvalidJsonException
|
* @throws org.apache.fineract.infrastructure.core.exception.InvalidJsonException
|
||||||
*/
|
*/
|
||||||
public CommandProcessingResult deleteTeller(Long tellerId);
|
CommandProcessingResult deleteTeller(Long tellerId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Allocates a cashier to an existing teller. The allocation can be for a duration from a date to a date from a
|
* Allocates a cashier to an existing teller. The allocation can be for a duration from a date to a date from a
|
||||||
@@ -76,11 +76,11 @@ public interface TellerWritePlatformService {
|
|||||||
* @throws org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException
|
* @throws org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException
|
||||||
* @throws org.apache.fineract.infrastructure.core.exception.InvalidJsonException
|
* @throws org.apache.fineract.infrastructure.core.exception.InvalidJsonException
|
||||||
*/
|
*/
|
||||||
public CommandProcessingResult allocateCashierToTeller(Long tellerId, JsonCommand command);
|
CommandProcessingResult allocateCashierToTeller(Long tellerId, JsonCommand command);
|
||||||
|
|
||||||
CommandProcessingResult updateCashierAllocation(Long tellerId, Long cashierId, JsonCommand command);
|
CommandProcessingResult updateCashierAllocation(Long tellerId, Long cashierId, JsonCommand command);
|
||||||
|
|
||||||
CommandProcessingResult deleteCashierAllocation(final Long tellerId, Long cashierId, JsonCommand command);
|
CommandProcessingResult deleteCashierAllocation(Long tellerId, Long cashierId, JsonCommand command);
|
||||||
|
|
||||||
CommandProcessingResult allocateCashToCashier(Long cashierId, JsonCommand command);
|
CommandProcessingResult allocateCashToCashier(Long cashierId, JsonCommand command);
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -44,7 +44,7 @@ public enum AccountTransferRecurrenceType {
|
|||||||
return enumeration;
|
return enumeration;
|
||||||
}
|
}
|
||||||
|
|
||||||
private AccountTransferRecurrenceType(final Integer value, final String code) {
|
AccountTransferRecurrenceType(final Integer value, final String code) {
|
||||||
this.value = value;
|
this.value = value;
|
||||||
this.code = code;
|
this.code = code;
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-4
@@ -24,13 +24,13 @@ import org.apache.fineract.portfolio.account.data.PortfolioAccountData;
|
|||||||
|
|
||||||
public interface AccountAssociationsReadPlatformService {
|
public interface AccountAssociationsReadPlatformService {
|
||||||
|
|
||||||
public PortfolioAccountData retriveLoanLinkedAssociation(final Long loanId);
|
PortfolioAccountData retriveLoanLinkedAssociation(Long loanId);
|
||||||
|
|
||||||
public boolean isLinkedWithAnyActiveAccount(final Long savingsId);
|
boolean isLinkedWithAnyActiveAccount(Long savingsId);
|
||||||
|
|
||||||
public PortfolioAccountData retriveSavingsLinkedAssociation(final Long savingsId);
|
PortfolioAccountData retriveSavingsLinkedAssociation(Long savingsId);
|
||||||
|
|
||||||
public Collection<AccountAssociationsData> retriveLoanAssociations(Long loanId, Integer associationType);
|
Collection<AccountAssociationsData> retriveLoanAssociations(Long loanId, Integer associationType);
|
||||||
|
|
||||||
PortfolioAccountData retriveSavingsAccount(Long savingsId);
|
PortfolioAccountData retriveSavingsAccount(Long savingsId);
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -165,7 +165,7 @@ public class StandingInstructionHistoryReadPlatformServiceImpl implements Standi
|
|||||||
|
|
||||||
private final String schemaSql;
|
private final String schemaSql;
|
||||||
|
|
||||||
public StandingInstructionHistoryMapper() {
|
StandingInstructionHistoryMapper() {
|
||||||
final StringBuilder sqlBuilder = new StringBuilder(400);
|
final StringBuilder sqlBuilder = new StringBuilder(400);
|
||||||
sqlBuilder.append("atsi.id as id,atsi.name as name, ");
|
sqlBuilder.append("atsi.id as id,atsi.name as name, ");
|
||||||
sqlBuilder.append("atsih.status as status, atsih.execution_time as executionTime, ");
|
sqlBuilder.append("atsih.status as status, atsih.execution_time as executionTime, ");
|
||||||
|
|||||||
+1
-1
@@ -517,7 +517,7 @@ public class StandingInstructionReadPlatformServiceImpl implements StandingInstr
|
|||||||
|
|
||||||
private final String schemaSql;
|
private final String schemaSql;
|
||||||
|
|
||||||
public StandingInstructionLoanDuesMapper() {
|
StandingInstructionLoanDuesMapper() {
|
||||||
final StringBuilder sqlBuilder = new StringBuilder(400);
|
final StringBuilder sqlBuilder = new StringBuilder(400);
|
||||||
|
|
||||||
sqlBuilder.append("max(ls.duedate) as dueDate,sum(ls.principal_amount) as principalAmount,");
|
sqlBuilder.append("max(ls.duedate) as dueDate,sum(ls.principal_amount) as principalAmount,");
|
||||||
|
|||||||
+1
-1
@@ -32,7 +32,7 @@ public enum AccountType {
|
|||||||
private final Integer value;
|
private final Integer value;
|
||||||
private final String code;
|
private final String code;
|
||||||
|
|
||||||
private AccountType(final Integer value, final String code) {
|
AccountType(final Integer value, final String code) {
|
||||||
this.value = value;
|
this.value = value;
|
||||||
this.code = code;
|
this.code = code;
|
||||||
}
|
}
|
||||||
|
|||||||
+7
-7
@@ -25,19 +25,19 @@ import org.apache.fineract.portfolio.accountdetails.data.LoanAccountSummaryData;
|
|||||||
|
|
||||||
public interface AccountDetailsReadPlatformService {
|
public interface AccountDetailsReadPlatformService {
|
||||||
|
|
||||||
public AccountSummaryCollectionData retrieveClientAccountDetails(final Long clientId);
|
AccountSummaryCollectionData retrieveClientAccountDetails(Long clientId);
|
||||||
|
|
||||||
public AccountSummaryCollectionData retrieveGroupAccountDetails(final Long groupId);
|
AccountSummaryCollectionData retrieveGroupAccountDetails(Long groupId);
|
||||||
|
|
||||||
public Collection<LoanAccountSummaryData> retrieveClientLoanAccountsByLoanOfficerId(final Long clientId, final Long loanOfficerId);
|
Collection<LoanAccountSummaryData> retrieveClientLoanAccountsByLoanOfficerId(Long clientId, Long loanOfficerId);
|
||||||
|
|
||||||
public Collection<LoanAccountSummaryData> retrieveGroupLoanAccountsByLoanOfficerId(final Long groupId, final Long loanOfficerId);
|
Collection<LoanAccountSummaryData> retrieveGroupLoanAccountsByLoanOfficerId(Long groupId, Long loanOfficerId);
|
||||||
|
|
||||||
public Collection<LoanAccountSummaryData> retrieveClientActiveLoanAccountSummary(final Long clientId);
|
Collection<LoanAccountSummaryData> retrieveClientActiveLoanAccountSummary(Long clientId);
|
||||||
|
|
||||||
public List<LoanAccountSummaryData> retrieveLoanAccountDetailsByGroupIdAndGlimAccountNumber(Long groupId, final String glimAccount);
|
List<LoanAccountSummaryData> retrieveLoanAccountDetailsByGroupIdAndGlimAccountNumber(Long groupId, String glimAccount);
|
||||||
|
|
||||||
public Collection<LoanAccountSummaryData> retrieveGroupActiveLoanAccountSummary(final Long groupId);
|
Collection<LoanAccountSummaryData> retrieveGroupActiveLoanAccountSummary(Long groupId);
|
||||||
|
|
||||||
AccountSummaryCollectionData retrieveGroupAccountDetails(Long groupId, Long gsimId);
|
AccountSummaryCollectionData retrieveGroupAccountDetails(Long groupId, Long gsimId);
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -20,7 +20,7 @@ package org.apache.fineract.portfolio.accounts.constants;
|
|||||||
|
|
||||||
public interface AccountsApiConstants {
|
public interface AccountsApiConstants {
|
||||||
|
|
||||||
public final String READPLATFORM_NAME = "AccountReadPlatformService";
|
String READPLATFORM_NAME = "AccountReadPlatformService";
|
||||||
|
|
||||||
public final String ACCOUNT_COMMANDSERVICE = "ACCOUNT_COMMANDSERVICE";
|
String ACCOUNT_COMMANDSERVICE = "ACCOUNT_COMMANDSERVICE";
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-4
@@ -24,12 +24,12 @@ import org.apache.fineract.portfolio.accounts.data.AccountData;
|
|||||||
|
|
||||||
public interface AccountReadPlatformService {
|
public interface AccountReadPlatformService {
|
||||||
|
|
||||||
public AccountData retrieveTemplate(final Long clientId, final Long productId);
|
AccountData retrieveTemplate(Long clientId, Long productId);
|
||||||
|
|
||||||
public AccountData retrieveOne(Long id, boolean includeTemplate);
|
AccountData retrieveOne(Long id, boolean includeTemplate);
|
||||||
|
|
||||||
public Page<AccountData> retrieveAll(final Integer offSet, final Integer limit);
|
Page<AccountData> retrieveAll(Integer offSet, Integer limit);
|
||||||
|
|
||||||
public Set<String> getResponseDataParams();
|
Set<String> getResponseDataParams();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -20,5 +20,5 @@ package org.apache.fineract.portfolio.accounts.service;
|
|||||||
|
|
||||||
public interface AccountsCommandsService {
|
public interface AccountsCommandsService {
|
||||||
|
|
||||||
public Object handleCommand(final Long accountId, final String command, final String jsonBody);
|
public Object handleCommand(Long accountId, String command, String jsonBody);
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -23,11 +23,11 @@ import org.apache.fineract.portfolio.address.data.AddressData;
|
|||||||
|
|
||||||
public interface AddressReadPlatformService {
|
public interface AddressReadPlatformService {
|
||||||
|
|
||||||
public Collection<AddressData> retrieveAddressFields(long clientid);
|
Collection<AddressData> retrieveAddressFields(long clientid);
|
||||||
|
|
||||||
public Collection<AddressData> retrieveAllClientAddress(long clientid);
|
Collection<AddressData> retrieveAllClientAddress(long clientid);
|
||||||
|
|
||||||
public Collection<AddressData> retrieveAddressbyType(long clientid, long typeid);
|
Collection<AddressData> retrieveAddressbyType(long clientid, long typeid);
|
||||||
|
|
||||||
Collection<AddressData> retrieveAddressbyTypeAndStatus(long clientid, long typeid, String status);
|
Collection<AddressData> retrieveAddressbyTypeAndStatus(long clientid, long typeid, String status);
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -31,7 +31,7 @@ public enum CalendarFrequencyType {
|
|||||||
private final Integer value;
|
private final Integer value;
|
||||||
private final String code;
|
private final String code;
|
||||||
|
|
||||||
private CalendarFrequencyType(final Integer value, final String code) {
|
CalendarFrequencyType(final Integer value, final String code) {
|
||||||
this.value = value;
|
this.value = value;
|
||||||
this.code = code;
|
this.code = code;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -31,7 +31,7 @@ public enum CalendarWeekDaysType {
|
|||||||
private final Integer value;
|
private final Integer value;
|
||||||
private final String code;
|
private final String code;
|
||||||
|
|
||||||
private CalendarWeekDaysType(final Integer value, final String code) {
|
CalendarWeekDaysType(final Integer value, final String code) {
|
||||||
this.value = value;
|
this.value = value;
|
||||||
this.code = code;
|
this.code = code;
|
||||||
}
|
}
|
||||||
|
|||||||
+9
-10
@@ -26,29 +26,28 @@ import org.joda.time.LocalDate;
|
|||||||
|
|
||||||
public interface CalendarReadPlatformService {
|
public interface CalendarReadPlatformService {
|
||||||
|
|
||||||
CalendarData retrieveCalendar(final Long calendarId, Long entityId, Integer entityTypeId);
|
CalendarData retrieveCalendar(Long calendarId, Long entityId, Integer entityTypeId);
|
||||||
|
|
||||||
Collection<CalendarData> retrieveCalendarsByEntity(final Long entityId, final Integer entityTypeId, List<Integer> calendarTypeOptions);
|
Collection<CalendarData> retrieveCalendarsByEntity(Long entityId, Integer entityTypeId, List<Integer> calendarTypeOptions);
|
||||||
|
|
||||||
Collection<CalendarData> retrieveParentCalendarsByEntity(final Long entityId, final Integer entityTypeId,
|
Collection<CalendarData> retrieveParentCalendarsByEntity(Long entityId, Integer entityTypeId, List<Integer> calendarTypeOptions);
|
||||||
List<Integer> calendarTypeOptions);
|
|
||||||
|
|
||||||
Collection<CalendarData> retrieveAllCalendars();
|
Collection<CalendarData> retrieveAllCalendars();
|
||||||
|
|
||||||
CalendarData retrieveNewCalendarDetails();
|
CalendarData retrieveNewCalendarDetails();
|
||||||
|
|
||||||
Collection<LocalDate> generateRecurringDates(final CalendarData calendarData, final boolean withHistory, final LocalDate tillDate);
|
Collection<LocalDate> generateRecurringDates(CalendarData calendarData, boolean withHistory, LocalDate tillDate);
|
||||||
|
|
||||||
Collection<LocalDate> generateNextTenRecurringDates(final CalendarData calendarData);
|
Collection<LocalDate> generateNextTenRecurringDates(CalendarData calendarData);
|
||||||
|
|
||||||
Collection<CalendarData> updateWithRecurringDates(final Collection<CalendarData> calendarsData);
|
Collection<CalendarData> updateWithRecurringDates(Collection<CalendarData> calendarsData);
|
||||||
|
|
||||||
CalendarData retrieveLoanCalendar(final Long loanId);
|
CalendarData retrieveLoanCalendar(Long loanId);
|
||||||
|
|
||||||
CalendarData retrieveCollctionCalendarByEntity(final Long entityId, final Integer entityTypeId);
|
CalendarData retrieveCollctionCalendarByEntity(Long entityId, Integer entityTypeId);
|
||||||
|
|
||||||
LocalDate generateNextEligibleMeetingDateForCollection(CalendarData calendarData, MeetingData lastMeetingData);
|
LocalDate generateNextEligibleMeetingDateForCollection(CalendarData calendarData, MeetingData lastMeetingData);
|
||||||
|
|
||||||
Boolean isCalendarAssociatedWithEntity(final Long entityId, final Long calendarId, Long entityTypeId);
|
Boolean isCalendarAssociatedWithEntity(Long entityId, Long calendarId, Long entityTypeId);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -382,7 +382,7 @@ public class CalendarUtils {
|
|||||||
return (recurDate == null || recurDate.isEmpty()) ? false : recurDate.contains(date);
|
return (recurDate == null || recurDate.isEmpty()) ? false : recurDate.contains(date);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static enum DayNameEnum {
|
public enum DayNameEnum {
|
||||||
|
|
||||||
MO(1, "Monday"), TU(2, "Tuesday"), WE(3, "Wednesday"), TH(4, "Thursday"), FR(5, "Friday"), SA(6, "Saturday"), SU(7, "Sunday");
|
MO(1, "Monday"), TU(2, "Tuesday"), WE(3, "Wednesday"), TH(4, "Thursday"), FR(5, "Friday"), SA(6, "Saturday"), SU(7, "Sunday");
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -28,7 +28,7 @@ public enum ChargeAppliesTo {
|
|||||||
private final Integer value;
|
private final Integer value;
|
||||||
private final String code;
|
private final String code;
|
||||||
|
|
||||||
private ChargeAppliesTo(final Integer value, final String code) {
|
ChargeAppliesTo(final Integer value, final String code) {
|
||||||
this.value = value;
|
this.value = value;
|
||||||
this.code = code;
|
this.code = code;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -30,7 +30,7 @@ public enum ChargeCalculationType {
|
|||||||
private final Integer value;
|
private final Integer value;
|
||||||
private final String code;
|
private final String code;
|
||||||
|
|
||||||
private ChargeCalculationType(final Integer value, final String code) {
|
ChargeCalculationType(final Integer value, final String code) {
|
||||||
this.value = value;
|
this.value = value;
|
||||||
this.code = code;
|
this.code = code;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -42,7 +42,7 @@ public enum ChargeTimeType {
|
|||||||
private final Integer value;
|
private final Integer value;
|
||||||
private final String code;
|
private final String code;
|
||||||
|
|
||||||
private ChargeTimeType(final Integer value, final String code) {
|
ChargeTimeType(final Integer value, final String code) {
|
||||||
this.value = value;
|
this.value = value;
|
||||||
this.code = code;
|
this.code = code;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -23,7 +23,7 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainR
|
|||||||
public class LoanChargeCannotBeDeletedException extends AbstractPlatformDomainRuleException {
|
public class LoanChargeCannotBeDeletedException extends AbstractPlatformDomainRuleException {
|
||||||
|
|
||||||
/*** enum of reasons of why Loan Charge cannot be waived **/
|
/*** enum of reasons of why Loan Charge cannot be waived **/
|
||||||
public static enum LoanChargeCannotBeDeletedReason {
|
public enum LoanChargeCannotBeDeletedReason {
|
||||||
|
|
||||||
ALREADY_PAID, ALREADY_WAIVED, LOAN_NOT_IN_SUBMITTED_AND_PENDING_APPROVAL_STAGE;
|
ALREADY_PAID, ALREADY_WAIVED, LOAN_NOT_IN_SUBMITTED_AND_PENDING_APPROVAL_STAGE;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -23,7 +23,7 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainR
|
|||||||
public class LoanChargeCannotBeWaivedException extends AbstractPlatformDomainRuleException {
|
public class LoanChargeCannotBeWaivedException extends AbstractPlatformDomainRuleException {
|
||||||
|
|
||||||
/*** enum of reasons of why Loan Charge cannot be waived **/
|
/*** enum of reasons of why Loan Charge cannot be waived **/
|
||||||
public static enum LoanChargeCannotBeWaivedReason {
|
public enum LoanChargeCannotBeWaivedReason {
|
||||||
|
|
||||||
ALREADY_PAID, ALREADY_WAIVED, LOAN_INACTIVE, WAIVE_NOT_ALLOWED_FOR_CHARGE;
|
ALREADY_PAID, ALREADY_WAIVED, LOAN_INACTIVE, WAIVE_NOT_ALLOWED_FOR_CHARGE;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -23,7 +23,7 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainR
|
|||||||
public class SavingsAccountChargeCannotBeWaivedException extends AbstractPlatformDomainRuleException {
|
public class SavingsAccountChargeCannotBeWaivedException extends AbstractPlatformDomainRuleException {
|
||||||
|
|
||||||
/*** enum of reasons of why Savings Account Charge cannot be waived **/
|
/*** enum of reasons of why Savings Account Charge cannot be waived **/
|
||||||
public static enum SavingsAccountChargeCannotBeWaivedReason {
|
public enum SavingsAccountChargeCannotBeWaivedReason {
|
||||||
|
|
||||||
ALREADY_PAID, ALREADY_WAIVED, SAVINGS_ACCOUNT_NOT_ACTIVE, SAVINGS_ACCOUNT_CLOSED;
|
ALREADY_PAID, ALREADY_WAIVED, SAVINGS_ACCOUNT_NOT_ACTIVE, SAVINGS_ACCOUNT_CLOSED;
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -27,9 +27,9 @@ import org.springframework.data.repository.query.Param;
|
|||||||
public interface ClientAddressRepository extends JpaRepository<ClientAddress, Long>, JpaSpecificationExecutor<ClientAddress> {
|
public interface ClientAddressRepository extends JpaRepository<ClientAddress, Long>, JpaSpecificationExecutor<ClientAddress> {
|
||||||
|
|
||||||
@Query("SELECT clientAddress FROM ClientAddress clientAddress WHERE clientAddress.client.id = :clientId AND clientAddress.addressType = :addressType AND clientAddress.isActive = :isActive ")
|
@Query("SELECT clientAddress FROM ClientAddress clientAddress WHERE clientAddress.client.id = :clientId AND clientAddress.addressType = :addressType AND clientAddress.isActive = :isActive ")
|
||||||
ClientAddress findByClientIdAndAddressTypeAndIsActive(@Param("clientId") final long clientId,
|
ClientAddress findByClientIdAndAddressTypeAndIsActive(@Param("clientId") long clientId, @Param("addressType") CodeValue addressType,
|
||||||
@Param("addressType") final CodeValue addressType, @Param("isActive") final boolean isActive);
|
@Param("isActive") boolean isActive);
|
||||||
|
|
||||||
@Query("SELECT clientAddress FROM ClientAddress clientAddress WHERE clientAddress.client.id = :clientId AND clientAddress.address.id = :addressId ")
|
@Query("SELECT clientAddress FROM ClientAddress clientAddress WHERE clientAddress.client.id = :clientId AND clientAddress.address.id = :addressId ")
|
||||||
ClientAddress findByClientIdAndAddressId(@Param("clientId") final long clientId, @Param("addressId") final long addressId);
|
ClientAddress findByClientIdAndAddressId(@Param("clientId") long clientId, @Param("addressId") long addressId);
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -44,7 +44,7 @@ public enum ClientIdentifierStatus {
|
|||||||
return enumeration;
|
return enumeration;
|
||||||
}
|
}
|
||||||
|
|
||||||
private ClientIdentifierStatus(final Integer value, final String code) {
|
ClientIdentifierStatus(final Integer value, final String code) {
|
||||||
this.value = value;
|
this.value = value;
|
||||||
this.code = code;
|
this.code = code;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -25,7 +25,7 @@ import org.springframework.data.repository.query.Param;
|
|||||||
|
|
||||||
abstract interface ClientRepository extends JpaRepository<Client, Long>, JpaSpecificationExecutor<Client> {
|
abstract interface ClientRepository extends JpaRepository<Client, Long>, JpaSpecificationExecutor<Client> {
|
||||||
|
|
||||||
public static final String FIND_CLIENT_BY_ACCOUNT_NUMBER = "select client from Client client where client.accountNumber = :accountNumber";
|
String FIND_CLIENT_BY_ACCOUNT_NUMBER = "select client from Client client where client.accountNumber = :accountNumber";
|
||||||
|
|
||||||
@Query(FIND_CLIENT_BY_ACCOUNT_NUMBER)
|
@Query(FIND_CLIENT_BY_ACCOUNT_NUMBER)
|
||||||
Client getClientByAccountNumber(@Param("accountNumber") String accountNumber);
|
Client getClientByAccountNumber(@Param("accountNumber") String accountNumber);
|
||||||
|
|||||||
+2
-2
@@ -25,9 +25,9 @@ import org.apache.fineract.portfolio.client.domain.Client;
|
|||||||
|
|
||||||
public interface ClientFamilyMembersWritePlatformService {
|
public interface ClientFamilyMembersWritePlatformService {
|
||||||
|
|
||||||
CommandProcessingResult addFamilyMember(final long clientId, final JsonCommand command);
|
CommandProcessingResult addFamilyMember(long clientId, JsonCommand command);
|
||||||
|
|
||||||
CommandProcessingResult addClientFamilyMember(final Client client, final JsonCommand command);
|
CommandProcessingResult addClientFamilyMember(Client client, JsonCommand command);
|
||||||
|
|
||||||
CommandProcessingResult updateFamilyMember(Long familyMemberId, JsonCommand command);
|
CommandProcessingResult updateFamilyMember(Long familyMemberId, JsonCommand command);
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -356,7 +356,7 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService
|
|||||||
|
|
||||||
private final String schema;
|
private final String schema;
|
||||||
|
|
||||||
public ClientMembersOfGroupMapper() {
|
ClientMembersOfGroupMapper() {
|
||||||
final StringBuilder sqlBuilder = new StringBuilder(200);
|
final StringBuilder sqlBuilder = new StringBuilder(200);
|
||||||
|
|
||||||
sqlBuilder.append(
|
sqlBuilder.append(
|
||||||
@@ -545,7 +545,7 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService
|
|||||||
|
|
||||||
private final String schema;
|
private final String schema;
|
||||||
|
|
||||||
public ClientMapper() {
|
ClientMapper() {
|
||||||
final StringBuilder builder = new StringBuilder(400);
|
final StringBuilder builder = new StringBuilder(400);
|
||||||
|
|
||||||
builder.append(
|
builder.append(
|
||||||
|
|||||||
+3
-3
@@ -27,12 +27,12 @@ import org.springframework.transaction.annotation.Transactional;
|
|||||||
public interface ClientTransactionReadPlatformService {
|
public interface ClientTransactionReadPlatformService {
|
||||||
|
|
||||||
@Transactional(readOnly = true)
|
@Transactional(readOnly = true)
|
||||||
public Page<ClientTransactionData> retrieveAllTransactions(Long clientId, SearchParameters parameters);
|
Page<ClientTransactionData> retrieveAllTransactions(Long clientId, SearchParameters parameters);
|
||||||
|
|
||||||
@Transactional(readOnly = true)
|
@Transactional(readOnly = true)
|
||||||
public Collection<ClientTransactionData> retrieveAllTransactions(final Long clientId, final Long chargeId);
|
Collection<ClientTransactionData> retrieveAllTransactions(Long clientId, Long chargeId);
|
||||||
|
|
||||||
@Transactional(readOnly = true)
|
@Transactional(readOnly = true)
|
||||||
public ClientTransactionData retrieveTransaction(Long clientId, Long transactionId);
|
ClientTransactionData retrieveTransaction(Long clientId, Long transactionId);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -60,7 +60,7 @@ public class ClientTransactionReadPlatformServiceImpl implements ClientTransacti
|
|||||||
|
|
||||||
private final String schemaSql;
|
private final String schemaSql;
|
||||||
|
|
||||||
public ClientTransactionMapper() {
|
ClientTransactionMapper() {
|
||||||
|
|
||||||
final StringBuilder sqlBuilder = new StringBuilder(400);
|
final StringBuilder sqlBuilder = new StringBuilder(400);
|
||||||
sqlBuilder.append("tr.id as transactionId, tr.transaction_type_enum as transactionType, ");
|
sqlBuilder.append("tr.id as transactionId, tr.transaction_type_enum as transactionType, ");
|
||||||
|
|||||||
+1
-1
@@ -33,7 +33,7 @@ public interface ClientWritePlatformService {
|
|||||||
|
|
||||||
CommandProcessingResult unassignClientStaff(Long clientId, JsonCommand command);
|
CommandProcessingResult unassignClientStaff(Long clientId, JsonCommand command);
|
||||||
|
|
||||||
CommandProcessingResult closeClient(final Long clientId, final JsonCommand command);
|
CommandProcessingResult closeClient(Long clientId, JsonCommand command);
|
||||||
|
|
||||||
CommandProcessingResult assignClientStaff(Long clientId, JsonCommand command);
|
CommandProcessingResult assignClientStaff(Long clientId, JsonCommand command);
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -28,7 +28,7 @@ public class CollateralApiConstants {
|
|||||||
/***
|
/***
|
||||||
* Enum of all parameters passed in while creating/updating a collateral
|
* Enum of all parameters passed in while creating/updating a collateral
|
||||||
***/
|
***/
|
||||||
public static enum CollateralJSONinputParams {
|
public enum CollateralJSONinputParams {
|
||||||
|
|
||||||
LOAN_ID("loanId"), COLLATERAL_ID("collateralId"), COLLATERAL_TYPE_ID("collateralTypeId"), VALUE("value"), DESCRIPTION(
|
LOAN_ID("loanId"), COLLATERAL_ID("collateralId"), COLLATERAL_TYPE_ID("collateralTypeId"), VALUE("value"), DESCRIPTION(
|
||||||
"description");
|
"description");
|
||||||
|
|||||||
+1
-1
@@ -23,7 +23,7 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainR
|
|||||||
public class CollateralCannotBeCreatedException extends AbstractPlatformDomainRuleException {
|
public class CollateralCannotBeCreatedException extends AbstractPlatformDomainRuleException {
|
||||||
|
|
||||||
/*** enum of reasons of why Loan Charge cannot be waived **/
|
/*** enum of reasons of why Loan Charge cannot be waived **/
|
||||||
public static enum LoanCollateralCannotBeCreatedReason {
|
public enum LoanCollateralCannotBeCreatedReason {
|
||||||
|
|
||||||
LOAN_NOT_IN_SUBMITTED_AND_PENDING_APPROVAL_STAGE;
|
LOAN_NOT_IN_SUBMITTED_AND_PENDING_APPROVAL_STAGE;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -23,7 +23,7 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainR
|
|||||||
public class CollateralCannotBeDeletedException extends AbstractPlatformDomainRuleException {
|
public class CollateralCannotBeDeletedException extends AbstractPlatformDomainRuleException {
|
||||||
|
|
||||||
/*** enum of reasons of why Loan Charge cannot be waived **/
|
/*** enum of reasons of why Loan Charge cannot be waived **/
|
||||||
public static enum LoanCollateralCannotBeDeletedReason {
|
public enum LoanCollateralCannotBeDeletedReason {
|
||||||
|
|
||||||
LOAN_NOT_IN_SUBMITTED_AND_PENDING_APPROVAL_STAGE;
|
LOAN_NOT_IN_SUBMITTED_AND_PENDING_APPROVAL_STAGE;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -23,7 +23,7 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainR
|
|||||||
public class CollateralCannotBeUpdatedException extends AbstractPlatformDomainRuleException {
|
public class CollateralCannotBeUpdatedException extends AbstractPlatformDomainRuleException {
|
||||||
|
|
||||||
/*** enum of reasons of why Loan Charge cannot be waived **/
|
/*** enum of reasons of why Loan Charge cannot be waived **/
|
||||||
public static enum LoanCollateralCannotBeUpdatedReason {
|
public enum LoanCollateralCannotBeUpdatedReason {
|
||||||
|
|
||||||
LOAN_NOT_IN_SUBMITTED_AND_PENDING_APPROVAL_STAGE;
|
LOAN_NOT_IN_SUBMITTED_AND_PENDING_APPROVAL_STAGE;
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -24,10 +24,10 @@ import org.apache.fineract.portfolio.collectionsheet.data.JLGCollectionSheetData
|
|||||||
|
|
||||||
public interface CollectionSheetReadPlatformService {
|
public interface CollectionSheetReadPlatformService {
|
||||||
|
|
||||||
JLGCollectionSheetData generateGroupCollectionSheet(final Long groupId, final JsonQuery query);
|
JLGCollectionSheetData generateGroupCollectionSheet(Long groupId, JsonQuery query);
|
||||||
|
|
||||||
JLGCollectionSheetData generateCenterCollectionSheet(final Long groupId, final JsonQuery query);
|
JLGCollectionSheetData generateCenterCollectionSheet(Long groupId, JsonQuery query);
|
||||||
|
|
||||||
IndividualCollectionSheetData generateIndividualCollectionSheet(final JsonQuery query);
|
IndividualCollectionSheetData generateIndividualCollectionSheet(JsonQuery query);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -712,7 +712,7 @@ public class CollectionSheetReadPlatformServiceImpl implements CollectionSheetRe
|
|||||||
|
|
||||||
private final String sql;
|
private final String sql;
|
||||||
|
|
||||||
public IndividualCollectionSheetFaltDataMapper(final boolean checkForOfficeId, final boolean checkforStaffId) {
|
IndividualCollectionSheetFaltDataMapper(final boolean checkForOfficeId, final boolean checkforStaffId) {
|
||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
sb.append("SELECT loandata.*, sum(lc.amount_outstanding_derived) as chargesDue ");
|
sb.append("SELECT loandata.*, sum(lc.amount_outstanding_derived) as chargesDue ");
|
||||||
sb.append("from (SELECT cl.display_name As clientName, ");
|
sb.append("from (SELECT cl.display_name As clientName, ");
|
||||||
|
|||||||
+3
-3
@@ -23,7 +23,7 @@ import java.util.Set;
|
|||||||
|
|
||||||
public class BusinessEventNotificationConstants {
|
public class BusinessEventNotificationConstants {
|
||||||
|
|
||||||
public static enum BusinessEvents {
|
public enum BusinessEvents {
|
||||||
|
|
||||||
LOAN_APPROVED("loan_approved"), LOAN_REJECTED("loan_reject"), LOAN_UNDO_APPROVAL("loan_undo_approval"), LOAN_UNDO_DISBURSAL(
|
LOAN_APPROVED("loan_approved"), LOAN_REJECTED("loan_reject"), LOAN_UNDO_APPROVAL("loan_undo_approval"), LOAN_UNDO_DISBURSAL(
|
||||||
"loan_undo_disbursal"), LOAN_UNDO_LASTDISBURSAL("loan_undo_lastdisbursal"), LOAN_UNDO_TRANSACTION(
|
"loan_undo_disbursal"), LOAN_UNDO_LASTDISBURSAL("loan_undo_lastdisbursal"), LOAN_UNDO_TRANSACTION(
|
||||||
@@ -89,7 +89,7 @@ public class BusinessEventNotificationConstants {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static enum BusinessEntity {
|
public enum BusinessEntity {
|
||||||
|
|
||||||
LOAN("loan"), LOAN_TRANSACTION("loan_transaction"), LOAN_CHARGE("loan_charge"), LOAN_ADJUSTED_TRANSACTION(
|
LOAN("loan"), LOAN_TRANSACTION("loan_transaction"), LOAN_CHARGE("loan_charge"), LOAN_ADJUSTED_TRANSACTION(
|
||||||
"loan_adjusted_transaction"), SAVING("saving"), CLIENT("client"), SAVINGS_TRANSACTION("Savings Transaction"), GROUP(
|
"loan_adjusted_transaction"), SAVING("saving"), CLIENT("client"), SAVINGS_TRANSACTION("Savings Transaction"), GROUP(
|
||||||
@@ -98,7 +98,7 @@ public class BusinessEventNotificationConstants {
|
|||||||
|
|
||||||
private final String value;
|
private final String value;
|
||||||
|
|
||||||
private BusinessEntity(final String value) {
|
BusinessEntity(final String value) {
|
||||||
this.value = value;
|
this.value = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -30,7 +30,7 @@ public enum DayOfWeekType {
|
|||||||
private final Integer value;
|
private final Integer value;
|
||||||
private final String code;
|
private final String code;
|
||||||
|
|
||||||
private DayOfWeekType(Integer value, String code) {
|
DayOfWeekType(Integer value, String code) {
|
||||||
this.value = value;
|
this.value = value;
|
||||||
this.code = code;
|
this.code = code;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -42,7 +42,7 @@ public enum DaysInYearType {
|
|||||||
private final Integer value;
|
private final Integer value;
|
||||||
private final String code;
|
private final String code;
|
||||||
|
|
||||||
private DaysInYearType(final Integer value, final String code) {
|
DaysInYearType(final Integer value, final String code) {
|
||||||
this.value = value;
|
this.value = value;
|
||||||
this.code = code;
|
this.code = code;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -33,7 +33,7 @@ public enum PeriodFrequencyType {
|
|||||||
private final Integer value;
|
private final Integer value;
|
||||||
private final String code;
|
private final String code;
|
||||||
|
|
||||||
private PeriodFrequencyType(final Integer value, final String code) {
|
PeriodFrequencyType(final Integer value, final String code) {
|
||||||
this.value = value;
|
this.value = value;
|
||||||
this.code = code;
|
this.code = code;
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -31,11 +31,11 @@ public interface BusinessEventListner {
|
|||||||
/**
|
/**
|
||||||
* Implement this method for notifications before executing Business Event
|
* Implement this method for notifications before executing Business Event
|
||||||
*/
|
*/
|
||||||
public void businessEventToBeExecuted(Map<BusinessEntity, Object> businessEventEntity);
|
void businessEventToBeExecuted(Map<BusinessEntity, Object> businessEventEntity);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Implement this method for notifications after executing Business Event
|
* Implement this method for notifications after executing Business Event
|
||||||
*/
|
*/
|
||||||
public void businessEventWasExecuted(Map<BusinessEntity, Object> businessEventEntity);
|
void businessEventWasExecuted(Map<BusinessEntity, Object> businessEventEntity);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-4
@@ -31,21 +31,21 @@ public interface BusinessEventNotifierService {
|
|||||||
/**
|
/**
|
||||||
* Method should be called to notify listeners before Business event execution for any pre-processing of event
|
* Method should be called to notify listeners before Business event execution for any pre-processing of event
|
||||||
*/
|
*/
|
||||||
public void notifyBusinessEventToBeExecuted(BusinessEvents businessEvent, Map<BusinessEntity, Object> businessEventEntity);
|
void notifyBusinessEventToBeExecuted(BusinessEvents businessEvent, Map<BusinessEntity, Object> businessEventEntity);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Method should be called to notify listeners after Business event execution for any post-processing of event
|
* Method should be called to notify listeners after Business event execution for any post-processing of event
|
||||||
*/
|
*/
|
||||||
public void notifyBusinessEventWasExecuted(BusinessEvents businessEvent, Map<BusinessEntity, Object> businessEventEntity);
|
void notifyBusinessEventWasExecuted(BusinessEvents businessEvent, Map<BusinessEntity, Object> businessEventEntity);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Method is to register a class as listener for pre-processing of any Business event
|
* Method is to register a class as listener for pre-processing of any Business event
|
||||||
*/
|
*/
|
||||||
public void addBusinessEventPreListners(BusinessEvents businessEvent, BusinessEventListner businessEventListner);
|
void addBusinessEventPreListners(BusinessEvents businessEvent, BusinessEventListner businessEventListner);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Method is to register a class as listener for post-processing of any Business event
|
* Method is to register a class as listener for post-processing of any Business event
|
||||||
*/
|
*/
|
||||||
public void addBusinessEventPostListners(BusinessEvents businessEvent, BusinessEventListner businessEventListner);
|
void addBusinessEventPostListners(BusinessEvents businessEvent, BusinessEventListner businessEventListner);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -23,7 +23,7 @@ import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
|
|||||||
|
|
||||||
public interface FloatingRateWritePlatformService {
|
public interface FloatingRateWritePlatformService {
|
||||||
|
|
||||||
public CommandProcessingResult createFloatingRate(JsonCommand command);
|
CommandProcessingResult createFloatingRate(JsonCommand command);
|
||||||
|
|
||||||
public CommandProcessingResult updateFloatingRate(JsonCommand command);
|
CommandProcessingResult updateFloatingRate(JsonCommand command);
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -110,7 +110,7 @@ public class FloatingRatesReadPlatformServiceImpl implements FloatingRatesReadPl
|
|||||||
.append("FROM m_floating_rates as rate ").append("LEFT JOIN m_appuser as crappu on rate.createdby_id = crappu.id ")
|
.append("FROM m_floating_rates as rate ").append("LEFT JOIN m_appuser as crappu on rate.createdby_id = crappu.id ")
|
||||||
.append("LEFT JOIN m_appuser as moappu on rate.lastmodifiedby_id = moappu.id ");
|
.append("LEFT JOIN m_appuser as moappu on rate.lastmodifiedby_id = moappu.id ");
|
||||||
|
|
||||||
public FloatingRateRowMapper(final boolean addRatePeriods) {
|
FloatingRateRowMapper(final boolean addRatePeriods) {
|
||||||
this.addRatePeriods = addRatePeriods;
|
this.addRatePeriods = addRatePeriods;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -29,7 +29,7 @@ public interface GroupRepository extends JpaRepository<Group, Long>, JpaSpecific
|
|||||||
|
|
||||||
Collection<Group> findByParentId(Long parentId);
|
Collection<Group> findByParentId(Long parentId);
|
||||||
|
|
||||||
public static final String RETRIEVE_SUBMITTED_ON_DATE = "select g.submittedOnDate from Group g where g.id = :groupId";
|
String RETRIEVE_SUBMITTED_ON_DATE = "select g.submittedOnDate from Group g where g.id = :groupId";
|
||||||
|
|
||||||
@Query(RETRIEVE_SUBMITTED_ON_DATE)
|
@Query(RETRIEVE_SUBMITTED_ON_DATE)
|
||||||
Date retrieveGroupTypeSubmitteOndDate(@Param("groupId") Long groupId);
|
Date retrieveGroupTypeSubmitteOndDate(@Param("groupId") Long groupId);
|
||||||
|
|||||||
+1
-1
@@ -191,7 +191,7 @@ public class CenterReadPlatformServiceImpl implements CenterReadPlatformService
|
|||||||
|
|
||||||
private final String schemaSql;
|
private final String schemaSql;
|
||||||
|
|
||||||
public CenterDataMapper() {
|
CenterDataMapper() {
|
||||||
|
|
||||||
this.schemaSql = SQL_QUERY;
|
this.schemaSql = SQL_QUERY;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -67,7 +67,7 @@ public class GroupRolesReadPlatformServiceImpl implements GroupRolesReadPlatform
|
|||||||
|
|
||||||
private static final class GroupRolesDataMapper implements RowMapper<GroupRoleData> {
|
private static final class GroupRolesDataMapper implements RowMapper<GroupRoleData> {
|
||||||
|
|
||||||
public final String schema() {
|
public String schema() {
|
||||||
return " role.id AS id, role.client_id AS clientId, c.display_name as clientName, role.role_cv_id AS roleId, cv.code_value AS roleName"
|
return " role.id AS id, role.client_id AS clientId, c.display_name as clientName, role.role_cv_id AS roleId, cv.code_value AS roleName"
|
||||||
+ " from m_code_value cv join m_group_roles role on role.role_cv_id = cv.id left join m_client c on c.id = role.client_id ";
|
+ " from m_code_value cv join m_group_roles role on role.role_cv_id = cv.id left join m_client c on c.id = role.client_id ";
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-4
@@ -35,9 +35,9 @@ public interface GroupingTypesWritePlatformService {
|
|||||||
|
|
||||||
CommandProcessingResult deleteGroup(Long groupId);
|
CommandProcessingResult deleteGroup(Long groupId);
|
||||||
|
|
||||||
CommandProcessingResult closeGroup(final Long groupId, final JsonCommand command);
|
CommandProcessingResult closeGroup(Long groupId, JsonCommand command);
|
||||||
|
|
||||||
CommandProcessingResult closeCenter(final Long centerId, final JsonCommand command);
|
CommandProcessingResult closeCenter(Long centerId, JsonCommand command);
|
||||||
|
|
||||||
CommandProcessingResult unassignGroupOrCenterStaff(Long groupId, JsonCommand command);
|
CommandProcessingResult unassignGroupOrCenterStaff(Long groupId, JsonCommand command);
|
||||||
|
|
||||||
@@ -47,7 +47,7 @@ public interface GroupingTypesWritePlatformService {
|
|||||||
|
|
||||||
CommandProcessingResult disassociateClientsFromGroup(Long groupId, JsonCommand command);
|
CommandProcessingResult disassociateClientsFromGroup(Long groupId, JsonCommand command);
|
||||||
|
|
||||||
CommandProcessingResult associateGroupsToCenter(final Long centerId, final JsonCommand command);
|
CommandProcessingResult associateGroupsToCenter(Long centerId, JsonCommand command);
|
||||||
|
|
||||||
CommandProcessingResult disassociateGroupsToCenter(final Long centerId, final JsonCommand command);
|
CommandProcessingResult disassociateGroupsToCenter(Long centerId, JsonCommand command);
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-12
@@ -24,19 +24,18 @@ import java.util.Set;
|
|||||||
|
|
||||||
public interface InterestIncentiveApiConstants {
|
public interface InterestIncentiveApiConstants {
|
||||||
|
|
||||||
public static final String idParamName = "id";
|
String idParamName = "id";
|
||||||
public static final String entityTypeParamName = "entityType";
|
String entityTypeParamName = "entityType";
|
||||||
public static final String attributeNameParamName = "attributeName";
|
String attributeNameParamName = "attributeName";
|
||||||
public static final String conditionTypeParamName = "conditionType";
|
String conditionTypeParamName = "conditionType";
|
||||||
public static final String attributeValueParamName = "attributeValue";
|
String attributeValueParamName = "attributeValue";
|
||||||
public static final String incentiveTypeparamName = "incentiveType";
|
String incentiveTypeparamName = "incentiveType";
|
||||||
public static final String amountParamName = "amount";
|
String amountParamName = "amount";
|
||||||
public static final String deleteParamName = "delete";
|
String deleteParamName = "delete";
|
||||||
|
|
||||||
public static final String INCENTIVE_RESOURCE_NAME = "interest.rate.incentives";
|
String INCENTIVE_RESOURCE_NAME = "interest.rate.incentives";
|
||||||
|
|
||||||
public static final Set<String> INTERESTRATE_INCENTIVE_RESPONSE_DATA_PARAMETERS = new HashSet<>(
|
Set<String> INTERESTRATE_INCENTIVE_RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList(idParamName, entityTypeParamName,
|
||||||
Arrays.asList(idParamName, entityTypeParamName, attributeNameParamName, conditionTypeParamName, attributeValueParamName,
|
attributeNameParamName, conditionTypeParamName, attributeValueParamName, incentiveTypeparamName, amountParamName));
|
||||||
incentiveTypeparamName, amountParamName));
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -23,7 +23,7 @@ import org.apache.fineract.portfolio.common.domain.ConditionType;
|
|||||||
|
|
||||||
public abstract class AttributeIncentiveCalculation {
|
public abstract class AttributeIncentiveCalculation {
|
||||||
|
|
||||||
public abstract BigDecimal calculateIncentive(final IncentiveDTO incentiveDTO);
|
public abstract BigDecimal calculateIncentive(IncentiveDTO incentiveDTO);
|
||||||
|
|
||||||
public boolean applyIncentive(ConditionType conditionType, Long attributeValue, Long actualValue) {
|
public boolean applyIncentive(ConditionType conditionType, Long attributeValue, Long actualValue) {
|
||||||
boolean applyIncentive = false;
|
boolean applyIncentive = false;
|
||||||
|
|||||||
+1
-1
@@ -46,7 +46,7 @@ public enum InterestIncentiveAttributeName {
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
private InterestIncentiveAttributeName(final Integer value, final String code) {
|
InterestIncentiveAttributeName(final Integer value, final String code) {
|
||||||
this.value = value;
|
this.value = value;
|
||||||
this.code = code;
|
this.code = code;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -44,7 +44,7 @@ public enum InterestIncentiveEntityType {
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
private InterestIncentiveEntityType(final Integer value, final String code) {
|
InterestIncentiveEntityType(final Integer value, final String code) {
|
||||||
this.value = value;
|
this.value = value;
|
||||||
this.code = code;
|
this.code = code;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -44,7 +44,7 @@ public enum InterestIncentiveType {
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
private InterestIncentiveType(final Integer value, final String code) {
|
InterestIncentiveType(final Integer value, final String code) {
|
||||||
this.value = value;
|
this.value = value;
|
||||||
this.code = code;
|
this.code = code;
|
||||||
}
|
}
|
||||||
|
|||||||
+95
-95
@@ -20,116 +20,116 @@ package org.apache.fineract.portfolio.loanaccount.api;
|
|||||||
|
|
||||||
public interface LoanApiConstants {
|
public interface LoanApiConstants {
|
||||||
|
|
||||||
public static final String emiAmountParameterName = "fixedEmiAmount";
|
String emiAmountParameterName = "fixedEmiAmount";
|
||||||
public static final String maxOutstandingBalanceParameterName = "maxOutstandingLoanBalance";
|
String maxOutstandingBalanceParameterName = "maxOutstandingLoanBalance";
|
||||||
public static final String disbursementDataParameterName = "disbursementData";
|
String disbursementDataParameterName = "disbursementData";
|
||||||
public static final String disbursementDateParameterName = "expectedDisbursementDate";
|
String disbursementDateParameterName = "expectedDisbursementDate";
|
||||||
public static final String disbursementPrincipalParameterName = "principal";
|
String disbursementPrincipalParameterName = "principal";
|
||||||
public static final String updatedDisbursementDateParameterName = "updatedExpectedDisbursementDate";
|
String updatedDisbursementDateParameterName = "updatedExpectedDisbursementDate";
|
||||||
public static final String updatedDisbursementPrincipalParameterName = "updatedPrincipal";
|
String updatedDisbursementPrincipalParameterName = "updatedPrincipal";
|
||||||
public static final String disbursementIdParameterName = "id";
|
String disbursementIdParameterName = "id";
|
||||||
public static final String loanChargeIdParameterName = "loanChargeId";
|
String loanChargeIdParameterName = "loanChargeId";
|
||||||
public static final String principalDisbursedParameterName = "transactionAmount";
|
String principalDisbursedParameterName = "transactionAmount";
|
||||||
public static final String chargesParameterName = "charges";
|
String chargesParameterName = "charges";
|
||||||
public static final String loanIdTobeApproved = "loanId";
|
String loanIdTobeApproved = "loanId";
|
||||||
|
|
||||||
public static final String approvedLoanAmountParameterName = "approvedLoanAmount";
|
String approvedLoanAmountParameterName = "approvedLoanAmount";
|
||||||
public static final String approvedOnDateParameterName = "approvedOnDate";
|
String approvedOnDateParameterName = "approvedOnDate";
|
||||||
public static final String noteParameterName = "note";
|
String noteParameterName = "note";
|
||||||
public static final String localeParameterName = "locale";
|
String localeParameterName = "locale";
|
||||||
public static final String dateFormatParameterName = "dateFormat";
|
String dateFormatParameterName = "dateFormat";
|
||||||
public static final String rejectedOnDateParameterName = "rejectedOnDate";
|
String rejectedOnDateParameterName = "rejectedOnDate";
|
||||||
public static final String withdrawnOnDateParameterName = "withdrawnOnDate";
|
String withdrawnOnDateParameterName = "withdrawnOnDate";
|
||||||
|
|
||||||
public static final String transactionProcessingStrategyIdParameterName = "transactionProcessingStrategyId";
|
String transactionProcessingStrategyIdParameterName = "transactionProcessingStrategyId";
|
||||||
public static final String loanPurposeIdParameterName = "loanPurposeId";
|
String loanPurposeIdParameterName = "loanPurposeId";
|
||||||
public static final String loanOfficerIdParameterName = "loanOfficerId";
|
String loanOfficerIdParameterName = "loanOfficerId";
|
||||||
public static final String fundIdParameterName = "fundId";
|
String fundIdParameterName = "fundId";
|
||||||
public static final String externalIdParameterName = "externalId";
|
String externalIdParameterName = "externalId";
|
||||||
public static final String accountNoParameterName = "accountNo";
|
String accountNoParameterName = "accountNo";
|
||||||
public static final String productIdParameterName = "productId";
|
String productIdParameterName = "productId";
|
||||||
public static final String calendarIdParameterName = "calendarId";
|
String calendarIdParameterName = "calendarId";
|
||||||
public static final String loanTypeParameterName = "loanType";
|
String loanTypeParameterName = "loanType";
|
||||||
public static final String groupIdParameterName = "groupId";
|
String groupIdParameterName = "groupId";
|
||||||
public static final String clientIdParameterName = "clientId";
|
String clientIdParameterName = "clientId";
|
||||||
public static final String idParameterName = "id";
|
String idParameterName = "id";
|
||||||
public static final String graceOnInterestChargedParameterName = "graceOnInterestCharged";
|
String graceOnInterestChargedParameterName = "graceOnInterestCharged";
|
||||||
public static final String graceOnInterestPaymentParameterName = "graceOnInterestPayment";
|
String graceOnInterestPaymentParameterName = "graceOnInterestPayment";
|
||||||
public static final String graceOnPrincipalPaymentParameterName = "graceOnPrincipalPayment";
|
String graceOnPrincipalPaymentParameterName = "graceOnPrincipalPayment";
|
||||||
public static final String repaymentsStartingFromDateParameterName = "repaymentsStartingFromDate";
|
String repaymentsStartingFromDateParameterName = "repaymentsStartingFromDate";
|
||||||
public static final String interestRateFrequencyTypeParameterName = "interestRateFrequencyType";
|
String interestRateFrequencyTypeParameterName = "interestRateFrequencyType";
|
||||||
public static final String interestCalculationPeriodTypeParameterName = "interestCalculationPeriodType";
|
String interestCalculationPeriodTypeParameterName = "interestCalculationPeriodType";
|
||||||
public static final String interestTypeParameterName = "interestType";
|
String interestTypeParameterName = "interestType";
|
||||||
public static final String amortizationTypeParameterName = "amortizationType";
|
String amortizationTypeParameterName = "amortizationType";
|
||||||
public static final String repaymentFrequencyTypeParameterName = "repaymentFrequencyType";
|
String repaymentFrequencyTypeParameterName = "repaymentFrequencyType";
|
||||||
public static final String loanTermFrequencyTypeParameterName = "loanTermFrequencyType";
|
String loanTermFrequencyTypeParameterName = "loanTermFrequencyType";
|
||||||
public static final String loanTermFrequencyParameterName = "loanTermFrequency";
|
String loanTermFrequencyParameterName = "loanTermFrequency";
|
||||||
public static final String numberOfRepaymentsParameterName = "numberOfRepayments";
|
String numberOfRepaymentsParameterName = "numberOfRepayments";
|
||||||
public static final String repaymentEveryParameterName = "repaymentEvery";
|
String repaymentEveryParameterName = "repaymentEvery";
|
||||||
public static final String interestRatePerPeriodParameterName = "interestRatePerPeriod";
|
String interestRatePerPeriodParameterName = "interestRatePerPeriod";
|
||||||
public static final String inArrearsToleranceParameterName = "inArrearsTolerance";
|
String inArrearsToleranceParameterName = "inArrearsTolerance";
|
||||||
public static final String interestChargedFromDateParameterName = "interestChargedFromDate";
|
String interestChargedFromDateParameterName = "interestChargedFromDate";
|
||||||
public static final String submittedOnDateParameterName = "submittedOnDate";
|
String submittedOnDateParameterName = "submittedOnDate";
|
||||||
public static final String submittedOnNoteParameterName = "interestChargedFromDate";
|
String submittedOnNoteParameterName = "interestChargedFromDate";
|
||||||
public static final String collateralParameterName = "collateral";
|
String collateralParameterName = "collateral";
|
||||||
public static final String syncDisbursementWithMeetingParameterName = "syncDisbursementWithMeeting";
|
String syncDisbursementWithMeetingParameterName = "syncDisbursementWithMeeting";
|
||||||
public static final String linkAccountIdParameterName = "linkAccountId";
|
String linkAccountIdParameterName = "linkAccountId";
|
||||||
public static final String createStandingInstructionAtDisbursementParameterName = "createStandingInstructionAtDisbursement";
|
String createStandingInstructionAtDisbursementParameterName = "createStandingInstructionAtDisbursement";
|
||||||
public static final String daysInYearTypeParameterName = "daysInYearType";
|
String daysInYearTypeParameterName = "daysInYearType";
|
||||||
public static final String daysInMonthTypeParameterName = "daysInMonthType";
|
String daysInMonthTypeParameterName = "daysInMonthType";
|
||||||
|
|
||||||
// Interest recalculation related
|
// Interest recalculation related
|
||||||
public static final String isInterestRecalculationEnabledParameterName = "isInterestRecalculationEnabled";
|
String isInterestRecalculationEnabledParameterName = "isInterestRecalculationEnabled";
|
||||||
public static final String interestRecalculationCompoundingMethodParameterName = "interestRecalculationCompoundingMethod";
|
String interestRecalculationCompoundingMethodParameterName = "interestRecalculationCompoundingMethod";
|
||||||
public static final String rescheduleStrategyMethodParameterName = "rescheduleStrategyMethod";
|
String rescheduleStrategyMethodParameterName = "rescheduleStrategyMethod";
|
||||||
public static final String repaymentFrequencyNthDayTypeParameterName = "repaymentFrequencyNthDayType";
|
String repaymentFrequencyNthDayTypeParameterName = "repaymentFrequencyNthDayType";
|
||||||
public static final String repaymentFrequencyDayOfWeekTypeParameterName = "repaymentFrequencyDayOfWeekType";
|
String repaymentFrequencyDayOfWeekTypeParameterName = "repaymentFrequencyDayOfWeekType";
|
||||||
|
|
||||||
// Floating interest rate related
|
// Floating interest rate related
|
||||||
public static final String interestRateDifferentialParameterName = "interestRateDifferential";
|
String interestRateDifferentialParameterName = "interestRateDifferential";
|
||||||
public static final String isFloatingInterestRateParameterName = "isFloatingInterestRate";
|
String isFloatingInterestRateParameterName = "isFloatingInterestRate";
|
||||||
|
|
||||||
// Error codes
|
// Error codes
|
||||||
public static final String LOAN_CHARGE_CAN_NOT_BE_ADDED_WITH_INTEREST_CALCULATION_TYPE = "loancharge.with.calculation.type.interest.not.allowed";
|
String LOAN_CHARGE_CAN_NOT_BE_ADDED_WITH_INTEREST_CALCULATION_TYPE = "loancharge.with.calculation.type.interest.not.allowed";
|
||||||
public static final String LOAN_CHARGE_CAN_NOT_BE_ADDED_WITH_PRINCIPAL_CALCULATION_TYPE = "loancharge.with.calculation.type.principal.not.allowed";
|
String LOAN_CHARGE_CAN_NOT_BE_ADDED_WITH_PRINCIPAL_CALCULATION_TYPE = "loancharge.with.calculation.type.principal.not.allowed";
|
||||||
public static final String DISBURSEMENT_DATE_START_WITH_ERROR = "first.disbursement.date.must.start.with.expected.disbursement.date";
|
String DISBURSEMENT_DATE_START_WITH_ERROR = "first.disbursement.date.must.start.with.expected.disbursement.date";
|
||||||
public static final String PRINCIPAL_AMOUNT_SHOULD_BE_SAME = "sum.of.multi.disburse.amounts.must.equal.with.total.principal";
|
String PRINCIPAL_AMOUNT_SHOULD_BE_SAME = "sum.of.multi.disburse.amounts.must.equal.with.total.principal";
|
||||||
public static final String DISBURSEMENT_DATE_UNIQUE_ERROR = "disbursement.date.must.be.unique.for.tranches";
|
String DISBURSEMENT_DATE_UNIQUE_ERROR = "disbursement.date.must.be.unique.for.tranches";
|
||||||
public static final String ALREADY_DISBURSED = "can.not.change.disbursement.date";
|
String ALREADY_DISBURSED = "can.not.change.disbursement.date";
|
||||||
public static final String APPROVED_AMOUNT_IS_LESS_THAN_SUM_OF_TRANCHES = "sum.of.multi.disburse.amounts.must.be.equal.to.or.lesser.than.approved.principal";
|
String APPROVED_AMOUNT_IS_LESS_THAN_SUM_OF_TRANCHES = "sum.of.multi.disburse.amounts.must.be.equal.to.or.lesser.than.approved.principal";
|
||||||
public static final String DISBURSEMENT_DATES_NOT_IN_ORDER = "disbursements.should.be.ordered.based.on.their.disbursement.dates";
|
String DISBURSEMENT_DATES_NOT_IN_ORDER = "disbursements.should.be.ordered.based.on.their.disbursement.dates";
|
||||||
public static final String DISBURSEMENT_DATE_BEFORE_ERROR = "disbursement.date.of.tranche.cannot.be.before.expected.disbursement.date";
|
String DISBURSEMENT_DATE_BEFORE_ERROR = "disbursement.date.of.tranche.cannot.be.before.expected.disbursement.date";
|
||||||
|
|
||||||
public static final String isFloatingInterestRate = "isFloatingInterestRate";
|
String isFloatingInterestRate = "isFloatingInterestRate";
|
||||||
public static final String interestRateDifferential = "interestRateDifferential";
|
String interestRateDifferential = "interestRateDifferential";
|
||||||
|
|
||||||
public static final String exceptionParamName = "exceptions";
|
String exceptionParamName = "exceptions";
|
||||||
public static final String modifiedinstallmentsParamName = "modifiedinstallments";
|
String modifiedinstallmentsParamName = "modifiedinstallments";
|
||||||
public static final String newinstallmentsParamName = "newinstallments";
|
String newinstallmentsParamName = "newinstallments";
|
||||||
public static final String deletedinstallmentsParamName = "deletedinstallments";
|
String deletedinstallmentsParamName = "deletedinstallments";
|
||||||
public static final String dueDateParamName = "dueDate";
|
String dueDateParamName = "dueDate";
|
||||||
public static final String modifiedDueDateParamName = "modifiedDueDate";
|
String modifiedDueDateParamName = "modifiedDueDate";
|
||||||
public static final String principalParamName = "principal";
|
String principalParamName = "principal";
|
||||||
public static final String parentAccountParamName = "isParentAccount";
|
String parentAccountParamName = "isParentAccount";
|
||||||
public static final String totalLoanParamName = "totalLoan";
|
String totalLoanParamName = "totalLoan";
|
||||||
public static final String installmentAmountParamName = "installmentAmount";
|
String installmentAmountParamName = "installmentAmount";
|
||||||
// loan write off
|
// loan write off
|
||||||
public static final String WRITEOFFREASONS = "WriteOffReasons";
|
String WRITEOFFREASONS = "WriteOffReasons";
|
||||||
|
|
||||||
// fore closure constants
|
// fore closure constants
|
||||||
public static final String transactionDateParamName = "transactionDate";
|
String transactionDateParamName = "transactionDate";
|
||||||
public static final String noteParamName = "note";
|
String noteParamName = "note";
|
||||||
|
|
||||||
public static final String canUseForTopup = "canUseForTopup";
|
String canUseForTopup = "canUseForTopup";
|
||||||
public static final String clientActiveLoanOptions = "clientActiveLoanOptions";
|
String clientActiveLoanOptions = "clientActiveLoanOptions";
|
||||||
public static final String isTopup = "isTopup";
|
String isTopup = "isTopup";
|
||||||
public static final String loanIdToClose = "loanIdToClose";
|
String loanIdToClose = "loanIdToClose";
|
||||||
public static final String topupAmount = "topupAmount";
|
String topupAmount = "topupAmount";
|
||||||
|
|
||||||
public static final String datatables = "datatables";
|
String datatables = "datatables";
|
||||||
|
|
||||||
public static final String isEqualAmortizationParam = "isEqualAmortization";
|
String isEqualAmortizationParam = "isEqualAmortization";
|
||||||
public static final String applicationId = "applicationId";
|
String applicationId = "applicationId";
|
||||||
public static final String lastApplication = "lastApplication";
|
String lastApplication = "lastApplication";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -2855,7 +2855,7 @@ public class Loan extends AbstractPersistableCustom {
|
|||||||
return actualChanges;
|
return actualChanges;
|
||||||
}
|
}
|
||||||
|
|
||||||
private final void reverseExistingTransactions() {
|
private void reverseExistingTransactions() {
|
||||||
Collection<LoanTransaction> retainTransactions = new ArrayList<>();
|
Collection<LoanTransaction> retainTransactions = new ArrayList<>();
|
||||||
for (final LoanTransaction transaction : this.loanTransactions) {
|
for (final LoanTransaction transaction : this.loanTransactions) {
|
||||||
transaction.reverse();
|
transaction.reverse();
|
||||||
|
|||||||
+3
-4
@@ -28,9 +28,8 @@ import org.joda.time.LocalDate;
|
|||||||
public interface LoanAccountDomainService {
|
public interface LoanAccountDomainService {
|
||||||
|
|
||||||
LoanTransaction makeRepayment(Loan loan, CommandProcessingResultBuilder builderResult, LocalDate transactionDate,
|
LoanTransaction makeRepayment(Loan loan, CommandProcessingResultBuilder builderResult, LocalDate transactionDate,
|
||||||
BigDecimal transactionAmount, PaymentDetail paymentDetail, String noteText, String txnExternalId,
|
BigDecimal transactionAmount, PaymentDetail paymentDetail, String noteText, String txnExternalId, boolean isRecoveryRepayment,
|
||||||
final boolean isRecoveryRepayment, boolean isAccountTransfer, HolidayDetailDTO holidatDetailDto,
|
boolean isAccountTransfer, HolidayDetailDTO holidatDetailDto, Boolean isHolidayValidationDone);
|
||||||
Boolean isHolidayValidationDone);
|
|
||||||
|
|
||||||
LoanTransaction makeRefund(Long accountId, CommandProcessingResultBuilder builderResult, LocalDate transactionDate,
|
LoanTransaction makeRefund(Long accountId, CommandProcessingResultBuilder builderResult, LocalDate transactionDate,
|
||||||
BigDecimal transactionAmount, PaymentDetail paymentDetail, String noteText, String txnExternalId);
|
BigDecimal transactionAmount, PaymentDetail paymentDetail, String noteText, String txnExternalId);
|
||||||
@@ -63,7 +62,7 @@ public interface LoanAccountDomainService {
|
|||||||
|
|
||||||
void saveLoanWithDataIntegrityViolationChecks(Loan loan);
|
void saveLoanWithDataIntegrityViolationChecks(Loan loan);
|
||||||
|
|
||||||
Map<String, Object> foreCloseLoan(final Loan loan, final LocalDate foreClourseDate, String noteText);
|
Map<String, Object> foreCloseLoan(Loan loan, LocalDate foreClourseDate, String noteText);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Disables all standing instructions linked to a closed loan
|
* Disables all standing instructions linked to a closed loan
|
||||||
|
|||||||
+16
-17
@@ -28,49 +28,48 @@ import org.springframework.data.repository.query.Param;
|
|||||||
|
|
||||||
public interface LoanRepository extends JpaRepository<Loan, Long>, JpaSpecificationExecutor<Loan> {
|
public interface LoanRepository extends JpaRepository<Loan, Long>, JpaSpecificationExecutor<Loan> {
|
||||||
|
|
||||||
public static final String FIND_GROUP_LOANS_DISBURSED_AFTER = "select l from Loan l where ( l.actualDisbursementDate IS NOT NULL and l.actualDisbursementDate > :disbursementDate) and "
|
String FIND_GROUP_LOANS_DISBURSED_AFTER = "select l from Loan l where ( l.actualDisbursementDate IS NOT NULL and l.actualDisbursementDate > :disbursementDate) and "
|
||||||
+ "l.group.id = :groupId and l.loanType = :loanType order by l.actualDisbursementDate";
|
+ "l.group.id = :groupId and l.loanType = :loanType order by l.actualDisbursementDate";
|
||||||
|
|
||||||
public static final String FIND_CLIENT_OR_JLG_LOANS_DISBURSED_AFTER = "select l from Loan l where (l.actualDisbursementDate IS NOT NULL and l.actualDisbursementDate > :disbursementDate) and "
|
String FIND_CLIENT_OR_JLG_LOANS_DISBURSED_AFTER = "select l from Loan l where (l.actualDisbursementDate IS NOT NULL and l.actualDisbursementDate > :disbursementDate) and "
|
||||||
+ "l.client.id = :clientId order by l.actualDisbursementDate";
|
+ "l.client.id = :clientId order by l.actualDisbursementDate";
|
||||||
|
|
||||||
public static final String FIND_MAX_GROUP_LOAN_COUNTER_QUERY = "Select MAX(l.loanCounter) from Loan l where l.group.id = :groupId "
|
String FIND_MAX_GROUP_LOAN_COUNTER_QUERY = "Select MAX(l.loanCounter) from Loan l where l.group.id = :groupId "
|
||||||
+ "and l.loanType = :loanType";
|
+ "and l.loanType = :loanType";
|
||||||
|
|
||||||
public static final String FIND_MAX_GROUP_LOAN_PRODUCT_COUNTER_QUERY = "Select MAX(l.loanProductCounter) from Loan l where "
|
String FIND_MAX_GROUP_LOAN_PRODUCT_COUNTER_QUERY = "Select MAX(l.loanProductCounter) from Loan l where "
|
||||||
+ "l.group.id = :groupId and l.loanType = :loanType and l.loanProduct.id = :productId";
|
+ "l.group.id = :groupId and l.loanType = :loanType and l.loanProduct.id = :productId";
|
||||||
|
|
||||||
public static final String FIND_MAX_CLIENT_OR_JLG_LOAN_COUNTER_QUERY = "Select MAX(l.loanCounter) from Loan l where "
|
String FIND_MAX_CLIENT_OR_JLG_LOAN_COUNTER_QUERY = "Select MAX(l.loanCounter) from Loan l where " + "l.client.id = :clientId";
|
||||||
+ "l.client.id = :clientId";
|
|
||||||
|
|
||||||
public static final String FIND_MAX_CLIENT_OR_JLG_LOAN_PRODUCT_COUNTER_QUERY = "Select MAX(l.loanProductCounter) from Loan l where "
|
String FIND_MAX_CLIENT_OR_JLG_LOAN_PRODUCT_COUNTER_QUERY = "Select MAX(l.loanProductCounter) from Loan l where "
|
||||||
+ "l.client.id = :clientId and l.loanProduct.id = :productId";
|
+ "l.client.id = :clientId and l.loanProduct.id = :productId";
|
||||||
|
|
||||||
public static final String FIND_GROUP_LOANS_TO_UPDATE = "select l from Loan l where l.loanCounter > :loanCounter and "
|
String FIND_GROUP_LOANS_TO_UPDATE = "select l from Loan l where l.loanCounter > :loanCounter and "
|
||||||
+ "l.group.id = :groupId and l.loanType = :groupLoanType order by l.loanCounter";
|
+ "l.group.id = :groupId and l.loanType = :groupLoanType order by l.loanCounter";
|
||||||
|
|
||||||
public static final String FIND_CLIENT_OR_JLG_LOANS_TO_UPDATE = "select l from Loan l where l.loanCounter > :loanCounter and "
|
String FIND_CLIENT_OR_JLG_LOANS_TO_UPDATE = "select l from Loan l where l.loanCounter > :loanCounter and "
|
||||||
+ "l.client.id = :clientId order by l.loanCounter";
|
+ "l.client.id = :clientId order by l.loanCounter";
|
||||||
|
|
||||||
public static final String FIND_GROUP_LOANS_TO_UPDATE_LOANPRODUCT_COUNTER = "select l from Loan l where l.loanProductCounter > :loanProductCounter"
|
String FIND_GROUP_LOANS_TO_UPDATE_LOANPRODUCT_COUNTER = "select l from Loan l where l.loanProductCounter > :loanProductCounter"
|
||||||
+ " and l.group.id = :groupId and l.loanType = :groupLoanType and l.loanCounter is NULL order by l.loanProductCounter";
|
+ " and l.group.id = :groupId and l.loanType = :groupLoanType and l.loanCounter is NULL order by l.loanProductCounter";
|
||||||
|
|
||||||
public static final String FIND_CLIENT_LOANS_TO_UPDATE_LOANPRODUCT_COUNTER = "select l from Loan l where l.loanProductCounter > :loanProductCounter"
|
String FIND_CLIENT_LOANS_TO_UPDATE_LOANPRODUCT_COUNTER = "select l from Loan l where l.loanProductCounter > :loanProductCounter"
|
||||||
+ " and l.client.id = :clientId and l.loanCounter is NULL order by l.loanProductCounter";
|
+ " and l.client.id = :clientId and l.loanCounter is NULL order by l.loanProductCounter";
|
||||||
|
|
||||||
public static final String FIND_ACTIVE_LOANS_PRODUCT_IDS_BY_CLIENT = "Select loan.loanProduct.id from Loan loan where "
|
String FIND_ACTIVE_LOANS_PRODUCT_IDS_BY_CLIENT = "Select loan.loanProduct.id from Loan loan where "
|
||||||
+ "loan.client.id = :clientId and loan.loanStatus = :loanStatus group by loan.loanProduct.id";
|
+ "loan.client.id = :clientId and loan.loanStatus = :loanStatus group by loan.loanProduct.id";
|
||||||
|
|
||||||
public static final String FIND_ACTIVE_LOANS_PRODUCT_IDS_BY_GROUP = "Select loan.loanProduct.id from Loan loan where "
|
String FIND_ACTIVE_LOANS_PRODUCT_IDS_BY_GROUP = "Select loan.loanProduct.id from Loan loan where "
|
||||||
+ "loan.group.id = :groupId and loan.loanStatus = :loanStatus and loan.client.id is NULL group by loan.loanProduct.id";
|
+ "loan.group.id = :groupId and loan.loanStatus = :loanStatus and loan.client.id is NULL group by loan.loanProduct.id";
|
||||||
|
|
||||||
public static final String DOES_CLIENT_HAVE_NON_CLOSED_LOANS = "select case when (count (loan) > 0) then 'true' else 'false' end from Loan loan where loan.client.id = :clientId and loan.loanStatus in (100,200,300,303,304,700)";
|
String DOES_CLIENT_HAVE_NON_CLOSED_LOANS = "select case when (count (loan) > 0) then 'true' else 'false' end from Loan loan where loan.client.id = :clientId and loan.loanStatus in (100,200,300,303,304,700)";
|
||||||
|
|
||||||
public static final String DOES_PRODUCT_HAVE_NON_CLOSED_LOANS = "select case when (count (loan) > 0) then 'true' else 'false' end from Loan loan where loan.loanProduct.id = :productId and loan.loanStatus in (100,200,300,303,304,700)";
|
String DOES_PRODUCT_HAVE_NON_CLOSED_LOANS = "select case when (count (loan) > 0) then 'true' else 'false' end from Loan loan where loan.loanProduct.id = :productId and loan.loanStatus in (100,200,300,303,304,700)";
|
||||||
|
|
||||||
public static final String FIND_BY_ACCOUNT_NUMBER = "select loan from Loan loan where loan.accountNumber = :accountNumber and loan.loanStatus in (100,200,300,303,304)";
|
String FIND_BY_ACCOUNT_NUMBER = "select loan from Loan loan where loan.accountNumber = :accountNumber and loan.loanStatus in (100,200,300,303,304)";
|
||||||
|
|
||||||
public static final String FIND_NON_CLOSED_LOAN_THAT_BELONGS_TO_CLIENT = "select loan from Loan loan where loan.id = :loanId and loan.loanStatus = 300 and loan.client.id = :clientId";
|
String FIND_NON_CLOSED_LOAN_THAT_BELONGS_TO_CLIENT = "select loan from Loan loan where loan.id = :loanId and loan.loanStatus = 300 and loan.client.id = :clientId";
|
||||||
|
|
||||||
@Query(FIND_GROUP_LOANS_DISBURSED_AFTER)
|
@Query(FIND_GROUP_LOANS_DISBURSED_AFTER)
|
||||||
List<Loan> getGroupLoansDisbursedAfter(@Param("disbursementDate") Date disbursementDate, @Param("groupId") Long groupId,
|
List<Loan> getGroupLoansDisbursedAfter(@Param("disbursementDate") Date disbursementDate, @Param("groupId") Long groupId,
|
||||||
|
|||||||
+1
-1
@@ -33,7 +33,7 @@ public enum LoanTermVariationType {
|
|||||||
private final Integer value;
|
private final Integer value;
|
||||||
private final String code;
|
private final String code;
|
||||||
|
|
||||||
private LoanTermVariationType(final Integer value, final String code) {
|
LoanTermVariationType(final Integer value, final String code) {
|
||||||
this.value = value;
|
this.value = value;
|
||||||
this.code = code;
|
this.code = code;
|
||||||
}
|
}
|
||||||
|
|||||||
+12
-13
@@ -433,9 +433,9 @@ public abstract class AbstractLoanRepaymentScheduleTransactionProcessor implemen
|
|||||||
* @param transactionMappings
|
* @param transactionMappings
|
||||||
* TODO
|
* TODO
|
||||||
*/
|
*/
|
||||||
protected abstract Money handleTransactionThatIsALateRepaymentOfInstallment(final LoanRepaymentScheduleInstallment currentInstallment,
|
protected abstract Money handleTransactionThatIsALateRepaymentOfInstallment(LoanRepaymentScheduleInstallment currentInstallment,
|
||||||
final List<LoanRepaymentScheduleInstallment> installments, final LoanTransaction loanTransaction,
|
List<LoanRepaymentScheduleInstallment> installments, LoanTransaction loanTransaction, Money transactionAmountUnprocessed,
|
||||||
final Money transactionAmountUnprocessed, final List<LoanTransactionToRepaymentScheduleMapping> transactionMappings);
|
List<LoanTransactionToRepaymentScheduleMapping> transactionMappings);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This method is responsible for checking if the current transaction is 'an advance/early payment' based on the
|
* This method is responsible for checking if the current transaction is 'an advance/early payment' based on the
|
||||||
@@ -458,10 +458,9 @@ public abstract class AbstractLoanRepaymentScheduleTransactionProcessor implemen
|
|||||||
* @param transactionMappings
|
* @param transactionMappings
|
||||||
* TODO
|
* TODO
|
||||||
*/
|
*/
|
||||||
protected abstract Money handleTransactionThatIsPaymentInAdvanceOfInstallment(final LoanRepaymentScheduleInstallment currentInstallment,
|
protected abstract Money handleTransactionThatIsPaymentInAdvanceOfInstallment(LoanRepaymentScheduleInstallment currentInstallment,
|
||||||
final List<LoanRepaymentScheduleInstallment> installments, final LoanTransaction loanTransaction,
|
List<LoanRepaymentScheduleInstallment> installments, LoanTransaction loanTransaction, LocalDate transactionDate,
|
||||||
final LocalDate transactionDate, final Money paymentInAdvance,
|
Money paymentInAdvance, List<LoanTransactionToRepaymentScheduleMapping> transactionMappings);
|
||||||
final List<LoanTransactionToRepaymentScheduleMapping> transactionMappings);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* For normal on-time repayments.
|
* For normal on-time repayments.
|
||||||
@@ -469,9 +468,9 @@ public abstract class AbstractLoanRepaymentScheduleTransactionProcessor implemen
|
|||||||
* @param transactionMappings
|
* @param transactionMappings
|
||||||
* TODO
|
* TODO
|
||||||
*/
|
*/
|
||||||
protected abstract Money handleTransactionThatIsOnTimePaymentOfInstallment(final LoanRepaymentScheduleInstallment currentInstallment,
|
protected abstract Money handleTransactionThatIsOnTimePaymentOfInstallment(LoanRepaymentScheduleInstallment currentInstallment,
|
||||||
final LoanTransaction loanTransaction, final Money transactionAmountUnprocessed,
|
LoanTransaction loanTransaction, Money transactionAmountUnprocessed,
|
||||||
final List<LoanTransactionToRepaymentScheduleMapping> transactionMappings);
|
List<LoanTransactionToRepaymentScheduleMapping> transactionMappings);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Invoked when a transaction results in an over-payment of the full loan.
|
* Invoked when a transaction results in an over-payment of the full loan.
|
||||||
@@ -562,9 +561,9 @@ public abstract class AbstractLoanRepaymentScheduleTransactionProcessor implemen
|
|||||||
* TODO
|
* TODO
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
protected abstract Money handleRefundTransactionPaymentOfInstallment(final LoanRepaymentScheduleInstallment currentInstallment,
|
protected abstract Money handleRefundTransactionPaymentOfInstallment(LoanRepaymentScheduleInstallment currentInstallment,
|
||||||
final LoanTransaction loanTransaction, final Money transactionAmountUnprocessed,
|
LoanTransaction loanTransaction, Money transactionAmountUnprocessed,
|
||||||
final List<LoanTransactionToRepaymentScheduleMapping> transactionMappings);
|
List<LoanTransactionToRepaymentScheduleMapping> transactionMappings);
|
||||||
|
|
||||||
private void undoChargesPaidAmountBy(final LoanTransaction loanTransaction, final Money feeCharges, final Set<LoanCharge> charges,
|
private void undoChargesPaidAmountBy(final LoanTransaction loanTransaction, final Money feeCharges, final Set<LoanCharge> charges,
|
||||||
final Integer installmentNumber) {
|
final Integer installmentNumber) {
|
||||||
|
|||||||
+1
-1
@@ -28,7 +28,7 @@ public enum GuarantorType {
|
|||||||
private final Integer value;
|
private final Integer value;
|
||||||
private final String code;
|
private final String code;
|
||||||
|
|
||||||
private GuarantorType(final Integer value, final String code) {
|
GuarantorType(final Integer value, final String code) {
|
||||||
this.value = value;
|
this.value = value;
|
||||||
this.code = code;
|
this.code = code;
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -237,7 +237,7 @@ public class GuarantorReadPlatformServiceImpl implements GuarantorReadPlatformSe
|
|||||||
|
|
||||||
private final String sql;
|
private final String sql;
|
||||||
|
|
||||||
public GuarantorTransactionMapper() {
|
GuarantorTransactionMapper() {
|
||||||
StringBuilder sb = new StringBuilder(" gt.id as gtId,");
|
StringBuilder sb = new StringBuilder(" gt.id as gtId,");
|
||||||
sb.append("gt.is_reversed as reversed,");
|
sb.append("gt.is_reversed as reversed,");
|
||||||
sb.append(" oht.id as ohtId, oht.amount as transactionAmount, ");
|
sb.append(" oht.id as ohtId, oht.amount as transactionAmount, ");
|
||||||
@@ -301,7 +301,7 @@ public class GuarantorReadPlatformServiceImpl implements GuarantorReadPlatformSe
|
|||||||
|
|
||||||
private final String sql;
|
private final String sql;
|
||||||
|
|
||||||
public ObligeeMapper() {
|
ObligeeMapper() {
|
||||||
StringBuilder sb = new StringBuilder(
|
StringBuilder sb = new StringBuilder(
|
||||||
"SELECT cl.firstname, cl.lastname,cl.display_name as displayName, loan.account_no as loanAccountNumber, loan.principal_amount as loanAmount, gfd.amount as guaranteedAmount, ");
|
"SELECT cl.firstname, cl.lastname,cl.display_name as displayName, loan.account_no as loanAccountNumber, loan.principal_amount as loanAmount, gfd.amount as guaranteedAmount, ");
|
||||||
sb.append(
|
sb.append(
|
||||||
|
|||||||
+3
-3
@@ -23,10 +23,10 @@ import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
|
|||||||
|
|
||||||
public interface GuarantorWritePlatformService {
|
public interface GuarantorWritePlatformService {
|
||||||
|
|
||||||
CommandProcessingResult createGuarantor(final Long loanId, final JsonCommand command);
|
CommandProcessingResult createGuarantor(Long loanId, JsonCommand command);
|
||||||
|
|
||||||
CommandProcessingResult updateGuarantor(final Long loanId, final Long guarantorId, final JsonCommand command);
|
CommandProcessingResult updateGuarantor(Long loanId, Long guarantorId, JsonCommand command);
|
||||||
|
|
||||||
CommandProcessingResult removeGuarantor(final Long loanId, final Long guarantorId, Long guarantorFundingId);
|
CommandProcessingResult removeGuarantor(Long loanId, Long guarantorId, Long guarantorFundingId);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -2703,7 +2703,7 @@ public abstract class AbstractLoanScheduleGenerator implements LoanScheduleGener
|
|||||||
boolean isEmiAmountChanged;
|
boolean isEmiAmountChanged;
|
||||||
double interestCalculationGraceOnRepaymentPeriodFraction;
|
double interestCalculationGraceOnRepaymentPeriodFraction;
|
||||||
|
|
||||||
public ScheduleCurrentPeriodParams(final MonetaryCurrency currency, double interestCalculationGraceOnRepaymentPeriodFraction) {
|
ScheduleCurrentPeriodParams(final MonetaryCurrency currency, double interestCalculationGraceOnRepaymentPeriodFraction) {
|
||||||
this.earlyPaidAmount = Money.zero(currency);
|
this.earlyPaidAmount = Money.zero(currency);
|
||||||
this.lastInstallment = null;
|
this.lastInstallment = null;
|
||||||
this.skipCurrentLoop = false;
|
this.skipCurrentLoop = false;
|
||||||
|
|||||||
+1
-1
@@ -731,7 +731,7 @@ public final class LoanApplicationTerms {
|
|||||||
return new PrincipalInterest(null, interestForInstallment, interestBroughtForwardDueToGrace);
|
return new PrincipalInterest(null, interestForInstallment, interestBroughtForwardDueToGrace);
|
||||||
}
|
}
|
||||||
|
|
||||||
private final boolean isLastRepaymentPeriod(final int numberOfRepayments, final int periodNumber) {
|
private boolean isLastRepaymentPeriod(final int numberOfRepayments, final int periodNumber) {
|
||||||
return periodNumber == numberOfRepayments;
|
return periodNumber == numberOfRepayments;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -32,10 +32,10 @@ import org.joda.time.LocalDate;
|
|||||||
public interface LoanScheduleGenerator {
|
public interface LoanScheduleGenerator {
|
||||||
|
|
||||||
LoanScheduleModel generate(MathContext mc, LoanApplicationTerms loanApplicationTerms, Set<LoanCharge> loanCharges,
|
LoanScheduleModel generate(MathContext mc, LoanApplicationTerms loanApplicationTerms, Set<LoanCharge> loanCharges,
|
||||||
final HolidayDetailDTO holidayDetailDTO);
|
HolidayDetailDTO holidayDetailDTO);
|
||||||
|
|
||||||
LoanScheduleDTO rescheduleNextInstallments(MathContext mc, LoanApplicationTerms loanApplicationTerms, Loan loan,
|
LoanScheduleDTO rescheduleNextInstallments(MathContext mc, LoanApplicationTerms loanApplicationTerms, Loan loan,
|
||||||
final HolidayDetailDTO holidayDetailDTO, LoanRepaymentScheduleTransactionProcessor loanRepaymentScheduleTransactionProcessor,
|
HolidayDetailDTO holidayDetailDTO, LoanRepaymentScheduleTransactionProcessor loanRepaymentScheduleTransactionProcessor,
|
||||||
LocalDate rescheduleFrom);
|
LocalDate rescheduleFrom);
|
||||||
|
|
||||||
LoanRepaymentScheduleInstallment calculatePrepaymentAmount(MonetaryCurrency currency, LocalDate onDate,
|
LoanRepaymentScheduleInstallment calculatePrepaymentAmount(MonetaryCurrency currency, LocalDate onDate,
|
||||||
|
|||||||
+5
-5
@@ -26,21 +26,21 @@ import org.joda.time.LocalDate;
|
|||||||
|
|
||||||
public interface ScheduledDateGenerator {
|
public interface ScheduledDateGenerator {
|
||||||
|
|
||||||
LocalDate getLastRepaymentDate(LoanApplicationTerms loanApplicationTerms, final HolidayDetailDTO holidayDetailDTO);
|
LocalDate getLastRepaymentDate(LoanApplicationTerms loanApplicationTerms, HolidayDetailDTO holidayDetailDTO);
|
||||||
|
|
||||||
LocalDate idealDisbursementDateBasedOnFirstRepaymentDate(PeriodFrequencyType repaymentPeriodFrequencyType, int repaidEvery,
|
LocalDate idealDisbursementDateBasedOnFirstRepaymentDate(PeriodFrequencyType repaymentPeriodFrequencyType, int repaidEvery,
|
||||||
final LocalDate firstRepaymentDate, final Calendar loanCalendar, final HolidayDetailDTO holidayDetailDTO,
|
LocalDate firstRepaymentDate, Calendar loanCalendar, HolidayDetailDTO holidayDetailDTO,
|
||||||
final LoanApplicationTerms loanApplicationTerms);
|
LoanApplicationTerms loanApplicationTerms);
|
||||||
|
|
||||||
LocalDate generateNextRepaymentDate(LocalDate lastRepaymentDate, LoanApplicationTerms loanApplicationTerms, boolean isFirstRepayment);
|
LocalDate generateNextRepaymentDate(LocalDate lastRepaymentDate, LoanApplicationTerms loanApplicationTerms, boolean isFirstRepayment);
|
||||||
|
|
||||||
AdjustedDateDetailsDTO adjustRepaymentDate(LocalDate dueRepaymentPeriodDate, LoanApplicationTerms loanApplicationTerms,
|
AdjustedDateDetailsDTO adjustRepaymentDate(LocalDate dueRepaymentPeriodDate, LoanApplicationTerms loanApplicationTerms,
|
||||||
final HolidayDetailDTO holidayDetailDTO);
|
HolidayDetailDTO holidayDetailDTO);
|
||||||
|
|
||||||
LocalDate getRepaymentPeriodDate(PeriodFrequencyType frequency, int repaidEvery, LocalDate startDate);
|
LocalDate getRepaymentPeriodDate(PeriodFrequencyType frequency, int repaidEvery, LocalDate startDate);
|
||||||
|
|
||||||
Boolean isDateFallsInSchedule(PeriodFrequencyType frequency, int repaidEvery, LocalDate startDate, LocalDate date);
|
Boolean isDateFallsInSchedule(PeriodFrequencyType frequency, int repaidEvery, LocalDate startDate, LocalDate date);
|
||||||
|
|
||||||
LocalDate generateNextScheduleDateStartingFromDisburseDate(LocalDate lastRepaymentDate, LoanApplicationTerms loanApplicationTerms,
|
LocalDate generateNextScheduleDateStartingFromDisburseDate(LocalDate lastRepaymentDate, LoanApplicationTerms loanApplicationTerms,
|
||||||
final HolidayDetailDTO holidayDetailDTO);
|
HolidayDetailDTO holidayDetailDTO);
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -94,7 +94,7 @@ public class LoanScheduleHistoryReadPlatformServiceImpl implements LoanScheduleH
|
|||||||
private LocalDate lastDueDate;
|
private LocalDate lastDueDate;
|
||||||
private BigDecimal outstandingLoanPrincipalBalance;
|
private BigDecimal outstandingLoanPrincipalBalance;
|
||||||
|
|
||||||
public LoanScheduleArchiveResultSetExtractor(final RepaymentScheduleRelatedLoanData repaymentScheduleRelatedLoanData,
|
LoanScheduleArchiveResultSetExtractor(final RepaymentScheduleRelatedLoanData repaymentScheduleRelatedLoanData,
|
||||||
Collection<DisbursementData> disbursementData) {
|
Collection<DisbursementData> disbursementData) {
|
||||||
this.currency = repaymentScheduleRelatedLoanData.getCurrency();
|
this.currency = repaymentScheduleRelatedLoanData.getCurrency();
|
||||||
this.disbursement = repaymentScheduleRelatedLoanData.disbursementData();
|
this.disbursement = repaymentScheduleRelatedLoanData.disbursementData();
|
||||||
|
|||||||
+2
-2
@@ -26,8 +26,8 @@ import org.apache.fineract.portfolio.loanaccount.rescheduleloan.domain.LoanResch
|
|||||||
|
|
||||||
public interface LoanScheduleHistoryWritePlatformService {
|
public interface LoanScheduleHistoryWritePlatformService {
|
||||||
|
|
||||||
List<LoanRepaymentScheduleHistory> createLoanScheduleArchive(final List<LoanRepaymentScheduleInstallment> repaymentScheduleInstallments,
|
List<LoanRepaymentScheduleHistory> createLoanScheduleArchive(List<LoanRepaymentScheduleInstallment> repaymentScheduleInstallments,
|
||||||
final Loan loan, final LoanRescheduleRequest loanRescheduleRequest);
|
Loan loan, LoanRescheduleRequest loanRescheduleRequest);
|
||||||
|
|
||||||
void createAndSaveLoanScheduleArchive(List<LoanRepaymentScheduleInstallment> repaymentScheduleInstallments, Loan loan,
|
void createAndSaveLoanScheduleArchive(List<LoanRepaymentScheduleInstallment> repaymentScheduleInstallments, Loan loan,
|
||||||
LoanRescheduleRequest loanRescheduleRequest);
|
LoanRescheduleRequest loanRescheduleRequest);
|
||||||
|
|||||||
+2
-2
@@ -23,7 +23,7 @@ import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
|
|||||||
|
|
||||||
public interface LoanScheduleWritePlatformService {
|
public interface LoanScheduleWritePlatformService {
|
||||||
|
|
||||||
public CommandProcessingResult addLoanScheduleVariations(final Long loanId, final JsonCommand command);
|
CommandProcessingResult addLoanScheduleVariations(Long loanId, JsonCommand command);
|
||||||
|
|
||||||
CommandProcessingResult deleteLoanScheduleVariations(final Long loanId);
|
CommandProcessingResult deleteLoanScheduleVariations(Long loanId);
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -22,5 +22,5 @@ import org.apache.fineract.portfolio.loanaccount.loanschedule.domain.LoanSchedul
|
|||||||
|
|
||||||
public interface LoanReschedulePreviewPlatformService {
|
public interface LoanReschedulePreviewPlatformService {
|
||||||
|
|
||||||
public LoanScheduleModel previewLoanReschedule(Long requestId);
|
LoanScheduleModel previewLoanReschedule(Long requestId);
|
||||||
}
|
}
|
||||||
|
|||||||
+5
-5
@@ -30,7 +30,7 @@ public interface LoanRescheduleRequestReadPlatformService {
|
|||||||
* the loan identifier
|
* the loan identifier
|
||||||
* @return list of LoanRescheduleRequestData objects
|
* @return list of LoanRescheduleRequestData objects
|
||||||
**/
|
**/
|
||||||
public List<LoanRescheduleRequestData> readLoanRescheduleRequests(Long loanId);
|
List<LoanRescheduleRequestData> readLoanRescheduleRequests(Long loanId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get a single loan reschedule request by ID (primary key)
|
* get a single loan reschedule request by ID (primary key)
|
||||||
@@ -39,7 +39,7 @@ public interface LoanRescheduleRequestReadPlatformService {
|
|||||||
* the loan reschedule request identifier
|
* the loan reschedule request identifier
|
||||||
* @return a LoanRescheduleRequestData object
|
* @return a LoanRescheduleRequestData object
|
||||||
**/
|
**/
|
||||||
public LoanRescheduleRequestData readLoanRescheduleRequest(Long requestId);
|
LoanRescheduleRequestData readLoanRescheduleRequest(Long requestId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get all loan reschedule requests filter by loan ID and status enum
|
* get all loan reschedule requests filter by loan ID and status enum
|
||||||
@@ -48,7 +48,7 @@ public interface LoanRescheduleRequestReadPlatformService {
|
|||||||
* the loan identifier
|
* the loan identifier
|
||||||
* @return list of LoanRescheduleRequestData objects
|
* @return list of LoanRescheduleRequestData objects
|
||||||
**/
|
**/
|
||||||
public List<LoanRescheduleRequestData> readLoanRescheduleRequests(Long loanId, Integer statusEnum);
|
List<LoanRescheduleRequestData> readLoanRescheduleRequests(Long loanId, Integer statusEnum);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get all loan reschedule reasons
|
* get all loan reschedule reasons
|
||||||
@@ -57,7 +57,7 @@ public interface LoanRescheduleRequestReadPlatformService {
|
|||||||
* the loan reschedule reason
|
* the loan reschedule reason
|
||||||
* @return list of LoanRescheduleRequestData objects
|
* @return list of LoanRescheduleRequestData objects
|
||||||
**/
|
**/
|
||||||
public LoanRescheduleRequestData retrieveAllRescheduleReasons(String loanRescheduleReason);
|
LoanRescheduleRequestData retrieveAllRescheduleReasons(String loanRescheduleReason);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get all loan reschedule request
|
* get all loan reschedule request
|
||||||
@@ -67,5 +67,5 @@ public interface LoanRescheduleRequestReadPlatformService {
|
|||||||
* pending for approval reject - give all rejected requests
|
* pending for approval reject - give all rejected requests
|
||||||
* @return list of LoanRescheduleRequestData objects
|
* @return list of LoanRescheduleRequestData objects
|
||||||
**/
|
**/
|
||||||
public List<LoanRescheduleRequestData> retrieveAllRescheduleRequests(String command);
|
List<LoanRescheduleRequestData> retrieveAllRescheduleRequests(String command);
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -22,5 +22,5 @@ import org.apache.fineract.organisation.staff.data.StaffAccountSummaryCollection
|
|||||||
|
|
||||||
public interface BulkLoansReadPlatformService {
|
public interface BulkLoansReadPlatformService {
|
||||||
|
|
||||||
StaffAccountSummaryCollectionData retrieveLoanOfficerAccountSummary(final Long loanOfficerId);
|
StaffAccountSummaryCollectionData retrieveLoanOfficerAccountSummary(Long loanOfficerId);
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -300,7 +300,7 @@ public class LoanChargeReadPlatformServiceImpl implements LoanChargeReadPlatform
|
|||||||
|
|
||||||
private final String schemaSql;
|
private final String schemaSql;
|
||||||
|
|
||||||
public LoanChargeAccrualMapper() {
|
LoanChargeAccrualMapper() {
|
||||||
StringBuilder sb = new StringBuilder(50);
|
StringBuilder sb = new StringBuilder(50);
|
||||||
sb.append("lc.id as id, lc.charge_id as chargeId, ");
|
sb.append("lc.id as id, lc.charge_id as chargeId, ");
|
||||||
sb.append("lc.amount as amountDue, ");
|
sb.append("lc.amount as amountDue, ");
|
||||||
@@ -360,7 +360,7 @@ public class LoanChargeReadPlatformServiceImpl implements LoanChargeReadPlatform
|
|||||||
private final String schemaSql;
|
private final String schemaSql;
|
||||||
private final Map<Long, LoanChargeData> chargeDataMap;
|
private final Map<Long, LoanChargeData> chargeDataMap;
|
||||||
|
|
||||||
public LoanChargeUnRecognizedIncomeMapper(final Collection<LoanChargeData> datas) {
|
LoanChargeUnRecognizedIncomeMapper(final Collection<LoanChargeData> datas) {
|
||||||
this.chargeDataMap = new HashMap<>();
|
this.chargeDataMap = new HashMap<>();
|
||||||
for (LoanChargeData chargeData : datas) {
|
for (LoanChargeData chargeData : datas) {
|
||||||
this.chargeDataMap.put(chargeData.getId(), chargeData);
|
this.chargeDataMap.put(chargeData.getId(), chargeData);
|
||||||
|
|||||||
+2
-3
@@ -88,8 +88,7 @@ public interface LoanReadPlatformService {
|
|||||||
* The 'overdue-charge' is only ever applied once to an installment and as a result overdue installments with this
|
* The 'overdue-charge' is only ever applied once to an installment and as a result overdue installments with this
|
||||||
* charge already applied are not returned.
|
* charge already applied are not returned.
|
||||||
*/
|
*/
|
||||||
Collection<OverdueLoanScheduleData> retrieveAllLoansWithOverdueInstallments(final Long penaltyWaitPeriod,
|
Collection<OverdueLoanScheduleData> retrieveAllLoansWithOverdueInstallments(Long penaltyWaitPeriod, Boolean backdatePenalties);
|
||||||
final Boolean backdatePenalties);
|
|
||||||
|
|
||||||
Integer retriveLoanCounter(Long groupId, Integer loanType, Long productId);
|
Integer retriveLoanCounter(Long groupId, Integer loanType, Long productId);
|
||||||
|
|
||||||
@@ -131,7 +130,7 @@ public interface LoanReadPlatformService {
|
|||||||
|
|
||||||
Collection<Long> retrieveLoanIdsWithPendingIncomePostingTransactions();
|
Collection<Long> retrieveLoanIdsWithPendingIncomePostingTransactions();
|
||||||
|
|
||||||
LoanTransactionData retrieveLoanForeclosureTemplate(final Long loanId, final LocalDate transactionDate);
|
LoanTransactionData retrieveLoanForeclosureTemplate(Long loanId, LocalDate transactionDate);
|
||||||
|
|
||||||
LoanAccountData retrieveLoanByLoanAccount(String loanAccountNumber);
|
LoanAccountData retrieveLoanByLoanAccount(String loanAccountNumber);
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -1953,7 +1953,7 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService {
|
|||||||
return this.sqlSchema;
|
return this.sqlSchema;
|
||||||
}
|
}
|
||||||
|
|
||||||
public LoanRepaymentWaiverMapper() {
|
LoanRepaymentWaiverMapper() {
|
||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
sb.append("lrs.duedate as dueDate,lrs.interest_waived_derived interestWaived, lrs.installment as installment");
|
sb.append("lrs.duedate as dueDate,lrs.interest_waived_derived interestWaived, lrs.installment as installment");
|
||||||
sb.append(" from m_loan_repayment_schedule lrs ");
|
sb.append(" from m_loan_repayment_schedule lrs ");
|
||||||
|
|||||||
+3
-3
@@ -78,9 +78,9 @@ public interface LoanWritePlatformService {
|
|||||||
|
|
||||||
LoanTransaction initiateLoanTransfer(Loan loan, LocalDate transferDate);
|
LoanTransaction initiateLoanTransfer(Loan loan, LocalDate transferDate);
|
||||||
|
|
||||||
LoanTransaction withdrawLoanTransfer(final Loan loan, LocalDate transferDate);
|
LoanTransaction withdrawLoanTransfer(Loan loan, LocalDate transferDate);
|
||||||
|
|
||||||
void rejectLoanTransfer(final Loan loan);
|
void rejectLoanTransfer(Loan loan);
|
||||||
|
|
||||||
LoanTransaction acceptLoanTransfer(Loan loan, LocalDate transferDate, Office acceptedInOffice, Staff loanOfficer);
|
LoanTransaction acceptLoanTransfer(Loan loan, LocalDate transferDate, Office acceptedInOffice, Staff loanOfficer);
|
||||||
|
|
||||||
@@ -106,7 +106,7 @@ public interface LoanWritePlatformService {
|
|||||||
|
|
||||||
CommandProcessingResult undoLastLoanDisbursal(Long loanId, JsonCommand command);
|
CommandProcessingResult undoLastLoanDisbursal(Long loanId, JsonCommand command);
|
||||||
|
|
||||||
CommandProcessingResult forecloseLoan(final Long loanId, JsonCommand command);
|
CommandProcessingResult forecloseLoan(Long loanId, JsonCommand command);
|
||||||
|
|
||||||
CommandProcessingResult disburseGLIMLoan(Long loanId, JsonCommand command);
|
CommandProcessingResult disburseGLIMLoan(Long loanId, JsonCommand command);
|
||||||
|
|
||||||
|
|||||||
+87
-87
@@ -22,117 +22,117 @@ import java.math.BigDecimal;
|
|||||||
|
|
||||||
public interface LoanProductConstants {
|
public interface LoanProductConstants {
|
||||||
|
|
||||||
public static final String USE_BORROWER_CYCLE_PARAMETER_NAME = "useBorrowerCycle";
|
String USE_BORROWER_CYCLE_PARAMETER_NAME = "useBorrowerCycle";
|
||||||
|
|
||||||
public static final String PRINCIPAL_VARIATIONS_FOR_BORROWER_CYCLE_PARAMETER_NAME = "principalVariationsForBorrowerCycle";
|
String PRINCIPAL_VARIATIONS_FOR_BORROWER_CYCLE_PARAMETER_NAME = "principalVariationsForBorrowerCycle";
|
||||||
public static final String INTEREST_RATE_VARIATIONS_FOR_BORROWER_CYCLE_PARAMETER_NAME = "interestRateVariationsForBorrowerCycle";
|
String INTEREST_RATE_VARIATIONS_FOR_BORROWER_CYCLE_PARAMETER_NAME = "interestRateVariationsForBorrowerCycle";
|
||||||
public static final String NUMBER_OF_REPAYMENT_VARIATIONS_FOR_BORROWER_CYCLE_PARAMETER_NAME = "numberOfRepaymentVariationsForBorrowerCycle";
|
String NUMBER_OF_REPAYMENT_VARIATIONS_FOR_BORROWER_CYCLE_PARAMETER_NAME = "numberOfRepaymentVariationsForBorrowerCycle";
|
||||||
|
|
||||||
public static final String DEFAULT_VALUE_PARAMETER_NAME = "defaultValue";
|
String DEFAULT_VALUE_PARAMETER_NAME = "defaultValue";
|
||||||
public static final String MIN_VALUE_PARAMETER_NAME = "minValue";
|
String MIN_VALUE_PARAMETER_NAME = "minValue";
|
||||||
public static final String MAX_VALUE_PARAMETER_NAME = "maxValue";
|
String MAX_VALUE_PARAMETER_NAME = "maxValue";
|
||||||
public static final String VALUE_CONDITION_TYPE_PARAM_NAME = "valueConditionType";
|
String VALUE_CONDITION_TYPE_PARAM_NAME = "valueConditionType";
|
||||||
public static final String BORROWER_CYCLE_NUMBER_PARAM_NAME = "borrowerCycleNumber";
|
String BORROWER_CYCLE_NUMBER_PARAM_NAME = "borrowerCycleNumber";
|
||||||
public static final String BORROWER_CYCLE_ID_PARAMETER_NAME = "id";
|
String BORROWER_CYCLE_ID_PARAMETER_NAME = "id";
|
||||||
|
|
||||||
public static final String PRINCIPAL_PER_CYCLE_PARAMETER_NAME = "principalPerCycle";
|
String PRINCIPAL_PER_CYCLE_PARAMETER_NAME = "principalPerCycle";
|
||||||
public static final String MIN_PRINCIPAL_PER_CYCLE_PARAMETER_NAME = "minPrincipalPerCycle";
|
String MIN_PRINCIPAL_PER_CYCLE_PARAMETER_NAME = "minPrincipalPerCycle";
|
||||||
public static final String MAX_PRINCIPAL_PER_CYCLE_PARAMETER_NAME = "maxPrincipalPerCycle";
|
String MAX_PRINCIPAL_PER_CYCLE_PARAMETER_NAME = "maxPrincipalPerCycle";
|
||||||
public static final String PRINCIPAL_VALUE_USAGE_CONDITION_PARAM_NAME = "principalValueUsageCondition";
|
String PRINCIPAL_VALUE_USAGE_CONDITION_PARAM_NAME = "principalValueUsageCondition";
|
||||||
public static final String PRINCIPAL_CYCLE_NUMBERS_PARAM_NAME = "principalCycleNumbers";
|
String PRINCIPAL_CYCLE_NUMBERS_PARAM_NAME = "principalCycleNumbers";
|
||||||
|
|
||||||
public static final String NUMBER_OF_REPAYMENTS_PER_CYCLE_PARAMETER_NAME = "numberOfRepaymentsPerCycle";
|
String NUMBER_OF_REPAYMENTS_PER_CYCLE_PARAMETER_NAME = "numberOfRepaymentsPerCycle";
|
||||||
public static final String MIN_NUMBER_OF_REPAYMENTS_PER_CYCLE_PARAMETER_NAME = "minNumberOfRepaymentsPerCycle";
|
String MIN_NUMBER_OF_REPAYMENTS_PER_CYCLE_PARAMETER_NAME = "minNumberOfRepaymentsPerCycle";
|
||||||
public static final String MAX_NUMBER_OF_REPAYMENTS_PER_CYCLE_PARAMETER_NAME = "maxNumberOfRepaymentsPerCycle";
|
String MAX_NUMBER_OF_REPAYMENTS_PER_CYCLE_PARAMETER_NAME = "maxNumberOfRepaymentsPerCycle";
|
||||||
public static final String REPAYMENT_VALUE_USAGE_CONDITION_PARAM_NAME = "repaymentValueUsageCondition";
|
String REPAYMENT_VALUE_USAGE_CONDITION_PARAM_NAME = "repaymentValueUsageCondition";
|
||||||
public static final String REPAYMENT_CYCLE_NUMBER_PARAM_NAME = "repaymentCycleNumber";
|
String REPAYMENT_CYCLE_NUMBER_PARAM_NAME = "repaymentCycleNumber";
|
||||||
|
|
||||||
public static final String INTEREST_RATE_PER_PERIOD_PER_CYCLE_PARAMETER_NAME = "interestRatePerPeriodPerCycle";
|
String INTEREST_RATE_PER_PERIOD_PER_CYCLE_PARAMETER_NAME = "interestRatePerPeriodPerCycle";
|
||||||
public static final String MIN_INTEREST_RATE_PER_PERIOD_PER_CYCLE_PARAMETER_NAME = "minInterestRatePerPeriodPerCycle";
|
String MIN_INTEREST_RATE_PER_PERIOD_PER_CYCLE_PARAMETER_NAME = "minInterestRatePerPeriodPerCycle";
|
||||||
public static final String MAX_INTEREST_RATE_PER_PERIOD_PER_CYCLE_PARAMETER_NAME = "maxInterestRatePerPeriodPerCycle";
|
String MAX_INTEREST_RATE_PER_PERIOD_PER_CYCLE_PARAMETER_NAME = "maxInterestRatePerPeriodPerCycle";
|
||||||
public static final String INTEREST_RATE_VALUE_USAGE_CONDITION_PARAM_NAME = "interestRateValueUsageCondition";
|
String INTEREST_RATE_VALUE_USAGE_CONDITION_PARAM_NAME = "interestRateValueUsageCondition";
|
||||||
public static final String INTEREST_RATE_CYCLE_NUMBER_PARAM_NAME = "interestRateCycleNumber";
|
String INTEREST_RATE_CYCLE_NUMBER_PARAM_NAME = "interestRateCycleNumber";
|
||||||
|
|
||||||
public static final String PRINCIPAL = "principal";
|
String PRINCIPAL = "principal";
|
||||||
public static final String MIN_PRINCIPAL = "minPrincipal";
|
String MIN_PRINCIPAL = "minPrincipal";
|
||||||
public static final String MAX_PRINCIPAL = "maxPrincipalValue";
|
String MAX_PRINCIPAL = "maxPrincipalValue";
|
||||||
|
|
||||||
public static final String INTEREST_RATE_PER_PERIOD = "interestRatePerPeriod";
|
String INTEREST_RATE_PER_PERIOD = "interestRatePerPeriod";
|
||||||
public static final String MIN_INTEREST_RATE_PER_PERIOD = "minInterestRatePerPeriod";
|
String MIN_INTEREST_RATE_PER_PERIOD = "minInterestRatePerPeriod";
|
||||||
public static final String MAX_INTEREST_RATE_PER_PERIOD = "maxInterestRatePerPeriod";
|
String MAX_INTEREST_RATE_PER_PERIOD = "maxInterestRatePerPeriod";
|
||||||
|
|
||||||
public static final String NUMBER_OF_REPAYMENTS = "numberOfRepayments";
|
String NUMBER_OF_REPAYMENTS = "numberOfRepayments";
|
||||||
public static final String MIN_NUMBER_OF_REPAYMENTS = "minNumberOfRepayments";
|
String MIN_NUMBER_OF_REPAYMENTS = "minNumberOfRepayments";
|
||||||
public static final String MAX_NUMBER_OF_REPAYMENTS = "maxNumberOfRepayments";
|
String MAX_NUMBER_OF_REPAYMENTS = "maxNumberOfRepayments";
|
||||||
|
|
||||||
public static final String VALUE_CONDITION_END_WITH_ERROR = "condition.type.must.end.with.greterthan";
|
String VALUE_CONDITION_END_WITH_ERROR = "condition.type.must.end.with.greterthan";
|
||||||
public static final String VALUE_CONDITION_START_WITH_ERROR = "condition.type.must.start.with.equal";
|
String VALUE_CONDITION_START_WITH_ERROR = "condition.type.must.start.with.equal";
|
||||||
public static final String SHORT_NAME = "shortName";
|
String SHORT_NAME = "shortName";
|
||||||
|
|
||||||
public static final String MULTI_DISBURSE_LOAN_PARAMETER_NAME = "multiDisburseLoan";
|
String MULTI_DISBURSE_LOAN_PARAMETER_NAME = "multiDisburseLoan";
|
||||||
public static final String MAX_TRANCHE_COUNT_PARAMETER_NAME = "maxTrancheCount";
|
String MAX_TRANCHE_COUNT_PARAMETER_NAME = "maxTrancheCount";
|
||||||
public static final String OUTSTANDING_LOAN_BALANCE_PARAMETER_NAME = "outstandingLoanBalance";
|
String OUTSTANDING_LOAN_BALANCE_PARAMETER_NAME = "outstandingLoanBalance";
|
||||||
|
|
||||||
public static final String GRACE_ON_ARREARS_AGEING_PARAMETER_NAME = "graceOnArrearsAgeing";
|
String GRACE_ON_ARREARS_AGEING_PARAMETER_NAME = "graceOnArrearsAgeing";
|
||||||
public static final String OVERDUE_DAYS_FOR_NPA_PARAMETER_NAME = "overdueDaysForNPA";
|
String OVERDUE_DAYS_FOR_NPA_PARAMETER_NAME = "overdueDaysForNPA";
|
||||||
public static final String MINIMUM_DAYS_BETWEEN_DISBURSAL_AND_FIRST_REPAYMENT = "minimumDaysBetweenDisbursalAndFirstRepayment";
|
String MINIMUM_DAYS_BETWEEN_DISBURSAL_AND_FIRST_REPAYMENT = "minimumDaysBetweenDisbursalAndFirstRepayment";
|
||||||
public static final String ACCOUNT_MOVES_OUT_OF_NPA_ONLY_ON_ARREARS_COMPLETION_PARAM_NAME = "accountMovesOutOfNPAOnlyOnArrearsCompletion";
|
String ACCOUNT_MOVES_OUT_OF_NPA_ONLY_ON_ARREARS_COMPLETION_PARAM_NAME = "accountMovesOutOfNPAOnlyOnArrearsCompletion";
|
||||||
|
|
||||||
// Interest recalculation related
|
// Interest recalculation related
|
||||||
public static final String IS_INTEREST_RECALCULATION_ENABLED_PARAMETER_NAME = "isInterestRecalculationEnabled";
|
String IS_INTEREST_RECALCULATION_ENABLED_PARAMETER_NAME = "isInterestRecalculationEnabled";
|
||||||
public static final String DAYS_IN_YEAR_TYPE_PARAMETER_NAME = "daysInYearType";
|
String DAYS_IN_YEAR_TYPE_PARAMETER_NAME = "daysInYearType";
|
||||||
public static final String DAYS_IN_MONTH_TYPE_PARAMETER_NAME = "daysInMonthType";
|
String DAYS_IN_MONTH_TYPE_PARAMETER_NAME = "daysInMonthType";
|
||||||
public static final String interestRecalculationCompoundingMethodParameterName = "interestRecalculationCompoundingMethod";
|
String interestRecalculationCompoundingMethodParameterName = "interestRecalculationCompoundingMethod";
|
||||||
public static final String rescheduleStrategyMethodParameterName = "rescheduleStrategyMethod";
|
String rescheduleStrategyMethodParameterName = "rescheduleStrategyMethod";
|
||||||
public static final String recalculationRestFrequencyTypeParameterName = "recalculationRestFrequencyType";
|
String recalculationRestFrequencyTypeParameterName = "recalculationRestFrequencyType";
|
||||||
public static final String recalculationRestFrequencyIntervalParameterName = "recalculationRestFrequencyInterval";
|
String recalculationRestFrequencyIntervalParameterName = "recalculationRestFrequencyInterval";
|
||||||
public static final String recalculationRestFrequencyWeekdayParamName = "recalculationRestFrequencyDayOfWeekType";
|
String recalculationRestFrequencyWeekdayParamName = "recalculationRestFrequencyDayOfWeekType";
|
||||||
public static final String recalculationRestFrequencyNthDayParamName = "recalculationRestFrequencyNthDayType";
|
String recalculationRestFrequencyNthDayParamName = "recalculationRestFrequencyNthDayType";
|
||||||
public static final String recalculationRestFrequencyOnDayParamName = "recalculationRestFrequencyOnDayType";
|
String recalculationRestFrequencyOnDayParamName = "recalculationRestFrequencyOnDayType";
|
||||||
public static final String isArrearsBasedOnOriginalScheduleParamName = "isArrearsBasedOnOriginalSchedule";
|
String isArrearsBasedOnOriginalScheduleParamName = "isArrearsBasedOnOriginalSchedule";
|
||||||
public static final String preClosureInterestCalculationStrategyParamName = "preClosureInterestCalculationStrategy";
|
String preClosureInterestCalculationStrategyParamName = "preClosureInterestCalculationStrategy";
|
||||||
public static final String recalculationCompoundingFrequencyTypeParameterName = "recalculationCompoundingFrequencyType";
|
String recalculationCompoundingFrequencyTypeParameterName = "recalculationCompoundingFrequencyType";
|
||||||
public static final String recalculationCompoundingFrequencyIntervalParameterName = "recalculationCompoundingFrequencyInterval";
|
String recalculationCompoundingFrequencyIntervalParameterName = "recalculationCompoundingFrequencyInterval";
|
||||||
public static final String recalculationCompoundingFrequencyWeekdayParamName = "recalculationCompoundingFrequencyDayOfWeekType";
|
String recalculationCompoundingFrequencyWeekdayParamName = "recalculationCompoundingFrequencyDayOfWeekType";
|
||||||
public static final String recalculationCompoundingFrequencyNthDayParamName = "recalculationCompoundingFrequencyNthDayType";
|
String recalculationCompoundingFrequencyNthDayParamName = "recalculationCompoundingFrequencyNthDayType";
|
||||||
public static final String recalculationCompoundingFrequencyOnDayParamName = "recalculationCompoundingFrequencyOnDayType";
|
String recalculationCompoundingFrequencyOnDayParamName = "recalculationCompoundingFrequencyOnDayType";
|
||||||
public static final String isCompoundingToBePostedAsTransactionParamName = "isCompoundingToBePostedAsTransaction";
|
String isCompoundingToBePostedAsTransactionParamName = "isCompoundingToBePostedAsTransaction";
|
||||||
|
|
||||||
// Guarantee related
|
// Guarantee related
|
||||||
public static final String holdGuaranteeFundsParamName = "holdGuaranteeFunds";
|
String holdGuaranteeFundsParamName = "holdGuaranteeFunds";
|
||||||
public static final String mandatoryGuaranteeParamName = "mandatoryGuarantee";
|
String mandatoryGuaranteeParamName = "mandatoryGuarantee";
|
||||||
public static final String minimumGuaranteeFromOwnFundsParamName = "minimumGuaranteeFromOwnFunds";
|
String minimumGuaranteeFromOwnFundsParamName = "minimumGuaranteeFromOwnFunds";
|
||||||
public static final String minimumGuaranteeFromGuarantorParamName = "minimumGuaranteeFromGuarantor";
|
String minimumGuaranteeFromGuarantorParamName = "minimumGuaranteeFromGuarantor";
|
||||||
|
|
||||||
public static final String principalThresholdForLastInstallmentParamName = "principalThresholdForLastInstallment";
|
String principalThresholdForLastInstallmentParamName = "principalThresholdForLastInstallment";
|
||||||
public static final BigDecimal DEFAULT_PRINCIPAL_THRESHOLD_FOR_MULTI_DISBURSE_LOAN = BigDecimal.valueOf(50);
|
BigDecimal DEFAULT_PRINCIPAL_THRESHOLD_FOR_MULTI_DISBURSE_LOAN = BigDecimal.valueOf(50);
|
||||||
public static final BigDecimal DEFAULT_PRINCIPAL_THRESHOLD_FOR_SINGLE_DISBURSE_LOAN = BigDecimal.valueOf(0);
|
BigDecimal DEFAULT_PRINCIPAL_THRESHOLD_FOR_SINGLE_DISBURSE_LOAN = BigDecimal.valueOf(0);
|
||||||
// Fixed installment configuration related
|
// Fixed installment configuration related
|
||||||
public static final String canDefineEmiAmountParamName = "canDefineInstallmentAmount";
|
String canDefineEmiAmountParamName = "canDefineInstallmentAmount";
|
||||||
public static final String installmentAmountInMultiplesOfParamName = "installmentAmountInMultiplesOf";
|
String installmentAmountInMultiplesOfParamName = "installmentAmountInMultiplesOf";
|
||||||
|
|
||||||
// Loan Configurable Attributes
|
// Loan Configurable Attributes
|
||||||
public static final String allowAttributeOverridesParamName = "allowAttributeOverrides";
|
String allowAttributeOverridesParamName = "allowAttributeOverrides";
|
||||||
public static final String amortizationTypeParamName = "amortizationType";
|
String amortizationTypeParamName = "amortizationType";
|
||||||
public static final String interestTypeParamName = "interestType";
|
String interestTypeParamName = "interestType";
|
||||||
public static final String transactionProcessingStrategyIdParamName = "transactionProcessingStrategyId";
|
String transactionProcessingStrategyIdParamName = "transactionProcessingStrategyId";
|
||||||
public static final String interestCalculationPeriodTypeParamName = "interestCalculationPeriodType";
|
String interestCalculationPeriodTypeParamName = "interestCalculationPeriodType";
|
||||||
public static final String inArrearsToleranceParamName = "inArrearsTolerance";
|
String inArrearsToleranceParamName = "inArrearsTolerance";
|
||||||
public static final String repaymentEveryParamName = "repaymentEvery";
|
String repaymentEveryParamName = "repaymentEvery";
|
||||||
public static final String graceOnPrincipalAndInterestPaymentParamName = "graceOnPrincipalAndInterestPayment";
|
String graceOnPrincipalAndInterestPaymentParamName = "graceOnPrincipalAndInterestPayment";
|
||||||
public static final String allowCompoundingOnEodParamName = "allowCompoundingOnEod";
|
String allowCompoundingOnEodParamName = "allowCompoundingOnEod";
|
||||||
|
|
||||||
// Variable Installments Settings
|
// Variable Installments Settings
|
||||||
public static final String allowVariableInstallmentsParamName = "allowVariableInstallments";
|
String allowVariableInstallmentsParamName = "allowVariableInstallments";
|
||||||
public static final String minimumGapBetweenInstallments = "minimumGap";
|
String minimumGapBetweenInstallments = "minimumGap";
|
||||||
public static final String maximumGapBetweenInstallments = "maximumGap";
|
String maximumGapBetweenInstallments = "maximumGap";
|
||||||
|
|
||||||
public static final String ALLOW_PARTIAL_PERIOD_INTEREST_CALCUALTION_PARAM_NAME = "allowPartialPeriodInterestCalcualtion";
|
String ALLOW_PARTIAL_PERIOD_INTEREST_CALCUALTION_PARAM_NAME = "allowPartialPeriodInterestCalcualtion";
|
||||||
|
|
||||||
public static final String CAN_USE_FOR_TOPUP = "canUseForTopup";
|
String CAN_USE_FOR_TOPUP = "canUseForTopup";
|
||||||
|
|
||||||
public static final String IS_EQUAL_AMORTIZATION_PARAM = "isEqualAmortization";
|
String IS_EQUAL_AMORTIZATION_PARAM = "isEqualAmortization";
|
||||||
|
|
||||||
public static final String RATES_PARAM_NAME = "rates";
|
String RATES_PARAM_NAME = "rates";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -27,7 +27,7 @@ public enum AmortizationMethod {
|
|||||||
private final Integer value;
|
private final Integer value;
|
||||||
private final String code;
|
private final String code;
|
||||||
|
|
||||||
private AmortizationMethod(final Integer value, final String code) {
|
AmortizationMethod(final Integer value, final String code) {
|
||||||
this.value = value;
|
this.value = value;
|
||||||
this.code = code;
|
this.code = code;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -27,7 +27,7 @@ public enum InterestCalculationPeriodMethod {
|
|||||||
private final Integer value;
|
private final Integer value;
|
||||||
private final String code;
|
private final String code;
|
||||||
|
|
||||||
private InterestCalculationPeriodMethod(final Integer value, final String code) {
|
InterestCalculationPeriodMethod(final Integer value, final String code) {
|
||||||
this.value = value;
|
this.value = value;
|
||||||
this.code = code;
|
this.code = code;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -25,7 +25,7 @@ public enum InterestMethod {
|
|||||||
private final Integer value;
|
private final Integer value;
|
||||||
private final String code;
|
private final String code;
|
||||||
|
|
||||||
private InterestMethod(final Integer value, final String code) {
|
InterestMethod(final Integer value, final String code) {
|
||||||
this.value = value;
|
this.value = value;
|
||||||
this.code = code;
|
this.code = code;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -53,7 +53,7 @@ public enum InterestRecalculationCompoundingMethod {
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
private InterestRecalculationCompoundingMethod(final Integer value, final String code) {
|
InterestRecalculationCompoundingMethod(final Integer value, final String code) {
|
||||||
this.value = value;
|
this.value = value;
|
||||||
this.code = code;
|
this.code = code;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -57,7 +57,7 @@ public enum InterestRecalculationPeriodMethod {
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
private InterestRecalculationPeriodMethod(final Integer value, final String code) {
|
InterestRecalculationPeriodMethod(final Integer value, final String code) {
|
||||||
this.value = value;
|
this.value = value;
|
||||||
this.code = code;
|
this.code = code;
|
||||||
}
|
}
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user