diff --git a/src/Db/Events/Logger.php b/src/Db/Events/Logger.php index 6c478c8a..8313f231 100644 --- a/src/Db/Events/Logger.php +++ b/src/Db/Events/Logger.php @@ -15,6 +15,7 @@ use Phalcon\Events\EventInterface; use Phalcon\Mvc\ModelInterface; use Zemit\Di\Injectable; +use Zemit\Models\Interfaces\SessionInterface; /** * @todo review @@ -31,11 +32,7 @@ public function beforeQuery(EventInterface $event, AbstractAdapter $connection): // deactivate logger $this->inProgress = true; - - $session = $this->identity->getSession(); - assert($session instanceof ModelInterface); - - $sessionId = $session->readAttribute('id'); + $sessionId = $this->identity->getSession()?->getId(); $userId = $this->identity->getUserId() ?: null; $userAsId = $this->identity->getUserAsId() ?: null; @@ -44,10 +41,14 @@ public function beforeQuery(EventInterface $event, AbstractAdapter $connection): 'sessionId' => $sessionId, 'userId' => $userId, 'userAsId' => $userAsId, + 'event' => [ + 'type' => $event->getType(), + 'data' => $event->getData(), + ], 'meta' => [ // 'identity' => $this->identity->getIdentity(), 'sqlStatement' => $connection->getSQLStatement(), - 'sqlVariables' => $connection->getSqlVariables(), + 'sqlVariables' => $connection->getSQLVariables(), ], ]);