rez_core 5.0.166 → 5.0.168

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 (420) 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/dashboard/service/dashboard.service.js +1 -1
  12. package/dist/module/dashboard/service/dashboard.service.js.map +1 -1
  13. package/dist/module/filter/repository/saved-filter.repository.d.ts +4 -6
  14. package/dist/module/filter/repository/saved-filter.repository.js +43 -9
  15. package/dist/module/filter/repository/saved-filter.repository.js.map +1 -1
  16. package/dist/module/filter/service/filter.service.js +19 -19
  17. package/dist/module/integration/examples/usage.example.js +9 -9
  18. package/dist/module/listmaster/entity/list-master.entity.d.ts +1 -0
  19. package/dist/module/listmaster/entity/list-master.entity.js +4 -0
  20. package/dist/module/listmaster/entity/list-master.entity.js.map +1 -1
  21. package/dist/module/meta/dto/entity-table.dto.d.ts +1 -4
  22. package/dist/module/meta/repository/attribute-master.repository.js +8 -8
  23. package/dist/module/meta/service/entity-dynamic.service.js +17 -17
  24. package/dist/module/meta/service/entity-dynamic.service.js.map +1 -1
  25. package/dist/module/meta/service/entity-list.service.js +2 -2
  26. package/dist/module/meta/service/media-data.service.js +6 -6
  27. package/dist/module/meta/service/resolver.service.js +15 -15
  28. package/dist/module/module/controller/module-access.controller.d.ts +1 -1
  29. package/dist/module/module/controller/module-access.controller.js +6 -8
  30. package/dist/module/module/controller/module-access.controller.js.map +1 -1
  31. package/dist/module/module/repository/menu.repository.js +5 -5
  32. package/dist/module/module/repository/menu.repository.js.map +1 -1
  33. package/dist/module/module/service/module-access.service.d.ts +3 -4
  34. package/dist/module/module/service/module-access.service.js +7 -14
  35. package/dist/module/module/service/module-access.service.js.map +1 -1
  36. package/dist/module/notification/service/notification.service.js +6 -6
  37. package/dist/module/user/controller/login.controller.js +18 -18
  38. package/dist/module/workflow/repository/action.repository.js +2 -2
  39. package/dist/module/workflow/repository/stage.repository.js +8 -8
  40. package/dist/module/workflow/service/action-template-mapping.service.js +2 -2
  41. package/dist/module/workflow/service/action.service.js +5 -5
  42. package/dist/module/workflow/service/entity-modification.service.js +2 -2
  43. package/dist/module/workflow/service/task.service.js +8 -8
  44. package/dist/module/workflow-automation/service/schedule-handler.service.js +9 -9
  45. package/dist/tsconfig.build.tsbuildinfo +1 -1
  46. package/dist/utils/service/reflection-helper.service.js +2 -2
  47. package/docs/modules/event-driven-integration-design.md +91 -91
  48. package/docs/modules/integration.md +250 -250
  49. package/eslint.config.mjs +34 -34
  50. package/nest-cli.json +14 -14
  51. package/package.json +125 -125
  52. package/src/app.controller.ts +12 -12
  53. package/src/app.module.ts +68 -68
  54. package/src/app.service.ts +8 -8
  55. package/src/config/bull.config.ts +69 -69
  56. package/src/config/config.module.ts +17 -17
  57. package/src/config/database.config.ts +48 -48
  58. package/src/constant/global.constant.ts +67 -67
  59. package/src/core.module.ts +94 -94
  60. package/src/decorators/roles.decorator.ts +7 -7
  61. package/src/dtos/response.dto.ts +6 -6
  62. package/src/dtos/response.ts +5 -5
  63. package/src/index.ts +1 -1
  64. package/src/module/auth/auth.module.ts +49 -49
  65. package/src/module/auth/controller/auth.controller.ts +28 -28
  66. package/src/module/auth/guards/google-auth.guard.ts +9 -9
  67. package/src/module/auth/guards/jwt.guard.ts +22 -22
  68. package/src/module/auth/guards/role.guard.ts +68 -68
  69. package/src/module/auth/services/auth.service.ts +56 -56
  70. package/src/module/auth/services/jwt.service.ts +11 -11
  71. package/src/module/auth/strategies/google.strategy.ts +54 -54
  72. package/src/module/auth/strategies/jwt.strategy.ts +58 -58
  73. package/src/module/auth/strategies/local.strategy.ts +13 -13
  74. package/src/module/dashboard/controller/dashboard.controller.ts +36 -36
  75. package/src/module/dashboard/dashboard.module.ts +21 -21
  76. package/src/module/dashboard/entity/dashboard_page_data.entity.ts +27 -27
  77. package/src/module/dashboard/entity/widget_master.entity.ts +18 -18
  78. package/src/module/dashboard/repository/dashboard.repository.ts +51 -51
  79. package/src/module/dashboard/service/dashboard.service.ts +73 -73
  80. package/src/module/enterprise/controller/organization.controller.ts +36 -36
  81. package/src/module/enterprise/enterprise.module.ts +30 -30
  82. package/src/module/enterprise/entity/enterprise.entity.ts +37 -37
  83. package/src/module/enterprise/entity/organization-app-mapping.entity.ts +13 -13
  84. package/src/module/enterprise/entity/organization.entity.ts +92 -92
  85. package/src/module/enterprise/repository/enterprise.repository.ts +31 -31
  86. package/src/module/enterprise/repository/organization.repository.ts +26 -26
  87. package/src/module/enterprise/repository/school.repository.ts +272 -272
  88. package/src/module/enterprise/service/brand.service.ts +5 -5
  89. package/src/module/enterprise/service/enterprise.service.ts +16 -16
  90. package/src/module/enterprise/service/organization-app-mapping.service.ts +4 -4
  91. package/src/module/enterprise/service/organization.service.ts +145 -145
  92. package/src/module/entity_json/controller/entity_json.controller.ts +47 -47
  93. package/src/module/entity_json/entity/entityJson.entity.ts +39 -39
  94. package/src/module/entity_json/entity_json.module.ts +18 -18
  95. package/src/module/entity_json/service/entityJson.repository.ts +37 -37
  96. package/src/module/entity_json/service/entity_json.service.ts +242 -242
  97. package/src/module/export/controller/export.controller.ts +83 -83
  98. package/src/module/export/export.module.ts +14 -14
  99. package/src/module/export/service/export.service.ts +105 -105
  100. package/src/module/filter/controller/filter.controller.ts +84 -84
  101. package/src/module/filter/dto/filter-request.dto.ts +39 -39
  102. package/src/module/filter/entity/saved-filter-detail.entity.ts +41 -41
  103. package/src/module/filter/entity/saved-filter-master.entity.ts +32 -32
  104. package/src/module/filter/filter.module.ts +33 -33
  105. package/src/module/filter/repository/saved-filter.repository.ts +256 -200
  106. package/src/module/filter/repository/saved.filter-detail.repository.ts +19 -19
  107. package/src/module/filter/service/filter-evaluator.service.ts +82 -82
  108. package/src/module/filter/service/filter.service.ts +1319 -1319
  109. package/src/module/filter/service/saved-filter.service.ts +164 -164
  110. package/src/module/ics/controller/ics.controller.ts +21 -21
  111. package/src/module/ics/dto/ics.dto.ts +55 -55
  112. package/src/module/ics/ics.module.ts +13 -13
  113. package/src/module/ics/service/ics.service.ts +57 -57
  114. package/src/module/integration/controller/calender-event.controller.ts +31 -31
  115. package/src/module/integration/controller/integration.controller.ts +662 -662
  116. package/src/module/integration/controller/wrapper.controller.ts +37 -37
  117. package/src/module/integration/dto/create-config.dto.ts +526 -526
  118. package/src/module/integration/entity/integration-config.entity.ts +112 -112
  119. package/src/module/integration/entity/integration-entity-mapper.entity.ts +14 -14
  120. package/src/module/integration/entity/integration-source.entity.ts +17 -17
  121. package/src/module/integration/entity/user-integration.entity.ts +71 -71
  122. package/src/module/integration/examples/usage.example.ts +338 -338
  123. package/src/module/integration/factories/base.factory.ts +7 -7
  124. package/src/module/integration/factories/email.factory.ts +49 -49
  125. package/src/module/integration/factories/integration.factory.ts +121 -121
  126. package/src/module/integration/factories/sms.factory.ts +51 -51
  127. package/src/module/integration/factories/telephone.factory.ts +41 -41
  128. package/src/module/integration/factories/whatsapp.factory.ts +56 -56
  129. package/src/module/integration/integration.module.ts +110 -110
  130. package/src/module/integration/service/calendar-event.service.ts +118 -118
  131. package/src/module/integration/service/integration-entity-mapper.service.ts +17 -17
  132. package/src/module/integration/service/integration-queue.service.ts +229 -229
  133. package/src/module/integration/service/integration.service.ts +2634 -2634
  134. package/src/module/integration/service/oauth.service.ts +224 -224
  135. package/src/module/integration/service/wrapper.service.ts +753 -753
  136. package/src/module/integration/strategies/email/gmail-api.strategy.ts +280 -280
  137. package/src/module/integration/strategies/email/outlook-api.strategy.ts +44 -44
  138. package/src/module/integration/strategies/email/outlook.strategy.ts +64 -64
  139. package/src/module/integration/strategies/email/sendgrid-api.strategy.ts +260 -260
  140. package/src/module/integration/strategies/integration.strategy.ts +97 -97
  141. package/src/module/integration/strategies/sms/gupshup-sms.strategy.ts +146 -146
  142. package/src/module/integration/strategies/sms/msg91-sms.strategy.ts +164 -164
  143. package/src/module/integration/strategies/sms/tubelight-sms.strategy.ts +163 -163
  144. package/src/module/integration/strategies/telephone/ozonetel-voice.strategy.ts +238 -238
  145. package/src/module/integration/strategies/telephone/tubelight-voice.strategy.ts +210 -210
  146. package/src/module/integration/strategies/whatsapp/gupshup-whatsapp.strategy.ts +359 -359
  147. package/src/module/integration/strategies/whatsapp/tubelight-whatsapp.strategy.ts +372 -372
  148. package/src/module/integration/strategies/whatsapp/whatsapp-cloud.strategy.ts +403 -403
  149. package/src/module/integration/strategies/whatsapp/whatsapp.strategy.ts +57 -57
  150. package/src/module/layout/controller/layout.controller.ts +47 -47
  151. package/src/module/layout/entity/header-items.entity.ts +28 -28
  152. package/src/module/layout/entity/header-section.entity.ts +19 -19
  153. package/src/module/layout/layout.module.ts +21 -21
  154. package/src/module/layout/repository/header-items.repository.ts +18 -18
  155. package/src/module/layout/repository/header-section.repository.ts +22 -22
  156. package/src/module/layout/service/header-section.service.ts +25 -25
  157. package/src/module/layout_preference/controller/layout_preference.controller.ts +73 -73
  158. package/src/module/layout_preference/entity/layout_preference.entity.ts +28 -28
  159. package/src/module/layout_preference/layout_preference.module.ts +22 -22
  160. package/src/module/layout_preference/repository/layout_preference.repository.ts +65 -65
  161. package/src/module/layout_preference/service/layout_preference.service.ts +191 -191
  162. package/src/module/lead/controller/lead.controller.ts +30 -30
  163. package/src/module/lead/lead.module.ts +14 -14
  164. package/src/module/lead/repository/lead.repository.ts +41 -41
  165. package/src/module/lead/service/lead.service.ts +54 -54
  166. package/src/module/linked_attributes/controller/linked_attributes.controller.ts +37 -37
  167. package/src/module/linked_attributes/entity/linked_attribute.entity.ts +51 -51
  168. package/src/module/linked_attributes/linked_attributes.module.ts +16 -16
  169. package/src/module/linked_attributes/repository/linked_attribute.repository.ts +12 -12
  170. package/src/module/linked_attributes/service/linked_attributes.service.ts +75 -75
  171. package/src/module/listmaster/controller/list-master.controller.ts +230 -230
  172. package/src/module/listmaster/entity/list-master-items.entity.ts +43 -43
  173. package/src/module/listmaster/entity/list-master.entity.ts +33 -30
  174. package/src/module/listmaster/listmaster.module.ts +46 -46
  175. package/src/module/listmaster/repository/list-master-items.repository.ts +173 -173
  176. package/src/module/listmaster/repository/list-master.repository.ts +56 -56
  177. package/src/module/listmaster/service/list-master-engine.ts +19 -19
  178. package/src/module/listmaster/service/list-master-extension.interface.ts +4 -4
  179. package/src/module/listmaster/service/list-master-item.service.ts +281 -281
  180. package/src/module/listmaster/service/list-master-registry.ts +15 -15
  181. package/src/module/listmaster/service/list-master.service.ts +535 -535
  182. package/src/module/mapper/controller/field-mapper.controller.ts +76 -76
  183. package/src/module/mapper/controller/mapper.controller.ts +20 -20
  184. package/src/module/mapper/dto/field-mapper.dto.ts +14 -14
  185. package/src/module/mapper/entity/field-lovs.entity.ts +19 -19
  186. package/src/module/mapper/entity/field-mapper.entity.ts +53 -53
  187. package/src/module/mapper/entity/mapper.entity.ts +16 -16
  188. package/src/module/mapper/mapper.module.ts +35 -35
  189. package/src/module/mapper/repository/field-lovs.repository.ts +35 -35
  190. package/src/module/mapper/repository/field-mapper.repository.ts +42 -42
  191. package/src/module/mapper/repository/mapper.repository.ts +32 -32
  192. package/src/module/mapper/service/field-mapper.service.ts +269 -269
  193. package/src/module/mapper/service/mapper.service.ts +81 -81
  194. package/src/module/master/controller/master.controller.ts +74 -74
  195. package/src/module/master/service/master.service.ts +483 -483
  196. package/src/module/meta/controller/app-master.controller.ts +38 -38
  197. package/src/module/meta/controller/attribute-master.controller.ts +84 -84
  198. package/src/module/meta/controller/entity-dynamic.controller.ts +125 -125
  199. package/src/module/meta/controller/entity-master.controller.ts +41 -41
  200. package/src/module/meta/controller/entity-relation.controller.ts +36 -36
  201. package/src/module/meta/controller/entity.controller.ts +342 -342
  202. package/src/module/meta/controller/entity.public.controller.ts +75 -75
  203. package/src/module/meta/controller/media.controller.ts +135 -135
  204. package/src/module/meta/controller/meta.controller.ts +96 -96
  205. package/src/module/meta/controller/view-master.controller.ts +86 -86
  206. package/src/module/meta/dto/entity-list-data.dto.ts +6 -6
  207. package/src/module/meta/dto/entity-tab.dto.ts +4 -4
  208. package/src/module/meta/dto/entity-table.dto.ts +12 -12
  209. package/src/module/meta/entity/app-master.entity.ts +37 -37
  210. package/src/module/meta/entity/attribute-master.entity.ts +92 -92
  211. package/src/module/meta/entity/base-entity.entity.ts +75 -75
  212. package/src/module/meta/entity/entity-master.entity.ts +85 -85
  213. package/src/module/meta/entity/entity-relation-data.entity.ts +29 -29
  214. package/src/module/meta/entity/entity-relation.entity.ts +23 -23
  215. package/src/module/meta/entity/entity-table-column.entity.ts +61 -61
  216. package/src/module/meta/entity/entity-table.entity.ts +50 -50
  217. package/src/module/meta/entity/media-data.entity.ts +32 -32
  218. package/src/module/meta/entity/preference.entity.ts +62 -62
  219. package/src/module/meta/entity/view-master.entity.ts +41 -41
  220. package/src/module/meta/entity.module.ts +168 -168
  221. package/src/module/meta/repository/app-master.repository.ts +20 -20
  222. package/src/module/meta/repository/attribute-master.repository.ts +156 -156
  223. package/src/module/meta/repository/entity-attribute-update.repository.ts +48 -48
  224. package/src/module/meta/repository/entity-master.repository.ts +110 -110
  225. package/src/module/meta/repository/entity-relation.repository.ts +22 -22
  226. package/src/module/meta/repository/entity-table-column.repository.ts +39 -39
  227. package/src/module/meta/repository/entity-table.repository.ts +53 -53
  228. package/src/module/meta/repository/media-data.repository.ts +50 -50
  229. package/src/module/meta/repository/preference.repository.ts +20 -20
  230. package/src/module/meta/repository/user-app-mapping.repository.ts +28 -28
  231. package/src/module/meta/repository/view-master.repository.ts +42 -42
  232. package/src/module/meta/service/app-master.service.ts +37 -37
  233. package/src/module/meta/service/attribute-master.service.ts +130 -130
  234. package/src/module/meta/service/common.service.ts +9 -9
  235. package/src/module/meta/service/entity-attribute-update.service.ts +26 -26
  236. package/src/module/meta/service/entity-dynamic.service.ts +822 -822
  237. package/src/module/meta/service/entity-list.service.ts +201 -201
  238. package/src/module/meta/service/entity-master.service.ts +171 -171
  239. package/src/module/meta/service/entity-realation-data.service.ts +9 -9
  240. package/src/module/meta/service/entity-relation.service.ts +74 -74
  241. package/src/module/meta/service/entity-service-impl.service.ts +439 -439
  242. package/src/module/meta/service/entity-table-column.service.ts +39 -39
  243. package/src/module/meta/service/entity-table.service.ts +157 -157
  244. package/src/module/meta/service/entity-validation.service.ts +187 -187
  245. package/src/module/meta/service/entity.service.ts +59 -59
  246. package/src/module/meta/service/field-group.service.ts +103 -103
  247. package/src/module/meta/service/media-data.service.ts +591 -591
  248. package/src/module/meta/service/populate-meta.service.ts +222 -222
  249. package/src/module/meta/service/preference.service.ts +16 -16
  250. package/src/module/meta/service/resolver.service.ts +291 -291
  251. package/src/module/meta/service/section-master.service.ts +104 -104
  252. package/src/module/meta/service/update-form-json.service.ts +22 -22
  253. package/src/module/meta/service/user-app-mapping.service.ts +17 -17
  254. package/src/module/meta/service/view-master.service.ts +127 -127
  255. package/src/module/microservice-client/microservice-clients.module.ts +13 -13
  256. package/src/module/microservice-client/service/microservice-client-factory.ts +37 -37
  257. package/src/module/microservice-client/service/microservice-clients.ts +4 -4
  258. package/src/module/module/controller/menu.controller.ts +15 -15
  259. package/src/module/module/controller/module-access.controller.ts +133 -134
  260. package/src/module/module/entity/menu.entity.ts +43 -43
  261. package/src/module/module/entity/module-access.entity.ts +25 -25
  262. package/src/module/module/entity/module-action.entity.ts +17 -17
  263. package/src/module/module/entity/module.entity.ts +52 -52
  264. package/src/module/module/module.module.ts +42 -42
  265. package/src/module/module/repository/menu.repository.ts +186 -186
  266. package/src/module/module/repository/module-access.repository.ts +344 -344
  267. package/src/module/module/service/menu.service.ts +82 -82
  268. package/src/module/module/service/module-access.service.ts +189 -199
  269. package/src/module/notification/controller/notification.controller.ts +58 -58
  270. package/src/module/notification/controller/otp.controller.ts +117 -117
  271. package/src/module/notification/entity/notification.entity.ts +26 -26
  272. package/src/module/notification/entity/otp.entity.ts +28 -28
  273. package/src/module/notification/firebase-admin.config.ts +22 -22
  274. package/src/module/notification/notification.module.ts +69 -69
  275. package/src/module/notification/repository/otp.repository.ts +27 -27
  276. package/src/module/notification/service/email.service.ts +127 -127
  277. package/src/module/notification/service/notification.service.ts +164 -164
  278. package/src/module/notification/service/otp.service.ts +133 -133
  279. package/src/module/third-party-module/entity/third-party-api-registry.entity.ts +52 -52
  280. package/src/module/third-party-module/repository/third-party-api-registry.repository.ts +20 -20
  281. package/src/module/third-party-module/service/api-registry.service.ts +13 -13
  282. package/src/module/third-party-module/third-party.module.ts +12 -12
  283. package/src/module/user/controller/login.controller.ts +198 -198
  284. package/src/module/user/controller/user.controller.ts +40 -40
  285. package/src/module/user/dto/create-user.dto.ts +62 -62
  286. package/src/module/user/dto/update-user.dto.ts +4 -4
  287. package/src/module/user/entity/role.entity.ts +33 -33
  288. package/src/module/user/entity/user-role-mapping.entity.ts +38 -38
  289. package/src/module/user/entity/user-session.entity.ts +73 -73
  290. package/src/module/user/entity/user.entity.ts +59 -59
  291. package/src/module/user/repository/role.repository.ts +96 -96
  292. package/src/module/user/repository/user-role-mapping.repository.ts +126 -126
  293. package/src/module/user/repository/user.repository.ts +50 -50
  294. package/src/module/user/repository/userSession.repository.ts +33 -33
  295. package/src/module/user/service/login.service.ts +326 -326
  296. package/src/module/user/service/role.service.ts +197 -197
  297. package/src/module/user/service/user-role-mapping.service.ts +98 -98
  298. package/src/module/user/service/user-session.service.ts +200 -200
  299. package/src/module/user/service/user.service.ts +368 -368
  300. package/src/module/user/user.module.ts +65 -65
  301. package/src/module/workflow/controller/action-category.controller.ts +54 -54
  302. package/src/module/workflow/controller/action-resource-mapping.controller.ts +23 -23
  303. package/src/module/workflow/controller/action-template-mapping.controller.ts +35 -35
  304. package/src/module/workflow/controller/action.controller.ts +111 -111
  305. package/src/module/workflow/controller/activity-log.controller.ts +55 -55
  306. package/src/module/workflow/controller/comm-template.controller.ts +43 -43
  307. package/src/module/workflow/controller/entity-modification.controller.ts +35 -35
  308. package/src/module/workflow/controller/form-master.controller.ts +43 -43
  309. package/src/module/workflow/controller/stage-group.controller.ts +48 -48
  310. package/src/module/workflow/controller/stage.controller.ts +50 -50
  311. package/src/module/workflow/controller/task.controller.ts +77 -77
  312. package/src/module/workflow/controller/workflow-list-master.controller.ts +44 -44
  313. package/src/module/workflow/controller/workflow-meta.controller.ts +80 -80
  314. package/src/module/workflow/controller/workflow.controller.ts +67 -67
  315. package/src/module/workflow/entity/action-category.entity.ts +38 -38
  316. package/src/module/workflow/entity/action-data.entity.ts +55 -55
  317. package/src/module/workflow/entity/action-resources-mapping.entity.ts +29 -29
  318. package/src/module/workflow/entity/action-template-mapping.entity.ts +17 -17
  319. package/src/module/workflow/entity/action.entity.ts +53 -53
  320. package/src/module/workflow/entity/activity-log.entity.ts +43 -43
  321. package/src/module/workflow/entity/comm-template.entity.ts +43 -43
  322. package/src/module/workflow/entity/entity-modification.entity.ts +38 -38
  323. package/src/module/workflow/entity/form.entity.ts +25 -25
  324. package/src/module/workflow/entity/stage-action-mapping.entity.ts +17 -17
  325. package/src/module/workflow/entity/stage-group.entity.ts +23 -23
  326. package/src/module/workflow/entity/stage-movement-data.entity.ts +38 -38
  327. package/src/module/workflow/entity/stage.entity.ts +20 -20
  328. package/src/module/workflow/entity/task-data.entity.ts +88 -88
  329. package/src/module/workflow/entity/template-attach-mapper.entity.ts +30 -30
  330. package/src/module/workflow/entity/workflow-data.entity.ts +11 -11
  331. package/src/module/workflow/entity/workflow-level-mapping.entity.ts +18 -18
  332. package/src/module/workflow/entity/workflow.entity.ts +20 -20
  333. package/src/module/workflow/repository/action-category.repository.ts +79 -79
  334. package/src/module/workflow/repository/action-data.repository.ts +346 -346
  335. package/src/module/workflow/repository/action.repository.ts +339 -339
  336. package/src/module/workflow/repository/activity-log.repository.ts +148 -148
  337. package/src/module/workflow/repository/comm-template.repository.ts +157 -157
  338. package/src/module/workflow/repository/form-master.repository.ts +50 -50
  339. package/src/module/workflow/repository/stage-group.repository.ts +186 -186
  340. package/src/module/workflow/repository/stage-movement.repository.ts +257 -257
  341. package/src/module/workflow/repository/stage.repository.ts +160 -160
  342. package/src/module/workflow/repository/task.repository.ts +151 -151
  343. package/src/module/workflow/repository/workflow.repository.ts +42 -42
  344. package/src/module/workflow/service/action-category.service.ts +33 -33
  345. package/src/module/workflow/service/action-data.service.ts +62 -62
  346. package/src/module/workflow/service/action-resources-mapping.service.ts +10 -10
  347. package/src/module/workflow/service/action-template-mapping.service.ts +140 -140
  348. package/src/module/workflow/service/action.service.ts +302 -302
  349. package/src/module/workflow/service/activity-log.service.ts +107 -107
  350. package/src/module/workflow/service/comm-template.service.ts +180 -180
  351. package/src/module/workflow/service/entity-modification.service.ts +61 -61
  352. package/src/module/workflow/service/form-master.service.ts +35 -35
  353. package/src/module/workflow/service/populate-workflow.service.ts +320 -320
  354. package/src/module/workflow/service/stage-action-mapping.service.ts +5 -5
  355. package/src/module/workflow/service/stage-group.service.ts +344 -344
  356. package/src/module/workflow/service/stage.service.ts +207 -207
  357. package/src/module/workflow/service/task.service.ts +550 -550
  358. package/src/module/workflow/service/workflow-list-master.service.ts +68 -68
  359. package/src/module/workflow/service/workflow-meta.service.ts +639 -639
  360. package/src/module/workflow/service/workflow.service.ts +213 -213
  361. package/src/module/workflow/workflow.module.ts +180 -180
  362. package/src/module/workflow-automation/SCHEDULING_GUIDE.md +145 -145
  363. package/src/module/workflow-automation/controller/workflow-automation.controller.ts +43 -43
  364. package/src/module/workflow-automation/entity/workflow-automation-action.entity.ts +26 -26
  365. package/src/module/workflow-automation/entity/workflow-automation.entity.ts +40 -40
  366. package/src/module/workflow-automation/interface/action.decorator.ts +7 -7
  367. package/src/module/workflow-automation/interface/action.interface.ts +5 -5
  368. package/src/module/workflow-automation/service/action-registery.service.ts +35 -35
  369. package/src/module/workflow-automation/service/schedule-handler.service.ts +168 -168
  370. package/src/module/workflow-automation/service/workflow-automation-engine.service.ts +219 -219
  371. package/src/module/workflow-automation/service/workflow-automation.service.ts +515 -515
  372. package/src/module/workflow-automation/workflow-automation.module.ts +54 -54
  373. package/src/module/workflow-schedule/INSTALLATION.md +244 -244
  374. package/src/module/workflow-schedule/MULTI_PROJECT_GUIDE.md +196 -196
  375. package/src/module/workflow-schedule/README.md +422 -422
  376. package/src/module/workflow-schedule/constants/schedule.constants.ts +48 -48
  377. package/src/module/workflow-schedule/controller/workflow-schedule.controller.ts +255 -255
  378. package/src/module/workflow-schedule/docs/CLAUDE_CODE_GUIDE.md +510 -510
  379. package/src/module/workflow-schedule/docs/CLAUDE_CODE_PROMPT.md +362 -362
  380. package/src/module/workflow-schedule/docs/RUN_CLAUDE_CODE.sh +68 -68
  381. package/src/module/workflow-schedule/dto/create-schedule.dto.ts +147 -147
  382. package/src/module/workflow-schedule/dto/get-execution-logs.dto.ts +119 -119
  383. package/src/module/workflow-schedule/dto/update-schedule.dto.ts +96 -96
  384. package/src/module/workflow-schedule/entities/scheduled-workflow.entity.ts +148 -148
  385. package/src/module/workflow-schedule/entities/workflow-execution-log.entity.ts +154 -154
  386. package/src/module/workflow-schedule/interfaces/schedule-job-data.interface.ts +53 -53
  387. package/src/module/workflow-schedule/interfaces/workflow-schedule-options.interface.ts +12 -12
  388. package/src/module/workflow-schedule/processors/schedule.processor.ts +620 -620
  389. package/src/module/workflow-schedule/service/workflow-schedule.service.ts +598 -598
  390. package/src/module/workflow-schedule/workflow-schedule.module.ts +67 -67
  391. package/src/resources/dev.properties.yaml +31 -31
  392. package/src/resources/local.properties.yaml +27 -27
  393. package/src/resources/properties.module.ts +12 -12
  394. package/src/resources/properties.yaml.ts +11 -11
  395. package/src/resources/uat.properties.yaml +31 -31
  396. package/src/table.config.ts +133 -133
  397. package/src/utils/dto/excel-data.dto.ts +14 -14
  398. package/src/utils/dto/excelsheet-data.dto.ts +5 -5
  399. package/src/utils/service/base64util.service.ts +18 -18
  400. package/src/utils/service/clockIDGenUtil.service.ts +21 -21
  401. package/src/utils/service/codeGenerator.service.ts +22 -22
  402. package/src/utils/service/dateUtil.service.ts +17 -17
  403. package/src/utils/service/encryptUtil.service.ts +97 -97
  404. package/src/utils/service/excel-helper.service.ts +72 -72
  405. package/src/utils/service/excelUtil.service.ts +15 -15
  406. package/src/utils/service/file-util.service.ts +11 -11
  407. package/src/utils/service/json-util.service.ts +23 -23
  408. package/src/utils/service/loggingUtil.service.ts +88 -88
  409. package/src/utils/service/reflection-helper.service.ts +62 -62
  410. package/src/utils/service/wbsCodeGen.service.ts +8 -8
  411. package/src/utils/utils.module.ts +27 -27
  412. package/tsconfig.build.json +4 -4
  413. package/tsconfig.json +24 -24
  414. package/.claude/settings.local.json +0 -26
  415. package/.idea/copilot.data.migration.agent.xml +0 -6
  416. package/.idea/copilot.data.migration.ask.xml +0 -6
  417. package/.idea/copilot.data.migration.ask2agent.xml +0 -6
  418. package/.idea/copilot.data.migration.edit.xml +0 -6
  419. package/.idea/misc.xml +0 -6
  420. package/server.log +0 -850
@@ -1,591 +1,591 @@
1
- import { Injectable } from '@nestjs/common';
2
- import { ConfigService } from '@nestjs/config';
3
- import { S3 } from 'aws-sdk';
4
- import axios from 'axios';
5
- import { EntityManager } from 'typeorm';
6
- import { v4 as uuidv4 } from 'uuid';
7
- import {
8
- ENTITYTYPE_MEDIA,
9
- STATUS_PENDING,
10
- } from '../../../constant/global.constant';
11
- import { MediaData } from '../entity/media-data.entity';
12
- import { MediaDataRepository } from '../repository/media-data.repository';
13
- import { EntityServiceImpl } from './entity-service-impl.service';
14
-
15
- @Injectable()
16
- export class MediaDataService extends EntityServiceImpl {
17
- constructor(
18
- private readonly configService: ConfigService,
19
- private readonly mediaRepository: MediaDataRepository,
20
- private entityManager: EntityManager,
21
- ) {
22
- super();
23
- }
24
-
25
- s3AccessKeyID = this.configService.get('AWS.S3.AWS_ACCESS_KEY_ID');
26
- s3AccessKeySecret = this.configService.get('AWS.S3.AWS_SECRET_KEY');
27
- s3Region = this.configService.get('AWS.S3.AWS_REGION');
28
- bucketName = this.configService.get<string>('AWS.S3.BUCKET_NAME');
29
-
30
- s3 = new S3({
31
- accessKeyId: this.s3AccessKeyID,
32
- secretAccessKey: this.s3AccessKeySecret,
33
- region: this.s3Region,
34
- signatureVersion: 'v4',
35
- });
36
-
37
- async generateMediaUploadDetails(
38
- fileName: string,
39
- mappedAttributeKey: string,
40
- loggedInUser,
41
- mappedEntityType?: string,
42
- mappedEntityId?: number,
43
- parentId?: number,
44
- parentType?: string,
45
- ) {
46
- if (!fileName || !mappedAttributeKey) {
47
- return null;
48
- }
49
- const ext = fileName.split('.').pop()?.toLowerCase() ?? '';
50
-
51
- const id = uuidv4();
52
-
53
- const s3Path =
54
- (await this.buildUploadPathGeneric(
55
- mappedEntityType || '',
56
- loggedInUser,
57
- mappedEntityId,
58
- parentId,
59
- parentType,
60
- )) || `uploads`;
61
-
62
- const s3Key = `${s3Path}/${id}.${ext}`;
63
-
64
- const uploadUrl = await this.s3.getSignedUrlPromise('putObject', {
65
- Bucket: this.bucketName,
66
- Key: s3Key,
67
- Expires: 60 * 5, // URL valid for 5 mins
68
- ContentType: this.getContentType(ext),
69
- });
70
-
71
- const mediaData = new MediaData();
72
- mediaData.file_name = fileName;
73
- mediaData.mapped_attribute_key = mappedAttributeKey;
74
- mediaData.status = STATUS_PENDING;
75
- if (mappedEntityType) {
76
- mediaData.mapped_entity_type = mappedEntityType;
77
- }
78
- if (mappedEntityId) {
79
- mediaData.mapped_entity_id = mappedEntityId;
80
- }
81
- mediaData.media_url = s3Key;
82
-
83
- //INSERT RECORD IN DOC TABLE
84
- const savedEntity = await super.createEntity(mediaData, loggedInUser);
85
-
86
- if (savedEntity) {
87
- return { id: savedEntity.id, path: s3Key, uploadUrl };
88
- }
89
- return null;
90
- }
91
-
92
- async findByAttributeKeyAndMappedEntityIdAndMappedEntityType(
93
- attributeKey: string,
94
- mappedEntityId: number,
95
- mappedEntityType: string,
96
- ) {
97
- return await this.mediaRepository.findByAttributeKeyAndMappedEntityIdAndMappedEntityType(
98
- attributeKey,
99
- mappedEntityId,
100
- mappedEntityType,
101
- );
102
- }
103
-
104
- async findByMappedEntityIdAndMappedEntityType(
105
- mappedEntityId: number,
106
- mappedEntityType: string,
107
- ) {
108
- return await this.mediaRepository.findByMappedEntityIdAndMappedEntityType(
109
- mappedEntityId,
110
- mappedEntityType,
111
- );
112
- }
113
-
114
- async deleteByAttributeKeyAndMappedEntityIdAndMappedEntityType(
115
- attributeKey: string,
116
- mappedEntityId: number,
117
- mappedEntityType: string,
118
- ) {
119
- return await this.mediaRepository.deleteByAttributeKeyAndMappedEntityIdAndMappedEntityType(
120
- attributeKey,
121
- mappedEntityId,
122
- mappedEntityType,
123
- );
124
- }
125
-
126
- private getContentType(ext: string): string {
127
- const map = {
128
- pdf: 'application/pdf',
129
- jpg: 'image/jpeg',
130
- jpeg: 'image/jpeg',
131
- png: 'image/png',
132
- gif: 'image/gif',
133
- webp: 'image/webp',
134
- txt: 'text/plain',
135
- html: 'text/html',
136
- htm: 'text/html',
137
- doc: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
138
- docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
139
- xls: 'application/vnd.ms-excel',
140
- xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
141
- ppt: 'application/vnd.ms-powerpoint',
142
- pptx: 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
143
- };
144
- return map[ext] || 'application/octet-stream';
145
- }
146
-
147
- // New method to get the signed URL for the media (download link)
148
- async getMediaDownloadUrl(id: number, loggedInUser, expiresIn?: number) {
149
- try {
150
- const entityData = await this.getEntityData(
151
- ENTITYTYPE_MEDIA,
152
- id,
153
- loggedInUser,
154
- );
155
- const mediaData = entityData as MediaData;
156
- let fileSize: number | undefined;
157
- if (this.bucketName) {
158
- const head = await this.s3
159
- .headObject({
160
- Bucket: this.bucketName,
161
- Key: mediaData.media_url,
162
- })
163
- .promise();
164
- fileSize = head.ContentLength;
165
- }
166
-
167
- const signedUrl = await this.s3.getSignedUrlPromise('getObject', {
168
- Bucket: this.bucketName,
169
- Key: mediaData.media_url,
170
- Expires: Number(expiresIn) || 60 * 5,
171
- ResponseContentDisposition: 'inline',
172
- });
173
- return {
174
- signedUrl,
175
- fileName: mediaData.file_name,
176
- id: mediaData.id,
177
- size: fileSize,
178
- };
179
- } catch (error) {
180
- console.error('Error generating signed URL for media:', error);
181
- throw new Error('Failed to generate signed URL');
182
- }
183
- }
184
-
185
- async getMediaInlineUrl(id: number, loggedInUser, expiresIn?: number) {
186
- try {
187
- const entityData = await this.getEntityData(
188
- ENTITYTYPE_MEDIA,
189
- id,
190
- loggedInUser,
191
- );
192
- const mediaData = entityData as MediaData;
193
- let fileSize: number | undefined;
194
-
195
- if (!mediaData) {
196
- throw new Error('Media not found');
197
- }
198
-
199
- const ext = mediaData.file_name.split('.').pop()?.toLowerCase() || '';
200
-
201
- if (this.bucketName) {
202
- const head = await this.s3
203
- .headObject({
204
- Bucket: this.bucketName,
205
- Key: mediaData.media_url,
206
- })
207
- .promise();
208
- fileSize = head.ContentLength;
209
- }
210
-
211
- const signedUrl = await this.s3.getSignedUrlPromise('getObject', {
212
- Bucket: this.bucketName,
213
- Key: mediaData.media_url,
214
- Expires: Number(expiresIn) || 60 * 5,
215
- ResponseContentDisposition: 'inline',
216
- ResponseContentType: this.getContentType(ext),
217
- });
218
-
219
- let previewUrl = signedUrl;
220
- // if (ext === 'doc' || ext === 'docx') {
221
- // previewUrl =
222
- // `https://view.officeapps.live.com/op/embed.aspx?src=` +
223
- // encodeURIComponent(signedUrl);
224
- // }
225
-
226
- return {
227
- signedUrl: previewUrl,
228
- fileName: mediaData.file_name,
229
- id: mediaData.id,
230
- size: fileSize,
231
- uploadedDate: mediaData.created_date,
232
- };
233
- } catch (error) {
234
- console.error('Error generating inline URL:', error);
235
- throw new Error('Failed to generate inline URL');
236
- }
237
- }
238
-
239
- public async buildUploadPathGenericdd(
240
- mappedEntityType: string,
241
- loggedInUser,
242
- mappedEntityId?: number,
243
- parentId?: number,
244
- parentType?: string,
245
- ) {
246
- // 1️⃣ Fetch entity metadata
247
- const entityMaster = await this.entityMasterService.getEntityData(
248
- mappedEntityType,
249
- loggedInUser,
250
- );
251
- if (!entityMaster) {
252
- throw new Error(`Entity master not found for ${mappedEntityType}`);
253
- }
254
-
255
- let pathTemplate = entityMaster.doc_upload_path ?? '';
256
- const entityOverwrite = entityMaster.overwrite_path ?? 0;
257
-
258
- if (!pathTemplate) {
259
- throw new Error(`doc_upload_path not defined for ${mappedEntityType}`);
260
- }
261
-
262
- // 2️⃣ Prepare replacement map
263
- const replacements: Record<string, string | null> = {};
264
-
265
- // --- ORG ---
266
- const organizationRepo =
267
- this.reflectionHelper.getRepoService('OrganizationData');
268
- let organizationData = await organizationRepo.findOne({
269
- where: {
270
- id: loggedInUser.organization_id,
271
- },
272
- });
273
-
274
- replacements['org_code'] = organizationData.code;
275
-
276
- // --- LEVEL CODE ---
277
- // Priority: If parent is provided, use parent for level_code; otherwise use normal logic
278
- let levelEntityId: number;
279
- let levelEntityType: string;
280
-
281
- if (parentId && parentType) {
282
- // When parent is provided, parent becomes the level_code
283
- levelEntityId = parentId;
284
- levelEntityType = parentType;
285
- } else {
286
- // Normal logic: determine which entity to use for level_code
287
- levelEntityId = entityOverwrite ? mappedEntityId : loggedInUser.level_id;
288
- levelEntityType = entityOverwrite
289
- ? mappedEntityType
290
- : loggedInUser.level_type;
291
- }
292
-
293
- // Get entity data for level_code
294
- const getEntityData = await this.entityMasterService.getEntityData(
295
- levelEntityType,
296
- loggedInUser,
297
- );
298
-
299
- if (!getEntityData) return null;
300
- const levelEntityDataResult = await this.entityManager.query(
301
- `SELECT *
302
- FROM ${getEntityData?.db_table_name}
303
- WHERE id = $1`,
304
- [levelEntityId],
305
- );
306
-
307
- const levelEntityData = levelEntityDataResult[0] || null;
308
-
309
- if (levelEntityData?.code) {
310
- replacements['level_code'] = levelEntityData.code; // universal alias
311
- }
312
-
313
- // --- MAPPED ENTITY CODE (when parent is provided) ---
314
- // When parent is provided, the mapped entity becomes an additional level
315
- if (parentId && parentType && mappedEntityId && mappedEntityType) {
316
- const mappedEntityKey = `${mappedEntityType.toLowerCase()}_code`;
317
- const mappedEntityData = await super.getEntityData(
318
- mappedEntityType,
319
- mappedEntityId,
320
- loggedInUser,
321
- );
322
- if (mappedEntityData?.code) {
323
- replacements[mappedEntityKey] = mappedEntityData.code;
324
-
325
- // Modify path template to include mapped entity
326
- // Example: ${org_code}/${level_code} becomes ${org_code}/${level_code}/${tem_code}
327
- const mappedVariable = `\${${mappedEntityKey}}`;
328
- if (!pathTemplate.includes(mappedVariable)) {
329
- pathTemplate = pathTemplate + `/${mappedVariable}`;
330
- }
331
- }
332
- }
333
-
334
- // --- TEMPLATE CODE (if parent is provided) ---
335
- // Special handling for template_code when parent_id and parent_type are provided
336
- if (parentId && parentType) {
337
- // const templateEntityData = await super.getEntityData(
338
- // parentType,
339
- // parentId,
340
- // loggedInUser,
341
- // );
342
-
343
- // Get entity data for level_code
344
- const getEntityData = await this.entityMasterService.getEntityData(
345
- mappedEntityType,
346
- loggedInUser,
347
- );
348
-
349
- if (!getEntityData) return null;
350
- const levelEntityDataResult = await this.entityManager.query(
351
- `SELECT *
352
- FROM ${getEntityData?.db_table_name}
353
- WHERE id = $1`,
354
- [mappedEntityId],
355
- );
356
-
357
- if (
358
- levelEntityDataResult?.[0].code &&
359
- parentType != 'SCH' &&
360
- loggedInUser.level_type != 'SCH'
361
- ) {
362
- replacements['template_code'] = levelEntityDataResult[0].code;
363
- // If we have parent template, modify the path to include it
364
- pathTemplate = '${org_code}/template/${template_code}';
365
- } else {
366
- const getEntityData = await this.entityMasterService.getEntityData(
367
- mappedEntityType,
368
- loggedInUser,
369
- );
370
-
371
- if (!getEntityData) return null;
372
- const levelEntityDataResult = await this.entityManager.query(
373
- `SELECT *
374
- FROM ${getEntityData?.db_table_name}
375
- WHERE id = $1`,
376
- [mappedEntityId],
377
- );
378
-
379
- replacements['template_code'] = levelEntityDataResult?.[0].code;
380
-
381
- pathTemplate = '${org_code}/${level_code}/template/${template_code}';
382
- }
383
- }
384
-
385
- // --- Dynamic variables inside path ---
386
- const matches = pathTemplate.match(/\$\{(\w+)\}/g) || [];
387
-
388
- for (const variable of matches) {
389
- const key = variable.replace(/\$\{|\}/g, '');
390
- if (replacements[key]) continue; // already resolved
391
-
392
- if (key === 'org_code') continue; // already set
393
- if (key === 'level_code') continue; // already set above
394
- if (key === 'template_code') continue; // handled above if parent is provided
395
-
396
- if (key.endsWith('_code')) {
397
- // derive entity type dynamically
398
- const entityType = key.replace('_code', '').toUpperCase();
399
-
400
- let entityId: number | undefined;
401
-
402
- // Special handling for template_code - use parent if available, otherwise mapped entity
403
- if (key === 'template_code') {
404
- if (parentType?.toUpperCase() === 'TEMPLATE' && parentId) {
405
- entityId = parentId;
406
- } else if (mappedEntityType === 'TEMPLATE') {
407
- entityId = mappedEntityId;
408
- }
409
- } else {
410
- // For other _code variables, check if parent matches the entity type
411
- if (parentType?.toUpperCase() === entityType && parentId) {
412
- entityId = parentId;
413
- } else if (mappedEntityType === entityType) {
414
- entityId = mappedEntityId;
415
- }
416
- }
417
-
418
- // Generic lookup
419
- if (entityId) {
420
- const entityData = await super.getEntityData(
421
- entityType,
422
- entityId,
423
- loggedInUser,
424
- );
425
- replacements[key] = entityData?.code ?? null;
426
- }
427
- }
428
- }
429
-
430
- // --- ORG special case ---
431
- // If ORG level & overwrite = 0 → use org_code, otherwise use the mapped entity's code
432
- if (loggedInUser.level_type === 'ORG' && entityOverwrite === 0) {
433
- // When overwrite is 0 and user is ORG level, but we want to use mapped entity
434
- // Don't set level_code to null - it should already be set above based on entityOverwrite logic
435
- }
436
-
437
- // 3️⃣ Final substitution and cleanup
438
- if (pathTemplate) {
439
- const finalPath = this.resolveUploadPath(pathTemplate, replacements);
440
- return finalPath;
441
- }
442
- return null;
443
- }
444
-
445
- public async buildUploadPathGeneric(
446
- mappedEntityType: string,
447
- loggedInUser,
448
- mappedEntityId?: number,
449
- parentId?: number,
450
- parentType?: string,
451
- ) {
452
- //APPCODE
453
- let appCode = '';
454
-
455
- let org_id = loggedInUser.organization_id;
456
- let level_type = loggedInUser.level_type;
457
- let level_id =
458
- loggedInUser.level_type == 'ORG' && mappedEntityType == 'SCH'
459
- ? mappedEntityId
460
- : loggedInUser.level_id;
461
-
462
- let organizationData = {};
463
- let levelData = {};
464
- let mappedEntityData = {};
465
-
466
- if (loggedInUser && loggedInUser.appcode) {
467
- appCode = loggedInUser.appcode;
468
- }
469
-
470
- if (appCode && appCode != 'ADM') {
471
- const baseUrl = this.configService.get<string>('REDIRECT_BE_URL');
472
-
473
- // Prepare the query string
474
- const queryParams = new URLSearchParams({
475
- loggedInUser: JSON.stringify(loggedInUser),
476
- }).toString();
477
-
478
- organizationData = await axios
479
- .get(
480
- `${baseUrl}/organization/public/${loggedInUser.organization_id}?${queryParams}`,
481
- )
482
- .then((res) => res.data)
483
- .catch((err) => {
484
- console.error('Error fetching organization data:', err.message);
485
- return null;
486
- });
487
-
488
- levelData = await axios
489
- .get(`${baseUrl}/school/public/?${queryParams}`)
490
- .then((res) => res.data)
491
- .catch((err) => {
492
- console.error('Error fetching school data:', err.message);
493
- return null;
494
- });
495
- } else {
496
- const organizationProfileRepo = this.reflectionHelper.getRepoService(
497
- 'OrganizationProfile',
498
- );
499
- organizationData = await organizationProfileRepo.find({
500
- where: {
501
- id: loggedInUser.organization_id,
502
- },
503
- });
504
-
505
- const schoolProfileRepo = this.reflectionHelper.getRepoService('School');
506
-
507
- levelData = await schoolProfileRepo.find({
508
- where: {
509
- id: loggedInUser.level_id,
510
- },
511
- });
512
- }
513
-
514
- console.log(levelData);
515
-
516
- // 1️⃣ Fetch entity metadata
517
- // const uploadEntity = await this.entityMasterService.getEntityData(
518
- // mappedEntityType,
519
- // loggedInUser,
520
- // );
521
- // if (!uploadEntity) {
522
- // throw new Error(`Entity master not found for ${mappedEntityType}`);
523
- // }
524
-
525
- let subfolder =
526
- mappedEntityType == level_type
527
- ? 'data'
528
- : parentType
529
- ? `${parentType}/${parentId}/${mappedEntityType}`
530
- : mappedEntityType;
531
- let path =
532
- '${org_code}/${level_code}/' +
533
- (subfolder !== 'data'
534
- ? `${subfolder}/${mappedEntityId}`
535
- : `${subfolder}`);
536
-
537
- // 2️⃣ Prepare replacement map
538
- const replacements: Record<string, string | null> = {};
539
- replacements['org_code'] = organizationData[0]?.code;
540
- replacements['level_code'] = levelData[0]?.code; // universal alias
541
-
542
- // 3️⃣ Final substitution and cleanup
543
- if (path) {
544
- const finalPath = this.resolveUploadPath(path, replacements);
545
- return finalPath;
546
- }
547
- return null;
548
- }
549
-
550
- /**
551
- * Replace placeholders with actual values, remove missing variables
552
- */
553
- private resolveUploadPath(
554
- template: string,
555
- replacements: Record<string, string | null>,
556
- ) {
557
- let path = template;
558
- path = path.replace(/\$\{(\w+)\}/g, (_, key) => replacements[key] || '');
559
- return path.replace(/\/+/g, '/').replace(/\/$/, '');
560
- }
561
-
562
- /**
563
- * Helper method to build upload path for different scenarios
564
- *
565
- * @param mappedEntityType - The main entity type (e.g., 'LEAD', 'SCH')
566
- * @param loggedInUser - Current user context
567
- * @param mappedEntityId - ID of the main entity
568
- * @param parentId - Optional parent entity ID (e.g., template ID)
569
- * @param parentType - Optional parent entity type (e.g., 'TEMPLATE')
570
- * @returns Promise<string | null> - The resolved upload path
571
- *
572
- * Examples:
573
- * - buildUploadPath('LEAD', user, 123) -> "ORG1/template/SCH1"
574
- * - buildUploadPath('LEAD', user, 123, 456, 'TEMPLATE') -> "ORG1/template/SCH1/TEMPLATE1"
575
- */
576
- async buildUploadPath(
577
- mappedEntityType: string,
578
- loggedInUser: any,
579
- mappedEntityId?: number,
580
- parentId?: number,
581
- parentType?: string,
582
- ): Promise<string | null> {
583
- return this.buildUploadPathGeneric(
584
- mappedEntityType,
585
- loggedInUser,
586
- mappedEntityId,
587
- parentId,
588
- parentType,
589
- );
590
- }
591
- }
1
+ import { Injectable } from '@nestjs/common';
2
+ import { ConfigService } from '@nestjs/config';
3
+ import { S3 } from 'aws-sdk';
4
+ import axios from 'axios';
5
+ import { EntityManager } from 'typeorm';
6
+ import { v4 as uuidv4 } from 'uuid';
7
+ import {
8
+ ENTITYTYPE_MEDIA,
9
+ STATUS_PENDING,
10
+ } from '../../../constant/global.constant';
11
+ import { MediaData } from '../entity/media-data.entity';
12
+ import { MediaDataRepository } from '../repository/media-data.repository';
13
+ import { EntityServiceImpl } from './entity-service-impl.service';
14
+
15
+ @Injectable()
16
+ export class MediaDataService extends EntityServiceImpl {
17
+ constructor(
18
+ private readonly configService: ConfigService,
19
+ private readonly mediaRepository: MediaDataRepository,
20
+ private entityManager: EntityManager,
21
+ ) {
22
+ super();
23
+ }
24
+
25
+ s3AccessKeyID = this.configService.get('AWS.S3.AWS_ACCESS_KEY_ID');
26
+ s3AccessKeySecret = this.configService.get('AWS.S3.AWS_SECRET_KEY');
27
+ s3Region = this.configService.get('AWS.S3.AWS_REGION');
28
+ bucketName = this.configService.get<string>('AWS.S3.BUCKET_NAME');
29
+
30
+ s3 = new S3({
31
+ accessKeyId: this.s3AccessKeyID,
32
+ secretAccessKey: this.s3AccessKeySecret,
33
+ region: this.s3Region,
34
+ signatureVersion: 'v4',
35
+ });
36
+
37
+ async generateMediaUploadDetails(
38
+ fileName: string,
39
+ mappedAttributeKey: string,
40
+ loggedInUser,
41
+ mappedEntityType?: string,
42
+ mappedEntityId?: number,
43
+ parentId?: number,
44
+ parentType?: string,
45
+ ) {
46
+ if (!fileName || !mappedAttributeKey) {
47
+ return null;
48
+ }
49
+ const ext = fileName.split('.').pop()?.toLowerCase() ?? '';
50
+
51
+ const id = uuidv4();
52
+
53
+ const s3Path =
54
+ (await this.buildUploadPathGeneric(
55
+ mappedEntityType || '',
56
+ loggedInUser,
57
+ mappedEntityId,
58
+ parentId,
59
+ parentType,
60
+ )) || `uploads`;
61
+
62
+ const s3Key = `${s3Path}/${id}.${ext}`;
63
+
64
+ const uploadUrl = await this.s3.getSignedUrlPromise('putObject', {
65
+ Bucket: this.bucketName,
66
+ Key: s3Key,
67
+ Expires: 60 * 5, // URL valid for 5 mins
68
+ ContentType: this.getContentType(ext),
69
+ });
70
+
71
+ const mediaData = new MediaData();
72
+ mediaData.file_name = fileName;
73
+ mediaData.mapped_attribute_key = mappedAttributeKey;
74
+ mediaData.status = STATUS_PENDING;
75
+ if (mappedEntityType) {
76
+ mediaData.mapped_entity_type = mappedEntityType;
77
+ }
78
+ if (mappedEntityId) {
79
+ mediaData.mapped_entity_id = mappedEntityId;
80
+ }
81
+ mediaData.media_url = s3Key;
82
+
83
+ //INSERT RECORD IN DOC TABLE
84
+ const savedEntity = await super.createEntity(mediaData, loggedInUser);
85
+
86
+ if (savedEntity) {
87
+ return { id: savedEntity.id, path: s3Key, uploadUrl };
88
+ }
89
+ return null;
90
+ }
91
+
92
+ async findByAttributeKeyAndMappedEntityIdAndMappedEntityType(
93
+ attributeKey: string,
94
+ mappedEntityId: number,
95
+ mappedEntityType: string,
96
+ ) {
97
+ return await this.mediaRepository.findByAttributeKeyAndMappedEntityIdAndMappedEntityType(
98
+ attributeKey,
99
+ mappedEntityId,
100
+ mappedEntityType,
101
+ );
102
+ }
103
+
104
+ async findByMappedEntityIdAndMappedEntityType(
105
+ mappedEntityId: number,
106
+ mappedEntityType: string,
107
+ ) {
108
+ return await this.mediaRepository.findByMappedEntityIdAndMappedEntityType(
109
+ mappedEntityId,
110
+ mappedEntityType,
111
+ );
112
+ }
113
+
114
+ async deleteByAttributeKeyAndMappedEntityIdAndMappedEntityType(
115
+ attributeKey: string,
116
+ mappedEntityId: number,
117
+ mappedEntityType: string,
118
+ ) {
119
+ return await this.mediaRepository.deleteByAttributeKeyAndMappedEntityIdAndMappedEntityType(
120
+ attributeKey,
121
+ mappedEntityId,
122
+ mappedEntityType,
123
+ );
124
+ }
125
+
126
+ private getContentType(ext: string): string {
127
+ const map = {
128
+ pdf: 'application/pdf',
129
+ jpg: 'image/jpeg',
130
+ jpeg: 'image/jpeg',
131
+ png: 'image/png',
132
+ gif: 'image/gif',
133
+ webp: 'image/webp',
134
+ txt: 'text/plain',
135
+ html: 'text/html',
136
+ htm: 'text/html',
137
+ doc: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
138
+ docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
139
+ xls: 'application/vnd.ms-excel',
140
+ xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
141
+ ppt: 'application/vnd.ms-powerpoint',
142
+ pptx: 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
143
+ };
144
+ return map[ext] || 'application/octet-stream';
145
+ }
146
+
147
+ // New method to get the signed URL for the media (download link)
148
+ async getMediaDownloadUrl(id: number, loggedInUser, expiresIn?: number) {
149
+ try {
150
+ const entityData = await this.getEntityData(
151
+ ENTITYTYPE_MEDIA,
152
+ id,
153
+ loggedInUser,
154
+ );
155
+ const mediaData = entityData as MediaData;
156
+ let fileSize: number | undefined;
157
+ if (this.bucketName) {
158
+ const head = await this.s3
159
+ .headObject({
160
+ Bucket: this.bucketName,
161
+ Key: mediaData.media_url,
162
+ })
163
+ .promise();
164
+ fileSize = head.ContentLength;
165
+ }
166
+
167
+ const signedUrl = await this.s3.getSignedUrlPromise('getObject', {
168
+ Bucket: this.bucketName,
169
+ Key: mediaData.media_url,
170
+ Expires: Number(expiresIn) || 60 * 5,
171
+ ResponseContentDisposition: 'inline',
172
+ });
173
+ return {
174
+ signedUrl,
175
+ fileName: mediaData.file_name,
176
+ id: mediaData.id,
177
+ size: fileSize,
178
+ };
179
+ } catch (error) {
180
+ console.error('Error generating signed URL for media:', error);
181
+ throw new Error('Failed to generate signed URL');
182
+ }
183
+ }
184
+
185
+ async getMediaInlineUrl(id: number, loggedInUser, expiresIn?: number) {
186
+ try {
187
+ const entityData = await this.getEntityData(
188
+ ENTITYTYPE_MEDIA,
189
+ id,
190
+ loggedInUser,
191
+ );
192
+ const mediaData = entityData as MediaData;
193
+ let fileSize: number | undefined;
194
+
195
+ if (!mediaData) {
196
+ throw new Error('Media not found');
197
+ }
198
+
199
+ const ext = mediaData.file_name.split('.').pop()?.toLowerCase() || '';
200
+
201
+ if (this.bucketName) {
202
+ const head = await this.s3
203
+ .headObject({
204
+ Bucket: this.bucketName,
205
+ Key: mediaData.media_url,
206
+ })
207
+ .promise();
208
+ fileSize = head.ContentLength;
209
+ }
210
+
211
+ const signedUrl = await this.s3.getSignedUrlPromise('getObject', {
212
+ Bucket: this.bucketName,
213
+ Key: mediaData.media_url,
214
+ Expires: Number(expiresIn) || 60 * 5,
215
+ ResponseContentDisposition: 'inline',
216
+ ResponseContentType: this.getContentType(ext),
217
+ });
218
+
219
+ let previewUrl = signedUrl;
220
+ // if (ext === 'doc' || ext === 'docx') {
221
+ // previewUrl =
222
+ // `https://view.officeapps.live.com/op/embed.aspx?src=` +
223
+ // encodeURIComponent(signedUrl);
224
+ // }
225
+
226
+ return {
227
+ signedUrl: previewUrl,
228
+ fileName: mediaData.file_name,
229
+ id: mediaData.id,
230
+ size: fileSize,
231
+ uploadedDate: mediaData.created_date,
232
+ };
233
+ } catch (error) {
234
+ console.error('Error generating inline URL:', error);
235
+ throw new Error('Failed to generate inline URL');
236
+ }
237
+ }
238
+
239
+ public async buildUploadPathGenericdd(
240
+ mappedEntityType: string,
241
+ loggedInUser,
242
+ mappedEntityId?: number,
243
+ parentId?: number,
244
+ parentType?: string,
245
+ ) {
246
+ // 1️⃣ Fetch entity metadata
247
+ const entityMaster = await this.entityMasterService.getEntityData(
248
+ mappedEntityType,
249
+ loggedInUser,
250
+ );
251
+ if (!entityMaster) {
252
+ throw new Error(`Entity master not found for ${mappedEntityType}`);
253
+ }
254
+
255
+ let pathTemplate = entityMaster.doc_upload_path ?? '';
256
+ const entityOverwrite = entityMaster.overwrite_path ?? 0;
257
+
258
+ if (!pathTemplate) {
259
+ throw new Error(`doc_upload_path not defined for ${mappedEntityType}`);
260
+ }
261
+
262
+ // 2️⃣ Prepare replacement map
263
+ const replacements: Record<string, string | null> = {};
264
+
265
+ // --- ORG ---
266
+ const organizationRepo =
267
+ this.reflectionHelper.getRepoService('OrganizationData');
268
+ let organizationData = await organizationRepo.findOne({
269
+ where: {
270
+ id: loggedInUser.organization_id,
271
+ },
272
+ });
273
+
274
+ replacements['org_code'] = organizationData.code;
275
+
276
+ // --- LEVEL CODE ---
277
+ // Priority: If parent is provided, use parent for level_code; otherwise use normal logic
278
+ let levelEntityId: number;
279
+ let levelEntityType: string;
280
+
281
+ if (parentId && parentType) {
282
+ // When parent is provided, parent becomes the level_code
283
+ levelEntityId = parentId;
284
+ levelEntityType = parentType;
285
+ } else {
286
+ // Normal logic: determine which entity to use for level_code
287
+ levelEntityId = entityOverwrite ? mappedEntityId : loggedInUser.level_id;
288
+ levelEntityType = entityOverwrite
289
+ ? mappedEntityType
290
+ : loggedInUser.level_type;
291
+ }
292
+
293
+ // Get entity data for level_code
294
+ const getEntityData = await this.entityMasterService.getEntityData(
295
+ levelEntityType,
296
+ loggedInUser,
297
+ );
298
+
299
+ if (!getEntityData) return null;
300
+ const levelEntityDataResult = await this.entityManager.query(
301
+ `SELECT *
302
+ FROM ${getEntityData?.db_table_name}
303
+ WHERE id = $1`,
304
+ [levelEntityId],
305
+ );
306
+
307
+ const levelEntityData = levelEntityDataResult[0] || null;
308
+
309
+ if (levelEntityData?.code) {
310
+ replacements['level_code'] = levelEntityData.code; // universal alias
311
+ }
312
+
313
+ // --- MAPPED ENTITY CODE (when parent is provided) ---
314
+ // When parent is provided, the mapped entity becomes an additional level
315
+ if (parentId && parentType && mappedEntityId && mappedEntityType) {
316
+ const mappedEntityKey = `${mappedEntityType.toLowerCase()}_code`;
317
+ const mappedEntityData = await super.getEntityData(
318
+ mappedEntityType,
319
+ mappedEntityId,
320
+ loggedInUser,
321
+ );
322
+ if (mappedEntityData?.code) {
323
+ replacements[mappedEntityKey] = mappedEntityData.code;
324
+
325
+ // Modify path template to include mapped entity
326
+ // Example: ${org_code}/${level_code} becomes ${org_code}/${level_code}/${tem_code}
327
+ const mappedVariable = `\${${mappedEntityKey}}`;
328
+ if (!pathTemplate.includes(mappedVariable)) {
329
+ pathTemplate = pathTemplate + `/${mappedVariable}`;
330
+ }
331
+ }
332
+ }
333
+
334
+ // --- TEMPLATE CODE (if parent is provided) ---
335
+ // Special handling for template_code when parent_id and parent_type are provided
336
+ if (parentId && parentType) {
337
+ // const templateEntityData = await super.getEntityData(
338
+ // parentType,
339
+ // parentId,
340
+ // loggedInUser,
341
+ // );
342
+
343
+ // Get entity data for level_code
344
+ const getEntityData = await this.entityMasterService.getEntityData(
345
+ mappedEntityType,
346
+ loggedInUser,
347
+ );
348
+
349
+ if (!getEntityData) return null;
350
+ const levelEntityDataResult = await this.entityManager.query(
351
+ `SELECT *
352
+ FROM ${getEntityData?.db_table_name}
353
+ WHERE id = $1`,
354
+ [mappedEntityId],
355
+ );
356
+
357
+ if (
358
+ levelEntityDataResult?.[0].code &&
359
+ parentType != 'SCH' &&
360
+ loggedInUser.level_type != 'SCH'
361
+ ) {
362
+ replacements['template_code'] = levelEntityDataResult[0].code;
363
+ // If we have parent template, modify the path to include it
364
+ pathTemplate = '${org_code}/template/${template_code}';
365
+ } else {
366
+ const getEntityData = await this.entityMasterService.getEntityData(
367
+ mappedEntityType,
368
+ loggedInUser,
369
+ );
370
+
371
+ if (!getEntityData) return null;
372
+ const levelEntityDataResult = await this.entityManager.query(
373
+ `SELECT *
374
+ FROM ${getEntityData?.db_table_name}
375
+ WHERE id = $1`,
376
+ [mappedEntityId],
377
+ );
378
+
379
+ replacements['template_code'] = levelEntityDataResult?.[0].code;
380
+
381
+ pathTemplate = '${org_code}/${level_code}/template/${template_code}';
382
+ }
383
+ }
384
+
385
+ // --- Dynamic variables inside path ---
386
+ const matches = pathTemplate.match(/\$\{(\w+)\}/g) || [];
387
+
388
+ for (const variable of matches) {
389
+ const key = variable.replace(/\$\{|\}/g, '');
390
+ if (replacements[key]) continue; // already resolved
391
+
392
+ if (key === 'org_code') continue; // already set
393
+ if (key === 'level_code') continue; // already set above
394
+ if (key === 'template_code') continue; // handled above if parent is provided
395
+
396
+ if (key.endsWith('_code')) {
397
+ // derive entity type dynamically
398
+ const entityType = key.replace('_code', '').toUpperCase();
399
+
400
+ let entityId: number | undefined;
401
+
402
+ // Special handling for template_code - use parent if available, otherwise mapped entity
403
+ if (key === 'template_code') {
404
+ if (parentType?.toUpperCase() === 'TEMPLATE' && parentId) {
405
+ entityId = parentId;
406
+ } else if (mappedEntityType === 'TEMPLATE') {
407
+ entityId = mappedEntityId;
408
+ }
409
+ } else {
410
+ // For other _code variables, check if parent matches the entity type
411
+ if (parentType?.toUpperCase() === entityType && parentId) {
412
+ entityId = parentId;
413
+ } else if (mappedEntityType === entityType) {
414
+ entityId = mappedEntityId;
415
+ }
416
+ }
417
+
418
+ // Generic lookup
419
+ if (entityId) {
420
+ const entityData = await super.getEntityData(
421
+ entityType,
422
+ entityId,
423
+ loggedInUser,
424
+ );
425
+ replacements[key] = entityData?.code ?? null;
426
+ }
427
+ }
428
+ }
429
+
430
+ // --- ORG special case ---
431
+ // If ORG level & overwrite = 0 → use org_code, otherwise use the mapped entity's code
432
+ if (loggedInUser.level_type === 'ORG' && entityOverwrite === 0) {
433
+ // When overwrite is 0 and user is ORG level, but we want to use mapped entity
434
+ // Don't set level_code to null - it should already be set above based on entityOverwrite logic
435
+ }
436
+
437
+ // 3️⃣ Final substitution and cleanup
438
+ if (pathTemplate) {
439
+ const finalPath = this.resolveUploadPath(pathTemplate, replacements);
440
+ return finalPath;
441
+ }
442
+ return null;
443
+ }
444
+
445
+ public async buildUploadPathGeneric(
446
+ mappedEntityType: string,
447
+ loggedInUser,
448
+ mappedEntityId?: number,
449
+ parentId?: number,
450
+ parentType?: string,
451
+ ) {
452
+ //APPCODE
453
+ let appCode = '';
454
+
455
+ let org_id = loggedInUser.organization_id;
456
+ let level_type = loggedInUser.level_type;
457
+ let level_id =
458
+ loggedInUser.level_type == 'ORG' && mappedEntityType == 'SCH'
459
+ ? mappedEntityId
460
+ : loggedInUser.level_id;
461
+
462
+ let organizationData = {};
463
+ let levelData = {};
464
+ let mappedEntityData = {};
465
+
466
+ if (loggedInUser && loggedInUser.appcode) {
467
+ appCode = loggedInUser.appcode;
468
+ }
469
+
470
+ if (appCode && appCode != 'ADM') {
471
+ const baseUrl = this.configService.get<string>('REDIRECT_BE_URL');
472
+
473
+ // Prepare the query string
474
+ const queryParams = new URLSearchParams({
475
+ loggedInUser: JSON.stringify(loggedInUser),
476
+ }).toString();
477
+
478
+ organizationData = await axios
479
+ .get(
480
+ `${baseUrl}/organization/public/${loggedInUser.organization_id}?${queryParams}`,
481
+ )
482
+ .then((res) => res.data)
483
+ .catch((err) => {
484
+ console.error('Error fetching organization data:', err.message);
485
+ return null;
486
+ });
487
+
488
+ levelData = await axios
489
+ .get(`${baseUrl}/school/public/?${queryParams}`)
490
+ .then((res) => res.data)
491
+ .catch((err) => {
492
+ console.error('Error fetching school data:', err.message);
493
+ return null;
494
+ });
495
+ } else {
496
+ const organizationProfileRepo = this.reflectionHelper.getRepoService(
497
+ 'OrganizationProfile',
498
+ );
499
+ organizationData = await organizationProfileRepo.find({
500
+ where: {
501
+ id: loggedInUser.organization_id,
502
+ },
503
+ });
504
+
505
+ const schoolProfileRepo = this.reflectionHelper.getRepoService('School');
506
+
507
+ levelData = await schoolProfileRepo.find({
508
+ where: {
509
+ id: loggedInUser.level_id,
510
+ },
511
+ });
512
+ }
513
+
514
+ console.log(levelData);
515
+
516
+ // 1️⃣ Fetch entity metadata
517
+ // const uploadEntity = await this.entityMasterService.getEntityData(
518
+ // mappedEntityType,
519
+ // loggedInUser,
520
+ // );
521
+ // if (!uploadEntity) {
522
+ // throw new Error(`Entity master not found for ${mappedEntityType}`);
523
+ // }
524
+
525
+ let subfolder =
526
+ mappedEntityType == level_type
527
+ ? 'data'
528
+ : parentType
529
+ ? `${parentType}/${parentId}/${mappedEntityType}`
530
+ : mappedEntityType;
531
+ let path =
532
+ '${org_code}/${level_code}/' +
533
+ (subfolder !== 'data'
534
+ ? `${subfolder}/${mappedEntityId}`
535
+ : `${subfolder}`);
536
+
537
+ // 2️⃣ Prepare replacement map
538
+ const replacements: Record<string, string | null> = {};
539
+ replacements['org_code'] = organizationData[0]?.code;
540
+ replacements['level_code'] = levelData[0]?.code; // universal alias
541
+
542
+ // 3️⃣ Final substitution and cleanup
543
+ if (path) {
544
+ const finalPath = this.resolveUploadPath(path, replacements);
545
+ return finalPath;
546
+ }
547
+ return null;
548
+ }
549
+
550
+ /**
551
+ * Replace placeholders with actual values, remove missing variables
552
+ */
553
+ private resolveUploadPath(
554
+ template: string,
555
+ replacements: Record<string, string | null>,
556
+ ) {
557
+ let path = template;
558
+ path = path.replace(/\$\{(\w+)\}/g, (_, key) => replacements[key] || '');
559
+ return path.replace(/\/+/g, '/').replace(/\/$/, '');
560
+ }
561
+
562
+ /**
563
+ * Helper method to build upload path for different scenarios
564
+ *
565
+ * @param mappedEntityType - The main entity type (e.g., 'LEAD', 'SCH')
566
+ * @param loggedInUser - Current user context
567
+ * @param mappedEntityId - ID of the main entity
568
+ * @param parentId - Optional parent entity ID (e.g., template ID)
569
+ * @param parentType - Optional parent entity type (e.g., 'TEMPLATE')
570
+ * @returns Promise<string | null> - The resolved upload path
571
+ *
572
+ * Examples:
573
+ * - buildUploadPath('LEAD', user, 123) -> "ORG1/template/SCH1"
574
+ * - buildUploadPath('LEAD', user, 123, 456, 'TEMPLATE') -> "ORG1/template/SCH1/TEMPLATE1"
575
+ */
576
+ async buildUploadPath(
577
+ mappedEntityType: string,
578
+ loggedInUser: any,
579
+ mappedEntityId?: number,
580
+ parentId?: number,
581
+ parentType?: string,
582
+ ): Promise<string | null> {
583
+ return this.buildUploadPathGeneric(
584
+ mappedEntityType,
585
+ loggedInUser,
586
+ mappedEntityId,
587
+ parentId,
588
+ parentType,
589
+ );
590
+ }
591
+ }