rahulg963 commented on a change in pull request #492: glim_gsim
URL: https://github.com/apache/fineract/pull/492#discussion_r235471810
##########
File path:
fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/service/AccountDetailsReadPlatformServiceJpaRepositoryImpl.java
##########
@@ -106,9 +123,34 @@ public AccountSummaryCollectionData
retrieveGroupAccountDetails(final Long group
new Object[] { groupId });
final List<SavingsAccountSummaryData> memberSavingsAccounts =
retrieveAccountDetails(savingswhereClauseForMembers,
new Object[] { groupId });
+<<<<<<< HEAD
final List<GuarantorAccountSummaryData> memberGuarantorloanAccounts =
retrieveGuarantorLoanAccountDetails(
guarantorWhereClauseForMembers, new Object[] { groupId
});
return new AccountSummaryCollectionData(groupLoanAccounts,
groupSavingsAccounts, groupGuarantorloanAccounts, memberLoanAccounts,
memberSavingsAccounts, memberGuarantorloanAccounts);
+=======
+ return new AccountSummaryCollectionData(groupLoanAccounts,
glimAccounts,groupSavingsAccounts, memberLoanAccounts, memberSavingsAccounts);
+ }
+
+ @Override
+ public AccountSummaryCollectionData retrieveGroupAccountDetails(final Long
groupId,final Long gsimId) {
+ // Check if group exists
+ this.groupReadPlatformService.retrieveOne(groupId);
+ final String loanWhereClauseForGroup = " where l.group_id = ? and
l.client_id is null";
+ final String loanWhereClauseForGroupAndLoanType = " where l.group_id =
? and l.loan_type_enum=4";
+ final String loanWhereClauseForMembers = " where l.group_id = ? and
l.client_id is not null";
+ final String savingswhereClauseForGroup = " where sa.group_id = ? and
sa.gsim_id = ? sa.client_id is null order by sa.status_enum ASC, sa.account_no
ASC";
+ final String savingswhereClauseForMembers = " where sa.group_id = ?
and sa.client_id is not null order by sa.status_enum ASC, sa.account_no ASC";
+
+ final List<LoanAccountSummaryData> glimAccounts =
retrieveLoanAccountDetails(loanWhereClauseForGroupAndLoanType, new Object[] {
groupId });
+ final List<LoanAccountSummaryData> groupLoanAccounts =
retrieveLoanAccountDetails(loanWhereClauseForGroup, new Object[] { groupId });
+ final List<SavingsAccountSummaryData> gsimSavingsAccounts =
retrieveAccountDetails(savingswhereClauseForGroup,
+ new Object[] { groupId,gsimId });
+ final List<LoanAccountSummaryData> memberLoanAccounts =
retrieveLoanAccountDetails(loanWhereClauseForMembers,
+ new Object[] { groupId });
+ final List<SavingsAccountSummaryData> memberSavingsAccounts =
retrieveAccountDetails(savingswhereClauseForMembers,
+ new Object[] { groupId });
+ return new AccountSummaryCollectionData(groupLoanAccounts,
glimAccounts,gsimSavingsAccounts, memberLoanAccounts, memberSavingsAccounts);
+>>>>>>> 5ecaff5dc... gsim and glim functionalities added
Review comment:
Please solve merge conflicts and remove these.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
