From 423ae852128fef840382044e056e2f704f9872b2 Mon Sep 17 00:00:00 2001
From: alexandre <alexandre@verdnatura.es>
Date: Wed, 8 Mar 2023 12:29:09 +0100
Subject: [PATCH] refs #4632 dmsRecover deprecated

---
 back/model-config.json                        |  3 --
 back/models/dms-recover.json                  | 37 -------------------
 db/changes/231001/.gitkeep                    |  0
 db/changes/{230801 => 231001}/00-delivery.sql |  2 +
 .../back/methods/ticket-dms/saveSign.js       | 31 ++--------------
 5 files changed, 6 insertions(+), 67 deletions(-)
 delete mode 100644 back/models/dms-recover.json
 delete mode 100644 db/changes/231001/.gitkeep
 rename db/changes/{230801 => 231001}/00-delivery.sql (98%)

diff --git a/back/model-config.json b/back/model-config.json
index 6724db151..29676e979 100644
--- a/back/model-config.json
+++ b/back/model-config.json
@@ -44,9 +44,6 @@
     "DmsType": {
         "dataSource": "vn"
     },
-    "DmsRecover": {
-        "dataSource": "vn"
-    },
     "Docuware": {
         "dataSource": "vn"
     },
diff --git a/back/models/dms-recover.json b/back/models/dms-recover.json
deleted file mode 100644
index 3449347a7..000000000
--- a/back/models/dms-recover.json
+++ /dev/null
@@ -1,37 +0,0 @@
-
-{
-    "name": "DmsRecover",
-    "description": "Documental Managment System Recover",
-    "base": "VnModel",
-    "log": {
-        "showField": "ticketFk"
-	},
-    "options": {
-        "mysql": {
-        "table": "dmsRecover"
-        }
-    },
-    "properties": {
-        "id": {
-            "type": "number",
-            "id": true,
-            "description": "Identifier"
-        },
-        "ticketFk": {
-            "type": "number"
-        },
-        "sign": {
-            "type": "string"
-        },
-        "created": {
-            "type": "date"
-        }
-    },
-    "relations": {
-        "ticket": {
-            "type": "belongsTo",
-            "model": "Ticket",
-            "foreignKey": "ticketFk"
-        }
-    }
-}
diff --git a/db/changes/231001/.gitkeep b/db/changes/231001/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/db/changes/230801/00-delivery.sql b/db/changes/231001/00-delivery.sql
similarity index 98%
rename from db/changes/230801/00-delivery.sql
rename to db/changes/231001/00-delivery.sql
index 38c0a7971..06464b80f 100644
--- a/db/changes/230801/00-delivery.sql
+++ b/db/changes/231001/00-delivery.sql
@@ -1,3 +1,5 @@
+DROP TABLE `vn`.`dmsRecover`;
+
 ALTER TABLE `vn`.`delivery` DROP FOREIGN KEY delivery_FK;
 ALTER TABLE `vn`.`delivery` DROP COLUMN addressFk;
 ALTER TABLE `vn`.`delivery` ADD ticketFk INT NOT NULL;
diff --git a/modules/ticket/back/methods/ticket-dms/saveSign.js b/modules/ticket/back/methods/ticket-dms/saveSign.js
index 725abfe67..9f1684539 100644
--- a/modules/ticket/back/methods/ticket-dms/saveSign.js
+++ b/modules/ticket/back/methods/ticket-dms/saveSign.js
@@ -51,7 +51,7 @@ module.exports = Self => {
                     ticketFk: ticketId,
                     longitude: args.location.Longitude,
                     latitude: args.location.Latitude,
-                    dated: args.signedTime
+                    dated: args.signedTime || new Date()
                 }, myOptions);
             }
         }
@@ -67,7 +67,8 @@ module.exports = Self => {
             if (!ticketDms) return false;
 
             const ticket = await models.Ticket.findById(ticketId, {fields: ['isSigned']}, myOptions);
-            if (ticket.isSigned == true) return true;
+            if (ticket.isSigned == true)
+                return true;
             else
                 await models.Dms.destroyAll({where: {reference: ticketId}}, myOptions);
 
@@ -108,10 +109,6 @@ module.exports = Self => {
             await models.Ticket.uploadFile(ctxUploadFile, id, myOptions);
         }
 
-        // async function dmsRecover(ticketFk, sign) {
-        //     await models.DmsRecover.create({ticketFk, sign}, myOptions);
-        // }
-
         try {
             for (let i = 0; i < args.tickets.length; i++) {
                 const ticketState = await models.TicketState.findOne(
@@ -120,35 +117,15 @@ module.exports = Self => {
                     }, myOptions);
 
                 if (ticketState.alertLevel >= 2 && !await gestDocExists(args.tickets[i])) {
-                    if (!args.signedTime) args.signedTime = Date.vnNew();
                     if (args.location) setLocation(args.tickets[i]);
                     await createGestDoc(args.tickets[i]);
-
-                    // if (image) {
-                    //     if (!fs.existsSync(dir))
-                    //         dmsRecover(args.tickets[i], args.signContent);
-                    //     else {
-                    //         fs.writeFile(image, args.signContent, 'base64', async function(err) {
-                    //             if (err) {
-                    //                 await tx.rollback();
-                    //                 throw err.message;
-                    //             }
-                    //         });
-                    //     }
-                    // } else
-                    //     dmsRecover(args.tickets[i], args.signContent);
-
-                    // if (id && fileName) {
-                    //     await models.TicketDms.replaceOrCreate({ticketFk: args.tickets[i], dmsFk: id}, myOptions);
                     await Self.rawSql(`CALL vn.ticket_setState(?, ?)`, [args.tickets[i], 'DELIVERED'], myOptions);
-                    //     await models.Dms.updateAll({id}, {file: fileName, contentType: 'image/png'}, myOptions);
-                    // }
                 }
             }
 
             if (tx) await tx.commit();
 
-            return 'Sign uploaded correctly';
+            return 'Signs uploaded correctly';
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;