fix: model event consistency in BaseModel::paginate()
#9617
+134
−1
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.
Description
This PR fixes
BaseModel::paginate()
to triggerbeforeFind
events before callingcountAllResults()
, ensuring both the count and results are consistently filtered.Currently,
BaseModel::paginate()
has an inconsistency wherebeforeFind
events are only applied to the data retrieval query (findAll()
) but not to the count query (countAllResults()
). This causes pagination metadata to be incorrect when model events filter or modify the underlying query. More details and examples are available in #8412.The solution in short:
beforeFind
events before counting to apply query modificationsfindAll()
to prevent duplicate event executionafterFind
events to maintain a complete event flowI'm not 100% certain this is the proper way to solve this issue. While it fixes the consistency problem, it does change the execution flow a bit. If anyone sees any drawbacks, please share.
Also, I feel like the changes are a bit messy, so feedback is much appreciated on both the technical implementation and whether this change should be made at all.
Fixes #8412
Checklist: