@autofleet/sadot 0.5.2 → 0.5.3

package/dist/scopes/filter.js

@@ -4,7 +4,8 @@ exports.scopeName = exports.customFieldsFilterScope = void 0;
 /* eslint-disable import/prefer-default-export */
 const sequelize_1 = require("sequelize");
 const sequelize_typescript_1 = require("sequelize-typescript");
-const constants_1 = require("../utils/constants");
+const common_types_1 = require("@autofleet/common-types");
+const { CUSTOM_FIELDS_FILTER_SCOPE } = common_types_1.customFields;
 /**
  * A Sequelize scope for filtering models by custom fields.
  * This scope builds a WHERE clause to be applied on the main query.
@@ -51,4 +52,4 @@ const customFieldsFilterScope = (name) => (conditions) => {
     };
 };
 exports.customFieldsFilterScope = customFieldsFilterScope;
-exports.scopeName = constants_1.CUSTOM_FIELDS_FILTER_SCOPE;
+exports.scopeName = CUSTOM_FIELDS_FILTER_SCOPE;

package/dist/utils/constants/index.d.ts

@@ -1,2 +1,5 @@
+declare const CUSTOM_FIELDS_FILTER_SCOPE: string;
 export declare const supportedEntities: string[];
-export declare const CUSTOM_FIELDS_FILTER_SCOPE = "filterByCustomFields";
+export { 
+/** @deprecated Use the value from `@autofleet/common-types` instead */
+CUSTOM_FIELDS_FILTER_SCOPE, };

package/dist/utils/constants/index.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CUSTOM_FIELDS_FILTER_SCOPE = exports.supportedEntities = void 0;
+const common_types_1 = require("@autofleet/common-types");
+const { CUSTOM_FIELDS_FILTER_SCOPE } = common_types_1.customFields;
+exports.CUSTOM_FIELDS_FILTER_SCOPE = CUSTOM_FIELDS_FILTER_SCOPE;
 // eslint-disable-next-line import/prefer-default-export
 exports.supportedEntities = ['businessModelId', 'fleetId', 'demandSourceId'];
-exports.CUSTOM_FIELDS_FILTER_SCOPE = 'filterByCustomFields';

package/dist/utils/init.js

@@ -5,11 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addScopes = exports.removeHooks = exports.addHooks = void 0;
 const sequelize_1 = require("sequelize");
+const common_types_1 = require("@autofleet/common-types");
 const models_1 = require("../models");
 const hooks_1 = require("../hooks");
 const scopes_1 = require("../scopes");
 const logger_1 = __importDefault(require("./logger"));
-const constants_1 = require("./constants");
+const { CUSTOM_FIELDS_FILTER_SCOPE } = common_types_1.customFields;
 const addHooks = (models, getModel) => {
     models.forEach(async ({ name, scopeAttributes }) => {
         try {
@@ -89,7 +90,7 @@ const addScopes = (models, getModel) => {
             // Necessary associations for the filtering scope
             addAssociations(model, name);
             // Add filter scope
-            model.addScope(constants_1.CUSTOM_FIELDS_FILTER_SCOPE, (0, scopes_1.customFieldsFilterScope)(name));
+            model.addScope(CUSTOM_FIELDS_FILTER_SCOPE, (0, scopes_1.customFieldsFilterScope)(name));
         }
         catch (e) {
             logger_1.default.error(`Could not add custom fields scopes to model ${name}. `, e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -12,6 +12,7 @@
     "dev": "nodemon"
   },
   "dependencies": {
+    "@autofleet/common-types": "^1.7.29",
     "@autofleet/errors": "^1.0.10",
     "@autofleet/events": "^2.0.0",
     "@autofleet/logger": "^2.0.5",

package/src/scopes/filter.ts

@@ -1,7 +1,9 @@
 /* eslint-disable import/prefer-default-export */
 import { Op, WhereOptions } from 'sequelize';
 import { Sequelize } from 'sequelize-typescript';
-import { CUSTOM_FIELDS_FILTER_SCOPE } from '../utils/constants';
+import { customFields } from '@autofleet/common-types';
+
+const { CUSTOM_FIELDS_FILTER_SCOPE } = customFields;
 
 /**
  * Type representing possible condition values.

package/src/utils/constants/index.ts

@@ -1,4 +1,11 @@
+import { customFields } from '@autofleet/common-types';
+
+const { CUSTOM_FIELDS_FILTER_SCOPE } = customFields;
+
 // eslint-disable-next-line import/prefer-default-export
 export const supportedEntities = ['businessModelId', 'fleetId', 'demandSourceId'];
 
-export const CUSTOM_FIELDS_FILTER_SCOPE = 'filterByCustomFields';
+export {
+  /** @deprecated Use the value from `@autofleet/common-types` instead */
+  CUSTOM_FIELDS_FILTER_SCOPE,
+};

package/src/utils/init.ts

@@ -1,5 +1,6 @@
 import { DataTypes } from 'sequelize';
 import { ModelCtor } from 'sequelize-typescript';
+import { customFields } from '@autofleet/common-types';
 import {
   CustomFieldValue,
 } from '../models';
@@ -14,7 +15,8 @@ import {
 import { customFieldsFilterScope } from '../scopes';
 import logger from './logger';
 import type { ModelFetcher, ModelOptions } from '../types';
-import { CUSTOM_FIELDS_FILTER_SCOPE } from './constants';
+
+const { CUSTOM_FIELDS_FILTER_SCOPE } = customFields;
 
 export const addHooks = (models: ModelOptions[], getModel: ModelFetcher): void => {
   models.forEach(async ({ name, scopeAttributes }) => {