Refactor the controller for the API response. #424

This commit is contained in:
Korina Cordero 2020-06-22 06:41:24 +00:00
parent 0f0169cff4
commit a3cf1572f1

View file

@ -12,79 +12,32 @@ use App\Ramcar\NewAPIResult;
use App\Service\RiderAPIHandlerInterface; use App\Service\RiderAPIHandlerInterface;
// Rider API controller for CMB // Rider API controller for CMB
// TODO: refactor the other functions to use generateResultFromHandler
class CMBRAPIController extends Controller class CMBRAPIController extends Controller
{ {
public function register(Request $req, RiderAPIHandlerInterface $rapi_handler) public function register(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->register($req); $data = $rapi_handler->register($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function login(Request $req, RiderAPIHandlerInterface $rapi_handler) public function login(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->login($req); $data = $rapi_handler->login($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function logout(Request $req, RiderAPIHandlerInterface $rapi_handler) public function logout(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->logout($req); $data = $rapi_handler->logout($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
@ -99,73 +52,28 @@ class CMBRAPIController extends Controller
public function acceptJobOrder(Request $req, RiderAPIHandlerInterface $rapi_handler) public function acceptJobOrder(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->acceptJobOrder($req); $data = $rapi_handler->acceptJobOrder($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function cancelJobOrder(Request $req, RiderAPIHandlerInterface $rapi_handler) public function cancelJobOrder(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->cancelJobOrder($req); $data = $rapi_handler->cancelJobOrder($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function arrive(Request $req, RiderAPIHandlerInterface $rapi_handler) public function arrive(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->arrive($req); $data = $rapi_handler->arrive($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
@ -180,557 +88,208 @@ class CMBRAPIController extends Controller
public function hubArrive(Request $req, RiderAPIHandlerInterface $rapi_handler) public function hubArrive(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->hubArrive($req); $data = $rapi_handler->hubArrive($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function payment(Request $req, RiderAPIHandlerInterface $rapi_handler) public function payment(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->payment($req); $data = $rapi_handler->payment($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function available(Request $req, RiderAPIHandlerInterface $rapi_handler) public function available(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->available($req); $data = $rapi_handler->available($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function getPromos(Request $req, RiderAPIHandlerInterface $rapi_handler) public function getPromos(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->getPromos($req); $data = $rapi_handler->getPromos($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function getBatteries(Request $req, RiderAPIHandlerInterface $rapi_handler) public function getBatteries(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->getBatteries($req); $data = $rapi_handler->getBatteries($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function changeService(Request $req, RiderAPIHandlerInterface $rapi_handler) public function changeService(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->changeService($req); $data = $rapi_handler->changeService($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function getJobOrderHistory(Request $req, $period, RiderAPIHandlerInterface $rapi_handler) public function getJobOrderHistory(Request $req, $period, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->getJobOrderHistory($req, $period); $data = $rapi_handler->getJobOrderHistory($req, $period);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function getAssignedJobOrders(Request $req, RiderAPIHandlerInterface $rapi_handler) public function getAssignedJobOrders(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->getAssignedJobOrders($req); $data = $rapi_handler->getAssignedJobOrders($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function setJobOrderInTransit(Request $req, RiderAPIHandlerInterface $rapi_handler) public function setJobOrderInTransit(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->setJobOrderInTransit($req); $data = $rapi_handler->setJobOrderInTransit($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function generateInvoice(Request $req, RiderAPIHandlerInterface $rapi_handler) public function generateInvoice(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->generateInvoice($req); $data = $rapi_handler->generateInvoice($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function goOnline(Request $req, RiderAPIHandlerInterface $rapi_handler) public function goOnline(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->goOnline($req); $data = $rapi_handler->goOnline($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function goOffline(Request $req, RiderAPIHandlerInterface $rapi_handler) public function goOffline(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->goOffline($req); $data = $rapi_handler->goOffline($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function startJobOrder(Request $req, RiderAPIHandlerInterface $rapi_handler) public function startJobOrder(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->startJobOrder($req); $data = $rapi_handler->startJobOrder($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function completeJobOrder(Request $req, RiderAPIHandlerInterface $rapi_handler) public function completeJobOrder(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->completeJobOrder($req); $data = $rapi_handler->completeJobOrder($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function setActiveJobOrder(Request $req, RiderAPIHandlerInterface $rapi_handler) public function setActiveJobOrder(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->setActiveJobOrder($req); $data = $rapi_handler->setActiveJobOrder($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function rejectJobOrder(Request $req, RiderAPIHandlerInterface $rapi_handler) public function rejectJobOrder(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->rejectJobOrder($req); $data = $rapi_handler->rejectJobOrder($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function setOdometer(Request $req, RiderAPIHandlerInterface $rapi_handler) public function setOdometer(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->setOdometer($req); $data = $rapi_handler->setOdometer($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function uploadArrivePhotos(Request $req, RiderAPIHandlerInterface $rapi_handler) public function uploadArrivePhotos(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->uploadArrivePhotos($req); $data = $rapi_handler->uploadArrivePhotos($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function uploadFinishPhotos(Request $req, RiderAPIHandlerInterface $rapi_handler) public function uploadFinishPhotos(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->uploadFinishPhotos($req); $data = $rapi_handler->uploadFinishPhotos($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function getStatus(Request $req, RiderAPIHandlerInterface $rapi_handler) public function getStatus(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->getStatus($req); $data = $rapi_handler->getStatus($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function getOngoingJobOrder(Request $req, RiderAPIHandlerInterface $rapi_handler) public function getOngoingJobOrder(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->getOngoingJobOrder($req); $data = $rapi_handler->getOngoingJobOrder($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function getPaymentMethods(Request $req, RiderAPIHandlerInterface $rapi_handler) public function getPaymentMethods(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->getPaymentMethods($req); $data = $rapi_handler->getPaymentMethods($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
public function getCancelReasons(Request $req, RiderAPIHandlerInterface $rapi_handler) public function getCancelReasons(Request $req, RiderAPIHandlerInterface $rapi_handler)
{ {
$res = new NewAPIResult();
$data = $rapi_handler->getCancelReasons($req); $data = $rapi_handler->getCancelReasons($req);
if (isset($data['error'])) $res = $this->generateResultFromHandler($data);
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
{
$res->setData($data);
}
// response
return $res->getReturnResponse(); return $res->getReturnResponse();
} }