#1430 | Throw rule failure if visits are scheduled without earliestVi…

…sitDateTime Return empty array instead of pre-existing visits if error occurs during visit schedule rule execution Check for null before converting toISTDate
avniproject · Jun 17, 2024 · e29d825 · e29d825
1 parent a326c38
commit e29d825
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/packages/openchs-android/package-lock.json b/packages/openchs-android/package-lock.json
diff --git a/packages/openchs-android/src/service/RuleEvaluationService.js b/packages/openchs-android/src/service/RuleEvaluationService.js
@@ -464,9 +464,10 @@ class RuleEvaluationService extends BaseService {
                     params: _.merge({visitSchedule: scheduledVisits, entity, entityContext, services: this.services}, this.getCommonParams()),
                     imports: getImports()
                 });
+                this.checkIfScheduledVisitsAreValid(nextVisits);
                 return nextVisits;
             } catch (e) {
-                General.logDebug("Rule-Failure", `New enrolment decision failed for form: ${form.uuid}`);
+                General.logDebug("Rule-Failure", `Visit Schedule failed for form: ${form.uuid}`);
                 this.saveFailedRules(e, form.uuid, this.getIndividualUUID(entity, entityName));
             }
         } else {
@@ -476,9 +477,21 @@ class RuleEvaluationService extends BaseService {
                     return this.runRuleAndSaveFailure(rule, entityName, entity, schedule, visitScheduleConfig, null, entityContext);
                 }, scheduledVisits);
             General.logDebug("RuleEvaluationService - Next Visits", nextVisits);
-            return nextVisits;
+            try {
+                this.checkIfScheduledVisitsAreValid(nextVisits);
+                return nextVisits;
+            } catch(e) {
+                General.logDebug("Rule-Failure", `Visit Schedule (old) failed for form: ${form.uuid}`);
+                this.saveFailedRules(e, form.uuid, this.getIndividualUUID(entity, entityName));
+            }
+        }
+        return defaultVisitSchedule;
+    }
+
+    checkIfScheduledVisitsAreValid(nextVisits) {
+        if (nextVisits.map(visit => _.isNil(visit.earliestVisitDateTime)).length > 0) {
+            throw new Error("Visit(s) scheduled without earliestVisitDateTime");
         }
-        return scheduledVisits;
     }
 
     getChecklists(entity, entityName, defaultChecklists = []) {

diff --git a/packages/openchs-android/src/utility/General.js b/packages/openchs-android/src/utility/General.js
@@ -202,7 +202,7 @@ class General {
     }
 
     static toISTDate(x) {
-        if (x.toString().includes("18:30:00"))
+        if (x && x.toString().includes("18:30:00"))
             return moment(x).add(330, "m").toDate();
         return x;
     }