WIP

rosalieper · rosalieper · commit 47f5ec301419 · 2025-05-06T08:59:31.000+02:00
diff --git a/app/Http/Controllers/WikiController.php b/app/Http/Controllers/WikiController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Helper\ProfileValidator;
+use App\Http\Resources\WikiResource;
 use App\Jobs\KubernetesIngressCreate;
 use App\Jobs\MediawikiInit;
 use App\Jobs\ProvisionQueryserviceNamespaceJob;
@@ -17,9 +18,7 @@
 use App\WikiProfile;
 use App\WikiSetting;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Config;
 use App\Helper\DomainValidator;
@@ -63,14 +62,14 @@ public function create(Request $request): \Illuminate\Http\Response
             'username' => 'required',
             'profile' => 'nullable|json',
         ]);
-        
+
         $rawProfile = false;
         if ($request->filled('profile') ) {
             $rawProfile = json_decode($request->input('profile'), true);
             $profileValidator = $this->profileValidator->validate($rawProfile);
             $profileValidator->validateWithBag('post');
         }
-        
+
         $wiki = null;
         $dbAssignment = null;
 
@@ -160,12 +159,12 @@ public function create(Request $request): \Illuminate\Http\Response
               'user_id' => $user->id,
               'wiki_id' => $wiki->id,
             ]);
-            
+
             // Create WikiProfile
             if ($rawProfile) {
                 WikiProfile::create([ 'wiki_id' => $wiki->id, ...$rawProfile ] );
             }
-            
+
 
             // TODO maybe always make these run in a certain order..?
             dispatch(new MediawikiInit($wiki->domain, $request->input('username'), $user->email));
@@ -264,4 +263,10 @@ public static function isSubDomain( string $domain, string $subDomainSuffix = nu
         $subDomainSuffix = $subDomainSuffix ?? Config::get('wbstack.subdomain_suffix');
         return preg_match('/' . preg_quote( $subDomainSuffix ) . '$/', $domain) === 1;
     }
+
+    public function show(Wiki $wiki)
+    {
+        $wiki->load('latestProfile');
+        return new WikiResource($wiki);
+    }
 }
diff --git a/app/Http/Resources/WikiResource.php b/app/Http/Resources/WikiResource.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class WikiResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'description' => $this->description,
+            'domain' => $this->domain,
+            'sitename' => $this->sitename,
+            'profile' => $this->whenLoaded('latestProfile', function () {
+                if (!$this->latestProfile) {
+                    return null;
+                }
+                return [
+                    'id' => $this->latestProfile->id,
+                    'wiki_id' => $this->latestProfile->wiki_id,
+                    'purpose' => $this->latestProfile->purpose,
+                    'purpose_other' => $this->latestProfile->purpose_other,
+                    'audience' => $this->latestProfile->audience,
+                    'audience_other' => $this->latestProfile->audience_other,
+                    'temporality' => $this->latestProfile->temporality,
+                    'temporality_other' => $this->latestProfile->temporality_other
+                ];
+            })
+        ];
+    }
+}
diff --git a/app/Wiki.php b/app/Wiki.php
@@ -182,4 +182,8 @@ public static function getSiteDirectory( int $wiki_id ): string {
     public function getDomainDecodedAttribute(): string {
         return DomainHelper::decode($this->domain);
     }
+
+    public function latestProfile() {
+        return $this->hasOne(\App\Models\WikiProfile::class)->latestOfMany();
+    }
 }
diff --git a/app/WikiProfile.php b/app/WikiProfile.php
@@ -26,4 +26,4 @@ public function wiki(): BelongsTo
         return $this->belongsTo(Wiki::class);
     }
 
-}
+}
diff --git a/routes/api.php b/routes/api.php
@@ -39,6 +39,7 @@
         $router->group(['prefix' => 'wiki', 'middleware' => ['verified']], function () use ($router) {
             $router->post('create', ['uses' => 'WikiController@create']);
             $router->post('delete', ['uses' => 'WikiController@delete']);
+            $router->get('profile/{wiki}', ['uses' => 'WikiController@show']);
             $router->post('details', ['uses' => 'WikiController@getWikiDetailsForIdForOwner']);
             $router->post('logo/update', ['uses' => 'WikiLogoController@update']);
             $router->post('setting/{setting}/update', ['uses' => 'WikiSettingController@update']);

Original file line number	Diff line number	Diff line change
`@@ -182,4 +182,8 @@ public static function getSiteDirectory( int $wiki_id ): string {`
`182`	`182`	`public function getDomainDecodedAttribute(): string {`
`183`	`183`	`return DomainHelper::decode($this->domain);`
`184`	`184`	`}`
	`185`	`+`
	`186`	`+ public function latestProfile() {`
	`187`	`+ return $this->hasOne(\App\Models\WikiProfile::class)->latestOfMany();`
	`188`	`+ }`
`185`	`189`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,4 @@ public function wiki(): BelongsTo`
`26`	`26`	`return $this->belongsTo(Wiki::class);`
`27`	`27`	`}`
`28`	`28`
`29`		`-}`
	`29`	`+}`