perf: Collect orgUnitGroups in RuleContextRequirements [DHIS2-21245]

Author: enricocolasante

api/rule-engine.api

@@ -65,12 +65,15 @@ public final class org/hisp/dhis/rules/api/ItemValueType : java/lang/Enum {
 
 public final class org/hisp/dhis/rules/api/RuleContextRequirements {
 	public static final field Companion Lorg/hisp/dhis/rules/api/RuleContextRequirements$Companion;
-	public fun <init> (Z)V
+	public fun <init> (ZLjava/util/Set;)V
+	public synthetic fun <init> (ZLjava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Z
-	public final fun copy (Z)Lorg/hisp/dhis/rules/api/RuleContextRequirements;
-	public static synthetic fun copy$default (Lorg/hisp/dhis/rules/api/RuleContextRequirements;ZILjava/lang/Object;)Lorg/hisp/dhis/rules/api/RuleContextRequirements;
+	public final fun component2 ()Ljava/util/Set;
+	public final fun copy (ZLjava/util/Set;)Lorg/hisp/dhis/rules/api/RuleContextRequirements;
+	public static synthetic fun copy$default (Lorg/hisp/dhis/rules/api/RuleContextRequirements;ZLjava/util/Set;ILjava/lang/Object;)Lorg/hisp/dhis/rules/api/RuleContextRequirements;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getNeedsAllEvents ()Z
+	public final fun getOrgUnitGroups ()Ljava/util/Set;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }

gradle/libs.versions.toml

@@ -10,7 +10,7 @@ sonarqube = "7.2.3.7755"
 kotlinxDatetime = "0.7.1"
 kotlinJsWrappers = "1.0.0-pre.830"
 slf4jApi = "1.7.36"
-expressionParser = "1.4.0"
+expressionParser = "1.4.1"
 
 [libraries]
 kotlin-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }

src/commonMain/kotlin/org/hisp/dhis/rules/api/RuleContextRequirements.kt

@@ -1,7 +1,11 @@
 package org.hisp.dhis.rules.api
 
+import kotlin.js.JsExport
+
+@JsExport
 data class RuleContextRequirements(
     val needsAllEvents: Boolean,
+    val orgUnitGroups: Set<String> = emptySet(),
 ) {
     companion object {
         val NONE = RuleContextRequirements(needsAllEvents = false)

src/commonMain/kotlin/org/hisp/dhis/rules/engine/RuleEngineAnalyzer.kt

@@ -16,16 +16,19 @@ internal object RuleEngineAnalyzer {
     ): RuleContextRequirements {
         val envVars = mutableSetOf<String>()
         val referencedVarNames = mutableSetOf<String>()
+        val orgUnitGroups = mutableSetOf<String>()
 
         for (rule in rules) {
             rule.conditionExpression.getOrNull()?.let {
                 envVars += it.collectProgramVariablesNames()
                 referencedVarNames += it.collectProgramRuleVariableNames()
+                orgUnitGroups += it.collectInOrgUnitGroups()
             }
             for (action in rule.actions) {
                 action.dataExpression.getOrNull()?.let {
                     envVars += it.collectProgramVariablesNames()
                     referencedVarNames += it.collectProgramRuleVariableNames()
+                    orgUnitGroups += it.collectInOrgUnitGroups()
                 }
             }
         }
@@ -39,6 +42,6 @@ internal object RuleEngineAnalyzer {
                     v is RuleVariablePreviousEvent
             }
 
-        return RuleContextRequirements(needsAllEvents)
+        return RuleContextRequirements(needsAllEvents, orgUnitGroups)
     }
 }

src/commonTest/kotlin/org/hisp/dhis/rules/RuleEngineAnalyzerTest.kt

@@ -148,6 +148,40 @@ class RuleEngineAnalyzerTest {
         assertFalse(RuleContextRequirements.NONE.needsAllEvents)
     }
 
+    // --- orgUnitGroups collection ---
+
+    @Test
+    fun orgUnitGroupInConditionIsCollected() {
+        val rules = listOf(rule("d2:inOrgUnitGroup('GroupA')"))
+        val result = RuleEngineAnalyzer.analyzeContextRequirements(rules, emptyList())
+        assertEquals(setOf("GroupA"), result.orgUnitGroups)
+    }
+
+    @Test
+    fun orgUnitGroupInActionDataIsCollected() {
+        val rules = listOf(rule("true", "d2:inOrgUnitGroup('GroupB')"))
+        val result = RuleEngineAnalyzer.analyzeContextRequirements(rules, emptyList())
+        assertEquals(setOf("GroupB"), result.orgUnitGroups)
+    }
+
+    @Test
+    fun multipleOrgUnitGroupsAcrossRulesAreCollected() {
+        val rules = listOf(
+            rule("d2:inOrgUnitGroup('GroupA')"),
+            rule("true", "d2:inOrgUnitGroup('GroupB')"),
+            rule("d2:inOrgUnitGroup('GroupA') || d2:inOrgUnitGroup('GroupC')"),
+        )
+        val result = RuleEngineAnalyzer.analyzeContextRequirements(rules, emptyList())
+        assertEquals(setOf("GroupA", "GroupB", "GroupC"), result.orgUnitGroups)
+    }
+
+    @Test
+    fun noOrgUnitGroupReturnsEmptySet() {
+        val rules = listOf(rule("#{score} > 5"))
+        val result = RuleEngineAnalyzer.analyzeContextRequirements(rules, emptyList())
+        assertTrue(result.orgUnitGroups.isEmpty())
+    }
+
     // --- RuleEngine interface delegation ---
 
     @Test