From 24dcf28b634cb7d0a1a0ee833bb8350dd88492d2 Mon Sep 17 00:00:00 2001 From: "sanjeev.p" Date: Wed, 22 Sep 2021 15:46:42 +0530 Subject: [PATCH] Existing report file check : ps --- api/application/controllers/Sales_PD_Controller.php | 10 +++++++++- api/application/helpers/pdalerts_helper.php | 8 ++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php index c35fda73..ca900821 100644 --- a/api/application/controllers/Sales_PD_Controller.php +++ b/api/application/controllers/Sales_PD_Controller.php @@ -240,7 +240,15 @@ class Sales_PD_Controller extends REST_Controller { { if($api) { - $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$key,'30 minutes'); + ## NEW KEY BECAUSE TITLE-RENAME + $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$key,'30 minutes'); + if(curl_init($singed_uri) !== false){ ##THERE IS NO FILE in NEW KEY means we using OLD KEY. So that using if Cond. + $old_pdf_name = strtolower(trim($sales_pd_data[0]['applicant_name'])); + $old_pdf_name .= '-'.$sales_pd_data[0]['abbr']; + $old_pdf_name .= '-'.(date('dmY',strtotime($sales_pd_data[0]['completed_date']))); + $old_key = 'sales_pd/'.$sales_pd_id.'/'.$old_pdf_name.'.pdf'; + $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$old_key,'30 minutes'); + } $data['dataStatus'] = true; $data['status'] = REST_Controller::HTTP_OK; $data['records'] = $singed_uri; diff --git a/api/application/helpers/pdalerts_helper.php b/api/application/helpers/pdalerts_helper.php index b0186668..63513115 100644 --- a/api/application/helpers/pdalerts_helper.php +++ b/api/application/helpers/pdalerts_helper.php @@ -620,7 +620,15 @@ class PDALERTS $file_name = $pdf_name.'.pdf'; $content = "Dear Team

Please find enclosed the sales PD report." ; $key = 'sales_pd/'.$sales_pd_id.'/'.$pdf_name.'.pdf'; + ## NEW KEY BECAUSE TITLE-RENAME $singed_uri = $CI->aws_s3->getSingleObjectInaBucketAsSignedURI((LENDER_BUCKET_NAME_PREFIX.$sales_pd_data[0]['lender_id']),$key,'+5 minutes'); + if(curl_init($singed_uri) !== false){ ##THERE IS NO FILE in NEW KEY means we using OLD KEY. So that using if Cond. + $old_pdf_name = strtolower(trim($sales_pd_data[0]['applicant_name'])); + $old_pdf_name .= '-'.$sales_pd_data[0]['abbr']; + $old_pdf_name .= '-'.(date('dmY',strtotime($sales_pd_data[0]['completed_date']))); + $old_key = 'sales_pd/'.$sales_pd_id.'/'.$old_pdf_name.'.pdf'; + $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI((LENDER_BUCKET_NAME_PREFIX.$sales_pd_data[0]['lender_id']),$old_key,'+5 minutes');; + } //echo $singed_uri; return array($mail_subject,$file_name,$content,$singed_uri); }