repositories
/
Project_proches_de_moi-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only expose relevant attributes.
[Project_proches_de_moi-server.git]
/
src
/
Controller
/
PersonController.php
diff --git
a/src/Controller/PersonController.php
b/src/Controller/PersonController.php
index 102b6980245824c6ca33201fe66ae29d641a3573..734f29c9eca165ade74de8773ffde5970a07cb1a 100644
(file)
--- a/
src/Controller/PersonController.php
+++ b/
src/Controller/PersonController.php
@@
-3,7
+3,6
@@
namespace App\Controller;
use App\Entity\Person;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use App\Entity\Person;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-#use FOS\RestBundle\Controller\FOSRestController;
use FOS\RestBundle\Controller\Annotations as Rest;
use FOS\RestBundle\View\ViewHandler;
use FOS\RestBundle\View\View;
use FOS\RestBundle\Controller\Annotations as Rest;
use FOS\RestBundle\View\ViewHandler;
use FOS\RestBundle\View\View;
@@
-29,7
+28,6
@@
class PersonController extends Controller
$em->persist($person);
$em->flush();
$em->persist($person);
$em->flush();
- //TODO: use ViewHandler
return $this->view($person, Response::HTTP_CREATED, ['Location' => $this->generateUrl('show_person', ['id' => $person->getId(), UrlGeneratorInterface::ABSOLUTE_URL])]);
}
return $this->view($person, Response::HTTP_CREATED, ['Location' => $this->generateUrl('show_person', ['id' => $person->getId(), UrlGeneratorInterface::ABSOLUTE_URL])]);
}
@@
-61,10
+59,8
@@
class PersonController extends Controller
$em = $this->getDoctrine()->getManager();
$person = $em->getRepository('App:Person')->find($request->get('id'));
$em = $this->getDoctrine()->getManager();
$person = $em->getRepository('App:Person')->find($request->get('id'));
- $viewHandler = $this->get('fos_rest.view_handler');
-
if (empty($person)) {
if (empty($person)) {
- return $this->PersonNotFound(
$viewHandler
);
+ return $this->PersonNotFound();
}
$person->setFirstName($request->get('firstname'));
}
$person->setFirstName($request->get('firstname'));
@@
-74,37
+70,39
@@
class PersonController extends Controller
$em->merge($person);
$em->flush();
$em->merge($person);
$em->flush();
- //TODO: use ViewHandler
return $this->view($person, Response::HTTP_CREATED, ['Location' => $this->generateUrl('show_person', ['id' => $person->getId(), UrlGeneratorInterface::ABSOLUTE_URL])]);
}
/**
return $this->view($person, Response::HTTP_CREATED, ['Location' => $this->generateUrl('show_person', ['id' => $person->getId(), UrlGeneratorInterface::ABSOLUTE_URL])]);
}
/**
- * @Rest\Get("/api/person/{id}/friends/localisation")
+ * @Rest\Get("/api/person/{id}/localisations")
+ * @Rest\View()
*/
*/
- public function get
FriendsLocalisation
Action(Request $request)
+ public function get
Localisations
Action(Request $request)
{
{
+ $em = $this->getDoctrine()->getManager();
+ $localisations = $em->getRepository('App:Localisation')->findBy(['person' => $request->get('id')]);
+ if (empty($localisations)) {
+ return $this->PersonLocalisationsNotFound();
+ }
+
+ return $localisations;
}
/**
}
/**
- * @Rest\Get("/api/person/{id}/localisations")
+ * @Rest\Get("/api/person/{id}/localisation")
+ * @Rest\View()
*/
*/
- public function getLocalisation
s
Action(Request $request)
+ public function getLocalisationAction(Request $request)
{
$em = $this->getDoctrine()->getManager();
{
$em = $this->getDoctrine()->getManager();
- $localisations = $em->getRepository('App:Localisation')->findBy(['person' => $request->get('id')]);
-
- $viewHandler = $this->get('fos_rest.view_handler');
+ $localisations = $em->getRepository('App:Localisation')->findOneBy(['person' => $request->get('id')]);
if (empty($localisations)) {
if (empty($localisations)) {
- return $this->PersonLocalisation
sNotFound($viewHandler
);
+ return $this->PersonLocalisation
NotFound(
);
}
}
- $view = View::create($localisations);
- $view->setFormat('json');
-
- return $viewHandler->handle($view);
-
+ return $localisations;
}
/**
}
/**
@@
-138,16
+136,11
@@
class PersonController extends Controller
$em = $this->getDoctrine()->getManager();
$person = $em->getRepository('App:Person')->find($request->get('id'));
$em = $this->getDoctrine()->getManager();
$person = $em->getRepository('App:Person')->find($request->get('id'));
- $viewHandler = $this->get('fos_rest.view_handler');
-
if (empty($person)) {
if (empty($person)) {
- return $this->PersonNotFound(
$viewHandler
);
+ return $this->PersonNotFound();
}
}
- $view = View::create($person);
- $view->setFormat('json');
-
- return $viewHandler->handle($view);
+ return $person;
}
/**
}
/**
@@
-163,16
+156,11
@@
class PersonController extends Controller
$em = $this->getDoctrine()->getManager();
$person = $em->getRepository('App:Person')->findOneBy(['email' => $request->get('email')]);
$em = $this->getDoctrine()->getManager();
$person = $em->getRepository('App:Person')->findOneBy(['email' => $request->get('email')]);
- $viewHandler = $this->get('fos_rest.view_handler');
-
if (empty($person)) {
if (empty($person)) {
- return $this->PersonNotFound(
$viewHandler
);
+ return $this->PersonNotFound();
}
}
- $view = View::create($person);
- $view->setFormat('json');
-
- return $viewHandler->handle($view);
+ return $person;
}
/**
}
/**
@@
-188,16
+176,11
@@
class PersonController extends Controller
$em = $this->getDoctrine()->getManager();
$person = $em->getRepository('App:Person')->find($request->get('id'));
$em = $this->getDoctrine()->getManager();
$person = $em->getRepository('App:Person')->find($request->get('id'));
- $viewHandler = $this->get('fos_rest.view_handler');
-
if (empty($person)) {
if (empty($person)) {
- return $this->PersonNotFound(
$viewHandler
);
+ return $this->PersonNotFound();
}
}
- $view = View::create($person->getFriends());
- $view->setFormat('json');
-
- return $viewHandler->handle($view);
+ return $person->getFriends();
}
/**
}
/**
@@
-212,16
+195,10
@@
class PersonController extends Controller
$em = $this->getDoctrine()->getManager();
$persons = $em->getRepository('App:Person')->findAll();
$em = $this->getDoctrine()->getManager();
$persons = $em->getRepository('App:Person')->findAll();
- $viewHandler = $this->get('fos_rest.view_handler');
-
if (empty($persons)) {
if (empty($persons)) {
- return $this->Person
NotFound($viewHandler
);
+ return $this->Person
sNotFound(
);
}
}
- // $view = View::create($persons);
- // $view->setFormat('json');
- //
- // return $viewHandler->handle($view);
return $persons;
}
return $persons;
}
@@
-238,24
+215,27
@@
class PersonController extends Controller
$em = $this->getDoctrine()->getManager();
$person = $em->getRepository('App:Person')->findOneBy(['email' => $request->get('email')]);
$em = $this->getDoctrine()->getManager();
$person = $em->getRepository('App:Person')->findOneBy(['email' => $request->get('email')]);
- $viewHandler = $this->get('fos_rest.view_handler');
-
if (empty($person)) {
if (empty($person)) {
- return $this->PersonNotFound(
$viewHandler
);
+ return $this->PersonNotFound();
}
}
- $view = View::create($person->getFriends());
- $view->setFormat('json');
+ return $person->getFriends();
+ }
+
+ private function PersonNotFound() {
+ return View::create(['message' => 'Person not found'], Response::HTTP_NOT_FOUND);
+ }
- return $viewHandler->handle($view);
+ private function PersonsNotFound() {
+ return View::create(['message' => 'Persons not found'], Response::HTTP_NOT_FOUND);
}
}
- private function Person
NotFound($viewHandler
) {
- return
$viewHandler->handle(View::create(['message' => 'Person not found'], Response::HTTP_NOT_FOUND)
);
+ private function Person
LocalisationNotFound(
) {
+ return
View::create(['message' => 'Person localisation not found'], Response::HTTP_NOT_FOUND
);
}
}
- private function PersonLocalisationsNotFound(
$viewHandler
) {
- return
$viewHandler->handle(View::create(['message' => 'Person localisations not found'], Response::HTTP_NOT_FOUND)
);
+ private function PersonLocalisationsNotFound() {
+ return
View::create(['message' => 'Person localisations not found'], Response::HTTP_NOT_FOUND
);
}
}
}
}