Move in_transit event to pre hub departure #730

This commit is contained in:
Ramon Gutierrez 2023-05-12 15:10:08 +08:00
parent c32b7d68c7
commit b90fc2f8dd

View file

@ -389,7 +389,7 @@ class RiderAppController extends APIController
} }
public function acceptJobOrder(Request $req, EntityManagerInterface $em, MQTTClientApiv2 $mclientv2) public function acceptJobOrder(Request $req, EntityManagerInterface $em)
{ {
$required_params = ['jo_id']; $required_params = ['jo_id'];
@ -412,14 +412,6 @@ class RiderAppController extends APIController
// set jo status to in transit // set jo status to in transit
$jo->setStatus(JOStatus::IN_TRANSIT); $jo->setStatus(JOStatus::IN_TRANSIT);
// NOTE: send new in transit event to new app
$payload = [
'event' => 'in_transit',
'jo_id' => $jo->getID(),
];
$mclientv2->sendEvent($jo, $payload);
// set delivery status // set delivery status
$jo->setDeliveryStatus(DeliveryStatus::RIDER_ACCEPT); $jo->setDeliveryStatus(DeliveryStatus::RIDER_ACCEPT);
@ -579,7 +571,7 @@ class RiderAppController extends APIController
return new APIResponse(true, 'Rider arrive at hub pre jo.', $data); return new APIResponse(true, 'Rider arrive at hub pre jo.', $data);
} }
public function preHubDepart(Request $req, EntityManagerInterface $em) public function preHubDepart(Request $req, EntityManagerInterface $em, MQTTClientApiv2 $mclientv2)
{ {
$required_params = []; $required_params = [];
$missing = $this->checkMissingParameters($req, $required_params); $missing = $this->checkMissingParameters($req, $required_params);
@ -605,6 +597,14 @@ class RiderAppController extends APIController
// set delivery status // set delivery status
$jo->setDeliveryStatus(DeliveryStatus::RIDER_DEPART_HUB_PRE_JO); $jo->setDeliveryStatus(DeliveryStatus::RIDER_DEPART_HUB_PRE_JO);
// NOTE: send new in transit event to new app
$payload = [
'event' => 'in_transit',
'jo_id' => $jo->getID(),
];
$mclientv2->sendEvent($jo, $payload);
// create time stamp event for JO event // create time stamp event for JO event
$event = new JOEvent(); $event = new JOEvent();
$event->setDateHappen(new DateTime()) $event->setDateHappen(new DateTime())