Merge pull request #31 from familytree365/feature/event-channel-details

data event & channel settings

Author: curtisdelicata

src/Events/GedComProgressSent.php

@@ -17,6 +17,7 @@ class GedComProgressSent implements ShouldBroadcast
     public $slug;
     public $total;
     public $complete;
+    public $channel;
 
     /**
      * Create a new event instance.
@@ -25,12 +26,33 @@ class GedComProgressSent implements ShouldBroadcast
      * @param $total
      * @param $complete
      */
-    public function __construct($slug, $total, $complete)
+    public function __construct(
+      $slug,
+      $total,
+      $complete,
+      $channel = ['name' => 'gedcom-progress', 'eventName' => 'newMessage']
+    )
     {
         $this->slug = $slug;
         $this->total = $total;
         $this->complete = $complete;
         $this->queue = 'low';
+
+        $this->channel = $channel;
+    }
+
+    /**
+     * Get the data to broadcast.
+     *
+     * @return array
+     */
+    public function broadcastWith()
+    {
+        return [
+          'slug' => $this->slug,
+          'total' => $this->total,
+          'complete' => $this->complete,
+        ];
     }
 
     /**
@@ -40,11 +62,11 @@ public function __construct($slug, $total, $complete)
      */
     public function broadcastOn()
     {
-        return new Channel('gedcom-progress');
+        return new Channel($this->channel['name']);
     }
 
     public function broadcastAs()
     {
-        return 'newMessage';
+        return $this->channel['eventName'];
     }
 }

src/Utils/GedcomParser.php

@@ -29,7 +29,13 @@ class GedcomParser
     protected $repo_ids = [];
     protected $conn = '';
 
-    public function parse($conn, string $filename, string $slug, bool $progressBar = false)
+    public function parse(
+        $conn,
+        string $filename,
+        string $slug,
+        bool $progressBar = false,
+        $channel = ['name' => 'gedcom-progress', 'eventName' => 'newMessage']
+    )
     {
         $this->conn = $conn;
         error_log('PARSE LOG : +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++'.$conn);
@@ -46,14 +52,14 @@ public function parse($conn, string $filename, string $slug, bool $progressBar =
             $head = $gedcom->getHead();
         }
          **/
-        
+
         $subn = [];
         $subm = [];
         $sour = [];
         $note = [];
         $repo = [];
         $obje = [];
-        
+
         if ($gedcom->getSubn())
         {
             $subn = $gedcom->getSubn();
@@ -101,7 +107,7 @@ public function parse($conn, string $filename, string $slug, bool $progressBar =
         $complete = 0;
         if ($progressBar === true) {
             $bar = $this->getProgressBar(count($individuals) + count($families));
-            event(new GedComProgressSent($slug, $total, $complete));
+            event(new GedComProgressSent($slug, $total, $complete, $channel));
         }
         Log::info('Individual:'.count($individuals));
         Log::info('Families:'.count($families));
@@ -124,7 +130,7 @@ public function parse($conn, string $filename, string $slug, bool $progressBar =
             if ($progressBar === true) {
                 $bar->advance();
                 $complete++;
-                event(new GedComProgressSent($slug, $total, $complete));
+                event(new GedComProgressSent($slug, $total, $complete, $channel));
             }
         }
 
@@ -139,7 +145,7 @@ public function parse($conn, string $filename, string $slug, bool $progressBar =
             if ($progressBar === true) {
                 $bar->advance();
                 $complete++;
-                event(new GedComProgressSent($slug, $total, $complete));
+                event(new GedComProgressSent($slug, $total, $complete, $channel));
             }
         }
 
@@ -150,7 +156,7 @@ public function parse($conn, string $filename, string $slug, bool $progressBar =
             if ($progressBar === true) {
                 $bar->advance();
                 $complete++;
-                event(new GedComProgressSent($slug, $total, $complete));
+                event(new GedComProgressSent($slug, $total, $complete, $channel));
             }
         }
 
@@ -166,7 +172,7 @@ public function parse($conn, string $filename, string $slug, bool $progressBar =
             if ($progressBar === true) {
                 $bar->advance();
                 $complete++;
-                event(new GedComProgressSent($slug, $total, $complete));
+                event(new GedComProgressSent($slug, $total, $complete, $channel));
             }
         }
 
@@ -181,7 +187,7 @@ public function parse($conn, string $filename, string $slug, bool $progressBar =
             if ($progressBar === true) {
                 $bar->advance();
                 $complete++;
-                event(new GedComProgressSent($slug, $total, $complete));
+                event(new GedComProgressSent($slug, $total, $complete, $channel));
             }
         }
 
@@ -199,7 +205,7 @@ public function parse($conn, string $filename, string $slug, bool $progressBar =
             if ($progressBar === true) {
                 $bar->advance();
                 $complete++;
-                event(new GedComProgressSent($slug, $total, $complete));
+                event(new GedComProgressSent($slug, $total, $complete, $channel));
             }
         }
 
@@ -208,7 +214,7 @@ public function parse($conn, string $filename, string $slug, bool $progressBar =
             if ($progressBar === true) {
                 $bar->advance();
                 $complete++;
-                event(new GedComProgressSent($slug, $total, $complete));
+                event(new GedComProgressSent($slug, $total, $complete, $channel));
             }
         }
 
@@ -242,7 +248,7 @@ public function parse($conn, string $filename, string $slug, bool $progressBar =
             if ($progressBar === true) {
                 $bar->advance();
                 $complete++;
-                event(new GedComProgressSent($slug, $total, $complete));
+                event(new GedComProgressSent($slug, $total, $complete, $channel));
             }
         }