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

Merge branch 'master' of bitbucket.org:venbaittech/sparqapi

Browse Source
This commit is contained in:
VE10-Sanjeev 2022-05-28 18:41:45 +05:30
commit 7193b97f20
6 changed files with 51 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
api/application/controllers/PD_Controller.php
View File

@ -793,10 +793,10 @@ class PD_Controller extends REST_Controller {
/****************END OF ADDTIONAL REQUIREMENTS SECTION*******************************************/ /****************END OF ADDTIONAL REQUIREMENTS SECTION*******************************************/
//create gmeet link //create gmeet link
if($pd_id != null && $pd_id != '' && ($pd_details['fk_pd_type'] == 2 || $pd_details['fk_pd_type'] == 3)) // if($pd_id != null && $pd_id != '' && ($pd_details['fk_pd_type'] == 2 || $pd_details['fk_pd_type'] == 3))
{ // {
$this->createGmeetLink($pdid); // $this->createGmeetLink($pd_id);
} // }
if($pd_id != null || $pd_id != '' && $count != 0) if($pd_id != null || $pd_id != '' && $count != 0)
{ {
@ -11883,20 +11883,27 @@ public function getCompaniesListsFromGeneralFormRawJSONV2_post()
/**** /****
create gmeet link for smart and tele pd and update it in pd trigger table create gmeet link for smart and tele pd and update it in pd trigger table
*/ */
// function createGmeetLink_get() function createGmeetLink_get()
function createGmeetLink($pdid) // function createGmeetLink($pdid)
{ {
// $pdid = $this->get('pdid');
// echo Date('Y-m-d').'T'. Date('H:i:s', (strtotime(Date('H:i:s') . '+ 1 hour')));
// die();
$pdid = $this->get('pdid');
$this->load->library('Googleapi'); $this->load->library('Googleapi');
$pd_details = $this->PD_Model->getPDMasterDetails($pdid); $pd_details = $this->PD_Model->getPDMasterDetails($pdid);
// print_r($pd_details);
if(!$pd_details[0]['gmeet_code'] && ($pd_details[0]['fk_pd_type'] == 2 || $pd_details[0]['fk_pd_type'] == 3))
{
$event = array( $event = array(
'summary' => 'PD for case -'.$pd_details[0]['pd_sno'].' & Applicant ID - '.$pd_details[0]['lender_applicant_id'], 'summary' => 'PD for '.$pd_details[0]['title_name'].' '.$pd_details[0]['main_applicant'].' & case no -'.$pd_details[0]['pd_sno'].' & Applicant ID - '.$pd_details[0]['lender_applicant_id'],
'start' => Date('Y-m-d'), 'start' => Date('Y-m-d').'T'.Date('H:i:s'),
'end' => Date('Y-m-d'), 'end' => Date('Y-m-d').'T'. Date('H:i:s', (strtotime(Date('H:i:s') . '+ 1 hour'))),
'pdid' => $pdid, 'pdid' => $pdid,
); );
// print_r($event);die();
$event_data = $this->googleapi->addGoogleCalenterEvent($event); $event_data = $this->googleapi->addGoogleCalenterEvent($event);
if(is_object($event_data)) if(is_object($event_data))
{ {
@ -11904,6 +11911,19 @@ public function getCompaniesListsFromGeneralFormRawJSONV2_post()
$meet_id = isset($event_data['id']) ? $event_data['id'] : null; $meet_id = isset($event_data['id']) ? $event_data['id'] : null;
$where_condition_array = array('pd_id' => $pdid); $where_condition_array = array('pd_id' => $pdid);
$this->PD_Model->updateRecords(['gmeet_code' => $meet_code,'gmeet_id' => $meet_id],PDTRIGGER,$where_condition_array); $this->PD_Model->updateRecords(['gmeet_code' => $meet_code,'gmeet_id' => $meet_id],PDTRIGGER,$where_condition_array);
$data['dataStatus'] = true;
$data['status'] = REST_Controller::HTTP_OK;
$data['data'] = ['gmeet_code' => $meet_code];
$this->response($data,REST_Controller::HTTP_OK);
}
}
else
{
$data['dataStatus'] = false;
$data['status'] = REST_Controller::HTTP_NO_CONTENT;
$data['msg'] = 'gmeet already created';
$this->response($data,REST_Controller::HTTP_OK);
} }

4
api/application/controllers/Test.php
View File

@ -135,7 +135,7 @@ class Test extends REST_Controller {
} }
} }
//update face api result in main table //update face api result in main table
$where_condition_array = array('pd_id' => $pd_id); $where_condition_array = array('pd_id' => $pdid);
$this->PD_Model->updateRecords(['faceapi_result' => json_encode($res_data)],PDTRIGGER,$where_condition_array); $this->PD_Model->updateRecords(['faceapi_result' => json_encode($res_data)],PDTRIGGER,$where_condition_array);
//delete local files if created //delete local files if created
@ -189,6 +189,7 @@ class Test extends REST_Controller {
$driveFilesList = $this->googleapi->getDriveFilesList($pd_details[0]['gmeet_code']); $driveFilesList = $this->googleapi->getDriveFilesList($pd_details[0]['gmeet_code']);
if(count($driveFilesList)) if(count($driveFilesList))
{ {
log_message('ERROR','###Videos Found'.count($driveFilesList).' - PDID - '. $pdid);
foreach ($driveFilesList as $key => $file) foreach ($driveFilesList as $key => $file)
{ {
$this->handleGoolgeVideoFile($file,$pd_details); $this->handleGoolgeVideoFile($file,$pd_details);
@ -201,6 +202,7 @@ class Test extends REST_Controller {
} }
else else
{ {
log_message('ERROR','###Videos not found/not available in drive yet Found'.count($driveFilesList).' - PDID - '. $pdid);
$data['dataStatus'] = true; $data['dataStatus'] = true;
$data['status'] = REST_Controller::HTTP_NO_CONTENT; $data['status'] = REST_Controller::HTTP_NO_CONTENT;
// $data['msg'] = 'Officers Records Not Found!'; // $data['msg'] = 'Officers Records Not Found!';

2
api/application/helpers/cet_salespd_helper.php
View File

@ -63,7 +63,7 @@ class CET_SALESPD
curl_setopt( $ch,CURLOPT_POSTFIELDS, $output_data); curl_setopt( $ch,CURLOPT_POSTFIELDS, $output_data);
$result = curl_exec($ch ); $result = curl_exec($ch );
$response = json_decode($result); $response = json_decode($result);
log_message('ERROR',"CET APP SALES PDID (".$pdid.") ".$log_msg."PullSalesPDData api response :".json_encode($response)); log_message('ERROR',"CET APP SALES PDID (".$pdid.") "."PullSalesPDData api response :".json_encode($response));
curl_close( $ch ); curl_close( $ch );
} }

2
api/application/helpers/video_grabber_helper.php
View File

@ -33,7 +33,7 @@ class video_grabber_helper
foreach ($video_info as $key => $value) foreach ($video_info as $key => $value)
{ {
$video_name = $value['composition_id'].'.mp4'; $video_name = $value['composition_id'].'.mp4';
if($value['is_uploaded']){$video_name = $value['composition_id'];} if($value['is_uploaded'] || $value['vps'] == 'google'){$video_name = $value['composition_id'];}
$file_name = $video_name; $file_name = $video_name;
if($value['s3_copied']) if($value['s3_copied'])

4
api/application/libraries/Googleapi.php
View File

@ -144,11 +144,11 @@ class Googleapi
'location' => 'Online', 'location' => 'Online',
'description' => '', 'description' => '',
'start' => array( 'start' => array(
'dateTime' => $eventdata['start'].'T00:00:00', 'dateTime' => $eventdata['start'],
'timeZone' => 'Asia/Kolkata', 'timeZone' => 'Asia/Kolkata',
), ),
'end' => array( 'end' => array(
'dateTime' => $eventdata['end'].'T00:00:00', 'dateTime' => $eventdata['end'],
'timeZone' => 'Asia/Kolkata', 'timeZone' => 'Asia/Kolkata',
),"conferenceData" => [ ),"conferenceData" => [
"createRequest"=> [ "createRequest"=> [

2
api/application/models/Entity_Management_Model.php
View File

@ -14,7 +14,7 @@ class Entity_Management_Model extends SPARQ_Model {
{ {
$result_data = array(); $result_data = array();
$this->db->SELECT('ENTITY.entity_id, ENTITY.full_name, ENTITY.short_name,ENTITY.createdon, ENTITY.fk_createdby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby, ENTITY.updatedon, ENTITY.fk_updatedby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby, ENTITY.isactive,ENTITY.fk_entity_type_id,ENTITYTYPE.name as entity_name,ENTITY.is_otp_enabled,ENTITY.is_score_card_enabled,ENTITY.is_sms_enabled,ENTITY.is_mail_enabled,ENTITY.is_app_notify_enabled'); $this->db->SELECT('ENTITY.entity_id, ENTITY.full_name, ENTITY.short_name,ENTITY.createdon, ENTITY.fk_createdby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby, ENTITY.updatedon, ENTITY.fk_updatedby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby, ENTITY.isactive,ENTITY.fk_entity_type_id,ENTITYTYPE.name as entity_name,ENTITY.is_otp_enabled,ENTITY.is_score_card_enabled,ENTITY.is_sms_enabled,ENTITY.is_mail_enabled,ENTITY.is_app_notify_enabled,ENTITY.is_face_api_enabled');
$this->db->FROM(ENTITY.' as ENTITY'); $this->db->FROM(ENTITY.' as ENTITY');
$this->db->JOIN(USERPROFILE.' as USERPROFILE','ENTITY.fk_createdby = USERPROFILE.userid','LEFT'); $this->db->JOIN(USERPROFILE.' as USERPROFILE','ENTITY.fk_createdby = USERPROFILE.userid','LEFT');
$this->db->JOIN(USERPROFILE.' as USERPROFILE1','ENTITY.fk_updatedby = USERPROFILE1.userid','LEFT'); $this->db->JOIN(USERPROFILE.' as USERPROFILE1','ENTITY.fk_updatedby = USERPROFILE1.userid','LEFT');