Website integration

app/Console/Commands/Dev/FixupCSpecApprovalDates.php

@@ -70,7 +70,7 @@ private function updateStepForAllApplications($step, $eventName)
                 $expertPanel->save();
                 Event::dispatch(
                     new StepDateApprovedUpdated(
-                        application: $expertPanel,
+                        expertPanel: $expertPanel,
                         step: $step,
                         dateApproved: $dateApproved
                     )

app/Modules/ExpertPanel/Actions/ApplicationDocumentAdd.php

@@ -50,7 +50,7 @@ public function handle(
         $this->updateOrTouchExpertPanel($expertPanel, $document);
 
         $event = new DocumentAdded(
-            application: $expertPanel,
+            expertPanel: $expertPanel,
             document: $document
         );
         Event::dispatch($event);

app/Modules/ExpertPanel/Actions/CompleteNextAction.php

@@ -36,6 +36,6 @@ public function handle()
         $nextAction->save();
         $expertPanel->touch();
 
-        Event::dispatch(new NextActionCompleted(application: $expertPanel, nextAction: $nextAction));
+        Event::dispatch(new NextActionCompleted(expertPanel: $expertPanel, nextAction: $nextAction));
     }
 }

app/Modules/ExpertPanel/Actions/ExpertPanelDelete.php

@@ -15,6 +15,6 @@ public function handle(String $expertPanelUuid)
         $expertPanel = ExpertPanel::findByUuidOrFail($expertPanelUuid);
         $expertPanel->delete();
 
-        event(new ExpertPanelDeleted(application: $expertPanel));
+        event(new ExpertPanelDeleted(expertPanel: $expertPanel));
     }
 }

app/Modules/ExpertPanel/Actions/NextActionComplete.php

@@ -19,7 +19,7 @@ public function handle(ExpertPanel $expertPanel, NextAction $nextAction, ?string
         $nextAction->save();
         $expertPanel->touch();
 
-        Event::dispatch(new NextActionCompleted(application: $expertPanel, nextAction: $nextAction));
+        Event::dispatch(new NextActionCompleted(expertPanel: $expertPanel, nextAction: $nextAction));
 
         return $nextAction;
     }

app/Modules/ExpertPanel/Actions/NextActionUpdate.php

@@ -46,7 +46,7 @@ public function handle(
         DB::transaction(fn () => $nextAction->save());
         $nextAction->update($data);
 
-        event(new NextActionUpdated(application: $expertPanel, nextAction: $nextAction, oldData: $oldData));
+        event(new NextActionUpdated(expertPanel: $expertPanel, nextAction: $nextAction, oldData: $oldData));
 
         return $nextAction->load('assignee');
     }

app/Modules/ExpertPanel/Actions/SpecificationAndRulesetsSync.php

@@ -39,7 +39,7 @@ public function handle(
         }
 
         event(new SpecificationStatusUpdated(
-            application: $expertPanel,
+            expertPanel: $expertPanel,
             specification: $specification,
         ));
 

app/Modules/ExpertPanel/Actions/StepApprovalUpdate.php

@@ -28,7 +28,7 @@ public function handle(string $expertPanelUuid, int $step, string $dateApproved)
 
             Event::dispatch(
                 new StepDateApprovedUpdated(
-                    application: $expertPanel,
+                    expertPanel: $expertPanel,
                     step: $step,
                     dateApproved: $dateApproved
                 )

app/Modules/ExpertPanel/Actions/StepApprove.php

@@ -70,7 +70,7 @@ public function handle(
         }
 
         event(new StepApproved(
-            application: $expertPanel,
+            expertPanel: $expertPanel,
             step: $approvedStep,
             dateApproved: $dateApproved
         ));

app/Modules/ExpertPanel/Events/ApplicationCompleted.php

@@ -21,7 +21,7 @@ class ApplicationCompleted extends ExpertPanelEvent
      *
      * @return void
      */
-    public function __construct(public ExpertPanel  $application)
+    public function __construct(public ExpertPanel  $expertPanel)
     {
 
     }
@@ -33,12 +33,12 @@ public function getLogEntry():string
 
     public function getLogDate():Carbon
     {
-        return $this->application->date_completed;
+        return $this->expertPanel->date_completed;
     }
 
     public function getProperties():array
     {
-        return ['date_completed' => $this->application->date_completed];
+        return ['date_completed' => $this->expertPanel->date_completed];
     }
 
 

app/Modules/ExpertPanel/Events/ApplicationInitiated.php

@@ -14,13 +14,13 @@ class ApplicationInitiated extends ExpertPanelEvent
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
     public function __construct(
-        public ExpertPanel  $application
+        public ExpertPanel  $expertPanel
     )
     {}
 
     public function getProperties():array
     {
-        return $this->application->getAttributes();
+        return $this->expertPanel->getAttributes();
     }
 
     public function getLogEntry():string
@@ -30,7 +30,7 @@ public function getLogEntry():string
 
     public function getLogDate():Carbon
     {
-        return $this->application->date_initiated;
+        return $this->expertPanel->date_initiated;
     }
 
     public function getStep()

app/Modules/ExpertPanel/Events/ContactAdded.php

@@ -21,7 +21,7 @@ class ContactAdded extends ExpertPanelEvent
      *
      * @return void
      */
-    public function __construct(public ExpertPanel  $application, public Person $person)
+    public function __construct(public ExpertPanel  $expertPanel, public Person $person)
     {}
 
     public function getLogEntry():string

app/Modules/ExpertPanel/Events/ContactRemoved.php

@@ -22,7 +22,7 @@ class ContactRemoved extends ExpertPanelEvent
      *
      * @return void
      */
-    public function __construct(public ExpertPanel  $application, public Person $person)
+    public function __construct(public ExpertPanel  $expertPanel, public Person $person)
     {
         //
     }

app/Modules/ExpertPanel/Events/DocumentAdded.php

@@ -24,7 +24,7 @@ class DocumentAdded extends ExpertPanelEvent
      * @return void
      */
     public function __construct(
-        public ExpertPanel $application,
+        public ExpertPanel $expertPanel,
         public Document $document
     ) {
         //

app/Modules/ExpertPanel/Events/DocumentDeleted.php

@@ -21,7 +21,7 @@ class DocumentDeleted extends ExpertPanelEvent
      *
      * @return void
      */
-    public function __construct(public ExpertPanel  $application, public Document $document)
+    public function __construct(public ExpertPanel  $expertPanel, public Document $document)
     {
         //
     }

app/Modules/ExpertPanel/Events/DocumentInfoUpdated.php

@@ -21,7 +21,7 @@ class DocumentInfoUpdated extends ExpertPanelEvent
      *
      * @return void
      */
-    public function __construct(public ExpertPanel  $application, public Document $document)
+    public function __construct(public ExpertPanel  $expertPanel, public Document $document)
     {
     }
 

app/Modules/ExpertPanel/Events/DocumentMarkedFinal.php

@@ -21,7 +21,7 @@ class DocumentMarkedFinal extends ExpertPanelEvent
      *
      * @return void
      */
-    public function __construct(public ExpertPanel  $application, public Document $document)
+    public function __construct(public ExpertPanel  $expertPanel, public Document $document)
     {
         //
     }

app/Modules/ExpertPanel/Events/ExpertPanelAttributesUpdated.php

@@ -2,76 +2,50 @@
 
 namespace App\Modules\ExpertPanel\Events;
 
-use App\Events\PublishableEvent;
-use Illuminate\Broadcasting\Channel;
+use App\Modules\Group\Events\PublishableExpertPanelEvent;
+use App\Modules\Group\Events\Traits\IsPublishableExpertPanelEvent;
+use App\Modules\Group\Events\GroupEvent;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Broadcasting\PrivateChannel;
-use Illuminate\Broadcasting\PresenceChannel;
 use App\Modules\ExpertPanel\Models\ExpertPanel;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 
-class ExpertPanelAttributesUpdated extends ExpertPanelEvent implements PublishableEvent
+class ExpertPanelAttributesUpdated extends GroupEvent implements PublishableExpertPanelEvent
 {
-    use Dispatchable, InteractsWithSockets, SerializesModels;
+    use Dispatchable, InteractsWithSockets, SerializesModels, IsPublishableExpertPanelEvent;
 
     /**
      * Create a new event instance.
      *
      * @return void
      */
-    public function __construct(public ExpertPanel $application, public array $attributes)
+    public function __construct(public ExpertPanel $expertPanel, public array $attributes)
     {
+        $this->group = $expertPanel->group;
         //
     }
 
-    public function getLogEntry():string
+    public function getLogEntry(): string
     {
         $parts = [];
-        foreach ($this->attributes as $key=>$value) {
-            $parts[] = $key.' = '.$value;
+        foreach ($this->attributes as $key => $value) {
+            $parts[] = $key . ' = ' . $value;
         }
 
-        return 'Attributes updated: '.implode('; ', $parts);
+        return 'Attributes updated: ' . implode('; ', $parts);
     }
 
-    public function getProperties():array
+    public function getProperties(): array
     {
         return $this->attributes;
     }
 
-    public function getEventType():string
+    public function getEventType(): string
     {
         return 'ep_info_updated';
     }
 
-    public function getPublishableMessage(): array
-    {
-        return [
-            "expert_panel" => [
-                'id' => $this->application->group->uuid,
-                'name' => $this->application->display_name,
-                'type' => $this->application->group->type->name,
-                'affiliation_id' => $this->application->affiliation_id,
-                'long_base_name' => $this->application->long_base_name,
-                'short_base_name' => $this->application->short_base_name,
-                'hypothesis_group' => $this->application->hypothesis_group,
-                'membership_description' => $this->application->membership_description,
-                'scope_description' => $this->application->scope_description
-            ]
-        ];
-    }
-
-    /**
-     * For PublishableEvent interface that is applied to many sub-classes
-     */
-    public function shouldPublish(): bool
-    {
-        return parent::shouldPublish()
-            && $this->application->definitionIsApproved;
-    }
-
     /**
      * Get the channels the event should broadcast on.
      *

app/Modules/ExpertPanel/Events/ExpertPanelDeleted.php

@@ -13,7 +13,7 @@ class ExpertPanelDeleted extends ExpertPanelEvent
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
     public function __construct(
-        public ExpertPanel  $application
+        public ExpertPanel  $expertPanel
     ) {
     }
 

app/Modules/ExpertPanel/Events/ExpertPanelEvent.php

@@ -2,15 +2,13 @@
 
 namespace App\Modules\ExpertPanel\Events;
 
-use DateTime;
 use Illuminate\Queue\SerializesModels;
 use App\Modules\ExpertPanel\Models\ExpertPanel;
 use App\Events\RecordableEvent;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Carbon;
-use Ramsey\Uuid\Type\Integer;
 
 /**
  * @property App\Modules\Group\Models\Group $group
@@ -19,7 +17,7 @@ abstract class ExpertPanelEvent extends RecordableEvent
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
-    public function __construct(public ExpertPanel  $application)
+    public function __construct(public ExpertPanel  $expertPanel)
     {
     }
 
@@ -35,7 +33,7 @@ public function hasSubject():bool
 
     public function getSubject():Model
     {
-        return $this->application->group;
+        return $this->expertPanel->group;
     }
 
     public function getLogDate():Carbon
@@ -45,7 +43,7 @@ public function getLogDate():Carbon
 
     public function getStep()
     {
-        return $this->application->current_step;
+        return $this->expertPanel->current_step;
     }
 
     /**
@@ -66,6 +64,6 @@ public function shouldPublish(): bool
 
     public function __get($key)
     {
-        return $key == 'group' ? $this->application->group : null;
+        return $key == 'group' ? $this->expertPanel->group : null;
     }
 }

app/Modules/ExpertPanel/Events/NextActionAdded.php

@@ -22,7 +22,7 @@ class NextActionAdded extends ExpertPanelEvent
      *
      * @return void
      */
-    public function __construct(public ExpertPanel  $application, public NextAction $nextAction)
+    public function __construct(public ExpertPanel  $expertPanel, public NextAction $nextAction)
     {
     }
 

app/Modules/ExpertPanel/Events/NextActionCompleted.php

@@ -3,15 +3,11 @@
 namespace App\Modules\ExpertPanel\Events;
 
 use Illuminate\Support\Carbon;
-use Illuminate\Broadcasting\Channel;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Broadcasting\PrivateChannel;
-use Illuminate\Broadcasting\PresenceChannel;
 use App\Modules\ExpertPanel\Models\NextAction;
 use Illuminate\Foundation\Events\Dispatchable;
 use App\Modules\ExpertPanel\Models\ExpertPanel;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 
 class NextActionCompleted extends ExpertPanelEvent
 {
@@ -22,7 +18,7 @@ class NextActionCompleted extends ExpertPanelEvent
      *
      * @return void
      */
-    public function __construct(public ExpertPanel  $application, public NextAction $nextAction)
+    public function __construct(public ExpertPanel  $expertPanel, public NextAction $nextAction)
     {
         //
     }

app/Modules/ExpertPanel/Events/NextActionUpdated.php

@@ -22,7 +22,7 @@ class NextActionUpdated extends ExpertPanelEvent
      *
      * @return void
      */
-    public function __construct(public ExpertPanel  $application, public NextAction $nextAction, public array $oldData)
+    public function __construct(public ExpertPanel  $expertPanel, public NextAction $nextAction, public array $oldData)
     {
     }
 

app/Modules/ExpertPanel/Events/SpecificationStatusUpdated.php

@@ -22,7 +22,7 @@ class SpecificationStatusUpdated extends ExpertPanelEvent
      *
      * @return void
      */
-    public function __construct(public ExpertPanel $application, public Specification $specification )
+    public function __construct(public ExpertPanel $expertPanel, public Specification $specification )
     {
     }