galovics commented on code in PR #2423:
URL: https://github.com/apache/fineract/pull/2423#discussion_r919767160
##########
fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountChargeRepository.java:
##########
@@ -31,6 +31,6 @@
@Query("select sac from SavingsAccountCharge sac where sac.id =:id and
sac.savingsAccount.id = :savingsAccountId")
SavingsAccountCharge findByIdAndSavingsAccountId(@Param("id") Long id,
@Param("savingsAccountId") Long savingsAccountId);
- @Query("select sac from SavingsAccountCharge sac where sac.dueDate
<=:transactionDate and sac.waived = 0 and sac.paid=0 order by sac.dueDate")
- List<SavingsAccountCharge> findPendingCharges(@Param("transactionDate")
Date transactionDate);
+ @Query("select sac from SavingsAccountCharge sac where sac.dueDate
<=:transactionDate and sac.waived = false and sac.paid=false order by
sac.dueDate")
Review Comment:
Nice job ;)
##########
fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/CenterReadPlatformServiceImpl.java:
##########
@@ -495,22 +494,21 @@ public CenterData retrieveCenterWithClosureReasons() {
}
@Override
- public Collection<StaffCenterData> retriveAllCentersByMeetingDate(final
Long officeId, final Date meetingDate, final Long staffId) {
+ public Collection<StaffCenterData> retriveAllCentersByMeetingDate(final
Long officeId, final LocalDate meetingDate,
+ final Long staffId) {
validateForGenerateCollectionSheet(staffId);
- LocalDate localDate = LocalDate.ofInstant(meetingDate.toInstant(),
DateUtils.getDateTimeZoneOfTenant());
final CenterCalendarDataMapper centerCalendarMapper = new
CenterCalendarDataMapper();
- String passeddate = formatter.format(localDate);
String sql = centerCalendarMapper.schema();
Collection<CenterData> centerDataArray;
if (staffId != null) {
sql += " and g.staff_id=? ";
- sql += "and lrs.duedate<='" + passeddate + "' and
l.loan_type_enum=3";
+ sql += "and lrs.duedate<=? and l.loan_type_enum=3";
sql += " group by c.id, ci.id, g.account_no, g.external_id,
g.status_enum, g.activation_date, g.hierarchy";
centerDataArray = this.jdbcTemplate.query(sql,
centerCalendarMapper, // NOSONAR
- new Object[] { passeddate, passeddate, passeddate,
passeddate, passeddate, passeddate, officeId, staffId });
+ meetingDate, meetingDate, meetingDate, meetingDate,
meetingDate, meetingDate, officeId, staffId, meetingDate);
} else {
centerDataArray = this.jdbcTemplate.query(sql,
centerCalendarMapper, // NOSONAR
- new Object[] { passeddate, passeddate, passeddate,
passeddate, passeddate, passeddate, officeId });
+ meetingDate, meetingDate, meetingDate, meetingDate,
meetingDate, meetingDate, officeId, meetingDate);
Review Comment:
I don't think the last `meetingDate` is needed since the inline parameter
you replaced with a bind parameter only exists in the other branch of the if
statement.
I'm not sure if this'll fail but we won't need it - as far as I can tell at
least.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
