diff --git a/api/application/config/constants.php b/api/application/config/constants.php index 585adaab..c7031b62 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -119,6 +119,7 @@ defined('SALESPD_CUSTOMER_IMG_URL') OR define('SALESPD_CUSTOMER_IMG_URL','https: defined('CUSTOMER_IMG_URL') OR define('CUSTOMER_IMG_URL','https://demo.pdgenie.com/customer/#/pd-images/'); defined('PDF_ATTACHEMENT_URL') OR define('PDF_ATTACHEMENT_URL','https://apitest.pdgenie.com/sparqdev/api/short?dat='); defined('OPTIMIZED_IMAGE_BUCKET_NAME') OR define('OPTIMIZED_IMAGE_BUCKET_NAME','optimized-images-demo'); +defined('IMAGE_OPTIMIZE_LAMBDA_URL') OR define('IMAGE_OPTIMIZE_LAMBDA_URL','https://wlaax92nne.execute-api.ap-south-1.amazonaws.com/demo'); } else if(ENVIRONMENT == 'testing') { @@ -135,6 +136,7 @@ else if(ENVIRONMENT == 'testing') defined('PDF_ATTACHEMENT_URL') OR define('PDF_ATTACHEMENT_URL','https://apitest.pdgenie.com/sparqtest/api/short?dat='); defined('GOOGLE_DISTANCE_MATRIX_API_KEY') OR define('GOOGLE_DISTANCE_MATRIX_API_KEY',getenv('GOOGLE_DISTANCE_MATRIX_API_KEY')); defined('OPTIMIZED_IMAGE_BUCKET_NAME') OR define('OPTIMIZED_IMAGE_BUCKET_NAME','optimized-images-demo'); + defined('IMAGE_OPTIMIZE_LAMBDA_URL') OR define('IMAGE_OPTIMIZE_LAMBDA_URL','https://wlaax92nne.execute-api.ap-south-1.amazonaws.com/demo'); } else if(ENVIRONMENT == 'production') { @@ -151,6 +153,7 @@ else if(ENVIRONMENT == 'production') defined('PDF_ATTACHEMENT_URL') OR define('PDF_ATTACHEMENT_URL','https://api.pdgenie.com/sparqprod/api/short?dat='); defined('GOOGLE_DISTANCE_MATRIX_API_KEY') OR define('GOOGLE_DISTANCE_MATRIX_API_KEY',getenv('GOOGLE_DISTANCE_MATRIX_API_KEY')); defined('OPTIMIZED_IMAGE_BUCKET_NAME') OR define('OPTIMIZED_IMAGE_BUCKET_NAME','optimized-images-live'); + defined('IMAGE_OPTIMIZE_LAMBDA_URL') OR define('IMAGE_OPTIMIZE_LAMBDA_URL','https://wlaax92nne.execute-api.ap-south-1.amazonaws.com/demo'); } /*********************END of AWS resources Constants*************************************************/ diff --git a/api/application/config/routes.php b/api/application/config/routes.php index 462d2c8a..c2b59bff 100755 --- a/api/application/config/routes.php +++ b/api/application/config/routes.php @@ -353,4 +353,5 @@ $route['resendSaleReportMail'] = 'Sales_PD_Controller/resendSaleReportMail'; $route['generateOTP'] = 'User_Management_Controller/generateOTP'; $route['verifyOTP'] = 'User_Management_Controller/verifyOTP'; -$route['awsrek/(:any)'] = 'Test/testAwsrek'; \ No newline at end of file +$route['awsrek/(:any)'] = 'Test/testAwsrek'; +$route['optimizeImages/(:num)'] = 'PD_Controller/optimizeImages'; \ No newline at end of file diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index f2a5e8e9..21be7471 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -20,7 +20,7 @@ class PD_Controller extends REST_Controller { //class level variable declaration //protected $external_path; - private $photo_names = array('selfie_with_person_met' => array('Person met','18',0,0),'person_met_id' => array('Person met ID Proof','18',0,0),'address_proof_visited' => array('Address Proof','5',0,0),'name_board_seen' => array('Name Board Seen','13',0,0),'machinery_image' => array('Machinery Image','22',0,0),'gst_Regn_cert_pic' => array('GST Regn Cert','13',0,0),'pf_regn_pic' => array('PF Regn','13',0,0),'esic_regn_pic' => array('ESIC Regn','13',0,0),'export_import_cert_pic' => array('Export Import Cert','13',0,0),'factory_cert_pic' => array('Factory Cert','13',0,0),'shop_eat_act_cert_pic' => array('Shop Est Act Cert','13',0,0),'eb_bill_pic' => array('EB Bill','13',0,0),'practice_cert_pic' => array('Cert of Practice','13',0,0),'fire_noc_pic' => array('Fire NOC','13',0,0),'stock_image' => array('Stock image','11',1,1),'client_image' => array('Client Bills','2',1,1),'supplier_image' => array('Supplier Bills','1',1,1)); + private $photo_names = array('selfie_with_person_met' => array('Person met','18',0,0),'person_met_id' => array('Person met ID Proof','18',0,0),'address_proof_visited' => array('Address Proof','5',0,0),'name_board_seen' => array('Name Board Seen','13',0,0),'machinery_image' => array('Machinery Image','22',0,0),'gst_Regn_cert_pic' => array('GST Regn Cert','13',0,0),'pf_regn_pic' => array('PF Regn','13',0,0),'esic_regn_pic' => array('ESIC Regn','13',0,0),'export_import_cert_pic' => array('Export Import Cert','13',0,0),'factory_cert_pic' => array('Factory Cert','13',0,0),'shop_eat_act_cert_pic' => array('Shop Est Act Cert','13',0,0),'eb_bill_pic' => array('EB Bill','13',0,0),'practice_cert_pic' => array('Cert of Practice','13',0,0),'fire_noc_pic' => array('Fire NOC','13',0,0),'stock_image' => array('Stock image','11',1,1),'client_image' => array('Client Bills','2',1,1),'supplier_image' => array('Supplier Bills','1',1,1),'office_setup' => array('Office/Business Setup','13',1,1)); private $existing_imges = array(); function __construct() @@ -11450,6 +11450,38 @@ public function getCompaniesListsFromGeneralFormRawJSON_post() PDALERTS::sendMWcreditPDMail($this,$records,1); PDALERTS::sendMWcreditPDMail($this,$records,2); } + + function optimizeImages_get() + { + $this->load->helper('MYHTTPCLIENT'); + $pd_id = $this->uri->segment(2); + $lender_id = $this->PD_Model->selectCustomRecords(array('fk_lender_id'),array('pd_id' => $pd_id),PDTRIGGER); + $sourceBucket = LENDER_BUCKET_NAME_PREFIX.$lender_id[0]['fk_lender_id']; + //echo $sourceBucket; + $result = MYHTTPCLIENT::startOptimizeImages($sourceBucket,$pd_id); + //print_r($result);die(); + // $code = $result->getStatusCode(); + // echo $code; + // $body = $result->getBody(); + // //$body = $body->getContents(); + // print_r($body);die(); + if($result['statusCode'] == 200) + { + $data['dataStatus'] = true; + $data['status'] = REST_Controller::HTTP_OK; + $data['records'] = $result['body']; + $this->response($data,REST_Controller::HTTP_OK); + } + else + { + $data['dataStatus'] = false; + $data['status'] = REST_Controller::HTTP_NOT_FOUND; + $data['msg'] = 'Something Went Wrong! Try Later'; + $this->response($data,REST_Controller::HTTP_OK); + } + //print_r($result); + + } diff --git a/api/application/helpers/myhttpclient_helper.php b/api/application/helpers/myhttpclient_helper.php index b2d942d2..8e7eaf66 100644 --- a/api/application/helpers/myhttpclient_helper.php +++ b/api/application/helpers/myhttpclient_helper.php @@ -25,6 +25,31 @@ class MYHTTPCLIENT } + // Create the http client + public static function startOptimizeImages($sourceBucket,$pdid) + { + include_once APPPATH.'/vendor/autoload.php'; + //echo IMAGE_OPTIMIZE_LAMBDA_URL;//die(); + if(true) + { + $reqest_data = ['bucket' => $sourceBucket,'pdid' => $pdid]; + //echo json_encode($reqest_data);die(); + $client = new \GuzzleHttp\Client(); + $response = $client->post( IMAGE_OPTIMIZE_LAMBDA_URL, [ + 'headers' => ['Content-Type' => 'application/json'], + 'body' => json_encode($reqest_data) + ]); + + //print_r($response); + $code = $response->getStatusCode(); + $data = $response->getBody()->getContents(); + //echo ($data);die(); + + return array('statusCode' => $code,'body' => $data); + } + + } + } ?> \ No newline at end of file