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

sales GCP name Implementation For Demo : ps

Browse Source
This commit is contained in:
VE10-Sanjeev 2023-08-17 17:37:39 +05:30
parent 3279a81710
commit c8659ad130
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -257,7 +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;
$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; $source=$output_file;
$gcpResult = $this->googlecloud->uploadFileToGCPBucket($gcpBucketName,$gcpObjectName,$source); $gcpResult = $this->googlecloud->uploadFileToGCPBucket($gcpBucketName,$gcpObjectName,$source);
$report_gcp_url = ''; $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'); $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$old_key,'30 minutes');
} }
$gcpBucketName = GCP_BUCKET_NAME; $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); $report_gcp_url = $this->googlecloud->getSingleObjectInaBucketAsSignedURI($gcpBucketName,$gcpObjectName);
$data['dataStatus'] = true; $data['dataStatus'] = true;
@ -335,8 +337,6 @@ class Sales_PD_Controller extends REST_Controller {
$details = $this->Sales_PD_Model->selectCustomRecords($columns, $where_arr, $table); $details = $this->Sales_PD_Model->selectCustomRecords($columns, $where_arr, $table);
if(!empty($details)){ if(!empty($details)){
$response = $this->dataSynchronization($sales_pd_id,0); $response = $this->dataSynchronization($sales_pd_id,0);
// echo "here i am";
// die();
$data['CETresponse'] = $response; $data['CETresponse'] = $response;
if(isset($response->status) && ($response->status == 200)){ if(isset($response->status) && ($response->status == 200)){
log_message('ERROR', '#### Sales PD ('.$sales_pd_id.') status '.$response->status." Data Transfered"); 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() public function listSalesPD_get()
{ {
//echo "sales ctrl";die();
$lender_id = $this->uri->segment(2); $lender_id = $this->uri->segment(2);
$user_id = $this->uri->segment(3); $user_id = $this->uri->segment(3);
$role = $this->uri->segment(4); $role = $this->uri->segment(4);
$redirect_email = base64_decode($this->uri->segment(5)); # becoz email can't able to send in url. so encoded $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', $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' '(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'; $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); $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)) 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"; $rand_name = $records['img_name'] == 'satellite' ? $records['img_name'].".png" : $records['img_name']."_".$randomString.".png";
$gcpBucketName = GCP_BUCKET_NAME; $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); $result = $this->googlecloud->uploadFileToGCPBucket($gcpBucketName,$objectName,$source);
if($result == true){ if($result == true){
$image_inserted++; $image_inserted++;
@ -2175,7 +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;
$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); $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');

3
api/application/helpers/satellite_image_helper.php
View File

@ -106,7 +106,8 @@ class satellite_image
// Google Library - GCP // Google Library - GCP
$CI->load->library('Googlecloud'); $CI->load->library('Googlecloud');
$gcpBucketName = GCP_BUCKET_NAME; $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); $result = $CI->googlecloud->uploadFileToGCPBucket($gcpBucketName,$objectName,$source);
if($result == true){ if($result == true){
$image_inserted++; $image_inserted++;