Refactored relation and node draft

application/src/Entity/Attribut/NodeAttribut.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Entity\Attribut;
-
-use App\Entity\NodeInterface;
-
-/**
- * @author kevinfrantz
- */
-trait NodeAttribut
-{
-    /**
-     * @var NodeInterface
-     */
-    protected $node;
-
-    public function setNode(NodeInterface $node): void
-    {
-        $this->node = $node;
-    }
-
-    public function getNode(): NodeInterface
-    {
-        return $this->node;
-    }
-}

application/src/Entity/Attribut/NodeAttributInterface.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace App\Entity\Attribut;
-
-use App\Entity\NodeInterface;
-
-/**
- * @author kevinfrantz
- */
-interface NodeAttributInterface
-{
-    public function setNode(NodeInterface $node): void;
-
-    public function getNode(): NodeInterface;
-}

application/src/Entity/Attribut/RelationAttribut.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Entity\Attribut;
+
+use App\Entity\RelationInterface;
+
+/**
+ * @author kevinfrantz
+ */
+trait RelationAttribut
+{
+    /**
+     * @var RelationInterface
+     */
+    protected $relation;
+
+    public function setRelation(RelationInterface $relation): void
+    {
+        $this->relation = $relation;
+    }
+
+    public function getRelation(): RelationInterface
+    {
+        return $this->relation;
+    }
+}

application/src/Entity/Attribut/RelationAttributInterface.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Entity\Attribut;
+
+use App\Entity\RelationInterface;
+
+/**
+ * @author kevinfrantz
+ */
+interface RelationAttributInterface
+{
+    public function setRelation(RelationInterface $relation): void;
+
+    public function getRelation(): RelationInterface;
+}

application/src/Entity/Law.php

@@ -5,7 +5,7 @@ namespace App\Entity;
 use Doctrine\ORM\Mapping as ORM;
 use App\Entity\Attribut\RightsAttribute;
 use Doctrine\Common\Collections\ArrayCollection;
-use App\Entity\Attribut\NodeAttribut;
+use App\Entity\Attribut\RelationAttribut;
 
 /**
  * @author kevinfrantz
@@ -14,7 +14,7 @@ use App\Entity\Attribut\NodeAttribut;
  */
 class Law extends AbstractEntity implements LawInterface
 {
-    use RightsAttribute, NodeAttribut;
+    use RightsAttribute, RelationAttribut;
 
     /**
      * @ORM\OneToMany(targetEntity="Right", mappedBy="law", cascade={"persist", "remove"})
@@ -24,12 +24,12 @@ class Law extends AbstractEntity implements LawInterface
     protected $rights;
 
     /**
-     * @ORM\OneToOne(targetEntity="Node",cascade={"persist", "remove"})
-     * @ORM\JoinColumn(name="node_id", referencedColumnName="id")
+     * @ORM\OneToOne(targetEntity="Relation",cascade={"persist", "remove"})
+     * @ORM\JoinColumn(name="relation_id", referencedColumnName="id")
      *
-     * @var NodeInterface
+     * @var RelationInterface
      */
-    protected $node;
+    protected $relation;
 
     public function __construct()
     {
@@ -41,13 +41,13 @@ class Law extends AbstractEntity implements LawInterface
         $this->rights = new ArrayCollection();
     }
 
-    public function isGranted(NodeInterface $node, string $layer, string $right): bool
+    public function isGranted(RelationInterface $relation, string $layer, string $right): bool
     {
         /**
          * @var RightInterface
          */
         foreach ($this->rights->toArray() as $right) {
-            if ($right->isGranted($node, $layer, $right)) {
+            if ($right->isGranted($relation, $layer, $right)) {
                 return true;
             }
         }

application/src/Entity/LawInterface.php

@@ -3,12 +3,12 @@
 namespace App\Entity;
 
 use App\Entity\Attribut\RightsAttributInterface;
-use App\Entity\Method\NodeGrantedInterface;
-use App\Entity\Attribut\NodeAttributInterface;
+use App\Entity\Attribut\RelationAttributInterface;
+use App\Entity\Method\RelationGrantedInterface;
 
 /**
  * @author kevinfrantz
  */
-interface LawInterface extends RightsAttributInterface, NodeGrantedInterface, NodeAttributInterface
+interface LawInterface extends RightsAttributInterface, RelationGrantedInterface, RelationAttributInterface
 {
 }

application/src/Entity/Method/NodeGrantedInterface.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Entity\Method;
-
-use App\Entity\NodeInterface;
-
-/**
- * @author kevinfrantz
- */
-interface NodeGrantedInterface
-{
-    public function isGranted(NodeInterface $node, string $layer, string $right): bool;
-}

application/src/Entity/Method/RelationGrantedInterface.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Entity\Method;
+
+use App\Entity\RelationInterface;
+
+/**
+ * @author kevinfrantz
+ */
+interface RelationGrantedInterface
+{
+    public function isGranted(RelationInterface $relation, string $layer, string $right): bool;
+}

application/src/Entity/RecieverGroup.php

@@ -2,13 +2,14 @@
 
 namespace App\Entity;
 
-use App\Entity\Attribut\NodeAttribut;
 use App\Entity\Attribut\RecieverAttribut;
 use Doctrine\Common\Collections\ArrayCollection;
 use App\DBAL\Types\RecieverType;
 use Symfony\Component\Intl\Exception\NotImplementedException;
 use Doctrine\ORM\Mapping as ORM;
 use Fresh\DoctrineEnumBundle\Validator\Constraints as DoctrineAssert;
+use App\Entity\Attribut\RelationAttribut;
+use App\Entity\Attribut\RelationAttributInterface;
 
 /**
  * @author kevinfrantz
@@ -17,7 +18,7 @@ use Fresh\DoctrineEnumBundle\Validator\Constraints as DoctrineAssert;
  */
 class RecieverGroup extends AbstractEntity implements RecieverGroupInterface
 {
-    use NodeAttribut,RecieverAttribut;
+    use RelationAttribut,RecieverAttribut;
 
     /**
      * @ORM\Column(name="reciever", type="RecieverType", nullable=false)
@@ -30,12 +31,12 @@ class RecieverGroup extends AbstractEntity implements RecieverGroupInterface
     /**
      * The node for which the right exists.
      *
-     * @ORM\ManyToOne(targetEntity="Node")
-     * @ORM\JoinColumn(name="node_id", referencedColumnName="id")
+     * @ORM\ManyToOne(targetEntity="Relation")
+     * @ORM\JoinColumn(name="relation_id", referencedColumnName="id")
      *
-     * @var NodeInterface
+     * @var RelationAttributInterface
      */
-    protected $node;
+    protected $relation;
 
     public function getAllRecievers(): ArrayCollection
     {

application/src/Entity/RecieverGroupInterface.php

@@ -2,14 +2,14 @@
 
 namespace App\Entity;
 
-use App\Entity\Attribut\NodeAttributInterface;
 use App\Entity\Attribut\RecieverAttributInterface;
 use Doctrine\Common\Collections\ArrayCollection;
+use App\Entity\Attribut\RelationAttributInterface;
 
 /**
  * @author kevinfrantz
  */
-interface RecieverGroupInterface extends NodeAttributInterface, RecieverAttributInterface
+interface RecieverGroupInterface extends RelationAttributInterface, RecieverAttributInterface
 {
     public function getAllRecievers(): ArrayCollection;
 }

application/src/Entity/Relation.php

@@ -13,12 +13,15 @@ use App\Entity\Source\SourceInterface;
 use Doctrine\Common\Collections\Collection;
 
 /**
+ * This class represents a relation. 
+ * It allows a better right management of the meta informations.
+ * Also it is used to capsel the logic relation to an own logical unit. 
  * @author kevinfrantz
  * @todo rename and refactor this class
  * @ORM\Table(name="node")
  * @ORM\Entity()
  */
-class Node extends AbstractEntity implements NodeInterface
+class Relation extends AbstractEntity implements RelationInterface
 {
     use IdAttribut,
     SourceAttribut,
@@ -27,28 +30,28 @@ class Node extends AbstractEntity implements NodeInterface
     ChildsAttribut;
     
     /**
-     * Many Nodes have many parents.
-     * @ORM\ManyToMany(targetEntity="Node")
-     * @ORM\JoinTable(name="nodes_parents",
-     *      joinColumns={@ORM\JoinColumn(name="node_id", referencedColumnName="id")},
-     *      inverseJoinColumns={@ORM\JoinColumn(name="node_id", referencedColumnName="id")}
+     * Parents represent the creators of the relation
+     * @ORM\ManyToMany(targetEntity="Relation")
+     * @ORM\JoinTable(name="relation_parents",
+     *      joinColumns={@ORM\JoinColumn(name="relation_id", referencedColumnName="id")},
+     *      inverseJoinColumns={@ORM\JoinColumn(name="relation_id", referencedColumnName="id")}
      *      )
      *
-     * @var Collection|NodeInterface[]
+     * @var Collection|RelationInterface[]
      */
     protected $parents;
     
     /**
-     * Many Nodes have many childs.
+     * Childs represent the by the object produced relations
      * @todo Replace this by self referencing 
      * @see https://www.doctrine-project.org/projects/doctrine-orm/en/2.6/reference/association-mapping.html
-     * @ORM\ManyToMany(targetEntity="Node")
-     * @ORM\JoinTable(name="nodes_childs",
-     *      joinColumns={@ORM\JoinColumn(name="node_id", referencedColumnName="id")},
-     *      inverseJoinColumns={@ORM\JoinColumn(name="node_id", referencedColumnName="id")}
+     * @ORM\ManyToMany(targetEntity="Relation")
+     * @ORM\JoinTable(name="relation_childs",
+     *      joinColumns={@ORM\JoinColumn(name="relation_id", referencedColumnName="id")},
+     *      inverseJoinColumns={@ORM\JoinColumn(name="relation_id", referencedColumnName="id")}
      *      )
      *
-     * @var Collection|NodeInterface[]
+     * @var Collection|RelationInterface[]
      */
     protected $childs;
 

application/src/Entity/RelationInterface.php

@@ -11,6 +11,6 @@ use App\Entity\Attribut\LawAttributInterface;
 /**
  * @author kevinfrantz
  */
-interface NodeInterface extends SourceAttributInterface, IdAttributInterface, ParentsAttributInterface, ChildsAttributeInterface, LawAttributInterface
+interface RelationInterface extends SourceAttributInterface, IdAttributInterface, ParentsAttributInterface, ChildsAttributeInterface, LawAttributInterface
 {
 }

application/src/Entity/Right.php

@@ -8,16 +8,12 @@ use Fresh\DoctrineEnumBundle\Validator\Constraints as DoctrineAssert;
 use App\Entity\Attribut\LawAttribut;
 use App\DBAL\Types\LayerType;
 use App\DBAL\Types\RightType;
-use App\Entity\Attribut\NodeAttribut;
 use App\Entity\Attribut\GrantAttribut;
 use App\Logic\Operation\OperationInterface;
 use App\Entity\Attribut\ConditionAttribut;
 use App\Entity\Attribut\RecieverGroupAttribut;
 use App\Entity\Attribut\LayerAttribut;
-use App\Entity\LawInterface;
-use App\Entity\RecieverGroupInterface;
-use App\Entity\NodeInterface;
-use App\Entity\RightInterface;
+use App\Entity\Attribut\RelationAttribut;
 
 /**
  * @author kevinfrantz
@@ -26,7 +22,7 @@ use App\Entity\RightInterface;
  */
 class Right extends AbstractEntity implements RightInterface
 {
-    use TypeAttribut,LawAttribut, NodeAttribut, GrantAttribut,ConditionAttribut,RecieverGroupAttribut,LayerAttribut;
+    use TypeAttribut,LawAttribut, RelationAttribut, GrantAttribut,ConditionAttribut,RecieverGroupAttribut,LayerAttribut;
 
     /**
      * @ORM\ManyToOne(targetEntity="Law", inversedBy="rights")
@@ -60,12 +56,12 @@ class Right extends AbstractEntity implements RightInterface
     protected $grant;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Node")
-     * @ORM\JoinColumn(name="node_id", referencedColumnName="id")
+     * @ORM\ManyToOne(targetEntity="Relation")
+     * @ORM\JoinColumn(name="relation_id", referencedColumnName="id")
      *
-     * @var NodeInterface
+     * @var RelationInterface
      */
-    protected $node;
+    protected $relation;
 
     /**
      * @ORM\Column(name="type", type="RightType", nullable=false)
@@ -91,9 +87,9 @@ class Right extends AbstractEntity implements RightInterface
         //$this->recieverGroup = new RecieverGroup();
     }
 
-    public function isGranted(NodeInterface $node, string $layer, string $right): bool
+    public function isGranted(RelationInterface $relation, string $layer, string $right): bool
     {
-        if ($this->layer == $layer && $this->type == $right && $this->checkIfNodeIsReciever($node) && $this->getConditionBoolOrTrue()) {
+        if ($this->layer == $layer && $this->type == $right && $this->checkIfNodeIsReciever($relation) && $this->getConditionBoolOrTrue()) {
             return $this->grant;
         }
 
@@ -109,8 +105,8 @@ class Right extends AbstractEntity implements RightInterface
         return true;
     }
 
-    private function checkIfNodeIsReciever(NodeInterface $node): bool
+    private function checkIfNodeIsReciever(RelationInterface $relation): bool
     {
-        return $this->recieverGroup->getAllRecievers()->contains($node);
+        return $this->recieverGroup->getAllRecievers()->contains($relation);
     }
 }

application/src/Entity/RightInterface.php

@@ -4,16 +4,16 @@ namespace App\Entity;
 
 use App\Entity\Attribut\TypeAttributInterface;
 use App\Entity\Attribut\LawAttributInterface;
-use App\Entity\Method\NodeGrantedInterface;
 use App\Entity\Attribut\RecieverGroupAttributInterface;
 use App\Entity\Attribut\GrantAttributInterface;
-use App\Entity\Attribut\NodeAttributInterface;
 use App\Entity\Attribut\ConditionAttributInterface;
 use App\Entity\Attribut\LayerAttributInterface;
+use App\Entity\Method\RelationGrantedInterface;
+use App\Entity\Attribut\RelationAttributInterface;
 
 /**
  * @author kevinfrantz
  */
-interface RightInterface extends TypeAttributInterface, LawAttributInterface, NodeGrantedInterface, GrantAttributInterface, RecieverGroupAttributInterface, NodeAttributInterface, ConditionAttributInterface, LayerAttributInterface
+interface RightInterface extends TypeAttributInterface, LawAttributInterface, RelationGrantedInterface, GrantAttributInterface, RecieverGroupAttributInterface, RelationAttributInterface, ConditionAttributInterface, LayerAttributInterface
 {
 }

application/src/Entity/Source/AbstractSource.php

@@ -2,12 +2,14 @@
 
 namespace App\Entity\Source;
 
-use App\Entity\Attribut\NodeAttribut;
 use Doctrine\ORM\Mapping as ORM;
 use JMS\Serializer\Annotation\Exclude;
-use App\Entity\NodeInterface;
 use App\Entity\AbstractEntity;
-use App\Entity\Node;
+use Doctrine\Common\Collections\Collection;
+use App\Entity\Source\Attribut\GroupSourcesAttribut;
+use App\Entity\RelationInterface;
+use App\Entity\Attribut\RelationAttribut;
+use App\Entity\Relation;
 
 /**
  * @author kevinfrantz
@@ -17,24 +19,30 @@ use App\Entity\Node;
  * @ORM\Table(name="source")
  * @ORM\InheritanceType("JOINED")
  * @ORM\DiscriminatorColumn(name="discr", type="string")
- * @ORM\DiscriminatorMap({"user" = "UserSource","name" = "NameSource","collection" = "SourcesSource"})
+ * @ORM\DiscriminatorMap({"user" = "UserSource","name" = "NameSource","group" = "GroupSource"})
  */
 abstract class AbstractSource extends AbstractEntity implements SourceInterface
 {
-    use NodeAttribut;
+    use RelationAttribut,GroupSourcesAttribut;
 
     /**
-     * @var NodeInterface
-     * @ORM\OneToOne(targetEntity="App\Entity\Node",cascade={"persist", "remove"})
-     * @ORM\JoinColumn(name="node_id", referencedColumnName="id")
+     * @var RelationInterface
+     * @ORM\OneToOne(targetEntity="App\Entity\Relation",cascade={"persist", "remove"})
+     * @ORM\JoinColumn(name="relation_id", referencedColumnName="id")
      * @Exclude
      */
-    protected $node;
+    protected $relation;
+
+    /**
+     * @var Collection|GroupSource[]
+     * @ORM\ManyToMany(targetEntity="GroupSource")
+     */
+    protected $groups;
     
     public function __construct()
     {
         parent::__construct();
-        $this->node = new Node();
-        $this->node->setSource($this);
+        $this->relation = new Relation();
+        $this->relation->setSource($this);
     }
 }

application/src/Entity/Source/Attribut/GroupSourcesAttribut.php

@@ -0,0 +1,36 @@
+<?php
+namespace App\Entity\Source\Attribut;
+
+use Doctrine\Common\Collections\Collection;
+use App\Entity\Source\GroupSourceInterface;
+
+/**
+ *
+ * @author kevinfrantz
+ *        
+ */
+trait GroupSourcesAttribut
+{
+    /**
+     * 
+     * @var Collection|GroupSourceInterface[]
+     */
+    protected $groups;
+    
+    /**
+     * 
+     * @return Collection|GroupSourceInterface[]
+     */
+    public function getGroupSources():Collection{
+        return $this->groups;
+    }
+    
+    /**
+     * 
+     * @param Collection|GroupSourceInterface[] $groups
+     */
+    public function setGroupSources(Collection $groups):void{
+        $this->groups = $groups;
+    }
+}
+

application/src/Entity/Source/Attribut/GroupSourcesAttributInterface.php

@@ -0,0 +1,24 @@
+<?php
+namespace App\Entity\Source\Attribut;
+
+use Doctrine\Common\Collections\Collection;
+use App\Entity\Source\GroupSourceInterface;
+
+/**
+ *
+ * @author kevinfrantz
+ *        
+ */
+interface GroupSourcesAttributInterface
+{
+    /**
+     * @param Collection|GroupSourceInterface[] $groups
+     */
+    public function setGroupSources(Collection $groups):void;
+    
+    /**
+     * @return Collection|GroupSourceInterface[]
+     */
+    public function getGroupSources():Collection;
+}
+

application/src/Entity/Source/Attribut/MembersAttribut.php

@@ -0,0 +1,30 @@
+<?php
+namespace App\Entity\Source\Attribut;
+
+use Doctrine\Common\Collections\Collection;
+
+/**
+ *
+ * @author kevinfrantz
+ *        
+ */
+trait MembersAttribut
+{
+
+    /**
+     *
+     * @var Collection
+     */
+    protected $members;
+
+    public function getMembers(): Collection
+    {
+        return $this->members;
+    }
+
+    public function setMembers(Collection $members): void
+    {
+        $this->members = $members;
+    }
+}
+

application/src/Entity/Source/Attribut/MembersAttributInterface.php

@@ -9,17 +9,16 @@ use Doctrine\Common\Collections\Collection;
  * @author kevinfrantz
  *        
  */
-interface SourcesAttributInterface
+interface MembersAttributInterface
 {
 
     /**
      * @param Collection $members
      */
-    public function setSources(Collection $sources): void;
+    public function setMembers(Collection $members): void;
 
     /**
      * @return Collection
      */
-    public function getSources(): Collection;
+    public function getMembers(): Collection;
 }
-

application/src/Entity/Source/Attribut/SourcesAttribut.php

@@ -1,30 +0,0 @@
-<?php
-namespace App\Entity\Source\Attribut;
-
-use Doctrine\Common\Collections\Collection;
-
-/**
- *
- * @author kevinfrantz
- *        
- */
-trait SourcesAttribut
-{
-
-    /**
-     *
-     * @var Collection
-     */
-    protected $sources;
-
-    public function getSources(): Collection
-    {
-        return $this->sources;
-    }
-
-    public function setSources(Collection $sources): void
-    {
-        $this->sources = $sources;
-    }
-}
-

application/src/Entity/Source/GroupSource.php

@@ -3,8 +3,8 @@ namespace App\Entity\Source;
 
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\Collection;
-use App\Entity\Attribut\SourceAttribut;
-use App\Entity\Source\Attribut\SourcesAttribut;
+use App\Entity\Source\Attribut\MembersAttributInterface;
+use App\Entity\Source\Attribut\MembersAttribut;
 
 /**
  *
@@ -12,15 +12,15 @@ use App\Entity\Source\Attribut\SourcesAttribut;
  * @ORM\Table(name="source_sources")
  * @ORM\Entity
  */
-class SourcesSource extends AbstractSource implements SourcesSourceInterface
+class GroupSource extends AbstractSource implements MembersAttributInterface
 {
-    use SourcesAttribut;
+    use MembersAttribut;
 
     /**
      *
      * @var Collection
      * @ORM\ManyToMany(targetEntity="AbstractSource")
      */
-    protected $sources;
+    protected $members;
 }
 

application/src/Entity/Source/GroupSourceInterface.php

@@ -1,15 +1,14 @@
 <?php
 namespace App\Entity\Source;
 
-
-use App\Entity\Source\Attribut\SourcesAttributInterface;
+use App\Entity\Source\Attribut\MembersAttributInterface;
 
 /**
  * @author kevinfrantz
  * @todo Map the not jet mapped functions!
  *      
  */
-interface SourcesSourceInterface extends SourcesAttributInterface
+interface GroupSourceInterface extends MembersAttributInterface
 {
 }
 

application/src/Entity/Source/SourceInterface.php

@@ -1,14 +1,14 @@
 <?php
 namespace App\Entity\Source;
 
-use App\Entity\Attribut\NodeAttributInterface;
 use App\Entity\Attribut\IdAttributInterface;
 use App\Entity\EntityInterface;
+use App\Entity\Source\Attribut\GroupSourcesAttributInterface;
 
 /**
  *
  * @author kevinfrantz
  */
-interface SourceInterface extends IdAttributInterface, NodeAttributInterface, EntityInterface
+interface SourceInterface extends IdAttributInterface, EntityInterface, GroupSourcesAttributInterface
 {
 }

application/src/Structur/Facade/Security/Source/UserSourceFacade.php

@@ -2,10 +2,12 @@
 namespace App\Structur\Facade\Security\Source;
 
 use App\Entity\Source\NameSourceInterface;
+use App\Entity\Source\SourceInterface;
 use App\Entity\UserInterface;
 use App\Entity\Source\UserSourceInterface;
 use App\DBAL\Types\RightType;
 use App\DBAL\Types\LayerType;
+use Doctrine\Common\Collections\Collection;
 
 /**
  *
@@ -62,4 +64,36 @@ class UserSourceFacade extends AbstractSourceFacade implements UserSourceInterfa
      * @todo Implement
      */
     }
+
+    public function setSource(SourceInterface $source): void
+    {
+    /**
+     *
+     * @todo Implement
+     */
+    }
+
+    public function getGroupSources(): Collection
+    {
+    /**
+     *
+     * @todo Implement
+     */
+    }
+
+    public function getSource(): SourceInterface
+    {
+    /**
+     *
+     * @todo Implement
+     */
+    }
+
+    public function setGroupSources(Collection $groups): void
+    {
+    /**
+     *
+     * @todo Implement
+     */
+    }
 }