test: improve rules engine coverage

dhis2 · Nov 10, 2023 · 296c1be · 296c1be
1 parent 1a127c2
commit 296c1be
Show file tree

Hide file tree

Showing 13 changed files with 5,222 additions and 5,427 deletions.
diff --git a/package.json b/package.json
@@ -95,7 +95,7 @@
         "@babel/preset-react": "^7.16.7",
         "@badeball/cypress-cucumber-preprocessor": "17.2.1",
         "@cypress/webpack-preprocessor": "^6.0.0",
-        "@dhis2/cli-app-scripts": "^9.0.1",
+        "@dhis2/cli-app-scripts": "^10.3.10",
         "@dhis2/cli-helpers-engine": "^3.2.1",
         "@dhis2/cli-style": "^10.4.1",
         "@dhis2/cli-utils-cypress": "^9.0.2",

diff --git a/packages/rules-engine/src/RulesEngine.js b/packages/rules-engine/src/RulesEngine.js
@@ -1,6 +1,6 @@
 // @flow
 import log from 'loglevel';
-import { VariableService } from './services/VariableService/VariableService';
+import { VariableService } from './services/VariableService';
 import { ValueProcessor } from './processors/ValueProcessor';
 import { executeExpression } from './services/expressionService';
 import { getD2Functions } from './d2Functions';

diff --git a/packages/rules-engine/src/helpers/previousValueCheck.js b/packages/rules-engine/src/helpers/previousValueCheck.js
@@ -59,7 +59,7 @@ export const getOutputEffectsWithPreviousValueCheck = ({
     onProcessValue: (value: any, type: $Values<typeof typeKeys>) => any,
 }) =>
     outputEffects.reduce((acc, outputEffect) => {
-        if (formValues && outputEffect.targetDataType) {
+        if (formValues && Object.keys(formValues).length !== 0 && outputEffect.targetDataType) {
             const formValue = formValues[outputEffect.id];
             const rawValue = mapByTargetDataTypes[outputEffect.targetDataType]({
                 dataElementId,

diff --git a/packages/rules-engine/src/processors/rulesEffectsProcessor/rulesEffectsProcessor.js b/packages/rules-engine/src/processors/rulesEffectsProcessor/rulesEffectsProcessor.js
@@ -296,26 +296,23 @@ export function getRulesEffectsProcessor(
         formValues,
         onProcessValue,
     }: {
-        effects: ?Array<ProgramRuleEffect>,
+        effects: Array<ProgramRuleEffect>,
         dataElements: ?DataElements,
         trackedEntityAttributes: ?TrackedEntityAttributes,
         formValues?: ?{ [key: string]: any },
         onProcessValue: (value: any, type: $Values<typeof typeKeys>) => any,
     }): OutputEffects {
-        if (effects) {
-            return effects
-                .filter(({ action }) => mapActionsToProcessor[action])
-                .flatMap(effect => mapActionsToProcessor[effect.action](
-                    effect,
-                    dataElements,
-                    trackedEntityAttributes,
-                    formValues,
-                    onProcessValue,
-                ))
-            // when mapActionsToProcessor function returns `null` we filter those value out.
-                .filter(keepTruthyValues => keepTruthyValues);
-        }
-        return [];
+        return effects
+            .filter(({ action }) => mapActionsToProcessor[action])
+            .flatMap(effect => mapActionsToProcessor[effect.action](
+                effect,
+                dataElements,
+                trackedEntityAttributes,
+                formValues,
+                onProcessValue,
+            ))
+        // when mapActionsToProcessor function returns `null` we filter those value out.
+            .filter(keepTruthyValues => keepTruthyValues);
     }
 
     return processRulesEffects;

diff --git a/packages/rules-engine/src/services/VariableService/helpers/structureEvents.js b/packages/rules-engine/src/services/VariableService/helpers/structureEvents.js
@@ -38,7 +38,7 @@ export const getStructureEvents = (compareDates: CompareDates) => {
                     event.eventId !== currentEvent.eventId,
             );
 
-        const events = [...otherEventsFiltered, currentEvent]
+        const events = [...otherEventsFiltered, ...(Object.keys(currentEvent).length !== 0 ? [currentEvent] : [])]
             .sort(compareEvents);
 
         return createEventsContainer(events);

diff --git a/...core/rules/__tests__/__snapshots__/getApplicableRuleEffectsForTrackerProgram.test.js.snap b/...core/rules/__tests__/__snapshots__/getApplicableRuleEffectsForTrackerProgram.test.js.snap
@@ -125,7 +125,7 @@ Object {
   "trackedEntityAttributes": Object {
     "lZGmxYbs96q": Object {
       "id": "lZGmxYbs96q",
-      "optionSetId": undefined,
+      "optionSetId": "optionSet",
       "valueType": "DATE",
     },
     "lZGmxYbs97q": Object {

diff --git a/...re_modules/capture-core/rules/__tests__/getApplicableRuleEffectsForTrackerProgram.test.js b/...re_modules/capture-core/rules/__tests__/getApplicableRuleEffectsForTrackerProgram.test.js
@@ -1,3 +1,4 @@
+import { variableSourceTypes } from '@dhis2/rules-engine-javascript';
 import {
     TrackerProgram,
     ProgramStage,
@@ -122,6 +123,7 @@ describe('getApplicableRuleEffectsForTrackerProgram', () => {
                 element3.id = 'lZGmxYbs96q';
                 element3.name = 'SomeDate';
                 element3.type = dataElementTypes.DATE;
+                element3.optionSet = { id: 'optionSet', name: 'optionSet', code: 'optionSet' };
             }),
             new DataElement((element4) => {
                 element4.id = 'w75KJ2mc4zz';
@@ -136,23 +138,23 @@ describe('getApplicableRuleEffectsForTrackerProgram', () => {
                 displayName: 'Test',
                 id: 'PUQZWgmQ0jx',
                 programId: 'IpHINAT79UW',
-                programRuleVariableSourceType: 'DATAELEMENT_NEWEST_EVENT_PROGRAM',
+                programRuleVariableSourceType: variableSourceTypes.DATAELEMENT_NEWEST_EVENT_PROGRAM,
                 useNameForOptionSet: true,
             },
             {
                 dataElementId: 'H6uSAMO5WLD',
                 displayName: 'apgarcomment',
                 id: 'aKpfPKSRQnv',
                 programId: 'IpHINAT79UW',
-                programRuleVariableSourceType: 'DATAELEMENT_NEWEST_EVENT_PROGRAM',
+                programRuleVariableSourceType: variableSourceTypes.DATAELEMENT_NEWEST_EVENT_PROGRAM,
                 useNameForOptionSet: true,
             },
             {
                 dataElementId: 'a3kGcGDCuk6',
                 displayName: 'apgarscore',
                 id: 'g2GooOydipB',
                 programId: 'IpHINAT79UW',
-                programRuleVariableSourceType: 'DATAELEMENT_NEWEST_EVENT_PROGRAM',
+                programRuleVariableSourceType: variableSourceTypes.DATAELEMENT_NEWEST_EVENT_PROGRAM,
                 useNameForOptionSet: true,
             },
         ];
@@ -236,4 +238,36 @@ describe('getApplicableRuleEffectsForTrackerProgram', () => {
 
         expect(Array.isArray(effects)).toBe(true);
     });
+
+    test('RulesEngine called without programRules', () => {
+        const effects = getApplicableRuleEffectsForTrackerProgram({
+            program: new TrackerProgram((initProgram) => {
+                initProgram.programRules = [];
+            }),
+            stage: new ProgramStage((stage) => {
+                stage.programRules = [];
+            }),
+            orgUnit,
+            currentEvent,
+            otherEvents,
+            attributeValues,
+            enrollmentData,
+        });
+
+        expect(effects).toStrictEqual([]);
+    });
+
+    test('currentEvent without a programStageId', () => {
+        const effects = getApplicableRuleEffectsForTrackerProgram({
+            program,
+            stage: programStage,
+            orgUnit,
+            currentEvent: {},
+            otherEvents,
+            attributeValues,
+            enrollmentData,
+        });
+
+        expect(effects.DISPLAYTEXT).toBeDefined();
+    });
 });
diff --git a/...ore_modules/capture-core/rules/__tests__/getApplicableRulesEffectsForEventProgram.test.js b/...ore_modules/capture-core/rules/__tests__/getApplicableRulesEffectsForEventProgram.test.js
@@ -1,3 +1,4 @@
+import { variableSourceTypes } from '@dhis2/rules-engine-javascript';
 import {
     EventProgram,
     ProgramStage,
@@ -78,23 +79,23 @@ describe('getApplicableRuleEffectsForEventProgram', () => {
                 displayName: 'Test',
                 id: 'PUQZWgmQ0jx',
                 programId: 'IpHINAT79UW',
-                programRuleVariableSourceType: 'DATAELEMENT_NEWEST_EVENT_PROGRAM',
+                programRuleVariableSourceType: variableSourceTypes.DATAELEMENT_NEWEST_EVENT_PROGRAM,
                 useNameForOptionSet: true,
             },
             {
                 dataElementId: 'H6uSAMO5WLD',
                 displayName: 'apgarcomment',
                 id: 'aKpfPKSRQnv',
                 programId: 'IpHINAT79UW',
-                programRuleVariableSourceType: 'DATAELEMENT_NEWEST_EVENT_PROGRAM',
+                programRuleVariableSourceType: variableSourceTypes.DATAELEMENT_NEWEST_EVENT_PROGRAM,
                 useNameForOptionSet: true,
             },
             {
                 dataElementId: 'a3kGcGDCuk6',
                 displayName: 'apgarscore',
                 id: 'g2GooOydipB',
                 programId: 'IpHINAT79UW',
-                programRuleVariableSourceType: 'DATAELEMENT_NEWEST_EVENT_PROGRAM',
+                programRuleVariableSourceType: variableSourceTypes.DATAELEMENT_NEWEST_EVENT_PROGRAM,
                 useNameForOptionSet: true,
             },
         ];
@@ -146,4 +147,16 @@ describe('getApplicableRuleEffectsForEventProgram', () => {
 
         expect(effects.DISPLAYTEXT).toBeDefined();
     });
+
+    test('RulesEngine called without programRules', () => {
+        const effects = getApplicableRuleEffectsForEventProgram({
+            program: new EventProgram((initProgram) => {
+                initProgram.programRules = [];
+            }),
+            orgUnit,
+            currentEvent,
+        });
+
+        expect(effects).toStrictEqual([]);
+    });
 });