From 532300d61251f1d1250b1ba5c861782c3199dcef Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Thu, 5 Oct 2023 11:46:44 +0300 Subject: [PATCH 1/3] Use omit util from lib-js-util-base --- package.json | 1 + .../prepare-response/helpers/omit-private-model-fields.js | 2 +- workers/loc.api/queue/processor.js | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 3e0baef5..3e503cd0 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "csv": "5.5.3", "inversify": "6.0.1", "js-yaml": "4.1.0", + "lib-js-util-base": "git+https://github.com/bitfinexcom/lib-js-util-base.git", "lodash": "4.17.21", "lru": "3.1.0", "moment": "2.29.4", diff --git a/workers/loc.api/helpers/prepare-response/helpers/omit-private-model-fields.js b/workers/loc.api/helpers/prepare-response/helpers/omit-private-model-fields.js index eac7c01a..38c0b9df 100644 --- a/workers/loc.api/helpers/prepare-response/helpers/omit-private-model-fields.js +++ b/workers/loc.api/helpers/prepare-response/helpers/omit-private-model-fields.js @@ -1,6 +1,6 @@ 'use strict' -const { omit } = require('lodash') +const { omit } = require('lib-js-util-base') const OMITTING_FIELDS = [ '_events', diff --git a/workers/loc.api/queue/processor.js b/workers/loc.api/queue/processor.js index 7b336132..3dd15300 100644 --- a/workers/loc.api/queue/processor.js +++ b/workers/loc.api/queue/processor.js @@ -1,9 +1,9 @@ 'use strict' const { - omit, - cloneDeep -} = require('lodash') + omit +} = require('lib-js-util-base') +const { cloneDeep } = require('lodash') const { promisify } = require('util') const { pipeline } = require('stream') const fs = require('fs') From 235bd8c3c00192979c6930c997f85537b5ec2a43 Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Thu, 5 Oct 2023 12:02:33 +0300 Subject: [PATCH 2/3] Use cloneDeep util from lib-js-util-base --- workers/loc.api/helpers/check-params.js | 2 +- workers/loc.api/helpers/get-data-from-api.js | 2 +- workers/loc.api/helpers/normalize-filter-params.js | 2 +- .../loc.api/helpers/prepare-response/helpers/get-params.js | 2 +- workers/loc.api/helpers/schema.js | 2 +- workers/loc.api/queue/processor.js | 4 ++-- workers/loc.api/queue/write-data-to-stream/data-normalizer.js | 2 +- workers/loc.api/queue/write-data-to-stream/helpers.js | 2 +- workers/loc.api/queue/write-data-to-stream/index.js | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/workers/loc.api/helpers/check-params.js b/workers/loc.api/helpers/check-params.js index 756da4c1..31503916 100644 --- a/workers/loc.api/helpers/check-params.js +++ b/workers/loc.api/helpers/check-params.js @@ -1,6 +1,6 @@ 'use strict' -const { cloneDeep } = require('lodash') +const { cloneDeep } = require('lib-js-util-base') const Ajv = require('ajv') const schema = require('./schema') diff --git a/workers/loc.api/helpers/get-data-from-api.js b/workers/loc.api/helpers/get-data-from-api.js index 836e95ee..d7502e79 100644 --- a/workers/loc.api/helpers/get-data-from-api.js +++ b/workers/loc.api/helpers/get-data-from-api.js @@ -1,6 +1,6 @@ 'use strict' -const { cloneDeep } = require('lodash') +const { cloneDeep } = require('lib-js-util-base') const Interrupter = require('../interrupter') const AbstractWSEventEmitter = require('../abstract.ws.event.emitter') diff --git a/workers/loc.api/helpers/normalize-filter-params.js b/workers/loc.api/helpers/normalize-filter-params.js index d7498fcb..1a7fb9f1 100644 --- a/workers/loc.api/helpers/normalize-filter-params.js +++ b/workers/loc.api/helpers/normalize-filter-params.js @@ -1,6 +1,6 @@ 'use strict' -const { cloneDeep } = require('lodash') +const { cloneDeep } = require('lib-js-util-base') const FILTER_MODELS_NAMES = require('./filter.models.names') const FILTER_CONDITIONS = require('./filter.conditions') diff --git a/workers/loc.api/helpers/prepare-response/helpers/get-params.js b/workers/loc.api/helpers/prepare-response/helpers/get-params.js index fae4a49b..9965cec8 100644 --- a/workers/loc.api/helpers/prepare-response/helpers/get-params.js +++ b/workers/loc.api/helpers/prepare-response/helpers/get-params.js @@ -1,6 +1,6 @@ 'use strict' -const { cloneDeep } = require('lodash') +const { cloneDeep } = require('lib-js-util-base') const { getDateNotMoreNow, diff --git a/workers/loc.api/helpers/schema.js b/workers/loc.api/helpers/schema.js index 8fb41304..f2123115 100644 --- a/workers/loc.api/helpers/schema.js +++ b/workers/loc.api/helpers/schema.js @@ -1,6 +1,6 @@ 'use strict' -const { cloneDeep } = require('lodash') +const { cloneDeep } = require('lib-js-util-base') const _publicTradesSymbol = { type: ['string', 'array'], diff --git a/workers/loc.api/queue/processor.js b/workers/loc.api/queue/processor.js index 3dd15300..7e8fdbb1 100644 --- a/workers/loc.api/queue/processor.js +++ b/workers/loc.api/queue/processor.js @@ -1,9 +1,9 @@ 'use strict' const { - omit + omit, + cloneDeep } = require('lib-js-util-base') -const { cloneDeep } = require('lodash') const { promisify } = require('util') const { pipeline } = require('stream') const fs = require('fs') diff --git a/workers/loc.api/queue/write-data-to-stream/data-normalizer.js b/workers/loc.api/queue/write-data-to-stream/data-normalizer.js index e8e2855b..3c5eb16d 100644 --- a/workers/loc.api/queue/write-data-to-stream/data-normalizer.js +++ b/workers/loc.api/queue/write-data-to-stream/data-normalizer.js @@ -1,6 +1,6 @@ 'use strict' -const { cloneDeep } = require('lodash') +const { cloneDeep } = require('lib-js-util-base') const { splitSymbolPairs } = require('../../helpers') diff --git a/workers/loc.api/queue/write-data-to-stream/helpers.js b/workers/loc.api/queue/write-data-to-stream/helpers.js index e2a5537c..d30d4749 100644 --- a/workers/loc.api/queue/write-data-to-stream/helpers.js +++ b/workers/loc.api/queue/write-data-to-stream/helpers.js @@ -1,6 +1,6 @@ 'use strict' -const { cloneDeep } = require('lodash') +const { cloneDeep } = require('lib-js-util-base') const moment = require('moment-timezone') const dataNormalizer = require('./data-normalizer') diff --git a/workers/loc.api/queue/write-data-to-stream/index.js b/workers/loc.api/queue/write-data-to-stream/index.js index 38baae6c..098cdc4c 100644 --- a/workers/loc.api/queue/write-data-to-stream/index.js +++ b/workers/loc.api/queue/write-data-to-stream/index.js @@ -1,6 +1,6 @@ 'use strict' -const { cloneDeep } = require('lodash') +const { cloneDeep } = require('lib-js-util-base') const { writeMessageToStream, From 575c3ef3a74e6c0d574625e7c116ec7bce964d68 Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Thu, 5 Oct 2023 12:38:48 +0300 Subject: [PATCH 3/3] Remove lodash min/max utils usage --- workers/loc.api/helpers/date-param.helpers.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/workers/loc.api/helpers/date-param.helpers.js b/workers/loc.api/helpers/date-param.helpers.js index 16e651ee..1c1b17bb 100644 --- a/workers/loc.api/helpers/date-param.helpers.js +++ b/workers/loc.api/helpers/date-param.helpers.js @@ -1,6 +1,5 @@ 'use strict' -const { min, max } = require('lodash') const moment = require('moment-timezone') const { TimeframeError } = require('../errors') @@ -8,11 +7,19 @@ const { TimeframeError } = require('../errors') const MIN_START_MTS = Date.UTC(2013) const getDateNotMoreNow = (mts, now = Date.now()) => { - return min([mts, now]) + if (!Number.isFinite(mts)) { + return now + } + + return Math.min(mts, now) } const getDateNotLessMinStart = (mts, minStart = MIN_START_MTS) => { - return max([mts, minStart]) + if (!Number.isFinite(mts)) { + return minStart + } + + return Math.max(mts, minStart) } const _setDefaultTimeIfNotExist = (args) => {