@autofleet/sadot 0.13.2 → 0.13.3-beta-c0a9f0d7.1

package/.env

@@ -0,0 +1,4 @@
+AF_SERVICE_NAME=sadot_package_test
+NODE_ENV=test
+DB_USERNAME=postgres
+DB_PASSWORD=postgres

package/dist/scopes/filter.d.ts

@@ -12,7 +12,6 @@ type customFieldsFilterScopeParams = {
  * @returns A function that takes conditions and returns the Sequelize options object.
  */
 export declare const customFieldsFilterScope: (name: string, options?: Pick<CustomFieldOptions, 'useCustomFieldsEntries'>) => ({ replacementsMap: replacements, scopeValue: conditions }: customFieldsFilterScopeParams) => CustomFieldFilterOptions;
-export declare const scopeName: "filterByCustomFields";
 export declare const customFieldsSortScope: (name: string, options?: Pick<CustomFieldOptions, 'useCustomFieldsEntries'>) => ({ replacementsMap, scopeValue: sort }: {
     replacementsMap: any;
     scopeValue: any;
@@ -24,7 +23,7 @@ export declare const customFieldsSortScope: (name: string, options?: Pick<Custom
     attributes: {
         include: (string | import("sequelize/types/utils").Literal)[][];
     };
-    order: import("sequelize/types/utils").Literal[];
+    order: any[][];
     replacements: any;
 };
 export {};

package/dist/scopes/filter.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.customFieldsSortScope = exports.scopeName = exports.customFieldsFilterScope = void 0;
+exports.customFieldsSortScope = exports.customFieldsFilterScope = void 0;
 /* eslint-disable import/prefer-default-export */
 const sequelize_1 = require("sequelize");
 const sequelize_typescript_1 = require("sequelize-typescript");
 const common_types_1 = require("@autofleet/common-types");
-const helpers_1 = require("../utils/helpers");
 const filter_helpers_1 = require("./helpers/filter.helpers");
 const { CUSTOM_FIELDS_FILTER_SCOPE } = common_types_1.customFields;
 /**
@@ -46,23 +45,23 @@ const customFieldsFilterScope = (name, options) => ({ replacementsMap: replaceme
     };
 };
 exports.customFieldsFilterScope = customFieldsFilterScope;
-exports.scopeName = CUSTOM_FIELDS_FILTER_SCOPE;
 const customFieldsSortScope = (name, options) => ({ replacementsMap, scopeValue: sort }) => {
     if (!sort || sort.length === 0) {
         return {};
     }
     const queryType = options?.useCustomFieldsEntries ? filter_helpers_1.SubQueryType.ENTRIES : filter_helpers_1.SubQueryType.VALUES;
-    const randomStr = (0, helpers_1.generateRandomString)();
     const includes = Object.entries(sort).map(([key]) => {
         const replacementKey = Object.keys(replacementsMap).find((randomString) => replacementsMap[randomString] === key);
+        const alias = `cf_sort_${key}`; // Explicit unique alias per field
         return ([
-            sequelize_typescript_1.Sequelize.literal((0, filter_helpers_1.getSortCustomFieldsSubQuery)(queryType, name, replacementKey)),
-            randomStr,
+            sequelize_typescript_1.Sequelize.literal(`(${(0, filter_helpers_1.getSortCustomFieldsSubQuery)(queryType, name, replacementKey)})`),
+            alias,
         ]);
     });
-    const orders = Object.entries(sort).map(([, sortObject]) => {
+    const orders = Object.entries(sort).map(([key, sortObject]) => {
         const direction = typeof sortObject === 'string' ? sortObject : Object.values(sortObject)[0];
-        return sequelize_typescript_1.Sequelize.literal(`"${randomStr}" ${direction || 'ASC'}`);
+        const alias = `cf_sort_${key}`;
+        return [sequelize_typescript_1.Sequelize.literal(`"${alias}"`), direction || 'ASC'];
     });
     return {
         attributes: {

package/dist/scopes/helpers/filter.helpers.js

@@ -117,17 +117,15 @@ const getSortCustomFieldsSubQuery = (queryType, modelType, replacementKey) => {
             `;
         case SubQueryType.ENTRIES:
             return `(
-        SELECT
-            customFields.value
-        FROM
-            custom_field_entries AS ${exports.CE_TABLE_ALIAS},
-            jsonb_each_text(custom_fields) AS customFields
-        WHERE
-          customFields.key = :${replacementKey}${exports.AND_DELIMITER}
-          ${exports.CE_TABLE_ALIAS}.model_type = '${modelType}'${exports.AND_DELIMITER}
-          ${exports.CE_TABLE_ALIAS}.model_id = "${modelType}"."id"
-        )
-      `;
+    SELECT customFields.value::numeric -- <-- Add numeric casting if sorting numeric values
+    FROM custom_field_entries AS ${exports.CE_TABLE_ALIAS},
+         jsonb_each_text(custom_fields) AS customFields
+    WHERE
+      customFields.key = :${replacementKey}${exports.AND_DELIMITER}
+      ${exports.CE_TABLE_ALIAS}.model_type = '${modelType}'${exports.AND_DELIMITER}
+      ${exports.CE_TABLE_ALIAS}.model_id = "${modelType}"."id"
+    LIMIT 1
+  )`;
         default:
             throw new Error('Invalid query type');
     }

package/dist/utils/db/index.js

@@ -9,10 +9,10 @@ exports.default = (databaseConfig) => {
     const config = databaseConfig[env];
     let sequelize;
     if (config.use_env_variable) {
-        sequelize = new sequelize_typescript_1.Sequelize(process.env[config.use_env_variable], config);
+        sequelize = new sequelize_typescript_1.Sequelize(process.env[config.use_env_variable], { ...config, logging: console.log });
     }
     else {
-        sequelize = new sequelize_typescript_1.Sequelize(config.database, config.username, config.password, config);
+        sequelize = new sequelize_typescript_1.Sequelize(config.database, config.username, config.password, { ...config, logging: console.log });
     }
     return sequelize;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "0.13.2",
+  "version": "0.13.3-beta-c0a9f0d7.1",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/scopes/filter.ts

@@ -64,8 +64,6 @@ export const customFieldsFilterScope = (
   };
 };
 
-export const scopeName = CUSTOM_FIELDS_FILTER_SCOPE;
-
 export const customFieldsSortScope = (
   name: string,
   options?: Pick<CustomFieldOptions, 'useCustomFieldsEntries'>,
@@ -75,21 +73,24 @@ export const customFieldsSortScope = (
   }
 
   const queryType = options?.useCustomFieldsEntries ? SubQueryType.ENTRIES : SubQueryType.VALUES;
-  const randomStr = generateRandomString();
+
   const includes = Object.entries(sort).map(([key]) => {
     const replacementKey = Object.keys(replacementsMap).find(
       (randomString) => replacementsMap[randomString] === key,
     );
+    const alias = `cf_sort_${key}`; // Explicit unique alias per field
     return ([
-      Sequelize.literal(getSortCustomFieldsSubQuery(queryType, name, replacementKey)),
-      randomStr,
+      Sequelize.literal(`(${getSortCustomFieldsSubQuery(queryType, name, replacementKey)})`),
+      alias,
     ]);
   });
 
-  const orders = Object.entries(sort).map(([, sortObject]) => {
+  const orders = Object.entries(sort).map(([key, sortObject]) => {
     const direction = typeof sortObject === 'string' ? sortObject : Object.values(sortObject)[0];
-    return Sequelize.literal(`"${randomStr}" ${direction || 'ASC'}`);
+    const alias = `cf_sort_${key}`;
+    return [Sequelize.literal(`"${alias}"`), direction || 'ASC'];
   });
+
   return {
     attributes: {
       include: includes,

package/src/scopes/helpers/filter.helpers.ts

@@ -134,17 +134,15 @@ export const getSortCustomFieldsSubQuery = (queryType: SubQueryType, modelType:
             `;
     case SubQueryType.ENTRIES:
       return `(
-        SELECT
-            customFields.value
-        FROM
-            custom_field_entries AS ${CE_TABLE_ALIAS},
-            jsonb_each_text(custom_fields) AS customFields
-        WHERE
-          customFields.key = :${replacementKey}${AND_DELIMITER}
-          ${CE_TABLE_ALIAS}.model_type = '${modelType}'${AND_DELIMITER}
-          ${CE_TABLE_ALIAS}.model_id = "${modelType}"."id"
-        )
-      `;
+    SELECT customFields.value::numeric -- <-- Add numeric casting if sorting numeric values
+    FROM custom_field_entries AS ${CE_TABLE_ALIAS},
+         jsonb_each_text(custom_fields) AS customFields
+    WHERE
+      customFields.key = :${replacementKey}${AND_DELIMITER}
+      ${CE_TABLE_ALIAS}.model_type = '${modelType}'${AND_DELIMITER}
+      ${CE_TABLE_ALIAS}.model_id = "${modelType}"."id"
+    LIMIT 1
+  )`;
     default:
       throw new Error('Invalid query type');
   }

package/src/utils/db/index.ts

@@ -7,9 +7,9 @@ export default (databaseConfig: any): Sequelize => {
   const config = databaseConfig[env];
   let sequelize: Sequelize;
   if (config.use_env_variable) {
-    sequelize = new Sequelize(process.env[config.use_env_variable], config);
+    sequelize = new Sequelize(process.env[config.use_env_variable], { ...config, logging: console.log });
   } else {
-    sequelize = new Sequelize(config.database, config.username, config.password, config);
+    sequelize = new Sequelize(config.database, config.username, config.password, { ...config, logging: console.log });
   }
   return sequelize;
 };