rez_core 2.2.28 → 2.2.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.2.28",
+  "version": "2.2.30",
   "description": "",
   "author": "",
   "private": false,

package/src/module/user/service/user.service.ts

@@ -73,7 +73,8 @@ export class UserService extends EntityServiceImpl {
         loggedInUser?.organization_id || 0,
       );
 
-    userData.name = (userData.first_name || '') + (userData.last_name || '');
+    userData.name =
+      (userData.first_name || '') + ' ' + (userData.last_name || '');
     userData.password = EncryptUtilService.encryptGCM(
       userData.password || 'Admin@123',
       this.masterKey,

package/src/module/workflow/repository/form-master.repository.ts

@@ -21,8 +21,8 @@ export class FormMasterRepository {
       .createQueryBuilder()
       .select(['fm.id', 'fm.form_name'])
       .from('cr_form_master', 'fm')
-      .where('fm.organization_id = :orgId', { orgId: organization_id })
-      .andWhere('fm.source_entity_type = :sourceEntityType', {
+      // .where('fm.organization_id = :orgId', { orgId: organization_id })
+      .where('fm.source_entity_type = :sourceEntityType', {
         sourceEntityType: source_entity_type,
       })
       .getRawMany();

package/src/module/workflow/service/action-category.service.ts

@@ -12,14 +12,14 @@ export class ActionCategoryService extends EntityServiceImpl {
   async getActionsCat(loggedInUser: UserData, entity_type: string) {
     const { organization_id } = loggedInUser;
 
+    console.log(entity_type, 'entity_type in action category service');
+
     const result = await this.dataSource.query(
       `
     SELECT id, name 
     FROM cr_wf_action_category 
-    WHERE mapped_entity_type = ? 
-      AND organization_id = ?
-    `,
-      [entity_type, organization_id],
+    WHERE mapped_entity_type = ?`,
+      [entity_type],
     );
 
     return result.map((row: any) => ({
@@ -50,9 +50,9 @@ export class ActionCategoryService extends EntityServiceImpl {
       `
       SELECT *
       FROM cr_wf_action_category
-      WHERE organization_id = ? AND id = ?
+      WHERE id = ?
       `,
-      [organization_id, action_cat_id],
+      [action_cat_id],
     );
 
     return result;

package/src/module/workflow/service/comm-template.service.ts

@@ -24,6 +24,7 @@ export class CommTemplateService extends EntityServiceImpl {
         organization_id: loggedInUser.organization_id,
         appcode: loggedInUser.appcode,
         level_id: loggedInUser.level_id,
+        mapped_entity_type: 'LEAD',
         level_type: loggedInUser.level_type,
       }));
 

package/src/module/workflow/service/populate-workflow.service.ts

@@ -81,6 +81,30 @@ export class PopulateWorkflowService extends EntityServiceImpl {
   //   }
 
   async populateWorkflowData(organization_id: number, loggedInUser: UserData) {
+    // template populate
+    // Step 1: Fetch default cr_wf_comm_template
+    const defaultCommTemplates = await this.dataSource.query(
+      `SELECT * FROM cr_wf_comm_template WHERE organization_id = -1 AND level_type = 'ORG' AND level_id = -1`,
+    );
+
+    if (defaultCommTemplates.length > 0) {
+      // Step 2: Insert default communication templates for the new organization
+      for (const template of defaultCommTemplates) {
+        const { id, created_date, modified_date, ...rest } = template;
+        await super.createEntity(
+          {
+            ...rest,
+            organization_id,
+            level_id: organization_id,
+            entity_type: 'TEM',
+            created_date: new Date(),
+            modified_date: new Date(),
+          },
+          loggedInUser,
+        );
+      }
+    }
+
     const defaultEntity = await this.dataSource.query(
       `SELECT * FROM eth_entity WHERE organization_id = -1 AND level_type = 'ORG' AND level_id = -1 AND entity_type = 'ENT'`,
     );

package/src/module/workflow/service/workflow-meta.service.ts

@@ -135,6 +135,7 @@ export class WorkflowMetaService extends EntityServiceImpl {
         status: firstStage.status,
         current_user_id: loggedInUser.id,
         stage_action_mapping_id: firstStage.id,
+        orgnization_id: loggedInUser.organization_id,
         stage_group_id: stageGroup.id,
         stage_id: firstStage.id,
         start_date: new Date(),
@@ -170,6 +171,7 @@ export class WorkflowMetaService extends EntityServiceImpl {
         status: nextStage.status,
         current_user_id: loggedInUser.id,
         stage_action_mapping_id: nextStage.id,
+        organization_id: loggedInUser.organization_id,
         start_date: now,
         stage_group_id: nextStage?.stage_group_id,
         stage_id: nextStage.id,