rename path to getWikiHostsForDomain and did some refactoring

Author: rosalieper

app/Http/Controllers/Backend/MediaWikiHostController.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Http\Controllers\Backend;
+
+use App\Http\Controllers\Controller;
+use App\Services\MediaWikiHostResolver;
+use App\Services\UnknownDBVersionException;
+use App\Services\UnknownWikiDomainException;
+use Illuminate\Http\Request;
+
+class MediaWikiHostsController extends Controller {
+    public function getWikiHostsForDomain(Request $request): \Illuminate\Http\JsonResponse {
+        $mediawikiHostResolver = new MediaWikiHostResolver;
+        $domain = $request->query('domain');
+        try {
+            $hosts = $mediawikiHostResolver->getHostsForDomain($domain);
+        } catch (UnknownWikiDomainException $e) {
+            return response()->json(['error' => 'Domain not found.'], 404);
+        } catch (UnknownDBVersionException $e) {
+            return response()->json(['error' => 'Unknown database version.'], 500);
+        }
+
+        return response()
+            ->json([
+                'domain' => $domain,
+                'backend-host' => $hosts['backend'],
+                'web-host' => $hosts['web'],
+                'api-host' => $hosts['api'],
+                'alpha-host' => $hosts['alpha'],
+            ])
+            ->header('x-backend-host', $hosts['backend'])
+            ->header('x-web-host', $hosts['web'])
+            ->header('x-api-host', $hosts['api'])
+            ->header('x-alpha-host', $hosts['alpha']);
+    }
+}

app/Http/Controllers/Backend/MediaWikiHostsController.php

@@ -29,26 +29,26 @@ class MediaWikiHostResolver {
     //     return $this->getBackendHostForDomain($wiki->domain);
     // }
 
+    /**
+     * @throws UnknownDBVersionException
+     * @throws UnknownWikiDomainException
+     */
+    public function getHostsForDomain(String $domain ): array {
+        $mwVersionForDomain = $this->getMwVersionForDomain($domain);
+        // TODO: Move host to an env variable (e.g. PLATFORM_MW_BACKEND_HOST_SUFFIX) for flexibility.
+        return [
+            'web' => sprintf('mediawiki-%s-app-web.default.svc.cluster.local', $mwVersionForDomain),
+            'backend' => sprintf('mediawiki-%s-app-backend.default.svc.cluster.local', $mwVersionForDomain),
+            'api' => sprintf('mediawiki-%s-app-api.default.svc.cluster.local', $mwVersionForDomain),
+            'alpha' => sprintf('mediawiki-%s-app-alpha.default.svc.cluster.local', $mwVersionForDomain)
+        ];
+    }
+
     public function getBackendHostForDomain(string $domain): string {
         // TODO: Move 'backend.default.svc.cluster.local' to an env variable (e.g. PLATFORM_MW_BACKEND_HOST_SUFFIX) for flexibility.
         return sprintf('mediawiki-%s-app-backend.default.svc.cluster.local', $this->getMwVersionForDomain($domain));
     }
 
-    public function getWebHostForDomain(string $domain): string {
-        // TODO: Move 'web.default.svc.cluster.local' to an env variable (e.g. PLATFORM_MW_WEB_HOST_SUFFIX) for flexibility.
-        return sprintf('mediawiki-%s-app-web.default.svc.cluster.local', $this->getMwVersionForDomain($domain));
-    }
-
-    public function getApiHostForDomain(string $domain): string {
-        // TODO: Move 'api.default.svc.cluster.local' to an env variable (e.g. PLATFORM_MW_API_HOST_SUFFIX) for flexibility.
-        return sprintf('mediawiki-%s-app-api.default.svc.cluster.local', $this->getMwVersionForDomain($domain));
-    }
-
-    public function getAlphaHostForDomain(string $domain): string {
-        // TODO: Move 'alpha.default.svc.cluster.local' to an env variable (e.g. PLATFORM_MW_ALPHA_HOST_SUFFIX) for flexibility.
-        return sprintf('mediawiki-%s-app-alpha.default.svc.cluster.local', $this->getMwVersionForDomain($domain));
-    }
-
     public function getMwVersionForDomain(string $domain): string {
         $wiki = Wiki::where('domain', $domain)->first();
 

app/Services/MediaWikiHostResolver.php

@@ -20,7 +20,7 @@ function () {
     $router->get('getWikiVersionForDomain', ['uses' => 'IngressController@getWikiVersionForDomain']);
 });
 
-$router->get('getWikiHostForDomain', ['uses' => 'MediaWikiHostController@getWikiHostForDomain']);
+$router->get('getWikiHostsForDomain', ['uses' => 'MediaWikiHostsController@getWikiHostsForDomain']);
 
 $router->group(['prefix' => 'wiki'], function () use ($router) {
     $router->get('getWikiForDomain', ['uses' => 'WikiController@getWikiForDomain']);

routes/backend.php

@@ -7,9 +7,11 @@
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
-class MediaWikiHostControllerTest extends TestCase {
+class MediaWikiHostsControllersTest extends TestCase {
     use RefreshDatabase;
 
+    protected $route = '/backend/getWikiHostsForDomain';
+
     private function createWiki(string $domain, string $version) {
         $wiki = Wiki::factory()->create(['domain' => $domain]);
         WikiDb::create([
@@ -23,13 +25,13 @@ private function createWiki(string $domain, string $version) {
     }
 
     public function testDomainNotfound() {
-        $this->getJson('/backend/getWikiHostForDomain?domain=notfound.wikibase.cloud')
+        $this->getJson($this->route . '?domain=notfound.wikibase.cloud')
             ->assertStatus(404);
     }
 
     public function testDbVersionNotfound() {
         $this->createWiki('noversion.wikibase.cloud', 'unknownVersion');
-        $this->getJson('/backend/getWikiHostForDomain?domain=noversion.wikibase.cloud')
+        $this->getJson($this->route . '?domain=noversion.wikibase.cloud')
             ->assertStatus(500);
     }
 
@@ -42,7 +44,7 @@ public function testFoundHost() {
         ];
         $this->createWiki('found.wikibase.cloud', 'mw1.43-wbs1');
         $this->createWiki('other.wikibase.cloud', 'otherVersion');
-        $this->getJson('/backend/getWikiHostForDomain?domain=found.wikibase.cloud')
+        $this->getJson($this->route . '?domain=found.wikibase.cloud')
             ->assertStatus(200)
             ->assertHeader('x-backend-host', $expectedHosts['backend'])
             ->assertHeader('x-web-host', $expectedHosts['web'])