rez_core 6.5.58 → 6.5.61

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 (436) hide show
  1. package/dist/app.module.js +3 -5
  2. package/dist/app.module.js.map +1 -1
  3. package/dist/core.module.js +38 -63
  4. package/dist/core.module.js.map +1 -1
  5. package/dist/migrations/1732612800000-AddEntityJsonGinIndex.d.ts +6 -0
  6. package/dist/migrations/1732612800000-AddEntityJsonGinIndex.js +32 -0
  7. package/dist/migrations/1732612800000-AddEntityJsonGinIndex.js.map +1 -0
  8. package/dist/module/auth/strategies/jwt.strategy.d.ts +1 -2
  9. package/dist/module/auth/strategies/jwt.strategy.js +2 -3
  10. package/dist/module/auth/strategies/jwt.strategy.js.map +1 -1
  11. package/dist/module/dashboard/dashboard.module.js +1 -1
  12. package/dist/module/dashboard/dashboard.module.js.map +1 -1
  13. package/dist/module/dashboard/service/dashboard.service.js +2 -1
  14. package/dist/module/dashboard/service/dashboard.service.js.map +1 -1
  15. package/dist/module/enterprise/controller/organization.controller.d.ts +4 -12
  16. package/dist/module/enterprise/controller/organization.controller.js +8 -64
  17. package/dist/module/enterprise/controller/organization.controller.js.map +1 -1
  18. package/dist/module/enterprise/enterprise.module.js +15 -10
  19. package/dist/module/enterprise/enterprise.module.js.map +1 -1
  20. package/dist/module/enterprise/entity/enterprise.entity.d.ts +3 -1
  21. package/dist/module/enterprise/entity/enterprise.entity.js +12 -4
  22. package/dist/module/enterprise/entity/enterprise.entity.js.map +1 -1
  23. package/dist/module/enterprise/entity/organization-app-mapping.entity.d.ts +1 -6
  24. package/dist/module/enterprise/entity/organization-app-mapping.entity.js +4 -21
  25. package/dist/module/enterprise/entity/organization-app-mapping.entity.js.map +1 -1
  26. package/dist/module/enterprise/entity/organization.entity.d.ts +17 -3
  27. package/dist/module/enterprise/entity/organization.entity.js +73 -11
  28. package/dist/module/enterprise/entity/organization.entity.js.map +1 -1
  29. package/dist/module/enterprise/repository/enterprise.repository.d.ts +2 -4
  30. package/dist/module/enterprise/repository/enterprise.repository.js +4 -19
  31. package/dist/module/enterprise/repository/enterprise.repository.js.map +1 -1
  32. package/dist/module/enterprise/service/brand.service.d.ts +3 -0
  33. package/dist/module/enterprise/service/brand.service.js +17 -0
  34. package/dist/module/enterprise/service/brand.service.js.map +1 -1
  35. package/dist/module/enterprise/service/enterprise.service.d.ts +2 -2
  36. package/dist/module/enterprise/service/enterprise.service.js +4 -6
  37. package/dist/module/enterprise/service/enterprise.service.js.map +1 -1
  38. package/dist/module/enterprise/service/organization.service.d.ts +6 -6
  39. package/dist/module/enterprise/service/organization.service.js +27 -109
  40. package/dist/module/enterprise/service/organization.service.js.map +1 -1
  41. package/dist/module/entity_json/controller/entity_json.controller.d.ts +2 -9
  42. package/dist/module/entity_json/controller/entity_json.controller.js.map +1 -1
  43. package/dist/module/entity_json/entity/entityJson.entity.d.ts +2 -1
  44. package/dist/module/entity_json/entity/entityJson.entity.js +5 -1
  45. package/dist/module/entity_json/entity/entityJson.entity.js.map +1 -1
  46. package/dist/module/entity_json/entity_json.module.js +7 -2
  47. package/dist/module/entity_json/entity_json.module.js.map +1 -1
  48. package/dist/module/entity_json/service/entity_json.service.d.ts +2 -10
  49. package/dist/module/entity_json/service/entity_json.service.js +101 -25
  50. package/dist/module/entity_json/service/entity_json.service.js.map +1 -1
  51. package/dist/module/filter/controller/filter.controller.d.ts +12 -0
  52. package/dist/module/filter/controller/filter.controller.js +1 -1
  53. package/dist/module/filter/controller/filter.controller.js.map +1 -1
  54. package/dist/module/filter/filter.module.js +11 -2
  55. package/dist/module/filter/filter.module.js.map +1 -1
  56. package/dist/module/filter/service/filter.service.d.ts +38 -2
  57. package/dist/module/filter/service/filter.service.js +43 -50
  58. package/dist/module/filter/service/filter.service.js.map +1 -1
  59. package/dist/module/filter/service/flatjson-filter.service.d.ts +32 -0
  60. package/dist/module/filter/service/flatjson-filter.service.js +632 -0
  61. package/dist/module/filter/service/flatjson-filter.service.js.map +1 -0
  62. package/dist/module/filter/service/saved-filter.service.d.ts +3 -2
  63. package/dist/module/filter/service/saved-filter.service.js +14 -18
  64. package/dist/module/filter/service/saved-filter.service.js.map +1 -1
  65. package/dist/module/integration/service/integration.service.d.ts +1 -0
  66. package/dist/module/integration/service/integration.service.js +2 -1
  67. package/dist/module/integration/service/integration.service.js.map +1 -1
  68. package/dist/module/integration/service/wrapper.service.js +1 -0
  69. package/dist/module/integration/service/wrapper.service.js.map +1 -1
  70. package/dist/module/layout/controller/layout.controller.d.ts +3 -1
  71. package/dist/module/layout/controller/layout.controller.js +7 -3
  72. package/dist/module/layout/controller/layout.controller.js.map +1 -1
  73. package/dist/module/layout/entity/header-section.entity.d.ts +2 -0
  74. package/dist/module/layout/entity/header-section.entity.js +8 -0
  75. package/dist/module/layout/entity/header-section.entity.js.map +1 -1
  76. package/dist/module/layout/layout.module.js +2 -1
  77. package/dist/module/layout/layout.module.js.map +1 -1
  78. package/dist/module/layout/repository/header-section.repository.d.ts +1 -0
  79. package/dist/module/layout/repository/header-section.repository.js +5 -0
  80. package/dist/module/layout/repository/header-section.repository.js.map +1 -1
  81. package/dist/module/layout/service/header-section.service.d.ts +1 -1
  82. package/dist/module/layout/service/header-section.service.js +1 -1
  83. package/dist/module/layout/service/header-section.service.js.map +1 -1
  84. package/dist/module/linked_attributes/controller/linked_attributes.controller.d.ts +41 -0
  85. package/dist/module/linked_attributes/controller/linked_attributes.controller.js +90 -0
  86. package/dist/module/linked_attributes/controller/linked_attributes.controller.js.map +1 -1
  87. package/dist/module/linked_attributes/dto/create-linked-attribute-smart.dto.d.ts +13 -0
  88. package/dist/module/linked_attributes/dto/create-linked-attribute-smart.dto.js +64 -0
  89. package/dist/module/linked_attributes/dto/create-linked-attribute-smart.dto.js.map +1 -0
  90. package/dist/module/linked_attributes/linked_attributes.module.js +8 -1
  91. package/dist/module/linked_attributes/linked_attributes.module.js.map +1 -1
  92. package/dist/module/linked_attributes/service/linked_attributes.service.d.ts +65 -1
  93. package/dist/module/linked_attributes/service/linked_attributes.service.js +287 -2
  94. package/dist/module/linked_attributes/service/linked_attributes.service.js.map +1 -1
  95. package/dist/module/listmaster/service/list-master.service.js +8 -1
  96. package/dist/module/listmaster/service/list-master.service.js.map +1 -1
  97. package/dist/module/meta/controller/app-master.controller.js.map +1 -0
  98. package/dist/module/meta/controller/attribute-master.controller.d.ts +3 -0
  99. package/dist/module/meta/controller/attribute-master.controller.js +12 -0
  100. package/dist/module/meta/controller/attribute-master.controller.js.map +1 -1
  101. package/dist/module/meta/controller/meta.controller.d.ts +6 -1
  102. package/dist/module/meta/controller/meta.controller.js +19 -1
  103. package/dist/module/meta/controller/meta.controller.js.map +1 -1
  104. package/dist/module/meta/entity/app-master.entity.d.ts +13 -0
  105. package/dist/module/{app_master → meta}/entity/app-master.entity.js +12 -30
  106. package/dist/module/meta/entity/app-master.entity.js.map +1 -0
  107. package/dist/module/meta/entity/entity-master.entity.d.ts +1 -0
  108. package/dist/module/meta/entity/entity-master.entity.js +8 -1
  109. package/dist/module/meta/entity/entity-master.entity.js.map +1 -1
  110. package/dist/module/meta/entity.module.js +14 -3
  111. package/dist/module/meta/entity.module.js.map +1 -1
  112. package/dist/module/{app_master → meta}/repository/app-master.repository.d.ts +2 -2
  113. package/dist/module/{app_master → meta}/repository/app-master.repository.js +4 -4
  114. package/dist/module/meta/repository/app-master.repository.js.map +1 -0
  115. package/dist/module/meta/service/app-master.service.js.map +1 -0
  116. package/dist/module/meta/service/attribute-master.service.d.ts +6 -1
  117. package/dist/module/meta/service/attribute-master.service.js +22 -2
  118. package/dist/module/meta/service/attribute-master.service.js.map +1 -1
  119. package/dist/module/meta/service/entity-master.service.js +1 -0
  120. package/dist/module/meta/service/entity-master.service.js.map +1 -1
  121. package/dist/module/meta/service/entity-relation.service.d.ts +4 -3
  122. package/dist/module/meta/service/entity-relation.service.js +10 -4
  123. package/dist/module/meta/service/entity-relation.service.js.map +1 -1
  124. package/dist/module/meta/service/entity-service-impl.service.d.ts +1 -1
  125. package/dist/module/meta/service/entity-service-impl.service.js +14 -10
  126. package/dist/module/meta/service/entity-service-impl.service.js.map +1 -1
  127. package/dist/module/meta/service/entity-table.service.d.ts +5 -4
  128. package/dist/module/meta/service/entity-table.service.js +45 -24
  129. package/dist/module/meta/service/entity-table.service.js.map +1 -1
  130. package/dist/module/meta/service/populate-meta.service.d.ts +13 -0
  131. package/dist/module/{enterprise → meta}/service/populate-meta.service.js +8 -2
  132. package/dist/module/meta/service/populate-meta.service.js.map +1 -0
  133. package/dist/module/meta/service/resolver.service.d.ts +1 -1
  134. package/dist/module/meta/service/resolver.service.js +6 -3
  135. package/dist/module/meta/service/resolver.service.js.map +1 -1
  136. package/dist/module/module/controller/module-access.controller.d.ts +4 -3
  137. package/dist/module/module/controller/module-access.controller.js +8 -13
  138. package/dist/module/module/controller/module-access.controller.js.map +1 -1
  139. package/dist/module/module/entity/menu.entity.d.ts +3 -6
  140. package/dist/module/module/entity/menu.entity.js +10 -19
  141. package/dist/module/module/entity/menu.entity.js.map +1 -1
  142. package/dist/module/module/entity/module-access.entity.d.ts +1 -15
  143. package/dist/module/module/entity/module-access.entity.js +3 -49
  144. package/dist/module/module/entity/module-access.entity.js.map +1 -1
  145. package/dist/module/module/entity/module-action.entity.d.ts +2 -4
  146. package/dist/module/module/entity/module-action.entity.js +6 -11
  147. package/dist/module/module/entity/module-action.entity.js.map +1 -1
  148. package/dist/module/module/entity/module.entity.d.ts +5 -3
  149. package/dist/module/module/entity/module.entity.js +18 -8
  150. package/dist/module/module/entity/module.entity.js.map +1 -1
  151. package/dist/module/module/module.module.d.ts +1 -1
  152. package/dist/module/module/module.module.js +7 -5
  153. package/dist/module/module/module.module.js.map +1 -1
  154. package/dist/module/module/repository/menu.repository.d.ts +3 -3
  155. package/dist/module/module/repository/menu.repository.js +27 -38
  156. package/dist/module/module/repository/menu.repository.js.map +1 -1
  157. package/dist/module/module/repository/module-access.repository.d.ts +6 -6
  158. package/dist/module/module/repository/module-access.repository.js +50 -100
  159. package/dist/module/module/repository/module-access.repository.js.map +1 -1
  160. package/dist/module/module/service/menu.service.d.ts +4 -2
  161. package/dist/module/module/service/menu.service.js +10 -7
  162. package/dist/module/module/service/menu.service.js.map +1 -1
  163. package/dist/module/module/service/module-access.service.d.ts +10 -7
  164. package/dist/module/module/service/module-access.service.js +24 -22
  165. package/dist/module/module/service/module-access.service.js.map +1 -1
  166. package/dist/module/notification/entity/notification.entity.d.ts +2 -17
  167. package/dist/module/notification/entity/notification.entity.js +2 -68
  168. package/dist/module/notification/entity/notification.entity.js.map +1 -1
  169. package/dist/module/notification/notification.module.js +4 -3
  170. package/dist/module/notification/notification.module.js.map +1 -1
  171. package/dist/module/notification/service/email.service.d.ts +0 -1
  172. package/dist/module/notification/service/email.service.js +0 -14
  173. package/dist/module/notification/service/email.service.js.map +1 -1
  174. package/dist/module/notification/service/notification.service.d.ts +3 -1
  175. package/dist/module/notification/service/notification.service.js +5 -2
  176. package/dist/module/notification/service/notification.service.js.map +1 -1
  177. package/dist/module/notification/service/otp.service.d.ts +2 -2
  178. package/dist/module/notification/service/otp.service.js +5 -4
  179. package/dist/module/notification/service/otp.service.js.map +1 -1
  180. package/dist/module/user/controller/login.controller.d.ts +3 -1
  181. package/dist/module/user/controller/login.controller.js +6 -2
  182. package/dist/module/user/controller/login.controller.js.map +1 -1
  183. package/dist/module/user/controller/user.controller.d.ts +2 -0
  184. package/dist/module/user/controller/user.controller.js +13 -0
  185. package/dist/module/user/controller/user.controller.js.map +1 -1
  186. package/dist/module/user/dto/create-user.dto.d.ts +3 -6
  187. package/dist/module/user/dto/create-user.dto.js +11 -17
  188. package/dist/module/user/dto/create-user.dto.js.map +1 -1
  189. package/dist/module/user/entity/role.entity.d.ts +6 -18
  190. package/dist/module/user/entity/role.entity.js +19 -64
  191. package/dist/module/user/entity/role.entity.js.map +1 -1
  192. package/dist/module/user/entity/user-role-mapping.entity.d.ts +0 -10
  193. package/dist/module/user/entity/user-role-mapping.entity.js +1 -33
  194. package/dist/module/user/entity/user-role-mapping.entity.js.map +1 -1
  195. package/dist/module/user/entity/user-session.entity.d.ts +2 -0
  196. package/dist/module/user/entity/user-session.entity.js +20 -2
  197. package/dist/module/user/entity/user-session.entity.js.map +1 -1
  198. package/dist/module/user/entity/user.entity.d.ts +5 -17
  199. package/dist/module/user/entity/user.entity.js +15 -61
  200. package/dist/module/user/entity/user.entity.js.map +1 -1
  201. package/dist/module/user/repository/role.repository.d.ts +2 -7
  202. package/dist/module/user/repository/role.repository.js +8 -23
  203. package/dist/module/user/repository/role.repository.js.map +1 -1
  204. package/dist/module/user/repository/user-role-mapping.repository.d.ts +0 -1
  205. package/dist/module/user/repository/user-role-mapping.repository.js +0 -3
  206. package/dist/module/user/repository/user-role-mapping.repository.js.map +1 -1
  207. package/dist/module/user/repository/user.repository.d.ts +2 -5
  208. package/dist/module/user/repository/user.repository.js +7 -26
  209. package/dist/module/user/repository/user.repository.js.map +1 -1
  210. package/dist/module/user/repository/userSession.repository.d.ts +0 -1
  211. package/dist/module/user/repository/userSession.repository.js +0 -3
  212. package/dist/module/user/repository/userSession.repository.js.map +1 -1
  213. package/dist/module/user/service/login.service.d.ts +5 -3
  214. package/dist/module/user/service/login.service.js +42 -43
  215. package/dist/module/user/service/login.service.js.map +1 -1
  216. package/dist/module/user/service/role.service.d.ts +11 -24
  217. package/dist/module/user/service/role.service.js +40 -54
  218. package/dist/module/user/service/role.service.js.map +1 -1
  219. package/dist/module/user/service/user-role-mapping.service.d.ts +0 -2
  220. package/dist/module/user/service/user-role-mapping.service.js +0 -6
  221. package/dist/module/user/service/user-role-mapping.service.js.map +1 -1
  222. package/dist/module/user/service/user-session.service.d.ts +4 -3
  223. package/dist/module/user/service/user-session.service.js +11 -10
  224. package/dist/module/user/service/user-session.service.js.map +1 -1
  225. package/dist/module/user/service/user.service.d.ts +22 -33
  226. package/dist/module/user/service/user.service.js +58 -66
  227. package/dist/module/user/service/user.service.js.map +1 -1
  228. package/dist/module/user/user.module.js +7 -2
  229. package/dist/module/user/user.module.js.map +1 -1
  230. package/dist/module/workflow/repository/action-data.repository.d.ts +1 -1
  231. package/dist/module/workflow/repository/action-data.repository.js +8 -6
  232. package/dist/module/workflow/repository/action-data.repository.js.map +1 -1
  233. package/dist/module/workflow/repository/action.repository.d.ts +1 -1
  234. package/dist/module/workflow/repository/action.repository.js +10 -10
  235. package/dist/module/workflow/repository/action.repository.js.map +1 -1
  236. package/dist/module/workflow/repository/form-master.repository.d.ts +1 -1
  237. package/dist/module/workflow/repository/form-master.repository.js +2 -2
  238. package/dist/module/workflow/repository/form-master.repository.js.map +1 -1
  239. package/dist/module/workflow/service/action-data.service.js +2 -1
  240. package/dist/module/workflow/service/action-data.service.js.map +1 -1
  241. package/dist/module/workflow/service/action.service.js +2 -2
  242. package/dist/module/workflow/service/action.service.js.map +1 -1
  243. package/dist/module/workflow/service/comm-template.service.js +2 -0
  244. package/dist/module/workflow/service/comm-template.service.js.map +1 -1
  245. package/dist/module/workflow/service/entity-modification.service.js +1 -0
  246. package/dist/module/workflow/service/entity-modification.service.js.map +1 -1
  247. package/dist/module/workflow/service/form-master.service.js +2 -2
  248. package/dist/module/workflow/service/form-master.service.js.map +1 -1
  249. package/dist/module/workflow/service/populate-workflow.service.d.ts +1 -1
  250. package/dist/module/workflow/service/populate-workflow.service.js +1 -1
  251. package/dist/module/workflow/service/populate-workflow.service.js.map +1 -1
  252. package/dist/module/workflow/service/task.service.js +3 -0
  253. package/dist/module/workflow/service/task.service.js.map +1 -1
  254. package/dist/module/workflow/service/workflow-meta.service.js +7 -2
  255. package/dist/module/workflow/service/workflow-meta.service.js.map +1 -1
  256. package/dist/module/workflow/service/workflow.service.js +2 -2
  257. package/dist/module/workflow/service/workflow.service.js.map +1 -1
  258. package/dist/module/workflow/workflow.module.js +0 -2
  259. package/dist/module/workflow/workflow.module.js.map +1 -1
  260. package/dist/module/workflow-automation/service/workflow-automation.service.js +6 -11
  261. package/dist/module/workflow-automation/service/workflow-automation.service.js.map +1 -1
  262. package/dist/module/workflow-automation/workflow-automation.module.js +1 -3
  263. package/dist/module/workflow-automation/workflow-automation.module.js.map +1 -1
  264. package/dist/module/workflow-schedule/service/workflow-schedule.service.js +2 -0
  265. package/dist/module/workflow-schedule/service/workflow-schedule.service.js.map +1 -1
  266. package/dist/table.config.d.ts +5 -3
  267. package/dist/table.config.js +3 -3
  268. package/dist/table.config.js.map +1 -1
  269. package/dist/tsconfig.build.tsbuildinfo +1 -1
  270. package/package.json +2 -2
  271. package/src/app.module.ts +5 -7
  272. package/src/core.module.ts +44 -58
  273. package/src/migrations/1732612800000-AddEntityJsonGinIndex.ts +41 -0
  274. package/src/module/auth/strategies/jwt.strategy.ts +2 -4
  275. package/src/module/dashboard/dashboard.module.ts +3 -3
  276. package/src/module/dashboard/service/dashboard.service.ts +2 -1
  277. package/src/module/enterprise/controller/organization.controller.ts +4 -60
  278. package/src/module/enterprise/enterprise.module.ts +18 -16
  279. package/src/module/enterprise/entity/enterprise.entity.ts +11 -5
  280. package/src/module/enterprise/entity/organization-app-mapping.entity.ts +4 -18
  281. package/src/module/enterprise/entity/organization.entity.ts +58 -11
  282. package/src/module/enterprise/repository/enterprise.repository.ts +4 -26
  283. package/src/module/enterprise/service/brand.service.ts +5 -75
  284. package/src/module/enterprise/service/enterprise.service.ts +4 -12
  285. package/src/module/enterprise/service/organization.service.ts +28 -151
  286. package/src/module/entity_json/controller/entity_json.controller.ts +13 -0
  287. package/src/module/entity_json/docs/FlatJson_Filterin_System.md +2804 -0
  288. package/src/module/entity_json/entity/entityJson.entity.ts +4 -1
  289. package/src/module/entity_json/entity_json.module.ts +9 -5
  290. package/src/module/entity_json/service/entity_json.service.ts +237 -51
  291. package/src/module/filter/controller/filter.controller.ts +1 -3
  292. package/src/module/filter/filter.module.ts +12 -3
  293. package/src/module/filter/service/filter.service.ts +130 -73
  294. package/src/module/filter/service/flatjson-filter.service.ts +903 -0
  295. package/src/module/filter/service/saved-filter.service.ts +16 -26
  296. package/src/module/filter/test/flatjson-filter.service.spec.ts +415 -0
  297. package/src/module/integration/service/integration.service.ts +6 -2
  298. package/src/module/integration/service/wrapper.service.ts +1 -0
  299. package/src/module/layout/controller/layout.controller.ts +8 -1
  300. package/src/module/layout/entity/header-section.entity.ts +6 -0
  301. package/src/module/layout/layout.module.ts +1 -1
  302. package/src/module/layout/repository/header-section.repository.ts +6 -0
  303. package/src/module/layout/service/header-section.service.ts +1 -1
  304. package/src/module/linked_attributes/controller/linked_attributes.controller.ts +100 -0
  305. package/src/module/linked_attributes/dto/create-linked-attribute-smart.dto.ts +54 -0
  306. package/src/module/linked_attributes/linked_attributes.module.ts +9 -2
  307. package/src/module/linked_attributes/service/linked_attributes.service.ts +578 -3
  308. package/src/module/linked_attributes/test/linked-attributes.service.spec.ts +244 -0
  309. package/src/module/listmaster/service/list-master.service.ts +9 -1
  310. package/src/module/meta/controller/attribute-master.controller.ts +12 -0
  311. package/src/module/meta/controller/meta.controller.ts +25 -3
  312. package/src/module/{app_master → meta}/entity/app-master.entity.ts +9 -22
  313. package/src/module/meta/entity/entity-master.entity.ts +9 -3
  314. package/src/module/meta/entity.module.ts +20 -6
  315. package/src/module/{app_master → meta}/repository/app-master.repository.ts +3 -3
  316. package/src/module/meta/service/attribute-master.service.ts +31 -1
  317. package/src/module/meta/service/entity-master.service.ts +1 -0
  318. package/src/module/meta/service/entity-relation.service.ts +10 -6
  319. package/src/module/meta/service/entity-service-impl.service.ts +14 -19
  320. package/src/module/meta/service/entity-table.service.ts +82 -68
  321. package/src/module/meta/service/entity.service.ts +0 -1
  322. package/src/module/{enterprise → meta}/service/populate-meta.service.ts +5 -2
  323. package/src/module/meta/service/resolver.service.ts +4 -0
  324. package/src/module/module/controller/module-access.controller.ts +9 -14
  325. package/src/module/module/entity/menu.entity.ts +10 -18
  326. package/src/module/module/entity/module-access.entity.ts +3 -40
  327. package/src/module/module/entity/module-action.entity.ts +6 -10
  328. package/src/module/module/entity/module.entity.ts +14 -7
  329. package/src/module/module/module.module.ts +3 -2
  330. package/src/module/module/repository/menu.repository.ts +29 -43
  331. package/src/module/module/repository/module-access.repository.ts +62 -110
  332. package/src/module/module/service/menu.service.ts +9 -7
  333. package/src/module/module/service/module-access.service.ts +34 -22
  334. package/src/module/notification/entity/notification.entity.ts +3 -53
  335. package/src/module/notification/notification.module.ts +5 -6
  336. package/src/module/notification/service/email.service.ts +1 -16
  337. package/src/module/notification/service/notification.service.ts +1 -0
  338. package/src/module/notification/service/otp.service.ts +5 -16
  339. package/src/module/user/controller/login.controller.ts +8 -7
  340. package/src/module/user/controller/user.controller.ts +9 -0
  341. package/src/module/user/dto/create-user.dto.ts +6 -19
  342. package/src/module/user/entity/role.entity.ts +16 -59
  343. package/src/module/user/entity/user-role-mapping.entity.ts +3 -29
  344. package/src/module/user/entity/user-session.entity.ts +19 -3
  345. package/src/module/user/entity/user.entity.ts +13 -48
  346. package/src/module/user/repository/role.repository.ts +12 -32
  347. package/src/module/user/repository/user-role-mapping.repository.ts +1 -5
  348. package/src/module/user/repository/user.repository.ts +9 -36
  349. package/src/module/user/repository/userSession.repository.ts +1 -5
  350. package/src/module/user/service/login.service.ts +51 -47
  351. package/src/module/user/service/role.service.ts +63 -64
  352. package/src/module/user/service/user-role-mapping.service.ts +1 -23
  353. package/src/module/user/service/user-session.service.ts +11 -14
  354. package/src/module/user/service/user.service.ts +95 -76
  355. package/src/module/user/user.module.ts +5 -4
  356. package/src/module/workflow/repository/action-data.repository.ts +8 -6
  357. package/src/module/workflow/repository/action.repository.ts +11 -11
  358. package/src/module/workflow/repository/form-master.repository.ts +2 -2
  359. package/src/module/workflow/service/action-data.service.ts +2 -3
  360. package/src/module/workflow/service/action.service.ts +2 -2
  361. package/src/module/workflow/service/comm-template.service.ts +2 -0
  362. package/src/module/workflow/service/entity-modification.service.ts +1 -0
  363. package/src/module/workflow/service/form-master.service.ts +2 -2
  364. package/src/module/workflow/service/populate-workflow.service.ts +1 -1
  365. package/src/module/workflow/service/task.service.ts +3 -0
  366. package/src/module/workflow/service/workflow-meta.service.ts +7 -2
  367. package/src/module/workflow/service/workflow.service.ts +2 -2
  368. package/src/module/workflow/workflow.module.ts +0 -2
  369. package/src/module/workflow-automation/service/workflow-automation.service.ts +7 -19
  370. package/src/module/workflow-automation/workflow-automation.module.ts +3 -4
  371. package/src/module/workflow-schedule/service/workflow-schedule.service.ts +2 -0
  372. package/src/resources/dev.properties.yaml +2 -2
  373. package/src/table.config.ts +3 -3
  374. package/.claude/settings.local.json +0 -26
  375. package/.idea/250218_nodejs_core.iml +0 -9
  376. package/.idea/codeStyles/Project.xml +0 -59
  377. package/.idea/codeStyles/codeStyleConfig.xml +0 -5
  378. package/.idea/copilot.data.migration.agent.xml +0 -6
  379. package/.idea/copilot.data.migration.ask.xml +0 -6
  380. package/.idea/copilot.data.migration.ask2agent.xml +0 -6
  381. package/.idea/copilot.data.migration.edit.xml +0 -6
  382. package/.idea/inspectionProfiles/Project_Default.xml +0 -6
  383. package/.idea/misc.xml +0 -6
  384. package/.idea/modules.xml +0 -8
  385. package/.idea/prettier.xml +0 -6
  386. package/.idea/vcs.xml +0 -6
  387. package/dist/constant/status.constant.d.ts +0 -4
  388. package/dist/constant/status.constant.js +0 -9
  389. package/dist/constant/status.constant.js.map +0 -1
  390. package/dist/module/app_master/app-master.module.d.ts +0 -2
  391. package/dist/module/app_master/app-master.module.js +0 -28
  392. package/dist/module/app_master/app-master.module.js.map +0 -1
  393. package/dist/module/app_master/controller/app-master.controller.js.map +0 -1
  394. package/dist/module/app_master/entity/app-master.entity.d.ts +0 -17
  395. package/dist/module/app_master/entity/app-master.entity.js.map +0 -1
  396. package/dist/module/app_master/repository/app-master.repository.js.map +0 -1
  397. package/dist/module/app_master/service/app-master.service.js.map +0 -1
  398. package/dist/module/enterprise/controller/enterprise.controller.d.ts +0 -12
  399. package/dist/module/enterprise/controller/enterprise.controller.js +0 -57
  400. package/dist/module/enterprise/controller/enterprise.controller.js.map +0 -1
  401. package/dist/module/enterprise/controller/meta.controller.d.ts +0 -9
  402. package/dist/module/enterprise/controller/meta.controller.js +0 -43
  403. package/dist/module/enterprise/controller/meta.controller.js.map +0 -1
  404. package/dist/module/enterprise/service/brand-profile.service.d.ts +0 -0
  405. package/dist/module/enterprise/service/brand-profile.service.js +0 -1
  406. package/dist/module/enterprise/service/brand-profile.service.js.map +0 -1
  407. package/dist/module/enterprise/service/populate-meta.service.d.ts +0 -9
  408. package/dist/module/enterprise/service/populate-meta.service.js.map +0 -1
  409. package/dist/module/enterprise/service/school.service.d.ts +0 -0
  410. package/dist/module/enterprise/service/school.service.js +0 -1
  411. package/dist/module/enterprise/service/school.service.js.map +0 -1
  412. package/dist/module/preference_master/entity/preference.entity.d.ts +0 -9
  413. package/dist/module/preference_master/entity/preference.entity.js +0 -48
  414. package/dist/module/preference_master/entity/preference.entity.js.map +0 -1
  415. package/dist/module/preference_master/preference.service.d.ts +0 -8
  416. package/dist/module/preference_master/preference.service.js +0 -31
  417. package/dist/module/preference_master/preference.service.js.map +0 -1
  418. package/dist/module/preference_master/repo/preference.repository.d.ts +0 -8
  419. package/dist/module/preference_master/repo/preference.repository.js +0 -48
  420. package/dist/module/preference_master/repo/preference.repository.js.map +0 -1
  421. package/server.log +0 -850
  422. package/src/constant/status.constant.ts +0 -4
  423. package/src/module/app_master/app-master.module.ts +0 -15
  424. package/src/module/enterprise/controller/enterprise.controller.ts +0 -40
  425. package/src/module/enterprise/controller/meta.controller.ts +0 -23
  426. package/src/module/enterprise/service/brand-profile.service.ts +0 -10
  427. package/src/module/enterprise/service/school.service.ts +0 -5
  428. package/src/module/preference_master/entity/preference.entity.ts +0 -25
  429. package/src/module/preference_master/preference.service.ts +0 -27
  430. package/src/module/preference_master/repo/preference.repository.ts +0 -36
  431. /package/dist/module/{app_master → meta}/controller/app-master.controller.d.ts +0 -0
  432. /package/dist/module/{app_master → meta}/controller/app-master.controller.js +0 -0
  433. /package/dist/module/{app_master → meta}/service/app-master.service.d.ts +0 -0
  434. /package/dist/module/{app_master → meta}/service/app-master.service.js +0 -0
  435. /package/src/module/{app_master → meta}/controller/app-master.controller.ts +0 -0
  436. /package/src/module/{app_master → meta}/service/app-master.service.ts +0 -0
@@ -4,7 +4,8 @@ import { BadRequestException, Injectable } from '@nestjs/common';
4
4
  import { UserSessionRepository } from '../repository/userSession.repository';
5
5
  import { JwtAuthService } from 'src/module/auth/services/jwt.service';
6
6
  import { ConfigService } from '@nestjs/config';
7
- import { Repository } from 'typeorm';
7
+ import { UserRoleMappingService } from './user-role-mapping.service';
8
+ import { DataSource, Repository } from 'typeorm';
8
9
  import { UserRoleMapping } from '../entity/user-role-mapping.entity';
9
10
  import { UserData } from '../entity/user.entity';
10
11
  import { InjectRepository } from '@nestjs/typeorm';
@@ -19,18 +20,18 @@ export class UserSessionService {
19
20
  private configService: ConfigService,
20
21
  @InjectRepository(UserData)
21
22
  private readonly userDataRepository: Repository<UserData>,
23
+ @InjectRepository(UserRoleMapping)
24
+ private readonly userRoleMappingRepository: Repository<UserRoleMapping>,
22
25
  private readonly reflectionHelper: ReflectionHelper,
23
- ) {
24
- }
25
-
26
- async createSession(user, app_id?: number, accessInfo?: any, appcode?: string) {
26
+ ) {}
27
+ async createSession(user, appcode?: string, accessInfo?: any) {
27
28
  const sessionToken = this.clockIDGenService.idGenerator('SES');
28
29
 
29
30
  const userSession: any = new UserSession();
30
31
  userSession.user_id = user.id;
31
32
  userSession.session_key = sessionToken;
32
33
  userSession.is_session_loggedout = 0;
33
- // userSession.login_time = new Date(); -- Changed login_time to be auto generated by typeorm
34
+ userSession.login_time = new Date();
34
35
 
35
36
  const expiryTokenInHours = this.configService.get('TOKEN_EXPIRY') || 1;
36
37
  userSession.expiry_date = new Date(
@@ -42,11 +43,10 @@ export class UserSessionService {
42
43
  const payload: any = {
43
44
  id: user.id,
44
45
  sessionToken,
45
- app_id,
46
+ appcode,
46
47
  email_id: user.email_id,
47
48
  organization_id: user.organization_id,
48
49
  enterprise_id: user.enterprise_id,
49
- appcode,
50
50
  };
51
51
 
52
52
  // ✅ Add role access details
@@ -57,6 +57,7 @@ export class UserSessionService {
57
57
 
58
58
  const accessToken = this.jwtAuthService.generateJwt(payload);
59
59
 
60
+ userSession.access_token = accessToken;
60
61
  await this.userSessionRepository.saveSession(userSession);
61
62
 
62
63
  return accessToken;
@@ -70,10 +71,6 @@ export class UserSessionService {
70
71
  await this.userSessionRepository.saveSession(userSession);
71
72
  }
72
73
 
73
- async fetchUserFcmToken(user_id: number) {
74
- return await this.userSessionRepository.fetchUserFcmToken(user_id);
75
- };
76
-
77
74
 
78
75
  async switchCurrentLevelService(
79
76
  currentUser: any,
@@ -106,12 +103,12 @@ export class UserSessionService {
106
103
  });
107
104
  }
108
105
 
109
- if (getUserDetails?.enterprise_id == 1 && payload.level_type == 'ORG') {
106
+ if (getUserDetails?.organization_id == 1 && payload.level_type == 'ORG') {
110
107
  payload.organization_id = payload.level_id;
111
108
  }
112
109
 
113
110
  await this.userDataRepository.update(currentUser.id, {
114
- last_app_access_id: data.app_id,
111
+ last_app_access: data.appcode,
115
112
  last_level_type: data.level_type,
116
113
  last_level_id: data.level_id,
117
114
  });
@@ -1,45 +1,65 @@
1
- import { BadRequestException, Injectable } from '@nestjs/common';
1
+ import { RoleService } from './role.service';
2
+ import {
3
+ BadRequestException,
4
+ ForbiddenException,
5
+ Inject,
6
+ Injectable,
7
+ } from '@nestjs/common';
8
+ import { EntityServiceImpl } from '../../meta/service/entity-service-impl.service';
2
9
  import { UserData } from '../entity/user.entity';
10
+ import { BaseEntity } from '../../meta/entity/base-entity.entity';
3
11
  import { UserRepository } from '../repository/user.repository';
4
- import { INVITATION_STATUS_SENT } from '../../../constant/global.constant';
12
+ import { EncryptUtilService } from '../../../utils/service/encryptUtil.service';
13
+ import { ClockIDGenService } from '../../../utils/service/clockIDGenUtil.service';
14
+ import {
15
+ ENTITYTYPE_ROLE,
16
+ STATUS_ACTIVE,
17
+ INVITATION_STATUS_SENT,
18
+ } from '../../../constant/global.constant';
5
19
  import { CreateUserDto } from '../dto/create-user.dto';
6
20
  import { UserRoleMappingService } from './user-role-mapping.service';
7
21
  import { UserRoleMapping } from '../entity/user-role-mapping.entity';
22
+ import { EntityManager, Repository } from 'typeorm';
23
+ import { UpdateUserDto } from '../dto/update-user.dto';
8
24
  import { ConfigService } from '@nestjs/config';
25
+ // import { UserAppMappingService } from 'src/module/meta/service/user-app-mapping.service';
26
+ import { ServiceResult } from 'src/dtos/response.dto';
27
+ import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
28
+ import { OrganizationRepository } from 'src/module/enterprise/repository/organization.repository';
29
+ import { InjectRepository } from '@nestjs/typeorm';
30
+ import { Action } from 'src/module/workflow-automation/interface/action.interface';
9
31
  import { ActionHandler } from 'src/module/workflow-automation/interface/action.decorator';
10
- import { EncryptUtilService } from '../../../utils/service/encryptUtil.service';
11
- import { plainToInstance } from 'class-transformer';
12
- import { UpdateUserDto } from '../dto/update-user.dto';
13
- import { EnterpriseRepository } from 'src/module/enterprise/repository/enterprise.repository';
14
- import { StatusConstant } from '../../../constant/status.constant';
15
- import { RoleRepository } from '../repository/role.repository';
16
- import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
17
32
 
18
33
  @Injectable()
19
34
  @ActionHandler('User')
20
- export class UserService {
35
+ export class UserService extends EntityServiceImpl implements Action {
21
36
  constructor(
22
37
  private userRepository: UserRepository,
23
38
  private userRoleMappingService: UserRoleMappingService,
24
- private roleRepo: RoleRepository,
39
+ private readonly clockIDGenService: ClockIDGenService,
25
40
  private configService: ConfigService,
26
- private readonly enterpriseRepository: EnterpriseRepository,
27
- private readonly reflectionHelper: ReflectionHelper
41
+ private readonly organizationRepository: OrganizationRepository,
42
+ // private readonly userAppMappingService: UserAppMappingService,
43
+ @Inject('RoleService') private readonly roleService: RoleService,
44
+ @Inject('ListMasterService')
45
+ private readonly listMasterService: ListMasterService,
28
46
  ) {
47
+ super();
29
48
  }
30
49
 
31
50
  masterKey = this.configService.get('MASTER_KEY') || '';
32
51
  masterIv = this.configService.get('MASTER_IV') || '';
33
52
 
34
- async createUser(
35
- entityData: CreateUserDto,
36
- loggedInUser: UserData,
37
- ) {
38
- const userData = entityData;
53
+ async createEntity(
54
+ entityData: BaseEntity,
55
+ loggedInUser: UserData | null,
56
+ manager?: EntityManager,
57
+ ): Promise<ServiceResult<BaseEntity>> {
58
+ const userData = entityData as CreateUserDto;
39
59
 
40
60
  let existingUser = await this.userRepository.findByEmailId(
41
61
  userData.email_id,
42
- loggedInUser?.enterprise_id,
62
+ loggedInUser?.organization_id,
43
63
  );
44
64
  if (existingUser) {
45
65
  return { success: false, error: 'User with this email already exists' };
@@ -47,46 +67,43 @@ export class UserService {
47
67
 
48
68
  existingUser = await this.userRepository.findByMobile(
49
69
  userData.mobile,
50
- loggedInUser?.enterprise_id,
70
+ loggedInUser?.organization_id,
51
71
  );
52
72
  if (existingUser) {
53
73
  return { success: false, error: 'User with this mobile already exists' };
54
74
  }
55
75
 
56
- if(!userData.code) {
57
- const maxId = await this.userRepository.findMaxIdRecord();
58
- if(maxId && maxId.id) {
59
- userData.code = `USR${maxId.id + 1}`;
60
- } else {
61
- userData.code = `USR1`;
62
- }
63
- }
76
+ const resolveStatus = await this.listMasterService.getResolvedListCode(
77
+ STATUS_ACTIVE,
78
+ loggedInUser?.organization_id || 0,
79
+ );
80
+
81
+ const resolvedInvitationStatus =
82
+ await this.listMasterService.getResolvedListCode(
83
+ INVITATION_STATUS_SENT,
84
+ loggedInUser?.organization_id || 0,
85
+ );
64
86
 
87
+ userData.name =
88
+ (userData.first_name || '') + ' ' + (userData.last_name || '');
65
89
  userData.password = EncryptUtilService.encryptGCM(
66
90
  userData.password || 'Admin@123',
67
91
  this.masterKey,
68
92
  this.masterIv,
69
93
  );
70
-
71
- userData.enterprise_id = loggedInUser.enterprise_id;
72
- userData.level_type = loggedInUser.level_type;
73
- userData.level_id = loggedInUser.level_id;
74
-
75
94
  userData.is_firstlogin = 1;
76
95
  userData.roles = [];
77
- userData.invitation_status = INVITATION_STATUS_SENT;
78
- userData.status = StatusConstant.ACTIVE;
96
+ userData.invitation_status = resolvedInvitationStatus.id;
97
+ userData.status = resolveStatus.id || 'ACTIVE';
79
98
 
80
- const entity = plainToInstance(UserData, userData);
81
- entity.created_by = loggedInUser.created_by;
82
-
83
- const savedData = await this.userRepository.saveUser(entity);
99
+ const savedData = await super.createEntity(userData, loggedInUser);
84
100
 
85
101
  const insertPromises: Promise<UserRoleMapping | void | null | undefined>[] =
86
102
  [];
87
103
 
88
104
  for (const entry of userData.access || []) {
89
105
  const { level_type, level_ids, app_code, role_id } = entry;
106
+
90
107
  if (
91
108
  !level_type ||
92
109
  !Array.isArray(level_ids) ||
@@ -96,19 +113,13 @@ export class UserService {
96
113
  ) {
97
114
  return { success: false, error: 'Invalid access level entry' };
98
115
  }
99
- const appMasterRepo = this.reflectionHelper.getRepoService('AppMaster');
100
- const appMaster = await appMasterRepo.findOne({
101
- where: {
102
- code: app_code
103
- }
104
- })
116
+
105
117
  for (const levelId of level_ids) {
106
118
  const userRoleMapping = new UserRoleMapping(savedData.id, role_id);
107
119
  userRoleMapping.level_type = level_type;
108
120
  userRoleMapping.level_id = String(levelId);
109
121
  userRoleMapping.appcode = app_code;
110
- userRoleMapping.app_id = appMaster.id
111
- userRoleMapping.enterprise_id = loggedInUser?.enterprise_id || 0;
122
+ userRoleMapping.organization_id = loggedInUser?.organization_id || 0;
112
123
  insertPromises.push(
113
124
  this.userRoleMappingService.assignUserRole(userRoleMapping),
114
125
  );
@@ -128,10 +139,15 @@ export class UserService {
128
139
  }
129
140
 
130
141
  name: string = 'UserService';
142
+ async execute(payload: any): Promise<any> {
143
+ console.log('payload', payload);
144
+ }
131
145
 
132
- async getUserData(
146
+ async getEntityData(
147
+ entityType: string,
133
148
  id: number,
134
- ) {
149
+ loggedInUser?: UserData,
150
+ ): Promise<BaseEntity | null> {
135
151
  const user = await this.userRepository.findById(id);
136
152
  if (user) {
137
153
  const userRoleMappings: UserRoleMapping[] | null =
@@ -142,7 +158,11 @@ export class UserService {
142
158
  for (const i in userRoleMappings) {
143
159
  const userRoleMapping = userRoleMappings[i];
144
160
  const roleId = userRoleMapping.role_id;
145
- const role = await this.roleRepo.findById(roleId);
161
+ const role = await super.getEntityData(
162
+ ENTITYTYPE_ROLE,
163
+ roleId,
164
+ loggedInUser,
165
+ );
146
166
  roles.push(role);
147
167
  }
148
168
  userDto.roles = roles;
@@ -152,13 +172,13 @@ export class UserService {
152
172
  return null;
153
173
  }
154
174
 
155
- async updateUser(
156
- id: number,
157
- userDto: UpdateUserDto,
175
+ async updateEntity(
176
+ entityData: BaseEntity,
158
177
  loggedInUserData: UserData,
159
- ) {
178
+ ): Promise<ServiceResult<BaseEntity>> {
179
+ const userDto = entityData as UpdateUserDto;
160
180
 
161
- const existingUser = await this.userRepository.findById(id);
181
+ const existingUser = await this.userRepository.findById(entityData.id);
162
182
 
163
183
  if (!existingUser) {
164
184
  return { success: false, error: 'User not found' };
@@ -188,7 +208,10 @@ export class UserService {
188
208
  const updatedUserData = { ...userDto } as any;
189
209
  delete updatedUserData.access;
190
210
 
191
- const savedData = await this.userRepository.updateUser(id, updatedUserData);
211
+ const savedData = await super.updateEntity(
212
+ updatedUserData,
213
+ loggedInUserData,
214
+ );
192
215
 
193
216
  // Handle updated access levels
194
217
  if (userDto.access && userDto.access.length > 0) {
@@ -212,11 +235,12 @@ export class UserService {
212
235
  }
213
236
 
214
237
  for (const levelId of level_ids) {
215
- const userRoleMapping = new UserRoleMapping(id, role_id);
238
+ const userRoleMapping = new UserRoleMapping(savedData.id, role_id);
216
239
  userRoleMapping.level_type = level_type;
217
240
  userRoleMapping.level_id = String(levelId);
218
241
  userRoleMapping.appcode = app_code;
219
- userRoleMapping.enterprise_id = loggedInUserData.enterprise_id;
242
+ userRoleMapping.organization_id =
243
+ loggedInUserData?.organization_id || 0;
220
244
 
221
245
  insertPromises.push(
222
246
  this.userRoleMappingService.assignUserRole(userRoleMapping),
@@ -237,10 +261,9 @@ export class UserService {
237
261
 
238
262
  async findByEmailId(
239
263
  email_id: string,
240
- enterprise_id?: number,
241
- getLastApp?: boolean,
264
+ organization_id?: number,
242
265
  ): Promise<UserData | null> {
243
- return await this.userRepository.findByEmailId(email_id, enterprise_id, getLastApp);
266
+ return await this.userRepository.findByEmailId(email_id, organization_id);
244
267
  }
245
268
 
246
269
  async findByMobile(
@@ -255,14 +278,14 @@ export class UserService {
255
278
  );
256
279
  }
257
280
 
258
- async setDefaultLastAccess(userId: number, app_id: number): Promise<void> {
281
+ async setDefaultLastAccess(userId: number, appcode: string): Promise<void> {
259
282
  const user = await this.userRepository.findById(userId);
260
283
 
261
284
  if (!user) {
262
285
  throw new BadRequestException('User not found');
263
286
  }
264
287
 
265
- user.last_app_access_id = app_id;
288
+ user.last_app_access = appcode;
266
289
 
267
290
  await this.userRepository.saveUser(user); // This persists the updated field
268
291
  }
@@ -271,7 +294,7 @@ export class UserService {
271
294
  userId: number,
272
295
  levelType: string,
273
296
  levelId: string,
274
- app_id: number,
297
+ appcode: string,
275
298
  ): Promise<void> {
276
299
  const user = await this.userRepository.findById(userId);
277
300
 
@@ -281,7 +304,7 @@ export class UserService {
281
304
 
282
305
  user.last_level_type = levelType;
283
306
  user.last_level_id = levelId;
284
- user.last_app_access_id = app_id;
307
+ user.last_app_access = appcode;
285
308
 
286
309
  await this.userRepository.saveUser(user); // This persists the updated field
287
310
  }
@@ -296,15 +319,15 @@ export class UserService {
296
319
  return { success: false, message: 'Email and Subdomain is required' };
297
320
  }
298
321
 
299
- let enterprise;
322
+ let organization;
300
323
 
301
324
  if (subdomain) {
302
- enterprise =
303
- await this.enterpriseRepository.findEnterpriseBySubdomain(
325
+ organization =
326
+ await this.organizationRepository.findOrganizationBySubdomain(
304
327
  subdomain,
305
328
  );
306
329
 
307
- if (!enterprise) {
330
+ if (!organization) {
308
331
  // throw new BadRequestException('Organization not found.');
309
332
  return {
310
333
  success: false,
@@ -316,14 +339,14 @@ export class UserService {
316
339
  // 🔹 Step 2: Find the user by email + organization check
317
340
  const user = await this.userRepository.findByEmailId(
318
341
  email_id,
319
- enterprise?.id,
342
+ organization?.id,
320
343
  );
321
344
 
322
- if (!user || (enterprise && user.enterprise_id !== enterprise.id)) {
345
+ if (!user || (organization && user.organization_id !== organization.id)) {
323
346
  // throw new BadRequestException('User not found in organization.');
324
347
  return {
325
348
  success: false,
326
- message: 'User not found in enterprise.',
349
+ message: 'User not found in organization.',
327
350
  };
328
351
  }
329
352
 
@@ -342,8 +365,4 @@ export class UserService {
342
365
  };
343
366
  }
344
367
  }
345
-
346
- async find(options: any): Promise<UserData[]> {
347
- return await this.userRepository.find(options);
348
- }
349
368
  }
@@ -23,7 +23,6 @@ import { ModuleAccess } from '../module/entity/module-access.entity';
23
23
  import { EnterpriseModule } from '../enterprise/enterprise.module';
24
24
  import { ListMasterModule } from '../listmaster/listmaster.module';
25
25
  import { IntegrationModule } from '../integration/integration.module';
26
- import { EnterpriseData } from '../enterprise/entity/enterprise.entity';
27
26
 
28
27
  @Module({
29
28
  imports: [
@@ -35,8 +34,11 @@ import { EnterpriseData } from '../enterprise/entity/enterprise.entity';
35
34
  ModuleAccess,
36
35
  ]),
37
36
  forwardRef(() => AuthModule),
37
+ EntityModule,
38
38
  UtilsModule,
39
- forwardRef(() => EnterpriseModule)
39
+ ListMasterModule,
40
+ IntegrationModule,
41
+ forwardRef(() => EnterpriseModule),
40
42
  ],
41
43
  providers: [
42
44
  { provide: 'UserService', useClass: UserService },
@@ -57,8 +59,7 @@ import { EnterpriseData } from '../enterprise/entity/enterprise.entity';
57
59
  UserRoleMappingService,
58
60
  RoleRepository,
59
61
  LoginService,
60
- UserRoleMappingRepository
61
62
  ],
62
63
  controllers: [LoginController, UserController],
63
64
  })
64
- export class UserModule { }
65
+ export class UserModule {}
@@ -51,6 +51,7 @@ export class ActionDataRepository extends EntityServiceImpl {
51
51
  action_id: act.id,
52
52
  sequence: act.sequence,
53
53
  name: act.name,
54
+ organization_id: loggedInUser.organization_id,
54
55
  enterprise_id: loggedInUser.enterprise_id,
55
56
  mapped_entity_id,
56
57
  mapped_entity_type,
@@ -115,6 +116,7 @@ export class ActionDataRepository extends EntityServiceImpl {
115
116
  this.reflectionHelper.getRepoService('EntityRelationData');
116
117
 
117
118
  await entityRelationDataRepo.save({
119
+ organization_id: loggedInUser.organization_id,
118
120
  enterprise_id: loggedInUser.enterprise_id,
119
121
  source_entity_id: createdEntity.mapped_entity_id,
120
122
  source_entity_type: createdEntity.mapped_entity_type,
@@ -187,7 +189,7 @@ export class ActionDataRepository extends EntityServiceImpl {
187
189
  }
188
190
 
189
191
  async resubmitAction(
190
- loggedInUser: UserData,
192
+ organization_id: number,
191
193
  mapped_entity_type: string,
192
194
  mapped_entity_id: number,
193
195
  stage_id: number,
@@ -196,7 +198,7 @@ export class ActionDataRepository extends EntityServiceImpl {
196
198
  // Get the current active action
197
199
  const currentAction = await this.actionDataRepo.findOne({
198
200
  where: {
199
- enterprise_id: loggedInUser.enterprise_id,
201
+ organization_id,
200
202
  stage_id,
201
203
  mapped_entity_id,
202
204
  mapped_entity_type,
@@ -213,7 +215,7 @@ export class ActionDataRepository extends EntityServiceImpl {
213
215
  // Find the immediate previous action in the sequence
214
216
  const previousAction = await this.actionDataRepo.findOne({
215
217
  where: {
216
- enterprise_id: loggedInUser.enterprise_id,
218
+ organization_id,
217
219
  stage_id,
218
220
  mapped_entity_id,
219
221
  mapped_entity_type,
@@ -230,7 +232,7 @@ export class ActionDataRepository extends EntityServiceImpl {
230
232
  // Unset current action
231
233
  currentAction.is_current = null as any;
232
234
  currentAction.modified_date = new Date();
233
- currentAction.modified_by = loggedInUser.id;
235
+ currentAction.modified_by = organization_id;
234
236
  currentAction.start_time = null as any;
235
237
  currentAction.resubmit_count = (currentAction.resubmit_count ?? 0) + 1;
236
238
 
@@ -239,7 +241,7 @@ export class ActionDataRepository extends EntityServiceImpl {
239
241
  // Mark previous action as current again
240
242
  previousAction.is_current = 'Y';
241
243
  previousAction.modified_date = new Date();
242
- previousAction.modified_by = loggedInUser.id;
244
+ previousAction.modified_by = organization_id;
243
245
  previousAction.end_time = null as any; // Reset end time
244
246
  previousAction.is_done = false;
245
247
  await this.actionDataRepo.update(previousAction.id, previousAction);
@@ -266,7 +268,7 @@ export class ActionDataRepository extends EntityServiceImpl {
266
268
  const listMasterItem = await listMasterItemRepo.findOne({
267
269
  where: {
268
270
  code: 'in_progress',
269
- enterprise_id: loggedInUser.enterprise_id,
271
+ organization_id: organization_id,
270
272
  listtype: 'TKST',
271
273
  },
272
274
  });
@@ -8,12 +8,12 @@ export class ActionRepository {
8
8
  constructor(private readonly reflectionHelper: ReflectionHelper) {}
9
9
 
10
10
  async getReasonCode(loggedInUser: UserData): Promise<any> {
11
- const { enterprise_id } = loggedInUser;
11
+ const { organization_id } = loggedInUser;
12
12
  const listMasterRepo =
13
13
  this.reflectionHelper.getRepoService('ListMasterData');
14
14
  const result = await listMasterRepo.find({
15
15
  where: {
16
- enterprise_id,
16
+ organization_id,
17
17
  source: 'master',
18
18
  },
19
19
  });
@@ -27,7 +27,7 @@ export class ActionRepository {
27
27
  }
28
28
 
29
29
  async defaultReasonCode(list_type: string, loggedInUser: UserData) {
30
- const { enterprise_id } = loggedInUser;
30
+ const { organization_id } = loggedInUser;
31
31
  if (!list_type) {
32
32
  throw new BadRequestException('list_type is required');
33
33
  }
@@ -38,7 +38,7 @@ export class ActionRepository {
38
38
  const result = await listMasterItemsRepo.find({
39
39
  where: {
40
40
  listtype: list_type,
41
- enterprise_id,
41
+ organization_id,
42
42
  },
43
43
  });
44
44
 
@@ -50,7 +50,7 @@ export class ActionRepository {
50
50
  }
51
51
 
52
52
  async getActions(loggedInUser: UserData, stage_id: number) {
53
- const { enterprise_id } = loggedInUser;
53
+ const { organization_id } = loggedInUser;
54
54
 
55
55
  const workflowStageActionRepo =
56
56
  this.reflectionHelper.getRepoService('StageActionMapping');
@@ -88,7 +88,7 @@ export class ActionRepository {
88
88
  const templates = await workflowCommTemplateRepo.find({
89
89
  where: {
90
90
  code: In(templateCodes),
91
- enterprise_id: enterprise_id,
91
+ organization_id: organization_id,
92
92
  },
93
93
  });
94
94
 
@@ -148,10 +148,10 @@ export class ActionRepository {
148
148
  'ar',
149
149
  `ar.id::text = a.action_requirement
150
150
  AND ar.listtype = 'ACRQ'
151
- AND ar.enterprise_id = :entId`,
152
- { entId: enterprise_id },
151
+ AND ar.organization_id = :orgId`,
152
+ { orgId: organization_id },
153
153
  )
154
- .where('a.enterprise_id = :entId', { entId: enterprise_id })
154
+ .where('a.organization_id = :orgId', { orgId: organization_id })
155
155
  .andWhere('a.id::text IN (:...actionIds)', { actionIds })
156
156
  .getRawMany();
157
157
 
@@ -218,7 +218,7 @@ export class ActionRepository {
218
218
  }
219
219
 
220
220
  async getAction(
221
- enterprise_id: number,
221
+ organization_id: number,
222
222
  stage_id: number,
223
223
  mapped_entity_id: number,
224
224
  mapped_entity_type: string,
@@ -268,7 +268,7 @@ export class ActionRepository {
268
268
  'ac',
269
269
  'ac.id = a.action_category::bigint',
270
270
  )
271
- .where('a.enterprise_id = :entId', { entId: enterprise_id })
271
+ .where('a.organization_id = :orgId', { orgId: organization_id })
272
272
  .andWhere('a.id IN (:...actionIds)', { actionIds })
273
273
  .orderBy('a.sequence', 'ASC')
274
274
  .getRawMany();
@@ -8,12 +8,12 @@ export class FormMasterRepository {
8
8
  private readonly reflectionHelper: ReflectionHelper,
9
9
  ) {}
10
10
 
11
- async getForms(enterprise_id: number, source_entity_type: string) {
11
+ async getForms(organization_id: number, source_entity_type: string) {
12
12
 
13
13
  const viewMasterRepo = this.reflectionHelper.getRepoService('ViewMaster');
14
14
  const forms = await viewMasterRepo.find({
15
15
  where: {
16
- enterprise_id,
16
+ organization_id,
17
17
  mapped_entity_type: source_entity_type
18
18
  }
19
19
  });
@@ -3,7 +3,6 @@ import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.s
3
3
  import { UserData } from 'src/module/user/entity/user.entity';
4
4
  import { DataSource } from 'typeorm';
5
5
  import { ActionDataRepository } from '../repository/action-data.repository';
6
- import { log } from 'console';
7
6
 
8
7
  @Injectable()
9
8
  export class ActionDataService extends EntityServiceImpl {
@@ -51,9 +50,9 @@ export class ActionDataService extends EntityServiceImpl {
51
50
  stage_id: number,
52
51
  action_id: number,
53
52
  ) {
54
-
53
+ const { organization_id } = loggedInUser;
55
54
  return this.actionDataRepo.resubmitAction(
56
- loggedInUser,
55
+ organization_id,
57
56
  mapped_entity_type,
58
57
  mapped_entity_id,
59
58
  stage_id,
@@ -291,9 +291,9 @@ export class ActionService extends EntityServiceImpl {
291
291
  mapped_entity_id: number,
292
292
  mapped_entity_type: string,
293
293
  ) {
294
- const { enterprise_id } = loggedInUser;
294
+ const { organization_id } = loggedInUser;
295
295
  return this.actionRepository.getAction(
296
- enterprise_id,
296
+ organization_id,
297
297
  stage_id,
298
298
  mapped_entity_id,
299
299
  mapped_entity_type,
@@ -75,7 +75,9 @@ export class CommTemplateService extends EntityServiceImpl {
75
75
  entity_type: templateData.entity_type,
76
76
  template_id: tempData.id,
77
77
  media_id: attachment,
78
+ organization_id: loggedInUser.organization_id,
78
79
  enterprise_id: loggedInUser.enterprise_id,
80
+ appcode: loggedInUser.appcode,
79
81
  level_id: loggedInUser.level_id,
80
82
  level_type: loggedInUser.level_type,
81
83
  }));
@@ -17,6 +17,7 @@ export class EntityModificationService extends EntityServiceImpl {
17
17
  async logModification(modificationData: any, loggedInUser: UserData) {
18
18
  const { mapped_entity_type, mapped_entity_id, attribute_key } =
19
19
  modificationData;
20
+ const { organization_id } = loggedInUser;
20
21
 
21
22
  if (!mapped_entity_type || !mapped_entity_id || !attribute_key) {
22
23
  throw new BadRequestException(