fix: Fix patch for nextScheduledDate in PS [DHIS2-20042] #22806
Merged
+86
−1
Conversation
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
enricocolasante
force-pushed
the
DHIS2-20042
branch
from
cf24a62 to
235c24c
Compare
|
| .formatted(dataElement.getUid())) | ||
| .content(HttpStatus.OK) | ||
| .as(JsonWebMessage.class); | ||
| assertEquals("OK", message.getStatus()); |
Contributor
There was a problem hiding this comment.
It might be just me, but I would also assert that the patch value is now in place to be 100% sure it works (GET ProgramStage and check nextScheduleDate)
david-mackessy
approved these changes
Jan 21, 2026
larshelge
approved these changes
Jan 26, 2026
enricocolasante
added a commit
that referenced
this pull request
Jan 28, 2026
enricocolasante
added a commit
that referenced
this pull request
Jan 28, 2026
enricocolasante
added a commit
that referenced
this pull request
Jan 28, 2026
This was referenced Jan 28, 2026
enricocolasante
added a commit
that referenced
this pull request
Jan 28, 2026
enricocolasante
added a commit
that referenced
this pull request
Jan 28, 2026
enricocolasante
added a commit
that referenced
this pull request
Jan 28, 2026
enricocolasante
added a commit
that referenced
this pull request
Jan 28, 2026
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.
The validation for
nextScheduleDateinProgramStageObjectBundleHookwas relying on the fact that thenextScheduleDatedata element was present in the theprogramStage.getDataElements()set and it was usingcontains()method to check it.contains()method usesequals()method that forDataElementis implemented in the chain ofBaseDimensionalItemObjectand all the objects that extend it and it uses some fields to check equality that are coming directly from the payload, so it depends on the shape of the payload if thecontains()method would success or fail.Almost by coincidence, the payload coming from Maintenance App when saving a whole program stage was passing the validation, but in the new Maintenance App we are using
PATCHand only updating one field at a time and thecontains()approach is not working.I changed the check to only look at the
UIDof the data element that it is in fact the only required field when patching.