Merge pull request #474 from bitfinexcom/staging

Release version to master

Author: tarcisiozf

bfx-report-ui

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

package-lock.json

@@ -41,8 +41,21 @@ const {
 
 const appDeps = require('./loc.api/di/app.deps')
 const TYPES = require('./loc.api/di/types')
+const fwDataValidator = require('./loc.api/data-validator')
 
 class WrkReportFrameWorkApi extends WrkReportServiceApi {
+  loadCoreDeps (...args) {
+    super.loadCoreDeps(...args)
+
+    this.container
+      .get(TYPES.DataValidator)
+      .reinit({
+        schemaNames: fwDataValidator.SCHEMA_NAMES,
+        schemaIds: fwDataValidator.SCHEMA_IDS,
+        schemas: fwDataValidator.schemas
+      })
+  }
+
   loadAppDeps (...args) {
     super.loadAppDeps(...args)
 

package.json

@@ -0,0 +1,12 @@
+'use strict'
+
+const SCHEMA_NAMES = require('./schema.names')
+const SCHEMA_IDS = require('./schema.ids')
+const schemas = require('./schemas')
+
+module.exports = {
+  SCHEMA_NAMES,
+  SCHEMA_IDS,
+
+  schemas
+}

workers/api.framework.report.wrk.js

@@ -0,0 +1,8 @@
+'use strict'
+
+const SCHEMA_NAMES = require('./schema.names')
+const {
+  getSchemaIds
+} = require('bfx-report/workers/loc.api/data-validator/helpers')
+
+module.exports = getSchemaIds(SCHEMA_NAMES)

workers/loc.api/data-validator/index.js

@@ -0,0 +1,35 @@
+'use strict'
+
+module.exports = {
+  FW_DEFS: 'fwDefs',
+
+  CREATE_SUB_ACCOUNT_REQ: 'createSubAccountReq',
+  UPDATE_SUB_ACCOUNT_REQ: 'updateSubAccountReq',
+  INTERRUPT_OPERATIONS_REQ: 'interruptOperationsReq',
+  EDIT_ALL_PUBLIC_COLLS_CONFS_REQ: 'editAllPublicCollsConfsReq',
+
+  FW_GET_CANDLES_REQ: 'fwGetCandlesReq',
+  GET_BALANCE_HISTORY_REQ: 'getBalanceHistoryReq',
+  GET_WIN_LOSS_REQ: 'getWinLossReq',
+  GET_POSITIONS_SNAPSHOT_REQ: 'getPositionsSnapshotReq',
+  GET_FULL_SNAPSHOT_REPORT_REQ: 'getFullSnapshotReportReq',
+  GET_FULL_TAX_REPORT_REQ: 'getFullTaxReportReq',
+  GET_TRANSACTION_TAX_REPORT_REQ: 'getTransactionTaxReportReq',
+  GET_TRADED_VOLUME_REQ: 'getTradedVolumeReq',
+  GET_TOTAL_FEES_REPORT_REQ: 'getTotalFeesReportReq',
+  GET_PERFORMING_LOAN_REQ: 'getPerformingLoanReq',
+  GET_WIN_LOSS_VS_ACCOUNT_BALANCE_REQ: 'getWinLossVSAccountBalanceReq',
+  GET_SUMMARY_BY_ASSET_REQ: 'getSummaryByAssetReq',
+
+  FW_GET_CANDLES_FILE_REQ: 'fwGetCandlesFileReq',
+  GET_BALANCE_HISTORY_FILE_REQ: 'getBalanceHistoryFileReq',
+  GET_WIN_LOSS_FILE_REQ: 'getWinLossFileReq',
+  GET_POSITIONS_SNAPSHOT_FILE_REQ: 'getPositionsSnapshotFileReq',
+  GET_FULL_SNAPSHOT_REPORT_FILE_REQ: 'getFullSnapshotReportFileReq',
+  GET_FULL_TAX_REPORT_FILE_REQ: 'getFullTaxReportFileReq',
+  GET_TRANSACTION_TAX_REPORT_FILE_REQ: 'getTransactionTaxReportFileReq',
+  GET_TRADED_VOLUME_FILE_REQ: 'getTradedVolumeFileReq',
+  GET_TOTAL_FEES_REPORT_FILE_REQ: 'getTotalFeesReportFileReq',
+  GET_PERFORMING_LOAN_FILE_REQ: 'getPerformingLoanFileReq',
+  GET_WIN_LOSS_VS_ACCOUNT_BALANCE_FILE_REQ: 'getWinLossVSAccountBalanceFileReq'
+}

workers/loc.api/data-validator/schema.ids.js

@@ -0,0 +1,21 @@
+'use strict'
+
+const SCHEMA_IDS = require('../schema.ids')
+
+module.exports = {
+  $id: SCHEMA_IDS.CREATE_SUB_ACCOUNT_REQ,
+  type: 'object',
+  additionalProperties: false,
+  required: ['subAccountApiKeys'],
+  properties: {
+    subAccountApiKeys: {
+      $ref: 'fwDefs#/definitions/subAccountApiKeys'
+    },
+    subAccountPassword: {
+      $ref: 'fwDefs#/definitions/password'
+    },
+    localUsername: {
+      type: 'string'
+    }
+  }
+}

workers/loc.api/data-validator/schema.names.js

@@ -0,0 +1,78 @@
+'use strict'
+
+const SCHEMA_IDS = require('../schema.ids')
+
+module.exports = {
+  $id: SCHEMA_IDS.EDIT_ALL_PUBLIC_COLLS_CONFS_REQ,
+  type: 'object',
+  additionalProperties: false,
+  properties: {
+    candlesConf: {
+      type: 'array',
+      items: {
+        type: 'object',
+        additionalProperties: false,
+        required: ['symbol', 'start', 'timeframe'],
+        properties: {
+          start: {
+            $ref: 'defs#/definitions/start'
+          },
+          symbol: {
+            $ref: 'defs#/definitions/strSymbol'
+          },
+          timeframe: {
+            $ref: 'defs#/definitions/candleTimeframe'
+          }
+        }
+      }
+    },
+    statusMessagesConf: {
+      type: 'array',
+      items: {
+        type: 'object',
+        additionalProperties: false,
+        required: ['symbol', 'start'],
+        properties: {
+          start: {
+            $ref: 'defs#/definitions/start'
+          },
+          symbol: {
+            $ref: 'defs#/definitions/strSymbol'
+          }
+        }
+      }
+    },
+    tickersHistoryConf: {
+      type: 'array',
+      items: {
+        type: 'object',
+        additionalProperties: false,
+        required: ['symbol', 'start'],
+        properties: {
+          start: {
+            $ref: 'defs#/definitions/start'
+          },
+          symbol: {
+            $ref: 'defs#/definitions/strSymbol'
+          }
+        }
+      }
+    },
+    publicTradesConf: {
+      type: 'array',
+      items: {
+        type: 'object',
+        additionalProperties: false,
+        required: ['symbol', 'start'],
+        properties: {
+          start: {
+            $ref: 'defs#/definitions/start'
+          },
+          symbol: {
+            $ref: 'defs#/definitions/strSymbol'
+          }
+        }
+      }
+    }
+  }
+}

workers/loc.api/data-validator/schemas/createSubAccountReq.js

@@ -0,0 +1,92 @@
+'use strict'
+
+const SCHEMA_IDS = require('../schema.ids')
+
+module.exports = {
+  $id: SCHEMA_IDS.FW_DEFS,
+  definitions: {
+    timeframe: {
+      type: 'string',
+      enum: [
+        'day',
+        'week',
+        'month',
+        'year'
+      ]
+    },
+    isUnrealizedProfitExcluded: {
+      type: 'boolean'
+    },
+    isVSPrevDayBalance: {
+      type: 'boolean'
+    },
+    apiKey: {
+      type: 'string'
+    },
+    apiSecret: {
+      type: 'string'
+    },
+    token: {
+      type: 'string'
+    },
+    password: {
+      type: 'string'
+    },
+    subAccountApiKeys: {
+      type: 'array',
+      minItems: 1,
+      maxItems: 20,
+      items: {
+        type: 'object',
+        oneOf: [
+          {
+            additionalProperties: false,
+            properties: {
+              apiKey: {
+                $ref: '#/definitions/apiKey'
+              },
+              apiSecret: {
+                $ref: '#/definitions/apiSecret'
+              }
+            }
+          },
+          {
+            additionalProperties: false,
+            properties: {
+              token: {
+                $ref: '#/definitions/token'
+              }
+            }
+          },
+          {
+            additionalProperties: false,
+            properties: {
+              email: {
+                $ref: 'defs#/definitions/email'
+              },
+              password: {
+                $ref: '#/definitions/password'
+              }
+            }
+          }
+        ]
+      }
+    },
+    strategy: {
+      type: 'string',
+      enum: [
+        'FIFO',
+        'LIFO'
+      ]
+    },
+    shouldFeesBeDeducted: {
+      type: 'boolean'
+    },
+    isTradingFees: {
+      type: 'boolean'
+    },
+    isFundingFees: {
+      type: 'boolean'
+    }
+  }
+}