Fix labeling of events

Author: mikebronner

src/Events/MixpanelEvent.php

@@ -10,26 +10,15 @@ class MixpanelEvent
     use SerializesModels;
 
     public $charge;
+    public $eventName;
     public $profileData;
-    public $trackingData;
     public $user;
 
-    public function __construct($user, array $trackingData, int $charge = 0, array $profileData = [])
+    public function __construct($user, string $eventName, int $charge = 0, array $profileData = [])
     {
         $this->charge = $charge;
+        $this->eventName = $eventName;
         $this->profileData = $profileData;
-        $this->trackingData = $this->addTimestamp($trackingData);
         $this->user = $user;
     }
-
-    private function addTimestamp(array $trackingData) : array
-    {
-        return array_map(function ($data) {
-            if (! array_key_exists('time', $data)) {
-                $data['time'] = time();
-            }
-
-            return $data;
-        }, $trackingData);
-    }
 }

src/Listeners/LaravelMixpanelEventHandler.php

@@ -23,31 +23,25 @@ public function onUserLoginAttempt($event)
         $user = app($authModel)
             ->where('email', $email)
             ->first();
-        $trackingData = [
-            ['Session', ['Status' => 'Login Attempt Succeeded']],
-        ];
-
-        if ($user && auth()->guest()) {
-            $trackingData = [
-                ['Session', ['Status' => 'Login Attempt Failed']],
-            ];
+        $eventName = 'Login Attempt Succeeded';
+
+        if ($user && ! auth()->validate($event->credentials)) {
+            $eventName = 'Login Attempt Failed';
         }
 
-        event(new MixpanelEvent($user, $trackingData));
+        event(new MixpanelEvent($user, $eventName));
     }
 
     public function onUserLogin($login)
     {
         $user = $login->user ?? $login;
-        $trackingData = [['Session', ['Status' => 'Logged In']]];
-        event(new MixpanelEvent($user, $trackingData));
+        event(new MixpanelEvent($user, 'User Logged In'));
     }
 
     public function onUserLogout($logout)
     {
         $user = property_exists($logout, 'user') ? $logout->user : $logout;
-        $trackingData = [['Session', ['Status' => 'Logged Out']]];
-        event(new MixpanelEvent($user, $trackingData));
+        event(new MixpanelEvent($user, 'User Logged Out'));
     }
 
     public function subscribe(Dispatcher $events)

src/Listeners/LaravelMixpanelUserObserver.php

@@ -6,33 +6,21 @@ class LaravelMixpanelUserObserver
 {
     public function created($user)
     {
-        $trackingData = [
-            ['User', ['Status' => 'Registered']],
-        ];
-        event(new MixpanelEvent($user, $trackingData));
+        event(new MixpanelEvent($user, 'User: Registered'));
     }
 
     public function saving($user)
     {
-        $trackingData = [
-            ['User', ['Status' => 'Updated']],
-        ];
-        event(new MixpanelEvent($user, $trackingData));
+        event(new MixpanelEvent($user, 'User: Updated'));
     }
 
     public function deleting($user)
     {
-        $trackingData = [
-            ['User', ['Status' => 'Deactivated']],
-        ];
-        event(new MixpanelEvent($user, $trackingData));
+        event(new MixpanelEvent($user, 'User: Deactivated'));
     }
 
     public function restored($user)
     {
-        $trackingData = [
-            ['User', ['Status' => 'Reactivated']],
-        ];
-        event(new MixpanelEvent($user, $trackingData));
+        event(new MixpanelEvent($user, 'User: Reactivated'));
     }
 }

src/Listeners/MixpanelEvent.php

@@ -20,9 +20,7 @@ public function handle(Event $event)
                 app('mixpanel')->people->trackCharge($user->id, $event->charge);
             }
 
-            array_map(function ($data) {
-                app('mixpanel')->track($data);
-            }, $event->trackingData);
+            app('mixpanel')->track($event->eventName);
         }
     }