fix: return an either

EyeSeeTea · Nov 4, 2024 · 39474f9 · 39474f9
1 parent 7e0dd8f
commit 39474f9
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 60 deletions.
diff --git a/src/data/entities/D2ExpressionParser.ts b/src/data/entities/D2ExpressionParser.ts
@@ -1,5 +1,6 @@
 import * as xp from "@dhis2/expression-parser";
 import _c from "../../domain/entities/generic/Collection";
+import { Either } from "../../domain/entities/generic/Either";
 
 export type ProgramRuleVariableType = "text" | "number" | "date" | "boolean";
 
@@ -20,49 +21,60 @@ export class D2ExpressionParser {
     public evaluateRuleEngineCondition(
         ruleCondtion: string,
         ruleVariables: Map<ProgramRuleVariableName, ProgramRuleVariableValue>
-    ): boolean {
-        const expressionParser = new xp.ExpressionJs(
-            ruleCondtion,
-            xp.ExpressionMode.RULE_ENGINE_CONDITION
-        );
+    ): Either<Error, boolean> {
+        try {
+            const expressionParser = new xp.ExpressionJs(
+                ruleCondtion,
+                xp.ExpressionMode.RULE_ENGINE_CONDITION
+            );
+
+            //Mapper function for program rule variables
+            const variables = expressionParser.collectProgramRuleVariableNames();
 
-        //Mapper function for program rule variables
-        const variables = expressionParser.collectProgramRuleVariableNames();
+            const variablesValueMap = this.mapProgramVariables(variables, ruleVariables);
 
-        const variablesValueMap = this.mapProgramVariables(variables, ruleVariables);
+            const variablesMap = new Map(
+                variablesValueMap.map(variable => [variable.programRuleVariable, variable.value])
+            );
 
-        const variablesMap = new Map(
-            variablesValueMap.map(variable => [variable.programRuleVariable, variable.value])
-        );
+            //TO DO : use switch instead of If
 
-        // const programVariables = expressionParser.collectProgramVariablesNames();
-        // const programVariablesValues = _c(
-        //     programVariables.map(programVariable => {
-        //         if (programVariable === "current_date")
-        //             return {
-        //                 programVariable: xp.ProgramVariable.current_date.name,
-        //                 value: new Date(),
-        //             };
-        //     })
-        // )
-        //     .compact()
-        //     .value();
-        // const programVariablesMap = new Map(
-        //     programVariablesValues.map(a => [a.programVariable, a.value])
-        // );
-        const expressionData = new xp.ExpressionDataJs(
-            variablesMap,
-            undefined,
-            undefined,
-            undefined,
-            undefined
-        );
+            // const programVariables = expressionParser.collectProgramVariablesNames();
+            // const programVariablesValues = _c(
+            //     programVariables.map(programVariable => {
+            //
+            //         if (programVariable === "current_date")
+            //             return {
+            //                 programVariable: xp.ProgramVariable.current_date.name,
+            //                 value: new Date(),
+            //             };
+            //     })
+            // )
+            //     .compact()
+            //     .value();
+            // const programVariablesMap = new Map(
+            //     programVariablesValues.map(a => [a.programVariable, a.value])
+            // );
+            const expressionData = new xp.ExpressionDataJs(
+                variablesMap,
+                undefined,
+                undefined,
+                undefined,
+                undefined
+            );
 
-        const parsedResult: boolean = expressionParser.evaluate(
-            () => console.debug(""),
-            expressionData
-        );
-        return parsedResult;
+            const parsedResult: boolean = expressionParser.evaluate(
+                () => console.debug(""),
+                expressionData
+            );
+            return Either.success(parsedResult);
+        } catch (error) {
+            return Either.error(
+                new Error(
+                    `An error occurred while evaluating the rule in D2ExpressionParser::evaluateRuleEngineCondition: ${error}`
+                )
+            );
+        }
     }
 
     private getVariableValueByType = (

diff --git a/src/domain/entities/Questionnaire/QuestionnaireQuestion.ts b/src/domain/entities/Questionnaire/QuestionnaireQuestion.ts
@@ -234,27 +234,19 @@ export class QuestionnaireQuestion {
 
         const finalUpdatesWithSideEffects = allQuestionsRequiringUpdate.reduce(
             (acc, questionRequiringUpdate) => {
-                console.debug("updatedQuestion", updatedQuestion);
-                console.debug("questionRequiringUpdate", questionRequiringUpdate);
-                console.debug("acc", acc);
-
                 const currentApplicableRules = getApplicableRules(
                     questionRequiringUpdate,
                     questionnaire.rules,
                     acc
                 );
-                console.debug("rules", currentApplicableRules);
                 processedQuestions.push(questionRequiringUpdate);
-                console.debug("processedQuestions", processedQuestions);
                 const updates = this.updateQuestions(
                     processedQuestions,
                     acc,
                     questionRequiringUpdate,
                     currentApplicableRules,
                     questionnaire
                 );
-
-                console.debug("updates", updates);
                 return updates;
             },
             finalUpdatedQuestions

diff --git a/src/domain/entities/Questionnaire/QuestionnaireRules.ts b/src/domain/entities/Questionnaire/QuestionnaireRules.ts
@@ -127,19 +127,16 @@ function getProgramRuleVariableValues(
     return programRuleVariableValues;
 }
 
-const parseConditionWithExpressionParser = (rule: QuestionnaireRule, questions: Question[]) => {
-    try {
-        const programRuleVariableValues = getProgramRuleVariableValues(
-            rule.programRuleVariables,
-            questions
-        );
+const parseConditionWithExpressionParser = (
+    rule: QuestionnaireRule,
+    questions: Question[]
+): boolean => {
+    const programRuleVariableValues = getProgramRuleVariableValues(
+        rule.programRuleVariables,
+        questions
+    );
 
-        return new D2ExpressionParser().evaluateRuleEngineCondition(
-            rule.condition,
-            programRuleVariableValues
-        );
-    } catch (error) {
-        console.error(`Error parsing rule condition: ${rule.condition} with error : ${error}`);
-        return false;
-    }
+    return new D2ExpressionParser()
+        .evaluateRuleEngineCondition(rule.condition, programRuleVariableValues)
+        .match({ success: x => x, error: () => false });
 };