namirasoft-field-node 1.4.23 → 1.4.25
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/controller/entity_tag/Create.js +1 -2
- package/dist/controller/entity_tag/Create.js.map +1 -1
- package/dist/controller/entity_tag/Update.js +1 -2
- package/dist/controller/entity_tag/Update.js.map +1 -1
- package/dist/database/NSFTables.js +4 -5
- package/dist/database/NSFTables.js.map +1 -1
- package/dist/database/attributes/EntityTagAttributes.js +1 -2
- package/dist/database/attributes/EntityTagAttributes.js.map +1 -1
- package/dist/database/model/EntityTagModel.d.ts +1 -2
- package/dist/database/model/EntityTagModel.js.map +1 -1
- package/dist/database/table/EntityTagTable.d.ts +2 -2
- package/dist/database/table/EntityTagTable.js +2 -4
- package/dist/database/table/EntityTagTable.js.map +1 -1
- package/package.json +1 -1
- package/src/controller/entity_tag/Create.ts +1 -2
- package/src/controller/entity_tag/Update.ts +1 -2
- package/src/database/NSFTables.ts +4 -4
- package/src/database/attributes/EntityTagAttributes.ts +1 -2
- package/src/database/model/EntityTagModel.ts +1 -2
- package/src/database/table/EntityTagTable.ts +2 -4
|
@@ -60,8 +60,7 @@ class Create extends BaseEntityFieldController_1.BaseEntityFieldController {
|
|
|
60
60
|
let entity_id = new namirasoft_core_1.ObjectService(this.req.params.entity_id).getString();
|
|
61
61
|
let name = new namirasoft_core_1.ObjectService(this.req.body.name).getString();
|
|
62
62
|
let value = new namirasoft_core_1.ObjectService(this.req.body.value).getString();
|
|
63
|
-
let
|
|
64
|
-
let ans = yield this.tables.entity_tag.create(this.props.access, this.props.session, this.props.access.owner_id, entity_id, name, value, description, null);
|
|
63
|
+
let ans = yield this.tables.entity_tag.create(this.props.access, this.props.session, this.props.access.owner_id, entity_id, name, value, null);
|
|
65
64
|
return yield this.tables.entity_tag.secure(ans);
|
|
66
65
|
});
|
|
67
66
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Create.js","sourceRoot":"","sources":["../../../src/controller/entity_tag/Create.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAA4D;AAC5D,4EAAyE;AAEzE,8DAA2D;AAC3D,yDAAqE;AACrE,MAAa,MAAO,SAAQ,qDAAyC;IAE3D,OAAO;QAEf,OAAO;YACN,IAAI,EAAE,QAAQ;YACd,GAAG,EAAE,IAAI,CAAC,SAAS,GAAG,KAAK;YAC3B,MAAM,EAAE,4BAAU,CAAC,IAAI;YACvB,IAAI,EAAE,IAAI,CAAC,UAAU,GAAG,kBAAkB;YAC1C,OAAO,EAAE,iBAAiB,IAAI,CAAC,UAAU,oBAAoB;SAC7D,CAAC;IACH,CAAC;IACc,mBAAmB;;YAEjC,OAAO,CAAC,IAAI,sCAAkB,CAAC,WAAW,EAAE,IAAI,gCAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACtE,CAAC;KAAA;IACc,gBAAgB;;YAE9B,OAAO,EAAE,CAAC;QACX,CAAC;KAAA;IACc,aAAa;;YAE3B,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,EAAE,+BAAc,CAAC,cAAc,CAAC,CAAC;QACpF,CAAC;KAAA;IACc,eAAe;;YAE7B,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACrD,CAAC;KAAA;IACc,QAAQ;;YAEtB,OAAO;gBACN,UAAU,EAAE,IAAI;gBAChB,aAAa,EAAE,KAAK;aACpB,CAAC;QACH,CAAC;KAAA;IACQ,KAAK;QAEb,OAAO,IAAI,CAAC;IACb,CAAC;IACc,MAAM;;YAEpB,IAAI,SAAS,GAAG,IAAI,+BAAa,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,CAAC;YACzE,IAAI,IAAI,GAAG,IAAI,+BAAa,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;YAC7D,IAAI,KAAK,GAAG,IAAI,+BAAa,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"Create.js","sourceRoot":"","sources":["../../../src/controller/entity_tag/Create.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAA4D;AAC5D,4EAAyE;AAEzE,8DAA2D;AAC3D,yDAAqE;AACrE,MAAa,MAAO,SAAQ,qDAAyC;IAE3D,OAAO;QAEf,OAAO;YACN,IAAI,EAAE,QAAQ;YACd,GAAG,EAAE,IAAI,CAAC,SAAS,GAAG,KAAK;YAC3B,MAAM,EAAE,4BAAU,CAAC,IAAI;YACvB,IAAI,EAAE,IAAI,CAAC,UAAU,GAAG,kBAAkB;YAC1C,OAAO,EAAE,iBAAiB,IAAI,CAAC,UAAU,oBAAoB;SAC7D,CAAC;IACH,CAAC;IACc,mBAAmB;;YAEjC,OAAO,CAAC,IAAI,sCAAkB,CAAC,WAAW,EAAE,IAAI,gCAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACtE,CAAC;KAAA;IACc,gBAAgB;;YAE9B,OAAO,EAAE,CAAC;QACX,CAAC;KAAA;IACc,aAAa;;YAE3B,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,EAAE,+BAAc,CAAC,cAAc,CAAC,CAAC;QACpF,CAAC;KAAA;IACc,eAAe;;YAE7B,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACrD,CAAC;KAAA;IACc,QAAQ;;YAEtB,OAAO;gBACN,UAAU,EAAE,IAAI;gBAChB,aAAa,EAAE,KAAK;aACpB,CAAC;QACH,CAAC;KAAA;IACQ,KAAK;QAEb,OAAO,IAAI,CAAC;IACb,CAAC;IACc,MAAM;;YAEpB,IAAI,SAAS,GAAG,IAAI,+BAAa,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,CAAC;YACzE,IAAI,IAAI,GAAG,IAAI,+BAAa,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;YAC7D,IAAI,KAAK,GAAG,IAAI,+BAAa,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,CAAC;YAE/D,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;YAC/I,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjD,CAAC;KAAA;CACD;AAhDD,wBAgDC"}
|
|
@@ -61,8 +61,7 @@ class Update extends BaseEntityFieldController_1.BaseEntityFieldController {
|
|
|
61
61
|
let entity_id = new namirasoft_core_1.ObjectService(this.req.params.entity_id).getString();
|
|
62
62
|
let name = new namirasoft_core_1.ObjectService(this.req.body.name).getString();
|
|
63
63
|
let value = new namirasoft_core_1.ObjectService(this.req.body.value).getString();
|
|
64
|
-
let
|
|
65
|
-
let ans = yield this.tables.entity_tag.update(this.props.access, this.props.session, this.props.access.owner_id, id, entity_id, name, value, description, null);
|
|
64
|
+
let ans = yield this.tables.entity_tag.update(this.props.access, this.props.session, this.props.access.owner_id, id, entity_id, name, value, null);
|
|
66
65
|
return yield this.tables.entity_tag.secure(ans);
|
|
67
66
|
});
|
|
68
67
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Update.js","sourceRoot":"","sources":["../../../src/controller/entity_tag/Update.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAA4D;AAC5D,4EAAyE;AACzE,yDAAqE;AACrE,8DAA2D;AAC3D,MAAa,MAAO,SAAQ,qDAAiC;IAEnD,OAAO;QAEf,OAAO;YACN,IAAI,EAAE,QAAQ;YACd,GAAG,EAAE,IAAI,CAAC,SAAS,GAAG,KAAK;YAC3B,MAAM,EAAE,4BAAU,CAAC,GAAG;YACtB,IAAI,EAAE,IAAI,CAAC,UAAU,GAAG,uBAAuB;YAC/C,OAAO,EAAE,aAAa,IAAI,CAAC,UAAU,6BAA6B;SAClE,CAAC;IACH,CAAC;IACc,mBAAmB;;YAEjC,OAAO,CAAC,IAAI,sCAAkB,CAAC,IAAI,EAAE,IAAI,gCAAY,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,sCAAkB,CAAC,WAAW,EAAE,IAAI,gCAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC5H,CAAC;KAAA;IACc,gBAAgB;;YAE9B,OAAO,EAAE,CAAC;QACX,CAAC;KAAA;IACc,aAAa;;YAE3B,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,EAAE,+BAAc,CAAC,cAAc,CAAC,CAAC;QACpF,CAAC;KAAA;IACc,eAAe;;YAE7B,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACrD,CAAC;KAAA;IACc,QAAQ;;YAEtB,OAAO;gBACN,UAAU,EAAE,IAAI;gBAChB,aAAa,EAAE,KAAK;aACpB,CAAC;QACH,CAAC;KAAA;IACQ,KAAK;QAEb,OAAO,IAAI,+BAAa,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC;IAC1D,CAAC;IACc,MAAM;;YAEpB,IAAI,EAAE,GAAG,IAAI,+BAAa,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC;YAE3D,IAAI,SAAS,GAAG,IAAI,+BAAa,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,CAAC;YACzE,IAAI,IAAI,GAAG,IAAI,+BAAa,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;YAC7D,IAAI,KAAK,GAAG,IAAI,+BAAa,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"Update.js","sourceRoot":"","sources":["../../../src/controller/entity_tag/Update.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAA4D;AAC5D,4EAAyE;AACzE,yDAAqE;AACrE,8DAA2D;AAC3D,MAAa,MAAO,SAAQ,qDAAiC;IAEnD,OAAO;QAEf,OAAO;YACN,IAAI,EAAE,QAAQ;YACd,GAAG,EAAE,IAAI,CAAC,SAAS,GAAG,KAAK;YAC3B,MAAM,EAAE,4BAAU,CAAC,GAAG;YACtB,IAAI,EAAE,IAAI,CAAC,UAAU,GAAG,uBAAuB;YAC/C,OAAO,EAAE,aAAa,IAAI,CAAC,UAAU,6BAA6B;SAClE,CAAC;IACH,CAAC;IACc,mBAAmB;;YAEjC,OAAO,CAAC,IAAI,sCAAkB,CAAC,IAAI,EAAE,IAAI,gCAAY,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,sCAAkB,CAAC,WAAW,EAAE,IAAI,gCAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC5H,CAAC;KAAA;IACc,gBAAgB;;YAE9B,OAAO,EAAE,CAAC;QACX,CAAC;KAAA;IACc,aAAa;;YAE3B,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,EAAE,+BAAc,CAAC,cAAc,CAAC,CAAC;QACpF,CAAC;KAAA;IACc,eAAe;;YAE7B,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACrD,CAAC;KAAA;IACc,QAAQ;;YAEtB,OAAO;gBACN,UAAU,EAAE,IAAI;gBAChB,aAAa,EAAE,KAAK;aACpB,CAAC;QACH,CAAC;KAAA;IACQ,KAAK;QAEb,OAAO,IAAI,+BAAa,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC;IAC1D,CAAC;IACc,MAAM;;YAEpB,IAAI,EAAE,GAAG,IAAI,+BAAa,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC;YAE3D,IAAI,SAAS,GAAG,IAAI,+BAAa,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,CAAC;YACzE,IAAI,IAAI,GAAG,IAAI,+BAAa,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;YAC7D,IAAI,KAAK,GAAG,IAAI,+BAAa,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,CAAC;YAE/D,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;YACnJ,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjD,CAAC;KAAA;CACD;AAlDD,wBAkDC"}
|
|
@@ -46,30 +46,29 @@ class NSFTables {
|
|
|
46
46
|
ans.push({
|
|
47
47
|
model: this.entity_category.model,
|
|
48
48
|
as: this.name + "_category",
|
|
49
|
-
|
|
49
|
+
required: false
|
|
50
50
|
});
|
|
51
51
|
ans.push({
|
|
52
52
|
model: this.entity_field.model,
|
|
53
53
|
as: this.name + "_field",
|
|
54
|
-
|
|
54
|
+
required: false
|
|
55
55
|
});
|
|
56
56
|
ans.push({
|
|
57
57
|
model: this.entity_tag.model,
|
|
58
58
|
as: this.name + "_tag",
|
|
59
|
-
|
|
59
|
+
required: false
|
|
60
60
|
});
|
|
61
61
|
return ans;
|
|
62
62
|
}
|
|
63
63
|
create(user_id, entity_id, cft, trx) {
|
|
64
64
|
return __awaiter(this, void 0, void 0, function* () {
|
|
65
65
|
return yield this.database.startTransaction((trx) => __awaiter(this, void 0, void 0, function* () {
|
|
66
|
-
var _a;
|
|
67
66
|
for (let i = 0; i < cft.categories.length; i++)
|
|
68
67
|
yield this.entity_category.create(null, null, user_id, entity_id, cft.categories[i].category_id, trx);
|
|
69
68
|
for (let i = 0; i < cft.fields.length; i++)
|
|
70
69
|
yield this.entity_field.create(null, null, user_id, entity_id, cft.fields[i].field_id, cft.fields[i].value, trx);
|
|
71
70
|
for (let i = 0; i < cft.tags.length; i++)
|
|
72
|
-
yield this.entity_tag.create(null, null, user_id, entity_id, cft.tags[i].name, cft.tags[i].value,
|
|
71
|
+
yield this.entity_tag.create(null, null, user_id, entity_id, cft.tags[i].name, cft.tags[i].value, trx);
|
|
73
72
|
}), trx);
|
|
74
73
|
});
|
|
75
74
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NSFTables.js","sourceRoot":"","sources":["../../src/database/NSFTables.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qEAAkE;AAClE,+DAA4D;AAC5D,2DAAwD;AAExD,0EAAuE;AACvE,8EAA2E;AAC3E,oFAAiF;AAGjF,yDAAkF;AAClF,qEAAkE;AAClE,+DAA4D;AAC5D,2DAAwD;AAExD,MAAa,SAAS;IAOlB,YAAY,GAAiC,EAAE,QAAkB;QAE7D,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,eAAe,GAAG,IAAI,yCAAmB,CAAW,GAAG,EAAE,QAAQ,CAAC,CAAC;QACxE,IAAI,CAAC,YAAY,GAAG,IAAI,mCAAgB,CAAW,GAAG,EAAE,QAAQ,CAAC,CAAC;QAClE,IAAI,CAAC,UAAU,GAAG,IAAI,+BAAc,CAAW,GAAG,EAAE,QAAQ,CAAC,CAAC;IAClE,CAAC;IACD,IAAI,CAAC,KAAoE;QAErE,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;QAC7B,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,GAAG,WAAW,EAAE,mDAAwB,CAAC,CAAC;QAC/E,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,GAAG,QAAQ,EAAE,6CAAqB,CAAC,CAAC;QACtE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,GAAG,MAAM,EAAE,yCAAmB,CAAC,CAAC;QAGhE,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;QAC9D,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;QAC3D,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;IAC7D,CAAC;IACD,eAAe,CAAC,MAAoB;QAEhC,MAAM,CAAC,QAAQ,CAAC,IAAI,sCAAkB,CAAC,IAAI,CAAC,IAAI,GAAG,WAAW,EAAE,IAAI,+BAAW,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,KAAK,EAAE,yCAAmB,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAChL,MAAM,CAAC,QAAQ,CAAC,IAAI,sCAAkB,CAAC,IAAI,CAAC,IAAI,GAAG,QAAQ,EAAE,IAAI,+BAAW,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,KAAK,EAAE,mCAAgB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpK,MAAM,CAAC,QAAQ,CAAC,IAAI,sCAAkB,CAAC,IAAI,CAAC,IAAI,GAAG,MAAM,EAAE,IAAI,+BAAW,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,KAAK,EAAE,+BAAc,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAChK,CAAC;IACD,kBAAkB,CAAC,QAAuB;QAEtC,IAAI,GAAG,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC;QACxB,GAAG,CAAC,IAAI,CAAC;YACL,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,KAAK;YACjC,EAAE,EAAE,IAAI,CAAC,IAAI,GAAG,WAAW;YAC3B,
|
|
1
|
+
{"version":3,"file":"NSFTables.js","sourceRoot":"","sources":["../../src/database/NSFTables.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,6 @@ exports.EntityTagAttributes = {
|
|
|
7
7
|
user_id: { type: sequelize_1.DataTypes.CHAR(20), allowNull: false },
|
|
8
8
|
entity_id: { type: sequelize_1.DataTypes.CHAR(20), allowNull: false },
|
|
9
9
|
name: { type: sequelize_1.DataTypes.STRING, allowNull: false },
|
|
10
|
-
value: { type: sequelize_1.DataTypes.TEXT, allowNull:
|
|
11
|
-
description: { type: sequelize_1.DataTypes.TEXT, allowNull: true }
|
|
10
|
+
value: { type: sequelize_1.DataTypes.TEXT, allowNull: true }
|
|
12
11
|
};
|
|
13
12
|
//# sourceMappingURL=EntityTagAttributes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntityTagAttributes.js","sourceRoot":"","sources":["../../../src/database/attributes/EntityTagAttributes.ts"],"names":[],"mappings":";;;AAAA,yCAAmE;AAGxD,QAAA,mBAAmB,GAG1B;IACH,EAAE,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE;IACxF,OAAO,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE;IACvD,SAAS,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE;IACzD,IAAI,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE;IAClD,KAAK,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,IAAI,EAAE,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"EntityTagAttributes.js","sourceRoot":"","sources":["../../../src/database/attributes/EntityTagAttributes.ts"],"names":[],"mappings":";;;AAAA,yCAAmE;AAGxD,QAAA,mBAAmB,GAG1B;IACH,EAAE,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE;IACxF,OAAO,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE;IACvD,SAAS,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE;IACzD,IAAI,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE;IAClD,KAAK,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE;CAChD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntityTagModel.js","sourceRoot":"","sources":["../../../src/database/model/EntityTagModel.ts"],"names":[],"mappings":";;;AAAA,iEAA2D;AAE3D,MAAa,cAAe,SAAQ,0CAAkB;
|
|
1
|
+
{"version":3,"file":"EntityTagModel.js","sourceRoot":"","sources":["../../../src/database/model/EntityTagModel.ts"],"names":[],"mappings":";;;AAAA,iEAA2D;AAE3D,MAAa,cAAe,SAAQ,0CAAkB;CAOrD;AAPD,wCAOC"}
|
|
@@ -12,8 +12,8 @@ export declare class EntityTagTable<Database extends BaseMySqlDatabase> extends
|
|
|
12
12
|
getSchemaNames(): string[];
|
|
13
13
|
protected setSchemaByName(schema: ObjectSchema): void;
|
|
14
14
|
get(user_id: string, id: string, trx: Transaction | null): Promise<EntityTagModel | null>;
|
|
15
|
-
create(accses: AccessRow | null, session: SessionRow | null, user_id: string, entity_id: string, name: string, value: string,
|
|
16
|
-
update(accses: AccessRow | null, session: SessionRow | null, user_id: string, id: string, entity_id: string, name: string, value: string,
|
|
15
|
+
create(accses: AccessRow | null, session: SessionRow | null, user_id: string, entity_id: string, name: string, value: string, trx: Transaction | null): Promise<EntityTagModel>;
|
|
16
|
+
update(accses: AccessRow | null, session: SessionRow | null, user_id: string, id: string, entity_id: string, name: string, value: string, trx: Transaction | null): Promise<EntityTagModel>;
|
|
17
17
|
delete(accses: AccessRow | null, session: SessionRow | null, user_id: string, id: string, trx: Transaction | null): Promise<void>;
|
|
18
18
|
deleteAll(user_id: string, entity_id: string, trx: Transaction | null): Promise<void>;
|
|
19
19
|
}
|
|
@@ -32,7 +32,7 @@ class EntityTagTable extends namirasoft_node_mysql_1.BaseSequelizeTable {
|
|
|
32
32
|
return yield this._get({ where: { user_id, id }, }, trx);
|
|
33
33
|
});
|
|
34
34
|
}
|
|
35
|
-
create(accses, session, user_id, entity_id, name, value,
|
|
35
|
+
create(accses, session, user_id, entity_id, name, value, trx) {
|
|
36
36
|
return __awaiter(this, void 0, void 0, function* () {
|
|
37
37
|
return this.app.on.create(this, accses, session, () => __awaiter(this, void 0, void 0, function* () {
|
|
38
38
|
return yield this.model.create({
|
|
@@ -40,12 +40,11 @@ class EntityTagTable extends namirasoft_node_mysql_1.BaseSequelizeTable {
|
|
|
40
40
|
entity_id,
|
|
41
41
|
name,
|
|
42
42
|
value,
|
|
43
|
-
description,
|
|
44
43
|
}, { transaction: trx });
|
|
45
44
|
}));
|
|
46
45
|
});
|
|
47
46
|
}
|
|
48
|
-
update(accses, session, user_id, id, entity_id, name, value,
|
|
47
|
+
update(accses, session, user_id, id, entity_id, name, value, trx) {
|
|
49
48
|
return __awaiter(this, void 0, void 0, function* () {
|
|
50
49
|
return yield this.app.on.update(this, accses, session, () => __awaiter(this, void 0, void 0, function* () {
|
|
51
50
|
return yield this._get({ where: { user_id, id } }, trx);
|
|
@@ -53,7 +52,6 @@ class EntityTagTable extends namirasoft_node_mysql_1.BaseSequelizeTable {
|
|
|
53
52
|
item.entity_id = entity_id;
|
|
54
53
|
item.name = name;
|
|
55
54
|
item.value = value;
|
|
56
|
-
item.description = description;
|
|
57
55
|
return yield item.save({ transaction: trx });
|
|
58
56
|
}));
|
|
59
57
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntityTagTable.js","sourceRoot":"","sources":["../../../src/database/table/EntityTagTable.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iEAA8E;AAK9E,8DAA2D;AAI3D,MAAa,cAAmD,SAAQ,0CAA4C;IAGhH,YAAY,GAAiC,EAAE,QAAkB;QAE7D,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACnB,CAAC;IACQ,YAAY;QAEjB,OAAO,EAAE,CAAC;IACd,CAAC;IACQ,cAAc;QAEnB,OAAO,MAAM,CAAC,IAAI,CAAC,+BAAc,CAAC,CAAC;IACvC,CAAC;IACkB,eAAe,CAAC,MAAoB;QAEnD,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACjC,CAAC;IACK,GAAG,CAAC,OAAe,EAAE,EAAU,EAAE,GAAuB;;YAE1D,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAC7D,CAAC;KAAA;IACK,MAAM,CAAC,MAAwB,EAAE,OAA0B,EAAE,OAAe,EAAE,SAAiB,EAAE,IAAY,EAAE,KAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"EntityTagTable.js","sourceRoot":"","sources":["../../../src/database/table/EntityTagTable.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -47,9 +47,8 @@ export class Create extends BaseEntityFieldController<EntityTagModel>
|
|
|
47
47
|
let entity_id = new ObjectService(this.req.params.entity_id).getString();
|
|
48
48
|
let name = new ObjectService(this.req.body.name).getString();
|
|
49
49
|
let value = new ObjectService(this.req.body.value).getString();
|
|
50
|
-
let description = new ObjectService(this.req.body.description).getString();
|
|
51
50
|
|
|
52
|
-
let ans = await this.tables.entity_tag.create(this.props.access, this.props.session, this.props.access.owner_id, entity_id, name, value,
|
|
51
|
+
let ans = await this.tables.entity_tag.create(this.props.access, this.props.session, this.props.access.owner_id, entity_id, name, value, null);
|
|
53
52
|
return await this.tables.entity_tag.secure(ans);
|
|
54
53
|
}
|
|
55
54
|
}
|
|
@@ -48,9 +48,8 @@ export class Update extends BaseEntityFieldController<string>
|
|
|
48
48
|
let entity_id = new ObjectService(this.req.params.entity_id).getString();
|
|
49
49
|
let name = new ObjectService(this.req.body.name).getString();
|
|
50
50
|
let value = new ObjectService(this.req.body.value).getString();
|
|
51
|
-
let description = new ObjectService(this.req.body.description).getString();
|
|
52
51
|
|
|
53
|
-
let ans = await this.tables.entity_tag.update(this.props.access, this.props.session, this.props.access.owner_id, id, entity_id, name, value,
|
|
52
|
+
let ans = await this.tables.entity_tag.update(this.props.access, this.props.session, this.props.access.owner_id, id, entity_id, name, value, null);
|
|
54
53
|
return await this.tables.entity_tag.secure(ans);
|
|
55
54
|
}
|
|
56
55
|
}
|
|
@@ -51,17 +51,17 @@ export class NSFTables<Database extends BaseSequelizeDatabase>
|
|
|
51
51
|
ans.push({
|
|
52
52
|
model: this.entity_category.model,
|
|
53
53
|
as: this.name + "_category",
|
|
54
|
-
|
|
54
|
+
required: false
|
|
55
55
|
});
|
|
56
56
|
ans.push({
|
|
57
57
|
model: this.entity_field.model,
|
|
58
58
|
as: this.name + "_field",
|
|
59
|
-
|
|
59
|
+
required: false
|
|
60
60
|
});
|
|
61
61
|
ans.push({
|
|
62
62
|
model: this.entity_tag.model,
|
|
63
63
|
as: this.name + "_tag",
|
|
64
|
-
|
|
64
|
+
required: false
|
|
65
65
|
});
|
|
66
66
|
return ans;
|
|
67
67
|
}
|
|
@@ -74,7 +74,7 @@ export class NSFTables<Database extends BaseSequelizeDatabase>
|
|
|
74
74
|
for (let i = 0; i < cft.fields.length; i++)
|
|
75
75
|
await this.entity_field.create(null, null, user_id, entity_id, cft.fields[i].field_id, cft.fields[i].value, trx);
|
|
76
76
|
for (let i = 0; i < cft.tags.length; i++)
|
|
77
|
-
await this.entity_tag.create(null, null, user_id, entity_id, cft.tags[i].name, cft.tags[i].value,
|
|
77
|
+
await this.entity_tag.create(null, null, user_id, entity_id, cft.tags[i].name, cft.tags[i].value, trx);
|
|
78
78
|
}, trx);
|
|
79
79
|
}
|
|
80
80
|
async update(user_id: string, entity_id: string, cft: NSFInputRow, trx: Transaction | null)
|
|
@@ -9,6 +9,5 @@ export let EntityTagAttributes: ModelAttributes<
|
|
|
9
9
|
user_id: { type: DataTypes.CHAR(20), allowNull: false },
|
|
10
10
|
entity_id: { type: DataTypes.CHAR(20), allowNull: false },
|
|
11
11
|
name: { type: DataTypes.STRING, allowNull: false },
|
|
12
|
-
value: { type: DataTypes.TEXT, allowNull:
|
|
13
|
-
description: { type: DataTypes.TEXT, allowNull: true }
|
|
12
|
+
value: { type: DataTypes.TEXT, allowNull: true }
|
|
14
13
|
};
|
|
@@ -32,7 +32,7 @@ export class EntityTagTable<Database extends BaseMySqlDatabase> extends BaseSequ
|
|
|
32
32
|
{
|
|
33
33
|
return await this._get({ where: { user_id, id }, }, trx);
|
|
34
34
|
}
|
|
35
|
-
async create(accses: AccessRow | null, session: SessionRow | null, user_id: string, entity_id: string, name: string, value: string,
|
|
35
|
+
async create(accses: AccessRow | null, session: SessionRow | null, user_id: string, entity_id: string, name: string, value: string, trx: Transaction | null): Promise<EntityTagModel>
|
|
36
36
|
{
|
|
37
37
|
return this.app.on.create(this, accses, session, async () =>
|
|
38
38
|
{
|
|
@@ -41,11 +41,10 @@ export class EntityTagTable<Database extends BaseMySqlDatabase> extends BaseSequ
|
|
|
41
41
|
entity_id,
|
|
42
42
|
name,
|
|
43
43
|
value,
|
|
44
|
-
description,
|
|
45
44
|
}, { transaction: trx });
|
|
46
45
|
});
|
|
47
46
|
}
|
|
48
|
-
async update(accses: AccessRow | null, session: SessionRow | null, user_id: string, id: string, entity_id: string, name: string, value: string,
|
|
47
|
+
async update(accses: AccessRow | null, session: SessionRow | null, user_id: string, id: string, entity_id: string, name: string, value: string, trx: Transaction | null): Promise<EntityTagModel>
|
|
49
48
|
{
|
|
50
49
|
return await this.app.on.update(this, accses, session, async () =>
|
|
51
50
|
{
|
|
@@ -55,7 +54,6 @@ export class EntityTagTable<Database extends BaseMySqlDatabase> extends BaseSequ
|
|
|
55
54
|
item.entity_id = entity_id;
|
|
56
55
|
item.name = name;
|
|
57
56
|
item.value = value;
|
|
58
|
-
item.description = description;
|
|
59
57
|
return await item.save({ transaction: trx });
|
|
60
58
|
});
|
|
61
59
|
}
|