Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 9 additions & 15 deletions app/Http/Controllers/Backend/WikiController.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,22 @@
use Illuminate\Http\Request;

class WikiController extends Controller {
private static $with = ['wikiDb', 'wikiQueryserviceNamespace', 'settings'];

public function getWikiForDomain(Request $request): \Illuminate\Http\JsonResponse {
$domain = $request->input('domain');
$validated = $request->validate([
'domain' => 'required|string',
]);

// XXX: this same logic is in quickstatements.php and platform api WikiController backend
$domain = $validated['domain'];
try {
if ($domain === 'localhost' || $domain === 'mediawiki') {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did a bit of digging (e.g. in quickstatements.php) to see if I could find what this was about or where it is used and didn't succeed.

I guess this can go but I'm still a bit unsure if it's needed somewhere special (e.g. for building the .sql or some mystry place.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this was for special curl handling in case of running in the docker compose setup wbstack/magnustools#18

I don't think usage of magnustools is playing a role in creating the mw/wikibase sql schema

// If just using localhost then just get the first undeleted wiki
$result = Wiki::with(self::$with)->first();
} else {
// TODO don't select the timestamps and redundant info for the settings?
$result = Wiki::where('domain', $domain)->with(self::$with)->first();
}
} catch (\Exception $ex) {
return response()->json($ex->getMessage(), 500);
$wiki = Wiki::with(['wikiDb', 'wikiQueryserviceNamespace', 'settings'])->firstWhere('domain', $domain);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

complement: $wiki is way better than $result

} catch (\Exception $e) {
return response()->json($e->getMessage(), 500);
}

if (!$result) {
if (!$wiki) {
return response()->json(['error' => 'Not found'], 404);
}

return response()->json(['data' => $result], 200);
return response()->json(['data' => $wiki], 200);
}
}
53 changes: 53 additions & 0 deletions tests/Routes/Backend/WikiControllerTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?php

namespace Tests\Routes\Backend;

use App\Wiki;
use App\WikiDb;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;

class WikiControllerTest extends TestCase {
use RefreshDatabase;

protected $route = '/backend/wiki/getWikiForDomain';

private function createWiki(string $domain) {
$wiki = Wiki::factory()->create(['domain' => $domain]);
WikiDb::create([
'name' => $domain,
'user' => 'someUser',
'password' => 'somePassword',
'prefix' => 'somePrefix',
'version' => 'someVersion',
'wiki_id' => $wiki->id,
]);
}

public function testGetWikiDomainSuccess() {
$wikiDomain = 'coffeebase.wikibase.cloud';

$this->createWiki($wikiDomain);

$this->get("{$this->route}?domain={$wikiDomain}")
->assertStatus(200)
->assertJsonPath('data.domain', $wikiDomain)
->assertJsonStructure([
'data' => [
'domain',
'sitename',
'wiki_queryservice_namespace',
],
]);
}

public function testGetWikiDomainMissingWikiDomain() {
$this->getJson("{$this->route}")
->assertStatus(422);
}

public function testGetWikiDomainWikiNotFound() {
$this->getJson("{$this->route}?domain=somewiki")
->assertStatus(404);
}
}
Loading