From d386c82973b4e2e3a62caff094a2267998ec6ac4 Mon Sep 17 00:00:00 2001
From: Maksim Eltyshev <meltyshev@gmail.com>
Date: Mon, 12 Jun 2023 23:54:57 +0200
Subject: [PATCH] fix: Fix saving milliseconds for timestamps

---
 server/api/controllers/access-tokens/delete.js |  2 +-
 server/api/helpers/users/delete-one.js         |  2 +-
 server/api/helpers/users/update-one.js         |  2 +-
 server/config/models.js                        |  4 ++--
 server/db/seeds/default.js                     | 10 +++-------
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/server/api/controllers/access-tokens/delete.js b/server/api/controllers/access-tokens/delete.js
index a42b739e..e3889e2e 100644
--- a/server/api/controllers/access-tokens/delete.js
+++ b/server/api/controllers/access-tokens/delete.js
@@ -6,7 +6,7 @@ module.exports = {
       accessToken,
       deletedAt: null,
     }).set({
-      deletedAt: new Date().toUTCString(),
+      deletedAt: new Date().toISOString(),
     });
 
     return {
diff --git a/server/api/helpers/users/delete-one.js b/server/api/helpers/users/delete-one.js
index 3d855f98..94bceeb7 100644
--- a/server/api/helpers/users/delete-one.js
+++ b/server/api/helpers/users/delete-one.js
@@ -30,7 +30,7 @@ module.exports = {
       id: inputs.record.id,
       deletedAt: null,
     }).set({
-      deletedAt: new Date().toUTCString(),
+      deletedAt: new Date().toISOString(),
     });
 
     if (user) {
diff --git a/server/api/helpers/users/update-one.js b/server/api/helpers/users/update-one.js
index 26533da7..553cdf54 100644
--- a/server/api/helpers/users/update-one.js
+++ b/server/api/helpers/users/update-one.js
@@ -64,7 +64,7 @@ module.exports = {
     if (!_.isUndefined(values.password)) {
       Object.assign(values, {
         password: bcrypt.hashSync(values.password, 10),
-        passwordChangedAt: new Date().toUTCString(),
+        passwordChangedAt: new Date().toISOString(),
       });
 
       if (Object.keys(values).length === 1) {
diff --git a/server/config/models.js b/server/config/models.js
index 9ddc3ee3..6639b20a 100644
--- a/server/config/models.js
+++ b/server/config/models.js
@@ -80,13 +80,13 @@ module.exports.models = {
   },
 
   beforeCreate(valuesToSet, proceed) {
-    valuesToSet.createdAt = new Date().toUTCString(); // eslint-disable-line no-param-reassign
+    valuesToSet.createdAt = new Date().toISOString(); // eslint-disable-line no-param-reassign
 
     proceed();
   },
 
   beforeUpdate(valuesToSet, proceed) {
-    valuesToSet.updatedAt = new Date().toUTCString(); // eslint-disable-line no-param-reassign
+    valuesToSet.updatedAt = new Date().toISOString(); // eslint-disable-line no-param-reassign
 
     proceed();
   },
diff --git a/server/db/seeds/default.js b/server/db/seeds/default.js
index 1e52fb23..f1f81ecc 100644
--- a/server/db/seeds/default.js
+++ b/server/db/seeds/default.js
@@ -1,16 +1,12 @@
 const bcrypt = require('bcrypt');
 
-exports.seed = (knex) => {
-  const date = new Date().toUTCString();
-
-  return knex('user_account').insert({
+exports.seed = (knex) =>
+  knex('user_account').insert({
     email: 'demo@demo.demo',
     password: bcrypt.hashSync('demo', 10),
     isAdmin: true,
     name: 'Demo Demo',
     username: 'demo',
     subscribeToOwnCards: false,
-    createdAt: date,
-    updatedAt: date,
+    createdAt: new Date().toISOString(),
   });
-};