From 040c33d6089b05df71d147a6ec239ceb132ad081 Mon Sep 17 00:00:00 2001 From: Madhukar Date: Sat, 23 Feb 2013 12:19:15 +0530 Subject: [PATCH] Fixing validations for update deposit products --- api-docs/apiLive.htm | 4 ++-- ...sitProductCommandFromApiJsonDeserializer.java | 16 ++++++++-------- .../DepositProductReadPlatformServiceImpl.java | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/api-docs/apiLive.htm b/api-docs/apiLive.htm index 861bc41ea..2b85eda6e 100644 --- a/api-docs/apiLive.htm +++ b/api-docs/apiLive.htm @@ -7030,10 +7030,10 @@ Request Body:
-DELETE https://Domain Name/api/v1/savingproducts/{productId} +DELETE https://Domain Name/api/v1/depositproducts/{productId} -DELETE savingproducts/1 +DELETE depositproducts/1 Content-Type: application/json { "resourceId": 1 } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savingsdepositproduct/serialization/DepositProductCommandFromApiJsonDeserializer.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savingsdepositproduct/serialization/DepositProductCommandFromApiJsonDeserializer.java index 0033e0bee..4d5bbbc02 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savingsdepositproduct/serialization/DepositProductCommandFromApiJsonDeserializer.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savingsdepositproduct/serialization/DepositProductCommandFromApiJsonDeserializer.java @@ -145,16 +145,16 @@ public final class DepositProductCommandFromApiJsonDeserializer { final JsonElement element = fromApiJsonHelper.parse(json); final String name = fromApiJsonHelper.extractStringNamed("name", element); - baseDataValidator.reset().parameter("name").value(name).notBlank().ignoreIfNull().notExceedingLengthOf(100); + baseDataValidator.reset().parameter("name").value(name).ignoreIfNull().notBlank().notExceedingLengthOf(100); final String externalId = fromApiJsonHelper.extractStringNamed("externalId", element); baseDataValidator.reset().parameter("externalId").value(externalId).ignoreIfNull().notExceedingLengthOf(100); final String description = fromApiJsonHelper.extractStringNamed("description", element); - baseDataValidator.reset().parameter("description").value(description).notExceedingLengthOf(500); + baseDataValidator.reset().parameter("description").value(description).ignoreIfNull().notExceedingLengthOf(500); final String currencyCode = fromApiJsonHelper.extractStringNamed("currencyCode", element); - baseDataValidator.reset().parameter("currencyCode").value(currencyCode).notBlank(); + baseDataValidator.reset().parameter("currencyCode").value(currencyCode).ignoreIfNull().notBlank(); final Integer digitsAfterDecimal = fromApiJsonHelper.extractIntegerNamed("digitsAfterDecimal", element, Locale.getDefault()); baseDataValidator.reset().parameter("digitsAfterDecimal").value(digitsAfterDecimal).ignoreIfNull().inMinMaxRange(0, 6); @@ -163,7 +163,7 @@ public final class DepositProductCommandFromApiJsonDeserializer { baseDataValidator.reset().parameter("minimumBalance").value(minimumBalance).ignoreIfNull().zeroOrPositiveAmount(); final BigDecimal maximumBalance = fromApiJsonHelper.extractBigDecimalWithLocaleNamed("maximumBalance", element); - baseDataValidator.reset().parameter("maximumBalance").value(maximumBalance).zeroOrPositiveAmount(); + baseDataValidator.reset().parameter("maximumBalance").value(maximumBalance).ignoreIfNull().zeroOrPositiveAmount(); baseDataValidator.reset().parameter("minimumBalance").comapareMinimumAndMaximumAmounts(minimumBalance, maximumBalance); final Integer tenureInMonths = fromApiJsonHelper.extractIntegerNamed("tenureInMonths", element, Locale.getDefault()); @@ -196,15 +196,15 @@ public final class DepositProductCommandFromApiJsonDeserializer { .inMinMaxRange(1, 3); final Boolean renewalAllowed = fromApiJsonHelper.extractBooleanNamed("renewalAllowed", element); - baseDataValidator.reset().parameter("renewalAllowed").value(renewalAllowed) + baseDataValidator.reset().parameter("renewalAllowed").value(renewalAllowed).ignoreIfNull() .trueOrFalseRequired(isBooleanValueUpdated(renewalAllowed)); final Boolean preClosureAllowed = fromApiJsonHelper.extractBooleanNamed("preClosureAllowed", element); - baseDataValidator.reset().parameter("preClosureAllowed").value(preClosureAllowed) + baseDataValidator.reset().parameter("preClosureAllowed").value(preClosureAllowed).ignoreIfNull() .trueOrFalseRequired(isBooleanValueUpdated(preClosureAllowed)); final Boolean interestCompoundingAllowed = fromApiJsonHelper.extractBooleanNamed("interestCompoundingAllowed", element); - baseDataValidator.reset().parameter("interestCompoundingAllowed").value(interestCompoundingAllowed) + baseDataValidator.reset().parameter("interestCompoundingAllowed").value(interestCompoundingAllowed).ignoreIfNull() .trueOrFalseRequired(isBooleanValueUpdated(interestCompoundingAllowed)); final BigDecimal preClosureInterestRate = fromApiJsonHelper.extractBigDecimalWithLocaleNamed("preClosureInterestRate", element); @@ -213,7 +213,7 @@ public final class DepositProductCommandFromApiJsonDeserializer { .comapareMinAndMaxOfTwoBigDecmimalNos(preClosureInterestRate, maturityMinInterestRate); final Boolean lockinPeriodAllowed = fromApiJsonHelper.extractBooleanNamed("isLockinPeriodAllowed", element); - baseDataValidator.reset().parameter("isLockinPeriodAllowed").value(lockinPeriodAllowed) + baseDataValidator.reset().parameter("isLockinPeriodAllowed").value(lockinPeriodAllowed).ignoreIfNull() .trueOrFalseRequired(isBooleanValueUpdated(lockinPeriodAllowed)); final Integer lockinPeriod = fromApiJsonHelper.extractIntegerNamed("lockinPeriod", element, Locale.getDefault()); diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savingsdepositproduct/service/DepositProductReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savingsdepositproduct/service/DepositProductReadPlatformServiceImpl.java index 587236fbc..a36c8d28c 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savingsdepositproduct/service/DepositProductReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savingsdepositproduct/service/DepositProductReadPlatformServiceImpl.java @@ -60,7 +60,7 @@ public class DepositProductReadPlatformServiceImpl implements DepositProductRead @Override public DepositProductData retrieveDepositProductData(Long productId) { DepositProductMapper depositProductMapper = new DepositProductMapper(); - String sql = "select " + depositProductMapper.depositProductSchema() + " where dp.id = ? and dp.is_deleted=0"; + String sql = "select " + depositProductMapper.depositProductSchema() + " where dp.id = ? "; return this.jdbcTemplate.queryForObject(sql, depositProductMapper, new Object[] { productId }); }