rez_core 2.2.21 → 2.2.23

package/package.json

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

package/src/module/notification/notification.module.ts

@@ -8,19 +8,22 @@ import { MailerModule } from '@nestjs-modules/mailer';
 import { HandlebarsAdapter } from '@nestjs-modules/mailer/dist/adapters/handlebars.adapter';
 import { EmailService } from './service/email.service';
 import { join } from 'path';
+import { ConfigModule, ConfigService } from '@nestjs/config';
 
 @Module({
   imports: [
     TypeOrmModule.forFeature([Otp]),
     MailerModule.forRootAsync({
-      useFactory: () => ({
+      imports: [ConfigModule],
+      inject: [ConfigService],
+      useFactory: (configService: ConfigService) => ({
         transport: {
           host: 'smtp.gmail.com',
           port: 465,
           secure: true,
           auth: {
-            user: process.env.EMAIL_USER,
-            pass: process.env.EMAIL_PASSWORD,
+            user: configService.get('EMAIL_USER'),
+            pass: configService.get('EMAIL_PASSWORD'),
           },
         },
         defaults: {

package/src/module/workflow/repository/action-data.repository.ts

@@ -25,6 +25,10 @@ export class ActionDataRepository {
 
     if (action.length > 0) {
       for (const act of action) {
+        const is_mandatory = await this.dataSource.query(
+          `SELECT code FROM cr_list_master_items WHERE id = ? and organization_id = ? LIMIT 1;`,
+          [act.action_requirement, loggedInUser.organization_id],
+        );
         const isFirst = act.sequence == minSequence;
         const actionData = this.actionDataRepo.create({
           stage_id: act.stage_id,
@@ -35,6 +39,7 @@ export class ActionDataRepository {
           mapped_entity_type,
           is_current: isFirst ? 'Y' : null,
           start_time: isFirst ? new Date() : null,
+          is_mandatory: is_mandatory[0]?.code === 'mandatory' ? true : false,
         } as ActionDataEntity);
         await this.actionDataRepo.save(actionData);
       }

package/src/module/workflow/repository/action.repository.ts

@@ -29,7 +29,14 @@ export class ActionRepository {
       [stage_id],
     );
 
-    if (!stageActions?.length) return [];
+    if (!stageActions?.length) {
+      return [
+        {
+          value: 0,
+          label: 'Generic',
+        },
+      ];
+    }
 
     const actionIds = stageActions.map((sa) => sa.action_id);
 

package/src/module/workflow/repository/task.repository.ts

@@ -38,14 +38,23 @@ export class TaskRepository {
 
     if (action.length > 0) {
       for (const act of action) {
+        // search that is_mandatory is true or not in list_master_items for the given organization
+
+        const is_mandatory = await this.dataSource.query(
+          `SELECT code FROM cr_list_master_items WHERE id = ? and organization_id = ? LIMIT 1;`,
+          [act.action_requirement, loggedInUser.organization_id],
+        );
+
         const taskData = this.TaskRepository.create({
           stage_id: act.stage_id,
           user_id: loggedInUser.id,
           action_id: act.id,
           name: act.name,
           sequence: act.sequence,
+          is_mandatory: is_mandatory[0]?.code === 'mandatory' ? true : false,
           mapped_entity_id,
           mapped_entity_type,
+
           is_system: true,
           status: todoListMasterItemId[0]?.id,
         } as TaskDataEntity);

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

@@ -151,13 +151,11 @@ export class WorkflowMetaService extends EntityServiceImpl {
       return `Initialized workflow with first stage (Stage ID: ${firstStage.id}).`;
     }
 
-    //idhr
-
     // Case 2: Has next stage – move forward
-    const stageDate = await this.getNextStage(currentStage);
+    const stageData = await this.getNextStage(currentStage);
 
-    if (stageDate.hasNextStage) {
-      const { nextStage } = stageDate;
+    if (stageData.hasNextStage) {
+      const { nextStage } = stageData;
       // Close current stage
       currentStage.end_date = now;
       currentStage.is_current = 'N';
@@ -179,7 +177,7 @@ export class WorkflowMetaService extends EntityServiceImpl {
       });
 
       this.populateActionService(
-        currentStage.stage_id,
+        stageData.nextStage.id,
         loggedInUser,
         mapped_entity_id,
         mapped_entity_type,