From 823c34c07fc0df81110098ee1032e9d3ed70b662 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 11 May 2023 15:02:53 +0200
Subject: Fix reset sequelize instance

---
 server/helpers/database-utils.ts | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'server/helpers')

diff --git a/server/helpers/database-utils.ts b/server/helpers/database-utils.ts
index 0e6b35503..da8fb0d54 100644
--- a/server/helpers/database-utils.ts
+++ b/server/helpers/database-utils.ts
@@ -70,16 +70,8 @@ function transactionRetryer <T> (func: (err: any, data: T) => any) {
 
 // ---------------------------------------------------------------------------
 
-function updateInstanceWithAnother <M, T extends U, U extends Model<M>> (instanceToUpdate: T, baseInstance: U) {
-  const obj = baseInstance.toJSON()
-
-  for (const key of Object.keys(obj)) {
-    instanceToUpdate[key] = obj[key]
-  }
-}
-
 function resetSequelizeInstance <T> (instance: Model<T>) {
-  instance.set(instance.previous())
+  return instance.reload()
 }
 
 function filterNonExistingModels <T extends { hasSameUniqueKeysThan (other: T): boolean }> (
@@ -113,7 +105,6 @@ export {
   resetSequelizeInstance,
   retryTransactionWrapper,
   transactionRetryer,
-  updateInstanceWithAnother,
   afterCommitIfTransaction,
   filterNonExistingModels,
   deleteAllModels,
-- 
cgit v1.2.3