Update photo exports (#66)

* Update photos export JSON format

* Add photos export CSV format

* Add headings for CSV export

app/Actions/Photos/ExportPhotosAction.php

@@ -16,7 +16,8 @@ public function run(User $user): Generator
             ->filter($user->settings->photo_filters)
             ->with(['photoItems' => fn (Builder $q) => $q
                 ->with('item:id,name')
-                ->with('tags:id,name'),
+                ->with('tags:id,tag_type_id,name')
+                ->with('tags.type:id,name'),
             ])
             ->lazyById();
 

app/DTO/PhotoExport.php

@@ -4,6 +4,7 @@
 
 use App\Models\Photo;
 use App\Models\PhotoItem;
+use App\Models\Tag;
 use Illuminate\Support\Collection;
 use Spatie\LaravelData\Data;
 
@@ -39,7 +40,10 @@ public static function fromModel(Photo $photo): static
                 'recycled' => $photoItem->recycled,
                 'deposit' => $photoItem->deposit,
                 'quantity' => $photoItem->quantity,
-                'tags' => $photoItem->tags->pluck('name')->toArray(),
+                'tags' => $photoItem->tags->map(fn (Tag $tag): array => [
+                    'type' => $tag->type->name,
+                    'name' => $tag->name,
+                ])->all(),
             ]),
         );
     }

app/Exports/PhotosCsvExport.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Exports;
+
+use App\DTO\PhotoExport;
+use Generator;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromGenerator;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+
+readonly class PhotosCsvExport implements FromGenerator, WithHeadings
+{
+    use Exportable;
+
+    /**
+     * @param  Generator<PhotoExport>  $photos
+     */
+    public function __construct(private Generator $photos)
+    {
+    }
+
+    public function generator(): Generator
+    {
+        return $this->photos;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function headings(): array
+    {
+        return [
+            'ID',
+            'Original File Name',
+            'Latitude',
+            'Longitude',
+            'Taken At Local',
+            'Created At',
+            'Items',
+        ];
+    }
+}

app/Http/Controllers/Photos/ExportPhotosController.php

@@ -3,19 +3,27 @@
 namespace App\Http\Controllers\Photos;
 
 use App\Actions\Photos\ExportPhotosAction;
+use App\Exports\PhotosCsvExport;
 use App\Http\Controllers\Controller;
 use App\Models\User;
+use Illuminate\Http\Response;
+use Maatwebsite\Excel\Excel;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class ExportPhotosController extends Controller
 {
-    public function __invoke(ExportPhotosAction $action): StreamedResponse
+    public function __invoke(ExportPhotosAction $action): StreamedResponse|BinaryFileResponse|Response
     {
         /** @var User $user */
         $user = auth()->user();
 
         $photos = $action->run($user);
 
+        if (request()->input('format') === 'csv') {
+            return (new PhotosCsvExport($photos))->download('photos.csv', Excel::CSV);
+        }
+
         return response()->streamJson(['photos' => $photos], 200, [
             'Content-Type' => 'application/json',
             'Content-Disposition' => 'attachment; filename="photos.json"',

app/Models/Tag.php

@@ -7,6 +7,9 @@
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
+/**
+ * @property TagType $type
+ */
 class Tag extends Model
 {
     use HasFactory;

composer.json

@@ -21,6 +21,7 @@
         "laravel/socialite": "^5.11",
         "laravel/tinker": "^2.8",
         "league/flysystem-aws-s3-v3": "^3.0",
+        "maatwebsite/excel": "^3.1",
         "spatie/laravel-data": "^4.0",
         "tightenco/ziggy": "^1.0"
     },