fix tests namespace definition

[bookstack] / app / Activity / ActivityQueries.php

diff --git a/app/Activity/ActivityQueries.php b/app/Activity/ActivityQueries.php
index dae0791b1cd85d7ababf89c63ad1070bd7741131..86326fb80af5c93575d71e54dda143d95e7d8de0 100644 (file)
--- a/app/Activity/ActivityQueries.php
+++ b/app/Activity/ActivityQueries.php
@@ -27,14 +27,14 @@ class ActivityQueries
     public function latest(int $count = 20, int $page = 0): array
     {
         $activityList = $this->permissions
     public function latest(int $count = 20, int $page = 0): array
     {
         $activityList = $this->permissions

-            ->restrictEntityRelationQuery(Activity::query(), 'activities', 'entity_id', 'entity_type')
+            ->restrictEntityRelationQuery(Activity::query(), 'activities', 'loggable_id', 'loggable_type')

             ->orderBy('created_at', 'desc')
             ->with(['user'])
             ->skip($count * $page)
             ->take($count)
             ->get();
 
             ->orderBy('created_at', 'desc')
             ->with(['user'])
             ->skip($count * $page)
             ->take($count)
             ->get();
 

-        $this->listLoader->loadIntoRelations($activityList->all(), 'entity', false);
+        $this->listLoader->loadIntoRelations($activityList->all(), 'loggable', false);

 
         return $this->filterSimilar($activityList);
     }
 
         return $this->filterSimilar($activityList);
     }


@@ -59,14 +59,14 @@ class ActivityQueries
         $query->where(function (Builder $query) use ($queryIds) {
             foreach ($queryIds as $morphClass => $idArr) {
                 $query->orWhere(function (Builder $innerQuery) use ($morphClass, $idArr) {
         $query->where(function (Builder $query) use ($queryIds) {
             foreach ($queryIds as $morphClass => $idArr) {
                 $query->orWhere(function (Builder $innerQuery) use ($morphClass, $idArr) {

-                    $innerQuery->where('entity_type', '=', $morphClass)
-                        ->whereIn('entity_id', $idArr);
+                    $innerQuery->where('loggable_type', '=', $morphClass)
+                        ->whereIn('loggable_id', $idArr);

                 });
             }
         });
 
         $activity = $query->orderBy('created_at', 'desc')
                 });
             }
         });
 
         $activity = $query->orderBy('created_at', 'desc')

-            ->with(['entity' => function (Relation $query) {
+            ->with(['loggable' => function (Relation $query) {

                 $query->withTrashed();
             }, 'user.avatar'])
             ->skip($count * ($page - 1))
                 $query->withTrashed();
             }, 'user.avatar'])
             ->skip($count * ($page - 1))


@@ -82,7 +82,7 @@ class ActivityQueries
     public function userActivity(User $user, int $count = 20, int $page = 0): array
     {
         $activityList = $this->permissions
     public function userActivity(User $user, int $count = 20, int $page = 0): array
     {
         $activityList = $this->permissions

-            ->restrictEntityRelationQuery(Activity::query(), 'activities', 'entity_id', 'entity_type')
+            ->restrictEntityRelationQuery(Activity::query(), 'activities', 'loggable_id', 'loggable_type')

             ->orderBy('created_at', 'desc')
             ->where('user_id', '=', $user->id)
             ->skip($count * $page)
             ->orderBy('created_at', 'desc')
             ->where('user_id', '=', $user->id)
             ->skip($count * $page)