fix: Block update event when block flag on PS [DHIS2-21551](2.42) (#24363)

* fix: Block update event when block flag on PS [DHIS2-21551]

* fix: Fix test

* fix: Fix test

Author: enricocolasante

dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/imports/validation/validator/event/BlockEntryFormAfterCompletionValidator.java

@@ -54,8 +54,9 @@ public void validate(Reporter reporter, TrackerBundle bundle, Event event) {
 
     ProgramStage programStage = preheat.getProgramStage(event.getProgramStage());
 
-    if (EventStatus.COMPLETED == event.getStatus()
-        && Boolean.TRUE.equals(programStage.getBlockEntryForm())) {
+    if (Boolean.TRUE.equals(programStage.getBlockEntryForm())
+        && EventStatus.COMPLETED == event.getStatus()
+        && EventStatus.COMPLETED == preheat.getEvent(event.getUid()).getStatus()) {
       reporter.addError(event, E1326, event.getEvent());
     }
   }

dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/tracker/imports/validation/validator/event/BlockEntryFormAfterCompletionValidatorTest.java

@@ -80,34 +80,39 @@ void setUp() {
   }
 
   @Test
-  void shouldFailWhenTrackerEventIsCompletedAndBlockEntryFormIsEnabled() {
+  void shouldFailWhenEventIsCompletedAndSavedStatusIsCompletedAndBlockEntryFormIsEnabled() {
     stubProgramStage(true);
-    Event event = trackerEvent(EventStatus.COMPLETED);
+    UID uid = UID.generate();
+    Event event = event(uid, EventStatus.COMPLETED);
+    stubSavedEvent(uid, EventStatus.COMPLETED);
 
     validator.validate(reporter, bundle, event);
 
     assertHasError(reporter, event, E1326);
   }
 
-  @Test
-  void shouldFailWhenSingleEventIsCompletedAndBlockEntryFormIsEnabled() {
+  @ParameterizedTest
+  @EnumSource(
+      value = EventStatus.class,
+      mode = Mode.EXCLUDE,
+      names = {"COMPLETED"})
+  void shouldPassWhenEventIsCompletedButSavedStatusIsNotCompleted(EventStatus savedStatus) {
     stubProgramStage(true);
-    Event event =
-        Event.builder()
-            .event(UID.generate())
-            .programStage(MetadataIdentifier.ofUid(PROGRAM_STAGE_UID))
-            .status(EventStatus.COMPLETED)
-            .build();
+    UID uid = UID.generate();
+    stubSavedEvent(uid, savedStatus);
+    Event event = event(uid, EventStatus.COMPLETED);
 
     validator.validate(reporter, bundle, event);
 
-    assertHasError(reporter, event, E1326);
+    assertIsEmpty(reporter.getErrors());
   }
 
   @Test
-  void shouldPassWhenEventIsCompletedButBlockEntryFormIsDisabled() {
+  void shouldPassWhenEventIsCompletedAndSavedStatusIsCompletedButBlockEntryFormIsDisabled() {
     stubProgramStage(false);
-    Event event = trackerEvent(EventStatus.COMPLETED);
+    UID uid = UID.generate();
+
+    Event event = event(uid, EventStatus.COMPLETED);
 
     validator.validate(reporter, bundle, event);
 
@@ -121,7 +126,8 @@ void shouldPassWhenEventIsCompletedButBlockEntryFormIsDisabled() {
       names = {"COMPLETED"})
   void shouldPassWhenBlockEntryFormIsEnabledButEventIsNotCompleted(EventStatus status) {
     stubProgramStage(true);
-    Event event = trackerEvent(status);
+    UID uid = UID.generate();
+    Event event = event(uid, status);
 
     validator.validate(reporter, bundle, event);
 
@@ -144,9 +150,15 @@ private void stubProgramStage(boolean blockEntryForm) {
         .thenReturn(programStage);
   }
 
-  private Event trackerEvent(EventStatus status) {
+  private void stubSavedEvent(UID uid, EventStatus status) {
+    org.hisp.dhis.program.Event savedEvent = new org.hisp.dhis.program.Event();
+    savedEvent.setStatus(status);
+    when(preheat.getEvent(uid)).thenReturn(savedEvent);
+  }
+
+  private Event event(UID uid, EventStatus status) {
     return Event.builder()
-        .event(UID.generate())
+        .event(uid)
         .programStage(MetadataIdentifier.ofUid(PROGRAM_STAGE_UID))
         .status(status)
         .build();

dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/tracker/imports/validation/EventImportValidationTest.java

@@ -52,6 +52,7 @@
 import org.hisp.dhis.common.CodeGenerator;
 import org.hisp.dhis.common.IdentifiableObjectManager;
 import org.hisp.dhis.common.UID;
+import org.hisp.dhis.event.EventStatus;
 import org.hisp.dhis.note.Note;
 import org.hisp.dhis.program.Event;
 import org.hisp.dhis.test.integration.PostgresIntegrationTestBase;
@@ -261,10 +262,14 @@ void testEventProgramHasNonDefaultCategoryCombo() throws IOException {
   void shouldBlockUpdateOfCompletedEventWhenBlockEntryFormIsTrue() throws IOException {
     TrackerImportParams params = TrackerImportParams.builder().build();
     TrackerObjects trackerObjects =
-        testSetup.fromJson("tracker/validations/single_completed_event.json");
+        testSetup.fromJson("tracker/validations/single_active_event.json");
     ImportReport importReport = trackerImportService.importTracker(params, trackerObjects);
     assertNoErrors(importReport);
 
+    trackerObjects.getEvents().get(0).setStatus(EventStatus.COMPLETED);
+    importReport = trackerImportService.importTracker(params, trackerObjects);
+    assertNoErrors(importReport);
+
     importReport = trackerImportService.importTracker(params, trackerObjects);
     assertHasOnlyErrors(importReport, ValidationCode.E1326);
   }

…/validations/single_completed_event.json …ker/validations/single_active_event.jsondhis-2/dhis-test-integration/src/test/resources/tracker/validations/single_completed_event.json renamed to dhis-2/dhis-test-integration/src/test/resources/tracker/validations/single_active_event.json dhis-2/dhis-test-integration/src/test/resources/tracker/validations/single_completed_event.json renamed to dhis-2/dhis-test-integration/src/test/resources/tracker/validations/single_active_event.json

@@ -4,7 +4,7 @@
   "events": [
     {
       "event": "ZwwuwNp6gVd",
-      "status": "COMPLETED",
+      "status": "ACTIVE",
       "program": {
         "idScheme": "UID",
         "identifier": "rT3rvcn2vid"