You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by GitBox <gi...@apache.org> on 2022/07/12 12:52:43 UTC
[GitHub] [fineract] adamsaghy opened a new pull request, #2423: Date to LocalDate (scheduler excluded due to quartz)
adamsaghy opened a new pull request, #2423:
URL: https://github.com/apache/fineract/pull/2423
## Description
Describe the changes made and why they were made.
Ignore if these details are present on the associated [Apache Fineract JIRA ticket](https://github.com/apache/fineract/pull/1284).
## Checklist
Please make sure these boxes are checked before submitting your pull request - thanks!
- [ ] Write the commit message as per https://github.com/apache/fineract/#pull-requests
- [ ] Acknowledge that we will not review PRs that are not passing the build _("green")_ - it is your responsibility to get a proposed PR to pass the build, not primarily the project's maintainers.
- [ ] Create/update unit or integration tests for verifying the changes made.
- [ ] Follow coding conventions at https://cwiki.apache.org/confluence/display/FINERACT/Coding+Conventions.
- [ ] Add required Swagger annotation and update API documentation at fineract-provider/src/main/resources/static/legacy-docs/apiLive.htm with details of any API changes
- [ ] Submission is not a "code dump". (Large changes can be made "in repository" via a branch. Ask on the developer mailing list for guidance, if required.)
FYI our guidelines for code reviews are at https://cwiki.apache.org/confluence/display/FINERACT/Code+Review+Guide.
--
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: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] galovics merged pull request #2423: Date to LocalDate (scheduler excluded due to quartz)
Posted by GitBox <gi...@apache.org>.
galovics merged PR #2423:
URL: https://github.com/apache/fineract/pull/2423
--
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: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] galovics commented on a diff in pull request #2423: Date to LocalDate (scheduler excluded due to quartz)
Posted by GitBox <gi...@apache.org>.
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: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org