Merge pull request #180 from CovOpen/DanielHabenicht-patch-2

fix: return null instead of empty string
CovOpen · Apr 19, 2021 · 92affd4 · 92affd4
2 parents b0e598e + 3755d5b
commit 92affd4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/covquestions-js/src/questionnaireEngine.test.ts b/covquestions-js/src/questionnaireEngine.test.ts
@@ -331,7 +331,7 @@ describe("questionnaireEngine", () => {
       const engine = new QuestionnaireEngine(testQuestionnaire);
       const result = engine.getVariables();
 
-      expect(result["converted_date"]).toEqual("");
+      expect(result["converted_date"]).toEqual(null);
     });
   });
 

diff --git a/covquestions-js/src/questionnaireEngine.ts b/covquestions-js/src/questionnaireEngine.ts
@@ -363,9 +363,9 @@ export class QuestionnaireEngine {
     function convertToDateString(
       timestamp?: LogicExpression,
       dateFormat?: LogicExpression
-    ): string {
+    ): string | null {
       if (!timestamp || !dateFormat) {
-        return "";
+        return null;
       }
       const timestampInMilliseconds = parseInt(timestamp.toString()) * 1000;
       return dayjs(timestampInMilliseconds).format(dateFormat.toString());