Add Github client cache decorator

app/app/src/Application/Bootloader/GithubBootloader.php

@@ -4,6 +4,7 @@
 
 namespace App\Application\Bootloader;
 
+use App\Github\CacheableClient;
 use App\Github\Client;
 use App\Github\ClientInterface;
 use App\Github\WebhookGate;
@@ -16,14 +17,19 @@ final class GithubBootloader extends Bootloader
  public function defineSingletons(): array
  {
  return [
- ClientInterface::class => static fn(CacheStorageProviderInterface $cache) => new Client(
- client: new \GuzzleHttp\Client([
- 'base_uri' => 'https://api.github.com/',
- 'headers' => [
- 'Accept' => 'application/vnd.github.v3+json',
- ],
- ]),
- cache: $cache,
+ ClientInterface::class => static fn(
+ CacheStorageProviderInterface $cache,
+ ) => new CacheableClient(
+ client: new Client(
+ client: new \GuzzleHttp\Client([
+ 'base_uri' => 'https://api.github.com/',
+ 'headers' => [
+ 'Accept' => 'application/vnd.github.v3+json',
+ ],
+ ]),
+ ),
+ cache: $cache->storage('github'),
+ ttl: 300,
  ),
 
  WebhookGate::class => static fn(

app/app/src/Endpoint/Http/Controller/GithubWebhookAction.php

@@ -4,6 +4,7 @@
 
 namespace App\Endpoint\Http\Controller;
 
+use App\Github\CacheableClient;
 use App\Github\ClientInterface;
 use App\Github\Event\NewRelease;
 use App\Github\Event\RepositoryStarred;
@@ -40,10 +41,13 @@ public function __invoke(
  };
 
  if ($event !== null) {
- $client->clearCache($input->data('repository.full_name'));
  $this->events->dispatch($event);
  }
 
+ if ($client instanceof CacheableClient) {
+ $client->clearCache();
+ }
+
  return $response->create(200);
  }
 

app/app/src/Github/CacheableClient.php

@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Github;
+
+use Psr\SimpleCache\CacheInterface;
+
+final readonly class CacheableClient implements ClientInterface
+{
+ public function __construct(
+ private ClientInterface $client,
+ private CacheInterface $cache,
+ private int $ttl = 300,
+ ) {
+ }
+
+ public function getStars(string $repository): int
+ {
+ $cacheKey = $this->getCacheKey($repository, __METHOD__);
+ if ($this->cache->has($cacheKey)) {
+ return $this->cache->get($cacheKey);
+ }
+
+ $stars = $this->client->getStars($repository);
+
+ $this->cache->set($cacheKey, $stars, $this->ttl);
+
+ return $stars;
+ }
+
+ public function getLastVersion(string $repository): string
+ {
+ $cacheKey = $this->getCacheKey($repository, __METHOD__);
+ if ($this->cache->has($cacheKey)) {
+ return $this->cache->get($cacheKey);
+ }
+
+ $version = $this->client->getLastVersion($repository);
+
+ $this->cache->set($cacheKey, $version, $this->ttl);
+
+ return $version;
+ }
+
+ public function clearCache(): void
+ {
+ $this->cache->clear();
+ }
+
+ private function getCacheKey(string $repository, string $prefix): string
+ {
+ return "{$prefix}:{$repository}";
+ }
+}

app/app/src/Github/Client.php

@@ -5,28 +5,16 @@
 namespace App\Github;
 
 use GuzzleHttp\Psr7\Request;
-use Psr\SimpleCache\CacheInterface;
-use Spiral\Cache\CacheStorageProviderInterface;
 
-final readonly class Client implements \App\Github\ClientInterface
+final readonly class Client implements ClientInterface
 {
- private CacheInterface $cache;
-
  public function __construct(
  private \Psr\Http\Client\ClientInterface $client,
- CacheStorageProviderInterface $cache,
- private int $ttl = 300,
  ) {
- $this->cache = $cache->storage('github');
  }
 
  public function getStars(string $repository): int
  {
- $cacheKey = $this->getCacheKey($repository, __METHOD__);
- if ($this->cache->has($cacheKey)) {
- return $this->cache->get($cacheKey);
- }
-
  $response = $this->client->sendRequest(
  new Request(
  'GET',
@@ -35,18 +23,12 @@ public function getStars(string $repository): int
  );
 
  $data = \json_decode($response->getBody()->getContents(), true);
- $this->cache->set($cacheKey, $data['stargazers_count'], $this->ttl);
 
  return $data['stargazers_count'];
  }
 
  public function getLastVersion(string $repository): string
  {
- $cacheKey = $this->getCacheKey($repository, __METHOD__);
- if ($this->cache->has($cacheKey)) {
- return $this->cache->get($cacheKey);
- }
-
  $response = $this->client->sendRequest(
  new Request(
  'GET',
@@ -55,18 +37,7 @@ public function getLastVersion(string $repository): string
  );
 
  $data = \json_decode($response->getBody()->getContents(), true);
- $this->cache->set($cacheKey, $data['tag_name'], $this->ttl);
 
  return $data['tag_name'];
  }
-
- private function getCacheKey(string $repository, string $prefix): string
- {
- return "{$prefix}:{$repository}";
- }
-
- public function clearCache(string $repository): void
- {
- $this->cache->clear();
- }
 }

app/app/src/Github/ClientInterface.php

@@ -9,6 +9,4 @@ interface ClientInterface
  public function getStars(string $repository): int;
 
  public function getLastVersion(string $repository): string;
-
- public function clearCache(string $repository): void;
 }