Merge branch 'main' into update-mediawiki-1.43

Author: AndrewKostka

.github/workflows/docker.build.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Set up helmfile
         uses: helmfile/helmfile-action@v1.9.1
       - name: Cache Docker layers
-        uses: actions/cache@v4.0.2
+        uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}

CHANGELOG.md

@@ -1,5 +1,14 @@
 # api
 
+## 10x.18.6 - 11 March 2025
+- Map domain to database version using backend route
+
+## 10x.18.5 - 28 February 2025
+- Fix bug on wiki metrics recoding
+
+## 10x.18.4 - 19 February 2025
+- Fix job definition in UpdateWikiDailyMetricJob class
+- Update actions/cache in github workflow to version 4 to pass CI
 
 ## 10x.18.3 - 10 February 2025
 - Added new table wiki_daily_metrics

app/Http/Controllers/Backend/IngressController.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Controllers\Backend;
+
+use App\Http\Controllers\Controller;
+use App\Wiki;
+use Illuminate\Http\Request;
+
+class IngressController extends Controller
+{
+    public function getWikiVersionForDomain(Request $request): \Illuminate\Http\Response
+    {
+        $domain = $request->query('domain');
+        $version = Wiki::where('domain', $domain)
+            ->whereNull('deleted_at')
+            ->leftJoin('wiki_dbs', 'wiki_id', '=', 'wikis.id')
+            ->pluck('version')
+            ->first();
+
+        if (is_null($version)) {
+            abort(401);
+        }
+        return response('1')->header('x-version', $version);
+    }
+}

app/Jobs/UpdateWikiDailyMetricJob.php

@@ -4,15 +4,16 @@
 
 use App\Wiki;
 use \App\Metrics\App\WikiMetrics;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 
 //This job is for the daily measurements of metrics per wikibases.
 //This is to help in understanding the purpose of active wikis.
-class UpdateWikiDailyMetricJob implements ShouldQueue
+class UpdateWikiDailyMetricJob extends Job implements ShouldBeUnique
 {
     use Dispatchable;
-    public int $timeout = 3600;
+    public $timeout = 3600;
 
     /**
      * Execute the job.

app/Metrics/App/WikiMetrics.php

@@ -16,12 +16,14 @@ public function saveMetrics(Wiki $wiki): void
         $isDeleted = (bool)$wiki->deleted_at;
         if ($oldRecord) {
             if ($oldRecord->is_deleted) {
-                \Log::info("WikiMetrics is deleted, no new record for WikiMetrics ID {$wiki->id}.");
+                \Log::info("Wiki is deleted, no new record for WikiMetrics ID {$wiki->id}.");
                 return;
             }
-            if ($oldRecord->pages === $todayPageCount) {
-                \Log::info("Page count unchanged for WikiMetrics ID {$wiki->id}, no new record added.");
-                return;
+            if (!$isDeleted) {
+                if ($oldRecord->pages === $todayPageCount) {
+                    \Log::info("Page count unchanged for WikiMetrics ID {$wiki->id}, no new record added.");
+                    return;
+                }
             }
         }
         WikiDailyMetrics::create([

routes/backend.php

@@ -14,6 +14,11 @@ function () {
     }
 );
 
+$router->group(['prefix' => 'ingress'], function () use ($router) {
+    // GET
+    $router->get('getWikiVersionForDomain', ['uses' => 'IngressController@getWikiVersionForDomain']);
+});
+
 $router->group(['prefix' => 'wiki'], function () use ($router) {
     $router->get('getWikiForDomain', ['uses' => 'WikiController@getWikiForDomain']);
     $router->patch('updateEntityImport', ['uses' => '\App\Http\Controllers\WikiEntityImportController@update']);

tests/Metrics/WikiMetricsTest.php

@@ -49,5 +49,32 @@ public function testDoesNotAddDuplicateRecordsWithOnlyDateChange()
             'date' => Carbon::today()->toDateString()
         ]);
     }
+
+    public function testAddRecordsWikiIsDeleted()
+    {
+        $wiki = Wiki::factory()->create([
+            'domain' => 'thisfake.wikibase.cloud'
+        ]);
+        //Insert an old metric value for a wiki
+        WikiDailyMetrics::create([
+            'id' => $wiki->id. '_'. Carbon::yesterday()->toDateString(),
+            'wiki_id' => $wiki->id,
+            'date' => Carbon::yesterday()->toDateString(),
+            'pages' => 0,
+            'is_deleted' => 1
+        ]);
+        //delete the wiki
+        $wiki->delete();
+        $wiki->save();
+
+        (new WikiMetrics())->saveMetrics($wiki);
+
+        //Assert No new record was created for today
+        $this->assertDatabaseMissing('wiki_daily_metrics', [
+            'wiki_id' => $wiki->id,
+            'is_deleted' => 1,
+            'date' => now()->toDateString()
+        ]);
+    }
 }
 

tests/Routes/Ingress/GetWikiVersionForDomainTest.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace Tests\Routes\Ingress;
+
+use Tests\TestCase;
+use App\Wiki;
+use App\WikiDb;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+
+class GetWikiVersionForDomainTest extends TestCase
+{
+    protected $route = '/backend/ingress/getWikiVersionForDomain';
+
+    use RefreshDatabase;
+
+    public function tearDown(): void
+    {
+        Wiki::query()->delete();
+        parent::tearDown();
+    }
+
+    private function createWiki(string $domain, string $version) {
+        $wiki = Wiki::factory()->create(['domain' => $domain]);
+        WikiDb::create([
+            'name' => $domain,
+            'user' => 'someUser',
+            'password' => 'somePassword',
+            'version' => $version,
+            'prefix' => 'somePrefix',
+            'wiki_id' => $wiki->id
+        ]);
+    }
+
+    public function testNotFound()
+    {
+        $this->createWiki('found.wikibase.cloud', 'someVersion');
+        $this->json('GET', $this->route . '?domain=notfound.wikibase.cloud')->assertStatus(401);
+    }
+
+    public function testFoundVersion()
+    {
+        $version = 'someVersion';
+        $this->createWiki('found.wikibase.cloud', $version);
+        $this->createWiki('other.wikibase.cloud', 'otherVersion');
+        $this->json('GET', $this->route . '?domain=found.wikibase.cloud')
+            ->assertStatus(200)
+            ->assertHeader('x-version', $version)
+            ->assertContent('1');
+    }
+}