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

PROD CONFIG WITH COMPLETE PD CHANGE

Browse Source
This commit is contained in:
Velz2020 2019-06-21 19:13:11 +05:30
parent b33bdef1c3
commit 63f57b0afd
10 changed files with 147 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
api/application/config/constants.php
View File

@ -99,7 +99,7 @@ defined('DETAILED_SCORE_CARD_IMAGE_LOCATION') OR define('DETAILED_SCORE_CARD_IMA
defined('LENDER_BUCKET_NAME_PREFIX') OR define('LENDER_BUCKET_NAME_PREFIX','lender');
defined('PHANTOMJSSCRIPT_LOCATION') OR define('PHANTOMJSSCRIPT_LOCATION','phantomjs_dev');
defined('LOGTOBOT') OR define('LOGTOBOT',0);
defined('GOOGLE_STATIC_MAP_API_KEY') OR define('GOOGLE_STATIC_MAP_API_KEY','AIzaSyCXsHTus6hyIB8jYvt9ZEIbZve-2vWeQRg');
defined('GOOGLE_STATIC_MAP_API_KEY') OR define('GOOGLE_STATIC_MAP_API_KEY','AIzaSyA3lYDYxwtn5vLSl45SOKbtK7G6cEyXGr0');
}
else if(ENVIRONMENT == 'testing')
{
@ -108,18 +108,24 @@ else if(ENVIRONMENT == 'testing')
defined('LENDER_BUCKET_NAME_PREFIX') OR define('LENDER_BUCKET_NAME_PREFIX','len');
defined('PHANTOMJSSCRIPT_LOCATION') OR define('PHANTOMJSSCRIPT_LOCATION','phantomjs_test');
defined('LOGTOBOT') OR define('LOGTOBOT',0);
defined('GOOGLE_STATIC_MAP_API_KEY') OR define('GOOGLE_STATIC_MAP_API_KEY','AIzaSyCXsHTus6hyIB8jYvt9ZEIbZve-2vWeQRg');
defined('GOOGLE_STATIC_MAP_API_KEY') OR define('GOOGLE_STATIC_MAP_API_KEY','AIzaSyA3lYDYxwtn5vLSl45SOKbtK7G6cEyXGr0');
}
else if(ENVIRONMENT == 'prod')
{
defined('SATELLITE_IMAGE_LOCATION') OR define('SATELLITE_IMAGE_LOCATION','phantomsatellite_test');
defined('DETAILED_SCORE_CARD_IMAGE_LOCATION') OR define('DETAILED_SCORE_CARD_IMAGE_LOCATION','phantom_dsc_test');
defined('LENDER_BUCKET_NAME_PREFIX') OR define('LENDER_BUCKET_NAME_PREFIX','lender');
defined('PHANTOMJSSCRIPT_LOCATION') OR define('PHANTOMJSSCRIPT_LOCATION','phantomjs_test');
defined('LOGTOBOT') OR define('LOGTOBOT',0);
defined('GOOGLE_STATIC_MAP_API_KEY') OR define('GOOGLE_STATIC_MAP_API_KEY','AIzaSyA3lYDYxwtn5vLSl45SOKbtK7G6cEyXGr0');
}
/*********************END of AWS resources Constants*************************************************/
defined('LOGTOSYS') OR define('LOGTOSYS',1);
defined('PROCESSJSON') OR define('PROCESSJSON',1);
//defined('BOTURLZ') OR define('BOTURLZ','https://cliq.zoho.com/api/v2/bots/sample/incoming?authtoken=467975ee8e33abf1549803925eaace0f');
defined('BOTURLVENBA') OR define('BOTURLVENBA','https://cliq.zoho.com/api/v2/bots/sample/incoming?authtoken=4eb460042d45d28a898b5ea11b5b103e');
defined('BOTURLSINEEDGE') OR define('BOTURLSINEEDGE','https://cliq.zoho.com/api/v2/bots/sample/incoming?authtoken=24e66f9d4e32303f473c011493a8fea6');
defined('PROCESSJSON') OR define('PROCESSJSON',1);
/*******************Constants PD status*********************************/
defined('TRIGGERED') OR define('TRIGGERED','TRIGGERED'); //First time PD Trigger.

60
api/application/config/customconfig_one.php
View File

@ -48,19 +48,71 @@ $config['vendor_pool_id'] = 'ap-south-1_K57yPaWxV';
/*Generated token will expire in 1 minute for sample code
* Increase this value as per requirement for production
* not in use SSA Projet.
*/
$config['token_timeout'] = 1;
$config['authorization_key'] = 'sparqvenba2018';
}else if(ENVIRONMENT == 'prod')
$config['s3_resource_key'] = 'AKIAJ3QDSPT3LDSWRYUQ';
$config['s3_resource_secret'] = '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';
$config['cognito_resource_key'] = 'AKIAJ3QDSPT3LDSWRYUQ';
$config['cognito_resource_secret'] = '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';
}
else if(ENVIRONMENT == 'prod')
{
$config['sine_egde_pool_id'] = 'ap-south-1_Ru6WdtCsV';
$config['lender_pool_id'] = 'ap-south-1_CTZdSjxsy';
$config['vendor_pool_id'] = 'ap-south-1_Ll0jEqWs2';
$config['authorization_key'] = 'letsitanddiscuss';
$config['s3_resource_key'] = 'AKIAR7TQUR2J6HFMHQ4P';
$config['s3_resource_secret'] = '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';
$config['cognito_resource_key'] = 'AKIAR7TQUR2JRYC4VCF5';
$config['cognito_resource_secret'] = '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';
$config['jwt_public_key_sineedge'] = '-----BEGIN PUBLIC KEY-----
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA02IAOOiNmBe42+o9lZmx
vs5MLoLaK/94OqdX1ksnc243q2Uk/f/0uZbEbP12ELJ3FIeQerI0s6i6/oQekqS/
Df5E0IAMBZ/YIMvUodAC8H3izhxa3+C2P+kGleTHQb6tIequlr8aEsWlSwSLfPCI
JTBerhgsHEApIDR8Q2gCIYPpagXpAPHHztCRUmEJ5mIotHL6ePjI2/M7n2Mynvl6
cYM02hO4WN3PA8ZHDXOoUr80b7v+aeKSXpeBq0IHE+xlANtB685qCtBE+WyE3wMs
QxD18cU1IW1lHZGfGcEIP4nexHyTnt0TET4dhfnrD2PVrknlp9xnf4ViDzZH0w48
ewIDAQAB
-----END PUBLIC KEY-----';
$config['jwt_public_key_vendor'] = '-----BEGIN PUBLIC KEY-----
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxnFmiVwWZWobyS1daynl
H8Q38gq9NePNcgvZCXRRNRVWKdvYgtFCbi7ME4C385lFy8BWr5S2WkqRgNyvYIXB
n+e4eQtPOHKtu6rLKFi1wX9Rcys1oWdYBOOXT4vAe6OTmku+28e9K7OHkawkQ/8M
ZBH0sqAOCmJQxxOPWb4ZnuyB5JDnDzhLK3el3lVJIU5f0cm8LlJUHlY9a9inaocN
WvqMvrTNMOHjdRezg6JIQdwXr77Xn0jnuRn13EjqUfcfNUsYJ/VYOSoCwlYv0jux
o7lKyEXUZr2o7ueohRqYEYYCsfduimCFXn3R1zEHjZZNCdXs3iMxa1h6pv1hvnAb
JwIDAQAB
-----END PUBLIC KEY-----';
$config['jwt_public_key_lender'] = '-----BEGIN PUBLIC KEY-----
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx1m2WLEtxMFqpE/Kw+eR
1s8Ud9rFkYoKSV/PmOcoDaKxg7QtFGwUhASPix3O6SNHjY/Q11qn8RwcapNqNaHD
REvhPz8ZvoeM+Ld6iwwzzXEv04mSD7T9e4lxXqdKovWvCUr6ZdbO7S+z1b9PCkKb
ulKLmoVGF3ga9kQ6ZgA7TZXpggn5fERoRMaKw7VXpW00f4hK5AZ9EKDSMH+K0ew3
fMWk1RDfkIkxyPz3ExA609+0eUYZI4W3vvgpKhtU8Sk7zw3+nFQ3bLaLji8QgFS7
62HLgCmQDfWQnJsyWZ+XAedTpH+1mvquQrgfODWUOp+J0QiLyxQ2Sl+6nrTzrTST
LQIDAQAB
-----END PUBLIC KEY-----';
}
/* End of file jwt.php */
/* Location: ./application/config/jwt.php */
// ************ SMSGUPSHUP Configurations ***********************//
$config['sms_api_user_id'] = '2000185290';

2
api/application/config/routes.php
View File

@ -228,7 +228,7 @@ $route['getDashBoardDetailsOfCity'] = 'Dash_Board_Controller/getDashBoardDetails
$route['getDashBoardAlertDetails'] = 'Dash_Board_Controller/getDashBoardDetailsOfAlert';
$route['PD_MIS_report'] = 'Dash_Board_Controller/PD_MIS_report';
$route['testCognito'] = 'Branch_Controller/testCognito';
//$route['(getPDReportHTML/:any)'] = 'Welcome/getPDReportHTML';
//miscellanous

61
api/application/controllers/Branch_Controller.php
View File

@ -11,7 +11,8 @@ defined('BASEPATH') OR exit('No direct script access allowed');
// This can be removed if you use __autoload() in config.php OR use Modular Extensions
/** @noinspection PhpIncludeInspection */
require_once APPPATH . '/libraries/REST_Controller.php';
include_once APPPATH.'/vendor/autoload.php';
use Aws\CognitoIdentityProvider\CognitoIdentityProviderClient;
/**
* This is an example of a few basic user interaction methods you could use
* all done with a hardcoded array
@ -33,6 +34,7 @@ class Branch_Controller extends REST_Controller {
// Ensure you have created the 'limits' table and enabled 'limits' within application/config/rest.php
$this->methods['getBranchDetails_post']['limit'] = 500; // 50 requests per hour per user/key
$this->methods['uploadFiles_post']['limit'] = 500; // 50 requests per hour per user/key
$this->methods['testCognito_post']['limit'] = 500; // 50 requests per hour per user/key
// load the model
$this->load->model('Branch_model', 'branch_model');
@ -127,17 +129,17 @@ class Branch_Controller extends REST_Controller {
// print_r($res);
/* GET FILES FROM S3*/
$bucket_name = 'lender1';
$folder_name = 'pd2';
$r = $this->aws_s3->getAllObjectsInaBucket($bucket_name,$folder_name);
$s3_signed_urls = array();
foreach($r as $k)
{
if($k['Key'] != $folder_name.'/') array_push($s3_signed_urls,$this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$k['Key']));
echo 'called';die();
// $bucket_name = 'test123';
// $folder_name = 'pd2';
// $r = $this->aws_s3->getAllObjectsInaBucket($bucket_name,$folder_name);
// $s3_signed_urls = array();
// foreach($r as $k)
// {
// if($k['Key'] != $folder_name.'/') array_push($s3_signed_urls,$this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$k['Key']));
}
print_r($s3_signed_urls);
// }
// print_r($s3_signed_urls);
/* GET FILES FROM S3*/
/* GET ALL FILES FROM IN A FOLDER WITHIN A BUCKET*/
@ -207,7 +209,7 @@ class Branch_Controller extends REST_Controller {
// echo $page->getText();
// }
include_once APPPATH.'/vendor/autoload.php';
//include_once APPPATH.'/vendor/autoload.php';
// include_once thiagoalessio\TesseractOCR\TesseractOCR;
// echo (new TesseractOCR(APPPATH.'/docs/image.jpg')->run();
@ -255,4 +257,39 @@ class Branch_Controller extends REST_Controller {
]);
}
}
public function testCognito_post()
{
// $cog = CognitoIdentityProviderClient->adminUpdateUserAttributes(array());
//$props = array('UserPoolId' => 'ap-south-1_K57yPaWxV',
//'Username' => 'vendor1@gmail.com','');
$props = array('region'=>'ap-south-1','version'=>'latest','credentials' => array(
'key' => $this->config->item('cognito_resource_key'),
'secret' => $this->config->item('cognito_resource_secret')
));
$cog = CognitoIdentityProviderClient::factory($props);
$result =$cog->adminUpdateUserAttributes([
'UserAttributes' => [ // REQUIRED
[
'Name' => 'locale', // REQUIRED
'Value' => '1',
]//,
// [
// 'Name' => 'custom:role_id', // REQUIRED
// 'Value' => '10',
// ]
// ...
],
'UserPoolId' => 'ap-south-1_CTZdSjxsy', // REQUIRED
'Username' => 'samplelen@gmail.com', // REQUIRED
]);
print_r($result);
}
}

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

@ -806,18 +806,7 @@ class PD_Controller extends REST_Controller {
/***********************CHOOSE PD TEMPALATE*********************/
$pd_details['fk_pd_template_id'] = $this->assignPDTempalate($pd_details['pd_id']);
//echo $pd_details['fk_pd_template_id'];
if($pd_details['fk_pd_template_id'] != "" || $pd_details['fk_pd_template_id'] != null)
{
//$logger->info("TEMPLATE ASSIGN FUNCTIONALTIY".$pd_details['fk_pd_template_id']." CHOOSED",array('ENV'=>ENVIRONMENT,'PDID' => $pd_details['pd_id'],'Pre-Status' => $exist_pd_details[0]['pd_status'],'Current_status' => $pd_details['pd_status']));
//$dataToBot = array('ENV'=>ENVIRONMENT,'Task Name'=>'PD Template Assign','Template ID'=>$pd_details['fk_pd_template_id'] ,'PDID'=> $pd_details['pd_id'],'Method' => 'UpdatePDMaster','Pre-Status' => $exist_pd_details[0]['pd_status'],'Current_status' => $pd_details['pd_status']);
//MYHTTPCLIENT::sendPOST($dataToBot);
}
//echo $pd_details['fk_pd_template_id'];
}
//die();
$primary_address_id = null;
@ -927,8 +916,7 @@ class PD_Controller extends REST_Controller {
$logger = MYLOG::logFunction();
$logger->info("TEMPLATE ASSIGN FUNCTIONALTIY CALLED AND TEMPLATED ID - ".$newpd['fk_pd_template_id']." CHOOSED",array('ENV'=>ENVIRONMENT,'Parent-PDID' => $newpd['parent_pd_id'],'Addresss ID'=>$newpd['fk_address_id'] ,'PDID' => $pd_id,'PD Type' => "Addtional PD",'Current_status' => $newpd['pd_status']));
$dataToBot = array('ENV'=>ENVIRONMENT,'Task Name'=>'PD Template Assign','Template ID'=>$newpd['fk_pd_template_id'] ,'PDID' => $pd_id,'PD Type' => "Addtional PD",'Method' => 'UpdatePDMaster - Addtional PD Creation','Pre-Status' => null,'Current_status' => $newpd['pd_status']);
MYHTTPCLIENT::sendPOST($dataToBot);
@ -2867,8 +2855,7 @@ class PD_Controller extends REST_Controller {
$dataToBot = array('ENV'=>ENVIRONMENT,'Task Name'=>'APPLICANT ADDED FROM GENERAL FORM','Method' => 'saveCoApplicantsFromGeneralInfoForm','Data' => $temp_array);
MYHTTPCLIENT::sendPOST($dataToBot);
/*################### LOGGING #########################*/
@ -2910,9 +2897,7 @@ class PD_Controller extends REST_Controller {
// $dataToBot = array('ENV'=>ENVIRONMENT,'Task Name'=>'APPLICANT EDITED FROM GENERAL FORM','Method' => 'saveCoApplicantsFromGeneralInfoForm','Data' => $temp_array);
// MYHTTPCLIENT::sendPOST($dataToBot);
// /*################### LOGGING #########################*/
@ -2935,8 +2920,7 @@ class PD_Controller extends REST_Controller {
$dataToBot = array('ENV'=>ENVIRONMENT,'Task Name'=>'APPLICANT DELETED FROM GENERAL FORM','Method' => 'saveCoApplicantsFromGeneralInfoForm','Data' => $new_applicant);
MYHTTPCLIENT::sendPOST($dataToBot);
/*################### LOGGING #########################*/
@ -2972,8 +2956,7 @@ class PD_Controller extends REST_Controller {
$dataToBot = array('ENV'=>ENVIRONMENT,'Task Name'=>'COMPANY ADDED AS APPLICANT FROM GENERAL FORM','Method' => 'saveCoApplicantsFromGeneralInfoForm','Data' => $temp_array);
MYHTTPCLIENT::sendPOST($dataToBot);
/*################### LOGGING #########################*/
@ -2999,9 +2982,7 @@ class PD_Controller extends REST_Controller {
$dataToBot = array('ENV'=>ENVIRONMENT,'Task Name'=>'COMPANY(APPLICANT) DELETED FROM GENERAL FORM','Method' => 'saveCoApplicantsFromGeneralInfoForm','Data' => $company);
MYHTTPCLIENT::sendPOST($dataToBot);
/*################### LOGGING #########################*/
}
@ -6945,7 +6926,7 @@ class PD_Controller extends REST_Controller {
#####Business Assets Form Questions########
$business_assest_form = (json_decode($form_data[22][0]['processed_json'],true));
$businees_assest_images_count = isset($pd_images[22][0]) ? count($pd_images[22][0]) : 0;
$businees_assest_images_count = isset($pd_images[22]) ? count($pd_images[22]) : 0;
if(array_key_exists('business_assets_details',$business_assest_form))
{
@ -6965,7 +6946,8 @@ class PD_Controller extends REST_Controller {
$supplier_form = isset($form_data[1][0]['processed_json'])?(json_decode($form_data[1][0]['processed_json'],true)):array();
//print_r($supplier_form);die();
$supplier_count = 0;
$supplier_images = isset($pd_images[1][0]) ? $pd_images[1][0] : array();
$supplier_images = isset($pd_images[1]) ? $pd_images[1] : array();
//print_r($pd_images[1]);die();
if(!((count($business_form['select_business_activity_type']) == 1) && ($business_form['select_business_activity_type'][0]['type_of_activity_id'] == 5)))
{
if(count($supplier_form))
@ -7079,7 +7061,7 @@ class PD_Controller extends REST_Controller {
#####client Form Questions########
$client_form = isset($form_data[2][0]['processed_json'])?(json_decode($form_data[2][0]['processed_json'],true)):array();
$client_images = isset($pd_images[2][0]) ? $pd_images[2][0] : array();
$client_images = isset($pd_images[2]) ? $pd_images[2] : array();
$client_count = 0;
if(count($client_form))
{
@ -7133,7 +7115,7 @@ class PD_Controller extends REST_Controller {
foreach ($client_form['trade_details'][0]['trading_products'] as $key => $value)
{
if($value['trade_product_name'] != "" && $value['trade_supplier_name'] != "" && $value['trade_product_contact_person_name'] != "" && ($value['trade_product_contact_person_mobile_number'] != "" || $value['person_landline'] != ""))
if($value['trade_product_name'] != "" && (isset($value['trade_supplier_name']) && $value['trade_supplier_name'] != "") && $value['trade_product_contact_person_name'] != "" && ($value['trade_product_contact_person_mobile_number'] != "" || $value['person_landline'] != ""))
{
$client_count++;
$current_client_images_count = 0 ;
@ -7275,7 +7257,7 @@ class PD_Controller extends REST_Controller {
}
//echo $total_stock_observed;die();
if( $total_stock_observed != 0 && !(isset($pd_images[11][0]) ))//&& !count($pd_images[11][0])) )
if( $total_stock_observed != 0 && !(isset($pd_images[11]) ))//&& !count($pd_images[11][0])) )
{
$incomplete_details[] = 'Stock Form - Images not sufficient';
}

4
api/application/helpers/myhttpclient_helper.php
View File

@ -10,10 +10,10 @@ class MYHTTPCLIENT
{
include_once APPPATH.'/vendor/autoload.php';
if(LOGTOBOT == true)
if(true)
{
$client = new \GuzzleHttp\Client();
$client->post( BOTURLVENBA, [
$client->post( URL_TO_SEND _DATA, [
'headers' => ['Content-Type' => 'application/json'],
'body' => json_encode($dataToBot)
]);

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

@ -31,7 +31,7 @@ class MYLOG
return $logger;
//$CI =&get_instance();
if(LOGTOSYS == 1)
if(true)
{
switch($log_type)
{

14
api/application/libraries/AWS_S3.php
View File

@ -10,16 +10,18 @@ class AWS_S3
{
private $S3;
private $name = "TEST";
private $s3_properties = array('region'=>'ap-south-1','version'=>'latest','credentials' => array(
'key' => 'AKIAJ3QDSPT3LDSWRYUQ',
'secret' => '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',
));
private $CI;
private $s3_properties;
public function __construct()
{
// Construct the parent class
//parent::__construct();
//echo "listAllBuckets";
$this->CI =& get_instance();
$this->s3_properties = array('region'=>'ap-south-1','version'=>'latest','credentials' => array(
'key' =>$this->CI->config->item('s3_resource_key'),
'secret' => $this->CI->config->item('s3_resource_secret')
));
$this->S3 = S3Client::factory($this->s3_properties);
// echo "Called";
// $this->setCors('lender8');die();

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

@ -11,8 +11,8 @@ class AWS_SES
private $SES;
private $name = "TEST";
private $ses_properties = array('region'=>'us-east-1','version'=>'latest','credentials' => array(
'key' => 'AKIAJ3QDSPT3LDSWRYUQ',
'secret' => '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',
'key' => $this->config->item('cognito_resource_key'),
'secret' => $this->config->item('cognito_resource_secret')
));
public function __construct()
{

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

@ -11,8 +11,8 @@ class AWS_SNS
private $sns;
private $sns_properties = array('region'=>'us-east-1','version'=>'latest','credentials' => array(
'key' => 'AKIAJ3QDSPT3LDSWRYUQ',
'secret' => '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',
'key' => $this->config->item('cognito_resource_key'),
'secret' => $this->config->item('cognito_resource_secret')
));
public function __construct()
{