Fix formcontroller 404 handling and add tests (#105)

* added functional test for form api * fix form controller api * add fields to formcontroller test
sulu · Nov 2, 2017 · a6c3cf3 · a6c3cf3
1 parent ca8d531
commit a6c3cf3
Show file tree

Hide file tree

Showing 17 changed files with 490 additions and 45 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,9 @@
+.gitattributes export-ignore
+.gitignore export-ignore
+.styleci.yml export-ignore
+.travis.yml export-ignore
+CHANGELOG.md export-ignore
+Gruntfile.js export-ignore
+package.json export-ignore
+phpunit.xml.dist export-ignore
+/Tests export-ignore
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,9 @@
 
 ## 0.4.0 (unreleased)
 
- - FEATURE    #104    Add search to dynamic list
- - FEATURE    #103    Add test setup
+ - ENHANCEMENT #105    Add functional api tests
+ - FEATURE     #104    Add search to dynamic list
+ - ENHANCEMENT #103    Add test setup 
 
 ## 0.3.2
 

diff --git a/Controller/FormController.php b/Controller/FormController.php
@@ -11,6 +11,7 @@
 
 namespace Sulu\Bundle\FormBundle\Controller;
 
+use Doctrine\ORM\NoResultException;
 use FOS\RestBundle\Controller\FOSRestController;
 use FOS\RestBundle\Routing\ClassResourceInterface;
 use Sulu\Bundle\FormBundle\Entity\Form;
@@ -243,8 +244,12 @@ public function getAction(Request $request, $id)
     {
         $locale = $this->getLocale($request);
 
-        // get entity
-        $entity = $this->getManager()->findById($id, $locale);
+        try {
+            // get entity
+            $entity = $this->getManager()->findById($id, $locale);
+        } catch (NoResultException $e) {
+            throw $this->createNotFoundException(sprintf('No form with id "%s" was found!', $id), $e);
+        }
 
         return $this->handleView($this->view($this->getApiEntity($entity, $locale)));
     }
@@ -261,7 +266,7 @@ public function postAction(Request $request)
         // create entity
         $entity = $this->getManager()->save($this->getData($request), $locale);
 
-        return $this->handleView($this->view($this->getApiEntity($entity, $locale)));
+        return $this->handleView($this->view($this->getApiEntity($entity, $locale), 201));
     }
 
     /**
@@ -275,7 +280,11 @@ public function putAction(Request $request, $id)
         $locale = $this->getLocale($request);
 
         // save entity
-        $entity = $this->getManager()->save($this->getData($request), $locale, $id);
+        try {
+            $entity = $this->getManager()->save($this->getData($request), $locale, $id);
+        } catch (NoResultException $e) {
+            throw $this->createNotFoundException(sprintf('No form with id "%s" was found!', $id), $e);
+        }
 
         return $this->handleView($this->view($this->getApiEntity($entity, $locale)));
     }
@@ -290,14 +299,13 @@ public function deleteAction(Request $request, $id)
     {
         $locale = $this->getLocale($request);
 
-        // delete entity
-        $entity = $this->getManager()->delete($id, $locale);
-
-        if (!$entity) {
-            return new Response('', 204);
+        try {
+            $this->getManager()->delete($id, $locale);
+        } catch (NoResultException $e) {
+            throw $this->createNotFoundException(sprintf('No form with id "%s" was found!', $id), $e);
         }
 
-        return $this->handleView($this->view($this->getApiEntity($entity, $locale)));
+        return new Response('', 204);
     }
 
     /**

diff --git a/Entity/FormTranslation.php b/Entity/FormTranslation.php
@@ -67,22 +67,22 @@ class FormTranslation implements AuditableInterface
     /**
      * @var bool
      */
-    private $sendAttachments;
+    private $sendAttachments = false;
 
     /**
      * @var bool
      */
-    private $deactivateNotifyMails;
+    private $deactivateNotifyMails = false;
 
     /**
      * @var bool
      */
-    private $deactivateCustomerMails;
+    private $deactivateCustomerMails = false;
 
     /**
      * @var bool
      */
-    private $replyTo;
+    private $replyTo = false;
 
     /**
      * @var string

diff --git a/Manager/FormManager.php b/Manager/FormManager.php
@@ -107,10 +107,10 @@ public function save($data, $locale = null, $id = null)
         $translation->setMailText(self::getValue($data, 'mailText'));
         $translation->setSubmitLabel(self::getValue($data, 'submitLabel'));
         $translation->setSuccessText(self::getValue($data, 'successText'));
-        $translation->setSendAttachments(self::getValue($data, 'sendAttachments'));
-        $translation->setDeactivateNotifyMails(self::getValue($data, 'deactivateNotifyMails'));
-        $translation->setDeactivateCustomerMails(self::getValue($data, 'deactivateCustomerMails'));
-        $translation->setReplyTo(self::getValue($data, 'replyTo'));
+        $translation->setSendAttachments(self::getValue($data, 'sendAttachments', false));
+        $translation->setDeactivateNotifyMails(self::getValue($data, 'deactivateNotifyMails', false));
+        $translation->setDeactivateCustomerMails(self::getValue($data, 'deactivateCustomerMails', false));
+        $translation->setReplyTo(self::getValue($data, 'replyTo', false));
         $translation->setChanged(new \DateTime());
 
         // Add Translation to Form.