From baf7b51f14679e5661830651cc5f237cd754654a Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Mon, 1 Jul 2019 07:46:54 +0000 Subject: [PATCH 1/8] Add flag_activated to the Warranty entity. Add Status field to Warranty results of search. #227 --- src/Entity/Warranty.php | 18 ++++++++++++++++++ templates/search/form.html.twig | 8 ++++++++ 2 files changed, 26 insertions(+) diff --git a/src/Entity/Warranty.php b/src/Entity/Warranty.php index c1e16d32..a0e71a99 100644 --- a/src/Entity/Warranty.php +++ b/src/Entity/Warranty.php @@ -121,12 +121,19 @@ class Warranty */ protected $claim_from; + // warranty activated + /** + * @ORM\Column(type="boolean") + */ + protected $flag_activated; + public function __construct() { $this->date_create = new DateTime(); $this->warranty_class = WarrantyClass::WTY_PRIVATE; $this->status = WarrantyStatus::ACTIVE; $this->date_claim = null; + $this->flag_activated = false; } public function getID() @@ -348,4 +355,15 @@ class Warranty { return $this->claim_from; } + + public function setActivated($flag_activated = true) + { + $this->flag_activated = $flag_activated; + return this; + } + + public function isActivated() + { + return $this->flag_activated; + } } diff --git a/templates/search/form.html.twig b/templates/search/form.html.twig index 892ca1ed..e1231721 100644 --- a/templates/search/form.html.twig +++ b/templates/search/form.html.twig @@ -197,6 +197,7 @@ Expiry Date Serial Battery + Status @@ -210,6 +211,13 @@ {{ result.getDateExpire|default("")|date('d M Y') }} {{ result.getSerial|default("") }} {{ result.getSAPBattery.getID|default("") }} + + {% if result.isActivated == true %} + Activated + {% else %} + Not Activated + {% endif %} + {% endfor %} From 6893211ff0d6a862c16faaece5d5edb6d72c7b8c Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Mon, 1 Jul 2019 07:54:28 +0000 Subject: [PATCH 2/8] Add status to warranty for Customer Battery Search. #227 --- templates/warranty-search/form.html.twig | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/templates/warranty-search/form.html.twig b/templates/warranty-search/form.html.twig index 371ee1ea..e643d3a4 100644 --- a/templates/warranty-search/form.html.twig +++ b/templates/warranty-search/form.html.twig @@ -125,6 +125,16 @@ End of Warranty {{ result.getDateExpire|date("d M Y") }} + + Status + + {% if result.isActivated == true %} + Activated + {% else %} + Not Activated + {% endif %} + + {% endfor %} From 60cab330b3ce6f079ba38ca0a81608d8ea2ec465 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Mon, 1 Jul 2019 08:26:58 +0000 Subject: [PATCH 3/8] Add flag_activated field for warranties in resq API responses. #227 --- src/Controller/CAPI/WarrantyController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Controller/CAPI/WarrantyController.php b/src/Controller/CAPI/WarrantyController.php index 1c56a837..081201ea 100644 --- a/src/Controller/CAPI/WarrantyController.php +++ b/src/Controller/CAPI/WarrantyController.php @@ -61,6 +61,7 @@ class WarrantyController extends APIController 'date_create' => (string) $warr->getDateCreate()->format('YmdHis'), 'date_purchase' => (string) $warr->getDatePurchase()->format('Ymd'), 'date_expire' => (string) $warr->getDateExpire()->format('Ymd'), + 'flag_activated' => (boolean) $warr->isActivated(), ]; $date_claim = $warr->getDateClaim(); From 1573ec0aa436c92a3a6099cf6679f32696837a59 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 2 Jul 2019 07:17:38 +0000 Subject: [PATCH 4/8] Return warranty information with customer vehicle information. #227 --- src/Controller/APIController.php | 59 ++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php index 7a39d50b..9642bb3b 100644 --- a/src/Controller/APIController.php +++ b/src/Controller/APIController.php @@ -38,6 +38,7 @@ use App\Entity\Promo; use App\Entity\Battery; use App\Entity\RiderRating; use App\Entity\JOEvent; +use App\Entity\Warranty; use DateTime; use Exception; @@ -673,6 +674,56 @@ class APIController extends Controller if ($cv->getWarrantyExpiration() != null) $wty_ex = $cv->getWarrantyExpiration()->format('Y-m-d'); + // NOTE: Modify the search for the latest warranty + // get latest warranty using plate number + $warranty_results = $em->getRepository(Warranty::class)->findBy(['plate_number' => $cv->getPlateNumber()], + ['date_create' => 'desc']); + + $warranty = current($warranty_results); + + // check for null values for battery and date claim and date expire + $batt_model = ''; + $batt_size = ''; + $sap_batt = ''; + $claim_date = ''; + $expiry_date = ''; + + if (!(is_null($warranty->getBatteryModel()))) { + $batt_model = $warranty->getBatteryModel()->getName(); + } + if (!(is_null($warranty->getBatterySize()))) { + $batt_size = $warranty->getBattyerSize()->getName(); + } + if (!(is_null($warranty->getSAPBattery()))) { + $sap_batt = $warranty->getSAPBattery()->getID(); + } + if (!(is_null($warranty->getDateClaim()))) { + $claim_date = $warranty->getDateClaim()->format("d M Y g:i A"); + } + if (!(is_null($warranty->getDateExpire()))) { + $expiry_date = $warranty->getDateExpire()->format("d M Y g:i A"); + } + + $warr[] = [ + 'id' => $warranty->getID(), + 'serial' => $warranty->getSerial(), + 'warranty_class' => $warranty->getWarrantyClass(), + 'plate_number' => $warranty->getPlateNumber(), + 'first_name' => $warranty->getFirstName(), + 'last_name' => $warranty->getLastName(), + 'mobile_number' => $warranty->getMobileNumber(), + 'battery_model' => $batt_model, + 'battery_size' => $batt_size, + 'sap_battery' => $sap_batt, + 'status' => $warranty->getStatus(), + 'date_create' => $warranty->getDateCreate()->format("d M Y g:i A"), + 'date_purchase' => $warranty->getDatePurchase()->format("d M Y g:i A"), + 'date_expire' => $expiry_date, + 'date_claim' => $claim_date, + 'claim_from' => $warranty->getClaimedFrom(), + 'is_activated' => $warranty->isActivated() ? 1 : 0, + ]; + $cv_list[] = [ 'cv_id' => $cv->getID(), 'mfg_id' => $cv->getVehicle()->getManufacturer()->getID(), @@ -688,6 +739,7 @@ class APIController extends Controller 'curr_batt_id' => $battery_id, 'is_motolite' => $cv->hasMotoliteBattery() ? 1 : 0, 'is_active' => $cv->isActive() ? 1 : 0, + 'warranty' => $warr, ]; } @@ -735,6 +787,7 @@ class APIController extends Controller $batts = $vehicle->getBatteries(); foreach ($batts as $batt) { + // TODO: Add warranty_tnv to battery information $batt_list[] = [ 'id' => $batt->getID(), 'mfg_id' => $batt->getManufacturer()->getID(), @@ -1645,6 +1698,9 @@ class APIController extends Controller 'plate_number' => $cv->getPlateNumber(), ]; + // TODO: mogol get warranty object for the plate number. Return only + // latest warranty. + // rider $rider = $jo->getRider(); if ($rider != null) @@ -1802,4 +1858,7 @@ class APIController extends Controller return $res->getReturnResponse(); } + + // TODO mogol add public function activateWarranty that takes in + // a plate number. Search for the latest warranty with the plate number } From 48b509ad431c63f663fe07bb5fd5a72431893cdc Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 2 Jul 2019 07:42:22 +0000 Subject: [PATCH 5/8] Return warranty information with customer vehicle information for job order history. #227 --- src/Controller/APIController.php | 58 +++++++++++++++++++++++++++++--- 1 file changed, 54 insertions(+), 4 deletions(-) diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php index 9642bb3b..81f87f05 100644 --- a/src/Controller/APIController.php +++ b/src/Controller/APIController.php @@ -1691,16 +1691,66 @@ class APIController extends Controller 'status' => $status, ]; - // customer vehicle + // customer vehicle and warranty $cv = $jo->getCustomerVehicle(); + + // NOTE: Modify the search for the latest warranty + // get latest warranty using plate number + $warranty_results = $em->getRepository(Warranty::class)->findBy(['plate_number' => $cv->getPlateNumber()], + ['date_create' => 'desc']); + + $warranty = current($warranty_results); + + // check for null values for battery and date claim and date expire + $batt_model = ''; + $batt_size = ''; + $sap_batt = ''; + $claim_date = ''; + $expiry_date = ''; + + if (!(is_null($warranty->getBatteryModel()))) { + $batt_model = $warranty->getBatteryModel()->getName(); + } + if (!(is_null($warranty->getBatterySize()))) { + $batt_size = $warranty->getBattyerSize()->getName(); + } + if (!(is_null($warranty->getSAPBattery()))) { + $sap_batt = $warranty->getSAPBattery()->getID(); + } + if (!(is_null($warranty->getDateClaim()))) { + $claim_date = $warranty->getDateClaim()->format("d M Y g:i A"); + } + if (!(is_null($warranty->getDateExpire()))) { + $expiry_date = $warranty->getDateExpire()->format("d M Y g:i A"); + } + + $warr = []; + $warr[] = [ + 'id' => $warranty->getID(), + 'serial' => $warranty->getSerial(), + 'warranty_class' => $warranty->getWarrantyClass(), + 'plate_number' => $warranty->getPlateNumber(), + 'first_name' => $warranty->getFirstName(), + 'last_name' => $warranty->getLastName(), + 'mobile_number' => $warranty->getMobileNumber(), + 'battery_model' => $batt_model, + 'battery_size' => $batt_size, + 'sap_battery' => $sap_batt, + 'status' => $warranty->getStatus(), + 'date_create' => $warranty->getDateCreate()->format("d M Y g:i A"), + 'date_purchase' => $warranty->getDatePurchase()->format("d M Y g:i A"), + 'date_expire' => $expiry_date, + 'date_claim' => $claim_date, + 'claim_from' => $warranty->getClaimedFrom(), + 'is_activated' => $warranty->isActivated() ? 1 : 0, + ]; + $jo_data['customer_vehicle'] = [ 'id' => $cv->getID(), 'plate_number' => $cv->getPlateNumber(), + 'warranty' => $warr, ]; - // TODO: mogol get warranty object for the plate number. Return only - // latest warranty. - // rider $rider = $jo->getRider(); if ($rider != null) From 13b955d0b6f472b0b0fdb99c05a4282a5232aa17 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 2 Jul 2019 09:15:06 +0000 Subject: [PATCH 6/8] Add route to activate warranty. Move the code to search for warranty to a separate function. Fix bug in Warranty entity when setting flag_activated. #227 --- config/routes/api.yaml | 5 + src/Controller/APIController.php | 209 ++++++++++++++++--------------- src/Entity/Warranty.php | 2 +- 3 files changed, 113 insertions(+), 103 deletions(-) diff --git a/config/routes/api.yaml b/config/routes/api.yaml index 50e50957..2d3a11bc 100644 --- a/config/routes/api.yaml +++ b/config/routes/api.yaml @@ -124,3 +124,8 @@ api_location_support: path: /api/location_support controller: App\Controller\APIController:locationSupport methods: [GET] + +api_activate_warranty: + path: /api/activate_warranty + controller: App\Controller\APIController:activateWarranty + methods: [POST] diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php index 81f87f05..5134a884 100644 --- a/src/Controller/APIController.php +++ b/src/Controller/APIController.php @@ -674,55 +674,7 @@ class APIController extends Controller if ($cv->getWarrantyExpiration() != null) $wty_ex = $cv->getWarrantyExpiration()->format('Y-m-d'); - // NOTE: Modify the search for the latest warranty - // get latest warranty using plate number - $warranty_results = $em->getRepository(Warranty::class)->findBy(['plate_number' => $cv->getPlateNumber()], - ['date_create' => 'desc']); - - $warranty = current($warranty_results); - - // check for null values for battery and date claim and date expire - $batt_model = ''; - $batt_size = ''; - $sap_batt = ''; - $claim_date = ''; - $expiry_date = ''; - - if (!(is_null($warranty->getBatteryModel()))) { - $batt_model = $warranty->getBatteryModel()->getName(); - } - if (!(is_null($warranty->getBatterySize()))) { - $batt_size = $warranty->getBattyerSize()->getName(); - } - if (!(is_null($warranty->getSAPBattery()))) { - $sap_batt = $warranty->getSAPBattery()->getID(); - } - if (!(is_null($warranty->getDateClaim()))) { - $claim_date = $warranty->getDateClaim()->format("d M Y g:i A"); - } - if (!(is_null($warranty->getDateExpire()))) { - $expiry_date = $warranty->getDateExpire()->format("d M Y g:i A"); - } - - $warr[] = [ - 'id' => $warranty->getID(), - 'serial' => $warranty->getSerial(), - 'warranty_class' => $warranty->getWarrantyClass(), - 'plate_number' => $warranty->getPlateNumber(), - 'first_name' => $warranty->getFirstName(), - 'last_name' => $warranty->getLastName(), - 'mobile_number' => $warranty->getMobileNumber(), - 'battery_model' => $batt_model, - 'battery_size' => $batt_size, - 'sap_battery' => $sap_batt, - 'status' => $warranty->getStatus(), - 'date_create' => $warranty->getDateCreate()->format("d M Y g:i A"), - 'date_purchase' => $warranty->getDatePurchase()->format("d M Y g:i A"), - 'date_expire' => $expiry_date, - 'date_claim' => $claim_date, - 'claim_from' => $warranty->getClaimedFrom(), - 'is_activated' => $warranty->isActivated() ? 1 : 0, - ]; + $warranty = $this->findWarranty($cv->getPlateNumber()); $cv_list[] = [ 'cv_id' => $cv->getID(), @@ -739,7 +691,7 @@ class APIController extends Controller 'curr_batt_id' => $battery_id, 'is_motolite' => $cv->hasMotoliteBattery() ? 1 : 0, 'is_active' => $cv->isActive() ? 1 : 0, - 'warranty' => $warr, + 'warranty' => $warranty, ]; } @@ -1694,61 +1646,13 @@ class APIController extends Controller // customer vehicle and warranty $cv = $jo->getCustomerVehicle(); - // NOTE: Modify the search for the latest warranty // get latest warranty using plate number - $warranty_results = $em->getRepository(Warranty::class)->findBy(['plate_number' => $cv->getPlateNumber()], - ['date_create' => 'desc']); - - $warranty = current($warranty_results); - - // check for null values for battery and date claim and date expire - $batt_model = ''; - $batt_size = ''; - $sap_batt = ''; - $claim_date = ''; - $expiry_date = ''; - - if (!(is_null($warranty->getBatteryModel()))) { - $batt_model = $warranty->getBatteryModel()->getName(); - } - if (!(is_null($warranty->getBatterySize()))) { - $batt_size = $warranty->getBattyerSize()->getName(); - } - if (!(is_null($warranty->getSAPBattery()))) { - $sap_batt = $warranty->getSAPBattery()->getID(); - } - if (!(is_null($warranty->getDateClaim()))) { - $claim_date = $warranty->getDateClaim()->format("d M Y g:i A"); - } - if (!(is_null($warranty->getDateExpire()))) { - $expiry_date = $warranty->getDateExpire()->format("d M Y g:i A"); - } - - $warr = []; - $warr[] = [ - 'id' => $warranty->getID(), - 'serial' => $warranty->getSerial(), - 'warranty_class' => $warranty->getWarrantyClass(), - 'plate_number' => $warranty->getPlateNumber(), - 'first_name' => $warranty->getFirstName(), - 'last_name' => $warranty->getLastName(), - 'mobile_number' => $warranty->getMobileNumber(), - 'battery_model' => $batt_model, - 'battery_size' => $batt_size, - 'sap_battery' => $sap_batt, - 'status' => $warranty->getStatus(), - 'date_create' => $warranty->getDateCreate()->format("d M Y g:i A"), - 'date_purchase' => $warranty->getDatePurchase()->format("d M Y g:i A"), - 'date_expire' => $expiry_date, - 'date_claim' => $claim_date, - 'claim_from' => $warranty->getClaimedFrom(), - 'is_activated' => $warranty->isActivated() ? 1 : 0, - ]; + $warranty = $this->findWarranty($cv->getPlateNumber()); $jo_data['customer_vehicle'] = [ 'id' => $cv->getID(), 'plate_number' => $cv->getPlateNumber(), - 'warranty' => $warr, + 'warranty' => $warranty, ]; // rider @@ -1909,6 +1813,107 @@ class APIController extends Controller return $res->getReturnResponse(); } - // TODO mogol add public function activateWarranty that takes in - // a plate number. Search for the latest warranty with the plate number + public function activateWarranty(Request $req) + { + $required_params = ['plate_number']; + $em = $this->getDoctrine()->getManager(); + $res = $this->checkParamsAndKey($req, $em, $required_params); + if ($res->isError()) + return $res->getReturnResponse(); + + $plate_number = $req->request->get('plate_number'); + + // find warranty using plate number + $warranty_results = $em->getRepository(Warranty::class)->findBy(['plate_number' => $plate_number], + ['date_create' => 'desc']); + + // check if warranty_results is empty + if (empty($warranty_results)) + { + $res->setError(true) + ->setErrorMessage('No warranty found for plate number'); + return $res->getReturnResponse(); + } + + // get first entry + $warranty = current($warranty_results); + if ($warranty->isActivated()) + { + $res->setError(true) + ->setErrorMessage('Warranty already activated'); + return $res->getReturnResponse(); + } + + $warranty->setActivated(); + + $em->flush(); + + return $res->getReturnResponse(); + } + + protected function findWarranty($plate_number) + { + $em = $this->getDoctrine()->getManager(); + // NOTE: Modify the search for the latest warranty. This seems hacky. + // get latest warranty using plate number + $warranty_results = $em->getRepository(Warranty::class)->findBy(['plate_number' => $plate_number], + ['date_create' => 'desc']); + + // check if warranty_results is empty + if (empty($warranty_results)) + { + $res->setError(true) + ->setErrorMessage('No warranty found for plate number'); + return $res->getReturnResponse(); + } + + // get first entry + $warranty = current($warranty_results); + + // check for null values for battery and date claim and date expire + $batt_model = ''; + $batt_size = ''; + $sap_batt = ''; + $claim_date = ''; + $expiry_date = ''; + + if (!(is_null($warranty->getBatteryModel()))) { + $batt_model = $warranty->getBatteryModel()->getName(); + } + if (!(is_null($warranty->getBatterySize()))) { + $batt_size = $warranty->getBattyerSize()->getName(); + } + if (!(is_null($warranty->getSAPBattery()))) { + $sap_batt = $warranty->getSAPBattery()->getID(); + } + if (!(is_null($warranty->getDateClaim()))) { + $claim_date = $warranty->getDateClaim()->format("d M Y g:i A"); + } + if (!(is_null($warranty->getDateExpire()))) { + $expiry_date = $warranty->getDateExpire()->format("d M Y g:i A"); + } + + $warr = []; + $warr[] = [ + 'id' => $warranty->getID(), + 'serial' => $warranty->getSerial(), + 'warranty_class' => $warranty->getWarrantyClass(), + 'plate_number' => $warranty->getPlateNumber(), + 'first_name' => $warranty->getFirstName(), + 'last_name' => $warranty->getLastName(), + 'mobile_number' => $warranty->getMobileNumber(), + 'battery_model' => $batt_model, + 'battery_size' => $batt_size, + 'sap_battery' => $sap_batt, + 'status' => $warranty->getStatus(), + 'date_create' => $warranty->getDateCreate()->format("d M Y g:i A"), + 'date_purchase' => $warranty->getDatePurchase()->format("d M Y g:i A"), + 'date_expire' => $expiry_date, + 'date_claim' => $claim_date, + 'claim_from' => $warranty->getClaimedFrom(), + 'is_activated' => $warranty->isActivated() ? 1 : 0, + ]; + + return $warr; + } } diff --git a/src/Entity/Warranty.php b/src/Entity/Warranty.php index a0e71a99..1cfa242c 100644 --- a/src/Entity/Warranty.php +++ b/src/Entity/Warranty.php @@ -359,7 +359,7 @@ class Warranty public function setActivated($flag_activated = true) { $this->flag_activated = $flag_activated; - return this; + return $this; } public function isActivated() From 79b0d3082d1290ceff5a47a388bf40dc4aee439e Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Wed, 3 Jul 2019 02:56:35 +0000 Subject: [PATCH 7/8] Fix typo when calling getBatterySize(). #227 --- src/Controller/APIController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php index 5134a884..55a8efa3 100644 --- a/src/Controller/APIController.php +++ b/src/Controller/APIController.php @@ -1881,7 +1881,7 @@ class APIController extends Controller $batt_model = $warranty->getBatteryModel()->getName(); } if (!(is_null($warranty->getBatterySize()))) { - $batt_size = $warranty->getBattyerSize()->getName(); + $batt_size = $warranty->getBatterySize()->getName(); } if (!(is_null($warranty->getSAPBattery()))) { $sap_batt = $warranty->getSAPBattery()->getID(); From 6cde81f0abab7a06caf4b2f247cfede777d36131 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 16 Jul 2019 00:20:22 +0000 Subject: [PATCH 8/8] Fix conflicts with API Controller #227 --- src/Controller/APIController.php | 110 +++++++++++++++---------------- 1 file changed, 54 insertions(+), 56 deletions(-) diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php index 49fe68e8..a89e359f 100644 --- a/src/Controller/APIController.php +++ b/src/Controller/APIController.php @@ -38,13 +38,10 @@ use App\Entity\Promo; use App\Entity\Battery; use App\Entity\RiderRating; use App\Entity\JOEvent; -<<<<<<< HEAD use App\Entity\Warranty; -======= use App\Entity\Service; use App\Entity\Partner; use App\Entity\Review; ->>>>>>> b17a7104d3e116b57dbf2fdc4fe4aa2f8ef3113f use DateTime; use Exception; @@ -1819,21 +1816,14 @@ class APIController extends Controller return $res->getReturnResponse(); } -<<<<<<< HEAD public function activateWarranty(Request $req) { $required_params = ['plate_number']; -======= - public function listServices(Request $req) - { - $required_params = []; ->>>>>>> b17a7104d3e116b57dbf2fdc4fe4aa2f8ef3113f $em = $this->getDoctrine()->getManager(); $res = $this->checkParamsAndKey($req, $em, $required_params); if ($res->isError()) return $res->getReturnResponse(); -<<<<<<< HEAD $plate_number = $req->request->get('plate_number'); // find warranty using plate number @@ -1847,7 +1837,7 @@ class APIController extends Controller ->setErrorMessage('No warranty found for plate number'); return $res->getReturnResponse(); } - + // get first entry $warranty = current($warranty_results); if ($warranty->isActivated()) @@ -1860,52 +1850,11 @@ class APIController extends Controller $warranty->setActivated(); $em->flush(); -======= - // services - $results = $em->getRepository(Service::class)->findAll(); - if (empty($results)) - { - $res->setError(true) - ->setErrorMessage('No services available.'); - return $res->getReturnResponse(); - } - - $services = []; - foreach ($results as $result) - { - // get partners - $partners = []; - $service_partners = $result->getPartners(); - foreach($service_partners as $sp) - { - $partners[] = [ - 'id' => $sp->getID(), - 'name' => $sp->getName(), - 'branch' => $sp->getBranch(), - 'address' => $sp->getAddress(), - 'contact_nums' => $sp->getContactNumbers(), - 'time_open' => $sp->getTimeOpen()->format("g:i A"), - 'time_close' => $sp->getTimeClose()->format("g:i A"), - ]; - } - - $services[] = [ - 'id' => $result->getID(), - 'name' => $result->getName(), - 'partners' => $partners, - ]; - } - - $data['services'] = $services; - - $res->setData($data); ->>>>>>> b17a7104d3e116b57dbf2fdc4fe4aa2f8ef3113f return $res->getReturnResponse(); } -<<<<<<< HEAD - protected function findWarranty($plate_number) + protected function findWarranty($plate_number) { $em = $this->getDoctrine()->getManager(); // NOTE: Modify the search for the latest warranty. This seems hacky. @@ -1969,7 +1918,58 @@ class APIController extends Controller ]; return $warr; -======= + } + + public function listServices(Request $req) + { + $required_params = []; + $em = $this->getDoctrine()->getManager(); + $res = $this->checkParamsAndKey($req, $em, $required_params); + if ($res->isError()) + return $res->getReturnResponse(); + + // services + $results = $em->getRepository(Service::class)->findAll(); + if (empty($results)) + { + $res->setError(true) + ->setErrorMessage('No services available.'); + return $res->getReturnResponse(); + } + + $services = []; + foreach ($results as $result) + { + // get partners + $partners = []; + $service_partners = $result->getPartners(); + foreach($service_partners as $sp) + { + $partners[] = [ + 'id' => $sp->getID(), + 'name' => $sp->getName(), + 'branch' => $sp->getBranch(), + 'address' => $sp->getAddress(), + 'contact_nums' => $sp->getContactNumbers(), + 'time_open' => $sp->getTimeOpen()->format("g:i A"), + 'time_close' => $sp->getTimeClose()->format("g:i A"), + ]; + } + + $services[] = [ + 'id' => $result->getID(), + 'name' => $result->getName(), + 'partners' => $partners, + ]; + } + + $data['services'] = $services; + + $res->setData($data); + + return $res->getReturnResponse(); + } + public function getPartnerInformation(Request $req, $pid) { $required_params = []; @@ -2071,7 +2071,5 @@ class APIController extends Controller $res->setData($data); return $res->getReturnResponse(); - ->>>>>>> b17a7104d3e116b57dbf2fdc4fe4aa2f8ef3113f } }