From 976acc26ad874a604c1f3898daa441a183874900 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 18 Jul 2023 06:16:41 +0000 Subject: [PATCH] Change APIResponse namespace for CAPI controllers. #749 --- src/Controller/CAPI/BatteryController.php | 2 +- src/Controller/CAPI/CustomerController.php | 1 - src/Controller/CAPI/CustomerWarrantyController.php | 2 +- src/Controller/CAPI/DealerController.php | 2 +- src/Controller/CAPI/MunicipalityController.php | 2 +- src/Controller/CAPI/PrivacyPolicyController.php | 2 +- src/Controller/CAPI/VehicleController.php | 7 +++++-- src/Controller/CAPI/WarrantyController.php | 4 ++-- src/Controller/CAPI/WarrantySerialController.php | 2 +- 9 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/Controller/CAPI/BatteryController.php b/src/Controller/CAPI/BatteryController.php index b61d39b8..7a9aa7b1 100644 --- a/src/Controller/CAPI/BatteryController.php +++ b/src/Controller/CAPI/BatteryController.php @@ -7,7 +7,7 @@ use Symfony\Component\HttpFoundation\Request; use Doctrine\ORM\Query; use Doctrine\ORM\EntityManagerInterface; use Catalyst\ApiBundle\Controller\ApiController; -use Catalyst\ApiBundle\Response\APIResponse; +use Catalyst\ApiBundle\Component\Response as APIResponse; use App\Entity\SAPBattery; use App\Entity\SAPBatterySize; diff --git a/src/Controller/CAPI/CustomerController.php b/src/Controller/CAPI/CustomerController.php index 283ffee8..553939e3 100644 --- a/src/Controller/CAPI/CustomerController.php +++ b/src/Controller/CAPI/CustomerController.php @@ -9,7 +9,6 @@ use Doctrine\ORM\Query; use Doctrine\ORM\EntityManagerInterface; use Catalyst\ApiBundle\Controller\ApiController; -//use Catalyst\ApiBundle\Response\APIResponse; use Catalyst\ApiBundle\Component\Response as APIResponse; use App\Entity\Customer; diff --git a/src/Controller/CAPI/CustomerWarrantyController.php b/src/Controller/CAPI/CustomerWarrantyController.php index 764b3b30..b22309f2 100644 --- a/src/Controller/CAPI/CustomerWarrantyController.php +++ b/src/Controller/CAPI/CustomerWarrantyController.php @@ -11,7 +11,7 @@ use Doctrine\ORM\EntityManagerInterface; use Doctrine\DBAL\Exception\UniqueConstraintViolationException; use Catalyst\ApiBundle\Controller\ApiController; -use Catalyst\ApiBundle\Response\APIResponse; +use Catalyst\ApiBundle\Component\Response as APIResponse; use App\Service\RisingTideGateway; use App\Service\WarrantyAPILogger; diff --git a/src/Controller/CAPI/DealerController.php b/src/Controller/CAPI/DealerController.php index d76dc943..78d26402 100644 --- a/src/Controller/CAPI/DealerController.php +++ b/src/Controller/CAPI/DealerController.php @@ -7,7 +7,7 @@ use Symfony\Component\HttpFoundation\Request; use Doctrine\ORM\Query; use Doctrine\ORM\EntityManagerInterface; use Catalyst\ApiBundle\Controller\ApiController; -use Catalyst\ApiBundle\Response\APIResponse; +use Catalyst\ApiBundle\Component\Response as APIResponse; use App\Entity\Dealer; diff --git a/src/Controller/CAPI/MunicipalityController.php b/src/Controller/CAPI/MunicipalityController.php index ebc70b10..7391aa82 100644 --- a/src/Controller/CAPI/MunicipalityController.php +++ b/src/Controller/CAPI/MunicipalityController.php @@ -7,7 +7,7 @@ use Symfony\Component\HttpFoundation\Request; use Doctrine\ORM\Query; use Doctrine\ORM\EntityManagerInterface; use Catalyst\ApiBundle\Controller\ApiController; -use Catalyst\ApiBundle\Response\APIResponse; +use Catalyst\ApiBundle\Component\Response as APIResponse; use App\Entity\Municipality; diff --git a/src/Controller/CAPI/PrivacyPolicyController.php b/src/Controller/CAPI/PrivacyPolicyController.php index 138a669e..46b4dade 100644 --- a/src/Controller/CAPI/PrivacyPolicyController.php +++ b/src/Controller/CAPI/PrivacyPolicyController.php @@ -8,7 +8,7 @@ use Doctrine\ORM\Query; use Doctrine\ORM\EntityManagerInterface; use Doctrine\DBAL\Exception\UniqueConstraintViolationException; use Catalyst\ApiBundle\Controller\ApiController; -use Catalyst\ApiBundle\Response\APIResponse; +use Catalyst\ApiBundle\Component\Response as APIResponse; use App\Entity\PrivacyPolicy; diff --git a/src/Controller/CAPI/VehicleController.php b/src/Controller/CAPI/VehicleController.php index 240b228e..547e3faf 100644 --- a/src/Controller/CAPI/VehicleController.php +++ b/src/Controller/CAPI/VehicleController.php @@ -7,7 +7,7 @@ use Symfony\Component\HttpFoundation\Request; use Doctrine\ORM\Query; use Doctrine\ORM\EntityManagerInterface; use Catalyst\ApiBundle\Controller\ApiController; -use Catalyst\ApiBundle\Response\APIResponse; +use Catalyst\ApiBundle\Component\Response as APIResponse; use App\Entity\Vehicle; use App\Entity\VehicleManufacturer; @@ -48,7 +48,7 @@ class VehicleController extends ApiController { $this->denyAccessUnlessGranted('vehicle.list', null, 'No access.'); - $mfg = $this->em->getRepository(VehicleManufacturer::class)->find($mfg_id); + $mfg = $em->getRepository(VehicleManufacturer::class)->find($mfg_id); // manufacturer not found if ($mfg == null) @@ -69,6 +69,9 @@ class VehicleController extends ApiController } // TODO: need to add manufacturer details + $data = [ + 'vehicles' => $make_data, + ]; return new APIResponse(true, 'Vehicles loaded.', $data); } diff --git a/src/Controller/CAPI/WarrantyController.php b/src/Controller/CAPI/WarrantyController.php index 71189527..581e22f5 100644 --- a/src/Controller/CAPI/WarrantyController.php +++ b/src/Controller/CAPI/WarrantyController.php @@ -8,7 +8,7 @@ use Doctrine\ORM\Query; use Doctrine\ORM\EntityManagerInterface; use Doctrine\DBAL\Exception\UniqueConstraintViolationException; use Catalyst\ApiBundle\Controller\ApiController; -use Catalyst\ApiBundle\Response\APIResponse; +use Catalyst\ApiBundle\Component\Response as APIResponse; use App\Entity\Warranty; use App\Entity\BatteryModel; @@ -330,7 +330,7 @@ class WarrantyController extends ApiController // get the api_user that made the call so that it gets added to the source // source becomes CAPI_USER_ - $username = $this->getAPIUsername($em, $user_id); + $username = $this->getUser()->getName(); $source = 'CAPI_USER_' . $username; diff --git a/src/Controller/CAPI/WarrantySerialController.php b/src/Controller/CAPI/WarrantySerialController.php index 9fa42c8f..419a5e9c 100644 --- a/src/Controller/CAPI/WarrantySerialController.php +++ b/src/Controller/CAPI/WarrantySerialController.php @@ -11,7 +11,7 @@ use Doctrine\ORM\EntityManagerInterface; use Doctrine\DBAL\Exception\UniqueConstraintViolationException; use Catalyst\ApiBundle\Controller\ApiController; -use Catalyst\ApiBundle\Response\APIResponse; +use Catalyst\ApiBundle\Component\Response as APIResponse; use App\Entity\WarrantySerialQueue; -- 2.43.5