Extend wiki details with profile data (#931)

* Extend wiki details with profile data

* Update CHANGELOG.md

Author: rosalieper

CHANGELOG.md

@@ -1,5 +1,8 @@
 # api
 
+## 10x.19.4
+- Extend wiki details with profile data
+
 ## 10x.19.3
 - Set specific Helm and Helmfile versions
 

app/Http/Controllers/WikiController.php

@@ -17,9 +17,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 +61,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 +158,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));
@@ -250,6 +248,7 @@ public function getWikiDetailsForIdForOwner(Request $request): \Illuminate\Http\
         $wiki = Wiki::where('id', $wikiId)
       ->with('wikiManagers')
       ->with('wikiDbVersion')
+      ->with('wikiLatestProfile')
       ->with('publicSettings')->first();
 
         $res = [

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 wikiLatestProfile() {
+        return $this->hasOne(WikiProfile::class)->latestOfMany();
+    }
 }

routes/api.php

@@ -40,6 +40,7 @@
             $router->post('create', ['uses' => 'WikiController@create']);
             $router->post('delete', ['uses' => 'WikiController@delete']);
             $router->post('details', ['uses' => 'WikiController@getWikiDetailsForIdForOwner']);
+            $router->get('details', ['uses' => 'WikiController@getWikiDetailsForIdForOwner']);
             $router->post('logo/update', ['uses' => 'WikiLogoController@update']);
             $router->post('setting/{setting}/update', ['uses' => 'WikiSettingController@update']);
             // TODO should wiki managers really be here?