pkp/pkp-lib#10662 Fix isOverdue query
#10808
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
taslangraham
commented
Jan 15, 2025
classes/submission/Collector.php
Outdated
Comment on lines
389
to
426
| if ($this->isOverdue) { | ||
| $q->leftJoin('review_assignments as raod', 'raod.submission_id', '=', 's.submission_id') | ||
| ->leftJoin('review_rounds as rr', fn (Builder $table) => | ||
| $table->on('rr.submission_id', '=', 's.submission_id') | ||
| ->on('raod.review_round_id', '=', 'rr.review_round_id') | ||
| ); | ||
| // Only get overdue assignments on active review rounds | ||
| $q->whereNotIn('rr.status', [ | ||
| ReviewRound::REVIEW_ROUND_STATUS_RESUBMIT_FOR_REVIEW, | ||
| ReviewRound::REVIEW_ROUND_STATUS_SENT_TO_EXTERNAL, | ||
| ReviewRound::REVIEW_ROUND_STATUS_ACCEPTED, | ||
| ReviewRound::REVIEW_ROUND_STATUS_DECLINED, | ||
| ]); | ||
| $q->where(fn (Builder $q) => | ||
| $q->where('raod.declined', '<>', 1) | ||
| ->where('raod.cancelled', '<>', 1) | ||
| ->where(fn (Builder $q) => | ||
| $q->where('raod.date_due', '<', Core::getCurrentDate(strtotime('tomorrow'))) | ||
| ->whereNull('raod.date_completed') | ||
| $q->whereIn( | ||
| 's.submission_id', | ||
| fn (Builder $q) => | ||
| $q->select('s.submission_id') | ||
| ->from('submissions AS s') | ||
| ->leftJoin('review_assignments as raod', 'raod.submission_id', '=', 's.submission_id') | ||
| ->leftJoin( | ||
| 'review_rounds as rr', | ||
| fn (Builder $table) => | ||
| $table->on('rr.submission_id', '=', 's.submission_id') | ||
| ->on('raod.review_round_id', '=', 'rr.review_round_id') | ||
| ) | ||
| ->orWhere(fn (Builder $q) => | ||
| $q->where('raod.date_response_due', '<', Core::getCurrentDate(strtotime('tomorrow'))) | ||
| ->whereNull('raod.date_confirmed') | ||
| ->whereNotIn('rr.status', [ | ||
| ReviewRound::REVIEW_ROUND_STATUS_RESUBMIT_FOR_REVIEW, | ||
| ReviewRound::REVIEW_ROUND_STATUS_SENT_TO_EXTERNAL, | ||
| ReviewRound::REVIEW_ROUND_STATUS_ACCEPTED, | ||
| ReviewRound::REVIEW_ROUND_STATUS_DECLINED, | ||
| ]) | ||
| ->where( | ||
| fn (Builder $q) => | ||
| $q->where('raod.declined', '<>', 1) | ||
| ->where('raod.cancelled', '<>', 1) | ||
| ->where( | ||
| fn (Builder $q) => | ||
| $q->where('raod.date_due', '<', Core::getCurrentDate(strtotime('tomorrow'))) | ||
| ->whereNull('raod.date_completed') | ||
| ) | ||
| ->orWhere( | ||
| fn (Builder $q) => | ||
| $q->where('raod.date_response_due', '<', Core::getCurrentDate(strtotime('tomorrow'))) | ||
| ->whereNull('raod.date_confirmed') | ||
| ) | ||
| ) | ||
| ); | ||
| } |
There was a problem hiding this comment.
The formatter made quite a few changes to the file, but these are the lines specific to the issue at hand
taslangraham
force-pushed
the
i10662-stable-3_4_0
branch
from
82203af to
cabb879
Compare
asmecher
approved these changes
Jan 15, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For #10662