lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1693 from siiky/fix/lam-969/message

Browse source 
LAM-969 fix: add machine name and timestamp to pending notifs messages
This commit is contained in:
Rafael Taranto 2024-07-16 10:54:11 +01:00 • committed by GitHub
commit 89160f623a
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/notifier/index.js
View file

@ -167,6 +167,7 @@ function transactionNotify (tx, rec) {
} }
function complianceNotify (settings, customer, deviceId, action, period) { function complianceNotify (settings, customer, deviceId, action, period) {
const timestamp = (new Date()).toLocaleString()
return queries.getMachineName(deviceId) return queries.getMachineName(deviceId)
.then(machineName => { .then(machineName => {
const notifications = configManager.getGlobalNotifications(settings.config) const notifications = configManager.getGlobalNotifications(settings.config)
@ -179,15 +180,15 @@ function complianceNotify (settings, customer, deviceId, action, period) {
const rec = { const rec = {
sms: { sms: {
body: `Customer ${customer.phone} ${msgCore[action]} - ${machineName}` body: `Customer ${customer.phone} ${msgCore[action]} - ${machineName}. ${timestamp}`
}, },
email: { email: {
subject: `Customer compliance`, subject: `Customer compliance`,
body: `Customer ${customer.phone} ${msgCore[action]} in machine ${machineName}` body: `Customer ${customer.phone} ${msgCore[action]} in machine ${machineName}. ${timestamp}`
}, },
webhook: { webhook: {
topic: `Customer compliance`, topic: `Customer compliance`,
content: `Customer ${customer.phone} ${msgCore[action]} in machine ${machineName}` content: `Customer ${customer.phone} ${msgCore[action]} in machine ${machineName}. ${timestamp}`
} }
} }
@ -207,7 +208,7 @@ function complianceNotify (settings, customer, deviceId, action, period) {
if (smsActive) promises.push(smsFuncs.sendMessage(settings, rec)) if (smsActive) promises.push(smsFuncs.sendMessage(settings, rec))
if (webhookActive) promises.push(webhookFuncs.sendMessage(settings, rec)) if (webhookActive) promises.push(webhookFuncs.sendMessage(settings, rec))
notifyIfActive('compliance', 'customerComplianceNotify', customer, deviceId, action, period) notifyIfActive('compliance', 'customerComplianceNotify', customer, deviceId, action, machineName, period)
return Promise.all(promises) return Promise.all(promises)
.catch(err => console.error(`An error occurred when sending a notification. Please check your notification preferences and 3rd party account configuration: ${err.stack}`)) .catch(err => console.error(`An error occurred when sending a notification. Please check your notification preferences and 3rd party account configuration: ${err.stack}`))

4
lib/notifier/notificationCenter.js
View file

@ -31,7 +31,7 @@ const clearOldCustomerSuspendedNotifications = (customerId, deviceId) => {
return queries.invalidateNotification(detailB, 'compliance') return queries.invalidateNotification(detailB, 'compliance')
} }
const customerComplianceNotify = (customer, deviceId, code, days = null) => { const customerComplianceNotify = (customer, deviceId, code, machineName, days = null) => {
// code for now can be "BLOCKED", "SUSPENDED" // code for now can be "BLOCKED", "SUSPENDED"
const detailB = utils.buildDetail({ customerId: customer.id, code, deviceId }) const detailB = utils.buildDetail({ customerId: customer.id, code, deviceId })
const date = new Date() const date = new Date()
@ -40,7 +40,7 @@ const customerComplianceNotify = (customer, deviceId, code, days = null) => {
} }
const message = code === 'SUSPENDED' ? `Customer ${customer.phone} suspended until ${date.toLocaleString()}` : const message = code === 'SUSPENDED' ? `Customer ${customer.phone} suspended until ${date.toLocaleString()}` :
code === 'BLOCKED' ? `Customer ${customer.phone} blocked` : code === 'BLOCKED' ? `Customer ${customer.phone} blocked` :
`Customer ${customer.phone} has pending compliance` `Customer ${customer.phone} has pending compliance in machine ${machineName}`
return clearOldCustomerSuspendedNotifications(customer.id, deviceId) return clearOldCustomerSuspendedNotifications(customer.id, deviceId)
.then(() => queries.getValidNotifications(COMPLIANCE, detailB)) .then(() => queries.getValidNotifications(COMPLIANCE, detailB))