rez_core 6.5.23 → 6.5.26

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 (395) hide show
  1. package/dist/app.module.js +3 -3
  2. package/dist/app.module.js.map +1 -1
  3. package/dist/core.module.js +38 -60
  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 +3 -2
  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 +18 -3
  27. package/dist/module/enterprise/entity/organization.entity.js +74 -8
  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 -4
  37. package/dist/module/enterprise/service/enterprise.service.js.map +1 -1
  38. package/dist/module/enterprise/service/organization.service.d.ts +4 -4
  39. package/dist/module/enterprise/service/organization.service.js +24 -101
  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 +97 -23
  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/meta.controller.d.ts +6 -1
  98. package/dist/module/meta/controller/meta.controller.js +19 -1
  99. package/dist/module/meta/controller/meta.controller.js.map +1 -1
  100. package/dist/module/meta/entity/app-master.entity.d.ts +4 -8
  101. package/dist/module/meta/entity/app-master.entity.js +12 -30
  102. package/dist/module/meta/entity/app-master.entity.js.map +1 -1
  103. package/dist/module/meta/entity/entity-master.entity.d.ts +1 -0
  104. package/dist/module/meta/entity/entity-master.entity.js +8 -1
  105. package/dist/module/meta/entity/entity-master.entity.js.map +1 -1
  106. package/dist/module/meta/entity.module.js +5 -2
  107. package/dist/module/meta/entity.module.js.map +1 -1
  108. package/dist/module/meta/repository/app-master.repository.js +1 -1
  109. package/dist/module/meta/repository/app-master.repository.js.map +1 -1
  110. package/dist/module/meta/service/attribute-master.service.d.ts +6 -1
  111. package/dist/module/meta/service/attribute-master.service.js +22 -2
  112. package/dist/module/meta/service/attribute-master.service.js.map +1 -1
  113. package/dist/module/meta/service/entity-master.service.js +1 -0
  114. package/dist/module/meta/service/entity-master.service.js.map +1 -1
  115. package/dist/module/meta/service/entity-relation.service.d.ts +4 -3
  116. package/dist/module/meta/service/entity-relation.service.js +10 -4
  117. package/dist/module/meta/service/entity-relation.service.js.map +1 -1
  118. package/dist/module/meta/service/entity-service-impl.service.d.ts +1 -1
  119. package/dist/module/meta/service/entity-service-impl.service.js +14 -10
  120. package/dist/module/meta/service/entity-service-impl.service.js.map +1 -1
  121. package/dist/module/meta/service/entity-table.service.d.ts +2 -3
  122. package/dist/module/meta/service/entity-table.service.js +19 -23
  123. package/dist/module/meta/service/entity-table.service.js.map +1 -1
  124. package/dist/module/meta/service/populate-meta.service.d.ts +13 -0
  125. package/dist/module/{enterprise → meta}/service/populate-meta.service.js +8 -2
  126. package/dist/module/meta/service/populate-meta.service.js.map +1 -0
  127. package/dist/module/meta/service/resolver.service.d.ts +1 -1
  128. package/dist/module/meta/service/resolver.service.js +6 -3
  129. package/dist/module/meta/service/resolver.service.js.map +1 -1
  130. package/dist/module/module/controller/menu.controller.js +2 -2
  131. package/dist/module/module/controller/menu.controller.js.map +1 -1
  132. package/dist/module/module/controller/module-access.controller.d.ts +4 -3
  133. package/dist/module/module/controller/module-access.controller.js +10 -15
  134. package/dist/module/module/controller/module-access.controller.js.map +1 -1
  135. package/dist/module/module/entity/menu.entity.d.ts +2 -6
  136. package/dist/module/module/entity/menu.entity.js +7 -19
  137. package/dist/module/module/entity/menu.entity.js.map +1 -1
  138. package/dist/module/module/entity/module-access.entity.d.ts +0 -15
  139. package/dist/module/module/entity/module-access.entity.js +0 -50
  140. package/dist/module/module/entity/module-access.entity.js.map +1 -1
  141. package/dist/module/module/entity/module-action.entity.d.ts +1 -4
  142. package/dist/module/module/entity/module-action.entity.js +3 -12
  143. package/dist/module/module/entity/module-action.entity.js.map +1 -1
  144. package/dist/module/module/entity/module.entity.d.ts +5 -3
  145. package/dist/module/module/entity/module.entity.js +18 -8
  146. package/dist/module/module/entity/module.entity.js.map +1 -1
  147. package/dist/module/module/module.module.d.ts +1 -1
  148. package/dist/module/module/module.module.js +7 -5
  149. package/dist/module/module/module.module.js.map +1 -1
  150. package/dist/module/module/repository/menu.repository.d.ts +4 -4
  151. package/dist/module/module/repository/menu.repository.js +27 -17
  152. package/dist/module/module/repository/menu.repository.js.map +1 -1
  153. package/dist/module/module/repository/module-access.repository.d.ts +7 -7
  154. package/dist/module/module/repository/module-access.repository.js +44 -82
  155. package/dist/module/module/repository/module-access.repository.js.map +1 -1
  156. package/dist/module/module/service/menu.service.d.ts +5 -3
  157. package/dist/module/module/service/menu.service.js +12 -9
  158. package/dist/module/module/service/menu.service.js.map +1 -1
  159. package/dist/module/module/service/module-access.service.d.ts +11 -8
  160. package/dist/module/module/service/module-access.service.js +26 -24
  161. package/dist/module/module/service/module-access.service.js.map +1 -1
  162. package/dist/module/notification/entity/notification.entity.d.ts +2 -17
  163. package/dist/module/notification/entity/notification.entity.js +2 -68
  164. package/dist/module/notification/entity/notification.entity.js.map +1 -1
  165. package/dist/module/notification/notification.module.js +2 -0
  166. package/dist/module/notification/notification.module.js.map +1 -1
  167. package/dist/module/notification/service/notification.service.d.ts +3 -1
  168. package/dist/module/notification/service/notification.service.js +5 -2
  169. package/dist/module/notification/service/notification.service.js.map +1 -1
  170. package/dist/module/notification/service/otp.service.js.map +1 -1
  171. package/dist/module/user/controller/login.controller.d.ts +3 -1
  172. package/dist/module/user/controller/login.controller.js +6 -2
  173. package/dist/module/user/controller/login.controller.js.map +1 -1
  174. package/dist/module/user/controller/user.controller.d.ts +2 -0
  175. package/dist/module/user/controller/user.controller.js +13 -0
  176. package/dist/module/user/controller/user.controller.js.map +1 -1
  177. package/dist/module/user/dto/create-user.dto.d.ts +3 -6
  178. package/dist/module/user/dto/create-user.dto.js +11 -17
  179. package/dist/module/user/dto/create-user.dto.js.map +1 -1
  180. package/dist/module/user/entity/role.entity.d.ts +6 -19
  181. package/dist/module/user/entity/role.entity.js +19 -68
  182. package/dist/module/user/entity/role.entity.js.map +1 -1
  183. package/dist/module/user/entity/user-role-mapping.entity.d.ts +0 -10
  184. package/dist/module/user/entity/user-role-mapping.entity.js +1 -33
  185. package/dist/module/user/entity/user-role-mapping.entity.js.map +1 -1
  186. package/dist/module/user/entity/user-session.entity.js +3 -2
  187. package/dist/module/user/entity/user-session.entity.js.map +1 -1
  188. package/dist/module/user/entity/user.entity.d.ts +5 -19
  189. package/dist/module/user/entity/user.entity.js +15 -69
  190. package/dist/module/user/entity/user.entity.js.map +1 -1
  191. package/dist/module/user/repository/role.repository.d.ts +2 -6
  192. package/dist/module/user/repository/role.repository.js +8 -16
  193. package/dist/module/user/repository/role.repository.js.map +1 -1
  194. package/dist/module/user/repository/user-role-mapping.repository.d.ts +0 -1
  195. package/dist/module/user/repository/user-role-mapping.repository.js +0 -3
  196. package/dist/module/user/repository/user-role-mapping.repository.js.map +1 -1
  197. package/dist/module/user/repository/user.repository.d.ts +2 -4
  198. package/dist/module/user/repository/user.repository.js +7 -19
  199. package/dist/module/user/repository/user.repository.js.map +1 -1
  200. package/dist/module/user/repository/userSession.repository.d.ts +0 -1
  201. package/dist/module/user/repository/userSession.repository.js +0 -3
  202. package/dist/module/user/repository/userSession.repository.js.map +1 -1
  203. package/dist/module/user/service/login.service.d.ts +5 -3
  204. package/dist/module/user/service/login.service.js +42 -43
  205. package/dist/module/user/service/login.service.js.map +1 -1
  206. package/dist/module/user/service/role.service.d.ts +11 -24
  207. package/dist/module/user/service/role.service.js +38 -42
  208. package/dist/module/user/service/role.service.js.map +1 -1
  209. package/dist/module/user/service/user-role-mapping.service.d.ts +0 -2
  210. package/dist/module/user/service/user-role-mapping.service.js +0 -6
  211. package/dist/module/user/service/user-role-mapping.service.js.map +1 -1
  212. package/dist/module/user/service/user-session.service.d.ts +1 -2
  213. package/dist/module/user/service/user-session.service.js +5 -9
  214. package/dist/module/user/service/user-session.service.js.map +1 -1
  215. package/dist/module/user/service/user.service.d.ts +20 -29
  216. package/dist/module/user/service/user.service.js +56 -44
  217. package/dist/module/user/service/user.service.js.map +1 -1
  218. package/dist/module/user/user.module.js +7 -1
  219. package/dist/module/user/user.module.js.map +1 -1
  220. package/dist/module/workflow/repository/action-data.repository.d.ts +1 -1
  221. package/dist/module/workflow/repository/action-data.repository.js +8 -6
  222. package/dist/module/workflow/repository/action-data.repository.js.map +1 -1
  223. package/dist/module/workflow/repository/action.repository.d.ts +1 -1
  224. package/dist/module/workflow/repository/action.repository.js +10 -10
  225. package/dist/module/workflow/repository/action.repository.js.map +1 -1
  226. package/dist/module/workflow/repository/form-master.repository.d.ts +1 -1
  227. package/dist/module/workflow/repository/form-master.repository.js +2 -2
  228. package/dist/module/workflow/repository/form-master.repository.js.map +1 -1
  229. package/dist/module/workflow/service/action-data.service.js +2 -1
  230. package/dist/module/workflow/service/action-data.service.js.map +1 -1
  231. package/dist/module/workflow/service/action.service.js +2 -2
  232. package/dist/module/workflow/service/action.service.js.map +1 -1
  233. package/dist/module/workflow/service/comm-template.service.js +2 -0
  234. package/dist/module/workflow/service/comm-template.service.js.map +1 -1
  235. package/dist/module/workflow/service/entity-modification.service.js +1 -0
  236. package/dist/module/workflow/service/entity-modification.service.js.map +1 -1
  237. package/dist/module/workflow/service/form-master.service.js +2 -2
  238. package/dist/module/workflow/service/form-master.service.js.map +1 -1
  239. package/dist/module/workflow/service/populate-workflow.service.d.ts +1 -1
  240. package/dist/module/workflow/service/populate-workflow.service.js +1 -1
  241. package/dist/module/workflow/service/populate-workflow.service.js.map +1 -1
  242. package/dist/module/workflow/service/task.service.js +3 -0
  243. package/dist/module/workflow/service/task.service.js.map +1 -1
  244. package/dist/module/workflow/service/workflow-meta.service.js +7 -2
  245. package/dist/module/workflow/service/workflow-meta.service.js.map +1 -1
  246. package/dist/module/workflow/service/workflow.service.js +2 -2
  247. package/dist/module/workflow/service/workflow.service.js.map +1 -1
  248. package/dist/module/workflow/workflow.module.js +0 -2
  249. package/dist/module/workflow/workflow.module.js.map +1 -1
  250. package/dist/module/workflow-automation/service/workflow-automation.service.js +6 -11
  251. package/dist/module/workflow-automation/service/workflow-automation.service.js.map +1 -1
  252. package/dist/module/workflow-automation/workflow-automation.module.js +1 -3
  253. package/dist/module/workflow-automation/workflow-automation.module.js.map +1 -1
  254. package/dist/module/workflow-schedule/service/workflow-schedule.service.js +2 -0
  255. package/dist/module/workflow-schedule/service/workflow-schedule.service.js.map +1 -1
  256. package/dist/table.config.d.ts +3 -2
  257. package/dist/tsconfig.build.tsbuildinfo +1 -1
  258. package/package.json +2 -2
  259. package/src/app.module.ts +5 -5
  260. package/src/core.module.ts +44 -55
  261. package/src/migrations/1732612800000-AddEntityJsonGinIndex.ts +41 -0
  262. package/src/module/auth/strategies/jwt.strategy.ts +2 -4
  263. package/src/module/dashboard/dashboard.module.ts +3 -3
  264. package/src/module/dashboard/service/dashboard.service.ts +3 -2
  265. package/src/module/enterprise/controller/organization.controller.ts +4 -60
  266. package/src/module/enterprise/enterprise.module.ts +18 -16
  267. package/src/module/enterprise/entity/enterprise.entity.ts +11 -5
  268. package/src/module/enterprise/entity/organization-app-mapping.entity.ts +4 -18
  269. package/src/module/enterprise/entity/organization.entity.ts +59 -9
  270. package/src/module/enterprise/repository/enterprise.repository.ts +4 -26
  271. package/src/module/enterprise/service/brand.service.ts +5 -75
  272. package/src/module/enterprise/service/enterprise.service.ts +4 -10
  273. package/src/module/enterprise/service/organization.service.ts +23 -140
  274. package/src/module/entity_json/controller/entity_json.controller.ts +13 -0
  275. package/src/module/entity_json/docs/FlatJson_Filterin_System.md +2804 -0
  276. package/src/module/entity_json/entity/entityJson.entity.ts +4 -1
  277. package/src/module/entity_json/entity_json.module.ts +9 -5
  278. package/src/module/entity_json/service/entity_json.service.ts +232 -49
  279. package/src/module/filter/controller/filter.controller.ts +1 -3
  280. package/src/module/filter/filter.module.ts +12 -3
  281. package/src/module/filter/service/filter.service.ts +130 -73
  282. package/src/module/filter/service/flatjson-filter.service.ts +903 -0
  283. package/src/module/filter/service/saved-filter.service.ts +16 -26
  284. package/src/module/filter/test/flatjson-filter.service.spec.ts +415 -0
  285. package/src/module/integration/service/integration.service.ts +6 -2
  286. package/src/module/integration/service/wrapper.service.ts +1 -0
  287. package/src/module/layout/controller/layout.controller.ts +8 -1
  288. package/src/module/layout/entity/header-section.entity.ts +6 -0
  289. package/src/module/layout/layout.module.ts +1 -1
  290. package/src/module/layout/repository/header-section.repository.ts +6 -0
  291. package/src/module/layout/service/header-section.service.ts +1 -1
  292. package/src/module/linked_attributes/controller/linked_attributes.controller.ts +100 -0
  293. package/src/module/linked_attributes/dto/create-linked-attribute-smart.dto.ts +54 -0
  294. package/src/module/linked_attributes/linked_attributes.module.ts +9 -2
  295. package/src/module/linked_attributes/service/linked_attributes.service.ts +578 -3
  296. package/src/module/linked_attributes/test/linked-attributes.service.spec.ts +244 -0
  297. package/src/module/listmaster/service/list-master.service.ts +9 -1
  298. package/src/module/meta/controller/meta.controller.ts +25 -3
  299. package/src/module/meta/entity/app-master.entity.ts +9 -22
  300. package/src/module/meta/entity/entity-master.entity.ts +9 -3
  301. package/src/module/meta/entity.module.ts +6 -5
  302. package/src/module/meta/repository/app-master.repository.ts +1 -1
  303. package/src/module/meta/service/attribute-master.service.ts +31 -1
  304. package/src/module/meta/service/entity-master.service.ts +1 -0
  305. package/src/module/meta/service/entity-relation.service.ts +10 -6
  306. package/src/module/meta/service/entity-service-impl.service.ts +14 -19
  307. package/src/module/meta/service/entity-table.service.ts +28 -20
  308. package/src/module/meta/service/entity.service.ts +0 -1
  309. package/src/module/{enterprise → meta}/service/populate-meta.service.ts +5 -2
  310. package/src/module/meta/service/resolver.service.ts +4 -0
  311. package/src/module/module/controller/menu.controller.ts +2 -2
  312. package/src/module/module/controller/module-access.controller.ts +11 -16
  313. package/src/module/module/entity/menu.entity.ts +7 -17
  314. package/src/module/module/entity/module-access.entity.ts +1 -41
  315. package/src/module/module/entity/module-action.entity.ts +4 -11
  316. package/src/module/module/entity/module.entity.ts +14 -7
  317. package/src/module/module/module.module.ts +3 -2
  318. package/src/module/module/repository/menu.repository.ts +31 -19
  319. package/src/module/module/repository/module-access.repository.ts +60 -97
  320. package/src/module/module/service/menu.service.ts +13 -11
  321. package/src/module/module/service/module-access.service.ts +38 -26
  322. package/src/module/notification/entity/notification.entity.ts +3 -53
  323. package/src/module/notification/notification.module.ts +2 -0
  324. package/src/module/notification/service/notification.service.ts +1 -0
  325. package/src/module/notification/service/otp.service.ts +2 -3
  326. package/src/module/user/controller/login.controller.ts +8 -7
  327. package/src/module/user/controller/user.controller.ts +9 -0
  328. package/src/module/user/dto/create-user.dto.ts +6 -19
  329. package/src/module/user/entity/role.entity.ts +16 -62
  330. package/src/module/user/entity/user-role-mapping.entity.ts +3 -29
  331. package/src/module/user/entity/user-session.entity.ts +4 -3
  332. package/src/module/user/entity/user.entity.ts +13 -54
  333. package/src/module/user/repository/role.repository.ts +12 -24
  334. package/src/module/user/repository/user-role-mapping.repository.ts +1 -5
  335. package/src/module/user/repository/user.repository.ts +8 -28
  336. package/src/module/user/repository/userSession.repository.ts +1 -5
  337. package/src/module/user/service/login.service.ts +51 -47
  338. package/src/module/user/service/role.service.ts +60 -53
  339. package/src/module/user/service/user-role-mapping.service.ts +1 -23
  340. package/src/module/user/service/user-session.service.ts +6 -12
  341. package/src/module/user/service/user.service.ts +91 -64
  342. package/src/module/user/user.module.ts +5 -3
  343. package/src/module/workflow/repository/action-data.repository.ts +8 -6
  344. package/src/module/workflow/repository/action.repository.ts +11 -11
  345. package/src/module/workflow/repository/form-master.repository.ts +2 -2
  346. package/src/module/workflow/service/action-data.service.ts +2 -3
  347. package/src/module/workflow/service/action.service.ts +2 -2
  348. package/src/module/workflow/service/comm-template.service.ts +2 -0
  349. package/src/module/workflow/service/entity-modification.service.ts +1 -0
  350. package/src/module/workflow/service/form-master.service.ts +2 -2
  351. package/src/module/workflow/service/populate-workflow.service.ts +1 -1
  352. package/src/module/workflow/service/task.service.ts +3 -0
  353. package/src/module/workflow/service/workflow-meta.service.ts +7 -2
  354. package/src/module/workflow/service/workflow.service.ts +2 -2
  355. package/src/module/workflow/workflow.module.ts +0 -2
  356. package/src/module/workflow-automation/service/workflow-automation.service.ts +7 -19
  357. package/src/module/workflow-automation/workflow-automation.module.ts +3 -4
  358. package/src/module/workflow-schedule/service/workflow-schedule.service.ts +2 -0
  359. package/src/resources/dev.properties.yaml +2 -2
  360. package/.claude/settings.local.json +0 -26
  361. package/.idea/250218_nodejs_core.iml +0 -9
  362. package/.idea/codeStyles/Project.xml +0 -59
  363. package/.idea/codeStyles/codeStyleConfig.xml +0 -5
  364. package/.idea/copilot.data.migration.agent.xml +0 -6
  365. package/.idea/copilot.data.migration.ask.xml +0 -6
  366. package/.idea/copilot.data.migration.ask2agent.xml +0 -6
  367. package/.idea/copilot.data.migration.edit.xml +0 -6
  368. package/.idea/inspectionProfiles/Project_Default.xml +0 -6
  369. package/.idea/misc.xml +0 -6
  370. package/.idea/modules.xml +0 -8
  371. package/.idea/prettier.xml +0 -6
  372. package/.idea/vcs.xml +0 -6
  373. package/dist/constant/status.constant.d.ts +0 -4
  374. package/dist/constant/status.constant.js +0 -9
  375. package/dist/constant/status.constant.js.map +0 -1
  376. package/dist/module/enterprise/controller/enterprise.controller.d.ts +0 -12
  377. package/dist/module/enterprise/controller/enterprise.controller.js +0 -57
  378. package/dist/module/enterprise/controller/enterprise.controller.js.map +0 -1
  379. package/dist/module/enterprise/controller/meta.controller.d.ts +0 -9
  380. package/dist/module/enterprise/controller/meta.controller.js +0 -43
  381. package/dist/module/enterprise/controller/meta.controller.js.map +0 -1
  382. package/dist/module/enterprise/service/brand-profile.service.d.ts +0 -0
  383. package/dist/module/enterprise/service/brand-profile.service.js +0 -1
  384. package/dist/module/enterprise/service/brand-profile.service.js.map +0 -1
  385. package/dist/module/enterprise/service/populate-meta.service.d.ts +0 -9
  386. package/dist/module/enterprise/service/populate-meta.service.js.map +0 -1
  387. package/dist/module/enterprise/service/school.service.d.ts +0 -0
  388. package/dist/module/enterprise/service/school.service.js +0 -1
  389. package/dist/module/enterprise/service/school.service.js.map +0 -1
  390. package/server.log +0 -850
  391. package/src/constant/status.constant.ts +0 -4
  392. package/src/module/enterprise/controller/enterprise.controller.ts +0 -40
  393. package/src/module/enterprise/controller/meta.controller.ts +0 -23
  394. package/src/module/enterprise/service/brand-profile.service.ts +0 -10
  395. package/src/module/enterprise/service/school.service.ts +0 -5
@@ -1 +1 @@
1
- {"version":3,"file":"user.repository.js","sourceRoot":"","sources":["../../../../src/module/user/repository/user.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,qCAAqC;AACrC,uDAAiD;AACjD,2CAA4C;AAC5C,6CAAmD;AAG5C,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YACsC,cAAoC;QAApC,mBAAc,GAAd,cAAc,CAAsB;IACtE,CAAC;IAEL,KAAK,CAAC,QAAQ,CAAC,MAAc;QAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,KAAa,EACb,aAAsB,EACtB,UAAoB;QAEpB,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAExB,MAAM,KAAK,GAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QAEvC,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YAChC,KAAK,CAAC,aAAa,GAAG,aAAa,CAAC;QACtC,CAAC;QAED,MAAM,OAAO,GAAQ,EAAE,KAAK,EAAE,CAAC;QAE/B,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,CAAC,SAAS,GAAG;gBAClB,QAAQ,EAAE,IAAI;aACf,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,MAAc,EACd,aAAsB,EACtB,OAAgB;QAEhB,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEzB,MAAM,KAAK,GAAQ,EAAE,MAAM,EAAE,CAAC;QAC9B,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YAChC,KAAK,CAAC,aAAa,GAAG,aAAa,CAAC;QACtC,CAAC;QACD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;QAC1B,CAAC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAc;QAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAU,EAAE,IAAc;QACzC,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAY;QACrB,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC;CACF,CAAA;AA9DY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,sBAAQ,CAAC,CAAA;qCAAyB,oBAAU;GAFrD,cAAc,CA8D1B"}
1
+ {"version":3,"file":"user.repository.js","sourceRoot":"","sources":["../../../../src/module/user/repository/user.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,qCAAqC;AACrC,uDAAiD;AACjD,2CAA4C;AAC5C,6CAAmD;AAG5C,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YACsC,cAAoC;QAApC,mBAAc,GAAd,cAAc,CAAsB;IACvE,CAAC;IAEJ,KAAK,CAAC,QAAQ,CAAC,MAAc;QAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IAChE,CAAC;IACD,KAAK,CAAC,aAAa,CACjB,KAAa,EACb,eAAwB;QAExB,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAExB,MAAM,KAAK,GAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QACvC,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;YAClC,KAAK,CAAC,eAAe,GAAG,eAAe,CAAC;QAC1C,CAAC;QACD,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,MAAc,EACd,eAAwB,EACxB,OAAgB;QAEhB,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEzB,MAAM,KAAK,GAAQ,EAAE,MAAM,EAAE,CAAC;QAC9B,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;YAClC,KAAK,CAAC,eAAe,GAAG,eAAe,CAAC;QAC1C,CAAC;QACD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;QAC1B,CAAC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAc;QAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;CACF,CAAA;AA1CY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,sBAAQ,CAAC,CAAA;qCAAyB,oBAAU;GAFrD,cAAc,CA0C1B"}
@@ -6,6 +6,5 @@ export declare class UserSessionRepository {
6
6
  findBySessionKey(sessionKey: string): Promise<UserSession | null>;
7
7
  findActiveSessionByUserId(userId: number): Promise<UserSession | null>;
8
8
  saveSession(session: UserSession): Promise<UserSession>;
9
- fetchUserFcmToken(user_id: number): Promise<UserSession | null>;
10
9
  logoutSession(sessionKey: string): Promise<void>;
11
10
  }
@@ -32,9 +32,6 @@ let UserSessionRepository = class UserSessionRepository {
32
32
  async saveSession(session) {
33
33
  return this.userSessionRepo.save(session);
34
34
  }
35
- async fetchUserFcmToken(user_id) {
36
- return await this.userSessionRepo.findOne({ where: { user_id }, select: ['fcm_token'], order: { login_time: 'DESC' } });
37
- }
38
35
  async logoutSession(sessionKey) {
39
36
  await this.userSessionRepo.update({ session_key: sessionKey }, { is_session_loggedout: 1, logout_time: new Date() });
40
37
  }
@@ -1 +1 @@
1
- {"version":3,"file":"userSession.repository.js","sourceRoot":"","sources":["../../../../src/module/user/repository/userSession.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qCAAqC;AACrC,uEAA4D;AAC5D,2CAA4C;AAC5C,6CAAmD;AAG5C,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAChC,YAEU,eAAwC;QAAxC,oBAAe,GAAf,eAAe,CAAyB;IAC9C,CAAC;IAEL,KAAK,CAAC,gBAAgB,CAAC,UAAkB;QACvC,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;IAC9E,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,MAAc;QAC5C,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC;YAClC,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAC,EAAE;SACpD,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAoB;QACpC,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAAe;QACrC,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IAC1H,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,UAAkB;QACpC,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAC/B,EAAE,WAAW,EAAE,UAAU,EAAE,EAC3B,EAAE,oBAAoB,EAAE,CAAC,EAAE,WAAW,EAAE,IAAI,IAAI,EAAE,EAAE,CACrD,CAAC;IACJ,CAAC;CACF,CAAA;AA9BY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,iCAAW,CAAC,CAAA;qCACL,oBAAU;GAH1B,qBAAqB,CA8BjC"}
1
+ {"version":3,"file":"userSession.repository.js","sourceRoot":"","sources":["../../../../src/module/user/repository/userSession.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qCAAqC;AACrC,uEAA4D;AAC5D,2CAA4C;AAC5C,6CAAmD;AAG5C,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAChC,YAEU,eAAwC;QAAxC,oBAAe,GAAf,eAAe,CAAyB;IAC/C,CAAC;IAEJ,KAAK,CAAC,gBAAgB,CAAC,UAAkB;QACvC,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;IAC9E,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,MAAc;QAC5C,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC;YAClC,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAC,EAAE;SACpD,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAoB;QACpC,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,UAAkB;QACpC,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAC/B,EAAE,WAAW,EAAE,UAAU,EAAE,EAC3B,EAAE,oBAAoB,EAAE,CAAC,EAAE,WAAW,EAAE,IAAI,IAAI,EAAE,EAAE,CACrD,CAAC;IACJ,CAAC;CACF,CAAA;AA1BY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,iCAAW,CAAC,CAAA;qCACL,oBAAU;GAH1B,qBAAqB,CA0BjC"}
@@ -1,20 +1,22 @@
1
1
  import { ConfigService } from '@nestjs/config';
2
+ import { OrganizationRepository } from 'src/module/enterprise/repository/organization.repository';
3
+ import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
2
4
  import { Repository } from 'typeorm';
3
5
  import { UserRoleMapping } from '../entity/user-role-mapping.entity';
4
6
  import { UserSessionService } from './user-session.service';
5
7
  import { UserService } from './user.service';
6
8
  import { JwtAuthService } from 'src/module/auth/services/jwt.service';
7
9
  import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
8
- import { EnterpriseRepository } from 'src/module/enterprise/repository/enterprise.repository';
9
10
  export declare class LoginService {
10
11
  private readonly userService;
11
12
  private userSessionService;
12
13
  private configService;
13
14
  private readonly userRoleMappingRepository;
14
- private readonly enterpriseRepository;
15
+ private readonly organizationRepository;
16
+ private readonly listMasterService;
15
17
  private readonly jwtAuthService;
16
18
  private readonly reflectionHelper;
17
- constructor(userService: UserService, userSessionService: UserSessionService, configService: ConfigService, userRoleMappingRepository: Repository<UserRoleMapping>, enterpriseRepository: EnterpriseRepository, jwtAuthService: JwtAuthService, reflectionHelper: ReflectionHelper);
19
+ constructor(userService: UserService, userSessionService: UserSessionService, configService: ConfigService, userRoleMappingRepository: Repository<UserRoleMapping>, organizationRepository: OrganizationRepository, listMasterService: ListMasterService, jwtAuthService: JwtAuthService, reflectionHelper: ReflectionHelper);
18
20
  masterKey: string;
19
21
  masterIv: string;
20
22
  login(data: {
@@ -17,6 +17,8 @@ const common_1 = require("@nestjs/common");
17
17
  const config_1 = require("@nestjs/config");
18
18
  const typeorm_1 = require("@nestjs/typeorm");
19
19
  const global_constant_1 = require("../../../constant/global.constant");
20
+ const organization_repository_1 = require("../../enterprise/repository/organization.repository");
21
+ const list_master_service_1 = require("../../listmaster/service/list-master.service");
20
22
  const typeorm_2 = require("typeorm");
21
23
  const encryptUtil_service_1 = require("../../../utils/service/encryptUtil.service");
22
24
  const user_role_mapping_entity_1 = require("../entity/user-role-mapping.entity");
@@ -24,15 +26,14 @@ const user_session_service_1 = require("./user-session.service");
24
26
  const user_service_1 = require("./user.service");
25
27
  const jwt_service_1 = require("../../auth/services/jwt.service");
26
28
  const reflection_helper_service_1 = require("../../../utils/service/reflection-helper.service");
27
- const enterprise_repository_1 = require("../../enterprise/repository/enterprise.repository");
28
- const status_constant_1 = require("../../../constant/status.constant");
29
29
  let LoginService = class LoginService {
30
- constructor(userService, userSessionService, configService, userRoleMappingRepository, enterpriseRepository, jwtAuthService, reflectionHelper) {
30
+ constructor(userService, userSessionService, configService, userRoleMappingRepository, organizationRepository, listMasterService, jwtAuthService, reflectionHelper) {
31
31
  this.userService = userService;
32
32
  this.userSessionService = userSessionService;
33
33
  this.configService = configService;
34
34
  this.userRoleMappingRepository = userRoleMappingRepository;
35
- this.enterpriseRepository = enterpriseRepository;
35
+ this.organizationRepository = organizationRepository;
36
+ this.listMasterService = listMasterService;
36
37
  this.jwtAuthService = jwtAuthService;
37
38
  this.reflectionHelper = reflectionHelper;
38
39
  this.masterKey = this.configService.get('MASTER_KEY') || '';
@@ -40,30 +41,31 @@ let LoginService = class LoginService {
40
41
  }
41
42
  async login(data) {
42
43
  const { email_id, password, is_otp = false, subdomain } = data;
43
- let enterprise;
44
+ let organization;
44
45
  if (subdomain) {
45
- enterprise =
46
- await this.enterpriseRepository.findEnterpriseBySubdomain(subdomain);
47
- if (!enterprise) {
46
+ organization =
47
+ await this.organizationRepository.findOrganizationBySubdomain(subdomain);
48
+ if (!organization) {
48
49
  return {
49
50
  success: false,
50
- message: 'Enterprise not found.',
51
+ message: 'Organization not found.',
51
52
  };
52
53
  }
53
54
  }
54
- const user = await this.userService.findByEmailId(email_id, enterprise?.id, true);
55
- if (!user || (enterprise && user.enterprise_id !== enterprise.id)) {
55
+ const user = await this.userService.findByEmailId(email_id, organization?.id);
56
+ if (!user || (organization && user.organization_id !== organization.id)) {
56
57
  return {
57
58
  success: false,
58
- message: 'User not found in Enterprise.',
59
+ message: 'User not found in organization.',
59
60
  };
60
61
  }
61
- const userOrgData = await this.enterpriseRepository.findById(user.enterprise_id);
62
- if (user.status != status_constant_1.StatusConstant.ACTIVE ||
63
- userOrgData?.status != status_constant_1.StatusConstant.ACTIVE) {
62
+ const userOrgData = await this.organizationRepository.findOrganizationById(user.organization_id);
63
+ const resolveStatus = await this.listMasterService.getResolvedListCode(global_constant_1.STATUS_ACTIVE, user?.organization_id || 0);
64
+ if (user.status != resolveStatus.id ||
65
+ userOrgData?.status != resolveStatus.id) {
64
66
  return {
65
67
  success: false,
66
- message: 'Your account or Enterprise is inactive. Please contact admin.',
68
+ message: 'Your account or organization is inactive. Please contact admin.',
67
69
  };
68
70
  }
69
71
  if (!is_otp) {
@@ -76,19 +78,16 @@ let LoginService = class LoginService {
76
78
  };
77
79
  }
78
80
  }
79
- let app_id = user.last_app_access_id;
80
- if (!user.last_app_access_id) {
81
- await this.userService.setDefaultLastAccess(user.id, app_id);
81
+ let appcode = user.last_app_access;
82
+ if (!user.last_app_access || user.last_app_access == '') {
83
+ await this.userService.setDefaultLastAccess(user.id, appcode);
82
84
  }
83
85
  const whereCondition = { user_id: user.id };
84
- if (app_id) {
85
- whereCondition.app_id = app_id;
86
+ if (appcode && appcode !== '') {
87
+ whereCondition.appcode = appcode;
86
88
  }
87
89
  const roleMappings = await this.userRoleMappingRepository.find({
88
90
  where: whereCondition,
89
- relations: {
90
- app: true
91
- }
92
91
  });
93
92
  if (!roleMappings.length) {
94
93
  return {
@@ -97,15 +96,16 @@ let LoginService = class LoginService {
97
96
  };
98
97
  }
99
98
  const defaultAccess = await this.getDefaultAccess(user, roleMappings);
100
- await this.userService.setLastLevelTypeAndId(user.id, defaultAccess.level_type, defaultAccess.level_id, defaultAccess.app_id);
101
- const token = await this.userSessionService.createSession(user, defaultAccess.app_id, defaultAccess, defaultAccess.appcode);
99
+ await this.userService.setLastLevelTypeAndId(user.id, defaultAccess.level_type, defaultAccess.level_id, defaultAccess.appcode);
100
+ const token = await this.userSessionService.createSession(user, defaultAccess.appcode, defaultAccess);
101
+ const resolvedInvitationStatus = await this.listMasterService.getResolvedListCode(global_constant_1.INVITATION_STATUS_ACCEPTED, user?.organization_id || 0);
102
102
  if (user.is_firstlogin === 1) {
103
- user.invitation_status = global_constant_1.INVITATION_STATUS_ACCEPTED;
103
+ user.invitation_status = resolvedInvitationStatus.id;
104
104
  user.is_firstlogin = 0;
105
105
  const { password, ...userWithoutPassword } = user;
106
- await this.userService.updateUser(user.id, userWithoutPassword, user);
106
+ await this.userService.updateEntity(userWithoutPassword, user);
107
107
  }
108
- const org = await this.enterpriseRepository.findById(user.enterprise_id);
108
+ const org = await this.organizationRepository.findOrganizationById(user.organization_id);
109
109
  let slug;
110
110
  if (org) {
111
111
  slug = org.slug;
@@ -113,22 +113,21 @@ let LoginService = class LoginService {
113
113
  else {
114
114
  return {
115
115
  success: false,
116
- message: 'Enterprise not found for the user.',
116
+ message: 'Organization not found for the user.',
117
117
  };
118
118
  }
119
119
  return {
120
120
  success: true,
121
121
  accessToken: token,
122
- app_id: defaultAccess.app_id,
122
+ appcode: defaultAccess.appcode,
123
123
  level_type: defaultAccess.level_type,
124
124
  level_id: defaultAccess.level_id,
125
125
  slug: slug,
126
- appcode: defaultAccess.appcode
127
126
  };
128
127
  }
129
128
  async formLogin(body) {
130
129
  if (body) {
131
- const { entity_id } = body;
130
+ const { entity_type, entity_id } = body;
132
131
  const leadRepo = this.reflectionHelper.getRepoService('CRMLead');
133
132
  const entityData = await leadRepo.findOne({
134
133
  where: { id: entity_id },
@@ -136,11 +135,11 @@ let LoginService = class LoginService {
136
135
  if (entityData) {
137
136
  const level_id = entityData.level_id;
138
137
  const level_type = entityData.level_type;
139
- const enterprise_id = entityData.enterprise_id;
138
+ const organization_id = entityData.organization_id;
140
139
  const token = this.jwtAuthService.generateJwt({
141
140
  level_id: level_id,
142
141
  level_type: level_type,
143
- enterprise_id: enterprise_id,
142
+ organization_id: organization_id,
144
143
  });
145
144
  return {
146
145
  success: true,
@@ -154,7 +153,7 @@ let LoginService = class LoginService {
154
153
  const brnAccesses = roleMappings.filter((r) => r.level_type === 'BRN');
155
154
  const schAccesses = roleMappings.filter((r) => r.level_type === 'SCH');
156
155
  let validURM;
157
- validURM = roleMappings.some((r) => r.level_type == 'ORG' && r.level_id == user.enterprise_id);
156
+ validURM = roleMappings.some((r) => r.level_type == 'ORG' && r.level_id == user.organization_id);
158
157
  if (!validURM) {
159
158
  validURM = roleMappings.some((r) => r.level_type === user.last_level_type &&
160
159
  r.level_id === user.last_level_id);
@@ -163,16 +162,14 @@ let LoginService = class LoginService {
163
162
  return {
164
163
  level_type: user.last_level_type,
165
164
  level_id: user.last_level_id,
166
- app_id: user.last_app_access_id,
167
- appcode: user.last_app.code
165
+ appcode: user.last_app_access,
168
166
  };
169
167
  }
170
168
  if (orgAccess) {
171
169
  return {
172
170
  level_type: 'ORG',
173
171
  level_id: orgAccess.level_id,
174
- app_id: orgAccess.app_id,
175
- appcode: orgAccess.app.code
172
+ appcode: orgAccess.appcode,
176
173
  };
177
174
  }
178
175
  if (brnAccesses.length) {
@@ -190,7 +187,7 @@ let LoginService = class LoginService {
190
187
  return {
191
188
  level_type: 'SCH',
192
189
  level_id: rows.id,
193
- app_id: brnAccesses[0].app_id,
190
+ appcode: brnAccesses[0].appcode,
194
191
  };
195
192
  }
196
193
  else {
@@ -201,7 +198,7 @@ let LoginService = class LoginService {
201
198
  return {
202
199
  level_type: 'SCH',
203
200
  level_id: schAccesses[0].level_id,
204
- app_id: schAccesses[0].app_id,
201
+ appcode: schAccesses[0].appcode,
205
202
  };
206
203
  }
207
204
  throw new common_1.BadRequestException('User does not have ORG, BRN, or SCH access for this app.');
@@ -232,11 +229,13 @@ exports.LoginService = LoginService = __decorate([
232
229
  (0, common_1.Injectable)(),
233
230
  __param(0, (0, common_1.Inject)('UserService')),
234
231
  __param(3, (0, typeorm_1.InjectRepository)(user_role_mapping_entity_1.UserRoleMapping)),
232
+ __param(5, (0, common_1.Inject)('ListMasterService')),
235
233
  __metadata("design:paramtypes", [user_service_1.UserService,
236
234
  user_session_service_1.UserSessionService,
237
235
  config_1.ConfigService,
238
236
  typeorm_2.Repository,
239
- enterprise_repository_1.EnterpriseRepository,
237
+ organization_repository_1.OrganizationRepository,
238
+ list_master_service_1.ListMasterService,
240
239
  jwt_service_1.JwtAuthService,
241
240
  reflection_helper_service_1.ReflectionHelper])
242
241
  ], LoginService);
@@ -1 +1 @@
1
- {"version":3,"file":"login.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/login.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"login.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/login.service.ts"],"names":[],"mappings":"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"}
@@ -1,38 +1,25 @@
1
+ import { EntityServiceImpl } from '../../meta/service/entity-service-impl.service';
2
+ import { BaseEntity } from '../../meta/entity/base-entity.entity';
1
3
  import { UserData } from '../entity/user.entity';
2
4
  import { Role } from '../entity/role.entity';
3
5
  import { RoleRepository } from '../repository/role.repository';
4
- import { Repository } from 'typeorm';
6
+ import { EntityManager, Repository } from 'typeorm';
5
7
  import { ModuleAccess } from '../../module/entity/module-access.entity';
8
+ import { ServiceResult } from 'src/dtos/response';
9
+ import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
6
10
  import { UserRoleMapping } from '../entity/user-role-mapping.entity';
7
- export declare class RoleService {
11
+ export declare class RoleService extends EntityServiceImpl {
8
12
  private readonly roleRepository;
13
+ private readonly entityManager;
9
14
  private readonly moduleAccessRepo;
15
+ private readonly listMasterService;
10
16
  private readonly userRoleMappingRepo;
11
- constructor(roleRepository: RoleRepository, moduleAccessRepo: Repository<ModuleAccess>, userRoleMappingRepo: Repository<UserRoleMapping>);
12
- createRole(role: Role, loggedInUser: UserData): Promise<{
13
- success: boolean;
14
- error: string;
15
- data?: undefined;
16
- } | {
17
- success: boolean;
18
- data: Role;
19
- error?: undefined;
20
- }>;
21
- updateRole(id: number, role: Role, loggedInUser: UserData): Promise<{
22
- success: boolean;
23
- error: string;
24
- data?: undefined;
25
- } | {
26
- success: boolean;
27
- data: import("typeorm").UpdateResult;
28
- error?: undefined;
29
- }>;
17
+ constructor(roleRepository: RoleRepository, entityManager: EntityManager, moduleAccessRepo: Repository<ModuleAccess>, listMasterService: ListMasterService, userRoleMappingRepo: Repository<UserRoleMapping>);
18
+ createEntity(entityData: BaseEntity, loggedInUser: UserData): Promise<ServiceResult<BaseEntity>>;
19
+ updateEntity(entityData: BaseEntity, loggedInUser: UserData): Promise<ServiceResult<BaseEntity>>;
30
20
  getDefaultRole(data: {
31
21
  is_factory?: boolean;
32
22
  level_id?: number;
33
23
  level_type?: string;
34
24
  }): Promise<Role[] | null>;
35
- findByCode(code: string): Promise<Role | null>;
36
- findById(id: number): Promise<Role | null>;
37
- find(options: any): Promise<Role[]>;
38
25
  }
@@ -14,42 +14,43 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  exports.RoleService = void 0;
16
16
  const common_1 = require("@nestjs/common");
17
- const role_entity_1 = require("../entity/role.entity");
17
+ const entity_service_impl_service_1 = require("../../meta/service/entity-service-impl.service");
18
18
  const global_constant_1 = require("../../../constant/global.constant");
19
19
  const role_repository_1 = require("../repository/role.repository");
20
20
  const typeorm_1 = require("typeorm");
21
21
  const typeorm_2 = require("@nestjs/typeorm");
22
22
  const module_access_entity_1 = require("../../module/entity/module-access.entity");
23
+ const list_master_service_1 = require("../../listmaster/service/list-master.service");
23
24
  const user_role_mapping_entity_1 = require("../entity/user-role-mapping.entity");
24
- const class_transformer_1 = require("class-transformer");
25
- const status_constant_1 = require("../../../constant/status.constant");
26
- let RoleService = class RoleService {
27
- constructor(roleRepository, moduleAccessRepo, userRoleMappingRepo) {
25
+ let RoleService = class RoleService extends entity_service_impl_service_1.EntityServiceImpl {
26
+ constructor(roleRepository, entityManager, moduleAccessRepo, listMasterService, userRoleMappingRepo) {
27
+ super();
28
28
  this.roleRepository = roleRepository;
29
+ this.entityManager = entityManager;
29
30
  this.moduleAccessRepo = moduleAccessRepo;
31
+ this.listMasterService = listMasterService;
30
32
  this.userRoleMappingRepo = userRoleMappingRepo;
31
33
  }
32
- async createRole(role, loggedInUser) {
33
- role.level_type = role.level_type || loggedInUser.level_type;
34
- role.level_id = role.level_id || loggedInUser.level_id;
35
- role.created_by = loggedInUser.id;
36
- role.enterprise_id = loggedInUser.enterprise_id;
34
+ async createEntity(entityData, loggedInUser) {
35
+ const role = entityData;
36
+ role.level_type = entityData.level_type || loggedInUser.level_type;
37
+ role.level_id = entityData.level_id || loggedInUser.level_id;
38
+ role.appcode = entityData.appcode || loggedInUser.appcode;
37
39
  if (await this.roleRepository.isRoleNameWithLevelExists(role.name, {
38
- enterprise_id: loggedInUser.enterprise_id,
39
- level_type: role.level_type || loggedInUser?.level_type,
40
- level_id: parseInt(role.level_id) ||
40
+ organization_id: loggedInUser?.organization_id || undefined,
41
+ level_type: entityData.level_type || loggedInUser?.level_type,
42
+ level_id: parseInt(entityData.level_id) ||
41
43
  parseInt(loggedInUser?.level_id || '', 10),
42
44
  })) {
43
45
  return { success: false, error: 'Role name already exists.' };
44
46
  }
45
47
  const sourceRole = role.copy_from_role_id
46
- ? await this.roleRepository.findById(role.copy_from_role_id)
48
+ ? await this.getEntityData(global_constant_1.ENTITYTYPE_ROLE, role.copy_from_role_id, loggedInUser)
47
49
  : null;
48
50
  if (role.copy_from_role_id && !sourceRole) {
49
51
  return { success: false, error: 'Source role not found.' };
50
52
  }
51
- role.status = status_constant_1.StatusConstant.ACTIVE;
52
- const savedRole = await this.roleRepository.saveRole(role);
53
+ const savedRole = await super.createEntity(role, loggedInUser);
53
54
  if (sourceRole) {
54
55
  const sourcePermissions = await this.moduleAccessRepo.find({
55
56
  where: { role_code: sourceRole.code },
@@ -66,23 +67,25 @@ let RoleService = class RoleService {
66
67
  }
67
68
  return { success: true, data: savedRole };
68
69
  }
69
- async updateRole(id, role, loggedInUser) {
70
- if (!role.name) {
70
+ async updateEntity(entityData, loggedInUser) {
71
+ if (!entityData.name) {
71
72
  return { success: false, error: 'Role name is required' };
72
73
  }
73
- if (role.status == global_constant_1.STATUS_INACTIVE) {
74
- const existingRole = await this.roleRepository.findById(id);
74
+ const role = entityData;
75
+ const resolveStatus = await this.listMasterService.getResolvedListCode(global_constant_1.STATUS_INACTIVE, loggedInUser?.organization_id || 0);
76
+ if (entityData.status == resolveStatus.id) {
77
+ const existingRole = await this.getEntityData(global_constant_1.ENTITYTYPE_ROLE, entityData.id, loggedInUser);
75
78
  if (!existingRole) {
76
79
  return { success: false, error: 'Role not found' };
77
80
  }
78
81
  const associatedUsers = await this.userRoleMappingRepo
79
- .createQueryBuilder('map')
80
- .innerJoin('sso_user', 'usr', 'map.user_id = usr.id')
81
- .where('usr.status::text = :status', { status: status_constant_1.StatusConstant.INACTIVE })
82
- .andWhere('map.role_id::text = :roleId', {
82
+ .createQueryBuilder("map")
83
+ .innerJoin("sso_user", "usr", "map.user_id = usr.id")
84
+ .where("usr.status::text = :status", { status: String(resolveStatus.id) })
85
+ .andWhere("map.role_id::text = :roleId", {
83
86
  roleId: String(existingRole?.id),
84
87
  })
85
- .select('map')
88
+ .select("map")
86
89
  .getRawMany();
87
90
  if (associatedUsers.length > 0) {
88
91
  return {
@@ -97,9 +100,9 @@ let RoleService = class RoleService {
97
100
  };
98
101
  }
99
102
  }
100
- if (await this.roleRepository.isRoleNameExists(role.name, {
101
- excludeRoleId: role.id,
102
- enterprise_id: loggedInUser?.enterprise_id,
103
+ if (await this.roleRepository.isRoleNameExists(entityData.name, {
104
+ excludeRoleId: entityData.id,
105
+ organization_id: loggedInUser?.organization_id,
103
106
  })) {
104
107
  return {
105
108
  success: false,
@@ -107,10 +110,9 @@ let RoleService = class RoleService {
107
110
  };
108
111
  }
109
112
  const { copy_from_role_id, ...persistableData } = role;
110
- const entity = (0, class_transformer_1.plainToInstance)(role_entity_1.Role, persistableData);
111
- const updatedRole = await this.roleRepository.updateRole(id, entity);
113
+ const updatedRole = await super.updateEntity(persistableData, loggedInUser);
112
114
  if (role.copy_from_role_id) {
113
- const sourceRole = await this.roleRepository.findById(role.copy_from_role_id);
115
+ const sourceRole = await this.getEntityData(global_constant_1.ENTITYTYPE_ROLE, role.copy_from_role_id, loggedInUser);
114
116
  if (!sourceRole) {
115
117
  return {
116
118
  success: false,
@@ -136,23 +138,17 @@ let RoleService = class RoleService {
136
138
  async getDefaultRole(data) {
137
139
  return await this.roleRepository.find(data);
138
140
  }
139
- async findByCode(code) {
140
- return await this.roleRepository.findByCode(code);
141
- }
142
- async findById(id) {
143
- return await this.roleRepository.findById(id);
144
- }
145
- async find(options) {
146
- return await this.roleRepository.findRoles(options);
147
- }
148
141
  };
149
142
  exports.RoleService = RoleService;
150
143
  exports.RoleService = RoleService = __decorate([
151
144
  (0, common_1.Injectable)(),
152
- __param(1, (0, typeorm_2.InjectRepository)(module_access_entity_1.ModuleAccess)),
153
- __param(2, (0, typeorm_2.InjectRepository)(user_role_mapping_entity_1.UserRoleMapping)),
145
+ __param(2, (0, typeorm_2.InjectRepository)(module_access_entity_1.ModuleAccess)),
146
+ __param(3, (0, common_1.Inject)('ListMasterService')),
147
+ __param(4, (0, typeorm_2.InjectRepository)(user_role_mapping_entity_1.UserRoleMapping)),
154
148
  __metadata("design:paramtypes", [role_repository_1.RoleRepository,
149
+ typeorm_1.EntityManager,
155
150
  typeorm_1.Repository,
151
+ list_master_service_1.ListMasterService,
156
152
  typeorm_1.Repository])
157
153
  ], RoleService);
158
154
  //# sourceMappingURL=role.service.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/role.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/role.service.ts"],"names":[],"mappings":"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"}
@@ -9,6 +9,4 @@ export declare class UserRoleMappingService {
9
9
  deleteByUserId(userId: number, levelType?: string, levelId?: any): Promise<void>;
10
10
  getUserByIdAndAppCode(userId: number, appCode: string): Promise<UserRoleMapping | null>;
11
11
  getUserByIdAppCodeAndLevel(userId: number, appCode: string, levelType: string, levelId: string): Promise<UserRoleMapping | null>;
12
- find(options: any): Promise<UserRoleMapping[]>;
13
- create(data: any, loggedInUser: any): Promise<UserRoleMapping | null | undefined>;
14
12
  }
@@ -51,12 +51,6 @@ let UserRoleMappingService = class UserRoleMappingService {
51
51
  async getUserByIdAppCodeAndLevel(userId, appCode, levelType, levelId) {
52
52
  return await this.userRoleMappingRepository.findByUserIdAndAppCodeAndLevel(userId, appCode, levelType, levelId);
53
53
  }
54
- async find(options) {
55
- return await this.userRoleMappingRepository.find(options);
56
- }
57
- async create(data, loggedInUser) {
58
- return await this.assignUserRole(data);
59
- }
60
54
  };
61
55
  exports.UserRoleMappingService = UserRoleMappingService;
62
56
  exports.UserRoleMappingService = UserRoleMappingService = __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"user-role-mapping.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/user-role-mapping.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"user-role-mapping.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/user-role-mapping.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2CAA4C;AAC5C,6FAAuF;AAIhF,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACjC,YACmB,yBAAoD;QAApD,8BAAyB,GAAzB,yBAAyB,CAA2B;IACpE,CAAC;IAEJ,KAAK,CAAC,cAAc,CAAC,eAAgC;QACnD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,qBAAqB,CACzE,eAAe,CAAC,OAAO,EACvB,eAAe,CAAC,OAAO,EACvB,eAAe,CAAC,OAAO,EACvB,eAAe,CAAC,QAAQ,EACxB,eAAe,CAAC,UAAU,CAC3B,CAAC;QAEF,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,eAAgC;QAEvD,IAAI,eAAe,CAAC,EAAE,EAAE,CAAC;YACvB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,WAAW,CAC/D,eAAe,CAAC,EAAE,CACnB,CAAC;YACF,IAAI,QAAQ,EAAE,CAAC;gBACb,QAAQ,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC;gBAC3C,QAAQ,CAAC,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC;gBAC7C,QAAQ,CAAC,UAAU,GAAG,eAAe,CAAC,UAAU,CAAC;gBACjD,QAAQ,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC;gBAE3C,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC7D,CAAC;QACH,CAAC;QAGD,MAAM,SAAS,GACb,MAAM,IAAI,CAAC,yBAAyB,CAAC,qBAAqB,CACxD,eAAe,CAAC,OAAO,EACvB,eAAe,CAAC,OAAO,EACvB,eAAe,CAAC,OAAO,EACvB,eAAe,CAAC,QAAQ,EACxB,eAAe,CAAC,UAAU,CAC3B,CAAC;QAEJ,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAAc;QAC/B,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,MAAc,EACd,SAAkB,EAClB,OAAQ;QAER,MAAM,IAAI,CAAC,yBAAyB,CAAC,cAAc,CACjD,MAAM,EACN,SAAS,EACT,OAAO,CACR,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,qBAAqB,CACzB,MAAc,EACd,OAAe;QAEf,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,sBAAsB,CAChE,MAAM,EACN,OAAO,CACR,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,0BAA0B,CAC9B,MAAc,EACd,OAAe,EACf,SAAiB,EACjB,OAAe;QAEf,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,8BAA8B,CACxE,MAAM,EACN,OAAO,EACP,SAAS,EACT,OAAO,CACR,CAAC;IACJ,CAAC;CACF,CAAA;AA3FY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAU,GAAE;qCAGmC,wDAAyB;GAF5D,sBAAsB,CA2FlC"}
@@ -16,10 +16,9 @@ export declare class UserSessionService {
16
16
  private readonly userRoleMappingRepository;
17
17
  private readonly reflectionHelper;
18
18
  constructor(userSessionRepository: UserSessionRepository, jwtAuthService: JwtAuthService, clockIDGenService: ClockIDGenService, configService: ConfigService, userDataRepository: Repository<UserData>, userRoleMappingRepository: Repository<UserRoleMapping>, reflectionHelper: ReflectionHelper);
19
- createSession(user: any, app_id?: number, accessInfo?: any, appcode?: string): Promise<string>;
19
+ createSession(user: any, appcode?: string, accessInfo?: any): Promise<string>;
20
20
  findBySessionKey(sessionKey: string): Promise<UserSession | null>;
21
21
  updateSession(userSession: UserSession): Promise<void>;
22
- fetchUserFcmToken(user_id: number): Promise<UserSession | null>;
23
22
  switchCurrentLevelService(currentUser: any, data: any): Promise<{
24
23
  success: boolean;
25
24
  accessToken: string;