You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by vo...@apache.org on 2020/12/02 06:28:24 UTC
[fineract] branch develop updated: fix-creditBureau-configuration
(FINERACT-1169)
This is an automated email from the ASF dual-hosted git repository.
vorburger pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
The following commit(s) were added to refs/heads/develop by this push:
new 16dec03 fix-creditBureau-configuration (FINERACT-1169)
16dec03 is described below
commit 16dec039686644869ec93fdcbfc87073dc1a3e5b
Author: rrpawar96 <rr...@gmail.com>
AuthorDate: Sat Aug 29 04:08:14 2020 +0530
fix-creditBureau-configuration (FINERACT-1169)
---
.../data/CreditBureauLoanProductMappingData.java | 2 +-
.../domain/CreditBureauLoanProductMapping.java | 20 ++++++++++----------
.../CreditBureauCommandFromApiJsonDeserializer.java | 14 +++++++-------
...eauLoanProductCommandFromApiJsonDeserializer.java | 18 +++++++++---------
...eauLoanProductMappingReadPlatformServiceImpl.java | 6 +++---
...auLoanProductMappingWritePlatformServiceImpl.java | 4 ++--
...anisationCreditBureauReadPlatformServiceImpl.java | 6 +++---
...isationCreditBureauWritePlatflormServiceImpl.java | 4 ++--
8 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/data/CreditBureauLoanProductMappingData.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/data/CreditBureauLoanProductMappingData.java
index 152adaa..e288421 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/data/CreditBureauLoanProductMappingData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/data/CreditBureauLoanProductMappingData.java
@@ -104,7 +104,7 @@ public final class CreditBureauLoanProductMappingData {
return this.stalePeriod;
}
- public boolean isisActive() {
+ public boolean isActive() {
return this.isActive;
}
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/domain/CreditBureauLoanProductMapping.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/domain/CreditBureauLoanProductMapping.java
index 57caf94..41b4de8 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/domain/CreditBureauLoanProductMapping.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/domain/CreditBureauLoanProductMapping.java
@@ -42,7 +42,7 @@ public class CreditBureauLoanProductMapping extends AbstractPersistableCustom {
@Column(name = "stale_Period")
private int stalePeriod;
- private boolean is_active;
+ private boolean isActive;
@ManyToOne
private OrganisationCreditBureau organisation_creditbureau;
@@ -56,11 +56,11 @@ public class CreditBureauLoanProductMapping extends AbstractPersistableCustom {
}
public CreditBureauLoanProductMapping(boolean isCreditCheckMandatory, boolean skipCreditCheckInFailure, int stalePeriod,
- boolean is_active, OrganisationCreditBureau organisationCreditbureau, LoanProduct loanProduct) {
+ boolean isActive, OrganisationCreditBureau organisationCreditbureau, LoanProduct loanProduct) {
this.isCreditCheckMandatory = isCreditCheckMandatory;
this.skipCreditCheckInFailure = skipCreditCheckInFailure;
this.stalePeriod = stalePeriod;
- this.is_active = is_active;
+ this.isActive = isActive;
this.organisation_creditbureau = organisationCreditbureau;
this.loanProduct = loanProduct;
}
@@ -70,7 +70,7 @@ public class CreditBureauLoanProductMapping extends AbstractPersistableCustom {
Boolean isCreditCheckMandatory = false;
Boolean skipCreditCheckInFailure = false;
Integer stalePeriod = -1;
- Boolean is_active = false;
+ Boolean isActive = false;
if ((Boolean) command.booleanPrimitiveValueOfParameterNamed("isCreditcheckMandatory") != null) {
isCreditCheckMandatory = command.booleanPrimitiveValueOfParameterNamed("isCreditcheckMandatory");
}
@@ -83,11 +83,11 @@ public class CreditBureauLoanProductMapping extends AbstractPersistableCustom {
stalePeriod = command.integerValueOfParameterNamed("stalePeriod");
}
- if ((Boolean) command.booleanPrimitiveValueOfParameterNamed("is_active")) {
- is_active = command.booleanPrimitiveValueOfParameterNamed("is_active");
+ if ((Boolean) command.booleanPrimitiveValueOfParameterNamed("isActive")) {
+ isActive = command.booleanPrimitiveValueOfParameterNamed("isActive");
}
- return new CreditBureauLoanProductMapping(isCreditCheckMandatory, skipCreditCheckInFailure, stalePeriod, is_active,
+ return new CreditBureauLoanProductMapping(isCreditCheckMandatory, skipCreditCheckInFailure, stalePeriod, isActive,
organisation_creditbureau, loanProduct);
}
@@ -117,11 +117,11 @@ public class CreditBureauLoanProductMapping extends AbstractPersistableCustom {
}
public boolean isIs_active() {
- return this.is_active;
+ return this.isActive;
}
- public void setIs_active(boolean is_active) {
- this.is_active = is_active;
+ public void setIs_active(boolean isActive) {
+ this.isActive = isActive;
}
public OrganisationCreditBureau getOrganisationCreditbureau() {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/serialization/CreditBureauCommandFromApiJsonDeserializer.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/serialization/CreditBureauCommandFromApiJsonDeserializer.java
index da55faf..cd1907d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/serialization/CreditBureauCommandFromApiJsonDeserializer.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/serialization/CreditBureauCommandFromApiJsonDeserializer.java
@@ -39,7 +39,7 @@ import org.springframework.stereotype.Component;
@Component
public class CreditBureauCommandFromApiJsonDeserializer {
- private final Set<String> supportedParameters = new HashSet<>(Arrays.asList("alias", "is_active", "creditBureauId"));
+ private final Set<String> supportedParameters = new HashSet<>(Arrays.asList("alias", "isActive", "creditBureauId"));
private final FromJsonHelper fromApiJsonHelper;
@@ -66,10 +66,10 @@ public class CreditBureauCommandFromApiJsonDeserializer {
final String alias = this.fromApiJsonHelper.extractStringNamed("alias", element);
baseDataValidator.reset().parameter("alias").value(alias).notNull().notBlank().notExceedingLengthOf(100);
- final String is_activeParameter = "is_active";
+ final String is_activeParameter = "isActive";
if (this.fromApiJsonHelper.parameterExists(is_activeParameter, element)) {
- final boolean is_active = this.fromApiJsonHelper.extractBooleanNamed("is_active", element);
- baseDataValidator.reset().parameter("is_active").value(is_active).notNull().notBlank().trueOrFalseRequired(is_active);
+ final boolean isActive = this.fromApiJsonHelper.extractBooleanNamed("isActive", element);
+ baseDataValidator.reset().parameter("isActive").value(isActive).notNull().notBlank().trueOrFalseRequired(isActive);
}
throwExceptionIfValidationWarningsExist(dataValidationErrors);
@@ -94,10 +94,10 @@ public class CreditBureauCommandFromApiJsonDeserializer {
baseDataValidator.reset().parameter("creditBureauId").value(creditBureauId).notNull().notBlank().longGreaterThanZero();
}
- final String is_activeParameter = "is_active";
+ final String is_activeParameter = "isActive";
if (this.fromApiJsonHelper.parameterExists(is_activeParameter, element)) {
- final boolean is_active = this.fromApiJsonHelper.extractBooleanNamed("is_active", element);
- baseDataValidator.reset().parameter("is_active").value(is_active).notNull().notBlank().trueOrFalseRequired(is_active);
+ final boolean isActive = this.fromApiJsonHelper.extractBooleanNamed("isActive", element);
+ baseDataValidator.reset().parameter("isActive").value(isActive).notNull().notBlank().trueOrFalseRequired(isActive);
}
throwExceptionIfValidationWarningsExist(dataValidationErrors);
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/serialization/CreditBureauLoanProductCommandFromApiJsonDeserializer.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/serialization/CreditBureauLoanProductCommandFromApiJsonDeserializer.java
index 94032f1..bd3176a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/serialization/CreditBureauLoanProductCommandFromApiJsonDeserializer.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/serialization/CreditBureauLoanProductCommandFromApiJsonDeserializer.java
@@ -40,7 +40,7 @@ import org.springframework.stereotype.Component;
public class CreditBureauLoanProductCommandFromApiJsonDeserializer {
private final Set<String> supportedParameters = new HashSet<>(Arrays.asList("loanProductId", "isCreditcheckMandatory",
- "skipCreditcheckInFailure", "stalePeriod", "is_active", "locale", "creditbureauLoanProductMappingId"));
+ "skipCreditcheckInFailure", "stalePeriod", "isActive", "locale", "creditbureauLoanProductMappingId"));
private final FromJsonHelper fromApiJsonHelper;
@@ -97,13 +97,13 @@ public class CreditBureauLoanProductCommandFromApiJsonDeserializer {
.notBlank().integerGreaterThanZero();
}
- if (this.fromApiJsonHelper.extractBooleanNamed("is_active", element) != null) {
- Boolean is_active = this.fromApiJsonHelper.extractBooleanNamed("is_active", element);
- if (is_active == null) {
- is_active = false;
+ if (this.fromApiJsonHelper.extractBooleanNamed("isActive", element) != null) {
+ Boolean isActive = this.fromApiJsonHelper.extractBooleanNamed("isActive", element);
+ if (isActive == null) {
+ isActive = false;
} else {
- baseDataValidator.reset().parameter("is_active").value(is_active).notBlank().trueOrFalseRequired(is_active);
+ baseDataValidator.reset().parameter("isActive").value(isActive).notBlank().trueOrFalseRequired(isActive);
}
}
@@ -133,10 +133,10 @@ public class CreditBureauLoanProductCommandFromApiJsonDeserializer {
.notBlank().longGreaterThanZero();
}
- final String is_activeParameter = "is_active";
+ final String is_activeParameter = "isActive";
if (this.fromApiJsonHelper.parameterExists(is_activeParameter, element)) {
- final boolean is_active = this.fromApiJsonHelper.extractBooleanNamed("is_active", element);
- baseDataValidator.reset().parameter("is_active").value(is_active).notNull().notBlank().trueOrFalseRequired(is_active);
+ final boolean isActive = this.fromApiJsonHelper.extractBooleanNamed("isActive", element);
+ baseDataValidator.reset().parameter("isActive").value(isActive).notNull().notBlank().trueOrFalseRequired(isActive);
}
throwExceptionIfValidationWarningsExist(dataValidationErrors);
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditBureauLoanProductMappingReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditBureauLoanProductMappingReadPlatformServiceImpl.java
index 7ec5544..06ce1ca 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditBureauLoanProductMappingReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditBureauLoanProductMappingReadPlatformServiceImpl.java
@@ -48,7 +48,7 @@ public class CreditBureauLoanProductMappingReadPlatformServiceImpl implements Cr
return "cblp.id as mappingId, cblp.organisation_creditbureau_id as orgcbId,"
+ "orgcb.alias as alias,concat( cb.product,' - ' ,cb.name,' - ',cb.country) as creditbureau,"
+ "cblp.loan_product_id as lpId,lp.name as loan_product_name,cblp.is_creditcheck_mandatory as crCheck,cblp.skip_creditcheck_in_failure as skipcheck,"
- + "cblp.stale_period as staleperiod,cblp.is_active as is_active from"
+ + "cblp.stale_period as staleperiod,cblp.isActive as isActive from"
+ " m_creditbureau_loanproduct_mapping cblp, m_organisation_creditbureau orgcb,m_product_loan lp,m_creditbureau cb"
+ " where cblp.organisation_creditbureau_id=orgcb.id and cblp.loan_product_id=lp.id and orgcb.creditbureau_id=cb.id";
}
@@ -65,10 +65,10 @@ public class CreditBureauLoanProductMappingReadPlatformServiceImpl implements Cr
final boolean is_creditcheck_mandatory = rs.getBoolean("crCheck");
final boolean skip_credit_check_in_failure = rs.getBoolean("skipcheck");
final int stale_period = rs.getInt("staleperiod");
- final boolean is_active = rs.getBoolean("is_active");
+ final boolean isActive = rs.getBoolean("isActive");
return CreditBureauLoanProductMappingData.instance(mapping_id, orgcbID, alias, credit_bureau_name, loan_product_name, lpId,
- is_creditcheck_mandatory, skip_credit_check_in_failure, stale_period, is_active);
+ is_creditcheck_mandatory, skip_credit_check_in_failure, stale_period, isActive);
}
}
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditBureauLoanProductMappingWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditBureauLoanProductMappingWritePlatformServiceImpl.java
index 03ce849..edef2fc 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditBureauLoanProductMappingWritePlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditBureauLoanProductMappingWritePlatformServiceImpl.java
@@ -87,9 +87,9 @@ public class CreditBureauLoanProductMappingWritePlatformServiceImpl implements C
this.fromApiJsonDeserializer.validateForUpdate(command.json());
final Long mappingid = command.longValueOfParameterNamed("creditbureauLoanProductMappingId");
- final boolean is_active = command.booleanPrimitiveValueOfParameterNamed("is_active");
+ final boolean isActive = command.booleanPrimitiveValueOfParameterNamed("isActive");
final CreditBureauLoanProductMapping cblpmapping = this.creditBureauLoanProductMappingRepository.getOne(mappingid);
- cblpmapping.setIs_active(is_active);
+ cblpmapping.setIs_active(isActive);
this.creditBureauLoanProductMappingRepository.saveAndFlush(cblpmapping);
return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(cblpmapping.getId()).build();
}
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/OrganisationCreditBureauReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/OrganisationCreditBureauReadPlatformServiceImpl.java
index f2e225c..a65962c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/OrganisationCreditBureauReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/OrganisationCreditBureauReadPlatformServiceImpl.java
@@ -46,7 +46,7 @@ public class OrganisationCreditBureauReadPlatformServiceImpl implements Organisa
public String schema() {
return "ocb.id as orgCbId,ocb.alias as orgCbAlias,cb.name as creditbureauName,cb.product as creditbureauProduct,cb.country as creditbureauCountry,"
+ "concat(cb.product,' - ',cb.name,' - ',cb.country) as CreditBureauSummary,"
- + "ocb.creditbureau_id as cbid,ocb.is_active as is_active"
+ + "ocb.creditbureau_id as cbid,ocb.isActive as isActive"
+ " from m_organisation_creditbureau ocb,m_creditbureau cb where ocb.creditbureau_id=cb.id";
}
@@ -60,10 +60,10 @@ public class OrganisationCreditBureauReadPlatformServiceImpl implements Organisa
final String creditbureauCountry = rs.getString("creditbureauCountry");
final String CreditBureauSummary = rs.getString("CreditBureauSummary");
final long cbid = rs.getLong("cbid");
- final boolean is_active = rs.getBoolean("is_active");
+ final boolean isActive = rs.getBoolean("isActive");
return OrganisationCreditBureauData.instance(orgCbId, orgCbAlias, cbid, creditbureauName, creditbureauProduct,
- creditbureauCountry, CreditBureauSummary, is_active);
+ creditbureauCountry, CreditBureauSummary, isActive);
}
}
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/OrganisationCreditBureauWritePlatflormServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/OrganisationCreditBureauWritePlatflormServiceImpl.java
index d73070c..f17dc20 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/OrganisationCreditBureauWritePlatflormServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/OrganisationCreditBureauWritePlatflormServiceImpl.java
@@ -76,11 +76,11 @@ public class OrganisationCreditBureauWritePlatflormServiceImpl implements Organi
final long creditbureauID = command.longValueOfParameterNamed("creditBureauId");
- final boolean is_active = command.booleanPrimitiveValueOfParameterNamed("is_active");
+ final boolean isActive = command.booleanPrimitiveValueOfParameterNamed("isActive");
final OrganisationCreditBureau orgcb = organisationCreditBureauRepository.getOne(creditbureauID);
- orgcb.setIsActive(is_active);
+ orgcb.setIsActive(isActive);
organisationCreditBureauRepository.saveAndFlush(orgcb);