throw exception when provider request fails

tallstackui · Sep 17, 2024 · cc62e71 · cc62e71
1 parent 746ffd9
commit cc62e71
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 39 deletions.
diff --git a/src/Providers/BitBucketProvider.php b/src/Providers/BitBucketProvider.php
@@ -19,18 +19,24 @@ public function fetch(): ?string
     {
         $this->validate();
 
-        return Cache::remember($this->cacheKey(), now()->addDays($this->configuration->get('cached_for', 1)), function (): ?string {
-            $response = Http::withToken($this->configuration->get('token'))
-                ->get('https://api.bitbucket.org/2.0/repositories/'.$this->configuration->get('repository').'/refs/tags', [
-                    'sort' => 'target.date',
-                ]);
-
-            if ($response->ok()) {
-                return rescue(fn () => $response->collect()->get('values')[0]['name'], report: false);
-            }
-
-            return null;
-        });
+        if (Cache::has($this->cacheKey())) {
+            return Cache::get($this->cacheKey());
+        }
+
+        $response = Http::withToken($this->configuration->get('token'))
+            ->get('https://api.bitbucket.org/2.0/repositories/'.$this->configuration->get('repository').'/refs/tags', [
+                'sort' => 'target.date',
+            ]);
+
+        if ($response->ok()) {
+            Cache::put($this->cacheKey(), $tag = $response->json('values.0.name'), now()->addDays($this->configuration->get('cached_for', 1)));
+
+            return $tag;
+        }
+
+        $response->throw();
+
+        return null;
     }
 
     /**

diff --git a/src/Providers/EnvoyerProvider.php b/src/Providers/EnvoyerProvider.php
@@ -19,14 +19,22 @@ public function fetch(): ?string
     {
         $this->validate();
 
-        return Cache::remember($this->cacheKey(), now()->addDays($this->configuration->get('cached_for', 1)), function (): ?string {
-            $response = Http::withToken($this->configuration->get('token'))
-                ->get('https://envoyer.io/api/projects/'.$this->configuration->get('project_id'));
-
-            return $response->failed()
-                ? null
-                : $response->json('project.last_deployed_branch');
-        });
+        if (Cache::has($this->cacheKey())) {
+            return Cache::get($this->cacheKey());
+        }
+
+        $response = Http::withToken($this->configuration->get('token'))
+            ->get('https://envoyer.io/api/projects/'.$this->configuration->get('project_id'));
+
+        if ($response->ok()) {
+            Cache::put($this->cacheKey(), $tag = $response->json('project.last_deployed_branch'), now()->addDays($this->configuration->get('cached_for', 1)));
+
+            return $tag;
+        }
+
+        $response->throw();
+
+        return null;
     }
 
     /**

diff --git a/src/Providers/GitHubProvider.php b/src/Providers/GitHubProvider.php
@@ -19,16 +19,22 @@ public function fetch(): ?string
     {
         $this->validate();
 
-        return Cache::remember($this->cacheKey(), now()->addDays($this->configuration->get('cached_for', 1)), function (): ?string {
-            $response = Http::withToken($this->configuration->get('token'))
-                ->get('https://api.github.com/repos/'.$this->configuration->get('repository').'/tags');
+        if (Cache::has($this->cacheKey())) {
+            return Cache::get($this->cacheKey());
+        }
 
-            if ($response->ok()) {
-                return $response->collect()->first()['name'];
-            }
+        $response = Http::withToken($this->configuration->get('token'))
+            ->get('https://api.github.com/repos/'.$this->configuration->get('repository').'/tags');
 
-            return null;
-        });
+        if ($response->ok()) {
+            Cache::put($this->cacheKey(), $tag = $response->json('0.name'), now()->addDays($this->configuration->get('cached_for', 1)));
+
+            return $tag;
+        }
+
+        $response->throw();
+
+        return null;
     }
 
     /**

diff --git a/tests/Browser/EnvBar/BitBucketProviderTest.php b/tests/Browser/EnvBar/BitBucketProviderTest.php
@@ -15,7 +15,8 @@ class BitBucketProviderTest extends BrowserTestCase
     public function see_release(): void
     {
         $this->beforeServingApplication(function ($app, Repository $config): void {
-            Cache::shouldReceive('remember')->andReturn('v2.0.0');
+            Cache::shouldReceive('has')->andReturnTrue();
+            Cache::shouldReceive('get')->andReturn('v2.0.0');
 
             $config->set('envbar.provider', 'bitbucket');
 
@@ -27,8 +28,8 @@ public function see_release(): void
 
         $this->browse(function (Browser $browser): void {
             $browser->visit('/')
-                ->waitForText('Latest BitBucket Release')
-                ->assertSee('Latest BitBucket Release')
+                ->waitForText('Latest Bitbucket Release')
+                ->assertSee('Latest Bitbucket Release')
                 ->assertSee('v2.0.0');
         });
     }
@@ -39,7 +40,8 @@ public function see_release(): void
     public function throw_exception_when_parameters_is_empty(string $token, string $repository): void
     {
         $this->beforeServingApplication(function ($app, Repository $config) use ($token, $repository): void {
-            Cache::shouldReceive('remember')->andReturn('v2.0.0');
+            Cache::shouldReceive('has')->andReturnTrue();
+            Cache::shouldReceive('get')->andReturn('v2.0.0');
 
             $config->set('envbar.provider', 'bitbucket');
 

diff --git a/tests/Browser/EnvBar/EnvoyerProviderTest.php b/tests/Browser/EnvBar/EnvoyerProviderTest.php
@@ -15,7 +15,8 @@ class EnvoyerProviderTest extends BrowserTestCase
     public function see_release(): void
     {
         $this->beforeServingApplication(function ($app, Repository $config): void {
-            Cache::shouldReceive('remember')->andReturn('v2.0.0');
+            Cache::shouldReceive('has')->andReturnTrue();
+            Cache::shouldReceive('get')->andReturn('v3.0.0');
 
             $config->set('envbar.provider', 'envoyer');
 
@@ -29,7 +30,7 @@ public function see_release(): void
             $browser->visit('/')
                 ->waitForText('Latest Envoyer Release')
                 ->assertSee('Latest Envoyer Release')
-                ->assertSee('v2.0.0');
+                ->assertSee('v3.0.0');
         });
     }
 
@@ -39,7 +40,8 @@ public function see_release(): void
     public function throw_exception_when_parameters_is_empty(string $token, string $project): void
     {
         $this->beforeServingApplication(function ($app, Repository $config) use ($token, $project): void {
-            Cache::shouldReceive('remember')->andReturn('v2.0.0');
+            Cache::shouldReceive('has')->andReturnTrue();
+            Cache::shouldReceive('get')->andReturn('v3.0.0');
 
             $config->set('envbar.provider', 'envoyer');
 

diff --git a/tests/Browser/EnvBar/GitHubProviderTest.php b/tests/Browser/EnvBar/GitHubProviderTest.php
@@ -15,7 +15,8 @@ class GitHubProviderTest extends BrowserTestCase
     public function see_release(): void
     {
         $this->beforeServingApplication(function ($app, Repository $config): void {
-            Cache::shouldReceive('remember')->andReturn('v1.0.0');
+            Cache::shouldReceive('has')->andReturnTrue();
+            Cache::shouldReceive('get')->andReturn('v1.0.0');
 
             $config->set('envbar.provider', 'github');
 
@@ -27,8 +28,8 @@ public function see_release(): void
 
         $this->browse(function (Browser $browser): void {
             $browser->visit('/')
-                ->waitForText('Latest GitHub Release')
-                ->assertSee('Latest GitHub Release')
+                ->waitForText('Latest Gitbub Release')
+                ->assertSee('Latest Gitbub Release')
                 ->assertSee('v1.0.0');
         });
     }
@@ -39,7 +40,8 @@ public function see_release(): void
     public function throw_exception_when_parameters_is_empty(string $token, string $repository): void
     {
         $this->beforeServingApplication(function ($app, Repository $config) use ($token, $repository): void {
-            Cache::shouldReceive('remember')->andReturn('v1.0.0');
+            Cache::shouldReceive('has')->andReturnTrue();
+            Cache::shouldReceive('get')->andReturn('v1.0.0');
 
             $config->set('envbar.provider', 'github');