From bdf5dd6e3c4e334b44a65a254220cdf239eab0f6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 13 Dec 2023 13:48:22 +0100
Subject: [PATCH] refs #2051 feat: restore dms methods

---
 back/methods/dms/removeFile.js | 15 +++++----------
 back/methods/dms/uploadFile.js | 15 +--------------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/back/methods/dms/removeFile.js b/back/methods/dms/removeFile.js
index cb81ff3220..a9ff368834 100644
--- a/back/methods/dms/removeFile.js
+++ b/back/methods/dms/removeFile.js
@@ -34,25 +34,20 @@ module.exports = Self => {
         }
 
         try {
-            let modelDms = null;
-            if (myOptions.model) {
-                modelDms = await models[myOptions.model].findById(id, null, myOptions);
-                id = modelDms.dmsFk;
-            }
-            const targetDms = await models.Dms.findById(id, null, myOptions);
+            const dms = await models.Dms.findById(id, null, myOptions);
             const trashDmsType = await models.DmsType.findOne({
                 where: {code: 'trash'}
             }, myOptions);
 
-            const hasWriteRole = await models.DmsType.hasWriteRole(ctx, targetDms.dmsTypeFk, myOptions);
+            const hasWriteRole = await models.DmsType.hasWriteRole(ctx, dms.dmsTypeFk, myOptions);
             if (!hasWriteRole)
                 throw new UserError(`You don't have enough privileges`);
 
-            await targetDms.updateAttribute('dmsTypeFk', trashDmsType.id, myOptions);
+            await dms.updateAttribute('dmsTypeFk', trashDmsType.id, myOptions);
 
             if (tx) await tx.commit();
-            if (modelDms) modelDms.destroy(myOptions);
-            return targetDms;
+
+            return dms;
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;
diff --git a/back/methods/dms/uploadFile.js b/back/methods/dms/uploadFile.js
index abed95a3a6..a4212b8047 100644
--- a/back/methods/dms/uploadFile.js
+++ b/back/methods/dms/uploadFile.js
@@ -96,21 +96,8 @@ module.exports = Self => {
             }
 
             if (tx) await tx.commit();
-            const promises = [];
-            const {model, create} = myOptions;
-            addedDms.forEach(dms => {
-                const newDms = models[model].create({
-                    ...create,
-                    dmsFk: dms.id
-                }, myOptions);
 
-                promises.push(newDms);
-            });
-            const resolvedPromises = await Promise.all(promises);
-
-            // if (tx) await tx.commit();
-
-            return resolvedPromises;
+            return addedDms;
         } catch (e) {
             if (tx) await tx.rollback();