@autofleet/sadot 0.5.5-beta.12 → 0.5.5-beta.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/dist/tests/functional/searching/index.js +1 -2
  2. package/dist/utils/helpers/index.d.ts +2 -2
  3. package/dist/utils/helpers/index.js +1 -1
  4. package/package.json +1 -1
  5. package/src/tests/functional/searching/index.ts +0 -1
  6. package/src/utils/helpers/index.ts +4 -4
package/dist/tests/functional/searching/index.js CHANGED
@@ -23,7 +23,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
23
23
  return result;
24
24
  };
25
25
  Object.defineProperty(exports, "__esModule", { value: true });
26
- const sequelize_typescript_1 = require("sequelize-typescript");
27
26
  const index_1 = require("../../../index");
28
27
  const DefinitionRepo = __importStar(require("../../../repository/definition"));
29
28
  const definition_mock_1 = require("../../mocks/definition.mock");
@@ -35,7 +34,7 @@ const customFieldsSearchTestFlow = async ({ fieldType, fieldValue, searchTerm, e
35
34
  const [testModel1] = await (0, testModel_1.createTestModels)(definition.entityId, 2);
36
35
  await testModel1.update({ customFields: { [definition.name]: fieldValue } });
37
36
  const models = await models_1.TestModel.findAndCountAll({
38
- ...(0, index_1.generateCustomFieldSearchQueryPayload)(searchTerm, models_1.TestModel, definition.entityId, [sequelize_typescript_1.DataType.DATE]),
37
+ ...(0, index_1.generateCustomFieldSearchQueryPayload)(searchTerm, models_1.TestModel, definition.entityId),
39
38
  });
40
39
  expect(models.count).toBe(expectedNumberOfQueryResults);
41
40
  if (expectedNumberOfQueryResults > 0) {
package/dist/utils/helpers/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { WhereOptions, BindOrReplacements, DataType } from 'sequelize';
1
+ import { WhereOptions, BindOrReplacements, DataType as SequelizeDataTypes } from 'sequelize';
2
2
  import { ModelStatic } from 'sequelize-typescript';
3
3
  /**
4
4
  * Builds a WHERE clause and replacements for free-text search by custom fields.
@@ -18,5 +18,5 @@ interface CustomFieldsSearchPayload {
18
18
  where: WhereOptions;
19
19
  replacements: BindOrReplacements;
20
20
  }
21
- export declare const generateCustomFieldSearchQueryPayload: (searchTerm: string, model: ModelStatic, entityId: string, excludedCustomFieldsTypes: DataType[]) => CustomFieldsSearchPayload;
21
+ export declare const generateCustomFieldSearchQueryPayload: (searchTerm: string, model: ModelStatic, entityId: string, excludedCustomFieldsTypes?: SequelizeDataTypes[]) => CustomFieldsSearchPayload;
22
22
  export {};
package/dist/utils/helpers/index.js CHANGED
@@ -4,7 +4,7 @@ exports.generateCustomFieldSearchQueryPayload = void 0;
4
4
  /* eslint-disable import/prefer-default-export */
5
5
  const sequelize_1 = require("sequelize");
6
6
  const sequelize_typescript_1 = require("sequelize-typescript");
7
- const generateCustomFieldSearchQueryPayload = (searchTerm, model, entityId, excludedCustomFieldsTypes) => {
7
+ const generateCustomFieldSearchQueryPayload = (searchTerm, model, entityId, excludedCustomFieldsTypes = [sequelize_typescript_1.DataType.DATE]) => {
8
8
  const subQuery = 'EXISTS ('
9
9
  + ' SELECT 1'
10
10
  + ' FROM "custom_field_values" AS "cv"'
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@autofleet/sadot",
3
- "version": "0.5.5-beta.12",
3
+ "version": "0.5.5-beta.14",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
package/src/tests/functional/searching/index.ts CHANGED
@@ -28,7 +28,6 @@ const customFieldsSearchTestFlow = async ({
28
28
  searchTerm,
29
29
  TestModel,
30
30
  definition.entityId,
31
- [DataType.DATE],
32
31
  ),
33
32
  },
34
33
  );
package/src/utils/helpers/index.ts CHANGED
@@ -1,8 +1,8 @@
1
1
  /* eslint-disable import/prefer-default-export */
2
2
  import {
3
- WhereOptions, Op, BindOrReplacements, DataType,
3
+ WhereOptions, Op, BindOrReplacements, DataType as SequelizeDataTypes,
4
4
  } from 'sequelize';
5
- import { ModelStatic, Sequelize } from 'sequelize-typescript';
5
+ import { DataType, ModelStatic, Sequelize } from 'sequelize-typescript';
6
6
 
7
7
  /**
8
8
  * Builds a WHERE clause and replacements for free-text search by custom fields.
@@ -28,7 +28,7 @@ export const generateCustomFieldSearchQueryPayload = (
28
28
  searchTerm: string,
29
29
  model: ModelStatic,
30
30
  entityId : string,
31
- excludedCustomFieldsTypes : DataType[],
31
+ excludedCustomFieldsTypes : SequelizeDataTypes[] = [DataType.DATE],
32
32
  ): CustomFieldsSearchPayload => {
33
33
  const subQuery = 'EXISTS ('
34
34
  + ' SELECT 1'
@@ -37,7 +37,7 @@ export const generateCustomFieldSearchQueryPayload = (
37
37
  + ` ON cd.entity_id = '${entityId}'`
38
38
  + ' AND cv.custom_field_definition_id = cd.id '
39
39
  + ` AND cd.model_type = '${model.name}' `
40
- + ` AND cd.field_type NOT IN (${excludedCustomFieldsTypes})`
40
+ + ' AND cd.field_type NOT IN (datetime)'
41
41
  + ' WHERE'
42
42
  + ' "cv"."deleted_at" IS NULL'
43
43
  + ` AND "cv"."model_id" = "${model.name}"."id"`