namirasoft-field-node 1.4.41 → 1.4.43

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (18) hide show
  1. package/dist/controller/NSFListController.d.ts +4 -12
  2. package/dist/controller/NSFListController.js +19 -66
  3. package/dist/controller/NSFListController.js.map +1 -1
  4. package/dist/controller/entity_category/List.js +2 -3
  5. package/dist/controller/entity_category/List.js.map +1 -1
  6. package/dist/controller/entity_field/List.js +2 -4
  7. package/dist/controller/entity_field/List.js.map +1 -1
  8. package/dist/controller/entity_tag/List.js +2 -3
  9. package/dist/controller/entity_tag/List.js.map +1 -1
  10. package/dist/database/table/EntityFieldTable.d.ts +1 -0
  11. package/dist/database/table/EntityFieldTable.js +5 -0
  12. package/dist/database/table/EntityFieldTable.js.map +1 -1
  13. package/package.json +3 -3
  14. package/src/controller/NSFListController.ts +20 -71
  15. package/src/controller/entity_category/List.ts +2 -4
  16. package/src/controller/entity_field/List.ts +2 -5
  17. package/src/controller/entity_tag/List.ts +2 -4
  18. package/src/database/table/EntityFieldTable.ts +6 -0
package/dist/controller/NSFListController.d.ts CHANGED
@@ -1,17 +1,9 @@
1
- import { Includeable, WhereOptions } from "sequelize";
2
- import { NSFTables } from "../database/NSFTables";
3
- import { BaseMySqlDatabase } from "namirasoft-node-mysql";
1
+ import { WhereOptions } from "sequelize";
4
2
  import { BaseDatabase_FilterTable } from "namirasoft-node";
5
3
  export declare class NSFListController {
6
- static handle_getTables(name: string, tables: {
7
- [table: string]: BaseDatabase_FilterTable;
4
+ static handle_getJoins(name: string, tables: {
5
+ [table: string]: BaseDatabase_FilterTable<WhereOptions>;
8
6
  }): {
9
- [table: string]: BaseDatabase_FilterTable;
7
+ [table: string]: BaseDatabase_FilterTable<WhereOptions>;
10
8
  };
11
- static handle_getIncludes<D extends BaseMySqlDatabase>(name: string, includes: Includeable[], res: {
12
- [table: string]: {
13
- conditions: WhereOptions[];
14
- required: boolean;
15
- };
16
- }, tables: NSFTables<D>): Includeable[];
17
9
  }
package/dist/controller/NSFListController.js CHANGED
@@ -1,89 +1,42 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.NSFListController = void 0;
4
- const sequelize_1 = require("sequelize");
5
4
  const NamirasoftFieldUUIDShort_1 = require("../NamirasoftFieldUUIDShort");
6
5
  const namirasoft_core_1 = require("namirasoft-core");
7
6
  class NSFListController {
8
- static handle_getTables(name, tables) {
7
+ static handle_getJoins(name, tables) {
9
8
  let ans = Object.assign({}, tables);
10
- ans[name] = {};
11
9
  ans[`${name}_category`] = {
12
- join_conditions: {
13
- main: {
14
- table: name,
15
- column: "id",
16
- },
17
- secondary: {
18
- table: `${name}_category`,
19
- column: "entity_id",
20
- }
10
+ main: {
11
+ column: "id",
12
+ },
13
+ secondary: {
14
+ column: "entity_id",
21
15
  }
22
16
  };
23
17
  ans[`${name}_field`] = {
24
- join_conditions: {
25
- main: {
26
- table: name,
27
- column: "id",
28
- },
29
- secondary: {
30
- table: `${name}_field`,
31
- column: "entity_id",
32
- },
33
- getExtraConditions: (column) => {
34
- if (namirasoft_core_1.BaseUUID.isValidShort(column, NamirasoftFieldUUIDShort_1.NamirasoftFieldUUIDShort.field))
35
- return [`field_id = '${column}'`];
36
- return [];
37
- }
18
+ main: {
19
+ column: "id",
20
+ },
21
+ secondary: {
22
+ column: "entity_id",
38
23
  },
39
- overrideColumnName: (column) => {
24
+ getExtraConditions: (column) => {
40
25
  if (namirasoft_core_1.BaseUUID.isValidShort(column, NamirasoftFieldUUIDShort_1.NamirasoftFieldUUIDShort.field))
41
- return "value";
42
- return column;
26
+ return [{ field_id: column }];
27
+ return [];
43
28
  }
44
29
  };
45
30
  ans[`${name}_tag`] = {
46
- join_conditions: {
47
- main: {
48
- table: name,
49
- column: "id",
50
- },
51
- secondary: {
52
- table: `${name}_tag`,
53
- column: "entity_id",
54
- }
31
+ main: {
32
+ column: "id",
33
+ },
34
+ secondary: {
35
+ column: "entity_id",
55
36
  }
56
37
  };
57
38
  return ans;
58
39
  }
59
- static handle_getIncludes(name, includes, res, tables) {
60
- let ans = [...includes];
61
- let entity_category = `${name}_category`;
62
- let entity_field = `${name}_field`;
63
- let entity_tag = `${name}_tag`;
64
- if (res[entity_category].conditions.length > 0)
65
- ans.push({
66
- model: tables.entity_category.model,
67
- attributes: [],
68
- where: { [sequelize_1.Op.and]: res[entity_category] },
69
- required: res[entity_category].required
70
- });
71
- if (res[entity_field].conditions.length > 0)
72
- ans.push({
73
- model: tables.entity_field.model,
74
- attributes: [],
75
- where: { [sequelize_1.Op.and]: res[entity_field] },
76
- required: res[entity_field].required
77
- });
78
- if (res[entity_tag].conditions.length > 0)
79
- ans.push({
80
- model: tables.entity_tag.model,
81
- attributes: [],
82
- where: { [sequelize_1.Op.and]: res[entity_tag] },
83
- required: res[entity_tag].required
84
- });
85
- return ans;
86
- }
87
40
  }
88
41
  exports.NSFListController = NSFListController;
89
42
  //# sourceMappingURL=NSFListController.js.map
package/dist/controller/NSFListController.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"NSFListController.js","sourceRoot":"","sources":["../../src/controller/NSFListController.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"NSFListController.js","sourceRoot":"","sources":["../../src/controller/NSFListController.ts"],"names":[],"mappings":";;;AAEA,0EAAuE;AACvE,qDAA2C;AAE3C,MAAa,iBAAiB;IAE1B,MAAM,CAAC,eAAe,CAAC,IAAY,EAAE,MAAoE;QAErG,IAAI,GAAG,qBAAQ,MAAM,CAAE,CAAC;QACxB,GAAG,CAAC,GAAG,IAAI,WAAW,CAAC,GAAG;YACtB,IAAI,EAAE;gBACF,MAAM,EAAE,IAAI;aACf;YACD,SAAS,EAAE;gBACP,MAAM,EAAE,WAAW;aACtB;SACJ,CAAC;QACF,GAAG,CAAC,GAAG,IAAI,QAAQ,CAAC,GAAG;YACnB,IAAI,EAAE;gBACF,MAAM,EAAE,IAAI;aACf;YACD,SAAS,EAAE;gBACP,MAAM,EAAE,WAAW;aACtB;YACD,kBAAkB,EAAE,CAAC,MAAc,EAAE,EAAE;gBAEnC,IAAI,0BAAQ,CAAC,YAAY,CAAC,MAAM,EAAE,mDAAwB,CAAC,KAAK,CAAC;oBAC7D,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;gBAClC,OAAO,EAAE,CAAC;YACd,CAAC;SACJ,CAAC;QACF,GAAG,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG;YACjB,IAAI,EAAE;gBACF,MAAM,EAAE,IAAI;aACf;YACD,SAAS,EAAE;gBACP,MAAM,EAAE,WAAW;aACtB;SACJ,CAAC;QACF,OAAO,GAAG,CAAC;IACf,CAAC;CACJ;AArCD,8CAqCC"}
package/dist/controller/entity_category/List.js CHANGED
@@ -57,12 +57,11 @@ class List extends BaseEntityFieldController_1.BaseEntityFieldController {
57
57
  }
58
58
  handle() {
59
59
  return __awaiter(this, void 0, void 0, function* () {
60
- let tables = { entity_category: {} };
61
60
  let q = namirasoft_account_node_1.NSAControllerList.handle_GetQueries(this, this.props.access.owner_id);
62
- let res = this.database.getFiltersConditions(tables, q.filters);
61
+ let conditions = yield this.database.getFiltersConditions(this.tables.entity_category, {}, q.filters);
63
62
  return yield this.tables.entity_category.list({
64
63
  user_id: q.user_id,
65
- [sequelize_1.Op.and]: res["entity_category"].conditions
64
+ [sequelize_1.Op.and]: conditions
66
65
  }, q.page, q.size, q.sorts, {}, null);
67
66
  });
68
67
  }
package/dist/controller/entity_category/List.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"List.js","sourceRoot":"","sources":["../../../src/controller/entity_category/List.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAA+B;AAC/B,qDAA6C;AAC7C,4EAAyE;AAEzE,qEAAwF;AAExF,MAAa,IAAK,SAAQ,qDAAyE;IAEzF,OAAO;QAEf,OAAO;YACN,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,IAAI,CAAC,SAAS,GAAG,UAAU;YAChC,MAAM,EAAE,4BAAU,CAAC,GAAG;YACtB,IAAI,EAAE,IAAI,CAAC,UAAU,GAAG,gBAAgB;YACxC,OAAO,EAAE,eAAe,IAAI,CAAC,UAAU,gBAAgB;SACvD,CAAC;IACH,CAAC;IACc,mBAAmB;;YAEjC,OAAO,EAAE,CAAC;QACX,CAAC;KAAA;IACc,gBAAgB;;YAE9B,OAAO,2CAAiB,CAAC,gBAAgB,EAAE,CAAC;QAC7C,CAAC;KAAA;IACc,aAAa;;YAE3B,OAAO,IAAI,CAAC;QACb,CAAC;KAAA;IACc,eAAe;;YAE7B,OAAO,2CAAiB,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC;QAClG,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,MAAM,GAAG,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC;YAErC,IAAI,CAAC,GAA+B,2CAAiB,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAE1G,IAAI,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;YAEhE,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC;gBAC7C,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,iBAAiB,CAAC,CAAC,UAAU;aAC3C,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;QACvC,CAAC;KAAA;CACD;AApDD,oBAoDC"}
1
+ {"version":3,"file":"List.js","sourceRoot":"","sources":["../../../src/controller/entity_category/List.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAA+B;AAC/B,qDAA6C;AAC7C,4EAAyE;AAEzE,qEAAwF;AAExF,MAAa,IAAK,SAAQ,qDAAyE;IAEzF,OAAO;QAEf,OAAO;YACN,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,IAAI,CAAC,SAAS,GAAG,UAAU;YAChC,MAAM,EAAE,4BAAU,CAAC,GAAG;YACtB,IAAI,EAAE,IAAI,CAAC,UAAU,GAAG,gBAAgB;YACxC,OAAO,EAAE,eAAe,IAAI,CAAC,UAAU,gBAAgB;SACvD,CAAC;IACH,CAAC;IACc,mBAAmB;;YAEjC,OAAO,EAAE,CAAC;QACX,CAAC;KAAA;IACc,gBAAgB;;YAE9B,OAAO,2CAAiB,CAAC,gBAAgB,EAAE,CAAC;QAC7C,CAAC;KAAA;IACc,aAAa;;YAE3B,OAAO,IAAI,CAAC;QACb,CAAC;KAAA;IACc,eAAe;;YAE7B,OAAO,2CAAiB,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC;QAClG,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,CAAC,GAA+B,2CAAiB,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAE1G,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;YAEtG,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC;gBAC7C,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,UAAU;aACpB,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;QACvC,CAAC;KAAA;CACD;AAlDD,oBAkDC"}
package/dist/controller/entity_field/List.js CHANGED
@@ -57,13 +57,11 @@ class List extends BaseEntityFieldController_1.BaseEntityFieldController {
57
57
  }
58
58
  handle() {
59
59
  return __awaiter(this, void 0, void 0, function* () {
60
- this.database;
61
- let tables = { entity_field: {} };
62
60
  let q = namirasoft_account_node_1.NSAControllerList.handle_GetQueries(this, this.props.access.owner_id);
63
- let res = this.database.getFiltersConditions(tables, q.filters);
61
+ let conditions = yield this.database.getFiltersConditions(this.tables.entity_field, {}, q.filters);
64
62
  return yield this.tables.entity_field.list({
65
63
  user_id: q.user_id,
66
- [sequelize_1.Op.and]: res["entity_field"].conditions
64
+ [sequelize_1.Op.and]: conditions
67
65
  }, q.page, q.size, q.sorts, {}, null);
68
66
  });
69
67
  }
package/dist/controller/entity_field/List.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"List.js","sourceRoot":"","sources":["../../../src/controller/entity_field/List.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAA+B;AAC/B,qDAA6C;AAC7C,4EAAyE;AAEzE,qEAAwF;AAExF,MAAa,IAAK,SAAQ,qDAAsE;IAEtF,OAAO;QAEf,OAAO;YACN,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,IAAI,CAAC,SAAS,GAAG,OAAO;YAC7B,MAAM,EAAE,4BAAU,CAAC,GAAG;YACtB,IAAI,EAAE,IAAI,CAAC,UAAU,GAAG,aAAa;YACrC,OAAO,EAAE,eAAe,IAAI,CAAC,UAAU,aAAa;SACpD,CAAC;IACH,CAAC;IACc,mBAAmB;;YAEjC,OAAO,EAAE,CAAC;QACX,CAAC;KAAA;IACc,gBAAgB;;YAE9B,OAAO,2CAAiB,CAAC,gBAAgB,EAAE,CAAC;QAC7C,CAAC;KAAA;IACc,aAAa;;YAE3B,OAAO,IAAI,CAAC;QACb,CAAC;KAAA;IACc,eAAe;;YAE7B,OAAO,2CAAiB,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/F,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,CAAC,QAAQ,CAAC;YACd,IAAI,MAAM,GAAG,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;YAElC,IAAI,CAAC,GAA+B,2CAAiB,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAE1G,IAAI,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;YAEhE,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC;gBAC1C,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC,UAAU;aACxC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;QACvC,CAAC;KAAA;CACD;AArDD,oBAqDC"}
1
+ {"version":3,"file":"List.js","sourceRoot":"","sources":["../../../src/controller/entity_field/List.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAA+B;AAC/B,qDAA6C;AAC7C,4EAAyE;AAEzE,qEAAwF;AAExF,MAAa,IAAK,SAAQ,qDAAsE;IAEtF,OAAO;QAEf,OAAO;YACN,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,IAAI,CAAC,SAAS,GAAG,OAAO;YAC7B,MAAM,EAAE,4BAAU,CAAC,GAAG;YACtB,IAAI,EAAE,IAAI,CAAC,UAAU,GAAG,aAAa;YACrC,OAAO,EAAE,eAAe,IAAI,CAAC,UAAU,aAAa;SACpD,CAAC;IACH,CAAC;IACc,mBAAmB;;YAEjC,OAAO,EAAE,CAAC;QACX,CAAC;KAAA;IACc,gBAAgB;;YAE9B,OAAO,2CAAiB,CAAC,gBAAgB,EAAE,CAAC;QAC7C,CAAC;KAAA;IACc,aAAa;;YAE3B,OAAO,IAAI,CAAC;QACb,CAAC;KAAA;IACc,eAAe;;YAE7B,OAAO,2CAAiB,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/F,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,CAAC,GAA+B,2CAAiB,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAE1G,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;YAEnG,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC;gBAC1C,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,UAAU;aACpB,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;QACvC,CAAC;KAAA;CACD;AAlDD,oBAkDC"}
package/dist/controller/entity_tag/List.js CHANGED
@@ -57,12 +57,11 @@ class List extends BaseEntityFieldController_1.BaseEntityFieldController {
57
57
  }
58
58
  handle() {
59
59
  return __awaiter(this, void 0, void 0, function* () {
60
- let tables = { entity_tag: {} };
61
60
  let q = namirasoft_account_node_1.NSAControllerList.handle_GetQueries(this, this.props.access.owner_id);
62
- let res = this.database.getFiltersConditions(tables, q.filters);
61
+ let conditions = yield this.database.getFiltersConditions(this.tables.entity_tag, {}, q.filters);
63
62
  return yield this.tables.entity_tag.list({
64
63
  user_id: q.user_id,
65
- [sequelize_1.Op.and]: res["entity_tag"].conditions
64
+ [sequelize_1.Op.and]: conditions
66
65
  }, q.page, q.size, q.sorts, {}, null);
67
66
  });
68
67
  }
package/dist/controller/entity_tag/List.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"List.js","sourceRoot":"","sources":["../../../src/controller/entity_tag/List.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAA+B;AAC/B,qDAA6C;AAC7C,4EAAyE;AAEzE,qEAAwF;AAExF,MAAa,IAAK,SAAQ,qDAAoE;IAEpF,OAAO;QAEf,OAAO;YACN,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,IAAI,CAAC,SAAS,GAAG,KAAK;YAC3B,MAAM,EAAE,4BAAU,CAAC,GAAG;YACtB,IAAI,EAAE,IAAI,CAAC,UAAU,GAAG,WAAW;YACnC,OAAO,EAAE,eAAe,IAAI,CAAC,UAAU,WAAW;SAClD,CAAC;IACH,CAAC;IACc,mBAAmB;;YAEjC,OAAO,EAAE,CAAC;QACX,CAAC;KAAA;IACc,gBAAgB;;YAE9B,OAAO,2CAAiB,CAAC,gBAAgB,EAAE,CAAC;QAC7C,CAAC;KAAA;IACc,aAAa;;YAE3B,OAAO,IAAI,CAAC;QACb,CAAC;KAAA;IACc,eAAe;;YAE7B,OAAO,2CAAiB,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7F,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,MAAM,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;YAEhC,IAAI,CAAC,GAA+B,2CAAiB,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAE1G,IAAI,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;YAEhE,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC;gBACxC,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC,UAAU;aACtC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;QACvC,CAAC;KAAA;CACD;AApDD,oBAoDC"}
1
+ {"version":3,"file":"List.js","sourceRoot":"","sources":["../../../src/controller/entity_tag/List.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAA+B;AAC/B,qDAA6C;AAC7C,4EAAyE;AAEzE,qEAAwF;AAExF,MAAa,IAAK,SAAQ,qDAAoE;IAEpF,OAAO;QAEf,OAAO;YACN,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,IAAI,CAAC,SAAS,GAAG,KAAK;YAC3B,MAAM,EAAE,4BAAU,CAAC,GAAG;YACtB,IAAI,EAAE,IAAI,CAAC,UAAU,GAAG,WAAW;YACnC,OAAO,EAAE,eAAe,IAAI,CAAC,UAAU,WAAW;SAClD,CAAC;IACH,CAAC;IACc,mBAAmB;;YAEjC,OAAO,EAAE,CAAC;QACX,CAAC;KAAA;IACc,gBAAgB;;YAE9B,OAAO,2CAAiB,CAAC,gBAAgB,EAAE,CAAC;QAC7C,CAAC;KAAA;IACc,aAAa;;YAE3B,OAAO,IAAI,CAAC;QACb,CAAC;KAAA;IACc,eAAe;;YAE7B,OAAO,2CAAiB,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7F,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,CAAC,GAA+B,2CAAiB,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAE1G,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;YAEjG,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC;gBACxC,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,UAAU;aACpB,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;QACvC,CAAC;KAAA;CACD;AAlDD,oBAkDC"}
package/dist/database/table/EntityFieldTable.d.ts CHANGED
@@ -14,6 +14,7 @@ export declare class EntityFieldTable<Database extends BaseMySqlDatabase> extend
14
14
  getShortName(): string;
15
15
  getSchemaNames(): string[];
16
16
  checkColumn(column: string, secure: boolean | null, read_only: boolean | null): void;
17
+ getRealColumnName(column: string): string;
17
18
  protected setSchemaByName(schema: ObjectSchema): void;
18
19
  get(user_id: string, id: string, trx: Transaction | null): Promise<EntityFieldModel | null>;
19
20
  create(access: AccessRow | null, session: SessionRow | null, user_id: string, entity_id: string, field_id: string, value: string, trx: Transaction | null): Promise<EntityFieldModel>;
package/dist/database/table/EntityFieldTable.js CHANGED
@@ -35,6 +35,11 @@ class EntityFieldTable extends namirasoft_node_mysql_1.BaseSequelizeTable {
35
35
  return;
36
36
  super.checkColumn(column, secure, read_only);
37
37
  }
38
+ getRealColumnName(column) {
39
+ if (namirasoft_core_1.BaseUUID.isValidShort(column, NamirasoftFieldUUIDShort_1.NamirasoftFieldUUIDShort.field))
40
+ return "value";
41
+ return super.getRealColumnName(column);
42
+ }
38
43
  setSchemaByName(schema) {
39
44
  schema.delReadOnly(true);
40
45
  schema.delField("entity_id");
package/dist/database/table/EntityFieldTable.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"EntityFieldTable.js","sourceRoot":"","sources":["../../../src/database/table/EntityFieldTable.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"EntityFieldTable.js","sourceRoot":"","sources":["../../../src/database/table/EntityFieldTable.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -8,7 +8,7 @@
8
8
  "framework": "npm",
9
9
  "application": "package",
10
10
  "private": false,
11
- "version": "1.4.41",
11
+ "version": "1.4.43",
12
12
  "author": "Amir Abolhasani",
13
13
  "license": "MIT",
14
14
  "main": "./dist/index.js",
@@ -21,8 +21,8 @@
21
21
  "namirasoft-account-node": "^1.4.79",
22
22
  "namirasoft-core": "^1.4.42",
23
23
  "namirasoft-field": "^1.4.11",
24
- "namirasoft-node": "^1.4.46",
25
- "namirasoft-node-mysql": "^1.4.25",
24
+ "namirasoft-node": "^1.4.50",
25
+ "namirasoft-node-mysql": "^1.4.26",
26
26
  "namirasoft-schema": "^1.4.22"
27
27
  },
28
28
  "bin": {
package/src/controller/NSFListController.ts CHANGED
@@ -1,94 +1,43 @@
1
- import { Op } from "sequelize";
2
- import { Includeable, WhereOptions } from "sequelize";
3
- import { NSFTables } from "../database/NSFTables";
4
- import { BaseMySqlDatabase } from "namirasoft-node-mysql";
1
+ import { WhereOptions } from "sequelize";
5
2
  import { BaseDatabase_FilterTable } from "namirasoft-node";
6
3
  import { NamirasoftFieldUUIDShort } from "../NamirasoftFieldUUIDShort";
7
4
  import { BaseUUID } from "namirasoft-core";
8
5
 
9
6
  export class NSFListController
10
7
  {
11
- static handle_getTables(name: string, tables: { [table: string]: BaseDatabase_FilterTable; }): { [table: string]: BaseDatabase_FilterTable; }
8
+ static handle_getJoins(name: string, tables: { [table: string]: BaseDatabase_FilterTable<WhereOptions>; }): { [table: string]: BaseDatabase_FilterTable<WhereOptions>; }
12
9
  {
13
10
  let ans = { ...tables };
14
- ans[name] = {};
15
11
  ans[`${name}_category`] = {
16
- join_conditions: {
17
- main: {
18
- table: name,
19
- column: "id",
20
- },
21
- secondary: {
22
- table: `${name}_category`,
23
- column: "entity_id",
24
- }
12
+ main: {
13
+ column: "id",
14
+ },
15
+ secondary: {
16
+ column: "entity_id",
25
17
  }
26
18
  };
27
19
  ans[`${name}_field`] = {
28
- join_conditions: {
29
- main: {
30
- table: name,
31
- column: "id",
32
- },
33
- secondary: {
34
- table: `${name}_field`,
35
- column: "entity_id",
36
- },
37
- getExtraConditions: (column: string) =>
38
- {
39
- if (BaseUUID.isValidShort(column, NamirasoftFieldUUIDShort.field))
40
- return [`field_id = '${column}'`];
41
- return [];
42
- }
20
+ main: {
21
+ column: "id",
22
+ },
23
+ secondary: {
24
+ column: "entity_id",
43
25
  },
44
- overrideColumnName: (column) =>
26
+ getExtraConditions: (column: string) =>
45
27
  {
46
28
  if (BaseUUID.isValidShort(column, NamirasoftFieldUUIDShort.field))
47
- return "value";
48
- return column;
29
+ return [{ field_id: column }];
30
+ return [];
49
31
  }
50
32
  };
51
33
  ans[`${name}_tag`] = {
52
- join_conditions: {
53
- main: {
54
- table: name,
55
- column: "id",
56
- },
57
- secondary: {
58
- table: `${name}_tag`,
59
- column: "entity_id",
60
- }
34
+ main: {
35
+ column: "id",
36
+ },
37
+ secondary: {
38
+ column: "entity_id",
61
39
  }
62
40
  };
63
41
  return ans;
64
42
  }
65
- static handle_getIncludes<D extends BaseMySqlDatabase>(name: string, includes: Includeable[], res: { [table: string]: { conditions: WhereOptions[], required: boolean }; }, tables: NSFTables<D>): Includeable[]
66
- {
67
- let ans = [...includes];
68
- let entity_category = `${name}_category`;
69
- let entity_field = `${name}_field`;
70
- let entity_tag = `${name}_tag`;
71
- if (res[entity_category].conditions.length > 0)
72
- ans.push({
73
- model: tables.entity_category.model,
74
- attributes: [],
75
- where: { [Op.and]: res[entity_category] },
76
- required: res[entity_category].required
77
- });
78
- if (res[entity_field].conditions.length > 0)
79
- ans.push({
80
- model: tables.entity_field.model,
81
- attributes: [],
82
- where: { [Op.and]: res[entity_field] },
83
- required: res[entity_field].required
84
- });
85
- if (res[entity_tag].conditions.length > 0)
86
- ans.push({
87
- model: tables.entity_tag.model,
88
- attributes: [],
89
- where: { [Op.and]: res[entity_tag] },
90
- required: res[entity_tag].required
91
- });
92
- return ans;
93
- }
94
43
  }
package/src/controller/entity_category/List.ts CHANGED
@@ -45,15 +45,13 @@ export class List extends BaseEntityFieldController<{ rows: EntityCategoryModel[
45
45
  }
46
46
  override async handle()
47
47
  {
48
- let tables = { entity_category: {} };
49
-
50
48
  let q: NSAControllerListQueryType = NSAControllerList.handle_GetQueries(this, this.props.access.owner_id);
51
49
 
52
- let res = this.database.getFiltersConditions(tables, q.filters);
50
+ let conditions = await this.database.getFiltersConditions(this.tables.entity_category, {}, q.filters);
53
51
 
54
52
  return await this.tables.entity_category.list({
55
53
  user_id: q.user_id,
56
- [Op.and]: res["entity_category"].conditions
54
+ [Op.and]: conditions
57
55
  }, q.page, q.size, q.sorts, {}, null);
58
56
  }
59
57
  }
package/src/controller/entity_field/List.ts CHANGED
@@ -45,16 +45,13 @@ export class List extends BaseEntityFieldController<{ rows: EntityFieldModel[],
45
45
  }
46
46
  override async handle()
47
47
  {
48
- this.database;
49
- let tables = { entity_field: {} };
50
-
51
48
  let q: NSAControllerListQueryType = NSAControllerList.handle_GetQueries(this, this.props.access.owner_id);
52
49
 
53
- let res = this.database.getFiltersConditions(tables, q.filters);
50
+ let conditions = await this.database.getFiltersConditions(this.tables.entity_field, {}, q.filters);
54
51
 
55
52
  return await this.tables.entity_field.list({
56
53
  user_id: q.user_id,
57
- [Op.and]: res["entity_field"].conditions
54
+ [Op.and]: conditions
58
55
  }, q.page, q.size, q.sorts, {}, null);
59
56
  }
60
57
  }
package/src/controller/entity_tag/List.ts CHANGED
@@ -45,15 +45,13 @@ export class List extends BaseEntityFieldController<{ rows: EntityTagModel[], co
45
45
  }
46
46
  override async handle()
47
47
  {
48
- let tables = { entity_tag: {} };
49
-
50
48
  let q: NSAControllerListQueryType = NSAControllerList.handle_GetQueries(this, this.props.access.owner_id);
51
49
 
52
- let res = this.database.getFiltersConditions(tables, q.filters);
50
+ let conditions = await this.database.getFiltersConditions(this.tables.entity_tag, {}, q.filters);
53
51
 
54
52
  return await this.tables.entity_tag.list({
55
53
  user_id: q.user_id,
56
- [Op.and]: res["entity_tag"].conditions
54
+ [Op.and]: conditions
57
55
  }, q.page, q.size, q.sorts, {}, null);
58
56
  }
59
57
  }
package/src/database/table/EntityFieldTable.ts CHANGED
@@ -39,6 +39,12 @@ export class EntityFieldTable<Database extends BaseMySqlDatabase> extends BaseSe
39
39
  return;
40
40
  super.checkColumn(column, secure, read_only);
41
41
  }
42
+ override getRealColumnName(column: string): string
43
+ {
44
+ if (BaseUUID.isValidShort(column, NamirasoftFieldUUIDShort.field))
45
+ return "value";
46
+ return super.getRealColumnName(column);
47
+ }
42
48
  protected override setSchemaByName(schema: ObjectSchema): void
43
49
  {
44
50
  schema.delReadOnly(true);