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

Chore: remove unused code and use lodash

Browse source
This commit is contained in:
Cesar 2020-12-02 16:01:33 +00:00 • committed by Josh Harvey
parent 0ec49159e4
commit ed4e654036
1 changed files with 9 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

69
lib/new-admin/transactions.js
View file

@ -65,7 +65,7 @@ function batch (from = new Date(0).toISOString(), until = new Date().toISOString
.then(packager) .then(packager)
} }
function getCustomerTransactions (customerId) { function getCustomerTransactionsBatch (ids) {
const packager = _.flow(it => { const packager = _.flow(it => {
return it return it
}, _.flatten, _.orderBy(_.property('created'), ['desc']), _.map(camelize), addNames) }, _.flatten, _.orderBy(_.property('created'), ['desc']), _.map(camelize), addNames)
@ -81,7 +81,7 @@ function getCustomerTransactions (customerId) {
((not txs.send_confirmed) and (txs.created <= now() - interval $2)) as expired ((not txs.send_confirmed) and (txs.created <= now() - interval $2)) as expired
from cash_in_txs as txs from cash_in_txs as txs
left outer join customers c on txs.customer_id = c.id left outer join customers c on txs.customer_id = c.id
where c.id = $1 where c.id::text LIKE ANY($1)
order by created desc limit $3` order by created desc limit $3`
const cashOutSql = `select 'cashOut' as tx_class, const cashOutSql = `select 'cashOut' as tx_class,
@ -99,68 +99,17 @@ function getCustomerTransactions (customerId) {
inner join cash_out_actions actions on txs.id = actions.tx_id inner join cash_out_actions actions on txs.id = actions.tx_id
and actions.action = 'provisionAddress' and actions.action = 'provisionAddress'
left outer join customers c on txs.customer_id = c.id left outer join customers c on txs.customer_id = c.id
where c.id = $1 where c.id::text LIKE ANY ($1)
order by created desc limit $2` order by created desc limit $2`
return Promise.all([ return Promise.all([
db.any(cashInSql, [customerId, cashInTx.PENDING_INTERVAL, NUM_RESULTS]), db.any(cashInSql, [ids, cashInTx.PENDING_INTERVAL, NUM_RESULTS]),
db.any(cashOutSql, [customerId, NUM_RESULTS, REDEEMABLE_AGE]) db.any(cashOutSql, [ids, NUM_RESULTS, REDEEMABLE_AGE])
]) ])
.then(packager) .then(packager).then(transactions => {
} const transactionMap = _.groupBy('customerId', transactions)
async function getCustomerTransactionsBatch(ids) {
const packager = _.flow(it => {
return it
}, _.flatten, _.orderBy(_.property('created'), ['desc']), _.map(camelize), addNames)
const cashInSql = `select 'cashIn' as tx_class, txs.*,
c.phone as customer_phone,
c.id_card_data_number as customer_id_card_data_number,
c.id_card_data_expiration as customer_id_card_data_expiration,
c.id_card_data as customer_id_card_data,
c.name as customer_name,
c.front_camera_path as customer_front_camera_path,
c.id_card_photo_path as customer_id_card_photo_path,
((not txs.send_confirmed) and (txs.created <= now() - interval $2)) as expired
from cash_in_txs as txs
left outer join customers c on txs.customer_id = c.id
where c.id::text LIKE ANY($1)
order by created desc limit $3`
const cashOutSql = `select 'cashOut' as tx_class,
txs.*,
actions.tx_hash,
c.phone as customer_phone,
c.id_card_data_number as customer_id_card_data_number,
c.id_card_data_expiration as customer_id_card_data_expiration,
c.id_card_data as customer_id_card_data,
c.name as customer_name,
c.front_camera_path as customer_front_camera_path,
c.id_card_photo_path as customer_id_card_photo_path,
(extract(epoch from (now() - greatest(txs.created, txs.confirmed_at))) * 1000) >= $3 as expired
from cash_out_txs txs
inner join cash_out_actions actions on txs.id = actions.tx_id
and actions.action = 'provisionAddress'
left outer join customers c on txs.customer_id = c.id
where c.id::text LIKE ANY ($1)
order by created desc limit $2`
const cashIns = await db.any(cashInSql, [ids, cashInTx.PENDING_INTERVAL, NUM_RESULTS])
const cashOuts = await db.any(cashOutSql, [ids, NUM_RESULTS, REDEEMABLE_AGE])
const transactions = await packager([...cashIns, ...cashOuts])
const transactionMap = {}
transactions.forEach(transaction => {
if(!transactionMap[transaction.customerId]) {
transactionMap[transaction.customerId] = [transaction]
}
else {
transactionMap[transaction.customerId].push(transaction)
}
})
return ids.map(id => transactionMap[id]) return ids.map(id => transactionMap[id])
})
} }
function single (txId) { function single (txId) {
@ -209,4 +158,4 @@ function cancel (txId) {
.then(() => single(txId)) .then(() => single(txId))
} }
module.exports = { batch, getCustomerTransactions, single, cancel, getCustomerTransactionsBatch } module.exports = { batch, single, cancel, getCustomerTransactionsBatch }