Merge pull request #3567 from MinThaMie/3562-not-notify-maintenance

Make maintenance also optional to notify subscribers
cachethq · Jun 23, 2019 · 066837f · 066837f
2 parents ea8c945 + 29e0cf9
commit 066837f
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 10 deletions.
diff --git a/app/Bus/Commands/Schedule/CreateScheduleCommand.php b/app/Bus/Commands/Schedule/CreateScheduleCommand.php
@@ -60,6 +60,13 @@ final class CreateScheduleCommand
      */
     public $components;
 
+    /**
+     * Whether to notify that the incident was reported.
+     *
+     * @var bool
+     */
+    public $notify;
+
     /**
      * The validation rules.
      *
@@ -72,6 +79,7 @@ final class CreateScheduleCommand
         'scheduled_at' => 'required|string',
         'completed_at' => 'nullable|string',
         'components'   => 'nullable|array',
+        'notify'       => 'nullable|bool',
     ];
 
     /**
@@ -83,16 +91,18 @@ final class CreateScheduleCommand
      * @param string $scheduled_at
      * @param string $completed_at
      * @param array  $components
+     * @param bool   $notify
      *
      * @return void
      */
-    public function __construct($name, $message, $status, $scheduled_at, $completed_at, array $components = [])
+    public function __construct($name, $message, $status, $scheduled_at, $completed_at, $components, $notify)
     {
         $this->name = $name;
         $this->message = $message;
         $this->status = $status;
         $this->scheduled_at = $scheduled_at;
         $this->completed_at = $completed_at;
         $this->components = $components;
+        $this->notify = $notify;
     }
 }
diff --git a/app/Bus/Events/Schedule/ScheduleWasCreatedEvent.php b/app/Bus/Events/Schedule/ScheduleWasCreatedEvent.php
@@ -36,18 +36,27 @@ final class ScheduleWasCreatedEvent implements ActionInterface, ScheduleEventInt
      */
     public $schedule;
 
+    /**
+     * Whether to notify that the incident was reported.
+     *
+     * @var bool
+     */
+    public $notify;
+
     /**
      * Create a new schedule was created event instance.
      *
      * @param \CachetHQ\Cachet\Models\User     $user
      * @param \CachetHQ\Cachet\Models\Schedule $schedule
+     * @param bool notify
      *
      * @return void
      */
-    public function __construct(User $user, Schedule $schedule)
+    public function __construct(User $user, Schedule $schedule, $notify = false)
     {
         $this->user = $user;
         $this->schedule = $schedule;
+        $this->notify = $notify;
     }
 
     /**

diff --git a/app/Bus/Handlers/Commands/Schedule/CreateScheduleCommandHandler.php b/app/Bus/Handlers/Commands/Schedule/CreateScheduleCommandHandler.php
@@ -66,8 +66,7 @@ public function handle(CreateScheduleCommand $command)
     {
         try {
             $schedule = Schedule::create($this->filter($command));
-
-            event(new ScheduleWasCreatedEvent($this->auth->user(), $schedule));
+            event(new ScheduleWasCreatedEvent($this->auth->user(), $schedule, (bool) $command->notify));
         } catch (InvalidArgumentException $e) {
             throw new ValidationException(new MessageBag([$e->getMessage()]));
         }
@@ -96,6 +95,7 @@ protected function filter(CreateScheduleCommand $command)
             'status'       => $command->status,
             'scheduled_at' => $scheduledAt,
             'completed_at' => $completedAt,
+            'notify'       => $command->notify,
         ];
 
         $availableParams = array_filter($params, function ($val) {

diff --git a/app/Bus/Handlers/Events/Schedule/SendScheduleEmailNotificationHandler.php b/app/Bus/Handlers/Events/Schedule/SendScheduleEmailNotificationHandler.php
@@ -51,6 +51,9 @@ public function __construct(Subscriber $subscriber)
     public function handle(ScheduleEventInterface $event)
     {
         $schedule = $event->schedule;
+        if (!$event->notify) {
+            return false;
+        }
 
         // First notify all global subscribers.
         $globalSubscribers = $this->subscriber->isVerified()->isGlobal()->get()->each(function ($subscriber) use ($schedule) {

diff --git a/app/Http/Controllers/Api/ScheduleController.php b/app/Http/Controllers/Api/ScheduleController.php
@@ -73,7 +73,8 @@ public function store()
                 Binput::get('status'),
                 Binput::get('scheduled_at'),
                 Binput::get('completed_at'),
-                Binput::get('components', [])
+                Binput::get('components', []),
+                Binput::get('notify', false)
             ));
         } catch (QueryException $e) {
             throw new BadRequestHttpException();

diff --git a/app/Http/Controllers/Dashboard/ScheduleController.php b/app/Http/Controllers/Dashboard/ScheduleController.php
@@ -15,6 +15,7 @@
 use CachetHQ\Cachet\Bus\Commands\Schedule\CreateScheduleCommand;
 use CachetHQ\Cachet\Bus\Commands\Schedule\DeleteScheduleCommand;
 use CachetHQ\Cachet\Bus\Commands\Schedule\UpdateScheduleCommand;
+use CachetHQ\Cachet\Integrations\Contracts\System;
 use CachetHQ\Cachet\Models\IncidentTemplate;
 use CachetHQ\Cachet\Models\Schedule;
 use GrahamCampbell\Binput\Facades\Binput;
@@ -35,13 +36,21 @@ class ScheduleController extends Controller
      */
     protected $subMenu = [];
 
+    /**
+     * The system instance.
+     *
+     * @var \CachetHQ\Cachet\Integrations\Contracts\System
+     */
+    protected $system;
+
     /**
      * Creates a new schedule controller instance.
      *
      * @return void
      */
-    public function __construct()
+    public function __construct(System $system)
     {
+        $this->system = $system;
         View::share('subTitle', trans('dashboard.schedule.title'));
     }
 
@@ -70,7 +79,8 @@ public function showAddSchedule()
 
         return View::make('dashboard.maintenance.add')
             ->withPageTitle(trans('dashboard.schedule.add.title').' - '.trans('dashboard.dashboard'))
-            ->withIncidentTemplates($incidentTemplates);
+            ->withIncidentTemplates($incidentTemplates)
+            ->withNotificationsEnabled($this->system->canNotifySubscribers());
     }
 
     /**
@@ -87,7 +97,8 @@ public function addScheduleAction()
                 Binput::get('status', Schedule::UPCOMING),
                 Binput::get('scheduled_at'),
                 Binput::get('completed_at'),
-                Binput::get('components', [])
+                Binput::get('components', []),
+                Binput::get('notify', false)
             ));
         } catch (ValidationException $e) {
             return cachet_redirect('dashboard.schedule.create')

diff --git a/resources/views/dashboard/maintenance/add.blade.php b/resources/views/dashboard/maintenance/add.blade.php
@@ -57,7 +57,15 @@
                             <input type="text" name="completed_at" class="form-control flatpickr-time" data-date-format="Y-m-d H:i" placeholder="{{ trans('forms.schedules.completed_at') }}">
                         </div>
                     </fieldset>
-
+                    @if($notificationsEnabled)
+                    <input type="hidden" name="notify" value="0">
+                    <div class="checkbox">
+                        <label>
+                            <input type="checkbox" name="notify" value="1" checked="{{ Binput::old('notify', 'checked') }}">
+                            {{ trans('forms.incidents.notify_subscribers') }}
+                        </label>
+                    </div>
+                    @endif
                     <div class="form-group">
                         <div class="btn-group">
                             <button type="submit" class="btn btn-success">{{ trans('forms.add') }}</button>

diff --git a/tests/Bus/Commands/Schedule/CreateScheduleCommandTest.php b/tests/Bus/Commands/Schedule/CreateScheduleCommandTest.php
@@ -34,14 +34,16 @@ protected function getObjectAndParams()
             'scheduled_at' => date('Y-m-d H:i'),
             'completed_at' => date('Y-m-d H:i'),
             'components'   => [],
+            'notify'       => 1,
         ];
         $object = new CreateScheduleCommand(
             $params['name'],
             $params['message'],
             $params['status'],
             $params['scheduled_at'],
             $params['completed_at'],
-            $params['components']
+            $params['components'],
+            $params['notify']
         );
 
         return compact('params', 'object');