Merge pull request #7 from iutrace/feature/VET-3598-notificacion-de-template-rechaz

fix events

Author: daniel-utrace

src/Commands/UpdateWhatsappTemplatesCommand.php

@@ -7,7 +7,7 @@
 
 class UpdateWhatsappTemplatesCommand extends Command
 {
-    protected $signature = 'botmaker:update-whatsap-templates';
+    protected $signature = 'botmaker:update-whatsapp-templates';
 
     protected $description = 'Update the states of WhatsApp templates by fetching changes from the API';
 
@@ -19,4 +19,4 @@ public function handle()
 
         return Command::SUCCESS;
     }
-}
+}

src/Events/WhatsappTemplate/Created.php

@@ -1,13 +1,14 @@
 <?php
 
-namespace App\Events\WhatsappTemplate;
+namespace Iutrace\Botmaker\Events\WhatsappTemplate;
 
 use Iutrace\Botmaker\Models\WhatsappTemplate;
 use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
 
 class Created
 {
-    use Dispatchable;
+    use Dispatchable, SerializesModels;
 
     public $whatsappTemplate;
 

src/Events/WhatsappTemplate/Deleted.php

@@ -1,13 +1,14 @@
 <?php
 
-namespace App\Events\WhatsappTemplate;
+namespace Iutrace\Botmaker\Events\WhatsappTemplate;
 
 use Iutrace\Botmaker\Models\WhatsappTemplate;
 use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
 
 class Deleted
 {
-    use Dispatchable;
+    use Dispatchable, SerializesModels;
 
     public $whatsappTemplate;
 

src/Events/WhatsappTemplate/Updated.php

@@ -1,13 +1,14 @@
 <?php
 
-namespace App\Events\WhatsappTemplate;
+namespace Iutrace\Botmaker\Events\WhatsappTemplate;
 
-use Iutrace\Botmaker\Models\WhatsappTemplate;
 use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+use Iutrace\Botmaker\Models\WhatsappTemplate;
 
 class Updated
 {
-    use Dispatchable;
+    use Dispatchable, SerializesModels;
 
     public $whatsappTemplate;
 

src/Jobs/UpdateWhatsappTemplatesJob.php

@@ -17,14 +17,14 @@ class UpdateWhatsappTemplatesJob implements ShouldQueue
 
     public function handle()
     {
-        $pendingTemplates = WhatsappTemplate::where('state', WhatsappTemplateState::ACCOUNT_PENDING)->get();
+        $pendingTemplates = WhatsappTemplate::where('state', WhatsappTemplateState::BOTMAKER_PENDING)->get();
 
         foreach ($pendingTemplates as $template) {
             try {
 
                 $botmakerTemplate = Botmaker::getWhatsappTemplate($template->name);
 
-                if($botmakerTemplate->state != WhatsappTemplateState::ACCOUNT_PENDING){
+                if($botmakerTemplate->state != WhatsappTemplateState::BOTMAKER_PENDING){
 
                     $template->state = WhatsappTemplateState::getState($botmakerTemplate->state);
                     $template->save();

src/Models/WhatsappTemplate.php

@@ -4,6 +4,9 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Event;
+use Iutrace\Botmaker\Events\WhatsappTemplate\Updated;
+use Iutrace\Botmaker\Events\WhatsappTemplate\Created;
+use Iutrace\Botmaker\Events\WhatsappTemplate\Deleted;
 
 class WhatsappTemplate extends Model
 {
@@ -39,16 +42,15 @@ protected static function boot()
         parent::boot();
 
         static::created(function ($whatsappTemplate) {
-            Event::dispatch(new \App\Events\WhatsappTemplate\Created($whatsappTemplate));
+            Event::dispatch(new Created($whatsappTemplate));
         });
 
         static::updated(function ($whatsappTemplate) {
-            Event::dispatch(new \App\Events\WhatsappTemplate\Updated($whatsappTemplate));
+            Event::dispatch(new Updated($whatsappTemplate));
         });
 
         static::deleted(function ($whatsappTemplate) {
-            Event::dispatch(new \App\Events\WhatsappTemplate\Deleted($whatsappTemplate));
+            Event::dispatch(new Deleted($whatsappTemplate));
         });
-
     }
 }