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

Merge branch '133-fix-alerts-for-ios-app-from-rider-app-initiated-events' into 'master'

Browse source 
Resolve "Fix alerts for ios app from rider app initiated events"

Closes #133

See merge request jankstudio/resq!125
This commit is contained in:
Kendrick Chan 2018-06-05 19:28:52 +00:00
commit 9dccf7005e
1 changed files with 39 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/Controller/RAPIController.php
View file

@ -479,14 +479,21 @@ class RAPIController extends Controller
$jo->setStatus(JOStatus::CANCELLED); $jo->setStatus(JOStatus::CANCELLED);
$em->flush(); $em->flush();
// TODO: send mqtt event // send mqtt event
$payload = [
'event' => 'cancelled',
'reason' => 'mobile cancellation',
'jo_id' => $jo->getID(),
];
$mclient->sendEvent($obj, $payload);
// TODO: add event // TODO: add event
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function arrive(Request $req) public function arrive(Request $req, MQTTClient $mclient)
{ {
$em = $this->getDoctrine()->getManager(); $em = $this->getDoctrine()->getManager();
$required_params = ['jo_id']; $required_params = ['jo_id'];
@ -500,14 +507,27 @@ class RAPIController extends Controller
$jo->setStatus(JOStatus::IN_PROGRESS); $jo->setStatus(JOStatus::IN_PROGRESS);
$em->flush(); $em->flush();
// TODO: send mqtt event // send mqtt event
$rider = $this->session->getRider();
$image_url = $req->getScheme() . '://' . $req->getHttpHost() . $req->getBasePath() . '/assets/images/user.gif';
if ($rider->getImageFile() != null)
$image_url = $req->getScheme() . '://' . $req->getHttpHost() . $req->getBasePath() . '/uploads/' . $rider->getImageFile();
$payload = [
'event' => 'driver_arrived',
'jo_id' => $jo->getID(),
'driver_image' => $rider->getImage(),
'driver_name' => $rider->getFullName(),
'driver_id' => $rider->getID(),
];
$mclient->sendEvent($jo, $payload);
// TODO: add event // TODO: add event
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function payment(Request $req) public function payment(Request $req, MQTTClient $mclient)
{ {
$em = $this->getDoctrine()->getManager(); $em = $this->getDoctrine()->getManager();
$required_params = ['jo_id']; $required_params = ['jo_id'];
@ -523,6 +543,21 @@ class RAPIController extends Controller
$em->flush(); $em->flush();
// send mqtt event (fulfilled)
$rider = $this->session->getRider();
$image_url = $req->getScheme() . '://' . $req->getHttpHost() . $req->getBasePath() . '/assets/images/user.gif';
if ($rider->getImageFile() != null)
$image_url = $req->getScheme() . '://' . $req->getHttpHost() . $req->getBasePath() . '/uploads/' . $rider->getImageFile();
$payload = [
'event' => 'fulfilled',
'jo_id' => $obj->getID(),
'driver_image' => $image_url,
'driver_name' => $rider->getFullName(),
'driver_id' => $rider->getID(),
];
$mclient->sendEvent($jo, $payload);
// TODO: add event // TODO: add event
return $res->getReturnResponse(); return $res->getReturnResponse();