From 4565774669bc3c1b11cc726d577946953dbe53c5 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 14 Feb 2023 08:59:27 +0100
Subject: Fix retrying update on sql serialization conflict

---
 server/helpers/database-utils.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'server/helpers')

diff --git a/server/helpers/database-utils.ts b/server/helpers/database-utils.ts
index 627381086..0e6b35503 100644
--- a/server/helpers/database-utils.ts
+++ b/server/helpers/database-utils.ts
@@ -78,10 +78,8 @@ function updateInstanceWithAnother <M, T extends U, U extends Model<M>> (instanc
   }
 }
 
-function resetSequelizeInstance (instance: Model<any>, savedFields: object) {
-  Object.keys(savedFields).forEach(key => {
-    instance[key] = savedFields[key]
-  })
+function resetSequelizeInstance <T> (instance: Model<T>) {
+  instance.set(instance.previous())
 }
 
 function filterNonExistingModels <T extends { hasSameUniqueKeysThan (other: T): boolean }> (
-- 
cgit v1.2.3