chore: fix operators

Author: Vincent Molinié

src/services/composite-keys-manager.js

@@ -17,7 +17,7 @@ function CompositeKeysManager(model, schema, record) {
   };
 
   this.getRecordsConditions = function getRecordsConditions(recordsIds, options) {
-    const { OR } = new Operators(options);
+    const { OR } = Operators.getInstance(options);
     return { [OR]: recordsIds.map((recordId) => this.getRecordConditions(recordId)) };
   };
 

src/services/filters-parser.js

@@ -5,7 +5,7 @@ import { NoMatchingOperatorError } from './errors';
 const { getReferenceSchema, getReferenceField } = require('../utils/query');
 
 function FiltersParser(modelSchema, timezone, options) {
-  this.OPERATORS = new Operators(options);
+  this.OPERATORS = Operators.getInstance(options);
   this.operatorDateParser = new BaseOperatorDateParser({ operators: this.OPERATORS, timezone });
 
   this.perform = async (filtersString) =>

src/services/has-many-dissociator.js

@@ -4,7 +4,7 @@ const orm = require('../utils/orm');
 const { ErrorHTTP422 } = require('./errors');
 
 function HasManyDissociator(model, association, options, params, data) {
-  const OPERATORS = new Operators(options);
+  const OPERATORS = Operators.getInstance(options);
   const isDelete = Boolean(params.delete);
 
   this.perform = () => {

src/services/resources-getter.js

@@ -15,7 +15,7 @@ function ResourcesGetter(model, options, params) {
   const queryBuilder = new QueryBuilder(model, options, params);
   let segmentScope;
   let segmentWhere;
-  const OPERATORS = new Operators(options);
+  const OPERATORS = Operators.getInstance(options);
   const primaryKey = _.keys(model.primaryKeys)[0];
   const filterParser = new FiltersParser(schema, params.timezone, options);
   let fieldNamesRequested;

src/services/search-builder.js

@@ -13,7 +13,7 @@ function SearchBuilder(model, opts, params, fieldNamesRequested) {
   let associations = _.clone(model.associations);
   const hasSearchFields = schema.searchFields && _.isArray(schema.searchFields);
   let searchAssociationFields;
-  const OPERATORS = new Operators(opts);
+  const OPERATORS = Operators.getInstance(opts);
   const fieldsSearched = [];
   let hasExtendedConditions = false;
 

src/services/value-stat-getter.js

@@ -5,7 +5,7 @@ import FiltersParser from './filters-parser';
 import Orm from '../utils/orm';
 
 function ValueStatGetter(model, params, options) {
-  const OPERATORS = new Operators(options);
+  const OPERATORS = Operators.getInstance(options);
 
   this.operatorDateParser = new BaseOperatorDateParser({
     operators: OPERATORS,

src/utils/operators.js

@@ -1,41 +1,44 @@
-let instance = null;
+class Operators {
+  static _instance = null;
 
-function Operators(options) {
-  if (instance) return instance;
+  constructor(options) {
+    if (options && options.sequelize && options.sequelize.Op) {
+      const { Op } = options.sequelize;
+      this.AND = Op.and;
+      this.CONTAINS = Op.contains;
+      this.EQ = Op.eq;
+      this.GT = Op.gt;
+      this.GTE = Op.gte;
+      this.IN = Op.in;
+      this.LIKE = Op.like;
+      this.LT = Op.lt;
+      this.LTE = Op.lte;
+      this.NE = Op.ne;
+      this.NOT = Op.not;
+      this.NOT_LIKE = Op.notLike;
+      this.OR = Op.or;
+    } else {
+      this.AND = '$and';
+      this.CONTAINS = '$contains';
+      this.EQ = '$eq';
+      this.GT = '$gt';
+      this.GTE = '$gte';
+      this.IN = '$in';
+      this.LIKE = '$like';
+      this.LT = '$lt';
+      this.LTE = '$lte';
+      this.NE = '$ne';
+      this.NOT = '$not';
+      this.NOT_LIKE = '$notLike';
+      this.OR = '$or';
+    }
 
-  if (options && options.Sequelize && options.Sequelize.Op) {
-    const { Op } = options.Sequelize;
-    this.AND = Op.and;
-    this.CONTAINS = Op.contains;
-    this.EQ = Op.eq;
-    this.GT = Op.gt;
-    this.GTE = Op.gte;
-    this.IN = Op.in;
-    this.LIKE = Op.like;
-    this.LT = Op.lt;
-    this.LTE = Op.lte;
-    this.NE = Op.ne;
-    this.NOT = Op.not;
-    this.NOT_LIKE = Op.notLike;
-    this.OR = Op.or;
-  } else {
-    this.AND = '$and';
-    this.CONTAINS = '$contains';
-    this.EQ = '$eq';
-    this.GT = '$gt';
-    this.GTE = '$gte';
-    this.IN = '$in';
-    this.LIKE = '$like';
-    this.LT = '$lt';
-    this.LTE = '$lte';
-    this.NE = '$ne';
-    this.NOT = '$not';
-    this.NOT_LIKE = '$notLike';
-    this.OR = '$or';
+    Operators._instance = this;
   }
 
-  instance = this;
-  return this;
+  static getInstance(options) {
+    return Operators._instance || new Operators(options);
+  }
 }
 
 module.exports = Operators;

test/services/filters-parser.test.js

@@ -12,7 +12,7 @@ describe('services > filters-parser', () => {
     sequelize: Sequelize,
   };
   const timezone = 'Europe/Paris';
-  const OPERATORS = new Operators(sequelizeOptions);
+  const OPERATORS = Operators.getInstance(sequelizeOptions);
   const defaultFiltersParser = new FiltersParser(schema, timezone, sequelizeOptions);
 
   const getExpectedCondition = (field, conditions) => {