From f66cb4a8cee8690c0f2c07861598c71663d8f7e7 Mon Sep 17 00:00:00 2001
From: Kevin Frantz <mail@kevin-frantz.de>
Date: Fri, 14 Sep 2018 13:33:56 +0200
Subject: [PATCH] Substituted whitelist and blacklist attribute trough grant
 attribute

---
 .../src/Entity/Attribut/GrantAttribut.php     | 24 +++++++++++++++++++
 .../Attribut/GrantAttributInterface.php       | 13 ++++++++++
 application/src/Entity/Permission.php         | 17 ++++---------
 .../src/Entity/PermissionInterface.php        |  5 ++--
 4 files changed, 43 insertions(+), 16 deletions(-)
 create mode 100644 application/src/Entity/Attribut/GrantAttribut.php
 create mode 100644 application/src/Entity/Attribut/GrantAttributInterface.php

diff --git a/application/src/Entity/Attribut/GrantAttribut.php b/application/src/Entity/Attribut/GrantAttribut.php
new file mode 100644
index 0000000..d052ae3
--- /dev/null
+++ b/application/src/Entity/Attribut/GrantAttribut.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Entity\Attribut;
+
+/**
+ * @author kevinfrantz
+ */
+trait GrantAttribut
+{
+    /**
+     * @var bool
+     */
+    protected $grant;
+
+    public function setGrant(bool $grant): void
+    {
+        $this->grant = $grant;
+    }
+
+    public function getGrant(): bool
+    {
+        return $this->grant;
+    }
+}
diff --git a/application/src/Entity/Attribut/GrantAttributInterface.php b/application/src/Entity/Attribut/GrantAttributInterface.php
new file mode 100644
index 0000000..ecb8679
--- /dev/null
+++ b/application/src/Entity/Attribut/GrantAttributInterface.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Entity\Attribut;
+
+/**
+ * @author kevinfrantz
+ */
+interface GrantAttributInterface
+{
+    public function setGrant(bool $grant): void;
+
+    public function getGrant(): bool;
+}
diff --git a/application/src/Entity/Permission.php b/application/src/Entity/Permission.php
index 07ee4af..ed47e54 100644
--- a/application/src/Entity/Permission.php
+++ b/application/src/Entity/Permission.php
@@ -3,13 +3,12 @@
 namespace App\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use App\Entity\Attribut\BlacklistAttribut;
-use App\Entity\Attribut\WhitelistAttribut;
 use App\Entity\Attribut\NodeAttribut;
 use App\Entity\Attribut\RightAttribut;
 use App\Entity\Attribut\RecieverAttribut;
 use App\DBAL\Types\RecieverType;
 use Fresh\DoctrineEnumBundle\Validator\Constraints as DoctrineAssert;
+use App\Entity\Attribut\GrantAttribut;
 
 /**
  * @author kevinfrantz
@@ -18,7 +17,7 @@ use Fresh\DoctrineEnumBundle\Validator\Constraints as DoctrineAssert;
  */
 class Permission extends AbstractEntity implements PermissionInterface
 {
-    use NodeAttribut,RightAttribut,WhitelistAttribut,BlacklistAttribut,RecieverAttribut;
+    use NodeAttribut,RightAttribut,RecieverAttribut,GrantAttribut;
 
     /**
      * @ORM\Column(name="reciever", type="RecieverType", nullable=false)
@@ -33,14 +32,7 @@ class Permission extends AbstractEntity implements PermissionInterface
      *
      * @var bool
      */
-    protected $blacklist;
-
-    /**
-     * @ORM\Column(type="boolean")
-     *
-     * @var bool
-     */
-    protected $whitelist;
+    protected $grant;
 
     /**
      * @ORM\ManyToOne(targetEntity="Node")
@@ -60,7 +52,6 @@ class Permission extends AbstractEntity implements PermissionInterface
 
     public function __construct()
     {
-        $this->blacklist = false;
-        $this->whitelist = false;
+        $this->grant = true;
     }
 }
diff --git a/application/src/Entity/PermissionInterface.php b/application/src/Entity/PermissionInterface.php
index 81ac55f..0818bad 100644
--- a/application/src/Entity/PermissionInterface.php
+++ b/application/src/Entity/PermissionInterface.php
@@ -2,15 +2,14 @@
 
 namespace App\Entity;
 
-use App\Entity\Attribut\BlacklistAttributInterface;
-use App\Entity\Attribut\WhitelistAttributInterface;
 use App\Entity\Attribut\NodeAttributInterface;
 use App\Entity\Attribut\RightAttributInterface;
 use App\Entity\Attribut\RecieverAttributInterface;
+use App\Entity\Attribut\GrantAttributInterface;
 
 /**
  * @author kevinfrantz
  */
-interface PermissionInterface extends BlacklistAttributInterface, WhitelistAttributInterface, NodeAttributInterface, RightAttributInterface, RecieverAttributInterface
+interface PermissionInterface extends NodeAttributInterface, RightAttributInterface, RecieverAttributInterface, GrantAttributInterface
 {
 }