Add Processing entity (#41)

* Add Processing entities * Update Folder and Pia models * [CI] Downgrade codeception because of bug Codeception/Codeception#5092 * Add tests and update existing ones * Replace paths with parameter '%api_pattern%' in fos_rest configuration (#43)
3035app · Aug 2, 2018 · 582bb30 · 582bb30
1 parent 4c66c6f
commit 582bb30
Show file tree

Hide file tree

Showing 22 changed files with 1,247 additions and 238 deletions.
diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
         "white-october/pagerfanta-bundle": "^1.1"
     },
     "require-dev": {
-        "codeception/codeception": "^2.4",
+        "codeception/codeception": "2.4.0",
         "flow/jsonpath": "^0.4.0",
         "guzzlehttp/guzzle": "^6.3",
         "symfony/phpunit-bridge": "^4.0",

diff --git a/composer.lock b/composer.lock
diff --git a/config/packages/fos_rest.yaml b/config/packages/fos_rest.yaml
@@ -1,13 +1,7 @@
 # Read the documentation: https://symfony.com/doc/master/bundles/FOSRestBundle/index.html
 fos_rest:
     zone:
-        - { path: ^/pias }
-        - { path: ^/profile }
-        - { path: ^/pia-templates }
-        - { path: ^/folders }
-        - { path: ^/structures }
-        - { path: ^/users }
-        - { path: ^/portfolios }
+        - { path: '%api_pattern%' }
     body_converter:
         enabled: true
     body_listener:

diff --git a/src/Controller/Pia/FolderController.php b/src/Controller/Pia/FolderController.php
@@ -206,7 +206,7 @@ public function deleteAction(Request $request, $id)
         $folder = $this->getResource($id);
         $this->canAccessResourceOr403($folder);
 
-        if (count($folder->getPias())) {
+        if (count($folder->getProcessings())) {
             throw new NonEmptyFolderCannotBeDeletedException();
         }
 

diff --git a/src/Controller/Pia/PiaController.php b/src/Controller/Pia/PiaController.php
@@ -20,7 +20,6 @@
 use PiaApi\Entity\Pia\Pia;
 use PiaApi\DataExchange\Transformer\JsonToEntityTransformer;
 use PiaApi\Entity\Pia\PiaTemplate;
-use PiaApi\Entity\Pia\Folder;
 use Swagger\Annotations as Swg;
 use Nelmio\ApiDocBundle\Annotation as Nelmio;
 use PiaApi\DataHandler\RequestDataHandler;
@@ -125,14 +124,6 @@ public function showAction(Request $request, $id)
     public function createAction(Request $request)
     {
         $pia = $this->newFromRequest($request);
-
-        if ($request->get('folder') !== null) {
-            $folderId = $request->get('folder')['id'];
-            $folder = $this->getResource($folderId, Folder::class);
-        } else {
-            $folder = $this->getUser()->getStructure() ? $this->getUser()->getStructure()->getRootFolder() : null;
-        }
-        $pia->setFolder($folder);
         $pia->setStructure($this->getUser()->getStructure());
         $this->persist($pia);
 
@@ -168,12 +159,6 @@ public function createFromTemplateAction(Request $request, $id)
         }
 
         $pia = $this->jsonToEntityTransformer->transform($piaTemplate->getData());
-        if (($folderId = $request->get('folder')) !== null) {
-            $folder = $this->getResource($request->get('folder')['id'], Folder::class);
-        } else {
-            $folder = $this->getUser()->getStructure() ? $this->getUser()->getStructure()->getRootFolder() : null;
-        }
-        $pia->setFolder($folder);
         $pia->setName($request->get('name', $pia->getName()));
         $pia->setAuthorName($request->get('author_name', $pia->getAuthorName()));
         $pia->setEvaluatorName($request->get('evaluator_name', $pia->getEvaluatorName()));
@@ -214,7 +199,6 @@ public function updateAction(Request $request, $id)
             'author_name'                        => RequestDataHandler::TYPE_STRING,
             'evaluator_name'                     => RequestDataHandler::TYPE_STRING,
             'validator_name'                     => RequestDataHandler::TYPE_STRING,
-            'folder'                             => Folder::class,
             'dpo_status'                         => RequestDataHandler::TYPE_INT,
             'concerned_people_status'            => RequestDataHandler::TYPE_INT,
             'status'                             => RequestDataHandler::TYPE_INT,
@@ -286,7 +270,6 @@ public function importAction(Request $request)
 
         $pia = $this->jsonToEntityTransformer->transform($importData);
         $pia->setStructure($this->getUser()->getStructure());
-        $pia->setFolder($this->getUser()->getStructure()->getRootFolder());
         $this->persist($pia);
 
         return $this->view($pia, Response::HTTP_OK);

diff --git a/src/Controller/Pia/StructureFolderController.php b/src/Controller/Pia/StructureFolderController.php
@@ -209,7 +209,7 @@ public function deleteAction(Request $request, $structureId, $id)
         $folder = $this->getRepository()->findOneBy(['structure' => $structureId, 'id' => $id]);
         $this->canAccessResourceOr403($folder);
 
-        if (count($folder->getPias())) {
+        if (count($folder->getProcessings())) {
             throw new NonEmptyFolderCannotBeDeletedException();
         }
 

diff --git a/src/Entity/Pia/Folder.php b/src/Entity/Pia/Folder.php
@@ -17,7 +17,6 @@
 use Gedmo\Timestampable\Timestampable;
 use Gedmo\Timestampable\Traits\TimestampableEntity;
 use JMS\Serializer\Annotation as JMS;
-use PiaApi\Entity\Pia\Traits\HasManyPiasTrait;
 use PiaApi\Entity\Pia\Traits\ResourceTrait;
 
 /**
@@ -29,7 +28,6 @@
 class Folder implements Timestampable
 {
     use ResourceTrait,
-        HasManyPiasTrait,
         TimestampableEntity;
 
     /**
@@ -99,13 +97,13 @@ class Folder implements Timestampable
     private $children;
 
     /**
-     * @ORM\OneToMany(targetEntity="Pia", mappedBy="folder",cascade={"remove"})
+     * @ORM\OneToMany(targetEntity="Processing", mappedBy="folder",cascade={"remove"})
      * @JMS\Groups({"Default", "Export"})
      * @JMS\MaxDepth(2)
      *
-     * @var Collection
+     * @var Collection|Processing[]
      */
-    protected $pias;
+    protected $processings;
 
     /**
      * @ORM\ManyToOne(targetEntity="Structure", inversedBy="folders").
@@ -124,8 +122,8 @@ public function __construct(string $name, ?Structure $structure = null)
             $structure->getFolders()->add($this);
         }
 
-        $this->pias = new ArrayCollection();
         $this->children = new ArrayCollection();
+        $this->processings = new ArrayCollection();
     }
 
     /**
@@ -303,4 +301,38 @@ public function getHierarchy(): array
 
         return $ancestorHierarchy;
     }
+
+    /**
+     * @return array|Processing[]
+     */
+    public function getProcessings(): array
+    {
+        return $this->processings->getValues();
+    }
+
+    /**
+     * @param Processing $processing
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function addProcessing(Processing $processing): void
+    {
+        if ($this->processings->contains($processing)) {
+            throw new \InvalidArgumentException(sprintf('Processing « %s » is already in Folder « #%d »', $processing, $this->getId()));
+        }
+        $this->processings->add($processing);
+    }
+
+    /**
+     * @param Processing $processing
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function removeProcessing(Processing $processing): void
+    {
+        if (!$this->processings->contains($processing)) {
+            throw new \InvalidArgumentException(sprintf('Processing « %s » is not in Folder « #%d »', $processing, $this->getId()));
+        }
+        $this->processings->removeElement($processing);
+    }
 }
diff --git a/src/Entity/Pia/Pia.php b/src/Entity/Pia/Pia.php
@@ -204,15 +204,6 @@ class Pia implements Timestampable
      */
     protected $template;
 
-    /**
-     * @ORM\ManyToOne(targetEntity="Folder", inversedBy="pias")
-     * @JMS\Groups({"Default", "Export"})
-     * @JMS\MaxDepth(1)
-     *
-     * @var Folder
-     */
-    protected $folder;
-
     /**
      * @ORM\Column(type="string")
      * @JMS\Groups({"Default", "Full"})
@@ -221,6 +212,14 @@ class Pia implements Timestampable
      */
     protected $type = self::TYPE_ADVANCED;
 
+    /**
+     * @ORM\ManyToOne(targetEntity="Processing", inversedBy="pias")
+     * @JMS\Groups({"Full"})
+     *
+     * @var Processing
+     */
+    protected $processing;
+
     public function __construct()
     {
         $this->answers = new ArrayCollection();
@@ -428,22 +427,6 @@ public function setValidatorName(string $validatorName): void
         $this->validatorName = $validatorName;
     }
 
-    /**
-     * @return Folder
-     */
-    public function getFolder(): ?Folder
-    {
-        return $this->folder;
-    }
-
-    /**
-     * @param Folder $folder
-     */
-    public function setFolder(?Folder $folder): void
-    {
-        $this->folder = $folder;
-    }
-
     /**
      * @param int $dpoStatus
      */
@@ -539,4 +522,20 @@ public function setType(?string $type): void
     {
         $this->type = $type;
     }
+
+    /**
+     * @return Processing
+     */
+    public function getProcessing(): Processing
+    {
+        return $this->processing;
+    }
+
+    /**
+     * @param Processing $processing
+     */
+    public function setProcessing(Processing $processing): void
+    {
+        $this->processing = $processing;
+    }
 }