rez_core 4.0.114 → 4.0.116

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 (388) hide show
  1. package/.idea/250218_nodejs_core.iml +11 -8
  2. package/.idea/codeStyles/Project.xml +58 -58
  3. package/.idea/codeStyles/codeStyleConfig.xml +4 -4
  4. package/.idea/inspectionProfiles/Project_Default.xml +1 -1
  5. package/.idea/modules.xml +7 -7
  6. package/.idea/prettier.xml +5 -5
  7. package/.idea/vcs.xml +5 -5
  8. package/.prettierrc +3 -3
  9. package/README.md +99 -99
  10. package/dist/module/auth/guards/role.guard.js +3 -3
  11. package/dist/module/auth/services/auth.service.js +2 -2
  12. package/dist/module/filter/repository/saved-filter.repository.js +4 -4
  13. package/dist/module/filter/service/filter-evaluator.service.js +2 -2
  14. package/dist/module/filter/service/filter.service.js +22 -22
  15. package/dist/module/integration/examples/usage.example.js +9 -9
  16. package/dist/module/integration/service/integration.service.js +1 -1
  17. package/dist/module/integration/service/wrapper.service.js +25 -25
  18. package/dist/module/listmaster/service/list-master-item.service.js +2 -2
  19. package/dist/module/mapper/service/field-mapper.service.js +4 -4
  20. package/dist/module/mapper/service/mapper.service.js +2 -2
  21. package/dist/module/meta/service/entity-dynamic.service.js +9 -9
  22. package/dist/module/meta/service/entity-list.service.js +3 -3
  23. package/dist/module/meta/service/entity-master.service.js +3 -3
  24. package/dist/module/meta/service/entity-relation.service.js +11 -11
  25. package/dist/module/meta/service/entity-service-impl.service.js +3 -3
  26. package/dist/module/meta/service/resolver.service.js +3 -3
  27. package/dist/module/module/repository/menu.repository.js +12 -12
  28. package/dist/module/notification/service/notification.service.js +9 -9
  29. package/dist/module/user/controller/login.controller.js +18 -18
  30. package/dist/module/user/service/login.service.js +13 -5
  31. package/dist/module/user/service/login.service.js.map +1 -1
  32. package/dist/module/user/service/role.service.js +4 -4
  33. package/dist/module/user/service/user-session.service.js +2 -2
  34. package/dist/module/workflow/repository/action.repository.js +20 -20
  35. package/dist/module/workflow/repository/comm-template.repository.js +6 -6
  36. package/dist/module/workflow/repository/form-master.repository.js +2 -2
  37. package/dist/module/workflow/repository/stage-group.repository.js +23 -23
  38. package/dist/module/workflow/repository/stage-movement.repository.js +15 -15
  39. package/dist/module/workflow/repository/stage.repository.js +8 -8
  40. package/dist/module/workflow/service/action-template-mapping.service.js +22 -22
  41. package/dist/module/workflow/service/action.service.js +7 -7
  42. package/dist/module/workflow/service/entity-modification.service.js +6 -6
  43. package/dist/module/workflow/service/stage-group.service.js +2 -2
  44. package/dist/module/workflow/service/stage.service.js +2 -2
  45. package/dist/module/workflow/service/task.service.js +28 -28
  46. package/dist/module/workflow/service/workflow-list-master.service.js +15 -15
  47. package/dist/module/workflow/service/workflow-meta.service.js +35 -35
  48. package/dist/module/workflow/service/workflow.service.js +2 -2
  49. package/dist/tsconfig.build.tsbuildinfo +1 -1
  50. package/dist/utils/service/reflection-helper.service.js +2 -2
  51. package/docs/modules/event-driven-integration-design.md +91 -91
  52. package/docs/modules/integration.md +250 -250
  53. package/eslint.config.mjs +34 -34
  54. package/nest-cli.json +14 -14
  55. package/package.json +119 -119
  56. package/src/app.controller.ts +12 -12
  57. package/src/app.module.ts +52 -52
  58. package/src/app.service.ts +8 -8
  59. package/src/config/config.module.ts +18 -18
  60. package/src/config/database.config.ts +23 -23
  61. package/src/constant/global.constant.ts +67 -67
  62. package/src/core.module.ts +81 -81
  63. package/src/decorators/roles.decorator.ts +7 -7
  64. package/src/dtos/response.dto.ts +6 -6
  65. package/src/dtos/response.ts +5 -5
  66. package/src/index.ts +1 -1
  67. package/src/module/auth/auth.module.ts +49 -49
  68. package/src/module/auth/controller/auth.controller.ts +28 -28
  69. package/src/module/auth/guards/google-auth.guard.ts +9 -9
  70. package/src/module/auth/guards/jwt.guard.ts +22 -22
  71. package/src/module/auth/guards/role.guard.ts +68 -68
  72. package/src/module/auth/services/auth.service.ts +50 -50
  73. package/src/module/auth/services/jwt.service.ts +11 -11
  74. package/src/module/auth/strategies/google.strategy.ts +54 -54
  75. package/src/module/auth/strategies/jwt.strategy.ts +58 -58
  76. package/src/module/auth/strategies/local.strategy.ts +13 -13
  77. package/src/module/dashboard/controller/dashboard.controller.ts +36 -36
  78. package/src/module/dashboard/dashboard.module.ts +21 -21
  79. package/src/module/dashboard/entity/dashboard_page_data.entity.ts +27 -27
  80. package/src/module/dashboard/entity/widget_master.entity.ts +18 -18
  81. package/src/module/dashboard/repository/dashboard.repository.ts +42 -42
  82. package/src/module/dashboard/service/dashboard.service.ts +73 -73
  83. package/src/module/dev/dev.module.ts +12 -12
  84. package/src/module/dev/service/dev.service.ts +7 -7
  85. package/src/module/enterprise/controller/organization.controller.ts +36 -36
  86. package/src/module/enterprise/enterprise.module.ts +30 -30
  87. package/src/module/enterprise/entity/enterprise.entity.ts +37 -37
  88. package/src/module/enterprise/entity/organization-app-mapping.entity.ts +13 -13
  89. package/src/module/enterprise/entity/organization.entity.ts +92 -92
  90. package/src/module/enterprise/repository/enterprise.repository.ts +31 -31
  91. package/src/module/enterprise/repository/organization.repository.ts +26 -26
  92. package/src/module/enterprise/repository/school.repository.ts +278 -278
  93. package/src/module/enterprise/service/brand.service.ts +5 -5
  94. package/src/module/enterprise/service/enterprise.service.ts +16 -16
  95. package/src/module/enterprise/service/organization-app-mapping.service.ts +4 -4
  96. package/src/module/enterprise/service/organization.service.ts +145 -145
  97. package/src/module/filter/controller/filter.controller.ts +84 -84
  98. package/src/module/filter/dto/filter-request.dto.ts +38 -38
  99. package/src/module/filter/entity/saved-filter-detail.entity.ts +41 -41
  100. package/src/module/filter/entity/saved-filter-master.entity.ts +23 -23
  101. package/src/module/filter/filter.module.ts +31 -31
  102. package/src/module/filter/repository/saved-filter.repository.ts +168 -168
  103. package/src/module/filter/service/filter-evaluator.service.ts +86 -86
  104. package/src/module/filter/service/filter.service.ts +1004 -1004
  105. package/src/module/filter/service/saved-filter.service.ts +170 -170
  106. package/src/module/ics/controller/ics.controller.ts +21 -21
  107. package/src/module/ics/dto/ics.dto.ts +55 -55
  108. package/src/module/ics/ics.module.ts +13 -13
  109. package/src/module/ics/service/ics.service.ts +57 -57
  110. package/src/module/integration/controller/calender-event.controller.ts +31 -31
  111. package/src/module/integration/controller/integration.controller.ts +662 -662
  112. package/src/module/integration/controller/wrapper.controller.ts +37 -37
  113. package/src/module/integration/dto/create-config.dto.ts +526 -526
  114. package/src/module/integration/entity/integration-config.entity.ts +112 -112
  115. package/src/module/integration/entity/integration-entity-mapper.entity.ts +14 -14
  116. package/src/module/integration/entity/integration-source.entity.ts +17 -17
  117. package/src/module/integration/entity/user-integration.entity.ts +71 -71
  118. package/src/module/integration/examples/usage.example.ts +338 -338
  119. package/src/module/integration/factories/base.factory.ts +7 -7
  120. package/src/module/integration/factories/email.factory.ts +49 -49
  121. package/src/module/integration/factories/integration.factory.ts +121 -121
  122. package/src/module/integration/factories/sms.factory.ts +51 -51
  123. package/src/module/integration/factories/telephone.factory.ts +41 -41
  124. package/src/module/integration/factories/whatsapp.factory.ts +56 -56
  125. package/src/module/integration/integration.module.ts +110 -110
  126. package/src/module/integration/service/calendar-event.service.ts +118 -118
  127. package/src/module/integration/service/integration-entity-mapper.service.ts +17 -17
  128. package/src/module/integration/service/integration-queue.service.ts +229 -229
  129. package/src/module/integration/service/integration.service.ts +2633 -2633
  130. package/src/module/integration/service/oauth.service.ts +224 -224
  131. package/src/module/integration/service/wrapper.service.ts +493 -493
  132. package/src/module/integration/strategies/email/gmail-api.strategy.ts +280 -280
  133. package/src/module/integration/strategies/email/outlook-api.strategy.ts +44 -44
  134. package/src/module/integration/strategies/email/outlook.strategy.ts +64 -64
  135. package/src/module/integration/strategies/email/sendgrid-api.strategy.ts +260 -260
  136. package/src/module/integration/strategies/integration.strategy.ts +97 -97
  137. package/src/module/integration/strategies/sms/gupshup-sms.strategy.ts +146 -146
  138. package/src/module/integration/strategies/sms/msg91-sms.strategy.ts +164 -164
  139. package/src/module/integration/strategies/sms/tubelight-sms.strategy.ts +163 -163
  140. package/src/module/integration/strategies/telephone/ozonetel-voice.strategy.ts +238 -238
  141. package/src/module/integration/strategies/telephone/tubelight-voice.strategy.ts +210 -210
  142. package/src/module/integration/strategies/whatsapp/gupshup-whatsapp.strategy.ts +359 -359
  143. package/src/module/integration/strategies/whatsapp/tubelight-whatsapp.strategy.ts +372 -372
  144. package/src/module/integration/strategies/whatsapp/whatsapp-cloud.strategy.ts +403 -403
  145. package/src/module/integration/strategies/whatsapp/whatsapp.strategy.ts +57 -57
  146. package/src/module/layout/controller/layout.controller.ts +47 -47
  147. package/src/module/layout/entity/header-items.entity.ts +28 -28
  148. package/src/module/layout/entity/header-section.entity.ts +19 -19
  149. package/src/module/layout/layout.module.ts +21 -21
  150. package/src/module/layout/repository/header-items.repository.ts +18 -18
  151. package/src/module/layout/repository/header-section.repository.ts +22 -22
  152. package/src/module/layout/service/header-section.service.ts +25 -25
  153. package/src/module/layout_preference/controller/layout_preference.controller.ts +73 -73
  154. package/src/module/layout_preference/entity/layout_preference.entity.ts +28 -28
  155. package/src/module/layout_preference/layout_preference.module.ts +22 -22
  156. package/src/module/layout_preference/repository/layout_preference.repository.ts +65 -65
  157. package/src/module/layout_preference/service/layout_preference.service.ts +191 -191
  158. package/src/module/lead/controller/lead.controller.ts +30 -30
  159. package/src/module/lead/lead.module.ts +14 -14
  160. package/src/module/lead/repository/lead.repository.ts +41 -41
  161. package/src/module/lead/service/lead.service.ts +54 -54
  162. package/src/module/listmaster/controller/list-master.controller.ts +230 -230
  163. package/src/module/listmaster/entity/list-master-items.entity.ts +43 -43
  164. package/src/module/listmaster/entity/list-master.entity.ts +33 -33
  165. package/src/module/listmaster/listmaster.module.ts +46 -46
  166. package/src/module/listmaster/repository/list-master-items.repository.ts +169 -169
  167. package/src/module/listmaster/repository/list-master.repository.ts +46 -46
  168. package/src/module/listmaster/service/list-master-engine.ts +19 -19
  169. package/src/module/listmaster/service/list-master-extension.interface.ts +4 -4
  170. package/src/module/listmaster/service/list-master-item.service.ts +292 -292
  171. package/src/module/listmaster/service/list-master-registry.ts +15 -15
  172. package/src/module/listmaster/service/list-master.service.ts +535 -535
  173. package/src/module/mapper/controller/field-mapper.controller.ts +76 -76
  174. package/src/module/mapper/controller/mapper.controller.ts +20 -20
  175. package/src/module/mapper/dto/field-mapper.dto.ts +14 -14
  176. package/src/module/mapper/entity/field-lovs.entity.ts +19 -19
  177. package/src/module/mapper/entity/field-mapper.entity.ts +53 -53
  178. package/src/module/mapper/entity/mapper.entity.ts +16 -16
  179. package/src/module/mapper/mapper.module.ts +34 -34
  180. package/src/module/mapper/repository/field-lovs.repository.ts +35 -35
  181. package/src/module/mapper/repository/field-mapper.repository.ts +42 -42
  182. package/src/module/mapper/repository/mapper.repository.ts +15 -15
  183. package/src/module/mapper/service/field-mapper.service.ts +266 -266
  184. package/src/module/mapper/service/mapper.service.ts +79 -79
  185. package/src/module/master/controller/master.controller.ts +74 -74
  186. package/src/module/master/service/master.service.ts +483 -483
  187. package/src/module/meta/controller/app-master.controller.ts +38 -38
  188. package/src/module/meta/controller/attribute-master.controller.ts +66 -66
  189. package/src/module/meta/controller/entity-dynamic.controller.ts +125 -125
  190. package/src/module/meta/controller/entity-master.controller.ts +28 -28
  191. package/src/module/meta/controller/entity-relation.controller.ts +36 -36
  192. package/src/module/meta/controller/entity.controller.ts +392 -392
  193. package/src/module/meta/controller/entity.public.controller.ts +75 -75
  194. package/src/module/meta/controller/media.controller.ts +107 -107
  195. package/src/module/meta/controller/meta.controller.ts +96 -96
  196. package/src/module/meta/controller/view-master.controller.ts +86 -86
  197. package/src/module/meta/dto/entity-list-data.dto.ts +6 -6
  198. package/src/module/meta/dto/entity-tab.dto.ts +4 -4
  199. package/src/module/meta/dto/entity-table.dto.ts +9 -9
  200. package/src/module/meta/entity/app-master.entity.ts +34 -34
  201. package/src/module/meta/entity/attribute-master.entity.ts +89 -89
  202. package/src/module/meta/entity/base-entity.entity.ts +75 -75
  203. package/src/module/meta/entity/entity-master.entity.ts +85 -85
  204. package/src/module/meta/entity/entity-relation-data.entity.ts +29 -29
  205. package/src/module/meta/entity/entity-relation.entity.ts +23 -23
  206. package/src/module/meta/entity/entity-table-column.entity.ts +61 -61
  207. package/src/module/meta/entity/entity-table.entity.ts +50 -50
  208. package/src/module/meta/entity/media-data.entity.ts +32 -32
  209. package/src/module/meta/entity/preference.entity.ts +62 -62
  210. package/src/module/meta/entity/view-master.entity.ts +41 -41
  211. package/src/module/meta/entity.module.ts +158 -158
  212. package/src/module/meta/repository/app-master.repository.ts +20 -20
  213. package/src/module/meta/repository/attribute-master.repository.ts +118 -118
  214. package/src/module/meta/repository/entity-master.repository.ts +69 -69
  215. package/src/module/meta/repository/entity-table-column.repository.ts +39 -39
  216. package/src/module/meta/repository/entity-table.repository.ts +53 -53
  217. package/src/module/meta/repository/media-data.repository.ts +50 -50
  218. package/src/module/meta/repository/preference.repository.ts +20 -20
  219. package/src/module/meta/repository/user-app-mapping.repository.ts +28 -28
  220. package/src/module/meta/repository/view-master.repository.ts +42 -42
  221. package/src/module/meta/service/app-master.service.ts +37 -37
  222. package/src/module/meta/service/attribute-master.service.ts +126 -126
  223. package/src/module/meta/service/common.service.ts +9 -9
  224. package/src/module/meta/service/entity-dynamic.service.ts +819 -819
  225. package/src/module/meta/service/entity-list.service.ts +205 -205
  226. package/src/module/meta/service/entity-master.service.ts +169 -169
  227. package/src/module/meta/service/entity-realation-data.service.ts +9 -9
  228. package/src/module/meta/service/entity-relation.service.ts +69 -69
  229. package/src/module/meta/service/entity-service-impl.service.ts +525 -525
  230. package/src/module/meta/service/entity-table-column.service.ts +39 -39
  231. package/src/module/meta/service/entity-table.service.ts +150 -150
  232. package/src/module/meta/service/entity-validation.service.ts +187 -187
  233. package/src/module/meta/service/entity.service.ts +67 -67
  234. package/src/module/meta/service/field-group.service.ts +103 -103
  235. package/src/module/meta/service/media-data.service.ts +507 -507
  236. package/src/module/meta/service/populate-meta.service.ts +193 -193
  237. package/src/module/meta/service/preference.service.ts +16 -16
  238. package/src/module/meta/service/resolver.service.ts +267 -267
  239. package/src/module/meta/service/section-master.service.ts +104 -104
  240. package/src/module/meta/service/update-form-json.service.ts +22 -22
  241. package/src/module/meta/service/user-app-mapping.service.ts +17 -17
  242. package/src/module/meta/service/view-master.service.ts +127 -127
  243. package/src/module/microservice-client/microservice-clients.module.ts +13 -13
  244. package/src/module/microservice-client/service/microservice-client-factory.ts +37 -37
  245. package/src/module/microservice-client/service/microservice-clients.ts +4 -4
  246. package/src/module/module/controller/menu.controller.ts +15 -15
  247. package/src/module/module/controller/module-access.controller.ts +134 -134
  248. package/src/module/module/entity/menu.entity.ts +43 -43
  249. package/src/module/module/entity/module-access.entity.ts +25 -25
  250. package/src/module/module/entity/module-action.entity.ts +17 -17
  251. package/src/module/module/entity/module.entity.ts +52 -52
  252. package/src/module/module/module.module.ts +42 -42
  253. package/src/module/module/repository/menu.repository.ts +184 -184
  254. package/src/module/module/repository/module-access.repository.ts +344 -344
  255. package/src/module/module/service/menu.service.ts +82 -82
  256. package/src/module/module/service/module-access.service.ts +209 -209
  257. package/src/module/notification/controller/notification.controller.ts +58 -58
  258. package/src/module/notification/controller/otp.controller.ts +117 -117
  259. package/src/module/notification/entity/notification.entity.ts +26 -26
  260. package/src/module/notification/entity/otp.entity.ts +28 -28
  261. package/src/module/notification/firebase-admin.config.ts +22 -22
  262. package/src/module/notification/notification.module.ts +69 -69
  263. package/src/module/notification/repository/otp.repository.ts +27 -27
  264. package/src/module/notification/service/email.service.ts +127 -127
  265. package/src/module/notification/service/notification.service.ts +163 -163
  266. package/src/module/notification/service/otp.service.ts +132 -132
  267. package/src/module/third-party-module/entity/third-party-api-registry.entity.ts +52 -52
  268. package/src/module/third-party-module/repository/third-party-api-registry.repository.ts +20 -20
  269. package/src/module/third-party-module/service/api-registry.service.ts +13 -13
  270. package/src/module/third-party-module/third-party.module.ts +12 -12
  271. package/src/module/user/controller/login.controller.ts +197 -197
  272. package/src/module/user/controller/user.controller.ts +40 -40
  273. package/src/module/user/dto/create-user.dto.ts +62 -62
  274. package/src/module/user/dto/update-user.dto.ts +4 -4
  275. package/src/module/user/entity/role.entity.ts +33 -33
  276. package/src/module/user/entity/user-role-mapping.entity.ts +38 -38
  277. package/src/module/user/entity/user-session.entity.ts +73 -73
  278. package/src/module/user/entity/user.entity.ts +59 -59
  279. package/src/module/user/repository/role.repository.ts +96 -96
  280. package/src/module/user/repository/user-role-mapping.repository.ts +126 -126
  281. package/src/module/user/repository/user.repository.ts +50 -50
  282. package/src/module/user/repository/userSession.repository.ts +33 -33
  283. package/src/module/user/service/login.service.ts +304 -290
  284. package/src/module/user/service/role.service.ts +189 -189
  285. package/src/module/user/service/user-role-mapping.service.ts +98 -98
  286. package/src/module/user/service/user-session.service.ts +168 -168
  287. package/src/module/user/service/user.service.ts +365 -365
  288. package/src/module/user/user.module.ts +65 -65
  289. package/src/module/workflow/controller/action-category.controller.ts +54 -54
  290. package/src/module/workflow/controller/action-resource-mapping.controller.ts +23 -23
  291. package/src/module/workflow/controller/action-template-mapping.controller.ts +35 -35
  292. package/src/module/workflow/controller/action.controller.ts +111 -111
  293. package/src/module/workflow/controller/activity-log.controller.ts +55 -55
  294. package/src/module/workflow/controller/comm-template.controller.ts +43 -43
  295. package/src/module/workflow/controller/entity-modification.controller.ts +35 -35
  296. package/src/module/workflow/controller/form-master.controller.ts +43 -43
  297. package/src/module/workflow/controller/stage-group.controller.ts +48 -48
  298. package/src/module/workflow/controller/stage.controller.ts +50 -50
  299. package/src/module/workflow/controller/task.controller.ts +77 -77
  300. package/src/module/workflow/controller/workflow-list-master.controller.ts +44 -44
  301. package/src/module/workflow/controller/workflow-meta.controller.ts +80 -80
  302. package/src/module/workflow/controller/workflow.controller.ts +67 -67
  303. package/src/module/workflow/entity/action-category.entity.ts +38 -38
  304. package/src/module/workflow/entity/action-data.entity.ts +55 -55
  305. package/src/module/workflow/entity/action-resources-mapping.entity.ts +29 -29
  306. package/src/module/workflow/entity/action-template-mapping.entity.ts +17 -17
  307. package/src/module/workflow/entity/action.entity.ts +50 -50
  308. package/src/module/workflow/entity/activity-log.entity.ts +43 -43
  309. package/src/module/workflow/entity/comm-template.entity.ts +43 -43
  310. package/src/module/workflow/entity/entity-modification.entity.ts +38 -38
  311. package/src/module/workflow/entity/form.entity.ts +25 -25
  312. package/src/module/workflow/entity/stage-action-mapping.entity.ts +17 -17
  313. package/src/module/workflow/entity/stage-group.entity.ts +23 -23
  314. package/src/module/workflow/entity/stage-movement-data.entity.ts +38 -38
  315. package/src/module/workflow/entity/stage.entity.ts +20 -20
  316. package/src/module/workflow/entity/task-data.entity.ts +88 -88
  317. package/src/module/workflow/entity/template-attach-mapper.entity.ts +30 -30
  318. package/src/module/workflow/entity/workflow-data.entity.ts +11 -11
  319. package/src/module/workflow/entity/workflow-level-mapping.entity.ts +18 -18
  320. package/src/module/workflow/entity/workflow.entity.ts +20 -20
  321. package/src/module/workflow/repository/action-category.repository.ts +79 -79
  322. package/src/module/workflow/repository/action-data.repository.ts +333 -333
  323. package/src/module/workflow/repository/action.repository.ts +323 -323
  324. package/src/module/workflow/repository/activity-log.repository.ts +148 -148
  325. package/src/module/workflow/repository/comm-template.repository.ts +149 -149
  326. package/src/module/workflow/repository/form-master.repository.ts +59 -59
  327. package/src/module/workflow/repository/stage-group.repository.ts +176 -176
  328. package/src/module/workflow/repository/stage-movement.repository.ts +244 -244
  329. package/src/module/workflow/repository/stage.repository.ts +172 -172
  330. package/src/module/workflow/repository/task.repository.ts +127 -127
  331. package/src/module/workflow/repository/workflow.repository.ts +42 -42
  332. package/src/module/workflow/service/action-category.service.ts +33 -33
  333. package/src/module/workflow/service/action-data.service.ts +62 -62
  334. package/src/module/workflow/service/action-resources-mapping.service.ts +10 -10
  335. package/src/module/workflow/service/action-template-mapping.service.ts +106 -106
  336. package/src/module/workflow/service/action.service.ts +279 -279
  337. package/src/module/workflow/service/activity-log.service.ts +107 -107
  338. package/src/module/workflow/service/comm-template.service.ts +180 -180
  339. package/src/module/workflow/service/entity-modification.service.ts +67 -67
  340. package/src/module/workflow/service/form-master.service.ts +35 -35
  341. package/src/module/workflow/service/populate-workflow.service.ts +303 -303
  342. package/src/module/workflow/service/stage-action-mapping.service.ts +5 -5
  343. package/src/module/workflow/service/stage-group.service.ts +319 -319
  344. package/src/module/workflow/service/stage.service.ts +199 -199
  345. package/src/module/workflow/service/task.service.ts +560 -560
  346. package/src/module/workflow/service/workflow-list-master.service.ts +60 -60
  347. package/src/module/workflow/service/workflow-meta.service.ts +640 -640
  348. package/src/module/workflow/service/workflow.service.ts +205 -205
  349. package/src/module/workflow/workflow.module.ts +176 -176
  350. package/src/module/workflow-automation/controller/workflow-automation.controller.ts +21 -21
  351. package/src/module/workflow-automation/entity/workflow-automation-action.entity.ts +26 -26
  352. package/src/module/workflow-automation/entity/workflow-automation.entity.ts +35 -35
  353. package/src/module/workflow-automation/interface/action.decorator.ts +7 -7
  354. package/src/module/workflow-automation/interface/action.interface.ts +5 -5
  355. package/src/module/workflow-automation/service/action-registery.service.ts +35 -35
  356. package/src/module/workflow-automation/service/workflow-automation-engine.service.ts +214 -214
  357. package/src/module/workflow-automation/service/workflow-automation.service.ts +347 -347
  358. package/src/module/workflow-automation/workflow-automation.module.ts +34 -34
  359. package/src/resources/dev.properties.yaml +30 -30
  360. package/src/resources/local.properties.yaml +27 -27
  361. package/src/resources/properties.module.ts +12 -12
  362. package/src/resources/properties.yaml.ts +11 -11
  363. package/src/resources/uat.properties.yaml +31 -31
  364. package/src/table.config.ts +126 -126
  365. package/src/utils/dto/excel-data.dto.ts +14 -14
  366. package/src/utils/dto/excelsheet-data.dto.ts +5 -5
  367. package/src/utils/service/base64util.service.ts +18 -18
  368. package/src/utils/service/clockIDGenUtil.service.ts +21 -21
  369. package/src/utils/service/codeGenerator.service.ts +22 -22
  370. package/src/utils/service/dateUtil.service.ts +17 -17
  371. package/src/utils/service/encryptUtil.service.ts +97 -97
  372. package/src/utils/service/excel-helper.service.ts +72 -72
  373. package/src/utils/service/excelUtil.service.ts +15 -15
  374. package/src/utils/service/file-util.service.ts +11 -11
  375. package/src/utils/service/json-util.service.ts +23 -23
  376. package/src/utils/service/loggingUtil.service.ts +34 -34
  377. package/src/utils/service/reflection-helper.service.ts +62 -62
  378. package/src/utils/service/wbsCodeGen.service.ts +8 -8
  379. package/src/utils/utils.module.ts +25 -25
  380. package/tsconfig.build.json +4 -4
  381. package/tsconfig.json +24 -24
  382. package/.claude/settings.local.json +0 -26
  383. package/.idea/copilot.data.migration.agent.xml +0 -6
  384. package/.idea/copilot.data.migration.ask.xml +0 -6
  385. package/.idea/copilot.data.migration.ask2agent.xml +0 -6
  386. package/.idea/copilot.data.migration.edit.xml +0 -6
  387. package/.idea/misc.xml +0 -6
  388. package/server.log +0 -850
@@ -1,1004 +1,1004 @@
1
- import { BadRequestException, Inject, Injectable } from '@nestjs/common';
2
- import { AttributeMasterService } from 'src/module/meta/service/attribute-master.service';
3
- import { EntityMasterService } from 'src/module/meta/service/entity-master.service';
4
- import { EntityTableColumnService } from 'src/module/meta/service/entity-table-column.service';
5
- import { EntityTableService } from 'src/module/meta/service/entity-table.service';
6
- import { DataSource } from 'typeorm';
7
- import { FilterCondition, FilterRequestDto } from '../dto/filter-request.dto';
8
- import { SavedFilterService } from './saved-filter.service';
9
-
10
- import * as moment from 'moment';
11
- import { EntityRelationService } from 'src/module/meta/service/entity-relation.service';
12
- import { ResolverService } from 'src/module/meta/service/resolver.service';
13
- import { LoggingService } from 'src/utils/service/loggingUtil.service';
14
-
15
- @Injectable()
16
- export class FilterService {
17
- constructor(
18
- private dataSource: DataSource,
19
- private readonly attributeMasterService: AttributeMasterService,
20
- private readonly entityMasterService: EntityMasterService,
21
- @Inject('SavedFilterService')
22
- private readonly savedFilterService: SavedFilterService,
23
- @Inject('EntityRelationService')
24
- private readonly entityRelationService: EntityRelationService,
25
- private readonly resolverService: ResolverService,
26
- @Inject() protected readonly loggingService: LoggingService,
27
- ) {}
28
- private readonly skipAppCodeFilterEntities = ['ORGP'];
29
- private readonly skipOrgFilterEntities = ['ORGP'];
30
-
31
- private async gettab_value_counts(
32
- tableName: string,
33
- column: string | undefined,
34
- whereClauses: { query: string; params: Record<string, any> }[],
35
- ) {
36
- if (!column) return [];
37
-
38
- let whereSQL = '';
39
- const values: any[] = [];
40
-
41
- if (whereClauses.length > 0) {
42
- const clauseParts = whereClauses.map((clause) => {
43
- let parsedQuery = clause.query.replace(/\be\./g, ''); // remove e.
44
-
45
- Object.entries(clause.params).forEach(([key, val]) => {
46
- if (Array.isArray(val)) {
47
- // if it's an array → expand placeholders (?, ?, ?)
48
- const placeholders = val.map(() => '?').join(', ');
49
- parsedQuery = parsedQuery.replace(
50
- new RegExp(`:${key}`, 'g'),
51
- `(${placeholders})`,
52
- );
53
- values.push(...val); // flatten values
54
- } else {
55
- parsedQuery = parsedQuery.replace(new RegExp(`:${key}`, 'g'), '?');
56
- values.push(val);
57
- }
58
- });
59
-
60
- return parsedQuery;
61
- });
62
-
63
- whereSQL = `WHERE ${clauseParts.join(' AND ')}`;
64
- }
65
-
66
- const rawSQL = `
67
- SELECT ${column} AS tab_value, COUNT(*) AS tab_value_count
68
- FROM ${tableName}
69
- ${whereSQL}
70
- GROUP BY ${column}
71
- `;
72
-
73
- const rows = await this.dataSource.query(rawSQL, values);
74
-
75
- const total = rows.reduce(
76
- (sum, r) => sum + parseInt(r.tab_value_count, 10),
77
- 0,
78
- );
79
-
80
- return [
81
- { tab_value: 'All', tab_value_count: total },
82
- ...rows.map((r) => ({
83
- tab_value: r.tab_value ?? 'UNKNOWN',
84
- tab_value_count: parseInt(r.tab_value_count, 10),
85
- })),
86
- ];
87
- }
88
-
89
- async applyFilterWrapper(dto: FilterRequestDto) {
90
- const {
91
- entity_type,
92
- quickFilter = [],
93
- savedFilterCode,
94
- attributeFilter = [],
95
- loggedInUser,
96
- } = dto;
97
-
98
- // 🔹 Step 1: Collect all filters (from body + savedFilter)
99
- const savedFilters = await this.getSavedFilters(
100
- savedFilterCode ?? undefined,
101
- );
102
- const allFilters = [
103
- ...quickFilter,
104
- ...attributeFilter,
105
- ...savedFilters,
106
- ].filter((f) => f.filter_value !== '');
107
-
108
- // 🔹 Step 2: Group filters by filter_entity_type
109
- const grouped = allFilters.reduce(
110
- (acc, f) => {
111
- if (!acc[f.filter_entity_type]) acc[f.filter_entity_type] = [];
112
- acc[f.filter_entity_type].push(f);
113
- return acc;
114
- },
115
- {} as Record<string, any[]>,
116
- );
117
-
118
- console.log('🟠 [FilterService] Grouped filters by entity type:', grouped);
119
-
120
- // 🔹 Step 3: Handle sub-entities first
121
- let intersectionIds: number[] | null = null;
122
- for (const [subEntityType, filters] of Object.entries(grouped)) {
123
- if (subEntityType === entity_type) continue; // skip main entity for now
124
-
125
- let { queryParams, tabs, ...newDto } = dto;
126
-
127
- const subDto: FilterRequestDto = {
128
- ...newDto,
129
- entity_type: subEntityType,
130
- quickFilter: filters as FilterCondition[],
131
- savedFilterCode: null, // already merged
132
- attributeFilter: [],
133
- };
134
-
135
- const subResult = await this.applyFilter(subDto);
136
- const subEntityIds = subResult.data.entity_list.map((row) => row.id);
137
-
138
- console.log(
139
- `🧩 [FilterService] Sub-entity ${subEntityType} returned IDs:`,
140
- subEntityIds,
141
- );
142
-
143
- if (!subEntityIds.length) {
144
- console.log(
145
- `ℹ️ [FilterService] No records for sub-entity ${subEntityType}, returning empty result`,
146
- );
147
- return {
148
- success: true,
149
- data: { entity_tabs: [], entity_list: [], pagination: {} },
150
- };
151
- }
152
-
153
- const relatedIds = await this.entityRelationService.getRelatedEntityIds(
154
- entity_type,
155
- subEntityType,
156
- subEntityIds,
157
- dto.loggedInUser.organization_id,
158
- );
159
-
160
- intersectionIds =
161
- intersectionIds === null
162
- ? relatedIds
163
- : intersectionIds.filter((id) => relatedIds.includes(id));
164
-
165
- if (intersectionIds.length === 0) {
166
- console.log(
167
- '🚫 [FilterService] No intersection IDs left, returning empty result',
168
- );
169
- return {
170
- success: true,
171
- data: { entity_tabs: [], entity_list: [], pagination: {} },
172
- };
173
- }
174
- }
175
-
176
- // 🔹 Step 4: Call applyFilter for main entity
177
- const mainFilters = grouped[entity_type] || [];
178
- const mainDto: FilterRequestDto = {
179
- ...dto,
180
- quickFilter: [...mainFilters],
181
- savedFilterCode: null,
182
- attributeFilter: [],
183
- };
184
-
185
- if (intersectionIds && intersectionIds.length > 0) {
186
- (mainDto.quickFilter ??= []).push({
187
- filter_attribute: 'id',
188
- filter_operator: 'equal',
189
- filter_value: intersectionIds,
190
- filter_entity_type: entity_type,
191
- });
192
- }
193
-
194
- return await this.applyFilter(mainDto);
195
- }
196
-
197
- async applyFilter(dto: FilterRequestDto) {
198
- const {
199
- entity_type,
200
- quickFilter,
201
- savedFilterCode,
202
- attributeFilter,
203
- tabs,
204
- sortby,
205
- loggedInUser,
206
- queryParams,
207
- customLevelType,
208
- customLevelId,
209
- customAppCode,
210
- } = dto;
211
-
212
- // abstract user details
213
- const {
214
- level_type,
215
- level_id,
216
- id: user_id,
217
- appcode,
218
- organization_id,
219
- } = loggedInUser || {};
220
-
221
- // Fetch meta from entity table service
222
- const entityMeta = await this.entityMasterService.getEntityData(
223
- entity_type,
224
- loggedInUser,
225
- );
226
- const tableName = entityMeta?.data_source; // data_source is the table name
227
-
228
- if (!tableName) {
229
- console.error(`❌ [FilterService] Invalid entity_type: ${entity_type}`);
230
- throw new BadRequestException(`Invalid entity_type: ${entity_type}`);
231
- }
232
-
233
- const getAttributeColumnMeta =
234
- await this.attributeMasterService.findAttributesByMappedEntityType(
235
- entity_type,
236
- loggedInUser,
237
- );
238
-
239
- const attributeMetaMap = getAttributeColumnMeta.reduce(
240
- (acc, attr) => {
241
- acc[attr.attribute_key] = attr;
242
- return acc;
243
- },
244
- {} as Record<string, any>,
245
- );
246
-
247
- // Get and parse saved filters
248
- const savedFilters = await this.getSavedFilters(
249
- savedFilterCode ?? undefined,
250
- );
251
- const savedFiltersNormalized = savedFilters.map((f) => ({
252
- filter_attribute: f.filter_attribute,
253
- filter_operator: f.filter_operator,
254
- filter_value: f.filter_value,
255
- }));
256
-
257
- const baseFilters = [
258
- ...(quickFilter || []).filter(
259
- (f) => f.filter_value != null && f.filter_value !== '',
260
- ),
261
- ...savedFiltersNormalized.filter(
262
- (f) => f.filter_value != null && f.filter_value !== '',
263
- ),
264
- ...(attributeFilter || []).filter(
265
- (f) => f.filter_value != null && f.filter_value !== '',
266
- ),
267
- ];
268
-
269
- // 🧱 Build where clauses
270
- const baseWhere = this.buildWhereClauses(baseFilters, attributeMetaMap);
271
-
272
- // Handle TEMPLATE entity special condition
273
- if (entity_type === 'TEMP' || entity_type === 'TEM') {
274
- const templateTable = entityMeta?.data_source || 'frm_wf_comm_template';
275
-
276
- if (level_type === 'ORG') {
277
- baseWhere.push({
278
- query: ` ((e.level_type = 'ORG' AND e.level_id = ${loggedInUser.organization_id} AND e.organization_id = ${loggedInUser.organization_id}))`,
279
- params: {},
280
- });
281
- } else if (level_type === 'SCH') {
282
- baseWhere.push({
283
- query: `
284
- (
285
- (e.level_type = 'SCH' AND e.level_id = ${loggedInUser.level_id} AND e.organization_id = ${loggedInUser.organization_id})
286
- OR
287
- (
288
- e.level_type = 'ORG'
289
- AND e.level_id = ${loggedInUser.organization_id}
290
- AND e.organization_id = ${loggedInUser.organization_id}
291
- AND e.code NOT IN (
292
- SELECT sub.code
293
- FROM frm_wf_comm_template AS sub
294
- WHERE sub.level_type = 'SCH' AND sub.level_id = ${loggedInUser.level_id}
295
- )
296
- )
297
- )
298
- `,
299
- params: {},
300
- });
301
- }
302
- }
303
-
304
- // Default org/level clause — skip TEMPLATE entity
305
- if (
306
- entity_type !== 'ORGP' &&
307
- entity_type !== 'TEMP' &&
308
- entity_type !== 'TEM' && // ✅ skip TEMPLATE
309
- level_type &&
310
- level_id &&
311
- organization_id &&
312
- !customLevelType &&
313
- !customLevelId
314
- ) {
315
- baseWhere.push({
316
- query:
317
- 'e.organization_id = :organization_id AND e.level_type = :level_type AND e.level_id = :level_id',
318
- params: { organization_id, level_type, level_id },
319
- });
320
- }
321
-
322
- if (entity_type == 'USR' || entity_type == 'UPR') {
323
- baseWhere.push({
324
- query: 'e.is_customer is NULL',
325
- params: {},
326
- });
327
- }
328
-
329
- if (customLevelType && customLevelId && customAppCode) {
330
- baseWhere.push({
331
- query:
332
- 'e.organization_id = :organization_id AND e.level_type = :customLevelType AND e.level_id = :customLevelId AND e.appcode = :customAppCode',
333
- params: {
334
- organization_id,
335
- customLevelType,
336
- customLevelId,
337
- customAppCode,
338
- },
339
- });
340
- }
341
-
342
- // Handle queryParams filters
343
- if (queryParams) {
344
- Object.entries(queryParams).forEach(([key, value]) => {
345
- if (!value) return;
346
-
347
- if (key === 'attributeName' && queryParams['attributeValue']) {
348
- const attrName = value;
349
- const attrValue = queryParams['attributeValue'];
350
- baseWhere.push({
351
- query: `e.${attrName} = :${attrName}`,
352
- params: { [attrName]: attrValue },
353
- });
354
- } else if (key !== 'attributeValue') {
355
- baseWhere.push({
356
- query: `e.${key} = :${key}`,
357
- params: { [key]: value },
358
- });
359
- }
360
- });
361
- }
362
-
363
- console.log('🟠 [FilterService] Constructed baseWhere clauses:', baseWhere);
364
-
365
- // layout preference query
366
- const layoutPreference = await this.dataSource.query(
367
- `SELECT mapped_json
368
- FROM frm_entity_layout_pref
369
- WHERE user_id = ? AND mapped_entity_type = ? AND mapped_level_id = ? AND mapped_level_type = ? AND type = 'layout'`,
370
- [user_id, entity_type, level_id, level_type],
371
- );
372
-
373
- // Extract layout preference
374
- const layout = layoutPreference?.[0]?.mapped_json?.quick_tab || {};
375
- const showList =
376
- layout?.show_list?.map((val) => {
377
- if (typeof val === 'string') {
378
- // legacy case — old format like ['Active', 'Inactive']
379
- return val.toLowerCase();
380
- }
381
-
382
- if (val && typeof val === 'object' && val.value !== undefined) {
383
- // new format — [{ label: 'Active', value: '13023' }]
384
- return String(val.value).toLowerCase();
385
- }
386
-
387
- return ''; // fallback safety
388
- }) || [];
389
-
390
- let filteredTabs = await this.getFilteredTabs(
391
- layout,
392
- showList,
393
- entityMeta,
394
- baseWhere,
395
- tabs,
396
- loggedInUser,
397
- );
398
-
399
- const dataWhere = [...baseWhere];
400
-
401
- if (tabs?.columnName && tabs?.value) {
402
- const tabAttrMeta = attributeMetaMap[tabs.columnName];
403
- const tabValue = tabs.value.toLowerCase();
404
-
405
- if (tabValue === 'others') {
406
- // Extract 'value' (IDs) from showList, ignore 'all'
407
- const valuesToExclude = showList
408
- .filter((v) => v.label.toLowerCase() !== 'all')
409
- .map((v) => v.value);
410
-
411
- if (valuesToExclude.length > 0) {
412
- for (const value of valuesToExclude) {
413
- const resolvedId = await this.resolverService.getResolvedId(
414
- loggedInUser,
415
- tabs.columnName,
416
- value,
417
- entity_type,
418
- );
419
- if (resolvedId) {
420
- const tabCondition = this.buildCondition(
421
- {
422
- filter_attribute: tabs.columnName,
423
- filter_operator: 'not_equal',
424
- filter_value: [resolvedId],
425
- skip_id: true,
426
- },
427
- tabAttrMeta,
428
- );
429
- if (tabCondition) dataWhere.push(tabCondition);
430
- }
431
- }
432
- }
433
- } else if (tabValue !== 'all') {
434
- const resolvedId = await this.resolverService.getResolvedId(
435
- loggedInUser,
436
- tabs.columnName,
437
- tabs.value,
438
- entity_type,
439
- );
440
-
441
- if (resolvedId) {
442
- const tabCondition = this.buildCondition(
443
- {
444
- filter_attribute: tabs.columnName,
445
- filter_operator: 'equal',
446
- filter_value: [resolvedId],
447
- skip_id: true,
448
- },
449
- tabAttrMeta,
450
- );
451
- if (tabCondition) dataWhere.push(tabCondition);
452
- }
453
- }
454
- }
455
-
456
- let qb = this.dataSource
457
- .createQueryBuilder()
458
- .select('e.*')
459
- .from(tableName, 'e');
460
- dataWhere.forEach((clause) => qb.andWhere(clause.query, clause.params));
461
-
462
- // Apply sorting
463
- qb = await this.sortTabsByShowList(qb, sortby, layoutPreference, tabs);
464
-
465
- const page = dto.page && dto.page > 0 ? dto.page : 1;
466
- const size = dto.size && dto.size > 0 ? dto.size : 10;
467
- qb.skip((page - 1) * size).take(size);
468
-
469
- const entity_list = await qb.getRawMany();
470
-
471
- console.log(`📦 [FilterService] Fetched ${entity_list.length} records`);
472
-
473
- const dateAttributes = Object.entries(attributeMetaMap)
474
- .filter(([_, attr]) => attr.data_type === 'date')
475
- .map(([key]) => key);
476
-
477
- const formatDate = (dateStr: string | null): string | null =>
478
- dateStr ? moment(dateStr).format('DD-MM-YYYY') : '';
479
-
480
- const formatDatesInRow = (row: any): any => {
481
- const formattedRow = { ...row };
482
- for (const key of dateAttributes) {
483
- if (formattedRow[key])
484
- formattedRow[key] = formatDate(formattedRow[key]);
485
- }
486
- return formattedRow;
487
- };
488
-
489
- const formattedEntityList = entity_list.map(formatDatesInRow);
490
-
491
- const resolvedEntityList = await Promise.all(
492
- formattedEntityList.map((row) =>
493
- this.resolverService.getResolvedData(loggedInUser, row, entity_type),
494
- ),
495
- );
496
-
497
- const resolvedTabs = await Promise.all(
498
- filteredTabs.map(async (tab) => {
499
- const tabAttrKey = layout?.attribute || tabs?.columnName;
500
-
501
- if (
502
- !tabAttrKey ||
503
- tab.tab_value?.toLowerCase() === 'all' ||
504
- tab.tab_value?.toLowerCase() === 'others'
505
- ) {
506
- return tab;
507
- }
508
-
509
- const resolvedVal = await this.resolverService.getResolvedValue(
510
- loggedInUser,
511
- tabAttrKey,
512
- tab.tab_value,
513
- entity_type,
514
- );
515
-
516
- return { ...tab, tab_value: resolvedVal ?? tab.tab_value };
517
- }),
518
- );
519
-
520
- const countQb = this.dataSource
521
- .createQueryBuilder()
522
- .select('COUNT(*)', 'count')
523
- .from(tableName, 'e');
524
- dataWhere.forEach((clause) =>
525
- countQb.andWhere(clause.query, clause.params),
526
- );
527
- const countResult = await countQb.getRawOne();
528
- const total = parseInt(countResult.count, 10);
529
-
530
- console.log('📊 [FilterService] Returning final result with total:', total);
531
-
532
- return {
533
- success: true,
534
- data: {
535
- entity_tabs: resolvedTabs,
536
- entity_list: resolvedEntityList,
537
- pagination: {
538
- total,
539
- page,
540
- size,
541
- totalPages: Math.ceil(total / size),
542
- hasNextPage: page * size < total,
543
- hasPreviousPage: page > 1,
544
- },
545
- },
546
- };
547
- }
548
-
549
- // GET FILTERED TABS LOGIC
550
- private async getFilteredTabs(
551
- layout: any,
552
- showList: any,
553
- entityMeta: any,
554
- baseWhere: any,
555
- tabs: any,
556
- loggedInUser: any,
557
- ) {
558
- let allTabs;
559
- if (layout.attribute) {
560
- allTabs = await this.gettab_value_counts(
561
- entityMeta?.data_source,
562
- layout.attribute,
563
- baseWhere,
564
- );
565
- } else {
566
- allTabs = await this.gettab_value_counts(
567
- entityMeta?.data_source,
568
- tabs?.columnName,
569
- baseWhere,
570
- );
571
- }
572
-
573
- let filteredTabs: any[] = [];
574
-
575
- if (showList?.length > 0) {
576
- // Extract tab IDs (values)
577
- const showValues = showList.map((item) =>
578
- item.value?.toString().toLowerCase(),
579
- );
580
-
581
- // Handle "all" logic
582
- const isAllNeeded = layout?.isAllSelected && !showValues.includes('all');
583
- if (isAllNeeded) {
584
- showList.push({ label: 'All', value: 'all' });
585
- showValues.push('all');
586
- }
587
-
588
- // Filter by value IDs (not labels)
589
- filteredTabs = allTabs.filter((tab) => {
590
- const tabValueStr = tab.tab_value
591
- ? String(tab.tab_value).toLowerCase()
592
- : '';
593
- return showValues.includes(tabValueStr);
594
- });
595
-
596
- // Handle "all" tab
597
- const allTab = filteredTabs.find(
598
- (tab) => tab.tab_value?.toString().toLowerCase() === 'all',
599
- );
600
- filteredTabs = filteredTabs.filter(
601
- (tab) => tab.tab_value?.toString().toLowerCase() !== 'all',
602
- );
603
-
604
- // SORTING LOGIC
605
- if (layout.sorting === 'asc') {
606
- filteredTabs.sort((a, b) =>
607
- a.tab_value.toString().localeCompare(b.tab_value.toString()),
608
- );
609
- } else if (layout.sorting === 'dsc') {
610
- filteredTabs.sort((a, b) =>
611
- b.tab_value.toString().localeCompare(a.tab_value.toString()),
612
- );
613
- } else if (layout.sorting === 'count_asc') {
614
- filteredTabs.sort((a, b) => a.tab_value_count - b.tab_value_count);
615
- } else if (layout.sorting === 'count_dsc') {
616
- filteredTabs.sort((a, b) => b.tab_value_count - a.tab_value_count);
617
- } else if (layout.sorting === 'custom') {
618
- // Keep order same as showList
619
- const orderMap = new Map<string, number>(
620
- showList.map((item, index) => [
621
- item.value?.toString().toLowerCase(),
622
- index,
623
- ]),
624
- );
625
- filteredTabs.sort((a, b) => {
626
- const aIndex =
627
- orderMap.get(a.tab_value?.toString().toLowerCase()) ?? Infinity;
628
- const bIndex =
629
- orderMap.get(b.tab_value?.toString().toLowerCase()) ?? Infinity;
630
- return aIndex - bIndex;
631
- });
632
- }
633
-
634
- // Re-add "all" tab at beginning if needed
635
- if (allTab) filteredTabs.unshift(allTab);
636
-
637
- // Combine others if enabled
638
- if (layout?.isCombineOther) {
639
- const originalAllTab = allTabs.find(
640
- (tab) => tab.tab_value?.toString().toLowerCase() === 'all',
641
- );
642
- const allCount = originalAllTab?.tab_value_count ?? 0;
643
- const knownTabCountSum = filteredTabs
644
- .filter((tab) => tab.tab_value?.toString().toLowerCase() !== 'all')
645
- .reduce((acc, tab) => acc + tab.tab_value_count, 0);
646
-
647
- const othersCount = allCount - knownTabCountSum;
648
- filteredTabs.push({
649
- tab_value: 'OTHERS',
650
- tab_value_count: othersCount < 0 ? 0 : othersCount,
651
- });
652
- }
653
- } else {
654
- filteredTabs = allTabs;
655
- }
656
-
657
- return filteredTabs;
658
- }
659
-
660
- // SORTING LOGIC FOR TABS
661
- private async sortTabsByShowList(
662
- qb: any,
663
- sortby: any,
664
- layoutPreference: any,
665
- tabs: any,
666
- ) {
667
- if (layoutPreference && layoutPreference[0]?.mapped_json?.sorting) {
668
- if (Array.isArray(layoutPreference[0]?.mapped_json?.sorting?.tabs)) {
669
- const preferenceTabArray =
670
- layoutPreference[0]?.mapped_json?.sorting?.tabs;
671
- const tabFilter = preferenceTabArray.find(
672
- (tabData) => tabData.tab_name === tabs?.value,
673
- );
674
- tabFilter?.sortby.forEach(({ column, order }) => {
675
- qb.addOrderBy(
676
- `e.${column}`,
677
- order?.toUpperCase() === 'DSC' ? 'DESC' : 'ASC',
678
- );
679
- });
680
- } else if (
681
- Array.isArray(layoutPreference[0]?.mapped_json?.sorting?.sortby)
682
- ) {
683
- layoutPreference[0]?.mapped_json?.sorting?.sortby?.forEach(
684
- ({ column, order }) => {
685
- qb.addOrderBy(
686
- `e.${column}`,
687
- order?.toUpperCase() === 'DSC' ? 'DESC' : 'ASC',
688
- );
689
- },
690
- );
691
- }
692
- }
693
-
694
- if (Array.isArray(sortby) && sortby.length > 0) {
695
- sortby.forEach(({ sortColum, sortType }) => {
696
- if (sortColum) {
697
- qb.addOrderBy(
698
- `e.${sortColum}`,
699
- sortType?.toUpperCase() === 'DSC' ? 'DESC' : 'ASC',
700
- );
701
- }
702
- });
703
- } else {
704
- // fallback if no explicit sortby sent
705
- qb.addOrderBy('e.created_date', 'DESC');
706
- }
707
-
708
- return qb;
709
- }
710
-
711
- private parseFilters(raw: any, isSingle = false): any[] {
712
- if (!raw) return [];
713
-
714
- if (typeof raw === 'string') {
715
- try {
716
- const parsed = JSON.parse(raw);
717
- return isSingle ? [parsed] : parsed;
718
- } catch {
719
- throw new BadRequestException('Invalid JSON in filter input');
720
- }
721
- }
722
-
723
- return isSingle ? [raw] : Array.isArray(raw) ? raw : [];
724
- }
725
-
726
- private async getSavedFilters(code?: string): Promise<any[]> {
727
- if (!code) return [];
728
-
729
- const savedFilter = await this.savedFilterService.getDetailsByCode(code);
730
- if (!savedFilter) {
731
- throw new BadRequestException(`Saved filter not found for code: ${code}`);
732
- }
733
- return savedFilter;
734
- }
735
-
736
- private buildWhereClauses(
737
- filters: any[],
738
- attributeMeta: Record<string, any>,
739
- ) {
740
- return filters
741
- .map((f) => this.buildCondition(f, attributeMeta[f.filter_attribute]))
742
- .filter(
743
- (clause): clause is { query: string; params: any } => clause !== null,
744
- );
745
- }
746
-
747
- private buildCondition(
748
- filter: any,
749
- meta: any,
750
- ): { query: string; params: any } | null {
751
- if (!meta) return null;
752
-
753
- let attr = filter.filter_attribute;
754
- const val = filter.filter_value;
755
- const op = filter.filter_operator;
756
- const key = `param_${attr}_${Math.random().toString(36).substring(2, 8)}`;
757
-
758
- // if (
759
- // (meta.data_source_type === 'entity' ||
760
- // meta.data_source_type === 'master') &&
761
- // !filter.skip_id
762
- // ) {
763
- // attr = `${attr}_id`;
764
- // }
765
-
766
- switch (meta.data_type) {
767
- case 'text':
768
- return this.buildTextCondition(attr, op, val, key);
769
- case 'number':
770
- return this.buildNumberCondition(attr, op, val, key);
771
- case 'date':
772
- return this.buildDateCondition(attr, op, val, key);
773
- case 'select':
774
- return this.buildMultiSelectCondition(attr, op, val, key);
775
- case 'multiselect':
776
- return this.buildMultiSelectCondition(attr, op, val, key);
777
- case 'checkbox':
778
- return this.buildMultiSelectCondition(attr, op, val, key);
779
- case 'radio':
780
- return this.buildMultiSelectCondition(attr, op, val, key);
781
- case 'year':
782
- return this.buildYearCondition(attr, op, val, key);
783
- default:
784
- return null;
785
- }
786
- }
787
-
788
- private buildTextCondition(attr: string, op: string, val: any, key: string) {
789
- switch (op) {
790
- case 'contains':
791
- return {
792
- query: `LOWER(e.${attr}) LIKE :${key}`,
793
- params: { [key]: `%${val ? val.toLowerCase() : ''}%` },
794
- };
795
- case 'equal':
796
- return {
797
- query: `e.${attr} = :${key}`,
798
- params: { [key]: val },
799
- };
800
- case 'not_equal':
801
- return {
802
- query: `e.${attr} != :${key}`,
803
- params: { [key]: val },
804
- };
805
- case 'empty':
806
- return {
807
- query: `e.${attr} IS NULL`,
808
- params: {},
809
- };
810
- case 'not_empty':
811
- return {
812
- query: `e.${attr} IS NOT NULL`,
813
- params: {},
814
- };
815
- default:
816
- throw new BadRequestException(`Unsupported operator for text: ${op}`);
817
- }
818
- }
819
-
820
- private buildNumberCondition(
821
- attr: string,
822
- op: string,
823
- val: any,
824
- key: string,
825
- ) {
826
- switch (op) {
827
- case 'equal':
828
- return { query: `e.${attr} = :${key}`, params: { [key]: val } };
829
- case 'not_equal':
830
- return { query: `e.${attr} != :${key}`, params: { [key]: val } };
831
- case 'greater_than':
832
- return { query: `e.${attr} > :${key}`, params: { [key]: val } };
833
- case 'less_than':
834
- return { query: `e.${attr} < :${key}`, params: { [key]: val } };
835
- case 'less_than_qual_to':
836
- return { query: `e.${attr} <= :${key}`, params: { [key]: val } };
837
- case 'greater_than_qual_to':
838
- return { query: `e.${attr} >= :${key}`, params: { [key]: val } };
839
- case 'empty':
840
- return { query: `e.${attr} IS NULL`, params: {} };
841
- case 'not_empty':
842
- return { query: `e.${attr} IS NOT NULL`, params: {} };
843
-
844
- default:
845
- throw new BadRequestException(`Unsupported operator for number: ${op}`);
846
- }
847
- }
848
-
849
- private buildDateCondition(attr: string, op: string, val: any, key: string) {
850
- switch (op) {
851
- case 'equal':
852
- return { query: `e.${attr} = :${key}`, params: { [key]: val } };
853
- case 'before':
854
- return { query: `e.${attr} < :${key}`, params: { [key]: val } };
855
- case 'after':
856
- return { query: `e.${attr} > :${key}`, params: { [key]: val } };
857
- case 'between': {
858
- if (typeof val === 'string') {
859
- val = val.split(',').map((v) => v.trim());
860
- }
861
-
862
- if (
863
- !Array.isArray(val) ||
864
- val.length !== 2 ||
865
- val[0] === '' ||
866
- val[1] === ''
867
- ) {
868
- // throw new BadRequestException(`Invalid value for in_between: ${val}`);
869
- console.log(`Invalid value for in_between: ${val}`);
870
- return null;
871
- }
872
- return {
873
- query: `e.${attr} BETWEEN :${key}_start AND :${key}_end`,
874
- params: {
875
- [`${key}_start`]: val[0],
876
- [`${key}_end`]: val[1],
877
- },
878
- };
879
- }
880
-
881
- case 'today': {
882
- const today = new Date().toISOString().split('T')[0]; // 'YYYY-MM-DD'
883
-
884
- return {
885
- query: `DATE(e.${attr}) = :today`,
886
- params: {
887
- today,
888
- },
889
- };
890
- }
891
-
892
- case 'empty': {
893
- return {
894
- query: `e.${attr} IS NULL`,
895
- params: {},
896
- };
897
- }
898
-
899
- case 'not_empty': {
900
- return {
901
- query: `e.${attr} IS NOT NULL`,
902
- params: {},
903
- };
904
- }
905
- default:
906
- throw new BadRequestException(`Unsupported operator for date: ${op}`);
907
- }
908
- }
909
-
910
- private buildSelectCondition(
911
- attr: string,
912
- op: string,
913
- val: any,
914
- key: string,
915
- ) {
916
- switch (op) {
917
- case 'equal':
918
- return { query: `e.${attr} = :${key}`, params: { [key]: val } };
919
- case 'not_equal':
920
- return { query: `e.${attr} != :${key}`, params: { [key]: val } };
921
- case 'empty':
922
- return { query: `e.${attr} IS NULL`, params: {} };
923
- case 'not_empty':
924
- return { query: `e.${attr} IS NOT NULL`, params: {} };
925
- default:
926
- throw new BadRequestException(`Unsupported operator for select: ${op}`);
927
- }
928
- }
929
-
930
- private buildMultiSelectCondition(
931
- attr: string,
932
- op: string,
933
- val: any,
934
- key: string,
935
- ) {
936
- if (Array.isArray(val) && val.length === 0) {
937
- return { query: '1=1', params: {} };
938
- }
939
-
940
- if ((op === 'equal' || op === 'not_equal') && !Array.isArray(val)) {
941
- throw new BadRequestException(
942
- `Value for multi-select must be an array for operator: ${op}`,
943
- );
944
- }
945
-
946
- switch (op) {
947
- case 'equal':
948
- return {
949
- query: `e.${attr} IN (:${key})`,
950
- params: { [key]: val },
951
- };
952
- case 'not_equal':
953
- return {
954
- query: `e.${attr} NOT IN (:${key})`,
955
- params: { [key]: val },
956
- };
957
- case 'contains':
958
- return {
959
- query: `e.${attr} LIKE :${key}`,
960
- params: { [key]: `%${val}%` },
961
- };
962
- case 'not_contains':
963
- return {
964
- query: `e.${attr} NOT LIKE :${key}`,
965
- params: { [key]: `%${val}%` },
966
- };
967
- case 'empty':
968
- return { query: `e.${attr} IS NULL`, params: {} };
969
- case 'not_empty':
970
- return { query: `e.${attr} IS NOT NULL`, params: {} };
971
- default:
972
- throw new BadRequestException(
973
- `Unsupported operator for multiselect: ${op}`,
974
- );
975
- }
976
- }
977
-
978
- private buildYearCondition(attr: string, op: string, val: any, key: string) {
979
- switch (op) {
980
- case 'equal':
981
- return {
982
- query: `e.${attr} = :${key}`,
983
- params: { [key]: parseInt(val, 10) },
984
- };
985
- case 'not_equal':
986
- return {
987
- query: `e.${attr} != :${key}`,
988
- params: { [key]: parseInt(val, 10) },
989
- };
990
- case 'greater_than':
991
- return {
992
- query: `e.${attr} > :${key}`,
993
- params: { [key]: parseInt(val, 10) },
994
- };
995
- case 'less_than':
996
- return {
997
- query: `e.${attr} < :${key}`,
998
- params: { [key]: parseInt(val, 10) },
999
- };
1000
- default:
1001
- throw new BadRequestException(`Unsupported operator for year: ${op}`);
1002
- }
1003
- }
1004
- }
1
+ import { BadRequestException, Inject, Injectable } from '@nestjs/common';
2
+ import { AttributeMasterService } from 'src/module/meta/service/attribute-master.service';
3
+ import { EntityMasterService } from 'src/module/meta/service/entity-master.service';
4
+ import { EntityTableColumnService } from 'src/module/meta/service/entity-table-column.service';
5
+ import { EntityTableService } from 'src/module/meta/service/entity-table.service';
6
+ import { DataSource } from 'typeorm';
7
+ import { FilterCondition, FilterRequestDto } from '../dto/filter-request.dto';
8
+ import { SavedFilterService } from './saved-filter.service';
9
+
10
+ import * as moment from 'moment';
11
+ import { EntityRelationService } from 'src/module/meta/service/entity-relation.service';
12
+ import { ResolverService } from 'src/module/meta/service/resolver.service';
13
+ import { LoggingService } from 'src/utils/service/loggingUtil.service';
14
+
15
+ @Injectable()
16
+ export class FilterService {
17
+ constructor(
18
+ private dataSource: DataSource,
19
+ private readonly attributeMasterService: AttributeMasterService,
20
+ private readonly entityMasterService: EntityMasterService,
21
+ @Inject('SavedFilterService')
22
+ private readonly savedFilterService: SavedFilterService,
23
+ @Inject('EntityRelationService')
24
+ private readonly entityRelationService: EntityRelationService,
25
+ private readonly resolverService: ResolverService,
26
+ @Inject() protected readonly loggingService: LoggingService,
27
+ ) {}
28
+ private readonly skipAppCodeFilterEntities = ['ORGP'];
29
+ private readonly skipOrgFilterEntities = ['ORGP'];
30
+
31
+ private async gettab_value_counts(
32
+ tableName: string,
33
+ column: string | undefined,
34
+ whereClauses: { query: string; params: Record<string, any> }[],
35
+ ) {
36
+ if (!column) return [];
37
+
38
+ let whereSQL = '';
39
+ const values: any[] = [];
40
+
41
+ if (whereClauses.length > 0) {
42
+ const clauseParts = whereClauses.map((clause) => {
43
+ let parsedQuery = clause.query.replace(/\be\./g, ''); // remove e.
44
+
45
+ Object.entries(clause.params).forEach(([key, val]) => {
46
+ if (Array.isArray(val)) {
47
+ // if it's an array → expand placeholders (?, ?, ?)
48
+ const placeholders = val.map(() => '?').join(', ');
49
+ parsedQuery = parsedQuery.replace(
50
+ new RegExp(`:${key}`, 'g'),
51
+ `(${placeholders})`,
52
+ );
53
+ values.push(...val); // flatten values
54
+ } else {
55
+ parsedQuery = parsedQuery.replace(new RegExp(`:${key}`, 'g'), '?');
56
+ values.push(val);
57
+ }
58
+ });
59
+
60
+ return parsedQuery;
61
+ });
62
+
63
+ whereSQL = `WHERE ${clauseParts.join(' AND ')}`;
64
+ }
65
+
66
+ const rawSQL = `
67
+ SELECT ${column} AS tab_value, COUNT(*) AS tab_value_count
68
+ FROM ${tableName}
69
+ ${whereSQL}
70
+ GROUP BY ${column}
71
+ `;
72
+
73
+ const rows = await this.dataSource.query(rawSQL, values);
74
+
75
+ const total = rows.reduce(
76
+ (sum, r) => sum + parseInt(r.tab_value_count, 10),
77
+ 0,
78
+ );
79
+
80
+ return [
81
+ { tab_value: 'All', tab_value_count: total },
82
+ ...rows.map((r) => ({
83
+ tab_value: r.tab_value ?? 'UNKNOWN',
84
+ tab_value_count: parseInt(r.tab_value_count, 10),
85
+ })),
86
+ ];
87
+ }
88
+
89
+ async applyFilterWrapper(dto: FilterRequestDto) {
90
+ const {
91
+ entity_type,
92
+ quickFilter = [],
93
+ savedFilterCode,
94
+ attributeFilter = [],
95
+ loggedInUser,
96
+ } = dto;
97
+
98
+ // 🔹 Step 1: Collect all filters (from body + savedFilter)
99
+ const savedFilters = await this.getSavedFilters(
100
+ savedFilterCode ?? undefined,
101
+ );
102
+ const allFilters = [
103
+ ...quickFilter,
104
+ ...attributeFilter,
105
+ ...savedFilters,
106
+ ].filter((f) => f.filter_value !== '');
107
+
108
+ // 🔹 Step 2: Group filters by filter_entity_type
109
+ const grouped = allFilters.reduce(
110
+ (acc, f) => {
111
+ if (!acc[f.filter_entity_type]) acc[f.filter_entity_type] = [];
112
+ acc[f.filter_entity_type].push(f);
113
+ return acc;
114
+ },
115
+ {} as Record<string, any[]>,
116
+ );
117
+
118
+ console.log('🟠 [FilterService] Grouped filters by entity type:', grouped);
119
+
120
+ // 🔹 Step 3: Handle sub-entities first
121
+ let intersectionIds: number[] | null = null;
122
+ for (const [subEntityType, filters] of Object.entries(grouped)) {
123
+ if (subEntityType === entity_type) continue; // skip main entity for now
124
+
125
+ let { queryParams, tabs, ...newDto } = dto;
126
+
127
+ const subDto: FilterRequestDto = {
128
+ ...newDto,
129
+ entity_type: subEntityType,
130
+ quickFilter: filters as FilterCondition[],
131
+ savedFilterCode: null, // already merged
132
+ attributeFilter: [],
133
+ };
134
+
135
+ const subResult = await this.applyFilter(subDto);
136
+ const subEntityIds = subResult.data.entity_list.map((row) => row.id);
137
+
138
+ console.log(
139
+ `🧩 [FilterService] Sub-entity ${subEntityType} returned IDs:`,
140
+ subEntityIds,
141
+ );
142
+
143
+ if (!subEntityIds.length) {
144
+ console.log(
145
+ `ℹ️ [FilterService] No records for sub-entity ${subEntityType}, returning empty result`,
146
+ );
147
+ return {
148
+ success: true,
149
+ data: { entity_tabs: [], entity_list: [], pagination: {} },
150
+ };
151
+ }
152
+
153
+ const relatedIds = await this.entityRelationService.getRelatedEntityIds(
154
+ entity_type,
155
+ subEntityType,
156
+ subEntityIds,
157
+ dto.loggedInUser.organization_id,
158
+ );
159
+
160
+ intersectionIds =
161
+ intersectionIds === null
162
+ ? relatedIds
163
+ : intersectionIds.filter((id) => relatedIds.includes(id));
164
+
165
+ if (intersectionIds.length === 0) {
166
+ console.log(
167
+ '🚫 [FilterService] No intersection IDs left, returning empty result',
168
+ );
169
+ return {
170
+ success: true,
171
+ data: { entity_tabs: [], entity_list: [], pagination: {} },
172
+ };
173
+ }
174
+ }
175
+
176
+ // 🔹 Step 4: Call applyFilter for main entity
177
+ const mainFilters = grouped[entity_type] || [];
178
+ const mainDto: FilterRequestDto = {
179
+ ...dto,
180
+ quickFilter: [...mainFilters],
181
+ savedFilterCode: null,
182
+ attributeFilter: [],
183
+ };
184
+
185
+ if (intersectionIds && intersectionIds.length > 0) {
186
+ (mainDto.quickFilter ??= []).push({
187
+ filter_attribute: 'id',
188
+ filter_operator: 'equal',
189
+ filter_value: intersectionIds,
190
+ filter_entity_type: entity_type,
191
+ });
192
+ }
193
+
194
+ return await this.applyFilter(mainDto);
195
+ }
196
+
197
+ async applyFilter(dto: FilterRequestDto) {
198
+ const {
199
+ entity_type,
200
+ quickFilter,
201
+ savedFilterCode,
202
+ attributeFilter,
203
+ tabs,
204
+ sortby,
205
+ loggedInUser,
206
+ queryParams,
207
+ customLevelType,
208
+ customLevelId,
209
+ customAppCode,
210
+ } = dto;
211
+
212
+ // abstract user details
213
+ const {
214
+ level_type,
215
+ level_id,
216
+ id: user_id,
217
+ appcode,
218
+ organization_id,
219
+ } = loggedInUser || {};
220
+
221
+ // Fetch meta from entity table service
222
+ const entityMeta = await this.entityMasterService.getEntityData(
223
+ entity_type,
224
+ loggedInUser,
225
+ );
226
+ const tableName = entityMeta?.data_source; // data_source is the table name
227
+
228
+ if (!tableName) {
229
+ console.error(`❌ [FilterService] Invalid entity_type: ${entity_type}`);
230
+ throw new BadRequestException(`Invalid entity_type: ${entity_type}`);
231
+ }
232
+
233
+ const getAttributeColumnMeta =
234
+ await this.attributeMasterService.findAttributesByMappedEntityType(
235
+ entity_type,
236
+ loggedInUser,
237
+ );
238
+
239
+ const attributeMetaMap = getAttributeColumnMeta.reduce(
240
+ (acc, attr) => {
241
+ acc[attr.attribute_key] = attr;
242
+ return acc;
243
+ },
244
+ {} as Record<string, any>,
245
+ );
246
+
247
+ // Get and parse saved filters
248
+ const savedFilters = await this.getSavedFilters(
249
+ savedFilterCode ?? undefined,
250
+ );
251
+ const savedFiltersNormalized = savedFilters.map((f) => ({
252
+ filter_attribute: f.filter_attribute,
253
+ filter_operator: f.filter_operator,
254
+ filter_value: f.filter_value,
255
+ }));
256
+
257
+ const baseFilters = [
258
+ ...(quickFilter || []).filter(
259
+ (f) => f.filter_value != null && f.filter_value !== '',
260
+ ),
261
+ ...savedFiltersNormalized.filter(
262
+ (f) => f.filter_value != null && f.filter_value !== '',
263
+ ),
264
+ ...(attributeFilter || []).filter(
265
+ (f) => f.filter_value != null && f.filter_value !== '',
266
+ ),
267
+ ];
268
+
269
+ // 🧱 Build where clauses
270
+ const baseWhere = this.buildWhereClauses(baseFilters, attributeMetaMap);
271
+
272
+ // Handle TEMPLATE entity special condition
273
+ if (entity_type === 'TEMP' || entity_type === 'TEM') {
274
+ const templateTable = entityMeta?.data_source || 'frm_wf_comm_template';
275
+
276
+ if (level_type === 'ORG') {
277
+ baseWhere.push({
278
+ query: ` ((e.level_type = 'ORG' AND e.level_id = ${loggedInUser.organization_id} AND e.organization_id = ${loggedInUser.organization_id}))`,
279
+ params: {},
280
+ });
281
+ } else if (level_type === 'SCH') {
282
+ baseWhere.push({
283
+ query: `
284
+ (
285
+ (e.level_type = 'SCH' AND e.level_id = ${loggedInUser.level_id} AND e.organization_id = ${loggedInUser.organization_id})
286
+ OR
287
+ (
288
+ e.level_type = 'ORG'
289
+ AND e.level_id = ${loggedInUser.organization_id}
290
+ AND e.organization_id = ${loggedInUser.organization_id}
291
+ AND e.code NOT IN (
292
+ SELECT sub.code
293
+ FROM frm_wf_comm_template AS sub
294
+ WHERE sub.level_type = 'SCH' AND sub.level_id = ${loggedInUser.level_id}
295
+ )
296
+ )
297
+ )
298
+ `,
299
+ params: {},
300
+ });
301
+ }
302
+ }
303
+
304
+ // Default org/level clause — skip TEMPLATE entity
305
+ if (
306
+ entity_type !== 'ORGP' &&
307
+ entity_type !== 'TEMP' &&
308
+ entity_type !== 'TEM' && // ✅ skip TEMPLATE
309
+ level_type &&
310
+ level_id &&
311
+ organization_id &&
312
+ !customLevelType &&
313
+ !customLevelId
314
+ ) {
315
+ baseWhere.push({
316
+ query:
317
+ 'e.organization_id = :organization_id AND e.level_type = :level_type AND e.level_id = :level_id',
318
+ params: { organization_id, level_type, level_id },
319
+ });
320
+ }
321
+
322
+ if (entity_type == 'USR' || entity_type == 'UPR') {
323
+ baseWhere.push({
324
+ query: 'e.is_customer is NULL',
325
+ params: {},
326
+ });
327
+ }
328
+
329
+ if (customLevelType && customLevelId && customAppCode) {
330
+ baseWhere.push({
331
+ query:
332
+ 'e.organization_id = :organization_id AND e.level_type = :customLevelType AND e.level_id = :customLevelId AND e.appcode = :customAppCode',
333
+ params: {
334
+ organization_id,
335
+ customLevelType,
336
+ customLevelId,
337
+ customAppCode,
338
+ },
339
+ });
340
+ }
341
+
342
+ // Handle queryParams filters
343
+ if (queryParams) {
344
+ Object.entries(queryParams).forEach(([key, value]) => {
345
+ if (!value) return;
346
+
347
+ if (key === 'attributeName' && queryParams['attributeValue']) {
348
+ const attrName = value;
349
+ const attrValue = queryParams['attributeValue'];
350
+ baseWhere.push({
351
+ query: `e.${attrName} = :${attrName}`,
352
+ params: { [attrName]: attrValue },
353
+ });
354
+ } else if (key !== 'attributeValue') {
355
+ baseWhere.push({
356
+ query: `e.${key} = :${key}`,
357
+ params: { [key]: value },
358
+ });
359
+ }
360
+ });
361
+ }
362
+
363
+ console.log('🟠 [FilterService] Constructed baseWhere clauses:', baseWhere);
364
+
365
+ // layout preference query
366
+ const layoutPreference = await this.dataSource.query(
367
+ `SELECT mapped_json
368
+ FROM frm_entity_layout_pref
369
+ WHERE user_id = ? AND mapped_entity_type = ? AND mapped_level_id = ? AND mapped_level_type = ? AND type = 'layout'`,
370
+ [user_id, entity_type, level_id, level_type],
371
+ );
372
+
373
+ // Extract layout preference
374
+ const layout = layoutPreference?.[0]?.mapped_json?.quick_tab || {};
375
+ const showList =
376
+ layout?.show_list?.map((val) => {
377
+ if (typeof val === 'string') {
378
+ // legacy case — old format like ['Active', 'Inactive']
379
+ return val.toLowerCase();
380
+ }
381
+
382
+ if (val && typeof val === 'object' && val.value !== undefined) {
383
+ // new format — [{ label: 'Active', value: '13023' }]
384
+ return String(val.value).toLowerCase();
385
+ }
386
+
387
+ return ''; // fallback safety
388
+ }) || [];
389
+
390
+ let filteredTabs = await this.getFilteredTabs(
391
+ layout,
392
+ showList,
393
+ entityMeta,
394
+ baseWhere,
395
+ tabs,
396
+ loggedInUser,
397
+ );
398
+
399
+ const dataWhere = [...baseWhere];
400
+
401
+ if (tabs?.columnName && tabs?.value) {
402
+ const tabAttrMeta = attributeMetaMap[tabs.columnName];
403
+ const tabValue = tabs.value.toLowerCase();
404
+
405
+ if (tabValue === 'others') {
406
+ // Extract 'value' (IDs) from showList, ignore 'all'
407
+ const valuesToExclude = showList
408
+ .filter((v) => v.label.toLowerCase() !== 'all')
409
+ .map((v) => v.value);
410
+
411
+ if (valuesToExclude.length > 0) {
412
+ for (const value of valuesToExclude) {
413
+ const resolvedId = await this.resolverService.getResolvedId(
414
+ loggedInUser,
415
+ tabs.columnName,
416
+ value,
417
+ entity_type,
418
+ );
419
+ if (resolvedId) {
420
+ const tabCondition = this.buildCondition(
421
+ {
422
+ filter_attribute: tabs.columnName,
423
+ filter_operator: 'not_equal',
424
+ filter_value: [resolvedId],
425
+ skip_id: true,
426
+ },
427
+ tabAttrMeta,
428
+ );
429
+ if (tabCondition) dataWhere.push(tabCondition);
430
+ }
431
+ }
432
+ }
433
+ } else if (tabValue !== 'all') {
434
+ const resolvedId = await this.resolverService.getResolvedId(
435
+ loggedInUser,
436
+ tabs.columnName,
437
+ tabs.value,
438
+ entity_type,
439
+ );
440
+
441
+ if (resolvedId) {
442
+ const tabCondition = this.buildCondition(
443
+ {
444
+ filter_attribute: tabs.columnName,
445
+ filter_operator: 'equal',
446
+ filter_value: [resolvedId],
447
+ skip_id: true,
448
+ },
449
+ tabAttrMeta,
450
+ );
451
+ if (tabCondition) dataWhere.push(tabCondition);
452
+ }
453
+ }
454
+ }
455
+
456
+ let qb = this.dataSource
457
+ .createQueryBuilder()
458
+ .select('e.*')
459
+ .from(tableName, 'e');
460
+ dataWhere.forEach((clause) => qb.andWhere(clause.query, clause.params));
461
+
462
+ // Apply sorting
463
+ qb = await this.sortTabsByShowList(qb, sortby, layoutPreference, tabs);
464
+
465
+ const page = dto.page && dto.page > 0 ? dto.page : 1;
466
+ const size = dto.size && dto.size > 0 ? dto.size : 10;
467
+ qb.skip((page - 1) * size).take(size);
468
+
469
+ const entity_list = await qb.getRawMany();
470
+
471
+ console.log(`📦 [FilterService] Fetched ${entity_list.length} records`);
472
+
473
+ const dateAttributes = Object.entries(attributeMetaMap)
474
+ .filter(([_, attr]) => attr.data_type === 'date')
475
+ .map(([key]) => key);
476
+
477
+ const formatDate = (dateStr: string | null): string | null =>
478
+ dateStr ? moment(dateStr).format('DD-MM-YYYY') : '';
479
+
480
+ const formatDatesInRow = (row: any): any => {
481
+ const formattedRow = { ...row };
482
+ for (const key of dateAttributes) {
483
+ if (formattedRow[key])
484
+ formattedRow[key] = formatDate(formattedRow[key]);
485
+ }
486
+ return formattedRow;
487
+ };
488
+
489
+ const formattedEntityList = entity_list.map(formatDatesInRow);
490
+
491
+ const resolvedEntityList = await Promise.all(
492
+ formattedEntityList.map((row) =>
493
+ this.resolverService.getResolvedData(loggedInUser, row, entity_type),
494
+ ),
495
+ );
496
+
497
+ const resolvedTabs = await Promise.all(
498
+ filteredTabs.map(async (tab) => {
499
+ const tabAttrKey = layout?.attribute || tabs?.columnName;
500
+
501
+ if (
502
+ !tabAttrKey ||
503
+ tab.tab_value?.toLowerCase() === 'all' ||
504
+ tab.tab_value?.toLowerCase() === 'others'
505
+ ) {
506
+ return tab;
507
+ }
508
+
509
+ const resolvedVal = await this.resolverService.getResolvedValue(
510
+ loggedInUser,
511
+ tabAttrKey,
512
+ tab.tab_value,
513
+ entity_type,
514
+ );
515
+
516
+ return { ...tab, tab_value: resolvedVal ?? tab.tab_value };
517
+ }),
518
+ );
519
+
520
+ const countQb = this.dataSource
521
+ .createQueryBuilder()
522
+ .select('COUNT(*)', 'count')
523
+ .from(tableName, 'e');
524
+ dataWhere.forEach((clause) =>
525
+ countQb.andWhere(clause.query, clause.params),
526
+ );
527
+ const countResult = await countQb.getRawOne();
528
+ const total = parseInt(countResult.count, 10);
529
+
530
+ console.log('📊 [FilterService] Returning final result with total:', total);
531
+
532
+ return {
533
+ success: true,
534
+ data: {
535
+ entity_tabs: resolvedTabs,
536
+ entity_list: resolvedEntityList,
537
+ pagination: {
538
+ total,
539
+ page,
540
+ size,
541
+ totalPages: Math.ceil(total / size),
542
+ hasNextPage: page * size < total,
543
+ hasPreviousPage: page > 1,
544
+ },
545
+ },
546
+ };
547
+ }
548
+
549
+ // GET FILTERED TABS LOGIC
550
+ private async getFilteredTabs(
551
+ layout: any,
552
+ showList: any,
553
+ entityMeta: any,
554
+ baseWhere: any,
555
+ tabs: any,
556
+ loggedInUser: any,
557
+ ) {
558
+ let allTabs;
559
+ if (layout.attribute) {
560
+ allTabs = await this.gettab_value_counts(
561
+ entityMeta?.data_source,
562
+ layout.attribute,
563
+ baseWhere,
564
+ );
565
+ } else {
566
+ allTabs = await this.gettab_value_counts(
567
+ entityMeta?.data_source,
568
+ tabs?.columnName,
569
+ baseWhere,
570
+ );
571
+ }
572
+
573
+ let filteredTabs: any[] = [];
574
+
575
+ if (showList?.length > 0) {
576
+ // Extract tab IDs (values)
577
+ const showValues = showList.map((item) =>
578
+ item.value?.toString().toLowerCase(),
579
+ );
580
+
581
+ // Handle "all" logic
582
+ const isAllNeeded = layout?.isAllSelected && !showValues.includes('all');
583
+ if (isAllNeeded) {
584
+ showList.push({ label: 'All', value: 'all' });
585
+ showValues.push('all');
586
+ }
587
+
588
+ // Filter by value IDs (not labels)
589
+ filteredTabs = allTabs.filter((tab) => {
590
+ const tabValueStr = tab.tab_value
591
+ ? String(tab.tab_value).toLowerCase()
592
+ : '';
593
+ return showValues.includes(tabValueStr);
594
+ });
595
+
596
+ // Handle "all" tab
597
+ const allTab = filteredTabs.find(
598
+ (tab) => tab.tab_value?.toString().toLowerCase() === 'all',
599
+ );
600
+ filteredTabs = filteredTabs.filter(
601
+ (tab) => tab.tab_value?.toString().toLowerCase() !== 'all',
602
+ );
603
+
604
+ // SORTING LOGIC
605
+ if (layout.sorting === 'asc') {
606
+ filteredTabs.sort((a, b) =>
607
+ a.tab_value.toString().localeCompare(b.tab_value.toString()),
608
+ );
609
+ } else if (layout.sorting === 'dsc') {
610
+ filteredTabs.sort((a, b) =>
611
+ b.tab_value.toString().localeCompare(a.tab_value.toString()),
612
+ );
613
+ } else if (layout.sorting === 'count_asc') {
614
+ filteredTabs.sort((a, b) => a.tab_value_count - b.tab_value_count);
615
+ } else if (layout.sorting === 'count_dsc') {
616
+ filteredTabs.sort((a, b) => b.tab_value_count - a.tab_value_count);
617
+ } else if (layout.sorting === 'custom') {
618
+ // Keep order same as showList
619
+ const orderMap = new Map<string, number>(
620
+ showList.map((item, index) => [
621
+ item.value?.toString().toLowerCase(),
622
+ index,
623
+ ]),
624
+ );
625
+ filteredTabs.sort((a, b) => {
626
+ const aIndex =
627
+ orderMap.get(a.tab_value?.toString().toLowerCase()) ?? Infinity;
628
+ const bIndex =
629
+ orderMap.get(b.tab_value?.toString().toLowerCase()) ?? Infinity;
630
+ return aIndex - bIndex;
631
+ });
632
+ }
633
+
634
+ // Re-add "all" tab at beginning if needed
635
+ if (allTab) filteredTabs.unshift(allTab);
636
+
637
+ // Combine others if enabled
638
+ if (layout?.isCombineOther) {
639
+ const originalAllTab = allTabs.find(
640
+ (tab) => tab.tab_value?.toString().toLowerCase() === 'all',
641
+ );
642
+ const allCount = originalAllTab?.tab_value_count ?? 0;
643
+ const knownTabCountSum = filteredTabs
644
+ .filter((tab) => tab.tab_value?.toString().toLowerCase() !== 'all')
645
+ .reduce((acc, tab) => acc + tab.tab_value_count, 0);
646
+
647
+ const othersCount = allCount - knownTabCountSum;
648
+ filteredTabs.push({
649
+ tab_value: 'OTHERS',
650
+ tab_value_count: othersCount < 0 ? 0 : othersCount,
651
+ });
652
+ }
653
+ } else {
654
+ filteredTabs = allTabs;
655
+ }
656
+
657
+ return filteredTabs;
658
+ }
659
+
660
+ // SORTING LOGIC FOR TABS
661
+ private async sortTabsByShowList(
662
+ qb: any,
663
+ sortby: any,
664
+ layoutPreference: any,
665
+ tabs: any,
666
+ ) {
667
+ if (layoutPreference && layoutPreference[0]?.mapped_json?.sorting) {
668
+ if (Array.isArray(layoutPreference[0]?.mapped_json?.sorting?.tabs)) {
669
+ const preferenceTabArray =
670
+ layoutPreference[0]?.mapped_json?.sorting?.tabs;
671
+ const tabFilter = preferenceTabArray.find(
672
+ (tabData) => tabData.tab_name === tabs?.value,
673
+ );
674
+ tabFilter?.sortby.forEach(({ column, order }) => {
675
+ qb.addOrderBy(
676
+ `e.${column}`,
677
+ order?.toUpperCase() === 'DSC' ? 'DESC' : 'ASC',
678
+ );
679
+ });
680
+ } else if (
681
+ Array.isArray(layoutPreference[0]?.mapped_json?.sorting?.sortby)
682
+ ) {
683
+ layoutPreference[0]?.mapped_json?.sorting?.sortby?.forEach(
684
+ ({ column, order }) => {
685
+ qb.addOrderBy(
686
+ `e.${column}`,
687
+ order?.toUpperCase() === 'DSC' ? 'DESC' : 'ASC',
688
+ );
689
+ },
690
+ );
691
+ }
692
+ }
693
+
694
+ if (Array.isArray(sortby) && sortby.length > 0) {
695
+ sortby.forEach(({ sortColum, sortType }) => {
696
+ if (sortColum) {
697
+ qb.addOrderBy(
698
+ `e.${sortColum}`,
699
+ sortType?.toUpperCase() === 'DSC' ? 'DESC' : 'ASC',
700
+ );
701
+ }
702
+ });
703
+ } else {
704
+ // fallback if no explicit sortby sent
705
+ qb.addOrderBy('e.created_date', 'DESC');
706
+ }
707
+
708
+ return qb;
709
+ }
710
+
711
+ private parseFilters(raw: any, isSingle = false): any[] {
712
+ if (!raw) return [];
713
+
714
+ if (typeof raw === 'string') {
715
+ try {
716
+ const parsed = JSON.parse(raw);
717
+ return isSingle ? [parsed] : parsed;
718
+ } catch {
719
+ throw new BadRequestException('Invalid JSON in filter input');
720
+ }
721
+ }
722
+
723
+ return isSingle ? [raw] : Array.isArray(raw) ? raw : [];
724
+ }
725
+
726
+ private async getSavedFilters(code?: string): Promise<any[]> {
727
+ if (!code) return [];
728
+
729
+ const savedFilter = await this.savedFilterService.getDetailsByCode(code);
730
+ if (!savedFilter) {
731
+ throw new BadRequestException(`Saved filter not found for code: ${code}`);
732
+ }
733
+ return savedFilter;
734
+ }
735
+
736
+ private buildWhereClauses(
737
+ filters: any[],
738
+ attributeMeta: Record<string, any>,
739
+ ) {
740
+ return filters
741
+ .map((f) => this.buildCondition(f, attributeMeta[f.filter_attribute]))
742
+ .filter(
743
+ (clause): clause is { query: string; params: any } => clause !== null,
744
+ );
745
+ }
746
+
747
+ private buildCondition(
748
+ filter: any,
749
+ meta: any,
750
+ ): { query: string; params: any } | null {
751
+ if (!meta) return null;
752
+
753
+ let attr = filter.filter_attribute;
754
+ const val = filter.filter_value;
755
+ const op = filter.filter_operator;
756
+ const key = `param_${attr}_${Math.random().toString(36).substring(2, 8)}`;
757
+
758
+ // if (
759
+ // (meta.data_source_type === 'entity' ||
760
+ // meta.data_source_type === 'master') &&
761
+ // !filter.skip_id
762
+ // ) {
763
+ // attr = `${attr}_id`;
764
+ // }
765
+
766
+ switch (meta.data_type) {
767
+ case 'text':
768
+ return this.buildTextCondition(attr, op, val, key);
769
+ case 'number':
770
+ return this.buildNumberCondition(attr, op, val, key);
771
+ case 'date':
772
+ return this.buildDateCondition(attr, op, val, key);
773
+ case 'select':
774
+ return this.buildMultiSelectCondition(attr, op, val, key);
775
+ case 'multiselect':
776
+ return this.buildMultiSelectCondition(attr, op, val, key);
777
+ case 'checkbox':
778
+ return this.buildMultiSelectCondition(attr, op, val, key);
779
+ case 'radio':
780
+ return this.buildMultiSelectCondition(attr, op, val, key);
781
+ case 'year':
782
+ return this.buildYearCondition(attr, op, val, key);
783
+ default:
784
+ return null;
785
+ }
786
+ }
787
+
788
+ private buildTextCondition(attr: string, op: string, val: any, key: string) {
789
+ switch (op) {
790
+ case 'contains':
791
+ return {
792
+ query: `LOWER(e.${attr}) LIKE :${key}`,
793
+ params: { [key]: `%${val ? val.toLowerCase() : ''}%` },
794
+ };
795
+ case 'equal':
796
+ return {
797
+ query: `e.${attr} = :${key}`,
798
+ params: { [key]: val },
799
+ };
800
+ case 'not_equal':
801
+ return {
802
+ query: `e.${attr} != :${key}`,
803
+ params: { [key]: val },
804
+ };
805
+ case 'empty':
806
+ return {
807
+ query: `e.${attr} IS NULL`,
808
+ params: {},
809
+ };
810
+ case 'not_empty':
811
+ return {
812
+ query: `e.${attr} IS NOT NULL`,
813
+ params: {},
814
+ };
815
+ default:
816
+ throw new BadRequestException(`Unsupported operator for text: ${op}`);
817
+ }
818
+ }
819
+
820
+ private buildNumberCondition(
821
+ attr: string,
822
+ op: string,
823
+ val: any,
824
+ key: string,
825
+ ) {
826
+ switch (op) {
827
+ case 'equal':
828
+ return { query: `e.${attr} = :${key}`, params: { [key]: val } };
829
+ case 'not_equal':
830
+ return { query: `e.${attr} != :${key}`, params: { [key]: val } };
831
+ case 'greater_than':
832
+ return { query: `e.${attr} > :${key}`, params: { [key]: val } };
833
+ case 'less_than':
834
+ return { query: `e.${attr} < :${key}`, params: { [key]: val } };
835
+ case 'less_than_qual_to':
836
+ return { query: `e.${attr} <= :${key}`, params: { [key]: val } };
837
+ case 'greater_than_qual_to':
838
+ return { query: `e.${attr} >= :${key}`, params: { [key]: val } };
839
+ case 'empty':
840
+ return { query: `e.${attr} IS NULL`, params: {} };
841
+ case 'not_empty':
842
+ return { query: `e.${attr} IS NOT NULL`, params: {} };
843
+
844
+ default:
845
+ throw new BadRequestException(`Unsupported operator for number: ${op}`);
846
+ }
847
+ }
848
+
849
+ private buildDateCondition(attr: string, op: string, val: any, key: string) {
850
+ switch (op) {
851
+ case 'equal':
852
+ return { query: `e.${attr} = :${key}`, params: { [key]: val } };
853
+ case 'before':
854
+ return { query: `e.${attr} < :${key}`, params: { [key]: val } };
855
+ case 'after':
856
+ return { query: `e.${attr} > :${key}`, params: { [key]: val } };
857
+ case 'between': {
858
+ if (typeof val === 'string') {
859
+ val = val.split(',').map((v) => v.trim());
860
+ }
861
+
862
+ if (
863
+ !Array.isArray(val) ||
864
+ val.length !== 2 ||
865
+ val[0] === '' ||
866
+ val[1] === ''
867
+ ) {
868
+ // throw new BadRequestException(`Invalid value for in_between: ${val}`);
869
+ console.log(`Invalid value for in_between: ${val}`);
870
+ return null;
871
+ }
872
+ return {
873
+ query: `e.${attr} BETWEEN :${key}_start AND :${key}_end`,
874
+ params: {
875
+ [`${key}_start`]: val[0],
876
+ [`${key}_end`]: val[1],
877
+ },
878
+ };
879
+ }
880
+
881
+ case 'today': {
882
+ const today = new Date().toISOString().split('T')[0]; // 'YYYY-MM-DD'
883
+
884
+ return {
885
+ query: `DATE(e.${attr}) = :today`,
886
+ params: {
887
+ today,
888
+ },
889
+ };
890
+ }
891
+
892
+ case 'empty': {
893
+ return {
894
+ query: `e.${attr} IS NULL`,
895
+ params: {},
896
+ };
897
+ }
898
+
899
+ case 'not_empty': {
900
+ return {
901
+ query: `e.${attr} IS NOT NULL`,
902
+ params: {},
903
+ };
904
+ }
905
+ default:
906
+ throw new BadRequestException(`Unsupported operator for date: ${op}`);
907
+ }
908
+ }
909
+
910
+ private buildSelectCondition(
911
+ attr: string,
912
+ op: string,
913
+ val: any,
914
+ key: string,
915
+ ) {
916
+ switch (op) {
917
+ case 'equal':
918
+ return { query: `e.${attr} = :${key}`, params: { [key]: val } };
919
+ case 'not_equal':
920
+ return { query: `e.${attr} != :${key}`, params: { [key]: val } };
921
+ case 'empty':
922
+ return { query: `e.${attr} IS NULL`, params: {} };
923
+ case 'not_empty':
924
+ return { query: `e.${attr} IS NOT NULL`, params: {} };
925
+ default:
926
+ throw new BadRequestException(`Unsupported operator for select: ${op}`);
927
+ }
928
+ }
929
+
930
+ private buildMultiSelectCondition(
931
+ attr: string,
932
+ op: string,
933
+ val: any,
934
+ key: string,
935
+ ) {
936
+ if (Array.isArray(val) && val.length === 0) {
937
+ return { query: '1=1', params: {} };
938
+ }
939
+
940
+ if ((op === 'equal' || op === 'not_equal') && !Array.isArray(val)) {
941
+ throw new BadRequestException(
942
+ `Value for multi-select must be an array for operator: ${op}`,
943
+ );
944
+ }
945
+
946
+ switch (op) {
947
+ case 'equal':
948
+ return {
949
+ query: `e.${attr} IN (:${key})`,
950
+ params: { [key]: val },
951
+ };
952
+ case 'not_equal':
953
+ return {
954
+ query: `e.${attr} NOT IN (:${key})`,
955
+ params: { [key]: val },
956
+ };
957
+ case 'contains':
958
+ return {
959
+ query: `e.${attr} LIKE :${key}`,
960
+ params: { [key]: `%${val}%` },
961
+ };
962
+ case 'not_contains':
963
+ return {
964
+ query: `e.${attr} NOT LIKE :${key}`,
965
+ params: { [key]: `%${val}%` },
966
+ };
967
+ case 'empty':
968
+ return { query: `e.${attr} IS NULL`, params: {} };
969
+ case 'not_empty':
970
+ return { query: `e.${attr} IS NOT NULL`, params: {} };
971
+ default:
972
+ throw new BadRequestException(
973
+ `Unsupported operator for multiselect: ${op}`,
974
+ );
975
+ }
976
+ }
977
+
978
+ private buildYearCondition(attr: string, op: string, val: any, key: string) {
979
+ switch (op) {
980
+ case 'equal':
981
+ return {
982
+ query: `e.${attr} = :${key}`,
983
+ params: { [key]: parseInt(val, 10) },
984
+ };
985
+ case 'not_equal':
986
+ return {
987
+ query: `e.${attr} != :${key}`,
988
+ params: { [key]: parseInt(val, 10) },
989
+ };
990
+ case 'greater_than':
991
+ return {
992
+ query: `e.${attr} > :${key}`,
993
+ params: { [key]: parseInt(val, 10) },
994
+ };
995
+ case 'less_than':
996
+ return {
997
+ query: `e.${attr} < :${key}`,
998
+ params: { [key]: parseInt(val, 10) },
999
+ };
1000
+ default:
1001
+ throw new BadRequestException(`Unsupported operator for year: ${op}`);
1002
+ }
1003
+ }
1004
+ }