fix: [DHIS2-18248] pass on createdAt to rules engine when editing

dhis2 · Oct 17, 2024 · 46caa2b · 46caa2b
1 parent fba5ecb
commit 46caa2b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/packages/rules-engine/src/services/VariableService/variableService.types.js b/packages/rules-engine/src/services/VariableService/variableService.types.js
@@ -27,6 +27,7 @@ type EventMain = {
     +status?: $Values<eventStatuses>,
     +occurredAt?: string,
     +scheduledAt?: string,
+    +createdAt?: string,
 };
 
 export type EventValues = {

diff --git a/...dules/capture-core/components/WidgetEventEdit/DataEntry/epics/editEventDataEntry.epics.js b/...dules/capture-core/components/WidgetEventEdit/DataEntry/epics/editEventDataEntry.epics.js
@@ -65,14 +65,21 @@ const runRulesForEditSingleEvent = ({
     if (program instanceof TrackerProgram) {
         const { enrollment, attributeValues } = state.enrollmentDomain;
 
+        const { apiOtherEvents, apiCurrentEventOriginal } = enrollment.events.reduce((acc, apiEvent) => {
+            if (apiEvent.event === currentEvent.eventId) {
+                acc.apiCurrentEventOriginal = apiEvent;
+            } else {
+                acc.apiOtherEvents.push(apiEvent);
+            }
+            return acc;
+        }, { apiOtherEvents: [] });
+
         effects = getApplicableRuleEffectsForTrackerProgram({
             program,
             stage,
             orgUnit,
-            currentEvent,
-            otherEvents: prepareEnrollmentEventsForRulesEngine(
-                enrollment?.events.filter(enrollmentEvent => enrollmentEvent.event !== currentEvent.eventId),
-            ),
+            currentEvent: { ...currentEvent, createdAt: apiCurrentEventOriginal.createdAt },
+            otherEvents: prepareEnrollmentEventsForRulesEngine(apiOtherEvents),
             enrollmentData: getEnrollmentForRulesEngine(enrollment),
             attributeValues: getAttributeValuesForRulesEngine(attributeValues, program.attributes),
         });