Merge pull request #481 from bitfinexcom/staging

Release version to master

Author: tarcisiozf

.npmrc

@@ -1 +1,2 @@
 save-exact=true
+foreground-scripts=true

bfx-report-ui

@@ -1,6 +1,6 @@
 {
   "name": "bfx-reports-framework",
-  "version": "4.22.5",
+  "version": "4.23.0",
   "description": "Bitfinex reports framework",
   "main": "worker.js",
   "license": "Apache-2.0",

package-lock.json

@@ -1452,52 +1452,6 @@ module.exports = (
     ])
   })
 
-  it('it should be successfully performed by the getPayInvoiceList method', async function () {
-    this.timeout(5000)
-
-    const res = await agent
-      .post(`${basePath}/json-rpc`)
-      .type('json')
-      .send({
-        auth,
-        method: 'getPayInvoiceList',
-        params: {
-          start: 0,
-          end,
-          limit: 2
-        },
-        id: 5
-      })
-      .expect('Content-Type', /json/)
-      .expect(200)
-
-    assert.isObject(res.body)
-    assert.propertyVal(res.body, 'id', 5)
-    assert.isObject(res.body.result)
-    assert.isArray(res.body.result.res)
-    assert.isNumber(res.body.result.nextPage)
-
-    const resItem = res.body.result.res[0]
-
-    assert.isObject(resItem)
-    assert.containsAllKeys(resItem, [
-      'id',
-      't',
-      'duration',
-      'amount',
-      'currency',
-      'orderId',
-      'payCurrencies',
-      'webhook',
-      'redirectUrl',
-      'status',
-      'customerInfo',
-      'invoices',
-      'payment',
-      'merchantName'
-    ])
-  })
-
   it('it should be successfully performed by the getTrades method', async function () {
     this.timeout(5000)
 
@@ -2767,34 +2721,6 @@ module.exports = (
     await testMethodOfGettingReportFile(procPromise, aggrPromise, res)
   })
 
-  it('it should be successfully performed by the getPayInvoiceListFile method', async function () {
-    this.timeout(60000)
-
-    const procPromise = queueToPromise(params.processorQueue)
-    const aggrPromise = queueToPromise(params.aggregatorQueue)
-
-    const res = await agent
-      .post(`${basePath}/json-rpc`)
-      .type('json')
-      .send({
-        auth,
-        method: 'getPayInvoiceListFile',
-        params: {
-          isPDFRequired,
-          end,
-          start,
-          limit: 100,
-          timezone: -3,
-          email
-        },
-        id: 5
-      })
-      .expect('Content-Type', /json/)
-      .expect(200)
-
-    await testMethodOfGettingReportFile(procPromise, aggrPromise, res)
-  })
-
   it('it should be successfully performed by the getTradesFile method', async function () {
     this.timeout(60000)
 

package.json

@@ -41,7 +41,6 @@ class BfxApiRouter extends BaseBfxApiRouter {
       ['positionsAudit', 90],
       ['wallets', 90],
       ['ledgers', 90],
-      ['payInvoiceList', 90],
       ['accountTrades', 90],
       ['fundingTrades', 90],
       ['trades', 10],

test/test-cases/api-sync-mode-sqlite-test-cases.js

@@ -718,28 +718,6 @@ class FrameworkReportService extends ReportService {
     }, 'getLedgers', args, cb)
   }
 
-  /**
-   * @override
-   */
-  getPayInvoiceList (space, args, cb) {
-    return this._privResponder(async () => {
-      if (!await this.isSyncModeWithDbData(space, args)) {
-        return this._subAccountApiData
-          .getDataForSubAccount(
-            (args) => super.getPayInvoiceList(space, args),
-            args,
-            { datePropName: 't' }
-          )
-      }
-
-      return this._dao.findInCollBy(
-        this._SYNC_API_METHODS.PAY_INVOICE_LIST,
-        args,
-        { isPrepareResponse: true, shouldParamsBeVerified: true }
-      )
-    }, 'getPayInvoiceList', args, cb)
-  }
-
   /**
    * @override
    */

workers/loc.api/bfx.api.router/index.js

@@ -19,10 +19,6 @@ class ReportService extends BaseReportService {
     return super.getLedgers(null, args)
   }
 
-  [SYNC_API_METHODS.PAY_INVOICE_LIST] (args) {
-    return super.getPayInvoiceList(null, args)
-  }
-
   [SYNC_API_METHODS.TRADES] (args) {
     return super.getTrades(null, args)
   }

workers/loc.api/service.report.framework.js

@@ -5,9 +5,6 @@ const setImmediatePromise = promisify(setImmediate)
 const MAIN_DB_WORKER_ACTIONS = require(
   'bfx-facs-db-better-sqlite/worker/db-worker-actions/db-worker-actions.const'
 )
-const {
-  normalizeFilterParams
-} = require('bfx-report/workers/loc.api/helpers')
 const {
   getValidationSchemaId,
   getFilterValidationSchemaId
@@ -913,7 +910,7 @@ class BetterSqliteDAO extends DAO {
    */
   async findInCollBy (
     method,
-    reqArgs,
+    args,
     opts
   ) {
     const {
@@ -932,13 +929,12 @@ class BetterSqliteDAO extends DAO {
       : this._getMethodCollMap().get(method)
 
     const apiMethodName = filterModelNameMap.get(method) ?? {}
-    const args = normalizeFilterParams(apiMethodName, reqArgs)
 
     if (shouldParamsBeVerified) {
       const schemaId = getValidationSchemaId(apiMethodName)
       const filterSchemaId = getFilterValidationSchemaId(apiMethodName)
 
-      await this.dataValidator.validate(reqArgs, schemaId)
+      await this.dataValidator.validate(args, schemaId)
       await this.dataValidator.validate(
         { params: args?.params?.filter },
         filterSchemaId