O3-2476 - isOmrsDateStrict should accept dates with negative timezone…

… offsets (openmrs#785)
mccarthyaaron · Oct 10, 2023 · dde85c6 · dde85c6
1 parent 82616de
commit dde85c6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/packages/framework/esm-utils/src/omrs-dates.test.ts b/packages/framework/esm-utils/src/omrs-dates.test.ts
@@ -22,6 +22,7 @@ describe("Openmrs Dates", () => {
   it("checks if a string is openmrs date", () => {
     expect(isOmrsDateStrict("2018-03-19T00:00:00.000+0300")).toEqual(true);
     expect(isOmrsDateStrict(" 2018-03-19T00:00:00.000+0300 ")).toEqual(true);
+    expect(isOmrsDateStrict("2023-10-06T12:56:56.065-0400")).toEqual(true);
     // the exclusion test cases are important for strictness
     expect(isOmrsDateStrict("2018-03-19 00:00:00.000+0300")).toEqual(false);
     expect(isOmrsDateStrict("2018-03-19T00:00:00.000+03:00")).toEqual(false);

diff --git a/packages/framework/esm-utils/src/omrs-dates.ts b/packages/framework/esm-utils/src/omrs-dates.ts
@@ -50,7 +50,7 @@ export function isOmrsDateStrict(omrsPayloadString: string): boolean {
   }
 
   // checking UTC offset format
-  if (!(omrsPayloadString[23] === "+" && omrsPayloadString[26] !== ":")) {
+  if (!(omrsPayloadString[23] === "+" || omrsPayloadString[23] === "-")) {
     return false;
   }