Rossum Sheets: gracefully handle datetime

adeira · Jan 8, 2024 · 679edc7 · 679edc7
1 parent adec3a3
commit 679edc7
Show file tree

Hide file tree

Showing 5 changed files with 186 additions and 6 deletions.
diff --git a/src/rossum-sheets/src/__tests__/configs/currency.test.js b/src/rossum-sheets/src/__tests__/configs/currency.test.js
@@ -0,0 +1,38 @@
+// @flow
+
+import processRossumPayload from '../../processRossumPayload';
+import createMockPayload from '../createMockPayload';
+
+it('correctly deals with currencies', () => {
+  const config = {
+    sheets: {
+      headers: {
+        columns: { A: 'number_currency' },
+        formulas: [
+          {
+            fx: '=A1',
+            target: 'notes',
+          },
+        ],
+      },
+    },
+  };
+  const payload = createMockPayload(config);
+  expect(processRossumPayload(payload)).toMatchInlineSnapshot(`
+    {
+      "automation_blockers": [],
+      "messages": [],
+      "operations": [
+        {
+          "id": 9999,
+          "op": "replace",
+          "value": {
+            "content": {
+              "value": "42",
+            },
+          },
+        },
+      ],
+    }
+  `);
+});
diff --git a/src/rossum-sheets/src/__tests__/configs/datetime.test.js b/src/rossum-sheets/src/__tests__/configs/datetime.test.js
@@ -0,0 +1,108 @@
+// @flow
+
+import processRossumPayload from '../../processRossumPayload';
+import createMockPayload from '../createMockPayload';
+
+it('correctly replaces date values', () => {
+  const config = {
+    sheets: {
+      headers: {
+        columns: { A: 'number_date' },
+        formulas: [
+          {
+            fx: '=A1',
+            target: 'notes',
+          },
+        ],
+      },
+    },
+  };
+  const payload = createMockPayload(config);
+  expect(processRossumPayload(payload)).toMatchInlineSnapshot(`
+    {
+      "automation_blockers": [],
+      "messages": [],
+      "operations": [
+        {
+          "id": 9999,
+          "op": "replace",
+          "value": {
+            "content": {
+              "value": "2024-1-24",
+            },
+          },
+        },
+      ],
+    }
+  `);
+});
+
+it('correctly replaces datetime values', () => {
+  const config = {
+    sheets: {
+      headers: {
+        columns: { A: 'number_datetime' },
+        formulas: [
+          {
+            fx: '=A1',
+            target: 'notes',
+          },
+        ],
+      },
+    },
+  };
+  const payload = createMockPayload(config);
+  expect(processRossumPayload(payload)).toMatchInlineSnapshot(`
+    {
+      "automation_blockers": [],
+      "messages": [],
+      "operations": [
+        {
+          "id": 9999,
+          "op": "replace",
+          "value": {
+            "content": {
+              "value": "2024-1-24",
+            },
+          },
+        },
+      ],
+    }
+  `);
+});
+
+it('correctly replaces time values', () => {
+  const config = {
+    sheets: {
+      headers: {
+        columns: { A: 'number_time' },
+        formulas: [
+          {
+            fx: '=A1',
+            target: 'notes',
+          },
+        ],
+      },
+    },
+  };
+  const payload = createMockPayload(config);
+
+  // TODO: this is a bit unspecified I'd say:
+  expect(processRossumPayload(payload)).toMatchInlineSnapshot(`
+    {
+      "automation_blockers": [],
+      "messages": [],
+      "operations": [
+        {
+          "id": 9999,
+          "op": "replace",
+          "value": {
+            "content": {
+              "value": "0.516666666666667",
+            },
+          },
+        },
+      ],
+    }
+  `);
+});
diff --git a/src/rossum-sheets/src/__tests__/createMockPayload.js b/src/rossum-sheets/src/__tests__/createMockPayload.js
@@ -20,6 +20,41 @@ export default function createMockPayload(
             value: '1000',
           },
         },
+        {
+          id: 2000,
+          schema_id: 'number_currency',
+          content: {
+            value: '42USD',
+          },
+        },
+        {
+          id: 3000,
+          schema_id: 'number_percent',
+          content: {
+            value: '42USD',
+          },
+        },
+        {
+          id: 4000,
+          schema_id: 'number_date',
+          content: {
+            value: '2024-01-24',
+          },
+        },
+        {
+          id: 5000,
+          schema_id: 'number_datetime',
+          content: {
+            value: '2024-01-24 12:24',
+          },
+        },
+        {
+          id: 6000,
+          schema_id: 'number_time',
+          content: {
+            value: '12:24',
+          },
+        },
         {
           id: 9999,
           schema_id: 'notes',

diff --git a/src/rossum-sheets/src/createHyperFormulaInstance.js b/src/rossum-sheets/src/createHyperFormulaInstance.js
@@ -21,8 +21,8 @@ const options = {
   arrayColumnSeparator: ',',
   arrayRowSeparator: ';',
   caseSensitive: false,
-  currencySymbol: ['$', 'USD'],
-  dateFormats: ['MM/DD/YYYY', 'MM/DD/YY', 'YYYY/MM/DD'],
+  currencySymbol: ['$', 'USD'], // TODO: disable to prevent unexpected automatic detection (?)
+  dateFormats: ['MM/DD/YYYY', 'MM/DD/YY', 'YYYY/MM/DD'], // TODO: disable to prevent unexpected automatic detection (?)
   decimalSeparator: '.',
   evaluateNullToZero: false,
   functionArgSeparator: ',',
@@ -36,7 +36,7 @@ const options = {
   nullYear: 30,
   smartRounding: true,
   thousandSeparator: '',
-  timeFormats: ['hh:mm', 'hh:mm:ss.sss'],
+  timeFormats: ['hh:mm', 'hh:mm:ss.sss'], // TODO: disable to prevent unexpected automatic detection (?)
   useArrayArithmetic: true,
   useRegularExpressions: false,
   useWildcards: true,

diff --git a/src/rossum-sheets/src/processRossumPayload.js b/src/rossum-sheets/src/processRossumPayload.js
@@ -74,9 +74,8 @@ export default function processRossumPayload(
           } else if (hide != null) {
             operations.push(createReplaceOperation(targetDatapoint, null, false));
           }
-        } else if (cellType === 'NUMBER_DATE') {
-          // Otherwise replace date value (as an ISO string)
-          // TODO: support other cell types as well?
+        } else if (cellType === 'NUMBER_DATE' || cellType === 'NUMBER_DATETIME') {
+          // Otherwise replace date value (as short ISO string)
           const { year, month, day } = hfInstance.numberToDate(cellValue);
           operations.push(createReplaceOperation(targetDatapoint, `${year}-${month}-${day}`));
         } else {