Browse Source

FD3-449 se añade el soft_delete al CM y se configuran algunos parámetros para el envío de datos a Base.

Maxi Schvindt 7 years ago
parent
commit
f4f0ff48ac

+ 4 - 4
app/config/bundles/ik/device-bundle/parameters.yml.dist

@@ -1,5 +1,5 @@
 parameters:
-    device_check_url: 'http://127.0.0.1/base/app_dev.php/api/devices/check.json'
-    device_post_url: 'http://127.0.0.1/base/app_dev.php/api/devices.json'
-    device_delete_post_url: 'http://127.0.0.1/base/app_dev.php/api/devices/'
-    device_put_url: 'http://127.0.0.1/base/app_dev.php/api/devices/'
+    device_check_url: 'http://%env(HOST_BASE)%/api/devices/check.json'
+    device_post_url: 'http://%env(HOST_BASE)%/api/devices.json'
+    device_delete_post_url: 'http://%env(HOST_BASE)%/api/devices/'
+    device_put_url: 'http://%env(HOST_BASE)%/api/devices/'

+ 2 - 1
app/config/parameters.yml.dist

@@ -32,7 +32,8 @@ parameters:
     db_session_name: fd_session
     db_session_user: root
     db_session_password: 235r2342gtfsw
-    env(AMQP_KEY) : ""
+    env(HOST_AMQP): amqp
+    env(AMQP_KEY): cablemodem
 
     cookie_domain_client: '%env(CLIENT)%'
     cookie_domain: '%cookie_domain_client%.flowdat.com'

+ 2 - 1
app/config/parameters.yml.docker

@@ -33,7 +33,8 @@ parameters:
     db_session_name: fd_session
     db_session_user: root
     db_session_password: 235r2342gtfsw
-    env(AMQP_KEY) : ""
+    env(HOST_AMQP): amqp
+    env(AMQP_KEY): cablemodem
 
     cookie_domain_client: '%env(CLIENT)%'
     cookie_domain: '%cookie_domain_client%.flowdat.com'

+ 13 - 1
src/CablemodemBundle/Entity/Cablemodem.php

@@ -15,6 +15,8 @@ use MapBundle\Entity\Interfaces\LocationInterface;
 use MapBundle\Entity\Traits\LocationTrait;
 use WorkflowBundle\Entity\Interfaces\WorkflowInterface;
 use WorkflowBundle\Entity\Traits\WorkflowTrait;
+use Gedmo\SoftDeleteable\Traits\SoftDeleteableEntity as SoftDeleteable;
+use Base\AdminBundle\Interfaces\SoftDeleteInterface;
 
 /**
  * @ORM\Entity
@@ -23,14 +25,16 @@ use WorkflowBundle\Entity\Traits\WorkflowTrait;
  * @UniqueEntity(fields={"mac"})
  * 
  * @Gedmo\Loggable
+ * @Gedmo\SoftDeleteable(fieldName="deletedAt", timeAware=true)
  */
-class Cablemodem implements DeviceInterface, TenancyIdTraitInterface, LocationInterface, WorkflowInterface
+class Cablemodem implements DeviceInterface, TenancyIdTraitInterface, LocationInterface, WorkflowInterface, SoftDeleteInterface
 {
 
     use ExtraDataTrait;
     use TenancyIdTrait;
     use LocationTrait;
     use WorkflowTrait;
+    use SoftDeleteable;
     
     /**
      * @var bigint $id
@@ -326,4 +330,12 @@ class Cablemodem implements DeviceInterface, TenancyIdTraitInterface, LocationIn
         ];
     }
 
+    /**
+     * @return array
+     */
+    public function getSoftDeleteCriteria() 
+    {
+        return array('mac' => $this->mac);
+    }
+
 }