namirasoft-field-node 1.4.38 → 1.4.40

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 (14) hide show
  1. package/dist/controller/NSFListController.d.ts +4 -2
  2. package/dist/controller/NSFListController.js +10 -6
  3. package/dist/controller/NSFListController.js.map +1 -1
  4. package/dist/controller/entity_category/List.js +1 -1
  5. package/dist/controller/entity_category/List.js.map +1 -1
  6. package/dist/controller/entity_field/List.js +1 -1
  7. package/dist/controller/entity_field/List.js.map +1 -1
  8. package/dist/controller/entity_tag/List.js +1 -1
  9. package/dist/controller/entity_tag/List.js.map +1 -1
  10. package/package.json +3 -3
  11. package/src/controller/NSFListController.ts +11 -10
  12. package/src/controller/entity_category/List.ts +1 -1
  13. package/src/controller/entity_field/List.ts +1 -1
  14. package/src/controller/entity_tag/List.ts +1 -1
package/dist/controller/NSFListController.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { Includeable } from "sequelize";
1
+ import { Includeable, WhereOptions } from "sequelize";
2
2
  import { NSFTables } from "../database/NSFTables";
3
3
  import { BaseMySqlDatabase } from "namirasoft-node-mysql";
4
4
  import { BaseDatabase_FilterTable } from "namirasoft-node";
@@ -8,5 +8,7 @@ export declare class NSFListController {
8
8
  }): {
9
9
  [table: string]: BaseDatabase_FilterTable;
10
10
  };
11
- static handle_getIncludes<D extends BaseMySqlDatabase>(name: string, includes: Includeable[], joins: string[], tables: NSFTables<D>): Includeable[];
11
+ static handle_getIncludes<D extends BaseMySqlDatabase>(name: string, includes: Includeable[], conditions: {
12
+ [table: string]: WhereOptions[];
13
+ }, tables: NSFTables<D>): Includeable[];
12
14
  }
package/dist/controller/NSFListController.js CHANGED
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.NSFListController = void 0;
4
+ const sequelize_1 = require("sequelize");
4
5
  const NamirasoftFieldUUIDShort_1 = require("../NamirasoftFieldUUIDShort");
5
6
  const namirasoft_core_1 = require("namirasoft-core");
6
7
  class NSFListController {
@@ -31,13 +32,13 @@ class NSFListController {
31
32
  },
32
33
  getExtraConditions: (column) => {
33
34
  if (namirasoft_core_1.BaseUUID.isValidShort(column, NamirasoftFieldUUIDShort_1.NamirasoftFieldUUIDShort.field))
34
- return [`\`${name}_field\`.\`field_id\` = '${column}'`];
35
+ return [`field_id = '${column}'`];
35
36
  return [];
36
37
  }
37
38
  },
38
39
  overrideColumnName: (column) => {
39
40
  if (namirasoft_core_1.BaseUUID.isValidShort(column, NamirasoftFieldUUIDShort_1.NamirasoftFieldUUIDShort.field))
40
- return `\`${name}_field\`.\`value\``;
41
+ return "value";
41
42
  return column;
42
43
  }
43
44
  };
@@ -55,22 +56,25 @@ class NSFListController {
55
56
  };
56
57
  return ans;
57
58
  }
58
- static handle_getIncludes(name, includes, joins, tables) {
59
+ static handle_getIncludes(name, includes, conditions, tables) {
59
60
  let ans = [...includes];
60
- if (joins.includes(`${name}_category`))
61
+ if (conditions[`${name}_category`].length > 0)
61
62
  ans.push({
62
63
  model: tables.entity_category.model,
63
64
  attributes: [],
65
+ where: { [sequelize_1.Op.and]: conditions[`${name}_category`] }
64
66
  });
65
- if (joins.includes(`${name}_field`))
67
+ if (conditions[`${name}_field`].length > 0)
66
68
  ans.push({
67
69
  model: tables.entity_field.model,
68
70
  attributes: [],
71
+ where: { [sequelize_1.Op.and]: conditions[`${name}_field`] }
69
72
  });
70
- if (joins.includes(`${name}_tag`))
73
+ if (conditions[`${name}_tag`].length > 0)
71
74
  ans.push({
72
75
  model: tables.entity_tag.model,
73
76
  attributes: [],
77
+ where: { [sequelize_1.Op.and]: conditions[`${name}_tag`] }
74
78
  });
75
79
  return ans;
76
80
  }
package/dist/controller/NSFListController.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"NSFListController.js","sourceRoot":"","sources":["../../src/controller/NSFListController.ts"],"names":[],"mappings":";;;AAIA,0EAAuE;AACvE,qDAA2C;AAE3C,MAAa,iBAAiB;IAE1B,MAAM,CAAC,gBAAgB,CAAC,IAAY,EAAE,MAAsD;QAExF,IAAI,GAAG,qBAAQ,MAAM,CAAE,CAAC;QACxB,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QACf,GAAG,CAAC,GAAG,IAAI,WAAW,CAAC,GAAG;YACtB,eAAe,EAAE;gBACb,IAAI,EAAE;oBACF,KAAK,EAAE,IAAI;oBACX,MAAM,EAAE,IAAI;iBACf;gBACD,SAAS,EAAE;oBACP,KAAK,EAAE,GAAG,IAAI,WAAW;oBACzB,MAAM,EAAE,WAAW;iBACtB;aACJ;SACJ,CAAC;QACF,GAAG,CAAC,GAAG,IAAI,QAAQ,CAAC,GAAG;YACnB,eAAe,EAAE;gBACb,IAAI,EAAE;oBACF,KAAK,EAAE,IAAI;oBACX,MAAM,EAAE,IAAI;iBACf;gBACD,SAAS,EAAE;oBACP,KAAK,EAAE,GAAG,IAAI,QAAQ;oBACtB,MAAM,EAAE,WAAW;iBACtB;gBACD,kBAAkB,EAAE,CAAC,MAAc,EAAE,EAAE;oBAEnC,IAAI,0BAAQ,CAAC,YAAY,CAAC,MAAM,EAAE,mDAAwB,CAAC,KAAK,CAAC;wBAC7D,OAAO,CAAC,KAAK,IAAI,4BAA4B,MAAM,GAAG,CAAC,CAAC;oBAC5D,OAAO,EAAE,CAAC;gBACd,CAAC;aACJ;YACD,kBAAkB,EAAE,CAAC,MAAM,EAAE,EAAE;gBAE3B,IAAI,0BAAQ,CAAC,YAAY,CAAC,MAAM,EAAE,mDAAwB,CAAC,KAAK,CAAC;oBAC7D,OAAO,KAAK,IAAI,oBAAoB,CAAC;gBACzC,OAAO,MAAM,CAAC;YAClB,CAAC;SACJ,CAAC;QACF,GAAG,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG;YACjB,eAAe,EAAE;gBACb,IAAI,EAAE;oBACF,KAAK,EAAE,IAAI;oBACX,MAAM,EAAE,IAAI;iBACf;gBACD,SAAS,EAAE;oBACP,KAAK,EAAE,GAAG,IAAI,MAAM;oBACpB,MAAM,EAAE,WAAW;iBACtB;aACJ;SACJ,CAAC;QACF,OAAO,GAAG,CAAC;IACf,CAAC;IACD,MAAM,CAAC,kBAAkB,CAA8B,IAAY,EAAE,QAAuB,EAAE,KAAe,EAAE,MAAoB;QAE/H,IAAI,GAAG,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC;QACxB,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,IAAI,WAAW,CAAC;YAClC,GAAG,CAAC,IAAI,CAAC;gBACL,KAAK,EAAE,MAAM,CAAC,eAAe,CAAC,KAAK;gBACnC,UAAU,EAAE,EAAE;aAEjB,CAAC,CAAC;QACP,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,IAAI,QAAQ,CAAC;YAC/B,GAAG,CAAC,IAAI,CAAC;gBACL,KAAK,EAAE,MAAM,CAAC,YAAY,CAAC,KAAK;gBAChC,UAAU,EAAE,EAAE;aAEjB,CAAC,CAAC;QACP,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,IAAI,MAAM,CAAC;YAC7B,GAAG,CAAC,IAAI,CAAC;gBACL,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK;gBAC9B,UAAU,EAAE,EAAE;aAEjB,CAAC,CAAC;QACP,OAAO,GAAG,CAAC;IACf,CAAC;CACJ;AA/ED,8CA+EC"}
1
+ {"version":3,"file":"NSFListController.js","sourceRoot":"","sources":["../../src/controller/NSFListController.ts"],"names":[],"mappings":";;;AAAA,yCAA+B;AAK/B,0EAAuE;AACvE,qDAA2C;AAE3C,MAAa,iBAAiB;IAE1B,MAAM,CAAC,gBAAgB,CAAC,IAAY,EAAE,MAAsD;QAExF,IAAI,GAAG,qBAAQ,MAAM,CAAE,CAAC;QACxB,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QACf,GAAG,CAAC,GAAG,IAAI,WAAW,CAAC,GAAG;YACtB,eAAe,EAAE;gBACb,IAAI,EAAE;oBACF,KAAK,EAAE,IAAI;oBACX,MAAM,EAAE,IAAI;iBACf;gBACD,SAAS,EAAE;oBACP,KAAK,EAAE,GAAG,IAAI,WAAW;oBACzB,MAAM,EAAE,WAAW;iBACtB;aACJ;SACJ,CAAC;QACF,GAAG,CAAC,GAAG,IAAI,QAAQ,CAAC,GAAG;YACnB,eAAe,EAAE;gBACb,IAAI,EAAE;oBACF,KAAK,EAAE,IAAI;oBACX,MAAM,EAAE,IAAI;iBACf;gBACD,SAAS,EAAE;oBACP,KAAK,EAAE,GAAG,IAAI,QAAQ;oBACtB,MAAM,EAAE,WAAW;iBACtB;gBACD,kBAAkB,EAAE,CAAC,MAAc,EAAE,EAAE;oBAEnC,IAAI,0BAAQ,CAAC,YAAY,CAAC,MAAM,EAAE,mDAAwB,CAAC,KAAK,CAAC;wBAC7D,OAAO,CAAC,eAAe,MAAM,GAAG,CAAC,CAAC;oBACtC,OAAO,EAAE,CAAC;gBACd,CAAC;aACJ;YACD,kBAAkB,EAAE,CAAC,MAAM,EAAE,EAAE;gBAE3B,IAAI,0BAAQ,CAAC,YAAY,CAAC,MAAM,EAAE,mDAAwB,CAAC,KAAK,CAAC;oBAC7D,OAAO,OAAO,CAAC;gBACnB,OAAO,MAAM,CAAC;YAClB,CAAC;SACJ,CAAC;QACF,GAAG,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG;YACjB,eAAe,EAAE;gBACb,IAAI,EAAE;oBACF,KAAK,EAAE,IAAI;oBACX,MAAM,EAAE,IAAI;iBACf;gBACD,SAAS,EAAE;oBACP,KAAK,EAAE,GAAG,IAAI,MAAM;oBACpB,MAAM,EAAE,WAAW;iBACtB;aACJ;SACJ,CAAC;QACF,OAAO,GAAG,CAAC;IACf,CAAC;IACD,MAAM,CAAC,kBAAkB,CAA8B,IAAY,EAAE,QAAuB,EAAE,UAAgD,EAAE,MAAoB;QAEhK,IAAI,GAAG,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC;QACxB,IAAI,UAAU,CAAC,GAAG,IAAI,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC;YACzC,GAAG,CAAC,IAAI,CAAC;gBACL,KAAK,EAAE,MAAM,CAAC,eAAe,CAAC,KAAK;gBACnC,UAAU,EAAE,EAAE;gBACd,KAAK,EAAE,EAAE,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,GAAG,IAAI,WAAW,CAAC,EAAE;aACtD,CAAC,CAAC;QACP,IAAI,UAAU,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC;YACtC,GAAG,CAAC,IAAI,CAAC;gBACL,KAAK,EAAE,MAAM,CAAC,YAAY,CAAC,KAAK;gBAChC,UAAU,EAAE,EAAE;gBACd,KAAK,EAAE,EAAE,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,GAAG,IAAI,QAAQ,CAAC,EAAE;aACnD,CAAC,CAAC;QACP,IAAI,UAAU,CAAC,GAAG,IAAI,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC;YACpC,GAAG,CAAC,IAAI,CAAC;gBACL,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK;gBAC9B,UAAU,EAAE,EAAE;gBACd,KAAK,EAAE,EAAE,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,GAAG,IAAI,MAAM,CAAC,EAAE;aACjD,CAAC,CAAC;QACP,OAAO,GAAG,CAAC;IACf,CAAC;CACJ;AA/ED,8CA+EC"}
package/dist/controller/entity_category/List.js CHANGED
@@ -62,7 +62,7 @@ class List extends BaseEntityFieldController_1.BaseEntityFieldController {
62
62
  let res = this.database.getFiltersConditions(tables, q.filters);
63
63
  return yield this.tables.entity_category.list({
64
64
  user_id: q.user_id,
65
- [sequelize_1.Op.and]: res.conditions
65
+ [sequelize_1.Op.and]: res["entity_category"].conditions
66
66
  }, q.page, q.size, q.sorts, {}, null);
67
67
  });
68
68
  }
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,UAAU;aACxB,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,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"}
package/dist/controller/entity_field/List.js CHANGED
@@ -63,7 +63,7 @@ class List extends BaseEntityFieldController_1.BaseEntityFieldController {
63
63
  let res = this.database.getFiltersConditions(tables, q.filters);
64
64
  return yield this.tables.entity_field.list({
65
65
  user_id: q.user_id,
66
- [sequelize_1.Op.and]: res.conditions
66
+ [sequelize_1.Op.and]: res["entity_field"].conditions
67
67
  }, q.page, q.size, q.sorts, {}, null);
68
68
  });
69
69
  }
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,UAAU;aACxB,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,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"}
package/dist/controller/entity_tag/List.js CHANGED
@@ -62,7 +62,7 @@ class List extends BaseEntityFieldController_1.BaseEntityFieldController {
62
62
  let res = this.database.getFiltersConditions(tables, q.filters);
63
63
  return yield this.tables.entity_tag.list({
64
64
  user_id: q.user_id,
65
- [sequelize_1.Op.and]: res.conditions
65
+ [sequelize_1.Op.and]: res["entity_tag"].conditions
66
66
  }, q.page, q.size, q.sorts, {}, null);
67
67
  });
68
68
  }
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,UAAU;aACxB,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,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"}
package/package.json CHANGED
@@ -8,7 +8,7 @@
8
8
  "framework": "npm",
9
9
  "application": "package",
10
10
  "private": false,
11
- "version": "1.4.38",
11
+ "version": "1.4.40",
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.43",
25
- "namirasoft-node-mysql": "^1.4.23",
24
+ "namirasoft-node": "^1.4.46",
25
+ "namirasoft-node-mysql": "^1.4.25",
26
26
  "namirasoft-schema": "^1.4.22"
27
27
  },
28
28
  "bin": {
package/src/controller/NSFListController.ts CHANGED
@@ -1,4 +1,5 @@
1
- import { Includeable } from "sequelize";
1
+ import { Op } from "sequelize";
2
+ import { Includeable, WhereOptions } from "sequelize";
2
3
  import { NSFTables } from "../database/NSFTables";
3
4
  import { BaseMySqlDatabase } from "namirasoft-node-mysql";
4
5
  import { BaseDatabase_FilterTable } from "namirasoft-node";
@@ -36,14 +37,14 @@ export class NSFListController
36
37
  getExtraConditions: (column: string) =>
37
38
  {
38
39
  if (BaseUUID.isValidShort(column, NamirasoftFieldUUIDShort.field))
39
- return [`\`${name}_field\`.\`field_id\` = '${column}'`];
40
+ return [`field_id = '${column}'`];
40
41
  return [];
41
42
  }
42
43
  },
43
44
  overrideColumnName: (column) =>
44
45
  {
45
46
  if (BaseUUID.isValidShort(column, NamirasoftFieldUUIDShort.field))
46
- return `\`${name}_field\`.\`value\``;
47
+ return "value";
47
48
  return column;
48
49
  }
49
50
  };
@@ -61,26 +62,26 @@ export class NSFListController
61
62
  };
62
63
  return ans;
63
64
  }
64
- static handle_getIncludes<D extends BaseMySqlDatabase>(name: string, includes: Includeable[], joins: string[], tables: NSFTables<D>): Includeable[]
65
+ static handle_getIncludes<D extends BaseMySqlDatabase>(name: string, includes: Includeable[], conditions: { [table: string]: WhereOptions[]; }, tables: NSFTables<D>): Includeable[]
65
66
  {
66
67
  let ans = [...includes];
67
- if (joins.includes(`${name}_category`))
68
+ if (conditions[`${name}_category`].length > 0)
68
69
  ans.push({
69
70
  model: tables.entity_category.model,
70
71
  attributes: [],
71
- // where: { [Op.and]: conditions[`${name}_category`] }
72
+ where: { [Op.and]: conditions[`${name}_category`] }
72
73
  });
73
- if (joins.includes(`${name}_field`))
74
+ if (conditions[`${name}_field`].length > 0)
74
75
  ans.push({
75
76
  model: tables.entity_field.model,
76
77
  attributes: [],
77
- // where: { [Op.and]: conditions[`${name}_field`] }
78
+ where: { [Op.and]: conditions[`${name}_field`] }
78
79
  });
79
- if (joins.includes(`${name}_tag`))
80
+ if (conditions[`${name}_tag`].length > 0)
80
81
  ans.push({
81
82
  model: tables.entity_tag.model,
82
83
  attributes: [],
83
- // where: { [Op.and]: conditions[`${name}_tag`] }
84
+ where: { [Op.and]: conditions[`${name}_tag`] }
84
85
  });
85
86
  return ans;
86
87
  }
package/src/controller/entity_category/List.ts CHANGED
@@ -53,7 +53,7 @@ export class List extends BaseEntityFieldController<{ rows: EntityCategoryModel[
53
53
 
54
54
  return await this.tables.entity_category.list({
55
55
  user_id: q.user_id,
56
- [Op.and]: res.conditions
56
+ [Op.and]: res["entity_category"].conditions
57
57
  }, q.page, q.size, q.sorts, {}, null);
58
58
  }
59
59
  }
package/src/controller/entity_field/List.ts CHANGED
@@ -54,7 +54,7 @@ export class List extends BaseEntityFieldController<{ rows: EntityFieldModel[],
54
54
 
55
55
  return await this.tables.entity_field.list({
56
56
  user_id: q.user_id,
57
- [Op.and]: res.conditions
57
+ [Op.and]: res["entity_field"].conditions
58
58
  }, q.page, q.size, q.sorts, {}, null);
59
59
  }
60
60
  }
package/src/controller/entity_tag/List.ts CHANGED
@@ -53,7 +53,7 @@ export class List extends BaseEntityFieldController<{ rows: EntityTagModel[], co
53
53
 
54
54
  return await this.tables.entity_tag.list({
55
55
  user_id: q.user_id,
56
- [Op.and]: res.conditions
56
+ [Op.and]: res["entity_tag"].conditions
57
57
  }, q.page, q.size, q.sorts, {}, null);
58
58
  }
59
59
  }