fix: Block updates on expired events [DHIS2-21536]#24305
Merged
Conversation
|
ameenhere
approved these changes
Jun 30, 2026
muilpp
approved these changes
Jun 30, 2026
This was referenced Jun 30, 2026
This file contains hidden or 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
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.



Summary
Fixes a gap in event date validation where completed events past their expiry window could
still be updated. The expiry check now anchors to the persisted completion date
when an event is already completed in the database, so updates are correctly blocked even when
the payload omits
completedAtorstatus, and a freshcompletedAtin the payload can nolonger reset the expiry clock.
Changes
DateValidator.java: ReworksvalidateCompletionExpiryDaysto use the program'scompleteEventsExpiryDaysas the early-return guard and to resolve the completion date theexpiry check is anchored to via the new
getCompletedDate/getPersistedCompletedDatehelpers (which read the persisted event from
TrackerPreheat). When the event is alreadycompleted in the DB, the persisted completion date wins over any value in the payload;
otherwise, if the payload itself completes the event, its
completedAtis used.DateValidator.java: ThreadsTrackerPreheatinto the validation so bothTrackerEventandSingleEventtypes can look up their persisted counterparts.DateValidatorTest.java: Adds coverage for the new behavior — expiry failures when thepayload lacks
completedAt/status, payloadcompletedAtnot resetting the clock on analready-completed event, passing within the expiry window, and the
F_EDIT_EXPIREDauthorization bypass; for both
TrackerEventandSingleEvent.