formatting and rename of patch files.

mifosng-db/patches/02-patch_add_unique_const_on_loanprodname.sql

@@ -0,0 +1,6 @@
+UPDATE m_product_loan SET name = CONCAT(id,'-',name); 
+
+-- concating unique value to make sure column does not contain any duplicate value
+
+ALTER TABLE m_product_loan
+ADD CONSTRAINT unq_name UNIQUE (name);

mifosng-db/patches/patch_add_unique_const_on_loanprodname.sql

@@ -1,3 +0,0 @@
-UPDATE m_product_loan SET name = CONCAT(id,'-',name); -- concating unique value to make sure column does not contain any duplicate value
-ALTER TABLE m_product_loan
-ADD CONSTRAINT unq_name UNIQUE (name);

mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/service/LoanProductWritePlatformServiceJpaRepositoryImpl.java

@@ -75,28 +75,21 @@ public class LoanProductWritePlatformServiceJpaRepositoryImpl implements LoanPro
 
             // associating fund with loan product at creation is optional for
             // now.
-			final Fund fund = findFundByIdIfProvided(command
+            final Fund fund = findFundByIdIfProvided(command.longValueOfParameterNamed("fundId"));
-					.longValueOfParameterNamed("fundId"));
 
-			final Long transactionProcessingStrategyId = command
+            final Long transactionProcessingStrategyId = command.longValueOfParameterNamed("transactionProcessingStrategyId");
-					.longValueOfParameterNamed("transactionProcessingStrategyId");
             final LoanTransactionProcessingStrategy loanTransactionProcessingStrategy = findStrategyByIdIfProvided(transactionProcessingStrategyId);
 
-			final String currencyCode = command
+            final String currencyCode = command.stringValueOfParameterNamed("currencyCode");
-					.stringValueOfParameterNamed("currencyCode");
+            final Set<Charge> charges = this.assembleSetOfCharges(command, currencyCode);
-			final Set<Charge> charges = this.assembleSetOfCharges(command,
-					currencyCode);
 
-			final LoanProduct loanproduct = LoanProduct.assembleFromJson(fund,
+            final LoanProduct loanproduct = LoanProduct.assembleFromJson(fund, loanTransactionProcessingStrategy, charges, command,
-					loanTransactionProcessingStrategy, charges, command,
                     this.aprCalculator);
 
             this.loanProductRepository.save(loanproduct);
 
             // save accounting mappings
-			accountMappingWritePlatformService
+            accountMappingWritePlatformService.createLoanProductToGLAccountMapping(loanproduct.getId(), command);
-					.createLoanProductToGLAccountMapping(loanproduct.getId(),
-							command);
 
             return new CommandProcessingResultBuilder() //
                     .withCommandId(command.commandId()) //
@@ -138,14 +131,10 @@ public class LoanProductWritePlatformServiceJpaRepositoryImpl implements LoanPro
 
             this.fromApiJsonDeserializer.validateForUpdate(command.json());
 
-			final LoanProduct product = this.loanProductRepository
+            final LoanProduct product = this.loanProductRepository.findOne(loanProductId);
-					.findOne(loanProductId);
+            if (product == null) { throw new LoanProductNotFoundException(loanProductId); }
-			if (product == null) {
-				throw new LoanProductNotFoundException(loanProductId);
-			}
 
-			final Map<String, Object> changes = product.update(command,
+            final Map<String, Object> changes = product.update(command, this.aprCalculator);
-					this.aprCalculator);
 
             // associating fund with loan product at creation is optional for
             // now.
@@ -156,25 +145,20 @@ public class LoanProductWritePlatformServiceJpaRepositoryImpl implements LoanPro
             }
 
             if (changes.containsKey("transactionProcessingStrategyId")) {
-				final Long transactionProcessingStrategyId = (Long) changes
+                final Long transactionProcessingStrategyId = (Long) changes.get("transactionProcessingStrategyId");
-						.get("transactionProcessingStrategyId");
                 final LoanTransactionProcessingStrategy loanTransactionProcessingStrategy = findStrategyByIdIfProvided(transactionProcessingStrategyId);
                 product.update(loanTransactionProcessingStrategy);
             }
 
             if (changes.containsKey("charges")) {
-				final Set<Charge> charges = this.assembleSetOfCharges(command,
+                final Set<Charge> charges = this.assembleSetOfCharges(command, product.getCurrency().getCode());
-						product.getCurrency().getCode());
                 product.update(charges);
             }
 
             // accounting related changes
-			boolean accountingTypeChanged = changes
+            boolean accountingTypeChanged = changes.containsKey("accountingType");
-					.containsKey("accountingType");
             if (accountingTypeChanged) {
-				accountMappingWritePlatformService
+                accountMappingWritePlatformService.updateLoanProductToGLAccountMapping(product.getId(), command, accountingTypeChanged);
-						.updateLoanProductToGLAccountMapping(product.getId(),
-								command, accountingTypeChanged);
             }
 
             if (!changes.isEmpty()) {
@@ -222,6 +206,7 @@ public class LoanProductWritePlatformServiceJpaRepositoryImpl implements LoanPro
 
         return charges;
     }
+
     /*
      * Guaranteed to throw an exception no matter what the data integrity issue
      * is.