@autofleet/sadot 0.0.1-beta.18 → 0.0.1-beta.2

package/dist/api/v1/definition/index.js

@@ -43,7 +43,7 @@ const validations_1 = require("./validations");
 const logger_1 = __importDefault(require("../../../utils/logger"));
 const router = (0, express_1.Router)({ mergeParams: true });
 const ENTITY = 'CustomFieldDefinition';
-const toPascalCase = (str) => str.replace(/(^\w|-\w)/g, (subStr) => subStr.replace(/-/, '').toUpperCase());
+const toPascalCase = (str) => str.replace(/(^\w|-\w)/g, subStr => subStr.replace(/-/, '').toUpperCase());
 /**
  * Create
  */
@@ -51,8 +51,8 @@ router.post('/', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
     const { modelName } = req.params;
     const modelType = toPascalCase(modelName);
     try {
-        const validatedPayload = yield (0, validations_1.validateCustomFieldDefinitionCreation)(req.body);
-        const customFieldDefinition = yield DefinitionRepo.create(Object.assign(Object.assign({}, validatedPayload), { modelType }));
+        const validatedPayload = yield (0, validations_1.validateCustomFieldDefinitionCreation)(Object.assign(Object.assign({}, req.body), { modelType }));
+        const customFieldDefinition = yield DefinitionRepo.create(validatedPayload);
         return res.status(201).json(customFieldDefinition);
     }
     catch (err) {
@@ -86,7 +86,7 @@ router.get('/', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const customFieldDefinitions = yield DefinitionRepo.findAll({
             modelType,
-        }, { withDisabled: true });
+        });
         return res.json(customFieldDefinitions);
     }
     catch (err) {
@@ -101,7 +101,6 @@ router.patch('/:customFieldDefinitionId', (req, res) => __awaiter(void 0, void 0
     const { customFieldDefinitionId, modelName } = req.params;
     const modelType = toPascalCase(modelName);
     try {
-        // eslint-disable-next-line max-len
         const validatedPayload = yield (0, validations_1.validateCustomFieldDefinitionUpdate)(req.body);
         const customFieldDefinition = yield DefinitionRepo.findByWhere({
             id: customFieldDefinitionId,
@@ -110,7 +109,7 @@ router.patch('/:customFieldDefinitionId', (req, res) => __awaiter(void 0, void 0
         if (!customFieldDefinition) {
             throw new errors_1.ResourceNotFoundError();
         }
-        const updatedCustomFieldDefinition = yield DefinitionRepo.update(customFieldDefinitionId, Object.assign(Object.assign({}, validatedPayload), { modelType }));
+        const updatedCustomFieldDefinition = yield DefinitionRepo.update(customFieldDefinitionId, validatedPayload);
         return res.status(200).json(updatedCustomFieldDefinition);
     }
     catch (err) {

package/dist/api/v1/definition/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/v1/definition/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/v1/definition/index.ts"],"names":[],"mappings":"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"}

package/dist/api/v1/definition/validations.js

@@ -5,14 +5,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateCustomFieldDefinitionUpdate = exports.validateCustomFieldDefinitionCreation = void 0;
 const joi_1 = __importDefault(require("@hapi/joi"));
-const type_1 = require("../../../utils/validations/type");
+const CustomFieldDefinition_1 = require("../../../models/CustomFieldDefinition");
 const CustomFieldDefinitionCreationSchema = joi_1.default.object({
     name: joi_1.default.string().required(),
     displayName: joi_1.default.string().required(),
     validation: joi_1.default.object().required(),
-    fieldType: joi_1.default.string().valid(...Object.values(type_1.CustomFieldDefinitionType)).required(),
+    fieldType: joi_1.default.string().valid(CustomFieldDefinition_1.CustomFieldDefinitionType.BOOLEAN, CustomFieldDefinition_1.CustomFieldDefinitionType.NUMBER, CustomFieldDefinition_1.CustomFieldDefinitionType.DATE, CustomFieldDefinition_1.CustomFieldDefinitionType.DATETIME, CustomFieldDefinition_1.CustomFieldDefinitionType.TEXT, CustomFieldDefinition_1.CustomFieldDefinitionType.IMAGE, CustomFieldDefinition_1.CustomFieldDefinitionType.ENUM).required(),
     entityId: joi_1.default.string().guid().required(),
     entityType: joi_1.default.string().required(),
+    modelType: joi_1.default.string().required(),
     description: joi_1.default.string(),
     required: joi_1.default.boolean(),
     disabled: joi_1.default.boolean(),
@@ -20,15 +21,16 @@ const CustomFieldDefinitionCreationSchema = joi_1.default.object({
 const CustomFieldDefinitionUpdateSchema = joi_1.default.object({
     displayName: joi_1.default.string(),
     validation: joi_1.default.object(),
-    fieldType: joi_1.default.string().valid(...Object.values(type_1.CustomFieldDefinitionType)),
+    fieldType: joi_1.default.string().valid(CustomFieldDefinition_1.CustomFieldDefinitionType.BOOLEAN, CustomFieldDefinition_1.CustomFieldDefinitionType.NUMBER, CustomFieldDefinition_1.CustomFieldDefinitionType.DATE, CustomFieldDefinition_1.CustomFieldDefinitionType.DATETIME, CustomFieldDefinition_1.CustomFieldDefinitionType.TEXT, CustomFieldDefinition_1.CustomFieldDefinitionType.IMAGE, CustomFieldDefinition_1.CustomFieldDefinitionType.ENUM),
     entityId: joi_1.default.string().guid(),
     entityType: joi_1.default.string(),
+    modelType: joi_1.default.string(),
     description: joi_1.default.string(),
     required: joi_1.default.boolean(),
     disabled: joi_1.default.boolean(),
 });
-const validateCustomFieldDefinitionCreation = (payload) => CustomFieldDefinitionCreationSchema.validateAsync(payload, { abortEarly: false });
+const validateCustomFieldDefinitionCreation = payload => CustomFieldDefinitionCreationSchema.validateAsync(payload, { abortEarly: false });
 exports.validateCustomFieldDefinitionCreation = validateCustomFieldDefinitionCreation;
-const validateCustomFieldDefinitionUpdate = (payload) => CustomFieldDefinitionUpdateSchema.validateAsync(payload, { abortEarly: false });
+const validateCustomFieldDefinitionUpdate = payload => CustomFieldDefinitionUpdateSchema.validateAsync(payload, { abortEarly: false });
 exports.validateCustomFieldDefinitionUpdate = validateCustomFieldDefinitionUpdate;
 //# sourceMappingURL=validations.js.map

package/dist/api/v1/definition/validations.js.map

@@ -1 +1 @@
-{"version":3,"file":"validations.js","sourceRoot":"","sources":["../../../../src/api/v1/definition/validations.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,0DAA4E;AAE5E,MAAM,mCAAmC,GAAG,aAAG,CAAC,MAAM,CAAC;IACrD,IAAI,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,WAAW,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACpC,UAAU,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACnC,SAAS,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,gCAAyB,CAAC,CAAC,CAAC,QAAQ,EAAE;IACrF,QAAQ,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE;IACxC,UAAU,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACnC,WAAW,EAAE,aAAG,CAAC,MAAM,EAAE;IACzB,QAAQ,EAAE,aAAG,CAAC,OAAO,EAAE;IACvB,QAAQ,EAAE,aAAG,CAAC,OAAO,EAAE;CACxB,CAAC,CAAC;AAEH,MAAM,iCAAiC,GAAG,aAAG,CAAC,MAAM,CAAC;IACnD,WAAW,EAAE,aAAG,CAAC,MAAM,EAAE;IACzB,UAAU,EAAE,aAAG,CAAC,MAAM,EAAE;IACxB,SAAS,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,gCAAyB,CAAC,CAAC;IAC1E,QAAQ,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE;IAC7B,UAAU,EAAE,aAAG,CAAC,MAAM,EAAE;IACxB,WAAW,EAAE,aAAG,CAAC,MAAM,EAAE;IACzB,QAAQ,EAAE,aAAG,CAAC,OAAO,EAAE;IACvB,QAAQ,EAAE,aAAG,CAAC,OAAO,EAAE;CACxB,CAAC,CAAC;AAEI,MAAM,qCAAqC,GAAG,CAAC,OAAO,EAAE,EAAE,CAC/D,mCAAmC,CAAC,aAAa,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;AADvE,QAAA,qCAAqC,yCACkC;AAE7E,MAAM,mCAAmC,GAAG,CAAC,OAAO,EAAE,EAAE,CAC7D,iCAAiC,CAAC,aAAa,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;AADrE,QAAA,mCAAmC,uCACkC"}
+{"version":3,"file":"validations.js","sourceRoot":"","sources":["../../../../src/api/v1/definition/validations.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,iFAAkF;AAElF,MAAM,mCAAmC,GAAG,aAAG,CAAC,MAAM,CAAC;IACrD,IAAI,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,WAAW,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACpC,UAAU,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACnC,SAAS,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAC3B,iDAAyB,CAAC,OAAO,EACjC,iDAAyB,CAAC,MAAM,EAChC,iDAAyB,CAAC,IAAI,EAC9B,iDAAyB,CAAC,QAAQ,EAClC,iDAAyB,CAAC,IAAI,EAC9B,iDAAyB,CAAC,KAAK,EAC/B,iDAAyB,CAAC,IAAI,CAC/B,CAAC,QAAQ,EAAE;IACZ,QAAQ,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE;IACxC,UAAU,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACnC,SAAS,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,WAAW,EAAE,aAAG,CAAC,MAAM,EAAE;IACzB,QAAQ,EAAE,aAAG,CAAC,OAAO,EAAE;IACvB,QAAQ,EAAE,aAAG,CAAC,OAAO,EAAE;CACxB,CAAC,CAAC;AAEH,MAAM,iCAAiC,GAAG,aAAG,CAAC,MAAM,CAAC;IACnD,WAAW,EAAE,aAAG,CAAC,MAAM,EAAE;IACzB,UAAU,EAAE,aAAG,CAAC,MAAM,EAAE;IACxB,SAAS,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAC3B,iDAAyB,CAAC,OAAO,EACjC,iDAAyB,CAAC,MAAM,EAChC,iDAAyB,CAAC,IAAI,EAC9B,iDAAyB,CAAC,QAAQ,EAClC,iDAAyB,CAAC,IAAI,EAC9B,iDAAyB,CAAC,KAAK,EAC/B,iDAAyB,CAAC,IAAI,CAC/B;IACD,QAAQ,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE;IAC7B,UAAU,EAAE,aAAG,CAAC,MAAM,EAAE;IACxB,SAAS,EAAE,aAAG,CAAC,MAAM,EAAE;IACvB,WAAW,EAAE,aAAG,CAAC,MAAM,EAAE;IACzB,QAAQ,EAAE,aAAG,CAAC,OAAO,EAAE;IACvB,QAAQ,EAAE,aAAG,CAAC,OAAO,EAAE;CACxB,CAAC,CAAC;AAEI,MAAM,qCAAqC,GAAG,OAAO,CAAC,EAAE,CAC7D,mCAAmC,CAAC,aAAa,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;AADvE,QAAA,qCAAqC,yCACkC;AAE7E,MAAM,mCAAmC,GAAG,OAAO,CAAC,EAAE,CAC3D,iCAAiC,CAAC,aAAa,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;AADrE,QAAA,mCAAmC,uCACkC"}

package/dist/api/v1/index.js

@@ -6,6 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const express_1 = require("express");
 const definition_1 = __importDefault(require("./definition"));
 const router = (0, express_1.Router)({ mergeParams: true });
-router.use('/custom-field-definitions/:modelName', definition_1.default);
+router.use('/:modelName/custom-field-definitions', definition_1.default);
 exports.default = router;
 //# sourceMappingURL=index.js.map

package/dist/hooks/create.js

@@ -35,7 +35,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.beforeCreate = exports.beforeBulkCreate = void 0;
 const ValueRepo = __importStar(require("../repository/value"));
 const DefinitionRepo = __importStar(require("../repository/definition"));
-const errors_1 = require("../errors");
 /**
  * A hook to create the custom fields when updating a model (more then one instance).
  */
@@ -52,23 +51,22 @@ exports.beforeBulkCreate = beforeBulkCreate;
 const beforeCreate = (scopeAttributes) => (instance, options) => __awaiter(void 0, void 0, void 0, function* () {
     const { fields } = options;
     const modelType = instance.constructor.name;
-    const identifiers = scopeAttributes.map((attribute) => instance[attribute]);
+    const identifiers = scopeAttributes.map(attribute => instance[attribute]);
     // get all model's required definitions
     const requiredFieldsNames = yield DefinitionRepo.getRequiredFields(modelType, instance.id, identifiers);
     const customFieldsIdx = fields.indexOf('customFields');
     const { customFields } = instance;
     if (customFieldsIdx > -1 && customFields) {
         const fieldsNames = Object.keys(customFields);
-        const missingFields = requiredFieldsNames.filter((name) => !fieldsNames.includes(name));
-        if ((missingFields === null || missingFields === void 0 ? void 0 : missingFields.length) > 0) {
-            throw new errors_1.MissingRequiredCustomFieldError(missingFields);
+        if (requiredFieldsNames.some(name => !fieldsNames.includes(name))) {
+            throw new Error('some fields are required');
         }
-        yield ValueRepo.updateValues(modelType, instance.id, identifiers, customFields, { transaction: options.transaction });
+        yield ValueRepo.updateValues(modelType, instance.id, customFields, { transaction: options.transaction });
         // eslint-disable-next-line no-param-reassign
         fields.splice(customFieldsIdx, 1);
     }
     else if ((requiredFieldsNames === null || requiredFieldsNames === void 0 ? void 0 : requiredFieldsNames.length) > 0) {
-        throw new errors_1.MissingRequiredCustomFieldError(requiredFieldsNames);
+        throw new Error('some fields are required');
     }
 });
 exports.beforeCreate = beforeCreate;

package/dist/hooks/create.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/hooks/create.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAAiD;AACjD,yEAA2D;AAC3D,sCAA4D;AAE5D;;GAEG;AACI,MAAM,gBAAgB,GAAG,CAAC,OAAO,EAAQ,EAAE;IAChD,sEAAsE;IACtE,6CAA6C;IAC7C,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;AACjC,CAAC,CAAC;AAJW,QAAA,gBAAgB,oBAI3B;AACF;;;GAGG;AACI,MAAM,YAAY,GAAG,CAAC,eAAyB,EAAE,EAAE,CAAC,CACzD,QAAQ,EACR,OAAO,EACQ,EAAE;IACjB,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,SAAS,GAAG,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC;IAC5C,MAAM,WAAW,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;IAC5E,uCAAuC;IACvC,MAAM,mBAAmB,GAAG,MAAM,cAAc,CAAC,iBAAiB,CAAC,SAAS,EAC1E,QAAQ,CAAC,EAAE,EACX,WAAW,CAAC,CAAC;IACf,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACvD,MAAM,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;IAClC,IAAI,eAAe,GAAG,CAAC,CAAC,IAAI,YAAY,EAAE;QACxC,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC9C,MAAM,aAAa,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QACxF,IAAI,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,IAAG,CAAC,EAAE;YAC7B,MAAM,IAAI,wCAA+B,CAAC,aAAa,CAAC,CAAC;SAC1D;QAED,MAAM,SAAS,CAAC,YAAY,CAC1B,SAAS,EACT,QAAQ,CAAC,EAAE,EACX,WAAW,EACX,YAAY,EACZ,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,CACrC,CAAC;QACF,6CAA6C;QAC7C,MAAM,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;KACnC;SAAM,IAAI,CAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,MAAM,IAAG,CAAC,EAAE;QAC1C,MAAM,IAAI,wCAA+B,CAAC,mBAAmB,CAAC,CAAC;KAChE;AACH,CAAC,CAAA,CAAC;AAhCW,QAAA,YAAY,gBAgCvB"}
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/hooks/create.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAAiD;AACjD,yEAA2D;AAE3D;;GAEG;AACI,MAAM,gBAAgB,GAAG,CAAC,OAAO,EAAQ,EAAE;IAChD,sEAAsE;IACtE,6CAA6C;IAC7C,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;AACjC,CAAC,CAAC;AAJW,QAAA,gBAAgB,oBAI3B;AACF;;;GAGG;AACI,MAAM,YAAY,GAAG,CAAC,eAAyB,EAAE,EAAE,CAAC,CACzD,QAAQ,EACR,OAAO,EACQ,EAAE;IACjB,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,SAAS,GAAG,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC;IAC5C,MAAM,WAAW,GAAG,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;IAC1E,uCAAuC;IACvC,MAAM,mBAAmB,GAAG,MAAM,cAAc,CAAC,iBAAiB,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;IACxG,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACvD,MAAM,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;IAClC,IAAI,eAAe,GAAG,CAAC,CAAC,IAAI,YAAY,EAAE;QACxC,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC9C,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE;YACjE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC7C;QAED,MAAM,SAAS,CAAC,YAAY,CAC1B,SAAS,EACT,QAAQ,CAAC,EAAE,EACX,YAAY,EACZ,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,CACrC,CAAC;QACF,6CAA6C;QAC7C,MAAM,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;KACnC;SAAM,IAAI,CAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,MAAM,IAAG,CAAC,EAAE;QAC1C,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;KAC7C;AACH,CAAC,CAAA,CAAC;AA5BW,QAAA,YAAY,gBA4BvB"}

package/dist/hooks/find.js

@@ -1,26 +1,95 @@
 "use strict";
-/* eslint-disable no-param-reassign */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.beforeFind = void 0;
-const doScopeAttributesMissing = (scopeAttributes, queryAttributes) => {
-    var _a;
-    const attributes = scopeAttributes
-        .filter((attribute) => !queryAttributes.includes(attribute));
-    if (!((_a = queryAttributes.includes) === null || _a === void 0 ? void 0 : _a.call(queryAttributes, 'id'))) {
-        attributes.push('id');
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
     }
-    return attributes;
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
-// eslint-disable-next-line import/prefer-default-export
-const beforeFind = (scopeAttributes) => (options) => {
-    const { attributes: queryAttributes } = options;
-    if (queryAttributes === null || queryAttributes === void 0 ? void 0 : queryAttributes.includes('customFields')) {
-        const missingScopeAttributes = doScopeAttributesMissing(scopeAttributes, queryAttributes);
-        if ((missingScopeAttributes === null || missingScopeAttributes === void 0 ? void 0 : missingScopeAttributes.length) > 0) {
-            queryAttributes.push(...missingScopeAttributes);
-            options.attributesToRemove = missingScopeAttributes;
-        }
-    }
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
 };
-exports.beforeFind = beforeFind;
+Object.defineProperty(exports, "__esModule", { value: true });
+const ValueRepo = __importStar(require("../repository/value"));
+const DefinitionRepo = __importStar(require("../repository/definition"));
+/**
+ * Serialize custom fields value into the format of {[name] -> [fieldData]}
+ */
+const serializeCustomFields = (customFieldValues) => {
+    const customFields = customFieldValues.reduce((acc, cfv) => (Object.assign(Object.assign({}, acc), { [cfv.customFieldDefinition.name]: cfv.value })), {});
+    return customFields;
+};
+/**
+ * A hook to attach the custom fields when fetching a model instances.
+ */
+const afterFind = (scopeAttributes) => (instancesOrInstance, options) => __awaiter(void 0, void 0, void 0, function* () {
+    const primaryKey = 'id';
+    const instances = Array.isArray(instancesOrInstance)
+        ? instancesOrInstance
+        : [instancesOrInstance];
+    const identifiers = instances.map(instance => scopeAttributes.map(attr => instance[attr])).flat();
+    const uniqueIdentifiers = [...new Set(identifiers)];
+    const identifierCustomFieldDefinitionsMapping = {};
+    yield Promise.all(uniqueIdentifiers.map((identifier) => __awaiter(void 0, void 0, void 0, function* () {
+        const customFieldDefinitions = yield DefinitionRepo.findByEntityId(identifier, options.transaction);
+        identifierCustomFieldDefinitionsMapping[identifier] = customFieldDefinitions;
+    })));
+    // Get the values per instates ids:
+    const instancesIds = instances.map(i => i[primaryKey]);
+    const customFieldValues = yield ValueRepo.findValuesByModelIds(instancesIds, { transaction: options.transaction });
+    // Group fields by modelId
+    const valuesGroupByInstance = customFieldValues.reduce((acc, v) => {
+        const { modelId } = v;
+        if (!acc[modelId]) {
+            acc[modelId] = [];
+        }
+        acc[modelId].push(v);
+        return acc;
+    }, {});
+    // Attach custom fields to the instances
+    instances.forEach((instance) => {
+        const customFields = {};
+        const { id } = instance;
+        const instanceValues = valuesGroupByInstance[id];
+        if (instanceValues) {
+            const serializedCustomFields = serializeCustomFields(instanceValues);
+            Object.assign(customFields, serializedCustomFields);
+        }
+        scopeAttributes.forEach((attribute) => {
+            const identifier = instance[attribute];
+            const customFieldDefinitions = identifierCustomFieldDefinitionsMapping[identifier];
+            if ((customFieldDefinitions === null || customFieldDefinitions === void 0 ? void 0 : customFieldDefinitions.length) > 0) {
+                customFieldDefinitions.forEach((customFieldDefinition) => {
+                    if (customFields[customFieldDefinition.name] === undefined) {
+                        customFields[customFieldDefinition.name] = null;
+                    }
+                });
+            }
+        });
+        instance.setDataValue('customFields', customFields);
+    });
+});
+exports.default = afterFind;
 //# sourceMappingURL=find.js.map

package/dist/hooks/find.js.map

@@ -1 +1 @@
-{"version":3,"file":"find.js","sourceRoot":"","sources":["../../src/hooks/find.ts"],"names":[],"mappings":";AAAA,sCAAsC;;;AAEtC,MAAM,wBAAwB,GAAG,CAC/B,eAAyB,EACzB,eAAsC,EAC5B,EAAE;;IACZ,MAAM,UAAU,GAAG,eAAe;SAC/B,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;IAC/D,IAAI,CAAC,CAAA,MAAA,eAAe,CAAC,QAAQ,gEAAG,IAAI,CAAC,CAAA,EAAE;QACrC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KACvB;IACD,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEF,wDAAwD;AACjD,MAAM,UAAU,GAAG,CAAC,eAAyB,EAAE,EAAE,CAAC,CAAC,OAAO,EAAQ,EAAE;IACzE,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;IAChD,IAAI,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,QAAQ,CAAC,cAAc,CAAC,EAAE;QAC7C,MAAM,sBAAsB,GAAG,wBAAwB,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;QAC1F,IAAI,CAAA,sBAAsB,aAAtB,sBAAsB,uBAAtB,sBAAsB,CAAE,MAAM,IAAG,CAAC,EAAE;YACtC,eAAe,CAAC,IAAI,CAAC,GAAG,sBAAsB,CAAC,CAAC;YAChD,OAAO,CAAC,kBAAkB,GAAG,sBAAsB,CAAC;SACrD;KACF;AACH,CAAC,CAAC;AATW,QAAA,UAAU,cASrB"}
+{"version":3,"file":"find.js","sourceRoot":"","sources":["../../src/hooks/find.ts"],"names":[],"mappings":"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"}

package/dist/hooks/index.js

@@ -3,11 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.workaround = exports.beforeCreate = exports.beforeBulkCreate = exports.beforeUpdate = exports.beforeBulkUpdate = exports.beforeFind = exports.enrichResults = void 0;
-const enrich_1 = __importDefault(require("./enrich"));
-exports.enrichResults = enrich_1.default;
-const find_1 = require("./find");
-Object.defineProperty(exports, "beforeFind", { enumerable: true, get: function () { return find_1.beforeFind; } });
+exports.workaround = exports.beforeCreate = exports.beforeBulkCreate = exports.beforeUpdate = exports.beforeBulkUpdate = exports.afterFind = void 0;
+const find_1 = __importDefault(require("./find"));
+exports.afterFind = find_1.default;
 const update_1 = require("./update");
 Object.defineProperty(exports, "beforeBulkUpdate", { enumerable: true, get: function () { return update_1.beforeBulkUpdate; } });
 Object.defineProperty(exports, "beforeUpdate", { enumerable: true, get: function () { return update_1.beforeUpdate; } });

package/dist/hooks/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAqC;AAOnC,wBAPK,gBAAa,CAOL;AANf,iCAAoC;AAOlC,2FAPO,iBAAU,OAOP;AANZ,qCAA0D;AAOxD,iGAPO,yBAAgB,OAOP;AAChB,6FARyB,qBAAY,OAQzB;AAPd,qCAA0D;AAQxD,iGARO,yBAAgB,OAQP;AAChB,6FATyB,qBAAY,OASzB;AARd,8DAAsC;AASpC,qBATK,oBAAU,CASL"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA+B;AAM7B,oBANK,cAAS,CAML;AALX,qCAA0D;AAMxD,iGANO,yBAAgB,OAMP;AAChB,6FAPyB,qBAAY,OAOzB;AANd,qCAA0D;AAOxD,iGAPO,yBAAgB,OAOP;AAChB,6FARyB,qBAAY,OAQzB;AAPd,8DAAsC;AAQpC,qBARK,oBAAU,CAQL"}

package/dist/hooks/update.js

@@ -34,6 +34,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.beforeUpdate = exports.beforeBulkUpdate = void 0;
 const ValueRepo = __importStar(require("../repository/value"));
+const DefinitionRepo = __importStar(require("../repository/definition"));
 /**
  * A hook to update the custom fields when updating a model (more then one instance).
  */
@@ -50,14 +51,23 @@ exports.beforeBulkUpdate = beforeBulkUpdate;
 const beforeUpdate = (scopeAttributes) => (instance, options) => __awaiter(void 0, void 0, void 0, function* () {
     const { fields } = options;
     const modelType = instance.constructor.name;
-    const identifiers = scopeAttributes.map((attribute) => instance[attribute]);
+    const identifiers = scopeAttributes.map(attribute => instance[attribute]);
+    // get all model's required definitions
+    const requiredNullFieldsNames = yield DefinitionRepo.getRequiredFields(modelType, instance.id, identifiers, true);
     const customFieldsIdx = fields.indexOf('customFields');
     if (customFieldsIdx > -1) {
         const { customFields } = instance;
-        yield ValueRepo.updateValues(modelType, instance.id, identifiers, customFields, { transaction: options.transaction });
+        const fieldsNames = Object.keys(customFields);
+        if (requiredNullFieldsNames.some(name => !fieldsNames.includes(name))) {
+            throw new Error('some fields are required');
+        }
+        yield ValueRepo.updateValues(modelType, instance.id, customFields, { transaction: options.transaction });
         // eslint-disable-next-line no-param-reassign
         fields.splice(customFieldsIdx, 1);
     }
+    else if ((requiredNullFieldsNames === null || requiredNullFieldsNames === void 0 ? void 0 : requiredNullFieldsNames.length) > 0) {
+        throw new Error('some fields are required');
+    }
 });
 exports.beforeUpdate = beforeUpdate;
 //# sourceMappingURL=update.js.map

package/dist/hooks/update.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/hooks/update.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAAiD;AAEjD;;GAEG;AACI,MAAM,gBAAgB,GAAG,CAAC,OAAO,EAAQ,EAAE;IAChD,sEAAsE;IACtE,6CAA6C;IAC7C,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;AACjC,CAAC,CAAC;AAJW,QAAA,gBAAgB,oBAI3B;AAEF;;;GAGG;AACI,MAAM,YAAY,GAAG,CAAC,eAAyB,EAAE,EAAE,CAAC,CACzD,QAAQ,EACR,OAAO,EACQ,EAAE;IACjB,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,SAAS,GAAG,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC;IAC5C,MAAM,WAAW,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;IAE5E,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACvD,IAAI,eAAe,GAAG,CAAC,CAAC,EAAE;QACxB,MAAM,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;QAClC,MAAM,SAAS,CAAC,YAAY,CAC1B,SAAS,EACT,QAAQ,CAAC,EAAE,EACX,WAAW,EACX,YAAY,EACZ,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,CACrC,CAAC;QACF,6CAA6C;QAC7C,MAAM,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;KACnC;AACH,CAAC,CAAA,CAAC;AArBW,QAAA,YAAY,gBAqBvB"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/hooks/update.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAAiD;AACjD,yEAA2D;AAE3D;;GAEG;AACI,MAAM,gBAAgB,GAAG,CAAC,OAAO,EAAQ,EAAE;IAChD,sEAAsE;IACtE,6CAA6C;IAC7C,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;AACjC,CAAC,CAAC;AAJW,QAAA,gBAAgB,oBAI3B;AACF;;;GAGG;AACI,MAAM,YAAY,GAAG,CAAC,eAAyB,EAAE,EAAE,CAAC,CACzD,QAAQ,EACR,OAAO,EACQ,EAAE;IACjB,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,SAAS,GAAG,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC;IAC5C,MAAM,WAAW,GAAG,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;IAC1E,uCAAuC;IACvC,MAAM,uBAAuB,GAAG,MAAM,cAAc,CAAC,iBAAiB,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;IAElH,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACvD,IAAI,eAAe,GAAG,CAAC,CAAC,EAAE;QACxB,MAAM,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;QAClC,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC9C,IAAI,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE;YACrE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC7C;QACD,MAAM,SAAS,CAAC,YAAY,CAC1B,SAAS,EACT,QAAQ,CAAC,EAAE,EACX,YAAY,EACZ,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,CACrC,CAAC;QACF,6CAA6C;QAC7C,MAAM,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;KACnC;SAAM,IAAI,CAAA,uBAAuB,aAAvB,uBAAuB,uBAAvB,uBAAuB,CAAE,MAAM,IAAG,CAAC,EAAE;QAC9C,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;KAC7C;AACH,CAAC,CAAA,CAAC;AA5BW,QAAA,YAAY,gBA4BvB"}

package/dist/hooks/workaround.js

@@ -36,9 +36,9 @@ const handleChildrenAfterFindHook = (instances, options, level = 0) => __awaiter
         yield constructor.runHooks('afterFind', instance, options);
     }
     const { associations } = constructor;
-    const associatedNames = Object.keys(instance).filter((attribute) => Object.keys(associations).includes(attribute));
+    const associatedNames = Object.keys(instance).filter(attribute => Object.keys(associations).includes(attribute));
     if (associatedNames.length) {
-        const childInstances = associatedNames.map((name) => instance[name]);
+        const childInstances = associatedNames.map(name => instance[name]);
         return handleChildrenAfterFindHook(childInstances, options, level + 1);
     }
     return Promise.resolve();

package/dist/hooks/workaround.js.map

@@ -1 +1 @@
-{"version":3,"file":"workaround.js","sourceRoot":"","sources":["../../src/hooks/workaround.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;;;;;;;;;AAEH,MAAM,2BAA2B,GAAG,CAAO,SAAS,EAAE,OAAO,EAAE,KAAK,GAAG,CAAC,EAAE,EAAE;IAC1E,IAAI,CAAC,SAAS;QAAE,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAEzC,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC5B,OAAO,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC5C,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,QAAQ,CAAC,WAAW,CAAC;YAC1D,OAAO,2BAA2B,CAChC,QAAQ,EACR,eAAe,EACf,KAAK,CACN,CAAC;QACJ,CAAC,CAAC,CAAC,CAAC;KACL;IAED,MAAM,QAAQ,GAAG,SAAS,CAAC;IAC3B,MAAM,EAAE,WAAW,EAAE,GAAG,QAAQ,CAAC;IAEjC;;;WAGO;IACP,IAAI,KAAK,IAAI,CAAC,EAAE;QACd,MAAM,WAAW,CAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;KAC5D;IAED,MAAM,EAAE,YAAY,EAAE,GAAG,WAAW,CAAC;IACrC,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CACjE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;IAEjD,IAAI,eAAe,CAAC,MAAM,EAAE;QAC1B,MAAM,cAAc,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QACrE,OAAO,2BAA2B,CAAC,cAAc,EAAE,OAAO,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;KACxE;IAED,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;AAC3B,CAAC,CAAA,CAAC;AAEF,kBAAe,2BAA2B,CAAC"}
+{"version":3,"file":"workaround.js","sourceRoot":"","sources":["../../src/hooks/workaround.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;;;;;;;;;AAEH,MAAM,2BAA2B,GAAG,CAAO,SAAS,EAAE,OAAO,EAAE,KAAK,GAAG,CAAC,EAAE,EAAE;IAC1E,IAAI,CAAC,SAAS;QAAE,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAEzC,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC5B,OAAO,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC5C,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,QAAQ,CAAC,WAAW,CAAC;YAC1D,OAAO,2BAA2B,CAChC,QAAQ,EACR,eAAe,EACf,KAAK,CACN,CAAC;QACJ,CAAC,CAAC,CAAC,CAAC;KACL;IAED,MAAM,QAAQ,GAAG,SAAS,CAAC;IAC3B,MAAM,EAAE,WAAW,EAAE,GAAG,QAAQ,CAAC;IAEjC;;;WAGO;IACP,IAAI,KAAK,IAAI,CAAC,EAAE;QACd,MAAM,WAAW,CAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;KAC5D;IAED,MAAM,EAAE,YAAY,EAAE,GAAG,WAAW,CAAC;IACrC,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAC/D,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;IAEjD,IAAI,eAAe,CAAC,MAAM,EAAE;QAC1B,MAAM,cAAc,GAAG,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QACnE,OAAO,2BAA2B,CAAC,cAAc,EAAE,OAAO,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;KACxE;IAED,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;AAC3B,CAAC,CAAA,CAAC;AAEF,kBAAe,2BAA2B,CAAC"}

package/dist/index.js

@@ -26,7 +26,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.disableCustomFields = void 0;
 const sequelize_1 = require("sequelize");
 const models_1 = require("./models");
 const api_1 = __importDefault(require("./api"));
@@ -46,13 +45,12 @@ const addHooks = (models, getModel) => {
             model.refreshAttributes();
             // TODO: Uncomment after tests are passed
             // model.addHook('afterFind', workaround);
-            model.addHook('beforeFind', 'sadot-beforeFind', (0, hooks_1.beforeFind)(scopeAttributes));
-            model.addHook('beforeBulkCreate', 'sadot-beforeBulkCreate', hooks_1.beforeBulkCreate);
-            model.addHook('beforeBulkUpdate', 'sadot-beforeBulkUpdate', hooks_1.beforeBulkUpdate);
-            model.addHook('beforeCreate', 'sadot-beforeCreate', (0, hooks_1.beforeCreate)(scopeAttributes));
-            model.addHook('beforeUpdate', 'sadot-beforeUpdate', (0, hooks_1.beforeUpdate)(scopeAttributes));
-            model.addHook('afterFind', 'sadot-afterFind', (0, hooks_1.enrichResults)(scopeAttributes));
-            model.addHook('afterUpdate', 'sadot-afterUpdate', (0, hooks_1.enrichResults)(scopeAttributes));
+            model.addHook('afterFind', hooks_1.afterFind);
+            model.addHook('beforeBulkCreate', hooks_1.beforeBulkCreate);
+            model.addHook('afterFind', (0, hooks_1.afterFind)(scopeAttributes));
+            model.addHook('beforeBulkUpdate', hooks_1.beforeBulkUpdate);
+            model.addHook('beforeCreate', (0, hooks_1.beforeCreate)(scopeAttributes));
+            model.addHook('beforeUpdate', (0, hooks_1.beforeUpdate)(scopeAttributes));
         }
         catch (e) {
             logger_1.default.error(`Could not add custom fields hook to model ${name}. `, e);
@@ -64,41 +62,19 @@ const addHooks = (models, getModel) => {
  * @see {@link 'custom-fields/config'} for configurations
  */
 const useCustomFields = (app, getModel, options) => __awaiter(void 0, void 0, void 0, function* () {
-    const { models } = options;
+    const { innerSequelize, models } = options;
+    // deepAfterFindWorkAround(sequelize);
     if (app) {
         app.use('/api', api_1.default);
     }
-    const sequelize = (0, db_1.default)(options.databaseConfig);
-    yield (0, models_1.initTables)(sequelize, options.getUser);
+    if (!innerSequelize) {
+        const moreInnerSequelize = (0, db_1.default)(options.databaseConfig);
+        yield (0, models_1.initTables)(moreInnerSequelize);
+    }
+    else {
+        yield (0, models_1.initTables)(innerSequelize);
+    }
     addHooks(models, getModel);
 });
 exports.default = useCustomFields;
-const removeHooks = (models, getModel) => {
-    models.forEach(({ name }) => __awaiter(void 0, void 0, void 0, function* () {
-        try {
-            const model = getModel(name);
-            if (!model)
-                return;
-            if (model.rawAttributes.customFields) {
-                delete model.rawAttributes.customFields;
-                model.refreshAttributes();
-            }
-            // model.removeHook('afterFind', 'sadot-workaround');
-            model.removeHook('beforeFind', 'sadot-beforeFind');
-            model.removeHook('beforeBulkCreate', 'sadot-beforeBulkCreate');
-            model.removeHook('beforeBulkUpdate', 'sadot-beforeBulkUpdate');
-            model.removeHook('beforeCreate', 'sadot-beforeCreate');
-            model.removeHook('beforeUpdate', 'sadot-beforeUpdate');
-            model.removeHook('afterFind', 'sadot-afterFind');
-            model.removeHook('afterUpdate', 'sadot-afterUpdate');
-        }
-        catch (e) {
-            logger_1.default.error(`Could not add custom fields hook to model ${name}. `, e);
-        }
-    }));
-};
-const disableCustomFields = (models, getModel) => {
-    removeHooks(models, getModel);
-};
-exports.disableCustomFields = disableCustomFields;
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,yCAAsC;AACtC,qCAAsC;AACtC,gDAAwB;AACxB,mCAAoG;AACpG,oDAAgC;AAChC,4DAAoC;AAGpC,oEAAkD;AAElD,MAAM,QAAQ,GAAG,CAAC,MAAsB,EAAE,QAAsB,EAAE,EAAE;IAClE,MAAM,CAAC,OAAO,CAAC,CAAO,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,EAAE;QACjD,IAAI;YACF,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC7B,IAAI,CAAC,KAAK;gBAAE,OAAO;YACnB,KAAK,CAAC,aAAa,CAAC,YAAY,GAAG;gBACjC,IAAI,EAAE,qBAAS,CAAC,OAAO;aACxB,CAAC;YACF,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAC1B,yCAAyC;YACzC,0CAA0C;YAC1C,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,iBAAS,CAAC,CAAC;YACtC,KAAK,CAAC,OAAO,CAAC,kBAAkB,EAAE,wBAAgB,CAAC,CAAC;YACpD,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,IAAA,iBAAS,EAAC,eAAe,CAAC,CAAC,CAAC;YACvD,KAAK,CAAC,OAAO,CAAC,kBAAkB,EAAE,wBAAgB,CAAC,CAAC;YACpD,KAAK,CAAC,OAAO,CAAC,cAAc,EAAE,IAAA,oBAAY,EAAC,eAAe,CAAC,CAAC,CAAC;YAC7D,KAAK,CAAC,OAAO,CAAC,cAAc,EAAE,IAAA,oBAAY,EAAC,eAAe,CAAC,CAAC,CAAC;SAC9D;QAAC,OAAO,CAAC,EAAE;YACV,gBAAM,CAAC,KAAK,CAAC,6CAA6C,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;SACxE;IACH,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,eAAe,GAAG,CACtB,GAAuB,EACvB,QAAsB,EACtB,OAA2B,EACZ,EAAE;IACjB,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3C,sCAAsC;IACtC,IAAI,GAAG,EAAE;QACP,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,aAAG,CAAC,CAAC;KACtB;IACD,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,kBAAkB,GAAG,IAAA,YAAM,EAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAC1D,MAAM,IAAA,mBAAU,EAAC,kBAAkB,CAAC,CAAC;KACtC;SAAM;QACL,MAAM,IAAA,mBAAU,EAAC,cAAc,CAAC,CAAC;KAClC;IACD,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AAC7B,CAAC,CAAA,CAAC;AAEF,kBAAe,eAAe,CAAC"}

package/dist/models/CustomFieldDefinition.js

@@ -9,14 +9,24 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.CustomFieldDefinitionType = void 0;
 /* eslint-disable @typescript-eslint/no-unused-vars */
-/* eslint-disable indent */
 const sequelize_typescript_1 = require("sequelize-typescript");
-const custom_1 = require("../utils/validations/custom");
-const type_1 = require("../utils/validations/type");
 const _1 = require(".");
 const events_1 = require("../events");
-const errors_1 = require("../errors");
+/**
+ * Supported custom field types
+ */
+var CustomFieldDefinitionType;
+(function (CustomFieldDefinitionType) {
+    CustomFieldDefinitionType["NUMBER"] = "number";
+    CustomFieldDefinitionType["BOOLEAN"] = "boolean";
+    CustomFieldDefinitionType["DATE"] = "date";
+    CustomFieldDefinitionType["DATETIME"] = "datetime";
+    CustomFieldDefinitionType["TEXT"] = "text";
+    CustomFieldDefinitionType["IMAGE"] = "image";
+    CustomFieldDefinitionType["ENUM"] = "enum";
+})(CustomFieldDefinitionType = exports.CustomFieldDefinitionType || (exports.CustomFieldDefinitionType = {}));
 let CustomFieldDefinition = class CustomFieldDefinition extends sequelize_typescript_1.Model {
     static displayNameDefaultValue(instance) {
         if (!(instance === null || instance === void 0 ? void 0 : instance.displayName)) {
@@ -56,11 +66,6 @@ __decorate([
     __metadata("design:type", String)
 ], CustomFieldDefinition.prototype, "displayName", void 0);
 __decorate([
-    (0, sequelize_typescript_1.Is)('SupportedType', (value) => {
-        if (!Object.values(type_1.CustomFieldDefinitionType).includes(value)) {
-            throw new errors_1.UnsupportedCustomFieldTypeError(`"${value}" is not a supported type.`);
-        }
-    }),
     (0, sequelize_typescript_1.Column)({
         type: sequelize_typescript_1.DataType.STRING,
         allowNull: false,
@@ -146,20 +151,9 @@ CustomFieldDefinition = __decorate([
     (0, sequelize_typescript_1.DefaultScope)(() => ({ where: { disabled: false } })),
     (0, sequelize_typescript_1.Table)({
         indexes: [
-            {
-                name: 'unique_name_model_type',
-                fields: ['name', 'model_type', 'entity_id'],
-                unique: true,
-            },
+            { name: "unique_name_model_type", fields: ["name", "model_type", "entity_id"], unique: true },
         ],
         timestamps: true,
-        validate: {
-            validationByType() {
-                if (!(0, custom_1.validateValidation)(this.fieldType, this.validation)) {
-                    throw new errors_1.UnsupportedCustomValidationError(`Validation provided for "${this.fieldType}" is not supported`);
-                }
-            },
-        },
     })
 ], CustomFieldDefinition);
 exports.default = CustomFieldDefinition;

package/dist/models/CustomFieldDefinition.js.map

@@ -1 +1 @@
-{"version":3,"file":"CustomFieldDefinition.js","sourceRoot":"","sources":["../../src/models/CustomFieldDefinition.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CustomFieldDefinition.js","sourceRoot":"","sources":["../../src/models/CustomFieldDefinition.ts"],"names":[],"mappings":"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"}