@autofleet/sadot 1.2.0 → 1.2.1-beta
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.
- package/.nvmrc +1 -0
- package/dist/api/index.d.ts +3 -0
- package/dist/api/index.js +12 -2
- package/dist/api/v1/definition/index.d.ts +3 -0
- package/dist/api/v1/definition/index.js +116 -2
- package/dist/api/v1/definition/validations.d.ts +2 -0
- package/dist/api/v1/definition/validations.js +77 -2
- package/dist/api/v1/errors.d.ts +4 -0
- package/dist/api/v1/errors.js +12 -2
- package/dist/api/v1/index.d.ts +3 -0
- package/dist/api/v1/index.js +13 -2
- package/dist/api/v1/validator/index.d.ts +3 -0
- package/dist/api/v1/validator/index.js +143 -2
- package/dist/api/v1/validator/validations.d.ts +6 -23
- package/dist/api/v1/validator/validations.js +38 -2
- package/dist/errors/index.d.ts +24 -0
- package/dist/errors/index.js +66 -3
- package/dist/events/index.d.ts +5 -0
- package/dist/events/index.js +54 -2
- package/dist/hooks/create.d.ts +10 -0
- package/dist/hooks/create.js +95 -0
- package/dist/hooks/enrich.d.ts +25 -0
- package/dist/hooks/enrich.js +198 -2
- package/dist/hooks/find.d.ts +1 -0
- package/dist/hooks/find.js +29 -2
- package/dist/hooks/hooks.d.ts +17 -0
- package/dist/hooks/hooks.js +388 -2
- package/dist/hooks/index.d.ts +5 -0
- package/dist/hooks/index.js +17 -1
- package/dist/hooks/update.d.ts +10 -0
- package/dist/hooks/update.js +49 -0
- package/dist/hooks/utils/updateInstanceValues.d.ts +15 -0
- package/dist/hooks/utils/updateInstanceValues.js +50 -2
- package/dist/hooks/workaround.d.ts +10 -0
- package/dist/hooks/workaround.js +37 -0
- package/dist/index.d.ts +12 -22
- package/dist/index.js +67 -2
- package/dist/models/CustomFieldDefinition.d.ts +23 -31
- package/dist/models/CustomFieldDefinition.js +192 -2
- package/dist/models/CustomFieldEntries.d.ts +13 -14
- package/dist/models/CustomFieldEntries.js +123 -2
- package/dist/models/CustomFieldValue.d.ts +14 -19
- package/dist/models/CustomFieldValue.js +151 -2
- package/dist/models/CustomValidator.d.ts +15 -17
- package/dist/models/CustomValidator.js +98 -2
- package/dist/models/index.d.ts +18 -7
- package/dist/models/index.js +131 -2
- package/dist/models/tests/AssociatedTestModel.d.ts +12 -0
- package/dist/models/tests/AssociatedTestModel.js +71 -2
- package/dist/models/tests/TestModel.d.ts +12 -0
- package/dist/models/tests/TestModel.js +69 -2
- package/dist/models/tests/contextAwareModels/ContextAwareTestModel.d.ts +10 -0
- package/dist/models/tests/contextAwareModels/ContextAwareTestModel.js +53 -2
- package/dist/models/tests/contextAwareModels/ContextTestModel.d.ts +13 -0
- package/dist/models/tests/contextAwareModels/ContextTestModel.js +47 -2
- package/dist/repository/definition.d.ts +36 -0
- package/dist/repository/definition.js +121 -2
- package/dist/repository/entries.d.ts +13 -0
- package/dist/repository/entries.js +92 -2
- package/dist/repository/utils/formatValues.d.ts +3 -0
- package/dist/repository/utils/formatValues.js +16 -2
- package/dist/repository/validator.d.ts +27 -0
- package/dist/repository/validator.js +69 -2
- package/dist/repository/value.d.ts +28 -0
- package/dist/repository/value.js +124 -2
- package/dist/scopes/filter.d.ts +29 -22
- package/dist/scopes/filter.js +75 -2
- package/dist/scopes/helpers/filter.helpers.d.ts +40 -15
- package/dist/scopes/helpers/filter.helpers.js +183 -25
- package/dist/scopes/index.d.ts +2 -0
- package/dist/scopes/index.js +6 -1
- package/dist/tests/api/test-api.d.ts +2 -0
- package/dist/tests/api/test-api.js +38 -0
- package/dist/tests/functional/searching/index.d.ts +8 -0
- package/dist/tests/functional/searching/index.js +44 -0
- package/dist/tests/helpers/commonHooks.d.ts +6 -0
- package/dist/tests/helpers/commonHooks.js +62 -0
- package/dist/tests/helpers/database-config.d.ts +16 -0
- package/dist/tests/helpers/database-config.js +17 -0
- package/dist/tests/helpers/index.d.ts +7 -0
- package/dist/tests/helpers/index.js +33 -0
- package/dist/tests/mocks/definition.mock.d.ts +48 -0
- package/dist/tests/mocks/definition.mock.js +78 -0
- package/dist/tests/mocks/events.mock.d.ts +4 -0
- package/dist/tests/mocks/events.mock.js +21 -0
- package/dist/tests/mocks/testModel.d.ts +12 -0
- package/dist/tests/mocks/testModel.js +35 -0
- package/dist/types/definition/index.d.ts +25 -0
- package/dist/types/definition/index.js +2 -0
- package/dist/types/entries/index.d.ts +25 -0
- package/dist/types/entries/index.js +2 -0
- package/dist/types/index.d.ts +46 -48
- package/dist/types/index.js +2 -0
- package/dist/types/value/index.d.ts +15 -0
- package/dist/types/value/index.js +2 -0
- package/dist/utils/constants/index.d.ts +17 -20
- package/dist/utils/constants/index.js +22 -2
- package/dist/utils/db/index.d.ts +4 -0
- package/dist/utils/db/index.js +24 -2
- package/dist/utils/helpers/index.d.ts +23 -28
- package/dist/utils/helpers/index.js +40 -2
- package/dist/utils/init.d.ts +7 -0
- package/dist/utils/init.js +112 -2
- package/dist/utils/logger/index.d.ts +3 -0
- package/dist/utils/logger/index.js +42 -2
- package/dist/utils/scopeAttributes.d.ts +2 -0
- package/dist/utils/scopeAttributes.js +11 -2
- package/dist/utils/validations/index.d.ts +8 -0
- package/dist/utils/validations/index.js +41 -2
- package/dist/utils/validations/schema/custom-fields.d.ts +2 -6
- package/dist/utils/validations/schema/custom-fields.js +9 -2
- package/dist/utils/validations/schema/validator-schema.d.ts +9 -0
- package/dist/utils/validations/schema/validator-schema.js +95 -2
- package/dist/utils/validations/type.d.ts +15 -0
- package/dist/utils/validations/type.js +2 -0
- package/dist/utils/validations/validators/index.d.ts +14 -0
- package/dist/utils/validations/validators/index.js +40 -2
- package/dist/utils/validations/validators/select.validator.d.ts +5 -0
- package/dist/utils/validations/validators/select.validator.js +12 -2
- package/dist/utils/validations/validators/status.validator.d.ts +12 -0
- package/dist/utils/validations/validators/status.validator.js +15 -2
- package/package.json +39 -40
- package/src/api/index.ts +10 -0
- package/src/api/v1/definition/index.ts +104 -0
- package/src/api/v1/definition/validations.ts +75 -0
- package/src/api/v1/errors.ts +13 -0
- package/src/api/v1/index.ts +11 -0
- package/src/api/v1/validator/index.ts +141 -0
- package/src/api/v1/validator/validations.ts +39 -0
- package/src/errors/index.ts +70 -0
- package/src/events/index.ts +63 -0
- package/src/hooks/create.ts +81 -0
- package/src/hooks/enrich.ts +255 -0
- package/src/hooks/find.ts +27 -0
- package/src/hooks/hooks.ts +464 -0
- package/src/hooks/index.ts +20 -0
- package/src/hooks/update.ts +55 -0
- package/src/hooks/utils/updateInstanceValues.ts +63 -0
- package/src/hooks/workaround.ts +47 -0
- package/src/index.ts +52 -0
- package/src/models/CustomFieldDefinition.ts +162 -0
- package/src/models/CustomFieldEntries.ts +81 -0
- package/src/models/CustomFieldValue.ts +118 -0
- package/src/models/CustomValidator.ts +78 -0
- package/src/models/index.ts +165 -0
- package/src/models/tests/AssociatedTestModel.ts +57 -0
- package/src/models/tests/TestModel.ts +54 -0
- package/src/models/tests/contextAwareModels/ContextAwareTestModel.ts +43 -0
- package/src/models/tests/contextAwareModels/ContextTestModel.ts +38 -0
- package/src/repository/definition.ts +175 -0
- package/src/repository/entries.ts +88 -0
- package/src/repository/utils/formatValues.ts +14 -0
- package/src/repository/validator.ts +116 -0
- package/src/repository/value.ts +116 -0
- package/src/scopes/filter.ts +100 -0
- package/src/scopes/helpers/filter.helpers.ts +227 -0
- package/src/scopes/index.ts +6 -0
- package/src/tests/api/test-api.ts +40 -0
- package/src/tests/functional/searching/index.ts +39 -0
- package/src/tests/helpers/commonHooks.ts +43 -0
- package/src/tests/helpers/database-config.ts +15 -0
- package/src/tests/helpers/index.ts +35 -0
- package/src/tests/mocks/definition.mock.ts +84 -0
- package/src/tests/mocks/events.mock.ts +21 -0
- package/src/tests/mocks/testModel.ts +37 -0
- package/src/types/definition/index.ts +24 -0
- package/src/types/entries/index.ts +27 -0
- package/src/types/index.ts +52 -0
- package/src/types/value/index.ts +14 -0
- package/src/utils/constants/index.ts +25 -0
- package/src/utils/db/index.ts +21 -0
- package/src/utils/helpers/index.ts +66 -0
- package/src/utils/init.ts +122 -0
- package/src/utils/logger/index.ts +14 -0
- package/src/utils/scopeAttributes.ts +12 -0
- package/src/utils/validations/index.ts +46 -0
- package/src/utils/validations/schema/README.md +93 -0
- package/src/utils/validations/schema/custom-fields.ts +8 -0
- package/src/utils/validations/schema/validator-schema.ts +106 -0
- package/src/utils/validations/type.ts +20 -0
- package/src/utils/validations/validators/index.ts +38 -0
- package/src/utils/validations/validators/select.validator.ts +12 -0
- package/src/utils/validations/validators/status.validator.ts +22 -0
- package/tsconfig.build.json +7 -0
- package/tsconfig.json +16 -0
- package/dist/_virtual/_@oxc-project_runtime@0.103.0/helpers/decorate.cjs +0 -1
- package/dist/_virtual/_@oxc-project_runtime@0.103.0/helpers/decorate.js +0 -1
- package/dist/_virtual/_@oxc-project_runtime@0.103.0/helpers/decorateMetadata.cjs +0 -1
- package/dist/_virtual/_@oxc-project_runtime@0.103.0/helpers/decorateMetadata.js +0 -1
- package/dist/_virtual/rolldown_runtime.cjs +0 -1
- package/dist/api/index.cjs +0 -2
- package/dist/api/index.cjs.map +0 -1
- package/dist/api/index.js.map +0 -1
- package/dist/api/v1/definition/index.cjs +0 -2
- package/dist/api/v1/definition/index.cjs.map +0 -1
- package/dist/api/v1/definition/index.js.map +0 -1
- package/dist/api/v1/definition/validations.cjs +0 -2
- package/dist/api/v1/definition/validations.cjs.map +0 -1
- package/dist/api/v1/definition/validations.js.map +0 -1
- package/dist/api/v1/errors.cjs +0 -2
- package/dist/api/v1/errors.cjs.map +0 -1
- package/dist/api/v1/errors.js.map +0 -1
- package/dist/api/v1/index.cjs +0 -2
- package/dist/api/v1/index.cjs.map +0 -1
- package/dist/api/v1/index.js.map +0 -1
- package/dist/api/v1/validator/index.cjs +0 -2
- package/dist/api/v1/validator/index.cjs.map +0 -1
- package/dist/api/v1/validator/index.js.map +0 -1
- package/dist/api/v1/validator/validations.cjs +0 -2
- package/dist/api/v1/validator/validations.cjs.map +0 -1
- package/dist/api/v1/validator/validations.d.cts +0 -23
- package/dist/api/v1/validator/validations.js.map +0 -1
- package/dist/errors/index.cjs +0 -3
- package/dist/errors/index.cjs.map +0 -1
- package/dist/errors/index.js.map +0 -1
- package/dist/events/index.cjs +0 -2
- package/dist/events/index.cjs.map +0 -1
- package/dist/events/index.js.map +0 -1
- package/dist/hooks/enrich.cjs +0 -2
- package/dist/hooks/enrich.cjs.map +0 -1
- package/dist/hooks/enrich.js.map +0 -1
- package/dist/hooks/find.cjs +0 -2
- package/dist/hooks/find.cjs.map +0 -1
- package/dist/hooks/find.js.map +0 -1
- package/dist/hooks/hooks.cjs +0 -2
- package/dist/hooks/hooks.cjs.map +0 -1
- package/dist/hooks/hooks.js.map +0 -1
- package/dist/hooks/index.cjs +0 -1
- package/dist/hooks/utils/updateInstanceValues.cjs +0 -2
- package/dist/hooks/utils/updateInstanceValues.cjs.map +0 -1
- package/dist/hooks/utils/updateInstanceValues.js.map +0 -1
- package/dist/index.cjs +0 -2
- package/dist/index.cjs.map +0 -1
- package/dist/index.d.cts +0 -23
- package/dist/index.js.map +0 -1
- package/dist/models/CustomFieldDefinition.cjs +0 -2
- package/dist/models/CustomFieldDefinition.cjs.map +0 -1
- package/dist/models/CustomFieldDefinition.d.cts +0 -33
- package/dist/models/CustomFieldDefinition.js.map +0 -1
- package/dist/models/CustomFieldEntries.cjs +0 -2
- package/dist/models/CustomFieldEntries.cjs.map +0 -1
- package/dist/models/CustomFieldEntries.d.cts +0 -16
- package/dist/models/CustomFieldEntries.js.map +0 -1
- package/dist/models/CustomFieldModelTypeMap.cjs +0 -2
- package/dist/models/CustomFieldModelTypeMap.cjs.map +0 -1
- package/dist/models/CustomFieldModelTypeMap.d.cts +0 -15
- package/dist/models/CustomFieldModelTypeMap.d.ts +0 -15
- package/dist/models/CustomFieldModelTypeMap.js +0 -2
- package/dist/models/CustomFieldModelTypeMap.js.map +0 -1
- package/dist/models/CustomFieldValue.cjs +0 -2
- package/dist/models/CustomFieldValue.cjs.map +0 -1
- package/dist/models/CustomFieldValue.d.cts +0 -21
- package/dist/models/CustomFieldValue.js.map +0 -1
- package/dist/models/CustomValidator.cjs +0 -2
- package/dist/models/CustomValidator.cjs.map +0 -1
- package/dist/models/CustomValidator.d.cts +0 -19
- package/dist/models/CustomValidator.js.map +0 -1
- package/dist/models/index.cjs +0 -2
- package/dist/models/index.cjs.map +0 -1
- package/dist/models/index.d.cts +0 -7
- package/dist/models/index.js.map +0 -1
- package/dist/models/tests/AssociatedTestModel.cjs +0 -2
- package/dist/models/tests/AssociatedTestModel.cjs.map +0 -1
- package/dist/models/tests/AssociatedTestModel.js.map +0 -1
- package/dist/models/tests/TestModel.cjs +0 -2
- package/dist/models/tests/TestModel.cjs.map +0 -1
- package/dist/models/tests/TestModel.js.map +0 -1
- package/dist/models/tests/contextAwareModels/ContextAwareTestModel.cjs +0 -2
- package/dist/models/tests/contextAwareModels/ContextAwareTestModel.cjs.map +0 -1
- package/dist/models/tests/contextAwareModels/ContextAwareTestModel.js.map +0 -1
- package/dist/models/tests/contextAwareModels/ContextTestModel.cjs +0 -2
- package/dist/models/tests/contextAwareModels/ContextTestModel.cjs.map +0 -1
- package/dist/models/tests/contextAwareModels/ContextTestModel.js.map +0 -1
- package/dist/repository/definition.cjs +0 -2
- package/dist/repository/definition.cjs.map +0 -1
- package/dist/repository/definition.js.map +0 -1
- package/dist/repository/entries.cjs +0 -2
- package/dist/repository/entries.cjs.map +0 -1
- package/dist/repository/entries.js.map +0 -1
- package/dist/repository/utils/formatValues.cjs +0 -2
- package/dist/repository/utils/formatValues.cjs.map +0 -1
- package/dist/repository/utils/formatValues.js.map +0 -1
- package/dist/repository/validator.cjs +0 -2
- package/dist/repository/validator.cjs.map +0 -1
- package/dist/repository/validator.js.map +0 -1
- package/dist/repository/value.cjs +0 -2
- package/dist/repository/value.cjs.map +0 -1
- package/dist/repository/value.js.map +0 -1
- package/dist/scopes/filter.cjs +0 -2
- package/dist/scopes/filter.cjs.map +0 -1
- package/dist/scopes/filter.d.cts +0 -23
- package/dist/scopes/filter.js.map +0 -1
- package/dist/scopes/helpers/filter.helpers.cjs +0 -46
- package/dist/scopes/helpers/filter.helpers.cjs.map +0 -1
- package/dist/scopes/helpers/filter.helpers.d.cts +0 -17
- package/dist/scopes/helpers/filter.helpers.js.map +0 -1
- package/dist/scopes/index.cjs +0 -1
- package/dist/types/index.d.cts +0 -48
- package/dist/utils/constants/index.cjs +0 -2
- package/dist/utils/constants/index.cjs.map +0 -1
- package/dist/utils/constants/index.d.cts +0 -22
- package/dist/utils/constants/index.js.map +0 -1
- package/dist/utils/db/index.cjs +0 -2
- package/dist/utils/db/index.cjs.map +0 -1
- package/dist/utils/db/index.js.map +0 -1
- package/dist/utils/helpers/index.cjs +0 -2
- package/dist/utils/helpers/index.cjs.map +0 -1
- package/dist/utils/helpers/index.d.cts +0 -31
- package/dist/utils/helpers/index.js.map +0 -1
- package/dist/utils/init.cjs +0 -2
- package/dist/utils/init.cjs.map +0 -1
- package/dist/utils/init.js.map +0 -1
- package/dist/utils/logger/index.cjs +0 -2
- package/dist/utils/logger/index.cjs.map +0 -1
- package/dist/utils/logger/index.js.map +0 -1
- package/dist/utils/scopeAttributes.cjs +0 -2
- package/dist/utils/scopeAttributes.cjs.map +0 -1
- package/dist/utils/scopeAttributes.js.map +0 -1
- package/dist/utils/validations/index.cjs +0 -2
- package/dist/utils/validations/index.cjs.map +0 -1
- package/dist/utils/validations/index.js.map +0 -1
- package/dist/utils/validations/schema/custom-fields.cjs +0 -2
- package/dist/utils/validations/schema/custom-fields.cjs.map +0 -1
- package/dist/utils/validations/schema/custom-fields.d.cts +0 -7
- package/dist/utils/validations/schema/custom-fields.js.map +0 -1
- package/dist/utils/validations/schema/validator-schema.cjs +0 -2
- package/dist/utils/validations/schema/validator-schema.cjs.map +0 -1
- package/dist/utils/validations/schema/validator-schema.js.map +0 -1
- package/dist/utils/validations/validators/index.cjs +0 -2
- package/dist/utils/validations/validators/index.cjs.map +0 -1
- package/dist/utils/validations/validators/index.js.map +0 -1
- package/dist/utils/validations/validators/select.validator.cjs +0 -2
- package/dist/utils/validations/validators/select.validator.cjs.map +0 -1
- package/dist/utils/validations/validators/select.validator.js.map +0 -1
- package/dist/utils/validations/validators/status.validator.cjs +0 -2
- package/dist/utils/validations/validators/status.validator.cjs.map +0 -1
- package/dist/utils/validations/validators/status.validator.js.map +0 -1
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
import type { WhereOptions } from 'sequelize';
|
|
2
|
+
import logger from '../utils/logger';
|
|
3
|
+
import * as DefinitionRepo from '../repository/definition';
|
|
4
|
+
import { MissingRequiredCustomFieldError } from '../errors';
|
|
5
|
+
import type { CustomFieldOptions, ModelOptions } from '../types';
|
|
6
|
+
import applyScopeToInstance from '../utils/scopeAttributes';
|
|
7
|
+
import updateInstanceValues from './utils/updateInstanceValues';
|
|
8
|
+
|
|
9
|
+
/**
|
|
10
|
+
* A hook to create the custom fields when updating a model (more then one instance).
|
|
11
|
+
*/
|
|
12
|
+
export const beforeBulkCreate = (options): void => {
|
|
13
|
+
// This will activate the beforeCreate hook on each updating instance.
|
|
14
|
+
// eslint-disable-next-line no-param-reassign
|
|
15
|
+
options.individualHooks = true;
|
|
16
|
+
};
|
|
17
|
+
/**
|
|
18
|
+
* A hook to create the custom fields when updating a model instance.
|
|
19
|
+
* TODO - cleanup if update fail
|
|
20
|
+
*/
|
|
21
|
+
export const beforeCreate = (
|
|
22
|
+
scopeAttributes: string[],
|
|
23
|
+
modelOptions: ModelOptions = {},
|
|
24
|
+
sadotOptions: Pick<CustomFieldOptions, 'useCustomFieldsEntries'> = { useCustomFieldsEntries: false },
|
|
25
|
+
) => async (
|
|
26
|
+
instance,
|
|
27
|
+
options,
|
|
28
|
+
): Promise<void> => {
|
|
29
|
+
logger.debug('sadot - before create hook');
|
|
30
|
+
const { fields } = options;
|
|
31
|
+
const { include, useEntityIdFromInclude } = modelOptions;
|
|
32
|
+
const modelType = instance.constructor.name;
|
|
33
|
+
|
|
34
|
+
const identifiers = applyScopeToInstance(instance, scopeAttributes);
|
|
35
|
+
|
|
36
|
+
const where: WhereOptions = {
|
|
37
|
+
modelType,
|
|
38
|
+
disabled: false,
|
|
39
|
+
...(!useEntityIdFromInclude && { entityId: identifiers }),
|
|
40
|
+
};
|
|
41
|
+
const fieldDefinitions = await DefinitionRepo.findAll(where, { withDisabled: false, transaction: options.transaction, include: include?.(identifiers) });
|
|
42
|
+
const requiredFieldsNames = Array.from(new Set(fieldDefinitions.filter(({ required }) => required).map(({ name }) => name)));
|
|
43
|
+
|
|
44
|
+
const fieldsWithDefaultValue = fieldDefinitions.filter((def) => ![null, undefined].includes(def.defaultValue));
|
|
45
|
+
if (fieldsWithDefaultValue.length) {
|
|
46
|
+
// eslint-disable-next-line no-param-reassign
|
|
47
|
+
instance.customFields ||= {};
|
|
48
|
+
fieldsWithDefaultValue.filter((def) => (instance.customFields?.[def.name] === undefined)).forEach(({ name, defaultValue }) => {
|
|
49
|
+
// eslint-disable-next-line no-param-reassign
|
|
50
|
+
instance.customFields[name] = defaultValue;
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
const { customFields } = instance;
|
|
55
|
+
const fieldsNames = Object.keys(customFields ?? {});
|
|
56
|
+
const missingFields = requiredFieldsNames.filter((name) => !fieldsNames.includes(name));
|
|
57
|
+
if (missingFields?.length) {
|
|
58
|
+
throw new MissingRequiredCustomFieldError(missingFields);
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
const customFieldsIdx = fields.indexOf('customFields');
|
|
62
|
+
if (customFieldsIdx === -1 || !customFields || !Object.keys(customFields).length) {
|
|
63
|
+
// After checking for required fields and fields with default values, and we have no custom fields.
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
await updateInstanceValues({
|
|
68
|
+
modelId: instance.id,
|
|
69
|
+
modelType,
|
|
70
|
+
identifiers,
|
|
71
|
+
customFields,
|
|
72
|
+
options: {
|
|
73
|
+
useCustomFieldsEntries: sadotOptions.useCustomFieldsEntries,
|
|
74
|
+
transaction: options.transaction,
|
|
75
|
+
modelOptions,
|
|
76
|
+
},
|
|
77
|
+
});
|
|
78
|
+
|
|
79
|
+
// eslint-disable-next-line no-param-reassign
|
|
80
|
+
fields.splice(customFieldsIdx, 1);
|
|
81
|
+
};
|
|
@@ -0,0 +1,255 @@
|
|
|
1
|
+
/* eslint-disable no-param-reassign */
|
|
2
|
+
import * as ValueRepo from '../repository/value';
|
|
3
|
+
import * as DefinitionRepo from '../repository/definition';
|
|
4
|
+
import * as EntriesRepo from '../repository/entries';
|
|
5
|
+
import type CustomFieldValue from '../models/CustomFieldValue';
|
|
6
|
+
import type CustomFieldDefinition from '../models/CustomFieldDefinition';
|
|
7
|
+
import type { SerializedCustomFields } from '../types/definition';
|
|
8
|
+
import type { CustomFieldOptions, ModelOptions, TransactionOptions } from '../types';
|
|
9
|
+
import applyScopeToInstance from '../utils/scopeAttributes';
|
|
10
|
+
|
|
11
|
+
// Include all required fields for proper functioning
|
|
12
|
+
const CUSTOM_FIELD_DEFINITION_ATTRIBUTES_TO_PULL = [
|
|
13
|
+
'id',
|
|
14
|
+
'name',
|
|
15
|
+
'entityId',
|
|
16
|
+
'fieldType',
|
|
17
|
+
'displayName',
|
|
18
|
+
'validation',
|
|
19
|
+
'entityType',
|
|
20
|
+
'modelType',
|
|
21
|
+
'required',
|
|
22
|
+
'disabled',
|
|
23
|
+
'defaultValue',
|
|
24
|
+
];
|
|
25
|
+
|
|
26
|
+
type SupportedHookTypes = 'afterFind' | 'afterCreate' | 'afterUpdate';
|
|
27
|
+
|
|
28
|
+
type CustomFieldEntries = Record<string, any>;
|
|
29
|
+
|
|
30
|
+
interface GetValuesGroupByInstanceResponse {
|
|
31
|
+
[modelId: string]: CustomFieldValue[];
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
interface GetCustomFieldEntriesByInstanceIdResponse {
|
|
35
|
+
[modelId: string]: CustomFieldEntries;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
export const getCustomFieldEntriesByInstanceId = async ({
|
|
39
|
+
instancesIds,
|
|
40
|
+
options,
|
|
41
|
+
sadotOptions,
|
|
42
|
+
}: {
|
|
43
|
+
instancesIds: string[],
|
|
44
|
+
options?: TransactionOptions,
|
|
45
|
+
sadotOptions: Pick<CustomFieldOptions, 'useCustomFieldsEntries'>,
|
|
46
|
+
}): Promise<GetCustomFieldEntriesByInstanceIdResponse> => {
|
|
47
|
+
if (!sadotOptions.useCustomFieldsEntries) {
|
|
48
|
+
return {};
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
const customFieldEntries = await EntriesRepo.findEntriesByModelIds(
|
|
52
|
+
instancesIds,
|
|
53
|
+
options ?? {},
|
|
54
|
+
);
|
|
55
|
+
|
|
56
|
+
const customFieldEntriesByInstanceId = Object.fromEntries(customFieldEntries.map((instanceEntries) => {
|
|
57
|
+
const { modelId, customFields } = instanceEntries?.dataValues ?? {};
|
|
58
|
+
if (!modelId) {
|
|
59
|
+
return undefined;
|
|
60
|
+
}
|
|
61
|
+
return [modelId, customFields];
|
|
62
|
+
}).filter(Boolean));
|
|
63
|
+
|
|
64
|
+
instancesIds.forEach((instanceId) => {
|
|
65
|
+
customFieldEntriesByInstanceId[instanceId] ??= {};
|
|
66
|
+
});
|
|
67
|
+
|
|
68
|
+
return customFieldEntriesByInstanceId;
|
|
69
|
+
};
|
|
70
|
+
|
|
71
|
+
export const getValuesGroupByInstance = async ({
|
|
72
|
+
instancesIds,
|
|
73
|
+
options,
|
|
74
|
+
sadotOptions,
|
|
75
|
+
}: {
|
|
76
|
+
instancesIds: string[],
|
|
77
|
+
options?: TransactionOptions,
|
|
78
|
+
sadotOptions: Pick<CustomFieldOptions, 'useCustomFieldsEntries'>,
|
|
79
|
+
}): Promise<GetValuesGroupByInstanceResponse> => {
|
|
80
|
+
if (sadotOptions.useCustomFieldsEntries) {
|
|
81
|
+
return {};
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
const customFieldValues = await ValueRepo.findValuesByModelIds(
|
|
85
|
+
instancesIds,
|
|
86
|
+
options ?? {},
|
|
87
|
+
);
|
|
88
|
+
|
|
89
|
+
// Group fields by modelId
|
|
90
|
+
return customFieldValues.reduce((acc, v) => {
|
|
91
|
+
const { modelId } = v;
|
|
92
|
+
acc[modelId] ??= [];
|
|
93
|
+
acc[modelId].push(v);
|
|
94
|
+
return acc;
|
|
95
|
+
}, {});
|
|
96
|
+
};
|
|
97
|
+
|
|
98
|
+
/**
|
|
99
|
+
* Serialize custom fields value into the format of {[name] -> [fieldData]}
|
|
100
|
+
*/
|
|
101
|
+
const serializeCustomFields = (
|
|
102
|
+
customFieldValues: CustomFieldValue[],
|
|
103
|
+
customFieldDefinitionsHash: Record<string, CustomFieldDefinition>,
|
|
104
|
+
): SerializedCustomFields => {
|
|
105
|
+
const customFields = customFieldValues.reduce((acc, cfv) => ({
|
|
106
|
+
...acc,
|
|
107
|
+
...(
|
|
108
|
+
customFieldDefinitionsHash[cfv.customFieldDefinitionId]
|
|
109
|
+
&& { [customFieldDefinitionsHash[cfv.customFieldDefinitionId].name]: cfv.value }
|
|
110
|
+
),
|
|
111
|
+
}), {});
|
|
112
|
+
return customFields;
|
|
113
|
+
};
|
|
114
|
+
/**
|
|
115
|
+
* A hook to attach the custom fields when fetching a model instances.
|
|
116
|
+
*/
|
|
117
|
+
const enrichResults = (
|
|
118
|
+
modelType: string,
|
|
119
|
+
scopeAttributes: string[],
|
|
120
|
+
hookType?: SupportedHookTypes,
|
|
121
|
+
modelOptions: ModelOptions = {},
|
|
122
|
+
sadotOptions: Pick<CustomFieldOptions, 'useCustomFieldsEntries'> = { useCustomFieldsEntries: false },
|
|
123
|
+
) => async (
|
|
124
|
+
instancesOrInstance: any | any[],
|
|
125
|
+
options: TransactionOptions,
|
|
126
|
+
): Promise<void> => {
|
|
127
|
+
if (
|
|
128
|
+
options.originalAttributes?.length > 0
|
|
129
|
+
&& !options.originalAttributes?.includes?.('customFields')
|
|
130
|
+
) {
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
const primaryKey = 'id';
|
|
135
|
+
let instances = Array.isArray(instancesOrInstance)
|
|
136
|
+
? instancesOrInstance
|
|
137
|
+
: [instancesOrInstance];
|
|
138
|
+
|
|
139
|
+
instances = instances.filter(Boolean);
|
|
140
|
+
|
|
141
|
+
const identifiers = applyScopeToInstance(instances, scopeAttributes);
|
|
142
|
+
|
|
143
|
+
const uniqueIdentifiers = [...new Set(identifiers)].filter(Boolean);
|
|
144
|
+
|
|
145
|
+
const identifierCustomFieldDefinitionsMapping = uniqueIdentifiers.reduce((map, identifier) => ({
|
|
146
|
+
...map,
|
|
147
|
+
[identifier]: [],
|
|
148
|
+
}), {});
|
|
149
|
+
|
|
150
|
+
// Cache for definitions by model type and transaction to avoid redundant DB queries
|
|
151
|
+
let customFieldDefinitionsPromise;
|
|
152
|
+
let cacheKey;
|
|
153
|
+
|
|
154
|
+
if (options.transaction) {
|
|
155
|
+
// Initialize definition cache Map if not already present directly on the transaction object
|
|
156
|
+
options.transaction.definitionCache ||= new Map();
|
|
157
|
+
cacheKey = `${modelType}:${uniqueIdentifiers.slice().sort().join(',')}`;
|
|
158
|
+
customFieldDefinitionsPromise = options.transaction.definitionCache.get(cacheKey);
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
if (!customFieldDefinitionsPromise) {
|
|
162
|
+
// Fetch from database (either first time in this transaction or no transaction)
|
|
163
|
+
customFieldDefinitionsPromise = DefinitionRepo.findByEntityIds(
|
|
164
|
+
modelType,
|
|
165
|
+
uniqueIdentifiers,
|
|
166
|
+
{ transaction: options.transaction, modelOptions, attributes: CUSTOM_FIELD_DEFINITION_ATTRIBUTES_TO_PULL },
|
|
167
|
+
);
|
|
168
|
+
|
|
169
|
+
options.transaction?.definitionCache?.set(cacheKey, customFieldDefinitionsPromise);
|
|
170
|
+
}
|
|
171
|
+
const customFieldDefinitions = await customFieldDefinitionsPromise;
|
|
172
|
+
|
|
173
|
+
if (customFieldDefinitions.length === 0) {
|
|
174
|
+
// if no custom fields, we can return
|
|
175
|
+
instances.forEach((instance) => {
|
|
176
|
+
instance.customFields = {};
|
|
177
|
+
});
|
|
178
|
+
return;
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
if (modelOptions?.include && modelOptions.useEntityIdFromInclude) {
|
|
182
|
+
// if we pass useEntityIdFromInclude,
|
|
183
|
+
// map the entity from the options to the identifierCustomFieldDefinitionsMapping
|
|
184
|
+
modelOptions.include(identifiers).forEach(({ model }) => {
|
|
185
|
+
customFieldDefinitions.forEach((cfd) => {
|
|
186
|
+
const entityId = cfd[`${model.name}.entityId`];
|
|
187
|
+
identifierCustomFieldDefinitionsMapping[entityId] = [];
|
|
188
|
+
});
|
|
189
|
+
});
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
const definitionsMap = customFieldDefinitions.reduce((map, definition) => ({
|
|
193
|
+
...map,
|
|
194
|
+
[definition.id]: definition,
|
|
195
|
+
}), {});
|
|
196
|
+
|
|
197
|
+
customFieldDefinitions.forEach((cfd) => {
|
|
198
|
+
identifierCustomFieldDefinitionsMapping[cfd.entityId].push(cfd);
|
|
199
|
+
});
|
|
200
|
+
|
|
201
|
+
// Get the values per instates ids:
|
|
202
|
+
const instancesIds = instances.map((i) => i[primaryKey]);
|
|
203
|
+
|
|
204
|
+
// Group fields by modelId
|
|
205
|
+
const [valuesGroupByInstance, customFieldEntriesByInstanceId] = await Promise.all([
|
|
206
|
+
getValuesGroupByInstance({
|
|
207
|
+
instancesIds,
|
|
208
|
+
options,
|
|
209
|
+
sadotOptions,
|
|
210
|
+
}),
|
|
211
|
+
getCustomFieldEntriesByInstanceId({
|
|
212
|
+
instancesIds,
|
|
213
|
+
options,
|
|
214
|
+
sadotOptions,
|
|
215
|
+
}),
|
|
216
|
+
]);
|
|
217
|
+
|
|
218
|
+
// Attach custom fields to the instances
|
|
219
|
+
instances.forEach((instance) => {
|
|
220
|
+
const { id } = instance;
|
|
221
|
+
|
|
222
|
+
const instanceValues = valuesGroupByInstance[id];
|
|
223
|
+
const serializedCustomFieldsValues = instanceValues ? serializeCustomFields(instanceValues, definitionsMap) : {};
|
|
224
|
+
|
|
225
|
+
const customFields = sadotOptions.useCustomFieldsEntries
|
|
226
|
+
? customFieldEntriesByInstanceId[id]
|
|
227
|
+
: serializedCustomFieldsValues;
|
|
228
|
+
|
|
229
|
+
scopeAttributes.forEach((attribute) => {
|
|
230
|
+
const identifier = instance[attribute];
|
|
231
|
+
|
|
232
|
+
const entityCustomFieldDefinitions = identifierCustomFieldDefinitionsMapping[identifier];
|
|
233
|
+
if (entityCustomFieldDefinitions?.length > 0) {
|
|
234
|
+
entityCustomFieldDefinitions.forEach((customFieldDefinition) => {
|
|
235
|
+
if (customFields[customFieldDefinition.name] === undefined) {
|
|
236
|
+
customFields[customFieldDefinition.name] = null;
|
|
237
|
+
}
|
|
238
|
+
});
|
|
239
|
+
}
|
|
240
|
+
});
|
|
241
|
+
instance.customFields = customFields;
|
|
242
|
+
options.attributesToRemove?.forEach?.((attribute) => {
|
|
243
|
+
delete instance.dataValues?.[attribute];
|
|
244
|
+
// if raw:
|
|
245
|
+
delete instance?.[attribute];
|
|
246
|
+
});
|
|
247
|
+
// sequelize will think customFields changed also in 'find', so we need to mark it as unchanged
|
|
248
|
+
if (hookType === 'afterFind') {
|
|
249
|
+
// changed() could be undefined, i.e in raw: true
|
|
250
|
+
instance?.changed?.('customFields', false);
|
|
251
|
+
}
|
|
252
|
+
});
|
|
253
|
+
};
|
|
254
|
+
|
|
255
|
+
export default enrichResults;
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
/* eslint-disable no-param-reassign */
|
|
2
|
+
import logger from '../utils/logger';
|
|
3
|
+
|
|
4
|
+
const doScopeAttributesMissing = (
|
|
5
|
+
scopeAttributes: string[],
|
|
6
|
+
queryAttributes: (string | string[])[],
|
|
7
|
+
): string[] => {
|
|
8
|
+
const attributes = scopeAttributes
|
|
9
|
+
.filter((attribute) => !queryAttributes.includes(attribute));
|
|
10
|
+
if (!queryAttributes.includes?.('id')) {
|
|
11
|
+
attributes.push('id');
|
|
12
|
+
}
|
|
13
|
+
return attributes;
|
|
14
|
+
};
|
|
15
|
+
|
|
16
|
+
// eslint-disable-next-line import/prefer-default-export
|
|
17
|
+
export const beforeFind = (scopeAttributes: string[]) => (options): void => {
|
|
18
|
+
const { attributes: queryAttributes } = options;
|
|
19
|
+
if (queryAttributes?.includes?.('customFields')) {
|
|
20
|
+
const missingScopeAttributes = doScopeAttributesMissing(scopeAttributes, queryAttributes);
|
|
21
|
+
logger.debug('sadot - before find hook');
|
|
22
|
+
if (missingScopeAttributes?.length > 0) {
|
|
23
|
+
queryAttributes.push(...missingScopeAttributes);
|
|
24
|
+
options.attributesToRemove = missingScopeAttributes;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
};
|