fix: Add event validation when updating status [DHIS2-17658] #17890

enricocolasante · 2024-06-26T12:15:34Z

This is the first PR to fix https://dhis2.atlassian.net/browse/DHIS2-17658.
We were missing the validation on event status update.
Some statuses are meant to be used for events that will be handled at a later point in time ('SCHEDULE', 'SKIPPED', 'OVERDUE') and they do not allow data values to be defined and other statuses are meant to be used for events that are being worked on ('ACTIVE', 'COMPLETED', 'VISITED').
Updating from the first ones to the second ones is always allowed while going back from the second ones to the first ones does not make sense and it has to be blocked.

muilpp · 2024-06-26T14:00:04Z

dhis-2/dhis-api/src/main/java/org/hisp/dhis/event/EventStatus.java

-        return eventStatus;
-      }
-    }
+  public static final Set<EventStatus> ALLOW_DATA_VALUES_STATUSES =


wouldn't it make more sense to name it ALLOWED_STATUSES?
we are not referencing event data values here, are we?

Anyway, is this used somewhere?

Not yet :)
I extracted this PR from the other one, so it will be used at some point.

ALLOWED_STATUSES is not true. These are the statuses that allow to have data values defined.
ALLOWED_STATUSES gets you the idea that those statuses are not allowed at all, which is not true.

How about STATUSES_ALLOWING_DATA_VALUES or STATUSES_WITH_DATA_VALUES?

muilpp · 2024-06-26T14:01:00Z

dhis-2/dhis-api/src/main/java/org/hisp/dhis/event/EventStatus.java

-  public static boolean isExistingEvent(EventStatus status) {
-    return status != null && (COMPLETED.equals(status) || VISITED.equals(status));
-  }
+  public static final Set<EventStatus> NO_ALLOW_DATA_VALUES_STATUSES =


I'd call this one DISALLOWED_DATA_VALUES_STATUSES, and in case the comment above makes sense, just DISALLOWED_STATUSES

I think not allowed and disallowed are not synonyms, but we could ask a native speaker about it.
The idea here is the same as above, these statuses are valid, the just do not permit to define data values.
Maybe because this was extracted from a bigger PR is not clear, but we will add another validation that is simply going to fail if the event has a status in NO_ALLOW_DATA_VALUES_STATUSES and dataValues is not empty

STATUSES_DISALLOWING_DATA_VALUES or STATUSES_WITHOUT_DATA_VALUES

teleivo · 2024-06-27T07:09:43Z

dhis-2/dhis-api/src/main/java/org/hisp/dhis/event/EventStatus.java

-        return eventStatus;
-      }
-    }
+  public static final Set<EventStatus> ALLOW_DATA_VALUES_STATUSES =


How about STATUSES_ALLOWING_DATA_VALUES or STATUSES_WITH_DATA_VALUES?

teleivo · 2024-06-27T07:10:44Z

dhis-2/dhis-api/src/main/java/org/hisp/dhis/event/EventStatus.java

-  public static boolean isExistingEvent(EventStatus status) {
-    return status != null && (COMPLETED.equals(status) || VISITED.equals(status));
-  }
+  public static final Set<EventStatus> NO_ALLOW_DATA_VALUES_STATUSES =


STATUSES_DISALLOWING_DATA_VALUES or STATUSES_WITHOUT_DATA_VALUES

dhis-2/dhis-api/src/main/java/org/hisp/dhis/tracker/imports/validation/ValidationCode.java

teleivo · 2024-06-27T07:15:12Z

.../main/java/org/hisp/dhis/tracker/imports/validation/validator/event/DataStatusValidator.java

+
+  private boolean checkInvalidStatusTransition(EventStatus fromStatus, EventStatus toStatus) {
+    return switch (fromStatus) {
+      case VISITED, ACTIVE, COMPLETED ->


These are ALLOW_DATA_VALUES_STATUSES, should we not use that then? like you do with NO_ALLOW_DATA_VALUES_STATUSES.

.../main/java/org/hisp/dhis/tracker/imports/validation/validator/event/DataStatusValidator.java

sonarqubecloud · 2024-06-27T14:40:16Z

Quality Gate passed

Issues
0 New issues
3 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

* fix: Add event validation when updating status [DHIS2-17658] * Fix sonar issues * Fix code review comments * Fix code review comments * Fix code review comments * Fix code review comments

….41) (#18015) * fix: Add event validation when updating status [DHIS2-17658] (#17890) * fix: Add event validation when updating status [DHIS2-17658] * Fix sonar issues * Fix code review comments * Fix code review comments * Fix code review comments * Fix code review comments * fix: Validate no datavalues for some event statuses [DHIS2-17658] (#17934) * fix: Validate no datavalues for some event statuses [DHIS2-17658] * Fix tests * Fix code review comments * Update dhis-2/dhis-api/src/main/java/org/hisp/dhis/tracker/imports/validation/ValidationCode.java Co-authored-by: teleivo <[email protected]> --------- Co-authored-by: teleivo <[email protected]> * fix: Skip mandatory data value validation for UPDATE [DHIS2-17560] (#17835) * fix: Skip mandatory data value validation for UPDATE [DHIS2-17560] * More clean up * Fix tests * Add tests * Add tests --------- Co-authored-by: teleivo <[email protected]>

* fix: Add event validation when updating status [DHIS2-17658] * Fix sonar issues * Fix code review comments * Fix code review comments * Fix code review comments * Fix code review comments

….40) (#18017) * fix: Add event validation when updating status [DHIS2-17560] * fix: Add event validation when updating status [DHIS2-17658] (#17890) * fix: Add event validation when updating status [DHIS2-17658] * Fix sonar issues * Fix code review comments * Fix code review comments * Fix code review comments * Fix code review comments * fix: Skip mandatory data value validation for UPDATE [DHIS2-17560] (#17835) * fix: Skip mandatory data value validation for UPDATE [DHIS2-17560] * More clean up * Fix tests * Add tests * Add tests

* fix: Add event validation when updating status [DHIS2-17658] * Fix sonar issues * Fix code review comments * Fix code review comments * Fix code review comments * Fix code review comments

….39) (#18018) * fix: Add event validation when updating status [DHIS2-17560] * fix: Add event validation when updating status [DHIS2-17658] (#17890) * fix: Add event validation when updating status [DHIS2-17658] * Fix sonar issues * Fix code review comments * Fix code review comments * Fix code review comments * Fix code review comments * fix: Skip mandatory data value validation for UPDATE [DHIS2-17560] (#17835) * fix: Skip mandatory data value validation for UPDATE [DHIS2-17560] * More clean up * Fix tests * Add tests * Add tests * Fix test

enricocolasante added 2 commits June 26, 2024 13:06

fix: Add event validation when updating status [DHIS2-17658]

f634dce

Fix sonar issues

4b0c473

enricocolasante force-pushed the DHIS2-17658 branch from 9dbc015 to 4b0c473 Compare June 26, 2024 13:16

enricocolasante requested review from JoakimSM and a team June 26, 2024 13:28

muilpp reviewed Jun 26, 2024

View reviewed changes

enricocolasante requested a review from muilpp June 26, 2024 14:21

teleivo reviewed Jun 27, 2024

View reviewed changes

enricocolasante added 2 commits June 27, 2024 14:31

Fix code review comments

dd0e65b

Fix code review comments

b3d025f

enricocolasante requested a review from teleivo June 27, 2024 14:03

muilpp approved these changes Jun 27, 2024

View reviewed changes

enricocolasante added 2 commits June 27, 2024 15:34

Fix code review comments

3eff8fa

Fix code review comments

79f66aa

JoakimSM approved these changes Jun 27, 2024

View reviewed changes

enricocolasante merged commit 39a31c8 into master Jun 27, 2024
15 checks passed

enricocolasante deleted the DHIS2-17658 branch June 27, 2024 14:57

enricocolasante restored the DHIS2-17658 branch July 1, 2024 08:55

enricocolasante mentioned this pull request Jul 1, 2024

fix: Validate no datavalues for some event statuses [DHIS2-17658] #17934

Merged

enricocolasante mentioned this pull request Jul 8, 2024

fix: Skip mandatory data value validation for UPDATE [DHIS2-17560] (2.41) #18015

Merged

enricocolasante mentioned this pull request Jul 8, 2024

fix: Skip mandatory data value validation for UPDATE [DHIS2-17560] (2.40) #18017

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix: Add event validation when updating status [DHIS2-17658] #17890

fix: Add event validation when updating status [DHIS2-17658] #17890

Uh oh!

enricocolasante commented Jun 26, 2024 •

edited

Loading

Uh oh!

muilpp Jun 26, 2024

Uh oh!

muilpp Jun 26, 2024

Uh oh!

enricocolasante Jun 26, 2024

Uh oh!

enricocolasante Jun 26, 2024

Uh oh!

teleivo Jun 27, 2024

Uh oh!

muilpp Jun 26, 2024

Uh oh!

enricocolasante Jun 26, 2024

Uh oh!

teleivo Jun 27, 2024

Uh oh!

teleivo Jun 27, 2024

Uh oh!

teleivo Jun 27, 2024

Uh oh!

Uh oh!

teleivo Jun 27, 2024

Uh oh!

Uh oh!

sonarqubecloud bot commented Jun 27, 2024

Uh oh!

Uh oh!

Uh oh!

fix: Add event validation when updating status [DHIS2-17658] #17890

fix: Add event validation when updating status [DHIS2-17658] #17890

Uh oh!

Conversation

enricocolasante commented Jun 26, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

sonarqubecloud bot commented Jun 27, 2024

Quality Gate passed

Uh oh!

Uh oh!

Uh oh!

enricocolasante commented Jun 26, 2024 •

edited

Loading