Skip to content

fix(api): skip deleted wikis before resolving backend URLs #1246

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 1 commit into
base: main
Choose a base branch
from
Open

fix(api): skip deleted wikis before resolving backend URLs #1246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions app/Jobs/PlatformStatsSummaryJob.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,14 @@ public function prepareStats(array $allStats, $wikis): array {
$currentTime = CarbonImmutable::now();

foreach ($wikis as $wiki) {
$this->apiUrl = $this->mwHostResolver->getBackendUrlForDomain($wiki->domain) . '/w/api.php'; // used in PageFetcher::fetchPagesInNamespace

if (!is_null($wiki->deleted_at)) {
$deletedWikis[] = $wiki;

continue;
}

$this->apiUrl = $this->mwHostResolver->getBackendUrlForDomain($wiki->domain) . '/w/api.php'; // used in PageFetcher::fetchPagesInNamespace

// add items and properties counts of the wiki to the corresponded arrays
try {
$nextItemCount = count($this->fetchPagesInNamespace($wiki->domain, MediawikiNamespace::item));
Expand Down
68 changes: 68 additions & 0 deletions tests/Jobs/PlatformStatsSummaryJobTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,74 @@ public function testGroupings() {
);
}

public function testSkipDeletedWikisBeforeResolvingBackendUrl() {
$deletedWiki = Wiki::factory()->create(['deleted_at' => CarbonImmutable::now()->subDay(), 'domain' => 'deleted.cloud']);
WikiDb::create([
'name' => 'deleted_db',
'user' => 'asdasd',
'password' => 'asdasfasfasf',
'version' => 'version',
'prefix' => 'asdasd',
'wiki_id' => $deletedWiki->id,
]);

$activeWiki = Wiki::factory()->create(['deleted_at' => null, 'domain' => 'active.cloud']);
WikiDb::create([
'name' => 'active_db',
'user' => 'asdasd',
'password' => 'asdasfasfasf',
'version' => 'version',
'prefix' => 'asdasd',
'wiki_id' => $activeWiki->id,
]);

Http::fake([
$this->mwBackendHost . '/w/api.php?action=query&list=allpages&apnamespace=122&apcontinue=&aplimit=max&format=json' => Http::response([
'query' => ['allpages' => []],
], 200),
$this->mwBackendHost . '/w/api.php?action=query&list=allpages&apnamespace=120&apcontinue=&aplimit=max&format=json' => Http::response([
'query' => ['allpages' => []],
], 200),
]);

$this->mockMwHostResolver
->expects($this->once())
->method('getBackendUrlForDomain')
->with('active.cloud')
->willReturn($this->mwBackendHost);

$job = new PlatformStatsSummaryJob();
(function ($resolver): void {
$this->mwHostResolver = $resolver;
})->call($job, $this->mockMwHostResolver);

$groups = $job->prepareStats([
[
'wiki' => 'active.cloud',
'edits' => 1,
'pages' => 1,
'users' => 1,
'active_users' => 1,
'lastEdit' => MWTimestampHelper::getMWTimestampFromCarbon(CarbonImmutable::now()),
'first100UsingOauth' => '0',
'platform_summary_version' => 'v1',
],
[
'wiki' => 'deleted.cloud',
'edits' => 1,
'pages' => 1,
'users' => 1,
'active_users' => 1,
'lastEdit' => MWTimestampHelper::getMWTimestampFromCarbon(CarbonImmutable::now()),
'first100UsingOauth' => '0',
'platform_summary_version' => 'v1',
],
], [$deletedWiki, $activeWiki]);

$this->assertSame(1, $groups['deleted']);
$this->assertSame(1, $groups['edited_last_90_days']);
}

public function testCreationStats() {
$this->markTestSkipped('Pollutes the deleted wiki list');
$mockJob = $this->createMock(Job::class);
Expand Down
Loading