Fix bug on wiki metrics recording (#883)

* Fix bug on wiki metrics recoding

* Add test for deleted wikis

* adjust testAddRecordsWikiIsDeleted

---------

Co-authored-by: dena <dena@wikimedia.de>

Author: rosalieper

CHANGELOG.md

@@ -1,5 +1,8 @@
 # api
 
+## 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

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([

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()
+        ]);
+    }
 }