Fix exporting relationship fields

Author: jacksleight

src/Exporters/AbstractExporter.php

@@ -4,36 +4,31 @@
 
 use JackSleight\StatamicMemberbox\Facades\Member;
 use Statamic\Facades\User;
-use Statamic\Support\Arr;
 
 abstract class AbstractExporter
 {
-    protected function getHeaders()
-    {
-        return User::blueprint()
-            ->fields()
-            ->except(['groups', 'roles', 'password'])
-            ->all()
-            ->keys()
-            ->merge(['id', 'last_login'])
-            ->all();
-    }
+    abstract public function contentType();
+
+    abstract public function export();
 
     protected function getData()
     {
-        $headers = $this->getHeaders();
-        $default = array_combine($headers, array_fill(0, count($headers), null));
-
-        $users = Member::query()->get()->toArray();
-
-        return collect($users)
-            ->map(function ($user) use ($headers, $default) {
-                return array_merge($default, Arr::only($user, $headers));
-            })
+        return Member::query()->get()
             ->map(function ($user) {
-                return collect($user)->map(function ($value) {
-                    return (is_array($value)) ? implode(', ', $value) : $value;
-                })->all();
+                $data = $user->data();
+
+                return User::blueprint()->fields()->all()->keys()->flip()
+                    ->reject(function ($field, $key) {
+                        return in_array($key, ['id', 'groups', 'roles', 'password']);
+                    })
+                    ->map(function ($field, $key) use ($data) {
+                        return $data[$key] ?? null;
+                    })
+                    ->merge([
+                        'id' => $user->id(),
+                        'last_login' => $user->lastLogin(),
+                    ])
+                    ->all();
             })
             ->all();
     }

src/Exporters/CsvExporter.php

@@ -4,6 +4,7 @@
 
 use League\Csv\Writer;
 use SplTempFileObject;
+use Statamic\Facades\User;
 
 class CsvExporter extends AbstractExporter
 {
@@ -14,6 +15,11 @@ public function __construct()
         $this->writer = Writer::createFromFileObject(new SplTempFileObject);
     }
 
+    public function contentType()
+    {
+        return 'text/csv';
+    }
+
     public function export()
     {
         $this->writer->insertOne($this->getHeaders());
@@ -22,8 +28,25 @@ public function export()
         return (string) $this->writer;
     }
 
-    public function contentType()
+    protected function getHeaders()
     {
-        return 'text/csv';
+        return User::blueprint()
+            ->fields()
+            ->except(['id', 'groups', 'roles', 'password'])
+            ->all()
+            ->keys()
+            ->merge(['id', 'last_login'])
+            ->all();
+    }
+
+    protected function getData()
+    {
+        return collect(parent::getData())
+            ->map(function ($user) {
+                return collect($user)->map(function ($value) {
+                    return (is_array($value)) ? implode(', ', $value) : $value;
+                })->all();
+            })
+            ->all();
     }
 }

src/Exporters/JsonExporter.php

@@ -4,13 +4,13 @@
 
 class JsonExporter extends AbstractExporter
 {
-    public function export()
+    public function contentType()
     {
-        return json_encode($this->getData());
+        return 'application/json';
     }
 
-    public function contentType()
+    public function export()
     {
-        return 'application/json';
+        return json_encode($this->getData());
     }
 }