Sineedge/sparqapi
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GCP Path "/" fixes in sales pd ctrlr : ps

Browse Source
This commit is contained in:
VE10-Sanjeev 2023-10-27 11:10:31 +05:30
parent b3cce0f95f
commit 33e80256c0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
api/application/controllers/Sales_PD_Controller.php
View File

@ -257,8 +257,8 @@ class Sales_PD_Controller extends REST_Controller {
$s3result= $this->aws_s3->uploadFileToS3Bucket($bucket_data); $s3result= $this->aws_s3->uploadFileToS3Bucket($bucket_data);
/*** GCP Report Upload here */ /*** GCP Report Upload here */
$gcpBucketName = GCP_BUCKET_NAME; $gcpBucketName = GCP_BUCKET_NAME;
$prefixToObject = ENVIRONMENT == 'production' ? "":"sales-pd-demo"; $prefixToObject = ENVIRONMENT == 'production' ? "":"sales-pd-demo/";
$gcpObjectName = $prefixToObject."/pd".$sales_pd_id."/".$sales_pd_id.".pdf"; $gcpObjectName = $prefixToObject."pd".$sales_pd_id."/".$sales_pd_id.".pdf";
$source=$output_file; $source=$output_file;
$gcpResult = $this->googlecloud->uploadFileToGCPBucket($gcpBucketName,$gcpObjectName,$source); $gcpResult = $this->googlecloud->uploadFileToGCPBucket($gcpBucketName,$gcpObjectName,$source);
$report_gcp_url = ''; $report_gcp_url = '';
@ -312,8 +312,8 @@ class Sales_PD_Controller extends REST_Controller {
$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$old_key,'30 minutes'); $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$old_key,'30 minutes');
} }
$gcpBucketName = GCP_BUCKET_NAME; $gcpBucketName = GCP_BUCKET_NAME;
$prefixToObject = ENVIRONMENT == 'production' ? "":"sales-pd-demo"; $prefixToObject = ENVIRONMENT == 'production' ? "":"sales-pd-demo/";
$gcpObjectName = $prefixToObject."/pd".$sales_pd_id."/".$sales_pd_id.".pdf"; $gcpObjectName = $prefixToObject."pd".$sales_pd_id."/".$sales_pd_id.".pdf";
$report_gcp_url = $this->googlecloud->getSingleObjectInaBucketAsSignedURI($gcpBucketName,$gcpObjectName); $report_gcp_url = $this->googlecloud->getSingleObjectInaBucketAsSignedURI($gcpBucketName,$gcpObjectName);
$data['dataStatus'] = true; $data['dataStatus'] = true;
@ -838,8 +838,8 @@ class Sales_PD_Controller extends REST_Controller {
} }
$rand_name = $records['img_name'] == 'satellite' ? $records['img_name'].".png" : $records['img_name']."_".$randomString.".png"; $rand_name = $records['img_name'] == 'satellite' ? $records['img_name'].".png" : $records['img_name']."_".$randomString.".png";
$gcpBucketName = GCP_BUCKET_NAME; $gcpBucketName = GCP_BUCKET_NAME;
$prefixToObject = ENVIRONMENT == 'production' ? "":"sales-pd-demo"; $prefixToObject = ENVIRONMENT == 'production' ? "":"sales-pd-demo/";
$objectName = $prefixToObject."/pd".$sales_pd_id."/images/".$rand_name; $objectName = $prefixToObject."pd".$sales_pd_id."/images/".$rand_name;
$result = $this->googlecloud->uploadFileToGCPBucket($gcpBucketName,$objectName,$source); $result = $this->googlecloud->uploadFileToGCPBucket($gcpBucketName,$objectName,$source);
if($result == true){ if($result == true){
$image_inserted++; $image_inserted++;
@ -2176,8 +2176,8 @@ public function filterSalesPDList_post() {
$source=$value['img_name'] == 'satellite' ? 'data:image/png;base64,'.$value['img'] : $value['img']; $source=$value['img_name'] == 'satellite' ? 'data:image/png;base64,'.$value['img'] : $value['img'];
//Google Library - GCP //Google Library - GCP
$gcpBucketName = GCP_BUCKET_NAME; $gcpBucketName = GCP_BUCKET_NAME;
$prefixToObject = ENVIRONMENT == 'production' ? "":"sales-pd-demo"; $prefixToObject = ENVIRONMENT == 'production' ? "":"sales-pd-demo/";
$objectName = $prefixToObject."/pd".$sales_pd_id."/images/".$rand_name; $objectName = $prefixToObject."pd".$sales_pd_id."/images/".$rand_name;
$gcp_result = $this->googlecloud->uploadFileToGCPBucket($gcpBucketName,$objectName,$source); $gcp_result = $this->googlecloud->uploadFileToGCPBucket($gcpBucketName,$objectName,$source);
if($gcp_result == true){ if($gcp_result == true){
log_message('ERROR', '### Sales-PD ('.$sales_pd_id.') '.$value['img_name'].' Image Stored In GCP'); log_message('ERROR', '### Sales-PD ('.$sales_pd_id.') '.$value['img_name'].' Image Stored In GCP');