From 452383c5a0f4d63b494abc67cf16ad93f3dcff8c Mon Sep 17 00:00:00 2001
From: Simona Domnisoru <simona.domnisoru@gmail.com>
Date: Fri, 1 Dec 2023 11:31:26 +0100
Subject: [PATCH] chore: check currentEvent occurredAt property

---
 .../VariableService/helpers/structureEvents.js |  6 +++---
 .../ruleEffectsForEventProgram.test.js         | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/rules-engine/src/services/VariableService/helpers/structureEvents.js b/packages/rules-engine/src/services/VariableService/helpers/structureEvents.js
index c1dc66b3f1..079b48da11 100644
--- a/packages/rules-engine/src/services/VariableService/helpers/structureEvents.js
+++ b/packages/rules-engine/src/services/VariableService/helpers/structureEvents.js
@@ -38,9 +38,9 @@ export const getStructureEvents = (compareDates: CompareDates) => {
                     event.eventId !== currentEvent.eventId,
             );
 
-        const events = [...otherEventsFiltered, ...(Object.keys(currentEvent).length !== 0 ? [currentEvent] : [])]
-            .sort(compareEvents);
+        const events = currentEvent.occurredAt ? otherEventsFiltered.concat(currentEvent) : otherEventsFiltered;
+        const sortedEvents = events.sort(compareEvents);
 
-        return createEventsContainer(events);
+        return createEventsContainer(sortedEvents);
     };
 };
diff --git a/src/core_modules/capture-core/rules/__tests__/ruleEffectsForEventProgram.test.js b/src/core_modules/capture-core/rules/__tests__/ruleEffectsForEventProgram.test.js
index 215b2a8ea0..1a6a3f05cf 100644
--- a/src/core_modules/capture-core/rules/__tests__/ruleEffectsForEventProgram.test.js
+++ b/src/core_modules/capture-core/rules/__tests__/ruleEffectsForEventProgram.test.js
@@ -80,7 +80,7 @@ describe('Event Event rules engine', () => {
 
     describe.each([
         [
-            { vANAXwtLwcT: 0 },
+            { vANAXwtLwcT: 0, occurredAt: '2020-04-30T22:00:00.000Z' },
             [
                 {
                     id: 'vANAXwtLwcT',
@@ -92,15 +92,15 @@ describe('Event Event rules engine', () => {
             ],
         ],
         [
-            { vANAXwtLwcT: 9 },
+            { vANAXwtLwcT: 9, occurredAt: '2020-04-30T22:00:00.000Z' },
             [{ id: 'Ok9OQpitjQr', targetDataType: rulesEngineEffectTargetDataTypes.DATA_ELEMENT, type: 'HIDEFIELD' }],
         ],
         [
-            { vANAXwtLwcT: 99 },
+            { vANAXwtLwcT: 99, occurredAt: '2020-04-30T22:00:00.000Z' },
             [{ id: 'Ok9OQpitjQr', targetDataType: rulesEngineEffectTargetDataTypes.DATA_ELEMENT, type: 'HIDEFIELD' }],
         ],
         [
-            { vANAXwtLwcT: 100 },
+            { vANAXwtLwcT: 100, occurredAt: '2020-04-30T22:00:00.000Z' },
             [
                 {
                     id: 'vANAXwtLwcT',
@@ -127,7 +127,7 @@ describe('Event Event rules engine', () => {
 
     describe.each([
         [
-            { sWoqcoByYmD: true },
+            { sWoqcoByYmD: true, occurredAt: '2020-04-30T22:00:00.000Z' },
             [
                 {
                     id: 'vANAXwtLwcT',
@@ -138,7 +138,7 @@ describe('Event Event rules engine', () => {
             ],
         ],
         [
-            { sWoqcoByYmD: false },
+            { sWoqcoByYmD: false, occurredAt: '2020-04-30T22:00:00.000Z' },
             [
                 {
                     id: 'vANAXwtLwcT',
@@ -269,7 +269,7 @@ describe('Event rules engine', () => {
 
     describe.each([
         [
-            { oZg33kd9taw: 'Female', SWfdB5lX0fk: null },
+            { oZg33kd9taw: 'Female', SWfdB5lX0fk: null, occurredAt: '2020-04-30T22:00:00.000Z' },
             [
                 {
                     displayKeyValuePair: { id: 'x7PaHGvgWY2', key: 'BMI', value: '' },
@@ -279,7 +279,7 @@ describe('Event rules engine', () => {
             ],
         ],
         [
-            { oZg33kd9taw: 'Male', SWfdB5lX0fk: null },
+            { oZg33kd9taw: 'Male', SWfdB5lX0fk: null, occurredAt: '2020-04-30T22:00:00.000Z' },
             [
                 { id: 'SWfdB5lX0fk', targetDataType: rulesEngineEffectTargetDataTypes.DATA_ELEMENT, type: 'HIDEFIELD' },
                 {
@@ -290,7 +290,7 @@ describe('Event rules engine', () => {
             ],
         ],
         [
-            { oZg33kd9taw: null, SWfdB5lX0fk: null },
+            { oZg33kd9taw: null, SWfdB5lX0fk: null, occurredAt: '2020-04-30T22:00:00.000Z' },
             [
                 {
                     displayKeyValuePair: { id: 'x7PaHGvgWY2', key: 'BMI', value: '' },