fix: adjust entitymanager closing

app/Builder/AppBuilderManager.php

@@ -8,7 +8,6 @@
 use Core\Http\Adapters\SlimFramework\SlimRouteCollector;
 use Core\Http\RouterCollector;
 use Exception;
-use MiddlewareCollector;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Respect\Validation\Factory;

app/Builder/MiddlewareCollector.php

@@ -2,14 +2,14 @@
 
 namespace Core\Builder;
 
-use Core\Http\Interfaces\MiddlewareIncluder;
+use Core\Http\Interfaces\MIddlewareIncluderInterface;
 use Core\ResourceLoader;
 use Middlewares\TrailingSlash;
 
 
 class MiddlewareCollector
 {
-    public static function collect(MiddlewareIncluder $root)
+    public static function collect(MIddlewareIncluderInterface $root)
     {
         $root->add(new TrailingSlash());
 

app/Data/Doctrine/EntityManagerBuilder.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Core\Data\Doctrine;
+
+use Doctrine\DBAL\DriverManager;
+use Doctrine\DBAL\Types\Type;
+use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\ORMSetup;
+
+class EntityManagerBuilder
+{
+    public static function produce(array $doctrine): EntityManager
+    {
+        $devMode = $doctrine['dev_mode'];
+
+        $config = ORMSetup::createAttributeMetadataConfiguration(
+            $doctrine['metadata_dirs'],
+            $devMode
+        );
+
+        if (!Type::hasType('uuid')) {
+            Type::addType('uuid', 'Ramsey\Uuid\Doctrine\UuidType');
+        }
+
+
+        $connection = DriverManager::getConnection(
+            $doctrine['connection'],
+            $config
+        );
+
+        $entityManager = new EntityManager($connection, $config);
+
+        if (!Type::hasType('uuid_binary')) {
+            Type::addType('uuid_binary', 'Ramsey\Uuid\Doctrine\UuidBinaryType');
+            $entityManager->getConnection()->getDatabasePlatform()->registerDoctrineTypeMapping('uuid_binary', 'binary');
+        }
+
+        return $entityManager;
+    }
+}

app/Decorators/ReopeningEntityManagerDecorator.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Core\Decorators;
+
+use Core\Data\Doctrine\EntityManagerBuilder;
+use Doctrine\ORM\Decorator\EntityManagerDecorator;
+use Psr\Container\ContainerInterface;
+
+class ReopeningEntityManagerDecorator extends EntityManagerDecorator
+{
+    public function __construct(private ContainerInterface $container)
+    {
+        parent::__construct(EntityManagerBuilder::produce($container->get('settings')['doctrine']));
+    }
+
+    public function open(): void
+    {
+        if (!$this->wrapped->isOpen()) {
+            $settings = $this->container->get('settings');
+            $doctrine = $settings['doctrine'];
+
+            $this->wrapped = EntityManagerBuilder::produce($doctrine);
+        }
+    }
+}

app/Definitions/database.php

@@ -1,43 +1,17 @@
 <?php
 
-use Doctrine\DBAL\Types\Type;
+declare(strict_types=1);
+
+
 use Doctrine\ORM\EntityManager;
-use Doctrine\ORM\Tools\Setup;
 use Psr\Container\ContainerInterface;
-use Doctrine\Common\Cache\Psr6\DoctrineProvider;
-use Symfony\Component\Cache\Adapter\ArrayAdapter;
-use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+use Core\Data\Doctrine\EntityManagerBuilder;
 
 return [
     EntityManager::class => static function (ContainerInterface $container): EntityManager {
         $settings = $container->get('settings');
         $doctrine = $settings['doctrine'];
 
-        $cache = $doctrine['dev_mode'] ?
-            DoctrineProvider::wrap(new ArrayAdapter()) :
-            DoctrineProvider::wrap(new FilesystemAdapter(directory: $doctrine['cache_dir']));
-
-        $config = Setup::createAttributeMetadataConfiguration(
-            $doctrine['metadata_dirs'],
-            $doctrine['dev_mode'],
-            null,
-            $cache
-        );
-
-        if (!Type::hasType('uuid')) {
-            Type::addType('uuid', 'Ramsey\Uuid\Doctrine\UuidType');
-        }
-
-        $entityManager = EntityManager::create(
-            $doctrine['connection'],
-            $config
-        );
-
-        if (!Type::hasType('uuid_binary')) {
-            Type::addType('uuid_binary', 'Ramsey\Uuid\Doctrine\UuidBinaryType');
-            $entityManager->getConnection()->getDatabasePlatform()->registerDoctrineTypeMapping('uuid_binary', 'binary');
-        }
-
-        return $entityManager;
+        return EntityManagerBuilder::produce($doctrine);
     },
-];
+];

app/Definitions/middlewares.php

@@ -2,11 +2,13 @@
 
 use App\Presentation\Middleware\JWTAuthMiddleware;
 use App\Presentation\Middleware\SessionMiddleware;
+use Core\Http\Middlewares\DatabaseKeepAliveMiddleware;
 use Slim\Middleware\BodyParsingMiddleware;
 
 return [
     SessionMiddleware::class,
     JWTAuthMiddleware::class,
-    BodyParsingMiddleware::class
+    BodyParsingMiddleware::class,
+    DatabaseKeepAliveMiddleware::class
     //ErrorMiddleware::class
 ];

app/Http/Adapters/SlimFramework/SlimMiddlewareIncluder.php

@@ -2,11 +2,11 @@
 
 namespace Core\Http\Adapters\SlimFramework;
 
-use Core\Http\Interfaces\MiddlewareIncluder;
+use Core\Http\Interfaces\MIddlewareIncluderInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Slim\App;
 
-class SlimMiddlewareIncluder implements MiddlewareIncluder
+class SlimMiddlewareIncluder implements MIddlewareIncluderInterface
 {
     public function __construct(private App $app)
     {

app/Http/Interfaces/MIddlewareIncluder.php → app/Http/Interfaces/MIddlewareIncluderInterface.php

@@ -4,7 +4,7 @@
 
 use Psr\Http\Server\MiddlewareInterface;
 
-interface MiddlewareIncluder
+interface MIddlewareIncluderInterface
 {
     function add(\Closure|MiddlewareInterface|string $middleware): void;
 }

app/Http/Middlewares/DatabaseKeepAliveMiddleware.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Core\Http\Middlewares;
+
+
+use Core\Decorators\ReopeningEntityManagerDecorator;
+use Psr\Container\ContainerInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+
+class DatabaseKeepAliveMiddleware implements MiddlewareInterface
+{
+    public function __construct(
+        private ReopeningEntityManagerDecorator $reopeningEntityManagerDecorator,
+        private ContainerInterface $containerInterface
+    ) {
+    }
+
+    function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        $this->reopeningEntityManagerDecorator->open();
+
+        try {
+            return $handler->handle($request);
+        } finally {
+            $this->reopeningEntityManagerDecorator->getConnection()->close();
+            $this->reopeningEntityManagerDecorator->clear();
+        }
+    }
+}