Merge pull request #448 from bitfinexcom/staging

Release version to master

Author: ezewer

bfx-report-ui

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

package-lock.json

@@ -124,7 +124,7 @@ const _getIsNullOperator = (
     return false
   }
   const _alias = alias && typeof alias === 'string'
-    ? `${alias}_`
+    ? `${alias}.`
     : ''
   const operator = fieldName === FILTER_CONDITIONS.IS_NOT_NULL
     ? SQL_OPERATORS.IS_NOT_NULL

package.json

@@ -29,7 +29,8 @@ const depsTypes = (TYPES) => [
   TYPES.DataInserterFactory,
   TYPES.Progress,
   TYPES.SyncSchema,
-  TYPES.SyncInterrupter
+  TYPES.SyncInterrupter,
+  TYPES.Authenticator
 ]
 class SyncQueue extends EventEmitter {
   constructor (
@@ -39,7 +40,8 @@ class SyncQueue extends EventEmitter {
     dataInserterFactory,
     progress,
     syncSchema,
-    syncInterrupter
+    syncInterrupter,
+    authenticator
   ) {
     super()
 
@@ -50,6 +52,7 @@ class SyncQueue extends EventEmitter {
     this.progress = progress
     this.syncSchema = syncSchema
     this.syncInterrupter = syncInterrupter
+    this.authenticator = authenticator
     this.name = this.TABLES_NAMES.SYNC_QUEUE
 
     this.methodCollMap = this._filterMethodCollMap(
@@ -85,8 +88,14 @@ class SyncQueue extends EventEmitter {
     } = params ?? {}
 
     if (
-      !Number.isInteger(ownerUserId) &&
-      !isOwnerScheduler
+      (
+        !Number.isInteger(ownerUserId) &&
+        !isOwnerScheduler
+      ) ||
+      (
+        Number.isInteger(ownerUserId) &&
+        isOwnerScheduler
+      )
     ) {
       throw new SyncQueueOwnerSettingError()
     }
@@ -96,17 +105,36 @@ class SyncQueue extends EventEmitter {
       : [syncColls]
     checkCollPermission(_syncColls, this.ALLOWED_COLLS)
 
-    const ownerUserIdFilter = Number.isInteger(ownerUserId)
-      ? { ownerUserId }
-      : {}
-    const isOwnerSchedulerFilter = isOwnerScheduler
-      ? { isOwnerScheduler: 1 }
-      : {}
+    const signedInUserIds = this.#getSignedInUserIds()
+
+    if (
+      isOwnerScheduler &&
+      signedInUserIds.length === 0
+    ) {
+      return
+    }
+
+    const subQueryFilter = Number.isInteger(ownerUserId)
+      ? {
+          $or: {
+            $eq: {
+              isOwnerScheduler: 1,
+              ownerUserId
+            }
+          }
+        }
+      : {
+          $or: {
+            $eq: { isOwnerScheduler: 1 },
+            $in: { ownerUserId: signedInUserIds }
+          }
+        }
 
     const allSyncs = await this._getAll({
-      state: [NEW_JOB_STATE, ERROR_JOB_STATE],
-      ...ownerUserIdFilter,
-      ...isOwnerSchedulerFilter
+      filter: {
+        $in: { state: [NEW_JOB_STATE, ERROR_JOB_STATE, LOCKED_JOB_STATE] }
+      },
+      subQuery: { filter: subQueryFilter }
     })
     const hasALLInDB = allSyncs.some(item => {
       return item.collName === this.ALLOWED_COLLS.ALL
@@ -272,13 +300,16 @@ class SyncQueue extends EventEmitter {
       : {}
 
     const futureSyncs = await this._getAll({
-      state: [
-        NEW_JOB_STATE,
-        LOCKED_JOB_STATE,
-        ERROR_JOB_STATE
-      ],
-      ...ownerUserIdFilter
-    }, { limit: 10 })
+      filter: {
+        state: [
+          NEW_JOB_STATE,
+          LOCKED_JOB_STATE,
+          ERROR_JOB_STATE
+        ],
+        ...ownerUserIdFilter
+      },
+      limit: 10
+    })
 
     const allSyncs = (
       !Array.isArray(futureSyncs) ||
@@ -335,17 +366,20 @@ class SyncQueue extends EventEmitter {
     return (1 / multipliersSum) * currMultipliers
   }
 
-  _getAll (filter, opts) {
+  _getAll (params) {
     const {
+      filter,
+      subQuery,
       sort = this._sort,
-      limit = null
-    } = opts ?? {}
+      limit
+    } = params ?? {}
 
     return this.dao.getElemsInCollBy(
       this.name,
       {
-        sort,
         filter,
+        subQuery,
+        sort,
         limit
       }
     )
@@ -441,6 +475,13 @@ class SyncQueue extends EventEmitter {
 
     this.emit('progress', progress)
   }
+
+  #getSignedInUserIds () {
+    const sessions = this.authenticator.getUserSessions()
+
+    return [...sessions]
+      .map(([token, session]) => session._id)
+  }
 }
 
 decorateInjectable(SyncQueue, depsTypes)

workers/loc.api/sync/dao/helpers/get-where-query.js

@@ -11,10 +11,10 @@ module.exports = (pubTrades, mts) => {
     if (pubTrades[middleIndex]?.mts === mts) {
       return pubTrades[middleIndex]
     }
-    if (mts < pubTrades[middleIndex]?.mts) {
+    if (mts > pubTrades[middleIndex]?.mts) {
       endIndex = middleIndex - 1
     }
-    if (mts > pubTrades[middleIndex]?.mts) {
+    if (mts < pubTrades[middleIndex]?.mts) {
       startIndex = middleIndex + 1
     }
   }

workers/loc.api/sync/sync.queue/index.js

@@ -7,7 +7,6 @@ const INTERRUPTER_NAMES = require(
 )
 
 const { pushLargeArr } = require('../../helpers/utils')
-const { getBackIterable } = require('../helpers')
 const { PubTradeFindForTrxTaxError } = require('../../errors')
 
 const {
@@ -21,8 +20,6 @@ const {
   getCcyPairForConversion
 } = require('./helpers')
 
-const isTestEnv = process.env.NODE_ENV === 'test'
-
 const { decorateInjectable } = require('../../di/utils')
 
 const depsTypes = (TYPES) => [
@@ -280,13 +277,11 @@ class TransactionTaxReport {
         return
       }
 
-      const trxPriceCalculatorIterator = getBackIterable(trxPriceCalculators)
-
       let pubTrades = []
-      let pubTradeStart = pubTrades[0]?.mts
-      let pubTradeEnd = pubTrades[pubTrades.length - 1]?.mts
+      let pubTradeStart = pubTrades[pubTrades.length - 1]?.mts
+      let pubTradeEnd = pubTrades[0]?.mts
 
-      for (const trxPriceCalculator of trxPriceCalculatorIterator) {
+      for (const trxPriceCalculator of trxPriceCalculators) {
         count += 1
 
         if (interrupter.hasInterrupted()) {
@@ -300,12 +295,12 @@ class TransactionTaxReport {
           pubTradeStart > trx.mtsCreate ||
           pubTradeEnd < trx.mtsCreate
         ) {
-          const start = trx.mtsCreate - 1
+          const end = trx.mtsCreate
 
           pubTrades = await this.#getPublicTrades(
             {
               symbol: getCcyPairForConversion(symbol, trxPriceCalculator),
-              start
+              end
             },
             opts
           )
@@ -342,7 +337,7 @@ class TransactionTaxReport {
               const res = await this.#getPublicTrades(
                 {
                   symbol: getCcyPairForConversion(symbol, trxPriceCalculator),
-                  start
+                  end
                 },
                 opts
               )
@@ -366,8 +361,8 @@ class TransactionTaxReport {
             }
           }
 
-          pubTradeStart = start ?? pubTrades[0]?.mts
-          pubTradeEnd = pubTrades[pubTrades.length - 1]?.mts
+          pubTradeStart = pubTrades[pubTrades.length - 1]?.mts
+          pubTradeEnd = end ?? pubTrades[0]?.mts
         }
 
         if (
@@ -455,7 +450,7 @@ class TransactionTaxReport {
       symbol,
       start = 0,
       end = Date.now(),
-      sort = 1,
+      sort = -1,
       limit = 10000
     } = params ?? {}
     const { interrupter } = opts ?? {}
@@ -505,13 +500,6 @@ class TransactionTaxReport {
         onceInterruptPromise
       ])
 
-      if (isTestEnv) {
-        /*
-         * Need to reverse pub-trades array for test env
-         * as mocked test server return data in desc order
-         */
-        return getResponse(res.reverse())
-      }
       if (Array.isArray(res)) {
         return getResponse(res)
       }