Merge pull request #19 from bilaliqbalr/patch-1

Moved activity query out of private function
199ocero · Feb 3, 2024 · ac3869b · ac3869b
2 parents c88d2fa + 202281f
commit ac3869b
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/Concerns/HasSetting.php b/src/Concerns/HasSetting.php
@@ -106,17 +106,21 @@ public function activityInfolist(Infolist $infolist): Infolist
             ->columns(1);
     }
 
-    private function getActivityLogRecord(): Collection
-    {
+    protected function getActivites() : \Illuminate\Database\Eloquent\Collection {
         $activityModelClass = config('activitylog.activity_model');
         $activityModel = new $activityModelClass;
 
-        $activities = $activityModel::query()
+        return $activityModel::query()
             ->with(['causer', 'subject'])
             ->where('subject_id', $this->record->id)
             ->where('subject_type', get_class($this->record))
             ->orderBy('created_at', 'desc')
             ->get();
+    }
+
+    private function getActivityLogRecord(): Collection
+    {
+        $activities = $this->getActivites();
 
         $activities->transform(function ($activity) {