Changing model events to use observer classes

Author: REBELinBLUE

Makefile

@@ -96,10 +96,6 @@ coverage: ##@tests Test Coverage HTML
 		--html storage/app/tmp/coverage/ --clover storage/app/tmp/coverage.xml
 	@rm storage/app/tmp/*.cov
 
-phpunit-fast: ##@tests Unit Tests - Excluding slow model tests which touch the database
-	@echo "${GREEN}Fast unit tests${RESET}"
-	@php vendor/bin/phpunit --no-coverage --testsuite "Unit Tests" --exclude-group slow
-
 phpunit: ##@tests Unit Tests
 	@echo "${GREEN}Unit tests${RESET}"
 	@php vendor/bin/phpunit --no-coverage --testsuite "Unit Tests"
@@ -109,7 +105,7 @@ integration: ##@tests Integration Tests
 	@php vendor/bin/phpunit --no-coverage --testsuite "Integration Tests"
 
 quicktest: ##@shortcuts Runs fast tests; these exclude PHPMD, slow unit tests, integration & dusk tests
-quicktest: install-dev lint phpcs phpdoc-check phpcpd phpunit-fast
+quicktest: install-dev lint phpcs phpdoc-check phpcpd
 
 test: ##@shortcuts Runs most tests; but excludes integration & dusk tests
 test: install-dev lint phpcs phpdoc-check phpunit phpcpd phpmd phpstan

app/Channel.php

@@ -5,7 +5,6 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Notifications\Notifiable;
-use REBELinBLUE\Deployer\Notifications\System\NewTestNotification;
 use REBELinBLUE\Deployer\Traits\BroadcastChanges;
 
 /**
@@ -67,20 +66,6 @@ public function project()
         return $this->belongsTo(Project::class);
     }
 
-    /**
-     * Override the boot method to bind model event listeners.
-     */
-    public static function boot()
-    {
-        parent::boot();
-
-        // When the notification has been saved queue a test
-        static::saved(function (Channel $model) {
-            // FIXME: Change to use an event listener
-            $model->notify(new NewTestNotification(app('translator')));
-        });
-    }
-
     /**
      * Returns the email address to send the notification to.
      *

app/CheckUrl.php

@@ -4,18 +4,14 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Foundation\Bus\DispatchesJobs;
-use REBELinBLUE\Deployer\Events\UrlDown;
-use REBELinBLUE\Deployer\Events\UrlUp;
-use REBELinBLUE\Deployer\Jobs\RequestProjectCheckUrl;
 use REBELinBLUE\Deployer\Traits\BroadcastChanges;
 
 /**
  * The application's url store for health check.
  */
 class CheckUrl extends Model
 {
-    use SoftDeletes, BroadcastChanges, DispatchesJobs;
+    use SoftDeletes, BroadcastChanges;
 
     const ONLINE   = 0;
     const UNTESTED = 1;
@@ -55,21 +51,6 @@ class CheckUrl extends Model
      */
     protected $dates = ['last_seen'];
 
-    /**
-     * Override the boot method to bind model event listeners.
-     */
-    public static function boot()
-    {
-        parent::boot();
-
-        // When saving the model, if the URL has changed we need to test it
-        static::saved(function (CheckUrl $model) {
-            if ($model->status === self::UNTESTED) {
-                $model->dispatch(new RequestProjectCheckUrl(collect([$model])));
-            }
-        });
-    }
-
     /**
      * Define a mutator to set the status to untested if the URL changes.
      *
@@ -92,17 +73,9 @@ public function setUrlAttribute($value)
      */
     public function online()
     {
-        $isCurrentlyHealthy = ($this->status === self::UNTESTED || $this->isHealthy());
-
         $this->status    = self::ONLINE;
         $this->missed    = 0;
         $this->last_seen = $this->freshTimestamp();
-
-        if (!$isCurrentlyHealthy) {
-            event(new UrlUp($this));
-        }
-
-        return $this->save();
     }
 
     /**
@@ -112,12 +85,8 @@ public function online()
      */
     public function offline()
     {
-        $this->status    = self::OFFLINE;
-        $this->missed    = $this->missed + 1;
-
-        event(new UrlDown($this));
-
-        return $this->save();
+        $this->status = self::OFFLINE;
+        $this->missed = $this->missed + 1;
     }
 
     /**

app/Deployment.php

@@ -78,6 +78,7 @@ public static function boot()
     {
         parent::boot();
 
+        // FIXME: Change to use the trait
         static::saved(function (Deployment $model) {
             event(new ModelChanged($model, 'deployment'));
         });

app/Listeners/ClearJwt.php renamed to app/Events/Listeners/ClearJwt.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace REBELinBLUE\Deployer\Listeners;
+namespace REBELinBLUE\Deployer\Events\Listeners;
 
 use Illuminate\Session\Store;
 

app/Listeners/CreateJwt.php renamed to app/Events/Listeners/CreateJwt.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace REBELinBLUE\Deployer\Listeners;
+namespace REBELinBLUE\Deployer\Events\Listeners;
 
 use Carbon\Carbon;
 use Illuminate\Auth\Events\Login;

app/Listeners/SendCheckUrlNotification.php renamed to app/Events/Listeners/SendCheckUrlNotifications.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace REBELinBLUE\Deployer\Listeners;
+namespace REBELinBLUE\Deployer\Events\Listeners;
 
 use Illuminate\Contracts\Translation\Translator;
 use REBELinBLUE\Deployer\Events\UrlChanged;
@@ -10,7 +10,7 @@
 /**
  * Event handler class for URL notifications.
  **/
-class SendCheckUrlNotification
+class SendCheckUrlNotifications
 {
     /**
      * @var Translator

app/Listeners/SendDeploymentNotifications.php renamed to app/Events/Listeners/SendDeploymentNotifications.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace REBELinBLUE\Deployer\Listeners;
+namespace REBELinBLUE\Deployer\Events\Listeners;
 
 use Illuminate\Contracts\Translation\Translator;
 use REBELinBLUE\Deployer\Events\DeploymentFinished;
@@ -41,6 +41,7 @@ public function handle(DeploymentFinished $event)
 
         $notification = DeploymentFailed::class;
         $event        = 'deployment_failure';
+
         if ($deployment->isSuccessful()) {
             $notification = DeploymentSucceeded::class;
             $event        = 'deployment_success';

app/Listeners/SendEmailChangeConfirmation.php renamed to app/Events/Listeners/SendEmailChangeConfirmation.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace REBELinBLUE\Deployer\Listeners;
+namespace REBELinBLUE\Deployer\Events\Listeners;
 
 use Illuminate\Contracts\Translation\Translator;
 use REBELinBLUE\Deployer\Events\EmailChangeRequested;

app/Listeners/SendHeartbeatNotification.php renamed to app/Events/Listeners/SendHeartbeatNotifications.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace REBELinBLUE\Deployer\Listeners;
+namespace REBELinBLUE\Deployer\Events\Listeners;
 
 use Illuminate\Contracts\Translation\Translator;
 use REBELinBLUE\Deployer\Events\HeartbeatChanged;
@@ -10,7 +10,7 @@
 /**
  * Event handler class for heartbeat notifications.
  **/
-class SendHeartbeatNotification
+class SendHeartbeatNotifications
 {
     /**
      * @var Translator
@@ -36,6 +36,7 @@ public function handle(HeartbeatChanged $event)
 
         $notification = HeartbeatRecovered::class;
         $event        = 'heartbeat_recovered';
+
         if (!$heartbeat->isHealthy()) {
             $notification = HeartbeatMissing::class;
             $event        = 'heartbeat_missing';