Merge branch 'develop' into openmf_develop

karthikiyer · Jun 28, 2016 · 1f2e798 · 1f2e798
2 parents b191485 + 5982508
commit 1f2e798
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/...rc/main/java/org/apache/fineract/scheduledjobs/service/ScheduledJobRunnerServiceImpl.java b/...rc/main/java/org/apache/fineract/scheduledjobs/service/ScheduledJobRunnerServiceImpl.java
@@ -379,8 +379,15 @@ public void postDividends() throws JobExecutionException {
         List<Map<String, Object>> dividendDetails = this.shareAccountDividendReadPlatformService.retriveDividendDetailsForPostDividents();
         StringBuilder errorMsg = new StringBuilder();
         for (Map<String, Object> dividendMap : dividendDetails) {
-            final Long id = ((BigInteger) dividendMap.get("id")).longValue();
-            final Long savingsId = ((BigInteger) dividendMap.get("savingsAccountId")).longValue();
+        	Long id = null ;
+        	Long savingsId = null ;
+        	if(dividendMap.get("id") instanceof BigInteger) { //Drizzle is returning BigInteger
+        		id = ((BigInteger)dividendMap.get("id")).longValue() ;
+        		savingsId = ((BigInteger)dividendMap.get("savingsAccountId")).longValue() ;
+        	}else { //MySQL connector is returning Long
+        		id = (Long) dividendMap.get("id") ;
+        		savingsId = (Long) dividendMap.get("savingsAccountId") ;
+        	}
             try {
                 this.shareAccountSchedularService.postDividend(id, savingsId);
             } catch (final PlatformApiDataValidationException e) {

diff --git a/...migrations/core_db/V310__copy_data_from_entitytoentityaccess_to_entitytoentitymapping.sql b/...migrations/core_db/V310__copy_data_from_entitytoentityaccess_to_entitytoentitymapping.sql
@@ -2,8 +2,8 @@ insert ignore into m_entity_to_entity_mapping (from_id,to_id,rel_id)
 select  mea.entity_id as fromId,
 mea.second_entity_id as toid,
 case mea.access_type_code_value_id
-when 10 then 1
-when 11 then 2
-when 12 then 3
+when (select mcv.id from m_code_value mcv where mcv.code_value like'Office Access to Loan Products') then (select mer.id from m_entity_relation mer where mer.code_name like 'office_access_to_loan_products')
+when (select mcv.id from m_code_value mcv where mcv.code_value like'Office Access to Savings Products') then (select mer.id from m_entity_relation mer where mer.code_name like 'office_access_to_savings_products')
+when (select mcv.id from m_code_value mcv where mcv.code_value like'Office Access to Fees/Charges') then (select mer.id from m_entity_relation mer where mer.code_name like 'office_access_to_fees/charges')
 end as reId
 from m_entity_to_entity_access mea