Allowing to post subresources as form content

dontdrinkandroot · Nov 21, 2018 · 5d332ee · 5d332ee
1 parent cf93e21
commit 5d332ee
Show file tree

Hide file tree

Showing 7 changed files with 109 additions and 18 deletions.
diff --git a/Controller/AbstractCrudServiceRestResourceController.php b/Controller/AbstractCrudServiceRestResourceController.php
@@ -3,7 +3,6 @@
 namespace Dontdrinkandroot\RestBundle\Controller;
 
 use Dontdrinkandroot\RestBundle\Metadata\RestMetadataFactory;
-use Dontdrinkandroot\RestBundle\Service\Normalizer;
 use Dontdrinkandroot\Service\CrudServiceInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

diff --git a/Controller/AbstractRestResourceController.php b/Controller/AbstractRestResourceController.php
@@ -265,12 +265,7 @@ public function postSubresourceAction(Request $request, $id, string $subresource
         $parent = $this->fetchEntity($id);
         $this->assertSubResourceMethodGranted(Method::POST, $parent, $subresource);
 
-        $entity = $this->serializer->deserialize(
-            $request->getContent(),
-            $this->getSubResourceEntityClass($subresource),
-            'json',
-            [RestDenormalizer::DDR_REST_METHOD => Method::POST]
-        );
+        $entity = $this->getSubresourcePostedEntity($request, $subresource);
 
         $entity = $this->buildAssociation($parent, $subresource, $entity);
         $entity = $this->postProcessSubResourcePostedEntity($parent, $subresource, $entity);
@@ -609,4 +604,30 @@ abstract protected function addAssociation($parent, string $subresource, $subId)
      * @return mixed
      */
     abstract protected function removeAssociation($parent, string $subresource, $subId = null);
+
+    /**
+     * @param Request $request
+     * @param string  $subresource
+     *
+     * @return mixed
+     */
+    protected function getSubresourcePostedEntity(Request $request, string $subresource)
+    {
+        $content = null;
+        $requestParameters = $request->request->all();
+        if (!empty($requestParameters)) {
+            $content = json_encode($requestParameters);
+        } else {
+            $content = $request->getContent();
+        }
+
+        $entity = $this->serializer->deserialize(
+            $content,
+            $this->getSubResourceEntityClass($subresource),
+            'json',
+            [RestDenormalizer::DDR_REST_METHOD => Method::POST]
+        );
+
+        return $entity;
+    }
 }
diff --git a/Tests/Functional/PuttablePostableTest.php b/Tests/Functional/PuttablePostableTest.php
@@ -2,7 +2,6 @@
 
 namespace Dontdrinkandroot\RestBundle\Tests\Functional\TestBundle\Entity;
 
-use Dontdrinkandroot\RestBundle\Security\AbstractAccessTokenAuthenticator;
 use Dontdrinkandroot\RestBundle\Tests\Functional\FunctionalTestCase;
 use Dontdrinkandroot\RestBundle\Tests\Functional\TestBundle\Fixtures\ORM\PuttablePostableAnnotationEntities;
 use Dontdrinkandroot\RestBundle\Tests\Functional\TestBundle\Fixtures\ORM\Users;

diff --git a/Tests/Functional/ReferenceTest.php b/Tests/Functional/ReferenceTest.php
@@ -2,8 +2,6 @@
 
 namespace Dontdrinkandroot\RestBundle\Tests\Functional;
 
-use Dontdrinkandroot\RestBundle\Security\AbstractAccessTokenAuthenticator;
-use Dontdrinkandroot\RestBundle\Tests\Functional\TestBundle\Entity\AccessToken;
 use Dontdrinkandroot\RestBundle\Tests\Functional\TestBundle\Fixtures\ORM\SubResourceEntities;
 use Dontdrinkandroot\RestBundle\Tests\Functional\TestBundle\Fixtures\ORM\Users;
 use Symfony\Component\HttpFoundation\Response;
@@ -47,7 +45,8 @@ public function testPostByReference()
                     'roles'    => [
                         'ROLE_USER'
                     ]
-                ]
+                ],
+                'text'    => null
             ],
             $content
         );
@@ -90,7 +89,8 @@ public function testPutByReference()
                     'roles'    => [
                         'ROLE_USER'
                     ]
-                ]
+                ],
+                'text'    => null
             ],
             $content
         );

diff --git a/Tests/Functional/SecuredEnvironmentTest.php b/Tests/Functional/SecuredEnvironmentTest.php
@@ -418,7 +418,8 @@ public function testAddParent()
                 'parentEntity' => [
                     'id'   => $parent->getId(),
                     'uuid' => $parent->getUuid()
-                ]
+                ],
+                'text'         => null
             ],
             $content,
             false
@@ -506,7 +507,8 @@ public function testRemoveParent()
         $this->assertContentEquals(
             [
                 'id'           => $child->getId(),
-                'parentEntity' => null
+                'parentEntity' => null,
+                'text'         => null
             ],
             $content,
             false
@@ -570,12 +572,58 @@ public function testPostSubresource()
             $client,
             sprintf('/rest/secured/%s/subresources', $entity->getId()),
             [],
+            [],
+            ['text' => 'TestText']
+        );
+        $content = $this->assertJsonResponse($response, Response::HTTP_CREATED);
+        $this->assertHasKeyAndUnset('id', $content);
+        $this->assertContentEquals(
+            [
+                'parentEntity' => [
+                    'id'   => $entity->getId(),
+                    'uuid' => $entity->getUuid()
+                ],
+                'text'         => 'TestText'
+            ],
+            $content,
+            false
+        );
+    }
+
+    public function testPostSubresourceAsForm()
+    {
+        $referenceRepository = $this->loadFixtures([Users::class, SecuredEntities::class])->getReferenceRepository();
+
+        $client = $this->makeClient(
+            false,
+            [
+                'PHP_AUTH_USER' => 'admin',
+                'PHP_AUTH_PW'   => 'admin',
+            ]
+        );
+
+        /** @var SecuredEntity $entity */
+        $entity = $referenceRepository->getReference('secured-entity-1');
+
+        $response = $this->performPost(
+            $client,
+            sprintf('/rest/secured/%s/subresources', $entity->getId()),
+            ['text' => 'TestText'],
             []
         );
         $content = $this->assertJsonResponse($response, Response::HTTP_CREATED);
-        $this->assertNotNull($content['id']);
-        $this->assertNotNull($content['parentEntity']);
-        $this->assertEquals($entity->getId(), $content['parentEntity']['id']);
+        $this->assertHasKeyAndUnset('id', $content);
+        $this->assertContentEquals(
+            [
+                'parentEntity' => [
+                    'id'   => $entity->getId(),
+                    'uuid' => $entity->getUuid()
+                ],
+                'text'         => 'TestText'
+            ],
+            $content,
+            false
+        );
     }
 
     public function testGetInheritedEntity()

diff --git a/Tests/Functional/TestBundle/Entity/SubResourceEntity.php b/Tests/Functional/TestBundle/Entity/SubResourceEntity.php
@@ -3,7 +3,6 @@
 namespace Dontdrinkandroot\RestBundle\Tests\Functional\TestBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use Dontdrinkandroot\RestBundle\Metadata\Annotation as REST;
 
 /**
  * @author Philip Washington Sorst <philip@sorst.net>
@@ -38,6 +37,13 @@ class SubResourceEntity
      */
     private $creator;
 
+    /**
+     * @ORM\Column(type="string", nullable=true)
+     *
+     * @var string|null
+     */
+    private $text;
+
     /**
      * @return int
      */
@@ -71,4 +77,20 @@ public function setCreator($creator)
     {
         $this->creator = $creator;
     }
+
+    /**
+     * @return null|string
+     */
+    public function getText(): ?string
+    {
+        return $this->text;
+    }
+
+    /**
+     * @param null|string $text
+     */
+    public function setText(?string $text): void
+    {
+        $this->text = $text;
+    }
 }
diff --git a/Tests/Functional/app/config/secured/metadata/SubResourceEntity.rest.yml b/Tests/Functional/app/config/secured/metadata/SubResourceEntity.rest.yml
@@ -43,3 +43,5 @@ Dontdrinkandroot\RestBundle\Tests\Functional\TestBundle\Entity\SubResourceEntity
                 byReference: true
             puttable:
                 byReference: true
+        text:
+            postable: true