From c8659ad130f2c0ac6dbddfd25c79ccb1edc56abf Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Thu, 17 Aug 2023 17:37:39 +0530 Subject: [PATCH] sales GCP name Implementation For Demo : ps --- .../controllers/Sales_PD_Controller.php | 22 ++++++++++--------- .../helpers/satellite_image_helper.php | 3 ++- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php index d15b672c..301d4991 100644 --- a/api/application/controllers/Sales_PD_Controller.php +++ b/api/application/controllers/Sales_PD_Controller.php @@ -257,7 +257,8 @@ class Sales_PD_Controller extends REST_Controller { $s3result= $this->aws_s3->uploadFileToS3Bucket($bucket_data); /*** GCP Report Upload here */ $gcpBucketName = GCP_BUCKET_NAME; - $gcpObjectName = "pd".$sales_pd_id."/".$sales_pd_id.".pdf"; + $prefixToObject = ENVIRONMENT == 'production' ? "":"sales-pd-demo"; + $gcpObjectName = $prefixToObject."/pd".$sales_pd_id."/".$sales_pd_id.".pdf"; $source=$output_file; $gcpResult = $this->googlecloud->uploadFileToGCPBucket($gcpBucketName,$gcpObjectName,$source); $report_gcp_url = ''; @@ -311,7 +312,8 @@ class Sales_PD_Controller extends REST_Controller { $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$old_key,'30 minutes'); } $gcpBucketName = GCP_BUCKET_NAME; - $gcpObjectName = "pd".$sales_pd_id."/".$sales_pd_id.".pdf"; + $prefixToObject = ENVIRONMENT == 'production' ? "":"sales-pd-demo"; + $gcpObjectName = $prefixToObject."/pd".$sales_pd_id."/".$sales_pd_id.".pdf"; $report_gcp_url = $this->googlecloud->getSingleObjectInaBucketAsSignedURI($gcpBucketName,$gcpObjectName); $data['dataStatus'] = true; @@ -335,8 +337,6 @@ class Sales_PD_Controller extends REST_Controller { $details = $this->Sales_PD_Model->selectCustomRecords($columns, $where_arr, $table); if(!empty($details)){ $response = $this->dataSynchronization($sales_pd_id,0); - // echo "here i am"; - // die(); $data['CETresponse'] = $response; if(isset($response->status) && ($response->status == 200)){ log_message('ERROR', '#### Sales PD ('.$sales_pd_id.') status '.$response->status." Data Transfered"); @@ -556,12 +556,12 @@ class Sales_PD_Controller extends REST_Controller { public function listSalesPD_get() { - //echo "sales ctrl";die(); $lender_id = $this->uri->segment(2); $user_id = $this->uri->segment(3); $role = $this->uri->segment(4); $redirect_email = base64_decode($this->uri->segment(5)); # becoz email can't able to send in url. so encoded - // echo base64_decode($redirect_email); + + $columns = array('SALES_PD_DATA.sales_pd_id','SALES_PD_DATA.sales_pd_sno','SALES_PD_DATA.applicant_name','SALES_PD_DATA.applicant_id','SALES_PD_DATA.lender_id','SALES_PD_DATA.product_id','SALES_PD_DATA.is_pdf','SALES_PD_DATA.is_edited','ENTITY.short_name','PRODUCT.abbr','SALES_PD_DATA.status','SALES_PD_DATA.sales_pd_type','SALES_PD_DATA.rand_string','SALES_PD_DATA.isactive','SALES_PD_DATA.city_id','CITY.name as city_name', '(CASE WHEN SALES_PD_DATA.status = "STARTED" THEN SALES_PD_DATA.createdon WHEN SALES_PD_DATA.status = "COMPLETED" THEN SALES_PD_DATA.completed_date ELSE NULL END) AS createdon' @@ -629,8 +629,8 @@ class Sales_PD_Controller extends REST_Controller { } $order_by = 'SALES_PD_DATA.sales_pd_id'; $sales_pd_data = $this->Sales_PD_Model->getJoinRecords($columns,$table,$joins,$where_condition_array,$order_by,'DESC','',$or_where); - // print_r($sales_pd_data); - // print_r($this->db->last_query());die(); + + //print_r($this->db->last_query());die(); if(count($sales_pd_data)) { @@ -838,7 +838,8 @@ class Sales_PD_Controller extends REST_Controller { } $rand_name = $records['img_name'] == 'satellite' ? $records['img_name'].".png" : $records['img_name']."_".$randomString.".png"; $gcpBucketName = GCP_BUCKET_NAME; - $objectName = "pd".$sales_pd_id."/images/".$rand_name; + $prefixToObject = ENVIRONMENT == 'production' ? "":"sales-pd-demo"; + $objectName = $prefixToObject."/pd".$sales_pd_id."/images/".$rand_name; $result = $this->googlecloud->uploadFileToGCPBucket($gcpBucketName,$objectName,$source); if($result == true){ $image_inserted++; @@ -2175,7 +2176,8 @@ public function filterSalesPDList_post() { $source=$value['img_name'] == 'satellite' ? 'data:image/png;base64,'.$value['img'] : $value['img']; //Google Library - GCP $gcpBucketName = GCP_BUCKET_NAME; - $objectName = "pd".$sales_pd_id."/images/".$rand_name; + $prefixToObject = ENVIRONMENT == 'production' ? "":"sales-pd-demo"; + $objectName = $prefixToObject."/pd".$sales_pd_id."/images/".$rand_name; $gcp_result = $this->googlecloud->uploadFileToGCPBucket($gcpBucketName,$objectName,$source); if($gcp_result == true){ log_message('ERROR', '### Sales-PD ('.$sales_pd_id.') '.$value['img_name'].' Image Stored In GCP'); diff --git a/api/application/helpers/satellite_image_helper.php b/api/application/helpers/satellite_image_helper.php index 6fc7bfda..4750d846 100644 --- a/api/application/helpers/satellite_image_helper.php +++ b/api/application/helpers/satellite_image_helper.php @@ -106,7 +106,8 @@ class satellite_image // Google Library - GCP $CI->load->library('Googlecloud'); $gcpBucketName = GCP_BUCKET_NAME; - $objectName = "pd".$pdid."/images/satellite.png"; + $prefixToObject = ENVIRONMENT == 'production' ? "":"sales-pd-demo"; + $objectName = $prefixToObject."/pd".$pdid."/images/satellite.png"; $result = $CI->googlecloud->uploadFileToGCPBucket($gcpBucketName,$objectName,$source); if($result == true){ $image_inserted++;