verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 58 Releases Wiki Activity

Merge pull request 'MASTER fix: use vn email' (!1159) from hotFix_useVerdnaturaEmail into master
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #1159
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
Joan Sanchez 2022-11-18 09:42:13 +00:00
parent 0dfdcda1a6 f8e6b71bc6
commit 3d3a317b52
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
back/methods/notification/clean.js
View File

@ -29,6 +29,9 @@ module.exports = Self => {
try {
const config = await models.NotificationConfig.findOne({}, myOptions);
if (!config.cleanDays) return;
const cleanDate = new Date();
cleanDate.setDate(cleanDate.getDate() - config.cleanDays);
@ -36,11 +39,11 @@ module.exports = Self => {
where: {status: {inq: status}},
created: {lt: cleanDate}
}, myOptions);
if (tx) await tx.commit();
} catch (e) {
if (tx) await tx.rollback();
throw e;
}
if (tx) await tx.commit();
};
};

8
back/methods/notification/send.js
View File

@ -1,5 +1,4 @@
const {Email} = require('vn-print');
const UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
Self.remoteMethod('send', {
@ -35,7 +34,10 @@ module.exports = Self => {
include: {
relation: 'user',
scope: {
fields: ['name', 'email', 'lang']
fields: ['name', 'lang'],
include: {
relation: 'emailUser'
}
}
}
}
@ -56,7 +58,7 @@ module.exports = Self => {
for (const notificationUser of queue.notification().subscription()) {
try {
const sendParams = {
recipient: notificationUser.user().email,
recipient: notificationUser.user().emailUser().email,
lang: notificationUser.user().lang
};