working notifications

src/Http/Controllers/Internal/v1/NotificationController.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Fleetbase\Http\Controllers\Internal\v1;
+
+use Fleetbase\Http\Controllers\FleetbaseController;
+
+class NotificationController extends FleetbaseController
+{
+    /**
+     * The resource to query.
+     *
+     * @var string
+     */
+    public $resource = 'notification';
+}

src/Http/Filter/NotificationFilter.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Fleetbase\Http\Filter;
+
+class NotificationFilter extends Filter
+{
+    public function queryForInternal()
+    {
+        $this->builder->where(function ($q) {
+            $q->where('notifiable_id', $this->session->get('company'));
+            $q->orWhere('notifiable_id', $this->session->get('user'));
+        });
+    }
+
+    public function query(?string $query)
+    {
+        $this->builder->search($query);
+    }
+
+    public function unread(?bool $unread)
+    {
+        if ($unread) {
+            $this->builder->whereNull('read_at');
+        }
+    }
+}

src/Models/Notification.php

@@ -2,21 +2,21 @@
 
 namespace Fleetbase\Models;
 
+use Fleetbase\Traits\Filterable;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\Searchable;
 use Illuminate\Notifications\DatabaseNotification;
 
 class Notification extends DatabaseNotification
 {
-    use HasApiModelBehavior;
-    use Searchable;
+    use HasApiModelBehavior, Searchable, Filterable;
 
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
-    protected $fillable = ['read_at', 'data'];
+    protected $fillable = ['read_at', 'data', 'notifiable_id', 'notifiable_type', 'type'];
 
     /**
      * The searchable columns.

src/Notifications/UserCreated.php

@@ -79,18 +79,15 @@ public function toBroadcast($notifiable)
     public function toArray($notifiable)
     {
         return [
-            'id'          => $this->notificationId,
-            'created_at'  => $this->sentAt,
-            'notifiable' => $notifiable->{$notifiable->getKeyName()},
-            'data'        => [
-                'subject' => '🥳 New Fleetbase Signup!',
-                'message' => 'New user ' . $this->user->name . ' added to organization ' . $this->company->name,
-                'id' => $this->user->uuid,
-                'email' => $this->user->email,
-                'phone' => $this->user->phone,
-                'companyId' => $this->company->uuid,
-                'company' => $this->company->name,
-            ],
+            'notification_id' => $this->notificationId,
+            'sent_at'  => $this->sentAt,
+            'subject' => '🥳 New Fleetbase Signup!',
+            'message' => 'New user ' . $this->user->name . ' added to organization ' . $this->company->name,
+            'id' => $this->user->uuid,
+            'email' => $this->user->email,
+            'phone' => $this->user->phone,
+            'companyId' => $this->company->uuid,
+            'company' => $this->company->name,
         ];
     }
 }

src/routes.php

@@ -157,6 +157,7 @@ function ($router, $controller) {
                                     }
                                 );
                                 $router->fleetbaseRoutes('transactions');
+                                $router->fleetbaseRoutes('notifications');
                             }
                         );
                     }