From 92886a14ce610829bcc0ec61b2b41aff44372624 Mon Sep 17 00:00:00 2001
From: Kevin Frantz <mail@kevin-frantz.de>
Date: Thu, 13 Sep 2018 16:37:33 +0200
Subject: [PATCH] Optimized law draft

---
 .../Entity/Attribut/RightAttributInterface.php    |  2 +-
 .../Entity/Attribut/RightsAttributInterface.php   |  2 +-
 .../src/Entity/Attribut/RightsAttribute.php       |  2 +-
 application/src/Entity/Attribut/TypeAttribut.php  |  2 +-
 .../src/Entity/Attribut/TypeAttributInterface.php |  2 +-
 application/src/Entity/Law.php                    | 15 ++++++++++++---
 application/src/Entity/LawInterface.php           |  2 +-
 application/src/Entity/Right.php                  | 13 +++++++++++--
 application/src/Entity/RightInterface.php         |  3 ++-
 9 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/application/src/Entity/Attribut/RightAttributInterface.php b/application/src/Entity/Attribut/RightAttributInterface.php
index 3c65319..80fb30a 100644
--- a/application/src/Entity/Attribut/RightAttributInterface.php
+++ b/application/src/Entity/Attribut/RightAttributInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace Entity\Attribut;
+namespace App\Entity\Attribut;
 
 use App\Entity\RightInterface;
 
diff --git a/application/src/Entity/Attribut/RightsAttributInterface.php b/application/src/Entity/Attribut/RightsAttributInterface.php
index 4506f61..898ee26 100644
--- a/application/src/Entity/Attribut/RightsAttributInterface.php
+++ b/application/src/Entity/Attribut/RightsAttributInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace Entity\Attribut;
+namespace App\Entity\Attribut;
 
 use Doctrine\Common\Collections\ArrayCollection;
 
diff --git a/application/src/Entity/Attribut/RightsAttribute.php b/application/src/Entity/Attribut/RightsAttribute.php
index d67a669..28146b4 100644
--- a/application/src/Entity/Attribut/RightsAttribute.php
+++ b/application/src/Entity/Attribut/RightsAttribute.php
@@ -1,5 +1,5 @@
 <?php
-namespace Entity\Attribut;
+namespace App\Entity\Attribut;
 
 use Doctrine\Common\Collections\ArrayCollection;
 
diff --git a/application/src/Entity/Attribut/TypeAttribut.php b/application/src/Entity/Attribut/TypeAttribut.php
index a4cc116..b4cb476 100644
--- a/application/src/Entity/Attribut/TypeAttribut.php
+++ b/application/src/Entity/Attribut/TypeAttribut.php
@@ -13,7 +13,7 @@ trait TypeAttribut {
      */
     protected $type;
     
-    public function setType(string $right):void{
+    public function setType(string $type):void{
         $this->type = $type;
     }
     
diff --git a/application/src/Entity/Attribut/TypeAttributInterface.php b/application/src/Entity/Attribut/TypeAttributInterface.php
index afbf8cd..7418722 100644
--- a/application/src/Entity/Attribut/TypeAttributInterface.php
+++ b/application/src/Entity/Attribut/TypeAttributInterface.php
@@ -8,7 +8,7 @@ namespace App\Entity\Attribut;
  */
 interface TypeAttributInterface
 {
-    public function setType(string $right):void;
+    public function setType(string $type):void;
     
     public function getType():string;
 }
diff --git a/application/src/Entity/Law.php b/application/src/Entity/Law.php
index fe45a55..f74b01d 100644
--- a/application/src/Entity/Law.php
+++ b/application/src/Entity/Law.php
@@ -2,9 +2,10 @@
 namespace App\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use Entity\Attribut\RightsAttribute;
+use App\Entity\Attribut\RightsAttribute;
 use Doctrine\Common\Collections\ArrayCollection;
 use App\DBAL\Types\RightType;
+use App\Entity\Attribut\NodeAttribut;
 
 /**
  *
@@ -14,7 +15,7 @@ use App\DBAL\Types\RightType;
  */
 class Law extends AbstractEntity implements LawInterface
 {
-    use RightsAttribute;
+    use RightsAttribute, NodeAttribut;
 
     /**
      *
@@ -23,17 +24,25 @@ class Law extends AbstractEntity implements LawInterface
      */
     protected $rights;
 
+    /**
+     * @ORM\OneToOne(targetEntity="Node",cascade={"persist", "remove"})
+     * @ORM\JoinColumn(name="node_id", referencedColumnName="id")
+     * @var NodeInterface
+     */
+    protected $node;
+    
     public function __construct()
     {
-        parent::__contruct();
         $this->initAllRights();
     }
 
     private function initAllRights(): void
     {
+        $this->rights = new ArrayCollection();
         foreach (RightType::getChoices() as $key=>$value){
             $right = new Right();
             $right->setType($value);
+            $right->setLaw($this);
             $this->rights->set($key, $right);
         }
     }
diff --git a/application/src/Entity/LawInterface.php b/application/src/Entity/LawInterface.php
index aa9cd0b..0a119d6 100644
--- a/application/src/Entity/LawInterface.php
+++ b/application/src/Entity/LawInterface.php
@@ -1,7 +1,7 @@
 <?php
 namespace App\Entity;
 
-use Entity\Attribut\RightsAttributInterface;
+use App\Entity\Attribut\RightsAttributInterface;
 
 /**
  *
diff --git a/application/src/Entity/Right.php b/application/src/Entity/Right.php
index 24de0d9..f6a01b9 100644
--- a/application/src/Entity/Right.php
+++ b/application/src/Entity/Right.php
@@ -6,16 +6,25 @@ use App\Entity\Attribut\TypeAttribut;
 use App\DBAL\Types\RightType;
 use Doctrine\ORM\Mapping as ORM;
 use Fresh\DoctrineEnumBundle\Validator\Constraints as DoctrineAssert;
+use App\Entity\Attribut\LawAttributInterface;
+use App\Entity\Attribut\LawAttribut;
 
 /**
  *
  * @author kevinfrantz
- * @ORM\Table(name="right")
+ * @ORM\Table(name="`right`")
  * @ORM\Entity(repositoryClass="App\Repository\RightRepository")
  */
 class Right extends AbstractEntity implements RightInterface
 {
-    use TypeAttribut;
+    use TypeAttribut,LawAttribut;
+    
+    /**
+     * @ORM\ManyToOne(targetEntity="Law",cascade={"persist", "remove"})
+     * @ORM\JoinColumn(name="law_id", referencedColumnName="id")
+     * @var LawInterface
+     */
+    protected $law;
     
     /**
      * @ORM\Column(name="type", type="RightType", nullable=false)
diff --git a/application/src/Entity/RightInterface.php b/application/src/Entity/RightInterface.php
index dc89573..9c9216c 100644
--- a/application/src/Entity/RightInterface.php
+++ b/application/src/Entity/RightInterface.php
@@ -3,13 +3,14 @@ namespace App\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use App\Entity\Attribut\TypeAttributInterface;
+use App\Entity\Attribut\LawAttributInterface;
 
 /**
  *
  * @author kevinfrantz
  *        
  */
-interface RightInterface extends TypeAttributInterface
+interface RightInterface extends TypeAttributInterface, LawAttributInterface
 {
     
     public function isGranted(NodeInterface $node): bool;