@autofleet/sadot 0.0.1-beta.19 → 0.0.1-beta.2
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/dist/api/v1/definition/index.js +5 -6
- package/dist/api/v1/definition/index.js.map +1 -1
- package/dist/api/v1/definition/validations.js +7 -5
- package/dist/api/v1/definition/validations.js.map +1 -1
- package/dist/api/v1/index.js +1 -1
- package/dist/hooks/create.js +5 -7
- package/dist/hooks/create.js.map +1 -1
- package/dist/hooks/find.js +90 -21
- package/dist/hooks/find.js.map +1 -1
- package/dist/hooks/index.js +3 -5
- package/dist/hooks/index.js.map +1 -1
- package/dist/hooks/update.js +12 -2
- package/dist/hooks/update.js.map +1 -1
- package/dist/hooks/workaround.js +2 -2
- package/dist/hooks/workaround.js.map +1 -1
- package/dist/index.js +15 -39
- package/dist/index.js.map +1 -1
- package/dist/models/CustomFieldDefinition.js +15 -21
- package/dist/models/CustomFieldDefinition.js.map +1 -1
- package/dist/models/CustomFieldValue.js +9 -8
- package/dist/models/CustomFieldValue.js.map +1 -1
- package/dist/models/index.js +5 -18
- package/dist/models/index.js.map +1 -1
- package/dist/repository/definition.js +18 -8
- package/dist/repository/definition.js.map +1 -1
- package/dist/repository/value.js +10 -10
- package/dist/repository/value.js.map +1 -1
- package/dist/tests/helpers/database-config.js +1 -1
- package/dist/tests/helpers/database-config.js.map +1 -1
- package/dist/tests/mocks/{definition.mock.js → index.js} +6 -5
- package/dist/tests/mocks/index.js.map +1 -0
- package/dist/tests/mocks/testModel.js +5 -7
- package/dist/tests/mocks/testModel.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/utils/validations/custom.js +41 -26
- package/dist/utils/validations/custom.js.map +1 -1
- package/dist/utils/validations/type.js +9 -27
- package/dist/utils/validations/type.js.map +1 -1
- package/package.json +2 -2
- package/src/api/v1/definition/index.ts +11 -11
- package/src/api/v1/definition/validations.ts +23 -5
- package/src/api/v1/index.ts +1 -1
- package/src/hooks/create.ts +6 -10
- package/src/hooks/find.ts +82 -21
- package/src/hooks/index.ts +2 -4
- package/src/hooks/update.ts +11 -3
- package/src/hooks/workaround.ts +2 -2
- package/src/index.ts +15 -45
- package/src/models/CustomFieldDefinition.ts +15 -23
- package/src/models/CustomFieldValue.ts +10 -10
- package/src/models/index.ts +7 -21
- package/src/models/tests/AssociatedTestModel.ts +1 -0
- package/src/models/tests/TestModel.ts +1 -0
- package/src/repository/definition.ts +19 -8
- package/src/repository/value.ts +10 -10
- package/src/tests/helpers/database-config.ts +1 -1
- package/src/tests/mocks/events.mock.ts +1 -1
- package/src/tests/mocks/{definition.mock.ts → index.ts} +6 -5
- package/src/tests/mocks/testModel.ts +7 -12
- package/src/types/index.ts +3 -1
- package/src/utils/validations/custom.ts +44 -27
- package/src/utils/validations/type.ts +5 -21
- package/tsconfig.json +1 -0
- package/dist/errors/index.js +0 -46
- package/dist/errors/index.js.map +0 -1
- package/dist/hooks/enrich.js +0 -110
- package/dist/hooks/enrich.js.map +0 -1
- package/dist/tests/mocks/definition.mock.js.map +0 -1
- package/dist/tests/mocks/events.mock.js +0 -20
- package/dist/tests/mocks/events.mock.js.map +0 -1
- package/dist/utils/validations/validators.js +0 -34
- package/dist/utils/validations/validators.js.map +0 -1
- package/src/errors/index.ts +0 -42
- package/src/hooks/enrich.ts +0 -102
- package/src/utils/validations/validators.ts +0 -34
|
@@ -45,17 +45,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
45
45
|
};
|
|
46
46
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
47
47
|
/* eslint-disable @typescript-eslint/no-unused-vars */
|
|
48
|
-
/* eslint-disable indent */
|
|
49
48
|
const sequelize_typescript_1 = require("sequelize-typescript");
|
|
50
49
|
const events_1 = require("../events");
|
|
51
50
|
const _1 = require(".");
|
|
52
51
|
const validations_1 = __importDefault(require("../utils/validations"));
|
|
53
52
|
const CustomFieldDefinitionRepo = __importStar(require("../repository/definition"));
|
|
54
|
-
const
|
|
53
|
+
const logger_1 = __importDefault(require("../utils/logger"));
|
|
55
54
|
let CustomFieldValue = class CustomFieldValue extends sequelize_typescript_1.Model {
|
|
56
55
|
static validateValues(instances) {
|
|
57
56
|
return __awaiter(this, void 0, void 0, function* () {
|
|
58
|
-
|
|
57
|
+
logger_1.default.info('CustomFieldValue BeforeBulkCreate/BeforeBulkUpdate', { instances });
|
|
58
|
+
const ids = instances.map(instance => instance.customFieldDefinitionId);
|
|
59
59
|
const uniqueIds = [...new Set(ids)];
|
|
60
60
|
const definitions = yield CustomFieldDefinitionRepo.findByIds(uniqueIds, { withDisabled: true });
|
|
61
61
|
if (!definitions || definitions.length !== uniqueIds.length) {
|
|
@@ -63,27 +63,28 @@ let CustomFieldValue = class CustomFieldValue extends sequelize_typescript_1.Mod
|
|
|
63
63
|
}
|
|
64
64
|
instances.forEach((instance) => {
|
|
65
65
|
const { validation, fieldType, } = definitions
|
|
66
|
-
.find(
|
|
66
|
+
.find(definition => definition.id === instance.customFieldDefinitionId);
|
|
67
67
|
const isValid = (0, validations_1.default)(instance.value, fieldType, validation);
|
|
68
68
|
if (!isValid) {
|
|
69
|
-
throw new
|
|
69
|
+
throw new Error('Invalid value');
|
|
70
70
|
}
|
|
71
71
|
});
|
|
72
72
|
});
|
|
73
73
|
}
|
|
74
74
|
static validateValue(instance) {
|
|
75
75
|
return __awaiter(this, void 0, void 0, function* () {
|
|
76
|
+
logger_1.default.info('CustomFieldValue BeforeCreate/BeforeUpdate', { instance });
|
|
76
77
|
const { customFieldDefinitionId } = instance;
|
|
77
|
-
// eslint-disable-next-line max-len
|
|
78
78
|
const cfd = yield CustomFieldDefinitionRepo.findById(customFieldDefinitionId, { withDisabled: true });
|
|
79
79
|
const { validation, fieldType } = cfd;
|
|
80
80
|
const isValid = (0, validations_1.default)(instance.value, fieldType, validation);
|
|
81
81
|
if (!isValid) {
|
|
82
|
-
throw new
|
|
82
|
+
throw new Error('Invalid value');
|
|
83
83
|
}
|
|
84
84
|
});
|
|
85
85
|
}
|
|
86
86
|
static afterSaveHandler(instance, options) {
|
|
87
|
+
logger_1.default.info('CustomFieldValue afterSave', { instance });
|
|
87
88
|
if (options.transaction) {
|
|
88
89
|
options.transaction.afterCommit(() => (0, events_1.sendDimEvent)(instance[0]));
|
|
89
90
|
}
|
|
@@ -112,7 +113,7 @@ __decorate([
|
|
|
112
113
|
__decorate([
|
|
113
114
|
(0, sequelize_typescript_1.Column)({
|
|
114
115
|
type: sequelize_typescript_1.DataType.JSONB,
|
|
115
|
-
allowNull:
|
|
116
|
+
allowNull: false,
|
|
116
117
|
}),
|
|
117
118
|
__metadata("design:type", Object)
|
|
118
119
|
], CustomFieldValue.prototype, "value", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CustomFieldValue.js","sourceRoot":"","sources":["../../src/models/CustomFieldValue.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAsD;AACtD
|
|
1
|
+
{"version":3,"file":"CustomFieldValue.js","sourceRoot":"","sources":["../../src/models/CustomFieldValue.ts"],"names":[],"mappings":"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"}
|
package/dist/models/index.js
CHANGED
|
@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.initTables = exports.AssociatedTestModel = exports.TestModel = exports.CustomFieldDefinition = exports.CustomFieldValue = void 0;
|
|
16
16
|
const logger_1 = __importDefault(require("../utils/logger"));
|
|
17
|
+
// import addPermanentHooks from '../hooks/permanent-hooks';
|
|
17
18
|
const CustomFieldDefinition_1 = __importDefault(require("./CustomFieldDefinition"));
|
|
18
19
|
exports.CustomFieldDefinition = CustomFieldDefinition_1.default;
|
|
19
20
|
const CustomFieldValue_1 = __importDefault(require("./CustomFieldValue"));
|
|
@@ -22,17 +23,18 @@ const TestModel_1 = __importDefault(require("./tests/TestModel"));
|
|
|
22
23
|
exports.TestModel = TestModel_1.default;
|
|
23
24
|
const AssociatedTestModel_1 = __importDefault(require("./tests/AssociatedTestModel"));
|
|
24
25
|
exports.AssociatedTestModel = AssociatedTestModel_1.default;
|
|
26
|
+
// export const CustomFieldDefinition = CustomFieldDefinitionModel;
|
|
27
|
+
// export { default as CustomFieldDefinition } from './custom-field-definition.model';
|
|
25
28
|
const productionModels = [CustomFieldDefinition_1.default, CustomFieldValue_1.default];
|
|
26
29
|
const testModels = [...productionModels, TestModel_1.default, AssociatedTestModel_1.default];
|
|
27
|
-
const initTables = (sequelize
|
|
30
|
+
const initTables = (sequelize) => __awaiter(void 0, void 0, void 0, function* () {
|
|
28
31
|
logger_1.default.info('custom-fields: initialize custom-fields tables');
|
|
29
32
|
// Detect models and import them to the orm
|
|
30
33
|
// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
|
|
31
34
|
if (!sequelize.addModels) {
|
|
32
35
|
throw new Error('sequelize instance must have addModels function');
|
|
33
36
|
}
|
|
34
|
-
|
|
35
|
-
sequelize.addModels(models);
|
|
37
|
+
sequelize.addModels(process.env.NODE_ENV === 'test' ? testModels : productionModels);
|
|
36
38
|
yield sequelize.dropSchema('custom-fields', { logging: false });
|
|
37
39
|
yield sequelize.createSchema('custom-fields', { logging: false });
|
|
38
40
|
logger_1.default.info('custom-fields: models added');
|
|
@@ -43,21 +45,6 @@ const initTables = (sequelize, getUser) => __awaiter(void 0, void 0, void 0, fun
|
|
|
43
45
|
yield AssociatedTestModel_1.default.sync({ alter: true });
|
|
44
46
|
}
|
|
45
47
|
logger_1.default.info('custom-fields: models synced');
|
|
46
|
-
CustomFieldDefinition_1.default.addScope('userScope', () => {
|
|
47
|
-
const user = getUser();
|
|
48
|
-
if (user === null || user === void 0 ? void 0 : user.permissions) {
|
|
49
|
-
return {
|
|
50
|
-
where: {
|
|
51
|
-
entityId: [
|
|
52
|
-
...Object.keys(user.permissions.fleets),
|
|
53
|
-
...Object.keys(user.permissions.businessModels),
|
|
54
|
-
...Object.keys(user.permissions.demandSources),
|
|
55
|
-
],
|
|
56
|
-
},
|
|
57
|
-
};
|
|
58
|
-
}
|
|
59
|
-
return {};
|
|
60
|
-
});
|
|
61
48
|
});
|
|
62
49
|
exports.initTables = initTables;
|
|
63
50
|
//# sourceMappingURL=index.js.map
|
package/dist/models/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/models/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,6DAAqC;AACrC,oFAA4D;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/models/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,6DAAqC;AACrC,4DAA4D;AAE5D,oFAA4D;AAmC1D,gCAnCK,+BAAqB,CAmCL;AAlCvB,0EAAkD;AAiChD,2BAjCK,0BAAgB,CAiCL;AAhClB,kEAA0C;AAkCxC,oBAlCK,mBAAS,CAkCL;AAjCX,sFAA8D;AAkC5D,8BAlCK,6BAAmB,CAkCL;AAhCrB,mEAAmE;AACnE,sFAAsF;AAEtF,MAAM,gBAAgB,GAAG,CAAC,+BAAqB,EAAE,0BAAgB,CAAC,CAAC;AACnE,MAAM,UAAU,GAAG,CAAC,GAAG,gBAAgB,EAAE,mBAAS,EAAE,6BAAmB,CAAC,CAAC;AAEzE,MAAM,UAAU,GAAG,CAAO,SAAoB,EAAiB,EAAE;IAC/D,gBAAM,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC;IAC9D,2CAA2C;IAC3C,4EAA4E;IAC5E,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;KACpE;IACD,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;IACrF,MAAM,SAAS,CAAC,UAAU,CAAC,eAAe,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IAChE,MAAM,SAAS,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IAElE,gBAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;IAC3C,MAAM,+BAAqB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAClD,MAAM,0BAAgB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAE7C,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE;QACnC,MAAM,mBAAS,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACtC,MAAM,6BAAmB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;KACjD;IACD,gBAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;AAC9C,CAAC,CAAA,CAAC;AAOA,gCAAU"}
|
|
@@ -14,11 +14,17 @@ const sequelize_1 = require("sequelize");
|
|
|
14
14
|
const models_1 = require("../models");
|
|
15
15
|
const create = (data) => models_1.CustomFieldDefinition.create(data);
|
|
16
16
|
exports.create = create;
|
|
17
|
-
const findAll = (
|
|
17
|
+
const findAll = (query, options = { withDisabled: false }) => {
|
|
18
18
|
if (options.withDisabled) {
|
|
19
|
-
return models_1.CustomFieldDefinition.unscoped().
|
|
19
|
+
return models_1.CustomFieldDefinition.unscoped().findAll({
|
|
20
|
+
where: query,
|
|
21
|
+
include: [models_1.CustomFieldValue],
|
|
22
|
+
});
|
|
20
23
|
}
|
|
21
|
-
return models_1.CustomFieldDefinition.
|
|
24
|
+
return models_1.CustomFieldDefinition.findAll({
|
|
25
|
+
where: query,
|
|
26
|
+
include: [models_1.CustomFieldValue],
|
|
27
|
+
});
|
|
22
28
|
};
|
|
23
29
|
exports.findAll = findAll;
|
|
24
30
|
const findByIds = (ids, options = { withDisabled: false }) => (0, exports.findAll)({ id: { [sequelize_1.Op.in]: ids } }, options);
|
|
@@ -26,9 +32,13 @@ exports.findByIds = findByIds;
|
|
|
26
32
|
const findById = (id, options = { withDisabled: false }) => {
|
|
27
33
|
const { withDisabled } = options;
|
|
28
34
|
if (withDisabled) {
|
|
29
|
-
return models_1.CustomFieldDefinition.unscoped().
|
|
35
|
+
return models_1.CustomFieldDefinition.unscoped().findByPk(id, {
|
|
36
|
+
include: [models_1.CustomFieldValue],
|
|
37
|
+
});
|
|
30
38
|
}
|
|
31
|
-
return models_1.CustomFieldDefinition.
|
|
39
|
+
return models_1.CustomFieldDefinition.findByPk(id, {
|
|
40
|
+
include: [models_1.CustomFieldValue],
|
|
41
|
+
});
|
|
32
42
|
};
|
|
33
43
|
exports.findById = findById;
|
|
34
44
|
const findByEntityId = (entityId, options = {}) => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -38,7 +48,7 @@ const findByEntityId = (entityId, options = {}) => __awaiter(void 0, void 0, voi
|
|
|
38
48
|
});
|
|
39
49
|
});
|
|
40
50
|
exports.findByEntityId = findByEntityId;
|
|
41
|
-
const findByWhere = (where) => models_1.CustomFieldDefinition.
|
|
51
|
+
const findByWhere = (where) => models_1.CustomFieldDefinition.findOne({
|
|
42
52
|
where,
|
|
43
53
|
include: [models_1.CustomFieldValue],
|
|
44
54
|
});
|
|
@@ -53,7 +63,7 @@ const findDefinitionsByModels = (modelTypes, options) => __awaiter(void 0, void
|
|
|
53
63
|
});
|
|
54
64
|
exports.findDefinitionsByModels = findDefinitionsByModels;
|
|
55
65
|
const update = (id, data) => __awaiter(void 0, void 0, void 0, function* () {
|
|
56
|
-
const updatedDefinition = (yield models_1.CustomFieldDefinition.
|
|
66
|
+
const updatedDefinition = (yield models_1.CustomFieldDefinition.update(data, {
|
|
57
67
|
where: { id },
|
|
58
68
|
returning: true,
|
|
59
69
|
individualHooks: true,
|
|
@@ -90,7 +100,7 @@ const getRequiredFields = (modelType, modelId, entityId, onlyNull = false) => __
|
|
|
90
100
|
},
|
|
91
101
|
logging: true,
|
|
92
102
|
});
|
|
93
|
-
const requiredFieldsNames = requiredFields.map(
|
|
103
|
+
const requiredFieldsNames = requiredFields.map(definition => definition.name);
|
|
94
104
|
return [...new Set(requiredFieldsNames)];
|
|
95
105
|
});
|
|
96
106
|
exports.getRequiredFields = getRequiredFields;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"definition.js","sourceRoot":"","sources":["../../src/repository/definition.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAA6C;AAC7C,sCAAoE;AAG7D,MAAM,MAAM,GAAG,CAAC,IAAiC,EAAkC,EAAE,CAC1F,8BAAqB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AADxB,QAAA,MAAM,UACkB;AAE9B,MAAM,OAAO,GAAG,CACrB,KAAU,EACV,UAAe,EAAE,YAAY,EAAE,KAAK,EAAE,EACJ,EAAE;IACpC,IAAI,OAAO,CAAC,YAAY,EAAE;QACxB,OAAO,8BAAqB,CAAC,QAAQ,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"definition.js","sourceRoot":"","sources":["../../src/repository/definition.ts"],"names":[],"mappings":"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"}
|
package/dist/repository/value.js
CHANGED
|
@@ -37,10 +37,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
37
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
38
|
exports.deleteValue = exports.updateValues = exports.findValuesByModelIds = exports.findValuesByModelId = exports.findAllValues = exports.create = exports.findByModelIdAndDefinition = void 0;
|
|
39
39
|
/* eslint-disable max-len */
|
|
40
|
+
const sequelize_1 = require("sequelize");
|
|
40
41
|
const models_1 = require("../models");
|
|
41
42
|
const DefinitionRepo = __importStar(require("./definition"));
|
|
42
43
|
const logger_1 = __importDefault(require("../utils/logger"));
|
|
43
|
-
const errors_1 = require("../errors");
|
|
44
44
|
const findByModelIdAndDefinition = (modelId, customFieldDefinitionId) => __awaiter(void 0, void 0, void 0, function* () { return models_1.CustomFieldValue.findAll({ where: { modelId, customFieldDefinitionId }, include: [models_1.CustomFieldDefinition] }); });
|
|
45
45
|
exports.findByModelIdAndDefinition = findByModelIdAndDefinition;
|
|
46
46
|
const create = (data, withAssociations = false) => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -80,25 +80,25 @@ exports.findValuesByModelIds = findValuesByModelIds;
|
|
|
80
80
|
* Create new value record if not exists, but fails if value's definition not exist.
|
|
81
81
|
* Return the updated values
|
|
82
82
|
*/
|
|
83
|
-
const updateValues = (modelType, modelId,
|
|
83
|
+
const updateValues = (modelType, modelId, valuesToUpdate, options = {}) => __awaiter(void 0, void 0, void 0, function* () {
|
|
84
84
|
logger_1.default.info(`custom-fields: updating values for ${modelType} ${modelId}`, { valuesToUpdate });
|
|
85
85
|
const names = Object.keys(valuesToUpdate);
|
|
86
|
-
const fieldDefinitions = (yield DefinitionRepo.findAll({ modelType, name:
|
|
87
|
-
const disabledDefinitions = fieldDefinitions.filter(
|
|
86
|
+
const fieldDefinitions = (yield DefinitionRepo.findAll({ modelType, name: { [sequelize_1.Op.in]: names } }, { withDisabled: true, transaction: options.transaction })) || [];
|
|
87
|
+
const disabledDefinitions = fieldDefinitions.filter(def => def.disabled);
|
|
88
88
|
if (fieldDefinitions.length !== names.length) {
|
|
89
|
-
const missingDefinitions = names.filter(
|
|
90
|
-
throw new
|
|
89
|
+
const missingDefinitions = names.filter(name => !fieldDefinitions.some(def => def.name === name));
|
|
90
|
+
throw new Error(`custom-fields: missing definitions for ${missingDefinitions.join(', ')}`);
|
|
91
91
|
}
|
|
92
|
-
const disabledNames = (disabledDefinitions === null || disabledDefinitions === void 0 ? void 0 : disabledDefinitions.map(
|
|
93
|
-
const valuesWithDisabledDefinitions = names.filter(
|
|
92
|
+
const disabledNames = (disabledDefinitions === null || disabledDefinitions === void 0 ? void 0 : disabledDefinitions.map(def => def.name)) || [];
|
|
93
|
+
const valuesWithDisabledDefinitions = names.filter(name => disabledNames.includes(name));
|
|
94
94
|
if ((valuesWithDisabledDefinitions === null || valuesWithDisabledDefinitions === void 0 ? void 0 : valuesWithDisabledDefinitions.length) > 0) {
|
|
95
95
|
logger_1.default.warn(`custom-fields: trying to update disabled values: ${valuesWithDisabledDefinitions.join(', ')}`);
|
|
96
96
|
}
|
|
97
|
-
const values = names.map(
|
|
97
|
+
const values = names.map(name => ({
|
|
98
98
|
modelId,
|
|
99
99
|
value: valuesToUpdate[name],
|
|
100
100
|
updatedAt: new Date(),
|
|
101
|
-
customFieldDefinitionId: fieldDefinitions.find(
|
|
101
|
+
customFieldDefinitionId: fieldDefinitions.find(def => def.name === name).id,
|
|
102
102
|
}));
|
|
103
103
|
return Promise.all(values.map((value) => __awaiter(void 0, void 0, void 0, function* () {
|
|
104
104
|
const [cfv] = yield models_1.CustomFieldValue.upsert(value, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"value.js","sourceRoot":"","sources":["../../src/repository/value.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4BAA4B;AAC5B,sCAAoE;AACpE,6DAA+C;AAE/C,6DAAqC;
|
|
1
|
+
{"version":3,"file":"value.js","sourceRoot":"","sources":["../../src/repository/value.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ exports.default = {
|
|
|
4
4
|
test: {
|
|
5
5
|
username: process.env.DB_USERNAME || '',
|
|
6
6
|
password: process.env.DB_PASSWORD || null,
|
|
7
|
-
database: process.env.DB_NAME || '
|
|
7
|
+
database: process.env.DB_NAME || 'vehicles_service_test',
|
|
8
8
|
host: process.env.DB_HOST || '127.0.0.1',
|
|
9
9
|
dialect: process.env.DB_TYPE || 'postgres',
|
|
10
10
|
define: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database-config.js","sourceRoot":"","sources":["../../../src/tests/helpers/database-config.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb,IAAI,EAAE;QACJ,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE;QACvC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,IAAI;QACzC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,
|
|
1
|
+
{"version":3,"file":"database-config.js","sourceRoot":"","sources":["../../../src/tests/helpers/database-config.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb,IAAI,EAAE;QACJ,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE;QACvC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,IAAI;QACzC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,uBAAuB;QACxD,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,WAAW;QACxC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,UAAU;QAC1C,MAAM,EAAE;YACN,WAAW,EAAE,IAAI;YACjB,cAAc,EAAE,IAAI;SACrB;QACD,OAAO,EAAE,KAAK;KACf;CACF,CAAC"}
|
|
@@ -22,8 +22,10 @@ exports.booleanField = booleanField;
|
|
|
22
22
|
const enumField = (modelType, options) => ({
|
|
23
23
|
name: 'choices',
|
|
24
24
|
modelType,
|
|
25
|
-
fieldType: '
|
|
26
|
-
validation:
|
|
25
|
+
fieldType: 'enum',
|
|
26
|
+
validation: {
|
|
27
|
+
enum: options,
|
|
28
|
+
},
|
|
27
29
|
entityId: (0, uuid_1.v4)(),
|
|
28
30
|
entityType: 'fleetId',
|
|
29
31
|
});
|
|
@@ -39,7 +41,6 @@ const rangeField = (modelType) => ({
|
|
|
39
41
|
entityType: 'fleetId',
|
|
40
42
|
});
|
|
41
43
|
exports.rangeField = rangeField;
|
|
42
|
-
// eslint-disable-next-line max-len
|
|
43
44
|
const createDefinition = (defaults) => ({
|
|
44
45
|
name: (defaults === null || defaults === void 0 ? void 0 : defaults.name) || `def_${(0, uuid_1.v4)()}`,
|
|
45
46
|
modelType: (defaults === null || defaults === void 0 ? void 0 : defaults.modelType) || 'TestModel',
|
|
@@ -48,7 +49,7 @@ const createDefinition = (defaults) => ({
|
|
|
48
49
|
entityType: (defaults === null || defaults === void 0 ? void 0 : defaults.entityType) || 'fleetId',
|
|
49
50
|
});
|
|
50
51
|
exports.createDefinition = createDefinition;
|
|
51
|
-
const createDefinitions = (defaults, length = 1) => (Array(length).fill({}).map(
|
|
52
|
+
const createDefinitions = (defaults, length = 1) => (Array(length).fill({}).map(_ => ({
|
|
52
53
|
name: (defaults === null || defaults === void 0 ? void 0 : defaults.name) || `def_${(0, uuid_1.v4)()}`,
|
|
53
54
|
modelType: (defaults === null || defaults === void 0 ? void 0 : defaults.modelType) || 'TestModel',
|
|
54
55
|
fieldType: (defaults === null || defaults === void 0 ? void 0 : defaults.fieldType) || 'boolean',
|
|
@@ -56,4 +57,4 @@ const createDefinitions = (defaults, length = 1) => (Array(length).fill({}).map(
|
|
|
56
57
|
entityType: (defaults === null || defaults === void 0 ? void 0 : defaults.entityType) || 'fleetId',
|
|
57
58
|
})));
|
|
58
59
|
exports.createDefinitions = createDefinitions;
|
|
59
|
-
//# sourceMappingURL=
|
|
60
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tests/mocks/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,25 +21,23 @@ const createTestModels = (fleetId, total) => {
|
|
|
21
21
|
return Promise.all(models);
|
|
22
22
|
};
|
|
23
23
|
exports.createTestModels = createTestModels;
|
|
24
|
-
const upsertTestModel =
|
|
24
|
+
const upsertTestModel = payload => models_1.TestModel.upsert(payload);
|
|
25
25
|
exports.upsertTestModel = upsertTestModel;
|
|
26
26
|
const destroyTestModels = () => models_1.TestModel.destroy({ truncate: true });
|
|
27
27
|
exports.destroyTestModels = destroyTestModels;
|
|
28
|
-
const getTestModel = (id
|
|
28
|
+
const getTestModel = (id) => models_1.TestModel.findByPk(id);
|
|
29
29
|
exports.getTestModel = getTestModel;
|
|
30
|
-
const getSomeTestModels = (
|
|
30
|
+
const getSomeTestModels = (limit = 1) => models_1.TestModel.findAll({ limit });
|
|
31
31
|
exports.getSomeTestModels = getSomeTestModels;
|
|
32
32
|
const updateTestModel = (payload, query) => models_1.TestModel.update(payload, query);
|
|
33
33
|
exports.updateTestModel = updateTestModel;
|
|
34
34
|
// Associations
|
|
35
35
|
const createTestModelWithAssociation = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
36
36
|
const model = yield models_1.TestModel.create({});
|
|
37
|
-
yield models_1.AssociatedTestModel.create({ testModelId: model.id });
|
|
37
|
+
const associatedTestModel = yield models_1.AssociatedTestModel.create({ testModelId: model.id });
|
|
38
38
|
return model;
|
|
39
39
|
});
|
|
40
40
|
exports.createTestModelWithAssociation = createTestModelWithAssociation;
|
|
41
|
-
const getTestModelWithAssociation = (limit = 1) => models_1.TestModel.findAll({
|
|
42
|
-
limit, include: [models_1.AssociatedTestModel],
|
|
43
|
-
});
|
|
41
|
+
const getTestModelWithAssociation = (limit = 1) => models_1.TestModel.findAll({ limit, include: [models_1.AssociatedTestModel] });
|
|
44
42
|
exports.getTestModelWithAssociation = getTestModelWithAssociation;
|
|
45
43
|
//# sourceMappingURL=testModel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testModel.js","sourceRoot":"","sources":["../../../src/tests/mocks/testModel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAA8D;
|
|
1
|
+
{"version":3,"file":"testModel.js","sourceRoot":"","sources":["../../../src/tests/mocks/testModel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAA8D;AAGvD,MAAM,eAAe,GAAG,CAAC,OAAO,GAAG,EAAE,EAAE,EAAE,CAAC,kBAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAA9D,QAAA,eAAe,mBAA+C;AAEpE,MAAM,gBAAgB,GAAG,CAAC,OAAO,EAAE,KAAa,EAAE,EAAE;IACzD,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE;QACjC,MAAM,CAAC,IAAI,CAAC,IAAA,uBAAe,EAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;KAC3C;IACD,OAAO,OAAO,CAAC,GAAG,CAAY,MAAM,CAAC,CAAC;AACxC,CAAC,CAAC;AANW,QAAA,gBAAgB,oBAM3B;AAEK,MAAM,eAAe,GAAG,OAAO,CAAC,EAAE,CAAC,kBAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAAvD,QAAA,eAAe,mBAAwC;AAE7D,MAAM,iBAAiB,GAAG,GAAG,EAAE,CAAC,kBAAS,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;AAAhE,QAAA,iBAAiB,qBAA+C;AAEtE,MAAM,YAAY,GAAG,CAAC,EAAU,EAAsB,EAAE,CAAC,kBAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;AAA1E,QAAA,YAAY,gBAA8D;AAEhF,MAAM,iBAAiB,GAAG,CAAC,KAAK,GAAG,CAAC,EAAwB,EAAE,CAAC,kBAAS,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;AAAtF,QAAA,iBAAiB,qBAAqE;AAE5F,MAAM,eAAe,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,kBAAS,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;AAAvE,QAAA,eAAe,mBAAwD;AAEpF,eAAe;AACR,MAAM,8BAA8B,GAAG,GAAS,EAAE;IACvD,MAAM,KAAK,GAAG,MAAM,kBAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACzC,MAAM,mBAAmB,GAAG,MAAM,4BAAmB,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;IACxF,OAAO,KAAK,CAAC;AACf,CAAC,CAAA,CAAC;AAJW,QAAA,8BAA8B,kCAIzC;AAEK,MAAM,2BAA2B,GAAG,CAAC,KAAK,GAAG,CAAC,EAAE,EAAE,CAAC,kBAAS,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,4BAAmB,CAAC,EAAE,CAAC,CAAC;AAA1G,QAAA,2BAA2B,+BAA+E"}
|