rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Fix conflicts with API Controller #227

Browse source
This commit is contained in:
Korina Cordero 2019-07-16 00:20:22 +00:00
parent 189bb58880
commit 6cde81f0ab
1 changed files with 54 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

110
src/Controller/APIController.php
View file

@ -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
}
}