Skip to content

Prevent WikiMetrics from collecting metrics if db record already exists #1268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dati18 wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Prevent WikiMetrics from collecting metrics if db record already exists #1268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
78d3c9f
Add test to catch duplicate keys errors
dati18 Sep 23, 2026
4336d09
Add withoutOverlapping() to UpdateWikiDailyMetricJob
dati18 Sep 23, 2026
ba8716d
Squash messy git history
outdooracorn Oct 6, 2026
4206fd5
Remove withoutOverlapping()
dati18 Sep 30, 2026
9478ff3
Improvements during code review
outdooracorn Oct 6, 2026
0877388
Move test to WikiMetricsTest
outdooracorn Oct 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions app/Metrics/App/WikiMetrics.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ public function saveMetrics(Wiki $wiki): void {
$this->wiki = $wiki;

$today = now()->format('Y-m-d');
$previousRecord = WikiDailyMetrics::where('wiki_id', $wiki->id)->latest('date')->first();

// Skip expensive metrics collection if a record for today already exists.
if ($previousRecord?->date === $today) {
Log::warning("Daily metric already exists for Wiki ID {$wiki->id} on {$today}; skipping metrics collection.");
Comment thread
outdooracorn marked this conversation as resolved.

return;
}
Comment thread
outdooracorn marked this conversation as resolved.

$tripleCount = $this->getNumOfTriples();
$todayPageCount = $wiki->wikiSiteStats()->first()->pages ?? 0;
$isDeleted = (bool) $wiki->deleted_at;
Expand Down Expand Up @@ -57,8 +66,7 @@ public function saveMetrics(Wiki $wiki): void {
'total_user_count' => $numberOfUsers,
]);

// compare current record to previous record and only save if there is a change
$previousRecord = WikiDailyMetrics::where('wiki_id', $wiki->id)->latest('date')->first();
// compare current metrics to previous record and only save if there is a change
if ($previousRecord?->areMetricsEqual($dailyMetrics)) {
Log::info("Record unchanged for Wiki ID {$wiki->id}, no new record added.");

Expand Down
53 changes: 53 additions & 0 deletions tests/Metrics/WikiMetricsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Schema;
use Log;
use Psr\Log\LogLevel;
use Tests\TestCase;
use TiMacDonald\Log\LogEntry;
use TiMacDonald\Log\LogFake;

class WikiMetricsTest extends TestCase {
use RefreshDatabase;
Expand Down Expand Up @@ -70,6 +74,55 @@ public function testNoDuplicateRecordsWithOnlyDateChange() {
]);
}

public function testPreventMetricsCollectionWhenRecordExistsForToday(): void {
Log::swap(new LogFake());

$wiki = Wiki::factory()->create();
WikiDb::first()->update(['wiki_id' => $wiki->id]);

$wiki->wikiSiteStats()->create([
'pages' => 10,
'users' => 3,
]);

$wikiMetrics = new WikiMetrics();
$wikiMetrics->saveMetrics($wiki);

$this->assertDatabaseCount('wiki_daily_metrics', 1)
->assertDatabaseHas('wiki_daily_metrics', [
'wiki_id' => $wiki->id,
'date' => now()->toDateString(),
'pages' => 10,
'total_user_count' => 3,
]);

$wiki->wikiSiteStats()->first()->update([
'pages' => 12,
'users' => 5,
]);

$wikiMetrics->saveMetrics($wiki);

$this->assertDatabaseCount('wiki_daily_metrics', 1)
->assertDatabaseHas('wiki_daily_metrics', [
'wiki_id' => $wiki->id,
'date' => now()->toDateString(),
'pages' => 10,
'total_user_count' => 3,
]);

Log::assertLogged(function (LogEntry $log) use ($wiki) {
if ($log->level !== LogLevel::WARNING) {
return false;
}

return str_contains(
$log->message,
"Daily metric already exists for Wiki ID {$wiki->id} on " . now()->toDateString()
);
});
}

public function testRecordCreatedWhenWikiFirstDeleted() {
$wiki = Wiki::factory()->create([
'domain' => 'thisfake.wikibase.cloud',
Expand Down
Loading