From a3cf1572f1adf8ff3629c650d5b13d9c06b3cb21 Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Mon, 22 Jun 2020 06:41:24 +0000
Subject: [PATCH] Refactor the controller for the API response. #424

---
 src/Controller/CMBRAPIController.php | 499 ++-------------------------
 1 file changed, 29 insertions(+), 470 deletions(-)

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