Add the afterFindEntity to the CrudViewAction

CakeDC · Jan 30, 2024 · 913b13d · 913b13d
1 parent 582934a
commit 913b13d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/docs/Documentation/overview.md b/docs/Documentation/overview.md
@@ -125,6 +125,7 @@ Crud actions define some events that depend on the type of action and more detai
 * Action.Crud.onFindEntities (applied for index action)
 * Action.Crud.afterFindEntities (applied for index action)
 * Action.Crud.onFindEntity (applied for view action)
+* Action.Crud.afterFindEntity (applied for view action)
 
 
 ### Listing Service.

diff --git a/src/Service/Action/CrudAction.php b/src/Service/Action/CrudAction.php
@@ -261,7 +261,13 @@ protected function _getEntity($primaryKey)
             $query = $event->getResult();
         }
 
-        return $query->firstOrFail();
+        $record = $query->firstOrFail();
+        $event = $this->dispatchEvent('Action.Crud.afterFindEntity', ['query' => $query, 'record' => $record]);
+        if ($event->getResult() !== null) {
+            $record = $event->getResult();
+        }
+
+        return $record;
     }
 
     /**

diff --git a/tests/TestCase/Service/Action/CrudViewActionTest.php b/tests/TestCase/Service/Action/CrudViewActionTest.php
@@ -86,14 +86,18 @@ public function testExecuteSuccess()
             'id' => 1,
         ]);
 
-        $onFindEntity = false;
+        $onFindEntity = $afterFindEntity = false;
         $this->Action->getEventManager()->on('Action.Crud.onFindEntity', function () use (&$onFindEntity) {
             $onFindEntity = true;
         });
+        $this->Action->getEventManager()->on('Action.Crud.afterFindEntity', function () use (&$afterFindEntity) {
+            $afterFindEntity = true;
+        });
 
         $result = $this->Action->execute();
         $this->assertTrue($result instanceof EntityInterface);
         $this->assertTrue($onFindEntity);
+        $this->assertTrue($afterFindEntity);
     }
 
     /**