From 584f3264edc86712c840998d5794c9b34c7fd632 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 11 Dec 2023 08:54:58 +0100
Subject: [PATCH] refs #6085 refactor sql trad

---
 .../{235001 => 235201}/00-aclsMails.sql       |  0
 front/core/locale/es.yml                      |  2 +-
 loopback/locale/es.json                       |  6 +-
 .../account/back/models/mail-alias-account.js | 14 ++---
 modules/account/back/models/mail-alias-acl.js | 55 -------------------
 5 files changed, 9 insertions(+), 68 deletions(-)
 rename db/changes/{235001 => 235201}/00-aclsMails.sql (100%)
 delete mode 100644 modules/account/back/models/mail-alias-acl.js

diff --git a/db/changes/235001/00-aclsMails.sql b/db/changes/235201/00-aclsMails.sql
similarity index 100%
rename from db/changes/235001/00-aclsMails.sql
rename to db/changes/235201/00-aclsMails.sql
diff --git a/front/core/locale/es.yml b/front/core/locale/es.yml
index 1b9bbb40b3..17e955ff52 100644
--- a/front/core/locale/es.yml
+++ b/front/core/locale/es.yml
@@ -68,4 +68,4 @@ Load more results: Cargar más resultados
 Send cau: Enviar cau
 By sending this ticket, all the data related to the error, the section, the user, etc., are already sent.: Al enviar este cau ya se envían todos los datos relacionados con el error, la sección, el usuario, etc
 ExplainReason: Explique el motivo por el que no deberia aparecer este fallo
-You already have the mailAlias: Ya tienes este mail
+You already have the mailAlias: Ya tienes este alias de correo
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 2e516bf120..c26bf3ebc7 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -330,6 +330,6 @@
 	"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima",
 	"Cannot past travels with entries": "No se pueden pasar envíos con entradas",
 	"It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}",
-	"You already have the mailAlias": "You already have the mailAlias",
-	"The alias cant be modified": "The alias cant be modified"
-}
\ No newline at end of file
+	"You already have the mailAlias": "Ya tienes este alias de correo",
+	"The alias cant be modified": "Este alias de correo no puede ser modificado"
+}
diff --git a/modules/account/back/models/mail-alias-account.js b/modules/account/back/models/mail-alias-account.js
index a951896893..91fc43008f 100644
--- a/modules/account/back/models/mail-alias-account.js
+++ b/modules/account/back/models/mail-alias-account.js
@@ -22,12 +22,6 @@ module.exports = Self => {
 
     async function checkModifyPermission(ctx, mailAliasFk) {
         const userId = ctx.options.accessToken.userId;
-        const available = await Self.getAvailable(userId);
-        if (!available.has(mailAliasFk))
-            throw new UserError('The alias cant be modified');
-    }
-
-    Self.getAvailable = async function(userId, options) {
         const models = Self.app.models;
 
         const myOptions = {};
@@ -47,9 +41,11 @@ module.exports = Self => {
                 roleFk: {
                     inq: roles.map(role => role.roleId),
                 },
+                mailAliasFk
             }
         }, myOptions);
-        const mailAliasArray = Array.from(availableMailAlias, alias => alias.mailAliasFk);
-        return new Set(mailAliasArray);
-    };
+
+        console.log(availableMailAlias);
+        if (!availableMailAlias.length) throw new UserError('The alias cant be modified');
+    }
 };
diff --git a/modules/account/back/models/mail-alias-acl.js b/modules/account/back/models/mail-alias-acl.js
deleted file mode 100644
index a951896893..0000000000
--- a/modules/account/back/models/mail-alias-acl.js
+++ /dev/null
@@ -1,55 +0,0 @@
-
-const UserError = require('vn-loopback/util/user-error');
-
-module.exports = Self => {
-    Self.rewriteDbError(function(err) {
-        if (err.code === 'ER_DUP_ENTRY')
-            return new UserError(`You already have the mailAlias`);
-        return err;
-    });
-
-    Self.observe('before save', async ctx => {
-        const changes = ctx.currentInstance || ctx.instance;
-
-        await checkModifyPermission(ctx, changes.mailAlias);
-    });
-
-    Self.observe('before delete', async ctx => {
-        const mailAliasAccount = await Self.findById(ctx.where.id);
-
-        await checkModifyPermission(ctx, mailAliasAccount.mailAlias);
-    });
-
-    async function checkModifyPermission(ctx, mailAliasFk) {
-        const userId = ctx.options.accessToken.userId;
-        const available = await Self.getAvailable(userId);
-        if (!available.has(mailAliasFk))
-            throw new UserError('The alias cant be modified');
-    }
-
-    Self.getAvailable = async function(userId, options) {
-        const models = Self.app.models;
-
-        const myOptions = {};
-
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        const roles = await models.RoleMapping.find({
-            fields: ['roleId'],
-            where: {principalId: userId}
-        }, myOptions);
-
-        const availableMailAlias = await models.MailAliasAcl.find({
-            fields: ['mailAliasFk'],
-            include: {relation: 'mailAlias'},
-            where: {
-                roleFk: {
-                    inq: roles.map(role => role.roleId),
-                },
-            }
-        }, myOptions);
-        const mailAliasArray = Array.from(availableMailAlias, alias => alias.mailAliasFk);
-        return new Set(mailAliasArray);
-    };
-};