fix date field in sqlite

MoveOnOrg · Jan 24, 2020 · c4cbf3c · c4cbf3c
1 parent 05ebfe9
commit c4cbf3c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/components/MessageList.jsx b/src/components/MessageList.jsx
@@ -49,7 +49,7 @@ const MessageList = function MessageList(props) {
           style={message.isFromContact ? styles.received : styles.sent}
           key={message.id}
           primaryText={message.text}
-          secondaryText={moment(message.createdAt).fromNow()}
+          secondaryText={moment.utc(message.createdAt).fromNow()}
         />
       ))}
       {optOutItem}

diff --git a/src/server/api/lib/utils.js b/src/server/api/lib/utils.js
@@ -7,7 +7,13 @@ export function mapFieldsToModel(fields, model) {
     const snakeKey = humps.decamelize(field, { separator: "_" });
     // eslint-disable-next-line no-underscore-dangle
     if (model._schema._schema.hasOwnProperty(snakeKey)) {
-      resolvers[field] = instance => instance[snakeKey];
+      if (/At$/.test(field)) {
+        // force a Date-type: esp. important for sqlite
+        resolvers[field] = instance =>
+          instance[snakeKey] ? new Date(instance[snakeKey]) : null;
+      } else {
+        resolvers[field] = instance => instance[snakeKey];
+      }
     } else {
       // eslint-disable-next-line no-underscore-dangle
       throw new Error(