Use Laravel Db notification system model

rxcod9 · May 4, 2022 · 13a1f08 · 13a1f08
1 parent 4c381b0
commit 13a1f08
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 168 deletions.
diff --git a/database/factories/.gitkeep b/database/factories/.gitkeep
diff --git a/database/factories/NotificationFactory.php b/database/factories/NotificationFactory.php
diff --git a/database/migrations/2022_03_16_000000_create_notifications_table.php b/database/migrations/2022_03_16_000000_create_notifications_table.php
@@ -14,10 +14,10 @@ class CreateNotificationsTable extends Migration
     public function up()
     {
         Schema::create('notifications', function (Blueprint $table) {
-            $table->id();
-            $table->string('name')->nullable();
-            $table->text('description')->nullable();
-            $table->string('image')->nullable();
+            $table->uuid('id')->primary();
+            $table->string('type');
+            $table->morphs('notifiable');
+            $table->text('data');
 
             $table->bigInteger('created_by_id')->unsigned()->nullable()->default(null);
             $table->foreign('created_by_id')->references('id')->on('users')->onUpdate('cascade')->onDelete('set null');
@@ -28,14 +28,17 @@ public function up()
             $table->bigInteger('assigned_to_id')->unsigned()->nullable()->default(null);
             $table->foreign('assigned_to_id')->references('id')->on('users')->onUpdate('cascade')->onDelete('set null');
 
-            $table->bigInteger('parent_id')->unsigned()->nullable()->default(null);
-            $table->foreign('parent_id')->references('id')->on('notifications')->onUpdate('cascade')->onDelete('set null');
+            $table->uuid('parent_id')->nullable()->default(null);
 
-
             $table->enum('status', ['ACTIVE', 'INACTIVE', 'EXPIRED'])->default('ACTIVE');
 
+            $table->timestamp('read_at')->nullable();
             $table->timestamps();
         });
+
+        Schema::table('notifications', function (Blueprint $table) {
+            $table->foreign('parent_id')->references('id')->on('notifications')->onUpdate('cascade')->onDelete('set null');
+        });
     }
 
     /**

diff --git a/database/seeders/DataRowsTableSeeder.php b/database/seeders/DataRowsTableSeeder.php
@@ -19,7 +19,7 @@ public function run()
         $dataRow = $this->dataRow($notificationDataType, 'id');
         if (!$dataRow->exists) {
             $dataRow->fill([
-                'type'         => 'number',
+                'type'         => 'text',
                 'display_name' => __('joy-voyager-bread-notification::seeders.data_rows.id'),
                 'required'     => 1,
                 'browse'       => 0,
@@ -31,11 +31,11 @@ public function run()
             ])->save();
         }
 
-        $dataRow = $this->dataRow($notificationDataType, 'name');
+        $dataRow = $this->dataRow($notificationDataType, 'type');
         if (!$dataRow->exists) {
             $dataRow->fill([
                 'type'         => 'text',
-                'display_name' => __('joy-voyager-bread-notification::seeders.data_rows.name'),
+                'display_name' => __('joy-voyager-bread-notification::seeders.data_rows.type'),
                 'required'     => 1,
                 'browse'       => 1,
                 'read'         => 1,
@@ -46,11 +46,11 @@ public function run()
             ])->save();
         }
 
-        $dataRow = $this->dataRow($notificationDataType, 'description');
+        $dataRow = $this->dataRow($notificationDataType, 'notifiable_type');
         if (!$dataRow->exists) {
             $dataRow->fill([
                 'type'         => 'text',
-                'display_name' => __('joy-voyager-bread-notification::seeders.data_rows.description'),
+                'display_name' => __('joy-voyager-bread-notification::seeders.data_rows.notifiable_type'),
                 'required'     => 1,
                 'browse'       => 1,
                 'read'         => 1,
@@ -61,6 +61,36 @@ public function run()
             ])->save();
         }
 
+        $dataRow = $this->dataRow($notificationDataType, 'notifiable_id');
+        if (!$dataRow->exists) {
+            $dataRow->fill([
+                'type'         => 'text',
+                'display_name' => __('joy-voyager-bread-notification::seeders.data_rows.notifiable_id'),
+                'required'     => 1,
+                'browse'       => 1,
+                'read'         => 1,
+                'edit'         => 1,
+                'add'          => 1,
+                'delete'       => 1,
+                'order'        => 4,
+            ])->save();
+        }
+
+        $dataRow = $this->dataRow($notificationDataType, 'data');
+        if (!$dataRow->exists) {
+            $dataRow->fill([
+                'type'         => 'code_editor',
+                'display_name' => __('joy-voyager-bread-notification::seeders.data_rows.data'),
+                'required'     => 1,
+                'browse'       => 1,
+                'read'         => 1,
+                'edit'         => 1,
+                'add'          => 1,
+                'delete'       => 1,
+                'order'        => 5,
+            ])->save();
+        }
+
         $dataRow = $this->dataRow($notificationDataType, 'created_at');
         if (!$dataRow->exists) {
             $dataRow->fill([
@@ -91,21 +121,6 @@ public function run()
             ])->save();
         }
 
-        $dataRow = $this->dataRow($notificationDataType, 'image');
-        if (!$dataRow->exists) {
-            $dataRow->fill([
-                'type'         => 'image',
-                'display_name' => __('joy-voyager-bread-notification::seeders.data_rows.image'),
-                'required'     => 0,
-                'browse'       => 1,
-                'read'         => 1,
-                'edit'         => 1,
-                'add'          => 1,
-                'delete'       => 1,
-                'order'        => 8,
-            ])->save();
-        }
-
         $dataRow = $this->dataRow($notificationDataType, 'notification_belongsto_created_by_relationship');
         if (!$dataRow->exists) {
             $dataRow->fill([

diff --git a/database/seeders/DummyNotificationsTableSeeder.php b/database/seeders/DummyNotificationsTableSeeder.php
@@ -14,21 +14,6 @@ class DummyNotificationsTableSeeder extends Seeder
      */
     public function run()
     {
-        $count = 20;
-        Notification::factory()
-            ->count($count)
-            ->state(function (array $attributes) use ($count) {
-                return [
-                    'name' => 'Notification ' . time()
-                        . ' ' . rand(1, $count)
-                        . ' ' . rand(1, $count)
-                        . ' ' . rand(1, $count),
-                    'description' => 'Notification Description ' . time()
-                        . ' ' . rand(1, $count)
-                        . ' ' . rand(1, $count)
-                        . ' ' . rand(1, $count)
-                ];
-            })
-            ->create();
+        //
     }
 }
diff --git a/database/seeders/NotificationsTableSeeder.php b/database/seeders/NotificationsTableSeeder.php
@@ -18,21 +18,6 @@ public function run()
             return false;
         }
 
-        $count = 20;
-        Notification::factory()
-            ->count($count)
-            ->state(function (array $attributes) use ($count) {
-                return [
-                    'name' => 'Notification ' . time()
-                        . ' ' . rand(1, $count)
-                        . ' ' . rand(1, $count)
-                        . ' ' . rand(1, $count),
-                    'description' => 'Notification Description ' . time()
-                        . ' ' . rand(1, $count)
-                        . ' ' . rand(1, $count)
-                        . ' ' . rand(1, $count)
-                ];
-            })
-            ->create();
+        //
     }
 }
diff --git a/database/seeders/TranslationsTableSeeder.php b/database/seeders/TranslationsTableSeeder.php
@@ -31,16 +31,6 @@ private function notificationsTranslations()
     {
         // Adding translations for 'notifications'
         //
-        $cat = Notification::where('name', 'notification-1')->first();
-        if ($cat->exists) {
-            $this->trans('pt', $this->arr(['notifications', 'name'], $cat->id), 'notification-1');
-            $this->trans('pt', $this->arr(['notifications', 'description'], $cat->id), 'Notification 1');
-        }
-        $cat = Notification::where('name', 'notification-2')->first();
-        if ($cat->exists) {
-            $this->trans('pt', $this->arr(['notifications', 'name'], $cat->id), 'notification-2');
-            $this->trans('pt', $this->arr(['notifications', 'description'], $cat->id), 'Notification 2');
-        }
     }
 
     /**

diff --git a/resources/lang/en/seeders.php b/resources/lang/en/seeders.php
@@ -2,9 +2,10 @@
 
 return [
     'data_rows' => [
-        'name'        => 'Name',
-        'description' => 'Description',
-        'image'       => 'Image',
+        'type'        => 'Type',
+        'notifiable_type' => 'Notifiable type',
+        'notifiable_id'       => 'Notifiable id',
+        'data'       => 'Data',
         'created_by'  => 'Created by',
         'modified_by' => 'Modified by',
         'assigned_to' => 'Assigned to',

diff --git a/src/Models/Notification.php b/src/Models/Notification.php
@@ -3,24 +3,13 @@
 namespace Joy\VoyagerBreadNotification\Models;
 
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Notifications\Notifiable;
+use Illuminate\Notifications\DatabaseNotification;
 use Illuminate\Support\Facades\Auth;
-use Joy\VoyagerBreadNotification\Database\Factories\NotificationFactory;
+use Ramsey\Uuid\Uuid;
 use TCG\Voyager\Facades\Voyager;
-use TCG\Voyager\Traits\Resizable;
-use TCG\Voyager\Traits\Translatable;
 
-class Notification extends Model
+class Notification extends DatabaseNotification
 {
-    use HasFactory;
-    use Notifiable;
-    use Translatable;
-    use Resizable;
-
-    protected $translatable = ['name', 'description'];
-
     public const ACTIVE   = 'ACTIVE';
     public const INACTIVE = 'INACTIVE';
     public const EXPIRED  = 'EXPIRED';
@@ -38,6 +27,10 @@ public function save(array $options = [])
             $this->modified_by_id = Auth::user()->getKey();
         }
 
+        if (empty($this->{$this->getKeyName()})) {
+            $this->{$this->getKeyName()} = Uuid::uuid4()->toString();
+        }
+
         return parent::save();
     }
 
@@ -99,14 +92,4 @@ public function parent()
     {
         return $this->belongsTo(Voyager::modelClass('Notification'));
     }
-
-    /**
-     * Create a new factory instance for the model.
-     *
-     * @return \Illuminate\Database\Eloquent\Factories\Factory
-     */
-    protected static function newFactory()
-    {
-        return new NotificationFactory();
-    }
 }