refactor: compile vulnerabilities list after catagraphy save (#431)

Author: andreiio

app/DataTransferObjects/VulnerabilityListItem.php

@@ -10,6 +10,7 @@ public function __construct(
         public string $label,
         public string | int | null $value,
         public string | null $type = null,
+        public string | null $category = null,
         public bool $valid = false,
     ) {
         //

app/Filament/Resources/Beneficiaries/Resources/Catagraphies/Concerns/GetRecordFromParentRecord.php

@@ -5,9 +5,11 @@
 namespace App\Filament\Resources\Beneficiaries\Resources\Catagraphies\Concerns;
 
 use App\Models\Catagraphy;
+use Override;
 
 trait GetRecordFromParentRecord
 {
+    #[Override]
     public function mount(int | string | null $record = null): void
     {
         $this->record = $this->getRecord();
@@ -19,8 +21,15 @@ public function mount(int | string | null $record = null): void
         }
     }
 
+    #[Override]
     public function getRecord(): Catagraphy
     {
         return $this->getParentRecord()->catagraphy;
     }
+
+    #[Override]
+    public function hasRecord(): bool
+    {
+        return filled($this->getRecord());
+    }
 }

app/Filament/Resources/Beneficiaries/Resources/Catagraphies/Pages/EditCatagraphy.php

@@ -47,7 +47,7 @@ protected function handleRecordUpdate(Model $record, array $data): Model
     {
         $data['nurse_id'] = auth()->id();
         $data['beneficiary_id'] = $this->getParentRecord()->id;
-        // dd($data);
+
         // Handle pregnancy data
         if (! Vulnerability::isPregnancy($data['cat_rep'])) {
             $data['cat_preg'] = null;
@@ -73,6 +73,31 @@ protected function handleRecordUpdate(Model $record, array $data): Model
             $record->diseases->each->delete();
         }
 
+        // Fix issues with inconsistent calling of $this->record
+        // and $this->getRecord() in the parent class.
+        $this->record = $record;
+
         return $record;
     }
+
+    protected function afterSave()
+    {
+        $catagraphy = $this->getRecord();
+
+        $allVulnerabilities = $catagraphy->all_vulnerabilities_items;
+
+        $properties = collect($allVulnerabilities->pluck('value'))
+            ->concat($allVulnerabilities->pluck('category'))
+            ->filter()
+            ->unique()
+            ->sort()
+            ->values();
+
+        activity('vulnerabilities')
+            ->causedBy(auth()->user())
+            ->performedOn($catagraphy->beneficiary)
+            ->withProperties($properties)
+            ->event('updated')
+            ->log('updated');
+    }
 }

app/Models/Catagraphy.php

@@ -91,18 +91,6 @@ public function tapActivity(Activity $activity, string $eventName)
         $beneficiary = $activity->subject->beneficiary;
 
         $activity->beneficiary()->associate($beneficiary);
-
-        once(
-            fn () => activity('vulnerabilities')
-                ->causedBy($activity->causer)
-                ->performedOn($beneficiary)
-                ->withProperties($this->all_vulnerabilities_items->pluck('value'))
-                ->event($eventName)
-                ->tap(function (Activity $activity) use ($beneficiary) {
-                    $activity->beneficiary()->associate($beneficiary);
-                })
-                ->log($eventName)
-        );
     }
 
     public function nurse(): BelongsTo

app/Models/Disability.php

@@ -96,6 +96,7 @@ public function vulnerabilityListItem(): VulnerabilityListItem
         return new VulnerabilityListItem(
             label: "{$type->name}: {$vulnerability->name}",
             value: $vulnerability->id,
+            category: $type?->id,
             type: $this->getMorphClass(),
             valid: true
         );

app/Models/Disease.php

@@ -110,6 +110,7 @@ public function vulnerabilityListItem(): VulnerabilityListItem
         return new VulnerabilityListItem(
             label: "{$vulnerability->name}: {$category?->name}",
             value: $vulnerability->id,
+            category: $category?->id,
             type: $this->getMorphClass(),
             valid: true
         );

composer.json

@@ -26,7 +26,6 @@
         "spatie/laravel-activitylog": "^4.11",
         "spatie/laravel-csp": "^3.22",
         "spatie/laravel-onboard": "^2.6",
-        "spatie/once": "^3.1",
         "staudenmeir/belongs-to-through": "^2.16",
         "staudenmeir/laravel-merged-relations": "^1.9",
         "stevegrunwell/time-constants": "^1.2",