oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00
Code Wiki Activity

Move to controller as a service

Browse source 
Mostly using autowiring to inject deps.
The only tricky part was for import because all producer use the same class and have a different alias. So we must write them down in the service definition, autowiring doesn't work in that case.

Usually:
- if a controller has a constructor, it means injected services are at least re-used once in actions
- otherwise, service are injected per action
This commit is contained in:
Jeremy Benoist 2022-12-19 10:37:22 +01:00
parent 39f603e015
commit 6aca334d53
No known key found for this signature in database
GPG key ID: 7168D5DD29F38552
36 changed files with 855 additions and 699 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php
View file

@ -2,6 +2,7 @@
namespace Wallabag\AnnotationBundle\Controller;
use Doctrine\ORM\EntityManagerInterface;
use FOS\RestBundle\Controller\AbstractFOSRestController;
use JMS\Serializer\SerializerInterface;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
@ -12,10 +13,22 @@ use Symfony\Component\Routing\Annotation\Route;
use Wallabag\AnnotationBundle\Entity\Annotation;
use Wallabag\AnnotationBundle\Form\EditAnnotationType;
use Wallabag\AnnotationBundle\Form\NewAnnotationType;
use Wallabag\AnnotationBundle\Repository\AnnotationRepository;
use Wallabag\CoreBundle\Entity\Entry;
class WallabagAnnotationController extends AbstractFOSRestController
{
protected EntityManagerInterface $entityManager;
protected SerializerInterface $serializer;
protected FormFactoryInterface $formFactory;
public function __construct(EntityManagerInterface $entityManager, SerializerInterface $serializer, FormFactoryInterface $formFactory)
{
$this->entityManager = $entityManager;
$this->serializer = $serializer;
$this->formFactory = $formFactory;
}
/**
* Retrieve annotations for an entry.
*
@ -25,16 +38,14 @@ class WallabagAnnotationController extends AbstractFOSRestController
*
* @return JsonResponse
*/
public function getAnnotationsAction(Entry $entry)
public function getAnnotationsAction(Entry $entry, AnnotationRepository $annotationRepository)
{
$annotationRows = $this
->getDoctrine()
->getRepository(Annotation::class)
->findAnnotationsByPageId($entry->getId(), $this->getUser()->getId());
$annotationRows = $annotationRepository->findAnnotationsByPageId($entry->getId(), $this->getUser()->getId());
$total = \count($annotationRows);
$annotations = ['total' => $total, 'rows' => $annotationRows];
$json = $this->get(SerializerInterface::class)->serialize($annotations, 'json');
$json = $this->serializer->serialize($annotations, 'json');
return (new JsonResponse())->setJson($json);
}
@ -52,21 +63,20 @@ class WallabagAnnotationController extends AbstractFOSRestController
{
$data = json_decode($request->getContent(), true);
$em = $this->get('doctrine')->getManager();
$annotation = new Annotation($this->getUser());
$annotation->setEntry($entry);
$form = $this->get(FormFactoryInterface::class)->createNamed('', NewAnnotationType::class, $annotation, [
$form = $this->formFactory->createNamed('', NewAnnotationType::class, $annotation, [
'csrf_protection' => false,
'allow_extra_fields' => true,
]);
$form->submit($data);
if ($form->isValid()) {
$em->persist($annotation);
$em->flush();
$this->entityManager->persist($annotation);
$this->entityManager->flush();
$json = $this->get(SerializerInterface::class)->serialize($annotation, 'json');
$json = $this->serializer->serialize($annotation, 'json');
return JsonResponse::fromJsonString($json);
}
@ -88,18 +98,17 @@ class WallabagAnnotationController extends AbstractFOSRestController
{
$data = json_decode($request->getContent(), true);
$form = $this->get(FormFactoryInterface::class)->createNamed('', EditAnnotationType::class, $annotation, [
$form = $this->formFactory->createNamed('', EditAnnotationType::class, $annotation, [
'csrf_protection' => false,
'allow_extra_fields' => true,
]);
$form->submit($data);
if ($form->isValid()) {
$em = $this->get('doctrine')->getManager();
$em->persist($annotation);
$em->flush();
$this->entityManager->persist($annotation);
$this->entityManager->flush();
$json = $this->get(SerializerInterface::class)->serialize($annotation, 'json');
$json = $this->serializer->serialize($annotation, 'json');
return JsonResponse::fromJsonString($json);
}
@ -119,11 +128,10 @@ class WallabagAnnotationController extends AbstractFOSRestController
*/
public function deleteAnnotationAction(Annotation $annotation)
{
$em = $this->get('doctrine')->getManager();
$em->remove($annotation);
$em->flush();
$this->entityManager->remove($annotation);
$this->entityManager->flush();
$json = $this->get(SerializerInterface::class)->serialize($annotation, 'json');
$json = $this->serializer->serialize($annotation, 'json');
return (new JsonResponse())->setJson($json);
}