fix: avoid invalid dates in getQuestion. Catch errors from mapping.

EyeSeeTea · Dec 20, 2024 · 04e4510 · 04e4510
1 parent d309583
commit 04e4510
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 12 deletions.
diff --git a/i18n/en.pot b/i18n/en.pot
@@ -5,8 +5,11 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-05-23T16:02:03.207Z\n"
-"PO-Revision-Date: 2024-05-23T16:02:03.207Z\n"
+"POT-Creation-Date: 2024-12-20T16:08:06.715Z\n"
+"PO-Revision-Date: 2024-12-20T16:08:06.715Z\n"
+
+msgid "There was an error processing the form"
+msgstr ""
 
 msgid "Facilities"
 msgstr ""

diff --git a/i18n/es.po b/i18n/es.po
@@ -1,13 +1,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-05-22T13:24:01.336Z\n"
+"POT-Creation-Date: 2024-12-20T16:08:06.715Z\n"
 "PO-Revision-Date: 2018-10-25T09:02:35.143Z\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+msgid "There was an error processing the form"
+msgstr ""
+
 msgid "Facilities"
 msgstr ""
 

diff --git a/src/data/utils/questionHelper.ts b/src/data/utils/questionHelper.ts
@@ -38,6 +38,7 @@ import {
 import _ from "../../domain/entities/generic/Collection";
 import { D2TrackerEvent } from "@eyeseetea/d2-api/api/trackerEvents";
 import { D2TrackerTrackedEntity as TrackedEntity } from "@eyeseetea/d2-api/api/trackerTrackedEntities";
+import { isValidDate } from "../../utils/dates";
 
 const SPECIES_QUESTION_FORNAME = "Specify the specie";
 const ANTIBIOTIC_QUESTION_FORNAME = "Specify the antibiotic";
@@ -173,7 +174,7 @@ export const getQuestion = (
             const dateQ: DateQuestion = {
                 ...base,
                 type: "date",
-                value: dataValue ? new Date(dataValue) : undefined,
+                value: parseQuestionDate(dataValue, base),
             };
             return dateQ;
         }
@@ -182,13 +183,25 @@ export const getQuestion = (
             const dateQ: DateTimeQuestion = {
                 ...base,
                 type: "datetime",
-                value: dataValue ? new Date(dataValue) : undefined,
+                value: parseQuestionDate(dataValue, base),
             };
             return dateQ;
         }
     }
 };
 
+const parseQuestionDate = (
+    dateStr: string | undefined,
+    question: QuestionBase
+): Date | undefined => {
+    if (!dateStr) return undefined;
+    const result = isValidDate(new Date(dateStr)) ? new Date(dateStr) : undefined;
+    if (dateStr && !result) {
+        console.debug(`Invalid date value: ${dateStr}`, question);
+    }
+    return result;
+};
+
 export const mapQuestionsToDataValues = (questions: Question[]): DataValue[] => {
     const dataValues = _(
         questions.map(question => {

diff --git a/src/data/utils/surveyFormMappers.ts b/src/data/utils/surveyFormMappers.ts
@@ -42,6 +42,7 @@ import {
 } from "@eyeseetea/d2-api/api/trackerEnrollments";
 import { DataValue } from "@eyeseetea/d2-api";
 import { generateUid } from "../../utils/uid";
+import i18n from "../../utils/i18n";
 
 const AntibioticTreatmentHospitalEpisodeSectionName =
     `Antibiotic treatments during hospital episode`.toLowerCase();
@@ -294,7 +295,12 @@ export const mapQuestionnaireToEvent = (
         stages.sections.flatMap(section => section.questions)
     );
 
-    const dataValues = mapQuestionsToDataValues(questions);
+    let dataValues: DataValue[] = [];
+    try {
+        dataValues = mapQuestionsToDataValues(questions);
+    } catch (error) {
+        return Future.error(new Error(i18n.t("There was an error processing the form")));
+    }
 
     if (eventId) {
         return getEventProgramById(eventId, api).flatMap(event => {
@@ -323,13 +329,12 @@ export const mapQuestionnaireToEvent = (
     }
 };
 
-export const mapQuestionnaireToTrackedEntities = (
+const mapQuestionnaireToEventsByStage = (
     questionnaire: Questionnaire,
     orgUnitId: string,
-    programId: Id,
-    teiId: string | undefined = undefined
-): FutureData<{ trackedEntities: TrackedEntity[] }> => {
-    const eventsByStage: D2TrackerEvent[] = questionnaire.stages.map(stage => {
+    programId: Id
+): D2TrackerEvent[] => {
+    return questionnaire.stages.map(stage => {
         const dataValuesByStage = stage.sections.flatMap(section => {
             return mapQuestionsToDataValues(section.questions);
         });
@@ -339,11 +344,25 @@ export const mapQuestionnaireToTrackedEntities = (
             event: stage.instanceId ?? "",
             programStage: stage.code,
             orgUnit: orgUnitId,
-            dataValues: dataValuesByStage as DataValue[],
+            dataValues: dataValuesByStage,
             occurredAt: new Date().getTime().toString(),
             status: "ACTIVE",
         };
     });
+};
+
+export const mapQuestionnaireToTrackedEntities = (
+    questionnaire: Questionnaire,
+    orgUnitId: string,
+    programId: Id,
+    teiId: string | undefined = undefined
+): FutureData<{ trackedEntities: TrackedEntity[] }> => {
+    let eventsByStage: D2TrackerEvent[] = [];
+    try {
+        eventsByStage = mapQuestionnaireToEventsByStage(questionnaire, orgUnitId, programId);
+    } catch (error) {
+        return Future.error(new Error(i18n.t("There was an error processing the form")));
+    }
 
     const attributes: D2TrackerEnrollmentAttribute[] = questionnaire.entity
         ? questionnaire.entity.questions.map(question => {

diff --git a/src/utils/dates.ts b/src/utils/dates.ts
@@ -0,0 +1 @@
+export const isValidDate = (date: Date): boolean => !Number.isNaN(date.getTime());
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export const isValidDate = (date: Date): boolean => !Number.isNaN(date.getTime());