Merge branch '478-cmb-move-adding-removing-rider-to-and-from-cache' into '472-cmb-release'
Move adding/removal of rider to and from rider cache when going online/offline. #478 See merge request jankstudio/resq!555
This commit is contained in:
commit
ab11e8aee5
1 changed files with 9 additions and 2 deletions
|
|
@ -215,7 +215,7 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
|
||||||
$rider_id = $rider->getID();
|
$rider_id = $rider->getID();
|
||||||
// cache rider location (default to hub)
|
// cache rider location (default to hub)
|
||||||
// TODO: figure out longitude / latitude default
|
// TODO: figure out longitude / latitude default
|
||||||
$this->rcache->addActiveRider($rider_id, 0, 0);
|
// $this->rcache->addActiveRider($rider_id, 0, 0);
|
||||||
|
|
||||||
// TODO: log rider logging in
|
// TODO: log rider logging in
|
||||||
|
|
||||||
|
|
@ -285,7 +285,7 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
|
||||||
$rider->setActive(false);
|
$rider->setActive(false);
|
||||||
|
|
||||||
// remove from cache
|
// remove from cache
|
||||||
$this->rcache->removeActiveRider($rider->getID());
|
// $this->rcache->removeActiveRider($rider->getID());
|
||||||
|
|
||||||
// remove rider from session
|
// remove rider from session
|
||||||
$this->session->setRider(null);
|
$this->session->setRider(null);
|
||||||
|
|
@ -318,6 +318,10 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
|
||||||
|
|
||||||
$this->em->flush();
|
$this->em->flush();
|
||||||
|
|
||||||
|
// cache rider location (default to hub)
|
||||||
|
// TODO: figure out longitude / latitude default
|
||||||
|
$this->rcache->addActiveRider($rider_id, 0, 0);
|
||||||
|
|
||||||
// send mqtt event to put rider on map
|
// send mqtt event to put rider on map
|
||||||
// get rider coordinates from redis
|
// get rider coordinates from redis
|
||||||
$coord = $this->rider_tracker->getRiderLocation($rider->getID());
|
$coord = $this->rider_tracker->getRiderLocation($rider->getID());
|
||||||
|
|
@ -367,6 +371,9 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
|
||||||
|
|
||||||
$this->em->flush();
|
$this->em->flush();
|
||||||
|
|
||||||
|
// remove from cache
|
||||||
|
$this->rcache->removeActiveRider($rider->getID());
|
||||||
|
|
||||||
// send mqtt event to remove rider from map
|
// send mqtt event to remove rider from map
|
||||||
$channel = 'rider/' . $rider->getID() . '/availability';
|
$channel = 'rider/' . $rider->getID() . '/availability';
|
||||||
$payload = [
|
$payload = [
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue