move stuff and add tests

Author: rdeutz

app/Console/Commands/PerformUpdate.php

@@ -36,14 +36,6 @@ public function handle(): int
         /** @var Site $site */
         $site = Site::findOrFail($this->input->getArgument('siteId'));
 
-        $updateCount = $site->updates()->where('new_version', $targetVersion)->count();
-
-        if ($updateCount >= config('autoupdates.max_update_tries')) {
-            Log::info("Update Loop detected for Site: " . $site->id . '; TargetVersion: ' . $targetVersion);
-
-            return Command::SUCCESS;
-        }
-
         UpdateSite::dispatchSync(
             $site,
             $targetVersion

app/Jobs/UpdateSite.php

@@ -9,6 +9,7 @@
 use App\Models\Update;
 use App\RemoteSite\Connection;
 use App\RemoteSite\Responses\PrepareUpdate;
+use Illuminate\Console\Command;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Queue\Queueable;
 use Illuminate\Support\Facades\App;
@@ -31,6 +32,14 @@ public function __construct(protected readonly Site $site, protected string $tar
      */
     public function handle(): void
     {
+        $updateCount = $this->site->getUpdateCount($this->targetVersion);
+
+        if ($updateCount >= config('autoupdates.max_update_tries')) {
+            Log::info("Update Loop detected for Site: " . $this->site->id . '; TargetVersion: ' . $this->targetVersion);
+
+            return;
+        }
+
         /** @var Connection $connection */
         $connection = $this->site->connection;
 

app/Models/Site.php

@@ -60,6 +60,11 @@ public function getFrontendStatus(): int
         return $httpClient->get($this->url)->getStatusCode();
     }
 
+    public function getUpdateCount(string $targetVersion): int
+    {
+        return $this->updates()->where('new_version', $targetVersion)->count();
+    }
+
     /**
      * @return HasMany<Update, $this>
      */

tests/Unit/Jobs/UpdateSiteTest.php

@@ -58,6 +58,24 @@ public function testJobQuitsIfNoUpdateIsAvailable()
         $this->assertTrue(true);
     }
 
+    public function testJobQuitsIfWeDetectALoopForAVersion()
+    {
+        $site = $this->getSiteMock([], null, 6);
+
+        Log::spy();
+
+        $object = new UpdateSite($site, "1.0.1");
+        $object->handle();
+
+        Log::shouldHaveReceived('info')
+            ->once()
+            ->withArgs(function ($message) {
+                return str_contains($message, 'Update Loop detected for Site');
+            });
+
+        $this->assertTrue(true);
+    }
+
     public function testJobQuitsIfAvailableUpdateDoesNotMatchTargetVersion()
     {
         $site = $this->getSiteMock(
@@ -144,7 +162,7 @@ public function testJobWritesSuccessLogForSuccessfulJobs()
         $object->handle();
     }
 
-    protected function getSiteMock(array $responses, array $expectedLogRow = null)
+    protected function getSiteMock(array $responses, array $expectedLogRow = null, int $updateCount = 0)
     {
         $connectionMock = $this->getMockBuilder(Connection::class)
             ->disableOriginalConstructor()
@@ -183,6 +201,7 @@ function ($method) use ($responses) {
         $siteMock->method('updates')->willReturn($updateMock);
         $siteMock->method('getConnectionAttribute')->willReturn($connectionMock);
         $siteMock->method('getFrontendStatus')->willReturn(200);
+        $siteMock->method('getUpdateCount')->willReturn($updateCount);
         $siteMock->id = 1;
         $siteMock->url = "http://example.org";
         $siteMock->cms_version = "1.0.0";