diff --git a/api/application/controllers/Welcome.php b/api/application/controllers/Welcome.php index a9c62c75..ccd0725d 100644 --- a/api/application/controllers/Welcome.php +++ b/api/application/controllers/Welcome.php @@ -47,6 +47,7 @@ class Welcome extends CI_Controller { public function receiveShortenURL() { $data = $this->input->get('dat'); + // echo $data;die; if($data) { // $data = 'vdo/20221031/1010/random'; @@ -98,17 +99,27 @@ class Welcome extends CI_Controller { $this->load->model('PD_Model'); $this->load->library('AWS_S3'); $room_info = $this->PD_Model->selectCustomRecords(array('*'),array('composition_id' => $video_name),VIDEO_ROOM_INFO); - // print_r($room_info);die(); + // print_r($room_info);die(); if(count($room_info)) { // echo 'vdo working'; $pd_master_details = $this->PD_Model->getPDMasterDetails($room_info[0]['fk_pd_id']); - $bucket_name = LENDER_BUCKET_NAME_PREFIX.$pd_master_details[0]['fk_lender_id']; + $old_bucket_name = LENDER_BUCKET_NAME_PREFIX.$pd_master_details[0]['fk_lender_id']; + $new_bucket_name = TWILIO_CONTENT_BUCKET_NAME; if(!$room_info[0]['is_uploaded']){ $video_name = $video_name.'.mp4'; } - $final_key = 'pd'.$pd_master_details[0]['pd_id'].'/video/'.$video_name; + // $final_key = 'pd'.$pd_master_details[0]['pd_id'].'/video/'.$video_name; // echo $final_key;die(); + + if($room_info[0]['s3_copied'] == 1){ + $final_key = 'pd'.$pd_master_details[0]['pd_id'].'/video/'.$video_name; + $bucket_name = $old_bucket_name; + }else if($room_info[0]['s3_copied'] == 0){ + $final_key = $video_name; + $bucket_name = $new_bucket_name; + } + $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$final_key,'+2 hour'); return //echo