rez_core 5.0.295 → 5.0.296

package/package.json

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

package/src/module/meta/service/media-data.service.ts

@@ -46,6 +46,24 @@ export class MediaDataService extends EntityServiceImpl {
     if (!fileName || !mappedAttributeKey) {
       return null;
     }
+
+    // Validate AWS configuration
+    if (!this.s3AccessKeyID || !this.s3AccessKeySecret) {
+      throw new Error(
+        'AWS credentials not configured. Please check AWS_ACCESS_KEY_ID and AWS_SECRET_KEY in configuration.',
+      );
+    }
+    if (!this.bucketName) {
+      throw new Error(
+        'S3 bucket name not configured. Please check BUCKET_NAME in configuration.',
+      );
+    }
+    if (!this.s3Region) {
+      throw new Error(
+        'AWS region not configured. Please check AWS_REGION in configuration.',
+      );
+    }
+
     const ext = fileName.split('.').pop()?.toLowerCase() ?? '';
 
     const id = uuidv4();
@@ -61,32 +79,45 @@ export class MediaDataService extends EntityServiceImpl {
 
     const s3Key = `${s3Path}/${id}.${ext}`;
 
-    const uploadUrl = await this.s3.getSignedUrlPromise('putObject', {
-      Bucket: this.bucketName,
-      Key: s3Key,
-      Expires: 60 * 5, // URL valid for 5 mins
-      ContentType: this.getContentType(ext),
-    });
+    try {
+      const uploadUrl = await this.s3.getSignedUrlPromise('putObject', {
+        Bucket: this.bucketName,
+        Key: s3Key,
+        Expires: 60 * 5, // URL valid for 5 mins
+        ContentType: this.getContentType(ext),
+      });
 
-    const mediaData = new MediaData();
-    mediaData.file_name = fileName;
-    mediaData.mapped_attribute_key = mappedAttributeKey;
-    mediaData.status = STATUS_PENDING;
-    if (mappedEntityType) {
-      mediaData.mapped_entity_type = mappedEntityType;
-    }
-    if (mappedEntityId) {
-      mediaData.mapped_entity_id = mappedEntityId;
-    }
-    mediaData.media_url = s3Key;
+      const mediaData = new MediaData();
+      mediaData.file_name = fileName;
+      mediaData.mapped_attribute_key = mappedAttributeKey;
+      mediaData.status = STATUS_PENDING;
+      if (mappedEntityType) {
+        mediaData.mapped_entity_type = mappedEntityType;
+      }
+      if (mappedEntityId) {
+        mediaData.mapped_entity_id = mappedEntityId;
+      }
+      mediaData.media_url = s3Key;
 
-    //INSERT RECORD IN DOC TABLE
-    const savedEntity = await super.createEntity(mediaData, loggedInUser);
+      //INSERT RECORD IN DOC TABLE
+      const savedEntity = await super.createEntity(mediaData, loggedInUser);
 
-    if (savedEntity) {
-      return { id: savedEntity.id, path: s3Key, uploadUrl };
+      if (savedEntity) {
+        return { id: savedEntity.id, path: s3Key, uploadUrl };
+      }
+      return null;
+    } catch (error) {
+      console.error('Error generating upload URL:', error);
+      console.error('Error details:', {
+        message: error.message,
+        code: error.code,
+        statusCode: error.statusCode,
+        bucketName: this.bucketName,
+        region: this.s3Region,
+        hasCredentials: !!(this.s3AccessKeyID && this.s3AccessKeySecret),
+      });
+      throw new Error(`Failed to generate upload URL: ${error.message}`);
     }
-    return null;
   }
 
   async findByAttributeKeyAndMappedEntityIdAndMappedEntityType(
@@ -147,21 +178,51 @@ export class MediaDataService extends EntityServiceImpl {
   // New method to get the signed URL for the media (download link)
   async getMediaDownloadUrl(id: number, loggedInUser, expiresIn?: number) {
     try {
+      // Validate AWS configuration
+      if (!this.s3AccessKeyID || !this.s3AccessKeySecret) {
+        throw new Error(
+          'AWS credentials not configured. Please check AWS_ACCESS_KEY_ID and AWS_SECRET_KEY in configuration.',
+        );
+      }
+      if (!this.bucketName) {
+        throw new Error(
+          'S3 bucket name not configured. Please check BUCKET_NAME in configuration.',
+        );
+      }
+      if (!this.s3Region) {
+        throw new Error(
+          'AWS region not configured. Please check AWS_REGION in configuration.',
+        );
+      }
+
       const entityData = await this.getEntityData(
         ENTITYTYPE_MEDIA,
         id,
         loggedInUser,
       );
       const mediaData = entityData as MediaData;
+
+      if (!mediaData || !mediaData.media_url) {
+        throw new Error(`Media data not found or invalid for id: ${id}`);
+      }
+
       let fileSize: number | undefined;
       if (this.bucketName) {
-        const head = await this.s3
-          .headObject({
-            Bucket: this.bucketName,
-            Key: mediaData.media_url,
-          })
-          .promise();
-        fileSize = head.ContentLength;
+        try {
+          const head = await this.s3
+            .headObject({
+              Bucket: this.bucketName,
+              Key: mediaData.media_url,
+            })
+            .promise();
+          fileSize = head.ContentLength;
+        } catch (headError) {
+          console.error(
+            `Error checking file in S3 bucket '${this.bucketName}' with key '${mediaData.media_url}':`,
+            headError.message,
+          );
+          // Continue even if headObject fails - the file might still be accessible
+        }
       }
 
       const signedUrl = await this.s3.getSignedUrlPromise('getObject', {
@@ -179,12 +240,37 @@ export class MediaDataService extends EntityServiceImpl {
       };
     } catch (error) {
       console.error('Error generating signed URL for media:', error);
-      throw new Error('Failed to generate signed URL');
+      console.error('Error details:', {
+        message: error.message,
+        code: error.code,
+        statusCode: error.statusCode,
+        bucketName: this.bucketName,
+        region: this.s3Region,
+        hasCredentials: !!(this.s3AccessKeyID && this.s3AccessKeySecret),
+      });
+      throw new Error(`Failed to generate signed URL: ${error.message}`);
     }
   }
 
   async getMediaInlineUrl(id: number, loggedInUser, expiresIn?: number) {
     try {
+      // Validate AWS configuration
+      if (!this.s3AccessKeyID || !this.s3AccessKeySecret) {
+        throw new Error(
+          'AWS credentials not configured. Please check AWS_ACCESS_KEY_ID and AWS_SECRET_KEY in configuration.',
+        );
+      }
+      if (!this.bucketName) {
+        throw new Error(
+          'S3 bucket name not configured. Please check BUCKET_NAME in configuration.',
+        );
+      }
+      if (!this.s3Region) {
+        throw new Error(
+          'AWS region not configured. Please check AWS_REGION in configuration.',
+        );
+      }
+
       const entityData = await this.getEntityData(
         ENTITYTYPE_MEDIA,
         id,
@@ -193,20 +279,28 @@ export class MediaDataService extends EntityServiceImpl {
       const mediaData = entityData as MediaData;
       let fileSize: number | undefined;
 
-      if (!mediaData) {
-        throw new Error('Media not found');
+      if (!mediaData || !mediaData.media_url) {
+        throw new Error(`Media data not found or invalid for id: ${id}`);
       }
 
       const ext = mediaData.file_name.split('.').pop()?.toLowerCase() || '';
 
       if (this.bucketName) {
-        const head = await this.s3
-          .headObject({
-            Bucket: this.bucketName,
-            Key: mediaData.media_url,
-          })
-          .promise();
-        fileSize = head.ContentLength;
+        try {
+          const head = await this.s3
+            .headObject({
+              Bucket: this.bucketName,
+              Key: mediaData.media_url,
+            })
+            .promise();
+          fileSize = head.ContentLength;
+        } catch (headError) {
+          console.error(
+            `Error checking file in S3 bucket '${this.bucketName}' with key '${mediaData.media_url}':`,
+            headError.message,
+          );
+          // Continue even if headObject fails - the file might still be accessible
+        }
       }
 
       const signedUrl = await this.s3.getSignedUrlPromise('getObject', {
@@ -233,7 +327,15 @@ export class MediaDataService extends EntityServiceImpl {
       };
     } catch (error) {
       console.error('Error generating inline URL:', error);
-      throw new Error('Failed to generate inline URL');
+      console.error('Error details:', {
+        message: error.message,
+        code: error.code,
+        statusCode: error.statusCode,
+        bucketName: this.bucketName,
+        region: this.s3Region,
+        hasCredentials: !!(this.s3AccessKeyID && this.s3AccessKeySecret),
+      });
+      throw new Error(`Failed to generate inline URL: ${error.message}`);
     }
   }
 

package/src/module/workflow-automation/service/schedule-handler.service.ts

@@ -23,35 +23,35 @@ export class ScheduleHandlerService {
     private readonly listMasterRepo: Repository<ListMasterData>,
   ) {}
 
-  async scheduleQueryBuilder(workflow_id: number, jobData: any) {
+  async scheduleQueryBuilder(workflowId: number, jobData: any) {
     // 1️⃣ Fetch workflow automation config
     const workflow = await this.workflowAutomation.findOne({
       where: {
-        id: workflow_id,
-        organization_id: jobData.organization_id,
+        id: workflowId,
+        organization_id: jobData.organizationId,
       },
     });
 
-    if (!workflow) throw new Error(`Workflow with ID ${workflow_id} not found`);
+    if (!workflow) throw new Error(`Workflow with ID ${workflowId} not found`);
 
     const scheduleJson =
       typeof workflow.schedule === 'string'
         ? JSON.parse(workflow.schedule)
         : workflow.schedule;
-
+        
     const entityType = workflow.applicable_entity_type;
 
     // 2️⃣ Get table name from frm_entity_master
     const entity = await this.entityMasterRepository.findOne({
       where: {
         mapped_entity_type: entityType,
-        organization_id: jobData.organization_id,
+        organization_id: jobData.organizationId,
       },
-      select: ['db_table_name'],
+      select: ['data_source'],
     });
-    if (!entity?.db_table_name) throw new Error(`Entity ${entityType} not found`);
+    if (!entity?.data_source) throw new Error(`Entity ${entityType} not found`);
 
-    const tableName = entity.db_table_name;
+    const tableName = entity.data_source;
 
     // 3️⃣ Resolve executionDate (list master item name)
     const executionDateItem = await this.listMasterRepo.findOne({
@@ -88,19 +88,11 @@ export class ScheduleHandlerService {
 
     const qb = this.dataSource
       .createQueryBuilder()
-      .from(tableName, 'e')
-      .innerJoin(
-        'frm_wf_stage_movement_data',
-        'sm',
-        `
-      sm.mapped_entity_id = e.id
-      AND sm.is_current = 'Y'
-    `,
-      )
-      .select('e.*')
+      .from(tableName, tableName)
+      .select('*')
       .where(comparisonDateCondition)
-      .andWhere('e.organization_id = :orgId', {
-        orgId: jobData.organization_id,
+      .andWhere(`${tableName}.organization_id = :orgId`, {
+        orgId: jobData.organizationId,
       });
 
     this.logger.debug(`Executing Scheduler Query: ${qb.getSql()}`);
@@ -115,19 +107,19 @@ export class ScheduleHandlerService {
   }
 
   // ⚙️ Step 2: Handle scheduled automation (main entry point)
-  async handleScheduledWorkflow(workflow_id: number, jobData: any) {
+  async handleScheduledWorkflow(workflowId: number, jobData: any) {
     const { results, workflow, tableName } = await this.scheduleQueryBuilder(
-      workflow_id,
+      workflowId,
       jobData,
     );
 
     if (!results?.length) {
-      this.logger.warn(`No records found for scheduled workflow ${workflow_id}`);
+      this.logger.warn(`No records found for scheduled workflow ${workflowId}`);
       return;
     }
 
     this.logger.log(
-      `Processing ${results.length} records for workflow ${workflow_id}`,
+      `Processing ${results.length} records for workflow ${workflowId}`,
     );
 
     // Parse the workflow event JSON again to get filter/action info
@@ -157,7 +149,7 @@ export class ScheduleHandlerService {
 
     // 🧮 Step 3: Execute workflow actions for matched entities
     if (!matchedEntities.length) {
-      this.logger.log(`No records passed criteria for workflow ${workflow_id}`);
+      this.logger.log(`No records passed criteria for workflow ${workflowId}`);
       return;
     }
 
@@ -167,7 +159,7 @@ export class ScheduleHandlerService {
 
     for (const entity of matchedEntities) {
       await this.workflowAutomationEngineService.executeActions(
-        workflow_id,
+        workflowId,
         entity,
         jobData,
       );

package/src/module/workflow-schedule/interfaces/schedule-job-data.interface.ts

@@ -5,14 +5,13 @@
 import { UserData } from "src/module/user/entity/user.entity";
 
 export interface ScheduleJobData {
-  id: number;
-  schedule_id: number;
-  workflow_id: number;
-  workflow_name: string;
-  organization_id: number;
-  enterprise_id: number;
-  level_id?: string;
-  level_type?: string;
+  scheduleId: number;
+  workflowId: number;
+  workflowName: string;
+  organizationId: number;
+  enterpriseId: number;
+  levelId?: string;
+  levelType?: string;
   appcode?: string;
   createdBy: number;
   triggeredBy: 'SCHEDULE' | 'MANUAL';