Se agrega filtro por tenencia para los devices, onu y ports.

app/config/config.yml

@@ -60,6 +60,7 @@ twig:
     strict_variables: '%kernel.debug%'
     globals:
         fd_alerts: '@base_admin.alert_service'
+        tenancy_service: '@base_tenancy.tenancy_service'
 
 # Doctrine Configuration
 doctrine:
@@ -82,6 +83,8 @@ doctrine:
         auto_generate_proxy_classes: '%kernel.debug%'
         naming_strategy: doctrine.orm.naming_strategy.underscore
         auto_mapping: true
+        filters:
+            tenancy_filter: Base\AdminBundle\Filter\TenancyFilter
 
 # Swiftmailer Configuration
 swiftmailer:

src/StatsBundle/Entity/Device.php

@@ -6,16 +6,19 @@ use Doctrine\ORM\Mapping as ORM;
 use ExtraDataBundle\Entity\Traits\ExtraDataTrait;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 use Symfony\Component\Validator\Constraints as Assert;
+use Base\AdminBundle\Traits\TenancyIdTrait;
+use Base\AdminBundle\Traits\TenancyIdTraitInterface;
 
 /**
  * @ORM\Table
  * @ORM\Entity
  * 
  */
-class Device
+class Device implements TenancyIdTraitInterface
 {
 
     use ExtraDataTrait;
+    use TenancyIdTrait;
     
     /**
      * @var int
@@ -60,13 +63,6 @@ class Device
      */
     protected $deviceServer;
 
-    /**
-     * @var int
-     *
-     * @ORM\Column(type="integer", nullable=false, options={"default":1})
-     */
-    protected $tenancyId = 1;
-
     /**
      * @ORM\Column(type="datetime", options={"default": 0})
      */
@@ -173,30 +169,6 @@ class Device
         return str_replace("FTTHBundle\\Entity\\","",$this->deviceType);
     }
 
-    /**
-     * Set tenancyId
-     *
-     * @param int $tenancyId
-     *
-     * @return Device
-     */
-    public function setTenancyId($tenancyId)
-    {
-        $this->tenancyId = $tenancyId;
-
-        return $this;
-    }
-
-    /**
-     * Get tenancyId
-     *
-     * @return int
-     */
-    public function getTenancyId()
-    {
-        return $this->tenancyId;
-    }
-
     /**
      * Set updated
      *

src/StatsBundle/Entity/Onu.php

@@ -6,6 +6,9 @@ use Doctrine\ORM\Mapping as ORM;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 use Symfony\Component\Validator\Constraints as Assert;
 use JMS\Serializer\Annotation as JMS;
+use Base\AdminBundle\Traits\TenancyIdTrait;
+use Base\AdminBundle\Traits\TenancyIdTraitInterface;
+
 
 /**
  * @ORM\Table
@@ -13,8 +16,9 @@ use JMS\Serializer\Annotation as JMS;
  * @UniqueEntity(fields={"deviceServer", "oltDeviceId", "ponSerialNumber"}, message="errors.duplicate_key")
  * @ORM\Table(uniqueConstraints={@ORM\UniqueConstraint(name="unique_idx", columns={"device_server_id", "olt_device_id", "pon_serial_number"})})
  */
-class Onu
+class Onu implements TenancyIdTraitInterface
 {
+    use TenancyIdTrait;
     
     /**
      * @var int
@@ -24,7 +28,7 @@ class Onu
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private $id;
-    
+
     /**
      * @var string
      *
@@ -53,13 +57,7 @@ class Onu
      */
     private $deviceId;
 
-    /**
-     * @var int
-     *
-     * @ORM\Column(type="integer", nullable=false, options={"default":1})
-     */
-    protected $tenancyId = 1;
-
+    
     /**
      * @var string
      *
@@ -329,29 +327,7 @@ class Onu
         return str_replace("FTTHBundle\\Entity\\", "", $this->deviceType);
     }
 
-    /**
-     * Set tenancyId
-     *
-     * @param int $tenancyId
-     *
-     * @return ONU
-     */
-    public function setTenancyId($tenancyId)
-    {
-        $this->tenancyId = $tenancyId;
-
-        return $this;
-    }
-
-    /**
-     * Get tenancyId
-     *
-     * @return int
-     */
-    public function getTenancyId()
-    {
-        return $this->tenancyId;
-    }
+    
 
     /**
      * Set updated

src/StatsBundle/Entity/PonPort.php

@@ -4,6 +4,8 @@ namespace StatsBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
+use Base\AdminBundle\Traits\TenancyIdTrait;
+use Base\AdminBundle\Traits\TenancyIdTraitInterface;
 
 /**
  * @ORM\Table
@@ -11,9 +13,11 @@ use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
  * @UniqueEntity(fields={"deviceServer", "oltDeviceId", "ponPort"}, message="errors.duplicate_key")
  * @ORM\Table(uniqueConstraints={@ORM\UniqueConstraint(name="unique_idx", columns={"device_server_id", "olt_device_id", "pon_port"})})
  */
-class PonPort
+class PonPort implements TenancyIdTraitInterface
 {
 
+    use TenancyIdTrait;
+
     /**
      * @var int
      *
@@ -42,13 +46,6 @@ class PonPort
      */
     protected $deviceServer;
 
-    /**
-     * @var int
-     *
-     * @ORM\Column(type="integer", nullable=false, options={"default":1})
-     */
-    protected $tenancyId = 1;
-
     /**
      * @ORM\Column(type="datetime")
      */
@@ -160,34 +157,10 @@ class PonPort
         return $this->deviceServer;
     }
 
-    /**
-     * Set tenancyId
-     *
-     * @param int $tenancyId
-     *
-     * @return PonPort
-     */
-    public function setTenancyId($tenancyId)
-    {
-        $this->tenancyId = $tenancyId;
-
-        return $this;
-    }
-
-    /**
-     * Get tenancyId
-     *
-     * @return int
-     */
-    public function getTenancyId()
-    {
-        return $this->tenancyId;
-    }
-
     /**
      * Set updated
      *
-     * @param Datetime $tenancyId
+     * @param Datetime $updated
      *
      * @return PonPort
      */