move code

2 files changed, 48 insertions, 82 deletions

diff --git a/src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php b/src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php
index 4143c1b6..b04c0bc2 100644
--- a/src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php
+++ b/src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php
@@ -3,6 +3,7 @@
 namespace Wallabag\AnnotationBundle\Controller;
 
 use FOS\RestBundle\Controller\FOSRestController;
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
@@ -18,30 +19,30 @@ class WallabagAnnotationController extends FOSRestController
      *
      * @see Wallabag\ApiBundle\Controller\WallabagRestController
      *
-     * @return Response
+     * @return JsonResponse
      */
     public function getAnnotationsAction(Entry $entry)
     {
         $annotationRows = $this
-                ->getDoctrine()
-                ->getRepository('WallabagAnnotationBundle:Annotation')
-                ->findAnnotationsByPageId($entry->getId(), $this->getUser()->getId());
+            ->getDoctrine()
+            ->getRepository('WallabagAnnotationBundle:Annotation')
+            ->findAnnotationsByPageId($entry->getId(), $this->getUser()->getId());
         $total = count($annotationRows);
-        $annotations = ['total' => $total, 'rows' => $annotationRows];
+        $annotations = array('total' => $total, 'rows' => $annotationRows);
 
         $json = $this->get('serializer')->serialize($annotations, 'json');
 
-        return $this->renderJsonResponse($json);
+        return (new JsonResponse())->setJson($json);
     }
 
     /**
      * Creates a new annotation.
      *
+     * @param Request $request
      * @param Entry $entry
-     *
+     * @return JsonResponse
      * @see Wallabag\ApiBundle\Controller\WallabagRestController
      *
-     * @return Response
      */
     public function postAnnotationAction(Request $request, Entry $entry)
     {
@@ -66,7 +67,7 @@ class WallabagAnnotationController extends FOSRestController
 
         $json = $this->get('serializer')->serialize($annotation, 'json');
 
-        return $this->renderJsonResponse($json);
+        return (new JsonResponse())->setJson($json);
     }
 
     /**
@@ -76,7 +77,9 @@ class WallabagAnnotationController extends FOSRestController
      *
      * @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation")
      *
-     * @return Response
+     * @param Annotation $annotation
+     * @param Request $request
+     * @return JsonResponse
      */
     public function putAnnotationAction(Annotation $annotation, Request $request)
     {
@@ -91,7 +94,7 @@ class WallabagAnnotationController extends FOSRestController
 
         $json = $this->get('serializer')->serialize($annotation, 'json');
 
-        return $this->renderJsonResponse($json);
+        return (new JsonResponse())->setJson($json);
     }
 
     /**
@@ -101,7 +104,8 @@ class WallabagAnnotationController extends FOSRestController
      *
      * @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation")
      *
-     * @return Response
+     * @param Annotation $annotation
+     * @return JsonResponse
      */
     public function deleteAnnotationAction(Annotation $annotation)
     {
@@ -111,19 +115,6 @@ class WallabagAnnotationController extends FOSRestController
 
         $json = $this->get('serializer')->serialize($annotation, 'json');
 
-        return $this->renderJsonResponse($json);
-    }
-
-    /**
-     * Send a JSON Response.
-     * We don't use the Symfony JsonRespone, because it takes an array as parameter instead of a JSON string.
-     *
-     * @param string $json
-     *
-     * @return Response
-     */
-    private function renderJsonResponse($json, $code = 200)
-    {
-        return new Response($json, $code, ['application/json']);
+        return (new JsonResponse())->setJson($json);
     }
 }
diff --git a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php
index 07d0e1e9..e2e4924b 100644
--- a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php
+++ b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php
@@ -528,29 +528,26 @@ class WallabagRestController extends FOSRestController
      *      }
      * )
      *
-     * @return Response
+     * @param Entry $entry
+     * @return JsonResponse
      */
     public function getAnnotationsAction(Entry $entry)
     {
         $this->validateAuthentication();
 
-        $annotationRows = $this
-                ->getDoctrine()
-                ->getRepository('WallabagAnnotationBundle:Annotation')
-                ->findAnnotationsByPageId($entry->getId(), $this->getUser()->getId());
-        $total = count($annotationRows);
-        $annotations = array('total' => $total, 'rows' => $annotationRows);
-
-        $json = $this->get('serializer')->serialize($annotations, 'json');
-
-        return $this->renderJsonResponse($json);
+        $response = $this->forward('WallabagApiBundle:WallabagRest:getAnnotations',
+            [
+                'entry' => $entry
+            ]);
+        return $response;
     }
 
     /**
      * Creates a new annotation.
      *
+     * @param Request $request
      * @param Entry $entry
-     *
+     * @return JsonResponse
      * @ApiDoc(
      *      requirements={
      *          {"name"="ranges", "dataType"="array", "requirement"="\w+", "description"="The range array for the annotation"},
@@ -559,34 +556,17 @@ class WallabagRestController extends FOSRestController
      *      }
      * )
      *
-     * @return Response
      */
     public function postAnnotationAction(Request $request, Entry $entry)
     {
         $this->validateAuthentication();
 
-        $data = json_decode($request->getContent(), true);
-
-        $em = $this->getDoctrine()->getManager();
-
-        $annotation = new Annotation($this->getUser());
-
-        $annotation->setText($data['text']);
-        if (array_key_exists('quote', $data)) {
-            $annotation->setQuote($data['quote']);
-        }
-        if (array_key_exists('ranges', $data)) {
-            $annotation->setRanges($data['ranges']);
-        }
-
-        $annotation->setEntry($entry);
-
-        $em->persist($annotation);
-        $em->flush();
-
-        $json = $this->get('serializer')->serialize($annotation, 'json');
-
-        return $this->renderJsonResponse($json);
+        $response = $this->forward('WallabagApiBundle:WallabagRest:postAnnotation',
+            [
+                'request' => $request,
+                'entry' => $entry
+            ]);
+        return $response;
     }
 
     /**
@@ -600,24 +580,20 @@ class WallabagRestController extends FOSRestController
      *
      * @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation")
      *
-     * @return Response
+     * @param Annotation $annotation
+     * @param Request $request
+     * @return JsonResponse
      */
     public function putAnnotationAction(Annotation $annotation, Request $request)
     {
         $this->validateAuthentication();
 
-        $data = json_decode($request->getContent(), true);
-
-        if (!is_null($data['text'])) {
-            $annotation->setText($data['text']);
-        }
-
-        $em = $this->getDoctrine()->getManager();
-        $em->flush();
-
-        $json = $this->get('serializer')->serialize($annotation, 'json');
-
-        return $this->renderJsonResponse($json);
+        $response = $this->forward('WallabagApiBundle:WallabagRest:putAnnotation',
+            [
+                'annotation' => $annotation,
+                'request' => $request
+            ]);
+        return $response;
     }
 
     /**
@@ -631,19 +607,18 @@ class WallabagRestController extends FOSRestController
      *
      * @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation")
      *
-     * @return Response
+     * @param Annotation $annotation
+     * @return JsonResponse
      */
     public function deleteAnnotationAction(Annotation $annotation)
     {
         $this->validateAuthentication();
 
-        $em = $this->getDoctrine()->getManager();
-        $em->remove($annotation);
-        $em->flush();
-
-        $json = $this->get('serializer')->serialize($annotation, 'json');
-
-        return $this->renderJsonResponse($json);
+        $response = $this->forward('WallabagApiBundle:WallabagRest:deleteAnnotation',
+            [
+                'annotation' => $annotation,
+            ]);
+        return $response;
     }
 
     /**