From 8cc65d676e97f29912c53962f93ec506e2531fb7 Mon Sep 17 00:00:00 2001
From: unknown <nazeer.shaik@confluxtechnologies.com>
Date: Wed, 28 Oct 2015 13:58:58 +0530
Subject: [PATCH] MIFOSX-2045 Clarify New Loan Repayment Strategy Wording

---
 .../LoanTransactionProcessingStrategy.java     |  3 +++
 .../LoanDropdownReadPlatformServiceImpl.java   |  5 +++--
 ...V278__LoanTransactionProcessingStrategy.sql | 18 ++++++++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 mifosng-provider/src/main/resources/sql/migrations/core_db/V278__LoanTransactionProcessingStrategy.sql

diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanTransactionProcessingStrategy.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanTransactionProcessingStrategy.java
index 083720464..2c9dc64ee 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanTransactionProcessingStrategy.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanTransactionProcessingStrategy.java
@@ -22,6 +22,9 @@ public class LoanTransactionProcessingStrategy extends AbstractPersistable<Long>
     @Column(name = "name")
     private String name;
 
+    @Column(name = "sort_order")
+    private Integer sortOrder ; //Don't change this name as this property name is used as sort order while retrieving this objects
+   
     protected LoanTransactionProcessingStrategy() {
         //
     }
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/service/LoanDropdownReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/service/LoanDropdownReadPlatformServiceImpl.java
index 880e98b11..b00034e72 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/service/LoanDropdownReadPlatformServiceImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/service/LoanDropdownReadPlatformServiceImpl.java
@@ -40,6 +40,7 @@ import org.mifosplatform.portfolio.loanproduct.domain.LoanRescheduleStrategyMeth
 import org.mifosplatform.portfolio.loanproduct.domain.LoanTransactionProcessingStrategy;
 import org.mifosplatform.portfolio.loanproduct.domain.RecalculationFrequencyType;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -124,8 +125,8 @@ public class LoanDropdownReadPlatformServiceImpl implements LoanDropdownReadPlat
     public Collection<TransactionProcessingStrategyData> retreiveTransactionProcessingStrategies() {
 
         final Collection<TransactionProcessingStrategyData> strategyOptions = new ArrayList<>();
-
-        final List<LoanTransactionProcessingStrategy> strategies = this.loanTransactionProcessingStrategyRepository.findAll();
+        Sort sort = new Sort("sortOrder") ;
+        final List<LoanTransactionProcessingStrategy> strategies = this.loanTransactionProcessingStrategyRepository.findAll(sort);
         for (final LoanTransactionProcessingStrategy strategy : strategies) {
             strategyOptions.add(strategy.toData());
         }
diff --git a/mifosng-provider/src/main/resources/sql/migrations/core_db/V278__LoanTransactionProcessingStrategy.sql b/mifosng-provider/src/main/resources/sql/migrations/core_db/V278__LoanTransactionProcessingStrategy.sql
new file mode 100644
index 000000000..f816baab8
--- /dev/null
+++ b/mifosng-provider/src/main/resources/sql/migrations/core_db/V278__LoanTransactionProcessingStrategy.sql
@@ -0,0 +1,18 @@
+UPDATE `ref_loan_transaction_processing_strategy` SET `name`='Penalties, Fees, Interest, Principal order'
+WHERE code='mifos-standard-strategy' ;
+UPDATE `ref_loan_transaction_processing_strategy` SET `name`='Overdue/Due Fee/Int,Principal' WHERE code='rbi-india-strategy' ; 
+UPDATE `ref_loan_transaction_processing_strategy` SET `name`='HeavensFamily Unique, then list order' WHERE code='heavensfamily-strategy' ;
+UPDATE `ref_loan_transaction_processing_strategy` SET `name`='Creocore Unique, then list order' WHERE code='creocore-strategy' ;
+
+ALTER TABLE `ref_loan_transaction_processing_strategy`ADD `sort_order` INT(4) ;
+
+UPDATE `ref_loan_transaction_processing_strategy` SET `sort_order`=1 WHERE code='mifos-standard-strategy' ;
+UPDATE `ref_loan_transaction_processing_strategy` SET `sort_order`=2 WHERE code='rbi-india-strategy' ;
+UPDATE `ref_loan_transaction_processing_strategy` SET `sort_order`=3 WHERE code='principal-interest-penalties-fees-order-strategy' ;
+UPDATE `ref_loan_transaction_processing_strategy` SET `sort_order`=4 WHERE code='interest-principal-penalties-fees-order-strategy' ;
+UPDATE `ref_loan_transaction_processing_strategy` SET `sort_order`=5 WHERE code='early-repayment-strategy' ;
+UPDATE `ref_loan_transaction_processing_strategy` SET `sort_order`=6 WHERE code='heavensfamily-strategy' ;
+UPDATE `ref_loan_transaction_processing_strategy` SET `sort_order`=7 WHERE code='creocore-strategy' ;
+
+
+