rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Merge branch '668-remove-error_logs' into 'master'

Browse source 
Resolve "Remove error_logs"

Closes #668

See merge request jankstudio/resq!783
This commit is contained in:
Kendrick Chan 2022-06-13 02:09:24 +00:00
commit 54f065d30f
18 changed files with 86 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/Controller/APIController.php
View file

@ -1047,7 +1047,7 @@ class APIController extends Controller implements LoggedController
// TODO: set this properly, since the other flags
// are on default values.
// if true, set other values for HubCriteria
error_log('Area is covered by hub filtering');
// error_log('Area is covered by hub filtering');
$hub_criteria->setJoType($jo->getServiceType())
->setPaymentMethod($jo->getModeOfPayment())
->setRoundRobin(true);
@ -2959,14 +2959,14 @@ class APIController extends Controller implements LoggedController
// for the rest of the HubCriteria fields
if ($hub_filter_enabled == 'true')
{
error_log('hub filter is enabled');
// error_log('hub filter is enabled');
// check if customer location is in hub filter area
if ($hub_geofence->isCovered($long, $lat))
{
// if true, set other values for HubCriteria
// TODO: set this properly, since the other flags
// are on default values
error_log('Area is covered by hub filtering');
// error_log('Area is covered by hub filtering');
$hub_criteria->setJoType($jo->getServiceType())
->setPaymentMethod($jo->getModeOfPayment())
->setRoundRobin(true);
@ -3549,11 +3549,11 @@ class APIController extends Controller implements LoggedController
protected function handlePictureUpload($file, $target_dir, $serial, $name)
{
error_log("handling $name upload");
// error_log("handling $name upload");
// no file sent
if ($file == null)
{
error_log('no file');
error_log("handling $name upload - no file");
return null;
}
@ -3571,8 +3571,8 @@ class APIController extends Controller implements LoggedController
$filename = $name . '.' . $file->getClientOriginalExtension();
$file->move($target_dir . '/' . $serial, $filename);
error_log("filename - $filename");
error_log($target_dir . '/' . $serial . '/' . $filename);
// error_log("filename - $filename");
// error_log($target_dir . '/' . $serial . '/' . $filename);
return $serial . '/' . $filename;
}
@ -4077,7 +4077,7 @@ class APIController extends Controller implements LoggedController
$logger->logWarrantyInfo($log_data, '', $user_id, $action, $source);
// send sms
error_log('sending sms to - ' . $this->session->getPhoneNumber());
// error_log('sending sms to - ' . $this->session->getPhoneNumber());
$rt->sendSMS($this->session->getPhoneNumber(), $trans->trans('message.battery_brand_allcaps'), $sms_msg);
return $res;
@ -4168,9 +4168,9 @@ class APIController extends Controller implements LoggedController
->setMaxResults(1)
->getSingleScalarResult();
error_log('HUB - ' . $nhd['hub']->getID());
error_log('RIDER COUNT - ' . $count_riders);
error_log('ADVANCE ORDER COUNT - ' . $count_advance_orders);
// error_log('HUB - ' . $nhd['hub']->getID());
// error_log('RIDER COUNT - ' . $count_riders);
// error_log('ADVANCE ORDER COUNT - ' . $count_advance_orders);
// if (count($nhd['hub']->getAvailableRiders()) > 0)
// if we have more riders than we have advance orders
@ -4473,7 +4473,7 @@ class APIController extends Controller implements LoggedController
$hour = $date_sched->format('H');
$slot_id = sprintf('%02d_%02d', $hour, $hour + 1);
error_log("SLOT - $date_string - $slot_id");
// error_log("SLOT - $date_string - $slot_id");
// decrement rider slot
if (isset($hub_rider_slots[$date_string][$slot_id]))
@ -4484,7 +4484,7 @@ class APIController extends Controller implements LoggedController
if ($mins > 10)
{
$next_slot_id = sprintf('%02d_%02d', $hour + 1, $hour + 2);
error_log("NEXT SLOT - $date_string - $next_slot_id");
// error_log("NEXT SLOT - $date_string - $next_slot_id");
// decrement rider slot
if (isset($hub_rider_slots[$date_string][$next_slot_id]))
$hub_rider_slots[$date_string][$next_slot_id]--;
@ -4492,11 +4492,11 @@ class APIController extends Controller implements LoggedController
}
}
error_log(print_r($hub_rider_slots, true));
// error_log(print_r($hub_rider_slots, true));
$hub_slots = $this->generateHubSlots($hub_rider_slots, $slots);
error_log(print_r($hub_slots, true));
// error_log(print_r($hub_slots, true));
return $hub_slots;
}
@ -4535,11 +4535,11 @@ class APIController extends Controller implements LoggedController
// check if hub has available slots
$hub_available = true;
error_log('total rider slots ' . $total_rslots);
error_log('total unavailable slots ' . $total_unavailable_rslots);
// error_log('total rider slots ' . $total_rslots);
// error_log('total unavailable slots ' . $total_unavailable_rslots);
if ($total_rslots == $total_unavailable_rslots)
{
error_log('hub has no available slots');
// error_log('hub has no available slots');
$hub_available = false;
}

8
src/Controller/AnalyticsController.php
View file

@ -273,18 +273,18 @@ class AnalyticsController extends Controller
// error_log(print_r($args, true));
error_log('running...' . $sched_script);
// error_log('running...' . $sched_script);
$proc = new Process($args);
$proc->run();
//error_log('getErrorOutput() ' . $proc->getErrorOutput());
error_log('getErrorOutput() ' . $proc->getErrorOutput());
if (!$proc->isSuccessful())
error_log('SCHEDULER DID NOT RUN PROPERLY');
$res = $proc->getOutput();
error_log($res);
// error_log($res);
// returns lines with format: <day shift>-<hour shift>-<number of riders>
@ -502,7 +502,7 @@ class AnalyticsController extends Controller
}
}
error_log('BEST - ' . $best_batt_id . ' - ' . $best_batt_count);
// error_log('BEST - ' . $best_batt_id . ' - ' . $best_batt_count);
return $best_batt_id;
}

2
src/Controller/CAPI/BatteryController.php
View file

@ -113,7 +113,7 @@ class BatteryController extends APIController
];
$msg = $this->checkRequiredParameters($req, $params);
error_log('msg - ' . $msg);
// error_log('msg - ' . $msg);
if ($msg)
return new APIResponse(false, $msg);

4
src/Controller/CAPI/CustomerController.php
View file

@ -46,7 +46,7 @@ class CustomerController extends APIController
];
$msg = $this->checkRequiredParameters($req, $params);
error_log('msg - ' . $msg);
// error_log('msg - ' . $msg);
if ($msg)
return new APIResponse(false, $msg);
@ -72,7 +72,7 @@ class CustomerController extends APIController
{
// remove first '0'
$mobile_number = substr($mobile_number, 1);
error_log("CONVERTED TO $mobile_number");
// error_log("CONVERTED TO $mobile_number");
}
// does it fit our 9XXXXXXXXX pattern?

28
src/Controller/CAPI/CustomerWarrantyController.php
View file

@ -127,7 +127,7 @@ class CustomerWarrantyController extends APIController
if (!$res)
return $res;
error_log('check warranty serial');
// error_log('check warranty serial');
// TODO: add logging for the other scenarios
// check if warranty serial is there
@ -146,7 +146,7 @@ class CustomerWarrantyController extends APIController
// if we have a warranty entry for the serial already
if ($warr != null)
{
error_log('already have warranty.');
// error_log('already have warranty.');
$warr_plate = $warr->getPlateNumber();
$is_registered = true;
@ -316,7 +316,7 @@ class CustomerWarrantyController extends APIController
WarrantyAPILogger $logger)
{
$serial = $this->cleanSerial($serial);
error_log('HERE - register');
// error_log('HERE - register');
// set up information for logging
// get user from header
@ -338,7 +338,7 @@ class CustomerWarrantyController extends APIController
$username = $this->getUser()->getName();
$source = 'CAPI_USER_' . $username;
error_log('SOURCE: ' . $source);
// error_log('SOURCE: ' . $source);
// TODO: maybe add vmake_id? since warranty cannot be created with no vmake
// TODO: maybe also add mobile and email since customer creation won't let mobile and email be null
@ -358,7 +358,7 @@ class CustomerWarrantyController extends APIController
$invoice = $req->files->get('invoice');
$warr_card = $req->files->get('warr_card');
error_log('handling file uploads');
// error_log('handling file uploads');
// process picture uploads
$upload_dir = $kernel->getProjectDir() . '/public/warranty_uploads';
$inv_filename = $this->handlePictureUpload($invoice, $upload_dir, $serial, 'invoice');
@ -381,11 +381,11 @@ class CustomerWarrantyController extends APIController
{
$serial = $this->cleanSerial($serial);
error_log("handling $name upload");
// error_log("handling $name upload");
// no file sent
if ($file == null)
{
error_log('no file');
error_log("handling $name upload but no file");
return null;
}
@ -403,8 +403,8 @@ class CustomerWarrantyController extends APIController
$filename = $name . '.' . $file->getClientOriginalExtension();
$file->move($target_dir . '/' . $serial, $filename);
error_log("filename - $filename");
error_log($target_dir . '/' . $serial . '/' . $filename);
// error_log("filename - $filename");
// error_log($target_dir . '/' . $serial . '/' . $filename);
return $serial . '/' . $filename;
}
@ -414,7 +414,7 @@ class CustomerWarrantyController extends APIController
{
$plate_num = $this->cleanPlateNumber($req->request->get('plate_num'));
error_log('warranty serial check');
// error_log('warranty serial check');
// get serial
$warr_serial = $em->getRepository(WarrantySerial::class)->find($serial);
if ($warr_serial == null)
@ -453,7 +453,7 @@ class CustomerWarrantyController extends APIController
$warr->setCreateSource($source);
}
error_log('sap battery check');
// error_log('sap battery check');
// get sap battery
$sku = $warr_serial->getSKU();
$sap_bty = null;
@ -482,7 +482,7 @@ class CustomerWarrantyController extends APIController
}
}
error_log('date check');
// error_log('date check');
// default date purchase to today
// NOTE: might need to change this later
$date_pur = new DateTime();
@ -528,7 +528,7 @@ class CustomerWarrantyController extends APIController
}
error_log('update entity / database');
// error_log('update entity / database');
// create or update warranty entry
$warr->setSerial($serial)
->setFirstName($req->request->get('first_name'))
@ -600,7 +600,7 @@ class CustomerWarrantyController extends APIController
if ($clean_num[0] != '0' && $clean_num[0] != '6')
return false;
error_log('sending sms to - ' . $clean_num);
// error_log('sending sms to - ' . $clean_num);
$rt->sendSMS($clean_num, $trans->trans('message.battery_brand_allcaps'), $message);
}

4
src/Controller/CAPI/RiderAppController.php
View file

@ -1087,7 +1087,7 @@ class RiderAppController extends APIController
public function changeService(Request $req, EntityManagerInterface $em, InvoiceGeneratorInterface $ic)
{
$this->debugRequest($req);
// $this->debugRequest($req);
// allow rider to change service, promo, battery and trade-in options
$required_params = ['jo_id', 'stype_id', 'promo_id'];
@ -1194,7 +1194,7 @@ class RiderAppController extends APIController
if ($battery != null)
{
$crit->addEntry($battery, $trade_in, 1);
error_log('adding entry for battery - ' . $battery->getID());
// error_log('adding entry for battery - ' . $battery->getID());
}
$invoice = $ic->generateInvoice($crit);

20
src/Controller/CAPI/WarrantyController.php
View file

@ -199,7 +199,7 @@ class WarrantyController extends APIController
$source = 'CAPI_USER_' . $username;
$msg = $this->checkRequiredParameters($req, $params);
error_log('msg - ' . $msg);
// error_log('msg - ' . $msg);
if ($msg)
{
$logger->logWarrantyInfo($log_data, $msg, $user_id, $action, $source);
@ -434,7 +434,7 @@ class WarrantyController extends APIController
];
$msg = $this->checkRequiredParameters($req, $params);
error_log('msg - ' . $msg);
// error_log('msg - ' . $msg);
if ($msg)
return new APIResponse(false, $msg);
@ -567,7 +567,7 @@ class WarrantyController extends APIController
];
$msg = $this->checkRequiredParameters($req, $params);
error_log('msg - ' . $msg);
// error_log('msg - ' . $msg);
if ($msg)
return new APIResponse(false, $msg);
@ -600,14 +600,14 @@ class WarrantyController extends APIController
{
$this->denyAccessUnlessGranted('warranty.list.serial', null, 'No access.');
error_log('getWarrantiesBySerialList');
// error_log('getWarrantiesBySerialList');
// required parameters
$params = [
'serial_list',
];
$msg = $this->checkRequiredParameters($req, $params);
error_log('msg - ' . $msg);
// error_log('msg - ' . $msg);
if ($msg)
return new APIResponse(false, $msg);
@ -658,7 +658,7 @@ class WarrantyController extends APIController
{
// remove first '0'
$w_mobile_num = substr($w_mobile_num, 1);
error_log("CONVERTED TO $w_mobile_num");
// error_log("CONVERTED TO $w_mobile_num");
}
// does it fit our 9XXXXXXXXX pattern?
@ -678,7 +678,7 @@ class WarrantyController extends APIController
if (!empty($customers))
{
error_log('found customer for ' . $w_mobile_num);
// error_log('found customer for ' . $w_mobile_num);
foreach ($customers as $customer)
{
// get customer vehicles for customer
@ -707,13 +707,13 @@ class WarrantyController extends APIController
if ($cv_found)
{
// vehicle found, do nothing.
error_log('vehicle found - ' . $w_plate_number);
// error_log('vehicle found - ' . $w_plate_number);
}
else
{
// customer exists but not customer vehicle
// add customer vehicle to existing customer with unknown manufacturer and make
error_log('new vehicle - ' . $w_plate_number);
// error_log('new vehicle - ' . $w_plate_number);
$this->createCustomerVehicle($em, $customer, $this->getDefaultVehicle($em), $w_plate_number);
}
}
@ -721,7 +721,7 @@ class WarrantyController extends APIController
// customer not found
else
{
error_log('NEW customer and vehicle - ' . $w_plate_number);
// error_log('NEW customer and vehicle - ' . $w_plate_number);
// customer not found, add customer and customer vehicle
// get warranty first name, last name
$w_first_name = $warranty->getFirstName();

4
src/Controller/SMSController.php
View file

@ -21,10 +21,10 @@ class SMSController extends Controller
{
$content = $req->getContent();
error_log($content);
// error_log($content);
$data = json_decode($content, true);
error_log(print_r($data, true));
// error_log(print_r($data, true));
// data has id?
if (!isset($data['message_id']))

2
src/EventListener/JobOrderActiveCacheListener.php
View file

@ -124,7 +124,7 @@ class JobOrderActiveCacheListener
protected function processInactiveJO($jo, $status = 'cancel')
{
error_log('got inactive jo, sending mqtt message for ' . $jo->getID());
// error_log('got inactive jo, sending mqtt message for ' . $jo->getID());
// remove from redis cache
$this->jo_cache->removeActiveJobOrder($jo);

4
src/EventSubscriber/LogSubscriber.php
View file

@ -44,7 +44,7 @@ class LogSubscriber implements EventSubscriberInterface
$req->query->all(),
$req->request->all(),
];
error_log(print_r($reqdata, true));
// error_log(print_r($reqdata, true));
}
public function onKernelResponse(ResponseEvent $event)
@ -59,7 +59,7 @@ class LogSubscriber implements EventSubscriberInterface
$content = $resp->getContent();
error_log(print_r($content, true));
// error_log(print_r($content, true));
}
public static function getSubscribedEvents()

20
src/Service/HubSelector.php
View file

@ -56,20 +56,20 @@ class HubSelector
$results = [];
error_log('payment methods ' . $payment_method);
error_log('distance limit ' . $limit_distance);
error_log('emergency flag ' . $flag_emergency);
// error_log('payment methods ' . $payment_method);
// error_log('distance limit ' . $limit_distance);
// error_log('emergency flag ' . $flag_emergency);
// get all the hubs within distance
$filtered_hubs = $this->getClosestHubs($point, $limit_distance, $jo_id, $customer_id);
error_log('closest hubs ' . json_encode($filtered_hubs));
// error_log('closest hubs ' . json_encode($filtered_hubs));
// filter the first hub results for date and opening times
$hubs_date_time = $this->filterHubsByDateAndTime($filtered_hubs, $date_time, $jo_id, $customer_id);
$filtered_hubs = $hubs_date_time;
error_log('date_time hubs ' . json_encode($filtered_hubs));
// error_log('date_time hubs ' . json_encode($filtered_hubs));
if (!$flag_emergency)
{
@ -96,7 +96,7 @@ class HubSelector
$hubs_round_robin = $this->filterHubsByRoundRobin($filtered_hubs, $flag_round_robin);
$filtered_hubs = $hubs_round_robin;
error_log('round robin hubs ' . json_encode($filtered_hubs));
// error_log('round robin hubs ' . json_encode($filtered_hubs));
// max results filter
$hubs_max_result = $this->filterHubsByMaxResults($filtered_hubs, $limit_results, $jo_id, $customer_id);
@ -105,7 +105,7 @@ class HubSelector
$results = $filtered_hubs;
error_log(json_encode($results));
// error_log(json_encode($results));
return $results;
}
@ -297,7 +297,7 @@ class HubSelector
}
// send SMS to hub
$message = str_replace('item_display', trim($sku_text), $this->trans->trans('no_inventory_message'));
error_log($message);
// error_log($message);
$this->sendSMSMessage($hub, $items);
$this->hub_filter_logger->logFilteredHub($hub, 'no_inventory', $jo_id, $customer_id);
@ -325,7 +325,7 @@ class HubSelector
}
// send SMS to hub
$message = str_replace('item_display', trim($sku_text), $this->trans->trans('no_inventory_message'));
error_log($message);
// error_log($message);
$this->sendSMSMessage($hub, $items);
$this->hub_filter_logger->logFilteredHub($hub, 'no_inventory', $jo_id, $customer_id);
@ -457,7 +457,7 @@ class HubSelector
if (!empty($mobile_number))
{
// send SMS message
error_log('sending sms to - ' . $mobile_number);
// error_log('sending sms to - ' . $mobile_number);
$this->rt->sendSMS($mobile_number, $this->trans->trans('message.battery_brand_allcaps'), $message);
}
}

2
src/Service/InventoryManager.php
View file

@ -27,7 +27,7 @@ class InventoryManager
];
$json_data = json_encode($data);
error_log('JSON ' . $json_data);
// error_log('JSON ' . $json_data);
// initializes a new cURL session
$curl = curl_init($this->api_url);

2
src/Service/InvoiceGenerator/ResqInvoiceGenerator.php
View file

@ -111,7 +111,7 @@ class ResqInvoiceGenerator implements InvoiceGeneratorInterface
$this->processOverheat($total, $invoice, $cv, $has_coolant);
break;
case ServiceType::EMERGENCY_REFUEL:
error_log('processing refuel');
// error_log('processing refuel');
$ftype = $criteria->getCustomerVehicle()->getFuelType();
$this->processRefuel($total, $invoice, $cv);
break;

12
src/Service/JobOrderHandler/ResqJobOrderHandler.php
View file

@ -767,7 +767,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
->setTypeID(JOEventType::OPEN_EDIT)
->setJobOrder($obj);
error_log('open edit?');
// error_log('open edit?');
if ($user != null)
{
@ -1394,7 +1394,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
if (empty($req->request->get('landmark')))
$error_array['landmark'] = 'Landmark is required.';
error_log($req->request->get('landmark'));
// error_log($req->request->get('landmark'));
// check if customer is not willing to wait
$will_wait = $req->request->get('flag_willing_to_wait');
@ -2310,11 +2310,11 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
// for the rest of the HubCriteria fields
if ($this->hub_filter_enabled == 'true')
{
error_log('hub filter is enabled');
// error_log('hub filter is enabled');
if ($this->hub_geofence->isCovered($long, $lat))
{
// if true, set other values for HubCriteria
error_log('Area is covered by hub filtering');
// error_log('Area is covered by hub filtering');
$hub_criteria->setLimitDistance($this->cust_distance_limit)
->setPaymentMethod($obj->getModeOfPayment())
->setJoType($obj->getServiceType())
@ -2435,7 +2435,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
}
}
error_log(print_r($mres, true));
// error_log(print_r($mres, true));
return $params;
}
@ -2738,7 +2738,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
}
}
error_log(print_r($mres, true));
// error_log(print_r($mres, true));
$params['obj'] = $obj;
// get template to display

2
src/Service/MapTools.php
View file

@ -207,7 +207,7 @@ class MapTools
}
}
error_log('nearest open hubs count: ' . count($final_data));
// error_log('nearest open hubs count: ' . count($final_data));
return $final_data;
}

6
src/Service/MotivConnector.php
View file

@ -56,9 +56,9 @@ class MotivConnector
curl_close($curl);
error_log('MOTIV API connector');
error_log(print_r($options, true));
error_log($res);
// error_log('MOTIV API connector');
// error_log(print_r($options, true));
// error_log($res);
return $res;
}

6
src/Service/RiderAPIHandler/ResqRiderAPIHandler.php
View file

@ -124,7 +124,7 @@ class ResqRiderAPIHandler implements RiderAPIHandlerInterface
// create redis entry for the session
$redis_client = $this->redis->getRedisClient();
$redis_key = 'rider.id.' . $sess->getID();
error_log('redis_key: ' . $redis_key);
// error_log('redis_key: ' . $redis_key);
$redis_client->set($redis_key, '');
}
catch (DBALException $e)
@ -758,7 +758,7 @@ class ResqRiderAPIHandler implements RiderAPIHandlerInterface
public function changeService(Request $req)
{
$this->debugRequest($req);
// $this->debugRequest($req);
// allow rider to change service, promo, battery and trade-in options
$required_params = ['jo_id', 'stype_id', 'promo_id'];
@ -854,7 +854,7 @@ class ResqRiderAPIHandler implements RiderAPIHandlerInterface
if ($battery != null)
{
$crit->addEntry($battery, $trade_in, 1);
error_log('adding entry for battery - ' . $battery->getID());
// error_log('adding entry for battery - ' . $battery->getID());
}
$invoice = $this->ic->generateInvoice($crit);

10
src/Service/RisingTideGateway.php
View file

@ -71,7 +71,7 @@ class RisingTideGateway
'usagetype' => $this->usage_type,
'delivery_receipt_url' => $this->dr_url,
];
error_log(print_r($data, true));
// error_log(print_r($data, true));
$data_json = json_encode($data);
@ -91,7 +91,7 @@ class RisingTideGateway
error_log($http_code);
curl_close($curl);
error_log($result);
// error_log($result);
}
public function validatePhoneNumber($mobile)
@ -122,7 +122,7 @@ class RisingTideGateway
{
// remove any non digit character from string
$clean_number = preg_replace('~\D~', '', $mobile);
error_log('cleaned ' . $clean_number);
// error_log('cleaned ' . $clean_number);
// does it fit our 09XXXXXXXXX pattern?
if (preg_match('/^09[0-9]{9}$/', $clean_number))
@ -133,7 +133,7 @@ class RisingTideGateway
// prepend 63
$clean_number = '63' . $clean_number;
error_log("CONVERTED TO $clean_number");
// error_log("CONVERTED TO $clean_number");
return $clean_number;
}
// does it fit our 63XXXXXXXXXX pattern?
@ -148,7 +148,7 @@ class RisingTideGateway
// prepend 63
$clean_number = '63' . $clean_number;
error_log("CONVERT TO $clean_number");
// error_log("CONVERT TO $clean_number");
return $clean_number;
}