bitfinexcom · tarcisiozf · Aug 25, 2025 · Aug 7, 2025 · Aug 8, 2025 · Aug 8, 2025
diff --git a/workers/loc.api/data-validator/filter-schemas/index.js b/workers/loc.api/data-validator/filter-schemas/index.js
@@ -1,11 +1,9 @@
 'use strict'
 
-const path = require('node:path')
-
 const FILTER_SCHEMA_NAMES = require('../filter.schema.names')
 const { requireSchemas } = require('../helpers')
 
 module.exports = requireSchemas(
   FILTER_SCHEMA_NAMES,
-  path.join(__dirname, '../filter-schemas')
+  __dirname
 )
diff --git a/workers/loc.api/data-validator/index.js b/workers/loc.api/data-validator/index.js
@@ -22,27 +22,33 @@ const FILTER_SCHEMA_IDS = require('./filter.schema.ids')
 const schemas = require('./schemas')
 const filterSchemas = require('./filter-schemas')
 
-const ajv = new Ajv({
-  // Compile schema on initialization
-  schemas: [
-    ...Object.values(schemas),
-    ...Object.values(filterSchemas)
-  ],
-
-  // Strict mode
-  strict: true,
-  strictRequired: true,
-  allowMatchingProperties: true,
-  allowUnionTypes: true,
-
-  $data: true,
-  ownProperties: true,
-  allErrors: true,
-  messages: true,
-  formats: { reserved: true },
-  verbose: isDevEnv
-})
-addFormats(ajv)
+let ajv
+
+const init = () => {
+  ajv = new Ajv({
+    // Compile schema on initialization
+    schemas: [
+      ...Object.values(schemas),
+      ...Object.values(filterSchemas)
+    ],
+
+    // Strict mode
+    strict: true,
+    strictRequired: true,
+    allowMatchingProperties: true,
+    allowUnionTypes: true,
+
+    $data: true,
+    ownProperties: true,
+    allErrors: true,
+    messages: true,
+    formats: { reserved: true },
+    verbose: isDevEnv
+  })
+  addFormats(ajv)
+
+  return module.exports
+}
 
 const addSchemas = (schemas = []) => {
   const _schemas = Array.isArray(schemas)
@@ -104,15 +110,17 @@ const reinit = (args) => {
     schemaIds,
     filterSchemaNames,
     filterSchemaIds,
-    schemas = []
+    schemas = {}
   } = args ?? {}
 
   Object.assign(SCHEMA_NAMES, schemaNames)
   Object.assign(SCHEMA_IDS, schemaIds)
   Object.assign(FILTER_SCHEMA_NAMES, filterSchemaNames)
   Object.assign(FILTER_SCHEMA_IDS, filterSchemaIds)
 
-  addSchemas(schemas)
+  addSchemas(Object.values(schemas))
+
+  return module.exports
 }
 
 module.exports = {
@@ -122,6 +130,10 @@ module.exports = {
   FILTER_SCHEMA_NAMES,
   FILTER_SCHEMA_IDS,
 
+  schemas,
+  filterSchemas,
+
+  init,
   reinit,
   addSchemas,
   validate

diff --git a/workers/loc.api/data-validator/schemas/defs.js b/workers/loc.api/data-validator/schemas/defs.js
@@ -151,6 +151,10 @@ module.exports = {
     },
     method: {
       type: 'string'
+    },
+    candleTimeframe: {
+      type: 'string',
+      minLength: 2
     }
   }
 }
diff --git a/workers/loc.api/data-validator/schemas/getCandlesFileReq.js b/workers/loc.api/data-validator/schemas/getCandlesFileReq.js
@@ -24,8 +24,7 @@ module.exports = {
       $ref: 'defs#/definitions/sort'
     },
     timeframe: {
-      type: 'string',
-      minLength: 2
+      $ref: 'defs#/definitions/candleTimeframe'
     },
     section: {
       type: 'string',

diff --git a/workers/loc.api/data-validator/schemas/getCandlesReq.js b/workers/loc.api/data-validator/schemas/getCandlesReq.js
@@ -24,8 +24,7 @@ module.exports = {
       $ref: 'defs#/definitions/sort'
     },
     timeframe: {
-      type: 'string',
-      minLength: 2
+      $ref: 'defs#/definitions/candleTimeframe'
     },
     section: {
       type: 'string',

diff --git a/workers/loc.api/di/core.deps.js b/workers/loc.api/di/core.deps.js
@@ -17,6 +17,6 @@ module.exports = () => {
         [TYPES.CONF]
       )
     }).inSingletonScope()
-    bind(TYPES.DataValidator).toConstantValue(dataValidator)
+    bind(TYPES.DataValidator).toConstantValue(dataValidator.init())
   })
 }
diff --git a/workers/loc.api/generate-report-file/index.js b/workers/loc.api/generate-report-file/index.js
@@ -86,7 +86,7 @@ const _truncateFileNameEnding = (name) => {
   return `${cleanedName[0].toLowerCase()}${cleanedName.slice(1)}`
 }
 
-const _getfilterApiMethodNamesAndArgs = (
+const _getFilterApiMethodNamesAndArgs = (
   name,
   reqArgs
 ) => {
@@ -141,7 +141,7 @@ module.exports = (
     rootPath,
     conf
   })
-  const checkingDataArr = _getfilterApiMethodNamesAndArgs(
+  const checkingDataArr = _getFilterApiMethodNamesAndArgs(
     name,
     args
   )