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

mysql data type changes and provisiong update validation changes

Browse Source
This commit is contained in:
unknown
2016-02-09 18:17:56 +05:30
parent 06fd26b896
commit bb4799f583
2 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/data/ResultsetColumnHeaderData.java
+16 -1
View File
@@ -29,7 +29,7 @@ import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityEx
public final class ResultsetColumnHeaderData { public final class ResultsetColumnHeaderData {
private final String columnName; private final String columnName;
private final String columnType; private String columnType;
private final Long columnLength; private final Long columnLength;
private final String columnDisplayType; private final String columnDisplayType;
private final boolean isColumnNullable; private final boolean isColumnNullable;
@@ -68,6 +68,21 @@ public final class ResultsetColumnHeaderData {
this.columnValues = columnValues; this.columnValues = columnValues;
this.columnCode = columnCode; this.columnCode = columnCode;
if("NEWDECIMAL".equalsIgnoreCase(this.columnType)) {
this.columnType = "DECIMAL" ;
//Refer org.drizzle.jdbc.internal.mysql.MySQLType.java
}
if("CLOB".equalsIgnoreCase(this.columnType)) {
this.columnType = "varchar" ;
//Drizzle is returning some of the String data a CLOB
}
if("LONGLONG".equalsIgnoreCase(this.columnType) || "LONG".equalsIgnoreCase(this.columnType)) {
this.columnType = "bigint" ;
//Refer org.drizzle.jdbc.internal.mysql.MySQLType.java
}
String displayType = null; String displayType = null;
if (this.columnCode == null) { if (this.columnCode == null) {
if (isString()) { if (isString()) {
fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCriteriaWritePlatformServiceJpaRepositoryImpl.java
+21 -13
View File
@@ -104,19 +104,23 @@ public class ProvisioningCriteriaWritePlatformServiceJpaRepositoryImpl implement
@Override @Override
public CommandProcessingResult updateProvisioningCriteria(final Long criteriaId, JsonCommand command) { public CommandProcessingResult updateProvisioningCriteria(final Long criteriaId, JsonCommand command) {
this.fromApiJsonDeserializer.validateForUpdate(command.json()); try {
ProvisioningCriteria provisioningCriteria = provisioningCriteriaRepository.findOne(criteriaId) ; this.fromApiJsonDeserializer.validateForUpdate(command.json());
if(provisioningCriteria == null) { ProvisioningCriteria provisioningCriteria = provisioningCriteriaRepository.findOne(criteriaId) ;
throw new ProvisioningCategoryNotFoundException(criteriaId) ; if(provisioningCriteria == null) {
throw new ProvisioningCategoryNotFoundException(criteriaId) ;
}
List<LoanProduct> products = this.provisioningCriteriaAssembler.parseLoanProducts(command.parsedJson()) ;
final Map<String, Object> changes = provisioningCriteria.update(command, products) ;
if(!changes.isEmpty()) {
updateProvisioningCriteriaDefinitions(provisioningCriteria, command) ;
provisioningCriteriaRepository.save(provisioningCriteria) ;
}
return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(provisioningCriteria.getId()).build();
} catch (final DataIntegrityViolationException dve) {
handleDataIntegrityIssues(command, dve);
return CommandProcessingResult.empty();
} }
List<LoanProduct> products = this.provisioningCriteriaAssembler.parseLoanProducts(command.parsedJson()) ;
final Map<String, Object> changes = provisioningCriteria.update(command, products) ;
if(!changes.isEmpty()) {
updateProvisioningCriteriaDefinitions(provisioningCriteria, command) ;
provisioningCriteriaRepository.save(provisioningCriteria) ;
}
return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(provisioningCriteria.getId()).build();
} }
private void updateProvisioningCriteriaDefinitions(ProvisioningCriteria provisioningCriteria, JsonCommand command) { private void updateProvisioningCriteriaDefinitions(ProvisioningCriteria provisioningCriteria, JsonCommand command) {
@@ -156,7 +160,11 @@ public class ProvisioningCriteriaWritePlatformServiceJpaRepositoryImpl implement
final String name = command.stringValueOfParameterNamed("criteria_name"); final String name = command.stringValueOfParameterNamed("criteria_name");
throw new PlatformDataIntegrityException("error.msg.provisioning.duplicate.criterianame", "Provisioning Criteria with name `" throw new PlatformDataIntegrityException("error.msg.provisioning.duplicate.criterianame", "Provisioning Criteria with name `"
+ name + "` already exists", "category name", name); + name + "` already exists", "category name", name);
} }else if (realCause.getMessage().contains("product_id")) {
throw new PlatformDataIntegrityException(
"error.msg.provisioning.product.id(s).already.associated.existing.criteria",
"The selected products already associated with another Provisioning Criteria");
}
logger.error(dve.getMessage(), dve); logger.error(dve.getMessage(), dve);
throw new PlatformDataIntegrityException("error.msg.provisioning.unknown.data.integrity.issue", throw new PlatformDataIntegrityException("error.msg.provisioning.unknown.data.integrity.issue",
"Unknown data integrity issue with resource: " + realCause.getMessage()); "Unknown data integrity issue with resource: " + realCause.getMessage());