fix: Validation for OUMoude [DHIS2-11755] (dhis2#9114)

* fix: OuMode validation in event query * chore: More readable error messages. * chore: Code formatting * fix: Accessible ouMode per program protection level * Revert "fix: Accessible ouMode per program protection level" This reverts commit edc2703. * fix: Accessible ouMode per program protection level * fix: OuMode validation in event query * fix: Validation for OUMoude
davidhuser · Oct 24, 2021 · a3b4bea · a3b4bea
1 parent 8345bb0
commit a3b4bea
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java b/...dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java
@@ -1056,14 +1056,19 @@ private String getOuModeViolation( EventSearchParams params, User user )
             violation = userCanSearchOuModeALL( user ) ? null
                 : "Current user is not authorized to query across all organisation units";
             break;
+        case ACCESSIBLE:
         case CAPTURE:
+            violation = user == null ? "User is required for ouMode: " + params.getOrgUnitSelectionMode() : null;
+            break;
+        case CHILDREN:
+        case SELECTED:
         case DESCENDANTS:
             violation = params.getOrgUnit() == null
                 ? "Organisation unit is required for ouMode: " + params.getOrgUnitSelectionMode()
                 : null;
             break;
         default:
-            violation = null;
+            violation = "Invalid ouMode:  " + params.getOrgUnitSelectionMode();
             break;
         }