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

fix: use date-fns functional programming module

Browse source
This commit is contained in:
Sérgio Salgado 2021-11-23 18:26:02 +00:00
parent b0a031bd97
commit ca2274a8a2
20 changed files with 94 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/admin/server.js
View file

@ -1,3 +1,4 @@
const { intervalToDuration, secondsToMilliseconds, formatDuration } = require('date-fns/fp')
const _ = require('lodash/fp')
const ticker = require('../ticker')
@ -5,7 +6,6 @@ const settingsLoader = require('./settings-loader')
const db = require('../db')
const machineLoader = require('../machine-loader')
const { intervalToDuration, secondsToMilliseconds, formatDuration } = require('date-fns')
const CONSIDERED_UP_SECS = 30

8
lib/customers.js
View file

@ -6,6 +6,7 @@ const makeDir = require('make-dir')
const path = require('path')
const fs = require('fs')
const util = require('util')
const { sub, differenceInHours } = require('date-fns/fp')
const db = require('./db')
const BN = require('./bn')
@ -23,7 +24,6 @@ const operatorDataDir = _.get('operatorDataDir', options)
const sms = require('./sms')
const settingsLoader = require('./new-settings-loader')
const logger = require('./logger')
const { sub, differenceInHours } = require('date-fns')
const TX_PASSTHROUGH_ERROR_CODES = ['operatorCancel']
@ -216,13 +216,13 @@ function getDailyVolumeMinusCurrentTxQueries (id, txId) {
function getHoursTillLimitClear (cashInDate, cashOutDate) {
let startDate = new Date()
startDate = sub(startDate, { days: 1 })
startDate = sub({ days: 1 }, startDate)
const cashInMoment = new Date(cashInDate || startDate)
const cashOutMoment = new Date(cashOutDate || startDate)
const cashInDuration = differenceInHours(startDate, cashInMoment)
const cashOutDuration = differenceInHours(startDate, cashOutMoment)
const cashInDuration = differenceInHours(cashInMoment, startDate)
const cashOutDuration = differenceInHours(cashOutMoment, startDate)
return _.ceil(_.max([cashInDuration, cashOutDuration, 0]))
}

8
lib/logs.js
View file

@ -1,6 +1,6 @@
const _ = require('lodash/fp')
const { format } = require('date-fns')
const { zonedTimeToUtc, utcToZonedTime } = require('date-fns-tz')
const { format } = require('date-fns/fp')
const { utcToZonedTime } = require('date-fns-tz/fp')
const db = require('./db')
const pgp = require('pg-promise')()
@ -118,8 +118,8 @@ function logDateFormat (timezone, logs, fields) {
field =>
{
if (_.isNil(log[field])) return null
const date = utcToZonedTime(log[field], timezone)
return `${format(date, 'yyyy-MM-dd')}T${format(date, 'HH:mm:ss.SSS')}`
const date = utcToZonedTime(timezone, log[field])
return `${format('yyyy-MM-dd', date)}T${format('HH:mm:ss.SSS', date)}`
},
fields
)

5
lib/routes/customerRoutes.js
View file

@ -4,6 +4,7 @@ const semver = require('semver')
const sms = require('../sms')
const _ = require('lodash/fp')
const BN = require('../bn')
const { zonedTimeToUtc, utcToZonedTime } = require('date-fns-tz/fp')
const compliance = require('../compliance')
const complianceTriggers = require('../compliance-triggers')
@ -18,8 +19,6 @@ const { getCustomerById } = require('../customers')
const machineLoader = require('../machine-loader')
const { loadLatestConfig } = require('../new-settings-loader')
const { zonedTimeToUtc, utcToZonedTime } = require('date-fns-tz')
function updateCustomer (req, res, next) {
const id = req.params.id
const machineVersion = req.query.version
@ -136,7 +135,7 @@ function buildSms (data, receiptOptions) {
const cashInCommission = new BN(1).plus(new BN(formattedTx.commissionPercentage))
const rate = new BN(formattedTx.rawTickerPrice).multipliedBy(cashInCommission).decimalPlaces(2)
const date = utcToZonedTime(zonedTimeToUtc(new Date(), process.env.TZ), timezone)
const date = utcToZonedTime(timezone, zonedTimeToUtc(process.env.TZ, new Date()))
const dateString = `${date.toISOString().replace('T', ' ').slice(0, 19)}`
const data = {