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

fix: remove machine selector

Browse source
This commit is contained in:
Sérgio Salgado 2021-08-25 16:56:07 +01:00
parent 30bc9c96da
commit ee8c46b51e
8 changed files with 32 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

27
lib/custom-sms.js
View file

@ -8,21 +8,18 @@ const getCustomMessages = () => {
it => ({
id: it.id,
event: _.camelCase(it.event),
deviceId: it.device_id,
message: it.message
}), res))
}
const createCustomMessage = (event, deviceId, message) => {
const machineId = deviceId === 'ALL_MACHINES' ? null : deviceId
const sql = `INSERT INTO custom_messages (id, event, device_id, message) VALUES ($1, $2, $3, $4)`
return db.none(sql, [uuid.v4(), _.snakeCase(event), machineId, message])
const createCustomMessage = (event, message) => {
const sql = `INSERT INTO custom_messages (id, event, message) VALUES ($1, $2, $3)`
return db.none(sql, [uuid.v4(), _.snakeCase(event), message])
}
const editCustomMessage = (id, event, deviceId, message) => {
const machineId = deviceId === 'ALL_MACHINES' ? null : deviceId
const sql = `UPDATE custom_messages SET event=$2, device_id=$3, message=$4 WHERE id=$1`
return db.none(sql, [id, _.snakeCase(event), machineId, message])
const editCustomMessage = (id, event, message) => {
const sql = `UPDATE custom_messages SET event=$2, message=$3 WHERE id=$1`
return db.none(sql, [id, _.snakeCase(event), message])
}
const deleteCustomMessage = id => {
@ -30,21 +27,15 @@ const deleteCustomMessage = id => {
return db.none(sql, [id])
}
const getCommonCustomMessages = event => {
const sql = `SELECT * FROM custom_messages WHERE event=$1 AND device_id IS NULL LIMIT 1`
const getCustomMessage = event => {
const sql = `SELECT * FROM custom_messages WHERE event=$1 LIMIT 1`
return db.oneOrNone(sql, [event])
}
const getMachineCustomMessages = (event, deviceId) => {
const sql = `SELECT * FROM custom_messages WHERE event=$1 AND device_id=$2 LIMIT 1`
return db.oneOrNone(sql, [event, deviceId])
}
module.exports = {
getCustomMessages,
createCustomMessage,
editCustomMessage,
deleteCustomMessage,
getCommonCustomMessages,
getMachineCustomMessages
getCustomMessage
}

4
lib/new-admin/graphql/resolvers/sms.resolver.js
View file

@ -5,8 +5,8 @@ const resolvers = {
customMessages: () => customSms.getCustomMessages()
},
Mutation: {
createCustomMessage: (...[, { event, deviceId, message }]) => customSms.createCustomMessage(event, deviceId, message),
editCustomMessage: (...[, { id, event, deviceId, message }]) => customSms.editCustomMessage(id, event, deviceId, message),
createCustomMessage: (...[, { event, message }]) => customSms.createCustomMessage(event, message),
editCustomMessage: (...[, { id, event, message }]) => customSms.editCustomMessage(id, event, message),
deleteCustomMessage: (...[, { id }]) => customSms.deleteCustomMessage(id)
}
}

5
lib/new-admin/graphql/types/sms.type.js
View file

@ -4,7 +4,6 @@ const typeDef = gql`
type CustomMessage {
id: ID!
event: CustomMessageEvent!
deviceId: String
message: String!
}
@ -18,8 +17,8 @@ const typeDef = gql`
}
type Mutation {
createCustomMessage(event: CustomMessageEvent!, deviceId: String, message: String!): CustomMessage @auth
editCustomMessage(id: ID!, event: CustomMessageEvent!, deviceId: String, message: String!): CustomMessage @auth
createCustomMessage(event: CustomMessageEvent!, message: String!): CustomMessage @auth
editCustomMessage(id: ID!, event: CustomMessageEvent!, message: String!): CustomMessage @auth
deleteCustomMessage(id: ID!): CustomMessage @auth
}
`

4
lib/plugins.js
View file

@ -361,7 +361,7 @@ function plugins (settings, deviceId) {
const phone = tx.phone
const timestamp = dateFormat(new Date(), 'UTC:HH:MM Z')
return sms.getCashOutReadySms(deviceId, phone, timestamp)
return sms.getCashOutReadySms(phone, timestamp)
.then(msg => {
const rec = {
sms: msg
@ -723,7 +723,7 @@ function plugins (settings, deviceId) {
? '123'
: randomCode()
return sms.getPhoneCodeSms(deviceId, phone, code)
return sms.getPhoneCodeSms(phone, code)
.then(msg => {
const rec = {
sms: msg

42
lib/sms.js
View file

@ -5,22 +5,11 @@ const _ = require('lodash/fp')
const customSms = require('./custom-sms')
function getPhoneCodeSms (deviceId, phone, code) {
return Promise.all([
customSms.getCommonCustomMessages('sms_code'),
customSms.getMachineCustomMessages('sms_code', deviceId)
])
.then(([commonMsg, machineMsg]) => {
if (!_.isNil(machineMsg)) {
const messageContent = _.replace('#code', code, machineMsg.message)
return {
toNumber: phone,
body: messageContent
}
}
if (!_.isNil(commonMsg)) {
const messageContent = _.replace('#code', code, commonMsg.message)
function getPhoneCodeSms (phone, code) {
return customSms.getCustomMessage('sms_code')
.then(msg => {
if (!_.isNil(msg)) {
const messageContent = _.replace('#code', code, msg.message)
return {
toNumber: phone,
body: messageContent
@ -34,22 +23,11 @@ function getPhoneCodeSms (deviceId, phone, code) {
})
}
function getCashOutReadySms (deviceId, phone, timestamp) {
return Promise.all([
customSms.getCommonCustomMessages('cash_out_dispense_ready'),
customSms.getMachineCustomMessages('cash_out_dispense_ready', deviceId)
])
.then(([commonMsg, machineMsg]) => {
if (!_.isNil(machineMsg)) {
const messageContent = _.replace('#timestamp', timestamp, machineMsg.message)
return {
toNumber: phone,
body: messageContent
}
}
if (!_.isNil(commonMsg)) {
const messageContent = _.replace('#timestamp', timestamp, commonMsg.message)
function getCashOutReadySms (phone, timestamp) {
return customSms.getCustomMessage('cash_out_dispense_ready')
.then(msg => {
if (!_.isNil(msg)) {
const messageContent = _.replace('#timestamp', timestamp, msg.message)
return {
toNumber: phone,
body: messageContent