From 0e0f07ebb8ee4e0720e848f2599d1f87b4ff7529 Mon Sep 17 00:00:00 2001 From: alessandrofuda Date: Mon, 20 May 2024 18:07:30 +0200 Subject: [PATCH 1/4] removing form vcs custom repo name --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 835fad7..6dd8fb2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,9 @@ composer.phar composer.lock /vendor/ +# custom - ale 20/05/24 +composer.json + ### Node ### node_modules/ From 76c73cd354eb6e7384980d293427b583d7add313 Mon Sep 17 00:00:00 2001 From: alessandrofuda Date: Mon, 20 May 2024 18:14:41 +0200 Subject: [PATCH 2/4] start ignoring composer.json on git --- composer.json | 55 --------------------------------------------------- 1 file changed, 55 deletions(-) delete mode 100644 composer.json diff --git a/composer.json b/composer.json deleted file mode 100644 index 862442c..0000000 --- a/composer.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "name": "romanzipp/laravel-queue-monitor", - "description": "Queue Monitoring for Laravel Database Job Queue", - "type": "library", - "license": "MIT", - "authors": [ - { - "name": "romanzipp", - "email": "ich@ich.wtf", - "homepage": "https://ich.wtf" - } - ], - "require": { - "php": "^8.0", - "ext-json": "*", - "ext-mbstring": "*", - "illuminate/database": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", - "illuminate/queue": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", - "illuminate/support": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", - "nesbot/carbon": "^2.0|^3.0" - }, - "require-dev": { - "doctrine/dbal": "^3.1", - "friendsofphp/php-cs-fixer": "^3.0", - "laravel/framework": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", - "mockery/mockery": "^1.3.2", - "orchestra/testbench": ">=3.8", - "phpstan/phpstan": "^0.12.99|^1.0", - "phpunit/phpunit": "^8.5.23|^9.0|^10.5", - "romanzipp/php-cs-fixer-config": "^3.0" - }, - "autoload": { - "psr-4": { - "romanzipp\\QueueMonitor\\": "src" - } - }, - "autoload-dev": { - "psr-4": { - "romanzipp\\QueueMonitor\\Tests\\": "tests" - } - }, - "scripts": { - "test": "vendor/bin/phpunit" - }, - "extra": { - "laravel": { - "providers": [ - "romanzipp\\QueueMonitor\\Providers\\QueueMonitorProvider" - ] - } - }, - "config": { - "sort-packages": true - } -} From 3d59861fb431487e3d1b82e22875235cc825aaf2 Mon Sep 17 00:00:00 2001 From: alessandrofuda Date: Tue, 21 May 2024 15:40:33 +0200 Subject: [PATCH 3/4] main events dispatched from Monitor Model --- src/Events/MonitorCreated.php | 23 +++++++++++++++++++++++ src/Events/MonitorCreating.php | 23 +++++++++++++++++++++++ src/Events/MonitorDeleted.php | 23 +++++++++++++++++++++++ src/Events/MonitorDeleting.php | 23 +++++++++++++++++++++++ src/Models/Monitor.php | 17 +++++++++++++++++ 5 files changed, 109 insertions(+) create mode 100644 src/Events/MonitorCreated.php create mode 100644 src/Events/MonitorCreating.php create mode 100644 src/Events/MonitorDeleted.php create mode 100644 src/Events/MonitorDeleting.php diff --git a/src/Events/MonitorCreated.php b/src/Events/MonitorCreated.php new file mode 100644 index 0000000..3ecba0a --- /dev/null +++ b/src/Events/MonitorCreated.php @@ -0,0 +1,23 @@ +monitor = $monitor; + } +} diff --git a/src/Events/MonitorCreating.php b/src/Events/MonitorCreating.php new file mode 100644 index 0000000..baee27a --- /dev/null +++ b/src/Events/MonitorCreating.php @@ -0,0 +1,23 @@ +monitor = $monitor; + } +} diff --git a/src/Events/MonitorDeleted.php b/src/Events/MonitorDeleted.php new file mode 100644 index 0000000..16ce31b --- /dev/null +++ b/src/Events/MonitorDeleted.php @@ -0,0 +1,23 @@ +monitor = $monitor; + } +} diff --git a/src/Events/MonitorDeleting.php b/src/Events/MonitorDeleting.php new file mode 100644 index 0000000..b758356 --- /dev/null +++ b/src/Events/MonitorDeleting.php @@ -0,0 +1,23 @@ +monitor = $monitor; + } +} diff --git a/src/Models/Monitor.php b/src/Models/Monitor.php index baca33b..e8bb650 100644 --- a/src/Models/Monitor.php +++ b/src/Models/Monitor.php @@ -11,6 +11,10 @@ use Illuminate\Support\Facades\Artisan; use romanzipp\QueueMonitor\Enums\MonitorStatus; use romanzipp\QueueMonitor\Models\Contracts\MonitorContract; +use romanzipp\QueueMonitor\Events\MonitorDeleting; +use romanzipp\QueueMonitor\Events\MonitorDeleted; +use romanzipp\QueueMonitor\Events\MonitorCreating; +use romanzipp\QueueMonitor\Events\MonitorCreated; /** * @property int $id @@ -62,6 +66,19 @@ class Monitor extends Model implements MonitorContract */ public $timestamps = false; + /** + * The event map for the model. + * + * @var array + */ + protected $dispatchesEvents = [ + + 'creating' => MonitorCreating::class, + 'created' => MonitorCreated::class, + 'deleting' => MonitorDeleting::class, + 'deleted' => MonitorDeleted::class + ]; + /** * @param array $attributes */ From 737962778a5d2b76981b2f2d4eefbe8d414696d3 Mon Sep 17 00:00:00 2001 From: alessandrofuda Date: Wed, 22 May 2024 09:25:36 +0200 Subject: [PATCH 4/4] restore composer.json and .gitignore --- .gitignore | 3 --- composer.json | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 composer.json diff --git a/.gitignore b/.gitignore index 6dd8fb2..835fad7 100644 --- a/.gitignore +++ b/.gitignore @@ -6,9 +6,6 @@ composer.phar composer.lock /vendor/ -# custom - ale 20/05/24 -composer.json - ### Node ### node_modules/ diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..862442c --- /dev/null +++ b/composer.json @@ -0,0 +1,55 @@ +{ + "name": "romanzipp/laravel-queue-monitor", + "description": "Queue Monitoring for Laravel Database Job Queue", + "type": "library", + "license": "MIT", + "authors": [ + { + "name": "romanzipp", + "email": "ich@ich.wtf", + "homepage": "https://ich.wtf" + } + ], + "require": { + "php": "^8.0", + "ext-json": "*", + "ext-mbstring": "*", + "illuminate/database": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", + "illuminate/queue": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", + "illuminate/support": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", + "nesbot/carbon": "^2.0|^3.0" + }, + "require-dev": { + "doctrine/dbal": "^3.1", + "friendsofphp/php-cs-fixer": "^3.0", + "laravel/framework": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", + "mockery/mockery": "^1.3.2", + "orchestra/testbench": ">=3.8", + "phpstan/phpstan": "^0.12.99|^1.0", + "phpunit/phpunit": "^8.5.23|^9.0|^10.5", + "romanzipp/php-cs-fixer-config": "^3.0" + }, + "autoload": { + "psr-4": { + "romanzipp\\QueueMonitor\\": "src" + } + }, + "autoload-dev": { + "psr-4": { + "romanzipp\\QueueMonitor\\Tests\\": "tests" + } + }, + "scripts": { + "test": "vendor/bin/phpunit" + }, + "extra": { + "laravel": { + "providers": [ + "romanzipp\\QueueMonitor\\Providers\\QueueMonitorProvider" + ] + } + }, + "config": { + "sort-packages": true + } +}