perf: mise en cache de requêtes get users/me et datastore/$datastoreI…

…d + nettoyage
IGNF · Dec 2, 2024 · a50019d · a50019d
1 parent b44a7cd
commit a50019d
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 1,270 deletions.
diff --git a/json/getAllDetailed.json b/json/getAllDetailed.json
diff --git a/json/getAllWithFields.json b/json/getAllWithFields.json
diff --git a/src/Security/KeycloakUserProvider.php b/src/Security/KeycloakUserProvider.php
@@ -20,6 +20,8 @@
 use Symfony\Component\Security\Core\Exception\UserNotFoundException;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
+use Symfony\Contracts\Cache\CacheInterface;
+use Symfony\Contracts\Cache\ItemInterface;
 
 /**
  * @implements UserProviderInterface<User>
@@ -32,6 +34,7 @@ public function __construct(
         private ParameterBagInterface $params,
         private UserApiService $userApiService,
         private LoggerInterface $logger,
+        private CacheInterface $cache,
     ) {
     }
 
@@ -78,12 +81,16 @@ public function loadUser(): User
             throw new AuthenticationExpiredException('Failed to fetch user from token', Response::HTTP_UNAUTHORIZED, $th);
         }
 
-        try {
-            $apiUser = $this->userApiService->getMe();
-        } catch (TimeoutException $ex) {
-            $this->logger->debug('{class}: Failed to fetch logged-in user', ['class' => self::class]);
-            throw new UserNotFoundException('Failed to fetch logged-in user', Response::HTTP_UNAUTHORIZED, $ex);
-        }
+        $apiUser = $this->cache->get('users-me', function (ItemInterface $item) {
+            $item->expiresAfter(60);
+
+            try {
+                return $this->userApiService->getMe();
+            } catch (TimeoutException $ex) {
+                $this->logger->debug('{class}: Failed to fetch logged-in user', ['class' => self::class]);
+                throw new UserNotFoundException('Failed to fetch logged-in user', Response::HTTP_UNAUTHORIZED, $ex);
+            }
+        });
 
         $user = new User($keycloakUser->toArray(), $apiUser);
 

diff --git a/src/Services/EntrepotApi/BaseEntrepotApiService.php b/src/Services/EntrepotApi/BaseEntrepotApiService.php
@@ -10,6 +10,7 @@
 use Symfony\Component\HttpClient\Exception\JsonException;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
@@ -20,7 +21,8 @@ public function __construct(
         ParameterBagInterface $parameters,
         Filesystem $filesystem,
         RequestStack $requestStack,
-        LoggerInterface $logger
+        protected CacheInterface $cache,
+        LoggerInterface $logger,
     ) {
         parent::__construct($httpClient, $parameters, $filesystem, $requestStack, $logger, 'api_entrepot_url');
     }

diff --git a/src/Services/EntrepotApi/DatastoreApiService.php b/src/Services/EntrepotApi/DatastoreApiService.php
@@ -4,12 +4,17 @@
 
 use App\Exception\ApiException;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Contracts\Cache\ItemInterface;
 
 class DatastoreApiService extends BaseEntrepotApiService
 {
     public function get(string $datastoreId): array
     {
-        return $this->request('GET', "datastores/$datastoreId");
+        return $this->cache->get("datastore-$datastoreId", function (ItemInterface $item) use ($datastoreId) {
+            $item->expiresAfter(60);
+
+            return $this->request('GET', "datastores/$datastoreId");
+        });
     }
 
     /**