Convert ExternalSession code to Doctrine. (#34)

demiankatz · Dec 9, 2024 · fe77e78 · fe77e78
1 parent 9f6bdc5
commit fe77e78
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 288 deletions.
diff --git a/module/VuFind/src/VuFind/Db/Row/ExternalSession.php b/module/VuFind/src/VuFind/Db/Row/ExternalSession.php
diff --git a/module/VuFind/src/VuFind/Db/Row/PluginManager.php b/module/VuFind/src/VuFind/Db/Row/PluginManager.php
@@ -46,7 +46,6 @@ class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
      * @var array
      */
     protected $aliases = [
-        'externalsession' => ExternalSession::class,
         'ratings' => Ratings::class,
         'search' => Search::class,
         'session' => Session::class,
@@ -60,7 +59,6 @@ class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
      * @var array
      */
     protected $factories = [
-        ExternalSession::class => RowGatewayFactory::class,
         Ratings::class => RowGatewayFactory::class,
         Search::class => RowGatewayFactory::class,
         Session::class => RowGatewayFactory::class,

diff --git a/module/VuFind/src/VuFind/Db/Service/ExternalSessionService.php b/module/VuFind/src/VuFind/Db/Service/ExternalSessionService.php
@@ -30,9 +30,8 @@
 namespace VuFind\Db\Service;
 
 use DateTime;
+use VuFind\Db\Entity\ExternalSession;
 use VuFind\Db\Entity\ExternalSessionEntityInterface;
-use VuFind\Db\Table\DbTableAwareInterface;
-use VuFind\Db\Table\DbTableAwareTrait;
 
 /**
  * Database service for external_session table.
@@ -45,19 +44,17 @@
  */
 class ExternalSessionService extends AbstractDbService implements
     ExternalSessionServiceInterface,
-    Feature\DeleteExpiredInterface,
-    DbTableAwareInterface
+    Feature\DeleteExpiredInterface
 {
-    use DbTableAwareTrait;
-
     /**
      * Create a new external session entity.
      *
      * @return ExternalSessionEntityInterface
      */
     public function createEntity(): ExternalSessionEntityInterface
     {
-        return $this->getDbTable('ExternalSession')->createRow();
+        $class = $this->getEntityClass(ExternalSession::class);
+        return new $class();
     }
 
     /**
@@ -90,7 +87,13 @@ public function addSessionMapping(
      */
     public function getAllByExternalSessionId(string $sid): array
     {
-        return iterator_to_array($this->getDbTable('ExternalSession')->select(['external_session_id' => $sid]));
+        $dql = 'SELECT es '
+            . 'FROM ' . $this->getEntityClass(ExternalSession::class) . ' es '
+            . 'WHERE es.externalSessionId = :esid ';
+        $query = $this->entityManager->createQuery($dql);
+        $query->setParameter('esid', $sid);
+        $result = $query->getResult();
+        return $result;
     }
 
     /**
@@ -102,7 +105,11 @@ public function getAllByExternalSessionId(string $sid): array
      */
     public function destroySession(string $sid): void
     {
-        $this->getDbTable('ExternalSession')->delete(['session_id' => $sid]);
+        $dql = 'DELETE FROM ' . $this->getEntityClass(ExternalSession::class) . ' es'
+            . ' WHERE es.sessionId = :sid';
+        $query = $this->entityManager->createQuery($dql);
+        $query->setParameter('sid', $sid);
+        $query->execute();
     }
 
     /**
@@ -115,6 +122,18 @@ public function destroySession(string $sid): void
      */
     public function deleteExpired(DateTime $dateLimit, ?int $limit = null): int
     {
-        return $this->getDbTable('ExternalSession')->deleteExpired($dateLimit->format('Y-m-d H:i:s'), $limit);
+        $subQueryBuilder = $this->entityManager->createQueryBuilder();
+        $subQueryBuilder->select('es.id')
+            ->from($this->getEntityClass(ExternalSession::class), 'es')
+            ->where('es.created < :dateLimit')
+            ->setParameter('dateLimit', $dateLimit);
+        if ($limit) {
+            $subQueryBuilder->setMaxResults($limit);
+        }
+        $queryBuilder = $this->entityManager->createQueryBuilder();
+        $queryBuilder->delete($this->getEntityClass(ExternalSessionEntityInterface::class), 'es')
+            ->where('es.id IN (:ids)')
+            ->setParameter('ids', $subQueryBuilder->getQuery()->getResult());
+        return $queryBuilder->getQuery()->execute();
     }
 }
diff --git a/module/VuFind/src/VuFind/Db/Table/ExternalSession.php b/module/VuFind/src/VuFind/Db/Table/ExternalSession.php
diff --git a/module/VuFind/src/VuFind/Db/Table/PluginManager.php b/module/VuFind/src/VuFind/Db/Table/PluginManager.php
@@ -46,7 +46,6 @@ class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
      * @var array
      */
     protected $aliases = [
-        'externalsession' => ExternalSession::class,
         'ratings' => Ratings::class,
         'search' => Search::class,
         'session' => Session::class,
@@ -60,7 +59,6 @@ class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
      * @var array
      */
     protected $factories = [
-        ExternalSession::class => GatewayFactory::class,
         Ratings::class => GatewayFactory::class,
         Search::class => GatewayFactory::class,
         Session::class => GatewayFactory::class,