Skip to content

Create 'automatic_expiry' suspension on Wiki creation #1316

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

Merged
tarrow merged 2 commits into from
Nov 2, 2026
Merged

Create 'automatic_expiry' suspension on Wiki creation #1316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f1f3e0
Create 'automatic_expiry' suspension on Wiki creation
outdooracorn Oct 28, 2026
87e8232
config variable for days and move test to correct place
tarrow Nov 1, 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
11 changes: 11 additions & 0 deletions app/Http/Controllers/WikiController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace App\Http\Controllers;

use App\Enums\WikiSuspensionReason;
use App\Helper\DomainHelper;
use App\Helper\DomainValidator;
use App\Helper\ProfileValidator;
Expand All @@ -18,6 +19,8 @@
use App\WikiManager;
use App\WikiProfile;
use App\WikiSetting;
use App\WikiSuspension;
use Carbon\CarbonImmutable;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
Expand Down Expand Up @@ -107,6 +110,14 @@ public function create(Request $request): Response {
'domain' => $submittedDomain,
]);

$suspension = new WikiSuspension();
$suspension->wiki_id = $wiki->id;
$suspension->active_from = CarbonImmutable::now()->addDays(
Config::get('wbstack.automatic_expiry_suspension_days')
);
$suspension->reason = WikiSuspensionReason::AUTOMATIC_EXPIRY;
$suspension->save();

// Assign storage
$dbAssignment = DB::table('wiki_dbs')->where($wikiDbCondition)->limit(1)->update(['wiki_id' => $wiki->id]);
if (!$dbAssignment) {
Expand Down
4 changes: 4 additions & 0 deletions config/wbstack.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,8 @@

'transferbot_image_repo' => env('WBSTACK_TRANSFERBOT_IMAGE_REPO', 'ghcr.io/wbstack/transferbot'),
'transferbot_image_version' => env('WBSTACK_TRANSFERBOT_IMAGE_VERSION', '1.1.0'),

'automatic_expiry_suspension_days' => intval(
env('WBSTACK_AUTOMATIC_EXPIRY_SUSPENSION_DAYS', '91')
),
];
35 changes: 35 additions & 0 deletions tests/Routes/Wiki/CreateTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,21 @@

namespace Tests\Routes\Wiki\Managers;

use App\Enums\WikiSuspensionReason;
use App\Jobs\ElasticSearchAliasInit;
use App\Jobs\MediawikiInit;
use App\Jobs\ProvisionWikiDbJob;
use App\KnowledgeEquityResponse;
use App\QueryserviceNamespace;
use App\User;
use App\Wiki;
use App\WikiDb;
use App\WikiManager;
use App\WikiProfile;
use App\WikiSetting;
use App\WikiSuspension;
use Carbon\Carbon;
use Carbon\CarbonImmutable;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\Queue;
Expand All @@ -36,6 +40,37 @@ class CreateTest extends TestCase {
use DatabaseTransactions;
use OptionsRequestAllowed;

public function testCreateSchedulesAutomaticExpirySuspension(): void {
Queue::fake();

$user = User::factory()->create(['verified' => true]);

$now = CarbonImmutable::parse('2026-06-01 12:00');
$this->travelTo($now);

WikiDb::factory()->create([
'wiki_id' => null,
'version' => config('wbstack.wiki_db_use_version'),
]);
QueryserviceNamespace::create([
'namespace' => 'automatic-expiry-test',
'backend' => 'wdqs.svc',
]);

$response = $this->actingAs($user, 'api')->postJson($this->route, [
'domain' => 'automatic-expiry-test.wikibase.cloud',
'sitename' => 'Automatic Expiry Test',
'username' => 'Admin',
]);

$response->assertOk()->assertJsonPath('success', true);
$suspension = WikiSuspension::where('wiki_id', $response->json('data.id'))->sole();
$this->assertSame(WikiSuspensionReason::AUTOMATIC_EXPIRY, $suspension->reason);
$this->assertTrue($suspension->active_from->equalTo('2026-08-31 12:00'));
$this->assertNull($suspension->actor_user_id);
$this->assertNull($suspension->review_submission_action_id);
}

/**
* @dataProvider createDispatchesSomeJobsProvider
*/
Expand Down
Loading