@autofleet/sadot 0.8.6-beta-645eb88e.1 → 0.8.6

package/dist/models/index.js

@@ -22,7 +22,7 @@ exports.AssociatedTestModel = AssociatedTestModel_1.default;
 const productionModels = [CustomFieldDefinition_1.default, CustomFieldValue_1.default];
 const testModels = [TestModel_1.default, AssociatedTestModel_1.default, ContextAwareTestModel_1.default, ContextTestModel_1.default];
 const SADOT_MIGRATION_PREFIX = 'sadot-migration';
-const SCHEMA_VERSION = 'qq0fa867-1241-4816-b08d-5ed9060c7ae5';
+const SCHEMA_VERSION = 'fb0fa867-1241-4816-b08d-5ed9060c7ae5';
 const initTables = async (sequelize, getUser, { schemaPrefix, schemaVersion } = { schemaPrefix: SADOT_MIGRATION_PREFIX, schemaVersion: SCHEMA_VERSION }) => {
     const CUSTOM_FIELDS_SCHEMA_VERSION = `${schemaPrefix}_${schemaVersion}`;
     logger_1.default.info('custom-fields: initialize custom-fields tables');

package/dist/scopes/filter.js

@@ -18,9 +18,6 @@ const castIfNeeded = (columnName, conditionValue) => {
     if (isDate(conditionValue)) {
         return castValueToJsonb(columnName, 'timestamp');
     }
-    if (!Number.isNaN(Number(conditionValue))) {
-        return castValueToJsonbNumeric(columnName);
-    }
     return columnName;
 };
 const AND_DELIMITER = ' AND ';

package/dist/tests/mocks/definition.mock.js

@@ -64,6 +64,7 @@ const createDefinition = (defaults) => ({
     fieldType: defaults?.fieldType || 'boolean',
     entityId: defaults?.entityId || (0, node_crypto_1.randomUUID)(),
     entityType: defaults?.entityType || 'fleetId',
+    ...(defaults?.validation && { validation: defaults.validation }),
     ...(defaults?.defaultValue && { defaultValue: defaults.defaultValue }),
 });
 exports.createDefinition = createDefinition;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "0.8.6-beta-645eb88e.1",
+  "version": "0.8.6",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/models/index.ts

@@ -14,7 +14,7 @@ const productionModels = [CustomFieldDefinition, CustomFieldValue];
 const testModels = [TestModel, AssociatedTestModel, ContextAwareTestModel, ContextTestModel];
 
 const SADOT_MIGRATION_PREFIX = 'sadot-migration';
-const SCHEMA_VERSION = 'qq0fa867-1241-4816-b08d-5ed9060c7ae5';
+const SCHEMA_VERSION = 'fb0fa867-1241-4816-b08d-5ed9060c7ae5';
 
 const initTables = async (
   sequelize: Sequelize,

package/src/scopes/filter.ts

@@ -44,9 +44,6 @@ const castIfNeeded = (columnName: string, conditionValue: string): string => {
   if (isDate(conditionValue)) {
     return castValueToJsonb(columnName, 'timestamp');
   }
-  if (!Number.isNaN(Number(conditionValue))) {
-    return castValueToJsonbNumeric(columnName);
-  }
   return columnName;
 };
 const AND_DELIMITER = ' AND ';

package/src/tests/mocks/definition.mock.ts

@@ -1,4 +1,4 @@
-import { randomUUID as uuidv4 } from 'node:crypto';
+import { randomUUID } from 'node:crypto';
 import type { CreateCustomFieldDefinition, CustomFieldDefinitionDTO } from '../../types/definition';
 
 export const contextAwareFieldDefinition = {
@@ -12,7 +12,7 @@ export const coolFieldDefinition: CreateCustomFieldDefinition = {
   name: 'cool field',
   modelType: 'TestModel',
   fieldType: 'number',
-  entityId: uuidv4(),
+  entityId: randomUUID(),
   entityType: 'fleetId',
 };
 
@@ -30,7 +30,7 @@ export const booleanField = (modelType: string): CreateCustomFieldDefinition =>
   name: 'shapeless',
   modelType,
   fieldType: 'boolean',
-  entityId: uuidv4(),
+  entityId: randomUUID(),
   entityType: 'fleetId',
 });
 
@@ -39,7 +39,7 @@ export const selectField = (modelType: string, options): CreateCustomFieldDefini
   modelType,
   fieldType: 'select',
   validation: options,
-  entityId: uuidv4(),
+  entityId: randomUUID(),
   entityType: 'fleetId',
 });
 
@@ -48,7 +48,7 @@ export const statusField = (modelType: string, options): CreateCustomFieldDefini
   modelType,
   fieldType: 'status',
   validation: options,
-  entityId: uuidv4(),
+  entityId: randomUUID(),
   entityType: 'fleetId',
 });
 
@@ -56,17 +56,18 @@ export const fileField = (modelType: string): CreateCustomFieldDefinition => ({
   name: 'file',
   modelType,
   fieldType: 'file',
-  entityId: uuidv4(),
+  entityId: randomUUID(),
   entityType: 'fleetId',
 });
 
 // eslint-disable-next-line max-len
 export const createDefinition = (defaults: Partial<CustomFieldDefinitionDTO>): CreateCustomFieldDefinition => ({
-  name: defaults?.name || `def_${uuidv4()}`,
+  name: defaults?.name || `def_${randomUUID()}`,
   modelType: defaults?.modelType || 'TestModel',
   fieldType: defaults?.fieldType || 'boolean',
-  entityId: defaults?.entityId || uuidv4(),
+  entityId: defaults?.entityId || randomUUID(),
   entityType: defaults?.entityType || 'fleetId',
+  ...(defaults?.validation && { validation: defaults.validation }),
   ...(defaults?.defaultValue && { defaultValue: defaults.defaultValue }),
 });
 
@@ -75,9 +76,9 @@ export const createDefinitions = (
   length = 1,
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 ): CreateCustomFieldDefinition[] => (Array(length).fill({}).map((_) => ({
-  name: defaults?.name || `def_${uuidv4()}`,
+  name: defaults?.name || `def_${randomUUID()}`,
   modelType: defaults?.modelType || 'TestModel',
   fieldType: defaults?.fieldType || 'boolean',
-  entityId: defaults?.entityId || uuidv4(),
+  entityId: defaults?.entityId || randomUUID(),
   entityType: defaults?.entityType || 'fleetId',
 })));