From a8600dcf759f7ad8939f505b8286fccc1de16787 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 29 Nov 2023 20:49:43 +0100
Subject: [PATCH 001/209] Create PendingVolume model

---
 app/PendingVolume.php                         | 38 +++++++++++++
 config/filesystems.php                        |  5 ++
 config/volumes.php                            |  6 +++
 database/factories/PendingVolumeFactory.php   | 38 +++++++++++++
 ...29_201953_create_pending_volumes_table.php | 45 ++++++++++++++++
 tests/php/PendingVolumeTest.php               | 54 +++++++++++++++++++
 6 files changed, 186 insertions(+)
 create mode 100644 app/PendingVolume.php
 create mode 100644 database/factories/PendingVolumeFactory.php
 create mode 100644 database/migrations/2023_11_29_201953_create_pending_volumes_table.php
 create mode 100644 tests/php/PendingVolumeTest.php

diff --git a/app/PendingVolume.php b/app/PendingVolume.php
new file mode 100644
index 000000000..afc05d2ed
--- /dev/null
+++ b/app/PendingVolume.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Biigle;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\UploadedFile;
+
+class PendingVolume extends Model
+{
+    use HasFactory;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'media_type_id',
+        'user_id',
+        'project_id',
+        'metadata_file_path',
+    ];
+
+    public function hasMetadata(): bool
+    {
+        return !is_null($this->metadata_file_path);
+    }
+
+    public function saveMetadata(UploadedFile $file): void
+    {
+        $disk = config('volumes.pending_metadata_storage_disk');
+        $extension = $file->getExtension();
+        $this->metadata_file_path = "{$this->id}.{$extension}";
+        $file->storeAs('', $this->metadata_file_path, $disk);
+        $this->save();
+    }
+}
diff --git a/config/filesystems.php b/config/filesystems.php
index 68fd13004..138a5a919 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -64,6 +64,11 @@
             'driver' => 'local',
             'root' => storage_path('ifdos'),
         ],
+
+        'pending-metadata' => [
+            'driver' => 'local',
+            'root' => storage_path('pending-metadata'),
+        ],
     ],
 
     /*
diff --git a/config/volumes.php b/config/volumes.php
index e413a61ee..9c0138bf2 100644
--- a/config/volumes.php
+++ b/config/volumes.php
@@ -20,4 +20,10 @@
     | Storage disk for iFDO metadata files linked with volumes.
     */
     'ifdo_storage_disk' => env('VOLUME_IFDO_STORAGE_DISK', 'ifdos'),
+
+
+    /*
+    | Storage disk for metadata files of pending volumes.
+    */
+    'pending_metadata_storage_disk' => env('VOLUME_PENDING_METADATA_STORAGE_DISK', 'pending-metadata'),
 ];
diff --git a/database/factories/PendingVolumeFactory.php b/database/factories/PendingVolumeFactory.php
new file mode 100644
index 000000000..320c82565
--- /dev/null
+++ b/database/factories/PendingVolumeFactory.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Database\Factories;
+
+use Biigle\MediaType;
+use Biigle\PendingVolume;
+use Biigle\Project;
+use Biigle\User;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @template TModel of \Biigle\PendingVolume
+ *
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<TModel>
+ */
+class PendingVolumeFactory extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var class-string<TModel>
+     */
+    protected $model = PendingVolume::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            'media_type_id' => fn () => MediaType::imageId(),
+            'user_id' => User::factory(),
+            'project_id' => Project::factory(),
+        ];
+    }
+}
diff --git a/database/migrations/2023_11_29_201953_create_pending_volumes_table.php b/database/migrations/2023_11_29_201953_create_pending_volumes_table.php
new file mode 100644
index 000000000..2f52476d5
--- /dev/null
+++ b/database/migrations/2023_11_29_201953_create_pending_volumes_table.php
@@ -0,0 +1,45 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('pending_volumes', function (Blueprint $table) {
+            $table->id();
+            $table->timestamps();
+
+            $table->foreignId('user_id')
+                ->constrained()
+                ->onDelete('cascade');
+
+            $table->foreignId('media_type_id')
+                ->constrained()
+                ->onDelete('restrict');
+
+            $table->foreignId('project_id')
+                ->constrained()
+                ->onDelete('cascade');
+
+            // Path of the file in the pending_metadata_storage_disk.
+            $table->string('metadata_file_path', 256)->nullable();
+
+            // A user is only allowed to create one pending volume at a time for a
+            // project.
+            $table->unique(['user_id', 'project_id']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('pending_volumes');
+    }
+};
diff --git a/tests/php/PendingVolumeTest.php b/tests/php/PendingVolumeTest.php
new file mode 100644
index 000000000..934bcf998
--- /dev/null
+++ b/tests/php/PendingVolumeTest.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Biigle\Tests;
+
+use Biigle\MediaType;
+use Biigle\PendingVolume;
+use Biigle\Role;
+use Illuminate\Database\UniqueConstraintViolationException;
+use Illuminate\Http\UploadedFile;
+use ModelTestCase;
+use Storage;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+class PendingVolumeTest extends ModelTestCase
+{
+    /**
+     * The model class this class will test.
+     */
+    protected static $modelClass = PendingVolume::class;
+
+    public function testAttributes()
+    {
+        $this->assertNotNull($this->model->media_type_id);
+        $this->assertNotNull($this->model->user_id);
+        $this->assertNotNull($this->model->project_id);
+        $this->assertNotNull($this->model->created_at);
+        $this->assertNotNull($this->model->updated_at);
+        $this->assertNull($this->model->metadata_file_path);
+    }
+
+    public function testCreateOnlyOneForProject()
+    {
+        $this->expectException(UniqueConstraintViolationException::class);
+        PendingVolume::factory()->create([
+            'user_id' => $this->model->user_id,
+            'project_id' => $this->model->project_id,
+        ]);
+    }
+
+    public function testStoreMetadataFile()
+    {
+        $disk = Storage::fake('pending-metadata');
+        $csv = __DIR__."/../files/image-metadata.csv";
+        $file = new UploadedFile($csv, 'metadata.csv', 'text/csv', null, true);
+
+        $this->assertFalse($this->model->hasMetadata());
+        $this->model->saveMetadata($file);
+
+        $disk->assertExists($this->model->id.'.csv');
+        $this->assertTrue($this->model->hasMetadata());
+        $this->assertEquals($this->model->id.'.csv', $this->model->metadata_file_path);
+    }
+}

From 25389f09404a58d1e082f81676a5cf187a8599e4 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 30 Nov 2023 16:35:28 +0100
Subject: [PATCH 002/209] Start to implement pending volume API endpoint

---
 .../Api/ProjectPendingVolumeController.php    | 31 ++++++++
 app/Http/Requests/StorePendingVolume.php      | 70 +++++++++++++++++++
 routes/api.php                                |  5 ++
 .../ProjectPendingVolumeControllerTest.php    | 58 +++++++++++++++
 tests/php/PendingVolumeTest.php               |  4 --
 5 files changed, 164 insertions(+), 4 deletions(-)
 create mode 100644 app/Http/Controllers/Api/ProjectPendingVolumeController.php
 create mode 100644 app/Http/Requests/StorePendingVolume.php
 create mode 100644 tests/php/Http/Controllers/Api/ProjectPendingVolumeControllerTest.php

diff --git a/app/Http/Controllers/Api/ProjectPendingVolumeController.php b/app/Http/Controllers/Api/ProjectPendingVolumeController.php
new file mode 100644
index 000000000..6dd0cb43e
--- /dev/null
+++ b/app/Http/Controllers/Api/ProjectPendingVolumeController.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Biigle\Http\Controllers\Api;
+
+use Biigle\Http\Requests\StorePendingVolume;
+use Biigle\PendingVolume;
+
+class ProjectPendingVolumeController extends Controller
+{
+
+    /**
+     * Creates a new pending volume associated to the specified project.
+     *
+     * @api {post} projects/:id/pending-volumes Create a new pending volume
+     * @apiGroup Volumes
+     * @apiName StoreProjectPendingVolumes
+     * @apiPermission projectAdmin
+     *
+     * @apiParam {Number} id The project ID.
+     *
+     * @apiParam (Required attributes) {String} media_type The media type of the new volume (`image` or `video`).
+     */
+    public function store(StorePendingVolume $request)
+    {
+        return PendingVolume::create([
+            'media_type_id' => $request->input('media_type_id'),
+            'project_id' => $request->project->id,
+            'user_id' => $request->user()->id,
+        ]);
+    }
+}
diff --git a/app/Http/Requests/StorePendingVolume.php b/app/Http/Requests/StorePendingVolume.php
new file mode 100644
index 000000000..65514e0c7
--- /dev/null
+++ b/app/Http/Requests/StorePendingVolume.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Biigle\Http\Requests;
+
+use Biigle\MediaType;
+use Biigle\PendingVolume;
+use Biigle\Project;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+
+class StorePendingVolume extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        $this->project = Project::findOrFail($this->route('id'));
+
+        return $this->user()->can('update', $this->project);
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'media_type' => ['required', Rule::in(array_keys(MediaType::INSTANCES))],
+        ];
+    }
+
+    /**
+     * Configure the validator instance.
+     *
+     * @param  \Illuminate\Validation\Validator  $validator
+     * @return void
+     */
+    public function withValidator($validator)
+    {
+        if ($validator->fails()) {
+            return;
+        }
+
+        $validator->after(function ($validator) {
+            $exists = PendingVolume::where('project_id', $this->project->id)
+                ->where('user_id', $this->user()->id)
+                ->exists();
+            if ($exists) {
+                $validator->errors()->add('id', 'Only a single pending volume can be created at a time for each project and user.');
+            }
+        });
+    }
+
+    /**
+     * Prepare the data for validation.
+     *
+     * @return void
+     */
+    protected function prepareForValidation()
+    {
+        // Allow a string as media_type to be more conventient.
+        $type = $this->input('media_type');
+        if (in_array($type, array_keys(MediaType::INSTANCES))) {
+            $this->merge(['media_type_id' => MediaType::$type()->id]);
+        }
+    }
+}
diff --git a/routes/api.php b/routes/api.php
index c24cb026c..a254b75ff 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -168,6 +168,11 @@
     'parameters' => ['projects' => 'id', 'label-trees' => 'id2'],
 ]);
 
+$router->resource('projects.pending-volumes', 'ProjectPendingVolumeController', [
+    'only' => ['store'],
+    'parameters' => ['projects' => 'id'],
+]);
+
 $router->get(
     'projects/pinned',
     'UserPinnedProjectController@index'
diff --git a/tests/php/Http/Controllers/Api/ProjectPendingVolumeControllerTest.php b/tests/php/Http/Controllers/Api/ProjectPendingVolumeControllerTest.php
new file mode 100644
index 000000000..8539a1b85
--- /dev/null
+++ b/tests/php/Http/Controllers/Api/ProjectPendingVolumeControllerTest.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Biigle\Tests\Http\Controllers\Api;
+
+use ApiTestCase;
+use Biigle\MediaType;
+use Biigle\PendingVolume;
+
+class ProjectPendingVolumeControllerTest extends ApiTestCase
+{
+    public function testStoreImages()
+    {
+        $id = $this->project()->id;
+        $this->doTestApiRoute('POST', "/api/v1/projects/{$id}/pending-volumes");
+
+        $this->beEditor();
+        $this->post("/api/v1/projects/{$id}/pending-volumes")->assertStatus(403);
+
+        $this->beAdmin();
+        // Missing arguments.
+        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes")->assertStatus(422);
+
+        // Incorrect media type.
+        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
+            'media_type' => 'whatever',
+        ])->assertStatus(422);
+
+        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
+            'media_type' => 'image',
+        ])->assertStatus(201);
+
+        $pv = PendingVolume::where('project_id', $id)->first();
+        $this->assertEquals(MediaType::imageId(), $pv->media_type_id);
+        $this->assertEquals($this->admin()->id, $pv->user_id);
+    }
+
+    public function testStoreTwice()
+    {
+        $this->beAdmin();
+        $id = $this->project()->id;
+        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
+            'media_type' => 'image',
+        ])->assertStatus(201);
+
+        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
+            'media_type' => 'image',
+        ])->assertStatus(422);
+    }
+
+    public function testStoreVideo()
+    {
+        $this->beAdmin();
+        $id = $this->project()->id;
+        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
+            'media_type' => 'video',
+        ])->assertStatus(201);
+    }
+}
diff --git a/tests/php/PendingVolumeTest.php b/tests/php/PendingVolumeTest.php
index 934bcf998..a508198b4 100644
--- a/tests/php/PendingVolumeTest.php
+++ b/tests/php/PendingVolumeTest.php
@@ -2,15 +2,11 @@
 
 namespace Biigle\Tests;
 
-use Biigle\MediaType;
 use Biigle\PendingVolume;
-use Biigle\Role;
 use Illuminate\Database\UniqueConstraintViolationException;
 use Illuminate\Http\UploadedFile;
 use ModelTestCase;
 use Storage;
-use Symfony\Component\HttpFoundation\StreamedResponse;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class PendingVolumeTest extends ModelTestCase
 {

From 0550180d31f02ff1cced56eab5b627edf697e453 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 30 Nov 2023 21:02:04 +0100
Subject: [PATCH 003/209] Implement Project::pendingVolumes

---
 .../Controllers/Api/ProjectPendingVolumeController.php |  5 +----
 app/Http/Requests/StorePendingVolume.php               |  3 +--
 app/Project.php                                        | 10 ++++++++++
 tests/php/ProjectTest.php                              |  8 ++++++++
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Api/ProjectPendingVolumeController.php b/app/Http/Controllers/Api/ProjectPendingVolumeController.php
index 6dd0cb43e..3a3328bd5 100644
--- a/app/Http/Controllers/Api/ProjectPendingVolumeController.php
+++ b/app/Http/Controllers/Api/ProjectPendingVolumeController.php
@@ -3,11 +3,9 @@
 namespace Biigle\Http\Controllers\Api;
 
 use Biigle\Http\Requests\StorePendingVolume;
-use Biigle\PendingVolume;
 
 class ProjectPendingVolumeController extends Controller
 {
-
     /**
      * Creates a new pending volume associated to the specified project.
      *
@@ -22,9 +20,8 @@ class ProjectPendingVolumeController extends Controller
      */
     public function store(StorePendingVolume $request)
     {
-        return PendingVolume::create([
+        return $request->project->pendingVolumes()->create([
             'media_type_id' => $request->input('media_type_id'),
-            'project_id' => $request->project->id,
             'user_id' => $request->user()->id,
         ]);
     }
diff --git a/app/Http/Requests/StorePendingVolume.php b/app/Http/Requests/StorePendingVolume.php
index 65514e0c7..21a471786 100644
--- a/app/Http/Requests/StorePendingVolume.php
+++ b/app/Http/Requests/StorePendingVolume.php
@@ -3,7 +3,6 @@
 namespace Biigle\Http\Requests;
 
 use Biigle\MediaType;
-use Biigle\PendingVolume;
 use Biigle\Project;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
@@ -45,7 +44,7 @@ public function withValidator($validator)
         }
 
         $validator->after(function ($validator) {
-            $exists = PendingVolume::where('project_id', $this->project->id)
+            $exists = $this->project->pendingVolumes()
                 ->where('user_id', $this->user()->id)
                 ->exists();
             if ($exists) {
diff --git a/app/Project.php b/app/Project.php
index 4098402ff..494f9b1e7 100644
--- a/app/Project.php
+++ b/app/Project.php
@@ -209,6 +209,16 @@ public function videoVolumes()
         return $this->volumes()->where('media_type_id', MediaType::videoId());
     }
 
+    /**
+     * The pending volumes of this project.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     */
+    public function pendingVolumes()
+    {
+        return $this->hasMany(PendingVolume::class);
+    }
+
     /**
      * Adds a volume to this project if it wasn't already.
      *
diff --git a/tests/php/ProjectTest.php b/tests/php/ProjectTest.php
index 3261393ad..bfbd4d8d9 100644
--- a/tests/php/ProjectTest.php
+++ b/tests/php/ProjectTest.php
@@ -4,6 +4,7 @@
 
 use Biigle\Jobs\DeleteVolume;
 use Biigle\MediaType;
+use Biigle\PendingVolume;
 use Biigle\Project;
 use Biigle\ProjectInvitation;
 use Biigle\Role;
@@ -339,4 +340,11 @@ public function testInvitations()
         ProjectInvitation::factory(['project_id' => $this->model->id])->create();
         $this->assertTrue($this->model->invitations()->exists());
     }
+
+    public function testPendingVolumes()
+    {
+        $this->assertFalse($this->model->pendingVolumes()->exists());
+        PendingVolume::factory(['project_id' => $this->model->id])->create();
+        $this->assertTrue($this->model->pendingVolumes()->exists());
+    }
 }

From 87cd37a580edd4a6941b71517f28d6187690673c Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 30 Nov 2023 21:02:31 +0100
Subject: [PATCH 004/209] Start implementing the CSV metadata parser

---
 app/Services/MetadataParsers/CsvParser.php    | 45 +++++++++++++++++++
 .../MetadataParsers/MetadataParser.php        | 35 +++++++++++++++
 .../MetadataParsers/ParserFactory.php         | 13 ++++++
 .../MetadataParsers/ValidationException.php   |  8 ++++
 .../MetadataParsers/CsvParserTest.php         | 22 +++++++++
 5 files changed, 123 insertions(+)
 create mode 100644 app/Services/MetadataParsers/CsvParser.php
 create mode 100644 app/Services/MetadataParsers/MetadataParser.php
 create mode 100644 app/Services/MetadataParsers/ParserFactory.php
 create mode 100644 app/Services/MetadataParsers/ValidationException.php
 create mode 100644 tests/php/Services/MetadataParsers/CsvParserTest.php

diff --git a/app/Services/MetadataParsers/CsvParser.php b/app/Services/MetadataParsers/CsvParser.php
new file mode 100644
index 000000000..17f2f8b8b
--- /dev/null
+++ b/app/Services/MetadataParsers/CsvParser.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Biigle\Services\MetadataParsers;
+
+use SplFileObject;
+use Symfony\Component\HttpFoundation\File\File;
+
+class CsvParser extends MetadataParser
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function recognizesFile(): bool
+    {
+        $file = $this->getFileObject();
+        $line = $file->current();
+        if (!is_array($line)) {
+            return false;
+        }
+
+        $line = array_map('strtolower', $line);
+
+        if (!in_array('filename', $line, true) && !in_array('file', $line, true)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function validateFile(): void
+    {
+        //
+    }
+
+    protected function getFileObject(): SplFileObject
+    {
+        $file = parent::getFileObject();
+        $file->setFlags(SplFileObject::READ_CSV);
+
+        return $file;
+    }
+}
diff --git a/app/Services/MetadataParsers/MetadataParser.php b/app/Services/MetadataParsers/MetadataParser.php
new file mode 100644
index 000000000..ab76d4568
--- /dev/null
+++ b/app/Services/MetadataParsers/MetadataParser.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Biigle\Services\MetadataParsers;
+
+use SplFileObject;
+use Symfony\Component\HttpFoundation\File\File;
+
+abstract class MetadataParser
+{
+    public SplFileObject $fileObject;
+
+    public function __construct(public File $file)
+    {
+        //
+    }
+
+    /**
+     * Returns true if the file is in the format understood by the parser.
+     */
+    abstract public function recognizesFile(): bool;
+
+    /**
+     * @throws ValidationException
+     */
+    abstract public function validateFile(): void;
+
+    protected function getFileObject(): SplFileObject
+    {
+        if (!isset($this->fileObject)) {
+            $this->fileObject = $this->file->openFile();
+        }
+
+        return $this->fileObject;
+    }
+}
diff --git a/app/Services/MetadataParsers/ParserFactory.php b/app/Services/MetadataParsers/ParserFactory.php
new file mode 100644
index 000000000..a3a54a488
--- /dev/null
+++ b/app/Services/MetadataParsers/ParserFactory.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Biigle\Services\MetadataParsers;
+
+use Symfony\Component\HttpFoundation\File\File;
+
+class ParserFactory
+{
+    public static function getParserForFile(File $file): ?MetadataParser
+    {
+        //
+    }
+}
diff --git a/app/Services/MetadataParsers/ValidationException.php b/app/Services/MetadataParsers/ValidationException.php
new file mode 100644
index 000000000..a04984ef4
--- /dev/null
+++ b/app/Services/MetadataParsers/ValidationException.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Biigle\Services\MetadataParsers;
+
+class ValidationException extends Exception
+{
+    //
+}
diff --git a/tests/php/Services/MetadataParsers/CsvParserTest.php b/tests/php/Services/MetadataParsers/CsvParserTest.php
new file mode 100644
index 000000000..70d965ec4
--- /dev/null
+++ b/tests/php/Services/MetadataParsers/CsvParserTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Biigle\Tests\Services\MetadataParsers;
+
+use Biigle\Services\MetadataParsers\CsvParser;
+use Symfony\Component\HttpFoundation\File\File;
+use TestCase;
+
+class CsvParserTest extends TestCase
+{
+    public function testRecognizesFile()
+    {
+        $file = new File(__DIR__."/../../../files/image-metadata.csv");
+        $parser = new CsvParser($file);
+        $this->assertTrue($parser->recognizesFile());
+    }
+
+    public function testValidateFile()
+    {
+        //
+    }
+}

From 23734e2a059d8d14e2833a329895328a68e0c49e Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 6 Dec 2023 20:46:11 +0100
Subject: [PATCH 005/209] WIP Implement ImageCsvParser

---
 .../MetadataParsers/ValidationException.php   |  8 ----
 app/Services/MetadataParsing/FileMetadata.php | 11 +++++
 .../ImageCsvParser.php}                       | 10 +++--
 .../MetadataParsing/ImageMetadata.php         | 20 +++++++++
 .../MetadataParser.php                        |  4 +-
 .../ParserFactory.php                         |  0
 .../MetadataParsing/VolumeMetadata.php        | 30 ++++++++++++++
 .../MetadataParsers/CsvParserTest.php         | 22 ----------
 .../MetadataParsing/ImageCsvParserTest.php    | 41 +++++++++++++++++++
 .../MetadataParsing/VolumeMetadataTest.php    | 31 ++++++++++++++
 10 files changed, 142 insertions(+), 35 deletions(-)
 delete mode 100644 app/Services/MetadataParsers/ValidationException.php
 create mode 100644 app/Services/MetadataParsing/FileMetadata.php
 rename app/Services/{MetadataParsers/CsvParser.php => MetadataParsing/ImageCsvParser.php} (78%)
 create mode 100644 app/Services/MetadataParsing/ImageMetadata.php
 rename app/Services/{MetadataParsers => MetadataParsing}/MetadataParser.php (84%)
 rename app/Services/{MetadataParsers => MetadataParsing}/ParserFactory.php (100%)
 create mode 100644 app/Services/MetadataParsing/VolumeMetadata.php
 delete mode 100644 tests/php/Services/MetadataParsers/CsvParserTest.php
 create mode 100644 tests/php/Services/MetadataParsing/ImageCsvParserTest.php
 create mode 100644 tests/php/Services/MetadataParsing/VolumeMetadataTest.php

diff --git a/app/Services/MetadataParsers/ValidationException.php b/app/Services/MetadataParsers/ValidationException.php
deleted file mode 100644
index a04984ef4..000000000
--- a/app/Services/MetadataParsers/ValidationException.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace Biigle\Services\MetadataParsers;
-
-class ValidationException extends Exception
-{
-    //
-}
diff --git a/app/Services/MetadataParsing/FileMetadata.php b/app/Services/MetadataParsing/FileMetadata.php
new file mode 100644
index 000000000..080b57b88
--- /dev/null
+++ b/app/Services/MetadataParsing/FileMetadata.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Biigle\Services\MetadataParsing;
+
+class FileMetadata
+{
+    public function __construct(public string $name)
+    {
+        //
+    }
+}
diff --git a/app/Services/MetadataParsers/CsvParser.php b/app/Services/MetadataParsing/ImageCsvParser.php
similarity index 78%
rename from app/Services/MetadataParsers/CsvParser.php
rename to app/Services/MetadataParsing/ImageCsvParser.php
index 17f2f8b8b..0c14ab24f 100644
--- a/app/Services/MetadataParsers/CsvParser.php
+++ b/app/Services/MetadataParsing/ImageCsvParser.php
@@ -2,10 +2,11 @@
 
 namespace Biigle\Services\MetadataParsers;
 
+use duncan3dc\Bom\Util;
 use SplFileObject;
 use Symfony\Component\HttpFoundation\File\File;
 
-class CsvParser extends MetadataParser
+class ImageCsvParser extends MetadataParser
 {
     /**
      * {@inheritdoc}
@@ -19,6 +20,9 @@ public function recognizesFile(): bool
         }
 
         $line = array_map('strtolower', $line);
+        if (!empty($line[0])) {
+            $line[0] = Util::removeBom($line[0]);
+        }
 
         if (!in_array('filename', $line, true) && !in_array('file', $line, true)) {
             return false;
@@ -30,9 +34,9 @@ public function recognizesFile(): bool
     /**
      * {@inheritdoc}
      */
-    public function validateFile(): void
+    public function getMetadata(): VolumeMetadata;
     {
-        //
+
     }
 
     protected function getFileObject(): SplFileObject
diff --git a/app/Services/MetadataParsing/ImageMetadata.php b/app/Services/MetadataParsing/ImageMetadata.php
new file mode 100644
index 000000000..ad766e718
--- /dev/null
+++ b/app/Services/MetadataParsing/ImageMetadata.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Biigle\Services\MetadataParsing;
+
+class ImageMetadata extends FileMetadata
+{
+    public function __construct(
+        public string $name,
+        public ?float $lat = null,
+        public ?float $lng = null,
+        public ?string $takenAt = null,
+        public ?float $area = null,
+        public ?float $distanceToGround = null,
+        public ?float $gpsAltitude = null,
+        public ?float $yaw = null
+    )
+    {
+        parent::__construct($name);
+    }
+}
diff --git a/app/Services/MetadataParsers/MetadataParser.php b/app/Services/MetadataParsing/MetadataParser.php
similarity index 84%
rename from app/Services/MetadataParsers/MetadataParser.php
rename to app/Services/MetadataParsing/MetadataParser.php
index ab76d4568..376a577cb 100644
--- a/app/Services/MetadataParsers/MetadataParser.php
+++ b/app/Services/MetadataParsing/MetadataParser.php
@@ -20,9 +20,9 @@ public function __construct(public File $file)
     abstract public function recognizesFile(): bool;
 
     /**
-     * @throws ValidationException
+     * Get a filled VolumeMetadata object based on the file.
      */
-    abstract public function validateFile(): void;
+    abstract public function getMetadata(): VolumeMetadata;
 
     protected function getFileObject(): SplFileObject
     {
diff --git a/app/Services/MetadataParsers/ParserFactory.php b/app/Services/MetadataParsing/ParserFactory.php
similarity index 100%
rename from app/Services/MetadataParsers/ParserFactory.php
rename to app/Services/MetadataParsing/ParserFactory.php
diff --git a/app/Services/MetadataParsing/VolumeMetadata.php b/app/Services/MetadataParsing/VolumeMetadata.php
new file mode 100644
index 000000000..d960e1ac5
--- /dev/null
+++ b/app/Services/MetadataParsing/VolumeMetadata.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Biigle\Services\MetadataParsing;
+
+use Biigle\MediaType;
+
+class VolumeMetadata
+{
+    public array $files;
+
+    public function __construct(
+        public ?MediaType $type = null,
+        public ?string $name = null,
+        public ?string $url = null,
+        public ?string $handle = null
+    )
+    {
+        $this->files = [];
+    }
+
+    public function addFile(FileMetadata $file)
+    {
+        $this->files[$file->name] = $file;
+    }
+
+    public function getFiles(): array
+    {
+        return array_values($this->files);
+    }
+}
diff --git a/tests/php/Services/MetadataParsers/CsvParserTest.php b/tests/php/Services/MetadataParsers/CsvParserTest.php
deleted file mode 100644
index 70d965ec4..000000000
--- a/tests/php/Services/MetadataParsers/CsvParserTest.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace Biigle\Tests\Services\MetadataParsers;
-
-use Biigle\Services\MetadataParsers\CsvParser;
-use Symfony\Component\HttpFoundation\File\File;
-use TestCase;
-
-class CsvParserTest extends TestCase
-{
-    public function testRecognizesFile()
-    {
-        $file = new File(__DIR__."/../../../files/image-metadata.csv");
-        $parser = new CsvParser($file);
-        $this->assertTrue($parser->recognizesFile());
-    }
-
-    public function testValidateFile()
-    {
-        //
-    }
-}
diff --git a/tests/php/Services/MetadataParsing/ImageCsvParserTest.php b/tests/php/Services/MetadataParsing/ImageCsvParserTest.php
new file mode 100644
index 000000000..493633cc5
--- /dev/null
+++ b/tests/php/Services/MetadataParsing/ImageCsvParserTest.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Biigle\Tests\Services\MetadataParsing;
+
+use Biigle\Services\MetadataParsing\CsvParser;
+use Biigle\Volume;
+use Symfony\Component\HttpFoundation\File\File;
+use TestCase;
+
+class ImageCsvParserTest extends TestCase
+{
+    public function testRecognizesFile()
+    {
+        $file = new File(__DIR__."/../../../files/image-metadata.csv");
+        $parser = new CsvParser($file);
+        $this->assertTrue($parser->recognizesFile());
+
+        $file = new File(__DIR__."/../../../files/image-metadata-with-bom.csv");
+        $parser = new CsvParser($file);
+        $this->assertTrue($parser->recognizesFile());
+
+        $file = new File(__DIR__."/../../../files/test.mp4");
+        $parser = new CsvParser($file);
+        $this->assertFalse($parser->recognizesFile());
+    }
+
+    public function testGetMetadata()
+    {
+        //
+    }
+
+    public function testGetMetadataIgnoreMissingFilename()
+    {
+        //
+    }
+
+    public function testGetMetadataCantReadFile()
+    {
+        //
+    }
+}
diff --git a/tests/php/Services/MetadataParsing/VolumeMetadataTest.php b/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
new file mode 100644
index 000000000..154d5fad7
--- /dev/null
+++ b/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Biigle\Tests\Services\MetadataParsing;
+
+use Biigle\MediaType;
+use Biigle\Services\MetadataParsing\VolumeMetadata;
+use Biigle\Services\MetadataParsing\FileMetadata;
+use TestCase;
+
+class VolumeMetadataTest extends TestCase
+{
+    public function testNew()
+    {
+        $metadata = new VolumeMetadata(MediaType::image(), 'volumename', 'volumeurl', 'volumehandle');
+
+        $this->assertEquals(MediaType::imageId(), $metadata->type->id);
+        $this->assertEquals('volumename', $metadata->name);
+        $this->assertEquals('volumeurl', $metadata->url);
+        $this->assertEquals('volumehandle', $metadata->handle);
+    }
+
+    public function testAddGetFiles()
+    {
+        $metadata = new VolumeMetadata();
+        $file = new FileMetadata('filename');
+        $metadata->addFile($file);
+        $this->assertEquals($file, $metadata->getFiles()[0]);
+        $metadata->addFile($file);
+        $this->assertCount(1, $metadata->getFiles());
+    }
+}

From be8b6d03e82aa8e53e405e9d4cb5949effada2b7 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 7 Dec 2023 20:38:11 +0100
Subject: [PATCH 006/209] Continue implementing ImageCsvParser

---
 .../MetadataParsing/ImageCsvParser.php        |  92 ++++++++++-
 .../MetadataParsing/MetadataParser.php        |   2 +-
 .../MetadataParsing/ParserFactory.php         |   2 +-
 .../MetadataParsing/VolumeMetadata.php        |   9 +-
 .../MetadataParsing/ImageCsvParserTest.php    | 152 +++++++++++++++++-
 5 files changed, 236 insertions(+), 21 deletions(-)

diff --git a/app/Services/MetadataParsing/ImageCsvParser.php b/app/Services/MetadataParsing/ImageCsvParser.php
index 0c14ab24f..07acc6758 100644
--- a/app/Services/MetadataParsing/ImageCsvParser.php
+++ b/app/Services/MetadataParsing/ImageCsvParser.php
@@ -1,28 +1,46 @@
 <?php
 
-namespace Biigle\Services\MetadataParsers;
+namespace Biigle\Services\MetadataParsing;
 
+use Biigle\MediaType;
 use duncan3dc\Bom\Util;
+use SeekableIterator;
 use SplFileObject;
 use Symfony\Component\HttpFoundation\File\File;
 
 class ImageCsvParser extends MetadataParser
 {
+    /**
+     * Column name synonyms.
+     *
+     * @var array
+     */
+    const COLUMN_SYNONYMS = [
+        'file' => 'filename',
+        'lon' => 'lng',
+        'longitude' => 'lng',
+        'latitude' => 'lat',
+        'heading' => 'yaw',
+        'sub_datetime' => 'taken_at',
+        'sub_longitude' => 'lng',
+        'sub_latitude' => 'lat',
+        'sub_heading' => 'yaw',
+        'sub_distance' => 'distance_to_ground',
+        'sub_altitude' => 'gps_altitude',
+    ];
+
     /**
      * {@inheritdoc}
      */
     public function recognizesFile(): bool
     {
-        $file = $this->getFileObject();
+        $file = $this->getCsvIterator();
         $line = $file->current();
         if (!is_array($line)) {
             return false;
         }
 
-        $line = array_map('strtolower', $line);
-        if (!empty($line[0])) {
-            $line[0] = Util::removeBom($line[0]);
-        }
+        $line = $this->processFirstLine($line);
 
         if (!in_array('filename', $line, true) && !in_array('file', $line, true)) {
             return false;
@@ -34,16 +52,74 @@ public function recognizesFile(): bool
     /**
      * {@inheritdoc}
      */
-    public function getMetadata(): VolumeMetadata;
+    public function getMetadata(): VolumeMetadata
     {
+        $data = new VolumeMetadata(MediaType::image());
+
+        $file = $this->getCsvIterator();
+        $keys = $file->current();
+        if (!is_array($keys)) {
+            return $data;
+        }
+
+        $keys = $this->processFirstLine($keys);
+        $keys = array_map(function ($column) {
+            if (array_key_exists($column, self::COLUMN_SYNONYMS)) {
+                return self::COLUMN_SYNONYMS[$column];
+            }
+
+            return $column;
+        }, $keys);
+
+        $keyMap = array_flip($keys);
+        $getValue = fn ($row, $key) => $row[$keyMap[$key] ?? null] ?? null;
+        $maybeCast = fn ($value) => (is_null($value) || $value === '') ? null : floatval($value);
+
+        $file->next();
+        while ($file->valid()) {
+            $row = $file->current();
+            $file->next();
+            if (empty($row)) {
+                continue;
+            }
 
+            $name = $getValue($row, 'filename');
+            if (empty($name)) {
+                continue;
+            }
+
+            $fileData = new ImageMetadata(
+                name: $getValue($row, 'filename'),
+                lat: $maybeCast($getValue($row, 'lat')),
+                lng: $maybeCast($getValue($row, 'lng')),
+                takenAt: $getValue($row, 'taken_at') ?: null, // Use null instead of ''.
+                area: $maybeCast($getValue($row, 'area')),
+                distanceToGround: $maybeCast($getValue($row, 'distance_to_ground')),
+                gpsAltitude: $maybeCast($getValue($row, 'gps_altitude')),
+                yaw: $maybeCast($getValue($row, 'yaw')),
+            );
+
+            $data->addFile($fileData);
+        }
+
+        return $data;
     }
 
-    protected function getFileObject(): SplFileObject
+    protected function getCsvIterator(): SeekableIterator
     {
         $file = parent::getFileObject();
         $file->setFlags(SplFileObject::READ_CSV);
 
         return $file;
     }
+
+    protected function processFirstLine(array $line): array
+    {
+        $line = array_map('strtolower', $line);
+        if (!empty($line[0])) {
+            $line[0] = Util::removeBom($line[0]);
+        }
+
+        return $line;
+    }
 }
diff --git a/app/Services/MetadataParsing/MetadataParser.php b/app/Services/MetadataParsing/MetadataParser.php
index 376a577cb..22668d2ae 100644
--- a/app/Services/MetadataParsing/MetadataParser.php
+++ b/app/Services/MetadataParsing/MetadataParser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Biigle\Services\MetadataParsers;
+namespace Biigle\Services\MetadataParsing;
 
 use SplFileObject;
 use Symfony\Component\HttpFoundation\File\File;
diff --git a/app/Services/MetadataParsing/ParserFactory.php b/app/Services/MetadataParsing/ParserFactory.php
index a3a54a488..5538bc95a 100644
--- a/app/Services/MetadataParsing/ParserFactory.php
+++ b/app/Services/MetadataParsing/ParserFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Biigle\Services\MetadataParsers;
+namespace Biigle\Services\MetadataParsing;
 
 use Symfony\Component\HttpFoundation\File\File;
 
diff --git a/app/Services/MetadataParsing/VolumeMetadata.php b/app/Services/MetadataParsing/VolumeMetadata.php
index d960e1ac5..a480df64e 100644
--- a/app/Services/MetadataParsing/VolumeMetadata.php
+++ b/app/Services/MetadataParsing/VolumeMetadata.php
@@ -3,10 +3,11 @@
 namespace Biigle\Services\MetadataParsing;
 
 use Biigle\MediaType;
+use Illuminate\Support\Collection;
 
 class VolumeMetadata
 {
-    public array $files;
+    public Collection $files;
 
     public function __construct(
         public ?MediaType $type = null,
@@ -15,7 +16,7 @@ public function __construct(
         public ?string $handle = null
     )
     {
-        $this->files = [];
+        $this->files = collect([]);
     }
 
     public function addFile(FileMetadata $file)
@@ -23,8 +24,8 @@ public function addFile(FileMetadata $file)
         $this->files[$file->name] = $file;
     }
 
-    public function getFiles(): array
+    public function getFiles(): Collection
     {
-        return array_values($this->files);
+        return $this->files->values();
     }
 }
diff --git a/tests/php/Services/MetadataParsing/ImageCsvParserTest.php b/tests/php/Services/MetadataParsing/ImageCsvParserTest.php
index 493633cc5..1100aa2b3 100644
--- a/tests/php/Services/MetadataParsing/ImageCsvParserTest.php
+++ b/tests/php/Services/MetadataParsing/ImageCsvParserTest.php
@@ -2,7 +2,8 @@
 
 namespace Biigle\Tests\Services\MetadataParsing;
 
-use Biigle\Services\MetadataParsing\CsvParser;
+use Biigle\Services\MetadataParsing\ImageCsvParser;
+use Biigle\MediaType;
 use Biigle\Volume;
 use Symfony\Component\HttpFoundation\File\File;
 use TestCase;
@@ -12,30 +13,167 @@ class ImageCsvParserTest extends TestCase
     public function testRecognizesFile()
     {
         $file = new File(__DIR__."/../../../files/image-metadata.csv");
-        $parser = new CsvParser($file);
+        $parser = new ImageCsvParser($file);
         $this->assertTrue($parser->recognizesFile());
 
         $file = new File(__DIR__."/../../../files/image-metadata-with-bom.csv");
-        $parser = new CsvParser($file);
+        $parser = new ImageCsvParser($file);
         $this->assertTrue($parser->recognizesFile());
 
         $file = new File(__DIR__."/../../../files/test.mp4");
-        $parser = new CsvParser($file);
+        $parser = new ImageCsvParser($file);
         $this->assertFalse($parser->recognizesFile());
     }
 
     public function testGetMetadata()
     {
-        //
+        $file = new File(__DIR__."/../../../files/image-metadata.csv");
+        $parser = new ImageCsvParser($file);
+        $data = $parser->getMetadata();
+        $this->assertEquals(MediaType::imageId(), $data->type->id);
+        $this->assertNull($data->name);
+        $this->assertNull($data->url);
+        $this->assertNull($data->handle);
+        $this->assertCount(1, $data->getFiles());
+        $file = $data->getFiles()->first();
+        $this->assertEquals('abc.jpg', $file->name);
+        $this->assertEquals('2016-12-19 12:27:00', $file->takenAt);
+        $this->assertEquals(52.220, $file->lng);
+        $this->assertEquals(28.123, $file->lat);
+        $this->assertEquals(-1500, $file->gpsAltitude);
+        $this->assertEquals(10, $file->distanceToGround);
+        $this->assertEquals(2.6, $file->area);
+        $this->assertEquals(180, $file->yaw);
     }
 
     public function testGetMetadataIgnoreMissingFilename()
     {
-        //
+        $file = new File(__DIR__."/../../../files/image-metadata.csv");
+        $parser = new ImageCsvParserStub($file);
+        $parser->content = [
+            ['filename', 'taken_at', 'lng', 'lat', 'gps_altitude', 'distance_to_ground', 'area', 'yaw'],
+            ['', '2016-12-19 12:27:00', '52.220', '28.123', '-1500', '10', '2.6', '180'],
+        ];
+
+        $data = $parser->getMetadata();
+        $this->assertCount(0, $data->getFiles());
     }
 
     public function testGetMetadataCantReadFile()
     {
-        //
+        $file = new File(__DIR__."/../../../files/test.mp4");
+        $parser = new ImageCsvParser($file);
+        $data = $parser->getMetadata();
+        $this->assertEquals(MediaType::imageId(), $data->type->id);
+        $this->assertCount(0, $data->getFiles());
+    }
+
+    public function testGetMetadataCaseInsensitive()
+    {
+        $file = new File(__DIR__."/../../../files/image-metadata.csv");
+        $parser = new ImageCsvParserStub($file);
+        $parser->content = [
+            ['Filename', 'tAken_at', 'lnG', 'Lat', 'gPs_altitude', 'diStance_to_ground', 'areA'],
+            ['abc.jpg', '2016-12-19 12:27:00', '52.220', '28.123', '-1500', '10', '2.6'],
+        ];
+
+        $data = $parser->getMetadata();
+        $this->assertCount(1, $data->getFiles());
+        $file = $data->getFiles()->first();
+        $this->assertEquals('abc.jpg', $file->name);
+        $this->assertEquals('2016-12-19 12:27:00', $file->takenAt);
+        $this->assertEquals(52.220, $file->lng);
+        $this->assertEquals(28.123, $file->lat);
+        $this->assertEquals(-1500, $file->gpsAltitude);
+        $this->assertEquals(10, $file->distanceToGround);
+        $this->assertEquals(2.6, $file->area);
+    }
+
+    public function testGetMetadataColumnSynonyms1()
+    {
+        $file = new File(__DIR__."/../../../files/image-metadata.csv");
+        $parser = new ImageCsvParserStub($file);
+        $parser->content = [
+            ['file', 'lon', 'lat', 'heading'],
+            ['abc.jpg', '52.220', '28.123', '180'],
+        ];
+
+        $data = $parser->getMetadata();
+        $this->assertCount(1, $data->getFiles());
+        $file = $data->getFiles()->first();
+        $this->assertEquals('abc.jpg', $file->name);
+        $this->assertEquals(52.220, $file->lng);
+        $this->assertEquals(28.123, $file->lat);
+        $this->assertEquals(180, $file->yaw);
+    }
+
+    public function testGetMetadataColumnSynonyms2()
+    {
+        $file = new File(__DIR__."/../../../files/image-metadata.csv");
+        $parser = new ImageCsvParserStub($file);
+        $parser->content = [
+            ['file', 'longitude', 'latitude'],
+            ['abc.jpg', '52.220', '28.123'],
+        ];
+
+        $data = $parser->getMetadata();
+        $this->assertCount(1, $data->getFiles());
+        $file = $data->getFiles()->first();
+        $this->assertEquals('abc.jpg', $file->name);
+        $this->assertEquals(52.220, $file->lng);
+        $this->assertEquals(28.123, $file->lat);
+    }
+
+    public function testGetMetadataColumnSynonyms3()
+    {
+        $file = new File(__DIR__."/../../../files/image-metadata.csv");
+        $parser = new ImageCsvParserStub($file);
+        $parser->content = [
+            ['file', 'SUB_datetime', 'SUB_longitude', 'SUB_latitude', 'SUB_altitude', 'SUB_distance', 'SUB_heading'],
+            ['abc.jpg', '2016-12-19 12:27:00', '52.220', '28.123', '-1500', '10', '180'],
+        ];
+
+        $data = $parser->getMetadata();
+        $this->assertCount(1, $data->getFiles());
+        $file = $data->getFiles()->first();
+        $this->assertEquals('abc.jpg', $file->name);
+        $this->assertEquals('2016-12-19 12:27:00', $file->takenAt);
+        $this->assertEquals(52.220, $file->lng);
+        $this->assertEquals(28.123, $file->lat);
+        $this->assertEquals(-1500, $file->gpsAltitude);
+        $this->assertEquals(10, $file->distanceToGround);
+        $this->assertEquals(180, $file->yaw);
+    }
+
+    public function testGetMetadataEmptyCells()
+    {
+        $file = new File(__DIR__."/../../../files/image-metadata.csv");
+        $parser = new ImageCsvParserStub($file);
+        $parser->content = [
+            ['filename', 'taken_at', 'lng', 'lat', 'gps_altitude', 'distance_to_ground', 'area', 'yaw'],
+            ['abc.jpg', '', '52.220', '28.123', '', '', '', ''],
+        ];
+
+        $data = $parser->getMetadata();
+        $this->assertCount(1, $data->getFiles());
+        $file = $data->getFiles()->first();
+        $this->assertEquals('abc.jpg', $file->name);
+        $this->assertNull($file->takenAt);
+        $this->assertEquals(52.220, $file->lng);
+        $this->assertEquals(28.123, $file->lat);
+        $this->assertNull($file->gpsAltitude);
+        $this->assertNull($file->distanceToGround);
+        $this->assertNull($file->area);
+        $this->assertNull($file->yaw);
+    }
+}
+
+class ImageCsvParserStub extends ImageCsvParser
+{
+    public array $content = [];
+
+    protected function getCsvIterator(): \SeekableIterator
+    {
+        return new \ArrayIterator($this->content);
     }
 }

From c2b18720cfd083dc742c1b02281ba146f65431aa Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Mon, 11 Dec 2023 20:25:46 +0100
Subject: [PATCH 007/209] Implement ParserFactory

---
 .../MetadataParsing/ParserFactory.php         | 13 +++++++++-
 .../MetadataParsing/ParserFactoryTest.php     | 25 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 tests/php/Services/MetadataParsing/ParserFactoryTest.php

diff --git a/app/Services/MetadataParsing/ParserFactory.php b/app/Services/MetadataParsing/ParserFactory.php
index 5538bc95a..b385a476f 100644
--- a/app/Services/MetadataParsing/ParserFactory.php
+++ b/app/Services/MetadataParsing/ParserFactory.php
@@ -6,8 +6,19 @@
 
 class ParserFactory
 {
+    public static array $parsers = [
+        ImageCsvParser::class,
+    ];
+
     public static function getParserForFile(File $file): ?MetadataParser
     {
-        //
+        foreach (self::$parsers as $parserClass) {
+            $parser = new $parserClass($file);
+            if ($parser->recognizesFile()) {
+                return $parser;
+            }
+        }
+
+        return null;
     }
 }
diff --git a/tests/php/Services/MetadataParsing/ParserFactoryTest.php b/tests/php/Services/MetadataParsing/ParserFactoryTest.php
new file mode 100644
index 000000000..af525eece
--- /dev/null
+++ b/tests/php/Services/MetadataParsing/ParserFactoryTest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Biigle\Tests\Services\MetadataParsing;
+
+use Biigle\Services\MetadataParsing\ImageCsvParser;
+use Biigle\Services\MetadataParsing\ParserFactory;
+use Symfony\Component\HttpFoundation\File\File;
+use TestCase;
+
+class ParserFactoryTest extends TestCase
+{
+    public function testGetParserForFile()
+    {
+        $file = new File(__DIR__."/../../../files/image-metadata.csv");
+        $parser = ParserFactory::getParserForFile($file);
+        $this->assertInstanceOf(ImageCsvParser::class, $parser);
+    }
+
+    public function testGetParserForFileUnknown()
+    {
+        $file = new File(__DIR__."/../../../files/test.mp4");
+        $parser = ParserFactory::getParserForFile($file);
+        $this->assertNull($parser);
+    }
+}

From f1c8122907555a47cc2ced39d394a20a0c58a965 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Mon, 11 Dec 2023 21:00:17 +0100
Subject: [PATCH 008/209] Update the ImageMetadata validation rule

---
 app/Rules/ImageMetadata.php                   | 162 ++++-------------
 app/Services/MetadataParsing/FileMetadata.php |   5 +
 .../MetadataParsing/ImageCsvParser.php        |   2 +
 .../MetadataParsing/ImageMetadata.php         |  14 ++
 .../MetadataParsing/VolumeMetadata.php        |  14 ++
 tests/php/Rules/ImageMetadataTest.php         | 165 +++++++-----------
 .../MetadataParsing/VolumeMetadataTest.php    |  13 ++
 7 files changed, 140 insertions(+), 235 deletions(-)

diff --git a/app/Rules/ImageMetadata.php b/app/Rules/ImageMetadata.php
index 6d012c006..972c56c93 100644
--- a/app/Rules/ImageMetadata.php
+++ b/app/Rules/ImageMetadata.php
@@ -3,32 +3,10 @@
 namespace Biigle\Rules;
 
 use Illuminate\Contracts\Validation\Rule;
+use Biigle\Services\MetadataParsing\VolumeMetadata;
 
 class ImageMetadata implements Rule
 {
-    /**
-     * Allowed columns for the metadata information to change image attributes.
-     *
-     * @var array
-     */
-    const ALLOWED_ATTRIBUTES = [
-        'lat',
-        'lng',
-        'taken_at',
-    ];
-
-    /**
-     * Allowed columns for the metadata information to change image metadata.
-     *
-     * @var array
-     */
-    const ALLOWED_METADATA = [
-        'area',
-        'distance_to_ground',
-        'gps_altitude',
-        'yaw',
-    ];
-
     /**
      * All numeric metadata fields (keys) with description (values).
      *
@@ -36,20 +14,13 @@ class ImageMetadata implements Rule
      */
     const NUMERIC_FIELDS = [
         'area' => 'area',
-        'distance_to_ground' => 'distance to ground',
-        'gps_altitude' => 'GPS altitude',
+        'distanceToGround' => 'distance to ground',
+        'gpsAltitude' => 'GPS altitude',
         'lat' => 'latitude',
         'lng' => 'longitude',
         'yaw' => 'yaw',
     ];
 
-    /**
-     * Array of volume file names.
-     *
-     * @var array
-     */
-    protected $files;
-
     /**
      * The validation error message.
      *
@@ -62,157 +33,84 @@ class ImageMetadata implements Rule
      *
      * @param array $files
      */
-    public function __construct($files)
+    public function __construct(public array $files)
     {
-        $this->files = $files;
         $this->message = "The :attribute is invalid.";
     }
 
     /**
      * Determine if the validation rule passes.
-     *
-     * @param  string  $attribute
-     * @param  array  $value
-     * @return bool
      */
-    public function passes($attribute, $value)
+    public function passes($attribute, $value): bool
     {
-        if (!is_array($value)) {
-            return false;
+        if (!($value instanceof VolumeMetadata)) {
+            throw new \Exception('No value of type '.VolumeMetadata::class.' given.');
         }
 
+        $fileMetadata = $value->getFiles();
         // This checks if any information is given at all.
-        if (empty($value)) {
-            $this->message = 'The metadata information is empty.';
-
-            return false;
-        }
-
-        $columns = array_shift($value);
-
-        // This checks if any information is given beside the column description.
-        if (empty($value)) {
+        if ($fileMetadata->isEmpty()) {
             $this->message = 'The metadata information is empty.';
 
             return false;
         }
 
-        if (!in_array('filename', $columns)) {
-            $this->message = 'The filename column is required.';
-
-            return false;
-        }
-
-        $colCount = count($columns);
+        foreach ($fileMetadata as $file) {
 
-        if ($colCount === 1) {
-            $this->message = 'No metadata columns given.';
-
-            return false;
-        }
-
-        if ($colCount !== count(array_unique($columns))) {
-            $this->message = 'Each column may occur only once.';
-
-            return false;
-        }
-
-        $allowedColumns = array_merge(['filename'], self::ALLOWED_ATTRIBUTES, self::ALLOWED_METADATA);
-        $diff = array_diff($columns, $allowedColumns);
-
-        if (count($diff) > 0) {
-            $this->message = 'The columns array may contain only values of: '.implode(', ', $allowedColumns).'.';
-
-            return false;
-        }
-
-        $lng = in_array('lng', $columns);
-        $lat = in_array('lat', $columns);
-        if ($lng && !$lat || !$lng && $lat) {
-            $this->message = "If the 'lng' column is present, the 'lat' column must be present, too (and vice versa).";
-
-            return false;
-        }
-
-        foreach ($value as $index => $row) {
-            // +1 since index starts at 0.
-            // +1 since column description row was removed above.
-            $line = $index + 2;
-
-            if (count($row) !== $colCount) {
-                $this->message = "Invalid column count in line {$line}.";
-
-                return false;
-            }
-
-            $combined = array_combine($columns, $row);
-            $combined = array_filter($combined);
-            if (!array_key_exists('filename', $combined)) {
-                $this->message = "Filename missing in line {$line}.";
+            if (!in_array($file->name, $this->files)) {
+                $this->message = "There is no file with filename {$file->name}.";
 
                 return false;
             }
 
-            $filename = $combined['filename'];
-
-            if (!in_array($filename, $this->files)) {
-                $this->message = "There is no file with filename {$filename}.";
-
-                return false;
-            }
-
-            if (array_key_exists('lng', $combined)) {
-                $lng = $combined['lng'];
-                if (!is_numeric($lng) || abs($lng) > 180) {
-                    $this->message = "'{$lng}' is no valid longitude for file {$filename}.";
+            if (!is_null($file->lng)) {
+                if (!is_numeric($file->lng) || abs($file->lng) > 180) {
+                    $this->message = "'{$file->lng}' is no valid longitude for file {$file->name}.";
 
                     return false;
                 }
 
-
-                if (!array_key_exists('lat', $combined)) {
-                    $this->message = "Missing latitude for file {$filename}.";
+                if (is_null($file->lat)) {
+                    $this->message = "Missing latitude for file {$file->name}.";
 
                     return false;
                 }
             }
 
-            if (array_key_exists('lat', $combined)) {
-                $lat = $combined['lat'];
-                if (!is_numeric($lat) || abs($lat) > 90) {
-                    $this->message = "'{$lat}' is no valid latitude for file {$filename}.";
+            if (!is_null($file->lat)) {
+                if (!is_numeric($file->lat) || abs($file->lat) > 90) {
+                    $this->message = "'{$file->lat}' is no valid latitude for file {$file->name}.";
 
                     return false;
                 }
 
-                if (!array_key_exists('lng', $combined)) {
-                    $this->message = "Missing longitude for file {$filename}.";
+                if (is_null($file->lng)) {
+                    $this->message = "Missing longitude for file {$file->name}.";
 
                     return false;
                 }
             }
 
             // Catch both a malformed date (false) and the zero date (negative integer).
-            if (array_key_exists('taken_at', $combined)) {
-                $date = $combined['taken_at'];
-                if (!(strtotime($date) > 0)) {
-                    $this->message = "'{$date}' is no valid date for file {$filename}.";
+            if (!is_null($file->takenAt)) {
+                if (!(strtotime($file->takenAt) > 0)) {
+                    $this->message = "'{$file->takenAt}' is no valid date for file {$file->name}.";
 
                     return false;
                 }
             }
 
             foreach (self::NUMERIC_FIELDS as $key => $text) {
-                if (array_key_exists($key, $combined) && !is_numeric($combined[$key])) {
-                    $this->message = "'{$combined[$key]}' is no valid {$text} for file {$filename}.";
+                if (!is_null($file->$key) && !is_numeric($file->$key)) {
+                    $this->message = "'{$file->$key}' is no valid {$text} for file {$file->name}.";
 
                     return false;
                 }
             }
 
-            if (array_key_exists('yaw', $combined)) {
-                if ($combined['yaw'] < 0 || $combined['yaw'] > 360) {
-                    $this->message = "'{$combined['yaw']}' is no valid yaw for file {$filename}.";
+            if (!is_null($file->yaw)) {
+                if ($file->yaw < 0 || $file->yaw > 360) {
+                    $this->message = "'{$file->yaw}' is no valid yaw for file {$file->name}.";
 
                     return false;
                 }
diff --git a/app/Services/MetadataParsing/FileMetadata.php b/app/Services/MetadataParsing/FileMetadata.php
index 080b57b88..9ccdf5d40 100644
--- a/app/Services/MetadataParsing/FileMetadata.php
+++ b/app/Services/MetadataParsing/FileMetadata.php
@@ -8,4 +8,9 @@ public function __construct(public string $name)
     {
         //
     }
+
+    public function isEmpty(): bool
+    {
+        return true;
+    }
 }
diff --git a/app/Services/MetadataParsing/ImageCsvParser.php b/app/Services/MetadataParsing/ImageCsvParser.php
index 07acc6758..cd9dc49d3 100644
--- a/app/Services/MetadataParsing/ImageCsvParser.php
+++ b/app/Services/MetadataParsing/ImageCsvParser.php
@@ -71,7 +71,9 @@ public function getMetadata(): VolumeMetadata
             return $column;
         }, $keys);
 
+        // This will remove duplicate columns and retain the "last" one.
         $keyMap = array_flip($keys);
+
         $getValue = fn ($row, $key) => $row[$keyMap[$key] ?? null] ?? null;
         $maybeCast = fn ($value) => (is_null($value) || $value === '') ? null : floatval($value);
 
diff --git a/app/Services/MetadataParsing/ImageMetadata.php b/app/Services/MetadataParsing/ImageMetadata.php
index ad766e718..36920aef8 100644
--- a/app/Services/MetadataParsing/ImageMetadata.php
+++ b/app/Services/MetadataParsing/ImageMetadata.php
@@ -17,4 +17,18 @@ public function __construct(
     {
         parent::__construct($name);
     }
+
+    /**
+     * Determines if any metadata field other than the name is filled.
+     */
+    public function isEmpty(): bool
+    {
+        return is_null($this->lat)
+            && is_null($this->lng)
+            && is_null($this->takenAt)
+            && is_null($this->area)
+            && is_null($this->distanceToGround)
+            && is_null($this->gpsAltitude)
+            && is_null($this->yaw);
+    }
 }
diff --git a/app/Services/MetadataParsing/VolumeMetadata.php b/app/Services/MetadataParsing/VolumeMetadata.php
index a480df64e..b6defcd43 100644
--- a/app/Services/MetadataParsing/VolumeMetadata.php
+++ b/app/Services/MetadataParsing/VolumeMetadata.php
@@ -28,4 +28,18 @@ public function getFiles(): Collection
     {
         return $this->files->values();
     }
+
+    /**
+     * Determine if there is any file metadata.
+     */
+    public function isEmpty(): bool
+    {
+        foreach ($this->files as $file) {
+            if (!$file->isEmpty()) {
+                return false;
+            }
+        }
+
+        return true;
+    }
 }
diff --git a/tests/php/Rules/ImageMetadataTest.php b/tests/php/Rules/ImageMetadataTest.php
index d2c935a35..8bb5eac07 100644
--- a/tests/php/Rules/ImageMetadataTest.php
+++ b/tests/php/Rules/ImageMetadataTest.php
@@ -2,150 +2,109 @@
 
 namespace Biigle\Tests\Rules;
 
-use Biigle\Rules\ImageMetadata;
+use Biigle\Rules\ImageMetadata as ImageMetadataRule;
+use Biigle\Services\MetadataParsing\VolumeMetadata;
+use Biigle\Services\MetadataParsing\ImageMetadata;
 use TestCase;
 
 class ImageMetadataTest extends TestCase
 {
-    protected static $ruleClass = ImageMetadata::class;
-
     public function testMetadataOk()
     {
-        $validator = new static::$ruleClass(['abc.jpg']);
-        $metadata = [
-            ['filename', 'taken_at', 'lng', 'lat', 'gps_altitude', 'distance_to_ground', 'area', 'yaw'],
-            ['abc.jpg', '2016-12-19 12:27:00', '52.220', '28.123', '-1500', '10', '2.6', '180'],
-        ];
+        $validator = new ImageMetadataRule(['abc.jpg']);
+
+        $metadata = new VolumeMetadata;
+        $metadata->addFile(new ImageMetadata(
+            name: 'abc.jpg',
+            takenAt: '2016-12-19 12:27:00',
+            lng: 52.220,
+            lat: 28.123,
+            gpsAltitude: -1500,
+            distanceToGround: 10,
+            area: 2.6,
+            yaw: 180
+        ));
         $this->assertTrue($validator->passes(null, $metadata));
     }
 
     public function testMetadataWrongFile()
     {
-        $validator = new static::$ruleClass(['abc.jpg']);
-        $metadata = [
-            ['filename', 'taken_at'],
-            ['cba.jpg', '2016-12-19 12:27:00'],
-        ];
-        $this->assertFalse($validator->passes(null, $metadata));
-    }
-
-    public function testMetadataNoCols()
-    {
-        $validator = new static::$ruleClass(['abc.jpg']);
-        $metadata = [
-            ['abc.jpg', '2016-12-19 12:27:00'],
-        ];
-        $this->assertFalse($validator->passes(null, $metadata));
-    }
-
-    public function testMetadataWrongCols()
-    {
-        $validator = new static::$ruleClass(['abc.jpg']);
-        $metadata = [
-            ['filename', 'abc'],
-            ['abc.jpg', '2016-12-19 12:27:00'],
-        ];
-        $this->assertFalse($validator->passes(null, $metadata));
-    }
-
-    public function testMetadataColCount()
-    {
-        $validator = new static::$ruleClass(['abc.jpg']);
-        $metadata = [
-            ['filename', 'taken_at'],
-            ['abc.jpg', '2016-12-19 12:27:00', '52.220', '28.123'],
-        ];
+        $validator = new ImageMetadataRule(['abc.jpg']);
+        $metadata = new VolumeMetadata;
+        $metadata->addFile(new ImageMetadata(
+            name: 'cba.jpg',
+            takenAt: '2016-12-19 12:27:00'
+        ));
         $this->assertFalse($validator->passes(null, $metadata));
     }
 
     public function testMetadataNoLat()
     {
-        $validator = new static::$ruleClass(['abc.jpg']);
-        $metadata = [
-            ['filename', 'lng'],
-            ['abc.jpg', '52.220'],
-        ];
+        $validator = new ImageMetadataRule(['abc.jpg']);
+        $metadata = new VolumeMetadata;
+        $metadata->addFile(new ImageMetadata(
+            name: 'abc.jpg',
+            lng: 52.220
+        ));
         $this->assertFalse($validator->passes(null, $metadata));
     }
 
     public function testMetadataNoLng()
     {
-        $validator = new static::$ruleClass(['abc.jpg']);
-        $metadata = [
-            ['filename', 'lat'],
-            ['abc.jpg', '28.123'],
-        ];
-        $this->assertFalse($validator->passes(null, $metadata));
-    }
-
-    public function testMetadataColOrdering()
-    {
-        $validator = new static::$ruleClass(['abc.jpg']);
-        $metadata = [
-            ['filename', 'lng', 'lat', 'taken_at'],
-            ['abc.jpg', '2016-12-19 12:27:00', '52.220', '28.123'],
-        ];
+        $validator = new ImageMetadataRule(['abc.jpg']);
+        $metadata = new VolumeMetadata;
+        $metadata->addFile(new ImageMetadata(
+            name: 'abc.jpg',
+            lat: 28.123
+        ));
         $this->assertFalse($validator->passes(null, $metadata));
     }
 
     public function testMetadataInvalidLat()
     {
-        $validator = new static::$ruleClass(['abc.jpg']);
-        $metadata = [
-            ['filename', 'lng', 'lat'],
-            ['abc.jpg', '50', '91'],
-        ];
+        $validator = new ImageMetadataRule(['abc.jpg']);
+        $metadata = new VolumeMetadata;
+        $metadata->addFile(new ImageMetadata(
+            name: 'abc.jpg',
+            lng: 50,
+            lat: 91
+        ));
         $this->assertFalse($validator->passes(null, $metadata));
     }
 
     public function testMetadataInvalidLng()
     {
-        $validator = new static::$ruleClass(['abc.jpg']);
-        $metadata = [
-            ['filename', 'lng', 'lat'],
-            ['abc.jpg', '181', '50'],
-        ];
+        $validator = new ImageMetadataRule(['abc.jpg']);
+        $metadata = new VolumeMetadata;
+        $metadata->addFile(new ImageMetadata(
+            name: 'abc.jpg',
+            lng: 181,
+            lat: 50
+        ));
         $this->assertFalse($validator->passes(null, $metadata));
     }
 
     public function testMetadataInvalidYaw()
     {
-        $validator = new static::$ruleClass(['abc.jpg']);
-        $metadata = [
-            ['filename', 'yaw'],
-            ['abc.jpg', '361'],
-        ];
-        $this->assertFalse($validator->passes(null, $metadata));
-    }
-
-    public function testMetadataOnlyValidateFilled()
-    {
-        $validator = new static::$ruleClass(['abc.jpg']);
-        $metadata = [
-            ['filename', 'taken_at'],
-            ['abc.jpg', ''],
-        ];
-        $this->assertTrue($validator->passes(null, $metadata));
-    }
-
-    public function testMetadataLatFilledLonNotFilled()
-    {
-        $validator = new static::$ruleClass(['abc.jpg']);
-        $metadata = [
-            ['filename', 'lat', 'lon'],
-            ['abc.jpg', '28.123', ''],
-        ];
+        $validator = new ImageMetadataRule(['abc.jpg']);
+        $metadata = new VolumeMetadata;
+        $metadata->addFile(new ImageMetadata(
+            name: 'abc.jpg',
+            yaw: 361
+        ));
         $this->assertFalse($validator->passes(null, $metadata));
     }
 
     public function testEmptyFilename()
     {
-        $validator = new static::$ruleClass(['abc.jpg']);
-        $metadata = [
-            ['filename', 'taken_at'],
-            ['abc.jpg', ''],
-            ['', ''],
-        ];
+        $validator = new ImageMetadataRule(['abc.jpg']);
+        $metadata = new VolumeMetadata;
+        $metadata->addFile(new ImageMetadata(
+            name: 'abc.jpg'
+        ));
+        $metadata->addFile(new ImageMetadata(
+            name: ''
+        ));
         $this->assertFalse($validator->passes(null, $metadata));
     }
 }
diff --git a/tests/php/Services/MetadataParsing/VolumeMetadataTest.php b/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
index 154d5fad7..44524cd92 100644
--- a/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
@@ -5,6 +5,7 @@
 use Biigle\MediaType;
 use Biigle\Services\MetadataParsing\VolumeMetadata;
 use Biigle\Services\MetadataParsing\FileMetadata;
+use Biigle\Services\MetadataParsing\ImageMetadata;
 use TestCase;
 
 class VolumeMetadataTest extends TestCase
@@ -28,4 +29,16 @@ public function testAddGetFiles()
         $metadata->addFile($file);
         $this->assertCount(1, $metadata->getFiles());
     }
+
+    public function testIsEmpty()
+    {
+        $metadata = new VolumeMetadata();
+        $this->assertTrue($metadata->isEmpty());
+        $file = new ImageMetadata('filename');
+        $metadata->addFile($file);
+        $this->assertTrue($metadata->isEmpty());
+        $file = new ImageMetadata('filename', area: 100);
+        $metadata->addFile($file);
+        $this->assertFalse($metadata->isEmpty());
+    }
 }

From 993044c75c38e120d4ff905780bf2cee3cc90de8 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Tue, 12 Dec 2023 21:00:02 +0100
Subject: [PATCH 009/209] Implement VideoCsvParser

---
 app/Rules/VideoMetadata.php                   |   2 +-
 app/Services/MetadataParsing/CsvParser.php    |  96 ++++++++
 .../MetadataParsing/ImageCsvParser.php        |  92 +-------
 .../MetadataParsing/VideoCsvParser.php        |  72 ++++++
 .../MetadataParsing/VideoMetadata.php         |  81 +++++++
 .../MetadataParsing/VolumeMetadata.php        |   5 +
 ...sv => video-metadata-strange-encoding.csv} |   0
 .../MetadataParsing/ImageMetadataTest.php     |  18 ++
 .../MetadataParsing/VideoCsvParserTest.php    | 211 ++++++++++++++++++
 .../MetadataParsing/VideoMetadataTest.php     |  42 ++++
 .../MetadataParsing/VolumeMetadataTest.php    |   9 +
 11 files changed, 545 insertions(+), 83 deletions(-)
 create mode 100644 app/Services/MetadataParsing/CsvParser.php
 create mode 100644 app/Services/MetadataParsing/VideoCsvParser.php
 create mode 100644 app/Services/MetadataParsing/VideoMetadata.php
 rename tests/files/{video-metadata-incorrect-encoding.csv => video-metadata-strange-encoding.csv} (100%)
 create mode 100644 tests/php/Services/MetadataParsing/ImageMetadataTest.php
 create mode 100644 tests/php/Services/MetadataParsing/VideoCsvParserTest.php
 create mode 100644 tests/php/Services/MetadataParsing/VideoMetadataTest.php

diff --git a/app/Rules/VideoMetadata.php b/app/Rules/VideoMetadata.php
index a23c42ee9..c86bf4935 100644
--- a/app/Rules/VideoMetadata.php
+++ b/app/Rules/VideoMetadata.php
@@ -7,7 +7,7 @@ class VideoMetadata extends ImageMetadata
     /**
      * {@inheritdoc}
      */
-    public function passes($attribute, $value)
+    public function passes($attribute, $value): bool
     {
         $passes = parent::passes($attribute, $value);
 
diff --git a/app/Services/MetadataParsing/CsvParser.php b/app/Services/MetadataParsing/CsvParser.php
new file mode 100644
index 000000000..94ea8ee94
--- /dev/null
+++ b/app/Services/MetadataParsing/CsvParser.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace Biigle\Services\MetadataParsing;
+
+use duncan3dc\Bom\Util;
+use SeekableIterator;
+use SplFileObject;
+
+abstract class CsvParser extends MetadataParser
+{
+    /**
+     * Column name synonyms.
+     *
+     * @var array
+     */
+    const COLUMN_SYNONYMS = [
+        'file' => 'filename',
+        'lon' => 'lng',
+        'longitude' => 'lng',
+        'latitude' => 'lat',
+        'heading' => 'yaw',
+        'sub_datetime' => 'taken_at',
+        'sub_longitude' => 'lng',
+        'sub_latitude' => 'lat',
+        'sub_heading' => 'yaw',
+        'sub_distance' => 'distance_to_ground',
+        'sub_altitude' => 'gps_altitude',
+    ];
+
+    /**
+     * {@inheritdoc}
+     */
+    public function recognizesFile(): bool
+    {
+        $file = $this->getCsvIterator();
+        $line = $file->current();
+        if (!is_array($line)) {
+            return false;
+        }
+
+        $line = $this->processFirstLine($line);
+
+        if (!in_array('filename', $line, true) && !in_array('file', $line, true)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    abstract public function getMetadata(): VolumeMetadata;
+
+    protected function getCsvIterator(): SeekableIterator
+    {
+        $file = parent::getFileObject();
+        $file->setFlags(SplFileObject::READ_CSV);
+
+        return $file;
+    }
+
+    protected function processFirstLine(array $line): array
+    {
+        $line = array_map('strtolower', $line);
+        if (!empty($line[0])) {
+            $line[0] = Util::removeBom($line[0]);
+        }
+
+        return $line;
+    }
+
+    protected function getKeyMap(array $line): array
+    {
+        $line = $this->processFirstLine($line);
+
+        $keys = array_map(function ($column) {
+            if (array_key_exists($column, self::COLUMN_SYNONYMS)) {
+                return self::COLUMN_SYNONYMS[$column];
+            }
+
+            return $column;
+        }, $line);
+
+        // This will remove duplicate columns and retain the "last" one.
+        return array_flip($keys);
+    }
+
+    /**
+     * Cast the value to float if it is not null or an empty string.
+     */
+    protected function maybeCastToFloat(?string $value): ?float
+    {
+        return (is_null($value) || $value === '') ? null : floatval($value);
+    }
+}
diff --git a/app/Services/MetadataParsing/ImageCsvParser.php b/app/Services/MetadataParsing/ImageCsvParser.php
index cd9dc49d3..9859aa783 100644
--- a/app/Services/MetadataParsing/ImageCsvParser.php
+++ b/app/Services/MetadataParsing/ImageCsvParser.php
@@ -3,52 +3,9 @@
 namespace Biigle\Services\MetadataParsing;
 
 use Biigle\MediaType;
-use duncan3dc\Bom\Util;
-use SeekableIterator;
-use SplFileObject;
-use Symfony\Component\HttpFoundation\File\File;
 
-class ImageCsvParser extends MetadataParser
+class ImageCsvParser extends CsvParser
 {
-    /**
-     * Column name synonyms.
-     *
-     * @var array
-     */
-    const COLUMN_SYNONYMS = [
-        'file' => 'filename',
-        'lon' => 'lng',
-        'longitude' => 'lng',
-        'latitude' => 'lat',
-        'heading' => 'yaw',
-        'sub_datetime' => 'taken_at',
-        'sub_longitude' => 'lng',
-        'sub_latitude' => 'lat',
-        'sub_heading' => 'yaw',
-        'sub_distance' => 'distance_to_ground',
-        'sub_altitude' => 'gps_altitude',
-    ];
-
-    /**
-     * {@inheritdoc}
-     */
-    public function recognizesFile(): bool
-    {
-        $file = $this->getCsvIterator();
-        $line = $file->current();
-        if (!is_array($line)) {
-            return false;
-        }
-
-        $line = $this->processFirstLine($line);
-
-        if (!in_array('filename', $line, true) && !in_array('file', $line, true)) {
-            return false;
-        }
-
-        return true;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -57,25 +14,14 @@ public function getMetadata(): VolumeMetadata
         $data = new VolumeMetadata(MediaType::image());
 
         $file = $this->getCsvIterator();
-        $keys = $file->current();
-        if (!is_array($keys)) {
+        $line = $file->current();
+        if (!is_array($line)) {
             return $data;
         }
 
-        $keys = $this->processFirstLine($keys);
-        $keys = array_map(function ($column) {
-            if (array_key_exists($column, self::COLUMN_SYNONYMS)) {
-                return self::COLUMN_SYNONYMS[$column];
-            }
-
-            return $column;
-        }, $keys);
-
-        // This will remove duplicate columns and retain the "last" one.
-        $keyMap = array_flip($keys);
+        $keyMap = $this->getKeyMap($line);
 
         $getValue = fn ($row, $key) => $row[$keyMap[$key] ?? null] ?? null;
-        $maybeCast = fn ($value) => (is_null($value) || $value === '') ? null : floatval($value);
 
         $file->next();
         while ($file->valid()) {
@@ -92,13 +38,13 @@ public function getMetadata(): VolumeMetadata
 
             $fileData = new ImageMetadata(
                 name: $getValue($row, 'filename'),
-                lat: $maybeCast($getValue($row, 'lat')),
-                lng: $maybeCast($getValue($row, 'lng')),
+                lat: $this->maybeCastToFloat($getValue($row, 'lat')),
+                lng: $this->maybeCastToFloat($getValue($row, 'lng')),
                 takenAt: $getValue($row, 'taken_at') ?: null, // Use null instead of ''.
-                area: $maybeCast($getValue($row, 'area')),
-                distanceToGround: $maybeCast($getValue($row, 'distance_to_ground')),
-                gpsAltitude: $maybeCast($getValue($row, 'gps_altitude')),
-                yaw: $maybeCast($getValue($row, 'yaw')),
+                area: $this->maybeCastToFloat($getValue($row, 'area')),
+                distanceToGround: $this->maybeCastToFloat($getValue($row, 'distance_to_ground')),
+                gpsAltitude: $this->maybeCastToFloat($getValue($row, 'gps_altitude')),
+                yaw: $this->maybeCastToFloat($getValue($row, 'yaw')),
             );
 
             $data->addFile($fileData);
@@ -106,22 +52,4 @@ public function getMetadata(): VolumeMetadata
 
         return $data;
     }
-
-    protected function getCsvIterator(): SeekableIterator
-    {
-        $file = parent::getFileObject();
-        $file->setFlags(SplFileObject::READ_CSV);
-
-        return $file;
-    }
-
-    protected function processFirstLine(array $line): array
-    {
-        $line = array_map('strtolower', $line);
-        if (!empty($line[0])) {
-            $line[0] = Util::removeBom($line[0]);
-        }
-
-        return $line;
-    }
 }
diff --git a/app/Services/MetadataParsing/VideoCsvParser.php b/app/Services/MetadataParsing/VideoCsvParser.php
new file mode 100644
index 000000000..616c5ca72
--- /dev/null
+++ b/app/Services/MetadataParsing/VideoCsvParser.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace Biigle\Services\MetadataParsing;
+
+use Biigle\MediaType;
+
+class VideoCsvParser extends CsvParser
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getMetadata(): VolumeMetadata
+    {
+        $data = new VolumeMetadata(MediaType::video());
+
+        $file = $this->getCsvIterator();
+        $line = $file->current();
+        if (!is_array($line)) {
+            return $data;
+        }
+
+        $keyMap = $this->getKeyMap($line);
+
+        $getValue = fn ($row, $key) => $row[$keyMap[$key] ?? null] ?? null;
+
+        $file->next();
+        while ($file->valid()) {
+            $row = $file->current();
+            $file->next();
+            if (empty($row)) {
+                continue;
+            }
+
+            $name = $getValue($row, 'filename');
+            if (empty($name)) {
+                continue;
+            }
+
+             // Use null instead of ''.
+            $takenAt = $getValue($row, 'taken_at') ?: null;
+
+            // If the file already exists but takenAt is null, replace the file by newly
+            // adding it.
+            if (!is_null($fileData = $data->getFile($name)) && !is_null($takenAt)) {
+                $fileData->addFrame(
+                    takenAt: $takenAt,
+                    lat: $this->maybeCastToFloat($getValue($row, 'lat')),
+                    lng: $this->maybeCastToFloat($getValue($row, 'lng')),
+                    area: $this->maybeCastToFloat($getValue($row, 'area')),
+                    distanceToGround: $this->maybeCastToFloat($getValue($row, 'distance_to_ground')),
+                    gpsAltitude: $this->maybeCastToFloat($getValue($row, 'gps_altitude')),
+                    yaw: $this->maybeCastToFloat($getValue($row, 'yaw')),
+                );
+            } else {
+                $fileData = new VideoMetadata(
+                    name: $getValue($row, 'filename'),
+                    lat: $this->maybeCastToFloat($getValue($row, 'lat')),
+                    lng: $this->maybeCastToFloat($getValue($row, 'lng')),
+                    takenAt: $takenAt,
+                    area: $this->maybeCastToFloat($getValue($row, 'area')),
+                    distanceToGround: $this->maybeCastToFloat($getValue($row, 'distance_to_ground')),
+                    gpsAltitude: $this->maybeCastToFloat($getValue($row, 'gps_altitude')),
+                    yaw: $this->maybeCastToFloat($getValue($row, 'yaw')),
+                );
+
+                $data->addFile($fileData);
+            }
+        }
+
+        return $data;
+    }
+}
diff --git a/app/Services/MetadataParsing/VideoMetadata.php b/app/Services/MetadataParsing/VideoMetadata.php
new file mode 100644
index 000000000..eba7df169
--- /dev/null
+++ b/app/Services/MetadataParsing/VideoMetadata.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace Biigle\Services\MetadataParsing;
+
+use Illuminate\Support\Collection;
+
+class VideoMetadata extends FileMetadata
+{
+    public Collection $frames;
+
+    public function __construct(
+        public string $name,
+        public ?float $lat = null,
+        public ?float $lng = null,
+        public ?string $takenAt = null,
+        public ?float $area = null,
+        public ?float $distanceToGround = null,
+        public ?float $gpsAltitude = null,
+        public ?float $yaw = null
+    )
+    {
+        parent::__construct($name);
+
+        $this->frames = collect([]);
+
+        if (!is_null($takenAt)) {
+            $this->addFrame(
+                takenAt: $takenAt,
+                lat: $lat,
+                lng: $lng,
+                area: $area,
+                distanceToGround: $distanceToGround,
+                gpsAltitude: $gpsAltitude,
+                yaw: $yaw
+            );
+        }
+    }
+
+    public function getFrames(): Collection
+    {
+        return $this->frames;
+    }
+
+    public function addFrame(
+        string $takenAt,
+        ?float $lat = null,
+        ?float $lng = null,
+        ?float $area = null,
+        ?float $distanceToGround = null,
+        ?float $gpsAltitude = null,
+        ?float $yaw = null
+    ): void
+    {
+        $frame = new ImageMetadata(
+            name: $this->name,
+            takenAt: $takenAt,
+            lat: $lat,
+            lng: $lng,
+            area: $area,
+            distanceToGround: $distanceToGround,
+            gpsAltitude: $gpsAltitude,
+            yaw: $yaw
+        );
+        $this->frames->push($frame);
+    }
+
+    /**
+     * Determines if any metadata field other than the name is filled.
+     */
+    public function isEmpty(): bool
+    {
+        return $this->frames->isEmpty()
+            && is_null($this->lat)
+            && is_null($this->lng)
+            && is_null($this->takenAt)
+            && is_null($this->area)
+            && is_null($this->distanceToGround)
+            && is_null($this->gpsAltitude)
+            && is_null($this->yaw);
+    }
+}
diff --git a/app/Services/MetadataParsing/VolumeMetadata.php b/app/Services/MetadataParsing/VolumeMetadata.php
index b6defcd43..ce5885e29 100644
--- a/app/Services/MetadataParsing/VolumeMetadata.php
+++ b/app/Services/MetadataParsing/VolumeMetadata.php
@@ -29,6 +29,11 @@ public function getFiles(): Collection
         return $this->files->values();
     }
 
+    public function getFile(string $name): ?FileMetadata
+    {
+        return $this->files->get($name);
+    }
+
     /**
      * Determine if there is any file metadata.
      */
diff --git a/tests/files/video-metadata-incorrect-encoding.csv b/tests/files/video-metadata-strange-encoding.csv
similarity index 100%
rename from tests/files/video-metadata-incorrect-encoding.csv
rename to tests/files/video-metadata-strange-encoding.csv
diff --git a/tests/php/Services/MetadataParsing/ImageMetadataTest.php b/tests/php/Services/MetadataParsing/ImageMetadataTest.php
new file mode 100644
index 000000000..aaa39f6a5
--- /dev/null
+++ b/tests/php/Services/MetadataParsing/ImageMetadataTest.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Biigle\Tests\Services\MetadataParsing;
+
+use Biigle\Services\MetadataParsing\ImageMetadata;
+use TestCase;
+
+class ImageMetadataTest extends TestCase
+{
+    public function testIsEmpty()
+    {
+        $data = new ImageMetadata('filename');
+        $this->assertTrue($data->isEmpty());
+
+        $data = new ImageMetadata('filename', area: 10);
+        $this->assertFalse($data->isEmpty());
+    }
+}
diff --git a/tests/php/Services/MetadataParsing/VideoCsvParserTest.php b/tests/php/Services/MetadataParsing/VideoCsvParserTest.php
new file mode 100644
index 000000000..4bc75ec46
--- /dev/null
+++ b/tests/php/Services/MetadataParsing/VideoCsvParserTest.php
@@ -0,0 +1,211 @@
+<?php
+
+namespace Biigle\Tests\Services\MetadataParsing;
+
+use Biigle\Services\MetadataParsing\VideoCsvParser;
+use Biigle\MediaType;
+use Biigle\Volume;
+use Symfony\Component\HttpFoundation\File\File;
+use TestCase;
+
+class VideoCsvParserTest extends TestCase
+{
+    public function testRecognizesFile()
+    {
+        $file = new File(__DIR__."/../../../files/video-metadata.csv");
+        $parser = new VideoCsvParser($file);
+        $this->assertTrue($parser->recognizesFile());
+
+        $file = new File(__DIR__."/../../../files/test.mp4");
+        $parser = new VideoCsvParser($file);
+        $this->assertFalse($parser->recognizesFile());
+    }
+
+    public function testGetMetadata()
+    {
+        $file = new File(__DIR__."/../../../files/video-metadata.csv");
+        $parser = new VideoCsvParser($file);
+        $data = $parser->getMetadata();
+        $this->assertEquals(MediaType::videoId(), $data->type->id);
+        $this->assertNull($data->name);
+        $this->assertNull($data->url);
+        $this->assertNull($data->handle);
+        $this->assertCount(1, $data->getFiles());
+        $file = $data->getFiles()->first();
+        $this->assertEquals('abc.mp4', $file->name);
+        $this->assertEquals('2016-12-19 12:27:00', $file->takenAt);
+        $this->assertEquals(52.220, $file->lng);
+        $this->assertEquals(28.123, $file->lat);
+        $this->assertEquals(-1500, $file->gpsAltitude);
+        $this->assertEquals(10, $file->distanceToGround);
+        $this->assertEquals(2.6, $file->area);
+        $this->assertEquals(180, $file->yaw);
+
+        $frames = $file->getFrames();
+        $this->assertCount(2, $frames);
+        $frame = $frames[0];
+        $this->assertEquals('abc.mp4', $frame->name);
+        $this->assertEquals('2016-12-19 12:27:00', $frame->takenAt);
+        $this->assertEquals(52.220, $frame->lng);
+        $this->assertEquals(28.123, $frame->lat);
+        $this->assertEquals(-1500, $frame->gpsAltitude);
+        $this->assertEquals(10, $frame->distanceToGround);
+        $this->assertEquals(2.6, $frame->area);
+        $this->assertEquals(180, $frame->yaw);
+
+        $frame = $frames[1];
+        $this->assertEquals('abc.mp4', $frame->name);
+        $this->assertEquals('2016-12-19 12:28:00', $frame->takenAt);
+        $this->assertEquals(52.230, $frame->lng);
+        $this->assertEquals(28.133, $frame->lat);
+        $this->assertEquals(-1505, $frame->gpsAltitude);
+        $this->assertEquals(5, $frame->distanceToGround);
+        $this->assertEquals(1.6, $frame->area);
+        $this->assertEquals(181, $frame->yaw);
+    }
+
+    public function testGetMetadataIgnoreMissingFilename()
+    {
+        $file = new File(__DIR__."/../../../files/video-metadata.csv");
+        $parser = new VideoCsvParserStub($file);
+        $parser->content = [
+            ['filename', 'taken_at', 'lng', 'lat', 'gps_altitude', 'distance_to_ground', 'area', 'yaw'],
+            ['', '2016-12-19 12:27:00', '52.220', '28.123', '-1500', '10', '2.6', '180'],
+        ];
+
+        $data = $parser->getMetadata();
+        $this->assertCount(0, $data->getFiles());
+    }
+
+    public function testGetMetadataCantReadFile()
+    {
+        $file = new File(__DIR__."/../../../files/test.mp4");
+        $parser = new VideoCsvParser($file);
+        $data = $parser->getMetadata();
+        $this->assertEquals(MediaType::videoId(), $data->type->id);
+        $this->assertCount(0, $data->getFiles());
+    }
+
+    public function testGetMetadataCaseInsensitive()
+    {
+        $file = new File(__DIR__."/../../../files/video-metadata.csv");
+        $parser = new VideoCsvParserStub($file);
+        $parser->content = [
+            ['Filename', 'tAken_at', 'lnG', 'Lat', 'gPs_altitude', 'diStance_to_ground', 'areA'],
+            ['abc.mp4', '2016-12-19 12:27:00', '52.220', '28.123', '-1500', '10', '2.6'],
+        ];
+
+        $data = $parser->getMetadata();
+        $this->assertCount(1, $data->getFiles());
+        $file = $data->getFiles()->first();
+        $this->assertEquals('abc.mp4', $file->name);
+        $frame = $file->getFrames()->first();
+        $this->assertEquals('2016-12-19 12:27:00', $frame->takenAt);
+        $this->assertEquals(52.220, $frame->lng);
+        $this->assertEquals(28.123, $frame->lat);
+        $this->assertEquals(-1500, $frame->gpsAltitude);
+        $this->assertEquals(10, $frame->distanceToGround);
+        $this->assertEquals(2.6, $frame->area);
+    }
+
+    public function testGetMetadataColumnSynonyms1()
+    {
+        $file = new File(__DIR__."/../../../files/video-metadata.csv");
+        $parser = new VideoCsvParserStub($file);
+        $parser->content = [
+            ['file', 'lon', 'lat', 'heading'],
+            ['abc.mp4', '52.220', '28.123', '180'],
+        ];
+
+        $data = $parser->getMetadata();
+        $this->assertCount(1, $data->getFiles());
+        $file = $data->getFiles()->first();
+        $this->assertEquals('abc.mp4', $file->name);
+        $this->assertEquals(52.220, $file->lng);
+        $this->assertEquals(28.123, $file->lat);
+        $this->assertEquals(180, $file->yaw);
+        $this->assertTrue($file->getFrames()->isEmpty());
+    }
+
+    public function testGetMetadataColumnSynonyms2()
+    {
+        $file = new File(__DIR__."/../../../files/video-metadata.csv");
+        $parser = new VideoCsvParserStub($file);
+        $parser->content = [
+            ['file', 'longitude', 'latitude'],
+            ['abc.mp4', '52.220', '28.123'],
+        ];
+
+        $data = $parser->getMetadata();
+        $this->assertCount(1, $data->getFiles());
+        $file = $data->getFiles()->first();
+        $this->assertEquals('abc.mp4', $file->name);
+        $this->assertEquals(52.220, $file->lng);
+        $this->assertEquals(28.123, $file->lat);
+        $this->assertTrue($file->getFrames()->isEmpty());
+    }
+
+    public function testGetMetadataColumnSynonyms3()
+    {
+        $file = new File(__DIR__."/../../../files/video-metadata.csv");
+        $parser = new VideoCsvParserStub($file);
+        $parser->content = [
+            ['file', 'SUB_datetime', 'SUB_longitude', 'SUB_latitude', 'SUB_altitude', 'SUB_distance', 'SUB_heading'],
+            ['abc.mp4', '2016-12-19 12:27:00', '52.220', '28.123', '-1500', '10', '180'],
+        ];
+
+        $data = $parser->getMetadata();
+        $this->assertCount(1, $data->getFiles());
+        $file = $data->getFiles()->first();
+        $this->assertEquals('abc.mp4', $file->name);
+        $frame = $file->getFrames()->first();
+        $this->assertEquals('2016-12-19 12:27:00', $frame->takenAt);
+        $this->assertEquals(52.220, $frame->lng);
+        $this->assertEquals(28.123, $frame->lat);
+        $this->assertEquals(-1500, $frame->gpsAltitude);
+        $this->assertEquals(10, $frame->distanceToGround);
+        $this->assertEquals(180, $frame->yaw);
+    }
+
+    public function testGetMetadataEmptyCells()
+    {
+        $file = new File(__DIR__."/../../../files/video-metadata.csv");
+        $parser = new VideoCsvParserStub($file);
+        $parser->content = [
+            ['filename', 'taken_at', 'lng', 'lat', 'gps_altitude', 'distance_to_ground', 'area', 'yaw'],
+            ['abc.mp4', '', '52.220', '28.123', '', '', '', ''],
+        ];
+
+        $data = $parser->getMetadata();
+        $this->assertCount(1, $data->getFiles());
+        $file = $data->getFiles()->first();
+        $this->assertEquals('abc.mp4', $file->name);
+        $this->assertNull($file->takenAt);
+        $this->assertEquals(52.220, $file->lng);
+        $this->assertEquals(28.123, $file->lat);
+        $this->assertNull($file->gpsAltitude);
+        $this->assertNull($file->distanceToGround);
+        $this->assertNull($file->area);
+        $this->assertNull($file->yaw);
+        $this->assertTrue($file->getFrames()->isEmpty());
+    }
+
+    public function testGetMetadataStrangeEncoding()
+    {
+        $file = new File(__DIR__."/../../../files/video-metadata-strange-encoding.csv");
+        $parser = new VideoCsvParser($file);
+        $data = $parser->getMetadata();
+        $this->assertCount(1, $data->getFiles());
+        $this->assertCount(1, $data->getFiles()->first()->getFrames());
+    }
+}
+
+class VideoCsvParserStub extends VideoCsvParser
+{
+    public array $content = [];
+
+    protected function getCsvIterator(): \SeekableIterator
+    {
+        return new \ArrayIterator($this->content);
+    }
+}
diff --git a/tests/php/Services/MetadataParsing/VideoMetadataTest.php b/tests/php/Services/MetadataParsing/VideoMetadataTest.php
new file mode 100644
index 000000000..7cc771962
--- /dev/null
+++ b/tests/php/Services/MetadataParsing/VideoMetadataTest.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Biigle\Tests\Services\MetadataParsing;
+
+use Biigle\Services\MetadataParsing\VideoMetadata;
+use Biigle\Services\MetadataParsing\ImageMetadata;
+use TestCase;
+
+class VideoMetadataTest extends TestCase
+{
+    public function testIsEmpty()
+    {
+        $data = new VideoMetadata('filename');
+        $this->assertTrue($data->isEmpty());
+        $data->addFrame('2023-12-12 20:26:00');
+        $this->assertFalse($data->isEmpty());
+
+        $data = new VideoMetadata('filename', area: 10);
+        $this->assertFalse($data->isEmpty());
+    }
+
+    public function testGetFrames()
+    {
+        $data = new VideoMetadata('filename');
+        $this->assertTrue($data->getFrames()->isEmpty());
+
+        $data = new VideoMetadata('filename', takenAt: '2023-12-12 20:26:00');
+        $frame = $data->getFrames()->first();
+        $this->assertEquals('filename', $frame->name);
+        $this->assertEquals('2023-12-12 20:26:00', $frame->takenAt);
+    }
+
+    public function testAddFrame()
+    {
+        $data = new VideoMetadata('filename');
+        $this->assertTrue($data->getFrames()->isEmpty());
+        $data->addFrame('2023-12-12 20:26:00');
+        $frame = $data->getFrames()->first();
+        $this->assertEquals('filename', $frame->name);
+        $this->assertEquals('2023-12-12 20:26:00', $frame->takenAt);
+    }
+}
diff --git a/tests/php/Services/MetadataParsing/VolumeMetadataTest.php b/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
index 44524cd92..b2c75cf13 100644
--- a/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
@@ -30,6 +30,15 @@ public function testAddGetFiles()
         $this->assertCount(1, $metadata->getFiles());
     }
 
+    public function testGetFile()
+    {
+        $metadata = new VolumeMetadata();
+        $this->assertNull($metadata->getFile('filename'));
+        $file = new FileMetadata('filename');
+        $metadata->addFile($file);
+        $this->assertEquals($file, $metadata->getFile('filename'));
+    }
+
     public function testIsEmpty()
     {
         $metadata = new VolumeMetadata();

From 2437e9869bd9c0278d1238691271284ba474699a Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Mon, 18 Dec 2023 20:33:48 +0100
Subject: [PATCH 010/209] Fix VideoMetadata validation rule for new metadata
 objects

---
 app/Rules/ImageMetadata.php           | 110 ++++++++-------
 app/Rules/VideoMetadata.php           |  22 +--
 tests/php/Rules/ImageMetadataTest.php |  15 +-
 tests/php/Rules/VideoMetadataTest.php | 192 +++++++++++++++++++++-----
 4 files changed, 234 insertions(+), 105 deletions(-)

diff --git a/app/Rules/ImageMetadata.php b/app/Rules/ImageMetadata.php
index 972c56c93..3fe4fe028 100644
--- a/app/Rules/ImageMetadata.php
+++ b/app/Rules/ImageMetadata.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Contracts\Validation\Rule;
 use Biigle\Services\MetadataParsing\VolumeMetadata;
+use Biigle\Services\MetadataParsing\FileMetadata;
 
 class ImageMetadata implements Rule
 {
@@ -47,86 +48,95 @@ public function passes($attribute, $value): bool
             throw new \Exception('No value of type '.VolumeMetadata::class.' given.');
         }
 
-        $fileMetadata = $value->getFiles();
         // This checks if any information is given at all.
-        if ($fileMetadata->isEmpty()) {
+        if ($value->isEmpty()) {
             $this->message = 'The metadata information is empty.';
 
             return false;
         }
 
-        foreach ($fileMetadata as $file) {
-
-            if (!in_array($file->name, $this->files)) {
-                $this->message = "There is no file with filename {$file->name}.";
+        $fileMetadata = $value->getFiles();
 
+        foreach ($fileMetadata as $file) {
+            if (!$this->fileMetadataPasses($file)) {
                 return false;
             }
+        }
+
+        return true;
+    }
+
+    /**
+     * Get the validation error message.
+     *
+     * @return string
+     */
+    public function message()
+    {
+        return $this->message;
+    }
 
-            if (!is_null($file->lng)) {
-                if (!is_numeric($file->lng) || abs($file->lng) > 180) {
-                    $this->message = "'{$file->lng}' is no valid longitude for file {$file->name}.";
+    protected function fileMetadataPasses(FileMetadata $file)
+    {
+        if (!in_array($file->name, $this->files)) {
+            $this->message = "There is no file with filename {$file->name}.";
 
-                    return false;
-                }
+            return false;
+        }
 
-                if (is_null($file->lat)) {
-                    $this->message = "Missing latitude for file {$file->name}.";
+        if (!is_null($file->lng)) {
+            if (!is_numeric($file->lng) || abs($file->lng) > 180) {
+                $this->message = "'{$file->lng}' is no valid longitude for file {$file->name}.";
 
-                    return false;
-                }
+                return false;
             }
 
-            if (!is_null($file->lat)) {
-                if (!is_numeric($file->lat) || abs($file->lat) > 90) {
-                    $this->message = "'{$file->lat}' is no valid latitude for file {$file->name}.";
+            if (is_null($file->lat)) {
+                $this->message = "Missing latitude for file {$file->name}.";
 
-                    return false;
-                }
+                return false;
+            }
+        }
 
-                if (is_null($file->lng)) {
-                    $this->message = "Missing longitude for file {$file->name}.";
+        if (!is_null($file->lat)) {
+            if (!is_numeric($file->lat) || abs($file->lat) > 90) {
+                $this->message = "'{$file->lat}' is no valid latitude for file {$file->name}.";
 
-                    return false;
-                }
+                return false;
             }
 
-            // Catch both a malformed date (false) and the zero date (negative integer).
-            if (!is_null($file->takenAt)) {
-                if (!(strtotime($file->takenAt) > 0)) {
-                    $this->message = "'{$file->takenAt}' is no valid date for file {$file->name}.";
+            if (is_null($file->lng)) {
+                $this->message = "Missing longitude for file {$file->name}.";
 
-                    return false;
-                }
+                return false;
             }
+        }
 
-            foreach (self::NUMERIC_FIELDS as $key => $text) {
-                if (!is_null($file->$key) && !is_numeric($file->$key)) {
-                    $this->message = "'{$file->$key}' is no valid {$text} for file {$file->name}.";
+        // Catch both a malformed date (false) and the zero date (negative integer).
+        if (!is_null($file->takenAt)) {
+            if (!(strtotime($file->takenAt) > 0)) {
+                $this->message = "'{$file->takenAt}' is no valid date for file {$file->name}.";
 
-                    return false;
-                }
+                return false;
             }
+        }
 
-            if (!is_null($file->yaw)) {
-                if ($file->yaw < 0 || $file->yaw > 360) {
-                    $this->message = "'{$file->yaw}' is no valid yaw for file {$file->name}.";
+        foreach (self::NUMERIC_FIELDS as $key => $text) {
+            if (!is_null($file->$key) && !is_numeric($file->$key)) {
+                $this->message = "'{$file->$key}' is no valid {$text} for file {$file->name}.";
 
-                    return false;
-                }
+                return false;
             }
         }
 
-        return true;
-    }
+        if (!is_null($file->yaw)) {
+            if ($file->yaw < 0 || $file->yaw > 360) {
+                $this->message = "'{$file->yaw}' is no valid yaw for file {$file->name}.";
 
-    /**
-     * Get the validation error message.
-     *
-     * @return string
-     */
-    public function message()
-    {
-        return $this->message;
+                return false;
+            }
+        }
+
+        return true;
     }
 }
diff --git a/app/Rules/VideoMetadata.php b/app/Rules/VideoMetadata.php
index c86bf4935..83ad3110b 100644
--- a/app/Rules/VideoMetadata.php
+++ b/app/Rules/VideoMetadata.php
@@ -15,27 +15,13 @@ public function passes($attribute, $value): bool
             return false;
         }
 
-        $columns = array_shift($value);
-
-        $filenames = [];
-        foreach ($value as $index => $row) {
-            $combined = array_combine($columns, $row);
-            $combined = array_filter($combined);
-            $filename = $combined['filename'];
-            if (array_key_exists($filename, $filenames)) {
-                // If this exists, it was already checked if it is a valid date by the
-                // parent method.
-                if (!array_key_exists('taken_at', $combined)) {
-                    // +1 since index starts at 0.
-                    // +1 since column description row was removed above.
-                    $line = $index + 2;
-
-                    $this->message = "File {$filename} has multiple entries but no 'taken_at' at line {$line}.";
+        $fileMetadata = $value->getFiles();
 
+        foreach ($fileMetadata as $file) {
+            foreach ($file->getFrames() as $frame) {
+                if (!$this->fileMetadataPasses($frame)) {
                     return false;
                 }
-            } else {
-                $filenames[$filename] = true;
             }
         }
 
diff --git a/tests/php/Rules/ImageMetadataTest.php b/tests/php/Rules/ImageMetadataTest.php
index 8bb5eac07..913399452 100644
--- a/tests/php/Rules/ImageMetadataTest.php
+++ b/tests/php/Rules/ImageMetadataTest.php
@@ -99,12 +99,15 @@ public function testEmptyFilename()
     {
         $validator = new ImageMetadataRule(['abc.jpg']);
         $metadata = new VolumeMetadata;
-        $metadata->addFile(new ImageMetadata(
-            name: 'abc.jpg'
-        ));
-        $metadata->addFile(new ImageMetadata(
-            name: ''
-        ));
+        $metadata->addFile(new ImageMetadata(name: ''));
+        $this->assertFalse($validator->passes(null, $metadata));
+    }
+
+    public function testEmpty()
+    {
+        $validator = new ImageMetadataRule(['abc.jpg']);
+        $metadata = new VolumeMetadata;
+        $metadata->addFile(new ImageMetadata(name: 'abc.jpg'));
         $this->assertFalse($validator->passes(null, $metadata));
     }
 }
diff --git a/tests/php/Rules/VideoMetadataTest.php b/tests/php/Rules/VideoMetadataTest.php
index f44c4eb40..df8d26f49 100644
--- a/tests/php/Rules/VideoMetadataTest.php
+++ b/tests/php/Rules/VideoMetadataTest.php
@@ -2,52 +2,182 @@
 
 namespace Biigle\Tests\Rules;
 
-use Biigle\Rules\VideoMetadata;
+use Biigle\Rules\VideoMetadata as VideoMetadataRule;
+use Biigle\Services\MetadataParsing\VolumeMetadata;
+use Biigle\Services\MetadataParsing\VideoMetadata;
+use TestCase;
 
-class VideoMetadataTest extends ImageMetadataTest
+class VideoMetadataTest extends TestCase
 {
-    protected static $ruleClass = VideoMetadata::class;
-
-    public function testMultipleRowsWithTakenAtCol()
+    public function testMetadataOk()
     {
-        $validator = new static::$ruleClass(['abc.mp4']);
-        $metadata = [
-            ['filename', 'taken_at', 'lng', 'lat'],
-            ['abc.mp4', '2016-12-19 12:27:00', '52.220', '28.123'],
-            ['abc.mp4', '2016-12-19 12:28:00', '52.230', '28.133'],
-        ];
+        $validator = new VideoMetadataRule(['abc.mp4']);
+
+        $metadata = new VolumeMetadata;
+        $metadata->addFile(new VideoMetadata(
+            name: 'abc.mp4',
+            takenAt: '2016-12-19 12:27:00',
+            lng: 52.220,
+            lat: 28.123,
+            gpsAltitude: -1500,
+            distanceToGround: 10,
+            area: 2.6,
+            yaw: 180
+        ));
         $this->assertTrue($validator->passes(null, $metadata));
     }
 
-    public function testMultipleRowsWithoutTakenAtCol()
+    public function testMetadataWrongFile()
+    {
+        $validator = new VideoMetadataRule(['abc.mp4']);
+        $metadata = new VolumeMetadata;
+        $metadata->addFile(new VideoMetadata(
+            name: 'cba.jpg',
+            takenAt: '2016-12-19 12:27:00'
+        ));
+        $this->assertFalse($validator->passes(null, $metadata));
+    }
+
+    public function testMetadataNoLat()
+    {
+        $validator = new VideoMetadataRule(['abc.mp4']);
+        $metadata = new VolumeMetadata;
+        $metadata->addFile(new VideoMetadata(
+            name: 'abc.mp4',
+            lng: 52.220
+        ));
+        $this->assertFalse($validator->passes(null, $metadata));
+    }
+
+    public function testMetadataNoLatFrame()
+    {
+        $validator = new VideoMetadataRule(['abc.mp4']);
+        $metadata = new VolumeMetadata;
+        $fileMeta = new VideoMetadata(name: 'abc.mp4');
+        $fileMeta->addFrame('2016-12-19 12:27:00', lng: 52.220);
+        $metadata->addFile($fileMeta);
+        $this->assertFalse($validator->passes(null, $metadata));
+    }
+
+    public function testMetadataNoLng()
+    {
+        $validator = new VideoMetadataRule(['abc.mp4']);
+        $metadata = new VolumeMetadata;
+        $metadata->addFile(new VideoMetadata(
+            name: 'abc.mp4',
+            lat: 28.123
+        ));
+        $this->assertFalse($validator->passes(null, $metadata));
+    }
+
+    public function testMetadataNoLngFrame()
     {
-        $validator = new static::$ruleClass(['abc.mp4']);
-        $metadata = [
-            ['filename', 'lng', 'lat'],
-            ['abc.mp4', '52.220', '28.123'],
-            ['abc.mp4', '52.230', '28.133'],
-        ];
+        $validator = new VideoMetadataRule(['abc.mp4']);
+        $metadata = new VolumeMetadata;
+        $fileMeta = new VideoMetadata(name: 'abc.mp4');
+        $fileMeta->addFrame('2016-12-19 12:27:00', lat: 28.123);
+        $metadata->addFile($fileMeta);
         $this->assertFalse($validator->passes(null, $metadata));
     }
 
-    public function testMultipleRowsWithEmptyTakenAtCol()
+    public function testMetadataInvalidLat()
     {
-        $validator = new static::$ruleClass(['abc.mp4']);
-        $metadata = [
-            ['filename', 'taken_at', 'lng', 'lat'],
-            ['abc.mp4', '2016-12-19 12:27:00', '52.220', '28.123'],
-            ['abc.mp4', '', '52.230', '28.133'],
-        ];
+        $validator = new VideoMetadataRule(['abc.mp4']);
+        $metadata = new VolumeMetadata;
+        $metadata->addFile(new VideoMetadata(
+            name: 'abc.mp4',
+            lng: 50,
+            lat: 91
+        ));
         $this->assertFalse($validator->passes(null, $metadata));
     }
 
-    public function testOneRowWithoutTakenAtCol()
+    public function testMetadataInvalidLatFrame()
     {
-        $validator = new static::$ruleClass(['abc.mp4']);
-        $metadata = [
-            ['filename', 'lng', 'lat'],
-            ['abc.mp4', '52.220', '28.123'],
-        ];
+        $validator = new VideoMetadataRule(['abc.mp4']);
+        $metadata = new VolumeMetadata;
+        $fileMeta = new VideoMetadata(name: 'abc.mp4');
+        $fileMeta->addFrame('2016-12-19 12:27:00', lng: 50, lat: 91);
+        $metadata->addFile($fileMeta);
+        $this->assertFalse($validator->passes(null, $metadata));
+    }
+
+    public function testMetadataInvalidLng()
+    {
+        $validator = new VideoMetadataRule(['abc.mp4']);
+        $metadata = new VolumeMetadata;
+        $metadata->addFile(new VideoMetadata(
+            name: 'abc.mp4',
+            lng: 181,
+            lat: 50
+        ));
+        $this->assertFalse($validator->passes(null, $metadata));
+    }
+
+    public function testMetadataInvalidLngFrame()
+    {
+        $validator = new VideoMetadataRule(['abc.mp4']);
+        $metadata = new VolumeMetadata;
+        $fileMeta = new VideoMetadata(name: 'abc.mp4');
+        $fileMeta->addFrame('2016-12-19 12:27:00', lng: 181, lat: 50);
+        $metadata->addFile($fileMeta);
+        $this->assertFalse($validator->passes(null, $metadata));
+    }
+
+    public function testMetadataInvalidYaw()
+    {
+        $validator = new VideoMetadataRule(['abc.mp4']);
+        $metadata = new VolumeMetadata;
+        $metadata->addFile(new VideoMetadata(
+            name: 'abc.mp4',
+            yaw: 361
+        ));
+        $this->assertFalse($validator->passes(null, $metadata));
+    }
+
+    public function testMetadataInvalidYawFrame()
+    {
+        $validator = new VideoMetadataRule(['abc.mp4']);
+        $metadata = new VolumeMetadata;
+        $fileMeta = new VideoMetadata(name: 'abc.mp4');
+        $fileMeta->addFrame('2016-12-19 12:27:00', yaw: 361);
+        $metadata->addFile($fileMeta);
+        $this->assertFalse($validator->passes(null, $metadata));
+    }
+
+    public function testEmptyFilename()
+    {
+        $validator = new VideoMetadataRule(['abc.mp4']);
+        $metadata = new VolumeMetadata;
+        $metadata->addFile(new VideoMetadata(name: ''));
+        $this->assertFalse($validator->passes(null, $metadata));
+    }
+
+    public function testEmpty()
+    {
+        $validator = new VideoMetadataRule(['abc.jpg']);
+        $metadata = new VolumeMetadata;
+        $metadata->addFile(new VideoMetadata(name: 'abc.jpg'));
+        $this->assertFalse($validator->passes(null, $metadata));
+    }
+
+    public function testMultipleFrames()
+    {
+        $validator = new VideoMetadataRule(['abc.mp4']);
+
+        $metadata = new VolumeMetadata;
+        $fileMeta = new VideoMetadata(
+            name: 'abc.mp4',
+            takenAt: '2016-12-19 12:27:00',
+            lng: 52.220,
+            lat: 28.123
+        );
+        $fileMeta->addFrame(
+            takenAt: '2016-12-19 12:28:00',
+            lng: 52.230,
+            lat: 28.133
+        );
+        $metadata->addFile($fileMeta);
         $this->assertTrue($validator->passes(null, $metadata));
     }
 }

From 08f73ef59b6509de79e0cda5eb1ac7f2dfd28ef3 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 6 Mar 2024 14:55:54 +0100
Subject: [PATCH 011/209] Add media type to metadata file detection

---
 .../MetadataParsing/ParserFactory.php         | 12 +++++++---
 .../MetadataParsing/ParserFactoryTest.php     | 23 +++++++++++++++----
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/app/Services/MetadataParsing/ParserFactory.php b/app/Services/MetadataParsing/ParserFactory.php
index b385a476f..b0774b40f 100644
--- a/app/Services/MetadataParsing/ParserFactory.php
+++ b/app/Services/MetadataParsing/ParserFactory.php
@@ -7,12 +7,18 @@
 class ParserFactory
 {
     public static array $parsers = [
-        ImageCsvParser::class,
+        'image' => [
+            ImageCsvParser::class,
+        ],
+        'video' => [
+            VideoCsvParser::class,
+        ],
     ];
 
-    public static function getParserForFile(File $file): ?MetadataParser
+    public static function getParserForFile(File $file, string $type): ?MetadataParser
     {
-        foreach (self::$parsers as $parserClass) {
+        $parsers = self::$parsers[$type] ?? [];
+        foreach ($parsers as $parserClass) {
             $parser = new $parserClass($file);
             if ($parser->recognizesFile()) {
                 return $parser;
diff --git a/tests/php/Services/MetadataParsing/ParserFactoryTest.php b/tests/php/Services/MetadataParsing/ParserFactoryTest.php
index af525eece..4a3c9a513 100644
--- a/tests/php/Services/MetadataParsing/ParserFactoryTest.php
+++ b/tests/php/Services/MetadataParsing/ParserFactoryTest.php
@@ -4,22 +4,37 @@
 
 use Biigle\Services\MetadataParsing\ImageCsvParser;
 use Biigle\Services\MetadataParsing\ParserFactory;
+use Biigle\Services\MetadataParsing\VideoCsvParser;
 use Symfony\Component\HttpFoundation\File\File;
 use TestCase;
 
 class ParserFactoryTest extends TestCase
 {
-    public function testGetParserForFile()
+    public function testGetParserForFileImage()
     {
         $file = new File(__DIR__."/../../../files/image-metadata.csv");
-        $parser = ParserFactory::getParserForFile($file);
+        $parser = ParserFactory::getParserForFile($file, 'image');
         $this->assertInstanceOf(ImageCsvParser::class, $parser);
     }
 
-    public function testGetParserForFileUnknown()
+    public function testGetParserForFileVideo()
+    {
+        $file = new File(__DIR__."/../../../files/video-metadata.csv");
+        $parser = ParserFactory::getParserForFile($file, 'video');
+        $this->assertInstanceOf(VideoCsvParser::class, $parser);
+    }
+
+    public function testGetParserForFileUnknownFile()
     {
         $file = new File(__DIR__."/../../../files/test.mp4");
-        $parser = ParserFactory::getParserForFile($file);
+        $parser = ParserFactory::getParserForFile($file, 'video');
+        $this->assertNull($parser);
+    }
+
+    public function testGetParserForFileUnknownType()
+    {
+        $file = new File(__DIR__."/../../../files/image-metadata.csv");
+        $parser = ParserFactory::getParserForFile($file, 'test');
         $this->assertNull($parser);
     }
 }

From 2310e9904829b65ba45a1dd7e43afac9d95a9b80 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 6 Mar 2024 15:47:36 +0100
Subject: [PATCH 012/209] Do not match files in metadata validation

When the metadata file is uploaded it is not clear which files the
volume will have with the create volume v2 flow. Instead, metadata
of files not in the volume will be ignored. Also, files without
metadata will simply be not populated.
---
 app/Rules/ImageMetadata.php           | 10 +-------
 tests/php/Rules/ImageMetadataTest.php | 27 ++++++-------------
 tests/php/Rules/VideoMetadataTest.php | 37 ++++++++++-----------------
 3 files changed, 22 insertions(+), 52 deletions(-)

diff --git a/app/Rules/ImageMetadata.php b/app/Rules/ImageMetadata.php
index 3fe4fe028..c743d5286 100644
--- a/app/Rules/ImageMetadata.php
+++ b/app/Rules/ImageMetadata.php
@@ -31,10 +31,8 @@ class ImageMetadata implements Rule
 
     /**
      * Create a new instance.
-     *
-     * @param array $files
      */
-    public function __construct(public array $files)
+    public function __construct()
     {
         $this->message = "The :attribute is invalid.";
     }
@@ -78,12 +76,6 @@ public function message()
 
     protected function fileMetadataPasses(FileMetadata $file)
     {
-        if (!in_array($file->name, $this->files)) {
-            $this->message = "There is no file with filename {$file->name}.";
-
-            return false;
-        }
-
         if (!is_null($file->lng)) {
             if (!is_numeric($file->lng) || abs($file->lng) > 180) {
                 $this->message = "'{$file->lng}' is no valid longitude for file {$file->name}.";
diff --git a/tests/php/Rules/ImageMetadataTest.php b/tests/php/Rules/ImageMetadataTest.php
index 913399452..910297830 100644
--- a/tests/php/Rules/ImageMetadataTest.php
+++ b/tests/php/Rules/ImageMetadataTest.php
@@ -11,7 +11,7 @@ class ImageMetadataTest extends TestCase
 {
     public function testMetadataOk()
     {
-        $validator = new ImageMetadataRule(['abc.jpg']);
+        $validator = new ImageMetadataRule();
 
         $metadata = new VolumeMetadata;
         $metadata->addFile(new ImageMetadata(
@@ -27,20 +27,9 @@ public function testMetadataOk()
         $this->assertTrue($validator->passes(null, $metadata));
     }
 
-    public function testMetadataWrongFile()
-    {
-        $validator = new ImageMetadataRule(['abc.jpg']);
-        $metadata = new VolumeMetadata;
-        $metadata->addFile(new ImageMetadata(
-            name: 'cba.jpg',
-            takenAt: '2016-12-19 12:27:00'
-        ));
-        $this->assertFalse($validator->passes(null, $metadata));
-    }
-
     public function testMetadataNoLat()
     {
-        $validator = new ImageMetadataRule(['abc.jpg']);
+        $validator = new ImageMetadataRule();
         $metadata = new VolumeMetadata;
         $metadata->addFile(new ImageMetadata(
             name: 'abc.jpg',
@@ -51,7 +40,7 @@ public function testMetadataNoLat()
 
     public function testMetadataNoLng()
     {
-        $validator = new ImageMetadataRule(['abc.jpg']);
+        $validator = new ImageMetadataRule();
         $metadata = new VolumeMetadata;
         $metadata->addFile(new ImageMetadata(
             name: 'abc.jpg',
@@ -62,7 +51,7 @@ public function testMetadataNoLng()
 
     public function testMetadataInvalidLat()
     {
-        $validator = new ImageMetadataRule(['abc.jpg']);
+        $validator = new ImageMetadataRule();
         $metadata = new VolumeMetadata;
         $metadata->addFile(new ImageMetadata(
             name: 'abc.jpg',
@@ -74,7 +63,7 @@ public function testMetadataInvalidLat()
 
     public function testMetadataInvalidLng()
     {
-        $validator = new ImageMetadataRule(['abc.jpg']);
+        $validator = new ImageMetadataRule();
         $metadata = new VolumeMetadata;
         $metadata->addFile(new ImageMetadata(
             name: 'abc.jpg',
@@ -86,7 +75,7 @@ public function testMetadataInvalidLng()
 
     public function testMetadataInvalidYaw()
     {
-        $validator = new ImageMetadataRule(['abc.jpg']);
+        $validator = new ImageMetadataRule();
         $metadata = new VolumeMetadata;
         $metadata->addFile(new ImageMetadata(
             name: 'abc.jpg',
@@ -97,7 +86,7 @@ public function testMetadataInvalidYaw()
 
     public function testEmptyFilename()
     {
-        $validator = new ImageMetadataRule(['abc.jpg']);
+        $validator = new ImageMetadataRule();
         $metadata = new VolumeMetadata;
         $metadata->addFile(new ImageMetadata(name: ''));
         $this->assertFalse($validator->passes(null, $metadata));
@@ -105,7 +94,7 @@ public function testEmptyFilename()
 
     public function testEmpty()
     {
-        $validator = new ImageMetadataRule(['abc.jpg']);
+        $validator = new ImageMetadataRule();
         $metadata = new VolumeMetadata;
         $metadata->addFile(new ImageMetadata(name: 'abc.jpg'));
         $this->assertFalse($validator->passes(null, $metadata));
diff --git a/tests/php/Rules/VideoMetadataTest.php b/tests/php/Rules/VideoMetadataTest.php
index df8d26f49..530acc302 100644
--- a/tests/php/Rules/VideoMetadataTest.php
+++ b/tests/php/Rules/VideoMetadataTest.php
@@ -11,7 +11,7 @@ class VideoMetadataTest extends TestCase
 {
     public function testMetadataOk()
     {
-        $validator = new VideoMetadataRule(['abc.mp4']);
+        $validator = new VideoMetadataRule();
 
         $metadata = new VolumeMetadata;
         $metadata->addFile(new VideoMetadata(
@@ -27,20 +27,9 @@ public function testMetadataOk()
         $this->assertTrue($validator->passes(null, $metadata));
     }
 
-    public function testMetadataWrongFile()
-    {
-        $validator = new VideoMetadataRule(['abc.mp4']);
-        $metadata = new VolumeMetadata;
-        $metadata->addFile(new VideoMetadata(
-            name: 'cba.jpg',
-            takenAt: '2016-12-19 12:27:00'
-        ));
-        $this->assertFalse($validator->passes(null, $metadata));
-    }
-
     public function testMetadataNoLat()
     {
-        $validator = new VideoMetadataRule(['abc.mp4']);
+        $validator = new VideoMetadataRule();
         $metadata = new VolumeMetadata;
         $metadata->addFile(new VideoMetadata(
             name: 'abc.mp4',
@@ -51,7 +40,7 @@ public function testMetadataNoLat()
 
     public function testMetadataNoLatFrame()
     {
-        $validator = new VideoMetadataRule(['abc.mp4']);
+        $validator = new VideoMetadataRule();
         $metadata = new VolumeMetadata;
         $fileMeta = new VideoMetadata(name: 'abc.mp4');
         $fileMeta->addFrame('2016-12-19 12:27:00', lng: 52.220);
@@ -61,7 +50,7 @@ public function testMetadataNoLatFrame()
 
     public function testMetadataNoLng()
     {
-        $validator = new VideoMetadataRule(['abc.mp4']);
+        $validator = new VideoMetadataRule();
         $metadata = new VolumeMetadata;
         $metadata->addFile(new VideoMetadata(
             name: 'abc.mp4',
@@ -72,7 +61,7 @@ public function testMetadataNoLng()
 
     public function testMetadataNoLngFrame()
     {
-        $validator = new VideoMetadataRule(['abc.mp4']);
+        $validator = new VideoMetadataRule();
         $metadata = new VolumeMetadata;
         $fileMeta = new VideoMetadata(name: 'abc.mp4');
         $fileMeta->addFrame('2016-12-19 12:27:00', lat: 28.123);
@@ -82,7 +71,7 @@ public function testMetadataNoLngFrame()
 
     public function testMetadataInvalidLat()
     {
-        $validator = new VideoMetadataRule(['abc.mp4']);
+        $validator = new VideoMetadataRule();
         $metadata = new VolumeMetadata;
         $metadata->addFile(new VideoMetadata(
             name: 'abc.mp4',
@@ -94,7 +83,7 @@ public function testMetadataInvalidLat()
 
     public function testMetadataInvalidLatFrame()
     {
-        $validator = new VideoMetadataRule(['abc.mp4']);
+        $validator = new VideoMetadataRule();
         $metadata = new VolumeMetadata;
         $fileMeta = new VideoMetadata(name: 'abc.mp4');
         $fileMeta->addFrame('2016-12-19 12:27:00', lng: 50, lat: 91);
@@ -104,7 +93,7 @@ public function testMetadataInvalidLatFrame()
 
     public function testMetadataInvalidLng()
     {
-        $validator = new VideoMetadataRule(['abc.mp4']);
+        $validator = new VideoMetadataRule();
         $metadata = new VolumeMetadata;
         $metadata->addFile(new VideoMetadata(
             name: 'abc.mp4',
@@ -116,7 +105,7 @@ public function testMetadataInvalidLng()
 
     public function testMetadataInvalidLngFrame()
     {
-        $validator = new VideoMetadataRule(['abc.mp4']);
+        $validator = new VideoMetadataRule();
         $metadata = new VolumeMetadata;
         $fileMeta = new VideoMetadata(name: 'abc.mp4');
         $fileMeta->addFrame('2016-12-19 12:27:00', lng: 181, lat: 50);
@@ -126,7 +115,7 @@ public function testMetadataInvalidLngFrame()
 
     public function testMetadataInvalidYaw()
     {
-        $validator = new VideoMetadataRule(['abc.mp4']);
+        $validator = new VideoMetadataRule();
         $metadata = new VolumeMetadata;
         $metadata->addFile(new VideoMetadata(
             name: 'abc.mp4',
@@ -137,7 +126,7 @@ public function testMetadataInvalidYaw()
 
     public function testMetadataInvalidYawFrame()
     {
-        $validator = new VideoMetadataRule(['abc.mp4']);
+        $validator = new VideoMetadataRule();
         $metadata = new VolumeMetadata;
         $fileMeta = new VideoMetadata(name: 'abc.mp4');
         $fileMeta->addFrame('2016-12-19 12:27:00', yaw: 361);
@@ -147,7 +136,7 @@ public function testMetadataInvalidYawFrame()
 
     public function testEmptyFilename()
     {
-        $validator = new VideoMetadataRule(['abc.mp4']);
+        $validator = new VideoMetadataRule();
         $metadata = new VolumeMetadata;
         $metadata->addFile(new VideoMetadata(name: ''));
         $this->assertFalse($validator->passes(null, $metadata));
@@ -163,7 +152,7 @@ public function testEmpty()
 
     public function testMultipleFrames()
     {
-        $validator = new VideoMetadataRule(['abc.mp4']);
+        $validator = new VideoMetadataRule();
 
         $metadata = new VolumeMetadata;
         $fileMeta = new VideoMetadata(

From b535d7f1de27d07974e26c0c6a46031006f71696 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 6 Mar 2024 16:22:44 +0100
Subject: [PATCH 013/209] Implement metadata file upload for new pending
 volumes

---
 .../Api/ProjectPendingVolumeController.php    | 22 ++++-
 app/Http/Requests/StorePendingVolume.php      | 31 +++++-
 tests/files/image-metadata-invalid.csv        |  2 +
 tests/files/video-metadata-invalid.csv        |  3 +
 .../ProjectPendingVolumeControllerTest.php    | 96 ++++++++++++++++++-
 5 files changed, 148 insertions(+), 6 deletions(-)
 create mode 100644 tests/files/image-metadata-invalid.csv
 create mode 100644 tests/files/video-metadata-invalid.csv

diff --git a/app/Http/Controllers/Api/ProjectPendingVolumeController.php b/app/Http/Controllers/Api/ProjectPendingVolumeController.php
index 3a3328bd5..8bc62a0f6 100644
--- a/app/Http/Controllers/Api/ProjectPendingVolumeController.php
+++ b/app/Http/Controllers/Api/ProjectPendingVolumeController.php
@@ -17,12 +17,32 @@ class ProjectPendingVolumeController extends Controller
      * @apiParam {Number} id The project ID.
      *
      * @apiParam (Required attributes) {String} media_type The media type of the new volume (`image` or `video`).
+     *
+     * @apiParam (Optional attributes) {File} metadata_file A file with volume and image/video metadata. By default, this can be a CSV. See "metadata columns" for the possible columns. Each column may occur only once. There must be at least one column other than `filename`. For video metadata, multiple rows can contain metadata from different times of the same video. In this case, the `filename` of the rows must match and each row needs a (different) `taken_at` timestamp. Other formats may be supported through modules.
+     *
+     * @apiParam (metadata columns) {String} filename The filename of the file the metadata belongs to. This column is required.
+     * @apiParam (metadata columns) {String} taken_at The date and time where the file was taken. Example: `2016-12-19 12:49:00`
+     * @apiParam (metadata columns) {Number} lng Longitude where the file was taken in decimal form. If this column is present, `lat` must be present, too. Example: `52.3211`
+     * @apiParam (metadata columns) {Number} lat Latitude where the file was taken in decimal form. If this column is present, `lng` must be present, too. Example: `28.775`
+     * @apiParam (metadata columns) {Number} gps_altitude GPS Altitude where the file was taken in meters. Negative for below sea level. Example: `-1500.5`
+     * @apiParam (metadata columns) {Number} distance_to_ground Distance to the sea floor in meters. Example: `30.25`
+     * @apiParam (metadata columns) {Number} area Area shown by the file in m². Example `2.6`.
      */
     public function store(StorePendingVolume $request)
     {
-        return $request->project->pendingVolumes()->create([
+        $pv = $request->project->pendingVolumes()->create([
             'media_type_id' => $request->input('media_type_id'),
             'user_id' => $request->user()->id,
         ]);
+
+        if ($request->has('metadata_file')) {
+            $pv->saveMetadata($request->file('metadata_file'));
+        }
+
+        return $pv;
     }
+
+    // TODO implement update() endpoint to create the volume and optionally continue to
+    // import annotations/file labels.
+    // See: https://github.com/biigle/core/issues/701#issue-2000484824
 }
diff --git a/app/Http/Requests/StorePendingVolume.php b/app/Http/Requests/StorePendingVolume.php
index 21a471786..1c6749e8a 100644
--- a/app/Http/Requests/StorePendingVolume.php
+++ b/app/Http/Requests/StorePendingVolume.php
@@ -4,6 +4,9 @@
 
 use Biigle\MediaType;
 use Biigle\Project;
+use Biigle\Rules\ImageMetadata;
+use Biigle\Rules\VideoMetadata;
+use Biigle\Services\MetadataParsing\ParserFactory;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
@@ -28,6 +31,7 @@ public function rules(): array
     {
         return [
             'media_type' => ['required', Rule::in(array_keys(MediaType::INSTANCES))],
+            'metadata_file' => ['file'],
         ];
     }
 
@@ -39,16 +43,35 @@ public function rules(): array
      */
     public function withValidator($validator)
     {
-        if ($validator->fails()) {
-            return;
-        }
-
         $validator->after(function ($validator) {
+            if ($validator->errors()->isNotEmpty()) {
+                return;
+            }
+
             $exists = $this->project->pendingVolumes()
                 ->where('user_id', $this->user()->id)
                 ->exists();
             if ($exists) {
                 $validator->errors()->add('id', 'Only a single pending volume can be created at a time for each project and user.');
+                return;
+            }
+
+            if ($file = $this->file('metadata_file')) {
+                $type = $this->input('media_type');
+                $parser = ParserFactory::getParserForFile($file, $type);
+                if (is_null($parser)) {
+                    $validator->errors()->add('metadata_file', 'Unknown metadata file format.');
+                    return;
+                }
+
+                $rule = match ($type) {
+                    'video' => new VideoMetadata,
+                    default => new ImageMetadata,
+                };
+
+                if (!$rule->passes('metadata_file', $parser->getMetadata())) {
+                    $validator->errors()->add('metadata_file', $rule->message());
+                }
             }
         });
     }
diff --git a/tests/files/image-metadata-invalid.csv b/tests/files/image-metadata-invalid.csv
new file mode 100644
index 000000000..0c0937c59
--- /dev/null
+++ b/tests/files/image-metadata-invalid.csv
@@ -0,0 +1,2 @@
+filename,taken_at,lng,lat,gps_altitude,distance_to_ground,area,yaw
+abc.jpg,2016-12-19 12:27:00,52.220,28.123,-1500,10,2.6,999
diff --git a/tests/files/video-metadata-invalid.csv b/tests/files/video-metadata-invalid.csv
new file mode 100644
index 000000000..0320a04f1
--- /dev/null
+++ b/tests/files/video-metadata-invalid.csv
@@ -0,0 +1,3 @@
+filename,taken_at,lng,lat,gps_altitude,distance_to_ground,area,yaw
+abc.mp4,2016-12-19 12:27:00,52.220,28.123,-1500,10,2.6,999
+abc.mp4,2016-12-19 12:28:00,52.230,28.133,-1505,5,1.6,181
diff --git a/tests/php/Http/Controllers/Api/ProjectPendingVolumeControllerTest.php b/tests/php/Http/Controllers/Api/ProjectPendingVolumeControllerTest.php
index 8539a1b85..b86ea9eb4 100644
--- a/tests/php/Http/Controllers/Api/ProjectPendingVolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/ProjectPendingVolumeControllerTest.php
@@ -5,10 +5,12 @@
 use ApiTestCase;
 use Biigle\MediaType;
 use Biigle\PendingVolume;
+use Illuminate\Http\UploadedFile;
+use Storage;
 
 class ProjectPendingVolumeControllerTest extends ApiTestCase
 {
-    public function testStoreImages()
+    public function testStoreImage()
     {
         $id = $this->project()->id;
         $this->doTestApiRoute('POST', "/api/v1/projects/{$id}/pending-volumes");
@@ -55,4 +57,96 @@ public function testStoreVideo()
             'media_type' => 'video',
         ])->assertStatus(201);
     }
+
+    public function testStoreImageWithFile()
+    {
+        $disk = Storage::fake('pending-metadata');
+        $csv = __DIR__."/../../../../files/image-metadata.csv";
+        $file = new UploadedFile($csv, 'metadata.csv', 'text/csv', null, true);
+
+        $id = $this->project()->id;
+        $this->beAdmin();
+        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
+            'media_type' => 'image',
+            'metadata_file' => $file,
+        ])->assertStatus(201);
+
+        $pv = PendingVolume::where('project_id', $id)->first();
+        $this->assertNotNull($pv->metadata_file_path);
+        $disk->assertExists($pv->metadata_file_path);
+    }
+
+    public function testStoreImageWithFileUnknown()
+    {
+        $disk = Storage::fake('pending-metadata');
+        $csv = __DIR__."/../../../../files/test.mp4";
+        $file = new UploadedFile($csv, 'metadata.csv', 'text/csv', null, true);
+
+        $id = $this->project()->id;
+        $this->beAdmin();
+        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
+            'media_type' => 'image',
+            'metadata_file' => $file,
+        ])->assertStatus(422);
+    }
+
+    public function testStoreImageWithFileInvalid()
+    {
+        $disk = Storage::fake('pending-metadata');
+        $csv = __DIR__."/../../../../files/image-metadata-invalid.csv";
+        $file = new UploadedFile($csv, 'metadata.csv', 'text/csv', null, true);
+
+        $id = $this->project()->id;
+        $this->beAdmin();
+        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
+            'media_type' => 'image',
+            'metadata_file' => $file,
+        ])->assertStatus(422);
+    }
+
+    public function testStoreVideoWithFile()
+    {
+        $disk = Storage::fake('pending-metadata');
+        $csv = __DIR__."/../../../../files/video-metadata.csv";
+        $file = new UploadedFile($csv, 'metadata.csv', 'text/csv', null, true);
+
+        $id = $this->project()->id;
+        $this->beAdmin();
+        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
+            'media_type' => 'video',
+            'metadata_file' => $file,
+        ])->assertStatus(201);
+
+        $pv = PendingVolume::where('project_id', $id)->first();
+        $this->assertNotNull($pv->metadata_file_path);
+        $disk->assertExists($pv->metadata_file_path);
+    }
+
+    public function testStoreVideoWithFileUnknown()
+    {
+        $disk = Storage::fake('pending-metadata');
+        $csv = __DIR__."/../../../../files/test.mp4";
+        $file = new UploadedFile($csv, 'metadata.csv', 'text/csv', null, true);
+
+        $id = $this->project()->id;
+        $this->beAdmin();
+        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
+            'media_type' => 'video',
+            'metadata_file' => $file,
+        ])->assertStatus(422);
+    }
+
+    public function testStoreVideoWithFileInvalid()
+    {
+        $disk = Storage::fake('pending-metadata');
+        $csv = __DIR__."/../../../../files/video-metadata-invalid.csv";
+        $file = new UploadedFile($csv, 'metadata.csv', 'text/csv', null, true);
+
+        $id = $this->project()->id;
+        $this->beAdmin();
+        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
+            'media_type' => 'video',
+            'metadata_file' => $file,
+        ])->assertStatus(422);
+    }
 }

From 4d962ba9fd7a87d35cbd2046d8b1772514b19953 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 7 Mar 2024 15:37:17 +0100
Subject: [PATCH 014/209] Implement pending volume update API endpoint

The annotation/file label import is still missing.
---
 .../Api/PendingVolumeController.php           | 135 ++++
 .../Api/ProjectPendingVolumeController.php    |  48 --
 .../Api/ProjectVolumeController.php           |  11 +-
 app/Http/Controllers/Api/_apidoc.js           |   5 +
 app/Http/Requests/StoreVolume.php             |  11 +-
 app/Http/Requests/UpdatePendingVolume.php     |  77 +++
 app/PendingVolume.php                         |  16 +
 app/Policies/PendingVolumePolicy.php          |  43 ++
 app/Volume.php                                |  13 +
 ...6_143800_create_pending_volumes_table.php} |   8 +
 routes/api.php                                |   7 +-
 .../Api/PendingVolumeControllerTest.php       | 577 ++++++++++++++++++
 .../ProjectPendingVolumeControllerTest.php    | 152 -----
 tests/php/PendingVolumeTest.php               |   1 +
 .../php/Policies/PendingVolumePolicyTest.php  |  46 ++
 15 files changed, 935 insertions(+), 215 deletions(-)
 create mode 100644 app/Http/Controllers/Api/PendingVolumeController.php
 delete mode 100644 app/Http/Controllers/Api/ProjectPendingVolumeController.php
 create mode 100644 app/Http/Requests/UpdatePendingVolume.php
 create mode 100644 app/Policies/PendingVolumePolicy.php
 rename database/migrations/{2023_11_29_201953_create_pending_volumes_table.php => 2024_03_06_143800_create_pending_volumes_table.php} (75%)
 create mode 100644 tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
 delete mode 100644 tests/php/Http/Controllers/Api/ProjectPendingVolumeControllerTest.php
 create mode 100644 tests/php/Policies/PendingVolumePolicyTest.php

diff --git a/app/Http/Controllers/Api/PendingVolumeController.php b/app/Http/Controllers/Api/PendingVolumeController.php
new file mode 100644
index 000000000..dff453881
--- /dev/null
+++ b/app/Http/Controllers/Api/PendingVolumeController.php
@@ -0,0 +1,135 @@
+<?php
+
+namespace Biigle\Http\Controllers\Api;
+
+use Biigle\Http\Requests\StorePendingVolume;
+use Biigle\Http\Requests\UpdatePendingVolume;
+use Biigle\Jobs\CreateNewImagesOrVideos;
+use Biigle\Volume;
+use DB;
+use Queue;
+
+class PendingVolumeController extends Controller
+{
+    /**
+     * Limit for the number of files above which volume files are created asynchronously.
+     *
+     * @var int
+     */
+    const CREATE_SYNC_LIMIT = 10000;
+
+    /**
+     * Creates a new pending volume associated to the specified project.
+     *
+     * @api {post} projects/:id/pending-volumes Create a new pending volume
+     * @apiGroup Volumes
+     * @apiName StoreProjectPendingVolumes
+     * @apiPermission projectAdmin
+     *
+     * @apiParam {Number} id The project ID.
+     *
+     * @apiParam (Required attributes) {String} media_type The media type of the new volume (`image` or `video`).
+     *
+     * @apiParam (Optional attributes) {File} metadata_file A file with volume and image/video metadata. By default, this can be a CSV. See "metadata columns" for the possible columns. Each column may occur only once. There must be at least one column other than `filename`. For video metadata, multiple rows can contain metadata from different times of the same video. In this case, the `filename` of the rows must match and each row needs a (different) `taken_at` timestamp. Other formats may be supported through modules.
+     *
+     * @apiParam (metadata columns) {String} filename The filename of the file the metadata belongs to. This column is required.
+     * @apiParam (metadata columns) {String} taken_at The date and time where the file was taken. Example: `2016-12-19 12:49:00`
+     * @apiParam (metadata columns) {Number} lng Longitude where the file was taken in decimal form. If this column is present, `lat` must be present, too. Example: `52.3211`
+     * @apiParam (metadata columns) {Number} lat Latitude where the file was taken in decimal form. If this column is present, `lng` must be present, too. Example: `28.775`
+     * @apiParam (metadata columns) {Number} gps_altitude GPS Altitude where the file was taken in meters. Negative for below sea level. Example: `-1500.5`
+     * @apiParam (metadata columns) {Number} distance_to_ground Distance to the sea floor in meters. Example: `30.25`
+     * @apiParam (metadata columns) {Number} area Area shown by the file in m². Example `2.6`.
+     *
+     * @apiSuccessExample {json} Success response:
+     * {
+     *    "id": 2,
+     *    "created_at": "2015-02-19 16:10:17",
+     *    "updated_at": "2015-02-19 16:10:17",
+     *    "media_type_id": 1,
+     *    "user_id": 2,
+     *    "project_id": 3,
+     *    "volume_id": null
+     * }
+     */
+    public function store(StorePendingVolume $request)
+    {
+        $pv = $request->project->pendingVolumes()->create([
+            'media_type_id' => $request->input('media_type_id'),
+            'user_id' => $request->user()->id,
+        ]);
+
+        if ($request->has('metadata_file')) {
+            $pv->saveMetadata($request->file('metadata_file'));
+        }
+
+        return $pv;
+    }
+
+    /**
+     * Update a pending volume to create an actual volume
+     *
+     * @api {put} pending-volumes/:id Create a new volume (v2)
+     * @apiGroup Volumes
+     * @apiName UpdatePendingVolume
+     * @apiPermission projectAdminAndPendingVolumeOwner
+     *
+     * @apiDescription When this endpoint is called, the new volume is already created. Then there are two ways forward: 1) The user wants to import annotations and/or file labels. Then the pending volume is kept and used for the next steps. 2) Otherwise the pending volume will be deleted here. In both cases the endpoint returns the pending volume (even if it was deleted) which was updated with the new volume ID.
+     *
+     * @apiParam {Number} id The pending volume ID.
+     *
+     * @apiParam (Required attributes) {String} name The name of the new volume.
+     * @apiParam (Required attributes) {String} url The base URL of the image/video files. Can be a path to a storage disk like `local://volumes/1` or a remote path like `https://example.com/volumes/1`.
+     * @apiParam (Required attributes) {Array} files Array of file names of the images/videos that can be found at the base URL. Example: With the base URL `local://volumes/1` and the image `1.jpg`, the file `volumes/1/1.jpg` of the `local` storage disk will be used.
+     *
+     * @apiParam (Optional attributes) {String} handle Handle or DOI of the dataset that is represented by the new volume.
+     *
+     * @apiSuccessExample {json} Success response:
+     * {
+     *    "id": 2,
+     *    "created_at": "2015-02-19 16:10:17",
+     *    "updated_at": "2015-02-19 16:10:17",
+     *    "media_type_id": 1,
+     *    "user_id": 2,
+     *    "project_id": 3,
+     *    "volume_id": 4
+     * }
+     *
+     */
+    public function update(UpdatePendingVolume $request)
+    {
+        $volume = DB::transaction(function () use ($request) {
+            $volume = Volume::create([
+                'name' => $request->input('name'),
+                'url' => $request->input('url'),
+                'media_type_id' => $request->pendingVolume->media_type_id,
+                'handle' => $request->input('handle'),
+                'creator_id' => $request->user()->id,
+            ]);
+
+            $request->pendingVolume->project->volumes()->attach($volume);
+
+            $files = $request->input('files');
+
+            // If too many files should be created, do this asynchronously in the
+            // background. Else the script will run in the 30s execution timeout.
+            $job = new CreateNewImagesOrVideos($volume, $files);
+            if (count($files) > self::CREATE_SYNC_LIMIT) {
+                Queue::pushOn('high', $job);
+                $volume->creating_async = true;
+                $volume->save();
+            } else {
+                Queue::connection('sync')->push($job);
+            }
+
+            return $volume;
+        });
+
+        // TODO: Implement annotation/file label import where this must be saved in the
+        // DB.
+        $request->pendingVolume->volume_id = $volume->id;
+
+        $request->pendingVolume->delete();
+
+        return $request->pendingVolume;
+    }
+}
diff --git a/app/Http/Controllers/Api/ProjectPendingVolumeController.php b/app/Http/Controllers/Api/ProjectPendingVolumeController.php
deleted file mode 100644
index 8bc62a0f6..000000000
--- a/app/Http/Controllers/Api/ProjectPendingVolumeController.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-namespace Biigle\Http\Controllers\Api;
-
-use Biigle\Http\Requests\StorePendingVolume;
-
-class ProjectPendingVolumeController extends Controller
-{
-    /**
-     * Creates a new pending volume associated to the specified project.
-     *
-     * @api {post} projects/:id/pending-volumes Create a new pending volume
-     * @apiGroup Volumes
-     * @apiName StoreProjectPendingVolumes
-     * @apiPermission projectAdmin
-     *
-     * @apiParam {Number} id The project ID.
-     *
-     * @apiParam (Required attributes) {String} media_type The media type of the new volume (`image` or `video`).
-     *
-     * @apiParam (Optional attributes) {File} metadata_file A file with volume and image/video metadata. By default, this can be a CSV. See "metadata columns" for the possible columns. Each column may occur only once. There must be at least one column other than `filename`. For video metadata, multiple rows can contain metadata from different times of the same video. In this case, the `filename` of the rows must match and each row needs a (different) `taken_at` timestamp. Other formats may be supported through modules.
-     *
-     * @apiParam (metadata columns) {String} filename The filename of the file the metadata belongs to. This column is required.
-     * @apiParam (metadata columns) {String} taken_at The date and time where the file was taken. Example: `2016-12-19 12:49:00`
-     * @apiParam (metadata columns) {Number} lng Longitude where the file was taken in decimal form. If this column is present, `lat` must be present, too. Example: `52.3211`
-     * @apiParam (metadata columns) {Number} lat Latitude where the file was taken in decimal form. If this column is present, `lng` must be present, too. Example: `28.775`
-     * @apiParam (metadata columns) {Number} gps_altitude GPS Altitude where the file was taken in meters. Negative for below sea level. Example: `-1500.5`
-     * @apiParam (metadata columns) {Number} distance_to_ground Distance to the sea floor in meters. Example: `30.25`
-     * @apiParam (metadata columns) {Number} area Area shown by the file in m². Example `2.6`.
-     */
-    public function store(StorePendingVolume $request)
-    {
-        $pv = $request->project->pendingVolumes()->create([
-            'media_type_id' => $request->input('media_type_id'),
-            'user_id' => $request->user()->id,
-        ]);
-
-        if ($request->has('metadata_file')) {
-            $pv->saveMetadata($request->file('metadata_file'));
-        }
-
-        return $pv;
-    }
-
-    // TODO implement update() endpoint to create the volume and optionally continue to
-    // import annotations/file labels.
-    // See: https://github.com/biigle/core/issues/701#issue-2000484824
-}
diff --git a/app/Http/Controllers/Api/ProjectVolumeController.php b/app/Http/Controllers/Api/ProjectVolumeController.php
index 47e1e53e2..8df5636b6 100644
--- a/app/Http/Controllers/Api/ProjectVolumeController.php
+++ b/app/Http/Controllers/Api/ProjectVolumeController.php
@@ -12,13 +12,6 @@
 
 class ProjectVolumeController extends Controller
 {
-    /**
-     * Limit for the number of files above which volume files are created asynchronously.
-     *
-     * @var int
-     */
-    const CREATE_SYNC_LIMIT = 10000;
-
     /**
      * Shows a list of all volumes belonging to the specified project..
      *
@@ -56,7 +49,7 @@ public function index($id)
     /**
      * Creates a new volume associated to the specified project.
      *
-     * @api {post} projects/:id/volumes Create a new volume
+     * @api {post} projects/:id/volumes Create a new volume (v1)
      * @apiGroup Volumes
      * @apiName StoreProjectVolumes
      * @apiPermission projectAdmin
@@ -124,7 +117,7 @@ public function store(StoreVolume $request)
             // If too many files should be created, do this asynchronously in the
             // background. Else the script will run in the 30 s execution timeout.
             $job = new CreateNewImagesOrVideos($volume, $files, $metadata);
-            if (count($files) > self::CREATE_SYNC_LIMIT) {
+            if (count($files) > PendingVolumeController::CREATE_SYNC_LIMIT) {
                 Queue::pushOn('high', $job);
                 $volume->creating_async = true;
                 $volume->save();
diff --git a/app/Http/Controllers/Api/_apidoc.js b/app/Http/Controllers/Api/_apidoc.js
index 686417f17..b5601b551 100644
--- a/app/Http/Controllers/Api/_apidoc.js
+++ b/app/Http/Controllers/Api/_apidoc.js
@@ -50,3 +50,8 @@
  * The request must provide an authentication token of a remote instance configured for
  * federated search.
  */
+
+/**
+ * @apiDefine projectAdminAndPendingVolumeOwner Project admin and pending volume owner
+ * The authenticated user must be admin of the project and creator of the pending volume.
+ */
diff --git a/app/Http/Requests/StoreVolume.php b/app/Http/Requests/StoreVolume.php
index ae34feb48..5e91d72b7 100644
--- a/app/Http/Requests/StoreVolume.php
+++ b/app/Http/Requests/StoreVolume.php
@@ -71,12 +71,13 @@ public function rules()
      */
     public function withValidator($validator)
     {
-        if ($validator->fails()) {
-            return;
-        }
-
-        // Only validate sample volume files after all other fields have been validated.
         $validator->after(function ($validator) {
+           // Only validate sample volume files after all other fields have been
+           // validated.
+            if ($validator->errors()->isNotEmpty()) {
+                return;
+            }
+
             $files = $this->input('files');
             $rule = new VolumeFiles($this->input('url'), $this->input('media_type_id'));
             if (!$rule->passes('files', $files)) {
diff --git a/app/Http/Requests/UpdatePendingVolume.php b/app/Http/Requests/UpdatePendingVolume.php
new file mode 100644
index 000000000..b8163b60e
--- /dev/null
+++ b/app/Http/Requests/UpdatePendingVolume.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Biigle\Http\Requests;
+
+use Biigle\PendingVolume;
+use Biigle\Rules\Handle;
+use Biigle\Rules\VolumeUrl;
+use Biigle\Rules\VolumeFiles;
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdatePendingVolume extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        $this->pendingVolume = PendingVolume::findOrFail($this->route('id'));
+
+        return $this->user()->can('update', $this->pendingVolume);
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'name' => 'required|max:512',
+            'url' => ['required', 'string', 'max:256', new VolumeUrl],
+            'files' => ['required', 'array'],
+            'handle' => ['nullable', 'max:256', new Handle],
+            // Do not validate the maximum filename length with a 'files.*' rule because
+            // this leads to a request timeout when the rule is expanded for a huge
+            // number of files. This is checked in the VolumeFiles rule below.
+        ];
+    }
+
+    /**
+     * Configure the validator instance.
+     *
+     * @param  \Illuminate\Validation\Validator  $validator
+     * @return void
+     */
+    public function withValidator($validator)
+    {
+        $validator->after(function ($validator) {
+           // Only validate sample volume files after all other fields have been
+           // validated.
+            if ($validator->errors()->isNotEmpty()) {
+                return;
+            }
+
+            $files = $this->input('files');
+            $rule = new VolumeFiles($this->input('url'), $this->pendingVolume->media_type_id);
+            if (!$rule->passes('files', $files)) {
+                $validator->errors()->add('files', $rule->message());
+            }
+        });
+    }
+
+    /**
+     * Prepare the data for validation.
+     *
+     * @return void
+     */
+    protected function prepareForValidation()
+    {
+        $files = $this->input('files');
+        if (is_array($files)) {
+            $files = array_map(fn ($f) => trim($f, " \n\r\t\v\x00'\""), $files);
+            $this->merge(['files' => array_filter($files)]);
+        }
+    }
+}
diff --git a/app/PendingVolume.php b/app/PendingVolume.php
index afc05d2ed..8323df2fe 100644
--- a/app/PendingVolume.php
+++ b/app/PendingVolume.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Http\UploadedFile;
 
 class PendingVolume extends Model
@@ -20,6 +21,16 @@ class PendingVolume extends Model
         'user_id',
         'project_id',
         'metadata_file_path',
+        'volume_id',
+    ];
+
+    /**
+     * The attributes that should be hidden for arrays.
+     *
+     * @var array
+     */
+    protected $hidden = [
+        'metadata_file_path',
     ];
 
     public function hasMetadata(): bool
@@ -35,4 +46,9 @@ public function saveMetadata(UploadedFile $file): void
         $file->storeAs('', $this->metadata_file_path, $disk);
         $this->save();
     }
+
+    public function project(): BelongsTo
+    {
+        return $this->belongsTo(Project::class);
+    }
 }
diff --git a/app/Policies/PendingVolumePolicy.php b/app/Policies/PendingVolumePolicy.php
new file mode 100644
index 000000000..f35306b8c
--- /dev/null
+++ b/app/Policies/PendingVolumePolicy.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Biigle\Policies;
+
+use Biigle\PendingVolume;
+use Biigle\Role;
+use Biigle\User;
+use DB;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class PendingVolumePolicy extends CachedPolicy
+{
+    use HandlesAuthorization;
+
+    /**
+     * Intercept all checks.
+     *
+     * @param User $user
+     * @param string $ability
+     * @return bool|null
+     */
+    public function before($user, $ability)
+    {
+        if ($user->can('sudo')) {
+            return true;
+        }
+    }
+
+    /**
+     * Determine if the given volume can be updated by the user.
+     */
+    public function update(User $user, PendingVolume $pv): bool
+    {
+        return $user->id === $pv->user_id &&
+            $this->remember("pending-volume-can-update-{$user->id}-{$pv->id}", fn () =>
+                 DB::table('project_user')
+                    ->where('project_id', $pv->project_id)
+                    ->where('user_id', $user->id)
+                    ->where('project_role_id', Role::adminId())
+                    ->exists()
+            );
+    }
+}
diff --git a/app/Volume.php b/app/Volume.php
index c99b9d686..ca468650c 100644
--- a/app/Volume.php
+++ b/app/Volume.php
@@ -41,6 +41,19 @@ class Volume extends Model
      */
     const VIDEO_FILE_REGEX = '/\.(mpe?g|mp4|webm)(\?.+)?$/i';
 
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'name',
+        'url',
+        'media_type_id',
+        'handle',
+        'creator_id',
+    ];
+
     /**
      * The attributes hidden from the model's JSON form.
      *
diff --git a/database/migrations/2023_11_29_201953_create_pending_volumes_table.php b/database/migrations/2024_03_06_143800_create_pending_volumes_table.php
similarity index 75%
rename from database/migrations/2023_11_29_201953_create_pending_volumes_table.php
rename to database/migrations/2024_03_06_143800_create_pending_volumes_table.php
index 2f52476d5..6376d0aca 100644
--- a/database/migrations/2023_11_29_201953_create_pending_volumes_table.php
+++ b/database/migrations/2024_03_06_143800_create_pending_volumes_table.php
@@ -26,6 +26,14 @@ public function up(): void
                 ->constrained()
                 ->onDelete('cascade');
 
+            // This is used if annotations or file labels should be imported. The volume
+            // will be created first but the pending volume is still required to store
+            // additional information required for the import.
+            $table->foreignId('volume_id')
+                ->nullable()
+                ->constrained()
+                ->onDelete('cascade');
+
             // Path of the file in the pending_metadata_storage_disk.
             $table->string('metadata_file_path', 256)->nullable();
 
diff --git a/routes/api.php b/routes/api.php
index a254b75ff..7e625c4b0 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -147,6 +147,11 @@
     'only' => ['update', 'destroy'],
 ]);
 
+$router->resource('pending-volumes', 'PendingVolumeController', [
+    'only' => ['update'],
+    'parameters' => ['pending-volumes' => 'id'],
+]);
+
 $router->resource('projects', 'ProjectController', [
     'only' => ['index', 'show', 'update', 'store', 'destroy'],
     'parameters' => ['projects' => 'id'],
@@ -168,7 +173,7 @@
     'parameters' => ['projects' => 'id', 'label-trees' => 'id2'],
 ]);
 
-$router->resource('projects.pending-volumes', 'ProjectPendingVolumeController', [
+$router->resource('projects.pending-volumes', 'PendingVolumeController', [
     'only' => ['store'],
     'parameters' => ['projects' => 'id'],
 ]);
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
new file mode 100644
index 000000000..3879fcfcd
--- /dev/null
+++ b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
@@ -0,0 +1,577 @@
+<?php
+
+namespace Biigle\Tests\Http\Controllers\Api;
+
+use ApiTestCase;
+use Biigle\Jobs\CreateNewImagesOrVideos;
+use Biigle\MediaType;
+use Biigle\PendingVolume;
+use Biigle\Volume;
+use Exception;
+use FileCache;
+use Illuminate\Http\UploadedFile;
+use Queue;
+use Storage;
+
+class PendingVolumeControllerTest extends ApiTestCase
+{
+    public function testStoreImage()
+    {
+        $id = $this->project()->id;
+        $this->doTestApiRoute('POST', "/api/v1/projects/{$id}/pending-volumes");
+
+        $this->beEditor();
+        $this->post("/api/v1/projects/{$id}/pending-volumes")->assertStatus(403);
+
+        $this->beAdmin();
+        // Missing arguments.
+        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes")->assertStatus(422);
+
+        // Incorrect media type.
+        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
+            'media_type' => 'whatever',
+        ])->assertStatus(422);
+
+        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
+            'media_type' => 'image',
+        ])->assertStatus(201);
+
+        $pv = PendingVolume::where('project_id', $id)->first();
+        $this->assertEquals(MediaType::imageId(), $pv->media_type_id);
+        $this->assertEquals($this->admin()->id, $pv->user_id);
+    }
+
+    public function testStoreTwice()
+    {
+        $this->beAdmin();
+        $id = $this->project()->id;
+        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
+            'media_type' => 'image',
+        ])->assertStatus(201);
+
+        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
+            'media_type' => 'image',
+        ])->assertStatus(422);
+    }
+
+    public function testStoreVideo()
+    {
+        $this->beAdmin();
+        $id = $this->project()->id;
+        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
+            'media_type' => 'video',
+        ])->assertStatus(201);
+    }
+
+    public function testStoreImageWithFile()
+    {
+        $disk = Storage::fake('pending-metadata');
+        $csv = __DIR__."/../../../../files/image-metadata.csv";
+        $file = new UploadedFile($csv, 'metadata.csv', 'text/csv', null, true);
+
+        $id = $this->project()->id;
+        $this->beAdmin();
+        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
+            'media_type' => 'image',
+            'metadata_file' => $file,
+        ])->assertStatus(201);
+
+        $pv = PendingVolume::where('project_id', $id)->first();
+        $this->assertNotNull($pv->metadata_file_path);
+        $disk->assertExists($pv->metadata_file_path);
+    }
+
+    public function testStoreImageWithFileUnknown()
+    {
+        $disk = Storage::fake('pending-metadata');
+        $csv = __DIR__."/../../../../files/test.mp4";
+        $file = new UploadedFile($csv, 'metadata.csv', 'text/csv', null, true);
+
+        $id = $this->project()->id;
+        $this->beAdmin();
+        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
+            'media_type' => 'image',
+            'metadata_file' => $file,
+        ])->assertStatus(422);
+    }
+
+    public function testStoreImageWithFileInvalid()
+    {
+        $disk = Storage::fake('pending-metadata');
+        $csv = __DIR__."/../../../../files/image-metadata-invalid.csv";
+        $file = new UploadedFile($csv, 'metadata.csv', 'text/csv', null, true);
+
+        $id = $this->project()->id;
+        $this->beAdmin();
+        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
+            'media_type' => 'image',
+            'metadata_file' => $file,
+        ])->assertStatus(422);
+    }
+
+    public function testStoreVideoWithFile()
+    {
+        $disk = Storage::fake('pending-metadata');
+        $csv = __DIR__."/../../../../files/video-metadata.csv";
+        $file = new UploadedFile($csv, 'metadata.csv', 'text/csv', null, true);
+
+        $id = $this->project()->id;
+        $this->beAdmin();
+        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
+            'media_type' => 'video',
+            'metadata_file' => $file,
+        ])->assertStatus(201);
+
+        $pv = PendingVolume::where('project_id', $id)->first();
+        $this->assertNotNull($pv->metadata_file_path);
+        $disk->assertExists($pv->metadata_file_path);
+    }
+
+    public function testStoreVideoWithFileUnknown()
+    {
+        $disk = Storage::fake('pending-metadata');
+        $csv = __DIR__."/../../../../files/test.mp4";
+        $file = new UploadedFile($csv, 'metadata.csv', 'text/csv', null, true);
+
+        $id = $this->project()->id;
+        $this->beAdmin();
+        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
+            'media_type' => 'video',
+            'metadata_file' => $file,
+        ])->assertStatus(422);
+    }
+
+    public function testStoreVideoWithFileInvalid()
+    {
+        $disk = Storage::fake('pending-metadata');
+        $csv = __DIR__."/../../../../files/video-metadata-invalid.csv";
+        $file = new UploadedFile($csv, 'metadata.csv', 'text/csv', null, true);
+
+        $id = $this->project()->id;
+        $this->beAdmin();
+        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
+            'media_type' => 'video',
+            'metadata_file' => $file,
+        ])->assertStatus(422);
+    }
+
+    public function testUpdateImages()
+    {
+        config(['volumes.editor_storage_disks' => ['test']]);
+        $disk = Storage::fake('test');
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->editor()->id,
+        ]);
+        $id = $pv->id;
+        $this->doTestApiRoute('PUT', "/api/v1/pending-volumes/{$id}");
+
+        $this->beEditor();
+        $this->putJson("/api/v1/pending-volumes/{$id}")->assertStatus(403);
+
+        $this->beAdmin();
+        // Does not own the pending volume.
+        $this->putJson("/api/v1/pending-volumes/{$id}")->assertStatus(403);
+
+        $pv->update(['user_id' => $this->admin()->id]);
+        // mssing arguments
+        $this->putJson("/api/v1/pending-volumes/{$id}")->assertStatus(422);
+
+        // invalid url format
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test',
+            'media_type' => 'image',
+            'files' => ['1.jpg', '2.jpg'],
+        ])->assertStatus(422);
+
+        // unknown storage disk
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'random',
+            'media_type' => 'image',
+            'files' => ['1.jpg', '2.jpg'],
+        ])->assertStatus(422);
+
+        // images directory dows not exist in storage disk
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test://images',
+            'media_type' => 'image',
+            'files' => ['1.jpg', '2.jpg'],
+        ])->assertStatus(422);
+
+        $disk->makeDirectory('images');
+        $disk->put('images/1.jpg', 'abc');
+        $disk->put('images/2.jpg', 'abc');
+        $disk->put('images/1.bmp', 'abc');
+
+        // images array is empty
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test://images',
+            'media_type' => 'image',
+            'files' => [],
+        ])->assertStatus(422);
+
+        // error because of duplicate image
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test://images',
+            'media_type' => 'image',
+            'files' => ['1.jpg', '1.jpg'],
+        ])->assertStatus(422);
+
+        // error because of unsupported image format
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test://images',
+            'media_type' => 'image',
+            'files' => ['1.bmp'],
+        ])->assertStatus(422);
+
+        // Image filename too long.
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test://images',
+            'media_type' => 'image',
+            'files' => ['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.jpg'],
+        ])->assertStatus(422);
+
+        $response = $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test://images',
+            'media_type' => 'image',
+            // Elements should be sanitized and empty elements should be discarded
+            'files' => ['" 1.jpg"', '', '\'2.jpg\' ', '', ''],
+        ])->assertSuccessful();
+        $content = $response->getContent();
+        $this->assertEquals(1, $this->project()->volumes()->count());
+        $this->assertStringStartsWith('{', $content);
+        $this->assertStringEndsWith('}', $content);
+
+        $id = json_decode($content)->volume_id;
+        Queue::assertPushed(CreateNewImagesOrVideos::class, function ($job) use ($id) {
+            $this->assertEquals($id, $job->volume->id);
+            $this->assertContains('1.jpg', $job->filenames);
+            $this->assertContains('2.jpg', $job->filenames);
+
+            return true;
+        });
+
+        $this->assertNull($pv->fresh());
+    }
+
+    public function testUpdateImagesWithMetadata()
+    {
+        $this->markTestIncomplete();
+    }
+
+    public function testUpdateImagesWithAnnotationImport()
+    {
+        $this->markTestIncomplete();
+    }
+
+    public function testUpdateImagesWithImageLabelImport()
+    {
+        $this->markTestIncomplete();
+    }
+
+    public function testUpdateHandle()
+    {
+        config(['volumes.editor_storage_disks' => ['test']]);
+        $disk = Storage::fake('test');
+        $disk->makeDirectory('images');
+        $disk->put('images/1.jpg', 'abc');
+
+        $id = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+        ])->id;
+
+        $this->beAdmin();
+         // Invalid handle format.
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test://images',
+            'files' => ['1.jpg'],
+            'handle' => 'https://doi.org/10.3389/fmars.2017.00083',
+        ])->assertStatus(422);
+
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test://images',
+            'files' => ['1.jpg'],
+            'handle' => '10.3389/fmars.2017.00083',
+        ])->assertStatus(200);
+
+        $volume = Volume::orderBy('id', 'desc')->first();
+        $this->assertEquals('10.3389/fmars.2017.00083', $volume->handle);
+
+        $id = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+        ])->id;
+
+        // Some DOIs can contain multiple slashes.
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test://images',
+            'files' => ['1.jpg'],
+            'handle' => '10.3389/fmars.2017/00083',
+        ])->assertStatus(200);
+
+        $id = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+        ])->id;
+
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test://images',
+            'files' => ['1.jpg'],
+            'handle' => '',
+        ])->assertStatus(200);
+
+        $volume = Volume::orderBy('id', 'desc')->first();
+        $this->assertNull($volume->handle);
+    }
+
+    public function testUpdateFilesExist()
+    {
+        config(['volumes.editor_storage_disks' => ['test']]);
+        $disk = Storage::fake('test');
+        $disk->makeDirectory('images');
+        $disk->put('images/1.jpg', 'abc');
+
+        $id = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+        ])->id;
+
+        $this->beAdmin();
+
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test://images',
+            'files' => ['1.jpg', '2.jpg'],
+        ])->assertStatus(422);
+
+        $disk->put('images/2.jpg', 'abc');
+
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test://images',
+            'files' => ['1.jpg', '2.jpg'],
+        ])->assertSuccessful();
+    }
+
+    public function testUpdateUnableToParseUri()
+    {
+        config(['volumes.editor_storage_disks' => ['test']]);
+        $disk = Storage::fake('test');
+        $disk->makeDirectory('images');
+        $disk->put('images/1.jpg', 'abc');
+        $disk->put('images/2.jpg', 'abc');
+
+        $id = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+        ])->id;
+        $this->beAdmin();
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'https:///my/images',
+            'files' => ['1.jpg', '2.jpg'],
+        ])->assertStatus(422);
+    }
+
+    public function testUpdateFilesExistException()
+    {
+        config(['volumes.editor_storage_disks' => ['test']]);
+        $disk = Storage::fake('test');
+        $disk->makeDirectory('images');
+        $disk->put('images/1.jpg', 'abc');
+
+        $id = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+        ])->id;
+        $this->beAdmin();
+        FileCache::shouldReceive('exists')->andThrow(new Exception('Invalid MIME type.'));
+
+        $response = $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test://images',
+            'files' => ['1.jpg'],
+        ])->assertStatus(422);
+
+        $this->assertStringContainsString('Some files could not be accessed. Invalid MIME type.', $response->getContent());
+    }
+
+    public function testUpdateVideos()
+    {
+        config(['volumes.editor_storage_disks' => ['test']]);
+        $disk = Storage::fake('test');
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::videoId(),
+            'user_id' => $this->admin()->id,
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+        // invalid url format
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test',
+            'files' => ['1.mp4', '2.mp4'],
+        ])->assertStatus(422);
+
+        // unknown storage disk
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'random',
+            'files' => ['1.mp4', '2.mp4'],
+        ])->assertStatus(422);
+
+        // videos directory dows not exist in storage disk
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test://videos',
+            'files' => ['1.mp4', '2.mp4'],
+        ])->assertStatus(422);
+
+        $disk->makeDirectory('videos');
+        $disk->put('videos/1.mp4', 'abc');
+        $disk->put('videos/2.mp4', 'abc');
+
+        // error because of duplicate video
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test://videos',
+            'files' => ['1.mp4', '1.mp4'],
+        ])->assertStatus(422);
+
+        // error because of unsupported video format
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test://videos',
+            'files' => ['1.avi'],
+        ])->assertStatus(422);
+
+        // Video filename too long.
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test://videos',
+            'files' => ['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.mp4'],
+        ])->assertStatus(422);
+
+        $response = $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test://videos',
+            'media_type' => 'video',
+            // Elements should be sanitized and empty elements should be discarded
+            'files' => ['" 1.mp4"', '', '\'2.mp4\' ', '', ''],
+        ])->assertSuccessful();
+        $this->assertEquals(1, $this->project()->volumes()->count());
+
+        $id = json_decode($response->getContent())->volume_id;
+        Queue::assertPushed(CreateNewImagesOrVideos::class, function ($job) use ($id) {
+            $this->assertEquals($id, $job->volume->id);
+            $this->assertContains('1.mp4', $job->filenames);
+            $this->assertContains('2.mp4', $job->filenames);
+
+            return true;
+        });
+
+        $this->assertNull($pv->fresh());
+    }
+
+    public function testUpdateVideosWithMetadata()
+    {
+        $this->markTestIncomplete();
+    }
+
+    public function testUpdateVideosWithAnnotationImport()
+    {
+        $this->markTestIncomplete();
+    }
+
+    public function testUpdateVideosWithImageLabelImport()
+    {
+        $this->markTestIncomplete();
+    }
+
+    public function testUpdateProviderDenylist()
+    {
+        $id = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+        ])->id;
+        $this->beAdmin();
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'https://dropbox.com',
+            'files' => ['1.jpg', '2.jpg'],
+        ])->assertStatus(422);
+    }
+
+    public function testUpdateAuthorizeDisk()
+    {
+        config(['volumes.admin_storage_disks' => ['admin-test']]);
+        config(['volumes.editor_storage_disks' => ['editor-test']]);
+
+        $adminDisk = Storage::fake('admin-test');
+        $adminDisk->put('images/1.jpg', 'abc');
+
+        $editorDisk = Storage::fake('editor-test');
+        $editorDisk->put('images/2.jpg', 'abc');
+
+        $id = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+        ])->id;
+        $this->beAdmin();
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'name',
+            'url' => 'admin-test://images',
+            'files' => ['1.jpg'],
+        ])->assertStatus(422);
+
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'name',
+            'url' => 'editor-test://images',
+            'files' => ['2.jpg'],
+        ])->assertSuccessful();
+
+        $id = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+        ])->id;
+
+        $this->beGlobalAdmin();
+
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'name',
+            'url' => 'editor-test://images',
+            'files' => ['2.jpg'],
+        ])->assertStatus(422);
+
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'name',
+            'url' => 'admin-test://images',
+            'files' => ['1.jpg'],
+        ])->assertSuccessful();
+    }
+}
diff --git a/tests/php/Http/Controllers/Api/ProjectPendingVolumeControllerTest.php b/tests/php/Http/Controllers/Api/ProjectPendingVolumeControllerTest.php
deleted file mode 100644
index b86ea9eb4..000000000
--- a/tests/php/Http/Controllers/Api/ProjectPendingVolumeControllerTest.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-
-namespace Biigle\Tests\Http\Controllers\Api;
-
-use ApiTestCase;
-use Biigle\MediaType;
-use Biigle\PendingVolume;
-use Illuminate\Http\UploadedFile;
-use Storage;
-
-class ProjectPendingVolumeControllerTest extends ApiTestCase
-{
-    public function testStoreImage()
-    {
-        $id = $this->project()->id;
-        $this->doTestApiRoute('POST', "/api/v1/projects/{$id}/pending-volumes");
-
-        $this->beEditor();
-        $this->post("/api/v1/projects/{$id}/pending-volumes")->assertStatus(403);
-
-        $this->beAdmin();
-        // Missing arguments.
-        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes")->assertStatus(422);
-
-        // Incorrect media type.
-        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
-            'media_type' => 'whatever',
-        ])->assertStatus(422);
-
-        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
-            'media_type' => 'image',
-        ])->assertStatus(201);
-
-        $pv = PendingVolume::where('project_id', $id)->first();
-        $this->assertEquals(MediaType::imageId(), $pv->media_type_id);
-        $this->assertEquals($this->admin()->id, $pv->user_id);
-    }
-
-    public function testStoreTwice()
-    {
-        $this->beAdmin();
-        $id = $this->project()->id;
-        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
-            'media_type' => 'image',
-        ])->assertStatus(201);
-
-        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
-            'media_type' => 'image',
-        ])->assertStatus(422);
-    }
-
-    public function testStoreVideo()
-    {
-        $this->beAdmin();
-        $id = $this->project()->id;
-        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
-            'media_type' => 'video',
-        ])->assertStatus(201);
-    }
-
-    public function testStoreImageWithFile()
-    {
-        $disk = Storage::fake('pending-metadata');
-        $csv = __DIR__."/../../../../files/image-metadata.csv";
-        $file = new UploadedFile($csv, 'metadata.csv', 'text/csv', null, true);
-
-        $id = $this->project()->id;
-        $this->beAdmin();
-        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
-            'media_type' => 'image',
-            'metadata_file' => $file,
-        ])->assertStatus(201);
-
-        $pv = PendingVolume::where('project_id', $id)->first();
-        $this->assertNotNull($pv->metadata_file_path);
-        $disk->assertExists($pv->metadata_file_path);
-    }
-
-    public function testStoreImageWithFileUnknown()
-    {
-        $disk = Storage::fake('pending-metadata');
-        $csv = __DIR__."/../../../../files/test.mp4";
-        $file = new UploadedFile($csv, 'metadata.csv', 'text/csv', null, true);
-
-        $id = $this->project()->id;
-        $this->beAdmin();
-        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
-            'media_type' => 'image',
-            'metadata_file' => $file,
-        ])->assertStatus(422);
-    }
-
-    public function testStoreImageWithFileInvalid()
-    {
-        $disk = Storage::fake('pending-metadata');
-        $csv = __DIR__."/../../../../files/image-metadata-invalid.csv";
-        $file = new UploadedFile($csv, 'metadata.csv', 'text/csv', null, true);
-
-        $id = $this->project()->id;
-        $this->beAdmin();
-        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
-            'media_type' => 'image',
-            'metadata_file' => $file,
-        ])->assertStatus(422);
-    }
-
-    public function testStoreVideoWithFile()
-    {
-        $disk = Storage::fake('pending-metadata');
-        $csv = __DIR__."/../../../../files/video-metadata.csv";
-        $file = new UploadedFile($csv, 'metadata.csv', 'text/csv', null, true);
-
-        $id = $this->project()->id;
-        $this->beAdmin();
-        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
-            'media_type' => 'video',
-            'metadata_file' => $file,
-        ])->assertStatus(201);
-
-        $pv = PendingVolume::where('project_id', $id)->first();
-        $this->assertNotNull($pv->metadata_file_path);
-        $disk->assertExists($pv->metadata_file_path);
-    }
-
-    public function testStoreVideoWithFileUnknown()
-    {
-        $disk = Storage::fake('pending-metadata');
-        $csv = __DIR__."/../../../../files/test.mp4";
-        $file = new UploadedFile($csv, 'metadata.csv', 'text/csv', null, true);
-
-        $id = $this->project()->id;
-        $this->beAdmin();
-        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
-            'media_type' => 'video',
-            'metadata_file' => $file,
-        ])->assertStatus(422);
-    }
-
-    public function testStoreVideoWithFileInvalid()
-    {
-        $disk = Storage::fake('pending-metadata');
-        $csv = __DIR__."/../../../../files/video-metadata-invalid.csv";
-        $file = new UploadedFile($csv, 'metadata.csv', 'text/csv', null, true);
-
-        $id = $this->project()->id;
-        $this->beAdmin();
-        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
-            'media_type' => 'video',
-            'metadata_file' => $file,
-        ])->assertStatus(422);
-    }
-}
diff --git a/tests/php/PendingVolumeTest.php b/tests/php/PendingVolumeTest.php
index a508198b4..853347a4b 100644
--- a/tests/php/PendingVolumeTest.php
+++ b/tests/php/PendingVolumeTest.php
@@ -23,6 +23,7 @@ public function testAttributes()
         $this->assertNotNull($this->model->created_at);
         $this->assertNotNull($this->model->updated_at);
         $this->assertNull($this->model->metadata_file_path);
+        $this->assertNull($this->model->volume_id);
     }
 
     public function testCreateOnlyOneForProject()
diff --git a/tests/php/Policies/PendingVolumePolicyTest.php b/tests/php/Policies/PendingVolumePolicyTest.php
new file mode 100644
index 000000000..866eacbfd
--- /dev/null
+++ b/tests/php/Policies/PendingVolumePolicyTest.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Biigle\Tests\Policies;
+
+use Biigle\PendingVolume;
+use Biigle\Project;
+use Biigle\Role;
+use Biigle\User;
+use TestCase;
+
+class PendingVolumePolicyTest extends TestCase
+{
+    public function setUp(): void
+    {
+        parent::setUp();
+        $project = Project::factory()->create();
+        $this->user = User::factory()->create();
+        $this->guest = User::factory()->create();
+        $this->editor = User::factory()->create();
+        $this->expert = User::factory()->create();
+        $this->admin = User::factory()->create();
+        $this->owner = User::factory()->create();
+        $this->globalAdmin = User::factory()->create(['role_id' => Role::adminId()]);
+        $this->pv = PendingVolume::factory()->create([
+            'project_id' => $project->id,
+            'user_id' => $this->owner->id,
+        ]);
+
+        $project->addUserId($this->guest->id, Role::guestId());
+        $project->addUserId($this->editor->id, Role::editorId());
+        $project->addUserId($this->expert->id, Role::expertId());
+        $project->addUserId($this->admin->id, Role::adminId());
+        $project->addUserId($this->owner->id, Role::adminId());
+    }
+
+    public function testUpdate()
+    {
+        $this->assertFalse($this->user->can('update', $this->pv));
+        $this->assertFalse($this->guest->can('update', $this->pv));
+        $this->assertFalse($this->editor->can('update', $this->pv));
+        $this->assertFalse($this->expert->can('update', $this->pv));
+        $this->assertFalse($this->admin->can('update', $this->pv));
+        $this->assertTrue($this->owner->can('update', $this->pv));
+        $this->assertTrue($this->globalAdmin->can('update', $this->pv));
+    }
+}

From a432727ce31b53237dd7f457f758fd375170bf2b Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 7 Mar 2024 17:04:48 +0100
Subject: [PATCH 015/209] WIP Implement metadata support in the v1 create
 volume controller

---
 .../Api/ProjectVolumeController.php           |   6 +-
 app/Http/Requests/StorePendingVolume.php      |   2 +-
 app/Http/Requests/StoreVolume.php             |  65 ++++++-----
 app/Volume.php                                |  88 ++------------
 config/filesystems.php                        |   4 +-
 config/volumes.php                            |   4 +-
 ...06_143800_create_pending_volumes_table.php |   8 ++
 .../Api/ProjectVolumeControllerTest.php       | 107 ++----------------
 tests/php/PendingVolumeTest.php               |   5 +
 tests/php/VolumeTest.php                      |  52 +--------
 10 files changed, 86 insertions(+), 255 deletions(-)

diff --git a/app/Http/Controllers/Api/ProjectVolumeController.php b/app/Http/Controllers/Api/ProjectVolumeController.php
index 8df5636b6..9e7dfc49b 100644
--- a/app/Http/Controllers/Api/ProjectVolumeController.php
+++ b/app/Http/Controllers/Api/ProjectVolumeController.php
@@ -112,11 +112,13 @@ public function store(StoreVolume $request)
 
             $files = $request->input('files');
 
-            $metadata = $request->input('metadata', []);
+            if ($request->file('metadata_csv')) {
+                $volume->saveMetadata($request->file('metadata_csv'));
+            }
 
             // If too many files should be created, do this asynchronously in the
             // background. Else the script will run in the 30 s execution timeout.
-            $job = new CreateNewImagesOrVideos($volume, $files, $metadata);
+            $job = new CreateNewImagesOrVideos($volume, $files);
             if (count($files) > PendingVolumeController::CREATE_SYNC_LIMIT) {
                 Queue::pushOn('high', $job);
                 $volume->creating_async = true;
diff --git a/app/Http/Requests/StorePendingVolume.php b/app/Http/Requests/StorePendingVolume.php
index 1c6749e8a..a267f6d40 100644
--- a/app/Http/Requests/StorePendingVolume.php
+++ b/app/Http/Requests/StorePendingVolume.php
@@ -60,7 +60,7 @@ public function withValidator($validator)
                 $type = $this->input('media_type');
                 $parser = ParserFactory::getParserForFile($file, $type);
                 if (is_null($parser)) {
-                    $validator->errors()->add('metadata_file', 'Unknown metadata file format.');
+                    $validator->errors()->add('metadata_file', 'Unknown metadata file format for this media type.');
                     return;
                 }
 
diff --git a/app/Http/Requests/StoreVolume.php b/app/Http/Requests/StoreVolume.php
index 5e91d72b7..f8b1ef3cd 100644
--- a/app/Http/Requests/StoreVolume.php
+++ b/app/Http/Requests/StoreVolume.php
@@ -9,16 +9,16 @@
 use Biigle\Rules\VideoMetadata;
 use Biigle\Rules\VolumeFiles;
 use Biigle\Rules\VolumeUrl;
-use Biigle\Traits\ParsesMetadata;
+use Biigle\Services\MetadataParsing\ParserFactory;
 use Biigle\Volume;
 use Exception;
+use File;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Http\UploadedFile;
 use Illuminate\Validation\Rule;
 
 class StoreVolume extends FormRequest
 {
-    use ParsesMetadata;
-
     /**
      * The project to attach the new volume to.
      *
@@ -26,6 +26,22 @@ class StoreVolume extends FormRequest
      */
     public $project;
 
+    /**
+     * Filled if an uploaded metadata text was stored in a file.
+     *
+     * @var string
+     */
+    protected $metadataPath;
+
+    /**
+     * Remove potential temporary files.
+     */
+    function __destruct() {
+        if (isset($this->metadataPath)) {
+            File::delete($this->metadataPath);
+        }
+    }
+
     /**
      * Determine if the user is authorized to make this request.
      *
@@ -56,7 +72,6 @@ public function rules()
             'handle' => ['nullable', 'max:256', new Handle],
             'metadata_csv' => 'file|mimetypes:text/plain,text/csv,application/csv',
             'ifdo_file' => 'file',
-            'metadata' => 'filled',
             // Do not validate the maximum filename length with a 'files.*' rule because
             // this leads to a request timeout when the rule is expanded for a huge
             // number of files. This is checked in the VolumeFiles rule below.
@@ -84,28 +99,21 @@ public function withValidator($validator)
                 $validator->errors()->add('files', $rule->message());
             }
 
-            if ($this->has('metadata')) {
-                if ($this->input('media_type_id') === MediaType::imageId()) {
-                    $rule = new ImageMetadata($files);
-                } else {
-                    $rule = new VideoMetadata($files);
+            if ($file = $this->file('metadata_csv')) {
+                $type = $this->input('media_type');
+                $parser = ParserFactory::getParserForFile($file, $type);
+                if (is_null($parser)) {
+                    $validator->errors()->add('metadata', 'Unknown metadata file format for this media type.');
+                    return;
                 }
 
-                if (!$rule->passes('metadata', $this->input('metadata'))) {
-                    $validator->errors()->add('metadata', $rule->message());
-                }
-            }
-
-            if ($this->hasFile('ifdo_file')) {
-                try {
-                    // This throws an error if the iFDO is invalid.
-                    $data = $this->parseIfdoFile($this->file('ifdo_file'));
+                $rule = match ($type) {
+                    'video' => new VideoMetadata,
+                    default => new ImageMetadata,
+                };
 
-                    if ($data['media_type'] !== $this->input('media_type')) {
-                        $validator->errors()->add('ifdo_file', 'The iFDO image-acquisition type does not match the media type of the volume.');
-                    }
-                } catch (Exception $e) {
-                    $validator->errors()->add('ifdo_file', $e->getMessage());
+                if (!$rule->passes('metadata', $parser->getMetadata())) {
+                    $validator->errors()->add('metadata', $rule->message());
                 }
             }
         });
@@ -136,10 +144,13 @@ protected function prepareForValidation()
             $this->merge(['files' => Volume::parseFilesQueryString($files)]);
         }
 
-        if ($this->input('metadata_text')) {
-            $this->merge(['metadata' => $this->parseMetadata($this->input('metadata_text'))]);
-        } elseif ($this->hasFile('metadata_csv')) {
-            $this->merge(['metadata' => $this->parseMetadataFile($this->file('metadata_csv'))]);
+        if ($this->input('metadata_text') && !$this->file('metadata_csv')) {
+            $this->metadataPath = tempnam(sys_get_temp_dir(), 'volume_metadata');
+            File::put($this->metadataPath, $this->input('metadata_text'));
+            $file = new UploadedFile($this->metadataPath, 'metadata.csv', 'text/csv', test: true);
+            // Reset this so the new file will be picked up.
+            unset($this->convertedFiles);
+            $this->files->add(['metadata_csv' => $file]);
         }
 
         // Backwards compatibility.
diff --git a/app/Volume.php b/app/Volume.php
index ca468650c..cedee7fad 100644
--- a/app/Volume.php
+++ b/app/Volume.php
@@ -454,83 +454,13 @@ public function isVideoVolume()
         return $this->media_type_id === MediaType::videoId();
     }
 
-    /**
-     * Save an iFDO metadata file and link it with this volume.
-     *
-     * @param UploadedFile $file iFDO YAML file.
-     *
-     */
-    public function saveIfdo(UploadedFile $file)
-    {
-        $disk = config('volumes.ifdo_storage_disk');
-        $file->storeAs('', $this->getIfdoFilename(), $disk);
-        Cache::forget($this->getIfdoCacheKey());
-    }
-
-    /**
-     * Check if an iFDO metadata file is available for this volume.
-     *
-     * @param bool $ignoreErrors Set to `true` to ignore exceptions and return `false` if iFDO existence could not be determined.
-     * @return boolean
-     */
-    public function hasIfdo($ignoreErrors = false)
-    {
-        try {
-            return Cache::remember($this->getIfdoCacheKey(), 3600, fn () => Storage::disk(config('volumes.ifdo_storage_disk'))->exists($this->getIfdoFilename()));
-        } catch (Exception $e) {
-            if (!$ignoreErrors) {
-                throw $e;
-            }
-
-            return false;
-        }
-    }
-
-    /**
-     * Delete the iFDO metadata file linked with this volume.
-     */
-    public function deleteIfdo()
-    {
-        Storage::disk(config('volumes.ifdo_storage_disk'))->delete($this->getIfdoFilename());
-        Cache::forget($this->getIfdoCacheKey());
-    }
-
-    /**
-     * Download the iFDO that is attached to this volume.
-     *
-     * @return Response
-     */
-    public function downloadIfdo()
-    {
-        $disk = Storage::disk(config('volumes.ifdo_storage_disk'));
-
-        if (!$disk->exists($this->getIfdoFilename())) {
-            abort(Response::HTTP_NOT_FOUND);
-        }
-
-        return $disk->download($this->getIfdoFilename(), "biigle-volume-{$this->id}-ifdo.yaml");
-    }
-
-    /**
-     * Get the content of the iFDO file associated with this volume.
-     *
-     * @return array
-     */
-    public function getIfdo()
-    {
-        $content = Storage::disk(config('volumes.ifdo_storage_disk'))->get($this->getIfdoFilename());
-
-        return yaml_parse($content);
-    }
-
-    /**
-     * Get the filename of the volume iFDO in storage.
-     *
-     * @return string
-     */
-    protected function getIfdoFilename()
+    public function saveMetadata(UploadedFile $file): void
     {
-        return $this->id.'.yaml';
+        $disk = config('volumes.metadata_storage_disk');
+        $extension = $file->getExtension();
+        $this->metadata_file_path = "{$this->id}.{$extension}";
+        $file->storeAs('', $this->metadata_file_path, $disk);
+        $this->save();
     }
 
     /**
@@ -554,12 +484,12 @@ protected function getGeoInfoCacheKey()
     }
 
     /**
-     * Get the cache key for volume iFDO info.
+     * Get the cache key for volume metadata info.
      *
      * @return string
      */
-    protected function getIfdoCacheKey()
+    protected function getMetadataCacheKey()
     {
-        return "volume-{$this->id}-has-ifdo";
+        return "volume-{$this->id}-has-metadata";
     }
 }
diff --git a/config/filesystems.php b/config/filesystems.php
index 138a5a919..e95473eea 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -60,9 +60,9 @@
             'visibility' => 'public',
         ],
 
-        'ifdos' => [
+        'metadata' => [
             'driver' => 'local',
-            'root' => storage_path('ifdos'),
+            'root' => storage_path('metadata'),
         ],
 
         'pending-metadata' => [
diff --git a/config/volumes.php b/config/volumes.php
index 9c0138bf2..98723f697 100644
--- a/config/volumes.php
+++ b/config/volumes.php
@@ -17,9 +17,9 @@
     'editor_storage_disks' => array_filter(explode(',', env('VOLUME_EDITOR_STORAGE_DISKS', ''))),
 
     /*
-    | Storage disk for iFDO metadata files linked with volumes.
+    | Storage disk for metadata files linked with volumes.
     */
-    'ifdo_storage_disk' => env('VOLUME_IFDO_STORAGE_DISK', 'ifdos'),
+    'metadata_storage_disk' => env('VOLUME_METADATA_STORAGE_DISK', 'metadata'),
 
 
     /*
diff --git a/database/migrations/2024_03_06_143800_create_pending_volumes_table.php b/database/migrations/2024_03_06_143800_create_pending_volumes_table.php
index 6376d0aca..47fdbd90b 100644
--- a/database/migrations/2024_03_06_143800_create_pending_volumes_table.php
+++ b/database/migrations/2024_03_06_143800_create_pending_volumes_table.php
@@ -41,6 +41,10 @@ public function up(): void
             // project.
             $table->unique(['user_id', 'project_id']);
         });
+
+        Schema::table('volumes', function (Blueprint $table) {
+            $table->string('metadata_file_path', 256)->nullable();
+        });
     }
 
     /**
@@ -48,6 +52,10 @@ public function up(): void
      */
     public function down(): void
     {
+        Schema::table('volumes', function (Blueprint $table) {
+            $table->dropColumn('metadata_file_path');
+        });
+
         Schema::dropIfExists('pending_volumes');
     }
 };
diff --git a/tests/php/Http/Controllers/Api/ProjectVolumeControllerTest.php b/tests/php/Http/Controllers/Api/ProjectVolumeControllerTest.php
index 3881dcfd3..7085db332 100644
--- a/tests/php/Http/Controllers/Api/ProjectVolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/ProjectVolumeControllerTest.php
@@ -466,11 +466,14 @@ public function testStoreImageMetadataText()
             ])
             ->assertSuccessful();
 
-        Queue::assertPushed(CreateNewImagesOrVideos::class, fn ($job) => $job->metadata[1][0] === '1.jpg' && $job->metadata[1][1] === '2.5');
+        $volume = Volume::orderBy('id', 'desc')->first();
+        $this->assertNotNull($volume->metadata_file_path);
     }
 
     public function testStoreImageMetadataCsv()
     {
+        Storage::disk('metadata');
+
         $id = $this->project()->id;
         $this->beAdmin();
         $csv = __DIR__."/../../../../files/image-metadata.csv";
@@ -478,8 +481,7 @@ public function testStoreImageMetadataCsv()
         Storage::disk('test')->makeDirectory('images');
         Storage::disk('test')->put('images/abc.jpg', 'abc');
 
-        $this
-            ->postJson("/api/v1/projects/{$id}/volumes", [
+        $this->postJson("/api/v1/projects/{$id}/volumes", [
                 'name' => 'my volume no. 1',
                 'url' => 'test://images',
                 'media_type' => 'image',
@@ -488,7 +490,8 @@ public function testStoreImageMetadataCsv()
             ])
             ->assertSuccessful();
 
-        Queue::assertPushed(CreateNewImagesOrVideos::class, fn ($job) => $job->metadata[1][0] === 'abc.jpg' && $job->metadata[1][6] === '2.6');
+        $volume = Volume::orderBy('id', 'desc')->first();
+        $this->assertNotNull($volume->metadata_file_path);
     }
 
     public function testStoreImageMetadataInvalid()
@@ -546,7 +549,8 @@ public function testStoreVideoMetadataText()
             ])
             ->assertSuccessful();
 
-        Queue::assertPushed(CreateNewImagesOrVideos::class, fn ($job) => $job->metadata[1][0] === '1.mp4' && $job->metadata[1][1] === '2.5');
+        $volume = Volume::orderBy('id', 'desc')->first();
+        $this->assertNotNull($volume->metadata_file_path);
     }
 
     public function testStoreVideoMetadataCsv()
@@ -568,7 +572,8 @@ public function testStoreVideoMetadataCsv()
             ])
             ->assertSuccessful();
 
-        Queue::assertPushed(CreateNewImagesOrVideos::class, fn ($job) => $job->metadata[1][0] === 'abc.mp4' && $job->metadata[1][6] === '2.6' && $job->metadata[2][6] === '1.6');
+        $volume = Volume::orderBy('id', 'desc')->first();
+        $this->assertNotNull($volume->metadata_file_path);
     }
 
     public function testStoreVideoMetadataInvalid()
@@ -589,96 +594,6 @@ public function testStoreVideoMetadataInvalid()
             ->assertStatus(422);
     }
 
-    public function testStoreImageIfdoFile()
-    {
-        $id = $this->project()->id;
-        $this->beAdmin();
-        $csv = __DIR__."/../../../../files/image-ifdo.yaml";
-        $file = new UploadedFile($csv, 'ifdo.yaml', 'application/yaml', null, true);
-        Storage::disk('test')->makeDirectory('images');
-        Storage::disk('test')->put('images/abc.jpg', 'abc');
-
-        Storage::fake('ifdos');
-
-        $this
-            ->postJson("/api/v1/projects/{$id}/volumes", [
-                'name' => 'my volume no. 1',
-                'url' => 'test://images',
-                'media_type' => 'image',
-                'files' => 'abc.jpg',
-                'ifdo_file' => $file,
-            ])
-            ->assertSuccessful();
-
-        $volume = Volume::orderBy('id', 'desc')->first();
-        $this->assertTrue($volume->hasIfdo());
-    }
-
-    public function testStoreVideoIfdoFile()
-    {
-        $id = $this->project()->id;
-        $this->beAdmin();
-        $csv = __DIR__."/../../../../files/video-ifdo.yaml";
-        $file = new UploadedFile($csv, 'ifdo.yaml', 'application/yaml', null, true);
-        Storage::disk('test')->makeDirectory('videos');
-        Storage::disk('test')->put('videos/abc.mp4', 'abc');
-
-        Storage::fake('ifdos');
-
-        $this
-            ->postJson("/api/v1/projects/{$id}/volumes", [
-                'name' => 'my volume no. 1',
-                'url' => 'test://videos',
-                'media_type' => 'video',
-                'files' => 'abc.mp4',
-                'ifdo_file' => $file,
-            ])
-            ->assertSuccessful();
-
-        $volume = Volume::orderBy('id', 'desc')->first();
-        $this->assertTrue($volume->hasIfdo());
-    }
-
-    public function testStoreVideoVolumeWithImageIfdoFile()
-    {
-        $id = $this->project()->id;
-        $this->beAdmin();
-        $csv = __DIR__."/../../../../files/image-ifdo.yaml";
-        $file = new UploadedFile($csv, 'ifdo.yaml', 'application/yaml', null, true);
-        Storage::disk('test')->makeDirectory('videos');
-        Storage::disk('test')->put('videos/abc.mp4', 'abc');
-
-        $this
-            ->postJson("/api/v1/projects/{$id}/volumes", [
-                'name' => 'my volume no. 1',
-                'url' => 'test://videos',
-                'media_type' => 'video',
-                'files' => 'abc.mp4',
-                'ifdo_file' => $file,
-            ])
-            ->assertStatus(422);
-    }
-
-    public function testStoreImageVolumeWithVideoIfdoFile()
-    {
-        $id = $this->project()->id;
-        $this->beAdmin();
-        $csv = __DIR__."/../../../../files/video-ifdo.yaml";
-        $file = new UploadedFile($csv, 'ifdo.yaml', 'application/yaml', null, true);
-        Storage::disk('test')->makeDirectory('images');
-        Storage::disk('test')->put('images/abc.jpg', 'abc');
-
-        $this
-            ->postJson("/api/v1/projects/{$id}/volumes", [
-                'name' => 'my volume no. 1',
-                'url' => 'test://images',
-                'media_type' => 'image',
-                'files' => 'abc.jpg',
-                'ifdo_file' => $file,
-            ])
-            ->assertStatus(422);
-    }
-
     public function testStoreProviderDenylist()
     {
         $id = $this->project()->id;
diff --git a/tests/php/PendingVolumeTest.php b/tests/php/PendingVolumeTest.php
index 853347a4b..9c0c67711 100644
--- a/tests/php/PendingVolumeTest.php
+++ b/tests/php/PendingVolumeTest.php
@@ -48,4 +48,9 @@ public function testStoreMetadataFile()
         $this->assertTrue($this->model->hasMetadata());
         $this->assertEquals($this->model->id.'.csv', $this->model->metadata_file_path);
     }
+
+    public function testDeleteMetadataOnDelete()
+    {
+        $this->markTestIncomplete();
+    }
 }
diff --git a/tests/php/VolumeTest.php b/tests/php/VolumeTest.php
index 504a9ea2c..73eca084b 100644
--- a/tests/php/VolumeTest.php
+++ b/tests/php/VolumeTest.php
@@ -553,8 +553,9 @@ public function testCreatingAsyncAttr()
         $this->assertFalse($this->model->fresh()->creating_async);
     }
 
-    public function testSaveIfdo()
+    public function testSaveMetadata()
     {
+        $this->markTestIncomplete();
         $disk = Storage::fake('ifdos');
         $csv = __DIR__."/../files/image-ifdo.yaml";
         $file = new UploadedFile($csv, 'ifdo.yaml', 'application/yaml', null, true);
@@ -566,59 +567,18 @@ public function testSaveIfdo()
         $this->assertTrue($this->model->hasIfdo());
     }
 
-    public function testHasIfdo()
-    {
-        $disk = Storage::fake('ifdos');
-        $this->assertFalse($this->model->hasIfdo());
-        $disk->put($this->model->id.'.yaml', 'abc');
-        $this->assertFalse($this->model->hasIfdo());
-        Cache::flush();
-        $this->assertTrue($this->model->hasIfdo());
-    }
-
-    public function testHasIfdoError()
-    {
-        Storage::shouldReceive('disk')->andThrow(Exception::class);
-        $this->assertFalse($this->model->hasIfdo(true));
-
-        $this->expectException(Exception::class);
-        $this->model->hasIfdo();
-    }
-
-    public function testDeleteIfdo()
-    {
-        $disk = Storage::fake('ifdos');
-        $disk->put($this->model->id.'.yaml', 'abc');
-        $this->assertTrue($this->model->hasIfdo());
-        $this->model->deleteIfdo();
-        $disk->assertMissing($this->model->id.'.yaml');
-        $this->assertFalse($this->model->hasIfdo());
-    }
-
-    public function testDeleteIfdoOnDelete()
+    public function testDeleteMetadataOnDelete()
     {
+        $this->markTestIncomplete();
         $disk = Storage::fake('ifdos');
         $disk->put($this->model->id.'.yaml', 'abc');
         $this->model->delete();
         $disk->assertMissing($this->model->id.'.yaml');
     }
 
-    public function testDownloadIfdoNotFound()
-    {
-        $this->expectException(NotFoundHttpException::class);
-        $this->model->downloadIfdo();
-    }
-
-    public function testDownloadIfdo()
-    {
-        $disk = Storage::fake('ifdos');
-        $disk->put($this->model->id.'.yaml', 'abc');
-        $response = $this->model->downloadIfdo();
-        $this->assertInstanceOf(StreamedResponse::class, $response);
-    }
-
-    public function testGetIfdo()
+    public function testGetMetadata()
     {
+        $this->markTestIncomplete();
         $disk = Storage::fake('ifdos');
         $this->assertNull($this->model->getIfdo());
         $disk->put($this->model->id.'.yaml', 'abc: def');

From 46ad3000864cbe4a02b6a6278970e585e7a2ab2b Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Mon, 11 Mar 2024 14:43:35 +0100
Subject: [PATCH 016/209] Fix test for v1 create volume controller

---
 .../php/Http/Controllers/Api/ProjectVolumeControllerTest.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/php/Http/Controllers/Api/ProjectVolumeControllerTest.php b/tests/php/Http/Controllers/Api/ProjectVolumeControllerTest.php
index 7085db332..723f6b2f6 100644
--- a/tests/php/Http/Controllers/Api/ProjectVolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/ProjectVolumeControllerTest.php
@@ -507,7 +507,7 @@ public function testStoreImageMetadataInvalid()
                 'url' => 'test://images',
                 'media_type' => 'image',
                 'files' => '1.jpg',
-                'metadata_text' => "filename,area\nabc.jpg,2.5",
+                'metadata_text' => "filename,yaw\nabc.jpg,400",
             ])
             ->assertStatus(422);
     }
@@ -589,7 +589,7 @@ public function testStoreVideoMetadataInvalid()
                 'url' => 'test://videos',
                 'media_type' => 'video',
                 'files' => '1.mp4',
-                'metadata_text' => "filename,area\nabc.mp4,2.5",
+                'metadata_text' => "filename,yaw\nabc.mp4,400",
             ])
             ->assertStatus(422);
     }

From 684246cc0cffd5acd3d793680820d7dbab1e6a43 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Mon, 11 Mar 2024 15:32:56 +0100
Subject: [PATCH 017/209] Implement methods to save, get and delete volume
 metadata

---
 app/Observers/VolumeObserver.php              |  2 +-
 app/PendingVolume.php                         | 11 ++++
 .../MetadataParsing/MetadataParser.php        |  4 +-
 .../MetadataParsing/ParserFactory.php         |  4 +-
 app/Volume.php                                | 51 +++++++++++++++----
 tests/files/image-ifdo.yaml                   | 37 --------------
 tests/files/video-ifdo.yaml                   | 19 -------
 tests/php/PendingVolumeTest.php               |  9 +++-
 tests/php/VolumeTest.php                      | 38 +++++++-------
 9 files changed, 84 insertions(+), 91 deletions(-)
 delete mode 100644 tests/files/image-ifdo.yaml
 delete mode 100644 tests/files/video-ifdo.yaml

diff --git a/app/Observers/VolumeObserver.php b/app/Observers/VolumeObserver.php
index 397798cb1..20f6926ad 100644
--- a/app/Observers/VolumeObserver.php
+++ b/app/Observers/VolumeObserver.php
@@ -48,7 +48,7 @@ public function deleting(Volume $volume)
             event(new VideosDeleted($uuids));
         }
 
-        $volume->deleteIfdo();
+        $volume->deleteMetadata();
 
         return true;
     }
diff --git a/app/PendingVolume.php b/app/PendingVolume.php
index 8323df2fe..e997e6cc9 100644
--- a/app/PendingVolume.php
+++ b/app/PendingVolume.php
@@ -6,6 +6,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Http\UploadedFile;
+use Storage;
 
 class PendingVolume extends Model
 {
@@ -33,6 +34,16 @@ class PendingVolume extends Model
         'metadata_file_path',
     ];
 
+    protected static function booted(): void
+    {
+        static::deleting(function (PendingVolume $pv) {
+            if ($pv->hasMetadata()) {
+                $disk = config('volumes.pending_metadata_storage_disk');
+                Storage::disk($disk)->delete($pv->metadata_file_path);
+            }
+        });
+    }
+
     public function hasMetadata(): bool
     {
         return !is_null($this->metadata_file_path);
diff --git a/app/Services/MetadataParsing/MetadataParser.php b/app/Services/MetadataParsing/MetadataParser.php
index 22668d2ae..164611284 100644
--- a/app/Services/MetadataParsing/MetadataParser.php
+++ b/app/Services/MetadataParsing/MetadataParser.php
@@ -2,14 +2,14 @@
 
 namespace Biigle\Services\MetadataParsing;
 
+use SplFileInfo;
 use SplFileObject;
-use Symfony\Component\HttpFoundation\File\File;
 
 abstract class MetadataParser
 {
     public SplFileObject $fileObject;
 
-    public function __construct(public File $file)
+    public function __construct(public SplFileInfo $file)
     {
         //
     }
diff --git a/app/Services/MetadataParsing/ParserFactory.php b/app/Services/MetadataParsing/ParserFactory.php
index b0774b40f..2df5356a1 100644
--- a/app/Services/MetadataParsing/ParserFactory.php
+++ b/app/Services/MetadataParsing/ParserFactory.php
@@ -2,7 +2,7 @@
 
 namespace Biigle\Services\MetadataParsing;
 
-use Symfony\Component\HttpFoundation\File\File;
+use SplFileInfo;
 
 class ParserFactory
 {
@@ -15,7 +15,7 @@ class ParserFactory
         ],
     ];
 
-    public static function getParserForFile(File $file, string $type): ?MetadataParser
+    public static function getParserForFile(SplFileInfo $file, string $type): ?MetadataParser
     {
         $parsers = self::$parsers[$type] ?? [];
         foreach ($parsers as $parserClass) {
diff --git a/app/Volume.php b/app/Volume.php
index cedee7fad..37f344d4e 100644
--- a/app/Volume.php
+++ b/app/Volume.php
@@ -2,6 +2,8 @@
 
 namespace Biigle;
 
+use Biigle\Services\MetadataParsing\ParserFactory;
+use Biigle\Services\MetadataParsing\VolumeMetadata;
 use Biigle\Traits\HasJsonAttributes;
 use Cache;
 use Carbon\Carbon;
@@ -11,7 +13,9 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Response;
 use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Storage;
+use SplFileInfo;
 
 /**
  * A volume is a collection of images. Volumes belong to one or many
@@ -454,6 +458,11 @@ public function isVideoVolume()
         return $this->media_type_id === MediaType::videoId();
     }
 
+    public function hasMetadata(): bool
+    {
+        return !is_null($this->metadata_file_path);
+    }
+
     public function saveMetadata(UploadedFile $file): void
     {
         $disk = config('volumes.metadata_storage_disk');
@@ -463,6 +472,38 @@ public function saveMetadata(UploadedFile $file): void
         $this->save();
     }
 
+    public function getMetadata(): ?VolumeMetadata
+    {
+        if (!$this->hasMetadata()) {
+            return null;
+        }
+
+        $tmpPath = tempnam(sys_get_temp_dir(), 'volume-metadata');
+        try {
+            $from = Storage::disk(config('volumes.metadata_storage_disk'))
+                ->readStream($this->metadata_file_path);
+            $to = fopen($tmpPath, 'w');
+            stream_copy_to_stream($from, $to);
+            $type = $this->isImageVolume() ? 'image' : 'video';
+            $parser = ParserFactory::getParserForFile(new SplFileInfo($tmpPath), $type);
+            if (is_null($parser)) {
+                return null;
+            }
+
+            return $parser->getMetadata();
+        } finally {
+            fclose($to);
+            File::delete($tmpPath);
+        }
+    }
+
+    public function deleteMetadata(): void
+    {
+        if ($this->hasMetadata()) {
+            Storage::disk(config('volumes.metadata_storage_disk'))->delete($this->metadata_file_path);
+        }
+    }
+
     /**
      * Get the cache key for volume thumbnails.
      *
@@ -482,14 +523,4 @@ protected function getGeoInfoCacheKey()
     {
         return "volume-{$this->id}-has-geo-info";
     }
-
-    /**
-     * Get the cache key for volume metadata info.
-     *
-     * @return string
-     */
-    protected function getMetadataCacheKey()
-    {
-        return "volume-{$this->id}-has-metadata";
-    }
 }
diff --git a/tests/files/image-ifdo.yaml b/tests/files/image-ifdo.yaml
deleted file mode 100644
index 5d14b386b..000000000
--- a/tests/files/image-ifdo.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-image-set-header:
-  image-acquisition: photo
-  image-area-square-meter: 5.0
-  image-capture-mode: mixed
-  image-coordinate-reference-system: EPSG:4326
-  image-deployment: survey
-  image-event: SO268-2_100-1_OFOS
-  image-illumination: artificial
-  image-latitude: 11.8581802
-  image-license: CC-BY
-  image-longitude: -117.0214864
-  image-marine-zone: seafloor
-  image-meters-above-ground: 2
-  image-navigation: beacon
-  image-project: SO268
-  image-quality: raw
-  image-resolution: mm
-  image-scale-reference: laser marker
-  image-set-data-handle: 20.500.12085/d7546c4b-307f-4d42-8554-33236c577450@data
-  image-set-handle: 20.500.12085/d7546c4b-307f-4d42-8554-33236c577450
-  image-set-metadata-handle: 20.500.12085/d7546c4b-307f-4d42-8554-33236c577450@metadata
-  image-set-name: SO268 SO268-2_100-1_OFOS SO_CAM-1_Photo_OFOS
-  image-set-uuid: d7546c4b-307f-4d42-8554-33236c577450
-  image-spectral-resolution: rgb
-image-set-items:
-  SO268-2_100-1_OFOS_SO_CAM-1_20190406_042927.JPG:
-    image-datetime: '2019-04-06 04:29:27.000000'
-    image-depth: 2248.0
-    image-camera-yaw-degrees: 20
-  SO268-2_100-1_OFOS_SO_CAM-1_20190406_052726.JPG:
-    - image-datetime: '2019-04-06 05:27:26.000000'
-      image-altitude: -4129.6
-      image-latitude: 11.8582192
-      image-longitude: -117.0214286
-      image-area-square-meter: 5.1
-      image-meters-above-ground: 2.1
-      image-camera-yaw-degrees: 21
diff --git a/tests/files/video-ifdo.yaml b/tests/files/video-ifdo.yaml
deleted file mode 100644
index 6cc8bfd09..000000000
--- a/tests/files/video-ifdo.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-image-set-header:
-  image-acquisition: video
-  image-area-square-meter: 5.0
-  image-latitude: 11.8581802
-  image-longitude: -117.0214864
-  image-meters-above-ground: 2
-  image-set-data-handle: 20.500.12085/d7546c4b-307f-4d42-8554-33236c577450@data
-  image-set-handle: 20.500.12085/d7546c4b-307f-4d42-8554-33236c577450
-  image-set-metadata-handle: 20.500.12085/d7546c4b-307f-4d42-8554-33236c577450@metadata
-  image-set-name: SO268 SO268-2_100-1_OFOS SO_CAM-1_Photo_OFOS
-  image-set-uuid: d7546c4b-307f-4d42-8554-33236c577450
-image-set-items:
-  video1.mp4:
-    - image-datetime: '2019-04-06 04:29:27.000000'
-      image-depth: 2248.0
-      image-camera-yaw-degrees: 20
-    - image-datetime: '2019-04-06 04:30:27.000000'
-      image-depth: 2250.0
-      image-camera-yaw-degrees: 21
diff --git a/tests/php/PendingVolumeTest.php b/tests/php/PendingVolumeTest.php
index 9c0c67711..e26d3d597 100644
--- a/tests/php/PendingVolumeTest.php
+++ b/tests/php/PendingVolumeTest.php
@@ -35,7 +35,7 @@ public function testCreateOnlyOneForProject()
         ]);
     }
 
-    public function testStoreMetadataFile()
+    public function testSaveMetadata()
     {
         $disk = Storage::fake('pending-metadata');
         $csv = __DIR__."/../files/image-metadata.csv";
@@ -51,6 +51,11 @@ public function testStoreMetadataFile()
 
     public function testDeleteMetadataOnDelete()
     {
-        $this->markTestIncomplete();
+        $disk = Storage::fake('pending-metadata');
+        $disk->put($this->model->id.'.csv', 'abc');
+        $this->model->metadata_file_path = $this->model->id.'.csv';
+        $this->model->save();
+        $this->model->delete();
+        $disk->assertMissing($this->model->id.'.csv');
     }
 }
diff --git a/tests/php/VolumeTest.php b/tests/php/VolumeTest.php
index 73eca084b..c4e9b1aa2 100644
--- a/tests/php/VolumeTest.php
+++ b/tests/php/VolumeTest.php
@@ -555,34 +555,36 @@ public function testCreatingAsyncAttr()
 
     public function testSaveMetadata()
     {
-        $this->markTestIncomplete();
-        $disk = Storage::fake('ifdos');
-        $csv = __DIR__."/../files/image-ifdo.yaml";
-        $file = new UploadedFile($csv, 'ifdo.yaml', 'application/yaml', null, true);
+        $disk = Storage::fake('metadata');
+        $csv = __DIR__."/../files/image-metadata.csv";
+        $file = new UploadedFile($csv, 'metadata.csv', 'text/csv', null, true);
 
-        $this->assertFalse($this->model->hasIfdo());
-        $this->model->saveIfdo($file);
+        $this->assertFalse($this->model->hasMetadata());
+        $this->model->saveMetadata($file);
 
-        $disk->assertExists($this->model->id.'.yaml');
-        $this->assertTrue($this->model->hasIfdo());
+        $disk->assertExists($this->model->id.'.csv');
+        $this->assertTrue($this->model->hasMetadata());
+        $this->assertEquals($this->model->id.'.csv', $this->model->metadata_file_path);
     }
 
     public function testDeleteMetadataOnDelete()
     {
-        $this->markTestIncomplete();
-        $disk = Storage::fake('ifdos');
-        $disk->put($this->model->id.'.yaml', 'abc');
+        $disk = Storage::fake('metadata');
+        $disk->put($this->model->id.'.csv', 'abc');
+        $this->model->metadata_file_path = $this->model->id.'.csv';
+        $this->model->save();
         $this->model->delete();
-        $disk->assertMissing($this->model->id.'.yaml');
+        $disk->assertMissing($this->model->id.'.csv');
     }
 
     public function testGetMetadata()
     {
-        $this->markTestIncomplete();
-        $disk = Storage::fake('ifdos');
-        $this->assertNull($this->model->getIfdo());
-        $disk->put($this->model->id.'.yaml', 'abc: def');
-        $ifdo = $this->model->getIfdo();
-        $this->assertEquals(['abc' => 'def'], $ifdo);
+        $this->assertNull($this->model->getMetadata());
+        $disk = Storage::fake('metadata');
+        $this->model->metadata_file_path = $this->model->id.'.csv';
+        $disk->put($this->model->metadata_file_path, "filename,area\n1.jpg,2.5");
+        $metadata = $this->model->getMetadata();
+        $fileMeta = $metadata->getFile('1.jpg');
+        $this->assertEquals(2.5, $fileMeta->area);
     }
 }

From 70967416fb491f4a0a9e068e3d211d920a5ea2ee Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Mon, 11 Mar 2024 16:13:36 +0100
Subject: [PATCH 018/209] Implement download and deletion of generic volume
 metadata files

---
 .../Api/Volumes/IfdoController.php            | 48 -----------------
 .../Api/Volumes/MetadataController.php        | 50 +++++++++++++++++
 app/Observers/VolumeObserver.php              |  2 +-
 app/Volume.php                                |  9 +++-
 public/assets/images/ifdo_logo_grey.svg       | 13 -----
 resources/assets/sass/volumes/main.scss       | 11 ----
 .../partials/handleIndicator.blade.php        |  2 +-
 .../volumes/partials/ifdoIndicator.blade.php  |  5 --
 .../partials/metadataIndicator.blade.php      |  5 ++
 resources/views/volumes/show.blade.php        |  2 +-
 routes/api.php                                |  8 +--
 .../Api/Volumes/IfdoControllerTest.php        | 54 -------------------
 .../Api/Volumes/MetadataControllerTest.php    | 51 ++++++++++++++++++
 tests/php/VolumeTest.php                      | 11 ++++
 14 files changed, 132 insertions(+), 139 deletions(-)
 delete mode 100644 app/Http/Controllers/Api/Volumes/IfdoController.php
 delete mode 100644 public/assets/images/ifdo_logo_grey.svg
 delete mode 100644 resources/views/volumes/partials/ifdoIndicator.blade.php
 create mode 100644 resources/views/volumes/partials/metadataIndicator.blade.php
 delete mode 100644 tests/php/Http/Controllers/Api/Volumes/IfdoControllerTest.php

diff --git a/app/Http/Controllers/Api/Volumes/IfdoController.php b/app/Http/Controllers/Api/Volumes/IfdoController.php
deleted file mode 100644
index 6e27cb797..000000000
--- a/app/Http/Controllers/Api/Volumes/IfdoController.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-namespace Biigle\Http\Controllers\Api\Volumes;
-
-use Biigle\Http\Controllers\Api\Controller;
-use Biigle\Volume;
-
-class IfdoController extends Controller
-{
-    /**
-     * Get an iFDO file attached to a volume
-     *
-     * @api {get} volumes/:id/ifdo Get an iFDO file
-     * @apiGroup Volumes
-     * @apiName ShowVolumeIfdo
-     * @apiPermission projectMember
-     ~
-     * @param int $id
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function show($id)
-    {
-        $volume = Volume::findOrFail($id);
-        $this->authorize('access', $volume);
-
-        return $volume->downloadIfdo();
-    }
-
-    /**
-     * Delete an iFDO file attached to a volume
-     *
-     * @api {delete} volumes/:id/ifdo Delete an iFDO file
-     * @apiGroup Volumes
-     * @apiName DestroyVolumeIfdo
-     * @apiPermission projectAdmin
-     ~
-     * @param int $id
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy($id)
-    {
-        $volume = Volume::findOrFail($id);
-        $this->authorize('update', $volume);
-        $volume->deleteIfdo();
-    }
-}
diff --git a/app/Http/Controllers/Api/Volumes/MetadataController.php b/app/Http/Controllers/Api/Volumes/MetadataController.php
index 7ba285721..18f2853da 100644
--- a/app/Http/Controllers/Api/Volumes/MetadataController.php
+++ b/app/Http/Controllers/Api/Volumes/MetadataController.php
@@ -8,15 +8,45 @@
 use Biigle\Rules\VideoMetadata;
 use Biigle\Traits\ChecksMetadataStrings;
 use Biigle\Video;
+use Biigle\Volume;
 use Carbon\Carbon;
 use DB;
+use Illuminate\Http\Response;
 use Illuminate\Support\Collection;
 use Illuminate\Validation\ValidationException;
+use Storage;
 
 class MetadataController extends Controller
 {
     use ChecksMetadataStrings;
 
+    /**
+     * Get a metadata file attached to a volume
+     *
+     * @api {get} volumes/:id/metadata Get a metadata file
+     * @apiGroup Volumes
+     * @apiName ShowVolumeMetadata
+     * @apiPermission projectMember
+     ~
+     * @param int $id
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        $volume = Volume::findOrFail($id);
+        $this->authorize('access', $volume);
+
+        if (!$volume->hasMetadata()) {
+            abort(Response::HTTP_NOT_FOUND);
+        }
+
+        $disk = Storage::disk(config('volumes.metadata_storage_disk'));
+        $suffix = pathinfo($volume->metadata_file_path, PATHINFO_EXTENSION);
+
+        return $disk->download($volume->metadata_file_path, "biigle-volume-{$volume->id}-metadata.{$suffix}");
+    }
+
     /**
      * @api {post} volumes/:id/images/metadata Add image metadata
      * @apiDeprecated use now (#Volumes:StoreVolumeMetadata).
@@ -75,6 +105,26 @@ public function store(StoreVolumeMetadata $request)
         }
     }
 
+    /**
+     * Delete a metadata file attached to a volume
+     *
+     * @api {delete} volumes/:id/metadata Delete a metadata file
+     * @apiGroup Volumes
+     * @apiName DestroyVolumeMetadata
+     * @apiPermission projectAdmin
+     * @apiDescription This does not delete the metadata that was attached to the volume files.
+     ~
+     * @param int $id
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        $volume = Volume::findOrFail($id);
+        $this->authorize('update', $volume);
+        $volume->deleteMetadata();
+    }
+
     /**
      * Update volume metadata for each image.
      *
diff --git a/app/Observers/VolumeObserver.php b/app/Observers/VolumeObserver.php
index 20f6926ad..94e8deb70 100644
--- a/app/Observers/VolumeObserver.php
+++ b/app/Observers/VolumeObserver.php
@@ -48,7 +48,7 @@ public function deleting(Volume $volume)
             event(new VideosDeleted($uuids));
         }
 
-        $volume->deleteMetadata();
+        $volume->deleteMetadata(true);
 
         return true;
     }
diff --git a/app/Volume.php b/app/Volume.php
index 37f344d4e..1d97f5508 100644
--- a/app/Volume.php
+++ b/app/Volume.php
@@ -56,6 +56,7 @@ class Volume extends Model
         'media_type_id',
         'handle',
         'creator_id',
+        'metadata_file_path',
     ];
 
     /**
@@ -497,10 +498,16 @@ public function getMetadata(): ?VolumeMetadata
         }
     }
 
-    public function deleteMetadata(): void
+    /**
+     * @param boolean $noUpdate Do not set metadata_file_path to null.
+     */
+    public function deleteMetadata($noUpdate=false): void
     {
         if ($this->hasMetadata()) {
             Storage::disk(config('volumes.metadata_storage_disk'))->delete($this->metadata_file_path);
+            if (!$noUpdate) {
+                $this->update(['metadata_file_path' => null]);
+            }
         }
     }
 
diff --git a/public/assets/images/ifdo_logo_grey.svg b/public/assets/images/ifdo_logo_grey.svg
deleted file mode 100644
index c0413811b..000000000
--- a/public/assets/images/ifdo_logo_grey.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#EDEDED;stroke:#000000;stroke-width:7;stroke-miterlimit:10;}
-	.st1{fill:#BEBEBE;stroke:#000000;stroke-width:7;stroke-miterlimit:10;}
-	.st2{fill:#7F7F7F;stroke:#000000;stroke-width:7;stroke-miterlimit:10;}
-</style>
-<circle class="st0" cx="256" cy="256" r="246"/>
-<circle class="st1" cx="256" cy="256" r="182.9"/>
-<circle class="st2" cx="256" cy="256" r="119.2"/>
-</svg>
diff --git a/resources/assets/sass/volumes/main.scss b/resources/assets/sass/volumes/main.scss
index 0a674fc1d..9cd3c1485 100644
--- a/resources/assets/sass/volumes/main.scss
+++ b/resources/assets/sass/volumes/main.scss
@@ -25,17 +25,6 @@ $volume-image-padding: 0.5em;
     background-color: $gray-lighter;
 }
 
-.ifdo-icon {
-    width: 12px;
-    height: 12px;
-    display: inline-block;
-    margin-top: -3px;
-
-    &.ifdo-icon--btn {
-        margin-top: -2px;
-    }
-}
-
 .volume-storage-disk-btn {
     overflow-x: hidden;
     text-overflow: ellipsis;
diff --git a/resources/views/volumes/partials/handleIndicator.blade.php b/resources/views/volumes/partials/handleIndicator.blade.php
index 1ccb77958..801371f0b 100644
--- a/resources/views/volumes/partials/handleIndicator.blade.php
+++ b/resources/views/volumes/partials/handleIndicator.blade.php
@@ -1,3 +1,3 @@
 @if ($volume->handle)
-    <a href="https://hdl.handle.net/{{$volume->handle}}" class="btn btn-default btn-xs" title="Handle: {{$volume->handle}}"><span class="fa fa-link" aria-hidden="true" ></span></a>
+    <a href="https://hdl.handle.net/{{$volume->handle}}" class="btn btn-default btn-xs" title="Handle: {{$volume->handle}}"><span class="fa fa-link fa-fw" aria-hidden="true" ></span></a>
 @endif
diff --git a/resources/views/volumes/partials/ifdoIndicator.blade.php b/resources/views/volumes/partials/ifdoIndicator.blade.php
deleted file mode 100644
index f51d344d1..000000000
--- a/resources/views/volumes/partials/ifdoIndicator.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@if ($volume->hasIfdo(true))
-    <a href="{{url("api/v1/volumes/{$volume->id}/ifdo")}}" class="btn btn-default btn-xs" title="Download the iFDO attached to this volume">
-        <img class="ifdo-icon" src="{{ cachebust_asset('assets/images/ifdo_logo_grey.svg') }}"> iFDO
-    </a>
-@endif
diff --git a/resources/views/volumes/partials/metadataIndicator.blade.php b/resources/views/volumes/partials/metadataIndicator.blade.php
new file mode 100644
index 000000000..69f9d613f
--- /dev/null
+++ b/resources/views/volumes/partials/metadataIndicator.blade.php
@@ -0,0 +1,5 @@
+@if ($volume->hasMetadata())
+    <a href="{{url("api/v1/volumes/{$volume->id}/metadata")}}" class="btn btn-default btn-xs" title="Download the metadata file attached to this volume">
+        <i class="fa fa-file-alt fa-fw"></i>
+    </a>
+@endif
diff --git a/resources/views/volumes/show.blade.php b/resources/views/volumes/show.blade.php
index 467b0612d..e28c73cea 100644
--- a/resources/views/volumes/show.blade.php
+++ b/resources/views/volumes/show.blade.php
@@ -36,7 +36,7 @@
 
 @section('navbar')
 <div class="navbar-text navbar-volumes-breadcrumbs">
-    @include('volumes.partials.projectsBreadcrumb') / <strong>{{$volume->name}}</strong> <small>(<span id="volume-file-count" v-text="text">{{ $fileIds->count() }}</span>&nbsp;{{$type}}s)</small> @include('volumes.partials.annotationSessionIndicator') @include('volumes.partials.handleIndicator') @include('volumes.partials.ifdoIndicator')
+    @include('volumes.partials.projectsBreadcrumb') / <strong>{{$volume->name}}</strong> <small>(<span id="volume-file-count" v-text="text">{{ $fileIds->count() }}</span>&nbsp;{{$type}}s)</small> @include('volumes.partials.annotationSessionIndicator') @include('volumes.partials.handleIndicator') @include('volumes.partials.metadataIndicator')
 </div>
 @endsection
 
diff --git a/routes/api.php b/routes/api.php
index 7e625c4b0..4cafd5ab0 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -360,12 +360,12 @@
         'uses' => 'MetadataController@store',
     ]);
 
-    $router->get('{id}/ifdo', [
-        'uses' => 'IfdoController@show',
+    $router->get('{id}/metadata', [
+        'uses' => 'MetadataController@show',
     ]);
 
-    $router->delete('{id}/ifdo', [
-        'uses' => 'IfdoController@destroy',
+    $router->delete('{id}/metadata', [
+        'uses' => 'MetadataController@destroy',
     ]);
 
     $router->get('{id}/users', [
diff --git a/tests/php/Http/Controllers/Api/Volumes/IfdoControllerTest.php b/tests/php/Http/Controllers/Api/Volumes/IfdoControllerTest.php
deleted file mode 100644
index 861ffbe5c..000000000
--- a/tests/php/Http/Controllers/Api/Volumes/IfdoControllerTest.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace Biigle\Tests\Http\Controllers\Api\Volumes;
-
-use ApiTestCase;
-use Storage;
-
-class IfdoControllerTest extends ApiTestCase
-{
-    public function testGet()
-    {
-        $id = $this->volume()->id;
-
-        $this->doTestApiRoute('GET', "/api/v1/volumes/{$id}/ifdo");
-
-        $this->beUser();
-        $this->getJson("/api/v1/volumes/{$id}/ifdo")
-            ->assertStatus(403);
-
-        $this->beGuest();
-        $this->getJson("/api/v1/volumes/{$id}/ifdo")
-            ->assertStatus(404);
-
-        $disk = Storage::fake('ifdos');
-        $disk->put($id.'.yaml', 'abc');
-
-        $this->getJson("/api/v1/volumes/-1/ifdo")
-            ->assertStatus(404);
-
-        $response = $this->getJson("/api/v1/volumes/{$id}/ifdo");
-        $response->assertStatus(200);
-        $this->assertEquals("attachment; filename=biigle-volume-{$id}-ifdo.yaml", $response->headers->get('content-disposition'));
-    }
-
-    public function testDestroy()
-    {
-        $id = $this->volume()->id;
-
-        $this->doTestApiRoute('DELETE', "/api/v1/volumes/{$id}/ifdo");
-
-        $disk = Storage::fake('ifdos');
-        $disk->put($id.'.yaml', 'abc');
-
-        $this->beExpert();
-        $this->deleteJson("/api/v1/volumes/{$id}/ifdo")
-            ->assertStatus(403);
-
-        $this->beAdmin();
-        $this->deleteJson("/api/v1/volumes/{$id}/ifdo")
-            ->assertSuccessful();
-
-        $this->assertFalse($this->volume()->hasIfdo());
-    }
-}
diff --git a/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php b/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php
index 9237a93bf..a9f6fb612 100644
--- a/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php
+++ b/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php
@@ -11,6 +11,34 @@
 
 class MetadataControllerTest extends ApiTestCase
 {
+    public function testGet()
+    {
+        $volume = $this->volume();
+        $id = $volume->id;
+
+        $this->doTestApiRoute('GET', "/api/v1/volumes/{$id}/metadata");
+
+        $this->beUser();
+        $this->getJson("/api/v1/volumes/{$id}/metadata")
+            ->assertStatus(403);
+
+        $this->beGuest();
+        $this->getJson("/api/v1/volumes/{$id}/metadata")
+            ->assertStatus(404);
+
+        $disk = Storage::fake('metadata');
+        $disk->put($id.'.csv', 'abc');
+        $volume->metadata_file_path = $id.'.csv';
+        $volume->save();
+
+        $this->getJson("/api/v1/volumes/-1/metadata")
+            ->assertStatus(404);
+
+        $response = $this->getJson("/api/v1/volumes/{$id}/metadata");
+        $response->assertStatus(200);
+        $this->assertEquals("attachment; filename=biigle-volume-{$id}-metadata.csv", $response->headers->get('content-disposition'));
+    }
+
     public function testStoreDeprecated()
     {
         $id = $this->volume()->id;
@@ -447,4 +475,27 @@ public function testStoreImageIfdoFileForVideoVolume()
         $this->postJson("/api/v1/volumes/{$id}/metadata", ['ifdo_file' => $file])
             ->assertStatus(422);
     }
+
+    public function testDestroy()
+    {
+        $volume = $this->volume();
+        $id = $volume->id;
+
+        $this->doTestApiRoute('DELETE', "/api/v1/volumes/{$id}/metadata");
+
+        $disk = Storage::fake('metadata');
+        $disk->put($id.'.csv', 'abc');
+        $volume->metadata_file_path = $id.'.csv';
+        $volume->save();
+
+        $this->beExpert();
+        $this->deleteJson("/api/v1/volumes/{$id}/metadata")
+            ->assertStatus(403);
+
+        $this->beAdmin();
+        $this->deleteJson("/api/v1/volumes/{$id}/metadata")
+            ->assertSuccessful();
+
+        $this->assertFalse($volume->fresh()->hasMetadata());
+    }
 }
diff --git a/tests/php/VolumeTest.php b/tests/php/VolumeTest.php
index c4e9b1aa2..057990121 100644
--- a/tests/php/VolumeTest.php
+++ b/tests/php/VolumeTest.php
@@ -577,6 +577,17 @@ public function testDeleteMetadataOnDelete()
         $disk->assertMissing($this->model->id.'.csv');
     }
 
+    public function testDeleteMetadata()
+    {
+        $disk = Storage::fake('metadata');
+        $disk->put($this->model->id.'.csv', 'abc');
+        $this->model->metadata_file_path = $this->model->id.'.csv';
+        $this->model->save();
+        $this->model->deleteMetadata();
+        $disk->assertMissing($this->model->id.'.csv');
+        $this->assertNull($this->model->fresh()->metadata_file_path);
+    }
+
     public function testGetMetadata()
     {
         $this->assertNull($this->model->getMetadata());

From 696a36c43b99a00333e0b99ece336c0a37d9fa36 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Mon, 11 Mar 2024 16:19:54 +0100
Subject: [PATCH 019/209] Remove ParsesMetadata trait

---
 app/Traits/ParsesMetadata.php           | 294 --------------
 tests/php/Traits/ParsesMetadataTest.php | 493 ------------------------
 2 files changed, 787 deletions(-)
 delete mode 100644 app/Traits/ParsesMetadata.php
 delete mode 100644 tests/php/Traits/ParsesMetadataTest.php

diff --git a/app/Traits/ParsesMetadata.php b/app/Traits/ParsesMetadata.php
deleted file mode 100644
index 7289a912c..000000000
--- a/app/Traits/ParsesMetadata.php
+++ /dev/null
@@ -1,294 +0,0 @@
-<?php
-
-namespace Biigle\Traits;
-
-use duncan3dc\Bom\Util;
-use Exception;
-use Illuminate\Http\UploadedFile;
-
-trait ParsesMetadata
-{
-    /**
-     * Column name synonyms.
-     *
-     * @var array
-     */
-    protected $columnSynonyms = [
-        'file' => 'filename',
-        'lon' => 'lng',
-        'longitude' => 'lng',
-        'latitude' => 'lat',
-        'heading' => 'yaw',
-        'sub_datetime' => 'taken_at',
-        'sub_longitude' => 'lng',
-        'sub_latitude' => 'lat',
-        'sub_heading' => 'yaw',
-        'sub_distance' => 'distance_to_ground',
-        'sub_altitude' => 'gps_altitude',
-
-    ];
-
-    /**
-     * Maps iFDO field names to BIIGLE metadata CSV fields.
-     *
-     * @var array
-     */
-    protected $ifdoFieldMap = [
-        'image-area-square-meter' => 'area',
-        'image-meters-above-ground' => 'distance_to_ground',
-        'image-altitude' => 'gps_altitude',
-        'image-latitude' => 'lat',
-        'image-longitude' => 'lng',
-        'image-datetime' => 'taken_at',
-        'image-camera-yaw-degrees' => 'yaw',
-    ];
-
-    /**
-     * Parse a metadata CSV string to an array.
-     *
-     * @param string $content
-     *
-     * @return array
-     */
-    public function parseMetadata($content)
-    {
-        // Split string by rows but respect possible escaped linebreaks.
-        $rows = str_getcsv($content, "\n");
-        // Now parse individual rows.
-        $rows = array_map('str_getcsv', $rows);
-
-
-        if (!empty($rows) && is_array($rows[0])) {
-            if (!empty($rows[0])) {
-                $rows[0][0] = Util::removeBom($rows[0][0]);
-            }
-
-            $rows[0] = array_map('strtolower', $rows[0]);
-
-            $rows[0] = array_map(function ($column) {
-                if (array_key_exists($column, $this->columnSynonyms)) {
-                    return $this->columnSynonyms[$column];
-                }
-
-                return $column;
-            }, $rows[0]);
-        }
-
-        return $rows;
-    }
-
-    /**
-     * Parse metadata from a CSV file to an array.
-     *
-     * @param UploadedFile $file
-     *
-     * @return array
-     */
-    public function parseMetadataFile(UploadedFile $file)
-    {
-        return $this->parseMetadata($file->get());
-    }
-
-    /**
-     * Parse a volume metadata iFDO YAML string to an array.
-     *
-     * See: https://marine-imaging.com/fair/ifdos/iFDO-overview/
-     *
-     * @param string $content
-     *
-     * @return array
-     */
-    public function parseIfdo($content)
-    {
-        try {
-            $yaml = yaml_parse($content);
-        } catch (Exception $e) {
-            throw new Exception("The YAML file could not be parsed.");
-        }
-
-        if (!is_array($yaml)) {
-            throw new Exception("The file does not seem to be a valid iFDO.");
-        }
-
-        if (!array_key_exists('image-set-header', $yaml)) {
-            throw new Exception("The 'image-set-header' key must be present.");
-        }
-
-        $header = $yaml['image-set-header'];
-
-        if (!array_key_exists('image-set-name', $header)) {
-            throw new Exception("The 'image-set-name' key must be present.");
-        }
-
-        if (!array_key_exists('image-set-handle', $header)) {
-            throw new Exception("The 'image-set-handle' key must be present.");
-        }
-
-        if (!$this->isValidHandle($header['image-set-handle'])) {
-            throw new Exception("The 'image-set-handle' key must be a valid handle.");
-        }
-
-        if (!array_key_exists('image-set-uuid', $header)) {
-            throw new Exception("The 'image-set-uuid' key must be present.");
-        }
-
-        $url = '';
-        if (array_key_exists('image-set-data-handle', $header)) {
-            if (!$this->isValidHandle($header['image-set-data-handle'])) {
-                throw new Exception("The 'image-set-data-handle' key must be a valid handle.");
-            }
-
-            $url = 'https://hdl.handle.net/'.$header['image-set-data-handle'];
-        }
-
-        $mediaType = 'image';
-
-        if (array_key_exists('image-acquisition', $header) && $header['image-acquisition'] === 'video') {
-            $mediaType = 'video';
-        }
-
-        $files = [];
-        if (array_key_exists('image-set-items', $yaml)) {
-            $files = $this->parseIfdoItems($header, $yaml['image-set-items']);
-        }
-
-        return [
-            'name' => $header['image-set-name'],
-            'handle' => $header['image-set-handle'],
-            'uuid' => $header['image-set-uuid'],
-            'url' => $url,
-            'media_type' => $mediaType,
-            'files' => $files,
-        ];
-    }
-
-    /**
-     * Parse a volume metadata iFDO YAML file to an array.
-     *
-     * @param UploadedFile $file
-     *
-     * @return array
-     */
-    public function parseIfdoFile(UploadedFile $file)
-    {
-        return $this->parseIfdo($file->get());
-    }
-
-    /**
-     * Parse iFDO image-set-items to a CSV-like metadata array that can be parsed by
-     * `parseMetadata` if converted to a string.
-     *
-     * @param array $header iFDO image-set-header
-     * @param array $items iFDO image-set-items. Passed by reference so potentially huge arrays are not copied.
-     *
-     * @return array
-     */
-    protected function parseIfdoItems($header, &$items)
-    {
-        $fields = [];
-        $rows = [];
-        $reverseFieldMap = array_flip($this->ifdoFieldMap);
-
-        if (array_key_exists('image-depth', $header)) {
-            $header['image-altitude'] = -1 * $header['image-depth'];
-        }
-
-        $leftToCheck = $this->ifdoFieldMap;
-
-        // Add all metadata fields present in header.
-        foreach ($leftToCheck as $ifdoField => $csvField) {
-            if (array_key_exists($ifdoField, $header)) {
-                $fields[] = $csvField;
-                unset($leftToCheck[$ifdoField]);
-            }
-        }
-
-        // Normalize image-set-items entries. An entry can be either a list (e.g. for a
-        // video) or an object (e.g. for an image). But an image could be a list with a
-        // single entry, too.
-        foreach ($items as &$item) {
-            if (!is_array($item)) {
-                $item = [null];
-            } elseif (!array_key_exists(0, $item)) {
-                $item = [$item];
-            }
-        }
-
-        // Convert item depth to altitude.
-        // Also add all metadata fields present in items (stop early).
-        foreach ($items as &$subItems) {
-            foreach ($subItems as &$subItem) {
-                if (empty($subItem)) {
-                    continue;
-                }
-
-                if (array_key_exists('image-depth', $subItem)) {
-                    $subItem['image-altitude'] = -1 * $subItem['image-depth'];
-                    // Save some memory for potentially huge arrays.
-                    unset($subItem['image-depth']);
-                }
-
-                foreach ($leftToCheck as $ifdoField => $csvField) {
-                    if (array_key_exists($ifdoField, $subItem)) {
-                        $fields[] = $csvField;
-                        unset($leftToCheck[$ifdoField]);
-                        if (empty($leftToCheck)) {
-                            break;
-                        }
-                    }
-                }
-            }
-            unset($subItem); // Important to destroy by-reference variable after the loop!
-        }
-        unset($subItems); // Important to destroy by-reference variable after the loop!
-
-        sort($fields);
-
-        foreach ($items as $filename => $subItems) {
-            $defaults = [];
-            foreach ($subItems as $index => $subItem) {
-                if ($index === 0 && is_array($subItem)) {
-                    $defaults = $subItem;
-                }
-
-                $row = [$filename];
-                foreach ($fields as $field) {
-                    $ifdoField = $reverseFieldMap[$field];
-                    if (is_array($subItem) && array_key_exists($ifdoField, $subItem)) {
-                        // Take field value of subItem if it is given.
-                        $row[] = $subItem[$ifdoField];
-                    } elseif (array_key_exists($ifdoField, $defaults)) {
-                        // Otherwise fall back to the defaults of the first subItem.
-                        $row[] = $defaults[$ifdoField];
-                    } elseif (array_key_exists($ifdoField, $header)) {
-                        // Otherwise fall back to the defaults of the header.
-                        $row[] = $header[$ifdoField];
-                    } else {
-                        $row[] = '';
-                    }
-                }
-
-                $rows[] = $row;
-            }
-        }
-
-        // Add this only not because it should not be included in sort earlier and it is
-        // should be skipped in the loop above.
-        array_unshift($fields, 'filename');
-        array_unshift($rows, $fields);
-
-        return $rows;
-    }
-
-    /**
-     * Determine if a value is a valid handle.
-     *
-     * @param string $value
-     *
-     * @return boolean
-     */
-    protected function isValidHandle($value)
-    {
-        return preg_match('/[^\/]+\/[^\/]/', $value);
-    }
-}
diff --git a/tests/php/Traits/ParsesMetadataTest.php b/tests/php/Traits/ParsesMetadataTest.php
deleted file mode 100644
index ea3d08d20..000000000
--- a/tests/php/Traits/ParsesMetadataTest.php
+++ /dev/null
@@ -1,493 +0,0 @@
-<?php
-
-namespace Biigle\Tests\Traits;
-
-use Biigle\Traits\ParsesMetadata;
-use Exception;
-use Illuminate\Http\UploadedFile;
-use TestCase;
-
-class ParsesMetadataTest extends TestCase
-{
-    public function testParseMetadataOk()
-    {
-        $stub = new ParsesMetadataStub;
-        $input = "filename,taken_at,lng,lat,gps_altitude,distance_to_ground,area,yaw\nabc.jpg,2016-12-19 12:27:00,52.220,28.123,-1500,10,2.6,180";
-        $expect = [
-            ['filename', 'taken_at', 'lng', 'lat', 'gps_altitude', 'distance_to_ground', 'area', 'yaw'],
-            ['abc.jpg', '2016-12-19 12:27:00', '52.220', '28.123', '-1500', '10', '2.6', '180'],
-        ];
-        $this->assertEquals($expect, $stub->parseMetadata($input));
-    }
-
-    public function testParseMetadataCaseInsensitive()
-    {
-        $stub = new ParsesMetadataStub;
-        $input = "Filename,tAken_at,lnG,Lat,gPs_altitude,diStance_to_ground,areA\nabc.jpg,2016-12-19 12:27:00,52.220,28.123,-1500,10,2.6";
-        $expect = [
-            ['filename', 'taken_at', 'lng', 'lat', 'gps_altitude', 'distance_to_ground', 'area'],
-            ['abc.jpg', '2016-12-19 12:27:00', '52.220', '28.123', '-1500', '10', '2.6'],
-        ];
-        $this->assertEquals($expect, $stub->parseMetadata($input));
-    }
-
-    public function testParseMetadataSynonyms1()
-    {
-        $stub = new ParsesMetadataStub;
-        $input = "file,lon,lat,heading\nabc.jpg,52.220,28.123,180";
-        $expect = [
-            ['filename', 'lng', 'lat', 'yaw'],
-            ['abc.jpg', '52.220', '28.123', '180'],
-        ];
-        $this->assertEquals($expect, $stub->parseMetadata($input));
-    }
-
-    public function testParseMetadataSynonyms2()
-    {
-        $stub = new ParsesMetadataStub;
-        $input = "file,longitude,latitude\nabc.jpg,52.220,28.123";
-        $expect = [
-            ['filename', 'lng', 'lat'],
-            ['abc.jpg', '52.220', '28.123'],
-        ];
-        $this->assertEquals($expect, $stub->parseMetadata($input));
-    }
-
-    public function testParseMetadataSynonyms3()
-    {
-        $stub = new ParsesMetadataStub;
-        $input = "filename,SUB_datetime,SUB_longitude,SUB_latitude,SUB_altitude,SUB_distance,area,SUB_heading\nabc.jpg,2016-12-19 12:27:00,52.220,28.123,-1500,10,2.6,180";
-        $expect = [
-            ['filename', 'taken_at', 'lng', 'lat', 'gps_altitude', 'distance_to_ground', 'area', 'yaw'],
-            ['abc.jpg', '2016-12-19 12:27:00', '52.220', '28.123', '-1500', '10', '2.6', '180'],
-        ];
-        $this->assertEquals($expect, $stub->parseMetadata($input));
-    }
-
-    public function testParseMetadataEmptyCells()
-    {
-        $stub = new ParsesMetadataStub;
-        $input = "filename,taken_at,lng,lat,gps_altitude,distance_to_ground,area,yaw\nabc.jpg,,52.220,28.123,,,,";
-        $expect = [
-            ['filename', 'taken_at', 'lng', 'lat', 'gps_altitude', 'distance_to_ground', 'area', 'yaw'],
-            ['abc.jpg', '', '52.220', '28.123', '', '', '', ''],
-        ];
-        $this->assertEquals($expect, $stub->parseMetadata($input));
-    }
-
-    public function testParseMetadataFile()
-    {
-        $stub = new ParsesMetadataStub;
-        $csv = __DIR__."/../../files/image-metadata.csv";
-        $file = new UploadedFile($csv, 'metadata.csv', 'text/csv', null, true);
-        $expect = [
-            ['filename', 'taken_at', 'lng', 'lat', 'gps_altitude', 'distance_to_ground', 'area', 'yaw'],
-            ['abc.jpg', '2016-12-19 12:27:00', '52.220', '28.123', '-1500', '10', '2.6', '180'],
-        ];
-        $this->assertEquals($expect, $stub->parseMetadataFile($file));
-    }
-
-    public function testParseMetadataFileBOM()
-    {
-        $stub = new ParsesMetadataStub;
-        $csv = __DIR__."/../../files/image-metadata-with-bom.csv";
-        $file = new UploadedFile($csv, 'metadata.csv', 'text/csv', null, true);
-        $expect = [
-            ['filename', 'taken_at', 'lng', 'lat', 'gps_altitude', 'distance_to_ground', 'area', 'yaw'],
-            ['abc.jpg', '2016-12-19 12:27:00', '52.220', '28.123', '-1500', '10', '2.6', '180'],
-        ];
-        $this->assertEquals($expect, $stub->parseMetadataFile($file));
-    }
-
-    public function testParseIfdo()
-    {
-        $stub = new ParsesMetadataStub;
-        $input = <<<IFDO
-image-set-header:
-    image-set-name: myvolume
-    image-set-handle: 20.500.12085/d7546c4b-307f-4d42-8554-33236c577450
-    image-set-uuid: d7546c4b-307f-4d42-8554-33236c577450
-image-set-items:
-    myimage.jpg:
-IFDO;
-        $expect = [
-            'name' => 'myvolume',
-            'url' => '',
-            'handle' => '20.500.12085/d7546c4b-307f-4d42-8554-33236c577450',
-            'media_type' => 'image',
-            'uuid' => 'd7546c4b-307f-4d42-8554-33236c577450',
-            'files' => [
-                ['filename'],
-                ['myimage.jpg'],
-            ],
-        ];
-        $this->assertEquals($expect, $stub->parseIfdo($input));
-    }
-
-    public function testParseIfdoHeader()
-    {
-        $stub = new ParsesMetadataStub;
-        $input = <<<IFDO
-image-set-header:
-    image-set-name: myvolume
-    image-set-handle: 20.500.12085/d7546c4b-307f-4d42-8554-33236c577450
-    image-set-uuid: d7546c4b-307f-4d42-8554-33236c577450
-    image-set-data-handle: 20.500.12085/d7546c4b-307f-4d42-8554-33236c577450@data
-    image-set-acquisition: photo
-    image-latitude: 11.8581802
-    image-longitude: -117.0214864
-    image-meters-above-ground: 2
-    image-area-square-meter: 5.0
-    image-datetime: '2019-04-06 04:29:27.000000'
-    image-depth: 2248.0
-    image-camera-yaw-degrees: 20
-image-set-items:
-    myimage.jpg:
-IFDO;
-        $expect = [
-            'name' => 'myvolume',
-            'url' => 'https://hdl.handle.net/20.500.12085/d7546c4b-307f-4d42-8554-33236c577450@data',
-            'handle' => '20.500.12085/d7546c4b-307f-4d42-8554-33236c577450',
-            'media_type' => 'image',
-            'uuid' => 'd7546c4b-307f-4d42-8554-33236c577450',
-            'files' => [
-                ['filename', 'area', 'distance_to_ground', 'gps_altitude', 'lat', 'lng', 'taken_at', 'yaw'],
-                ['myimage.jpg', '5.0', '2', '-2248.0', '11.8581802', '-117.0214864', '2019-04-06 04:29:27.000000', '20'],
-            ],
-        ];
-        $this->assertEquals($expect, $stub->parseIfdo($input));
-    }
-
-    public function testParseIfdoVideoType()
-    {
-        $stub = new ParsesMetadataStub;
-        $input = <<<IFDO
-image-set-header:
-    image-set-name: myvolume
-    image-set-handle: 20.500.12085/d7546c4b-307f-4d42-8554-33236c577450
-    image-set-uuid: d7546c4b-307f-4d42-8554-33236c577450
-    image-acquisition: video
-image-set-items:
-    myvideo.mp4:
-IFDO;
-        $expect = [
-            'name' => 'myvolume',
-            'url' => '',
-            'handle' => '20.500.12085/d7546c4b-307f-4d42-8554-33236c577450',
-            'media_type' => 'video',
-            'uuid' => 'd7546c4b-307f-4d42-8554-33236c577450',
-            'files' => [
-                ['filename'],
-                ['myvideo.mp4'],
-            ],
-        ];
-        $this->assertEquals($expect, $stub->parseIfdo($input));
-    }
-
-    public function testParseIfdoSlideIsImageType()
-    {
-        $stub = new ParsesMetadataStub;
-        $input = <<<IFDO
-image-set-header:
-    image-set-name: myvolume
-    image-set-handle: 20.500.12085/d7546c4b-307f-4d42-8554-33236c577450
-    image-set-uuid: d7546c4b-307f-4d42-8554-33236c577450
-    image-set-acquisition: slide
-image-set-items:
-    myimage.jpg:
-IFDO;
-        $expect = [
-            'name' => 'myvolume',
-            'url' => '',
-            'handle' => '20.500.12085/d7546c4b-307f-4d42-8554-33236c577450',
-            'media_type' => 'image',
-            'uuid' => 'd7546c4b-307f-4d42-8554-33236c577450',
-            'files' => [
-                ['filename'],
-                ['myimage.jpg'],
-            ],
-        ];
-        $this->assertEquals($expect, $stub->parseIfdo($input));
-    }
-
-    public function testParseIfdoItems()
-    {
-        $stub = new ParsesMetadataStub;
-        $input = <<<IFDO
-image-set-header:
-    image-set-name: myvolume
-    image-set-handle: 20.500.12085/d7546c4b-307f-4d42-8554-33236c577450
-    image-set-uuid: d7546c4b-307f-4d42-8554-33236c577450
-image-set-items:
-    myimage.jpg:
-        image-latitude: 11.8581802
-        image-longitude: -117.0214864
-        image-meters-above-ground: 2
-        image-area-square-meter: 5.0
-        image-datetime: '2019-04-06 04:29:27.000000'
-        image-depth: 2248.0
-        image-camera-yaw-degrees: 20
-IFDO;
-        $expect = [
-            'name' => 'myvolume',
-            'url' => '',
-            'handle' => '20.500.12085/d7546c4b-307f-4d42-8554-33236c577450',
-            'media_type' => 'image',
-            'uuid' => 'd7546c4b-307f-4d42-8554-33236c577450',
-            'files' => [
-                ['filename', 'area', 'distance_to_ground', 'gps_altitude', 'lat', 'lng', 'taken_at', 'yaw'],
-                ['myimage.jpg', '5.0', '2', '-2248.0', '11.8581802', '-117.0214864', '2019-04-06 04:29:27.000000', '20'],
-            ],
-        ];
-        $this->assertEquals($expect, $stub->parseIfdo($input));
-    }
-
-    public function testParseIfdoImageArrayItems()
-    {
-        $stub = new ParsesMetadataStub;
-        $input = <<<IFDO
-image-set-header:
-    image-set-name: myvolume
-    image-set-handle: 20.500.12085/d7546c4b-307f-4d42-8554-33236c577450
-    image-set-uuid: d7546c4b-307f-4d42-8554-33236c577450
-image-set-items:
-    myimage.jpg:
-        - image-latitude: 11.8581802
-          image-longitude: -117.0214864
-          image-meters-above-ground: 2
-          image-area-square-meter: 5.0
-          image-datetime: '2019-04-06 04:29:27.000000'
-          image-depth: 2248.0
-          image-camera-yaw-degrees: 20
-IFDO;
-        $expect = [
-            'name' => 'myvolume',
-            'url' => '',
-            'handle' => '20.500.12085/d7546c4b-307f-4d42-8554-33236c577450',
-            'media_type' => 'image',
-            'uuid' => 'd7546c4b-307f-4d42-8554-33236c577450',
-            'files' => [
-                ['filename', 'area', 'distance_to_ground', 'gps_altitude', 'lat', 'lng', 'taken_at', 'yaw'],
-                ['myimage.jpg', '5.0', '2', '-2248.0', '11.8581802', '-117.0214864', '2019-04-06 04:29:27.000000', '20'],
-            ],
-        ];
-        $this->assertEquals($expect, $stub->parseIfdo($input));
-    }
-
-    public function testParseIfdoItemsOverrideHeader()
-    {
-        $stub = new ParsesMetadataStub;
-        $input = <<<IFDO
-image-set-header:
-    image-set-name: myvolume
-    image-set-handle: 20.500.12085/d7546c4b-307f-4d42-8554-33236c577450
-    image-set-uuid: d7546c4b-307f-4d42-8554-33236c577450
-    image-latitude: 11.8581802
-    image-longitude: -117.0214864
-    image-meters-above-ground: 2
-    image-area-square-meter: 5.0
-    image-datetime: '2019-04-06 04:29:27.000000'
-    image-depth: 2248.0
-    image-camera-yaw-degrees: 20
-image-set-items:
-    myimage.jpg:
-        image-meters-above-ground: 3
-        image-area-square-meter: 5.1
-        image-datetime: '2019-04-06 05:29:27.000000'
-IFDO;
-        $expect = [
-            'name' => 'myvolume',
-            'url' => '',
-            'handle' => '20.500.12085/d7546c4b-307f-4d42-8554-33236c577450',
-            'media_type' => 'image',
-            'uuid' => 'd7546c4b-307f-4d42-8554-33236c577450',
-            'files' => [
-                ['filename', 'area', 'distance_to_ground', 'gps_altitude', 'lat', 'lng', 'taken_at', 'yaw'],
-                ['myimage.jpg', '5.1', '3', '-2248.0', '11.8581802', '-117.0214864', '2019-04-06 05:29:27.000000', '20'],
-            ],
-        ];
-        $this->assertEquals($expect, $stub->parseIfdo($input));
-    }
-
-    public function testParseIfdoSubItemsOverrideDefaultsAndHeader()
-    {
-        $stub = new ParsesMetadataStub;
-        $input = <<<IFDO
-image-set-header:
-    image-set-name: myvolume
-    image-set-handle: 20.500.12085/d7546c4b-307f-4d42-8554-33236c577450
-    image-set-uuid: d7546c4b-307f-4d42-8554-33236c577450
-    image-latitude: 11.8581802
-    image-longitude: -117.0214864
-    image-meters-above-ground: 2
-    image-area-square-meter: 5.0
-    image-datetime: '2019-04-06 04:29:27.000000'
-    image-depth: 2248.0
-    image-camera-yaw-degrees: 20
-    image-acquisition: video
-image-set-items:
-    myvideo.mp4:
-        - image-meters-above-ground: 3
-          image-area-square-meter: 5.1
-          image-datetime: '2019-04-06 05:29:27.000000'
-        - image-meters-above-ground: 4
-          image-datetime: '2019-04-06 05:30:27.000000'
-IFDO;
-        $expect = [
-            'name' => 'myvolume',
-            'url' => '',
-            'handle' => '20.500.12085/d7546c4b-307f-4d42-8554-33236c577450',
-            'media_type' => 'video',
-            'uuid' => 'd7546c4b-307f-4d42-8554-33236c577450',
-            'files' => [
-                ['filename', 'area', 'distance_to_ground', 'gps_altitude', 'lat', 'lng', 'taken_at', 'yaw'],
-                ['myvideo.mp4', '5.1', '3', '-2248.0', '11.8581802', '-117.0214864', '2019-04-06 05:29:27.000000', '20'],
-                ['myvideo.mp4', '5.1', '4', '-2248.0', '11.8581802', '-117.0214864', '2019-04-06 05:30:27.000000', '20'],
-            ],
-        ];
-        $this->assertEquals($expect, $stub->parseIfdo($input));
-    }
-
-    public function testParseIfdoFile()
-    {
-        $stub = new ParsesMetadataStub;
-        $path = __DIR__."/../../files/image-ifdo.yaml";
-        $file = new UploadedFile($path, 'ifdo.yaml', 'application/yaml', null, true);
-        $expect = [
-            'name' => 'SO268 SO268-2_100-1_OFOS SO_CAM-1_Photo_OFOS',
-            'url' => 'https://hdl.handle.net/20.500.12085/d7546c4b-307f-4d42-8554-33236c577450@data',
-            'handle' => '20.500.12085/d7546c4b-307f-4d42-8554-33236c577450',
-            'media_type' => 'image',
-            'uuid' => 'd7546c4b-307f-4d42-8554-33236c577450',
-            'files' => [
-                ['filename', 'area', 'distance_to_ground', 'gps_altitude', 'lat', 'lng', 'taken_at', 'yaw'],
-                ['SO268-2_100-1_OFOS_SO_CAM-1_20190406_042927.JPG', '5.0', '2', '-2248.0', '11.8581802', '-117.0214864', '2019-04-06 04:29:27.000000', '20'],
-                ['SO268-2_100-1_OFOS_SO_CAM-1_20190406_052726.JPG', '5.1', '2.1', '-4129.6', '11.8582192', '-117.0214286', '2019-04-06 05:27:26.000000', '21'],
-            ],
-        ];
-        $this->assertEquals($expect, $stub->parseIfdoFile($file));
-    }
-
-    public function testParseIfdoNoHeader()
-    {
-        $stub = new ParsesMetadataStub;
-        $input = <<<IFDO
-image-set-items:
-    myimage.jpg:
-IFDO;
-
-        $this->expectException(Exception::class);
-        $stub->parseIfdo($input);
-    }
-
-    public function testParseIfdoNoItems()
-    {
-        $stub = new ParsesMetadataStub;
-        $input = <<<IFDO
-image-set-header:
-    image-set-name: myvolume
-    image-set-handle: 20.500.12085/d7546c4b-307f-4d42-8554-33236c577450
-    image-set-uuid: d7546c4b-307f-4d42-8554-33236c577450
-IFDO;
-        $expect = [
-            'name' => 'myvolume',
-            'url' => '',
-            'handle' => '20.500.12085/d7546c4b-307f-4d42-8554-33236c577450',
-            'media_type' => 'image',
-            'uuid' => 'd7546c4b-307f-4d42-8554-33236c577450',
-            'files' => [],
-        ];
-        $this->assertEquals($expect, $stub->parseIfdo($input));
-    }
-
-    public function testParseIfdoNoName()
-    {
-        $stub = new ParsesMetadataStub;
-        $input = <<<IFDO
-image-set-header:
-    image-set-handle: 20.500.12085/d7546c4b-307f-4d42-8554-33236c577450
-    image-set-uuid: d7546c4b-307f-4d42-8554-33236c577450
-IFDO;
-
-        $this->expectException(Exception::class);
-        $stub->parseIfdo($input);
-    }
-
-    public function testParseIfdoNoHandle()
-    {
-        $stub = new ParsesMetadataStub;
-        $input = <<<IFDO
-image-set-header:
-    image-set-name: myvolume
-    image-set-uuid: d7546c4b-307f-4d42-8554-33236c577450
-IFDO;
-
-        $this->expectException(Exception::class);
-        $stub->parseIfdo($input);
-    }
-
-    public function testParseIfdoNoUuid()
-    {
-        $stub = new ParsesMetadataStub;
-        $input = <<<IFDO
-image-set-header:
-    image-set-name: myvolume
-    image-set-handle: 20.500.12085/d7546c4b-307f-4d42-8554-33236c577450
-IFDO;
-
-        $this->expectException(Exception::class);
-        $stub->parseIfdo($input);
-    }
-
-    public function testParseIfdoInvalidHandle()
-    {
-        $stub = new ParsesMetadataStub;
-        $input = <<<IFDO
-image-set-header:
-    image-set-name: myvolume
-    image-set-handle: abc
-    image-set-uuid: d7546c4b-307f-4d42-8554-33236c577450
-IFDO;
-
-        $this->expectException(Exception::class);
-        $stub->parseIfdo($input);
-    }
-
-    public function testParseIfdoInvalidDataHandle()
-    {
-        $stub = new ParsesMetadataStub;
-        $input = <<<IFDO
-image-set-header:
-    image-set-name: myvolume
-    image-set-handle: 20.500.12085/d7546c4b-307f-4d42-8554-33236c577450
-    image-set-uuid: d7546c4b-307f-4d42-8554-33236c577450
-    image-set-data-handle: abc
-IFDO;
-
-        $this->expectException(Exception::class);
-        $stub->parseIfdo($input);
-    }
-
-    public function testParseIfdoInvalidYaml()
-    {
-        $stub = new ParsesMetadataStub;
-        $input = <<<IFDO
-image-set-header:!!
-IFDO;
-
-        $this->expectException(Exception::class);
-        $stub->parseIfdo($input);
-    }
-
-    public function testParseIfdoNoYamlArray()
-    {
-        $stub = new ParsesMetadataStub;
-        $this->expectException(Exception::class);
-        $stub->parseIfdo('abc123');
-    }
-}
-
-class ParsesMetadataStub
-{
-    use ParsesMetadata;
-}

From c05bc0b724745b86224d1eed420aba479f3e9e3a Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Mon, 11 Mar 2024 16:21:30 +0100
Subject: [PATCH 020/209] Remove ParseIfdoController

---
 .../Api/ProjectVolumeController.php           |  5 --
 .../Api/Volumes/ParseIfdoController.php       | 29 ---------
 app/Http/Requests/StoreParseIfdo.php          | 61 -------------------
 routes/api.php                                |  4 --
 .../Api/Volumes/ParseIfdoControllerTest.php   | 41 -------------
 5 files changed, 140 deletions(-)
 delete mode 100644 app/Http/Controllers/Api/Volumes/ParseIfdoController.php
 delete mode 100644 app/Http/Requests/StoreParseIfdo.php
 delete mode 100644 tests/php/Http/Controllers/Api/Volumes/ParseIfdoControllerTest.php

diff --git a/app/Http/Controllers/Api/ProjectVolumeController.php b/app/Http/Controllers/Api/ProjectVolumeController.php
index 9e7dfc49b..14112f77a 100644
--- a/app/Http/Controllers/Api/ProjectVolumeController.php
+++ b/app/Http/Controllers/Api/ProjectVolumeController.php
@@ -64,7 +64,6 @@ public function index($id)
      * @apiParam (Optional attributes) {String} handle Handle or DOI of the dataset that is represented by the new volume.
      * @apiParam (Optional attributes) {String} metadata_text CSV-like string with file metadata. See "metadata columns" for the possible columns. Each column may occur only once. There must be at least one column other than `filename`. For video metadata, multiple rows can contain metadata from different times of the same video. In this case, the `filename` of the rows must match and each row needs a (different) `taken_at` timestamp.
      * @apiParam (Optional attributes) {File} metadata_csv Alternative to `metadata_text`. This field allows the upload of an actual CSV file. See `metadata_text` for the further description.
-     * @apiParam (Optional attributes) {File} ifdo_file iFDO metadata file to upload and link with the volume. The metadata of this file is not used for the volume or volume files. Use `metadata_text` or `metadata_csv` for this.
      *
      * @apiParam (metadata columns) {String} filename The filename of the file the metadata belongs to. This column is required.
      * @apiParam (metadata columns) {String} taken_at The date and time where the file was taken. Example: `2016-12-19 12:49:00`
@@ -127,10 +126,6 @@ public function store(StoreVolume $request)
                 Queue::connection('sync')->push($job);
             }
 
-            if ($request->hasFile('ifdo_file')) {
-                $volume->saveIfdo($request->file('ifdo_file'));
-            }
-
             // media type shouldn't be returned
             unset($volume->media_type);
 
diff --git a/app/Http/Controllers/Api/Volumes/ParseIfdoController.php b/app/Http/Controllers/Api/Volumes/ParseIfdoController.php
deleted file mode 100644
index 6a325a90a..000000000
--- a/app/Http/Controllers/Api/Volumes/ParseIfdoController.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Biigle\Http\Controllers\Api\Volumes;
-
-use Biigle\Http\Controllers\Api\Controller;
-use Biigle\Http\Requests\StoreParseIfdo;
-
-class ParseIfdoController extends Controller
-{
-    /**
-     * parse an iFDO file
-     *
-     * @api {post} volumes/parse-ifdo Parse an iFDO file
-     * @apiGroup Volumes
-     * @apiName StoreVolumeIfdo
-     * @apiPermission user
-     * @apiDescription This endpoint parses an iFDO file (https://marine-imaging.com/fair) and returns the content that can be imported in BIIGLE as a new volume, formatted as JSON.
-     *
-     * @apiParam (Required attributes) {File} file iFDO file in YAML format (maximum size 500 MB).
-     *
-     * @param StoreParseIfdo $request
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function store(StoreParseIfdo $request)
-    {
-        return $request->metadata;
-    }
-}
diff --git a/app/Http/Requests/StoreParseIfdo.php b/app/Http/Requests/StoreParseIfdo.php
deleted file mode 100644
index faea4af2e..000000000
--- a/app/Http/Requests/StoreParseIfdo.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace Biigle\Http\Requests;
-
-use Biigle\Traits\ParsesMetadata;
-use Exception;
-use Illuminate\Foundation\Http\FormRequest;
-
-class StoreParseIfdo extends FormRequest
-{
-    use ParsesMetadata;
-
-    /**
-     * The parsed metadata.
-     *
-     * @var array
-     */
-    public $metadata;
-
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            // Allow a maximum of 500 MB.
-            'file' => 'required|file|max:500000',
-        ];
-    }
-
-    /**
-     * Configure the validator instance.
-     *
-     * @param  \Illuminate\Validation\Validator  $validator
-     * @return void
-     */
-    public function withValidator($validator)
-    {
-        $validator->after(function ($validator) {
-            if ($this->hasFile('file')) {
-                try {
-                    $this->metadata = $this->parseIfdoFile($this->file('file'));
-                } catch (Exception $e) {
-                    $validator->errors()->add('file', $e->getMessage());
-                }
-            }
-        });
-    }
-}
diff --git a/routes/api.php b/routes/api.php
index 4cafd5ab0..420e6592c 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -315,10 +315,6 @@
         $router->get('videos/{disk}', 'BrowserController@indexVideos');
     });
 
-    $router->post('parse-ifdo', [
-        'uses' => 'ParseIfdoController@store',
-    ]);
-
     $router->get('{id}/files/filter/labels', [
         'uses' => 'Filters\AnyFileLabelController@index',
     ]);
diff --git a/tests/php/Http/Controllers/Api/Volumes/ParseIfdoControllerTest.php b/tests/php/Http/Controllers/Api/Volumes/ParseIfdoControllerTest.php
deleted file mode 100644
index cb7edc016..000000000
--- a/tests/php/Http/Controllers/Api/Volumes/ParseIfdoControllerTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace Biigle\Tests\Http\Controllers\Api\Volumes;
-
-use ApiTestCase;
-use Illuminate\Http\UploadedFile;
-
-class ParseIfdoControllerTest extends ApiTestCase
-{
-    public function testStore()
-    {
-        $this->doTestApiRoute('POST', "/api/v1/volumes/parse-ifdo");
-
-        $this->beUser();
-        $this->postJson("/api/v1/volumes/parse-ifdo")
-            ->assertStatus(422);
-
-        $file = new UploadedFile(__DIR__."/../../../../../files/image-metadata.csv", 'metadata.csv', 'text/csv', null, true);
-
-        $this->postJson("/api/v1/volumes/parse-ifdo", ['file' => $file])
-            ->assertStatus(422);
-
-        $file = new UploadedFile(__DIR__."/../../../../../files/image-ifdo.yaml", 'ifdo.yaml', 'application/yaml', null, true);
-        $expect = [
-            'name' => 'SO268 SO268-2_100-1_OFOS SO_CAM-1_Photo_OFOS',
-            'url' => 'https://hdl.handle.net/20.500.12085/d7546c4b-307f-4d42-8554-33236c577450@data',
-            'handle' => '20.500.12085/d7546c4b-307f-4d42-8554-33236c577450',
-            'uuid' => 'd7546c4b-307f-4d42-8554-33236c577450',
-            'media_type' => 'image',
-            'files' => [
-                ['filename', 'area', 'distance_to_ground', 'gps_altitude', 'lat', 'lng', 'taken_at', 'yaw'],
-                ['SO268-2_100-1_OFOS_SO_CAM-1_20190406_042927.JPG', 5.0, 2, -2248.0, 11.8581802, -117.0214864, '2019-04-06 04:29:27.000000', 20],
-                ['SO268-2_100-1_OFOS_SO_CAM-1_20190406_052726.JPG', 5.1, 2.1, -4129.6, 11.8582192, -117.0214286, '2019-04-06 05:27:26.000000', 21],
-            ],
-        ];
-
-        $this->postJson("/api/v1/volumes/parse-ifdo", ['file' => $file])
-            ->assertStatus(200)
-            ->assertExactJson($expect);
-    }
-}

From 6b66cb99e0e6a7ce5b8c74d7a405abe528d0b764 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Mon, 11 Mar 2024 16:21:53 +0100
Subject: [PATCH 021/209] Implement 500MB file size for volume metadata files

---
 app/Http/Requests/StorePendingVolume.php  | 3 ++-
 app/Http/Requests/StoreVolume.php         | 3 +--
 app/Http/Requests/StoreVolumeMetadata.php | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Http/Requests/StorePendingVolume.php b/app/Http/Requests/StorePendingVolume.php
index a267f6d40..a58286e46 100644
--- a/app/Http/Requests/StorePendingVolume.php
+++ b/app/Http/Requests/StorePendingVolume.php
@@ -31,7 +31,8 @@ public function rules(): array
     {
         return [
             'media_type' => ['required', Rule::in(array_keys(MediaType::INSTANCES))],
-            'metadata_file' => ['file'],
+            // Allow a maximum of 500 MB.
+            'metadata_file' => 'file|max:500000',
         ];
     }
 
diff --git a/app/Http/Requests/StoreVolume.php b/app/Http/Requests/StoreVolume.php
index f8b1ef3cd..9560f3f96 100644
--- a/app/Http/Requests/StoreVolume.php
+++ b/app/Http/Requests/StoreVolume.php
@@ -70,8 +70,7 @@ public function rules()
                 'array',
             ],
             'handle' => ['nullable', 'max:256', new Handle],
-            'metadata_csv' => 'file|mimetypes:text/plain,text/csv,application/csv',
-            'ifdo_file' => 'file',
+            'metadata_csv' => 'file|mimetypes:text/plain,text/csv,application/csv|max:500000',
             // Do not validate the maximum filename length with a 'files.*' rule because
             // this leads to a request timeout when the rule is expanded for a huge
             // number of files. This is checked in the VolumeFiles rule below.
diff --git a/app/Http/Requests/StoreVolumeMetadata.php b/app/Http/Requests/StoreVolumeMetadata.php
index 3cc7fe2bc..90fec22d8 100644
--- a/app/Http/Requests/StoreVolumeMetadata.php
+++ b/app/Http/Requests/StoreVolumeMetadata.php
@@ -44,6 +44,7 @@ public function rules()
                 'required_without_all:metadata_text,ifdo_file',
                 'file',
                 'mimetypes:text/plain,text/csv,application/csv',
+                'max:500000',
                 new Utf8,
             ],
             'metadata_text' => 'required_without_all:metadata_csv,ifdo_file',

From a740de75925860a55352cfc8c88f18521110a2b2 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Mon, 11 Mar 2024 17:02:40 +0100
Subject: [PATCH 022/209] WIP Implement getInsertData for file metadata classes

---
 app/Services/MetadataParsing/FileMetadata.php |   8 ++
 .../MetadataParsing/ImageMetadata.php         |  44 ++++++++
 .../MetadataParsing/ImageMetadataTest.php     |  31 ++++++
 .../MetadataParsing/VideoMetadataTest.php     | 103 ++++++++++++++++++
 4 files changed, 186 insertions(+)

diff --git a/app/Services/MetadataParsing/FileMetadata.php b/app/Services/MetadataParsing/FileMetadata.php
index 9ccdf5d40..1f4cfa778 100644
--- a/app/Services/MetadataParsing/FileMetadata.php
+++ b/app/Services/MetadataParsing/FileMetadata.php
@@ -13,4 +13,12 @@ public function isEmpty(): bool
     {
         return true;
     }
+
+    /**
+     * Get the array of metadata that can be used for Model::insert();
+     */
+    public function getInsertData(): array
+    {
+        return [];
+    }
 }
diff --git a/app/Services/MetadataParsing/ImageMetadata.php b/app/Services/MetadataParsing/ImageMetadata.php
index 36920aef8..783d276fe 100644
--- a/app/Services/MetadataParsing/ImageMetadata.php
+++ b/app/Services/MetadataParsing/ImageMetadata.php
@@ -31,4 +31,48 @@ public function isEmpty(): bool
             && is_null($this->gpsAltitude)
             && is_null($this->yaw);
     }
+
+    /**
+     * Get the array of metadata that can be used for Model::insert();
+     */
+    public function getInsertData(): array
+    {
+        $data = ['filename' => $this->name];
+
+        if (!is_null($this->lat)) {
+            $data['lat'] = $this->lat;
+        }
+
+        if (!is_null($this->lng)) {
+            $data['lng'] = $this->lng;
+        }
+
+        if (!is_null($this->takenAt)) {
+            $data['taken_at'] = $this->takenAt;
+        }
+
+        $attrs = [];
+
+        if (!is_null($this->area)) {
+            $attrs['area'] = $this->area;
+        }
+
+        if (!is_null($this->distanceToGround)) {
+            $attrs['distance_to_ground'] = $this->distanceToGround;
+        }
+
+        if (!is_null($this->gpsAltitude)) {
+            $attrs['gps_altitude'] = $this->gpsAltitude;
+        }
+
+        if (!is_null($this->yaw)) {
+            $attrs['yaw'] = $this->yaw;
+        }
+
+        if (!empty($attrs)) {
+            $data['attrs'] = ['metadata' => $attrs];
+        }
+
+        return $data;
+    }
 }
diff --git a/tests/php/Services/MetadataParsing/ImageMetadataTest.php b/tests/php/Services/MetadataParsing/ImageMetadataTest.php
index aaa39f6a5..d7b049e3f 100644
--- a/tests/php/Services/MetadataParsing/ImageMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/ImageMetadataTest.php
@@ -15,4 +15,35 @@ public function testIsEmpty()
         $data = new ImageMetadata('filename', area: 10);
         $this->assertFalse($data->isEmpty());
     }
+
+    public function testGetInsertData()
+    {
+        $data = new ImageMetadata(
+            '1.jpg',
+            lat: 100,
+            lng: 120,
+            takenAt: '2024-03-11 16:43:00',
+            area: 2.5,
+            distanceToGround: 5,
+            gpsAltitude: -1500,
+            yaw: 50
+        );
+
+        $expect = [
+            'filename' => '1.jpg',
+            'lat' => 100,
+            'lng' => 120,
+            'taken_at' => '2024-03-11 16:43:00',
+            'attrs' => [
+                'metadata' => [
+                    'area' => 2.5,
+                    'distance_to_ground' => 5,
+                    'gps_altitude' => -1500,
+                    'yaw' => 50,
+                ],
+            ],
+        ];
+
+        $this->assertEquals($expect, $data->getInsertData());
+    }
 }
diff --git a/tests/php/Services/MetadataParsing/VideoMetadataTest.php b/tests/php/Services/MetadataParsing/VideoMetadataTest.php
index 7cc771962..488f7174c 100644
--- a/tests/php/Services/MetadataParsing/VideoMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/VideoMetadataTest.php
@@ -39,4 +39,107 @@ public function testAddFrame()
         $this->assertEquals('filename', $frame->name);
         $this->assertEquals('2023-12-12 20:26:00', $frame->takenAt);
     }
+
+    public function testGetInsertDataPlain()
+    {
+        $data = new VideoMetadata(
+            '1.mp4',
+            lat: 100,
+            lng: 120,
+            area: 2.5,
+            distanceToGround: 5,
+            gpsAltitude: -1500,
+            yaw: 50
+        );
+
+        $expect = [
+            'filename' => '1.mp4',
+            'lat' => [100],
+            'lng' => [120],
+            'attrs' => [
+                'metadata' => [
+                    'area' => [2.5],
+                    'distance_to_ground' => [5],
+                    'gps_altitude' => [-1500],
+                    'yaw' => [50],
+                ],
+            ],
+        ];
+
+        $this->assertEquals($expect, $data->getInsertData());
+    }
+
+    public function testGetInsertDataFrame()
+    {
+        $data = new VideoMetadata(
+            '1.mp4',
+            lat: 100,
+            lng: 120,
+            takenAt: '2024-03-11 16:43:00',
+            area: 2.5,
+            distanceToGround: 5,
+            gpsAltitude: -1500,
+            yaw: 50
+        );
+
+        $expect = [
+            'filename' => '1.mp4',
+            'lat' => [100],
+            'lng' => [120],
+            'taken_at' => ['2024-03-11 16:43:00'],
+            'attrs' => [
+                'metadata' => [
+                    'area' => [2.5],
+                    'distance_to_ground' => [5],
+                    'gps_altitude' => [-1500],
+                    'yaw' => [50],
+                ],
+            ],
+        ];
+
+        $this->assertEquals($expect, $data->getInsertData());
+    }
+
+    public function testGetInsertDataFrames()
+    {
+        $data = new VideoMetadata('1.mp4');
+
+        $data->addFrame(
+            '2024-03-11 16:44:00',
+            lat: 110,
+            lng: 130,
+            area: 3,
+            distanceToGround: 4,
+            gpsAltitude: -1501,
+            yaw: 51
+        );
+
+        $data->addFrame(
+            '2024-03-11 16:43:00',
+            lat: 100,
+            lng: 120,
+            area: 2.5,
+            distanceToGround: 5,
+            gpsAltitude: -1500,
+            yaw: 50
+        );
+
+        $expect = [
+            'filename' => '1.mp4',
+            'lat' => [100, 110],
+            'lng' => [120, 130],
+            // Metadata should be sorted by taken_at.
+            'taken_at' => ['2024-03-11 16:43:00', '2024-03-11 16:44:00'],
+            'attrs' => [
+                'metadata' => [
+                    'area' => [2.5, 3],
+                    'distance_to_ground' => [5, 4],
+                    'gps_altitude' => [-1500, -1501],
+                    'yaw' => [50, 51],
+                ],
+            ],
+        ];
+
+        $this->assertEquals($expect, $data->getInsertData());
+    }
 }

From c7a1f397baf142a1bc2534c6462f432e51a463db Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Tue, 12 Mar 2024 10:04:17 +0100
Subject: [PATCH 023/209] Implement getInsertData for VideoMetadata

---
 .../MetadataParsing/VideoMetadata.php         | 111 ++++++++++++++++++
 .../MetadataParsing/VideoMetadataTest.php     |  36 ++++++
 2 files changed, 147 insertions(+)

diff --git a/app/Services/MetadataParsing/VideoMetadata.php b/app/Services/MetadataParsing/VideoMetadata.php
index eba7df169..b3a5eb321 100644
--- a/app/Services/MetadataParsing/VideoMetadata.php
+++ b/app/Services/MetadataParsing/VideoMetadata.php
@@ -2,6 +2,7 @@
 
 namespace Biigle\Services\MetadataParsing;
 
+use Carbon\Carbon;
 use Illuminate\Support\Collection;
 
 class VideoMetadata extends FileMetadata
@@ -78,4 +79,114 @@ public function isEmpty(): bool
             && is_null($this->gpsAltitude)
             && is_null($this->yaw);
     }
+
+    /**
+     * Get the array of metadata that can be used for Model::insert();
+     */
+    public function getInsertData(): array
+    {
+        if ($this->frames->isEmpty()) {
+            return $this->getInsertDataPlain();
+        }
+
+        return $this->getInsertDataFrames();
+
+    }
+
+    /**
+     * Get the metadata insert array if no frames are present.
+     */
+    protected function getInsertDataPlain(): array
+    {
+        $data = ['filename' => $this->name];
+
+        if (!is_null($this->lat)) {
+            $data['lat'] = [$this->lat];
+        }
+
+        if (!is_null($this->lng)) {
+            $data['lng'] = [$this->lng];
+        }
+
+        if (!is_null($this->takenAt)) {
+            $data['taken_at'] = [$this->takenAt];
+        }
+
+        $attrs = [];
+
+        if (!is_null($this->area)) {
+            $attrs['area'] = [$this->area];
+        }
+
+        if (!is_null($this->distanceToGround)) {
+            $attrs['distance_to_ground'] = [$this->distanceToGround];
+        }
+
+        if (!is_null($this->gpsAltitude)) {
+            $attrs['gps_altitude'] = [$this->gpsAltitude];
+        }
+
+        if (!is_null($this->yaw)) {
+            $attrs['yaw'] = [$this->yaw];
+        }
+
+        if (!empty($attrs)) {
+            $data['attrs'] = ['metadata' => $attrs];
+        }
+
+        return $data;
+    }
+
+    /**
+     * Get the metadata insert array from all frames, sorted by taken_at.
+     * If one frame has data that another frame doesn't have, it is added as null.
+     */
+    protected function getInsertDataFrames(): array
+    {
+        $data = [
+            'lat' => [],
+            'lng' => [],
+            'taken_at' => [],
+        ];
+
+        $attrs = [
+            'area' => [],
+            'distance_to_ground' => [],
+            'gps_altitude' => [],
+            'yaw' => [],
+        ];
+
+        $sortedFrames = $this->frames->sort(fn ($a, $b) =>
+            Carbon::parse($a->takenAt)->gt($b->takenAt) ? 1 : -1
+        )->values();
+
+        foreach ($sortedFrames as $frame) {
+            $data['lat'][] = $frame->lat;
+            $data['lng'][] = $frame->lng;
+            $data['taken_at'][] = $frame->takenAt;
+
+            $attrs['area'][] = $frame->area;
+            $attrs['distance_to_ground'][] = $frame->distanceToGround;
+            $attrs['gps_altitude'][] = $frame->gpsAltitude;
+            $attrs['yaw'][] = $frame->yaw;
+        }
+
+        // Remove all items that are full of null.
+        $data = array_filter($data, function ($item) {
+            return !empty(array_filter($item, fn ($i) => !is_null($i)));
+        });
+
+        // Remove all items that are full of null.
+        $attrs = array_filter($attrs, function ($item) {
+            return !empty(array_filter($item, fn ($i) => !is_null($i)));
+        });
+
+        $data['filename'] = $this->name;
+
+        if (!empty($attrs)) {
+            $data['attrs'] = ['metadata' => $attrs];
+        }
+
+        return $data;
+    }
 }
diff --git a/tests/php/Services/MetadataParsing/VideoMetadataTest.php b/tests/php/Services/MetadataParsing/VideoMetadataTest.php
index 488f7174c..ab64e092b 100644
--- a/tests/php/Services/MetadataParsing/VideoMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/VideoMetadataTest.php
@@ -142,4 +142,40 @@ public function testGetInsertDataFrames()
 
         $this->assertEquals($expect, $data->getInsertData());
     }
+
+    public function testGetInsertDataFramesWithGaps()
+    {
+        $data = new VideoMetadata('1.mp4');
+
+        $data->addFrame(
+            '2024-03-11 16:44:00',
+            lat: 110,
+            lng: 130,
+            gpsAltitude: -1501
+        );
+
+        $data->addFrame(
+            '2024-03-11 16:43:00',
+            area: 2.5,
+            distanceToGround: 5,
+            gpsAltitude: -1500
+        );
+
+        $expect = [
+            'filename' => '1.mp4',
+            'lat' => [null, 110],
+            'lng' => [null, 130],
+            // Metadata should be sorted by taken_at.
+            'taken_at' => ['2024-03-11 16:43:00', '2024-03-11 16:44:00'],
+            'attrs' => [
+                'metadata' => [
+                    'area' => [2.5, null],
+                    'distance_to_ground' => [5, null],
+                    'gps_altitude' => [-1500, -1501],
+                ],
+            ],
+        ];
+
+        $this->assertEquals($expect, $data->getInsertData());
+    }
 }

From ad99725eab88bc8dbc44cdb39a5d4f7dfce5c09d Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Tue, 12 Mar 2024 10:59:02 +0100
Subject: [PATCH 024/209] Update CreateNewImagesOrVideos with new metadata
 handling

---
 app/Jobs/CreateNewImagesOrVideos.php          | 171 ++++--------------
 .../MetadataParsing/ImageMetadata.php         |   4 +-
 .../MetadataParsing/VideoMetadata.php         |  15 +-
 .../php/Jobs/CreateNewImagesOrVideosTest.php  | 128 +++++++------
 .../MetadataParsing/ImageMetadataTest.php     |   2 +-
 .../MetadataParsing/VideoMetadataTest.php     |   2 +-
 6 files changed, 119 insertions(+), 203 deletions(-)

diff --git a/app/Jobs/CreateNewImagesOrVideos.php b/app/Jobs/CreateNewImagesOrVideos.php
index c266698b2..84eaf51b4 100644
--- a/app/Jobs/CreateNewImagesOrVideos.php
+++ b/app/Jobs/CreateNewImagesOrVideos.php
@@ -4,7 +4,7 @@
 
 use Biigle\Image;
 use Biigle\Rules\ImageMetadata;
-use Biigle\Traits\ChecksMetadataStrings;
+use Biigle\Services\MetadataParsing\VolumeMetadata;
 use Biigle\Video;
 use Biigle\Volume;
 use Carbon\Carbon;
@@ -16,7 +16,7 @@
 
 class CreateNewImagesOrVideos extends Job implements ShouldQueue
 {
-    use InteractsWithQueue, SerializesModels, ChecksMetadataStrings;
+    use InteractsWithQueue, SerializesModels;
 
     /**
      * The volume to create the files for.
@@ -44,15 +44,13 @@ class CreateNewImagesOrVideos extends Job implements ShouldQueue
      *
      * @param Volume $volume The volume to create the files for.
      * @param array $filenames The filenames of the files to create.
-     * @param array $metadata File metadata (one row per file plus column headers).
      *
      * @return void
      */
-    public function __construct(Volume $volume, array $filenames, $metadata = [])
+    public function __construct(Volume $volume, array $filenames)
     {
         $this->volume = $volume;
         $this->filenames = $filenames;
-        $this->metadata = $metadata;
     }
 
     /**
@@ -67,17 +65,16 @@ public function handle()
 
         DB::transaction(function () {
             $chunks = collect($this->filenames)->chunk(1000);
+            $metadata = $this->volume->getMetadata();
 
             if ($this->volume->isImageVolume()) {
-                $metadataMap = $this->generateImageMetadataMap();
-                $chunks->each(function ($chunk) use ($metadataMap) {
-                    Image::insert($this->createFiles($chunk->toArray(), $metadataMap));
-                });
+                $chunks->each(fn ($chunk) =>
+                    Image::insert($this->createFiles($chunk->toArray(), $metadata))
+                );
             } else {
-                $metadataMap = $this->generateVideoMetadataMap();
-                $chunks->each(function ($chunk) use ($metadataMap) {
-                    Video::insert($this->createFiles($chunk->toArray(), $metadataMap));
-                });
+                $chunks->each(fn ($chunk) =>
+                    Video::insert($this->createFiles($chunk->toArray(), $metadata))
+                );
             }
         });
 
@@ -107,142 +104,42 @@ public function handle()
 
     /**
      * Create an array to be inserted as new image or video models.
-     *
-     * @param array $filenames New image/video filenames.
-     * @param \Illuminate\Support\Collection $metadataMap
-     *
-     * @return array
      */
-    protected function createFiles($filenames, $metadataMap)
+    protected function createFiles(array $filenames, ?VolumeMetadata $metadata): array
     {
-        return array_map(function ($filename) use ($metadataMap) {
-            // This makes sure that the inserts have the same number of columns even if
-            // some images have additional metadata and others not.
-            $insert = array_fill_keys(
-                array_merge(['attrs'], ImageMetadata::ALLOWED_ATTRIBUTES),
-                null
-            );
+        $metaKeys = [];
+        $insertData = [];
 
-            $insert = array_merge($insert, [
-                'filename' => $filename,
-                'volume_id' => $this->volume->id,
-                'uuid' => (string) Uuid::uuid4(),
-            ]);
+        foreach ($filenames as $filename) {
+            $insert = [];
 
-            $metadata = collect($metadataMap->get($filename));
-            if ($metadata) {
-                // Remove empty cells.
-                $metadata = $metadata->filter();
-                $insert = array_merge(
-                    $insert,
-                    $metadata->only(ImageMetadata::ALLOWED_ATTRIBUTES)->toArray()
-                );
+            if ($metadata && ($fileMeta = $metadata->getFile($filename))) {
+                $insert = array_map(function ($item) {
+                    if (is_array($item)) {
+                        return json_encode($item);
+                    }
 
-                $more = $metadata->only(ImageMetadata::ALLOWED_METADATA);
-                if ($more->isNotEmpty()) {
-                    $insert['attrs'] = collect(['metadata' => $more])->toJson();
-                }
+                    return $item;
+                }, $fileMeta->getInsertData());
             }
 
-            return $insert;
-        }, $filenames);
-    }
-
-    /**
-     * Generate a map for image metadata that is indexed by filename.
-     *
-     * @return \Illuminate\Support\Collection
-     */
-    protected function generateImageMetadataMap()
-    {
-        if (empty($this->metadata)) {
-            return collect([]);
-        }
-
-        $columns = $this->metadata[0];
+            $metaKeys += array_keys($insert);
 
-        $map = collect(array_slice($this->metadata, 1))
-            ->map(fn ($row) => array_combine($columns, $row))
-            ->map(function ($row) {
-                if (array_key_exists('taken_at', $row)) {
-                    $row['taken_at'] = Carbon::parse($row['taken_at']);
-                }
-
-                return $row;
-            })
-            ->keyBy('filename');
-
-        $map->forget('filename');
-
-        return $map;
-    }
+            $insert = array_merge($insert, [
+                'filename' => $filename,
+                'volume_id' => $this->volume->id,
+                'uuid' => (string) Uuid::uuid4(),
+            ]);
 
-    /**
-     * Generate a map for video metadata that is indexed by filename.
-     *
-     * @return \Illuminate\Support\Collection
-     */
-    protected function generateVideoMetadataMap()
-    {
-        if (empty($this->metadata)) {
-            return collect([]);
+            $insertData[] = $insert;
         }
 
-        $columns = $this->metadata[0];
-
-        $map = collect(array_slice($this->metadata, 1))
-            ->map(fn ($row) => array_combine($columns, $row))
-            ->map(function ($row) {
-                if (array_key_exists('taken_at', $row)) {
-                    $row['taken_at'] = Carbon::parse($row['taken_at']);
-                } else {
-                    $row['taken_at'] = null;
-                }
-
-                return $row;
-            })
-            ->sortBy('taken_at')
-            ->groupBy('filename')
-            ->map(fn ($entries) => $this->processVideoColumns($entries, $columns));
-
-        return $map;
-    }
-
-    /**
-     * Generate the metadata map entry for a single video file.
-     *
-     * @param \Illuminate\Support\Collection $entries
-     * @param \Illuminate\Support\Collection $columns
-     *
-     * @return \Illuminate\Support\Collection
-     */
-    protected function processVideoColumns($entries, $columns)
-    {
-        $return = collect([]);
-        foreach ($columns as $column) {
-            $values = $entries->pluck($column);
-            if ($values->filter([$this, 'isFilledString'])->isEmpty()) {
-                // Ignore completely empty columns.
-                continue;
-            }
-
-            $return[$column] = $values;
-
-            if (in_array($column, array_keys(ImageMetadata::NUMERIC_FIELDS))) {
-                $return[$column] = $return[$column]->map(function ($x) {
-                    // This check is required since floatval would return 0 for
-                    // an empty value. This could skew metadata.
-                    return $this->isFilledString($x) ? floatval($x) : null;
-                });
-            }
-
-            if (in_array($column, ImageMetadata::ALLOWED_ATTRIBUTES)) {
-                $return[$column] = $return[$column]->toJson();
-            }
+        // Ensure that each item has the same keys even if some are missing metadata.
+        if (!empty($metaKeys)) {
+            $fill = array_fill_keys($metaKeys, null);
+            $insertData = array_map(fn ($i) => array_merge($fill, $i), $insertData);
         }
 
-        $return->forget('filename');
-
-        return $return;
+        return $insertData;
     }
 }
diff --git a/app/Services/MetadataParsing/ImageMetadata.php b/app/Services/MetadataParsing/ImageMetadata.php
index 783d276fe..7d2dc3c93 100644
--- a/app/Services/MetadataParsing/ImageMetadata.php
+++ b/app/Services/MetadataParsing/ImageMetadata.php
@@ -2,6 +2,8 @@
 
 namespace Biigle\Services\MetadataParsing;
 
+use Carbon\Carbon;
+
 class ImageMetadata extends FileMetadata
 {
     public function __construct(
@@ -48,7 +50,7 @@ public function getInsertData(): array
         }
 
         if (!is_null($this->takenAt)) {
-            $data['taken_at'] = $this->takenAt;
+            $data['taken_at'] = Carbon::parse($this->takenAt)->toDateTimeString();
         }
 
         $attrs = [];
diff --git a/app/Services/MetadataParsing/VideoMetadata.php b/app/Services/MetadataParsing/VideoMetadata.php
index b3a5eb321..39501b1ca 100644
--- a/app/Services/MetadataParsing/VideoMetadata.php
+++ b/app/Services/MetadataParsing/VideoMetadata.php
@@ -108,10 +108,6 @@ protected function getInsertDataPlain(): array
             $data['lng'] = [$this->lng];
         }
 
-        if (!is_null($this->takenAt)) {
-            $data['taken_at'] = [$this->takenAt];
-        }
-
         $attrs = [];
 
         if (!is_null($this->area)) {
@@ -156,14 +152,15 @@ protected function getInsertDataFrames(): array
             'yaw' => [],
         ];
 
-        $sortedFrames = $this->frames->sort(fn ($a, $b) =>
-            Carbon::parse($a->takenAt)->gt($b->takenAt) ? 1 : -1
-        )->values();
+        $timestamps = $this->frames
+            ->map(fn ($f) => Carbon::parse($f->takenAt))
+            ->sort(fn ($a, $b) => $a->gt($b) ? 1 : -1);
 
-        foreach ($sortedFrames as $frame) {
+        foreach ($timestamps as $index => $timestamp) {
+            $frame = $this->frames->get($index);
             $data['lat'][] = $frame->lat;
             $data['lng'][] = $frame->lng;
-            $data['taken_at'][] = $frame->takenAt;
+            $data['taken_at'][] = $timestamp->toDateTimeString();
 
             $attrs['area'][] = $frame->area;
             $attrs['distance_to_ground'][] = $frame->distanceToGround;
diff --git a/tests/php/Jobs/CreateNewImagesOrVideosTest.php b/tests/php/Jobs/CreateNewImagesOrVideosTest.php
index 06044f071..b7c1b00b6 100644
--- a/tests/php/Jobs/CreateNewImagesOrVideosTest.php
+++ b/tests/php/Jobs/CreateNewImagesOrVideosTest.php
@@ -9,6 +9,7 @@
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Queue;
+use Illuminate\Support\Facades\Storage;
 use TestCase;
 
 class CreateNewImagesOrVideosTest extends TestCase
@@ -65,14 +66,16 @@ public function testHandleImageMetadata()
     {
         $volume = VolumeTest::create([
             'media_type_id' => MediaType::imageId(),
+            'metadata_file_path' => 'mymeta.csv',
         ]);
+        $disk = Storage::fake('metadata');
+        $disk->put($volume->metadata_file_path, <<<CSV
+        filename,taken_at,lng,lat,gps_altitude,distance_to_ground,area,yaw
+        a.jpg,2016-12-19 12:27:00,52.220,28.123,-1500,10,2.6,180
+        CSV);
         $filenames = ['a.jpg'];
-        $metadata = [
-            ['filename', 'taken_at', 'lng', 'lat', 'gps_altitude', 'distance_to_ground', 'area', 'yaw'],
-            ['a.jpg', '2016-12-19 12:27:00', '52.220', '28.123', '-1500', '10', '2.6', '180'],
-        ];
 
-        with(new CreateNewImagesOrVideos($volume, $filenames, $metadata))->handle();
+        with(new CreateNewImagesOrVideos($volume, $filenames))->handle();
         $image = $volume->images()->first();
         $this->assertEquals('2016-12-19 12:27:00', $image->taken_at);
         $this->assertEquals(52.220, $image->lng);
@@ -87,14 +90,16 @@ public function testHandleImageMetadataEmptyCells()
     {
         $volume = VolumeTest::create([
             'media_type_id' => MediaType::imageId(),
+            'metadata_file_path' => 'mymeta.csv',
         ]);
+        $disk = Storage::fake('metadata');
+        $disk->put($volume->metadata_file_path, <<<CSV
+        filename,lng,lat,gps_altitude
+        a.jpg,52.220,28.123,
+        CSV);
         $filenames = ['a.jpg'];
-        $metadata = [
-            ['filename', 'lng', 'lat', 'gps_altitude'],
-            ['a.jpg', '52.220', '28.123', ''],
-        ];
 
-        with(new CreateNewImagesOrVideos($volume, $filenames, $metadata))->handle();
+        with(new CreateNewImagesOrVideos($volume, $filenames))->handle();
         $image = $volume->images()->first();
         $this->assertEquals(52.220, $image->lng);
         $this->assertEquals(28.123, $image->lat);
@@ -105,14 +110,16 @@ public function testHandleImageMetadataIncomplete()
     {
         $volume = VolumeTest::create([
             'media_type_id' => MediaType::imageId(),
+            'metadata_file_path' => 'mymeta.csv',
         ]);
+        $disk = Storage::fake('metadata');
+        $disk->put($volume->metadata_file_path, <<<CSV
+        filename,lng,lat
+        a.jpg,52.220,28.123
+        CSV);
         $filenames = ['a.jpg', 'b.jpg'];
-        $metadata = [
-            ['filename', 'lng', 'lat'],
-            ['a.jpg', '52.220', '28.123'],
-        ];
 
-        with(new CreateNewImagesOrVideos($volume, $filenames, $metadata))->handle();
+        with(new CreateNewImagesOrVideos($volume, $filenames))->handle();
         $this->assertEquals(2, $volume->images()->count());
     }
 
@@ -120,16 +127,17 @@ public function testHandleVideoMetadata()
     {
         $volume = VolumeTest::create([
             'media_type_id' => MediaType::videoId(),
+            'metadata_file_path' => 'mymeta.csv',
         ]);
+        $disk = Storage::fake('metadata');
+        $disk->put($volume->metadata_file_path, <<<CSV
+        filename,taken_at,lng,lat,gps_altitude,distance_to_ground,area,yaw
+        a.mp4,2016-12-19 12:28:00,52.230,28.133,-1505,5,1.6,181
+        a.mp4,2016-12-19 12:27:00,52.220,28.123,-1500,10,2.6,180
+        CSV);
         $filenames = ['a.mp4'];
-        // Metadata should be sorted by taken_at later.
-        $metadata = [
-            ['filename', 'taken_at', 'lng', 'lat', 'gps_altitude', 'distance_to_ground', 'area', 'yaw'],
-            ['a.mp4', '2016-12-19 12:28:00', '52.230', '28.133', '-1505', '5', '1.6', '181'],
-            ['a.mp4', '2016-12-19 12:27:00', '52.220', '28.123', '-1500', '10', '2.6', '180'],
-        ];
 
-        with(new CreateNewImagesOrVideos($volume, $filenames, $metadata))->handle();
+        with(new CreateNewImagesOrVideos($volume, $filenames))->handle();
         $video = $volume->videos()->first();
         $expect = [
             Carbon::parse('2016-12-19 12:27:00'),
@@ -148,15 +156,17 @@ public function testHandleVideoMetadataEmptyCells()
     {
         $volume = VolumeTest::create([
             'media_type_id' => MediaType::videoId(),
+            'metadata_file_path' => 'mymeta.csv',
         ]);
+        $disk = Storage::fake('metadata');
+        $disk->put($volume->metadata_file_path, <<<CSV
+        filename,taken_at,gps_altitude,distance_to_ground
+        a.mp4,2016-12-19 12:28:00,,
+        a.mp4,2016-12-19 12:27:00,-1500,
+        CSV);
         $filenames = ['a.mp4'];
-        $metadata = [
-            ['filename', 'taken_at', 'gps_altitude', 'distance_to_ground'],
-            ['a.mp4', '2016-12-19 12:27:00', '-1500', ''],
-            ['a.mp4', '2016-12-19 12:28:00', '', ''],
-        ];
 
-        with(new CreateNewImagesOrVideos($volume, $filenames, $metadata))->handle();
+        with(new CreateNewImagesOrVideos($volume, $filenames))->handle();
         $video = $volume->videos()->first();
         $expect = ['gps_altitude' => [-1500, null]];
         $this->assertSame($expect, $video->metadata);
@@ -166,14 +176,16 @@ public function testHandleVideoMetadataZeroSingle()
     {
         $volume = VolumeTest::create([
             'media_type_id' => MediaType::videoId(),
+            'metadata_file_path' => 'mymeta.csv',
         ]);
+        $disk = Storage::fake('metadata');
+        $disk->put($volume->metadata_file_path, <<<CSV
+        filename,taken_at,distance_to_ground
+        a.mp4,2016-12-19 12:27:00,0
+        CSV);
         $filenames = ['a.mp4'];
-        $metadata = [
-            ['filename', 'taken_at', 'distance_to_ground'],
-            ['a.mp4', '2016-12-19 12:27:00', '0'],
-        ];
 
-        with(new CreateNewImagesOrVideos($volume, $filenames, $metadata))->handle();
+        with(new CreateNewImagesOrVideos($volume, $filenames))->handle();
         $video = $volume->videos()->first();
         $expect = ['distance_to_ground' => [0]];
         $this->assertSame($expect, $video->metadata);
@@ -183,15 +195,17 @@ public function testHandleVideoMetadataZero()
     {
         $volume = VolumeTest::create([
             'media_type_id' => MediaType::videoId(),
+            'metadata_file_path' => 'mymeta.csv',
         ]);
+        $disk = Storage::fake('metadata');
+        $disk->put($volume->metadata_file_path, <<<CSV
+        filename,taken_at,distance_to_ground
+        a.mp4,2016-12-19 12:27:00,0
+        a.mp4,2016-12-19 12:28:00,1
+        CSV);
         $filenames = ['a.mp4'];
-        $metadata = [
-            ['filename', 'taken_at', 'distance_to_ground'],
-            ['a.mp4', '2016-12-19 12:27:00', '0'],
-            ['a.mp4', '2016-12-19 12:28:00', '1'],
-        ];
 
-        with(new CreateNewImagesOrVideos($volume, $filenames, $metadata))->handle();
+        with(new CreateNewImagesOrVideos($volume, $filenames))->handle();
         $video = $volume->videos()->first();
         $expect = ['distance_to_ground' => [0, 1]];
         $this->assertSame($expect, $video->metadata);
@@ -201,14 +215,16 @@ public function testHandleVideoMetadataBasic()
     {
         $volume = VolumeTest::create([
             'media_type_id' => MediaType::videoId(),
+            'metadata_file_path' => 'mymeta.csv',
         ]);
+        $disk = Storage::fake('metadata');
+        $disk->put($volume->metadata_file_path, <<<CSV
+        filename,gps_altitude
+        a.mp4,-1500
+        CSV);
         $filenames = ['a.mp4'];
-        $metadata = [
-            ['filename', 'gps_altitude'],
-            ['a.mp4', '-1500'],
-        ];
 
-        with(new CreateNewImagesOrVideos($volume, $filenames, $metadata))->handle();
+        with(new CreateNewImagesOrVideos($volume, $filenames))->handle();
         $video = $volume->videos()->first();
         $expect = ['gps_altitude' => [-1500]];
         $this->assertSame($expect, $video->metadata);
@@ -219,14 +235,16 @@ public function testHandleVideoMetadataIncomplete()
     {
         $volume = VolumeTest::create([
             'media_type_id' => MediaType::videoId(),
+            'metadata_file_path' => 'mymeta.csv',
         ]);
+        $disk = Storage::fake('metadata');
+        $disk->put($volume->metadata_file_path, <<<CSV
+        filename,taken_at,lng,lat
+        a.mp4,2016-12-19 12:27:00,52.220,28.123
+        CSV);
         $filenames = ['a.mp4', 'b.mp4'];
-        $metadata = [
-            ['filename', 'taken_at', 'lng', 'lat'],
-            ['a.mp4', '2016-12-19 12:28:00', '52.220', '28.123'],
-        ];
 
-        with(new CreateNewImagesOrVideos($volume, $filenames, $metadata))->handle();
+        with(new CreateNewImagesOrVideos($volume, $filenames))->handle();
         $this->assertEquals(2, $volume->videos()->count());
     }
 
@@ -234,14 +252,16 @@ public function testHandleMetadataDateParsing()
     {
         $volume = VolumeTest::create([
             'media_type_id' => MediaType::imageId(),
+            'metadata_file_path' => 'mymeta.csv',
         ]);
+        $disk = Storage::fake('metadata');
+        $disk->put($volume->metadata_file_path, <<<CSV
+        filename,taken_at
+        a.jpg,05/01/2019 10:35
+        CSV);
         $filenames = ['a.jpg'];
-        $metadata = [
-            ['filename', 'taken_at'],
-            ['a.jpg', '05/01/2019 10:35'],
-        ];
 
-        with(new CreateNewImagesOrVideos($volume, $filenames, $metadata))->handle();
+        with(new CreateNewImagesOrVideos($volume, $filenames))->handle();
         $image = $volume->images()->first();
         $this->assertEquals('2019-05-01 10:35:00', $image->taken_at);
     }
diff --git a/tests/php/Services/MetadataParsing/ImageMetadataTest.php b/tests/php/Services/MetadataParsing/ImageMetadataTest.php
index d7b049e3f..1fbb7eab8 100644
--- a/tests/php/Services/MetadataParsing/ImageMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/ImageMetadataTest.php
@@ -22,7 +22,7 @@ public function testGetInsertData()
             '1.jpg',
             lat: 100,
             lng: 120,
-            takenAt: '2024-03-11 16:43:00',
+            takenAt: '03/11/2024 16:43:00',
             area: 2.5,
             distanceToGround: 5,
             gpsAltitude: -1500,
diff --git a/tests/php/Services/MetadataParsing/VideoMetadataTest.php b/tests/php/Services/MetadataParsing/VideoMetadataTest.php
index ab64e092b..647450a53 100644
--- a/tests/php/Services/MetadataParsing/VideoMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/VideoMetadataTest.php
@@ -75,7 +75,7 @@ public function testGetInsertDataFrame()
             '1.mp4',
             lat: 100,
             lng: 120,
-            takenAt: '2024-03-11 16:43:00',
+            takenAt: '03/11/2024 16:43:00',
             area: 2.5,
             distanceToGround: 5,
             gpsAltitude: -1500,

From 8137363526923e147bd3b599c1f4c32073d3a95c Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Tue, 12 Mar 2024 12:57:32 +0100
Subject: [PATCH 025/209] Update volume MetadataController with new metadata
 handling

---
 .../Api/PendingVolumeController.php           |   2 +-
 .../Api/Volumes/MetadataController.php        | 227 +---------
 app/Http/Requests/StoreVolumeMetadata.php     |  80 +---
 app/Image.php                                 |  16 +
 app/Jobs/UpdateVolumeMetadata.php             |  66 +++
 app/Rules/Utf8.php                            |  31 --
 app/Services/MetadataParsing/CsvParser.php    |   6 +-
 app/Traits/ChecksMetadataStrings.php          |  14 -
 app/Video.php                                 |  13 +-
 app/Volume.php                                |   2 +-
 app/VolumeFile.php                            |   2 +-
 .../files/image-metadata-strange-encoding.csv |   2 +
 .../files/video-metadata-strange-encoding.csv |   4 +-
 .../Api/Volumes/MetadataControllerTest.php    | 397 +-----------------
 tests/php/Jobs/UpdateVolumeMetadataTest.php   | 291 +++++++++++++
 .../MetadataParsing/ImageCsvParserTest.php    |   4 +
 .../MetadataParsing/VideoCsvParserTest.php    |   6 +-
 17 files changed, 452 insertions(+), 711 deletions(-)
 create mode 100644 app/Jobs/UpdateVolumeMetadata.php
 delete mode 100644 app/Rules/Utf8.php
 delete mode 100644 app/Traits/ChecksMetadataStrings.php
 create mode 100644 tests/files/image-metadata-strange-encoding.csv
 create mode 100644 tests/php/Jobs/UpdateVolumeMetadataTest.php

diff --git a/app/Http/Controllers/Api/PendingVolumeController.php b/app/Http/Controllers/Api/PendingVolumeController.php
index dff453881..88e77ee09 100644
--- a/app/Http/Controllers/Api/PendingVolumeController.php
+++ b/app/Http/Controllers/Api/PendingVolumeController.php
@@ -30,7 +30,7 @@ class PendingVolumeController extends Controller
      *
      * @apiParam (Required attributes) {String} media_type The media type of the new volume (`image` or `video`).
      *
-     * @apiParam (Optional attributes) {File} metadata_file A file with volume and image/video metadata. By default, this can be a CSV. See "metadata columns" for the possible columns. Each column may occur only once. There must be at least one column other than `filename`. For video metadata, multiple rows can contain metadata from different times of the same video. In this case, the `filename` of the rows must match and each row needs a (different) `taken_at` timestamp. Other formats may be supported through modules.
+     * @apiParam (Optional attributes) {File} metadata_file A file with volume and image/video metadata. By default, this can be a CSV. See "metadata columns" for the possible columns. Each column may occur only once. There must be at least one column other than `filename`. For video metadata, multiple rows can contain metadata from different times of the same video. In this case, the `filename` of the rows must match and each row needs a (different) `taken_at` timestamp. Other file formats may be supported through modules.
      *
      * @apiParam (metadata columns) {String} filename The filename of the file the metadata belongs to. This column is required.
      * @apiParam (metadata columns) {String} taken_at The date and time where the file was taken. Example: `2016-12-19 12:49:00`
diff --git a/app/Http/Controllers/Api/Volumes/MetadataController.php b/app/Http/Controllers/Api/Volumes/MetadataController.php
index 18f2853da..c43224450 100644
--- a/app/Http/Controllers/Api/Volumes/MetadataController.php
+++ b/app/Http/Controllers/Api/Volumes/MetadataController.php
@@ -4,22 +4,14 @@
 
 use Biigle\Http\Controllers\Api\Controller;
 use Biigle\Http\Requests\StoreVolumeMetadata;
-use Biigle\Rules\ImageMetadata;
-use Biigle\Rules\VideoMetadata;
-use Biigle\Traits\ChecksMetadataStrings;
-use Biigle\Video;
+use Biigle\Jobs\UpdateVolumeMetadata;
 use Biigle\Volume;
-use Carbon\Carbon;
-use DB;
 use Illuminate\Http\Response;
-use Illuminate\Support\Collection;
-use Illuminate\Validation\ValidationException;
+use Queue;
 use Storage;
 
 class MetadataController extends Controller
 {
-    use ChecksMetadataStrings;
-
     /**
      * Get a metadata file attached to a volume
      *
@@ -62,13 +54,13 @@ public function show($id)
      * @apiGroup Volumes
      * @apiName StoreVolumeMetadata
      * @apiPermission projectAdmin
-     * @apiDescription This endpoint allows adding or updating metadata such as geo coordinates for volume file.
+     * @apiDescription This endpoint allows adding or updating metadata such as geo
+     * coordinates for volume files. The uploaded metadata file replaces any previously
+     * uploaded file.
      *
      * @apiParam {Number} id The volume ID.
      *
-     * @apiParam (Attributes) {String} metadata_text CSV-like string with file metadata. See "metadata columns" for the possible columns. Each column may occur only once. There must be at least one column other than `filename`. For video metadata, multiple rows can contain metadata from different times of the same video. In this case, the `filename` of the rows must match and each row needs a (different) `taken_at` timestamp.
-     * @apiParam (Attributes) {File} metadata_csv Alternative to `metadata_text`. This field allows the upload of an actual CSV file. See `metadata_text` for the further description.
-     * @apiParam (Attributes) {File} ifdo_file iFDO metadata file to upload and link with the volume. The metadata of this file is not used for the volume or volume files. Use `metadata_text` or `metadata_csv` for this.
+     * @apiParam (attributes) {File} file A file with volume and image/video metadata. By default, this can be a CSV. See "metadata columns" for the possible columns. Each column may occur only once. There must be at least one column other than `filename`. For video metadata, multiple rows can contain metadata from different times of the same video. In this case, the `filename` of the rows must match and each row needs a (different) `taken_at` timestamp. Other file formats may be supported through modules.
      *
      * @apiParam (metadata columns) {String} filename The filename of the file the metadata belongs to. This column is required.
      * @apiParam (metadata columns) {String} taken_at The date and time where the file was taken. Example: `2016-12-19 12:49:00`
@@ -78,31 +70,17 @@ public function show($id)
      * @apiParam (metadata columns) {Number} distance_to_ground Distance to the sea floor in meters. Example: `30.25`
      * @apiParam (metadata columns) {Number} area Area shown by the file in m². Example `2.6`.
      *
-     * @apiParamExample {String} Request example:
-     * file: "filename,taken_at,lng,lat,gps_altitude,distance_to_ground,area
-     * image_1.png,2016-12-19 12:49:00,52.3211,28.775,-1500.5,30.25,2.6"
-     *
      * @param StoreVolumeMetadata $request
      *
      * @return \Illuminate\Http\Response
      */
     public function store(StoreVolumeMetadata $request)
     {
-        if ($request->hasFile('ifdo_file')) {
-            $request->volume->saveIfdo($request->file('ifdo_file'));
-        }
-
-        if ($request->input('metadata')) {
-            DB::transaction(function () use ($request) {
-                if ($request->volume->isImageVolume()) {
-                    $this->updateImageMetadata($request);
-                } else {
-                    $this->updateVideoMetadata($request);
-                }
-            });
-
-            $request->volume->flushGeoInfoCache();
-        }
+        // Delete first because the metadata file may have a different extension, so it
+        // is not guaranteed that the file is overwritten.
+        $request->volume->deleteMetadata();
+        $request->volume->saveMetadata($request->file('file'));
+        Queue::push(new UpdateVolumeMetadata($request->volume));
     }
 
     /**
@@ -112,7 +90,8 @@ public function store(StoreVolumeMetadata $request)
      * @apiGroup Volumes
      * @apiName DestroyVolumeMetadata
      * @apiPermission projectAdmin
-     * @apiDescription This does not delete the metadata that was attached to the volume files.
+     * @apiDescription This does not delete the metadata that was already attached to the
+     * volume files.
      ~
      * @param int $id
      *
@@ -124,184 +103,4 @@ public function destroy($id)
         $this->authorize('update', $volume);
         $volume->deleteMetadata();
     }
-
-    /**
-     * Update volume metadata for each image.
-     *
-     * @param StoreVolumeMetadata $request
-     */
-    protected function updateImageMetadata(StoreVolumeMetadata $request)
-    {
-        $metadata = $request->input('metadata');
-        $images = $request->volume->images()
-            ->select('id', 'filename', 'attrs')
-            ->get()
-            ->keyBy('filename');
-
-        $columns = array_shift($metadata);
-
-        foreach ($metadata as $row) {
-            $row = collect(array_combine($columns, $row));
-            $image = $images->get($row['filename']);
-            // Remove empty cells.
-            $row = $row->filter();
-            $fill = $row->only(ImageMetadata::ALLOWED_ATTRIBUTES);
-            if ($fill->has('taken_at')) {
-                $fill['taken_at'] = Carbon::parse($fill['taken_at']);
-            }
-            $image->fillable(ImageMetadata::ALLOWED_ATTRIBUTES);
-            $image->fill($fill->toArray());
-
-            $metadata = $row->only(ImageMetadata::ALLOWED_METADATA);
-            $image->metadata = array_merge($image->metadata, $metadata->toArray());
-            $image->save();
-        }
-    }
-
-    /**
-     * Update volume metadata for each video.
-     *
-     * @param StoreVolumeMetadata $request
-     */
-    protected function updateVideoMetadata(StoreVolumeMetadata $request)
-    {
-        $metadata = $request->input('metadata');
-        $videos = $request->volume->videos()
-            ->get()
-            ->keyBy('filename');
-
-        $columns = collect(array_shift($metadata));
-        $rowsByFile = collect($metadata)
-            ->map(fn ($row) => $columns->combine($row))
-            ->map(function ($row) {
-                if ($row->has('taken_at')) {
-                    $row['taken_at'] = Carbon::parse($row['taken_at']);
-                }
-
-                return $row;
-            })
-            ->groupBy('filename');
-
-        foreach ($rowsByFile as $filename => $rows) {
-            $video = $videos->get($filename);
-            $merged = $this->mergeVideoMetadata($video, $rows);
-            $video->fillable(VideoMetadata::ALLOWED_ATTRIBUTES);
-            $video->fill($merged->only(VideoMetadata::ALLOWED_ATTRIBUTES)->toArray());
-            // Fields for allowed metadata are filtered in mergeVideoMetadata(). We use
-            // except() with allowed attributes here so any metadata fields that were
-            // previously stored for the video but are not contained in ALLOWED_METADATA
-            // are not deleted.
-            $video->metadata = $merged->except(VideoMetadata::ALLOWED_ATTRIBUTES)->toArray();
-            $video->save();
-        }
-    }
-
-    /**
-     * Merge existing video metadata with new metaddata based on timestamps.
-     *
-     * Timestamps of existing metadata are extended, even if no new values are provided
-     * for the fields. New values are extended with existing timestamps, even if these
-     * timestamps are not provided in the new metadata.
-     *
-     * @param Video $video
-     * @param Collection $rows
-     *
-     * @return Collection
-     */
-    protected function mergeVideoMetadata(Video $video, Collection $rows)
-    {
-        $metadata = collect();
-        // Everything will be indexed by the timestamps below.
-        $origTakenAt = collect($video->taken_at)->map(fn ($time) => $time->getTimestamp());
-        $newTakenAt = $rows->pluck('taken_at')->filter()->map(fn ($time) => $time->getTimestamp());
-
-        if ($origTakenAt->isEmpty() && $this->hasMetadata($video)) {
-            if ($rows->count() > 1 || $newTakenAt->isNotEmpty()) {
-                throw ValidationException::withMessages(
-                    [
-                        'metadata' => ["Metadata of video '{$video->filename}' has no 'taken_at' timestamps and cannot be updated with new metadata that has timestamps."],
-                    ]
-                );
-            }
-
-            return $rows->first();
-        } elseif ($newTakenAt->isEmpty()) {
-            throw ValidationException::withMessages(
-                [
-                    'metadata' => ["Metadata of video '{$video->filename}' has 'taken_at' timestamps and cannot be updated with new metadata that has no timestamps."],
-                ]
-            );
-        }
-
-        // These are used to fill missing values with null.
-        $origTakenAtNull = $origTakenAt->combine($origTakenAt->map(fn ($x) => null));
-        $newTakenAtNull = $newTakenAt->combine($newTakenAt->map(fn ($x) => null));
-
-        $originalAttributes = collect(VideoMetadata::ALLOWED_ATTRIBUTES)
-            ->mapWithKeys(fn ($key) => [$key => $video->$key]);
-
-        $originalMetadata = collect(VideoMetadata::ALLOWED_METADATA)
-            ->mapWithKeys(fn ($key) => [$key => null])
-            ->merge($video->metadata);
-
-        $originalData = $originalMetadata->merge($originalAttributes);
-
-        foreach ($originalData as $key => $originalValues) {
-            $originalValues = collect($originalValues);
-            if ($originalValues->isNotEmpty()) {
-                $originalValues = $origTakenAt->combine($originalValues);
-            }
-
-            // Pluck returns an array filled with null if the key doesn't exist.
-            $newValues = $newTakenAt
-                ->combine($rows->pluck($key))
-                ->filter([$this, 'isFilledString']);
-
-            // This merges old an new values, leaving null where no values are given
-            // (for an existing or new timestamp). The union order is essential.
-            $newValues = $newValues
-                ->union($originalValues)
-                ->union($origTakenAtNull)
-                ->union($newTakenAtNull);
-
-            // Do not insert completely empty new values.
-            if ($newValues->filter([$this, 'isFilledString'])->isEmpty()) {
-                continue;
-            }
-
-            // Sort everything by ascending timestamps.
-            $metadata[$key] = $newValues->sortKeys()->values();
-        }
-
-        // Convert numeric fields to numbers.
-        foreach (VideoMetadata::NUMERIC_FIELDS as $key => $value) {
-            if ($metadata->has($key)) {
-                $metadata[$key]->transform(function ($x) {
-                    // This check is required since floatval would return 0 for
-                    // an empty value. This could skew metadata.
-                    return $this->isFilledString($x) ? floatval($x) : null;
-                });
-            }
-        }
-
-        return $metadata;
-    }
-
-    /**
-     * Determine if a video has any metadata.
-     *
-     * @param Video $video
-     *
-     * @return boolean
-     */
-    protected function hasMetadata(Video $video)
-    {
-        foreach (VideoMetadata::ALLOWED_ATTRIBUTES as $key) {
-            if (!is_null($video->$key)) {
-                return true;
-            }
-        }
-
-        return !empty($video->metadata);
-    }
 }
diff --git a/app/Http/Requests/StoreVolumeMetadata.php b/app/Http/Requests/StoreVolumeMetadata.php
index 90fec22d8..7342ef809 100644
--- a/app/Http/Requests/StoreVolumeMetadata.php
+++ b/app/Http/Requests/StoreVolumeMetadata.php
@@ -3,17 +3,13 @@
 namespace Biigle\Http\Requests;
 
 use Biigle\Rules\ImageMetadata;
-use Biigle\Rules\Utf8;
 use Biigle\Rules\VideoMetadata;
-use Biigle\Traits\ParsesMetadata;
+use Biigle\Services\MetadataParsing\ParserFactory;
 use Biigle\Volume;
-use Exception;
 use Illuminate\Foundation\Http\FormRequest;
 
 class StoreVolumeMetadata extends FormRequest
 {
-    use ParsesMetadata;
-
     /**
      * The volume to store the new metadata to.
      *
@@ -28,6 +24,8 @@ class StoreVolumeMetadata extends FormRequest
      */
     public function authorize()
     {
+        $this->volume = Volume::findOrFail($this->route('id'));
+
         return $this->user()->can('update', $this->volume);
     }
 
@@ -39,41 +37,10 @@ public function authorize()
     public function rules()
     {
         return [
-            'metadata_csv' => [
-                'bail',
-                'required_without_all:metadata_text,ifdo_file',
-                'file',
-                'mimetypes:text/plain,text/csv,application/csv',
-                'max:500000',
-                new Utf8,
-            ],
-            'metadata_text' => 'required_without_all:metadata_csv,ifdo_file',
-            'ifdo_file' => 'required_without_all:metadata_csv,metadata_text|file',
-            'metadata' => 'filled',
+            'file' => 'required|file|max:500000',
         ];
     }
 
-    /**
-     * Prepare the data for validation.
-     *
-     * @return void
-     */
-    protected function prepareForValidation()
-    {
-        $this->volume = Volume::findOrFail($this->route('id'));
-
-        // Backwards compatibility.
-        if ($this->hasFile('file') && !$this->hasFile('metadata_csv')) {
-            $this->convertedFiles['metadata_csv'] = $this->file('file');
-        }
-
-        if ($this->hasFile('metadata_csv')) {
-            $this->merge(['metadata' => $this->parseMetadataFile($this->file('metadata_csv'))]);
-        } elseif ($this->input('metadata_text')) {
-            $this->merge(['metadata' => $this->parseMetadata($this->input('metadata_text'))]);
-        }
-    }
-
     /**
      * Configure the validator instance.
      *
@@ -82,36 +49,25 @@ protected function prepareForValidation()
      */
     public function withValidator($validator)
     {
-        if ($validator->fails()) {
-            return;
-        }
-
         $validator->after(function ($validator) {
-            if ($this->has('metadata')) {
-                $files = $this->volume->files()->pluck('filename')->toArray();
-
-                if ($this->volume->isImageVolume()) {
-                    $rule = new ImageMetadata($files);
-                } else {
-                    $rule = new VideoMetadata($files);
-                }
+            if ($validator->errors()->isNotEmpty()) {
+                return;
+            }
 
-                if (!$rule->passes('metadata', $this->input('metadata'))) {
-                    $validator->errors()->add('metadata', $rule->message());
-                }
+            $type = $this->volume->isImageVolume() ? 'image' : 'video';
+            $parser = ParserFactory::getParserForFile($this->file('file'), $type);
+            if (is_null($parser)) {
+                $validator->errors()->add('file', 'Unknown metadata file format for this media type.');
+                return;
             }
 
-            if ($this->hasFile('ifdo_file')) {
-                try {
-                    // This throws an error if the iFDO is invalid.
-                    $data = $this->parseIfdoFile($this->file('ifdo_file'));
+            $rule = match ($type) {
+                'video' => new VideoMetadata,
+                default => new ImageMetadata,
+            };
 
-                    if ($data['media_type'] !== $this->volume->mediaType->name) {
-                        $validator->errors()->add('ifdo_file', 'The iFDO image-acquisition type does not match the media type of the volume.');
-                    }
-                } catch (Exception $e) {
-                    $validator->errors()->add('ifdo_file', $e->getMessage());
-                }
+            if (!$rule->passes('file', $parser->getMetadata())) {
+                $validator->errors()->add('file', $rule->message());
             }
         });
     }
diff --git a/app/Image.php b/app/Image.php
index c6eab803b..937053be6 100644
--- a/app/Image.php
+++ b/app/Image.php
@@ -25,6 +25,22 @@ class Image extends VolumeFile
         'image/webp',
     ];
 
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'filename',
+        'volume_id',
+        'uuid',
+        'taken_at',
+        'lng',
+        'lat',
+        'attrs',
+        'tiled',
+    ];
+
     /**
      * The attributes hidden in the model's JSON form.
      *
diff --git a/app/Jobs/UpdateVolumeMetadata.php b/app/Jobs/UpdateVolumeMetadata.php
new file mode 100644
index 000000000..ab0238bf4
--- /dev/null
+++ b/app/Jobs/UpdateVolumeMetadata.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Biigle\Jobs;
+
+use Biigle\Video;
+use Biigle\Volume;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Queue\SerializesModels;
+
+class UpdateVolumeMetadata extends Job implements ShouldQueue
+{
+    use SerializesModels;
+
+    /**
+     * Ignore this job if the project or volume does not exist any more.
+     *
+     * @var bool
+     */
+    protected $deleteWhenMissingModels = true;
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct(public Volume $volume)
+    {
+        //
+    }
+
+    public function handle()
+    {
+        $metadata = $this->volume->getMetadata();
+
+        if (!$metadata) {
+            return;
+        }
+
+        foreach ($this->volume->files()->lazyById() as $file) {
+            $fileMeta = $metadata->getFile($file->filename);
+            if (!$fileMeta) {
+                continue;
+            }
+
+            $insert = $fileMeta->getInsertData();
+
+            // If a video is updated with timestamped metadata, the old metadata must
+            // be replaced entirely.
+            if (($file instanceof Video) && array_key_exists('taken_at', $insert)) {
+                $file->taken_at = null;
+                $file->lat = null;
+                $file->lng = null;
+                $file->metadata = null;
+            }
+
+            $attrs = $insert['attrs'] ?? null;
+            unset($insert['attrs']);
+            $file->fill($insert);
+            if ($attrs) {
+                $file->metadata = array_merge($file->metadata ?: [], $attrs['metadata']);
+            }
+
+            if ($file->isDirty()) {
+                $file->save();
+            }
+        }
+    }
+}
diff --git a/app/Rules/Utf8.php b/app/Rules/Utf8.php
deleted file mode 100644
index f2a9bdf83..000000000
--- a/app/Rules/Utf8.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Biigle\Rules;
-
-use Illuminate\Contracts\Validation\Rule;
-
-class Utf8 implements Rule
-{
-    /**
-     * Determine if the validation rule passes.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @return bool
-     */
-    public function passes($attribute, $value)
-    {
-        $value = is_string($value) ? $value : $value->get();
-        return mb_detect_encoding($value, 'UTF-8', true) !== false;
-    }
-
-    /**
-     * Get the validation error message.
-     *
-     * @return string
-     */
-    public function message()
-    {
-        return "The :attribute must be UTF-8 encoded.";
-    }
-}
diff --git a/app/Services/MetadataParsing/CsvParser.php b/app/Services/MetadataParsing/CsvParser.php
index 94ea8ee94..1d263c4b1 100644
--- a/app/Services/MetadataParsing/CsvParser.php
+++ b/app/Services/MetadataParsing/CsvParser.php
@@ -34,7 +34,11 @@ public function recognizesFile(): bool
     {
         $file = $this->getCsvIterator();
         $line = $file->current();
-        if (!is_array($line)) {
+        if (!is_array($line) || empty($line)) {
+            return false;
+        }
+
+        if (mb_detect_encoding($line[0], 'UTF-8', true) === false) {
             return false;
         }
 
diff --git a/app/Traits/ChecksMetadataStrings.php b/app/Traits/ChecksMetadataStrings.php
deleted file mode 100644
index ff965a8c2..000000000
--- a/app/Traits/ChecksMetadataStrings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Biigle\Traits;
-
-trait ChecksMetadataStrings
-{
-    /**
-     * Determine if a value is not null and not an empty string.
-     */
-    public function isFilledString($x)
-    {
-        return !is_null($x) && $x !== '';
-    }
-}
diff --git a/app/Video.php b/app/Video.php
index 4247b6ba5..1ea599f63 100644
--- a/app/Video.php
+++ b/app/Video.php
@@ -79,6 +79,9 @@ class Video extends VolumeFile
         'uuid',
         'attrs',
         'duration',
+        'lng',
+        'lat',
+        'taken_at',
     ];
 
     /**
@@ -200,11 +203,15 @@ public function labels()
      *
      * @param array $value
      */
-    public function setTakenAtAttribute(array $value)
+    public function setTakenAtAttribute(?array $value)
     {
-        $value = array_map([Carbon::class, 'parse'], $value);
+        if (is_array($value)) {
+            $value = array_map([Carbon::class, 'parse'], $value);
 
-        $this->attributes['taken_at'] = json_encode($value);
+            $this->attributes['taken_at'] = json_encode($value);
+        } else {
+            $this->attributes['taken_at'] = $value;
+        }
     }
 
     /**
diff --git a/app/Volume.php b/app/Volume.php
index 1d97f5508..df4d71e06 100644
--- a/app/Volume.php
+++ b/app/Volume.php
@@ -501,7 +501,7 @@ public function getMetadata(): ?VolumeMetadata
     /**
      * @param boolean $noUpdate Do not set metadata_file_path to null.
      */
-    public function deleteMetadata($noUpdate=false): void
+    public function deleteMetadata($noUpdate = false): void
     {
         if ($this->hasMetadata()) {
             Storage::disk(config('volumes.metadata_storage_disk'))->delete($this->metadata_file_path);
diff --git a/app/VolumeFile.php b/app/VolumeFile.php
index 146ee5e73..78cbad11c 100644
--- a/app/VolumeFile.php
+++ b/app/VolumeFile.php
@@ -52,7 +52,7 @@ public function volume()
      *
      * @param array $value
      */
-    public function setMetadataAttribute(array $value)
+    public function setMetadataAttribute(?array $value)
     {
         return $this->setJsonAttr('metadata', $value);
     }
diff --git a/tests/files/image-metadata-strange-encoding.csv b/tests/files/image-metadata-strange-encoding.csv
new file mode 100644
index 000000000..bd460d2c8
--- /dev/null
+++ b/tests/files/image-metadata-strange-encoding.csv
@@ -0,0 +1,2 @@
+ taken_at,filename,gps_altitude
+2023-03-26 12:40:47,my-image ,-10
diff --git a/tests/files/video-metadata-strange-encoding.csv b/tests/files/video-metadata-strange-encoding.csv
index c74083723..9ab5ea006 100644
--- a/tests/files/video-metadata-strange-encoding.csv
+++ b/tests/files/video-metadata-strange-encoding.csv
@@ -1,2 +1,2 @@
-filename,taken_at,gps_altitude
- my-video ,2023-03-26 12:40:47,-10
+ taken_at,filename,gps_altitude
+2023-03-26 12:40:47,my-video ,-10
diff --git a/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php b/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php
index a9f6fb612..547b52ae0 100644
--- a/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php
+++ b/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php
@@ -3,10 +3,12 @@
 namespace Biigle\Tests\Http\Controllers\Api\Volumes;
 
 use ApiTestCase;
+use Biigle\Jobs\UpdateVolumeMetadata;
 use Biigle\MediaType;
 use Biigle\Tests\ImageTest;
 use Biigle\Tests\VideoTest;
 use Illuminate\Http\UploadedFile;
+use Queue;
 use Storage;
 
 class MetadataControllerTest extends ApiTestCase
@@ -54,113 +56,31 @@ public function testStoreImageMetadata()
         $csv = new UploadedFile(__DIR__."/../../../../../files/image-metadata.csv", 'image-metadata.csv', 'text/csv', null, true);
         $this->beEditor();
         // no permissions
-        $this->postJson("/api/v1/volumes/{$id}/metadata", ['metadata_csv' => $csv])
+        $this->postJson("/api/v1/volumes/{$id}/metadata", ['file' => $csv])
             ->assertStatus(403);
 
         $this->beAdmin();
         // file required
         $this->postJson("/api/v1/volumes/{$id}/metadata")->assertStatus(422);
 
-        // image does not exist
-        $this->postJson("/api/v1/volumes/{$id}/metadata", ['metadata_csv' => $csv])
-            ->assertStatus(422);
 
-        $png = ImageTest::create([
-            'filename' => 'abc.png',
-            'volume_id' => $id,
-        ]);
-        $jpg = ImageTest::create([
-            'filename' => 'abc.jpg',
-            'volume_id' => $id,
-            'attrs' => ['metadata' => [
-                'water_depth' => 4000,
-                'distance_to_ground' => 20,
-            ]],
-        ]);
-
-        $this->assertFalse($this->volume()->hasGeoInfo());
-
-        $this->postJson("/api/v1/volumes/{$id}/metadata", ['metadata_csv' => $csv])
+        $this->postJson("/api/v1/volumes/{$id}/metadata", ['file' => $csv])
             ->assertStatus(200);
 
-        $this->assertTrue($this->volume()->hasGeoInfo());
-
-        $png = $png->fresh();
-        $jpg = $jpg->fresh();
-
-        $this->assertEquals('2016-12-19 12:27:00', $jpg->taken_at);
-        $this->assertEquals(52.220, $jpg->lng);
-        $this->assertEquals(28.123, $jpg->lat);
-        $this->assertEquals(-1500, $jpg->metadata['gps_altitude']);
-        $this->assertEquals(2.6, $jpg->metadata['area']);
-        // Import should update but not destroy existing metadata.
-        $this->assertEquals(10, $jpg->metadata['distance_to_ground']);
-        $this->assertEquals(4000, $jpg->metadata['water_depth']);
-        $this->assertEquals(180, $jpg->metadata['yaw']);
-
-        $this->assertNull($png->taken_at);
-        $this->assertNull($png->lng);
-        $this->assertNull($png->lat);
-        $this->assertEmpty($png->metadata);
-    }
-
-    public function testStoreStringMetadata()
-    {
-        $id = $this->volume()->id;
-
-        $this->beAdmin();
+        Queue::assertPushed(UpdateVolumeMetadata::class, function ($job) {
+            $this->assertEquals($this->volume()->id, $job->volume->id);
 
-        $this->postJson("/api/v1/volumes/{$id}/metadata", ['metadata_csv' => "metadata_string"])
-            ->assertStatus(422);
+            return true;
+        });
     }
 
-    public function testStoreDeprecatedFileAttribute()
+    public function testStoreImageMetadataInvalid()
     {
         $id = $this->volume()->id;
-
-        $image = ImageTest::create([
-            'filename' => 'abc.jpg',
-            'volume_id' => $id,
-            'attrs' => ['metadata' => [
-                'water_depth' => 4000,
-                'distance_to_ground' => 20,
-            ]],
-        ]);
-
-        $csv = new UploadedFile(__DIR__."/../../../../../files/image-metadata.csv", 'metadata.csv', 'text/csv', null, true);
-
+        $csv = new UploadedFile(__DIR__."/../../../../../files/image-metadata-invalid.csv", 'image-metadata-invalid.csv', 'text/csv', null, true);
         $this->beAdmin();
         $this->postJson("/api/v1/volumes/{$id}/metadata", ['file' => $csv])
-            ->assertSuccessful();
-
-        $image->refresh();
-        $this->assertEquals(4000, $image->metadata['water_depth']);
-        $this->assertEquals(10, $image->metadata['distance_to_ground']);
-        $this->assertEquals(2.6, $image->metadata['area']);
-    }
-
-    public function testStoreImageMetadataText()
-    {
-        $id = $this->volume()->id;
-
-        $image = ImageTest::create([
-            'filename' => 'abc.jpg',
-            'volume_id' => $id,
-            'attrs' => ['metadata' => [
-                'water_depth' => 4000,
-                'distance_to_ground' => 20,
-            ]],
-        ]);
-
-        $this->beAdmin();
-        $this->postJson("/api/v1/volumes/{$id}/metadata", [
-            'metadata_text' => "filename,area,distance_to_ground\nabc.jpg,2.5,10",
-        ])->assertSuccessful();
-
-        $image->refresh();
-        $this->assertEquals(4000, $image->metadata['water_depth']);
-        $this->assertEquals(10, $image->metadata['distance_to_ground']);
-        $this->assertEquals(2.5, $image->metadata['area']);
+            ->assertStatus(422);
     }
 
     public function testStoreVideoMetadataCsv()
@@ -169,313 +89,30 @@ public function testStoreVideoMetadataCsv()
         $this->volume()->media_type_id = MediaType::videoId();
         $this->volume()->save();
 
-        $video = VideoTest::create([
-            'filename' => 'abc.mp4',
-            'volume_id' => $id,
-            'taken_at' => ['2016-12-19 12:27:00', '2016-12-19 12:28:00'],
-            'attrs' => ['metadata' => [
-                'distance_to_ground' => [20, 120],
-            ]],
-        ]);
-
         $csv = new UploadedFile(__DIR__."/../../../../../files/video-metadata.csv", 'metadata.csv', 'text/csv', null, true);
 
         $this->beAdmin();
         $this->postJson("/api/v1/volumes/{$id}/metadata", ['file' => $csv])
             ->assertSuccessful();
 
-        $video->refresh();
-        $this->assertSame([10, 5], $video->metadata['distance_to_ground']);
-        $this->assertSame([180, 181], $video->metadata['yaw']);
-    }
-
-    public function testStoreVideoMetadataText()
-    {
-        $id = $this->volume()->id;
-        $this->volume()->media_type_id = MediaType::videoId();
-        $this->volume()->save();
-
-        $video = VideoTest::create([
-            'filename' => 'abc.mp4',
-            'volume_id' => $id,
-            'taken_at' => ['2022-02-24 16:07:00', '2022-02-24 16:08:00'],
-            'attrs' => ['metadata' => [
-                'water_depth' => [4000, 4100],
-                'distance_to_ground' => [20, 120],
-            ]],
-        ]);
-
-        $text = <<<TEXT
-filename,taken_at,area,distance_to_ground
-abc.mp4,2022-02-24 16:07:00,2.5,10
-abc.mp4,2022-02-24 16:08:00,3.5,150
-TEXT;
-
-        $this->beAdmin();
-        $this->postJson("/api/v1/volumes/{$id}/metadata", [
-            'metadata_text' => $text,
-        ])->assertSuccessful();
-
-        $video->refresh();
-        $this->assertCount(2, $video->taken_at);
-        $this->assertSame([4000, 4100], $video->metadata['water_depth']);
-        $this->assertSame([10, 150], $video->metadata['distance_to_ground']);
-        $this->assertSame([2.5, 3.5], $video->metadata['area']);
-    }
-
-    public function testStoreVideoMetadataMerge()
-    {
-        $id = $this->volume()->id;
-        $this->volume()->media_type_id = MediaType::videoId();
-        $this->volume()->save();
-
-        $video = VideoTest::create([
-            'filename' => 'abc.mp4',
-            'volume_id' => $id,
-            'taken_at' => ['2022-02-24 16:07:00', '2022-02-24 16:08:00'],
-            'attrs' => ['metadata' => [
-                'water_depth' => [4000, 4100],
-                'distance_to_ground' => [20, 120],
-            ]],
-        ]);
-
-        $text = <<<TEXT
-filename,taken_at,area,distance_to_ground
-abc.mp4,2022-02-24 16:07:00,2.5,
-abc.mp4,2022-02-24 16:09:00,3.5,150
-TEXT;
+        Queue::assertPushed(UpdateVolumeMetadata::class, function ($job) {
+            $this->assertEquals($this->volume()->id, $job->volume->id);
 
-        $this->beAdmin();
-        $this->postJson("/api/v1/volumes/{$id}/metadata", [
-            'metadata_text' => $text,
-        ])->assertSuccessful();
-
-        $video->refresh();
-        $this->assertCount(3, $video->taken_at);
-        $this->assertSame([4000, 4100, null], $video->metadata['water_depth']);
-        $this->assertSame([20, 120, 150], $video->metadata['distance_to_ground']);
-        $this->assertSame([2.5, null, 3.5], $video->metadata['area']);
+            return true;
+        });
     }
 
-    public function testStoreVideoMetadataFillOneVideoButNotTheOther()
+    public function testStoreMetadataIncorrectEncoding()
     {
         $id = $this->volume()->id;
-        $this->volume()->media_type_id = MediaType::videoId();
-        $this->volume()->save();
 
-        $video1 = VideoTest::create([
-            'filename' => 'abc.mp4',
-            'volume_id' => $id,
-            'taken_at' => ['2022-02-24 16:07:00', '2022-02-24 16:08:00'],
-            'attrs' => ['metadata' => [
-                'distance_to_ground' => [20, 120],
-            ]],
-        ]);
-
-        $video2 = VideoTest::create([
-            'filename' => 'def.mp4',
-            'volume_id' => $id,
-            'taken_at' => ['2022-02-24 16:07:00', '2022-02-24 16:08:00'],
-            'attrs' => ['metadata' => []],
-        ]);
-
-        $text = <<<TEXT
-filename,taken_at,area,distance_to_ground
-abc.mp4,2022-02-24 16:07:00,2.5,10
-abc.mp4,2022-02-24 16:09:00,3.5,150
-def.mp4,2022-02-24 16:07:00,2.5,
-def.mp4,2022-02-24 16:09:00,3.5,
-TEXT;
-
-        $this->beAdmin();
-        $this->postJson("/api/v1/volumes/{$id}/metadata", [
-            'metadata_text' => $text,
-        ])->assertSuccessful();
-
-        $video1->refresh();
-        $video2->refresh();
-        $this->assertSame([10, 120, 150], $video1->metadata['distance_to_ground']);
-        $this->assertArrayNotHasKey('distance_to_ground', $video2->metadata);
-    }
-
-    public function testStoreVideoMetadataCannotUpdateTimestampedWithBasic()
-    {
-        $id = $this->volume()->id;
-        $this->volume()->media_type_id = MediaType::videoId();
-        $this->volume()->save();
-
-        $video = VideoTest::create([
-            'filename' => 'abc.mp4',
-            'volume_id' => $id,
-            'taken_at' => ['2022-02-24 16:07:00', '2022-02-24 16:08:00'],
-            'attrs' => ['metadata' => [
-                'water_depth' => [4000, 4100],
-                'distance_to_ground' => [20, 120],
-            ]],
-        ]);
-
-        $this->beAdmin();
-        // The video has timestamped metadata. There is no way the new area data without
-        // timestamp can be merged into the timestamped data.
-        $this->postJson("/api/v1/volumes/{$id}/metadata", [
-            'metadata_text' => "filename,area\nabc.mp4,2.5",
-        ])->assertStatus(422);
-    }
-
-    public function testStoreVideoMetadataCannotUpdateBasicWithTimestamped()
-    {
-        $id = $this->volume()->id;
-        $this->volume()->media_type_id = MediaType::videoId();
-        $this->volume()->save();
-
-        $video = VideoTest::create([
-            'filename' => 'abc.mp4',
-            'volume_id' => $id,
-            'attrs' => ['metadata' => [
-                'water_depth' => [4000],
-                'distance_to_ground' => [20],
-            ]],
-        ]);
-
-        $text = <<<TEXT
-filename,taken_at,area,distance_to_ground
-abc.mp4,2022-02-24 16:07:00,2.5,10
-abc.mp4,2022-02-24 16:09:00,3.5,150
-TEXT;
-
-        $this->beAdmin();
-        // The video has basic metadata. There is no way the new area data with
-        // timestamp can be merged into the basic data.
-        $this->postJson("/api/v1/volumes/{$id}/metadata", [
-            'metadata_text' => $text,
-        ])->assertStatus(422);
-    }
-
-    public function testStoreVideoMetadataZerosSingle()
-    {
-        $id = $this->volume()->id;
-        $this->volume()->media_type_id = MediaType::videoId();
-        $this->volume()->save();
-
-        $video = VideoTest::create([
-            'filename' => 'abc.mp4',
-            'volume_id' => $id,
-        ]);
-
-        $text = <<<TEXT
-filename,taken_at,area
-abc.mp4,2022-02-24 16:07:00,0
-TEXT;
-
-        $this->beAdmin();
-        $this->postJson("/api/v1/volumes/{$id}/metadata", [
-            'metadata_text' => $text,
-        ])->assertSuccessful();
-
-        $video->refresh();
-        $this->assertSame([0], $video->metadata['area']);
-    }
-
-    public function testStoreVideoMetadataZeros()
-    {
-        $id = $this->volume()->id;
-        $this->volume()->media_type_id = MediaType::videoId();
-        $this->volume()->save();
-
-        $video = VideoTest::create([
-            'filename' => 'abc.mp4',
-            'volume_id' => $id,
-        ]);
-
-        $text = <<<TEXT
-filename,taken_at,area
-abc.mp4,2022-02-24 16:07:00,0
-abc.mp4,2022-02-24 16:08:00,1
-TEXT;
-
-        $this->beAdmin();
-        $this->postJson("/api/v1/volumes/{$id}/metadata", [
-            'metadata_text' => $text,
-        ])->assertSuccessful();
-
-        $video->refresh();
-        $this->assertSame([0, 1], $video->metadata['area']);
-    }
-
-    public function testStoreVideoMetadataIncorrectEncoding()
-    {
-        $id = $this->volume()->id;
-        $this->volume()->media_type_id = MediaType::videoId();
-        $this->volume()->save();
-
-        $video = VideoTest::create([
-            'filename' => 'my-video.mp4',
-            'volume_id' => $id,
-        ]);
-
-        $csv = new UploadedFile(__DIR__."/../../../../../files/video-metadata-incorrect-encoding.csv", 'metadata.csv', 'text/csv', null, true);
+        $csv = new UploadedFile(__DIR__."/../../../../../files/image-metadata-strange-encoding.csv", 'metadata.csv', 'text/csv', null, true);
 
         $this->beAdmin();
         $this->postJson("/api/v1/volumes/{$id}/metadata", ['file' => $csv])
             ->assertStatus(422);
     }
 
-    public function testStoreImageIfdoFile()
-    {
-        $id = $this->volume()->id;
-        $this->beAdmin();
-        $file = new UploadedFile(__DIR__."/../../../../../files/image-ifdo.yaml", 'ifdo.yaml', 'application/yaml', null, true);
-
-        Storage::fake('ifdos');
-
-        $this->assertFalse($this->volume()->hasIfdo());
-
-        $this->postJson("/api/v1/volumes/{$id}/metadata", ['ifdo_file' => $file])
-            ->assertSuccessful();
-
-        $this->assertTrue($this->volume()->hasIfdo());
-    }
-
-    public function testStoreVideoIfdoFile()
-    {
-        $id = $this->volume()->id;
-        $this->volume()->media_type_id = MediaType::videoId();
-        $this->volume()->save();
-        $this->beAdmin();
-        $file = new UploadedFile(__DIR__."/../../../../../files/video-ifdo.yaml", 'ifdo.yaml', 'application/yaml', null, true);
-
-        Storage::fake('ifdos');
-
-        $this->assertFalse($this->volume()->hasIfdo());
-
-        $this->postJson("/api/v1/volumes/{$id}/metadata", ['ifdo_file' => $file])
-            ->assertSuccessful();
-
-        $this->assertTrue($this->volume()->hasIfdo());
-    }
-
-    public function testStoreVideoIfdoFileForImageVolume()
-    {
-        $id = $this->volume()->id;
-        $this->beAdmin();
-        $file = new UploadedFile(__DIR__."/../../../../../files/video-ifdo.yaml", 'ifdo.yaml', 'application/yaml', null, true);
-
-        $this->postJson("/api/v1/volumes/{$id}/metadata", ['ifdo_file' => $file])
-            ->assertStatus(422);
-    }
-
-    public function testStoreImageIfdoFileForVideoVolume()
-    {
-        $id = $this->volume()->id;
-        $this->volume()->media_type_id = MediaType::videoId();
-        $this->volume()->save();
-        $this->beAdmin();
-        $file = new UploadedFile(__DIR__."/../../../../../files/image-ifdo.yaml", 'ifdo.yaml', 'application/yaml', null, true);
-
-        $this->postJson("/api/v1/volumes/{$id}/metadata", ['ifdo_file' => $file])
-            ->assertStatus(422);
-    }
-
     public function testDestroy()
     {
         $volume = $this->volume();
diff --git a/tests/php/Jobs/UpdateVolumeMetadataTest.php b/tests/php/Jobs/UpdateVolumeMetadataTest.php
new file mode 100644
index 000000000..15c0907d9
--- /dev/null
+++ b/tests/php/Jobs/UpdateVolumeMetadataTest.php
@@ -0,0 +1,291 @@
+<?php
+
+namespace Biigle\Tests\Jobs;
+
+use Biigle\Image;
+use Biigle\Jobs\UpdateVolumeMetadata;
+use Biigle\MediaType;
+use Biigle\Video;
+use Biigle\Volume;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\Storage;
+use TestCase;
+
+class UpdateVolumeMetadataTest extends TestCase
+{
+    public function testHandleImageAdd()
+    {
+        $this->markTestIncomplete('clear geo info cache');
+        $volume = Volume::factory()->create([
+            'media_type_id' => MediaType::imageId(),
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+
+        $image = Image::factory()->create([
+            'filename' => 'a.jpg',
+            'volume_id' => $volume->id,
+            'attrs' => [
+                'size' => 100,
+            ],
+        ]);
+
+
+        $disk = Storage::fake('metadata');
+        $disk->put($volume->metadata_file_path, <<<CSV
+        filename,taken_at,lng,lat,gps_altitude,distance_to_ground,area,yaw
+        a.jpg,2016-12-19 12:27:00,52.220,28.123,-1500,10,2.6,180
+        CSV);
+
+        with(new UpdateVolumeMetadata($volume))->handle();
+        $image->refresh();
+        $this->assertEquals(100, $image->size);
+        $this->assertEquals('2016-12-19 12:27:00', $image->taken_at);
+        $this->assertEquals(52.220, $image->lng);
+        $this->assertEquals(28.123, $image->lat);
+        $this->assertEquals(-1500, $image->metadata['gps_altitude']);
+        $this->assertEquals(10, $image->metadata['distance_to_ground']);
+        $this->assertEquals(2.6, $image->metadata['area']);
+        $this->assertEquals(180, $image->metadata['yaw']);
+    }
+
+    public function testHandleImageUpdate()
+    {
+        $volume = Volume::factory()->create([
+            'media_type_id' => MediaType::imageId(),
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+
+        $image = Image::factory()->create([
+            'filename' => 'a.jpg',
+            'volume_id' => $volume->id,
+            'taken_at' => '2024-03-12 11:23:00',
+            'lng' => 12,
+            'lat' => 34,
+            'attrs' => [
+                'size' => 100,
+                'metadata' => [
+                    'gps_altitude' => -1000,
+                    'distance_to_ground' => 5,
+                    'area' => 2.5,
+                    'yaw' => 100,
+                ],
+            ],
+        ]);
+
+
+        $disk = Storage::fake('metadata');
+        $disk->put($volume->metadata_file_path, <<<CSV
+        filename,taken_at,lng,lat,gps_altitude,distance_to_ground,area,yaw
+        a.jpg,2016-12-19 12:27:00,52.220,28.123,-1500,10,2.6,180
+        CSV);
+
+        with(new UpdateVolumeMetadata($volume))->handle();
+        $image->refresh();
+        $this->assertEquals(100, $image->size);
+        $this->assertEquals('2016-12-19 12:27:00', $image->taken_at);
+        $this->assertEquals(52.220, $image->lng);
+        $this->assertEquals(28.123, $image->lat);
+        $this->assertEquals(-1500, $image->metadata['gps_altitude']);
+        $this->assertEquals(10, $image->metadata['distance_to_ground']);
+        $this->assertEquals(2.6, $image->metadata['area']);
+        $this->assertEquals(180, $image->metadata['yaw']);
+    }
+
+    public function testHandleImageMerge()
+    {
+        $volume = Volume::factory()->create([
+            'media_type_id' => MediaType::imageId(),
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+
+        $image = Image::factory()->create([
+            'filename' => 'a.jpg',
+            'volume_id' => $volume->id,
+            'lng' => 12,
+            'lat' => 34,
+            'attrs' => [
+                'size' => 100,
+                'metadata' => [
+                    'gps_altitude' => -1000,
+                    'distance_to_ground' => 5,
+                ],
+            ],
+        ]);
+
+
+        $disk = Storage::fake('metadata');
+        $disk->put($volume->metadata_file_path, <<<CSV
+        filename,taken_at,gps_altitude,
+        a.jpg,2016-12-19 12:27:00,-1500
+        CSV);
+
+        with(new UpdateVolumeMetadata($volume))->handle();
+        $image->refresh();
+        $this->assertEquals(100, $image->size);
+        $this->assertEquals('2016-12-19 12:27:00', $image->taken_at);
+        $this->assertEquals(12, $image->lng);
+        $this->assertEquals(34, $image->lat);
+        $this->assertEquals(-1500, $image->metadata['gps_altitude']);
+        $this->assertEquals(5, $image->metadata['distance_to_ground']);
+        $this->assertArrayNotHasKey('area', $image->metadata);
+        $this->assertArrayNotHasKey('yaw', $image->metadata);
+    }
+
+    public function testHandleVideoAdd()
+    {
+        $this->markTestIncomplete('clear geo info cache');
+        $volume = Volume::factory()->create([
+            'media_type_id' => MediaType::videoId(),
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+
+        $video = Video::factory()->create([
+            'filename' => 'a.mp4',
+            'volume_id' => $volume->id,
+            'attrs' => [
+                'size' => 100,
+            ],
+        ]);
+
+
+        $disk = Storage::fake('metadata');
+        $disk->put($volume->metadata_file_path, <<<CSV
+        filename,taken_at,lng,lat,gps_altitude,distance_to_ground,area,yaw
+        a.mp4,2016-12-19 12:27:00,52.220,28.123,-1500,10,2.6,180
+        CSV);
+
+        with(new UpdateVolumeMetadata($volume))->handle();
+        $video->refresh();
+        $this->assertEquals(100, $video->size);
+        $this->assertEquals([Carbon::parse('2016-12-19 12:27:00')], $video->taken_at);
+        $this->assertEquals([52.220], $video->lng);
+        $this->assertEquals([28.123], $video->lat);
+        $this->assertEquals([-1500], $video->metadata['gps_altitude']);
+        $this->assertEquals([10], $video->metadata['distance_to_ground']);
+        $this->assertEquals([2.6], $video->metadata['area']);
+        $this->assertEquals([180], $video->metadata['yaw']);
+    }
+
+    public function testHandleVideoUpdate()
+    {
+        $volume = Volume::factory()->create([
+            'media_type_id' => MediaType::videoId(),
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+
+        $video = Video::factory()->create([
+            'filename' => 'a.mp4',
+            'volume_id' => $volume->id,
+            'taken_at' => ['2024-03-12 11:23:00'],
+            'lng' => [12],
+            'lat' => [34],
+            'attrs' => [
+                'size' => 100,
+                'metadata' => [
+                    'gps_altitude' => [-1000],
+                    'distance_to_ground' => [5],
+                    'area' => [2.5],
+                    'yaw' => [100],
+                ],
+            ],
+        ]);
+
+
+        $disk = Storage::fake('metadata');
+        $disk->put($volume->metadata_file_path, <<<CSV
+        filename,taken_at,lng,lat,gps_altitude,distance_to_ground,area,yaw
+        a.mp4,2016-12-19 12:27:00,52.220,28.123,-1500,10,2.6,180
+        CSV);
+
+        with(new UpdateVolumeMetadata($volume))->handle();
+        $video->refresh();
+        $this->assertEquals(100, $video->size);
+        $this->assertEquals([Carbon::parse('2016-12-19 12:27:00')], $video->taken_at);
+        $this->assertEquals([52.220], $video->lng);
+        $this->assertEquals([28.123], $video->lat);
+        $this->assertEquals([-1500], $video->metadata['gps_altitude']);
+        $this->assertEquals([10], $video->metadata['distance_to_ground']);
+        $this->assertEquals([2.6], $video->metadata['area']);
+        $this->assertEquals([180], $video->metadata['yaw']);
+    }
+
+    public function testHandleVideoMergeWithoutTakenAt()
+    {
+        $volume = Volume::factory()->create([
+            'media_type_id' => MediaType::videoId(),
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+
+        $video = Video::factory()->create([
+            'filename' => 'a.mp4',
+            'volume_id' => $volume->id,
+            'lng' => [12],
+            'lat' => [34],
+            'attrs' => [
+                'size' => 100,
+                'metadata' => [
+                    'gps_altitude' => [-1000],
+                    'distance_to_ground' => [5],
+                ],
+            ],
+        ]);
+
+
+        $disk = Storage::fake('metadata');
+        $disk->put($volume->metadata_file_path, <<<CSV
+        filename,gps_altitude,
+        a.mp4,-1500
+        CSV);
+
+        with(new UpdateVolumeMetadata($volume))->handle();
+        $video->refresh();
+        $this->assertEquals(100, $video->size);
+        $this->assertNull($video->taken_at);
+        $this->assertEquals([12], $video->lng);
+        $this->assertEquals([34], $video->lat);
+        $this->assertEquals([-1500], $video->metadata['gps_altitude']);
+        $this->assertEquals([5], $video->metadata['distance_to_ground']);
+        $this->assertArrayNotHasKey('area', $video->metadata);
+        $this->assertArrayNotHasKey('yaw', $video->metadata);
+    }
+
+    public function testHandleVideoReplaceWithTakenAt()
+    {
+        $volume = Volume::factory()->create([
+            'media_type_id' => MediaType::videoId(),
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+
+        $video = Video::factory()->create([
+            'filename' => 'a.mp4',
+            'volume_id' => $volume->id,
+            'lng' => [12],
+            'lat' => [34],
+            'attrs' => [
+                'size' => 100,
+                'metadata' => [
+                    'gps_altitude' => [-1000],
+                    'distance_to_ground' => [5],
+                ],
+            ],
+        ]);
+
+
+        $disk = Storage::fake('metadata');
+        $disk->put($volume->metadata_file_path, <<<CSV
+        filename,taken_at,gps_altitude,
+        a.mp4,2016-12-19 12:27:00,-1500
+        CSV);
+
+        with(new UpdateVolumeMetadata($volume))->handle();
+        $video->refresh();
+        $this->assertEquals(100, $video->size);
+        $this->assertEquals([Carbon::parse('2016-12-19 12:27:00')], $video->taken_at);
+        $this->assertNull($video->lng);
+        $this->assertNull($video->lat);
+        $this->assertEquals([-1500], $video->metadata['gps_altitude']);
+        $this->assertArrayNotHasKey('distance_to_ground', $video->metadata);
+        $this->assertArrayNotHasKey('area', $video->metadata);
+        $this->assertArrayNotHasKey('yaw', $video->metadata);
+    }
+}
diff --git a/tests/php/Services/MetadataParsing/ImageCsvParserTest.php b/tests/php/Services/MetadataParsing/ImageCsvParserTest.php
index 1100aa2b3..71d556a5c 100644
--- a/tests/php/Services/MetadataParsing/ImageCsvParserTest.php
+++ b/tests/php/Services/MetadataParsing/ImageCsvParserTest.php
@@ -23,6 +23,10 @@ public function testRecognizesFile()
         $file = new File(__DIR__."/../../../files/test.mp4");
         $parser = new ImageCsvParser($file);
         $this->assertFalse($parser->recognizesFile());
+
+        $file = new File(__DIR__."/../../../files/image-metadata-strange-encoding.csv");
+        $parser = new ImageCsvParser($file);
+        $this->assertFalse($parser->recognizesFile());
     }
 
     public function testGetMetadata()
diff --git a/tests/php/Services/MetadataParsing/VideoCsvParserTest.php b/tests/php/Services/MetadataParsing/VideoCsvParserTest.php
index 4bc75ec46..c9f5e2278 100644
--- a/tests/php/Services/MetadataParsing/VideoCsvParserTest.php
+++ b/tests/php/Services/MetadataParsing/VideoCsvParserTest.php
@@ -19,6 +19,10 @@ public function testRecognizesFile()
         $file = new File(__DIR__."/../../../files/test.mp4");
         $parser = new VideoCsvParser($file);
         $this->assertFalse($parser->recognizesFile());
+
+        $file = new File(__DIR__."/../../../files/video-metadata-strange-encoding.csv");
+        $parser = new VideoCsvParser($file);
+        $this->assertFalse($parser->recognizesFile());
     }
 
     public function testGetMetadata()
@@ -196,7 +200,7 @@ public function testGetMetadataStrangeEncoding()
         $parser = new VideoCsvParser($file);
         $data = $parser->getMetadata();
         $this->assertCount(1, $data->getFiles());
-        $this->assertCount(1, $data->getFiles()->first()->getFrames());
+        $this->assertCount(0, $data->getFiles()->first()->getFrames());
     }
 }
 

From ddf8e1ec0a16c9993bd33c91eeabf3472e0da22a Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Tue, 12 Mar 2024 14:40:25 +0100
Subject: [PATCH 026/209] Update CloneImagesorVideos job with new metadata
 handling

---
 app/Http/Controllers/Api/VolumeController.php |  3 ++
 app/Jobs/CloneImagesOrVideos.php              | 23 ++++---------
 .../Controllers/Api/VolumeControllerTest.php  | 34 ++++++++++++-------
 tests/php/Jobs/CloneImagesOrVideosTest.php    | 21 ++++++------
 4 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/app/Http/Controllers/Api/VolumeController.php b/app/Http/Controllers/Api/VolumeController.php
index 2ced33713..ee0672618 100644
--- a/app/Http/Controllers/Api/VolumeController.php
+++ b/app/Http/Controllers/Api/VolumeController.php
@@ -192,6 +192,9 @@ public function clone(CloneVolume $request)
             $copy->name = $request->input('name', $volume->name);
             $copy->creating_async = true;
             $copy->save();
+            if ($volume->hasMetadata()) {
+                $copy->update(['metadata_file_path' => $copy->id.'.'.pathinfo($volume->metadata_file_path, PATHINFO_EXTENSION)]);
+            }
             $project->addVolumeId($copy->id);
 
             $job = new CloneImagesOrVideos($request, $copy);
diff --git a/app/Jobs/CloneImagesOrVideos.php b/app/Jobs/CloneImagesOrVideos.php
index 8af39fd47..bfcf9842d 100644
--- a/app/Jobs/CloneImagesOrVideos.php
+++ b/app/Jobs/CloneImagesOrVideos.php
@@ -11,7 +11,6 @@
 use Biigle\Modules\Largo\Jobs\ProcessAnnotatedImage;
 use Biigle\Modules\Largo\Jobs\ProcessAnnotatedVideo;
 use Biigle\Project;
-use Biigle\Traits\ChecksMetadataStrings;
 use Biigle\Video;
 use Biigle\VideoAnnotation;
 use Biigle\VideoAnnotationLabel;
@@ -26,7 +25,7 @@
 
 class CloneImagesOrVideos extends Job implements ShouldQueue
 {
-    use InteractsWithQueue, SerializesModels, ChecksMetadataStrings;
+    use InteractsWithQueue, SerializesModels;
 
 
     /**
@@ -140,9 +139,8 @@ public function handle()
                 $this->postProcessCloning($copy);
             }
 
-            //save ifdo-file if exist
-            if ($volume->hasIfdo()) {
-                $this->copyIfdoFile($volume->id, $copy->id);
+            if ($volume->hasMetadata()) {
+                $this->copyMetadataFile($volume, $copy);
             }
             $copy->creating_async = false;
 
@@ -448,7 +446,6 @@ private function copyVideoAnnotation($volume, $copy, $selectedFileIds, $selected
                 }
                 collect($insertData)->chunk($parameterLimit)->each(fn ($chunk) => VideoAnnotation::insert($chunk->toArray()));
 
-                
                 // Get the IDs of all newly inserted annotations. Ordering is essential.
                 $newAnnotationIds = VideoAnnotation::whereIn('video_id', $chunkNewVideoIds)
                     ->orderBy('id')
@@ -507,16 +504,10 @@ private function copyVideoLabels($volume, $copy, $selectedFileIds, $selectedLabe
             });
     }
 
-    /** Copies ifDo-Files from given volume to volume copy.
-     *
-     * @param int $volumeId
-     * @param int $copyId
-     **/
-    private function copyIfdoFile($volumeId, $copyId)
+    private function copyMetadataFile(Volume $source, Volume $target): void
     {
-        $disk = Storage::disk(config('volumes.ifdo_storage_disk'));
-        $iFdoFilename = $volumeId.".yaml";
-        $copyIFdoFilename = $copyId.".yaml";
-        $disk->copy($iFdoFilename, $copyIFdoFilename);
+        $disk = Storage::disk(config('volumes.metadata_storage_disk'));
+        // The target metadata file path was updated in the controller method.
+        $disk->copy($source->metadata_file_path, $target->metadata_file_path);
     }
 }
diff --git a/tests/php/Http/Controllers/Api/VolumeControllerTest.php b/tests/php/Http/Controllers/Api/VolumeControllerTest.php
index 44c8cdc43..ceba24518 100644
--- a/tests/php/Http/Controllers/Api/VolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/VolumeControllerTest.php
@@ -263,12 +263,7 @@ public function testUpdateRedirect()
 
     public function testCloneVolume()
     {
-        $volume = $this
-            ->volume([
-                'created_at' => '2022-11-09 14:37:00',
-                'updated_at' => '2022-11-09 14:37:00',
-            ])
-            ->fresh();
+        $volume = $this->volume(['metadata_file_path' => 'mymeta.csv']);
         $project = ProjectTest::create();
 
         $this->doTestApiRoute('POST', "/api/v1/volumes/{$volume->id}/clone-to/{$project->id}");
@@ -289,21 +284,34 @@ public function testCloneVolume()
 
         Cache::flush();
 
-        Queue::fake();
-
         $this
             ->postJson("/api/v1/volumes/{$volume->id}/clone-to/{$project->id}")
             ->assertStatus(201);
         Queue::assertPushed(CloneImagesOrVideos::class);
 
-        // The target project.
+        $this->assertTrue($project->volumes()->exists());
+        $copy = $project->volumes()->first();
+        $this->assertEquals($copy->name, $this->volume()->name);
+        $this->assertEquals($copy->media_type_id, $this->volume()->media_type_id);
+        $this->assertEquals($copy->url, $this->volume()->url);
+        $this->assertTrue($copy->creating_async);
+        $this->assertEquals("{$copy->id}.csv", $copy->metadata_file_path);
+    }
+
+    public function testCloneVolumeNewName()
+    {
+        $volume = $this->volume(['name' => 'myvolume']);
         $project = ProjectTest::create();
+        $project->addUserId($this->admin()->id, Role::adminId());
 
         $this->beAdmin();
-        $project->addUserId($this->admin()->id, Role::adminId());
 
-        $response = $this->postJson("/api/v1/volumes/{$volume->id}/clone-to/{$project->id}");
-        $response->assertStatus(201);
-        Queue::assertPushed(CloneImagesOrVideos::class);
+        $this
+            ->postJson("/api/v1/volumes/{$volume->id}/clone-to/{$project->id}", [
+                'name' => 'volumecopy',
+            ])
+            ->assertStatus(201);
+        $copy = $project->volumes()->first();
+        $this->assertEquals($copy->name, 'volumecopy');
     }
 }
diff --git a/tests/php/Jobs/CloneImagesOrVideosTest.php b/tests/php/Jobs/CloneImagesOrVideosTest.php
index 568bdd8f0..e016c605f 100644
--- a/tests/php/Jobs/CloneImagesOrVideosTest.php
+++ b/tests/php/Jobs/CloneImagesOrVideosTest.php
@@ -2,6 +2,7 @@
 
 namespace Biigle\Tests\Jobs;
 
+use ApiTestCase;
 use Biigle\Jobs\CloneImagesOrVideos;
 use Biigle\Jobs\ProcessNewVolumeFiles;
 use Biigle\MediaType;
@@ -24,7 +25,7 @@
 use Illuminate\Support\Facades\Queue;
 use Illuminate\Support\Facades\Storage;
 
-class CloneImagesOrVideosTest extends \ApiTestCase
+class CloneImagesOrVideosTest extends ApiTestCase
 {
     public function testCloneImageVolume()
     {
@@ -572,9 +573,9 @@ public function testCloneVolumeVideoWithoutAnnotations()
         $this->assertEmpty($newVideo->annotations()->get());
     }
 
-    public function testCloneVolumeIfDoFiles()
+    public function testCloneVolumeMetadataFile()
     {
-        Event::fake();
+        Storage::fake('metadata');
         $volume = $this->volume([
             'media_type_id' => MediaType::imageId(),
             'created_at' => '2022-11-09 14:37:00',
@@ -582,13 +583,13 @@ public function testCloneVolumeIfDoFiles()
         ])->fresh();
 
         $copy = $volume->replicate();
+        $copy->metadata_file_path = 'mymeta.csv';
         $copy->save();
         // Use fresh() to load even the null fields.
 
-        Storage::fake('ifdos');
-        $csv = __DIR__."/../../files/image-ifdo.yaml";
-        $file = new UploadedFile($csv, 'ifdo.yaml', 'application/yaml', null, true);
-        $volume->saveIfdo($file);
+        $csv = __DIR__."/../../files/image-metadata.csv";
+        $file = new UploadedFile($csv, 'metadata.csv', 'text/csv', null, true);
+        $volume->saveMetadata($file);
 
         // The target project.
         $project = ProjectTest::create();
@@ -597,12 +598,10 @@ public function testCloneVolumeIfDoFiles()
         $request = new Request(['project' => $project, 'volume' => $volume]);
 
         with(new CloneImagesOrVideos($request, $copy))->handle();
-        Event::assertDispatched('volume.cloned');
         $copy = $project->volumes()->first();
 
-        $this->assertNotNull($copy->getIfdo());
-        $this->assertTrue($copy->hasIfdo());
-        $this->assertEquals($volume->getIfdo(), $copy->getIfdo());
+        $this->assertTrue($copy->hasMetadata());
+        $this->assertNotNull($copy->getMetadata());
     }
 
     public function testHandleVolumeImages()

From 1a5c2e8bda86990d5da4ce872a6dc9738d245f9e Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Tue, 12 Mar 2024 14:50:14 +0100
Subject: [PATCH 027/209] Fix destructor of StoreVolume request

The File facade may not be available at this point.
---
 app/Http/Requests/StoreVolume.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Requests/StoreVolume.php b/app/Http/Requests/StoreVolume.php
index 9560f3f96..6a7fc4f46 100644
--- a/app/Http/Requests/StoreVolume.php
+++ b/app/Http/Requests/StoreVolume.php
@@ -38,7 +38,7 @@ class StoreVolume extends FormRequest
      */
     function __destruct() {
         if (isset($this->metadataPath)) {
-            File::delete($this->metadataPath);
+            unlink($this->metadataPath);
         }
     }
 

From dc7192275100043c50c8c7d58a9f919767ee8136 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Tue, 12 Mar 2024 14:58:07 +0100
Subject: [PATCH 028/209] Fix leaking metadata files from tests

---
 app/Volume.php                                      |  6 ++++--
 .../Controllers/Api/ProjectVolumeControllerTest.php | 13 +++++++++----
 .../Api/Volumes/MetadataControllerTest.php          |  2 ++
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/app/Volume.php b/app/Volume.php
index df4d71e06..cf9b41237 100644
--- a/app/Volume.php
+++ b/app/Volume.php
@@ -467,8 +467,10 @@ public function hasMetadata(): bool
     public function saveMetadata(UploadedFile $file): void
     {
         $disk = config('volumes.metadata_storage_disk');
-        $extension = $file->getExtension();
-        $this->metadata_file_path = "{$this->id}.{$extension}";
+        $this->metadata_file_path = $this->id;
+        if ($extension = $file->getExtension()) {
+            $this->metadata_file_path .= '.'.$extension;
+        }
         $file->storeAs('', $this->metadata_file_path, $disk);
         $this->save();
     }
diff --git a/tests/php/Http/Controllers/Api/ProjectVolumeControllerTest.php b/tests/php/Http/Controllers/Api/ProjectVolumeControllerTest.php
index 723f6b2f6..26848c85f 100644
--- a/tests/php/Http/Controllers/Api/ProjectVolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/ProjectVolumeControllerTest.php
@@ -446,11 +446,13 @@ public function testStoreEmptyImageMetadataText()
             ])
             ->assertSuccessful();
 
-        Queue::assertPushed(CreateNewImagesOrVideos::class, fn ($job) => empty($job->metadata));
+        $volume = $this->project()->volumes()->first();
+        $this->assertNull($volume->metadata_file_path);
     }
 
     public function testStoreImageMetadataText()
     {
+        Storage::fake('metadata');
         $id = $this->project()->id;
         $this->beAdmin();
         Storage::disk('test')->makeDirectory('images');
@@ -472,7 +474,7 @@ public function testStoreImageMetadataText()
 
     public function testStoreImageMetadataCsv()
     {
-        Storage::disk('metadata');
+        Storage::fake('metadata');
 
         $id = $this->project()->id;
         $this->beAdmin();
@@ -529,11 +531,13 @@ public function testStoreEmptyVideoMetadataText()
             ])
             ->assertSuccessful();
 
-        Queue::assertPushed(CreateNewImagesOrVideos::class, fn ($job) => empty($job->metadata));
+        $volume = $this->project()->volumes()->first();
+        $this->assertNull($volume->metadata_file_path);
     }
 
     public function testStoreVideoMetadataText()
     {
+        Storage::fake('metadata');
         $id = $this->project()->id;
         $this->beAdmin();
         Storage::disk('test')->makeDirectory('videos');
@@ -555,6 +559,8 @@ public function testStoreVideoMetadataText()
 
     public function testStoreVideoMetadataCsv()
     {
+        Storage::fake('metadata');
+
         $id = $this->project()->id;
         $this->beAdmin();
         $csv = __DIR__."/../../../../files/video-metadata.csv";
@@ -665,7 +671,6 @@ public function testAttach()
 
         $secondProject = ProjectTest::create();
         $pid = $secondProject->id;
-        // $secondProject->addUserId($this->admin()->id, Role::adminId());
 
         $this->doTestApiRoute('POST', "/api/v1/projects/{$pid}/volumes/{$tid}");
 
diff --git a/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php b/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php
index 547b52ae0..8149b6651 100644
--- a/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php
+++ b/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php
@@ -49,6 +49,7 @@ public function testStoreDeprecated()
 
     public function testStoreImageMetadata()
     {
+        Storage::fake('metadata');
         $id = $this->volume()->id;
 
         $this->doTestApiRoute('POST', "/api/v1/volumes/{$id}/metadata");
@@ -85,6 +86,7 @@ public function testStoreImageMetadataInvalid()
 
     public function testStoreVideoMetadataCsv()
     {
+        Storage::fake('metadata');
         $id = $this->volume()->id;
         $this->volume()->media_type_id = MediaType::videoId();
         $this->volume()->save();

From c9afa06e22b2e377967a6fb841c89823009305a5 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Tue, 12 Mar 2024 15:28:25 +0100
Subject: [PATCH 029/209] Fix volume metadata file extension

---
 app/Volume.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Volume.php b/app/Volume.php
index cf9b41237..0e1549f3d 100644
--- a/app/Volume.php
+++ b/app/Volume.php
@@ -468,7 +468,7 @@ public function saveMetadata(UploadedFile $file): void
     {
         $disk = config('volumes.metadata_storage_disk');
         $this->metadata_file_path = $this->id;
-        if ($extension = $file->getExtension()) {
+        if ($extension = $file->getClientOriginalExtension()) {
             $this->metadata_file_path .= '.'.$extension;
         }
         $file->storeAs('', $this->metadata_file_path, $disk);

From b1b9c4a5d876a909cead72615278caa600923846 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Tue, 12 Mar 2024 15:29:42 +0100
Subject: [PATCH 030/209] Update volume edit view for new metadata handling

---
 .../assets/js/volumes/api/parseIfdoFile.js    | 10 ----
 resources/assets/js/volumes/api/volumeIfdo.js |  8 ---
 resources/assets/js/volumes/createForm.vue    |  2 +-
 .../assets/js/volumes/metadataUpload.vue      | 59 +++++--------------
 resources/views/volumes/edit.blade.php        |  2 +-
 .../views/volumes/edit/metadata.blade.php     | 44 +++++---------
 6 files changed, 32 insertions(+), 93 deletions(-)
 delete mode 100644 resources/assets/js/volumes/api/parseIfdoFile.js
 delete mode 100644 resources/assets/js/volumes/api/volumeIfdo.js

diff --git a/resources/assets/js/volumes/api/parseIfdoFile.js b/resources/assets/js/volumes/api/parseIfdoFile.js
deleted file mode 100644
index 388ca7e93..000000000
--- a/resources/assets/js/volumes/api/parseIfdoFile.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Resource for uploading an IFDO file and getting content as JSON.
- *
- * let resource = parseIfdoFile;
- * let data = new FormData();
- * data.append('file', fileInputElement.files[0]);
- *
- * resource.save(data).then(...);
- */
-export default Vue.resource('api/v1/volumes/parse-ifdo');
diff --git a/resources/assets/js/volumes/api/volumeIfdo.js b/resources/assets/js/volumes/api/volumeIfdo.js
deleted file mode 100644
index 6cc046575..000000000
--- a/resources/assets/js/volumes/api/volumeIfdo.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * Resource for getting and deleting iFDO files attached to a volume.
- *
- * let resource = biigle.$require('api.volumeIfdo');
- *
- * resource.delete({id: volumeId}).then(...);
- */
-export default Vue.resource('api/v1/volumes{/id}/ifdo');
diff --git a/resources/assets/js/volumes/createForm.vue b/resources/assets/js/volumes/createForm.vue
index 8f51f06fb..d6638b52f 100644
--- a/resources/assets/js/volumes/createForm.vue
+++ b/resources/assets/js/volumes/createForm.vue
@@ -3,7 +3,7 @@ import BrowserApi from './api/browser';
 import Dropdown from 'uiv/dist/Dropdown';
 import FileBrowser from '../core/components/fileBrowser';
 import LoaderMixin from '../core/mixins/loader';
-import ParseIfdoFileApi from '../volumes/api/parseIfdoFile';
+// import ParseIfdoFileApi from '../volumes/api/parseIfdoFile';
 import {handleErrorResponse} from '../core/messages/store';
 
 const MEDIA_TYPE = {
diff --git a/resources/assets/js/volumes/metadataUpload.vue b/resources/assets/js/volumes/metadataUpload.vue
index 2d4a72c90..cf0211395 100644
--- a/resources/assets/js/volumes/metadataUpload.vue
+++ b/resources/assets/js/volumes/metadataUpload.vue
@@ -2,10 +2,6 @@
 import Dropdown from 'uiv/dist/Dropdown';
 import LoaderMixin from '../core/mixins/loader';
 import MetadataApi from './api/volumeMetadata';
-import ParseIfdoFileApi from './api/parseIfdoFile';
-import VolumeIfdoApi from './api/volumeIfdo';
-import Tab from 'uiv/dist/Tab';
-import Tabs from 'uiv/dist/Tabs';
 import MessageStore from '../core/messages/store';
 
 /**
@@ -14,8 +10,6 @@ import MessageStore from '../core/messages/store';
 export default {
     mixins: [LoaderMixin],
     components: {
-        tabs: Tabs,
-        tab: Tab,
         dropdown: Dropdown,
     },
     data() {
@@ -24,7 +18,7 @@ export default {
             error: false,
             success: false,
             message: undefined,
-            hasIfdo: false,
+            hasMetadata: false,
         };
     },
     computed: {
@@ -37,7 +31,7 @@ export default {
         },
         handleError(response) {
             this.success = false;
-            let knownError = response.body.errors && (response.body.errors.metadata || response.body.errors.ifdo_file || response.body.errors.file);
+            let knownError = response.body.errors && response.body.errors.file;
             if (knownError) {
                 if (Array.isArray(knownError)) {
                     this.error = knownError[0];
@@ -45,59 +39,36 @@ export default {
                     this.error = knownError;
                 }
             } else {
-                MessageStore.handleErrorResponse(response);
+                this.handleErrorResponse(response);
             }
         },
-        submitCsv() {
-            this.$refs.csvInput.click();
+        submitFile() {
+            this.$refs.fileInput.click();
         },
-        uploadCsv(event) {
-            this.startLoading();
-            let data = new FormData();
-            data.append('metadata_csv', event.target.files[0]);
-            this.upload(data)
-                .then(this.handleSuccess, this.handleError)
-                .finally(this.finishLoading);
-        },
-        submitIfdo() {
-            this.$refs.ifdoInput.click();
-        },
-        handleIfdo(event) {
+        handleFile(event) {
             this.startLoading();
             let data = new FormData();
             data.append('file', event.target.files[0]);
-            ParseIfdoFileApi.save(data)
-                .then(this.uploadIfdo)
-                .then(() => this.hasIfdo = true)
+            MetadataApi.save({id: this.volumeId}, data)
+                .then(() => this.hasMetadata = true)
                 .then(this.handleSuccess)
                 .catch(this.handleError)
                 .finally(this.finishLoading);
         },
-        uploadIfdo(response) {
-            let ifdo = response.body;
-            let data = new FormData();
-            data.append('ifdo_file', this.$refs.ifdoInput.files[0]);
-            data.append('metadata_text', ifdo.files.map(row => row.join(',')).join("\n"));
-
-            return this.upload(data);
-        },
-        upload(data) {
-            return MetadataApi.save({id: this.volumeId}, data);
-        },
-        deleteIfdo() {
+        deleteFile() {
             this.startLoading();
-            VolumeIfdoApi.delete({id: this.volumeId})
-                .then(this.handleIfdoDeleted, MessageStore.handleErrorResponse)
+            MetadataApi.delete({id: this.volumeId})
+                .then(this.handleFileDeleted, this.handleErrorResponse)
                 .finally(this.finishLoading);
         },
-        handleIfdoDeleted() {
-            this.hasIfdo = false;
-            MessageStore.success('The iFDO file was deleted.');
+        handleFileDeleted() {
+            this.hasMetadata = false;
+            MessageStore.success('The metadata file was deleted.');
         },
     },
     created() {
         this.volumeId = biigle.$require('volumes.id');
-        this.hasIfdo = biigle.$require('volumes.hasIfdo');
+        this.hasMetadata = biigle.$require('volumes.hasMetadata');
     },
 };
 </script>
diff --git a/resources/views/volumes/edit.blade.php b/resources/views/volumes/edit.blade.php
index 9507de6db..7b52f5e57 100644
--- a/resources/views/volumes/edit.blade.php
+++ b/resources/views/volumes/edit.blade.php
@@ -6,7 +6,7 @@
         biigle.$declare('volumes.id', {!! $volume->id !!});
         biigle.$declare('volumes.annotationSessions', {!! $annotationSessions !!});
         biigle.$declare('volumes.type', '{!! $type !!}');
-        biigle.$declare('volumes.hasIfdo', '{!! $volume->hasIfdo() !!}');
+        biigle.$declare('volumes.hasMetadata', '{!! $volume->hasMetadata() !!}');
     </script>
     @mixin('volumesEditScripts')
 @endpush
diff --git a/resources/views/volumes/edit/metadata.blade.php b/resources/views/volumes/edit/metadata.blade.php
index 56f1769d4..308d14c79 100644
--- a/resources/views/volumes/edit/metadata.blade.php
+++ b/resources/views/volumes/edit/metadata.blade.php
@@ -7,47 +7,33 @@
         @endif
         <span class="pull-right">
             <span class="loader" v-bind:class="{'loader--active':loading}"></span>
-            <dropdown tag="span" v-if="hasIfdo" v-cloak>
-                <button class="btn btn-default btn-xs dropdown-toggle" type="button" title="Manage the iFDO file attached to this volume" :disabled="loading"><img class="ifdo-icon ifdo-icon--btn" src="{{ cachebust_asset('assets/images/ifdo_logo_grey.svg') }}"> iFDO <span class="caret"></span></button>
+            <dropdown tag="span" v-if="hasMetadata" v-cloak>
+                <button class="btn btn-default btn-xs dropdown-toggle" type="button" title="Manage the metadata file attached to this volume" :disabled="loading"><i class="fa fa-file-alt"></i> Manage file <span class="caret"></span></button>
                 <template slot="dropdown">
                     <li>
-                        <a href="{{url("api/v1/volumes/{$volume->id}/ifdo")}}" title="Download the iFDO file">Download</a>
+                        <a href="{{url("api/v1/volumes/{$volume->id}/metadata")}}" title="Download the metadata file">Download</a>
                     </li>
                     <li>
-                        <a href="#" title="Delete the iFDO file" v-on:click.prevent="deleteIfdo">Delete</a>
+                        <a href="#" title="Delete the metadata file" v-on:click.prevent="deleteFile">Delete</a>
                     </li>
                 </template>
             </dropdown>
         </span>
     </div>
     <div class="panel-body">
-        <tabs>
-            <tab title="iFDO file">
-                <p>
-                    Upload an <a href="https://marine-imaging.com/fair/ifdos/iFDO-overview">iFDO file</a> to attach it to the volume and update the @if ($volume->isImageVolume()) image @else video @endif metadata.
-                </p>
-                <form class="form" v-on:submit.prevent="submitIfdo">
-                    <div class="form-group">
-                        <input class="hidden" ref="ifdoInput" type="file" name="file" v-on:change="handleIfdo" accept=".yml,.yaml">
-                        <button class="btn btn-default" type="submit" :disabled="loading">Upload iFDO</button>
-                    </div>
-                </form>
-            </tab>
-            <tab title="CSV file" v-cloak>
-                <p>
-                    Upload a CSV file to update the metadata of the @if ($volume->isImageVolume()) images @else videos @endif of this volume.
-                </p>
-                <form class="form" v-on:submit.prevent="submitCsv">
-                    <div class="form-group">
-                        <input class="hidden" ref="csvInput" type="file" name="file" v-on:change="uploadCsv" accept=".csv,text/csv,application/csv">
-                        <button class="btn btn-default" type="submit" :disabled="loading">Upload CSV</button>
-                    </div>
-                </form>
-            </tab>
-        </tabs>
+        <p>
+            Upload a metadata file to attach it to the volume and update the @if ($volume->isImageVolume()) image @else video @endif metadata.
+        </p>
+        <form class="form" v-on:submit.prevent="submitFile">
+            <div class="form-group">
+                <input class="hidden" ref="fileInput" type="file" name="file" v-on:change="handleFile">
+                <button class="btn btn-default" type="submit" :disabled="loading">Upload file</button>
+            </div>
+        </form>
+
         <div class="alert alert-danger" v-if="error" v-text="error" v-cloak></div>
         <div class="alert alert-success" v-if="success" v-cloak>
-            The @if ($volume->isImageVolume()) image @else video @endif metadata was successfully updated.
+            The @if ($volume->isImageVolume()) image @else video @endif metadata file was successfully updated.
         </div>
         <p class="text-muted">
             Learn more about @if ($volume->isImageVolume()) image @else video @endif metadata and the file formats in the <a href="{{route('manual-tutorials', ['volumes', 'file-metadata'])}}">manual</a>.

From 67746f80cc47bf2a4075406d4f9427eede2c7f1c Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Tue, 12 Mar 2024 15:45:14 +0100
Subject: [PATCH 031/209] Apply CS fixes

---
 app/Http/Requests/StoreVolume.php                  |  8 ++++----
 app/Http/Requests/UpdatePendingVolume.php          |  6 +++---
 app/Jobs/CreateNewImagesOrVideos.php               | 10 ++++------
 app/Policies/PendingVolumePolicy.php               | 14 ++++++++------
 app/Rules/ImageMetadata.php                        |  4 ++--
 app/Services/MetadataParsing/ImageMetadata.php     |  3 +--
 app/Services/MetadataParsing/VideoCsvParser.php    |  2 +-
 app/Services/MetadataParsing/VideoMetadata.php     | 14 ++++----------
 app/Services/MetadataParsing/VolumeMetadata.php    |  3 +--
 app/Volume.php                                     |  2 --
 .../Api/PendingVolumeControllerTest.php            |  2 +-
 .../Api/ProjectVolumeControllerTest.php            | 13 ++++++-------
 .../Api/Volumes/MetadataControllerTest.php         |  2 --
 tests/php/Rules/ImageMetadataTest.php              |  2 +-
 tests/php/Rules/VideoMetadataTest.php              |  2 +-
 .../MetadataParsing/ImageCsvParserTest.php         |  3 +--
 .../MetadataParsing/VideoCsvParserTest.php         |  3 +--
 .../Services/MetadataParsing/VideoMetadataTest.php |  1 -
 .../MetadataParsing/VolumeMetadataTest.php         |  2 +-
 tests/php/VolumeTest.php                           |  3 ---
 20 files changed, 40 insertions(+), 59 deletions(-)

diff --git a/app/Http/Requests/StoreVolume.php b/app/Http/Requests/StoreVolume.php
index 6a7fc4f46..5428dece1 100644
--- a/app/Http/Requests/StoreVolume.php
+++ b/app/Http/Requests/StoreVolume.php
@@ -11,7 +11,6 @@
 use Biigle\Rules\VolumeUrl;
 use Biigle\Services\MetadataParsing\ParserFactory;
 use Biigle\Volume;
-use Exception;
 use File;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Http\UploadedFile;
@@ -36,7 +35,8 @@ class StoreVolume extends FormRequest
     /**
      * Remove potential temporary files.
      */
-    function __destruct() {
+    public function __destruct()
+    {
         if (isset($this->metadataPath)) {
             unlink($this->metadataPath);
         }
@@ -86,8 +86,8 @@ public function rules()
     public function withValidator($validator)
     {
         $validator->after(function ($validator) {
-           // Only validate sample volume files after all other fields have been
-           // validated.
+            // Only validate sample volume files after all other fields have been
+            // validated.
             if ($validator->errors()->isNotEmpty()) {
                 return;
             }
diff --git a/app/Http/Requests/UpdatePendingVolume.php b/app/Http/Requests/UpdatePendingVolume.php
index b8163b60e..a1f6d43f5 100644
--- a/app/Http/Requests/UpdatePendingVolume.php
+++ b/app/Http/Requests/UpdatePendingVolume.php
@@ -4,8 +4,8 @@
 
 use Biigle\PendingVolume;
 use Biigle\Rules\Handle;
-use Biigle\Rules\VolumeUrl;
 use Biigle\Rules\VolumeFiles;
+use Biigle\Rules\VolumeUrl;
 use Illuminate\Foundation\Http\FormRequest;
 
 class UpdatePendingVolume extends FormRequest
@@ -47,8 +47,8 @@ public function rules(): array
     public function withValidator($validator)
     {
         $validator->after(function ($validator) {
-           // Only validate sample volume files after all other fields have been
-           // validated.
+            // Only validate sample volume files after all other fields have been
+            // validated.
             if ($validator->errors()->isNotEmpty()) {
                 return;
             }
diff --git a/app/Jobs/CreateNewImagesOrVideos.php b/app/Jobs/CreateNewImagesOrVideos.php
index 84eaf51b4..e5873a66b 100644
--- a/app/Jobs/CreateNewImagesOrVideos.php
+++ b/app/Jobs/CreateNewImagesOrVideos.php
@@ -3,11 +3,9 @@
 namespace Biigle\Jobs;
 
 use Biigle\Image;
-use Biigle\Rules\ImageMetadata;
 use Biigle\Services\MetadataParsing\VolumeMetadata;
 use Biigle\Video;
 use Biigle\Volume;
-use Carbon\Carbon;
 use DB;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Queue\InteractsWithQueue;
@@ -68,12 +66,12 @@ public function handle()
             $metadata = $this->volume->getMetadata();
 
             if ($this->volume->isImageVolume()) {
-                $chunks->each(fn ($chunk) =>
-                    Image::insert($this->createFiles($chunk->toArray(), $metadata))
+                $chunks->each(
+                    fn ($chunk) => Image::insert($this->createFiles($chunk->toArray(), $metadata))
                 );
             } else {
-                $chunks->each(fn ($chunk) =>
-                    Video::insert($this->createFiles($chunk->toArray(), $metadata))
+                $chunks->each(
+                    fn ($chunk) => Video::insert($this->createFiles($chunk->toArray(), $metadata))
                 );
             }
         });
diff --git a/app/Policies/PendingVolumePolicy.php b/app/Policies/PendingVolumePolicy.php
index f35306b8c..98cafe3fa 100644
--- a/app/Policies/PendingVolumePolicy.php
+++ b/app/Policies/PendingVolumePolicy.php
@@ -32,12 +32,14 @@ public function before($user, $ability)
     public function update(User $user, PendingVolume $pv): bool
     {
         return $user->id === $pv->user_id &&
-            $this->remember("pending-volume-can-update-{$user->id}-{$pv->id}", fn () =>
-                 DB::table('project_user')
-                    ->where('project_id', $pv->project_id)
-                    ->where('user_id', $user->id)
-                    ->where('project_role_id', Role::adminId())
-                    ->exists()
+            $this->remember(
+                "pending-volume-can-update-{$user->id}-{$pv->id}",
+                fn () =>
+                    DB::table('project_user')
+                        ->where('project_id', $pv->project_id)
+                        ->where('user_id', $user->id)
+                        ->where('project_role_id', Role::adminId())
+                        ->exists()
             );
     }
 }
diff --git a/app/Rules/ImageMetadata.php b/app/Rules/ImageMetadata.php
index c743d5286..c7ba060ae 100644
--- a/app/Rules/ImageMetadata.php
+++ b/app/Rules/ImageMetadata.php
@@ -2,9 +2,9 @@
 
 namespace Biigle\Rules;
 
-use Illuminate\Contracts\Validation\Rule;
-use Biigle\Services\MetadataParsing\VolumeMetadata;
 use Biigle\Services\MetadataParsing\FileMetadata;
+use Biigle\Services\MetadataParsing\VolumeMetadata;
+use Illuminate\Contracts\Validation\Rule;
 
 class ImageMetadata implements Rule
 {
diff --git a/app/Services/MetadataParsing/ImageMetadata.php b/app/Services/MetadataParsing/ImageMetadata.php
index 7d2dc3c93..1a680d9ec 100644
--- a/app/Services/MetadataParsing/ImageMetadata.php
+++ b/app/Services/MetadataParsing/ImageMetadata.php
@@ -15,8 +15,7 @@ public function __construct(
         public ?float $distanceToGround = null,
         public ?float $gpsAltitude = null,
         public ?float $yaw = null
-    )
-    {
+    ) {
         parent::__construct($name);
     }
 
diff --git a/app/Services/MetadataParsing/VideoCsvParser.php b/app/Services/MetadataParsing/VideoCsvParser.php
index 616c5ca72..9a66cc517 100644
--- a/app/Services/MetadataParsing/VideoCsvParser.php
+++ b/app/Services/MetadataParsing/VideoCsvParser.php
@@ -36,7 +36,7 @@ public function getMetadata(): VolumeMetadata
                 continue;
             }
 
-             // Use null instead of ''.
+            // Use null instead of ''.
             $takenAt = $getValue($row, 'taken_at') ?: null;
 
             // If the file already exists but takenAt is null, replace the file by newly
diff --git a/app/Services/MetadataParsing/VideoMetadata.php b/app/Services/MetadataParsing/VideoMetadata.php
index 39501b1ca..a18d7f458 100644
--- a/app/Services/MetadataParsing/VideoMetadata.php
+++ b/app/Services/MetadataParsing/VideoMetadata.php
@@ -18,8 +18,7 @@ public function __construct(
         public ?float $distanceToGround = null,
         public ?float $gpsAltitude = null,
         public ?float $yaw = null
-    )
-    {
+    ) {
         parent::__construct($name);
 
         $this->frames = collect([]);
@@ -50,8 +49,7 @@ public function addFrame(
         ?float $distanceToGround = null,
         ?float $gpsAltitude = null,
         ?float $yaw = null
-    ): void
-    {
+    ): void {
         $frame = new ImageMetadata(
             name: $this->name,
             takenAt: $takenAt,
@@ -169,14 +167,10 @@ protected function getInsertDataFrames(): array
         }
 
         // Remove all items that are full of null.
-        $data = array_filter($data, function ($item) {
-            return !empty(array_filter($item, fn ($i) => !is_null($i)));
-        });
+        $data = array_filter($data, fn ($item) => !empty(array_filter($item, fn ($i) => !is_null($i))));
 
         // Remove all items that are full of null.
-        $attrs = array_filter($attrs, function ($item) {
-            return !empty(array_filter($item, fn ($i) => !is_null($i)));
-        });
+        $attrs = array_filter($attrs, fn ($item) => !empty(array_filter($item, fn ($i) => !is_null($i))));
 
         $data['filename'] = $this->name;
 
diff --git a/app/Services/MetadataParsing/VolumeMetadata.php b/app/Services/MetadataParsing/VolumeMetadata.php
index ce5885e29..7a689cf53 100644
--- a/app/Services/MetadataParsing/VolumeMetadata.php
+++ b/app/Services/MetadataParsing/VolumeMetadata.php
@@ -14,8 +14,7 @@ public function __construct(
         public ?string $name = null,
         public ?string $url = null,
         public ?string $handle = null
-    )
-    {
+    ) {
         $this->files = collect([]);
     }
 
diff --git a/app/Volume.php b/app/Volume.php
index 0e1549f3d..bcf701855 100644
--- a/app/Volume.php
+++ b/app/Volume.php
@@ -8,10 +8,8 @@
 use Cache;
 use Carbon\Carbon;
 use DB;
-use Exception;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Http\Response;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Storage;
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
index 3879fcfcd..4195454bf 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
@@ -292,7 +292,7 @@ public function testUpdateHandle()
         ])->id;
 
         $this->beAdmin();
-         // Invalid handle format.
+        // Invalid handle format.
         $this->putJson("/api/v1/pending-volumes/{$id}", [
             'name' => 'my volume no. 1',
             'url' => 'test://images',
diff --git a/tests/php/Http/Controllers/Api/ProjectVolumeControllerTest.php b/tests/php/Http/Controllers/Api/ProjectVolumeControllerTest.php
index 26848c85f..d819e5850 100644
--- a/tests/php/Http/Controllers/Api/ProjectVolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/ProjectVolumeControllerTest.php
@@ -484,13 +484,12 @@ public function testStoreImageMetadataCsv()
         Storage::disk('test')->put('images/abc.jpg', 'abc');
 
         $this->postJson("/api/v1/projects/{$id}/volumes", [
-                'name' => 'my volume no. 1',
-                'url' => 'test://images',
-                'media_type' => 'image',
-                'files' => 'abc.jpg',
-                'metadata_csv' => $file,
-            ])
-            ->assertSuccessful();
+            'name' => 'my volume no. 1',
+            'url' => 'test://images',
+            'media_type' => 'image',
+            'files' => 'abc.jpg',
+            'metadata_csv' => $file,
+        ])->assertSuccessful();
 
         $volume = Volume::orderBy('id', 'desc')->first();
         $this->assertNotNull($volume->metadata_file_path);
diff --git a/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php b/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php
index 8149b6651..d19573602 100644
--- a/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php
+++ b/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php
@@ -5,8 +5,6 @@
 use ApiTestCase;
 use Biigle\Jobs\UpdateVolumeMetadata;
 use Biigle\MediaType;
-use Biigle\Tests\ImageTest;
-use Biigle\Tests\VideoTest;
 use Illuminate\Http\UploadedFile;
 use Queue;
 use Storage;
diff --git a/tests/php/Rules/ImageMetadataTest.php b/tests/php/Rules/ImageMetadataTest.php
index 910297830..9ee4d5410 100644
--- a/tests/php/Rules/ImageMetadataTest.php
+++ b/tests/php/Rules/ImageMetadataTest.php
@@ -3,8 +3,8 @@
 namespace Biigle\Tests\Rules;
 
 use Biigle\Rules\ImageMetadata as ImageMetadataRule;
-use Biigle\Services\MetadataParsing\VolumeMetadata;
 use Biigle\Services\MetadataParsing\ImageMetadata;
+use Biigle\Services\MetadataParsing\VolumeMetadata;
 use TestCase;
 
 class ImageMetadataTest extends TestCase
diff --git a/tests/php/Rules/VideoMetadataTest.php b/tests/php/Rules/VideoMetadataTest.php
index 530acc302..017658a44 100644
--- a/tests/php/Rules/VideoMetadataTest.php
+++ b/tests/php/Rules/VideoMetadataTest.php
@@ -3,8 +3,8 @@
 namespace Biigle\Tests\Rules;
 
 use Biigle\Rules\VideoMetadata as VideoMetadataRule;
-use Biigle\Services\MetadataParsing\VolumeMetadata;
 use Biigle\Services\MetadataParsing\VideoMetadata;
+use Biigle\Services\MetadataParsing\VolumeMetadata;
 use TestCase;
 
 class VideoMetadataTest extends TestCase
diff --git a/tests/php/Services/MetadataParsing/ImageCsvParserTest.php b/tests/php/Services/MetadataParsing/ImageCsvParserTest.php
index 71d556a5c..d324181c6 100644
--- a/tests/php/Services/MetadataParsing/ImageCsvParserTest.php
+++ b/tests/php/Services/MetadataParsing/ImageCsvParserTest.php
@@ -2,9 +2,8 @@
 
 namespace Biigle\Tests\Services\MetadataParsing;
 
-use Biigle\Services\MetadataParsing\ImageCsvParser;
 use Biigle\MediaType;
-use Biigle\Volume;
+use Biigle\Services\MetadataParsing\ImageCsvParser;
 use Symfony\Component\HttpFoundation\File\File;
 use TestCase;
 
diff --git a/tests/php/Services/MetadataParsing/VideoCsvParserTest.php b/tests/php/Services/MetadataParsing/VideoCsvParserTest.php
index c9f5e2278..2b56ae861 100644
--- a/tests/php/Services/MetadataParsing/VideoCsvParserTest.php
+++ b/tests/php/Services/MetadataParsing/VideoCsvParserTest.php
@@ -2,9 +2,8 @@
 
 namespace Biigle\Tests\Services\MetadataParsing;
 
-use Biigle\Services\MetadataParsing\VideoCsvParser;
 use Biigle\MediaType;
-use Biigle\Volume;
+use Biigle\Services\MetadataParsing\VideoCsvParser;
 use Symfony\Component\HttpFoundation\File\File;
 use TestCase;
 
diff --git a/tests/php/Services/MetadataParsing/VideoMetadataTest.php b/tests/php/Services/MetadataParsing/VideoMetadataTest.php
index 647450a53..be359e156 100644
--- a/tests/php/Services/MetadataParsing/VideoMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/VideoMetadataTest.php
@@ -3,7 +3,6 @@
 namespace Biigle\Tests\Services\MetadataParsing;
 
 use Biigle\Services\MetadataParsing\VideoMetadata;
-use Biigle\Services\MetadataParsing\ImageMetadata;
 use TestCase;
 
 class VideoMetadataTest extends TestCase
diff --git a/tests/php/Services/MetadataParsing/VolumeMetadataTest.php b/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
index b2c75cf13..f57b8a5fe 100644
--- a/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
@@ -3,9 +3,9 @@
 namespace Biigle\Tests\Services\MetadataParsing;
 
 use Biigle\MediaType;
-use Biigle\Services\MetadataParsing\VolumeMetadata;
 use Biigle\Services\MetadataParsing\FileMetadata;
 use Biigle\Services\MetadataParsing\ImageMetadata;
+use Biigle\Services\MetadataParsing\VolumeMetadata;
 use TestCase;
 
 class VolumeMetadataTest extends TestCase
diff --git a/tests/php/VolumeTest.php b/tests/php/VolumeTest.php
index 057990121..bdea4bf9e 100644
--- a/tests/php/VolumeTest.php
+++ b/tests/php/VolumeTest.php
@@ -11,13 +11,10 @@
 use Cache;
 use Carbon\Carbon;
 use Event;
-use Exception;
 use Illuminate\Database\QueryException;
 use Illuminate\Http\UploadedFile;
 use ModelTestCase;
 use Storage;
-use Symfony\Component\HttpFoundation\StreamedResponse;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class VolumeTest extends ModelTestCase
 {

From 75b328f1415dac9e7986fbf5daee8c35e3accada Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Tue, 12 Mar 2024 16:00:26 +0100
Subject: [PATCH 032/209] Fix geo info cache in UpdateVolumeMetadata job

---
 app/Jobs/UpdateVolumeMetadata.php           | 2 ++
 tests/php/Jobs/UpdateVolumeMetadataTest.php | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/Jobs/UpdateVolumeMetadata.php b/app/Jobs/UpdateVolumeMetadata.php
index ab0238bf4..c884375ad 100644
--- a/app/Jobs/UpdateVolumeMetadata.php
+++ b/app/Jobs/UpdateVolumeMetadata.php
@@ -62,5 +62,7 @@ public function handle()
                 $file->save();
             }
         }
+
+        $this->volume->flushGeoInfoCache();
     }
 }
diff --git a/tests/php/Jobs/UpdateVolumeMetadataTest.php b/tests/php/Jobs/UpdateVolumeMetadataTest.php
index 15c0907d9..4d94ece3f 100644
--- a/tests/php/Jobs/UpdateVolumeMetadataTest.php
+++ b/tests/php/Jobs/UpdateVolumeMetadataTest.php
@@ -15,7 +15,6 @@ class UpdateVolumeMetadataTest extends TestCase
 {
     public function testHandleImageAdd()
     {
-        $this->markTestIncomplete('clear geo info cache');
         $volume = Volume::factory()->create([
             'media_type_id' => MediaType::imageId(),
             'metadata_file_path' => 'mymeta.csv',
@@ -36,6 +35,8 @@ public function testHandleImageAdd()
         a.jpg,2016-12-19 12:27:00,52.220,28.123,-1500,10,2.6,180
         CSV);
 
+        $this->assertFalse($volume->hasGeoInfo());
+
         with(new UpdateVolumeMetadata($volume))->handle();
         $image->refresh();
         $this->assertEquals(100, $image->size);
@@ -46,6 +47,7 @@ public function testHandleImageAdd()
         $this->assertEquals(10, $image->metadata['distance_to_ground']);
         $this->assertEquals(2.6, $image->metadata['area']);
         $this->assertEquals(180, $image->metadata['yaw']);
+        $this->assertTrue($volume->hasGeoInfo());
     }
 
     public function testHandleImageUpdate()
@@ -133,7 +135,6 @@ public function testHandleImageMerge()
 
     public function testHandleVideoAdd()
     {
-        $this->markTestIncomplete('clear geo info cache');
         $volume = Volume::factory()->create([
             'media_type_id' => MediaType::videoId(),
             'metadata_file_path' => 'mymeta.csv',

From 549e9e358b2004110d278bf7df19f555cbd93e22 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Tue, 12 Mar 2024 16:17:16 +0100
Subject: [PATCH 033/209] Implement create volume v2 storage of metadata file

---
 .../Api/PendingVolumeController.php           | 11 +++
 .../Api/PendingVolumeControllerTest.php       | 78 ++++++++++++++++---
 2 files changed, 77 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/Api/PendingVolumeController.php b/app/Http/Controllers/Api/PendingVolumeController.php
index 88e77ee09..47361471e 100644
--- a/app/Http/Controllers/Api/PendingVolumeController.php
+++ b/app/Http/Controllers/Api/PendingVolumeController.php
@@ -8,6 +8,7 @@
 use Biigle\Volume;
 use DB;
 use Queue;
+use Storage;
 
 class PendingVolumeController extends Controller
 {
@@ -108,6 +109,16 @@ public function update(UpdatePendingVolume $request)
 
             $request->pendingVolume->project->volumes()->attach($volume);
 
+            if ($request->pendingVolume->hasMetadata()) {
+                $volume->update([
+                    'metadata_file_path' => $volume->id.'.'.pathinfo($request->pendingVolume->metadata_file_path, PATHINFO_EXTENSION)
+                ]);
+                $stream = Storage::disk(config('volumes.pending_metadata_storage_disk'))
+                    ->readStream($request->pendingVolume->metadata_file_path);
+                Storage::disk(config('volumes.metadata_storage_disk'))
+                    ->writeStream($volume->metadata_file_path, $stream);
+            }
+
             $files = $request->input('files');
 
             // If too many files should be created, do this asynchronously in the
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
index 4195454bf..8d1431980 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
@@ -182,7 +182,6 @@ public function testUpdateImages()
         $this->putJson("/api/v1/pending-volumes/{$id}", [
             'name' => 'my volume no. 1',
             'url' => 'test',
-            'media_type' => 'image',
             'files' => ['1.jpg', '2.jpg'],
         ])->assertStatus(422);
 
@@ -190,7 +189,6 @@ public function testUpdateImages()
         $this->putJson("/api/v1/pending-volumes/{$id}", [
             'name' => 'my volume no. 1',
             'url' => 'random',
-            'media_type' => 'image',
             'files' => ['1.jpg', '2.jpg'],
         ])->assertStatus(422);
 
@@ -198,7 +196,6 @@ public function testUpdateImages()
         $this->putJson("/api/v1/pending-volumes/{$id}", [
             'name' => 'my volume no. 1',
             'url' => 'test://images',
-            'media_type' => 'image',
             'files' => ['1.jpg', '2.jpg'],
         ])->assertStatus(422);
 
@@ -211,7 +208,6 @@ public function testUpdateImages()
         $this->putJson("/api/v1/pending-volumes/{$id}", [
             'name' => 'my volume no. 1',
             'url' => 'test://images',
-            'media_type' => 'image',
             'files' => [],
         ])->assertStatus(422);
 
@@ -219,7 +215,6 @@ public function testUpdateImages()
         $this->putJson("/api/v1/pending-volumes/{$id}", [
             'name' => 'my volume no. 1',
             'url' => 'test://images',
-            'media_type' => 'image',
             'files' => ['1.jpg', '1.jpg'],
         ])->assertStatus(422);
 
@@ -227,7 +222,6 @@ public function testUpdateImages()
         $this->putJson("/api/v1/pending-volumes/{$id}", [
             'name' => 'my volume no. 1',
             'url' => 'test://images',
-            'media_type' => 'image',
             'files' => ['1.bmp'],
         ])->assertStatus(422);
 
@@ -235,19 +229,16 @@ public function testUpdateImages()
         $this->putJson("/api/v1/pending-volumes/{$id}", [
             'name' => 'my volume no. 1',
             'url' => 'test://images',
-            'media_type' => 'image',
             'files' => ['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.jpg'],
         ])->assertStatus(422);
 
         $response = $this->putJson("/api/v1/pending-volumes/{$id}", [
             'name' => 'my volume no. 1',
             'url' => 'test://images',
-            'media_type' => 'image',
             // Elements should be sanitized and empty elements should be discarded
             'files' => ['" 1.jpg"', '', '\'2.jpg\' ', '', ''],
         ])->assertSuccessful();
         $content = $response->getContent();
-        $this->assertEquals(1, $this->project()->volumes()->count());
         $this->assertStringStartsWith('{', $content);
         $this->assertStringEndsWith('}', $content);
 
@@ -261,11 +252,43 @@ public function testUpdateImages()
         });
 
         $this->assertNull($pv->fresh());
+
+        $this->assertEquals(1, $this->project()->volumes()->count());
+        $volume = $this->project()->volumes()->first();
+        $this->assertEquals('my volume no. 1', $volume->name);
+        $this->assertEquals('test://images', $volume->url);
+        $this->assertEquals(MediaType::imageId(), $volume->media_type_id);
     }
 
     public function testUpdateImagesWithMetadata()
     {
-        $this->markTestIncomplete();
+        $pendingMetaDisk = Storage::fake('pending-metadata');
+        $metaDisk = Storage::fake('metadata');
+        $fileDisk = Storage::fake('test');
+        config(['volumes.editor_storage_disks' => ['test']]);
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+        $id = $pv->id;
+        $pendingMetaDisk->put('mymeta.csv', 'abc');
+
+        $fileDisk->makeDirectory('images');
+        $fileDisk->put('images/1.jpg', 'abc');
+
+        $this->beAdmin();
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test://images',
+            'files' => ['1.jpg'],
+        ])->assertSuccessful();
+
+        $volume = $this->project()->volumes()->first();
+        $this->assertTrue($volume->hasMetadata());
+        $metaDisk->assertExists($volume->metadata_file_path);
+        $pendingMetaDisk->assertMissing($pv->metadata_file_path);
     }
 
     public function testUpdateImagesWithAnnotationImport()
@@ -481,7 +504,6 @@ public function testUpdateVideos()
             // Elements should be sanitized and empty elements should be discarded
             'files' => ['" 1.mp4"', '', '\'2.mp4\' ', '', ''],
         ])->assertSuccessful();
-        $this->assertEquals(1, $this->project()->volumes()->count());
 
         $id = json_decode($response->getContent())->volume_id;
         Queue::assertPushed(CreateNewImagesOrVideos::class, function ($job) use ($id) {
@@ -493,11 +515,43 @@ public function testUpdateVideos()
         });
 
         $this->assertNull($pv->fresh());
+
+        $this->assertEquals(1, $this->project()->volumes()->count());
+        $volume = $this->project()->volumes()->first();
+        $this->assertEquals('my volume no. 1', $volume->name);
+        $this->assertEquals('test://videos', $volume->url);
+        $this->assertEquals(MediaType::videoId(), $volume->media_type_id);
     }
 
     public function testUpdateVideosWithMetadata()
     {
-        $this->markTestIncomplete();
+        $pendingMetaDisk = Storage::fake('pending-metadata');
+        $metaDisk = Storage::fake('metadata');
+        $fileDisk = Storage::fake('test');
+        config(['volumes.editor_storage_disks' => ['test']]);
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::videoId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+        $id = $pv->id;
+        $pendingMetaDisk->put('mymeta.csv', 'abc');
+
+        $fileDisk->makeDirectory('videos');
+        $fileDisk->put('videos/1.mp4', 'abc');
+
+        $this->beAdmin();
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test://videos',
+            'files' => ['1.mp4'],
+        ])->assertSuccessful();
+
+        $volume = $this->project()->volumes()->first();
+        $this->assertTrue($volume->hasMetadata());
+        $metaDisk->assertExists($volume->metadata_file_path);
+        $pendingMetaDisk->assertMissing($pv->metadata_file_path);
     }
 
     public function testUpdateVideosWithAnnotationImport()

From 7eb79c5bfa3c8d44fe172df7086634db309e8a2f Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 13 Mar 2024 11:58:36 +0100
Subject: [PATCH 034/209] Implement the first step of the new volume creation
 UI

---
 .../Views/Volumes/VolumeController.php        |  60 +--
 resources/assets/js/volumes/createForm.vue    | 434 +-----------------
 resources/views/volumes/create.blade.php      | 290 ++----------
 3 files changed, 85 insertions(+), 699 deletions(-)

diff --git a/app/Http/Controllers/Views/Volumes/VolumeController.php b/app/Http/Controllers/Views/Volumes/VolumeController.php
index 17266ecea..f77c7cf83 100644
--- a/app/Http/Controllers/Views/Volumes/VolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/VolumeController.php
@@ -27,48 +27,48 @@ public function create(Request $request)
         $project = Project::findOrFail($request->input('project'));
         $this->authorize('update', $project);
 
-        $disks = collect([]);
-        $user = $request->user();
+        // $disks = collect([]);
+        // $user = $request->user();
 
-        if ($user->can('sudo')) {
-            $disks = $disks->concat(config('volumes.admin_storage_disks'));
-        } elseif ($user->role_id === Role::editorId()) {
-            $disks = $disks->concat(config('volumes.editor_storage_disks'));
-        }
+        // if ($user->can('sudo')) {
+        //     $disks = $disks->concat(config('volumes.admin_storage_disks'));
+        // } elseif ($user->role_id === Role::editorId()) {
+        //     $disks = $disks->concat(config('volumes.editor_storage_disks'));
+        // }
 
-        // Limit to disks that actually exist.
-        $disks = $disks->intersect(array_keys(config('filesystems.disks')))->values();
+        // // Limit to disks that actually exist.
+        // $disks = $disks->intersect(array_keys(config('filesystems.disks')))->values();
 
-        // Use the disk keys as names, too. UserDisks can have different names
-        // (see below).
-        $disks = $disks->combine($disks)->map(fn ($name) => ucfirst($name));
+        // // Use the disk keys as names, too. UserDisks can have different names
+        // // (see below).
+        // $disks = $disks->combine($disks)->map(fn ($name) => ucfirst($name));
 
-        if (class_exists(UserDisk::class)) {
-            $userDisks = UserDisk::where('user_id', $user->id)
-                ->pluck('name', 'id')
-                ->mapWithKeys(fn ($name, $id) => ["disk-{$id}" => $name]);
+        // if (class_exists(UserDisk::class)) {
+        //     $userDisks = UserDisk::where('user_id', $user->id)
+        //         ->pluck('name', 'id')
+        //         ->mapWithKeys(fn ($name, $id) => ["disk-{$id}" => $name]);
 
-            $disks = $disks->merge($userDisks);
-        }
+        //     $disks = $disks->merge($userDisks);
+        // }
 
         $mediaType = old('media_type', 'image');
-        $filenames = str_replace(["\r", "\n", '"', "'"], '', old('files'));
-        $offlineMode = config('biigle.offline_mode');
+        // $filenames = str_replace(["\r", "\n", '"', "'"], '', old('files'));
+        // $offlineMode = config('biigle.offline_mode');
 
-        if (class_exists(UserStorageServiceProvider::class)) {
-            $userDisk = "user-{$user->id}";
-        } else {
-            $userDisk = null;
-        }
+        // if (class_exists(UserStorageServiceProvider::class)) {
+        //     $userDisk = "user-{$user->id}";
+        // } else {
+        //     $userDisk = null;
+        // }
 
         return view('volumes.create', [
             'project' => $project,
-            'disks' => $disks,
-            'hasDisks' => !empty($disks),
             'mediaType' => $mediaType,
-            'filenames' => $filenames,
-            'offlineMode' => $offlineMode,
-            'userDisk' => $userDisk,
+            // 'disks' => $disks,
+            // 'hasDisks' => !empty($disks),
+            // 'filenames' => $filenames,
+            // 'offlineMode' => $offlineMode,
+            // 'userDisk' => $userDisk,
         ]);
     }
 
diff --git a/resources/assets/js/volumes/createForm.vue b/resources/assets/js/volumes/createForm.vue
index d6638b52f..1cef0b474 100644
--- a/resources/assets/js/volumes/createForm.vue
+++ b/resources/assets/js/volumes/createForm.vue
@@ -1,459 +1,53 @@
 <script>
-import BrowserApi from './api/browser';
-import Dropdown from 'uiv/dist/Dropdown';
-import FileBrowser from '../core/components/fileBrowser';
 import LoaderMixin from '../core/mixins/loader';
-// import ParseIfdoFileApi from '../volumes/api/parseIfdoFile';
-import {handleErrorResponse} from '../core/messages/store';
 
 const MEDIA_TYPE = {
     IMAGE: 'image',
     VIDEO: 'video',
 };
 
-const FILE_SOURCE = {
-    REMOTE: 'remote',
-    DISK: 'disk',
-    USER_DISK: 'user-disk',
-};
-
-const numberFormatter = new Intl.NumberFormat();
-
-/**
- * View model for the create volume form.
- */
 export default {
     mixins: [LoaderMixin],
-    components: {
-        dropdown: Dropdown,
-        fileBrowser: FileBrowser,
-    },
     data() {
         return {
-            disks: [],
-            filenames: '',
-            filenamesReadFromMetadata: false,
-            fileSource: FILE_SOURCE.REMOTE,
-            hadMetadataText: false,
-            handle: '',
-            imageDiskCache: {},
-            initializingBrowser: false,
-            loadingBrowser: false,
-            loadingImport: false,
             mediaType: MEDIA_TYPE.IMAGE,
-            metadataText: '',
-            name: '',
-            selectedDiskRoot: null,
-            storageDisk: null,
-            url: '',
-            videoDiskCache: {},
         };
     },
     computed: {
-        showFilenameWarning() {
-            return this.filenames.includes('.tif');
-        },
-        hasDirectories() {
-            return this.currentDirectories.length > 0;
-        },
         isImageMediaType() {
             return this.mediaType === MEDIA_TYPE.IMAGE;
         },
         isVideoMediaType() {
             return this.mediaType === MEDIA_TYPE.VIDEO;
         },
-        isRemoteImageVolume() {
-            return this.isImageMediaType && this.url.search(/^https?:\/\//) !== -1;
-        },
-        hasMetadata() {
-            return this.metadataText.length > 0;
-        },
-        showImportAgainMessage() {
-            return this.hadMetadataText && !this.hasMetadata;
-        },
-        isRemoteFileSource() {
-            return this.fileSource === FILE_SOURCE.REMOTE;
-        },
-        isDiskFileSource() {
-            return this.fileSource === FILE_SOURCE.DISK;
-        },
-        isUserDiskFileSource() {
-            return this.fileSource === FILE_SOURCE.USER_DISK;
-        },
-        showFileBrowser() {
-            return this.isDiskFileSource || this.isUserDiskFileSource;
-        },
-        storageDiskEmpty() {
-            if (this.initializingBrowser) {
-                return false;
-            }
-
-            let root = this.selectedDiskRoot;
-
-            return !root || (root.files.length === 0 && Object.keys(root.directories).length === 0);
-        },
-        emptyText() {
-            if (this.isVideoMediaType) {
-                return 'no videos';
-            }
-
-            return 'no images';
-        },
-        cannotSubmit() {
-            return this.name === '' || this.url === '' || this.filenames === '' || this.loading;
-        },
-        fileCount() {
-            return this.filenames.split(',').filter(f => f).length;
+        imageTypeButtonClass() {
+            return {
+                'btn-default': !this.isImageMediaType,
+                active: this.isImageMediaType,
+                'btn-info': this.isImageMediaType,
+            };
         },
-        fileCountText() {
-            return numberFormatter.format(this.fileCount);
+        videoTypeButtonClass() {
+            return {
+                'btn-default': !this.isVideoMediaType,
+                active: this.isVideoMediaType,
+                'btn-info': this.isVideoMediaType,
+            };
         },
     },
     methods: {
-        fetchDirectories(disk, path) {
-            return BrowserApi.get({disk: disk, path: path});
-        },
-        fetchFiles(disk, path) {
-            if (this.isVideoMediaType) {
-                return BrowserApi.getVideos({disk: disk, path: path});
-            }
-
-            return BrowserApi.getImages({disk: disk, path: path});
-        },
-        parseBrowserResponses(responses) {
-            let [dirResponse, fileResponse] = responses;
-            let directories = {};
-            dirResponse.body.forEach(function (path) {
-                directories[path] = {
-                    name: path,
-                    directories: {},
-                    files: [],
-                    loaded: false,
-                    loading: false,
-                    selected: false,
-                };
-            });
-
-            let files = fileResponse.body.map(function (name) {
-                return {
-                    name: name,
-                    selected: false,
-                };
-            });
-
-            return [directories, files];
-        },
-        fetchDirectoryContent(disk, path) {
-            return Vue.Promise.all([
-                    this.fetchDirectories(disk, path),
-                    this.fetchFiles(disk, path),
-                ])
-                .then(this.parseBrowserResponses);
-        },
-        setFiles(response) {
-            this.filenames = response.body.join(', ');
-        },
-        resetFileSource() {
-            this.selectRemoteFileSource();
-        },
         selectImageMediaType() {
             this.mediaType = MEDIA_TYPE.IMAGE;
-            this.resetFileSource();
         },
         selectVideoMediaType() {
             this.mediaType = MEDIA_TYPE.VIDEO;
-            this.resetFileSource();
-        },
-        setCsvMetadata(event) {
-            this.hasMetadataCsv = true;
-            let file = event.target.files[0];
-            this.readCsvMetadataText(file).then((text) => {
-                this.metadataText = text;
-                if (!this.filenames && this.isRemoteFileSource) {
-                    this.filenames = this.parseMetadataTextFilenames(text);
-                    this.filenamesReadFromMetadata = true;
-                }
-                // Reset input field so the file is not uploaded, too.
-                event.target.value = '';
-            })
-        },
-        readCsvMetadataText(file) {
-            let reader = new FileReader();
-            let promise = new Promise(function (resolve, reject) {
-                reader.onload = resolve;
-                reader.onerror = reject;
-            });
-            reader.readAsText(file);
-
-            return promise.then(function () {
-                return reader.result;
-            });
-        },
-        parseMetadataTextFilenames(text) {
-            let metadata = text.split("\n").map(row => row.split(','));
-
-            return this.parseMetadataFilenames(metadata);
-        },
-        importCsv() {
-            this.$refs.metadataCsvField.click();
-        },
-        importIfdo() {
-            this.$refs.metadataIfdoField.click();
         },
-        parseIfdoMetadata(event) {
-            let data = new FormData();
-            data.append('file', event.target.files[0]);
-            this.loadingImport = true;
-            ParseIfdoFileApi.save(data)
-                .then(this.setIfdoMetadata, handleErrorResponse)
-                .finally(() => this.loadingImport = false);
-        },
-        setIfdoMetadata(response) {
-            let ifdo = response.body;
-            if (!this.name) {
-                this.name = ifdo.name;
-            }
-            if (!this.url && this.isRemoteFileSource) {
-                this.url = ifdo.url;
-            }
-            if (!this.handle) {
-                this.handle = ifdo.handle;
-            }
-            if (!this.filenames && this.isRemoteFileSource) {
-                this.filenames = this.parseMetadataFilenames(ifdo.files);
-                this.filenamesReadFromMetadata = true;
-            }
-
-            this.metadataText = ifdo.files.map(row => row.join(',')).join("\n");
-        },
-        parseMetadataFilenames(metadata) {
-            let columns = metadata[0];
-            let filenameColumn = columns.indexOf('filename')
-            let filenames = metadata.slice(1).map(row => row[filenameColumn]);
-
-            // Remove duplicate filenames (possible for video metadata).
-            return Array.from(new Set(filenames)).join(', ');
-        },
-        clearMetadata() {
-            this.metadataText = '';
-            this.$refs.metadataIfdoField.value = '';
-        },
-        selectRemoteFileSource() {
-            if (!this.isRemoteFileSource) {
-                this.fileSource = FILE_SOURCE.REMOTE;
-                this.storageDisk = null;
-                this.selectedDiskRoot = null;
-                this.url = '';
-                this.filenames = '';
-            }
-        },
-        selectStorageDisk(disk) {
-            if (this.storageDisk !== disk) {
-                if (this.disks.includes(disk)) {
-                    this.fileSource = FILE_SOURCE.DISK;
-                } else if (disk.startsWith('user-')) {
-                    this.fileSource = FILE_SOURCE.USER_DISK;
-                } else {
-                    return;
-                }
-
-                this.selectedDiskRoot = null;
-                this.storageDisk = disk;
-                this.url = '';
-                this.filenames = '';
-            }
-        },
-        showStorageDiskRoot(disk) {
-            let cache = this.isVideoMediaType ? this.videoDiskCache : this.imageDiskCache;
-
-            if (!cache.hasOwnProperty(disk)) {
-                cache[disk] = this.fetchDirectoryContent(disk, '')
-                    .then(this.setStorageDiskRoot, handleErrorResponse);
-            }
-
-            return cache[disk];
-        },
-        setStorageDiskRoot(args) {
-            let [dirs, files] = args;
-
-            return {
-                name: '',
-                directories: dirs,
-                files: files,
-                loaded: true,
-            };
-        },
-        handleLoadDirectory(directory, path) {
-            directory.loading = true;
-            // Remove leading slash.
-            path = path.slice(1);
-
-            return this.fetchDirectoryContent(this.storageDisk, path)
-                    .then(function (args) {
-                        let [dirs, files] = args;
-                        directory.directories = dirs;
-                        directory.files = files;
-                        directory.loaded = true;
-
-                        return directory;
-                    }, handleErrorResponse)
-                    .finally(() => directory.loading = false);
-        },
-        unselectAllDirectories(directory) {
-            directory.selected = false;
-            directory.files.forEach(file => file.selected = false);
-            Object.keys(directory.directories).forEach((key) => {
-                this.unselectAllDirectories(directory.directories[key]);
-            });
-        },
-        selectDirectory(directory, path) {
-            let promise;
-            if (!directory.loaded) {
-                promise = this.handleLoadDirectory(directory, path);
-            } else {
-                promise = Vue.Promise.resolve(directory);
-            }
-
-            promise.then((directory) => {
-                this.unselectDirectory(this.selectedDiskRoot);
-                directory.selected = true;
-                if (directory.files.length > 0) {
-                    directory.files.forEach(file => file.selected = true);
-                    this.setUrlAndFilenames(path, directory.files);
-                }
-            });
-        },
-        setUrlAndFilenames(path, files) {
-            // Add only one slash, as path already has a leading slash.
-            this.url = `${this.storageDisk}:/${path}`;
-            this.filenames = files.map(file => file.name).join(', ');
-        },
-        unselectDirectory(directory) {
-            this.unselectAllDirectories(directory);
-            this.url = '';
-            this.filenames = '';
-        },
-        recurseLoadDirectories(path) {
-            let breadcrumbs = path.split('/');
-            let currentDir = breadcrumbs.pop();
-            let promise;
-
-            if (breadcrumbs.length > 1) {
-                promise = this.recurseLoadDirectories(breadcrumbs.join('/'));
-            } else {
-                promise = Vue.Promise.resolve(this.selectedDiskRoot);
-            }
-
-            return promise.then((directory) => {
-                if (!directory.directories.hasOwnProperty(currentDir)) {
-                    throw `Directory '${currentDir}' not found`;
-                }
-
-                return this.handleLoadDirectory(
-                    directory.directories[currentDir], path
-                );
-            });
-        },
-        initializeSelectedFilesAfterError(directory, path) {
-            let files = this.filenames.split(',').map(f => f.trim())
-            if (files.length === directory.files.length) {
-                this.selectDirectory(directory, path);
-            } else {
-                // Hack to expand the directory but not select it.
-                directory.selected = true;
-                this.$nextTick(() => directory.selected = false);
-
-                directory.files
-                    .filter(f => files.includes(f.name))
-                    .forEach(f => f.selected = true);
-            }
-        },
-        initializeSelectedStorageDiskAfterError(disk, path) {
-            this.storageDisk = disk;
-            this.fileSource = FILE_SOURCE.DISK;
-            // A leading slash is expected in the subsequent functions.
-            path = '/' + path;
-
-            this.initializingBrowser = true;
-            this.showStorageDiskRoot(disk)
-                .then(root => this.selectedDiskRoot = root)
-                .then(() => this.recurseLoadDirectories(path))
-                .then((dir) => this.initializeSelectedFilesAfterError(dir, path))
-                .finally(() => this.initializingBrowser = false);
-        },
-        selectFile(file, directory, path, event) {
-            let selectedFiles = directory.files.filter(f => f.selected);
-            if (event?.ctrlKey && selectedFiles.length > 0) {
-                selectedFiles.push(file)
-                if (selectedFiles.length === directory.files.length) {
-                    this.selectDirectory(directory, path);
-                } else {
-                    file.selected = true;
-                    this.setUrlAndFilenames(path, selectedFiles);
-                }
-            } else {
-                this.unselectAllDirectories(this.selectedDiskRoot);
-                if (directory.files.length === 1) {
-                    this.selectDirectory(directory, path);
-                } else {
-                    file.selected = true;
-                }
-                this.setUrlAndFilenames(path, [file]);
-            }
-        },
-        unselectFile(file, directory, path, event) {
-            if (event?.ctrlKey) {
-                file.selected = false;
-                let selectedFiles = directory.files.filter(f => f.selected);
-                if (selectedFiles.length > 0) {
-                    directory.selected = false;
-                    this.setUrlAndFilenames(path, selectedFiles);
-                } else {
-                    this.unselectDirectory(directory);
-                }
-            } else {
-                this.selectFile(file, directory, path, event);
-            }
-        },
-    },
-    watch: {
-        storageDisk(disk) {
-            if (disk) {
-                this.initializingBrowser = true;
-                this.showStorageDiskRoot(disk)
-                    .then(root => this.selectedDiskRoot = root)
-                    .finally(() => this.initializingBrowser = false);
-            }
-        },
-        selectedDiskRoot(newRoot, oldRoot) {
-            if (oldRoot) {
-                this.unselectAllDirectories(oldRoot);
-            }
-        },
-        hasMetadata(hasMetadata) {
-            if (hasMetadata) {
-                // Don't show message again once a metadata file had been selected.
-                this.hadMetadataText = false;
-            }
+        selectFile() {
+            this.$refs.metadataFileField.click();
         },
     },
     created() {
-        this.disks = biigle.$require('volumes.disks');
-        this.url = biigle.$require('volumes.url');
-        this.name = biigle.$require('volumes.name');
-        this.handle = biigle.$require('volumes.handle');
-        this.hadMetadataText = biigle.$require('volumes.hadMetadataText');
         this.mediaType = biigle.$require('volumes.mediaType');
-        this.filenames = biigle.$require('volumes.filenames');
-
-        let [disk, path] = this.url.split('://');
-        if (this.disks.includes(disk)) {
-            this.initializeSelectedStorageDiskAfterError(disk, path);
-        }
-    },
-    mounted() {
-        // Vue disables the autofocus attribute somehow, so set focus manually here.
-        this.$refs.nameInput.focus();
     },
 };
 </script>
diff --git a/resources/views/volumes/create.blade.php b/resources/views/volumes/create.blade.php
index 20cc92520..7fd187e53 100644
--- a/resources/views/volumes/create.blade.php
+++ b/resources/views/volumes/create.blade.php
@@ -4,268 +4,60 @@
 
 @push('scripts')
    <script type="text/javascript">
-      biigle.$declare('volumes.name', '{!! old('name') !!}');
-      biigle.$declare('volumes.url', '{!! old('url') !!}');
-      biigle.$declare('volumes.hadMetadataText', @if (old('metadata_text')) true @else false @endif);
-      biigle.$declare('volumes.handle', `{!! old('handle') !!}`);
       biigle.$declare('volumes.mediaType', '{!! $mediaType !!}');
-      biigle.$declare('volumes.filenames', '{{ $filenames }}');
-      biigle.$declare('volumes.disks', {!! $disks->keys() !!});
    </script>
 @endpush
 
 @section('content')
-<div class="container">
-   <div class="col-sm-8 col-sm-offset-2 col-lg-6 col-lg-offset-3">
-      <h2>New volume for {{ $project->name }}</h2>
-      <form id="create-volume-form" class="clearfix" role="form" method="POST" action="{{ url('api/v1/projects/'.$project->id.'/volumes') }}" enctype="multipart/form-data" v-on:submit="startLoading">
 
-        <fieldset>
-            <legend>
-                1. Choose a media type
-            </legend>
-            <div class="form-group {{ $errors->has('media_type') ? ' has-error' : '' }}">
-                <div class="btn-group btn-group-justified">
-                    <div class="btn-group">
-                        <button type="button" class="btn btn-default" title="Image Volume" v-on:click="selectImageMediaType" :class="{active: isImageMediaType}"><i class="fa fa-image"></i> Image Volume</button>
-                    </div>
-                    <div class="btn-group">
-                        <button type="button" class="btn btn-default" title="Video Volume" v-on:click="selectVideoMediaType" :class="{active: isVideoMediaType}"><i class="fa fa-film"></i> Video Volume</button>
-                    </div>
-                    <input type="hidden" name="media_type" v-model="mediaType">
+<div id="create-volume-form" class="col-sm-8 col-sm-offset-2 col-lg-6 col-lg-offset-3">
+    <h2>New volume for {{ $project->name }}</h2>
+    <form role="form" method="POST" action="{{ url("api/v1/projects/{$project->id}/pending-volumes") }}" enctype="multipart/form-data" v-on:submit="startLoading">
+    <fieldset>
+        <legend>
+            1. Choose a media type
+        </legend>
+        <div class="form-group {{ $errors->has('media_type') ? ' has-error' : '' }}">
+            <div class="btn-group btn-group-justified">
+                <div class="btn-group">
+                    <button type="button" class="btn btn-default btn-lg" v-on:click="selectImageMediaType" :class="imageTypeButtonClass"><i class="fa fa-image"></i> Image Volume</button>
                 </div>
-                @if($errors->has('media_type'))
-                   <span class="help-block">{{ $errors->first('media_type') }}</span>
-                @endif
-            </div>
-        </fieldset>
-
-        <fieldset>
-            <legend>
-                2. Choose a name or import from file
-            </legend>
-            <div class="form-group row{{ $errors->has('name') ? ' has-error' : '' }}">
-                <div class="col-sm-8">
-                    <input type="text" class="form-control" name="name" id="name" v-model="name" placeholder="My new volume" ref="nameInput" required autofocus>
-                    @if($errors->has('name'))
-                       <span class="help-block">{{ $errors->first('name') }}</span>
-                    @endif
-                </div>
-                <div class="col-sm-4">
-                    <button v-if="hasMetadata" v-cloak type="button" class="btn btn-default btn-block" title="Clear metadata loaded from the selected file" v-on:click="clearMetadata">Clear metadata</button>
-                    <dropdown v-else tag="span">
-                        <button class="btn {{ $errors->hasAny(['ifdo_file', 'metadata_csv', 'metadata']) ? ' btn-danger' : 'btn-default' }} btn-block dropdown-toggle" type="button" title="Import volume information and metadata from a file" v-bind:disabled="loadingImport"><loader v-bind:active="loadingImport"></loader> Import <span class="caret"></span></button>
-                        <template slot="dropdown">
-                            <li>
-                                 <a title="Import volume information and metadata from an iFDO YAML file" href="#" v-on:click.prevent="importIfdo">iFDO YAML</a>
-                            </li>
-                            <li>
-                                 <a v-if="isImageMediaType" title="Import image metadata from a CSV file" href="#" v-on:click.prevent="importCsv">Metadata CSV</a>
-                                 <a v-else v-cloak title="Import video metadata from a CSV file" href="#" v-on:click.prevent="importCsv">Metadata CSV</a>
-                            </li>
-                        </template>
-                    </dropdown>
-                    <input class="hidden" ref="metadataCsvField" type="file" accept=".csv,text/csv,application/csv" v-on:change="setCsvMetadata">
-                    <input class="hidden" ref="metadataIfdoField" type="file" accept=".yml,.yaml" name="ifdo_file" v-on:change="parseIfdoMetadata">
+                <div class="btn-group">
+                    <button type="button" class="btn btn-default btn-lg" v-on:click="selectVideoMediaType" :class="videoTypeButtonClass"><i class="fa fa-film"></i> Video Volume</button>
                 </div>
             </div>
-        </fieldset>
-
-        <div class="form-group{{ $errors->hasAny(['ifdo_file', 'metadata_csv', 'metadata']) ? ' has-error' : '' }}">
-
-            <p v-if="showImportAgainMessage" v-cloak class="text-danger">Please import the metadata file again.</p>
-
-            <label v-show="hasMetadata" v-cloak for="metadata_text">Metadata (imported from file)</label>
-            <textarea v-show="hasMetadata" v-cloak class="form-control" rows="3" name="metadata_text" id="metadata_text" v-model="metadataText" wrap="off" readonly></textarea>
-
-            @if ($errors->hasAny(['ifdo_file', 'metadata_csv', 'metadata']))
-                @if ($errors->has('ifdo_file'))
-                    <span class="help-block">{{ $errors->first('ifdo_file') }}</span>
-                @endif
-                @if ($errors->has('metadata_csv'))
-                    <span class="help-block">{{ $errors->first('metadata_csv') }}</span>
-                @endif
-                @if ($errors->has('metadata'))
-                    <span class="help-block">{{ $errors->first('metadata') }}</span>
-                @endif
-            @else
-                <span class="help-block">Volume information and metadata can be imported from an <a href="https://marine-imaging.com/fair/ifdos/iFDO-overview/" target="_blank">iFDO YAML</a> file or a <a href="{{route('manual-tutorials', ['volumes', 'file-metadata'])}}" target="_blank">metadata CSV</a> file. Image metadata may be overridden by EXIF information.</span>
+            @if ($errors->has('media_type'))
+               <p class="help-block">{{ $errors->first('media_type') }}</p>
             @endif
-        </div>
-
-        <fieldset>
-            <legend class="clearfix">
-                3. Choose a file source
-                <span class="text-muted pull-right">
-                    <span v-text="fileCountText">0</span> files
-                </span>
-            </legend>
-             <div class="form-group">
-                <div class="btn-group btn-group-justified">
-                    @if ($offlineMode && $disks->isEmpty())
-                        <div class="panel panel-danger">
-                            <div class="panel-body text-danger">
-                                Please configure available storage disks with the <code>VOLUME_ADMIN_STORAGE_DISKS</code> and <code>VOLUME_EDITOR_STORAGE_DISKS</code> environment variables.
-                            </div>
-                        </div>
-                    @endif
-                    @unless ($offlineMode)
-                        <div class="btn-group">
-                            <button type="button" class="btn btn-default" title="Remote location" v-on:click="selectRemoteFileSource" v-bind:class="{active: isRemoteFileSource}" ><i class="fa fa-link"></i> Remote location</button>
-                        </div>
-                    @endunless
-                    @if ($userDisk)
-                        <div class="btn-group">
-                            <button type="button" class="btn btn-default" title="Choose files from your uploads" v-on:click="selectStorageDisk('{{$userDisk}}')" v-bind:class="{active: isUserDiskFileSource}">
-                                <i class="fa fa-upload"></i> Uploaded files
-                            </button>
-                        </div>
-                    @endif
-                    @if ($disks->count() > 1)
-                        <div class="btn-group">
-                            <dropdown tag="span">
-                                <button class="btn btn-default dropdown-toggle" v-bind:class="{active: isDiskFileSource}" type="button" title="Select a storage disk">
-                                    <i class="fa fa-database"></i> Storage disk <span class="caret"></span>
-                                </button>
-                                <template slot="dropdown">
-                                    @foreach ($disks as $id => $name)
-                                        <li>
-                                             <a title="Choose files from the '{{$name}}' storage disk" href="#" v-on:click.prevent="selectStorageDisk('{{$id}}')">{{$name}}</a>
-                                        </li>
-                                    @endforeach
-                                </template>
-                            </dropdown>
-                        </div>
-                    @elseif ($disks->count() === 1)
-                        <div class="btn-group">
-                            <button type="button" class="btn btn-default volume-storage-disk-btn" title="Choose files from the '{{$disks->values()->first()}}' storage disk" v-on:click="selectStorageDisk('{{$disks->keys()->first()}}')" v-bind:class="{active: isDiskFileSource}">
-                                <i class="fa fa-database"></i> {{$disks->values()->first()}}
-                            </button>
-                        </div>
-                    @endif
-                </div>
-            </div>
-        </fieldset>
-
-        @unless ($offlineMode)
-            <div v-if="isRemoteFileSource">
-                <div class="form-group{{ $errors->has('url') ? ' has-error' : '' }}">
-                    <label for="url">Remote location URL <a href="{{route('manual-tutorials', ['volumes', 'remote-volumes'])}}" target="_blank" title="Learn more about remote volumes"><i class="fa fa-question-circle"></i></a></label>
-                    <input type="text" class="form-control" name="url" id="url" placeholder="https://my-domain.tld/volume" required v-model="url" value="{{old('url')}}">
-                    @if ($errors->has('url'))
-                       <span class="help-block">{{ $errors->first('url') }}</span>
-                    @endif
-                 </div>
-
-                 <div v-if="isImageMediaType" class="panel panel-warning">
-                    <div class="panel-body text-warning">
-                        Remote locations for image volumes must support <a href="/manual/tutorials/volumes/remote-volumes#cors">cross-origin resource sharing</a>.
-                    </div>
-                </div>
-
-                 <div class="form-group{{ $errors->has('files') ? ' has-error' : '' }}">
-                    <label for="files">Volume files</label>
-                    <p v-cloak v-if="filenamesReadFromMetadata" class="text-info">
-                        The filenames have been extracted from the provided metadata file.
-                    </p>
-                    <div v-if="isImageMediaType" @unless ($mediaType === 'image') v-cloak @endif>
-                        <textarea class="form-control" name="files" id="files" placeholder="1.jpg, 2.jpg, 3.jpg" required v-model="filenames" rows="3"></textarea>
-                        <p class="help-block">
-                           The filenames of the images in the volume directory formatted as comma separated values. Example: <code>1.jpg, 2.jpg, 3.jpg</code>. The supported image file formats are: JPEG, PNG, WebP and TIFF.
-                        </p>
-                    </div>
-                    <div v-else @unless ($mediaType === 'video') v-cloak @endif>
-                        <textarea class="form-control" name="files" id="files" placeholder="1.mp4, 2.mp4, 3.mp4" required v-model="filenames" rows="3"></textarea>
-                        <p class="help-block">
-                           The filenames of the videos in the volume directory formatted as comma separated values. Example: <code>1.mp4, 2.mp4, 3.mp4</code>. The supported video file formats are: MP4 (H.264) and WebM (VP8, VP9, AV1).
-                        </p>
-                    </div>
-                    @if($errors->has('files'))
-                       <span class="help-block">{{ $errors->first('files') }}</span>
-                    @endif
-                 </div>
-            </div>
-        @endunless
-
-        <div v-if="showFileBrowser" v-cloak>
-
-            <p v-if="initializingBrowser">
-                <loader v-bind:active="true"></loader> loading available files...
+            <p class="help-block">
+                The media type determines the type of files that can be included in the volume. Each type requires different annotation tools.
             </p>
-            <p v-else class="help-block">
-                <span v-if="storageDiskEmpty" class="text-warning">
-                    No files found.
-                    @if (Route::has('create-storage-requests'))
-                        <a href="{{route('create-storage-requests')}}">Upload new files.</a>
-                    @endif
-                </span>
-                <span v-else>
-                    Select a directory or files below. All selected files will be used for the new volume.
-                </span>
-                <span v-if="isImageMediaType">Only files with a supported image file format are shown (JPEG, PNG, WebP and TIFF).</span>
-                <span v-if="isVideoMediaType">Only files with a supported video file format are shown (MP4 (H.264) and WebM (VP8, VP9, AV1)).</span>
+            <input type="hidden" name="media_type" v-model="mediaType">
+        </div>
+    </fieldset>
+    <fieldset>
+        <legend>
+            2. Select a metadata file <span class="text-muted">(optional)</span>
+        </legend>
+        <div class="form-group{{ $errors->has('metadata_file') ? ' has-error' : '' }}">
+            <p class="text-center">
+                <button class="btn btn-default btn-lg" type="button" v-on:click="selectFile"><i class="fa fa-file-alt"></i> Select a file</button>
             </p>
-
-            <file-browser
-                v-if="selectedDiskRoot"
-                v-bind:root-directory="selectedDiskRoot"
-                v-bind:expanded="false"
-                v-bind:empty-text="emptyText"
-                v-bind:selectable="true"
-                v-bind:files-selectable="true"
-                v-bind:expand-on-select="true"
-                v-on:select="selectDirectory"
-                v-on:select-file="selectFile"
-                v-on:unselect="unselectDirectory"
-                v-on:unselect-file="unselectFile"
-                v-on:load="handleLoadDirectory"
-                ></file-browser>
-
-
-            <input type="hidden" name="url" required v-model="url">
-            <input type="hidden" name="files" required v-model="filenames">
-
-            @if ($errors->has('url'))
-                <div class="form-group has-error">
-                    <span class="help-block">{{ $errors->first('url') }}</span>
-                 </div>
+            <input class="hidden" name="metadata_file" type="file" ref="metadataFileField">
+            @if ($errors->has('metadata_file'))
+               <p class="help-block">{{ $errors->first('metadata_file') }}</p>
             @endif
-            @if ($errors->has('files'))
-                <div class="form-group has-error">
-                    <span class="help-block">{{ $errors->first('files') }}</span>
-                 </div>
-            @endif
-        </div>
-
-        <div v-if="showFilenameWarning" v-cloak class="panel panel-warning">
-            <div class="panel-body text-warning">
-                Most browsers do not support the TIFF format. Only use it for very large images with more than {{config('image.tiles.threshold')}} pixels at one edge, as these will be automatically converted by BIIGLE.
-            </div>
+            <p class="help-block">
+                By default, BIIGLE supports a CSV metadata format. Other supported formats may be listed in <a href="{{route('manual-tutorials', ['volumes', 'file-metadata'])}}" target="_blank">the manual</a>. Image metadata may be overridden by EXIF information during the creation of the volume.
+            </p>
         </div>
-
-         <fieldset>
-             <legend>
-                 4. Set a handle or DOI <span class="text-muted">(optional)</span>
-             </legend>
-
-             <div class="form-group{{ $errors->has('handle') ? ' has-error' : '' }}">
-                <input type="text" class="form-control" name="handle" id="handle" v-model="handle" placeholder="10.3389/fmars.2017.00083">
-                <span class="help-block">
-                    A <a href="https://handle.net">handle</a> or <a href="https://www.doi.org/">DOI</a> to be associated with the volume.
-                </span>
-                @if($errors->has('handle'))
-                    <span class="help-block">{{ $errors->first('handle') }}</span>
-                @endif
-            </div>
-         </fieldset>
-
-         <div class="form-group">
-             <input type="hidden" name="_token" value="{{ csrf_token() }}">
-             <input type="hidden" name="_redirect" value="{{ url('projects/'.$project->id) }}">
-             <a href="{{ URL::previous() }}" class="btn btn-default" :disabled="loading">Cancel</a>
-             <input type="submit" class="btn btn-success pull-right" value="Create" :disabled="cannotSubmit" title="Create the new volume">
-         </div>
-      </form>
-   </div>
+    </fieldset>
+    <div class="form-group">
+         <input type="hidden" name="_token" value="{{ csrf_token() }}">
+         <a href="{{ route('project', $project->id) }}" class="btn btn-default" :disabled="loading">Cancel</a>
+         <input type="submit" class="btn btn-success pull-right" value="Continue" :disabled="loading" title="Proceed to enter the volume details">
+     </div>
+  </form>
 </div>
+
 @endsection

From 9f74bceb7d1252bc78915fdcabfe77fbc1f3d666 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 13 Mar 2024 11:58:51 +0100
Subject: [PATCH 035/209] Fix pending volume metadata file extension

---
 app/PendingVolume.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/PendingVolume.php b/app/PendingVolume.php
index e997e6cc9..3a7fbeae4 100644
--- a/app/PendingVolume.php
+++ b/app/PendingVolume.php
@@ -52,7 +52,7 @@ public function hasMetadata(): bool
     public function saveMetadata(UploadedFile $file): void
     {
         $disk = config('volumes.pending_metadata_storage_disk');
-        $extension = $file->getExtension();
+        $extension = $file->getClientOriginalExtension();
         $this->metadata_file_path = "{$this->id}.{$extension}";
         $file->storeAs('', $this->metadata_file_path, $disk);
         $this->save();

From d2298c3817fac31e55eccf3a81663684ecd6538e Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 14 Mar 2024 11:48:08 +0100
Subject: [PATCH 036/209] Finish create volume v2 UI without metadata import

---
 .../Api/PendingVolumeController.php           |  41 +-
 .../Views/Volumes/PendingVolumeController.php |  75 ++++
 .../Views/Volumes/VolumeController.php        |  41 +-
 app/Http/Requests/UpdatePendingVolume.php     |  10 +-
 app/Policies/PendingVolumePolicy.php          |  22 +-
 .../{createForm.vue => createFormStep1.vue}   |   2 +-
 .../assets/js/volumes/createFormStep2.vue     | 359 ++++++++++++++++++
 resources/assets/js/volumes/main.js           |   6 +-
 .../step1.blade.php}                          |   4 +-
 .../views/volumes/create/step2.blade.php      | 208 ++++++++++
 routes/api.php                                |   2 +-
 routes/web.php                                |   7 +
 .../Api/PendingVolumeControllerTest.php       | 102 +++++
 .../Volumes/PendingVolumeControllerTest.php   |  27 ++
 .../php/Policies/PendingVolumePolicyTest.php  |  22 ++
 15 files changed, 872 insertions(+), 56 deletions(-)
 create mode 100644 app/Http/Controllers/Views/Volumes/PendingVolumeController.php
 rename resources/assets/js/volumes/{createForm.vue => createFormStep1.vue} (97%)
 create mode 100644 resources/assets/js/volumes/createFormStep2.vue
 rename resources/views/volumes/{create.blade.php => create/step1.blade.php} (95%)
 create mode 100644 resources/views/volumes/create/step2.blade.php
 create mode 100644 tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php

diff --git a/app/Http/Controllers/Api/PendingVolumeController.php b/app/Http/Controllers/Api/PendingVolumeController.php
index 47361471e..a8f3d8297 100644
--- a/app/Http/Controllers/Api/PendingVolumeController.php
+++ b/app/Http/Controllers/Api/PendingVolumeController.php
@@ -5,8 +5,10 @@
 use Biigle\Http\Requests\StorePendingVolume;
 use Biigle\Http\Requests\UpdatePendingVolume;
 use Biigle\Jobs\CreateNewImagesOrVideos;
+use Biigle\PendingVolume;
 use Biigle\Volume;
 use DB;
+use Illuminate\Http\Request;
 use Queue;
 use Storage;
 
@@ -63,7 +65,11 @@ public function store(StorePendingVolume $request)
             $pv->saveMetadata($request->file('metadata_file'));
         }
 
-        return $pv;
+        if ($this->isAutomatedRequest()) {
+            return $pv;
+        }
+
+        return redirect()->route('pending-volume', $pv->id);
     }
 
     /**
@@ -80,7 +86,7 @@ public function store(StorePendingVolume $request)
      *
      * @apiParam (Required attributes) {String} name The name of the new volume.
      * @apiParam (Required attributes) {String} url The base URL of the image/video files. Can be a path to a storage disk like `local://volumes/1` or a remote path like `https://example.com/volumes/1`.
-     * @apiParam (Required attributes) {Array} files Array of file names of the images/videos that can be found at the base URL. Example: With the base URL `local://volumes/1` and the image `1.jpg`, the file `volumes/1/1.jpg` of the `local` storage disk will be used.
+     * @apiParam (Required attributes) {Array} files Array of file names of the images/videos that can be found at the base URL. Example: With the base URL `local://volumes/1` and the image `1.jpg`, the file `volumes/1/1.jpg` of the `local` storage disk will be used. This can also be a plain string of comma-separated filenames.
      *
      * @apiParam (Optional attributes) {String} handle Handle or DOI of the dataset that is represented by the new volume.
      *
@@ -141,6 +147,35 @@ public function update(UpdatePendingVolume $request)
 
         $request->pendingVolume->delete();
 
-        return $request->pendingVolume;
+        if ($this->isAutomatedRequest()) {
+            return $request->pendingVolume;
+        }
+
+        return redirect()
+            ->route('volume', $volume->id)
+            ->with('message', 'Volume created.')
+            ->with('messageType', 'success');
+    }
+
+    /**
+     * Delete a pending volume
+     *
+     * @api {delete} pending-volumes/:id Discard a pending volume
+     * @apiGroup Volumes
+     * @apiName DestroyPendingVolume
+     * @apiPermission projectAdminAndPendingVolumeOwner
+     *
+     * @param Request $request]
+     */
+    public function destroy(Request $request)
+    {
+        $pv = PendingVolume::findOrFail($request->route('id'));
+        $this->authorize('destroy', $pv);
+
+        $pv->delete();
+
+        if (!$this->isAutomatedRequest()) {
+            return redirect()->route('create-volume', ['project' => $pv->project_id]);
+        }
     }
 }
diff --git a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
new file mode 100644
index 000000000..32cb92eeb
--- /dev/null
+++ b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Biigle\Http\Controllers\Views\Volumes;
+
+use Biigle\Http\Controllers\Views\Controller;
+use Biigle\Modules\UserDisks\UserDisk;
+use Biigle\Modules\UserStorage\UserStorageServiceProvider;
+use Biigle\MediaType;
+use Biigle\PendingVolume;
+use Biigle\Role;
+use Illuminate\Http\Request;
+
+class PendingVolumeController extends Controller
+{
+    /**
+     * Shows the pending volume page to continue/finish a new volume.
+     *
+     * @param Request $request
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Request $request)
+    {
+        $pv = PendingVolume::with('project')->findOrFail($request->route('id'));
+        $this->authorize('access', $pv);
+
+        $disks = collect([]);
+        $user = $request->user();
+
+        if ($user->can('sudo')) {
+            $disks = $disks->concat(config('volumes.admin_storage_disks'));
+        } elseif ($user->role_id === Role::editorId()) {
+            $disks = $disks->concat(config('volumes.editor_storage_disks'));
+        }
+
+        // Limit to disks that actually exist.
+        $disks = $disks->intersect(array_keys(config('filesystems.disks')))->values();
+
+        // Use the disk keys as names, too. UserDisks can have different names
+        // (see below).
+        $disks = $disks->combine($disks)->map(fn ($name) => ucfirst($name));
+
+        if (class_exists(UserDisk::class)) {
+            $userDisks = UserDisk::where('user_id', $user->id)
+                ->pluck('name', 'id')
+                ->mapWithKeys(fn ($name, $id) => ["disk-{$id}" => $name]);
+
+            $disks = $disks->merge($userDisks);
+        }
+
+        $filenames = str_replace(["\r", "\n", '"', "'"], '', old('files'));
+        $offlineMode = config('biigle.offline_mode');
+
+        if (class_exists(UserStorageServiceProvider::class)) {
+            $userDisk = "user-{$user->id}";
+        } else {
+            $userDisk = null;
+        }
+
+        $mediaType = match ($pv->media_type_id) {
+            MediaType::videoId() => 'video',
+            default => 'image',
+        };
+
+        return view('volumes.create.step2', [
+            'pv' => $pv,
+            'project' => $pv->project,
+            'disks' => $disks,
+            'hasDisks' => !empty($disks),
+            'filenames' => $filenames,
+            'offlineMode' => $offlineMode,
+            'userDisk' => $userDisk,
+            'mediaType' => $mediaType,
+        ]);
+    }
+}
diff --git a/app/Http/Controllers/Views/Volumes/VolumeController.php b/app/Http/Controllers/Views/Volumes/VolumeController.php
index f77c7cf83..694740675 100644
--- a/app/Http/Controllers/Views/Volumes/VolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/VolumeController.php
@@ -5,8 +5,6 @@
 use Biigle\Http\Controllers\Views\Controller;
 use Biigle\LabelTree;
 use Biigle\MediaType;
-use Biigle\Modules\UserDisks\UserDisk;
-use Biigle\Modules\UserStorage\UserStorageServiceProvider;
 use Biigle\Project;
 use Biigle\Role;
 use Biigle\User;
@@ -27,48 +25,11 @@ public function create(Request $request)
         $project = Project::findOrFail($request->input('project'));
         $this->authorize('update', $project);
 
-        // $disks = collect([]);
-        // $user = $request->user();
-
-        // if ($user->can('sudo')) {
-        //     $disks = $disks->concat(config('volumes.admin_storage_disks'));
-        // } elseif ($user->role_id === Role::editorId()) {
-        //     $disks = $disks->concat(config('volumes.editor_storage_disks'));
-        // }
-
-        // // Limit to disks that actually exist.
-        // $disks = $disks->intersect(array_keys(config('filesystems.disks')))->values();
-
-        // // Use the disk keys as names, too. UserDisks can have different names
-        // // (see below).
-        // $disks = $disks->combine($disks)->map(fn ($name) => ucfirst($name));
-
-        // if (class_exists(UserDisk::class)) {
-        //     $userDisks = UserDisk::where('user_id', $user->id)
-        //         ->pluck('name', 'id')
-        //         ->mapWithKeys(fn ($name, $id) => ["disk-{$id}" => $name]);
-
-        //     $disks = $disks->merge($userDisks);
-        // }
-
         $mediaType = old('media_type', 'image');
-        // $filenames = str_replace(["\r", "\n", '"', "'"], '', old('files'));
-        // $offlineMode = config('biigle.offline_mode');
-
-        // if (class_exists(UserStorageServiceProvider::class)) {
-        //     $userDisk = "user-{$user->id}";
-        // } else {
-        //     $userDisk = null;
-        // }
 
-        return view('volumes.create', [
+        return view('volumes.create.step1', [
             'project' => $project,
             'mediaType' => $mediaType,
-            // 'disks' => $disks,
-            // 'hasDisks' => !empty($disks),
-            // 'filenames' => $filenames,
-            // 'offlineMode' => $offlineMode,
-            // 'userDisk' => $userDisk,
         ]);
     }
 
diff --git a/app/Http/Requests/UpdatePendingVolume.php b/app/Http/Requests/UpdatePendingVolume.php
index a1f6d43f5..78f1dc362 100644
--- a/app/Http/Requests/UpdatePendingVolume.php
+++ b/app/Http/Requests/UpdatePendingVolume.php
@@ -30,7 +30,7 @@ public function rules(): array
         return [
             'name' => 'required|max:512',
             'url' => ['required', 'string', 'max:256', new VolumeUrl],
-            'files' => ['required', 'array'],
+            'files' => ['required', 'array', 'min:1'],
             'handle' => ['nullable', 'max:256', new Handle],
             // Do not validate the maximum filename length with a 'files.*' rule because
             // this leads to a request timeout when the rule is expanded for a huge
@@ -69,9 +69,11 @@ public function withValidator($validator)
     protected function prepareForValidation()
     {
         $files = $this->input('files');
-        if (is_array($files)) {
-            $files = array_map(fn ($f) => trim($f, " \n\r\t\v\x00'\""), $files);
-            $this->merge(['files' => array_filter($files)]);
+        if (!is_array($files)) {
+            $files = explode(',', $files);
         }
+
+        $files = array_map(fn ($f) => trim($f, " \n\r\t\v\x00'\""), $files);
+        $this->merge(['files' => array_filter($files)]);
     }
 }
diff --git a/app/Policies/PendingVolumePolicy.php b/app/Policies/PendingVolumePolicy.php
index 98cafe3fa..078c758b7 100644
--- a/app/Policies/PendingVolumePolicy.php
+++ b/app/Policies/PendingVolumePolicy.php
@@ -27,13 +27,13 @@ public function before($user, $ability)
     }
 
     /**
-     * Determine if the given volume can be updated by the user.
+     * Determine if the given pending volume can be accessed by the user.
      */
-    public function update(User $user, PendingVolume $pv): bool
+    public function access(User $user, PendingVolume $pv): bool
     {
         return $user->id === $pv->user_id &&
             $this->remember(
-                "pending-volume-can-update-{$user->id}-{$pv->id}",
+                "pending-volume-can-access-{$user->id}-{$pv->id}",
                 fn () =>
                     DB::table('project_user')
                         ->where('project_id', $pv->project_id)
@@ -42,4 +42,20 @@ public function update(User $user, PendingVolume $pv): bool
                         ->exists()
             );
     }
+
+    /**
+     * Determine if the given pending volume can be updated by the user.
+     */
+    public function update(User $user, PendingVolume $pv): bool
+    {
+        return $this->access($user, $pv);
+    }
+
+    /**
+     * Determine if the given pending volume can be deleted by the user.
+     */
+    public function destroy(User $user, PendingVolume $pv): bool
+    {
+        return $this->access($user, $pv);
+    }
 }
diff --git a/resources/assets/js/volumes/createForm.vue b/resources/assets/js/volumes/createFormStep1.vue
similarity index 97%
rename from resources/assets/js/volumes/createForm.vue
rename to resources/assets/js/volumes/createFormStep1.vue
index 1cef0b474..084d43fa7 100644
--- a/resources/assets/js/volumes/createForm.vue
+++ b/resources/assets/js/volumes/createFormStep1.vue
@@ -1,7 +1,7 @@
 <script>
 import LoaderMixin from '../core/mixins/loader';
 
-const MEDIA_TYPE = {
+export const MEDIA_TYPE = {
     IMAGE: 'image',
     VIDEO: 'video',
 };
diff --git a/resources/assets/js/volumes/createFormStep2.vue b/resources/assets/js/volumes/createFormStep2.vue
new file mode 100644
index 000000000..856aeb20a
--- /dev/null
+++ b/resources/assets/js/volumes/createFormStep2.vue
@@ -0,0 +1,359 @@
+<script>
+import BrowserApi from './api/browser';
+import Dropdown from 'uiv/dist/Dropdown';
+import FileBrowser from '../core/components/fileBrowser';
+import LoaderMixin from '../core/mixins/loader';
+import {MEDIA_TYPE} from './createFormStep1';
+
+const FILE_SOURCE = {
+    REMOTE: 'remote',
+    DISK: 'disk',
+    USER_DISK: 'user-disk',
+};
+
+const numberFormatter = new Intl.NumberFormat();
+
+export default {
+    mixins: [LoaderMixin],
+    components: {
+        dropdown: Dropdown,
+        fileBrowser: FileBrowser,
+    },
+    data() {
+        return {
+            disks: [],
+            filenames: '',
+            fileSource: FILE_SOURCE.REMOTE,
+            handle: '',
+            imageDiskCache: {},
+            initializingBrowser: false,
+            loadingBrowser: false,
+            mediaType: MEDIA_TYPE.IMAGE,
+            name: '',
+            selectedDiskRoot: null,
+            storageDisk: null,
+            url: '',
+            videoDiskCache: {},
+        };
+    },
+    computed: {
+        showFilenameWarning() {
+            return this.filenames.includes('.tif');
+        },
+        hasDirectories() {
+            return this.currentDirectories.length > 0;
+        },
+        isImageMediaType() {
+            return this.mediaType === MEDIA_TYPE.IMAGE;
+        },
+        isVideoMediaType() {
+            return this.mediaType === MEDIA_TYPE.VIDEO;
+        },
+        isRemoteImageVolume() {
+            return this.isImageMediaType && this.url.search(/^https?:\/\//) !== -1;
+        },
+        isRemoteFileSource() {
+            return this.fileSource === FILE_SOURCE.REMOTE;
+        },
+        isDiskFileSource() {
+            return this.fileSource === FILE_SOURCE.DISK;
+        },
+        isUserDiskFileSource() {
+            return this.fileSource === FILE_SOURCE.USER_DISK;
+        },
+        showFileBrowser() {
+            return this.isDiskFileSource || this.isUserDiskFileSource;
+        },
+        storageDiskEmpty() {
+            if (this.initializingBrowser) {
+                return false;
+            }
+
+            let root = this.selectedDiskRoot;
+
+            return !root || (root.files.length === 0 && Object.keys(root.directories).length === 0);
+        },
+        emptyText() {
+            if (this.isVideoMediaType) {
+                return 'no videos';
+            }
+
+            return 'no images';
+        },
+        cannotSubmit() {
+            return this.name === '' || this.url === '' || this.filenames === '' || this.loading;
+        },
+        fileCount() {
+            return this.filenames.split(',').filter(f => f).length;
+        },
+        fileCountText() {
+            return numberFormatter.format(this.fileCount);
+        },
+    },
+    methods: {
+        fetchDirectories(disk, path) {
+            return BrowserApi.get({disk: disk, path: path});
+        },
+        fetchFiles(disk, path) {
+            if (this.isVideoMediaType) {
+                return BrowserApi.getVideos({disk: disk, path: path});
+            }
+
+            return BrowserApi.getImages({disk: disk, path: path});
+        },
+        parseBrowserResponses(responses) {
+            let [dirResponse, fileResponse] = responses;
+            let directories = {};
+            dirResponse.body.forEach(function (path) {
+                directories[path] = {
+                    name: path,
+                    directories: {},
+                    files: [],
+                    loaded: false,
+                    loading: false,
+                    selected: false,
+                };
+            });
+
+            let files = fileResponse.body.map(function (name) {
+                return {
+                    name: name,
+                    selected: false,
+                };
+            });
+
+            return [directories, files];
+        },
+        fetchDirectoryContent(disk, path) {
+            return Vue.Promise.all([
+                    this.fetchDirectories(disk, path),
+                    this.fetchFiles(disk, path),
+                ])
+                .then(this.parseBrowserResponses);
+        },
+        setFiles(response) {
+            this.filenames = response.body.join(', ');
+        },
+        resetFileSource() {
+            this.selectRemoteFileSource();
+        },
+        selectImageMediaType() {
+            this.mediaType = MEDIA_TYPE.IMAGE;
+            this.resetFileSource();
+        },
+        selectVideoMediaType() {
+            this.mediaType = MEDIA_TYPE.VIDEO;
+            this.resetFileSource();
+        },
+        selectRemoteFileSource() {
+            if (!this.isRemoteFileSource) {
+                this.fileSource = FILE_SOURCE.REMOTE;
+                this.storageDisk = null;
+                this.selectedDiskRoot = null;
+                this.url = '';
+                this.filenames = '';
+            }
+        },
+        selectStorageDisk(disk) {
+            if (this.storageDisk !== disk) {
+                if (this.disks.includes(disk)) {
+                    this.fileSource = FILE_SOURCE.DISK;
+                } else if (disk.startsWith('user-')) {
+                    this.fileSource = FILE_SOURCE.USER_DISK;
+                } else {
+                    return;
+                }
+
+                this.selectedDiskRoot = null;
+                this.storageDisk = disk;
+                this.url = '';
+                this.filenames = '';
+            }
+        },
+        showStorageDiskRoot(disk) {
+            let cache = this.isVideoMediaType ? this.videoDiskCache : this.imageDiskCache;
+
+            if (!cache.hasOwnProperty(disk)) {
+                cache[disk] = this.fetchDirectoryContent(disk, '')
+                    .then(this.setStorageDiskRoot, this.handleErrorResponse);
+            }
+
+            return cache[disk];
+        },
+        setStorageDiskRoot(args) {
+            let [dirs, files] = args;
+
+            return {
+                name: '',
+                directories: dirs,
+                files: files,
+                loaded: true,
+            };
+        },
+        handleLoadDirectory(directory, path) {
+            directory.loading = true;
+            // Remove leading slash.
+            path = path.slice(1);
+
+            return this.fetchDirectoryContent(this.storageDisk, path)
+                    .then(function (args) {
+                        let [dirs, files] = args;
+                        directory.directories = dirs;
+                        directory.files = files;
+                        directory.loaded = true;
+
+                        return directory;
+                    }, this.handleErrorResponse)
+                    .finally(() => directory.loading = false);
+        },
+        unselectAllDirectories(directory) {
+            directory.selected = false;
+            directory.files.forEach(file => file.selected = false);
+            Object.keys(directory.directories).forEach((key) => {
+                this.unselectAllDirectories(directory.directories[key]);
+            });
+        },
+        selectDirectory(directory, path) {
+            let promise;
+            if (!directory.loaded) {
+                promise = this.handleLoadDirectory(directory, path);
+            } else {
+                promise = Vue.Promise.resolve(directory);
+            }
+
+            promise.then((directory) => {
+                this.unselectDirectory(this.selectedDiskRoot);
+                directory.selected = true;
+                if (directory.files.length > 0) {
+                    directory.files.forEach(file => file.selected = true);
+                    this.setUrlAndFilenames(path, directory.files);
+                }
+            });
+        },
+        setUrlAndFilenames(path, files) {
+            // Add only one slash, as path already has a leading slash.
+            this.url = `${this.storageDisk}:/${path}`;
+            this.filenames = files.map(file => file.name).join(', ');
+        },
+        unselectDirectory(directory) {
+            this.unselectAllDirectories(directory);
+            this.url = '';
+            this.filenames = '';
+        },
+        recurseLoadDirectories(path) {
+            let breadcrumbs = path.split('/');
+            let currentDir = breadcrumbs.pop();
+            let promise;
+
+            if (breadcrumbs.length > 1) {
+                promise = this.recurseLoadDirectories(breadcrumbs.join('/'));
+            } else {
+                promise = Vue.Promise.resolve(this.selectedDiskRoot);
+            }
+
+            return promise.then((directory) => {
+                if (!directory.directories.hasOwnProperty(currentDir)) {
+                    throw `Directory '${currentDir}' not found`;
+                }
+
+                return this.handleLoadDirectory(
+                    directory.directories[currentDir], path
+                );
+            });
+        },
+        initializeSelectedFilesAfterError(directory, path) {
+            let files = this.filenames.split(',').map(f => f.trim())
+            if (files.length === directory.files.length) {
+                this.selectDirectory(directory, path);
+            } else {
+                // Hack to expand the directory but not select it.
+                directory.selected = true;
+                this.$nextTick(() => directory.selected = false);
+
+                directory.files
+                    .filter(f => files.includes(f.name))
+                    .forEach(f => f.selected = true);
+            }
+        },
+        initializeSelectedStorageDiskAfterError(disk, path) {
+            this.storageDisk = disk;
+            this.fileSource = FILE_SOURCE.DISK;
+            // A leading slash is expected in the subsequent functions.
+            path = '/' + path;
+
+            this.initializingBrowser = true;
+            this.showStorageDiskRoot(disk)
+                .then(root => this.selectedDiskRoot = root)
+                .then(() => this.recurseLoadDirectories(path))
+                .then((dir) => this.initializeSelectedFilesAfterError(dir, path))
+                .finally(() => this.initializingBrowser = false);
+        },
+        selectFile(file, directory, path, event) {
+            let selectedFiles = directory.files.filter(f => f.selected);
+            if (event?.ctrlKey && selectedFiles.length > 0) {
+                selectedFiles.push(file)
+                if (selectedFiles.length === directory.files.length) {
+                    this.selectDirectory(directory, path);
+                } else {
+                    file.selected = true;
+                    this.setUrlAndFilenames(path, selectedFiles);
+                }
+            } else {
+                this.unselectAllDirectories(this.selectedDiskRoot);
+                if (directory.files.length === 1) {
+                    this.selectDirectory(directory, path);
+                } else {
+                    file.selected = true;
+                }
+                this.setUrlAndFilenames(path, [file]);
+            }
+        },
+        unselectFile(file, directory, path, event) {
+            if (event?.ctrlKey) {
+                file.selected = false;
+                let selectedFiles = directory.files.filter(f => f.selected);
+                if (selectedFiles.length > 0) {
+                    directory.selected = false;
+                    this.setUrlAndFilenames(path, selectedFiles);
+                } else {
+                    this.unselectDirectory(directory);
+                }
+            } else {
+                this.selectFile(file, directory, path, event);
+            }
+        },
+    },
+    watch: {
+        storageDisk(disk) {
+            if (disk) {
+                this.initializingBrowser = true;
+                this.showStorageDiskRoot(disk)
+                    .then(root => this.selectedDiskRoot = root)
+                    .finally(() => this.initializingBrowser = false);
+            }
+        },
+        selectedDiskRoot(newRoot, oldRoot) {
+            if (oldRoot) {
+                this.unselectAllDirectories(oldRoot);
+            }
+        },
+    },
+    created() {
+        this.disks = biigle.$require('volumes.disks');
+        this.url = biigle.$require('volumes.url');
+        this.name = biigle.$require('volumes.name');
+        this.handle = biigle.$require('volumes.handle');
+        this.mediaType = biigle.$require('volumes.mediaType');
+        this.filenames = biigle.$require('volumes.filenames');
+
+        let [disk, path] = this.url.split('://');
+        if (this.disks.includes(disk)) {
+            this.initializeSelectedStorageDiskAfterError(disk, path);
+        }
+    },
+    mounted() {
+        // Vue disables the autofocus attribute somehow, so set focus manually here.
+        this.$refs.nameInput.focus();
+    },
+};
+</script>
diff --git a/resources/assets/js/volumes/main.js b/resources/assets/js/volumes/main.js
index 95e8cd011..bdaf173b9 100644
--- a/resources/assets/js/volumes/main.js
+++ b/resources/assets/js/volumes/main.js
@@ -1,6 +1,7 @@
 import './export';
 import AnnotationSessionPanel from './annotationSessionPanel';
-import CreateForm from './createForm';
+import CreateFormStep1 from './createFormStep1';
+import CreateFormStep2 from './createFormStep2';
 import CloneForm from './cloneForm';
 import FileCount from './fileCount';
 import FilePanel from './filePanel';
@@ -10,7 +11,8 @@ import SearchResults from './searchResults';
 import VolumeContainer from './volumeContainer';
 
 biigle.$mount('annotation-session-panel', AnnotationSessionPanel);
-biigle.$mount('create-volume-form', CreateForm);
+biigle.$mount('create-volume-form-step-1', CreateFormStep1);
+biigle.$mount('create-volume-form-step-2', CreateFormStep2);
 biigle.$mount('clone-volume-form', CloneForm);
 biigle.$mount('file-panel', FilePanel);
 biigle.$mount('projects-breadcrumb', ProjectsBreadcrumb);
diff --git a/resources/views/volumes/create.blade.php b/resources/views/volumes/create/step1.blade.php
similarity index 95%
rename from resources/views/volumes/create.blade.php
rename to resources/views/volumes/create/step1.blade.php
index 7fd187e53..8323524b8 100644
--- a/resources/views/volumes/create.blade.php
+++ b/resources/views/volumes/create/step1.blade.php
@@ -1,6 +1,6 @@
 @extends('app')
 
-@section('title', 'Create new volume')
+@section('title', 'Start creating a new volume')
 
 @push('scripts')
    <script type="text/javascript">
@@ -10,7 +10,7 @@
 
 @section('content')
 
-<div id="create-volume-form" class="col-sm-8 col-sm-offset-2 col-lg-6 col-lg-offset-3">
+<div id="create-volume-form-step-1" class="col-sm-8 col-sm-offset-2 col-lg-6 col-lg-offset-3">
     <h2>New volume for {{ $project->name }}</h2>
     <form role="form" method="POST" action="{{ url("api/v1/projects/{$project->id}/pending-volumes") }}" enctype="multipart/form-data" v-on:submit="startLoading">
     <fieldset>
diff --git a/resources/views/volumes/create/step2.blade.php b/resources/views/volumes/create/step2.blade.php
new file mode 100644
index 000000000..c430ab8ac
--- /dev/null
+++ b/resources/views/volumes/create/step2.blade.php
@@ -0,0 +1,208 @@
+@extends('app')
+
+@section('title', 'Finish creating a new volume')
+
+@push('scripts')
+    <script type="text/javascript">
+        biigle.$declare('volumes.name', '{!! old('name') !!}');
+        biigle.$declare('volumes.url', '{!! old('url') !!}');
+        biigle.$declare('volumes.handle', `{!! old('handle') !!}`);
+        biigle.$declare('volumes.mediaType', '{!! $mediaType !!}');
+        biigle.$declare('volumes.filenames', '{{ $filenames }}');
+        biigle.$declare('volumes.disks', {!! $disks->keys() !!});
+    </script>
+@endpush
+
+@section('content')
+
+<div id="create-volume-form-step-2" class="col-sm-8 col-sm-offset-2 col-lg-6 col-lg-offset-3">
+    <h2>New volume for {{ $project->name }}</h2>
+    <form method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}") }}" v-on:submit="startLoading">
+        <fieldset>
+            <legend>
+                2. Choose a volume name
+            </legend>
+            <div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}">
+                <input type="text" class="form-control" name="name" id="name" v-model="name" placeholder="My new volume" ref="nameInput" required autofocus>
+                @if ($errors->has('name'))
+                   <span class="help-block">{{ $errors->first('name') }}</span>
+                @endif
+            </div>
+        </fieldset>
+
+        <fieldset>
+            <legend class="clearfix">
+                3. Choose a file source
+                <span class="text-muted pull-right">
+                    <span v-text="fileCountText">0</span> files
+                </span>
+            </legend>
+             <div class="form-group">
+                <div class="btn-group btn-group-justified">
+                    @if ($offlineMode && $disks->isEmpty())
+                        <div class="panel panel-danger">
+                            <div class="panel-body text-danger">
+                                Please configure available storage disks with the <code>VOLUME_ADMIN_STORAGE_DISKS</code> and <code>VOLUME_EDITOR_STORAGE_DISKS</code> environment variables.
+                            </div>
+                        </div>
+                    @endif
+                    @unless ($offlineMode)
+                        <div class="btn-group">
+                            <button type="button" class="btn btn-default" title="Remote location" v-on:click="selectRemoteFileSource" v-bind:class="{active: isRemoteFileSource}" ><i class="fa fa-link"></i> Remote location</button>
+                        </div>
+                    @endunless
+                    @if ($userDisk)
+                        <div class="btn-group">
+                            <button type="button" class="btn btn-default" title="Choose files from your uploads" v-on:click="selectStorageDisk('{{$userDisk}}')" v-bind:class="{active: isUserDiskFileSource}">
+                                <i class="fa fa-upload"></i> Uploaded files
+                            </button>
+                        </div>
+                    @endif
+                    @if ($disks->count() > 1)
+                        <div class="btn-group">
+                            <dropdown tag="span">
+                                <button class="btn btn-default dropdown-toggle" v-bind:class="{active: isDiskFileSource}" type="button" title="Select a storage disk">
+                                    <i class="fa fa-database"></i> Storage disk <span class="caret"></span>
+                                </button>
+                                <template slot="dropdown">
+                                    @foreach ($disks as $id => $name)
+                                        <li>
+                                             <a title="Choose files from the '{{$name}}' storage disk" href="#" v-on:click.prevent="selectStorageDisk('{{$id}}')">{{$name}}</a>
+                                        </li>
+                                    @endforeach
+                                </template>
+                            </dropdown>
+                        </div>
+                    @elseif ($disks->count() === 1)
+                        <div class="btn-group">
+                            <button type="button" class="btn btn-default volume-storage-disk-btn" title="Choose files from the '{{$disks->values()->first()}}' storage disk" v-on:click="selectStorageDisk('{{$disks->keys()->first()}}')" v-bind:class="{active: isDiskFileSource}">
+                                <i class="fa fa-database"></i> {{$disks->values()->first()}}
+                            </button>
+                        </div>
+                    @endif
+                </div>
+            </div>
+        </fieldset>
+
+        @unless ($offlineMode)
+            <div v-if="isRemoteFileSource">
+                <div class="form-group{{ $errors->has('url') ? ' has-error' : '' }}">
+                    <label for="url">Remote location URL <a href="{{route('manual-tutorials', ['volumes', 'remote-volumes'])}}" target="_blank" title="Learn more about remote volumes"><i class="fa fa-question-circle"></i></a></label>
+                    <input type="text" class="form-control" name="url" id="url" placeholder="https://my-domain.tld/volume" required v-model="url" value="{{old('url')}}">
+                    @if ($errors->has('url'))
+                       <span class="help-block">{{ $errors->first('url') }}</span>
+                    @endif
+                 </div>
+
+                 <div v-if="isImageMediaType" class="panel panel-warning">
+                    <div class="panel-body text-warning">
+                        Remote locations for image volumes must support <a href="/manual/tutorials/volumes/remote-volumes#cors">cross-origin resource sharing</a>.
+                    </div>
+                </div>
+
+                 <div class="form-group{{ $errors->has('files') ? ' has-error' : '' }}">
+                    <label for="files">Volume files</label>
+                    <div v-if="isImageMediaType" @unless ($mediaType === 'image') v-cloak @endif>
+                        <textarea class="form-control" name="files" id="files" placeholder="1.jpg, 2.jpg, 3.jpg" required v-model="filenames" rows="3"></textarea>
+                        <p class="help-block">
+                           The filenames of the images in the volume directory formatted as comma separated values. Example: <code>1.jpg, 2.jpg, 3.jpg</code>. The supported image file formats are: JPEG, PNG, WebP and TIFF.
+                        </p>
+                    </div>
+                    <div v-else @unless ($mediaType === 'video') v-cloak @endif>
+                        <textarea class="form-control" name="files" id="files" placeholder="1.mp4, 2.mp4, 3.mp4" required v-model="filenames" rows="3"></textarea>
+                        <p class="help-block">
+                           The filenames of the videos in the volume directory formatted as comma separated values. Example: <code>1.mp4, 2.mp4, 3.mp4</code>. The supported video file formats are: MP4 (H.264) and WebM (VP8, VP9, AV1).
+                        </p>
+                    </div>
+                    @if($errors->has('files'))
+                       <span class="help-block">{{ $errors->first('files') }}</span>
+                    @endif
+                 </div>
+            </div>
+        @endunless
+
+        <div v-if="showFileBrowser" v-cloak>
+
+            <p v-if="initializingBrowser">
+                <loader v-bind:active="true"></loader> loading available files...
+            </p>
+            <p v-else class="help-block">
+                <span v-if="storageDiskEmpty" class="text-warning">
+                    No files found.
+                    @if (Route::has('create-storage-requests'))
+                        <a href="{{route('create-storage-requests')}}">Upload new files.</a>
+                    @endif
+                </span>
+                <span v-else>
+                    Select a directory or files below. All selected files will be used for the new volume.
+                </span>
+                <span v-if="isImageMediaType">Only files with a supported image file format are shown (JPEG, PNG, WebP and TIFF).</span>
+                <span v-if="isVideoMediaType">Only files with a supported video file format are shown (MP4 (H.264) and WebM (VP8, VP9, AV1)).</span>
+            </p>
+
+            <file-browser
+                v-if="selectedDiskRoot"
+                v-bind:root-directory="selectedDiskRoot"
+                v-bind:expanded="false"
+                v-bind:empty-text="emptyText"
+                v-bind:selectable="true"
+                v-bind:files-selectable="true"
+                v-bind:expand-on-select="true"
+                v-on:select="selectDirectory"
+                v-on:select-file="selectFile"
+                v-on:unselect="unselectDirectory"
+                v-on:unselect-file="unselectFile"
+                v-on:load="handleLoadDirectory"
+                ></file-browser>
+
+
+            <input type="hidden" name="url" required v-model="url">
+            <input type="hidden" name="files" required v-model="filenames">
+
+            @if ($errors->has('url'))
+                <div class="form-group has-error">
+                    <span class="help-block">{{ $errors->first('url') }}</span>
+                 </div>
+            @endif
+            @if ($errors->has('files'))
+                <div class="form-group has-error">
+                    <span class="help-block">{{ $errors->first('files') }}</span>
+                 </div>
+            @endif
+        </div>
+
+        <div v-if="showFilenameWarning" v-cloak class="panel panel-warning">
+            <div class="panel-body text-warning">
+                Most browsers do not support the TIFF format. Only use it for very large images with more than {{config('image.tiles.threshold')}} pixels at one edge, as these will be automatically converted by BIIGLE.
+            </div>
+        </div>
+
+        <fieldset>
+             <legend>
+                 4. Set a handle or DOI <span class="text-muted">(optional)</span>
+             </legend>
+
+             <div class="form-group{{ $errors->has('handle') ? ' has-error' : '' }}">
+                <input type="text" class="form-control" name="handle" id="handle" v-model="handle" placeholder="10.3389/fmars.2017.00083">
+                <span class="help-block">
+                    A <a href="https://handle.net">handle</a> or <a href="https://www.doi.org/">DOI</a> to be associated with the volume.
+                </span>
+                @if ($errors->has('handle'))
+                    <span class="help-block">{{ $errors->first('handle') }}</span>
+                @endif
+            </div>
+        </fieldset>
+        <div class="form-group">
+            <input type="hidden" name="_token" value="{{ csrf_token() }}">
+            <input type="hidden" name="_method" value="PUT">
+            <button type="submit" form="cancel-pending-volume" class="btn btn-default" :disabled="loading" title="Discard data and return to the previous step">Cancel</button>
+            <input type="submit" class="btn btn-success pull-right" value="Create" :disabled="cannotSubmit" title="Create the volume">
+        </div>
+    </form>
+    <form id="cancel-pending-volume" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}") }}" v-on:submit="startLoading">
+        <input type="hidden" name="_token" value="{{ csrf_token() }}">
+        <input type="hidden" name="_method" value="DELETE">
+    </form>
+</div>
+
+@endsection
diff --git a/routes/api.php b/routes/api.php
index 420e6592c..aa25f2250 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -148,7 +148,7 @@
 ]);
 
 $router->resource('pending-volumes', 'PendingVolumeController', [
-    'only' => ['update'],
+    'only' => ['update', 'destroy'],
     'parameters' => ['pending-volumes' => 'id'],
 ]);
 
diff --git a/routes/web.php b/routes/web.php
index 0970d1c79..a4175adf6 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -247,6 +247,13 @@
         ]);
     });
 
+    $router->group(['namespace' => 'Volumes', 'prefix' => 'pending-volumes'], function ($router) {
+        $router->get('{id}', [
+            'as'   => 'pending-volume',
+            'uses' => 'PendingVolumeController@show',
+        ]);
+    });
+
     $router->group(['namespace' => 'Volumes', 'prefix' => 'volumes'], function ($router) {
         $router->get('create', [
             'as'   => 'create-volume',
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
index 8d1431980..d7d8670dc 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
@@ -155,6 +155,20 @@ public function testStoreVideoWithFileInvalid()
         ])->assertStatus(422);
     }
 
+    public function testStoreFromUI()
+    {
+        $id = $this->project()->id;
+
+        $this->beAdmin();
+        $response = $this->post("/api/v1/projects/{$id}/pending-volumes", [
+            'media_type' => 'image',
+        ]);
+
+        $pv = PendingVolume::first();
+
+        $response->assertRedirectToRoute('pending-volume', $pv->id);
+    }
+
     public function testUpdateImages()
     {
         config(['volumes.editor_storage_disks' => ['test']]);
@@ -247,6 +261,7 @@ public function testUpdateImages()
             $this->assertEquals($id, $job->volume->id);
             $this->assertContains('1.jpg', $job->filenames);
             $this->assertContains('2.jpg', $job->filenames);
+            $this->assertCount(2, $job->filenames);
 
             return true;
         });
@@ -301,6 +316,63 @@ public function testUpdateImagesWithImageLabelImport()
         $this->markTestIncomplete();
     }
 
+    public function testUpdateFromUIWithoutImport()
+    {
+        $disk = Storage::fake('test');
+        config(['volumes.editor_storage_disks' => ['test']]);
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+        ]);
+        $id = $pv->id;
+
+        $disk->makeDirectory('images');
+        $disk->put('images/1.jpg', 'abc');
+
+        $this->beAdmin();
+        $response = $this->put("/api/v1/pending-volumes/{$pv->id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test://images',
+            'files' => ['1.jpg'],
+        ]);
+        $volume = Volume::first();
+
+        $response->assertRedirectToRoute('volume', $volume->id);
+    }
+
+    public function testUpdateFileString()
+    {
+        $disk = Storage::fake('test');
+        config(['volumes.editor_storage_disks' => ['test']]);
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+        ]);
+        $id = $pv->id;
+
+        $disk->makeDirectory('images');
+        $disk->put('images/1.jpg', 'abc');
+        $disk->put('images/2.jpg', 'abc');
+
+        $this->beAdmin();
+        $this->putJson("/api/v1/pending-volumes/{$pv->id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test://images',
+            'files' => '"1.jpg" , 2.jpg , ,',
+        ])->assertSuccessful();
+
+        $volume = Volume::first();
+        Queue::assertPushed(CreateNewImagesOrVideos::class, function ($job) {
+            $this->assertContains('1.jpg', $job->filenames);
+            $this->assertContains('2.jpg', $job->filenames);
+            $this->assertCount(2, $job->filenames);
+
+            return true;
+        });
+    }
+
     public function testUpdateHandle()
     {
         config(['volumes.editor_storage_disks' => ['test']]);
@@ -628,4 +700,34 @@ public function testUpdateAuthorizeDisk()
             'files' => ['1.jpg'],
         ])->assertSuccessful();
     }
+
+    public function testDestroy()
+    {
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+        ]);
+
+        $this->beExpert();
+        $this->deleteJson("/api/v1/pending-volumes/{$pv->id}")->assertStatus(403);
+
+        $this->beAdmin();
+        $this->deleteJson("/api/v1/pending-volumes/{$pv->id}")->assertStatus(200);
+        $this->assertNull($pv->fresh());
+    }
+
+    public function testDestroyFromUI()
+    {
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+        ]);
+
+        $this->beAdmin();
+        $this
+            ->delete("/api/v1/pending-volumes/{$pv->id}")
+            ->assertRedirectToRoute('create-volume', ['project' => $pv->project_id]);
+    }
 }
diff --git a/tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php b/tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php
new file mode 100644
index 000000000..bedf6ff58
--- /dev/null
+++ b/tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Biigle\Tests\Http\Controllers\Views\Volumes;
+
+use ApiTestCase;
+use Biigle\PendingVolume;
+
+class PendingVolumeControllerTest extends ApiTestCase
+{
+    public function testShow()
+    {
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+        ]);
+
+        // not logged in
+        $this->get("pending-volumes/{$pv->id}")->assertStatus(302);
+
+        // doesn't belong to pending volume
+        $this->beExpert();
+        $this->get("pending-volumes/{$pv->id}")->assertStatus(403);
+
+        $this->beAdmin();
+        $this->get("pending-volumes/{$pv->id}")->assertStatus(200);
+    }
+}
diff --git a/tests/php/Policies/PendingVolumePolicyTest.php b/tests/php/Policies/PendingVolumePolicyTest.php
index 866eacbfd..0d762c5de 100644
--- a/tests/php/Policies/PendingVolumePolicyTest.php
+++ b/tests/php/Policies/PendingVolumePolicyTest.php
@@ -33,6 +33,17 @@ public function setUp(): void
         $project->addUserId($this->owner->id, Role::adminId());
     }
 
+    public function testAccess()
+    {
+        $this->assertFalse($this->user->can('access', $this->pv));
+        $this->assertFalse($this->guest->can('access', $this->pv));
+        $this->assertFalse($this->editor->can('access', $this->pv));
+        $this->assertFalse($this->expert->can('access', $this->pv));
+        $this->assertFalse($this->admin->can('access', $this->pv));
+        $this->assertTrue($this->owner->can('access', $this->pv));
+        $this->assertTrue($this->globalAdmin->can('access', $this->pv));
+    }
+
     public function testUpdate()
     {
         $this->assertFalse($this->user->can('update', $this->pv));
@@ -43,4 +54,15 @@ public function testUpdate()
         $this->assertTrue($this->owner->can('update', $this->pv));
         $this->assertTrue($this->globalAdmin->can('update', $this->pv));
     }
+
+    public function testDestroy()
+    {
+        $this->assertFalse($this->user->can('destroy', $this->pv));
+        $this->assertFalse($this->guest->can('destroy', $this->pv));
+        $this->assertFalse($this->editor->can('destroy', $this->pv));
+        $this->assertFalse($this->expert->can('destroy', $this->pv));
+        $this->assertFalse($this->admin->can('destroy', $this->pv));
+        $this->assertTrue($this->owner->can('destroy', $this->pv));
+        $this->assertTrue($this->globalAdmin->can('destroy', $this->pv));
+    }
 }

From 64553640d4b24f370295d56bd73eff0ba43e617c Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 14 Mar 2024 12:05:51 +0100
Subject: [PATCH 037/209] Improve UX of create volume v2 step 1

---
 resources/assets/js/volumes/createFormStep1.vue | 15 +++++++++++++--
 resources/views/volumes/create/step1.blade.php  |  7 ++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/resources/assets/js/volumes/createFormStep1.vue b/resources/assets/js/volumes/createFormStep1.vue
index 084d43fa7..85de24d15 100644
--- a/resources/assets/js/volumes/createFormStep1.vue
+++ b/resources/assets/js/volumes/createFormStep1.vue
@@ -11,6 +11,8 @@ export default {
     data() {
         return {
             mediaType: MEDIA_TYPE.IMAGE,
+            hasFile: false,
+            initialized: false,
         };
     },
     computed: {
@@ -22,18 +24,22 @@ export default {
         },
         imageTypeButtonClass() {
             return {
-                'btn-default': !this.isImageMediaType,
                 active: this.isImageMediaType,
                 'btn-info': this.isImageMediaType,
             };
         },
         videoTypeButtonClass() {
             return {
-                'btn-default': !this.isVideoMediaType,
                 active: this.isVideoMediaType,
                 'btn-info': this.isVideoMediaType,
             };
         },
+        fileButtonClass() {
+            return {
+                active: this.hasFile,
+                'btn-info': this.hasFile,
+            };
+        },
     },
     methods: {
         selectImageMediaType() {
@@ -45,9 +51,14 @@ export default {
         selectFile() {
             this.$refs.metadataFileField.click();
         },
+        handleSelectedFile() {
+            this.hasFile = this.$refs.metadataFileField.files.length > 0;
+        },
     },
     created() {
         this.mediaType = biigle.$require('volumes.mediaType');
+        // Used to hide a dummy button that masks a flashing selected state on load.
+        this.initialized = true;
     },
 };
 </script>
diff --git a/resources/views/volumes/create/step1.blade.php b/resources/views/volumes/create/step1.blade.php
index 8323524b8..407a7f7af 100644
--- a/resources/views/volumes/create/step1.blade.php
+++ b/resources/views/volumes/create/step1.blade.php
@@ -20,7 +20,8 @@
         <div class="form-group {{ $errors->has('media_type') ? ' has-error' : '' }}">
             <div class="btn-group btn-group-justified">
                 <div class="btn-group">
-                    <button type="button" class="btn btn-default btn-lg" v-on:click="selectImageMediaType" :class="imageTypeButtonClass"><i class="fa fa-image"></i> Image Volume</button>
+                    <button v-if="!initialized" type="button" class="btn btn-info  btn-lg active"><i class="fa fa-image"></i> Image Volume</button>
+                    <button v-cloak type="button" class="btn btn-default btn-lg" v-on:click="selectImageMediaType" :class="imageTypeButtonClass" ref="imageTypeButton"><i class="fa fa-image"></i> Image Volume</button>
                 </div>
                 <div class="btn-group">
                     <button type="button" class="btn btn-default btn-lg" v-on:click="selectVideoMediaType" :class="videoTypeButtonClass"><i class="fa fa-film"></i> Video Volume</button>
@@ -41,9 +42,9 @@
         </legend>
         <div class="form-group{{ $errors->has('metadata_file') ? ' has-error' : '' }}">
             <p class="text-center">
-                <button class="btn btn-default btn-lg" type="button" v-on:click="selectFile"><i class="fa fa-file-alt"></i> Select a file</button>
+                <button class="btn btn-default btn-lg" type="button" v-on:click="selectFile" :class="fileButtonClass"><i class="fa fa-file-alt"></i> Select a file</button>
             </p>
-            <input class="hidden" name="metadata_file" type="file" ref="metadataFileField">
+            <input class="hidden" name="metadata_file" type="file" ref="metadataFileField" v-on:change="handleSelectedFile">
             @if ($errors->has('metadata_file'))
                <p class="help-block">{{ $errors->first('metadata_file') }}</p>
             @endif

From 7352ab412f442fd32e8abd24f5090b7ba45aba8a Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 14 Mar 2024 13:11:15 +0100
Subject: [PATCH 038/209] Fix CS

---
 app/Http/Controllers/Views/Volumes/PendingVolumeController.php | 2 +-
 app/Http/Controllers/Views/Volumes/VolumeController.php        | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
index 32cb92eeb..a78d95314 100644
--- a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
@@ -3,9 +3,9 @@
 namespace Biigle\Http\Controllers\Views\Volumes;
 
 use Biigle\Http\Controllers\Views\Controller;
+use Biigle\MediaType;
 use Biigle\Modules\UserDisks\UserDisk;
 use Biigle\Modules\UserStorage\UserStorageServiceProvider;
-use Biigle\MediaType;
 use Biigle\PendingVolume;
 use Biigle\Role;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/Views/Volumes/VolumeController.php b/app/Http/Controllers/Views/Volumes/VolumeController.php
index 694740675..520798665 100644
--- a/app/Http/Controllers/Views/Volumes/VolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/VolumeController.php
@@ -6,7 +6,6 @@
 use Biigle\LabelTree;
 use Biigle\MediaType;
 use Biigle\Project;
-use Biigle\Role;
 use Biigle\User;
 use Biigle\Volume;
 use Carbon\Carbon;

From 6d52278fed7ab082c7856561e5c0922676889544 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 14 Mar 2024 13:38:49 +0100
Subject: [PATCH 039/209] Implement continuing of previous pending volume

---
 .../Views/Volumes/PendingVolumeController.php    |  3 +++
 .../Views/Volumes/VolumeController.php           |  8 ++++++++
 resources/views/volumes/create/step2.blade.php   |  7 +++++++
 .../Views/Volumes/VolumeControllerTest.php       | 16 ++++++++++++++++
 4 files changed, 34 insertions(+)

diff --git a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
index a78d95314..1d9bebb7d 100644
--- a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
@@ -61,6 +61,8 @@ public function show(Request $request)
             default => 'image',
         };
 
+        $restored = session()->has('restored');
+
         return view('volumes.create.step2', [
             'pv' => $pv,
             'project' => $pv->project,
@@ -70,6 +72,7 @@ public function show(Request $request)
             'offlineMode' => $offlineMode,
             'userDisk' => $userDisk,
             'mediaType' => $mediaType,
+            'restored' => $restored,
         ]);
     }
 }
diff --git a/app/Http/Controllers/Views/Volumes/VolumeController.php b/app/Http/Controllers/Views/Volumes/VolumeController.php
index 520798665..613491a0d 100644
--- a/app/Http/Controllers/Views/Volumes/VolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/VolumeController.php
@@ -5,6 +5,7 @@
 use Biigle\Http\Controllers\Views\Controller;
 use Biigle\LabelTree;
 use Biigle\MediaType;
+use Biigle\PendingVolume;
 use Biigle\Project;
 use Biigle\User;
 use Biigle\Volume;
@@ -24,6 +25,13 @@ public function create(Request $request)
         $project = Project::findOrFail($request->input('project'));
         $this->authorize('update', $project);
 
+        $pv = $project->pendingVolumes()->where('user_id', $request->user()->id)->first();
+        if (!is_null($pv)) {
+            return redirect()
+                ->route('pending-volume', $pv->id)
+                ->with('restored', true);
+        }
+
         $mediaType = old('media_type', 'image');
 
         return view('volumes.create.step1', [
diff --git a/resources/views/volumes/create/step2.blade.php b/resources/views/volumes/create/step2.blade.php
index c430ab8ac..aa6ee66a6 100644
--- a/resources/views/volumes/create/step2.blade.php
+++ b/resources/views/volumes/create/step2.blade.php
@@ -17,6 +17,13 @@
 
 <div id="create-volume-form-step-2" class="col-sm-8 col-sm-offset-2 col-lg-6 col-lg-offset-3">
     <h2>New volume for {{ $project->name }}</h2>
+    @if ($restored)
+        <div class="panel panel-info">
+            <div class="panel-body text-info">
+                This is pending volume that you did not finish before.
+            </div>
+        </div>
+    @endif
     <form method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}") }}" v-on:submit="startLoading">
         <fieldset>
             <legend>
diff --git a/tests/php/Http/Controllers/Views/Volumes/VolumeControllerTest.php b/tests/php/Http/Controllers/Views/Volumes/VolumeControllerTest.php
index 91638805e..d0c5ec83c 100644
--- a/tests/php/Http/Controllers/Views/Volumes/VolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Views/Volumes/VolumeControllerTest.php
@@ -3,6 +3,7 @@
 namespace Biigle\Tests\Http\Controllers\Views\Volumes;
 
 use ApiTestCase;
+use Biigle\PendingVolume;
 
 class VolumeControllerTest extends ApiTestCase
 {
@@ -62,6 +63,21 @@ public function testCreate()
         $response->assertStatus(200);
     }
 
+    public function testCreateWithExisting()
+    {
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'user_id' => $this->admin()->id,
+        ]);
+
+        $id = $this->project()->id;
+        $this->beAdmin();
+
+        $this
+            ->get('volumes/create?project='.$id)
+            ->assertRedirectToRoute('pending-volume', $pv->id);
+    }
+
     public function testEdit()
     {
         $id = $this->volume()->id;

From 61d9b7cda72290de1b22a0b830762e6b845c1851 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 14 Mar 2024 13:56:45 +0100
Subject: [PATCH 040/209] Improve create volume v2 step 2 UX

---
 .../Views/Volumes/PendingVolumeController.php |  7 ++--
 .../Views/Volumes/VolumeController.php        |  1 -
 .../assets/js/volumes/createFormStep2.vue     | 18 ++++++++++
 .../views/volumes/create/step2.blade.php      | 34 +++++++++++--------
 4 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
index 1d9bebb7d..90bdd2f7c 100644
--- a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
@@ -56,10 +56,8 @@ public function show(Request $request)
             $userDisk = null;
         }
 
-        $mediaType = match ($pv->media_type_id) {
-            MediaType::videoId() => 'video',
-            default => 'image',
-        };
+        $isImageMediaType = $pv->media_type_id === MediaType::imageId();
+        $mediaType = $isImageMediaType ? 'image' : 'video';
 
         $restored = session()->has('restored');
 
@@ -72,6 +70,7 @@ public function show(Request $request)
             'offlineMode' => $offlineMode,
             'userDisk' => $userDisk,
             'mediaType' => $mediaType,
+            'isImageMediaType' => $isImageMediaType,
             'restored' => $restored,
         ]);
     }
diff --git a/app/Http/Controllers/Views/Volumes/VolumeController.php b/app/Http/Controllers/Views/Volumes/VolumeController.php
index 613491a0d..070f35723 100644
--- a/app/Http/Controllers/Views/Volumes/VolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/VolumeController.php
@@ -5,7 +5,6 @@
 use Biigle\Http\Controllers\Views\Controller;
 use Biigle\LabelTree;
 use Biigle\MediaType;
-use Biigle\PendingVolume;
 use Biigle\Project;
 use Biigle\User;
 use Biigle\Volume;
diff --git a/resources/assets/js/volumes/createFormStep2.vue b/resources/assets/js/volumes/createFormStep2.vue
index 856aeb20a..254c2f561 100644
--- a/resources/assets/js/volumes/createFormStep2.vue
+++ b/resources/assets/js/volumes/createFormStep2.vue
@@ -89,6 +89,24 @@ export default {
         fileCountText() {
             return numberFormatter.format(this.fileCount);
         },
+        remoteButtonClass() {
+            return {
+                active: this.isRemoteFileSource,
+                'btn-info': this.isRemoteFileSource,
+            };
+        },
+        userDiskButtonClass() {
+            return {
+                active: this.isUserDiskFileSource,
+                'btn-info': this.isUserDiskFileSource,
+            };
+        },
+        diskButtonClass() {
+            return {
+                active: this.isDiskFileSource,
+                'btn-info': this.isDiskFileSource,
+            };
+        },
     },
     methods: {
         fetchDirectories(disk, path) {
diff --git a/resources/views/volumes/create/step2.blade.php b/resources/views/volumes/create/step2.blade.php
index aa6ee66a6..421c65288 100644
--- a/resources/views/volumes/create/step2.blade.php
+++ b/resources/views/volumes/create/step2.blade.php
@@ -16,7 +16,7 @@
 @section('content')
 
 <div id="create-volume-form-step-2" class="col-sm-8 col-sm-offset-2 col-lg-6 col-lg-offset-3">
-    <h2>New volume for {{ $project->name }}</h2>
+    <h2>New {{$mediaType}} volume for {{ $project->name }}</h2>
     @if ($restored)
         <div class="panel panel-info">
             <div class="panel-body text-info">
@@ -55,12 +55,12 @@
                     @endif
                     @unless ($offlineMode)
                         <div class="btn-group">
-                            <button type="button" class="btn btn-default" title="Remote location" v-on:click="selectRemoteFileSource" v-bind:class="{active: isRemoteFileSource}" ><i class="fa fa-link"></i> Remote location</button>
+                            <button type="button" class="btn btn-default" title="Remote location" v-on:click="selectRemoteFileSource" v-bind:class="remoteButtonClass" ><i class="fa fa-link"></i> Remote location</button>
                         </div>
                     @endunless
                     @if ($userDisk)
                         <div class="btn-group">
-                            <button type="button" class="btn btn-default" title="Choose files from your uploads" v-on:click="selectStorageDisk('{{$userDisk}}')" v-bind:class="{active: isUserDiskFileSource}">
+                            <button type="button" class="btn btn-default" title="Choose files from your uploads" v-on:click="selectStorageDisk('{{$userDisk}}')" v-bind:class="userDiskButtonClass">
                                 <i class="fa fa-upload"></i> Uploaded files
                             </button>
                         </div>
@@ -68,7 +68,7 @@
                     @if ($disks->count() > 1)
                         <div class="btn-group">
                             <dropdown tag="span">
-                                <button class="btn btn-default dropdown-toggle" v-bind:class="{active: isDiskFileSource}" type="button" title="Select a storage disk">
+                                <button class="btn btn-default dropdown-toggle" v-bind:class="diskButtonClass" type="button" title="Select a storage disk" style="border-top-left-radius: 0; border-bottom-left-radius: 0;">
                                     <i class="fa fa-database"></i> Storage disk <span class="caret"></span>
                                 </button>
                                 <template slot="dropdown">
@@ -82,7 +82,7 @@
                         </div>
                     @elseif ($disks->count() === 1)
                         <div class="btn-group">
-                            <button type="button" class="btn btn-default volume-storage-disk-btn" title="Choose files from the '{{$disks->values()->first()}}' storage disk" v-on:click="selectStorageDisk('{{$disks->keys()->first()}}')" v-bind:class="{active: isDiskFileSource}">
+                            <button type="button" class="btn btn-default volume-storage-disk-btn" title="Choose files from the '{{$disks->values()->first()}}' storage disk" v-on:click="selectStorageDisk('{{$disks->keys()->first()}}')" v-bind:class="diskButtonClass">
                                 <i class="fa fa-database"></i> {{$disks->values()->first()}}
                             </button>
                         </div>
@@ -101,26 +101,27 @@
                     @endif
                  </div>
 
-                 <div v-if="isImageMediaType" class="panel panel-warning">
-                    <div class="panel-body text-warning">
-                        Remote locations for image volumes must support <a href="/manual/tutorials/volumes/remote-volumes#cors">cross-origin resource sharing</a>.
+                 @if ($isImageMediaType)
+                     <div class="panel panel-warning">
+                        <div class="panel-body text-warning">
+                            Remote locations for image volumes must support <a href="/manual/tutorials/volumes/remote-volumes#cors">cross-origin resource sharing</a>.
+                        </div>
                     </div>
-                </div>
+                @endif
 
                  <div class="form-group{{ $errors->has('files') ? ' has-error' : '' }}">
                     <label for="files">Volume files</label>
-                    <div v-if="isImageMediaType" @unless ($mediaType === 'image') v-cloak @endif>
+                    @if ($isImageMediaType)
                         <textarea class="form-control" name="files" id="files" placeholder="1.jpg, 2.jpg, 3.jpg" required v-model="filenames" rows="3"></textarea>
                         <p class="help-block">
                            The filenames of the images in the volume directory formatted as comma separated values. Example: <code>1.jpg, 2.jpg, 3.jpg</code>. The supported image file formats are: JPEG, PNG, WebP and TIFF.
                         </p>
-                    </div>
-                    <div v-else @unless ($mediaType === 'video') v-cloak @endif>
+                    @else
                         <textarea class="form-control" name="files" id="files" placeholder="1.mp4, 2.mp4, 3.mp4" required v-model="filenames" rows="3"></textarea>
                         <p class="help-block">
                            The filenames of the videos in the volume directory formatted as comma separated values. Example: <code>1.mp4, 2.mp4, 3.mp4</code>. The supported video file formats are: MP4 (H.264) and WebM (VP8, VP9, AV1).
                         </p>
-                    </div>
+                    @endif
                     @if($errors->has('files'))
                        <span class="help-block">{{ $errors->first('files') }}</span>
                     @endif
@@ -143,8 +144,11 @@
                 <span v-else>
                     Select a directory or files below. All selected files will be used for the new volume.
                 </span>
-                <span v-if="isImageMediaType">Only files with a supported image file format are shown (JPEG, PNG, WebP and TIFF).</span>
-                <span v-if="isVideoMediaType">Only files with a supported video file format are shown (MP4 (H.264) and WebM (VP8, VP9, AV1)).</span>
+                @if ($isImageMediaType)
+                    Only files with a supported image file format are shown (JPEG, PNG, WebP and TIFF).
+                @else
+                    Only files with a supported video file format are shown (MP4 (H.264) and WebM (VP8, VP9, AV1)).
+                @endif
             </p>
 
             <file-browser

From 2b44bae5553b883b93c1986716d477953141ef19 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 14 Mar 2024 14:35:22 +0100
Subject: [PATCH 041/209] Implement a way to extend metadata parsers from a
 module

---
 .../MetadataParsing/ParserFactory.php         | 16 +++++++++
 .../MetadataParsing/ParserFactoryTest.php     | 35 +++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/app/Services/MetadataParsing/ParserFactory.php b/app/Services/MetadataParsing/ParserFactory.php
index 2df5356a1..b0267d92a 100644
--- a/app/Services/MetadataParsing/ParserFactory.php
+++ b/app/Services/MetadataParsing/ParserFactory.php
@@ -3,6 +3,7 @@
 namespace Biigle\Services\MetadataParsing;
 
 use SplFileInfo;
+use Exception;
 
 class ParserFactory
 {
@@ -15,6 +16,9 @@ class ParserFactory
         ],
     ];
 
+    /**
+     * Get the first parser that recognizes the file.
+     */
     public static function getParserForFile(SplFileInfo $file, string $type): ?MetadataParser
     {
         $parsers = self::$parsers[$type] ?? [];
@@ -27,4 +31,16 @@ public static function getParserForFile(SplFileInfo $file, string $type): ?Metad
 
         return null;
     }
+
+    /**
+     * Add a new metadata parser to the list of known parsers.
+     */
+    public static function extend(string $parserClass, string $type): void
+    {
+        if (!in_array(MetadataParser::class, class_parents($parserClass))) {
+            throw new Exception("A metadata parser must extend ".MetadataParser::class);
+        }
+
+        self::$parsers[$type][] = $parserClass;
+    }
 }
diff --git a/tests/php/Services/MetadataParsing/ParserFactoryTest.php b/tests/php/Services/MetadataParsing/ParserFactoryTest.php
index 4a3c9a513..bb81b558e 100644
--- a/tests/php/Services/MetadataParsing/ParserFactoryTest.php
+++ b/tests/php/Services/MetadataParsing/ParserFactoryTest.php
@@ -3,8 +3,10 @@
 namespace Biigle\Tests\Services\MetadataParsing;
 
 use Biigle\Services\MetadataParsing\ImageCsvParser;
+use Biigle\Services\MetadataParsing\MetadataParser;
 use Biigle\Services\MetadataParsing\ParserFactory;
 use Biigle\Services\MetadataParsing\VideoCsvParser;
+use Biigle\Services\MetadataParsing\VolumeMetadata;
 use Symfony\Component\HttpFoundation\File\File;
 use TestCase;
 
@@ -37,4 +39,37 @@ public function testGetParserForFileUnknownType()
         $parser = ParserFactory::getParserForFile($file, 'test');
         $this->assertNull($parser);
     }
+
+    public function testExtend()
+    {
+        ParserFactory::extend(TestParser::class, 'image');
+        $this->assertContains(TestParser::class, ParserFactory::$parsers['image']);
+
+        $this->expectException(\Exception::class);
+        ParserFactory::extend(TestParser2::class, 'image');
+    }
+}
+
+class TestParser extends MetadataParser {
+    public function recognizesFile(): bool
+    {
+        return false;
+    }
+
+    public function getMetadata(): VolumeMetadata
+    {
+        return new VolumeMetadata;
+    }
+}
+
+class TestParser2 {
+    public function recognizesFile(): bool
+    {
+        return false;
+    }
+
+    public function getMetadata(): VolumeMetadata
+    {
+        return new VolumeMetadata;
+    }
 }

From 9e9283d9c98f3c519bdb6d2df753dec7453a4509 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 14 Mar 2024 14:35:48 +0100
Subject: [PATCH 042/209] Add deprecated note to create volume v1 endpoint

---
 app/Http/Controllers/Api/ProjectVolumeController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Http/Controllers/Api/ProjectVolumeController.php b/app/Http/Controllers/Api/ProjectVolumeController.php
index 14112f77a..415897dd9 100644
--- a/app/Http/Controllers/Api/ProjectVolumeController.php
+++ b/app/Http/Controllers/Api/ProjectVolumeController.php
@@ -53,6 +53,7 @@ public function index($id)
      * @apiGroup Volumes
      * @apiName StoreProjectVolumes
      * @apiPermission projectAdmin
+     * @apiDeprecated use now (#Volumes:StoreProjectPendingVolumes) and (#Volumes:UpdatePendingVolume).
      *
      * @apiParam {Number} id The project ID.
      *

From 06a032655754f7e70a2cf7bc7439c33dba126d1d Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 15 Mar 2024 11:26:24 +0100
Subject: [PATCH 043/209] Implement MIME type validation for metadata parsers

---
 .../Views/Volumes/VolumeController.php        |  6 +++++
 app/Http/Requests/StorePendingVolume.php      | 15 ++++++++++--
 app/Http/Requests/StoreVolumeMetadata.php     | 10 +++++++-
 app/Services/MetadataParsing/CsvParser.php    | 11 +++++++++
 .../MetadataParsing/MetadataParser.php        |  7 ++++++
 .../MetadataParsing/ParserFactory.php         | 13 +++++++++++
 .../views/volumes/create/step1.blade.php      |  2 +-
 .../views/volumes/edit/metadata.blade.php     |  2 +-
 .../MetadataParsing/ParserFactoryTest.php     | 23 ++++++++++++-------
 9 files changed, 76 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/Views/Volumes/VolumeController.php b/app/Http/Controllers/Views/Volumes/VolumeController.php
index 070f35723..55a614c8b 100644
--- a/app/Http/Controllers/Views/Volumes/VolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/VolumeController.php
@@ -6,6 +6,7 @@
 use Biigle\LabelTree;
 use Biigle\MediaType;
 use Biigle\Project;
+use Biigle\Services\MetadataParsing\ParserFactory;
 use Biigle\User;
 use Biigle\Volume;
 use Carbon\Carbon;
@@ -33,9 +34,12 @@ public function create(Request $request)
 
         $mediaType = old('media_type', 'image');
 
+        $mimeTypes = ParserFactory::getKnownMimeTypes($mediaType);
+
         return view('volumes.create.step1', [
             'project' => $project,
             'mediaType' => $mediaType,
+            'mimeTypes' => $mimeTypes,
         ]);
     }
 
@@ -99,6 +103,7 @@ public function edit(Request $request, $id)
         $sessions = $volume->annotationSessions()->with('users')->get();
         $projects = $this->getProjects($request->user(), $volume);
         $type = $volume->mediaType->name;
+        $mimeTypes = ParserFactory::getKnownMimeTypes($type);
 
         return view('volumes.edit', [
             'projects' => $projects,
@@ -107,6 +112,7 @@ public function edit(Request $request, $id)
             'annotationSessions' => $sessions,
             'today' => Carbon::today(),
             'type' => $type,
+            'mimeTypes' => $mimeTypes,
         ]);
     }
 
diff --git a/app/Http/Requests/StorePendingVolume.php b/app/Http/Requests/StorePendingVolume.php
index a58286e46..1e7da492c 100644
--- a/app/Http/Requests/StorePendingVolume.php
+++ b/app/Http/Requests/StorePendingVolume.php
@@ -29,11 +29,22 @@ public function authorize(): bool
      */
     public function rules(): array
     {
-        return [
+
+        $rules = [
             'media_type' => ['required', Rule::in(array_keys(MediaType::INSTANCES))],
             // Allow a maximum of 500 MB.
-            'metadata_file' => 'file|max:500000',
+            'metadata_file' => [
+                'file',
+                'max:500000',
+            ],
         ];
+
+        if ($this->has('media_type')) {
+            $mimeTypes = ParserFactory::getKnownMimeTypes($this->input('media_type'));
+            $rules['metadata_file'][] = 'mimetypes:'.implode(',', $mimeTypes);
+        }
+
+        return $rules;
     }
 
     /**
diff --git a/app/Http/Requests/StoreVolumeMetadata.php b/app/Http/Requests/StoreVolumeMetadata.php
index 7342ef809..81779a484 100644
--- a/app/Http/Requests/StoreVolumeMetadata.php
+++ b/app/Http/Requests/StoreVolumeMetadata.php
@@ -36,8 +36,16 @@ public function authorize()
      */
     public function rules()
     {
+        $type = $this->volume->isImageVolume() ? 'image' : 'video';
+        $mimeTypes = ParserFactory::getKnownMimeTypes($type);
+
         return [
-            'file' => 'required|file|max:500000',
+            'file' => [
+                'required',
+                'file',
+                'max:500000',
+                'mimetypes:'.implode(',', $mimeTypes),
+            ],
         ];
     }
 
diff --git a/app/Services/MetadataParsing/CsvParser.php b/app/Services/MetadataParsing/CsvParser.php
index 1d263c4b1..e93df94b2 100644
--- a/app/Services/MetadataParsing/CsvParser.php
+++ b/app/Services/MetadataParsing/CsvParser.php
@@ -27,6 +27,17 @@ abstract class CsvParser extends MetadataParser
         'sub_altitude' => 'gps_altitude',
     ];
 
+    /**
+     * {@inheritdoc}
+     */
+    public static function getKnownMimeTypes(): array
+    {
+        return [
+            'text/plain',
+            'text/csv',
+        ];
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/app/Services/MetadataParsing/MetadataParser.php b/app/Services/MetadataParsing/MetadataParser.php
index 164611284..9bfeac2b0 100644
--- a/app/Services/MetadataParsing/MetadataParser.php
+++ b/app/Services/MetadataParsing/MetadataParser.php
@@ -9,6 +9,13 @@ abstract class MetadataParser
 {
     public SplFileObject $fileObject;
 
+    /**
+     * Get the MIME types that files known by this parser can have.
+     *
+     * Example: ['text/csv']
+     */
+    abstract public static function getKnownMimeTypes(): array;
+
     public function __construct(public SplFileInfo $file)
     {
         //
diff --git a/app/Services/MetadataParsing/ParserFactory.php b/app/Services/MetadataParsing/ParserFactory.php
index b0267d92a..60df5acd7 100644
--- a/app/Services/MetadataParsing/ParserFactory.php
+++ b/app/Services/MetadataParsing/ParserFactory.php
@@ -43,4 +43,17 @@ public static function extend(string $parserClass, string $type): void
 
         self::$parsers[$type][] = $parserClass;
     }
+
+    /**
+     * Get the MIME types recognized by all metadata parsers of the media type.
+     */
+    public static function getKnownMimeTypes(string $type): array
+    {
+        $mimes = [];
+        foreach (static::$parsers[$type] ?? [] as $parser) {
+            $mimes = array_merge($mimes, $parser::getKnownMimeTypes());
+        }
+
+        return $mimes;
+    }
 }
diff --git a/resources/views/volumes/create/step1.blade.php b/resources/views/volumes/create/step1.blade.php
index 407a7f7af..0b9f6d722 100644
--- a/resources/views/volumes/create/step1.blade.php
+++ b/resources/views/volumes/create/step1.blade.php
@@ -44,7 +44,7 @@
             <p class="text-center">
                 <button class="btn btn-default btn-lg" type="button" v-on:click="selectFile" :class="fileButtonClass"><i class="fa fa-file-alt"></i> Select a file</button>
             </p>
-            <input class="hidden" name="metadata_file" type="file" ref="metadataFileField" v-on:change="handleSelectedFile">
+            <input class="hidden" name="metadata_file" type="file" ref="metadataFileField" v-on:change="handleSelectedFile" accept="{{implode(',', $mimeTypes)}}">
             @if ($errors->has('metadata_file'))
                <p class="help-block">{{ $errors->first('metadata_file') }}</p>
             @endif
diff --git a/resources/views/volumes/edit/metadata.blade.php b/resources/views/volumes/edit/metadata.blade.php
index 308d14c79..8e97c4967 100644
--- a/resources/views/volumes/edit/metadata.blade.php
+++ b/resources/views/volumes/edit/metadata.blade.php
@@ -26,7 +26,7 @@
         </p>
         <form class="form" v-on:submit.prevent="submitFile">
             <div class="form-group">
-                <input class="hidden" ref="fileInput" type="file" name="file" v-on:change="handleFile">
+                <input class="hidden" ref="fileInput" type="file" name="file" v-on:change="handleFile" accept="{{implode(',', $mimeTypes)}}">
                 <button class="btn btn-default" type="submit" :disabled="loading">Upload file</button>
             </div>
         </form>
diff --git a/tests/php/Services/MetadataParsing/ParserFactoryTest.php b/tests/php/Services/MetadataParsing/ParserFactoryTest.php
index bb81b558e..3dc10a239 100644
--- a/tests/php/Services/MetadataParsing/ParserFactoryTest.php
+++ b/tests/php/Services/MetadataParsing/ParserFactoryTest.php
@@ -48,21 +48,24 @@ public function testExtend()
         $this->expectException(\Exception::class);
         ParserFactory::extend(TestParser2::class, 'image');
     }
-}
 
-class TestParser extends MetadataParser {
-    public function recognizesFile(): bool
+    public function testGetKnownMimeTypes()
     {
-        return false;
+        $types = ParserFactory::getKnownMimeTypes('image');
+        $this->assertContains('text/csv', $types);
+        $types = ParserFactory::getKnownMimeTypes('video');
+        $this->assertContains('text/csv', $types);
+        $types = ParserFactory::getKnownMimeTypes('unknown');
+        $this->assertEquals([], $types);
     }
+}
 
-    public function getMetadata(): VolumeMetadata
+class TestParser extends MetadataParser {
+    public static function getKnownMimeTypes(): array
     {
-        return new VolumeMetadata;
+        return [];
     }
-}
 
-class TestParser2 {
     public function recognizesFile(): bool
     {
         return false;
@@ -73,3 +76,7 @@ public function getMetadata(): VolumeMetadata
         return new VolumeMetadata;
     }
 }
+
+class TestParser2 {
+    //
+}

From a11482cdb4e58b99e8579e1b8a48282630c765a3 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 15 Mar 2024 11:32:14 +0100
Subject: [PATCH 044/209] Fix markup of create volume v2 forms

---
 .../views/volumes/create/step1.blade.php      |  97 ++---
 .../views/volumes/create/step2.blade.php      | 375 +++++++++---------
 2 files changed, 237 insertions(+), 235 deletions(-)

diff --git a/resources/views/volumes/create/step1.blade.php b/resources/views/volumes/create/step1.blade.php
index 0b9f6d722..f12be1a1d 100644
--- a/resources/views/volumes/create/step1.blade.php
+++ b/resources/views/volumes/create/step1.blade.php
@@ -10,55 +10,56 @@
 
 @section('content')
 
-<div id="create-volume-form-step-1" class="col-sm-8 col-sm-offset-2 col-lg-6 col-lg-offset-3">
-    <h2>New volume for {{ $project->name }}</h2>
-    <form role="form" method="POST" action="{{ url("api/v1/projects/{$project->id}/pending-volumes") }}" enctype="multipart/form-data" v-on:submit="startLoading">
-    <fieldset>
-        <legend>
-            1. Choose a media type
-        </legend>
-        <div class="form-group {{ $errors->has('media_type') ? ' has-error' : '' }}">
-            <div class="btn-group btn-group-justified">
-                <div class="btn-group">
-                    <button v-if="!initialized" type="button" class="btn btn-info  btn-lg active"><i class="fa fa-image"></i> Image Volume</button>
-                    <button v-cloak type="button" class="btn btn-default btn-lg" v-on:click="selectImageMediaType" :class="imageTypeButtonClass" ref="imageTypeButton"><i class="fa fa-image"></i> Image Volume</button>
-                </div>
-                <div class="btn-group">
-                    <button type="button" class="btn btn-default btn-lg" v-on:click="selectVideoMediaType" :class="videoTypeButtonClass"><i class="fa fa-film"></i> Video Volume</button>
+<div class="container">
+    <div id="create-volume-form-step-1" class="col-sm-8 col-sm-offset-2 col-lg-6 col-lg-offset-3">
+        <h2>New volume for {{ $project->name }}</h2>
+        <form role="form" method="POST" action="{{ url("api/v1/projects/{$project->id}/pending-volumes") }}" enctype="multipart/form-data" v-on:submit="startLoading">
+        <fieldset>
+            <legend>
+                1. Choose a media type
+            </legend>
+            <div class="form-group {{ $errors->has('media_type') ? ' has-error' : '' }}">
+                <div class="btn-group btn-group-justified">
+                    <div class="btn-group">
+                        <button v-if="!initialized" type="button" class="btn btn-info  btn-lg active"><i class="fa fa-image"></i> Image Volume</button>
+                        <button v-cloak type="button" class="btn btn-default btn-lg" v-on:click="selectImageMediaType" :class="imageTypeButtonClass" ref="imageTypeButton"><i class="fa fa-image"></i> Image Volume</button>
+                    </div>
+                    <div class="btn-group">
+                        <button type="button" class="btn btn-default btn-lg" v-on:click="selectVideoMediaType" :class="videoTypeButtonClass"><i class="fa fa-film"></i> Video Volume</button>
+                    </div>
                 </div>
+                @if ($errors->has('media_type'))
+                   <p class="help-block">{{ $errors->first('media_type') }}</p>
+                @endif
+                <p class="help-block">
+                    The media type determines the type of files that can be included in the volume. Each type requires different annotation tools.
+                </p>
+                <input type="hidden" name="media_type" v-model="mediaType">
+            </div>
+        </fieldset>
+        <fieldset>
+            <legend>
+                2. Select a metadata file <span class="text-muted">(optional)</span>
+            </legend>
+            <div class="form-group{{ $errors->has('metadata_file') ? ' has-error' : '' }}">
+                <p class="text-center">
+                    <button class="btn btn-default btn-lg" type="button" v-on:click="selectFile" :class="fileButtonClass"><i class="fa fa-file-alt"></i> Select a file</button>
+                </p>
+                <input class="hidden" name="metadata_file" type="file" ref="metadataFileField" v-on:change="handleSelectedFile" accept="{{implode(',', $mimeTypes)}}">
+                @if ($errors->has('metadata_file'))
+                   <p class="help-block">{{ $errors->first('metadata_file') }}</p>
+                @endif
+                <p class="help-block">
+                    By default, BIIGLE supports a CSV metadata format. Other supported formats may be listed in <a href="{{route('manual-tutorials', ['volumes', 'file-metadata'])}}" target="_blank">the manual</a>. Image metadata may be overridden by EXIF information during the creation of the volume.
+                </p>
             </div>
-            @if ($errors->has('media_type'))
-               <p class="help-block">{{ $errors->first('media_type') }}</p>
-            @endif
-            <p class="help-block">
-                The media type determines the type of files that can be included in the volume. Each type requires different annotation tools.
-            </p>
-            <input type="hidden" name="media_type" v-model="mediaType">
-        </div>
-    </fieldset>
-    <fieldset>
-        <legend>
-            2. Select a metadata file <span class="text-muted">(optional)</span>
-        </legend>
-        <div class="form-group{{ $errors->has('metadata_file') ? ' has-error' : '' }}">
-            <p class="text-center">
-                <button class="btn btn-default btn-lg" type="button" v-on:click="selectFile" :class="fileButtonClass"><i class="fa fa-file-alt"></i> Select a file</button>
-            </p>
-            <input class="hidden" name="metadata_file" type="file" ref="metadataFileField" v-on:change="handleSelectedFile" accept="{{implode(',', $mimeTypes)}}">
-            @if ($errors->has('metadata_file'))
-               <p class="help-block">{{ $errors->first('metadata_file') }}</p>
-            @endif
-            <p class="help-block">
-                By default, BIIGLE supports a CSV metadata format. Other supported formats may be listed in <a href="{{route('manual-tutorials', ['volumes', 'file-metadata'])}}" target="_blank">the manual</a>. Image metadata may be overridden by EXIF information during the creation of the volume.
-            </p>
-        </div>
-    </fieldset>
-    <div class="form-group">
-         <input type="hidden" name="_token" value="{{ csrf_token() }}">
-         <a href="{{ route('project', $project->id) }}" class="btn btn-default" :disabled="loading">Cancel</a>
-         <input type="submit" class="btn btn-success pull-right" value="Continue" :disabled="loading" title="Proceed to enter the volume details">
-     </div>
-  </form>
+        </fieldset>
+        <div class="form-group">
+             <input type="hidden" name="_token" value="{{ csrf_token() }}">
+             <a href="{{ route('project', $project->id) }}" class="btn btn-default" :disabled="loading">Cancel</a>
+             <input type="submit" class="btn btn-success pull-right" value="Continue" :disabled="loading" title="Proceed to enter the volume details">
+         </div>
+      </form>
+    </div>
 </div>
-
 @endsection
diff --git a/resources/views/volumes/create/step2.blade.php b/resources/views/volumes/create/step2.blade.php
index 421c65288..9a08335f2 100644
--- a/resources/views/volumes/create/step2.blade.php
+++ b/resources/views/volumes/create/step2.blade.php
@@ -15,205 +15,206 @@
 
 @section('content')
 
-<div id="create-volume-form-step-2" class="col-sm-8 col-sm-offset-2 col-lg-6 col-lg-offset-3">
-    <h2>New {{$mediaType}} volume for {{ $project->name }}</h2>
-    @if ($restored)
-        <div class="panel panel-info">
-            <div class="panel-body text-info">
-                This is pending volume that you did not finish before.
-            </div>
-        </div>
-    @endif
-    <form method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}") }}" v-on:submit="startLoading">
-        <fieldset>
-            <legend>
-                2. Choose a volume name
-            </legend>
-            <div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}">
-                <input type="text" class="form-control" name="name" id="name" v-model="name" placeholder="My new volume" ref="nameInput" required autofocus>
-                @if ($errors->has('name'))
-                   <span class="help-block">{{ $errors->first('name') }}</span>
-                @endif
+<div class="container">
+    <div id="create-volume-form-step-2" class="col-sm-8 col-sm-offset-2 col-lg-6 col-lg-offset-3">
+        <h2>New {{$mediaType}} volume for {{ $project->name }}</h2>
+        @if ($restored)
+            <div class="panel panel-info">
+                <div class="panel-body text-info">
+                    This is pending volume that you did not finish before.
+                </div>
             </div>
-        </fieldset>
-
-        <fieldset>
-            <legend class="clearfix">
-                3. Choose a file source
-                <span class="text-muted pull-right">
-                    <span v-text="fileCountText">0</span> files
-                </span>
-            </legend>
-             <div class="form-group">
-                <div class="btn-group btn-group-justified">
-                    @if ($offlineMode && $disks->isEmpty())
-                        <div class="panel panel-danger">
-                            <div class="panel-body text-danger">
-                                Please configure available storage disks with the <code>VOLUME_ADMIN_STORAGE_DISKS</code> and <code>VOLUME_EDITOR_STORAGE_DISKS</code> environment variables.
-                            </div>
-                        </div>
+        @endif
+        <form method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}") }}" v-on:submit="startLoading">
+            <fieldset>
+                <legend>
+                    2. Choose a volume name
+                </legend>
+                <div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}">
+                    <input type="text" class="form-control" name="name" id="name" v-model="name" placeholder="My new volume" ref="nameInput" required autofocus>
+                    @if ($errors->has('name'))
+                       <span class="help-block">{{ $errors->first('name') }}</span>
                     @endif
-                    @unless ($offlineMode)
-                        <div class="btn-group">
-                            <button type="button" class="btn btn-default" title="Remote location" v-on:click="selectRemoteFileSource" v-bind:class="remoteButtonClass" ><i class="fa fa-link"></i> Remote location</button>
-                        </div>
-                    @endunless
-                    @if ($userDisk)
-                        <div class="btn-group">
-                            <button type="button" class="btn btn-default" title="Choose files from your uploads" v-on:click="selectStorageDisk('{{$userDisk}}')" v-bind:class="userDiskButtonClass">
-                                <i class="fa fa-upload"></i> Uploaded files
-                            </button>
-                        </div>
-                    @endif
-                    @if ($disks->count() > 1)
-                        <div class="btn-group">
-                            <dropdown tag="span">
-                                <button class="btn btn-default dropdown-toggle" v-bind:class="diskButtonClass" type="button" title="Select a storage disk" style="border-top-left-radius: 0; border-bottom-left-radius: 0;">
-                                    <i class="fa fa-database"></i> Storage disk <span class="caret"></span>
+                </div>
+            </fieldset>
+
+            <fieldset>
+                <legend class="clearfix">
+                    3. Choose a file source
+                    <span class="text-muted pull-right">
+                        <span v-text="fileCountText">0</span> files
+                    </span>
+                </legend>
+                 <div class="form-group">
+                    <div class="btn-group btn-group-justified">
+                        @if ($offlineMode && $disks->isEmpty())
+                            <div class="panel panel-danger">
+                                <div class="panel-body text-danger">
+                                    Please configure available storage disks with the <code>VOLUME_ADMIN_STORAGE_DISKS</code> and <code>VOLUME_EDITOR_STORAGE_DISKS</code> environment variables.
+                                </div>
+                            </div>
+                        @endif
+                        @unless ($offlineMode)
+                            <div class="btn-group">
+                                <button type="button" class="btn btn-default" title="Remote location" v-on:click="selectRemoteFileSource" v-bind:class="remoteButtonClass" ><i class="fa fa-link"></i> Remote location</button>
+                            </div>
+                        @endunless
+                        @if ($userDisk)
+                            <div class="btn-group">
+                                <button type="button" class="btn btn-default" title="Choose files from your uploads" v-on:click="selectStorageDisk('{{$userDisk}}')" v-bind:class="userDiskButtonClass">
+                                    <i class="fa fa-upload"></i> Uploaded files
                                 </button>
-                                <template slot="dropdown">
-                                    @foreach ($disks as $id => $name)
-                                        <li>
-                                             <a title="Choose files from the '{{$name}}' storage disk" href="#" v-on:click.prevent="selectStorageDisk('{{$id}}')">{{$name}}</a>
-                                        </li>
-                                    @endforeach
-                                </template>
-                            </dropdown>
-                        </div>
-                    @elseif ($disks->count() === 1)
-                        <div class="btn-group">
-                            <button type="button" class="btn btn-default volume-storage-disk-btn" title="Choose files from the '{{$disks->values()->first()}}' storage disk" v-on:click="selectStorageDisk('{{$disks->keys()->first()}}')" v-bind:class="diskButtonClass">
-                                <i class="fa fa-database"></i> {{$disks->values()->first()}}
-                            </button>
-                        </div>
-                    @endif
+                            </div>
+                        @endif
+                        @if ($disks->count() > 1)
+                            <div class="btn-group">
+                                <dropdown tag="span">
+                                    <button class="btn btn-default dropdown-toggle" v-bind:class="diskButtonClass" type="button" title="Select a storage disk" style="border-top-left-radius: 0; border-bottom-left-radius: 0;">
+                                        <i class="fa fa-database"></i> Storage disk <span class="caret"></span>
+                                    </button>
+                                    <template slot="dropdown">
+                                        @foreach ($disks as $id => $name)
+                                            <li>
+                                                 <a title="Choose files from the '{{$name}}' storage disk" href="#" v-on:click.prevent="selectStorageDisk('{{$id}}')">{{$name}}</a>
+                                            </li>
+                                        @endforeach
+                                    </template>
+                                </dropdown>
+                            </div>
+                        @elseif ($disks->count() === 1)
+                            <div class="btn-group">
+                                <button type="button" class="btn btn-default volume-storage-disk-btn" title="Choose files from the '{{$disks->values()->first()}}' storage disk" v-on:click="selectStorageDisk('{{$disks->keys()->first()}}')" v-bind:class="diskButtonClass">
+                                    <i class="fa fa-database"></i> {{$disks->values()->first()}}
+                                </button>
+                            </div>
+                        @endif
+                    </div>
                 </div>
-            </div>
-        </fieldset>
-
-        @unless ($offlineMode)
-            <div v-if="isRemoteFileSource">
-                <div class="form-group{{ $errors->has('url') ? ' has-error' : '' }}">
-                    <label for="url">Remote location URL <a href="{{route('manual-tutorials', ['volumes', 'remote-volumes'])}}" target="_blank" title="Learn more about remote volumes"><i class="fa fa-question-circle"></i></a></label>
-                    <input type="text" class="form-control" name="url" id="url" placeholder="https://my-domain.tld/volume" required v-model="url" value="{{old('url')}}">
-                    @if ($errors->has('url'))
-                       <span class="help-block">{{ $errors->first('url') }}</span>
-                    @endif
-                 </div>
-
-                 @if ($isImageMediaType)
-                     <div class="panel panel-warning">
-                        <div class="panel-body text-warning">
-                            Remote locations for image volumes must support <a href="/manual/tutorials/volumes/remote-volumes#cors">cross-origin resource sharing</a>.
+            </fieldset>
+
+            @unless ($offlineMode)
+                <div v-if="isRemoteFileSource">
+                    <div class="form-group{{ $errors->has('url') ? ' has-error' : '' }}">
+                        <label for="url">Remote location URL <a href="{{route('manual-tutorials', ['volumes', 'remote-volumes'])}}" target="_blank" title="Learn more about remote volumes"><i class="fa fa-question-circle"></i></a></label>
+                        <input type="text" class="form-control" name="url" id="url" placeholder="https://my-domain.tld/volume" required v-model="url" value="{{old('url')}}">
+                        @if ($errors->has('url'))
+                           <span class="help-block">{{ $errors->first('url') }}</span>
+                        @endif
+                     </div>
+
+                     @if ($isImageMediaType)
+                         <div class="panel panel-warning">
+                            <div class="panel-body text-warning">
+                                Remote locations for image volumes must support <a href="/manual/tutorials/volumes/remote-volumes#cors">cross-origin resource sharing</a>.
+                            </div>
                         </div>
-                    </div>
-                @endif
+                    @endif
 
-                 <div class="form-group{{ $errors->has('files') ? ' has-error' : '' }}">
-                    <label for="files">Volume files</label>
+                     <div class="form-group{{ $errors->has('files') ? ' has-error' : '' }}">
+                        <label for="files">Volume files</label>
+                        @if ($isImageMediaType)
+                            <textarea class="form-control" name="files" id="files" placeholder="1.jpg, 2.jpg, 3.jpg" required v-model="filenames" rows="3"></textarea>
+                            <p class="help-block">
+                               The filenames of the images in the volume directory formatted as comma separated values. Example: <code>1.jpg, 2.jpg, 3.jpg</code>. The supported image file formats are: JPEG, PNG, WebP and TIFF.
+                            </p>
+                        @else
+                            <textarea class="form-control" name="files" id="files" placeholder="1.mp4, 2.mp4, 3.mp4" required v-model="filenames" rows="3"></textarea>
+                            <p class="help-block">
+                               The filenames of the videos in the volume directory formatted as comma separated values. Example: <code>1.mp4, 2.mp4, 3.mp4</code>. The supported video file formats are: MP4 (H.264) and WebM (VP8, VP9, AV1).
+                            </p>
+                        @endif
+                        @if($errors->has('files'))
+                           <span class="help-block">{{ $errors->first('files') }}</span>
+                        @endif
+                     </div>
+                </div>
+            @endunless
+
+            <div v-if="showFileBrowser" v-cloak>
+
+                <p v-if="initializingBrowser">
+                    <loader v-bind:active="true"></loader> loading available files...
+                </p>
+                <p v-else class="help-block">
+                    <span v-if="storageDiskEmpty" class="text-warning">
+                        No files found.
+                        @if (Route::has('create-storage-requests'))
+                            <a href="{{route('create-storage-requests')}}">Upload new files.</a>
+                        @endif
+                    </span>
+                    <span v-else>
+                        Select a directory or files below. All selected files will be used for the new volume.
+                    </span>
                     @if ($isImageMediaType)
-                        <textarea class="form-control" name="files" id="files" placeholder="1.jpg, 2.jpg, 3.jpg" required v-model="filenames" rows="3"></textarea>
-                        <p class="help-block">
-                           The filenames of the images in the volume directory formatted as comma separated values. Example: <code>1.jpg, 2.jpg, 3.jpg</code>. The supported image file formats are: JPEG, PNG, WebP and TIFF.
-                        </p>
+                        Only files with a supported image file format are shown (JPEG, PNG, WebP and TIFF).
                     @else
-                        <textarea class="form-control" name="files" id="files" placeholder="1.mp4, 2.mp4, 3.mp4" required v-model="filenames" rows="3"></textarea>
-                        <p class="help-block">
-                           The filenames of the videos in the volume directory formatted as comma separated values. Example: <code>1.mp4, 2.mp4, 3.mp4</code>. The supported video file formats are: MP4 (H.264) and WebM (VP8, VP9, AV1).
-                        </p>
-                    @endif
-                    @if($errors->has('files'))
-                       <span class="help-block">{{ $errors->first('files') }}</span>
-                    @endif
-                 </div>
-            </div>
-        @endunless
-
-        <div v-if="showFileBrowser" v-cloak>
-
-            <p v-if="initializingBrowser">
-                <loader v-bind:active="true"></loader> loading available files...
-            </p>
-            <p v-else class="help-block">
-                <span v-if="storageDiskEmpty" class="text-warning">
-                    No files found.
-                    @if (Route::has('create-storage-requests'))
-                        <a href="{{route('create-storage-requests')}}">Upload new files.</a>
+                        Only files with a supported video file format are shown (MP4 (H.264) and WebM (VP8, VP9, AV1)).
                     @endif
-                </span>
-                <span v-else>
-                    Select a directory or files below. All selected files will be used for the new volume.
-                </span>
-                @if ($isImageMediaType)
-                    Only files with a supported image file format are shown (JPEG, PNG, WebP and TIFF).
-                @else
-                    Only files with a supported video file format are shown (MP4 (H.264) and WebM (VP8, VP9, AV1)).
+                </p>
+
+                <file-browser
+                    v-if="selectedDiskRoot"
+                    v-bind:root-directory="selectedDiskRoot"
+                    v-bind:expanded="false"
+                    v-bind:empty-text="emptyText"
+                    v-bind:selectable="true"
+                    v-bind:files-selectable="true"
+                    v-bind:expand-on-select="true"
+                    v-on:select="selectDirectory"
+                    v-on:select-file="selectFile"
+                    v-on:unselect="unselectDirectory"
+                    v-on:unselect-file="unselectFile"
+                    v-on:load="handleLoadDirectory"
+                    ></file-browser>
+
+
+                <input type="hidden" name="url" required v-model="url">
+                <input type="hidden" name="files" required v-model="filenames">
+
+                @if ($errors->has('url'))
+                    <div class="form-group has-error">
+                        <span class="help-block">{{ $errors->first('url') }}</span>
+                     </div>
                 @endif
-            </p>
-
-            <file-browser
-                v-if="selectedDiskRoot"
-                v-bind:root-directory="selectedDiskRoot"
-                v-bind:expanded="false"
-                v-bind:empty-text="emptyText"
-                v-bind:selectable="true"
-                v-bind:files-selectable="true"
-                v-bind:expand-on-select="true"
-                v-on:select="selectDirectory"
-                v-on:select-file="selectFile"
-                v-on:unselect="unselectDirectory"
-                v-on:unselect-file="unselectFile"
-                v-on:load="handleLoadDirectory"
-                ></file-browser>
-
-
-            <input type="hidden" name="url" required v-model="url">
-            <input type="hidden" name="files" required v-model="filenames">
-
-            @if ($errors->has('url'))
-                <div class="form-group has-error">
-                    <span class="help-block">{{ $errors->first('url') }}</span>
-                 </div>
-            @endif
-            @if ($errors->has('files'))
-                <div class="form-group has-error">
-                    <span class="help-block">{{ $errors->first('files') }}</span>
-                 </div>
-            @endif
-        </div>
-
-        <div v-if="showFilenameWarning" v-cloak class="panel panel-warning">
-            <div class="panel-body text-warning">
-                Most browsers do not support the TIFF format. Only use it for very large images with more than {{config('image.tiles.threshold')}} pixels at one edge, as these will be automatically converted by BIIGLE.
-            </div>
-        </div>
-
-        <fieldset>
-             <legend>
-                 4. Set a handle or DOI <span class="text-muted">(optional)</span>
-             </legend>
-
-             <div class="form-group{{ $errors->has('handle') ? ' has-error' : '' }}">
-                <input type="text" class="form-control" name="handle" id="handle" v-model="handle" placeholder="10.3389/fmars.2017.00083">
-                <span class="help-block">
-                    A <a href="https://handle.net">handle</a> or <a href="https://www.doi.org/">DOI</a> to be associated with the volume.
-                </span>
-                @if ($errors->has('handle'))
-                    <span class="help-block">{{ $errors->first('handle') }}</span>
+                @if ($errors->has('files'))
+                    <div class="form-group has-error">
+                        <span class="help-block">{{ $errors->first('files') }}</span>
+                     </div>
                 @endif
             </div>
-        </fieldset>
-        <div class="form-group">
+
+            <div v-if="showFilenameWarning" v-cloak class="panel panel-warning">
+                <div class="panel-body text-warning">
+                    Most browsers do not support the TIFF format. Only use it for very large images with more than {{config('image.tiles.threshold')}} pixels at one edge, as these will be automatically converted by BIIGLE.
+                </div>
+            </div>
+
+            <fieldset>
+                 <legend>
+                     4. Set a handle or DOI <span class="text-muted">(optional)</span>
+                 </legend>
+
+                 <div class="form-group{{ $errors->has('handle') ? ' has-error' : '' }}">
+                    <input type="text" class="form-control" name="handle" id="handle" v-model="handle" placeholder="10.3389/fmars.2017.00083">
+                    <span class="help-block">
+                        A <a href="https://handle.net">handle</a> or <a href="https://www.doi.org/">DOI</a> to be associated with the volume.
+                    </span>
+                    @if ($errors->has('handle'))
+                        <span class="help-block">{{ $errors->first('handle') }}</span>
+                    @endif
+                </div>
+            </fieldset>
+            <div class="form-group">
+                <input type="hidden" name="_token" value="{{ csrf_token() }}">
+                <input type="hidden" name="_method" value="PUT">
+                <button type="submit" form="cancel-pending-volume" class="btn btn-default" :disabled="loading" title="Discard data and return to the previous step">Cancel</button>
+                <input type="submit" class="btn btn-success pull-right" value="Create" :disabled="cannotSubmit" title="Create the volume">
+            </div>
+        </form>
+        <form id="cancel-pending-volume" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}") }}" v-on:submit="startLoading">
             <input type="hidden" name="_token" value="{{ csrf_token() }}">
-            <input type="hidden" name="_method" value="PUT">
-            <button type="submit" form="cancel-pending-volume" class="btn btn-default" :disabled="loading" title="Discard data and return to the previous step">Cancel</button>
-            <input type="submit" class="btn btn-success pull-right" value="Create" :disabled="cannotSubmit" title="Create the volume">
-        </div>
-    </form>
-    <form id="cancel-pending-volume" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}") }}" v-on:submit="startLoading">
-        <input type="hidden" name="_token" value="{{ csrf_token() }}">
-        <input type="hidden" name="_method" value="DELETE">
-    </form>
+            <input type="hidden" name="_method" value="DELETE">
+        </form>
+    </div>
 </div>
-
 @endsection

From ed462b93211323e1c02bd1d9f561e1df94c1819f Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 15 Mar 2024 11:56:36 +0100
Subject: [PATCH 045/209] Remove numbers from form labels

---
 resources/views/volumes/create/step1.blade.php | 6 +++---
 resources/views/volumes/create/step2.blade.php | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/views/volumes/create/step1.blade.php b/resources/views/volumes/create/step1.blade.php
index f12be1a1d..8d11c6e08 100644
--- a/resources/views/volumes/create/step1.blade.php
+++ b/resources/views/volumes/create/step1.blade.php
@@ -16,12 +16,12 @@
         <form role="form" method="POST" action="{{ url("api/v1/projects/{$project->id}/pending-volumes") }}" enctype="multipart/form-data" v-on:submit="startLoading">
         <fieldset>
             <legend>
-                1. Choose a media type
+                Choose a media type
             </legend>
             <div class="form-group {{ $errors->has('media_type') ? ' has-error' : '' }}">
                 <div class="btn-group btn-group-justified">
                     <div class="btn-group">
-                        <button v-if="!initialized" type="button" class="btn btn-info  btn-lg active"><i class="fa fa-image"></i> Image Volume</button>
+                        <button v-if="!initialized" type="button" class="btn btn-info btn-lg active"><i class="fa fa-image"></i> Image Volume</button>
                         <button v-cloak type="button" class="btn btn-default btn-lg" v-on:click="selectImageMediaType" :class="imageTypeButtonClass" ref="imageTypeButton"><i class="fa fa-image"></i> Image Volume</button>
                     </div>
                     <div class="btn-group">
@@ -39,7 +39,7 @@
         </fieldset>
         <fieldset>
             <legend>
-                2. Select a metadata file <span class="text-muted">(optional)</span>
+                Select a metadata file <span class="text-muted">(optional)</span>
             </legend>
             <div class="form-group{{ $errors->has('metadata_file') ? ' has-error' : '' }}">
                 <p class="text-center">
diff --git a/resources/views/volumes/create/step2.blade.php b/resources/views/volumes/create/step2.blade.php
index 9a08335f2..bd1df9ced 100644
--- a/resources/views/volumes/create/step2.blade.php
+++ b/resources/views/volumes/create/step2.blade.php
@@ -28,7 +28,7 @@
         <form method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}") }}" v-on:submit="startLoading">
             <fieldset>
                 <legend>
-                    2. Choose a volume name
+                    Choose a volume name
                 </legend>
                 <div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}">
                     <input type="text" class="form-control" name="name" id="name" v-model="name" placeholder="My new volume" ref="nameInput" required autofocus>
@@ -40,7 +40,7 @@
 
             <fieldset>
                 <legend class="clearfix">
-                    3. Choose a file source
+                    Choose a file source
                     <span class="text-muted pull-right">
                         <span v-text="fileCountText">0</span> files
                     </span>
@@ -191,7 +191,7 @@
 
             <fieldset>
                  <legend>
-                     4. Set a handle or DOI <span class="text-muted">(optional)</span>
+                     Set a handle or DOI <span class="text-muted">(optional)</span>
                  </legend>
 
                  <div class="form-group{{ $errors->has('handle') ? ' has-error' : '' }}">

From 5a795cdf171d6f76f6a13deddd3094fd3b066500 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 15 Mar 2024 15:04:49 +0100
Subject: [PATCH 046/209] Implement HasMetadataFile trait for volumes and
 pending volumes

---
 app/PendingVolume.php                         | 24 ++-----
 .../MetadataParsing/ParserFactory.php         |  2 +-
 app/Traits/HasMetadataFile.php                | 72 +++++++++++++++++++
 app/Volume.php                                | 70 +++---------------
 tests/php/PendingVolumeTest.php               | 11 +++
 .../MetadataParsing/ParserFactoryTest.php     |  6 +-
 6 files changed, 102 insertions(+), 83 deletions(-)
 create mode 100644 app/Traits/HasMetadataFile.php

diff --git a/app/PendingVolume.php b/app/PendingVolume.php
index 3a7fbeae4..43432f66f 100644
--- a/app/PendingVolume.php
+++ b/app/PendingVolume.php
@@ -2,6 +2,7 @@
 
 namespace Biigle;
 
+use Biigle\Traits\HasMetadataFile;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -10,7 +11,7 @@
 
 class PendingVolume extends Model
 {
-    use HasFactory;
+    use HasFactory, HasMetadataFile;
 
     /**
      * The attributes that are mass assignable.
@@ -36,28 +37,13 @@ class PendingVolume extends Model
 
     protected static function booted(): void
     {
+        static::$metadataFileDisk = config('volumes.pending_metadata_storage_disk');
+
         static::deleting(function (PendingVolume $pv) {
-            if ($pv->hasMetadata()) {
-                $disk = config('volumes.pending_metadata_storage_disk');
-                Storage::disk($disk)->delete($pv->metadata_file_path);
-            }
+            $pv->deleteMetadata(true);
         });
     }
 
-    public function hasMetadata(): bool
-    {
-        return !is_null($this->metadata_file_path);
-    }
-
-    public function saveMetadata(UploadedFile $file): void
-    {
-        $disk = config('volumes.pending_metadata_storage_disk');
-        $extension = $file->getClientOriginalExtension();
-        $this->metadata_file_path = "{$this->id}.{$extension}";
-        $file->storeAs('', $this->metadata_file_path, $disk);
-        $this->save();
-    }
-
     public function project(): BelongsTo
     {
         return $this->belongsTo(Project::class);
diff --git a/app/Services/MetadataParsing/ParserFactory.php b/app/Services/MetadataParsing/ParserFactory.php
index 60df5acd7..cacc9a1a8 100644
--- a/app/Services/MetadataParsing/ParserFactory.php
+++ b/app/Services/MetadataParsing/ParserFactory.php
@@ -2,8 +2,8 @@
 
 namespace Biigle\Services\MetadataParsing;
 
-use SplFileInfo;
 use Exception;
+use SplFileInfo;
 
 class ParserFactory
 {
diff --git a/app/Traits/HasMetadataFile.php b/app/Traits/HasMetadataFile.php
new file mode 100644
index 000000000..3a7139c63
--- /dev/null
+++ b/app/Traits/HasMetadataFile.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace Biigle\Traits;
+
+use Biigle\MediaType;
+use Biigle\Services\MetadataParsing\ParserFactory;
+use Biigle\Services\MetadataParsing\VolumeMetadata;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Storage;
+use SplFileInfo;
+
+trait HasMetadataFile
+{
+    /**
+     * Name of the storage disk where the metadata files are stored.
+     */
+    public static string $metadataFileDisk;
+
+    public function hasMetadata(): bool
+    {
+        return !is_null($this->metadata_file_path);
+    }
+
+    public function saveMetadata(UploadedFile $file): void
+    {
+        $this->metadata_file_path = $this->id;
+        if ($extension = $file->getClientOriginalExtension()) {
+            $this->metadata_file_path .= '.'.$extension;
+        }
+        $file->storeAs('', $this->metadata_file_path, static::$metadataFileDisk);
+        $this->save();
+    }
+
+    public function getMetadata(): ?VolumeMetadata
+    {
+        if (!$this->hasMetadata()) {
+            return null;
+        }
+
+        $tmpPath = tempnam(sys_get_temp_dir(), 'metadata');
+        try {
+            $from = Storage::disk(static::$metadataFileDisk)
+                ->readStream($this->metadata_file_path);
+            $to = fopen($tmpPath, 'w');
+            stream_copy_to_stream($from, $to);
+            $type = ($this->media_type_id === MediaType::imageId()) ? 'image' : 'video';
+            $parser = ParserFactory::getParserForFile(new SplFileInfo($tmpPath), $type);
+            if (is_null($parser)) {
+                return null;
+            }
+
+            return $parser->getMetadata();
+        } finally {
+            fclose($to);
+            File::delete($tmpPath);
+        }
+    }
+
+    /**
+     * @param boolean $noUpdate Do not set metadata_file_path to null.
+     */
+    public function deleteMetadata($noUpdate = false): void
+    {
+        if ($this->hasMetadata()) {
+            Storage::disk(static::$metadataFileDisk)->delete($this->metadata_file_path);
+            if (!$noUpdate) {
+                $this->update(['metadata_file_path' => null]);
+            }
+        }
+    }
+}
diff --git a/app/Volume.php b/app/Volume.php
index bcf701855..b295c22a6 100644
--- a/app/Volume.php
+++ b/app/Volume.php
@@ -2,18 +2,15 @@
 
 namespace Biigle;
 
-use Biigle\Services\MetadataParsing\ParserFactory;
-use Biigle\Services\MetadataParsing\VolumeMetadata;
+
 use Biigle\Traits\HasJsonAttributes;
+use Biigle\Traits\HasMetadataFile;
 use Cache;
 use Carbon\Carbon;
 use DB;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Http\UploadedFile;
-use Illuminate\Support\Facades\File;
-use Illuminate\Support\Facades\Storage;
-use SplFileInfo;
+
 
 /**
  * A volume is a collection of images. Volumes belong to one or many
@@ -21,7 +18,7 @@
  */
 class Volume extends Model
 {
-    use HasJsonAttributes, HasFactory;
+    use HasJsonAttributes, HasFactory, HasMetadataFile;
 
     /**
      * Regular expression that matches the supported image file extensions.
@@ -77,6 +74,11 @@ class Volume extends Model
         'media_type_id' => 'int',
     ];
 
+    protected static function booted(): void
+    {
+        static::$metadataFileDisk = config('volumes.metadata_storage_disk');
+    }
+
     /**
      * Parses a comma separated list of filenames to an array.
      *
@@ -457,60 +459,6 @@ public function isVideoVolume()
         return $this->media_type_id === MediaType::videoId();
     }
 
-    public function hasMetadata(): bool
-    {
-        return !is_null($this->metadata_file_path);
-    }
-
-    public function saveMetadata(UploadedFile $file): void
-    {
-        $disk = config('volumes.metadata_storage_disk');
-        $this->metadata_file_path = $this->id;
-        if ($extension = $file->getClientOriginalExtension()) {
-            $this->metadata_file_path .= '.'.$extension;
-        }
-        $file->storeAs('', $this->metadata_file_path, $disk);
-        $this->save();
-    }
-
-    public function getMetadata(): ?VolumeMetadata
-    {
-        if (!$this->hasMetadata()) {
-            return null;
-        }
-
-        $tmpPath = tempnam(sys_get_temp_dir(), 'volume-metadata');
-        try {
-            $from = Storage::disk(config('volumes.metadata_storage_disk'))
-                ->readStream($this->metadata_file_path);
-            $to = fopen($tmpPath, 'w');
-            stream_copy_to_stream($from, $to);
-            $type = $this->isImageVolume() ? 'image' : 'video';
-            $parser = ParserFactory::getParserForFile(new SplFileInfo($tmpPath), $type);
-            if (is_null($parser)) {
-                return null;
-            }
-
-            return $parser->getMetadata();
-        } finally {
-            fclose($to);
-            File::delete($tmpPath);
-        }
-    }
-
-    /**
-     * @param boolean $noUpdate Do not set metadata_file_path to null.
-     */
-    public function deleteMetadata($noUpdate = false): void
-    {
-        if ($this->hasMetadata()) {
-            Storage::disk(config('volumes.metadata_storage_disk'))->delete($this->metadata_file_path);
-            if (!$noUpdate) {
-                $this->update(['metadata_file_path' => null]);
-            }
-        }
-    }
-
     /**
      * Get the cache key for volume thumbnails.
      *
diff --git a/tests/php/PendingVolumeTest.php b/tests/php/PendingVolumeTest.php
index e26d3d597..859e09f7d 100644
--- a/tests/php/PendingVolumeTest.php
+++ b/tests/php/PendingVolumeTest.php
@@ -58,4 +58,15 @@ public function testDeleteMetadataOnDelete()
         $this->model->delete();
         $disk->assertMissing($this->model->id.'.csv');
     }
+
+    public function testGetMetadata()
+    {
+        $this->assertNull($this->model->getMetadata());
+        $disk = Storage::fake('pending-metadata');
+        $this->model->metadata_file_path = $this->model->id.'.csv';
+        $disk->put($this->model->metadata_file_path, "filename,area\n1.jpg,2.5");
+        $metadata = $this->model->getMetadata();
+        $fileMeta = $metadata->getFile('1.jpg');
+        $this->assertEquals(2.5, $fileMeta->area);
+    }
 }
diff --git a/tests/php/Services/MetadataParsing/ParserFactoryTest.php b/tests/php/Services/MetadataParsing/ParserFactoryTest.php
index 3dc10a239..c90090308 100644
--- a/tests/php/Services/MetadataParsing/ParserFactoryTest.php
+++ b/tests/php/Services/MetadataParsing/ParserFactoryTest.php
@@ -60,7 +60,8 @@ public function testGetKnownMimeTypes()
     }
 }
 
-class TestParser extends MetadataParser {
+class TestParser extends MetadataParser
+{
     public static function getKnownMimeTypes(): array
     {
         return [];
@@ -77,6 +78,7 @@ public function getMetadata(): VolumeMetadata
     }
 }
 
-class TestParser2 {
+class TestParser2
+{
     //
 }

From b1685c768e3a55d1d3bff9e8a09bb58cddd1e1bf Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 15 Mar 2024 15:49:25 +0100
Subject: [PATCH 047/209] Implement metadata auto-fill in create volume step 2

---
 .../Views/Volumes/PendingVolumeController.php | 25 ++++++++++++++++++-
 .../assets/js/volumes/createFormStep2.vue     | 16 ++++++++++--
 .../views/volumes/create/step2.blade.php      | 22 ++++++++--------
 3 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
index 90bdd2f7c..38aef5fb2 100644
--- a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
@@ -47,7 +47,6 @@ public function show(Request $request)
             $disks = $disks->merge($userDisks);
         }
 
-        $filenames = str_replace(["\r", "\n", '"', "'"], '', old('files'));
         $offlineMode = config('biigle.offline_mode');
 
         if (class_exists(UserStorageServiceProvider::class)) {
@@ -61,6 +60,27 @@ public function show(Request $request)
 
         $restored = session()->has('restored');
 
+        $metadata = null;
+        $oldName = '';
+        $oldUrl = '';
+        $oldHandle = '';
+        if ($pv->hasMetadata()) {
+            $metadata = $pv->getMetadata();
+            $oldName = $metadata->name;
+            $oldUrl = $metadata->url;
+            $oldHandle = $metadata->handle;
+        }
+
+        $oldName = old('name', $oldName);
+        $oldUrl = old('url', $oldUrl);
+        $oldHandle = old('handle', $oldHandle);
+
+        if ($filenames = old('files')) {
+            $filenames = str_replace(["\r", "\n", '"', "'"], '', old('files'));
+        } elseif ($metadata) {
+            $filenames = $metadata->getFiles()->pluck('name')->join(',');
+        }
+
         return view('volumes.create.step2', [
             'pv' => $pv,
             'project' => $pv->project,
@@ -72,6 +92,9 @@ public function show(Request $request)
             'mediaType' => $mediaType,
             'isImageMediaType' => $isImageMediaType,
             'restored' => $restored,
+            'oldName' => $oldName,
+            'oldUrl' => $oldUrl,
+            'oldHandle' => $oldHandle,
         ]);
     }
 }
diff --git a/resources/assets/js/volumes/createFormStep2.vue b/resources/assets/js/volumes/createFormStep2.vue
index 254c2f561..15cd964fe 100644
--- a/resources/assets/js/volumes/createFormStep2.vue
+++ b/resources/assets/js/volumes/createFormStep2.vue
@@ -26,10 +26,13 @@ export default {
             fileSource: FILE_SOURCE.REMOTE,
             handle: '',
             imageDiskCache: {},
+            initialized: false,
             initializingBrowser: false,
             loadingBrowser: false,
             mediaType: MEDIA_TYPE.IMAGE,
             name: '',
+            remoteFilenames: '',
+            remoteUrl: '',
             selectedDiskRoot: null,
             storageDisk: null,
             url: '',
@@ -168,11 +171,18 @@ export default {
                 this.fileSource = FILE_SOURCE.REMOTE;
                 this.storageDisk = null;
                 this.selectedDiskRoot = null;
-                this.url = '';
-                this.filenames = '';
+                this.url = this.remoteUrl;
+                this.filenames = this.remoteFilenames;
             }
         },
         selectStorageDisk(disk) {
+            if (!this.storageDisk) {
+                // Make a backup so the remote filenames and URL can be restored if the
+                // user switches back from a storage disk to a remote source.
+                this.remoteFilenames = this.filenames;
+                this.remoteUrl = this.url;
+            }
+
             if (this.storageDisk !== disk) {
                 if (this.disks.includes(disk)) {
                     this.fileSource = FILE_SOURCE.DISK;
@@ -372,6 +382,8 @@ export default {
     mounted() {
         // Vue disables the autofocus attribute somehow, so set focus manually here.
         this.$refs.nameInput.focus();
+        // Used to mask some flashing elements on pageload.
+        this.initialized = true;
     },
 };
 </script>
diff --git a/resources/views/volumes/create/step2.blade.php b/resources/views/volumes/create/step2.blade.php
index bd1df9ced..dd80f6c27 100644
--- a/resources/views/volumes/create/step2.blade.php
+++ b/resources/views/volumes/create/step2.blade.php
@@ -4,9 +4,9 @@
 
 @push('scripts')
     <script type="text/javascript">
-        biigle.$declare('volumes.name', '{!! old('name') !!}');
-        biigle.$declare('volumes.url', '{!! old('url') !!}');
-        biigle.$declare('volumes.handle', `{!! old('handle') !!}`);
+        biigle.$declare('volumes.name', '{!! $oldName !!}');
+        biigle.$declare('volumes.url', '{!! $oldUrl !!}');
+        biigle.$declare('volumes.handle', `{!! $oldHandle !!}`);
         biigle.$declare('volumes.mediaType', '{!! $mediaType !!}');
         biigle.$declare('volumes.filenames', '{{ $filenames }}');
         biigle.$declare('volumes.disks', {!! $disks->keys() !!});
@@ -31,7 +31,7 @@
                     Choose a volume name
                 </legend>
                 <div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}">
-                    <input type="text" class="form-control" name="name" id="name" v-model="name" placeholder="My new volume" ref="nameInput" required autofocus>
+                    <input type="text" class="form-control" name="name" id="name" v-model="name" placeholder="My new volume" ref="nameInput" required autofocus value="{{$oldName}}">
                     @if ($errors->has('name'))
                        <span class="help-block">{{ $errors->first('name') }}</span>
                     @endif
@@ -56,7 +56,8 @@
                         @endif
                         @unless ($offlineMode)
                             <div class="btn-group">
-                                <button type="button" class="btn btn-default" title="Remote location" v-on:click="selectRemoteFileSource" v-bind:class="remoteButtonClass" ><i class="fa fa-link"></i> Remote location</button>
+                                <button v-if="!initialized" type="button" class="btn btn-info active"><i class="fa fa-link"></i> Remote location</button>
+                                <button v-cloak type="button" class="btn btn-default" title="Remote location" v-on:click="selectRemoteFileSource" v-bind:class="remoteButtonClass" ><i class="fa fa-link"></i> Remote location</button>
                             </div>
                         @endunless
                         @if ($userDisk)
@@ -96,7 +97,7 @@
                 <div v-if="isRemoteFileSource">
                     <div class="form-group{{ $errors->has('url') ? ' has-error' : '' }}">
                         <label for="url">Remote location URL <a href="{{route('manual-tutorials', ['volumes', 'remote-volumes'])}}" target="_blank" title="Learn more about remote volumes"><i class="fa fa-question-circle"></i></a></label>
-                        <input type="text" class="form-control" name="url" id="url" placeholder="https://my-domain.tld/volume" required v-model="url" value="{{old('url')}}">
+                        <input type="text" class="form-control" name="url" id="url" placeholder="https://my-domain.tld/volume" required v-model="url" value="{{$oldUrl}}">
                         @if ($errors->has('url'))
                            <span class="help-block">{{ $errors->first('url') }}</span>
                         @endif
@@ -113,12 +114,12 @@
                      <div class="form-group{{ $errors->has('files') ? ' has-error' : '' }}">
                         <label for="files">Volume files</label>
                         @if ($isImageMediaType)
-                            <textarea class="form-control" name="files" id="files" placeholder="1.jpg, 2.jpg, 3.jpg" required v-model="filenames" rows="3"></textarea>
+                            <textarea class="form-control" name="files" id="files" placeholder="1.jpg, 2.jpg, 3.jpg" required v-model="filenames" rows="3">{{$filenames}}</textarea>
                             <p class="help-block">
                                The filenames of the images in the volume directory formatted as comma separated values. Example: <code>1.jpg, 2.jpg, 3.jpg</code>. The supported image file formats are: JPEG, PNG, WebP and TIFF.
                             </p>
                         @else
-                            <textarea class="form-control" name="files" id="files" placeholder="1.mp4, 2.mp4, 3.mp4" required v-model="filenames" rows="3"></textarea>
+                            <textarea class="form-control" name="files" id="files" placeholder="1.mp4, 2.mp4, 3.mp4" required v-model="filenames" rows="3">{{$filenames}}</textarea>
                             <p class="help-block">
                                The filenames of the videos in the volume directory formatted as comma separated values. Example: <code>1.mp4, 2.mp4, 3.mp4</code>. The supported video file formats are: MP4 (H.264) and WebM (VP8, VP9, AV1).
                             </p>
@@ -195,7 +196,7 @@
                  </legend>
 
                  <div class="form-group{{ $errors->has('handle') ? ' has-error' : '' }}">
-                    <input type="text" class="form-control" name="handle" id="handle" v-model="handle" placeholder="10.3389/fmars.2017.00083">
+                    <input type="text" class="form-control" name="handle" id="handle" v-model="handle" placeholder="10.3389/fmars.2017.00083" value="{{$oldHandle}}">
                     <span class="help-block">
                         A <a href="https://handle.net">handle</a> or <a href="https://www.doi.org/">DOI</a> to be associated with the volume.
                     </span>
@@ -208,7 +209,8 @@
                 <input type="hidden" name="_token" value="{{ csrf_token() }}">
                 <input type="hidden" name="_method" value="PUT">
                 <button type="submit" form="cancel-pending-volume" class="btn btn-default" :disabled="loading" title="Discard data and return to the previous step">Cancel</button>
-                <input type="submit" class="btn btn-success pull-right" value="Create" :disabled="cannotSubmit" title="Create the volume">
+                <button v-if="!initialized" type="button" class="btn btn-success pull-right" disabled>Create</button>
+                <input v-cloak type="submit" class="btn btn-success pull-right" value="Create" :disabled="cannotSubmit" title="Create the volume">
             </div>
         </form>
         <form id="cancel-pending-volume" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}") }}" v-on:submit="startLoading">

From 86d973a776b2c3db10acdd4632fd45d94f08b728 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 15 Mar 2024 16:13:43 +0100
Subject: [PATCH 048/209] Remove statically prefilled volume filenames again

The prefilled textarea duplicates the filenames in the HTML. For a
large volume with 10k's of files this could get bad. Since this is
only to mask a flashing of content on load, I don't think it worth
it.
---
 resources/views/volumes/create/step2.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/volumes/create/step2.blade.php b/resources/views/volumes/create/step2.blade.php
index dd80f6c27..c31db83e1 100644
--- a/resources/views/volumes/create/step2.blade.php
+++ b/resources/views/volumes/create/step2.blade.php
@@ -114,12 +114,12 @@
                      <div class="form-group{{ $errors->has('files') ? ' has-error' : '' }}">
                         <label for="files">Volume files</label>
                         @if ($isImageMediaType)
-                            <textarea class="form-control" name="files" id="files" placeholder="1.jpg, 2.jpg, 3.jpg" required v-model="filenames" rows="3">{{$filenames}}</textarea>
+                            <textarea class="form-control" name="files" id="files" placeholder="1.jpg, 2.jpg, 3.jpg" required v-model="filenames" rows="3"></textarea>
                             <p class="help-block">
                                The filenames of the images in the volume directory formatted as comma separated values. Example: <code>1.jpg, 2.jpg, 3.jpg</code>. The supported image file formats are: JPEG, PNG, WebP and TIFF.
                             </p>
                         @else
-                            <textarea class="form-control" name="files" id="files" placeholder="1.mp4, 2.mp4, 3.mp4" required v-model="filenames" rows="3">{{$filenames}}</textarea>
+                            <textarea class="form-control" name="files" id="files" placeholder="1.mp4, 2.mp4, 3.mp4" required v-model="filenames" rows="3"></textarea>
                             <p class="help-block">
                                The filenames of the videos in the volume directory formatted as comma separated values. Example: <code>1.mp4, 2.mp4, 3.mp4</code>. The supported video file formats are: MP4 (H.264) and WebM (VP8, VP9, AV1).
                             </p>

From a652e6ff9cf101baec95a9171d917c07d0ba6250 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 15 Mar 2024 16:47:11 +0100
Subject: [PATCH 049/209] Implement warning if metadata files do not match
 chosen files

---
 .../Views/Volumes/PendingVolumeController.php |  3 ++
 app/PendingVolume.php                         |  2 --
 app/Services/MetadataParsing/FileMetadata.php |  2 +-
 app/Volume.php                                |  2 --
 .../assets/js/volumes/createFormStep2.vue     | 32 ++++++++++++++++++-
 .../views/volumes/create/step2.blade.php      |  7 ++++
 .../MetadataParsing/ImageMetadataTest.php     |  6 ++++
 .../MetadataParsing/VideoMetadataTest.php     |  6 ++++
 8 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
index 38aef5fb2..54acadf9b 100644
--- a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
@@ -75,10 +75,12 @@ public function show(Request $request)
         $oldUrl = old('url', $oldUrl);
         $oldHandle = old('handle', $oldHandle);
 
+        $filenamesFromMeta = false;
         if ($filenames = old('files')) {
             $filenames = str_replace(["\r", "\n", '"', "'"], '', old('files'));
         } elseif ($metadata) {
             $filenames = $metadata->getFiles()->pluck('name')->join(',');
+            $filenamesFromMeta = !empty($filenames);
         }
 
         return view('volumes.create.step2', [
@@ -95,6 +97,7 @@ public function show(Request $request)
             'oldName' => $oldName,
             'oldUrl' => $oldUrl,
             'oldHandle' => $oldHandle,
+            'filenamesFromMeta' => $filenamesFromMeta,
         ]);
     }
 }
diff --git a/app/PendingVolume.php b/app/PendingVolume.php
index 43432f66f..334fbe818 100644
--- a/app/PendingVolume.php
+++ b/app/PendingVolume.php
@@ -6,8 +6,6 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Http\UploadedFile;
-use Storage;
 
 class PendingVolume extends Model
 {
diff --git a/app/Services/MetadataParsing/FileMetadata.php b/app/Services/MetadataParsing/FileMetadata.php
index 1f4cfa778..bd23dc1a6 100644
--- a/app/Services/MetadataParsing/FileMetadata.php
+++ b/app/Services/MetadataParsing/FileMetadata.php
@@ -6,7 +6,7 @@ class FileMetadata
 {
     public function __construct(public string $name)
     {
-        //
+        $this->name = trim($this->name);
     }
 
     public function isEmpty(): bool
diff --git a/app/Volume.php b/app/Volume.php
index b295c22a6..98244a5f8 100644
--- a/app/Volume.php
+++ b/app/Volume.php
@@ -2,7 +2,6 @@
 
 namespace Biigle;
 
-
 use Biigle\Traits\HasJsonAttributes;
 use Biigle\Traits\HasMetadataFile;
 use Cache;
@@ -11,7 +10,6 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
-
 /**
  * A volume is a collection of images. Volumes belong to one or many
  * projects.
diff --git a/resources/assets/js/volumes/createFormStep2.vue b/resources/assets/js/volumes/createFormStep2.vue
index 15cd964fe..4fe28b3ee 100644
--- a/resources/assets/js/volumes/createFormStep2.vue
+++ b/resources/assets/js/volumes/createFormStep2.vue
@@ -3,6 +3,7 @@ import BrowserApi from './api/browser';
 import Dropdown from 'uiv/dist/Dropdown';
 import FileBrowser from '../core/components/fileBrowser';
 import LoaderMixin from '../core/mixins/loader';
+import {debounce} from '../core/utils';
 import {MEDIA_TYPE} from './createFormStep1';
 
 const FILE_SOURCE = {
@@ -23,6 +24,7 @@ export default {
         return {
             disks: [],
             filenames: '',
+            filesDontMatchMetadata: false,
             fileSource: FILE_SOURCE.REMOTE,
             handle: '',
             imageDiskCache: {},
@@ -30,6 +32,7 @@ export default {
             initializingBrowser: false,
             loadingBrowser: false,
             mediaType: MEDIA_TYPE.IMAGE,
+            metadataFilenames: [],
             name: '',
             remoteFilenames: '',
             remoteUrl: '',
@@ -261,7 +264,7 @@ export default {
         setUrlAndFilenames(path, files) {
             // Add only one slash, as path already has a leading slash.
             this.url = `${this.storageDisk}:/${path}`;
-            this.filenames = files.map(file => file.name).join(', ');
+            this.filenames = files.map(file => file.name).join(',');
         },
         unselectDirectory(directory) {
             this.unselectAllDirectories(directory);
@@ -365,6 +368,30 @@ export default {
                 this.unselectAllDirectories(oldRoot);
             }
         },
+        filenames() {
+            if (!this.metadataFilenames || !this.filenames || !this.filenames.includes('.')) {
+                this.filesDontMatchMetadata = false;
+                return;
+            }
+
+            // Use a watcher+debounce instead of a computed property because this may be
+            // called on each keystroke in the textarea.
+            debounce(() => {
+                if (!this.filenames || !this.filenames.includes('.')) {
+                    this.filesDontMatchMetadata = false;
+                    return;
+                }
+
+                for (var i = this.metadataFilenames.length - 1; i >= 0; i--) {
+                    if (this.filenames.includes(this.metadataFilenames[i])) {
+                        this.filesDontMatchMetadata = false;
+                        return;
+                    }
+                }
+
+                this.filesDontMatchMetadata = true;
+            }, 1000, 'compare-volume-filenames-with-metadata');
+        },
     },
     created() {
         this.disks = biigle.$require('volumes.disks');
@@ -373,6 +400,9 @@ export default {
         this.handle = biigle.$require('volumes.handle');
         this.mediaType = biigle.$require('volumes.mediaType');
         this.filenames = biigle.$require('volumes.filenames');
+        if (biigle.$require('volumes.filenamesFromMeta')) {
+            this.metadataFilenames = this.filenames.split(',');
+        }
 
         let [disk, path] = this.url.split('://');
         if (this.disks.includes(disk)) {
diff --git a/resources/views/volumes/create/step2.blade.php b/resources/views/volumes/create/step2.blade.php
index c31db83e1..146019238 100644
--- a/resources/views/volumes/create/step2.blade.php
+++ b/resources/views/volumes/create/step2.blade.php
@@ -9,6 +9,7 @@
         biigle.$declare('volumes.handle', `{!! $oldHandle !!}`);
         biigle.$declare('volumes.mediaType', '{!! $mediaType !!}');
         biigle.$declare('volumes.filenames', '{{ $filenames }}');
+        biigle.$declare('volumes.filenamesFromMeta', {{ $filenamesFromMeta ? 'true' : 'false' }});
         biigle.$declare('volumes.disks', {!! $disks->keys() !!});
     </script>
 @endpush
@@ -190,6 +191,12 @@
                 </div>
             </div>
 
+            <div v-if="filesDontMatchMetadata" v-cloak class="panel panel-warning">
+                <div class="panel-body text-warning">
+                    The chosen files could not be found in the uploaded metadata file!
+                </div>
+            </div>
+
             <fieldset>
                  <legend>
                      Set a handle or DOI <span class="text-muted">(optional)</span>
diff --git a/tests/php/Services/MetadataParsing/ImageMetadataTest.php b/tests/php/Services/MetadataParsing/ImageMetadataTest.php
index 1fbb7eab8..21d586c36 100644
--- a/tests/php/Services/MetadataParsing/ImageMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/ImageMetadataTest.php
@@ -7,6 +7,12 @@
 
 class ImageMetadataTest extends TestCase
 {
+    public function testTrimName()
+    {
+        $data = new ImageMetadata(' filename');
+        $this->assertEquals('filename', $data->name);
+    }
+
     public function testIsEmpty()
     {
         $data = new ImageMetadata('filename');
diff --git a/tests/php/Services/MetadataParsing/VideoMetadataTest.php b/tests/php/Services/MetadataParsing/VideoMetadataTest.php
index be359e156..2de16cab2 100644
--- a/tests/php/Services/MetadataParsing/VideoMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/VideoMetadataTest.php
@@ -7,6 +7,12 @@
 
 class VideoMetadataTest extends TestCase
 {
+    public function testTrimName()
+    {
+        $data = new VideoMetadata(' filename');
+        $this->assertEquals('filename', $data->name);
+    }
+
     public function testIsEmpty()
     {
         $data = new VideoMetadata('filename');

From 1600d32f91b9c218d4c8729d443c58d36c863dda Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 20 Mar 2024 09:56:40 +0100
Subject: [PATCH 050/209] Add annotation metadata classes

---
 app/Services/MetadataParsing/Annotation.php   | 22 +++++++++++++++++
 .../MetadataParsing/AnnotationLabel.php       | 14 +++++++++++
 app/Services/MetadataParsing/Annotator.php    | 20 ++++++++++++++++
 app/Services/MetadataParsing/FileMetadata.php | 20 ++++++++++++++++
 .../MetadataParsing/ImageAnnotation.php       | 10 ++++++++
 .../MetadataParsing/ImageMetadata.php         |  2 +-
 app/Services/MetadataParsing/Label.php        | 24 +++++++++++++++++++
 .../MetadataParsing/VideoAnnotation.php       | 24 +++++++++++++++++++
 .../MetadataParsing/ImageMetadataTest.php     | 22 +++++++++++++++++
 .../MetadataParsing/VideoMetadataTest.php     | 23 ++++++++++++++++++
 10 files changed, 180 insertions(+), 1 deletion(-)
 create mode 100644 app/Services/MetadataParsing/Annotation.php
 create mode 100644 app/Services/MetadataParsing/AnnotationLabel.php
 create mode 100644 app/Services/MetadataParsing/Annotator.php
 create mode 100644 app/Services/MetadataParsing/ImageAnnotation.php
 create mode 100644 app/Services/MetadataParsing/Label.php
 create mode 100644 app/Services/MetadataParsing/VideoAnnotation.php

diff --git a/app/Services/MetadataParsing/Annotation.php b/app/Services/MetadataParsing/Annotation.php
new file mode 100644
index 000000000..ee12c8308
--- /dev/null
+++ b/app/Services/MetadataParsing/Annotation.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Biigle\Services\MetadataParsing;
+
+use Biigle\Shape;
+
+class Annotation
+{
+    /**
+     * @param Shape $shape
+     * @param array<float> $points
+     * @param array<AnnotationLabel> $labels
+     */
+    public function __construct(
+        public Shape $shape,
+        public array $points,
+        public array $labels,
+    )
+    {
+        //
+    }
+}
diff --git a/app/Services/MetadataParsing/AnnotationLabel.php b/app/Services/MetadataParsing/AnnotationLabel.php
new file mode 100644
index 000000000..e772ff354
--- /dev/null
+++ b/app/Services/MetadataParsing/AnnotationLabel.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Biigle\Services\MetadataParsing;
+
+class AnnotationLabel
+{
+    public function __construct(
+        public Label $label,
+        public Annotator $annotator,
+    )
+    {
+        //
+    }
+}
diff --git a/app/Services/MetadataParsing/Annotator.php b/app/Services/MetadataParsing/Annotator.php
new file mode 100644
index 000000000..a1d05c54c
--- /dev/null
+++ b/app/Services/MetadataParsing/Annotator.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Biigle\Services\MetadataParsing;
+
+class Annotator
+{
+    /**
+     * @param string $id
+     * @param string $name
+     * @param ?string $uuid The BIIGLE UUID of the user.
+     */
+    public function __construct(
+        public string $id,
+        public string $name,
+        public ?string $uuid = null,
+    )
+    {
+        //
+    }
+}
diff --git a/app/Services/MetadataParsing/FileMetadata.php b/app/Services/MetadataParsing/FileMetadata.php
index bd23dc1a6..53c0396dc 100644
--- a/app/Services/MetadataParsing/FileMetadata.php
+++ b/app/Services/MetadataParsing/FileMetadata.php
@@ -4,6 +4,11 @@
 
 class FileMetadata
 {
+    /**
+     * @var array<ImageAnnotation>
+     */
+    public array $annotations = [];
+
     public function __construct(public string $name)
     {
         $this->name = trim($this->name);
@@ -21,4 +26,19 @@ public function getInsertData(): array
     {
         return [];
     }
+
+    public function addAnnotation(Annotation $annotation): void
+    {
+        $this->annotations[] = $annotation;
+    }
+
+    public function getAnnotations(): array
+    {
+        return $this->annotations;
+    }
+
+    public function hasAnnotations(): bool
+    {
+        return !empty($this->annotations);
+    }
 }
diff --git a/app/Services/MetadataParsing/ImageAnnotation.php b/app/Services/MetadataParsing/ImageAnnotation.php
new file mode 100644
index 000000000..6ce32a2bd
--- /dev/null
+++ b/app/Services/MetadataParsing/ImageAnnotation.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Biigle\Services\MetadataParsing;
+
+use Biigle\Shape;
+
+class ImageAnnotation extends Annotation
+{
+    //
+}
diff --git a/app/Services/MetadataParsing/ImageMetadata.php b/app/Services/MetadataParsing/ImageMetadata.php
index 1a680d9ec..93848fed4 100644
--- a/app/Services/MetadataParsing/ImageMetadata.php
+++ b/app/Services/MetadataParsing/ImageMetadata.php
@@ -14,7 +14,7 @@ public function __construct(
         public ?float $area = null,
         public ?float $distanceToGround = null,
         public ?float $gpsAltitude = null,
-        public ?float $yaw = null
+        public ?float $yaw = null,
     ) {
         parent::__construct($name);
     }
diff --git a/app/Services/MetadataParsing/Label.php b/app/Services/MetadataParsing/Label.php
new file mode 100644
index 000000000..d826f49df
--- /dev/null
+++ b/app/Services/MetadataParsing/Label.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Biigle\Services\MetadataParsing;
+
+class Label
+{
+    /**
+     * @param string $id
+     * @param string $name
+     * @param ?string $color The BIIGLE label color
+     * @param ?string $uuid The BIIGLE label UUID.
+     * @param ?string $labelTreeUuid The BIIGLE label tree UUID.
+     */
+    public function __construct(
+        public string $id,
+        public string $name,
+        public ?string $color = null,
+        public ?string $uuid = null,
+        public ?string $labelTreeUuid = null,
+    )
+    {
+        //
+    }
+}
diff --git a/app/Services/MetadataParsing/VideoAnnotation.php b/app/Services/MetadataParsing/VideoAnnotation.php
new file mode 100644
index 000000000..71ac4496e
--- /dev/null
+++ b/app/Services/MetadataParsing/VideoAnnotation.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Biigle\Services\MetadataParsing;
+
+use Biigle\Shape;
+
+class VideoAnnotation extends Annotation
+{
+    /**
+     * @param Shape $shape
+     * @param array<array<float>> $points
+     * @param array<AnnotationLabel> $labels
+     * @param array<float> $frames
+     */
+    public function __construct(
+        public Shape $shape,
+        public array $points,
+        public array $labels,
+        public array $frames,
+    )
+    {
+        //
+    }
+}
diff --git a/tests/php/Services/MetadataParsing/ImageMetadataTest.php b/tests/php/Services/MetadataParsing/ImageMetadataTest.php
index 21d586c36..05473ea6a 100644
--- a/tests/php/Services/MetadataParsing/ImageMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/ImageMetadataTest.php
@@ -2,7 +2,12 @@
 
 namespace Biigle\Tests\Services\MetadataParsing;
 
+use Biigle\Services\MetadataParsing\AnnotationLabel;
+use Biigle\Services\MetadataParsing\Annotator;
+use Biigle\Services\MetadataParsing\ImageAnnotation;
 use Biigle\Services\MetadataParsing\ImageMetadata;
+use Biigle\Services\MetadataParsing\Label;
+use Biigle\Shape;
 use TestCase;
 
 class ImageMetadataTest extends TestCase
@@ -52,4 +57,21 @@ public function testGetInsertData()
 
         $this->assertEquals($expect, $data->getInsertData());
     }
+
+    public function testAnnotations()
+    {
+        $data = new ImageMetadata('filename');
+        $label = new Label(123, 'my label');
+        $annotator = new Annotator(321, 'joe user');
+        $al = new AnnotationLabel($label, $annotator);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$al],
+        );
+
+        $this->assertFalse($data->hasAnnotations());
+        $data->addAnnotation($annotation);
+        $this->assertTrue($data->hasAnnotations());
+    }
 }
diff --git a/tests/php/Services/MetadataParsing/VideoMetadataTest.php b/tests/php/Services/MetadataParsing/VideoMetadataTest.php
index 2de16cab2..d4a735c4f 100644
--- a/tests/php/Services/MetadataParsing/VideoMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/VideoMetadataTest.php
@@ -2,7 +2,12 @@
 
 namespace Biigle\Tests\Services\MetadataParsing;
 
+use Biigle\Services\MetadataParsing\AnnotationLabel;
+use Biigle\Services\MetadataParsing\Annotator;
+use Biigle\Services\MetadataParsing\Label;
+use Biigle\Services\MetadataParsing\VideoAnnotation;
 use Biigle\Services\MetadataParsing\VideoMetadata;
+use Biigle\Shape;
 use TestCase;
 
 class VideoMetadataTest extends TestCase
@@ -183,4 +188,22 @@ public function testGetInsertDataFramesWithGaps()
 
         $this->assertEquals($expect, $data->getInsertData());
     }
+
+    public function testAnnotations()
+    {
+        $data = new VideoMetadata('filename');
+        $label = new Label(123, 'my label');
+        $annotator = new Annotator(321, 'joe user');
+        $al = new AnnotationLabel($label, $annotator);
+        $annotation = new VideoAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$al],
+            frames: [0],
+        );
+
+        $this->assertFalse($data->hasAnnotations());
+        $data->addAnnotation($annotation);
+        $this->assertTrue($data->hasAnnotations());
+    }
 }

From cfc3ddcb6d976b533084aa620afdbffcd85889aa Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 20 Mar 2024 09:56:53 +0100
Subject: [PATCH 051/209] Update gitignore for metadata storage disks

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index de7c717d3..2cf34b81e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,8 @@
 /public/vendor
 /storage/*.key
 /storage/largo_patches
+/storage/metadata
+/storage/pending-metadata
 /vendor
 .env
 .env.backup

From a85a761dbe0e64a2ed46830557932d8fa526da57 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 20 Mar 2024 10:21:47 +0100
Subject: [PATCH 052/209] Implement file label metadata support

---
 app/Services/MetadataParsing/Annotation.php   |  2 +-
 app/Services/MetadataParsing/FileMetadata.php | 22 ++++++++++
 ...otationLabel.php => LabelAndAnnotator.php} |  2 +-
 .../MetadataParsing/VideoAnnotation.php       |  2 +-
 .../MetadataParsing/VolumeMetadata.php        | 22 ++++++++++
 .../MetadataParsing/ImageMetadataTest.php     | 18 +++++++--
 .../MetadataParsing/VideoMetadataTest.php     | 18 +++++++--
 .../MetadataParsing/VolumeMetadataTest.php    | 40 +++++++++++++++++++
 8 files changed, 117 insertions(+), 9 deletions(-)
 rename app/Services/MetadataParsing/{AnnotationLabel.php => LabelAndAnnotator.php} (88%)

diff --git a/app/Services/MetadataParsing/Annotation.php b/app/Services/MetadataParsing/Annotation.php
index ee12c8308..7a49a48d6 100644
--- a/app/Services/MetadataParsing/Annotation.php
+++ b/app/Services/MetadataParsing/Annotation.php
@@ -9,7 +9,7 @@ class Annotation
     /**
      * @param Shape $shape
      * @param array<float> $points
-     * @param array<AnnotationLabel> $labels
+     * @param array<LabelAndAnnotator> $labels
      */
     public function __construct(
         public Shape $shape,
diff --git a/app/Services/MetadataParsing/FileMetadata.php b/app/Services/MetadataParsing/FileMetadata.php
index 53c0396dc..cd298b06d 100644
--- a/app/Services/MetadataParsing/FileMetadata.php
+++ b/app/Services/MetadataParsing/FileMetadata.php
@@ -9,6 +9,13 @@ class FileMetadata
      */
     public array $annotations = [];
 
+    /**
+     * The labels directly attached to the file.
+     *
+     * @var array<LabelAndAnnotator>
+     */
+    public array $labels = [];
+
     public function __construct(public string $name)
     {
         $this->name = trim($this->name);
@@ -41,4 +48,19 @@ public function hasAnnotations(): bool
     {
         return !empty($this->annotations);
     }
+
+    public function addFileLabel(LabelAndAnnotator $la): void
+    {
+        $this->labels[] = $la;
+    }
+
+    public function getFileLabels(): array
+    {
+        return $this->labels;
+    }
+
+    public function hasFileLabels(): bool
+    {
+        return !empty($this->labels);
+    }
 }
diff --git a/app/Services/MetadataParsing/AnnotationLabel.php b/app/Services/MetadataParsing/LabelAndAnnotator.php
similarity index 88%
rename from app/Services/MetadataParsing/AnnotationLabel.php
rename to app/Services/MetadataParsing/LabelAndAnnotator.php
index e772ff354..9beae920e 100644
--- a/app/Services/MetadataParsing/AnnotationLabel.php
+++ b/app/Services/MetadataParsing/LabelAndAnnotator.php
@@ -2,7 +2,7 @@
 
 namespace Biigle\Services\MetadataParsing;
 
-class AnnotationLabel
+class LabelAndAnnotator
 {
     public function __construct(
         public Label $label,
diff --git a/app/Services/MetadataParsing/VideoAnnotation.php b/app/Services/MetadataParsing/VideoAnnotation.php
index 71ac4496e..a21944eb4 100644
--- a/app/Services/MetadataParsing/VideoAnnotation.php
+++ b/app/Services/MetadataParsing/VideoAnnotation.php
@@ -9,7 +9,7 @@ class VideoAnnotation extends Annotation
     /**
      * @param Shape $shape
      * @param array<array<float>> $points
-     * @param array<AnnotationLabel> $labels
+     * @param array<LabelAndAnnotator> $labels
      * @param array<float> $frames
      */
     public function __construct(
diff --git a/app/Services/MetadataParsing/VolumeMetadata.php b/app/Services/MetadataParsing/VolumeMetadata.php
index 7a689cf53..d77154e65 100644
--- a/app/Services/MetadataParsing/VolumeMetadata.php
+++ b/app/Services/MetadataParsing/VolumeMetadata.php
@@ -46,4 +46,26 @@ public function isEmpty(): bool
 
         return true;
     }
+
+    public function hasAnnotations(): bool
+    {
+        foreach ($this->files as $file) {
+            if ($file->hasAnnotations()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public function hasFileLabels(): bool
+    {
+        foreach ($this->files as $file) {
+            if ($file->hasFileLabels()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/tests/php/Services/MetadataParsing/ImageMetadataTest.php b/tests/php/Services/MetadataParsing/ImageMetadataTest.php
index 05473ea6a..52a9c80d8 100644
--- a/tests/php/Services/MetadataParsing/ImageMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/ImageMetadataTest.php
@@ -2,11 +2,11 @@
 
 namespace Biigle\Tests\Services\MetadataParsing;
 
-use Biigle\Services\MetadataParsing\AnnotationLabel;
 use Biigle\Services\MetadataParsing\Annotator;
 use Biigle\Services\MetadataParsing\ImageAnnotation;
 use Biigle\Services\MetadataParsing\ImageMetadata;
 use Biigle\Services\MetadataParsing\Label;
+use Biigle\Services\MetadataParsing\LabelAndAnnotator;
 use Biigle\Shape;
 use TestCase;
 
@@ -63,15 +63,27 @@ public function testAnnotations()
         $data = new ImageMetadata('filename');
         $label = new Label(123, 'my label');
         $annotator = new Annotator(321, 'joe user');
-        $al = new AnnotationLabel($label, $annotator);
+        $la = new LabelAndAnnotator($label, $annotator);
         $annotation = new ImageAnnotation(
             shape: Shape::point(),
             points: [10, 10],
-            labels: [$al],
+            labels: [$la],
         );
 
         $this->assertFalse($data->hasAnnotations());
         $data->addAnnotation($annotation);
         $this->assertTrue($data->hasAnnotations());
     }
+
+    public function testLabels()
+    {
+        $data = new ImageMetadata('filename');
+        $label = new Label(123, 'my label');
+        $annotator = new Annotator(321, 'joe user');
+        $la = new LabelAndAnnotator($label, $annotator);
+
+        $this->assertFalse($data->hasFileLabels());
+        $data->addFileLabel($la);
+        $this->assertTrue($data->hasFileLabels());
+    }
 }
diff --git a/tests/php/Services/MetadataParsing/VideoMetadataTest.php b/tests/php/Services/MetadataParsing/VideoMetadataTest.php
index d4a735c4f..03b981bb8 100644
--- a/tests/php/Services/MetadataParsing/VideoMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/VideoMetadataTest.php
@@ -2,9 +2,9 @@
 
 namespace Biigle\Tests\Services\MetadataParsing;
 
-use Biigle\Services\MetadataParsing\AnnotationLabel;
 use Biigle\Services\MetadataParsing\Annotator;
 use Biigle\Services\MetadataParsing\Label;
+use Biigle\Services\MetadataParsing\LabelAndAnnotator;
 use Biigle\Services\MetadataParsing\VideoAnnotation;
 use Biigle\Services\MetadataParsing\VideoMetadata;
 use Biigle\Shape;
@@ -194,11 +194,11 @@ public function testAnnotations()
         $data = new VideoMetadata('filename');
         $label = new Label(123, 'my label');
         $annotator = new Annotator(321, 'joe user');
-        $al = new AnnotationLabel($label, $annotator);
+        $la = new LabelAndAnnotator($label, $annotator);
         $annotation = new VideoAnnotation(
             shape: Shape::point(),
             points: [10, 10],
-            labels: [$al],
+            labels: [$la],
             frames: [0],
         );
 
@@ -206,4 +206,16 @@ public function testAnnotations()
         $data->addAnnotation($annotation);
         $this->assertTrue($data->hasAnnotations());
     }
+
+    public function testLabels()
+    {
+        $data = new VideoMetadata('filename');
+        $label = new Label(123, 'my label');
+        $annotator = new Annotator(321, 'joe user');
+        $la = new LabelAndAnnotator($label, $annotator);
+
+        $this->assertFalse($data->hasFileLabels());
+        $data->addFileLabel($la);
+        $this->assertTrue($data->hasFileLabels());
+    }
 }
diff --git a/tests/php/Services/MetadataParsing/VolumeMetadataTest.php b/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
index f57b8a5fe..65759f145 100644
--- a/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
@@ -3,9 +3,14 @@
 namespace Biigle\Tests\Services\MetadataParsing;
 
 use Biigle\MediaType;
+use Biigle\Services\MetadataParsing\Annotator;
 use Biigle\Services\MetadataParsing\FileMetadata;
+use Biigle\Services\MetadataParsing\ImageAnnotation;
 use Biigle\Services\MetadataParsing\ImageMetadata;
+use Biigle\Services\MetadataParsing\Label;
+use Biigle\Services\MetadataParsing\LabelAndAnnotator;
 use Biigle\Services\MetadataParsing\VolumeMetadata;
+use Biigle\Shape;
 use TestCase;
 
 class VolumeMetadataTest extends TestCase
@@ -50,4 +55,39 @@ public function testIsEmpty()
         $metadata->addFile($file);
         $this->assertFalse($metadata->isEmpty());
     }
+
+    public function testHasAnnotations()
+    {
+        $metadata = new VolumeMetadata();
+        $this->assertFalse($metadata->hasAnnotations());
+        $file = new ImageMetadata('filename');
+        $metadata->addFile($file);
+        $this->assertFalse($metadata->hasAnnotations());
+
+        $label = new Label(123, 'my label');
+        $annotator = new Annotator(321, 'joe user');
+        $la = new LabelAndAnnotator($label, $annotator);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$la],
+        );
+        $file->addAnnotation($annotation);
+        $this->assertTrue($metadata->hasAnnotations());
+    }
+
+    public function testHasFileLabels()
+    {
+        $metadata = new VolumeMetadata();
+        $this->assertFalse($metadata->hasFileLabels());
+        $file = new ImageMetadata('filename');
+        $metadata->addFile($file);
+        $this->assertFalse($metadata->hasFileLabels());
+
+        $label = new Label(123, 'my label');
+        $annotator = new Annotator(321, 'joe user');
+        $la = new LabelAndAnnotator($label, $annotator);
+        $file->addFileLabel($la);
+        $this->assertTrue($metadata->hasFileLabels());
+    }
 }

From d2e446017155b17843e02e8fc4796fa9b399a8ba Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 20 Mar 2024 11:18:26 +0100
Subject: [PATCH 053/209] Implement keep attribute of pending volume update
 endpoint

---
 .../Api/PendingVolumeController.php           | 10 +++--
 app/Http/Requests/UpdatePendingVolume.php     |  1 +
 .../Api/PendingVolumeControllerTest.php       | 41 +++++++++++++------
 3 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/app/Http/Controllers/Api/PendingVolumeController.php b/app/Http/Controllers/Api/PendingVolumeController.php
index a8f3d8297..fdf7d5c7a 100644
--- a/app/Http/Controllers/Api/PendingVolumeController.php
+++ b/app/Http/Controllers/Api/PendingVolumeController.php
@@ -89,6 +89,7 @@ public function store(StorePendingVolume $request)
      * @apiParam (Required attributes) {Array} files Array of file names of the images/videos that can be found at the base URL. Example: With the base URL `local://volumes/1` and the image `1.jpg`, the file `volumes/1/1.jpg` of the `local` storage disk will be used. This can also be a plain string of comma-separated filenames.
      *
      * @apiParam (Optional attributes) {String} handle Handle or DOI of the dataset that is represented by the new volume.
+     * @apiParam (Optional attributes) {Boolean} keep Set to `true` to keep the pending volume. This is required if you want to continue with the annotation/file label import. Otherwise the pending volume will be deleted after this request.
      *
      * @apiSuccessExample {json} Success response:
      * {
@@ -141,11 +142,14 @@ public function update(UpdatePendingVolume $request)
             return $volume;
         });
 
-        // TODO: Implement annotation/file label import where this must be saved in the
-        // DB.
         $request->pendingVolume->volume_id = $volume->id;
 
-        $request->pendingVolume->delete();
+        if ($request->input('keep', false)) {
+            $request->pendingVolume->save();
+        } else {
+            $request->pendingVolume->delete();
+        }
+
 
         if ($this->isAutomatedRequest()) {
             return $request->pendingVolume;
diff --git a/app/Http/Requests/UpdatePendingVolume.php b/app/Http/Requests/UpdatePendingVolume.php
index 78f1dc362..0c84ba8e4 100644
--- a/app/Http/Requests/UpdatePendingVolume.php
+++ b/app/Http/Requests/UpdatePendingVolume.php
@@ -32,6 +32,7 @@ public function rules(): array
             'url' => ['required', 'string', 'max:256', new VolumeUrl],
             'files' => ['required', 'array', 'min:1'],
             'handle' => ['nullable', 'max:256', new Handle],
+            'keep' => 'bool',
             // Do not validate the maximum filename length with a 'files.*' rule because
             // this leads to a request timeout when the rule is expanded for a huge
             // number of files. This is checked in the VolumeFiles rule below.
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
index d7d8670dc..25b235c7d 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
@@ -306,9 +306,36 @@ public function testUpdateImagesWithMetadata()
         $pendingMetaDisk->assertMissing($pv->metadata_file_path);
     }
 
-    public function testUpdateImagesWithAnnotationImport()
+    public function testUpdateKeep()
     {
-        $this->markTestIncomplete();
+        $pendingMetaDisk = Storage::fake('pending-metadata');
+        $fileDisk = Storage::fake('test');
+        config(['volumes.editor_storage_disks' => ['test']]);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+        $id = $pv->id;
+        $pendingMetaDisk->put('mymeta.csv', 'abc');
+
+        $fileDisk->makeDirectory('images');
+        $fileDisk->put('images/1.jpg', 'abc');
+
+        $this->beAdmin();
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test://images',
+            'files' => ['1.jpg'],
+            'keep' => true,
+        ])->assertSuccessful();
+
+        $pv = $pv->fresh();
+        $this->assertNotNull($pv);
+        $volume = $this->project()->volumes()->first();
+        $this->assertEquals($volume->id, $pv->volume_id);
     }
 
     public function testUpdateImagesWithImageLabelImport()
@@ -626,16 +653,6 @@ public function testUpdateVideosWithMetadata()
         $pendingMetaDisk->assertMissing($pv->metadata_file_path);
     }
 
-    public function testUpdateVideosWithAnnotationImport()
-    {
-        $this->markTestIncomplete();
-    }
-
-    public function testUpdateVideosWithImageLabelImport()
-    {
-        $this->markTestIncomplete();
-    }
-
     public function testUpdateProviderDenylist()
     {
         $id = PendingVolume::factory()->create([

From b4ad4278d80b950729d49889e6469a3223305d98 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 20 Mar 2024 11:20:12 +0100
Subject: [PATCH 054/209] Implement ability to mock metadata parsers for
 testing

---
 app/Services/MetadataParsing/ParserFactory.php    | 15 +++++++++++++++
 .../MetadataParsing/ParserFactoryTest.php         | 14 ++++++++++++++
 .../MetadataParsing/VolumeMetadataTest.php        | 10 +++++-----
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/app/Services/MetadataParsing/ParserFactory.php b/app/Services/MetadataParsing/ParserFactory.php
index cacc9a1a8..dbbec21ce 100644
--- a/app/Services/MetadataParsing/ParserFactory.php
+++ b/app/Services/MetadataParsing/ParserFactory.php
@@ -16,11 +16,17 @@ class ParserFactory
         ],
     ];
 
+    public static MetadataParser $mockParser;
+
     /**
      * Get the first parser that recognizes the file.
      */
     public static function getParserForFile(SplFileInfo $file, string $type): ?MetadataParser
     {
+        if (isset(static::$mockParser)) {
+            return static::$mockParser;
+        }
+
         $parsers = self::$parsers[$type] ?? [];
         foreach ($parsers as $parserClass) {
             $parser = new $parserClass($file);
@@ -56,4 +62,13 @@ public static function getKnownMimeTypes(string $type): array
 
         return $mimes;
     }
+
+    /**
+     * Set a mock parser that will be returned every time getParserForFile() is called.
+     * Use this for testing.
+     */
+    public static function mock(MetadataParser $mockParser): void
+    {
+        static::$mockParser = $mockParser;
+    }
 }
diff --git a/tests/php/Services/MetadataParsing/ParserFactoryTest.php b/tests/php/Services/MetadataParsing/ParserFactoryTest.php
index c90090308..291717089 100644
--- a/tests/php/Services/MetadataParsing/ParserFactoryTest.php
+++ b/tests/php/Services/MetadataParsing/ParserFactoryTest.php
@@ -58,6 +58,15 @@ public function testGetKnownMimeTypes()
         $types = ParserFactory::getKnownMimeTypes('unknown');
         $this->assertEquals([], $types);
     }
+
+    public function testMock()
+    {
+        $parser = new TestParser;
+        ParserFactory::mock($parser);
+        $file = new File(__DIR__."/../../../files/image-metadata.csv");
+        $p = ParserFactory::getParserForFile($file, 'image');
+        $this->assertSame($p, $parser);
+    }
 }
 
 class TestParser extends MetadataParser
@@ -67,6 +76,11 @@ public static function getKnownMimeTypes(): array
         return [];
     }
 
+    public function __construct()
+    {
+        parent::__construct(new \SplFileInfo('tmp'));
+    }
+
     public function recognizesFile(): bool
     {
         return false;
diff --git a/tests/php/Services/MetadataParsing/VolumeMetadataTest.php b/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
index 65759f145..9bd21256d 100644
--- a/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
@@ -27,7 +27,7 @@ public function testNew()
 
     public function testAddGetFiles()
     {
-        $metadata = new VolumeMetadata();
+        $metadata = new VolumeMetadata;
         $file = new FileMetadata('filename');
         $metadata->addFile($file);
         $this->assertEquals($file, $metadata->getFiles()[0]);
@@ -37,7 +37,7 @@ public function testAddGetFiles()
 
     public function testGetFile()
     {
-        $metadata = new VolumeMetadata();
+        $metadata = new VolumeMetadata;
         $this->assertNull($metadata->getFile('filename'));
         $file = new FileMetadata('filename');
         $metadata->addFile($file);
@@ -46,7 +46,7 @@ public function testGetFile()
 
     public function testIsEmpty()
     {
-        $metadata = new VolumeMetadata();
+        $metadata = new VolumeMetadata;
         $this->assertTrue($metadata->isEmpty());
         $file = new ImageMetadata('filename');
         $metadata->addFile($file);
@@ -58,7 +58,7 @@ public function testIsEmpty()
 
     public function testHasAnnotations()
     {
-        $metadata = new VolumeMetadata();
+        $metadata = new VolumeMetadata;
         $this->assertFalse($metadata->hasAnnotations());
         $file = new ImageMetadata('filename');
         $metadata->addFile($file);
@@ -78,7 +78,7 @@ public function testHasAnnotations()
 
     public function testHasFileLabels()
     {
-        $metadata = new VolumeMetadata();
+        $metadata = new VolumeMetadata;
         $this->assertFalse($metadata->hasFileLabels());
         $file = new ImageMetadata('filename');
         $metadata->addFile($file);

From 6acee0591e47b392b551490abdbc8378b9c42cbe Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 20 Mar 2024 11:21:34 +0100
Subject: [PATCH 055/209] Apply CS fixes

---
 app/Services/MetadataParsing/Annotation.php        | 3 +--
 app/Services/MetadataParsing/Annotator.php         | 3 +--
 app/Services/MetadataParsing/ImageAnnotation.php   | 2 --
 app/Services/MetadataParsing/Label.php             | 3 +--
 app/Services/MetadataParsing/LabelAndAnnotator.php | 3 +--
 app/Services/MetadataParsing/VideoAnnotation.php   | 3 +--
 6 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/app/Services/MetadataParsing/Annotation.php b/app/Services/MetadataParsing/Annotation.php
index 7a49a48d6..255962717 100644
--- a/app/Services/MetadataParsing/Annotation.php
+++ b/app/Services/MetadataParsing/Annotation.php
@@ -15,8 +15,7 @@ public function __construct(
         public Shape $shape,
         public array $points,
         public array $labels,
-    )
-    {
+    ) {
         //
     }
 }
diff --git a/app/Services/MetadataParsing/Annotator.php b/app/Services/MetadataParsing/Annotator.php
index a1d05c54c..3a586181c 100644
--- a/app/Services/MetadataParsing/Annotator.php
+++ b/app/Services/MetadataParsing/Annotator.php
@@ -13,8 +13,7 @@ public function __construct(
         public string $id,
         public string $name,
         public ?string $uuid = null,
-    )
-    {
+    ) {
         //
     }
 }
diff --git a/app/Services/MetadataParsing/ImageAnnotation.php b/app/Services/MetadataParsing/ImageAnnotation.php
index 6ce32a2bd..3df781ed2 100644
--- a/app/Services/MetadataParsing/ImageAnnotation.php
+++ b/app/Services/MetadataParsing/ImageAnnotation.php
@@ -2,8 +2,6 @@
 
 namespace Biigle\Services\MetadataParsing;
 
-use Biigle\Shape;
-
 class ImageAnnotation extends Annotation
 {
     //
diff --git a/app/Services/MetadataParsing/Label.php b/app/Services/MetadataParsing/Label.php
index d826f49df..b771d224d 100644
--- a/app/Services/MetadataParsing/Label.php
+++ b/app/Services/MetadataParsing/Label.php
@@ -17,8 +17,7 @@ public function __construct(
         public ?string $color = null,
         public ?string $uuid = null,
         public ?string $labelTreeUuid = null,
-    )
-    {
+    ) {
         //
     }
 }
diff --git a/app/Services/MetadataParsing/LabelAndAnnotator.php b/app/Services/MetadataParsing/LabelAndAnnotator.php
index 9beae920e..76e6bad93 100644
--- a/app/Services/MetadataParsing/LabelAndAnnotator.php
+++ b/app/Services/MetadataParsing/LabelAndAnnotator.php
@@ -7,8 +7,7 @@ class LabelAndAnnotator
     public function __construct(
         public Label $label,
         public Annotator $annotator,
-    )
-    {
+    ) {
         //
     }
 }
diff --git a/app/Services/MetadataParsing/VideoAnnotation.php b/app/Services/MetadataParsing/VideoAnnotation.php
index a21944eb4..9a428de41 100644
--- a/app/Services/MetadataParsing/VideoAnnotation.php
+++ b/app/Services/MetadataParsing/VideoAnnotation.php
@@ -17,8 +17,7 @@ public function __construct(
         public array $points,
         public array $labels,
         public array $frames,
-    )
-    {
+    ) {
         //
     }
 }

From 9074839458a5110ea9112dc07732c2eb59b8730f Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 20 Mar 2024 11:49:18 +0100
Subject: [PATCH 056/209] Replace keep attribute with import attributes

The information on which import should be performed must be saved
so the UI can determine which views should be displayed (and how).
---
 .../Api/PendingVolumeController.php           | 21 +++++++----
 app/Http/Requests/UpdatePendingVolume.php     |  3 +-
 app/PendingVolume.php                         |  2 +
 ...06_143800_create_pending_volumes_table.php |  3 ++
 .../Api/PendingVolumeControllerTest.php       | 37 +++++++++++++++++--
 5 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/Api/PendingVolumeController.php b/app/Http/Controllers/Api/PendingVolumeController.php
index fdf7d5c7a..4e6eb8cf8 100644
--- a/app/Http/Controllers/Api/PendingVolumeController.php
+++ b/app/Http/Controllers/Api/PendingVolumeController.php
@@ -80,7 +80,7 @@ public function store(StorePendingVolume $request)
      * @apiName UpdatePendingVolume
      * @apiPermission projectAdminAndPendingVolumeOwner
      *
-     * @apiDescription When this endpoint is called, the new volume is already created. Then there are two ways forward: 1) The user wants to import annotations and/or file labels. Then the pending volume is kept and used for the next steps. 2) Otherwise the pending volume will be deleted here. In both cases the endpoint returns the pending volume (even if it was deleted) which was updated with the new volume ID.
+     * @apiDescription When this endpoint is called, the new volume is already created. Then there are two ways forward: 1) The user wants to import annotations and/or file labels. Then the pending volume is kept and used for the next steps (see the `import_*` attributes). Continue with (#Volumes:UpdatePendingVolumeAnnotationLabels) in this case. 2) Otherwise the pending volume will be deleted here. In both cases the endpoint returns the pending volume (even if it was deleted) which was updated with the new volume ID.
      *
      * @apiParam {Number} id The pending volume ID.
      *
@@ -89,7 +89,8 @@ public function store(StorePendingVolume $request)
      * @apiParam (Required attributes) {Array} files Array of file names of the images/videos that can be found at the base URL. Example: With the base URL `local://volumes/1` and the image `1.jpg`, the file `volumes/1/1.jpg` of the `local` storage disk will be used. This can also be a plain string of comma-separated filenames.
      *
      * @apiParam (Optional attributes) {String} handle Handle or DOI of the dataset that is represented by the new volume.
-     * @apiParam (Optional attributes) {Boolean} keep Set to `true` to keep the pending volume. This is required if you want to continue with the annotation/file label import. Otherwise the pending volume will be deleted after this request.
+     * @apiParam (Optional attributes) {Boolean} import_annotations Set to `true` to keep the pending volume for annotation import. Otherwise the pending volume will be deleted after this request.
+     * @apiParam (Optional attributes) {Boolean} import_file_labels Set to `true` to keep the pending volume for file label import. Otherwise the pending volume will be deleted after this request.
      *
      * @apiSuccessExample {json} Success response:
      * {
@@ -99,7 +100,9 @@ public function store(StorePendingVolume $request)
      *    "media_type_id": 1,
      *    "user_id": 2,
      *    "project_id": 3,
-     *    "volume_id": 4
+     *    "volume_id": 4,
+     *    "import_annotations": true,
+     *    "import_file_labels": false
      * }
      *
      */
@@ -142,15 +145,17 @@ public function update(UpdatePendingVolume $request)
             return $volume;
         });
 
-        $request->pendingVolume->volume_id = $volume->id;
-
-        if ($request->input('keep', false)) {
-            $request->pendingVolume->save();
+        if ($request->input('import_annotations') || $request->input('import_file_labels')) {
+            $request->pendingVolume->update([
+                'volume_id' => $volume->id,
+                'import_annotations' => $request->input('import_annotations', false),
+                'import_file_labels' => $request->input('import_file_labels', false),
+            ]);
         } else {
+            $request->pendingVolume->volume_id = $volume->id;
             $request->pendingVolume->delete();
         }
 
-
         if ($this->isAutomatedRequest()) {
             return $request->pendingVolume;
         }
diff --git a/app/Http/Requests/UpdatePendingVolume.php b/app/Http/Requests/UpdatePendingVolume.php
index 0c84ba8e4..1736e0aa1 100644
--- a/app/Http/Requests/UpdatePendingVolume.php
+++ b/app/Http/Requests/UpdatePendingVolume.php
@@ -32,7 +32,8 @@ public function rules(): array
             'url' => ['required', 'string', 'max:256', new VolumeUrl],
             'files' => ['required', 'array', 'min:1'],
             'handle' => ['nullable', 'max:256', new Handle],
-            'keep' => 'bool',
+            'import_annotations' => 'bool',
+            'import_file_labels' => 'bool',
             // Do not validate the maximum filename length with a 'files.*' rule because
             // this leads to a request timeout when the rule is expanded for a huge
             // number of files. This is checked in the VolumeFiles rule below.
diff --git a/app/PendingVolume.php b/app/PendingVolume.php
index 334fbe818..2f3d4c0db 100644
--- a/app/PendingVolume.php
+++ b/app/PendingVolume.php
@@ -22,6 +22,8 @@ class PendingVolume extends Model
         'project_id',
         'metadata_file_path',
         'volume_id',
+        'import_annotations',
+        'import_file_labels',
     ];
 
     /**
diff --git a/database/migrations/2024_03_06_143800_create_pending_volumes_table.php b/database/migrations/2024_03_06_143800_create_pending_volumes_table.php
index 47fdbd90b..d590d4bc4 100644
--- a/database/migrations/2024_03_06_143800_create_pending_volumes_table.php
+++ b/database/migrations/2024_03_06_143800_create_pending_volumes_table.php
@@ -37,6 +37,9 @@ public function up(): void
             // Path of the file in the pending_metadata_storage_disk.
             $table->string('metadata_file_path', 256)->nullable();
 
+            $table->boolean('import_annotations')->default(false);
+            $table->boolean('import_file_labels')->default(false);
+
             // A user is only allowed to create one pending volume at a time for a
             // project.
             $table->unique(['user_id', 'project_id']);
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
index 25b235c7d..ce8f519dc 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
@@ -306,7 +306,7 @@ public function testUpdateImagesWithMetadata()
         $pendingMetaDisk->assertMissing($pv->metadata_file_path);
     }
 
-    public function testUpdateKeep()
+    public function testUpdateImportAnnotations()
     {
         $pendingMetaDisk = Storage::fake('pending-metadata');
         $fileDisk = Storage::fake('test');
@@ -329,18 +329,47 @@ public function testUpdateKeep()
             'name' => 'my volume no. 1',
             'url' => 'test://images',
             'files' => ['1.jpg'],
-            'keep' => true,
+            'import_annotations' => true,
         ])->assertSuccessful();
 
         $pv = $pv->fresh();
         $this->assertNotNull($pv);
         $volume = $this->project()->volumes()->first();
         $this->assertEquals($volume->id, $pv->volume_id);
+        $this->assertTrue($pv->import_annotations);
     }
 
-    public function testUpdateImagesWithImageLabelImport()
+    public function testUpdateImportFileLabels()
     {
-        $this->markTestIncomplete();
+        $pendingMetaDisk = Storage::fake('pending-metadata');
+        $fileDisk = Storage::fake('test');
+        config(['volumes.editor_storage_disks' => ['test']]);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+        $id = $pv->id;
+        $pendingMetaDisk->put('mymeta.csv', 'abc');
+
+        $fileDisk->makeDirectory('images');
+        $fileDisk->put('images/1.jpg', 'abc');
+
+        $this->beAdmin();
+        $this->putJson("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test://images',
+            'files' => ['1.jpg'],
+            'import_file_labels' => true,
+        ])->assertSuccessful();
+
+        $pv = $pv->fresh();
+        $this->assertNotNull($pv);
+        $volume = $this->project()->volumes()->first();
+        $this->assertEquals($volume->id, $pv->volume_id);
+        $this->assertTrue($pv->import_file_labels);
     }
 
     public function testUpdateFromUIWithoutImport()

From 8789979f30abd29f26ea5b5d54b0167f90e9770b Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 20 Mar 2024 12:09:54 +0100
Subject: [PATCH 057/209] Replace metadata parser mocking with cached metadata

The cache value can be set directly in tests to mock the metadata.
Also the file is only downloaded once per request.
---
 .../MetadataParsing/ParserFactory.php         | 11 ------
 app/Traits/HasMetadataFile.php                | 37 +++++++++++--------
 .../MetadataParsing/ParserFactoryTest.php     | 14 -------
 3 files changed, 21 insertions(+), 41 deletions(-)

diff --git a/app/Services/MetadataParsing/ParserFactory.php b/app/Services/MetadataParsing/ParserFactory.php
index dbbec21ce..be34d5d9c 100644
--- a/app/Services/MetadataParsing/ParserFactory.php
+++ b/app/Services/MetadataParsing/ParserFactory.php
@@ -16,8 +16,6 @@ class ParserFactory
         ],
     ];
 
-    public static MetadataParser $mockParser;
-
     /**
      * Get the first parser that recognizes the file.
      */
@@ -62,13 +60,4 @@ public static function getKnownMimeTypes(string $type): array
 
         return $mimes;
     }
-
-    /**
-     * Set a mock parser that will be returned every time getParserForFile() is called.
-     * Use this for testing.
-     */
-    public static function mock(MetadataParser $mockParser): void
-    {
-        static::$mockParser = $mockParser;
-    }
 }
diff --git a/app/Traits/HasMetadataFile.php b/app/Traits/HasMetadataFile.php
index 3a7139c63..aa2218d30 100644
--- a/app/Traits/HasMetadataFile.php
+++ b/app/Traits/HasMetadataFile.php
@@ -5,6 +5,7 @@
 use Biigle\MediaType;
 use Biigle\Services\MetadataParsing\ParserFactory;
 use Biigle\Services\MetadataParsing\VolumeMetadata;
+use Cache;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Storage;
@@ -38,23 +39,27 @@ public function getMetadata(): ?VolumeMetadata
             return null;
         }
 
-        $tmpPath = tempnam(sys_get_temp_dir(), 'metadata');
-        try {
-            $from = Storage::disk(static::$metadataFileDisk)
-                ->readStream($this->metadata_file_path);
-            $to = fopen($tmpPath, 'w');
-            stream_copy_to_stream($from, $to);
-            $type = ($this->media_type_id === MediaType::imageId()) ? 'image' : 'video';
-            $parser = ParserFactory::getParserForFile(new SplFileInfo($tmpPath), $type);
-            if (is_null($parser)) {
-                return null;
-            }
+        $disk = static::$metadataFileDisk;
+        $key = "metadata-{$disk}-{$this->metadata_file_path}";
 
-            return $parser->getMetadata();
-        } finally {
-            fclose($to);
-            File::delete($tmpPath);
-        }
+        return Cache::store('array')->remember($key, 60, function () use ($disk) {
+            $tmpPath = tempnam(sys_get_temp_dir(), 'metadata');
+            try {
+                $from = Storage::disk($disk)->readStream($this->metadata_file_path);
+                $to = fopen($tmpPath, 'w');
+                stream_copy_to_stream($from, $to);
+                $type = ($this->media_type_id === MediaType::imageId()) ? 'image' : 'video';
+                $parser = ParserFactory::getParserForFile(new SplFileInfo($tmpPath), $type);
+                if (is_null($parser)) {
+                    return null;
+                }
+
+                return $parser->getMetadata();
+            } finally {
+                fclose($to);
+                File::delete($tmpPath);
+            }
+        });
     }
 
     /**
diff --git a/tests/php/Services/MetadataParsing/ParserFactoryTest.php b/tests/php/Services/MetadataParsing/ParserFactoryTest.php
index 291717089..c90090308 100644
--- a/tests/php/Services/MetadataParsing/ParserFactoryTest.php
+++ b/tests/php/Services/MetadataParsing/ParserFactoryTest.php
@@ -58,15 +58,6 @@ public function testGetKnownMimeTypes()
         $types = ParserFactory::getKnownMimeTypes('unknown');
         $this->assertEquals([], $types);
     }
-
-    public function testMock()
-    {
-        $parser = new TestParser;
-        ParserFactory::mock($parser);
-        $file = new File(__DIR__."/../../../files/image-metadata.csv");
-        $p = ParserFactory::getParserForFile($file, 'image');
-        $this->assertSame($p, $parser);
-    }
 }
 
 class TestParser extends MetadataParser
@@ -76,11 +67,6 @@ public static function getKnownMimeTypes(): array
         return [];
     }
 
-    public function __construct()
-    {
-        parent::__construct(new \SplFileInfo('tmp'));
-    }
-
     public function recognizesFile(): bool
     {
         return false;

From 41f334c6a4defffad9d86a84f96ca93a31b4cd85 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 21 Mar 2024 09:28:07 +0100
Subject: [PATCH 058/209] Add convenience methods for metadata labels

---
 app/Services/MetadataParsing/FileMetadata.php | 16 +++++++++
 .../MetadataParsing/VolumeMetadata.php        | 31 +++++++++++++++++
 .../MetadataParsing/ImageMetadataTest.php     | 21 ++++++++++--
 .../MetadataParsing/VideoMetadataTest.php     | 22 +++++++++++--
 .../MetadataParsing/VolumeMetadataTest.php    | 33 +++++++++++++++++++
 5 files changed, 119 insertions(+), 4 deletions(-)

diff --git a/app/Services/MetadataParsing/FileMetadata.php b/app/Services/MetadataParsing/FileMetadata.php
index cd298b06d..b6a70d4df 100644
--- a/app/Services/MetadataParsing/FileMetadata.php
+++ b/app/Services/MetadataParsing/FileMetadata.php
@@ -63,4 +63,20 @@ public function hasFileLabels(): bool
     {
         return !empty($this->labels);
     }
+
+    /**
+     * The returned array is indexed by label IDs.
+     */
+    public function getAnnotationLabels(): array
+    {
+        $labels = [];
+
+        foreach ($this->getAnnotations() as $annotation) {
+            foreach ($annotation->labels as $annotationLabel) {
+                $labels[$annotationLabel->label->id] = $annotationLabel->label;
+            }
+        }
+
+        return $labels;
+    }
 }
diff --git a/app/Services/MetadataParsing/VolumeMetadata.php b/app/Services/MetadataParsing/VolumeMetadata.php
index d77154e65..90f7fc509 100644
--- a/app/Services/MetadataParsing/VolumeMetadata.php
+++ b/app/Services/MetadataParsing/VolumeMetadata.php
@@ -68,4 +68,35 @@ public function hasFileLabels(): bool
 
         return false;
     }
+
+    /**
+     * The returned array is indexed by label IDs.
+     */
+    public function getAnnotationLabels(): array
+    {
+        $labels = [];
+
+        foreach ($this->files as $file) {
+            // Use union to automatically remove duplicates.
+            $labels += $file->getAnnotationLabels();
+        }
+
+        return $labels;
+    }
+
+    /**
+     * The returned array is indexed by label IDs.
+     */
+    public function getFileLabels(): array
+    {
+        $labels = [];
+
+        foreach ($this->files as $file) {
+            foreach ($file->getFileLabels() as $fileLabel) {
+                $labels[$fileLabel->label->id] = $fileLabel->label;
+            }
+        }
+
+        return $labels;
+    }
 }
diff --git a/tests/php/Services/MetadataParsing/ImageMetadataTest.php b/tests/php/Services/MetadataParsing/ImageMetadataTest.php
index 52a9c80d8..e532388c6 100644
--- a/tests/php/Services/MetadataParsing/ImageMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/ImageMetadataTest.php
@@ -58,7 +58,7 @@ public function testGetInsertData()
         $this->assertEquals($expect, $data->getInsertData());
     }
 
-    public function testAnnotations()
+    public function testHasAnnotations()
     {
         $data = new ImageMetadata('filename');
         $label = new Label(123, 'my label');
@@ -75,7 +75,7 @@ public function testAnnotations()
         $this->assertTrue($data->hasAnnotations());
     }
 
-    public function testLabels()
+    public function testHasFileLabels()
     {
         $data = new ImageMetadata('filename');
         $label = new Label(123, 'my label');
@@ -86,4 +86,21 @@ public function testLabels()
         $data->addFileLabel($la);
         $this->assertTrue($data->hasFileLabels());
     }
+
+    public function testGetAnnotationLabels()
+    {
+        $data = new ImageMetadata('filename');
+        $label = new Label(123, 'my label');
+        $annotator = new Annotator(321, 'joe user');
+        $la = new LabelAndAnnotator($label, $annotator);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$la],
+        );
+
+        $this->assertEquals([], $data->getAnnotationLabels());
+        $data->addAnnotation($annotation);
+        $this->assertEquals([123 => $label], $data->getAnnotationLabels());
+    }
 }
diff --git a/tests/php/Services/MetadataParsing/VideoMetadataTest.php b/tests/php/Services/MetadataParsing/VideoMetadataTest.php
index 03b981bb8..dafe976db 100644
--- a/tests/php/Services/MetadataParsing/VideoMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/VideoMetadataTest.php
@@ -189,7 +189,7 @@ public function testGetInsertDataFramesWithGaps()
         $this->assertEquals($expect, $data->getInsertData());
     }
 
-    public function testAnnotations()
+    public function testHasAnnotations()
     {
         $data = new VideoMetadata('filename');
         $label = new Label(123, 'my label');
@@ -207,7 +207,7 @@ public function testAnnotations()
         $this->assertTrue($data->hasAnnotations());
     }
 
-    public function testLabels()
+    public function testHasFileLabels()
     {
         $data = new VideoMetadata('filename');
         $label = new Label(123, 'my label');
@@ -218,4 +218,22 @@ public function testLabels()
         $data->addFileLabel($la);
         $this->assertTrue($data->hasFileLabels());
     }
+
+        public function testGetAnnotationLabels()
+    {
+        $data = new VideoMetadata('filename');
+        $label = new Label(123, 'my label');
+        $annotator = new Annotator(321, 'joe user');
+        $la = new LabelAndAnnotator($label, $annotator);
+        $annotation = new VideoAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$la],
+            frames: [0],
+        );
+
+        $this->assertEquals([], $data->getAnnotationLabels());
+        $data->addAnnotation($annotation);
+        $this->assertEquals([123 => $label], $data->getAnnotationLabels());
+    }
 }
diff --git a/tests/php/Services/MetadataParsing/VolumeMetadataTest.php b/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
index 9bd21256d..f39d8e327 100644
--- a/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
@@ -90,4 +90,37 @@ public function testHasFileLabels()
         $file->addFileLabel($la);
         $this->assertTrue($metadata->hasFileLabels());
     }
+
+    public function testGetAnnotationLabels()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('filename');
+        $metadata->addFile($file);
+        $this->assertEquals([], $metadata->getAnnotationLabels());
+
+        $label = new Label(123, 'my label');
+        $annotator = new Annotator(321, 'joe user');
+        $la = new LabelAndAnnotator($label, $annotator);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$la],
+        );
+        $file->addAnnotation($annotation);
+        $this->assertEquals([123 => $label], $metadata->getAnnotationLabels());
+    }
+
+    public function testGetFileLabels()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('filename');
+        $metadata->addFile($file);
+        $this->assertEquals([], $metadata->getFileLabels());
+
+        $label = new Label(123, 'my label');
+        $annotator = new Annotator(321, 'joe user');
+        $la = new LabelAndAnnotator($label, $annotator);
+        $file->addFileLabel($la);
+        $this->assertEquals([123 => $label], $metadata->getFileLabels());
+    }
 }

From b566283e7fde21822f2b7269b7cf70b7c310a600 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 21 Mar 2024 09:53:17 +0100
Subject: [PATCH 059/209] Add API endpoint to choose annotation labels for
 import

---
 .../Api/PendingVolumeController.php           | 38 ++++++++++
 .../UpdatePendingVolumeAnnotationLabels.php   | 65 +++++++++++++++++
 app/PendingVolume.php                         | 10 +++
 ...06_143800_create_pending_volumes_table.php |  2 +
 routes/api.php                                |  2 +
 .../Api/PendingVolumeControllerTest.php       | 69 +++++++++++++++++++
 tests/php/PendingVolumeTest.php               |  3 +
 7 files changed, 189 insertions(+)
 create mode 100644 app/Http/Requests/UpdatePendingVolumeAnnotationLabels.php

diff --git a/app/Http/Controllers/Api/PendingVolumeController.php b/app/Http/Controllers/Api/PendingVolumeController.php
index 4e6eb8cf8..b32e1643b 100644
--- a/app/Http/Controllers/Api/PendingVolumeController.php
+++ b/app/Http/Controllers/Api/PendingVolumeController.php
@@ -4,6 +4,7 @@
 
 use Biigle\Http\Requests\StorePendingVolume;
 use Biigle\Http\Requests\UpdatePendingVolume;
+use Biigle\Http\Requests\UpdatePendingVolumeAnnotationLabels;
 use Biigle\Jobs\CreateNewImagesOrVideos;
 use Biigle\PendingVolume;
 use Biigle\Volume;
@@ -166,6 +167,43 @@ public function update(UpdatePendingVolume $request)
             ->with('messageType', 'success');
     }
 
+    /**
+     * Choose annotation labels for import.
+     *
+     * @api {put} pending-volumes/:id/annotation-labels Choose annotation labels for import
+     * @apiGroup Volumes
+     * @apiName UpdatePendingVolumeAnnotationLabels
+     * @apiPermission projectAdminAndPendingVolumeOwner
+     *
+     * @apiDescription If this endpoint is not used to set a list of label IDs, all annotations will be imported by default. Continue with (#Volumes:UpdatePendingVolumeFileLabels).
+     *
+     * @apiParam {Number} id The pending volume ID.
+     *
+     * @apiParam (Required attributes) {array} labels The label IDs (from the metadata file) that should be used to filter the annotation import.
+     *
+     * @apiSuccessExample {json} Success response:
+     * {
+     *    "id": 2,
+     *    "created_at": "2015-02-19 16:10:17",
+     *    "updated_at": "2015-02-19 16:10:17",
+     *    "media_type_id": 1,
+     *    "user_id": 2,
+     *    "project_id": 3,
+     *    "volume_id": 4,
+     *    "import_annotations": true,
+     *    "import_file_labels": true,
+     *    "only_annotation_labels": [123]
+     * }
+     */
+    public function updateAnnotationLabels(UpdatePendingVolumeAnnotationLabels $request)
+    {
+        $request->pendingVolume->update([
+            'only_annotation_labels' => $request->input('labels'),
+        ]);
+
+        return $request->pendingVolume;
+    }
+
     /**
      * Delete a pending volume
      *
diff --git a/app/Http/Requests/UpdatePendingVolumeAnnotationLabels.php b/app/Http/Requests/UpdatePendingVolumeAnnotationLabels.php
new file mode 100644
index 000000000..71b8d6e4c
--- /dev/null
+++ b/app/Http/Requests/UpdatePendingVolumeAnnotationLabels.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Biigle\Http\Requests;
+
+use Biigle\PendingVolume;
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdatePendingVolumeAnnotationLabels extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        $this->pendingVolume = PendingVolume::findOrFail($this->route('id'));
+
+        return $this->user()->can('update', $this->pendingVolume);
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'labels' => 'required|array|min:1',
+        ];
+    }
+
+    /**
+     * Configure the validator instance.
+     *
+     * @param  \Illuminate\Validation\Validator  $validator
+     * @return void
+     */
+    public function withValidator($validator)
+    {
+        $validator->after(function ($validator) {
+            if ($validator->errors()->isNotEmpty()) {
+                return;
+            }
+
+            if (is_null($this->pendingVolume->volume_id)) {
+                $validator->errors()->add('labels', 'A volume must be created from the pending volume first.');
+                return;
+            }
+
+            $labels = $this->input('labels');
+            $metadata = $this->pendingVolume->getMetadata();
+            if (is_null($metadata)) {
+                $validator->errors()->add('labels', 'No metadata file found.');
+            }
+
+            $metaLabels = $metadata->getAnnotationLabels();
+            foreach ($labels as $id) {
+                if (!array_key_exists($id, $metaLabels)) {
+                    $validator->errors()->add('labels', "Label ID {$id} does not exist in the metadata file.");
+                    return;
+                }
+            }
+        });
+    }
+}
diff --git a/app/PendingVolume.php b/app/PendingVolume.php
index 2f3d4c0db..f17b5eaf2 100644
--- a/app/PendingVolume.php
+++ b/app/PendingVolume.php
@@ -24,6 +24,7 @@ class PendingVolume extends Model
         'volume_id',
         'import_annotations',
         'import_file_labels',
+        'only_annotation_labels',
     ];
 
     /**
@@ -35,6 +36,15 @@ class PendingVolume extends Model
         'metadata_file_path',
     ];
 
+    /**
+     * The attributes that should be cast.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'only_annotation_labels' => 'array',
+    ];
+
     protected static function booted(): void
     {
         static::$metadataFileDisk = config('volumes.pending_metadata_storage_disk');
diff --git a/database/migrations/2024_03_06_143800_create_pending_volumes_table.php b/database/migrations/2024_03_06_143800_create_pending_volumes_table.php
index d590d4bc4..31deda8d4 100644
--- a/database/migrations/2024_03_06_143800_create_pending_volumes_table.php
+++ b/database/migrations/2024_03_06_143800_create_pending_volumes_table.php
@@ -40,6 +40,8 @@ public function up(): void
             $table->boolean('import_annotations')->default(false);
             $table->boolean('import_file_labels')->default(false);
 
+            $table->jsonb('only_annotation_labels')->nullable();
+
             // A user is only allowed to create one pending volume at a time for a
             // project.
             $table->unique(['user_id', 'project_id']);
diff --git a/routes/api.php b/routes/api.php
index aa25f2250..248a8f5fa 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -152,6 +152,8 @@
     'parameters' => ['pending-volumes' => 'id'],
 ]);
 
+$router->put('pending-volumes/{id}/annotation-labels', 'PendingVolumeController@updateAnnotationLabels');
+
 $router->resource('projects', 'ProjectController', [
     'only' => ['index', 'show', 'update', 'store', 'destroy'],
     'parameters' => ['projects' => 'id'],
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
index ce8f519dc..7332eeb56 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
@@ -6,7 +6,15 @@
 use Biigle\Jobs\CreateNewImagesOrVideos;
 use Biigle\MediaType;
 use Biigle\PendingVolume;
+use Biigle\Services\MetadataParsing\Annotator;
+use Biigle\Services\MetadataParsing\ImageAnnotation;
+use Biigle\Services\MetadataParsing\ImageMetadata;
+use Biigle\Services\MetadataParsing\Label;
+use Biigle\Services\MetadataParsing\LabelAndAnnotator;
+use Biigle\Services\MetadataParsing\VolumeMetadata;
+use Biigle\Shape;
 use Biigle\Volume;
+use Cache;
 use Exception;
 use FileCache;
 use Illuminate\Http\UploadedFile;
@@ -776,4 +784,65 @@ public function testDestroyFromUI()
             ->delete("/api/v1/pending-volumes/{$pv->id}")
             ->assertRedirectToRoute('create-volume', ['project' => $pv->project_id]);
     }
+
+    public function testUpdateAnnotationLabels()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $annotator = new Annotator(321, 'joe user');
+        $la = new LabelAndAnnotator($label, $annotator);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$la],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+        $id = $pv->id;
+
+        $this->beExpert();
+        $this
+            ->putJson("/api/v1/pending-volumes/{$id}/annotation-labels")
+            ->assertStatus(403);
+
+        $this->beAdmin();
+        // Label list required.
+        $this
+            ->putJson("/api/v1/pending-volumes/{$id}/annotation-labels")
+            ->assertStatus(422);
+
+        // Label list must be filled.
+        $this->putJson("/api/v1/pending-volumes/{$id}/annotation-labels", [
+            'labels' => [],
+        ])->assertStatus(422);
+
+        // Label not in metadata.
+        $this->putJson("/api/v1/pending-volumes/{$id}/annotation-labels", [
+            'labels' => [456],
+        ])->assertStatus(422);
+
+        // No volume attached yet.
+        $this->putJson("/api/v1/pending-volumes/{$id}/annotation-labels", [
+            'labels' => [123],
+        ])->assertStatus(422);
+
+        $pv->update(['volume_id' => $this->volume()->id]);
+
+        $this->putJson("/api/v1/pending-volumes/{$id}/annotation-labels", [
+            'labels' => [123],
+        ])->assertSuccessful();
+
+        $pv->refresh();
+        $this->assertEquals([123], $pv->only_annotation_labels);
+    }
 }
diff --git a/tests/php/PendingVolumeTest.php b/tests/php/PendingVolumeTest.php
index 859e09f7d..e202ad155 100644
--- a/tests/php/PendingVolumeTest.php
+++ b/tests/php/PendingVolumeTest.php
@@ -24,6 +24,9 @@ public function testAttributes()
         $this->assertNotNull($this->model->updated_at);
         $this->assertNull($this->model->metadata_file_path);
         $this->assertNull($this->model->volume_id);
+        $this->assertFalse($this->model->import_annotations);
+        $this->assertFalse($this->model->import_file_labels);
+        $this->assertNull($this->model->only_annotation_labels);
     }
 
     public function testCreateOnlyOneForProject()

From f7396c577ad074ccb9d2a05527f0d15b0b48b145 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 21 Mar 2024 10:03:47 +0100
Subject: [PATCH 060/209] Add API endpoint to choose file labels for import

---
 .../Api/PendingVolumeController.php           | 39 +++++++++++
 .../UpdatePendingVolumeFileLabels.php         | 65 +++++++++++++++++++
 app/PendingVolume.php                         |  2 +
 ...06_143800_create_pending_volumes_table.php |  1 +
 routes/api.php                                |  1 +
 .../Api/PendingVolumeControllerTest.php       | 56 ++++++++++++++++
 tests/php/PendingVolumeTest.php               |  1 +
 .../MetadataParsing/VideoMetadataTest.php     |  2 +-
 8 files changed, 166 insertions(+), 1 deletion(-)
 create mode 100644 app/Http/Requests/UpdatePendingVolumeFileLabels.php

diff --git a/app/Http/Controllers/Api/PendingVolumeController.php b/app/Http/Controllers/Api/PendingVolumeController.php
index b32e1643b..015f139f9 100644
--- a/app/Http/Controllers/Api/PendingVolumeController.php
+++ b/app/Http/Controllers/Api/PendingVolumeController.php
@@ -5,6 +5,7 @@
 use Biigle\Http\Requests\StorePendingVolume;
 use Biigle\Http\Requests\UpdatePendingVolume;
 use Biigle\Http\Requests\UpdatePendingVolumeAnnotationLabels;
+use Biigle\Http\Requests\UpdatePendingVolumeFileLabels;
 use Biigle\Jobs\CreateNewImagesOrVideos;
 use Biigle\PendingVolume;
 use Biigle\Volume;
@@ -204,6 +205,44 @@ public function updateAnnotationLabels(UpdatePendingVolumeAnnotationLabels $requ
         return $request->pendingVolume;
     }
 
+    /**
+     * Choose file labels for import.
+     *
+     * @api {put} pending-volumes/:id/file-labels Choose file labels for import
+     * @apiGroup Volumes
+     * @apiName UpdatePendingVolumeFileLabels
+     * @apiPermission projectAdminAndPendingVolumeOwner
+     *
+     * @apiDescription If this endpoint is not used to set a list of label IDs, all file labels will be imported by default. Continue with (#Volumes:UpdatePendingVolumeLabels).
+     *
+     * @apiParam {Number} id The pending volume ID.
+     *
+     * @apiParam (Required attributes) {array} labels The label IDs (from the metadata file) that should be used to filter the file label import.
+     *
+     * @apiSuccessExample {json} Success response:
+     * {
+     *    "id": 2,
+     *    "created_at": "2015-02-19 16:10:17",
+     *    "updated_at": "2015-02-19 16:10:17",
+     *    "media_type_id": 1,
+     *    "user_id": 2,
+     *    "project_id": 3,
+     *    "volume_id": 4,
+     *    "import_annotations": true,
+     *    "import_file_labels": true,
+     *    "only_annotation_labels": [123],
+     *    "only_file_labels": [456]
+     * }
+     */
+    public function updateFileLabels(UpdatePendingVolumeFileLabels $request)
+    {
+        $request->pendingVolume->update([
+            'only_file_labels' => $request->input('labels'),
+        ]);
+
+        return $request->pendingVolume;
+    }
+
     /**
      * Delete a pending volume
      *
diff --git a/app/Http/Requests/UpdatePendingVolumeFileLabels.php b/app/Http/Requests/UpdatePendingVolumeFileLabels.php
new file mode 100644
index 000000000..3377954d3
--- /dev/null
+++ b/app/Http/Requests/UpdatePendingVolumeFileLabels.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Biigle\Http\Requests;
+
+use Biigle\PendingVolume;
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdatePendingVolumeFileLabels extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        $this->pendingVolume = PendingVolume::findOrFail($this->route('id'));
+
+        return $this->user()->can('update', $this->pendingVolume);
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'labels' => 'required|array|min:1',
+        ];
+    }
+
+    /**
+     * Configure the validator instance.
+     *
+     * @param  \Illuminate\Validation\Validator  $validator
+     * @return void
+     */
+    public function withValidator($validator)
+    {
+        $validator->after(function ($validator) {
+            if ($validator->errors()->isNotEmpty()) {
+                return;
+            }
+
+            if (is_null($this->pendingVolume->volume_id)) {
+                $validator->errors()->add('labels', 'A volume must be created from the pending volume first.');
+                return;
+            }
+
+            $labels = $this->input('labels');
+            $metadata = $this->pendingVolume->getMetadata();
+            if (is_null($metadata)) {
+                $validator->errors()->add('labels', 'No metadata file found.');
+            }
+
+            $metaLabels = $metadata->getFileLabels();
+            foreach ($labels as $id) {
+                if (!array_key_exists($id, $metaLabels)) {
+                    $validator->errors()->add('labels', "Label ID {$id} does not exist in the metadata file.");
+                    return;
+                }
+            }
+        });
+    }
+}
diff --git a/app/PendingVolume.php b/app/PendingVolume.php
index f17b5eaf2..2817cae79 100644
--- a/app/PendingVolume.php
+++ b/app/PendingVolume.php
@@ -25,6 +25,7 @@ class PendingVolume extends Model
         'import_annotations',
         'import_file_labels',
         'only_annotation_labels',
+        'only_file_labels',
     ];
 
     /**
@@ -43,6 +44,7 @@ class PendingVolume extends Model
      */
     protected $casts = [
         'only_annotation_labels' => 'array',
+        'only_file_labels' => 'array',
     ];
 
     protected static function booted(): void
diff --git a/database/migrations/2024_03_06_143800_create_pending_volumes_table.php b/database/migrations/2024_03_06_143800_create_pending_volumes_table.php
index 31deda8d4..eecc01277 100644
--- a/database/migrations/2024_03_06_143800_create_pending_volumes_table.php
+++ b/database/migrations/2024_03_06_143800_create_pending_volumes_table.php
@@ -41,6 +41,7 @@ public function up(): void
             $table->boolean('import_file_labels')->default(false);
 
             $table->jsonb('only_annotation_labels')->nullable();
+            $table->jsonb('only_file_labels')->nullable();
 
             // A user is only allowed to create one pending volume at a time for a
             // project.
diff --git a/routes/api.php b/routes/api.php
index 248a8f5fa..9796d3f32 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -153,6 +153,7 @@
 ]);
 
 $router->put('pending-volumes/{id}/annotation-labels', 'PendingVolumeController@updateAnnotationLabels');
+$router->put('pending-volumes/{id}/file-labels', 'PendingVolumeController@updateFileLabels');
 
 $router->resource('projects', 'ProjectController', [
     'only' => ['index', 'show', 'update', 'store', 'destroy'],
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
index 7332eeb56..bf6378342 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
@@ -845,4 +845,60 @@ public function testUpdateAnnotationLabels()
         $pv->refresh();
         $this->assertEquals([123], $pv->only_annotation_labels);
     }
+
+    public function testUpdateFileLabels()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $annotator = new Annotator(321, 'joe user');
+        $la = new LabelAndAnnotator($label, $annotator);
+        $file->addFileLabel($la);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+        $id = $pv->id;
+
+        $this->beExpert();
+        $this
+            ->putJson("/api/v1/pending-volumes/{$id}/file-labels")
+            ->assertStatus(403);
+
+        $this->beAdmin();
+        // Label list required.
+        $this
+            ->putJson("/api/v1/pending-volumes/{$id}/file-labels")
+            ->assertStatus(422);
+
+        // Label list must be filled.
+        $this->putJson("/api/v1/pending-volumes/{$id}/file-labels", [
+            'labels' => [],
+        ])->assertStatus(422);
+
+        // Label not in metadata.
+        $this->putJson("/api/v1/pending-volumes/{$id}/file-labels", [
+            'labels' => [456],
+        ])->assertStatus(422);
+
+        // No volume attached yet.
+        $this->putJson("/api/v1/pending-volumes/{$id}/file-labels", [
+            'labels' => [123],
+        ])->assertStatus(422);
+
+        $pv->update(['volume_id' => $this->volume()->id]);
+
+        $this->putJson("/api/v1/pending-volumes/{$id}/file-labels", [
+            'labels' => [123],
+        ])->assertSuccessful();
+
+        $pv->refresh();
+        $this->assertEquals([123], $pv->only_file_labels);
+    }
 }
diff --git a/tests/php/PendingVolumeTest.php b/tests/php/PendingVolumeTest.php
index e202ad155..7f0e875ad 100644
--- a/tests/php/PendingVolumeTest.php
+++ b/tests/php/PendingVolumeTest.php
@@ -27,6 +27,7 @@ public function testAttributes()
         $this->assertFalse($this->model->import_annotations);
         $this->assertFalse($this->model->import_file_labels);
         $this->assertNull($this->model->only_annotation_labels);
+        $this->assertNull($this->model->only_file_labels);
     }
 
     public function testCreateOnlyOneForProject()
diff --git a/tests/php/Services/MetadataParsing/VideoMetadataTest.php b/tests/php/Services/MetadataParsing/VideoMetadataTest.php
index dafe976db..addeb3128 100644
--- a/tests/php/Services/MetadataParsing/VideoMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/VideoMetadataTest.php
@@ -219,7 +219,7 @@ public function testHasFileLabels()
         $this->assertTrue($data->hasFileLabels());
     }
 
-        public function testGetAnnotationLabels()
+    public function testGetAnnotationLabels()
     {
         $data = new VideoMetadata('filename');
         $label = new Label(123, 'my label');

From c944c55c0850231dff10d66f2db7f951263339c4 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 21 Mar 2024 11:07:50 +0100
Subject: [PATCH 061/209] Add API endpoint to choose a label map for import

---
 .../Api/PendingVolumeController.php           |  40 ++++
 .../Requests/UpdatePendingVolumeLabelMap.php  | 100 ++++++++
 app/PendingVolume.php                         |   2 +
 ...06_143800_create_pending_volumes_table.php |   4 +
 routes/api.php                                |   1 +
 .../Api/PendingVolumeControllerTest.php       | 217 +++++++++++++++++-
 tests/php/PendingVolumeTest.php               |   1 +
 7 files changed, 357 insertions(+), 8 deletions(-)
 create mode 100644 app/Http/Requests/UpdatePendingVolumeLabelMap.php

diff --git a/app/Http/Controllers/Api/PendingVolumeController.php b/app/Http/Controllers/Api/PendingVolumeController.php
index 015f139f9..1f53e2b7d 100644
--- a/app/Http/Controllers/Api/PendingVolumeController.php
+++ b/app/Http/Controllers/Api/PendingVolumeController.php
@@ -6,6 +6,7 @@
 use Biigle\Http\Requests\UpdatePendingVolume;
 use Biigle\Http\Requests\UpdatePendingVolumeAnnotationLabels;
 use Biigle\Http\Requests\UpdatePendingVolumeFileLabels;
+use Biigle\Http\Requests\UpdatePendingVolumeLabelMap;
 use Biigle\Jobs\CreateNewImagesOrVideos;
 use Biigle\PendingVolume;
 use Biigle\Volume;
@@ -243,6 +244,45 @@ public function updateFileLabels(UpdatePendingVolumeFileLabels $request)
         return $request->pendingVolume;
     }
 
+    /**
+     * Match metadata labels with database labels.
+     *
+     * @api {put} pending-volumes/:id/label-map Match metadata labels with database labels
+     * @apiGroup Volumes
+     * @apiName UpdatePendingVolumeLabels
+     * @apiPermission projectAdminAndPendingVolumeOwner
+     *
+     * @apiDescription If this endpoint is not used to set a map of metadata label IDs to database label IDs, the import will attempt to use the metadata label UUIDs to automatically find matches. Continue with (#Volumes:UpdatePendingVolumeUsers).
+     *
+     * @apiParam {Number} id The pending volume ID.
+     *
+     * @apiParam (Required attributes) {object} label_map Map of metadata label IDs as keys and database label IDs as values.
+     *
+     * @apiSuccessExample {json} Success response:
+     * {
+     *    "id": 2,
+     *    "created_at": "2015-02-19 16:10:17",
+     *    "updated_at": "2015-02-19 16:10:17",
+     *    "media_type_id": 1,
+     *    "user_id": 2,
+     *    "project_id": 3,
+     *    "volume_id": 4,
+     *    "import_annotations": true,
+     *    "import_file_labels": true,
+     *    "only_annotation_labels": [123],
+     *    "only_file_labels": [456],
+     *    "label_map": {"123": 987, "456": 654}
+     * }
+     */
+    public function updateLabelMap(UpdatePendingVolumeLabelMap $request)
+    {
+        $request->pendingVolume->update([
+            'label_map' => $request->input('label_map'),
+        ]);
+
+        return $request->pendingVolume;
+    }
+
     /**
      * Delete a pending volume
      *
diff --git a/app/Http/Requests/UpdatePendingVolumeLabelMap.php b/app/Http/Requests/UpdatePendingVolumeLabelMap.php
new file mode 100644
index 000000000..d4ae60a94
--- /dev/null
+++ b/app/Http/Requests/UpdatePendingVolumeLabelMap.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace Biigle\Http\Requests;
+
+use Biigle\Label;
+use Biigle\PendingVolume;
+use Biigle\Visibility;
+use DB;
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdatePendingVolumeLabelMap extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        $this->pendingVolume = PendingVolume::findOrFail($this->route('id'));
+
+        return $this->user()->can('update', $this->pendingVolume);
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'label_map' => 'required|array|min:1',
+        ];
+    }
+
+    /**
+     * Configure the validator instance.
+     *
+     * @param  \Illuminate\Validation\Validator  $validator
+     * @return void
+     */
+    public function withValidator($validator)
+    {
+        $validator->after(function ($validator) {
+            if ($validator->errors()->isNotEmpty()) {
+                return;
+            }
+
+            if (is_null($this->pendingVolume->volume_id)) {
+                $validator->errors()->add('label_map', 'A volume must be created from the pending volume first.');
+                return;
+            }
+
+            $map = $this->input('label_map');
+            $metadata = $this->pendingVolume->getMetadata();
+            if (is_null($metadata)) {
+                $validator->errors()->add('label_map', 'No metadata file found.');
+            }
+
+            $metaLabels = $metadata->getFileLabels() + $metadata->getAnnotationLabels();
+            foreach ($map as $id => $dbId) {
+                if (!array_key_exists($id, $metaLabels)) {
+                    $validator->errors()->add('label_map', "Label ID {$id} does not exist in the metadata file.");
+                    return;
+                }
+            }
+
+            $onlyLabels = $this->pendingVolume->only_annotation_labels ?: [];
+            $onlyLabels += $this->pendingVolume->only_file_labels ?: [];
+            if (!empty($onlyLabels)) {
+                $diff = array_diff(array_keys($map), $onlyLabels);
+                if (!empty($diff)) {
+                    $validator->errors()->add('label_map', 'Some chosen metadata labels were excluded by a previously defined subset of annotation and/or file labels to import.');
+                }
+            }
+
+            $count = Label::whereIn('id', array_values($map))->count();
+            if (count($map) !== $count) {
+                $validator->errors()->add('label_map', 'Some label IDs do not exist in the database.');
+            }
+
+            $count = Label::whereIn('id', array_values($map))
+                ->whereIn('label_tree_id', function ($query) {
+                    // All public and all accessible private label trees.
+                    $query->select('id')
+                        ->from('label_trees')
+                        ->where('visibility_id', Visibility::publicId())
+                        ->union(
+                            DB::table('label_tree_user')
+                                ->select('id')
+                                ->where('user_id', $this->user()->id)
+                        );
+                })
+                ->count();
+
+            if (count($map) !== $count) {
+                $validator->errors()->add('label_map', 'You do not have access to some label IDs in the database.');
+            }
+        });
+    }
+}
diff --git a/app/PendingVolume.php b/app/PendingVolume.php
index 2817cae79..fa0a67491 100644
--- a/app/PendingVolume.php
+++ b/app/PendingVolume.php
@@ -26,6 +26,7 @@ class PendingVolume extends Model
         'import_file_labels',
         'only_annotation_labels',
         'only_file_labels',
+        'label_map',
     ];
 
     /**
@@ -45,6 +46,7 @@ class PendingVolume extends Model
     protected $casts = [
         'only_annotation_labels' => 'array',
         'only_file_labels' => 'array',
+        'label_map' => 'array',
     ];
 
     protected static function booted(): void
diff --git a/database/migrations/2024_03_06_143800_create_pending_volumes_table.php b/database/migrations/2024_03_06_143800_create_pending_volumes_table.php
index eecc01277..e2892acbc 100644
--- a/database/migrations/2024_03_06_143800_create_pending_volumes_table.php
+++ b/database/migrations/2024_03_06_143800_create_pending_volumes_table.php
@@ -40,8 +40,12 @@ public function up(): void
             $table->boolean('import_annotations')->default(false);
             $table->boolean('import_file_labels')->default(false);
 
+            // Used to filter the imported annotations.
             $table->jsonb('only_annotation_labels')->nullable();
+            // Used to filter the imported file labels.
             $table->jsonb('only_file_labels')->nullable();
+            // Used to map labels from the metadata to labels in the database.
+            $table->jsonb('label_map')->nullable();
 
             // A user is only allowed to create one pending volume at a time for a
             // project.
diff --git a/routes/api.php b/routes/api.php
index 9796d3f32..ace549ea4 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -154,6 +154,7 @@
 
 $router->put('pending-volumes/{id}/annotation-labels', 'PendingVolumeController@updateAnnotationLabels');
 $router->put('pending-volumes/{id}/file-labels', 'PendingVolumeController@updateFileLabels');
+$router->put('pending-volumes/{id}/label-map', 'PendingVolumeController@updateLabelMap');
 
 $router->resource('projects', 'ProjectController', [
     'only' => ['index', 'show', 'update', 'store', 'destroy'],
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
index bf6378342..0ef88adc8 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
@@ -4,6 +4,8 @@
 
 use ApiTestCase;
 use Biigle\Jobs\CreateNewImagesOrVideos;
+use Biigle\Label as DbLabel;
+use Biigle\LabelTree;
 use Biigle\MediaType;
 use Biigle\PendingVolume;
 use Biigle\Services\MetadataParsing\Annotator;
@@ -13,6 +15,7 @@
 use Biigle\Services\MetadataParsing\LabelAndAnnotator;
 use Biigle\Services\MetadataParsing\VolumeMetadata;
 use Biigle\Shape;
+use Biigle\Visibility;
 use Biigle\Volume;
 use Cache;
 use Exception;
@@ -826,14 +829,14 @@ public function testUpdateAnnotationLabels()
             'labels' => [],
         ])->assertStatus(422);
 
-        // Label not in metadata.
+        // No volume attached yet.
         $this->putJson("/api/v1/pending-volumes/{$id}/annotation-labels", [
-            'labels' => [456],
+            'labels' => [123],
         ])->assertStatus(422);
 
-        // No volume attached yet.
+        // Label not in metadata.
         $this->putJson("/api/v1/pending-volumes/{$id}/annotation-labels", [
-            'labels' => [123],
+            'labels' => [456],
         ])->assertStatus(422);
 
         $pv->update(['volume_id' => $this->volume()->id]);
@@ -882,23 +885,221 @@ public function testUpdateFileLabels()
             'labels' => [],
         ])->assertStatus(422);
 
+        // No volume attached yet.
+        $this->putJson("/api/v1/pending-volumes/{$id}/file-labels", [
+            'labels' => [123],
+        ])->assertStatus(422);
+
+        $pv->update(['volume_id' => $this->volume()->id]);
+
         // Label not in metadata.
         $this->putJson("/api/v1/pending-volumes/{$id}/file-labels", [
             'labels' => [456],
         ])->assertStatus(422);
 
-        // No volume attached yet.
         $this->putJson("/api/v1/pending-volumes/{$id}/file-labels", [
             'labels' => [123],
+        ])->assertSuccessful();
+
+        $pv->refresh();
+        $this->assertEquals([123], $pv->only_file_labels);
+    }
+
+    public function testUpdateAnnotationLabelMap()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $annotator = new Annotator(321, 'joe user');
+        $la = new LabelAndAnnotator($label, $annotator);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$la],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+        $id = $pv->id;
+
+        $this->beExpert();
+        $this
+            ->putJson("/api/v1/pending-volumes/{$id}/label-map")
+            ->assertStatus(403);
+
+        $this->beAdmin();
+        // Label map required.
+        $this
+            ->putJson("/api/v1/pending-volumes/{$id}/label-map")
+            ->assertStatus(422);
+
+        // Label map must be filled.
+        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
+            'label_map' => [],
+        ])->assertStatus(422);
+
+        // No volume attached yet.
+        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
+            'label_map' => [123 => $this->labelRoot()->id],
         ])->assertStatus(422);
 
         $pv->update(['volume_id' => $this->volume()->id]);
 
-        $this->putJson("/api/v1/pending-volumes/{$id}/file-labels", [
-            'labels' => [123],
+        // Label not in metadata.
+        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
+            'label_map' => [456 => $this->labelRoot()->id],
+        ])->assertStatus(422);
+
+        // Label not in database.
+        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
+            'label_map' => [123 => -1],
+        ])->assertStatus(422);
+
+        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
+            'label_map' => [123 => $this->labelRoot()->id],
         ])->assertSuccessful();
 
         $pv->refresh();
-        $this->assertEquals([123], $pv->only_file_labels);
+        $this->assertEquals([123 => $this->labelRoot()->id], $pv->label_map);
+    }
+
+    public function testUpdateAnnotationLabelMapFileLabel()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $annotator = new Annotator(321, 'joe user');
+        $la = new LabelAndAnnotator($label, $annotator);
+        $file->addFileLabel($la);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+
+        // Label not in metadata.
+        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
+            'label_map' => [456 => $this->labelRoot()->id],
+        ])->assertStatus(422);
+
+        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
+            'label_map' => [123 => $this->labelRoot()->id],
+        ])->assertSuccessful();
+
+        $pv->refresh();
+        $this->assertEquals([123 => $this->labelRoot()->id], $pv->label_map);
+    }
+
+    public function testUpdateAnnotationLabelMapTryIgnoredAnnotationLabel()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $annotator = new Annotator(321, 'joe user');
+        $la = new LabelAndAnnotator($label, $annotator);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$la],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+            'only_annotation_labels' => [1],
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
+            'label_map' => [123 => $this->labelRoot()->id],
+        ])->assertStatus(422);
+    }
+
+    public function testUpdateAnnotationLabelMapTryIgnoredFileLabel()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $annotator = new Annotator(321, 'joe user');
+        $la = new LabelAndAnnotator($label, $annotator);
+        $file->addFileLabel($la);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+            'only_file_labels' => [1],
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
+            'label_map' => [123 => $this->labelRoot()->id],
+        ])->assertStatus(422);
+    }
+
+    public function testUpdateAnnotationLabelMapTryLabelNotAllowed()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $annotator = new Annotator(321, 'joe user');
+        $la = new LabelAndAnnotator($label, $annotator);
+        $file->addFileLabel($la);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+        ]);
+        $id = $pv->id;
+
+        // This label belongs to a label tree that is not accessible by the user.
+        // The other tests use a label from a public label tree.
+        $dbLabel = DbLabel::factory()->create([
+            'label_tree_id' => LabelTree::factory()->create([
+                'visibility_id' => Visibility::privateId(),
+            ])->id,
+        ]);
+
+        $this->beAdmin();
+        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
+            'label_map' => [123 => $dbLabel->id],
+        ])->assertStatus(422);
     }
 }
diff --git a/tests/php/PendingVolumeTest.php b/tests/php/PendingVolumeTest.php
index 7f0e875ad..1b284ce3c 100644
--- a/tests/php/PendingVolumeTest.php
+++ b/tests/php/PendingVolumeTest.php
@@ -28,6 +28,7 @@ public function testAttributes()
         $this->assertFalse($this->model->import_file_labels);
         $this->assertNull($this->model->only_annotation_labels);
         $this->assertNull($this->model->only_file_labels);
+        $this->assertNull($this->model->label_map);
     }
 
     public function testCreateOnlyOneForProject()

From f858846dca47dd46bbcdecfa2adeffba5e72d477 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 21 Mar 2024 11:13:25 +0100
Subject: [PATCH 062/209] Fix test

---
 tests/php/PendingVolumeTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/php/PendingVolumeTest.php b/tests/php/PendingVolumeTest.php
index 1b284ce3c..b9d74bc7c 100644
--- a/tests/php/PendingVolumeTest.php
+++ b/tests/php/PendingVolumeTest.php
@@ -17,6 +17,7 @@ class PendingVolumeTest extends ModelTestCase
 
     public function testAttributes()
     {
+        $this->model->refresh(); //Populate default values.
         $this->assertNotNull($this->model->media_type_id);
         $this->assertNotNull($this->model->user_id);
         $this->assertNotNull($this->model->project_id);

From 389b38e0ed683e391f0048124b38bd4092d9b1ce Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 21 Mar 2024 14:30:38 +0100
Subject: [PATCH 063/209] Add convenience methods to get metadata users

---
 app/Services/MetadataParsing/FileMetadata.php | 30 +++++-
 ...LabelAndAnnotator.php => LabelAndUser.php} |  4 +-
 .../{Annotator.php => User.php}               |  2 +-
 .../MetadataParsing/VolumeMetadata.php        | 17 ++++
 .../MetadataParsing/FileMetadataTest.php      | 97 +++++++++++++++++++
 .../MetadataParsing/ImageMetadataTest.php     | 66 -------------
 .../MetadataParsing/VideoMetadataTest.php     | 59 -----------
 .../MetadataParsing/VolumeMetadataTest.php    | 44 +++++++--
 8 files changed, 176 insertions(+), 143 deletions(-)
 rename app/Services/MetadataParsing/{LabelAndAnnotator.php => LabelAndUser.php} (69%)
 rename app/Services/MetadataParsing/{Annotator.php => User.php} (95%)
 create mode 100644 tests/php/Services/MetadataParsing/FileMetadataTest.php

diff --git a/app/Services/MetadataParsing/FileMetadata.php b/app/Services/MetadataParsing/FileMetadata.php
index b6a70d4df..e1ba93aae 100644
--- a/app/Services/MetadataParsing/FileMetadata.php
+++ b/app/Services/MetadataParsing/FileMetadata.php
@@ -49,9 +49,9 @@ public function hasAnnotations(): bool
         return !empty($this->annotations);
     }
 
-    public function addFileLabel(LabelAndAnnotator $la): void
+    public function addFileLabel(LabelAndUser $lau): void
     {
-        $this->labels[] = $la;
+        $this->labels[] = $lau;
     }
 
     public function getFileLabels(): array
@@ -65,18 +65,38 @@ public function hasFileLabels(): bool
     }
 
     /**
-     * The returned array is indexed by label IDs.
+     * @return array Labels indexed by ID.
      */
     public function getAnnotationLabels(): array
     {
         $labels = [];
 
         foreach ($this->getAnnotations() as $annotation) {
-            foreach ($annotation->labels as $annotationLabel) {
-                $labels[$annotationLabel->label->id] = $annotationLabel->label;
+            foreach ($annotation->labels as $lau) {
+                $labels[$lau->label->id] = $lau->label;
             }
         }
 
         return $labels;
     }
+
+    /**
+     * @return array Users indexed by ID.
+     */
+    public function getUsers(): array
+    {
+        $users = [];
+
+        foreach ($this->getAnnotations() as $annotation) {
+            foreach ($annotation->labels as $lau) {
+                $users[$lau->user->id] = $lau->user;
+            }
+        }
+
+        foreach ($this->getFileLabels() as $lau) {
+            $users[$lau->user->id] = $lau->user;
+        }
+
+        return $users;
+    }
 }
diff --git a/app/Services/MetadataParsing/LabelAndAnnotator.php b/app/Services/MetadataParsing/LabelAndUser.php
similarity index 69%
rename from app/Services/MetadataParsing/LabelAndAnnotator.php
rename to app/Services/MetadataParsing/LabelAndUser.php
index 76e6bad93..0f96ca861 100644
--- a/app/Services/MetadataParsing/LabelAndAnnotator.php
+++ b/app/Services/MetadataParsing/LabelAndUser.php
@@ -2,11 +2,11 @@
 
 namespace Biigle\Services\MetadataParsing;
 
-class LabelAndAnnotator
+class LabelAndUser
 {
     public function __construct(
         public Label $label,
-        public Annotator $annotator,
+        public User $user,
     ) {
         //
     }
diff --git a/app/Services/MetadataParsing/Annotator.php b/app/Services/MetadataParsing/User.php
similarity index 95%
rename from app/Services/MetadataParsing/Annotator.php
rename to app/Services/MetadataParsing/User.php
index 3a586181c..e0affcb4c 100644
--- a/app/Services/MetadataParsing/Annotator.php
+++ b/app/Services/MetadataParsing/User.php
@@ -2,7 +2,7 @@
 
 namespace Biigle\Services\MetadataParsing;
 
-class Annotator
+class User
 {
     /**
      * @param string $id
diff --git a/app/Services/MetadataParsing/VolumeMetadata.php b/app/Services/MetadataParsing/VolumeMetadata.php
index 90f7fc509..3d2a73de4 100644
--- a/app/Services/MetadataParsing/VolumeMetadata.php
+++ b/app/Services/MetadataParsing/VolumeMetadata.php
@@ -99,4 +99,21 @@ public function getFileLabels(): array
 
         return $labels;
     }
+
+    /**
+     * Get all users associated with annotations and/or file labels.
+     *
+     * @return array Users indexed by ID.
+     */
+    public function getUsers(): array
+    {
+        $users = [];
+
+        foreach ($this->files as $file) {
+            // Use union to automatically remove duplicates.
+            $users += $file->getUsers();
+        }
+
+        return $users;
+    }
 }
diff --git a/tests/php/Services/MetadataParsing/FileMetadataTest.php b/tests/php/Services/MetadataParsing/FileMetadataTest.php
new file mode 100644
index 000000000..25c30477f
--- /dev/null
+++ b/tests/php/Services/MetadataParsing/FileMetadataTest.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Biigle\Tests\Services\MetadataParsing;
+
+use Biigle\Services\MetadataParsing\ImageAnnotation;
+use Biigle\Services\MetadataParsing\ImageMetadata;
+use Biigle\Services\MetadataParsing\Label;
+use Biigle\Services\MetadataParsing\LabelAndUser;
+use Biigle\Services\MetadataParsing\User;
+use Biigle\Shape;
+use TestCase;
+
+class FileMetadataTest extends TestCase
+{
+    public function testTrimName()
+    {
+        $data = new ImageMetadata(' filename');
+        $this->assertEquals('filename', $data->name);
+    }
+
+    public function testIsEmpty()
+    {
+        $data = new ImageMetadata('filename');
+        $this->assertTrue($data->isEmpty());
+
+        $data = new ImageMetadata('filename', area: 10);
+        $this->assertFalse($data->isEmpty());
+    }
+
+    public function testHasAnnotations()
+    {
+        $data = new ImageMetadata('filename');
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+
+        $this->assertFalse($data->hasAnnotations());
+        $data->addAnnotation($annotation);
+        $this->assertTrue($data->hasAnnotations());
+    }
+
+    public function testHasFileLabels()
+    {
+        $data = new ImageMetadata('filename');
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+
+        $this->assertFalse($data->hasFileLabels());
+        $data->addFileLabel($lau);
+        $this->assertTrue($data->hasFileLabels());
+    }
+
+    public function testGetAnnotationLabels()
+    {
+        $data = new ImageMetadata('filename');
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+
+        $this->assertEquals([], $data->getAnnotationLabels());
+        $data->addAnnotation($annotation);
+        $this->assertEquals([123 => $label], $data->getAnnotationLabels());
+    }
+
+    public function testGetUsers()
+    {
+        $data = new ImageMetadata('filename');
+        $label = new Label(123, 'my label');
+        $user1 = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user1);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+
+        $this->assertEquals([], $data->getUsers());
+        $data->addAnnotation($annotation);
+        $this->assertEquals([321 => $user1], $data->getUsers());
+
+        $user2 = new User(432, 'joe user');
+        $lau = new LabelAndUser($label, $user2);
+        $data->addFileLabel($lau);
+        $this->assertEquals([321 => $user1, 432 => $user2], $data->getUsers());
+    }
+}
diff --git a/tests/php/Services/MetadataParsing/ImageMetadataTest.php b/tests/php/Services/MetadataParsing/ImageMetadataTest.php
index e532388c6..04e2386ef 100644
--- a/tests/php/Services/MetadataParsing/ImageMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/ImageMetadataTest.php
@@ -2,31 +2,11 @@
 
 namespace Biigle\Tests\Services\MetadataParsing;
 
-use Biigle\Services\MetadataParsing\Annotator;
-use Biigle\Services\MetadataParsing\ImageAnnotation;
 use Biigle\Services\MetadataParsing\ImageMetadata;
-use Biigle\Services\MetadataParsing\Label;
-use Biigle\Services\MetadataParsing\LabelAndAnnotator;
-use Biigle\Shape;
 use TestCase;
 
 class ImageMetadataTest extends TestCase
 {
-    public function testTrimName()
-    {
-        $data = new ImageMetadata(' filename');
-        $this->assertEquals('filename', $data->name);
-    }
-
-    public function testIsEmpty()
-    {
-        $data = new ImageMetadata('filename');
-        $this->assertTrue($data->isEmpty());
-
-        $data = new ImageMetadata('filename', area: 10);
-        $this->assertFalse($data->isEmpty());
-    }
-
     public function testGetInsertData()
     {
         $data = new ImageMetadata(
@@ -57,50 +37,4 @@ public function testGetInsertData()
 
         $this->assertEquals($expect, $data->getInsertData());
     }
-
-    public function testHasAnnotations()
-    {
-        $data = new ImageMetadata('filename');
-        $label = new Label(123, 'my label');
-        $annotator = new Annotator(321, 'joe user');
-        $la = new LabelAndAnnotator($label, $annotator);
-        $annotation = new ImageAnnotation(
-            shape: Shape::point(),
-            points: [10, 10],
-            labels: [$la],
-        );
-
-        $this->assertFalse($data->hasAnnotations());
-        $data->addAnnotation($annotation);
-        $this->assertTrue($data->hasAnnotations());
-    }
-
-    public function testHasFileLabels()
-    {
-        $data = new ImageMetadata('filename');
-        $label = new Label(123, 'my label');
-        $annotator = new Annotator(321, 'joe user');
-        $la = new LabelAndAnnotator($label, $annotator);
-
-        $this->assertFalse($data->hasFileLabels());
-        $data->addFileLabel($la);
-        $this->assertTrue($data->hasFileLabels());
-    }
-
-    public function testGetAnnotationLabels()
-    {
-        $data = new ImageMetadata('filename');
-        $label = new Label(123, 'my label');
-        $annotator = new Annotator(321, 'joe user');
-        $la = new LabelAndAnnotator($label, $annotator);
-        $annotation = new ImageAnnotation(
-            shape: Shape::point(),
-            points: [10, 10],
-            labels: [$la],
-        );
-
-        $this->assertEquals([], $data->getAnnotationLabels());
-        $data->addAnnotation($annotation);
-        $this->assertEquals([123 => $label], $data->getAnnotationLabels());
-    }
 }
diff --git a/tests/php/Services/MetadataParsing/VideoMetadataTest.php b/tests/php/Services/MetadataParsing/VideoMetadataTest.php
index addeb3128..be359e156 100644
--- a/tests/php/Services/MetadataParsing/VideoMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/VideoMetadataTest.php
@@ -2,22 +2,11 @@
 
 namespace Biigle\Tests\Services\MetadataParsing;
 
-use Biigle\Services\MetadataParsing\Annotator;
-use Biigle\Services\MetadataParsing\Label;
-use Biigle\Services\MetadataParsing\LabelAndAnnotator;
-use Biigle\Services\MetadataParsing\VideoAnnotation;
 use Biigle\Services\MetadataParsing\VideoMetadata;
-use Biigle\Shape;
 use TestCase;
 
 class VideoMetadataTest extends TestCase
 {
-    public function testTrimName()
-    {
-        $data = new VideoMetadata(' filename');
-        $this->assertEquals('filename', $data->name);
-    }
-
     public function testIsEmpty()
     {
         $data = new VideoMetadata('filename');
@@ -188,52 +177,4 @@ public function testGetInsertDataFramesWithGaps()
 
         $this->assertEquals($expect, $data->getInsertData());
     }
-
-    public function testHasAnnotations()
-    {
-        $data = new VideoMetadata('filename');
-        $label = new Label(123, 'my label');
-        $annotator = new Annotator(321, 'joe user');
-        $la = new LabelAndAnnotator($label, $annotator);
-        $annotation = new VideoAnnotation(
-            shape: Shape::point(),
-            points: [10, 10],
-            labels: [$la],
-            frames: [0],
-        );
-
-        $this->assertFalse($data->hasAnnotations());
-        $data->addAnnotation($annotation);
-        $this->assertTrue($data->hasAnnotations());
-    }
-
-    public function testHasFileLabels()
-    {
-        $data = new VideoMetadata('filename');
-        $label = new Label(123, 'my label');
-        $annotator = new Annotator(321, 'joe user');
-        $la = new LabelAndAnnotator($label, $annotator);
-
-        $this->assertFalse($data->hasFileLabels());
-        $data->addFileLabel($la);
-        $this->assertTrue($data->hasFileLabels());
-    }
-
-    public function testGetAnnotationLabels()
-    {
-        $data = new VideoMetadata('filename');
-        $label = new Label(123, 'my label');
-        $annotator = new Annotator(321, 'joe user');
-        $la = new LabelAndAnnotator($label, $annotator);
-        $annotation = new VideoAnnotation(
-            shape: Shape::point(),
-            points: [10, 10],
-            labels: [$la],
-            frames: [0],
-        );
-
-        $this->assertEquals([], $data->getAnnotationLabels());
-        $data->addAnnotation($annotation);
-        $this->assertEquals([123 => $label], $data->getAnnotationLabels());
-    }
 }
diff --git a/tests/php/Services/MetadataParsing/VolumeMetadataTest.php b/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
index f39d8e327..5c083bdbe 100644
--- a/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
@@ -3,12 +3,12 @@
 namespace Biigle\Tests\Services\MetadataParsing;
 
 use Biigle\MediaType;
-use Biigle\Services\MetadataParsing\Annotator;
 use Biigle\Services\MetadataParsing\FileMetadata;
 use Biigle\Services\MetadataParsing\ImageAnnotation;
 use Biigle\Services\MetadataParsing\ImageMetadata;
 use Biigle\Services\MetadataParsing\Label;
-use Biigle\Services\MetadataParsing\LabelAndAnnotator;
+use Biigle\Services\MetadataParsing\LabelAndUser;
+use Biigle\Services\MetadataParsing\User;
 use Biigle\Services\MetadataParsing\VolumeMetadata;
 use Biigle\Shape;
 use TestCase;
@@ -65,8 +65,8 @@ public function testHasAnnotations()
         $this->assertFalse($metadata->hasAnnotations());
 
         $label = new Label(123, 'my label');
-        $annotator = new Annotator(321, 'joe user');
-        $la = new LabelAndAnnotator($label, $annotator);
+        $user = new User(321, 'joe user');
+        $la = new LabelAndUser($label, $user);
         $annotation = new ImageAnnotation(
             shape: Shape::point(),
             points: [10, 10],
@@ -85,8 +85,8 @@ public function testHasFileLabels()
         $this->assertFalse($metadata->hasFileLabels());
 
         $label = new Label(123, 'my label');
-        $annotator = new Annotator(321, 'joe user');
-        $la = new LabelAndAnnotator($label, $annotator);
+        $user = new User(321, 'joe user');
+        $la = new LabelAndUser($label, $user);
         $file->addFileLabel($la);
         $this->assertTrue($metadata->hasFileLabels());
     }
@@ -99,8 +99,8 @@ public function testGetAnnotationLabels()
         $this->assertEquals([], $metadata->getAnnotationLabels());
 
         $label = new Label(123, 'my label');
-        $annotator = new Annotator(321, 'joe user');
-        $la = new LabelAndAnnotator($label, $annotator);
+        $user = new User(321, 'joe user');
+        $la = new LabelAndUser($label, $user);
         $annotation = new ImageAnnotation(
             shape: Shape::point(),
             points: [10, 10],
@@ -118,9 +118,33 @@ public function testGetFileLabels()
         $this->assertEquals([], $metadata->getFileLabels());
 
         $label = new Label(123, 'my label');
-        $annotator = new Annotator(321, 'joe user');
-        $la = new LabelAndAnnotator($label, $annotator);
+        $user = new User(321, 'joe user');
+        $la = new LabelAndUser($label, $user);
         $file->addFileLabel($la);
         $this->assertEquals([123 => $label], $metadata->getFileLabels());
     }
+
+    public function testGetUsers()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('filename');
+        $metadata->addFile($file);
+        $this->assertEquals([], $metadata->getUsers());
+
+        $label = new Label(123, 'my label');
+        $user1 = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user1);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+        $this->assertEquals([321 => $user1], $metadata->getUsers());
+
+        $user2 = new User(432, 'joe user');
+        $lau = new LabelAndUser($label, $user2);
+        $file->addFileLabel($lau);
+        $this->assertEquals([321 => $user1, 432 => $user2], $metadata->getUsers());
+    }
 }

From f904b2066da65906b672e8cd07098f10cb72cd06 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 21 Mar 2024 14:38:54 +0100
Subject: [PATCH 064/209] Add API endpoint to choose a user map for import

---
 .../Api/PendingVolumeController.php           |  41 +++++
 .../Requests/UpdatePendingVolumeLabelMap.php  |   2 +-
 .../Requests/UpdatePendingVolumeUserMap.php   |  71 ++++++++
 app/PendingVolume.php                         |   2 +
 ...06_143800_create_pending_volumes_table.php |   2 +
 routes/api.php                                |   1 +
 .../Api/PendingVolumeControllerTest.php       | 158 ++++++++++++++----
 tests/php/PendingVolumeTest.php               |   1 +
 8 files changed, 244 insertions(+), 34 deletions(-)
 create mode 100644 app/Http/Requests/UpdatePendingVolumeUserMap.php

diff --git a/app/Http/Controllers/Api/PendingVolumeController.php b/app/Http/Controllers/Api/PendingVolumeController.php
index 1f53e2b7d..467ea4381 100644
--- a/app/Http/Controllers/Api/PendingVolumeController.php
+++ b/app/Http/Controllers/Api/PendingVolumeController.php
@@ -7,6 +7,7 @@
 use Biigle\Http\Requests\UpdatePendingVolumeAnnotationLabels;
 use Biigle\Http\Requests\UpdatePendingVolumeFileLabels;
 use Biigle\Http\Requests\UpdatePendingVolumeLabelMap;
+use Biigle\Http\Requests\UpdatePendingVolumeUserMap;
 use Biigle\Jobs\CreateNewImagesOrVideos;
 use Biigle\PendingVolume;
 use Biigle\Volume;
@@ -283,6 +284,46 @@ public function updateLabelMap(UpdatePendingVolumeLabelMap $request)
         return $request->pendingVolume;
     }
 
+    /**
+     * Match metadata users with database users.
+     *
+     * @api {put} pending-volumes/:id/user-map Match metadata users with database users
+     * @apiGroup Volumes
+     * @apiName UpdatePendingVolumeUsers
+     * @apiPermission projectAdminAndPendingVolumeOwner
+     *
+     * @apiDescription If this endpoint is not used to set a map of metadata user IDs to database user IDs, the import will attempt to use the metadata user UUIDs to automatically find matches. Continue with (#Volumes:UpdatePendingVolumeImport).
+     *
+     * @apiParam {Number} id The pending volume ID.
+     *
+     * @apiParam (Required attributes) {object} user_map Map of metadata user IDs as keys and database user IDs as values.
+     *
+     * @apiSuccessExample {json} Success response:
+     * {
+     *    "id": 2,
+     *    "created_at": "2015-02-19 16:10:17",
+     *    "updated_at": "2015-02-19 16:10:17",
+     *    "media_type_id": 1,
+     *    "user_id": 2,
+     *    "project_id": 3,
+     *    "volume_id": 4,
+     *    "import_annotations": true,
+     *    "import_file_labels": true,
+     *    "only_annotation_labels": [123],
+     *    "only_file_labels": [456],
+     *    "label_map": {"123": 987, "456": 654},
+     *    "user_map": {"135": 246, "975": 864}
+     * }
+     */
+    public function updateUserMap(UpdatePendingVolumeUserMap $request)
+    {
+        $request->pendingVolume->update([
+            'user_map' => $request->input('user_map'),
+        ]);
+
+        return $request->pendingVolume;
+    }
+
     /**
      * Delete a pending volume
      *
diff --git a/app/Http/Requests/UpdatePendingVolumeLabelMap.php b/app/Http/Requests/UpdatePendingVolumeLabelMap.php
index d4ae60a94..4e3a52fa6 100644
--- a/app/Http/Requests/UpdatePendingVolumeLabelMap.php
+++ b/app/Http/Requests/UpdatePendingVolumeLabelMap.php
@@ -50,12 +50,12 @@ public function withValidator($validator)
                 return;
             }
 
-            $map = $this->input('label_map');
             $metadata = $this->pendingVolume->getMetadata();
             if (is_null($metadata)) {
                 $validator->errors()->add('label_map', 'No metadata file found.');
             }
 
+            $map = $this->input('label_map');
             $metaLabels = $metadata->getFileLabels() + $metadata->getAnnotationLabels();
             foreach ($map as $id => $dbId) {
                 if (!array_key_exists($id, $metaLabels)) {
diff --git a/app/Http/Requests/UpdatePendingVolumeUserMap.php b/app/Http/Requests/UpdatePendingVolumeUserMap.php
new file mode 100644
index 000000000..cd13eac1e
--- /dev/null
+++ b/app/Http/Requests/UpdatePendingVolumeUserMap.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Biigle\Http\Requests;
+
+use Biigle\PendingVolume;
+use Biigle\User;
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdatePendingVolumeUserMap extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        $this->pendingVolume = PendingVolume::findOrFail($this->route('id'));
+
+        return $this->user()->can('update', $this->pendingVolume);
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'user_map' => 'required|array|min:1',
+        ];
+    }
+
+    /**
+     * Configure the validator instance.
+     *
+     * @param  \Illuminate\Validation\Validator  $validator
+     * @return void
+     */
+    public function withValidator($validator)
+    {
+        $validator->after(function ($validator) {
+            if ($validator->errors()->isNotEmpty()) {
+                return;
+            }
+
+            if (is_null($this->pendingVolume->volume_id)) {
+                $validator->errors()->add('user_map', 'A volume must be created from the pending volume first.');
+                return;
+            }
+
+            $metadata = $this->pendingVolume->getMetadata();
+            if (is_null($metadata)) {
+                $validator->errors()->add('user_map', 'No metadata file found.');
+            }
+
+            $map = $this->input('user_map');
+            $metaUsers = $metadata->getUsers();
+            foreach ($map as $id => $dbId) {
+                if (!array_key_exists($id, $metaUsers)) {
+                    $validator->errors()->add('user_map', "User ID {$id} does not exist in the metadata file.");
+                    return;
+                }
+            }
+
+            $count = User::whereIn('id', array_values($map))->count();
+            if (count($map) !== $count) {
+                $validator->errors()->add('user_map', 'Some user IDs do not exist in the database.');
+            }
+        });
+    }
+}
diff --git a/app/PendingVolume.php b/app/PendingVolume.php
index fa0a67491..b19e012bc 100644
--- a/app/PendingVolume.php
+++ b/app/PendingVolume.php
@@ -27,6 +27,7 @@ class PendingVolume extends Model
         'only_annotation_labels',
         'only_file_labels',
         'label_map',
+        'user_map',
     ];
 
     /**
@@ -47,6 +48,7 @@ class PendingVolume extends Model
         'only_annotation_labels' => 'array',
         'only_file_labels' => 'array',
         'label_map' => 'array',
+        'user_map' => 'array',
     ];
 
     protected static function booted(): void
diff --git a/database/migrations/2024_03_06_143800_create_pending_volumes_table.php b/database/migrations/2024_03_06_143800_create_pending_volumes_table.php
index e2892acbc..5144b5258 100644
--- a/database/migrations/2024_03_06_143800_create_pending_volumes_table.php
+++ b/database/migrations/2024_03_06_143800_create_pending_volumes_table.php
@@ -46,6 +46,8 @@ public function up(): void
             $table->jsonb('only_file_labels')->nullable();
             // Used to map labels from the metadata to labels in the database.
             $table->jsonb('label_map')->nullable();
+            // Used to map users from the metadata to users in the database.
+            $table->jsonb('user_map')->nullable();
 
             // A user is only allowed to create one pending volume at a time for a
             // project.
diff --git a/routes/api.php b/routes/api.php
index ace549ea4..a2b032751 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -155,6 +155,7 @@
 $router->put('pending-volumes/{id}/annotation-labels', 'PendingVolumeController@updateAnnotationLabels');
 $router->put('pending-volumes/{id}/file-labels', 'PendingVolumeController@updateFileLabels');
 $router->put('pending-volumes/{id}/label-map', 'PendingVolumeController@updateLabelMap');
+$router->put('pending-volumes/{id}/user-map', 'PendingVolumeController@updateUserMap');
 
 $router->resource('projects', 'ProjectController', [
     'only' => ['index', 'show', 'update', 'store', 'destroy'],
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
index 0ef88adc8..04ca56eb7 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
@@ -8,11 +8,11 @@
 use Biigle\LabelTree;
 use Biigle\MediaType;
 use Biigle\PendingVolume;
-use Biigle\Services\MetadataParsing\Annotator;
 use Biigle\Services\MetadataParsing\ImageAnnotation;
 use Biigle\Services\MetadataParsing\ImageMetadata;
 use Biigle\Services\MetadataParsing\Label;
-use Biigle\Services\MetadataParsing\LabelAndAnnotator;
+use Biigle\Services\MetadataParsing\LabelAndUser;
+use Biigle\Services\MetadataParsing\User;
 use Biigle\Services\MetadataParsing\VolumeMetadata;
 use Biigle\Shape;
 use Biigle\Visibility;
@@ -794,12 +794,12 @@ public function testUpdateAnnotationLabels()
         $file = new ImageMetadata('1.jpg');
         $metadata->addFile($file);
         $label = new Label(123, 'my label');
-        $annotator = new Annotator(321, 'joe user');
-        $la = new LabelAndAnnotator($label, $annotator);
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
         $annotation = new ImageAnnotation(
             shape: Shape::point(),
             points: [10, 10],
-            labels: [$la],
+            labels: [$lau],
         );
         $file->addAnnotation($annotation);
 
@@ -855,9 +855,9 @@ public function testUpdateFileLabels()
         $file = new ImageMetadata('1.jpg');
         $metadata->addFile($file);
         $label = new Label(123, 'my label');
-        $annotator = new Annotator(321, 'joe user');
-        $la = new LabelAndAnnotator($label, $annotator);
-        $file->addFileLabel($la);
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
 
         Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
 
@@ -905,18 +905,18 @@ public function testUpdateFileLabels()
         $this->assertEquals([123], $pv->only_file_labels);
     }
 
-    public function testUpdateAnnotationLabelMap()
+    public function testUpdateLabelMap()
     {
         $metadata = new VolumeMetadata;
         $file = new ImageMetadata('1.jpg');
         $metadata->addFile($file);
         $label = new Label(123, 'my label');
-        $annotator = new Annotator(321, 'joe user');
-        $la = new LabelAndAnnotator($label, $annotator);
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
         $annotation = new ImageAnnotation(
             shape: Shape::point(),
             points: [10, 10],
-            labels: [$la],
+            labels: [$lau],
         );
         $file->addAnnotation($annotation);
 
@@ -971,15 +971,15 @@ public function testUpdateAnnotationLabelMap()
         $this->assertEquals([123 => $this->labelRoot()->id], $pv->label_map);
     }
 
-    public function testUpdateAnnotationLabelMapFileLabel()
+    public function testUpdateLabelMapFileLabel()
     {
         $metadata = new VolumeMetadata;
         $file = new ImageMetadata('1.jpg');
         $metadata->addFile($file);
         $label = new Label(123, 'my label');
-        $annotator = new Annotator(321, 'joe user');
-        $la = new LabelAndAnnotator($label, $annotator);
-        $file->addFileLabel($la);
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
 
         Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
 
@@ -994,11 +994,6 @@ public function testUpdateAnnotationLabelMapFileLabel()
 
         $this->beAdmin();
 
-        // Label not in metadata.
-        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
-            'label_map' => [456 => $this->labelRoot()->id],
-        ])->assertStatus(422);
-
         $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
             'label_map' => [123 => $this->labelRoot()->id],
         ])->assertSuccessful();
@@ -1007,18 +1002,18 @@ public function testUpdateAnnotationLabelMapFileLabel()
         $this->assertEquals([123 => $this->labelRoot()->id], $pv->label_map);
     }
 
-    public function testUpdateAnnotationLabelMapTryIgnoredAnnotationLabel()
+    public function testUpdateLabelMapTryIgnoredAnnotationLabel()
     {
         $metadata = new VolumeMetadata;
         $file = new ImageMetadata('1.jpg');
         $metadata->addFile($file);
         $label = new Label(123, 'my label');
-        $annotator = new Annotator(321, 'joe user');
-        $la = new LabelAndAnnotator($label, $annotator);
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
         $annotation = new ImageAnnotation(
             shape: Shape::point(),
             points: [10, 10],
-            labels: [$la],
+            labels: [$lau],
         );
         $file->addAnnotation($annotation);
 
@@ -1040,15 +1035,15 @@ public function testUpdateAnnotationLabelMapTryIgnoredAnnotationLabel()
         ])->assertStatus(422);
     }
 
-    public function testUpdateAnnotationLabelMapTryIgnoredFileLabel()
+    public function testUpdateLabelMapTryIgnoredFileLabel()
     {
         $metadata = new VolumeMetadata;
         $file = new ImageMetadata('1.jpg');
         $metadata->addFile($file);
         $label = new Label(123, 'my label');
-        $annotator = new Annotator(321, 'joe user');
-        $la = new LabelAndAnnotator($label, $annotator);
-        $file->addFileLabel($la);
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
 
         Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
 
@@ -1068,15 +1063,15 @@ public function testUpdateAnnotationLabelMapTryIgnoredFileLabel()
         ])->assertStatus(422);
     }
 
-    public function testUpdateAnnotationLabelMapTryLabelNotAllowed()
+    public function testUpdateLabelMapTryLabelNotAllowed()
     {
         $metadata = new VolumeMetadata;
         $file = new ImageMetadata('1.jpg');
         $metadata->addFile($file);
         $label = new Label(123, 'my label');
-        $annotator = new Annotator(321, 'joe user');
-        $la = new LabelAndAnnotator($label, $annotator);
-        $file->addFileLabel($la);
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
 
         Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
 
@@ -1102,4 +1097,101 @@ public function testUpdateAnnotationLabelMapTryLabelNotAllowed()
             'label_map' => [123 => $dbLabel->id],
         ])->assertStatus(422);
     }
+
+    public function testUpdateUserMap()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+        $id = $pv->id;
+
+        $this->beExpert();
+        $this
+            ->putJson("/api/v1/pending-volumes/{$id}/user-map")
+            ->assertStatus(403);
+
+        $this->beAdmin();
+        // User map required.
+        $this
+            ->putJson("/api/v1/pending-volumes/{$id}/user-map")
+            ->assertStatus(422);
+
+        // User map must be filled.
+        $this->putJson("/api/v1/pending-volumes/{$id}/user-map", [
+            'user_map' => [],
+        ])->assertStatus(422);
+
+        // No volume attached yet.
+        $this->putJson("/api/v1/pending-volumes/{$id}/user-map", [
+            'user_map' => [321 => $this->user()->id],
+        ])->assertStatus(422);
+
+        $pv->update(['volume_id' => $this->volume()->id]);
+
+        // User not in metadata.
+        $this->putJson("/api/v1/pending-volumes/{$id}/user-map", [
+            'user_map' => [456 => $this->user()->id],
+        ])->assertStatus(422);
+
+        // User not in database.
+        $this->putJson("/api/v1/pending-volumes/{$id}/user-map", [
+            'user_map' => [321 => -1],
+        ])->assertStatus(422);
+
+        $this->putJson("/api/v1/pending-volumes/{$id}/user-map", [
+            'user_map' => [321 => $this->user()->id],
+        ])->assertSuccessful();
+
+        $pv->refresh();
+        $this->assertEquals([321 => $this->user()->id], $pv->user_map);
+    }
+
+    public function testUpdateUserMapFileLabel()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+
+        $this->putJson("/api/v1/pending-volumes/{$id}/user-map", [
+            'user_map' => [321 => $this->user()->id],
+        ])->assertSuccessful();
+
+        $pv->refresh();
+        $this->assertEquals([321 => $this->user()->id], $pv->user_map);
+    }
 }
diff --git a/tests/php/PendingVolumeTest.php b/tests/php/PendingVolumeTest.php
index b9d74bc7c..b2732c083 100644
--- a/tests/php/PendingVolumeTest.php
+++ b/tests/php/PendingVolumeTest.php
@@ -30,6 +30,7 @@ public function testAttributes()
         $this->assertNull($this->model->only_annotation_labels);
         $this->assertNull($this->model->only_file_labels);
         $this->assertNull($this->model->label_map);
+        $this->assertNull($this->model->user_map);
     }
 
     public function testCreateOnlyOneForProject()

From beb67c091fc79b402f7a1e753052183519416f3f Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 21 Mar 2024 14:50:32 +0100
Subject: [PATCH 065/209] Move metadata import endpoints to own controller

---
 .../Api/PendingVolumeController.php           | 157 -------
 .../Api/PendingVolumeImportController.php     | 166 +++++++
 routes/api.php                                |   8 +-
 .../Api/PendingVolumeControllerTest.php       | 418 -----------------
 .../Api/PendingVolumeImportControllerTest.php | 429 ++++++++++++++++++
 5 files changed, 599 insertions(+), 579 deletions(-)
 create mode 100644 app/Http/Controllers/Api/PendingVolumeImportController.php
 create mode 100644 tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php

diff --git a/app/Http/Controllers/Api/PendingVolumeController.php b/app/Http/Controllers/Api/PendingVolumeController.php
index 467ea4381..81a0436e6 100644
--- a/app/Http/Controllers/Api/PendingVolumeController.php
+++ b/app/Http/Controllers/Api/PendingVolumeController.php
@@ -5,9 +5,6 @@
 use Biigle\Http\Requests\StorePendingVolume;
 use Biigle\Http\Requests\UpdatePendingVolume;
 use Biigle\Http\Requests\UpdatePendingVolumeAnnotationLabels;
-use Biigle\Http\Requests\UpdatePendingVolumeFileLabels;
-use Biigle\Http\Requests\UpdatePendingVolumeLabelMap;
-use Biigle\Http\Requests\UpdatePendingVolumeUserMap;
 use Biigle\Jobs\CreateNewImagesOrVideos;
 use Biigle\PendingVolume;
 use Biigle\Volume;
@@ -170,160 +167,6 @@ public function update(UpdatePendingVolume $request)
             ->with('messageType', 'success');
     }
 
-    /**
-     * Choose annotation labels for import.
-     *
-     * @api {put} pending-volumes/:id/annotation-labels Choose annotation labels for import
-     * @apiGroup Volumes
-     * @apiName UpdatePendingVolumeAnnotationLabels
-     * @apiPermission projectAdminAndPendingVolumeOwner
-     *
-     * @apiDescription If this endpoint is not used to set a list of label IDs, all annotations will be imported by default. Continue with (#Volumes:UpdatePendingVolumeFileLabels).
-     *
-     * @apiParam {Number} id The pending volume ID.
-     *
-     * @apiParam (Required attributes) {array} labels The label IDs (from the metadata file) that should be used to filter the annotation import.
-     *
-     * @apiSuccessExample {json} Success response:
-     * {
-     *    "id": 2,
-     *    "created_at": "2015-02-19 16:10:17",
-     *    "updated_at": "2015-02-19 16:10:17",
-     *    "media_type_id": 1,
-     *    "user_id": 2,
-     *    "project_id": 3,
-     *    "volume_id": 4,
-     *    "import_annotations": true,
-     *    "import_file_labels": true,
-     *    "only_annotation_labels": [123]
-     * }
-     */
-    public function updateAnnotationLabels(UpdatePendingVolumeAnnotationLabels $request)
-    {
-        $request->pendingVolume->update([
-            'only_annotation_labels' => $request->input('labels'),
-        ]);
-
-        return $request->pendingVolume;
-    }
-
-    /**
-     * Choose file labels for import.
-     *
-     * @api {put} pending-volumes/:id/file-labels Choose file labels for import
-     * @apiGroup Volumes
-     * @apiName UpdatePendingVolumeFileLabels
-     * @apiPermission projectAdminAndPendingVolumeOwner
-     *
-     * @apiDescription If this endpoint is not used to set a list of label IDs, all file labels will be imported by default. Continue with (#Volumes:UpdatePendingVolumeLabels).
-     *
-     * @apiParam {Number} id The pending volume ID.
-     *
-     * @apiParam (Required attributes) {array} labels The label IDs (from the metadata file) that should be used to filter the file label import.
-     *
-     * @apiSuccessExample {json} Success response:
-     * {
-     *    "id": 2,
-     *    "created_at": "2015-02-19 16:10:17",
-     *    "updated_at": "2015-02-19 16:10:17",
-     *    "media_type_id": 1,
-     *    "user_id": 2,
-     *    "project_id": 3,
-     *    "volume_id": 4,
-     *    "import_annotations": true,
-     *    "import_file_labels": true,
-     *    "only_annotation_labels": [123],
-     *    "only_file_labels": [456]
-     * }
-     */
-    public function updateFileLabels(UpdatePendingVolumeFileLabels $request)
-    {
-        $request->pendingVolume->update([
-            'only_file_labels' => $request->input('labels'),
-        ]);
-
-        return $request->pendingVolume;
-    }
-
-    /**
-     * Match metadata labels with database labels.
-     *
-     * @api {put} pending-volumes/:id/label-map Match metadata labels with database labels
-     * @apiGroup Volumes
-     * @apiName UpdatePendingVolumeLabels
-     * @apiPermission projectAdminAndPendingVolumeOwner
-     *
-     * @apiDescription If this endpoint is not used to set a map of metadata label IDs to database label IDs, the import will attempt to use the metadata label UUIDs to automatically find matches. Continue with (#Volumes:UpdatePendingVolumeUsers).
-     *
-     * @apiParam {Number} id The pending volume ID.
-     *
-     * @apiParam (Required attributes) {object} label_map Map of metadata label IDs as keys and database label IDs as values.
-     *
-     * @apiSuccessExample {json} Success response:
-     * {
-     *    "id": 2,
-     *    "created_at": "2015-02-19 16:10:17",
-     *    "updated_at": "2015-02-19 16:10:17",
-     *    "media_type_id": 1,
-     *    "user_id": 2,
-     *    "project_id": 3,
-     *    "volume_id": 4,
-     *    "import_annotations": true,
-     *    "import_file_labels": true,
-     *    "only_annotation_labels": [123],
-     *    "only_file_labels": [456],
-     *    "label_map": {"123": 987, "456": 654}
-     * }
-     */
-    public function updateLabelMap(UpdatePendingVolumeLabelMap $request)
-    {
-        $request->pendingVolume->update([
-            'label_map' => $request->input('label_map'),
-        ]);
-
-        return $request->pendingVolume;
-    }
-
-    /**
-     * Match metadata users with database users.
-     *
-     * @api {put} pending-volumes/:id/user-map Match metadata users with database users
-     * @apiGroup Volumes
-     * @apiName UpdatePendingVolumeUsers
-     * @apiPermission projectAdminAndPendingVolumeOwner
-     *
-     * @apiDescription If this endpoint is not used to set a map of metadata user IDs to database user IDs, the import will attempt to use the metadata user UUIDs to automatically find matches. Continue with (#Volumes:UpdatePendingVolumeImport).
-     *
-     * @apiParam {Number} id The pending volume ID.
-     *
-     * @apiParam (Required attributes) {object} user_map Map of metadata user IDs as keys and database user IDs as values.
-     *
-     * @apiSuccessExample {json} Success response:
-     * {
-     *    "id": 2,
-     *    "created_at": "2015-02-19 16:10:17",
-     *    "updated_at": "2015-02-19 16:10:17",
-     *    "media_type_id": 1,
-     *    "user_id": 2,
-     *    "project_id": 3,
-     *    "volume_id": 4,
-     *    "import_annotations": true,
-     *    "import_file_labels": true,
-     *    "only_annotation_labels": [123],
-     *    "only_file_labels": [456],
-     *    "label_map": {"123": 987, "456": 654},
-     *    "user_map": {"135": 246, "975": 864}
-     * }
-     */
-    public function updateUserMap(UpdatePendingVolumeUserMap $request)
-    {
-        $request->pendingVolume->update([
-            'user_map' => $request->input('user_map'),
-        ]);
-
-        return $request->pendingVolume;
-    }
-
     /**
      * Delete a pending volume
      *
diff --git a/app/Http/Controllers/Api/PendingVolumeImportController.php b/app/Http/Controllers/Api/PendingVolumeImportController.php
new file mode 100644
index 000000000..b64e4495a
--- /dev/null
+++ b/app/Http/Controllers/Api/PendingVolumeImportController.php
@@ -0,0 +1,166 @@
+<?php
+
+namespace Biigle\Http\Controllers\Api;
+
+use Biigle\Http\Requests\UpdatePendingVolumeAnnotationLabels;
+use Biigle\Http\Requests\UpdatePendingVolumeFileLabels;
+use Biigle\Http\Requests\UpdatePendingVolumeLabelMap;
+use Biigle\Http\Requests\UpdatePendingVolumeUserMap;
+use Biigle\Volume;
+
+class PendingVolumeImportController extends Controller
+{
+    /**
+     * Choose annotation labels for import.
+     *
+     * @api {post} pending-volumes/:id/annotation-labels Choose annotation labels for import
+     * @apiGroup Volumes
+     * @apiName UpdatePendingVolumeAnnotationLabels
+     * @apiPermission projectAdminAndPendingVolumeOwner
+     *
+     * @apiDescription If this endpoint is not used to set a list of label IDs, all annotations will be imported by default. Continue with (#Volumes:UpdatePendingVolumeFileLabels).
+     *
+     * @apiParam {Number} id The pending volume ID.
+     *
+     * @apiParam (Required attributes) {array} labels The label IDs (from the metadata file) that should be used to filter the annotation import.
+     *
+     * @apiSuccessExample {json} Success response:
+     * {
+     *    "id": 2,
+     *    "created_at": "2015-02-19 16:10:17",
+     *    "updated_at": "2015-02-19 16:10:17",
+     *    "media_type_id": 1,
+     *    "user_id": 2,
+     *    "project_id": 3,
+     *    "volume_id": 4,
+     *    "import_annotations": true,
+     *    "import_file_labels": true,
+     *    "only_annotation_labels": [123]
+     * }
+     */
+    public function storeAnnotationLabels(UpdatePendingVolumeAnnotationLabels $request)
+    {
+        $request->pendingVolume->update([
+            'only_annotation_labels' => $request->input('labels'),
+        ]);
+
+        return $request->pendingVolume;
+    }
+
+    /**
+     * Choose file labels for import.
+     *
+     * @api {post} pending-volumes/:id/file-labels Choose file labels for import
+     * @apiGroup Volumes
+     * @apiName UpdatePendingVolumeFileLabels
+     * @apiPermission projectAdminAndPendingVolumeOwner
+     *
+     * @apiDescription If this endpoint is not used to set a list of label IDs, all file labels will be imported by default. Continue with (#Volumes:UpdatePendingVolumeLabels).
+     *
+     * @apiParam {Number} id The pending volume ID.
+     *
+     * @apiParam (Required attributes) {array} labels The label IDs (from the metadata file) that should be used to filter the file label import.
+     *
+     * @apiSuccessExample {json} Success response:
+     * {
+     *    "id": 2,
+     *    "created_at": "2015-02-19 16:10:17",
+     *    "updated_at": "2015-02-19 16:10:17",
+     *    "media_type_id": 1,
+     *    "user_id": 2,
+     *    "project_id": 3,
+     *    "volume_id": 4,
+     *    "import_annotations": true,
+     *    "import_file_labels": true,
+     *    "only_annotation_labels": [123],
+     *    "only_file_labels": [456]
+     * }
+     */
+    public function storeFileLabels(UpdatePendingVolumeFileLabels $request)
+    {
+        $request->pendingVolume->update([
+            'only_file_labels' => $request->input('labels'),
+        ]);
+
+        return $request->pendingVolume;
+    }
+
+    /**
+     * Match metadata labels with database labels.
+     *
+     * @api {post} pending-volumes/:id/label-map Match metadata labels with database labels
+     * @apiGroup Volumes
+     * @apiName UpdatePendingVolumeLabels
+     * @apiPermission projectAdminAndPendingVolumeOwner
+     *
+     * @apiDescription If this endpoint is not used to set a map of metadata label IDs to database label IDs, the import will attempt to use the metadata label UUIDs to automatically find matches. Continue with (#Volumes:UpdatePendingVolumeUsers).
+     *
+     * @apiParam {Number} id The pending volume ID.
+     *
+     * @apiParam (Required attributes) {object} label_map Map of metadata label IDs as keys and database label IDs as values.
+     *
+     * @apiSuccessExample {json} Success response:
+     * {
+     *    "id": 2,
+     *    "created_at": "2015-02-19 16:10:17",
+     *    "updated_at": "2015-02-19 16:10:17",
+     *    "media_type_id": 1,
+     *    "user_id": 2,
+     *    "project_id": 3,
+     *    "volume_id": 4,
+     *    "import_annotations": true,
+     *    "import_file_labels": true,
+     *    "only_annotation_labels": [123],
+     *    "only_file_labels": [456],
+     *    "label_map": {"123": 987, "456": 654}
+     * }
+     */
+    public function storeLabelMap(UpdatePendingVolumeLabelMap $request)
+    {
+        $request->pendingVolume->update([
+            'label_map' => $request->input('label_map'),
+        ]);
+
+        return $request->pendingVolume;
+    }
+
+    /**
+     * Match metadata users with database users.
+     *
+     * @api {post} pending-volumes/:id/user-map Match metadata users with database users
+     * @apiGroup Volumes
+     * @apiName UpdatePendingVolumeUsers
+     * @apiPermission projectAdminAndPendingVolumeOwner
+     *
+     * @apiDescription If this endpoint is not used to set a map of metadata user IDs to database user IDs, the import will attempt to use the metadata user UUIDs to automatically find matches. Continue with (#Volumes:UpdatePendingVolumeImport).
+     *
+     * @apiParam {Number} id The pending volume ID.
+     *
+     * @apiParam (Required attributes) {object} user_map Map of metadata user IDs as keys and database user IDs as values.
+     *
+     * @apiSuccessExample {json} Success response:
+     * {
+     *    "id": 2,
+     *    "created_at": "2015-02-19 16:10:17",
+     *    "updated_at": "2015-02-19 16:10:17",
+     *    "media_type_id": 1,
+     *    "user_id": 2,
+     *    "project_id": 3,
+     *    "volume_id": 4,
+     *    "import_annotations": true,
+     *    "import_file_labels": true,
+     *    "only_annotation_labels": [123],
+     *    "only_file_labels": [456],
+     *    "label_map": {"123": 987, "456": 654},
+     *    "user_map": {"135": 246, "975": 864}
+     * }
+     */
+    public function storeUserMap(UpdatePendingVolumeUserMap $request)
+    {
+        $request->pendingVolume->update([
+            'user_map' => $request->input('user_map'),
+        ]);
+
+        return $request->pendingVolume;
+    }
+}
diff --git a/routes/api.php b/routes/api.php
index a2b032751..1fd859fe7 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -152,10 +152,10 @@
     'parameters' => ['pending-volumes' => 'id'],
 ]);
 
-$router->put('pending-volumes/{id}/annotation-labels', 'PendingVolumeController@updateAnnotationLabels');
-$router->put('pending-volumes/{id}/file-labels', 'PendingVolumeController@updateFileLabels');
-$router->put('pending-volumes/{id}/label-map', 'PendingVolumeController@updateLabelMap');
-$router->put('pending-volumes/{id}/user-map', 'PendingVolumeController@updateUserMap');
+$router->post('pending-volumes/{id}/annotation-labels', 'PendingVolumeImportController@storeAnnotationLabels');
+$router->post('pending-volumes/{id}/file-labels', 'PendingVolumeImportController@storeFileLabels');
+$router->post('pending-volumes/{id}/label-map', 'PendingVolumeImportController@storeLabelMap');
+$router->post('pending-volumes/{id}/user-map', 'PendingVolumeImportController@storeUserMap');
 
 $router->resource('projects', 'ProjectController', [
     'only' => ['index', 'show', 'update', 'store', 'destroy'],
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
index 04ca56eb7..ce8f519dc 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
@@ -4,20 +4,9 @@
 
 use ApiTestCase;
 use Biigle\Jobs\CreateNewImagesOrVideos;
-use Biigle\Label as DbLabel;
-use Biigle\LabelTree;
 use Biigle\MediaType;
 use Biigle\PendingVolume;
-use Biigle\Services\MetadataParsing\ImageAnnotation;
-use Biigle\Services\MetadataParsing\ImageMetadata;
-use Biigle\Services\MetadataParsing\Label;
-use Biigle\Services\MetadataParsing\LabelAndUser;
-use Biigle\Services\MetadataParsing\User;
-use Biigle\Services\MetadataParsing\VolumeMetadata;
-use Biigle\Shape;
-use Biigle\Visibility;
 use Biigle\Volume;
-use Cache;
 use Exception;
 use FileCache;
 use Illuminate\Http\UploadedFile;
@@ -787,411 +776,4 @@ public function testDestroyFromUI()
             ->delete("/api/v1/pending-volumes/{$pv->id}")
             ->assertRedirectToRoute('create-volume', ['project' => $pv->project_id]);
     }
-
-    public function testUpdateAnnotationLabels()
-    {
-        $metadata = new VolumeMetadata;
-        $file = new ImageMetadata('1.jpg');
-        $metadata->addFile($file);
-        $label = new Label(123, 'my label');
-        $user = new User(321, 'joe user');
-        $lau = new LabelAndUser($label, $user);
-        $annotation = new ImageAnnotation(
-            shape: Shape::point(),
-            points: [10, 10],
-            labels: [$lau],
-        );
-        $file->addAnnotation($annotation);
-
-        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
-
-        $pv = PendingVolume::factory()->create([
-            'project_id' => $this->project()->id,
-            'media_type_id' => MediaType::imageId(),
-            'user_id' => $this->admin()->id,
-            'metadata_file_path' => 'mymeta.csv',
-        ]);
-        $id = $pv->id;
-
-        $this->beExpert();
-        $this
-            ->putJson("/api/v1/pending-volumes/{$id}/annotation-labels")
-            ->assertStatus(403);
-
-        $this->beAdmin();
-        // Label list required.
-        $this
-            ->putJson("/api/v1/pending-volumes/{$id}/annotation-labels")
-            ->assertStatus(422);
-
-        // Label list must be filled.
-        $this->putJson("/api/v1/pending-volumes/{$id}/annotation-labels", [
-            'labels' => [],
-        ])->assertStatus(422);
-
-        // No volume attached yet.
-        $this->putJson("/api/v1/pending-volumes/{$id}/annotation-labels", [
-            'labels' => [123],
-        ])->assertStatus(422);
-
-        // Label not in metadata.
-        $this->putJson("/api/v1/pending-volumes/{$id}/annotation-labels", [
-            'labels' => [456],
-        ])->assertStatus(422);
-
-        $pv->update(['volume_id' => $this->volume()->id]);
-
-        $this->putJson("/api/v1/pending-volumes/{$id}/annotation-labels", [
-            'labels' => [123],
-        ])->assertSuccessful();
-
-        $pv->refresh();
-        $this->assertEquals([123], $pv->only_annotation_labels);
-    }
-
-    public function testUpdateFileLabels()
-    {
-        $metadata = new VolumeMetadata;
-        $file = new ImageMetadata('1.jpg');
-        $metadata->addFile($file);
-        $label = new Label(123, 'my label');
-        $user = new User(321, 'joe user');
-        $lau = new LabelAndUser($label, $user);
-        $file->addFileLabel($lau);
-
-        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
-
-        $pv = PendingVolume::factory()->create([
-            'project_id' => $this->project()->id,
-            'media_type_id' => MediaType::imageId(),
-            'user_id' => $this->admin()->id,
-            'metadata_file_path' => 'mymeta.csv',
-        ]);
-        $id = $pv->id;
-
-        $this->beExpert();
-        $this
-            ->putJson("/api/v1/pending-volumes/{$id}/file-labels")
-            ->assertStatus(403);
-
-        $this->beAdmin();
-        // Label list required.
-        $this
-            ->putJson("/api/v1/pending-volumes/{$id}/file-labels")
-            ->assertStatus(422);
-
-        // Label list must be filled.
-        $this->putJson("/api/v1/pending-volumes/{$id}/file-labels", [
-            'labels' => [],
-        ])->assertStatus(422);
-
-        // No volume attached yet.
-        $this->putJson("/api/v1/pending-volumes/{$id}/file-labels", [
-            'labels' => [123],
-        ])->assertStatus(422);
-
-        $pv->update(['volume_id' => $this->volume()->id]);
-
-        // Label not in metadata.
-        $this->putJson("/api/v1/pending-volumes/{$id}/file-labels", [
-            'labels' => [456],
-        ])->assertStatus(422);
-
-        $this->putJson("/api/v1/pending-volumes/{$id}/file-labels", [
-            'labels' => [123],
-        ])->assertSuccessful();
-
-        $pv->refresh();
-        $this->assertEquals([123], $pv->only_file_labels);
-    }
-
-    public function testUpdateLabelMap()
-    {
-        $metadata = new VolumeMetadata;
-        $file = new ImageMetadata('1.jpg');
-        $metadata->addFile($file);
-        $label = new Label(123, 'my label');
-        $user = new User(321, 'joe user');
-        $lau = new LabelAndUser($label, $user);
-        $annotation = new ImageAnnotation(
-            shape: Shape::point(),
-            points: [10, 10],
-            labels: [$lau],
-        );
-        $file->addAnnotation($annotation);
-
-        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
-
-        $pv = PendingVolume::factory()->create([
-            'project_id' => $this->project()->id,
-            'media_type_id' => MediaType::imageId(),
-            'user_id' => $this->admin()->id,
-            'metadata_file_path' => 'mymeta.csv',
-        ]);
-        $id = $pv->id;
-
-        $this->beExpert();
-        $this
-            ->putJson("/api/v1/pending-volumes/{$id}/label-map")
-            ->assertStatus(403);
-
-        $this->beAdmin();
-        // Label map required.
-        $this
-            ->putJson("/api/v1/pending-volumes/{$id}/label-map")
-            ->assertStatus(422);
-
-        // Label map must be filled.
-        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
-            'label_map' => [],
-        ])->assertStatus(422);
-
-        // No volume attached yet.
-        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
-            'label_map' => [123 => $this->labelRoot()->id],
-        ])->assertStatus(422);
-
-        $pv->update(['volume_id' => $this->volume()->id]);
-
-        // Label not in metadata.
-        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
-            'label_map' => [456 => $this->labelRoot()->id],
-        ])->assertStatus(422);
-
-        // Label not in database.
-        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
-            'label_map' => [123 => -1],
-        ])->assertStatus(422);
-
-        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
-            'label_map' => [123 => $this->labelRoot()->id],
-        ])->assertSuccessful();
-
-        $pv->refresh();
-        $this->assertEquals([123 => $this->labelRoot()->id], $pv->label_map);
-    }
-
-    public function testUpdateLabelMapFileLabel()
-    {
-        $metadata = new VolumeMetadata;
-        $file = new ImageMetadata('1.jpg');
-        $metadata->addFile($file);
-        $label = new Label(123, 'my label');
-        $user = new User(321, 'joe user');
-        $lau = new LabelAndUser($label, $user);
-        $file->addFileLabel($lau);
-
-        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
-
-        $pv = PendingVolume::factory()->create([
-            'project_id' => $this->project()->id,
-            'media_type_id' => MediaType::imageId(),
-            'user_id' => $this->admin()->id,
-            'metadata_file_path' => 'mymeta.csv',
-            'volume_id' => $this->volume()->id,
-        ]);
-        $id = $pv->id;
-
-        $this->beAdmin();
-
-        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
-            'label_map' => [123 => $this->labelRoot()->id],
-        ])->assertSuccessful();
-
-        $pv->refresh();
-        $this->assertEquals([123 => $this->labelRoot()->id], $pv->label_map);
-    }
-
-    public function testUpdateLabelMapTryIgnoredAnnotationLabel()
-    {
-        $metadata = new VolumeMetadata;
-        $file = new ImageMetadata('1.jpg');
-        $metadata->addFile($file);
-        $label = new Label(123, 'my label');
-        $user = new User(321, 'joe user');
-        $lau = new LabelAndUser($label, $user);
-        $annotation = new ImageAnnotation(
-            shape: Shape::point(),
-            points: [10, 10],
-            labels: [$lau],
-        );
-        $file->addAnnotation($annotation);
-
-        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
-
-        $pv = PendingVolume::factory()->create([
-            'project_id' => $this->project()->id,
-            'media_type_id' => MediaType::imageId(),
-            'user_id' => $this->admin()->id,
-            'metadata_file_path' => 'mymeta.csv',
-            'volume_id' => $this->volume()->id,
-            'only_annotation_labels' => [1],
-        ]);
-        $id = $pv->id;
-
-        $this->beAdmin();
-        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
-            'label_map' => [123 => $this->labelRoot()->id],
-        ])->assertStatus(422);
-    }
-
-    public function testUpdateLabelMapTryIgnoredFileLabel()
-    {
-        $metadata = new VolumeMetadata;
-        $file = new ImageMetadata('1.jpg');
-        $metadata->addFile($file);
-        $label = new Label(123, 'my label');
-        $user = new User(321, 'joe user');
-        $lau = new LabelAndUser($label, $user);
-        $file->addFileLabel($lau);
-
-        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
-
-        $pv = PendingVolume::factory()->create([
-            'project_id' => $this->project()->id,
-            'media_type_id' => MediaType::imageId(),
-            'user_id' => $this->admin()->id,
-            'metadata_file_path' => 'mymeta.csv',
-            'volume_id' => $this->volume()->id,
-            'only_file_labels' => [1],
-        ]);
-        $id = $pv->id;
-
-        $this->beAdmin();
-        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
-            'label_map' => [123 => $this->labelRoot()->id],
-        ])->assertStatus(422);
-    }
-
-    public function testUpdateLabelMapTryLabelNotAllowed()
-    {
-        $metadata = new VolumeMetadata;
-        $file = new ImageMetadata('1.jpg');
-        $metadata->addFile($file);
-        $label = new Label(123, 'my label');
-        $user = new User(321, 'joe user');
-        $lau = new LabelAndUser($label, $user);
-        $file->addFileLabel($lau);
-
-        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
-
-        $pv = PendingVolume::factory()->create([
-            'project_id' => $this->project()->id,
-            'media_type_id' => MediaType::imageId(),
-            'user_id' => $this->admin()->id,
-            'metadata_file_path' => 'mymeta.csv',
-            'volume_id' => $this->volume()->id,
-        ]);
-        $id = $pv->id;
-
-        // This label belongs to a label tree that is not accessible by the user.
-        // The other tests use a label from a public label tree.
-        $dbLabel = DbLabel::factory()->create([
-            'label_tree_id' => LabelTree::factory()->create([
-                'visibility_id' => Visibility::privateId(),
-            ])->id,
-        ]);
-
-        $this->beAdmin();
-        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
-            'label_map' => [123 => $dbLabel->id],
-        ])->assertStatus(422);
-    }
-
-    public function testUpdateUserMap()
-    {
-        $metadata = new VolumeMetadata;
-        $file = new ImageMetadata('1.jpg');
-        $metadata->addFile($file);
-        $label = new Label(123, 'my label');
-        $user = new User(321, 'joe user');
-        $lau = new LabelAndUser($label, $user);
-        $annotation = new ImageAnnotation(
-            shape: Shape::point(),
-            points: [10, 10],
-            labels: [$lau],
-        );
-        $file->addAnnotation($annotation);
-
-        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
-
-        $pv = PendingVolume::factory()->create([
-            'project_id' => $this->project()->id,
-            'media_type_id' => MediaType::imageId(),
-            'user_id' => $this->admin()->id,
-            'metadata_file_path' => 'mymeta.csv',
-        ]);
-        $id = $pv->id;
-
-        $this->beExpert();
-        $this
-            ->putJson("/api/v1/pending-volumes/{$id}/user-map")
-            ->assertStatus(403);
-
-        $this->beAdmin();
-        // User map required.
-        $this
-            ->putJson("/api/v1/pending-volumes/{$id}/user-map")
-            ->assertStatus(422);
-
-        // User map must be filled.
-        $this->putJson("/api/v1/pending-volumes/{$id}/user-map", [
-            'user_map' => [],
-        ])->assertStatus(422);
-
-        // No volume attached yet.
-        $this->putJson("/api/v1/pending-volumes/{$id}/user-map", [
-            'user_map' => [321 => $this->user()->id],
-        ])->assertStatus(422);
-
-        $pv->update(['volume_id' => $this->volume()->id]);
-
-        // User not in metadata.
-        $this->putJson("/api/v1/pending-volumes/{$id}/user-map", [
-            'user_map' => [456 => $this->user()->id],
-        ])->assertStatus(422);
-
-        // User not in database.
-        $this->putJson("/api/v1/pending-volumes/{$id}/user-map", [
-            'user_map' => [321 => -1],
-        ])->assertStatus(422);
-
-        $this->putJson("/api/v1/pending-volumes/{$id}/user-map", [
-            'user_map' => [321 => $this->user()->id],
-        ])->assertSuccessful();
-
-        $pv->refresh();
-        $this->assertEquals([321 => $this->user()->id], $pv->user_map);
-    }
-
-    public function testUpdateUserMapFileLabel()
-    {
-        $metadata = new VolumeMetadata;
-        $file = new ImageMetadata('1.jpg');
-        $metadata->addFile($file);
-        $label = new Label(123, 'my label');
-        $user = new User(321, 'joe user');
-        $lau = new LabelAndUser($label, $user);
-        $file->addFileLabel($lau);
-
-        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
-
-        $pv = PendingVolume::factory()->create([
-            'project_id' => $this->project()->id,
-            'media_type_id' => MediaType::imageId(),
-            'user_id' => $this->admin()->id,
-            'metadata_file_path' => 'mymeta.csv',
-            'volume_id' => $this->volume()->id,
-        ]);
-        $id = $pv->id;
-
-        $this->beAdmin();
-
-        $this->putJson("/api/v1/pending-volumes/{$id}/user-map", [
-            'user_map' => [321 => $this->user()->id],
-        ])->assertSuccessful();
-
-        $pv->refresh();
-        $this->assertEquals([321 => $this->user()->id], $pv->user_map);
-    }
 }
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
new file mode 100644
index 000000000..dee2e2ba7
--- /dev/null
+++ b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
@@ -0,0 +1,429 @@
+<?php
+
+namespace Biigle\Tests\Http\Controllers\Api;
+
+use ApiTestCase;
+use Biigle\Label as DbLabel;
+use Biigle\LabelTree;
+use Biigle\MediaType;
+use Biigle\PendingVolume;
+use Biigle\Services\MetadataParsing\ImageAnnotation;
+use Biigle\Services\MetadataParsing\ImageMetadata;
+use Biigle\Services\MetadataParsing\Label;
+use Biigle\Services\MetadataParsing\LabelAndUser;
+use Biigle\Services\MetadataParsing\User;
+use Biigle\Services\MetadataParsing\VolumeMetadata;
+use Biigle\Shape;
+use Biigle\Visibility;
+use Biigle\Volume;
+use Cache;
+
+class PendingVolumeImportControllerTest extends ApiTestCase
+{
+    public function testStoreAnnotationLabels()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+        $id = $pv->id;
+
+        $this->beExpert();
+        $this
+            ->postJson("/api/v1/pending-volumes/{$id}/annotation-labels")
+            ->assertStatus(403);
+
+        $this->beAdmin();
+        // Label list required.
+        $this
+            ->postJson("/api/v1/pending-volumes/{$id}/annotation-labels")
+            ->assertStatus(422);
+
+        // Label list must be filled.
+        $this->postJson("/api/v1/pending-volumes/{$id}/annotation-labels", [
+            'labels' => [],
+        ])->assertStatus(422);
+
+        // No volume attached yet.
+        $this->postJson("/api/v1/pending-volumes/{$id}/annotation-labels", [
+            'labels' => [123],
+        ])->assertStatus(422);
+
+        // Label not in metadata.
+        $this->postJson("/api/v1/pending-volumes/{$id}/annotation-labels", [
+            'labels' => [456],
+        ])->assertStatus(422);
+
+        $pv->update(['volume_id' => $this->volume()->id]);
+
+        $this->postJson("/api/v1/pending-volumes/{$id}/annotation-labels", [
+            'labels' => [123],
+        ])->assertSuccessful();
+
+        $pv->refresh();
+        $this->assertEquals([123], $pv->only_annotation_labels);
+    }
+
+    public function testStoreFileLabels()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+        $id = $pv->id;
+
+        $this->beExpert();
+        $this
+            ->postJson("/api/v1/pending-volumes/{$id}/file-labels")
+            ->assertStatus(403);
+
+        $this->beAdmin();
+        // Label list required.
+        $this
+            ->postJson("/api/v1/pending-volumes/{$id}/file-labels")
+            ->assertStatus(422);
+
+        // Label list must be filled.
+        $this->postJson("/api/v1/pending-volumes/{$id}/file-labels", [
+            'labels' => [],
+        ])->assertStatus(422);
+
+        // No volume attached yet.
+        $this->postJson("/api/v1/pending-volumes/{$id}/file-labels", [
+            'labels' => [123],
+        ])->assertStatus(422);
+
+        $pv->update(['volume_id' => $this->volume()->id]);
+
+        // Label not in metadata.
+        $this->postJson("/api/v1/pending-volumes/{$id}/file-labels", [
+            'labels' => [456],
+        ])->assertStatus(422);
+
+        $this->postJson("/api/v1/pending-volumes/{$id}/file-labels", [
+            'labels' => [123],
+        ])->assertSuccessful();
+
+        $pv->refresh();
+        $this->assertEquals([123], $pv->only_file_labels);
+    }
+
+    public function testStoreLabelMap()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+        $id = $pv->id;
+
+        $this->beExpert();
+        $this
+            ->postJson("/api/v1/pending-volumes/{$id}/label-map")
+            ->assertStatus(403);
+
+        $this->beAdmin();
+        // Label map required.
+        $this
+            ->postJson("/api/v1/pending-volumes/{$id}/label-map")
+            ->assertStatus(422);
+
+        // Label map must be filled.
+        $this->postJson("/api/v1/pending-volumes/{$id}/label-map", [
+            'label_map' => [],
+        ])->assertStatus(422);
+
+        // No volume attached yet.
+        $this->postJson("/api/v1/pending-volumes/{$id}/label-map", [
+            'label_map' => [123 => $this->labelRoot()->id],
+        ])->assertStatus(422);
+
+        $pv->update(['volume_id' => $this->volume()->id]);
+
+        // Label not in metadata.
+        $this->postJson("/api/v1/pending-volumes/{$id}/label-map", [
+            'label_map' => [456 => $this->labelRoot()->id],
+        ])->assertStatus(422);
+
+        // Label not in database.
+        $this->postJson("/api/v1/pending-volumes/{$id}/label-map", [
+            'label_map' => [123 => -1],
+        ])->assertStatus(422);
+
+        $this->postJson("/api/v1/pending-volumes/{$id}/label-map", [
+            'label_map' => [123 => $this->labelRoot()->id],
+        ])->assertSuccessful();
+
+        $pv->refresh();
+        $this->assertEquals([123 => $this->labelRoot()->id], $pv->label_map);
+    }
+
+    public function testStoreLabelMapFileLabel()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+
+        $this->postJson("/api/v1/pending-volumes/{$id}/label-map", [
+            'label_map' => [123 => $this->labelRoot()->id],
+        ])->assertSuccessful();
+
+        $pv->refresh();
+        $this->assertEquals([123 => $this->labelRoot()->id], $pv->label_map);
+    }
+
+    public function testStoreLabelMapTryIgnoredAnnotationLabel()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+            'only_annotation_labels' => [1],
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+        $this->postJson("/api/v1/pending-volumes/{$id}/label-map", [
+            'label_map' => [123 => $this->labelRoot()->id],
+        ])->assertStatus(422);
+    }
+
+    public function testStoreLabelMapTryIgnoredFileLabel()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+            'only_file_labels' => [1],
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+        $this->postJson("/api/v1/pending-volumes/{$id}/label-map", [
+            'label_map' => [123 => $this->labelRoot()->id],
+        ])->assertStatus(422);
+    }
+
+    public function testStoreLabelMapTryLabelNotAllowed()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+        ]);
+        $id = $pv->id;
+
+        // This label belongs to a label tree that is not accessible by the user.
+        // The other tests use a label from a public label tree.
+        $dbLabel = DbLabel::factory()->create([
+            'label_tree_id' => LabelTree::factory()->create([
+                'visibility_id' => Visibility::privateId(),
+            ])->id,
+        ]);
+
+        $this->beAdmin();
+        $this->postJson("/api/v1/pending-volumes/{$id}/label-map", [
+            'label_map' => [123 => $dbLabel->id],
+        ])->assertStatus(422);
+    }
+
+    public function testStoreUserMap()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+        $id = $pv->id;
+
+        $this->beExpert();
+        $this
+            ->postJson("/api/v1/pending-volumes/{$id}/user-map")
+            ->assertStatus(403);
+
+        $this->beAdmin();
+        // User map required.
+        $this
+            ->postJson("/api/v1/pending-volumes/{$id}/user-map")
+            ->assertStatus(422);
+
+        // User map must be filled.
+        $this->postJson("/api/v1/pending-volumes/{$id}/user-map", [
+            'user_map' => [],
+        ])->assertStatus(422);
+
+        // No volume attached yet.
+        $this->postJson("/api/v1/pending-volumes/{$id}/user-map", [
+            'user_map' => [321 => $this->user()->id],
+        ])->assertStatus(422);
+
+        $pv->update(['volume_id' => $this->volume()->id]);
+
+        // User not in metadata.
+        $this->postJson("/api/v1/pending-volumes/{$id}/user-map", [
+            'user_map' => [456 => $this->user()->id],
+        ])->assertStatus(422);
+
+        // User not in database.
+        $this->postJson("/api/v1/pending-volumes/{$id}/user-map", [
+            'user_map' => [321 => -1],
+        ])->assertStatus(422);
+
+        $this->postJson("/api/v1/pending-volumes/{$id}/user-map", [
+            'user_map' => [321 => $this->user()->id],
+        ])->assertSuccessful();
+
+        $pv->refresh();
+        $this->assertEquals([321 => $this->user()->id], $pv->user_map);
+    }
+
+    public function testStoreUserMapFileLabel()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+
+        $this->postJson("/api/v1/pending-volumes/{$id}/user-map", [
+            'user_map' => [321 => $this->user()->id],
+        ])->assertSuccessful();
+
+        $pv->refresh();
+        $this->assertEquals([321 => $this->user()->id], $pv->user_map);
+    }
+}

From 2ab11b6f205e422b54bb8a26fea49e7ca225fb5b Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 21 Mar 2024 14:54:36 +0100
Subject: [PATCH 066/209] Use PUT for metadata import endpoints again

The endpoints don't create new resources so POST is not appropriate.
---
 .../Api/PendingVolumeImportController.php     | 16 ++---
 routes/api.php                                |  8 +--
 .../Api/PendingVolumeImportControllerTest.php | 62 +++++++++----------
 3 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/app/Http/Controllers/Api/PendingVolumeImportController.php b/app/Http/Controllers/Api/PendingVolumeImportController.php
index b64e4495a..598b6431e 100644
--- a/app/Http/Controllers/Api/PendingVolumeImportController.php
+++ b/app/Http/Controllers/Api/PendingVolumeImportController.php
@@ -13,7 +13,7 @@ class PendingVolumeImportController extends Controller
     /**
      * Choose annotation labels for import.
      *
-     * @api {post} pending-volumes/:id/annotation-labels Choose annotation labels for import
+     * @api {put} pending-volumes/:id/annotation-labels Choose annotation labels for import
      * @apiGroup Volumes
      * @apiName UpdatePendingVolumeAnnotationLabels
      * @apiPermission projectAdminAndPendingVolumeOwner
@@ -38,7 +38,7 @@ class PendingVolumeImportController extends Controller
      *    "only_annotation_labels": [123]
      * }
      */
-    public function storeAnnotationLabels(UpdatePendingVolumeAnnotationLabels $request)
+    public function updateAnnotationLabels(UpdatePendingVolumeAnnotationLabels $request)
     {
         $request->pendingVolume->update([
             'only_annotation_labels' => $request->input('labels'),
@@ -50,7 +50,7 @@ public function storeAnnotationLabels(UpdatePendingVolumeAnnotationLabels $reque
     /**
      * Choose file labels for import.
      *
-     * @api {post} pending-volumes/:id/file-labels Choose file labels for import
+     * @api {put} pending-volumes/:id/file-labels Choose file labels for import
      * @apiGroup Volumes
      * @apiName UpdatePendingVolumeFileLabels
      * @apiPermission projectAdminAndPendingVolumeOwner
@@ -76,7 +76,7 @@ public function storeAnnotationLabels(UpdatePendingVolumeAnnotationLabels $reque
      *    "only_file_labels": [456]
      * }
      */
-    public function storeFileLabels(UpdatePendingVolumeFileLabels $request)
+    public function updateFileLabels(UpdatePendingVolumeFileLabels $request)
     {
         $request->pendingVolume->update([
             'only_file_labels' => $request->input('labels'),
@@ -88,7 +88,7 @@ public function storeFileLabels(UpdatePendingVolumeFileLabels $request)
     /**
      * Match metadata labels with database labels.
      *
-     * @api {post} pending-volumes/:id/label-map Match metadata labels with database labels
+     * @api {put} pending-volumes/:id/label-map Match metadata labels with database labels
      * @apiGroup Volumes
      * @apiName UpdatePendingVolumeLabels
      * @apiPermission projectAdminAndPendingVolumeOwner
@@ -115,7 +115,7 @@ public function storeFileLabels(UpdatePendingVolumeFileLabels $request)
      *    "label_map": {"123": 987, "456": 654}
      * }
      */
-    public function storeLabelMap(UpdatePendingVolumeLabelMap $request)
+    public function updateLabelMap(UpdatePendingVolumeLabelMap $request)
     {
         $request->pendingVolume->update([
             'label_map' => $request->input('label_map'),
@@ -127,7 +127,7 @@ public function storeLabelMap(UpdatePendingVolumeLabelMap $request)
     /**
      * Match metadata users with database users.
      *
-     * @api {post} pending-volumes/:id/user-map Match metadata users with database users
+     * @api {put} pending-volumes/:id/user-map Match metadata users with database users
      * @apiGroup Volumes
      * @apiName UpdatePendingVolumeUsers
      * @apiPermission projectAdminAndPendingVolumeOwner
@@ -155,7 +155,7 @@ public function storeLabelMap(UpdatePendingVolumeLabelMap $request)
      *    "user_map": {"135": 246, "975": 864}
      * }
      */
-    public function storeUserMap(UpdatePendingVolumeUserMap $request)
+    public function updateUserMap(UpdatePendingVolumeUserMap $request)
     {
         $request->pendingVolume->update([
             'user_map' => $request->input('user_map'),
diff --git a/routes/api.php b/routes/api.php
index 1fd859fe7..15b6b1275 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -152,10 +152,10 @@
     'parameters' => ['pending-volumes' => 'id'],
 ]);
 
-$router->post('pending-volumes/{id}/annotation-labels', 'PendingVolumeImportController@storeAnnotationLabels');
-$router->post('pending-volumes/{id}/file-labels', 'PendingVolumeImportController@storeFileLabels');
-$router->post('pending-volumes/{id}/label-map', 'PendingVolumeImportController@storeLabelMap');
-$router->post('pending-volumes/{id}/user-map', 'PendingVolumeImportController@storeUserMap');
+$router->put('pending-volumes/{id}/annotation-labels', 'PendingVolumeImportController@updateAnnotationLabels');
+$router->put('pending-volumes/{id}/file-labels', 'PendingVolumeImportController@updateFileLabels');
+$router->put('pending-volumes/{id}/label-map', 'PendingVolumeImportController@updateLabelMap');
+$router->put('pending-volumes/{id}/user-map', 'PendingVolumeImportController@updateUserMap');
 
 $router->resource('projects', 'ProjectController', [
     'only' => ['index', 'show', 'update', 'store', 'destroy'],
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
index dee2e2ba7..0a9803e12 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
@@ -47,33 +47,33 @@ public function testStoreAnnotationLabels()
 
         $this->beExpert();
         $this
-            ->postJson("/api/v1/pending-volumes/{$id}/annotation-labels")
+            ->putJson("/api/v1/pending-volumes/{$id}/annotation-labels")
             ->assertStatus(403);
 
         $this->beAdmin();
         // Label list required.
         $this
-            ->postJson("/api/v1/pending-volumes/{$id}/annotation-labels")
+            ->putJson("/api/v1/pending-volumes/{$id}/annotation-labels")
             ->assertStatus(422);
 
         // Label list must be filled.
-        $this->postJson("/api/v1/pending-volumes/{$id}/annotation-labels", [
+        $this->putJson("/api/v1/pending-volumes/{$id}/annotation-labels", [
             'labels' => [],
         ])->assertStatus(422);
 
         // No volume attached yet.
-        $this->postJson("/api/v1/pending-volumes/{$id}/annotation-labels", [
+        $this->putJson("/api/v1/pending-volumes/{$id}/annotation-labels", [
             'labels' => [123],
         ])->assertStatus(422);
 
         // Label not in metadata.
-        $this->postJson("/api/v1/pending-volumes/{$id}/annotation-labels", [
+        $this->putJson("/api/v1/pending-volumes/{$id}/annotation-labels", [
             'labels' => [456],
         ])->assertStatus(422);
 
         $pv->update(['volume_id' => $this->volume()->id]);
 
-        $this->postJson("/api/v1/pending-volumes/{$id}/annotation-labels", [
+        $this->putJson("/api/v1/pending-volumes/{$id}/annotation-labels", [
             'labels' => [123],
         ])->assertSuccessful();
 
@@ -103,33 +103,33 @@ public function testStoreFileLabels()
 
         $this->beExpert();
         $this
-            ->postJson("/api/v1/pending-volumes/{$id}/file-labels")
+            ->putJson("/api/v1/pending-volumes/{$id}/file-labels")
             ->assertStatus(403);
 
         $this->beAdmin();
         // Label list required.
         $this
-            ->postJson("/api/v1/pending-volumes/{$id}/file-labels")
+            ->putJson("/api/v1/pending-volumes/{$id}/file-labels")
             ->assertStatus(422);
 
         // Label list must be filled.
-        $this->postJson("/api/v1/pending-volumes/{$id}/file-labels", [
+        $this->putJson("/api/v1/pending-volumes/{$id}/file-labels", [
             'labels' => [],
         ])->assertStatus(422);
 
         // No volume attached yet.
-        $this->postJson("/api/v1/pending-volumes/{$id}/file-labels", [
+        $this->putJson("/api/v1/pending-volumes/{$id}/file-labels", [
             'labels' => [123],
         ])->assertStatus(422);
 
         $pv->update(['volume_id' => $this->volume()->id]);
 
         // Label not in metadata.
-        $this->postJson("/api/v1/pending-volumes/{$id}/file-labels", [
+        $this->putJson("/api/v1/pending-volumes/{$id}/file-labels", [
             'labels' => [456],
         ])->assertStatus(422);
 
-        $this->postJson("/api/v1/pending-volumes/{$id}/file-labels", [
+        $this->putJson("/api/v1/pending-volumes/{$id}/file-labels", [
             'labels' => [123],
         ])->assertSuccessful();
 
@@ -164,38 +164,38 @@ public function testStoreLabelMap()
 
         $this->beExpert();
         $this
-            ->postJson("/api/v1/pending-volumes/{$id}/label-map")
+            ->putJson("/api/v1/pending-volumes/{$id}/label-map")
             ->assertStatus(403);
 
         $this->beAdmin();
         // Label map required.
         $this
-            ->postJson("/api/v1/pending-volumes/{$id}/label-map")
+            ->putJson("/api/v1/pending-volumes/{$id}/label-map")
             ->assertStatus(422);
 
         // Label map must be filled.
-        $this->postJson("/api/v1/pending-volumes/{$id}/label-map", [
+        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
             'label_map' => [],
         ])->assertStatus(422);
 
         // No volume attached yet.
-        $this->postJson("/api/v1/pending-volumes/{$id}/label-map", [
+        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
             'label_map' => [123 => $this->labelRoot()->id],
         ])->assertStatus(422);
 
         $pv->update(['volume_id' => $this->volume()->id]);
 
         // Label not in metadata.
-        $this->postJson("/api/v1/pending-volumes/{$id}/label-map", [
+        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
             'label_map' => [456 => $this->labelRoot()->id],
         ])->assertStatus(422);
 
         // Label not in database.
-        $this->postJson("/api/v1/pending-volumes/{$id}/label-map", [
+        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
             'label_map' => [123 => -1],
         ])->assertStatus(422);
 
-        $this->postJson("/api/v1/pending-volumes/{$id}/label-map", [
+        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
             'label_map' => [123 => $this->labelRoot()->id],
         ])->assertSuccessful();
 
@@ -226,7 +226,7 @@ public function testStoreLabelMapFileLabel()
 
         $this->beAdmin();
 
-        $this->postJson("/api/v1/pending-volumes/{$id}/label-map", [
+        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
             'label_map' => [123 => $this->labelRoot()->id],
         ])->assertSuccessful();
 
@@ -262,7 +262,7 @@ public function testStoreLabelMapTryIgnoredAnnotationLabel()
         $id = $pv->id;
 
         $this->beAdmin();
-        $this->postJson("/api/v1/pending-volumes/{$id}/label-map", [
+        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
             'label_map' => [123 => $this->labelRoot()->id],
         ])->assertStatus(422);
     }
@@ -290,7 +290,7 @@ public function testStoreLabelMapTryIgnoredFileLabel()
         $id = $pv->id;
 
         $this->beAdmin();
-        $this->postJson("/api/v1/pending-volumes/{$id}/label-map", [
+        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
             'label_map' => [123 => $this->labelRoot()->id],
         ])->assertStatus(422);
     }
@@ -325,7 +325,7 @@ public function testStoreLabelMapTryLabelNotAllowed()
         ]);
 
         $this->beAdmin();
-        $this->postJson("/api/v1/pending-volumes/{$id}/label-map", [
+        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
             'label_map' => [123 => $dbLabel->id],
         ])->assertStatus(422);
     }
@@ -357,38 +357,38 @@ public function testStoreUserMap()
 
         $this->beExpert();
         $this
-            ->postJson("/api/v1/pending-volumes/{$id}/user-map")
+            ->putJson("/api/v1/pending-volumes/{$id}/user-map")
             ->assertStatus(403);
 
         $this->beAdmin();
         // User map required.
         $this
-            ->postJson("/api/v1/pending-volumes/{$id}/user-map")
+            ->putJson("/api/v1/pending-volumes/{$id}/user-map")
             ->assertStatus(422);
 
         // User map must be filled.
-        $this->postJson("/api/v1/pending-volumes/{$id}/user-map", [
+        $this->putJson("/api/v1/pending-volumes/{$id}/user-map", [
             'user_map' => [],
         ])->assertStatus(422);
 
         // No volume attached yet.
-        $this->postJson("/api/v1/pending-volumes/{$id}/user-map", [
+        $this->putJson("/api/v1/pending-volumes/{$id}/user-map", [
             'user_map' => [321 => $this->user()->id],
         ])->assertStatus(422);
 
         $pv->update(['volume_id' => $this->volume()->id]);
 
         // User not in metadata.
-        $this->postJson("/api/v1/pending-volumes/{$id}/user-map", [
+        $this->putJson("/api/v1/pending-volumes/{$id}/user-map", [
             'user_map' => [456 => $this->user()->id],
         ])->assertStatus(422);
 
         // User not in database.
-        $this->postJson("/api/v1/pending-volumes/{$id}/user-map", [
+        $this->putJson("/api/v1/pending-volumes/{$id}/user-map", [
             'user_map' => [321 => -1],
         ])->assertStatus(422);
 
-        $this->postJson("/api/v1/pending-volumes/{$id}/user-map", [
+        $this->putJson("/api/v1/pending-volumes/{$id}/user-map", [
             'user_map' => [321 => $this->user()->id],
         ])->assertSuccessful();
 
@@ -419,7 +419,7 @@ public function testStoreUserMapFileLabel()
 
         $this->beAdmin();
 
-        $this->postJson("/api/v1/pending-volumes/{$id}/user-map", [
+        $this->putJson("/api/v1/pending-volumes/{$id}/user-map", [
             'user_map' => [321 => $this->user()->id],
         ])->assertSuccessful();
 

From 519a82e1d0878ad7c01e4a495ac7ed9e68e554b6 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 21 Mar 2024 16:37:20 +0100
Subject: [PATCH 067/209] WIP Implement start metadata import API endpoint

---
 .../Api/PendingVolumeImportController.php     |  24 ++
 .../Requests/StorePendingVolumeImport.php     | 106 ++++++
 .../UpdatePendingVolumeAnnotationLabels.php   |   1 +
 .../UpdatePendingVolumeFileLabels.php         |   1 +
 .../Requests/UpdatePendingVolumeLabelMap.php  |   1 +
 .../Requests/UpdatePendingVolumeUserMap.php   |   1 +
 app/Jobs/ImportVolumeMetadata.php             |  37 ++
 app/PendingVolume.php                         |   1 +
 ...06_143800_create_pending_volumes_table.php |   7 +
 routes/api.php                                |   1 +
 .../Api/PendingVolumeImportControllerTest.php | 316 +++++++++++++++++-
 tests/php/Jobs/ImportVolumeMetadataTest.php   |  13 +
 tests/php/PendingVolumeTest.php               |   1 +
 13 files changed, 500 insertions(+), 10 deletions(-)
 create mode 100644 app/Http/Requests/StorePendingVolumeImport.php
 create mode 100644 app/Jobs/ImportVolumeMetadata.php
 create mode 100644 tests/php/Jobs/ImportVolumeMetadataTest.php

diff --git a/app/Http/Controllers/Api/PendingVolumeImportController.php b/app/Http/Controllers/Api/PendingVolumeImportController.php
index 598b6431e..3bab7edf8 100644
--- a/app/Http/Controllers/Api/PendingVolumeImportController.php
+++ b/app/Http/Controllers/Api/PendingVolumeImportController.php
@@ -2,11 +2,15 @@
 
 namespace Biigle\Http\Controllers\Api;
 
+use Biigle\Http\Requests\StorePendingVolumeImport;
 use Biigle\Http\Requests\UpdatePendingVolumeAnnotationLabels;
 use Biigle\Http\Requests\UpdatePendingVolumeFileLabels;
 use Biigle\Http\Requests\UpdatePendingVolumeLabelMap;
 use Biigle\Http\Requests\UpdatePendingVolumeUserMap;
+use Biigle\Jobs\ImportVolumeMetadata;
 use Biigle\Volume;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Queue;
 
 class PendingVolumeImportController extends Controller
 {
@@ -163,4 +167,24 @@ public function updateUserMap(UpdatePendingVolumeUserMap $request)
 
         return $request->pendingVolume;
     }
+
+    /**
+     * Perform the metadata annotation and/or file label import.
+     *
+     * @api {post} pending-volumes/:id/import Perform annotation/file label import
+     * @apiGroup Volumes
+     * @apiName UpdatePendingVolumeImport
+     * @apiPermission projectAdminAndPendingVolumeOwner
+     *
+     * @apiDescription This endpoint attempts to perform the annotation and/or file label import that can be started in (#Volumes:UpdatePendingVolume). If the import is successful, the pending volume will be deleted.
+     *
+     * @apiParam {Number} id The pending volume ID.
+     */
+    public function storeImport(StorePendingVolumeImport $request)
+    {
+        DB::transaction(function () use ($request) {
+            $request->pendingVolume->update(['importing' => true]);
+            Queue::push(new ImportVolumeMetadata($request->pendingVolume));
+        });
+    }
 }
diff --git a/app/Http/Requests/StorePendingVolumeImport.php b/app/Http/Requests/StorePendingVolumeImport.php
new file mode 100644
index 000000000..d096ee3e6
--- /dev/null
+++ b/app/Http/Requests/StorePendingVolumeImport.php
@@ -0,0 +1,106 @@
+<?php
+
+namespace Biigle\Http\Requests;
+
+use Biigle\PendingVolume;
+use Illuminate\Foundation\Http\FormRequest;
+
+class StorePendingVolumeImport extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        $this->pendingVolume = PendingVolume::findOrFail($this->route('id'));
+
+        return $this->user()->can('update', $this->pendingVolume);
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+            //
+        ];
+    }
+
+    /**
+     * Configure the validator instance.
+     *
+     * @param  \Illuminate\Validation\Validator  $validator
+     * @return void
+     */
+    public function withValidator($validator)
+    {
+        $validator->after(function ($validator) {
+            if ($validator->errors()->isNotEmpty()) {
+                return;
+            }
+            $pv = $this->pendingVolume;
+
+            if (is_null($pv->volume_id)) {
+                $validator->errors()->add('id', 'A volume must be created from the pending volume first.');
+                return;
+            }
+
+            if ($pv->importing) {
+                $validator->errors()->add('id', 'An import is already in progress.');
+                return;
+            }
+
+            if (!$pv->import_annotations && !$pv->import_file_labels) {
+                $validator->errors()->add('id', 'Neither annotations nor file labels were set to be imported.');
+                return;
+            }
+
+            $metadata = $pv->getMetadata();
+            if (is_null($metadata)) {
+                $validator->errors()->add('id', 'No metadata file found.');
+                return;
+            }
+
+            if ($pv->import_annotations) {
+                $labels = $metadata->getAnnotationLabels();
+
+                if (empty($labels)) {
+                    $validator->errors()->add('id', 'There are no annotations to import.');
+                    return;
+                }
+
+                if ($pv->only_annotation_labels) {
+                    $remaining = array_intersect_key($labels, array_flip($pv->only_annotation_labels));
+
+                    if (empty($remaining)) {
+                        $validator->errors()->add('id', 'There are no annotations to import with the chosen labels.');
+                        return;
+                    }
+                }
+
+            }
+
+            if ($pv->import_file_labels) {
+                $labels = $metadata->getFileLabels();
+
+                if (empty($labels)) {
+                    $validator->errors()->add('id', 'There are no file labels to import.');
+                    return;
+                }
+
+                if ($pv->only_file_labels) {
+                    $remaining = array_intersect_key($labels, array_flip($pv->only_file_labels));
+
+                    if (empty($remaining)) {
+                        $validator->errors()->add('id', 'There are no file labels to import with the chosen labels.');
+                        return;
+                    }
+                }
+
+            }
+        });
+    }
+}
diff --git a/app/Http/Requests/UpdatePendingVolumeAnnotationLabels.php b/app/Http/Requests/UpdatePendingVolumeAnnotationLabels.php
index 71b8d6e4c..644544e21 100644
--- a/app/Http/Requests/UpdatePendingVolumeAnnotationLabels.php
+++ b/app/Http/Requests/UpdatePendingVolumeAnnotationLabels.php
@@ -51,6 +51,7 @@ public function withValidator($validator)
             $metadata = $this->pendingVolume->getMetadata();
             if (is_null($metadata)) {
                 $validator->errors()->add('labels', 'No metadata file found.');
+                return;
             }
 
             $metaLabels = $metadata->getAnnotationLabels();
diff --git a/app/Http/Requests/UpdatePendingVolumeFileLabels.php b/app/Http/Requests/UpdatePendingVolumeFileLabels.php
index 3377954d3..df89040db 100644
--- a/app/Http/Requests/UpdatePendingVolumeFileLabels.php
+++ b/app/Http/Requests/UpdatePendingVolumeFileLabels.php
@@ -51,6 +51,7 @@ public function withValidator($validator)
             $metadata = $this->pendingVolume->getMetadata();
             if (is_null($metadata)) {
                 $validator->errors()->add('labels', 'No metadata file found.');
+                return;
             }
 
             $metaLabels = $metadata->getFileLabels();
diff --git a/app/Http/Requests/UpdatePendingVolumeLabelMap.php b/app/Http/Requests/UpdatePendingVolumeLabelMap.php
index 4e3a52fa6..1aeceab62 100644
--- a/app/Http/Requests/UpdatePendingVolumeLabelMap.php
+++ b/app/Http/Requests/UpdatePendingVolumeLabelMap.php
@@ -53,6 +53,7 @@ public function withValidator($validator)
             $metadata = $this->pendingVolume->getMetadata();
             if (is_null($metadata)) {
                 $validator->errors()->add('label_map', 'No metadata file found.');
+                return;
             }
 
             $map = $this->input('label_map');
diff --git a/app/Http/Requests/UpdatePendingVolumeUserMap.php b/app/Http/Requests/UpdatePendingVolumeUserMap.php
index cd13eac1e..6fa6e2805 100644
--- a/app/Http/Requests/UpdatePendingVolumeUserMap.php
+++ b/app/Http/Requests/UpdatePendingVolumeUserMap.php
@@ -51,6 +51,7 @@ public function withValidator($validator)
             $metadata = $this->pendingVolume->getMetadata();
             if (is_null($metadata)) {
                 $validator->errors()->add('user_map', 'No metadata file found.');
+                return;
             }
 
             $map = $this->input('user_map');
diff --git a/app/Jobs/ImportVolumeMetadata.php b/app/Jobs/ImportVolumeMetadata.php
new file mode 100644
index 000000000..b5d712ae0
--- /dev/null
+++ b/app/Jobs/ImportVolumeMetadata.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Biigle\Jobs;
+
+use Biigle\PendingVolume;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Queue\SerializesModels;
+
+class ImportVolumeMetadata extends Job implements ShouldQueue
+{
+    use SerializesModels;
+
+    /**
+     * Ignore this job if the pending volume does not exist any more.
+     *
+     * @var bool
+     */
+    protected $deleteWhenMissingModels = true;
+
+    /**
+     * Create a new job instance.
+     *
+     */
+    public function __construct(public PendingVolume $pendingVolume)
+    {
+        //
+    }
+
+    public function handle(): void
+    {
+        // ignore annotations with deleted labels, set null to
+        // annotations with deleted users (as they could be deleted in the meantime).
+        // do not import annotations/file labels if the pending volume property is false.
+        //
+        // delete pending volume on success
+    }
+}
diff --git a/app/PendingVolume.php b/app/PendingVolume.php
index b19e012bc..7882297ff 100644
--- a/app/PendingVolume.php
+++ b/app/PendingVolume.php
@@ -28,6 +28,7 @@ class PendingVolume extends Model
         'only_file_labels',
         'label_map',
         'user_map',
+        'importing',
     ];
 
     /**
diff --git a/database/migrations/2024_03_06_143800_create_pending_volumes_table.php b/database/migrations/2024_03_06_143800_create_pending_volumes_table.php
index 5144b5258..5f2af385a 100644
--- a/database/migrations/2024_03_06_143800_create_pending_volumes_table.php
+++ b/database/migrations/2024_03_06_143800_create_pending_volumes_table.php
@@ -37,9 +37,16 @@ public function up(): void
             // Path of the file in the pending_metadata_storage_disk.
             $table->string('metadata_file_path', 256)->nullable();
 
+            // Specify if the pending volume should be used to import annotations.
             $table->boolean('import_annotations')->default(false);
+
+            // Specify if the pending volume should be used to import file labels.
             $table->boolean('import_file_labels')->default(false);
 
+            // Specifies if a job to import metadata is already dispatched for this
+            // pending volume.
+            $table->boolean('importing')->default(false);
+
             // Used to filter the imported annotations.
             $table->jsonb('only_annotation_labels')->nullable();
             // Used to filter the imported file labels.
diff --git a/routes/api.php b/routes/api.php
index 15b6b1275..20e6fd982 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -156,6 +156,7 @@
 $router->put('pending-volumes/{id}/file-labels', 'PendingVolumeImportController@updateFileLabels');
 $router->put('pending-volumes/{id}/label-map', 'PendingVolumeImportController@updateLabelMap');
 $router->put('pending-volumes/{id}/user-map', 'PendingVolumeImportController@updateUserMap');
+$router->post('pending-volumes/{id}/import', 'PendingVolumeImportController@storeImport');
 
 $router->resource('projects', 'ProjectController', [
     'only' => ['index', 'show', 'update', 'store', 'destroy'],
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
index 0a9803e12..fde0aea44 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
@@ -3,6 +3,7 @@
 namespace Biigle\Tests\Http\Controllers\Api;
 
 use ApiTestCase;
+use Biigle\Jobs\ImportVolumeMetadata;
 use Biigle\Label as DbLabel;
 use Biigle\LabelTree;
 use Biigle\MediaType;
@@ -16,11 +17,12 @@
 use Biigle\Shape;
 use Biigle\Visibility;
 use Biigle\Volume;
-use Cache;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Queue;
 
 class PendingVolumeImportControllerTest extends ApiTestCase
 {
-    public function testStoreAnnotationLabels()
+    public function testUpdateAnnotationLabels()
     {
         $metadata = new VolumeMetadata;
         $file = new ImageMetadata('1.jpg');
@@ -45,6 +47,8 @@ public function testStoreAnnotationLabels()
         ]);
         $id = $pv->id;
 
+        $this->doTestApiRoute('PUT', "/api/v1/pending-volumes/{$id}/annotation-labels");
+
         $this->beExpert();
         $this
             ->putJson("/api/v1/pending-volumes/{$id}/annotation-labels")
@@ -81,7 +85,7 @@ public function testStoreAnnotationLabels()
         $this->assertEquals([123], $pv->only_annotation_labels);
     }
 
-    public function testStoreFileLabels()
+    public function testUpdateFileLabels()
     {
         $metadata = new VolumeMetadata;
         $file = new ImageMetadata('1.jpg');
@@ -101,6 +105,8 @@ public function testStoreFileLabels()
         ]);
         $id = $pv->id;
 
+        $this->doTestApiRoute('PUT', "/api/v1/pending-volumes/{$id}/file-labels");
+
         $this->beExpert();
         $this
             ->putJson("/api/v1/pending-volumes/{$id}/file-labels")
@@ -137,7 +143,7 @@ public function testStoreFileLabels()
         $this->assertEquals([123], $pv->only_file_labels);
     }
 
-    public function testStoreLabelMap()
+    public function testUpdateLabelMap()
     {
         $metadata = new VolumeMetadata;
         $file = new ImageMetadata('1.jpg');
@@ -162,6 +168,8 @@ public function testStoreLabelMap()
         ]);
         $id = $pv->id;
 
+        $this->doTestApiRoute('PUT', "/api/v1/pending-volumes/{$id}/label-map");
+
         $this->beExpert();
         $this
             ->putJson("/api/v1/pending-volumes/{$id}/label-map")
@@ -203,7 +211,7 @@ public function testStoreLabelMap()
         $this->assertEquals([123 => $this->labelRoot()->id], $pv->label_map);
     }
 
-    public function testStoreLabelMapFileLabel()
+    public function testUpdateLabelMapFileLabel()
     {
         $metadata = new VolumeMetadata;
         $file = new ImageMetadata('1.jpg');
@@ -234,7 +242,7 @@ public function testStoreLabelMapFileLabel()
         $this->assertEquals([123 => $this->labelRoot()->id], $pv->label_map);
     }
 
-    public function testStoreLabelMapTryIgnoredAnnotationLabel()
+    public function testUpdateLabelMapTryIgnoredAnnotationLabel()
     {
         $metadata = new VolumeMetadata;
         $file = new ImageMetadata('1.jpg');
@@ -267,7 +275,7 @@ public function testStoreLabelMapTryIgnoredAnnotationLabel()
         ])->assertStatus(422);
     }
 
-    public function testStoreLabelMapTryIgnoredFileLabel()
+    public function testUpdateLabelMapTryIgnoredFileLabel()
     {
         $metadata = new VolumeMetadata;
         $file = new ImageMetadata('1.jpg');
@@ -295,7 +303,7 @@ public function testStoreLabelMapTryIgnoredFileLabel()
         ])->assertStatus(422);
     }
 
-    public function testStoreLabelMapTryLabelNotAllowed()
+    public function testUpdateLabelMapTryLabelNotAllowed()
     {
         $metadata = new VolumeMetadata;
         $file = new ImageMetadata('1.jpg');
@@ -330,7 +338,7 @@ public function testStoreLabelMapTryLabelNotAllowed()
         ])->assertStatus(422);
     }
 
-    public function testStoreUserMap()
+    public function testUpdateUserMap()
     {
         $metadata = new VolumeMetadata;
         $file = new ImageMetadata('1.jpg');
@@ -355,6 +363,8 @@ public function testStoreUserMap()
         ]);
         $id = $pv->id;
 
+        $this->doTestApiRoute('PUT', "/api/v1/pending-volumes/{$id}/user-map");
+
         $this->beExpert();
         $this
             ->putJson("/api/v1/pending-volumes/{$id}/user-map")
@@ -396,7 +406,7 @@ public function testStoreUserMap()
         $this->assertEquals([321 => $this->user()->id], $pv->user_map);
     }
 
-    public function testStoreUserMapFileLabel()
+    public function testUpdateUserMapFileLabel()
     {
         $metadata = new VolumeMetadata;
         $file = new ImageMetadata('1.jpg');
@@ -426,4 +436,290 @@ public function testStoreUserMapFileLabel()
         $pv->refresh();
         $this->assertEquals([321 => $this->user()->id], $pv->user_map);
     }
+
+    public function testStoreImport()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'import_file_labels' => true,
+        ]);
+        $id = $pv->id;
+
+        $this->doTestApiRoute('POST', "/api/v1/pending-volumes/{$id}/import");
+
+        $this->beExpert();
+        $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertStatus(403);
+
+        $this->beAdmin();
+
+        // No volume_id set.
+        $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertStatus(422);
+
+        $pv->update(['volume_id' => $this->volume()->id]);
+
+        $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertSuccessful();
+
+        Queue::assertPushed(ImportVolumeMetadata::class, function ($job) use ($pv) {
+            $this->assertEquals($pv->id, $job->pendingVolume->id);
+
+            return true;
+        });
+
+        $this->assertTrue($pv->fresh()->importing);
+    }
+
+    public function testStoreImportNoImportAnnotationsSet()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+        $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertStatus(422);
+        $pv->update(['import_annotations' => true]);
+        $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertSuccessful();
+    }
+
+    public function testStoreImportNoImportFileLabelsSet()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+        $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertStatus(422);
+        $pv->update(['import_file_labels' => true]);
+        $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertSuccessful();
+    }
+
+    public function testStoreImportNoAnnotations()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+            'import_annotations' => true,
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+        $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertStatus(422);
+    }
+
+    public function testStoreImportNoAnnotationsAfterFiltering()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+            'import_annotations' => true,
+            'only_annotation_labels' => [1],
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+        $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertStatus(422);
+    }
+
+    public function testStoreImportNoFileLabels()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+            'import_file_labels' => true,
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+        $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertStatus(422);
+    }
+
+    public function testStoreImportNoFileLabelsAfterFiltering()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+            'import_file_labels' => true,
+            'only_file_labels' => [1],
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+        $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertStatus(422);
+    }
+
+    public function testStoreImportAlreadyImporting()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+            'import_file_labels' => true,
+            'importing' => true,
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+        $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertStatus(422);
+    }
+
+    public function testStoreImportMatchUserByUuid()
+    {
+        //
+    }
+
+    public function testStoreImportMatchLabelByUuid()
+    {
+        //
+    }
+
+    public function testStoreImportUserNoMatch()
+    {
+        // uuid not found
+    }
+
+    public function testStoreImportLabelNoMatch()
+    {
+        // uuid not found
+    }
+
+    public function testStoreImportUserMatchOnlyWithAnnotationLabelFilter()
+    {
+        // the user without match is ignored by only_annotation_labels
+    }
+
+    public function testStoreImportUserMatchOnlyWithFileLabelFilter()
+    {
+        // the user without match is ignored by only_file_labels
+    }
+
+    public function testStoreImportLabelMatchOnlyWithAnnotationLabelFilter()
+    {
+        // the label without match is ignored by only_annotation_labels
+    }
+
+    public function testStoreImportLabelMatchOnlyWithFileLabelFilter()
+    {
+        // the label without match is ignored by only_file_labels
+    }
 }
diff --git a/tests/php/Jobs/ImportVolumeMetadataTest.php b/tests/php/Jobs/ImportVolumeMetadataTest.php
new file mode 100644
index 000000000..eb8eba898
--- /dev/null
+++ b/tests/php/Jobs/ImportVolumeMetadataTest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Biigle\Tests\Jobs;
+
+use TestCase;
+
+class ImportVolumeMetadataTest extends TestCase
+{
+    public function testHandle()
+    {
+        //
+    }
+}
diff --git a/tests/php/PendingVolumeTest.php b/tests/php/PendingVolumeTest.php
index b2732c083..a7f5af707 100644
--- a/tests/php/PendingVolumeTest.php
+++ b/tests/php/PendingVolumeTest.php
@@ -31,6 +31,7 @@ public function testAttributes()
         $this->assertNull($this->model->only_file_labels);
         $this->assertNull($this->model->label_map);
         $this->assertNull($this->model->user_map);
+        $this->assertFalse($this->model->importing);
     }
 
     public function testCreateOnlyOneForProject()

From 39800e219bae1b032808d0259770ad6b1fb2b9e9 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 21 Mar 2024 16:55:46 +0100
Subject: [PATCH 068/209] Fix linter errors

---
 app/Services/MetadataParsing/Annotation.php      | 2 +-
 app/Services/MetadataParsing/FileMetadata.php    | 2 +-
 app/Services/MetadataParsing/VideoAnnotation.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Services/MetadataParsing/Annotation.php b/app/Services/MetadataParsing/Annotation.php
index 255962717..5886f6351 100644
--- a/app/Services/MetadataParsing/Annotation.php
+++ b/app/Services/MetadataParsing/Annotation.php
@@ -9,7 +9,7 @@ class Annotation
     /**
      * @param Shape $shape
      * @param array<float> $points
-     * @param array<LabelAndAnnotator> $labels
+     * @param array<LabelAndUser> $labels
      */
     public function __construct(
         public Shape $shape,
diff --git a/app/Services/MetadataParsing/FileMetadata.php b/app/Services/MetadataParsing/FileMetadata.php
index e1ba93aae..cd3da9674 100644
--- a/app/Services/MetadataParsing/FileMetadata.php
+++ b/app/Services/MetadataParsing/FileMetadata.php
@@ -12,7 +12,7 @@ class FileMetadata
     /**
      * The labels directly attached to the file.
      *
-     * @var array<LabelAndAnnotator>
+     * @var array<LabelAndUser>
      */
     public array $labels = [];
 
diff --git a/app/Services/MetadataParsing/VideoAnnotation.php b/app/Services/MetadataParsing/VideoAnnotation.php
index 9a428de41..d2736236b 100644
--- a/app/Services/MetadataParsing/VideoAnnotation.php
+++ b/app/Services/MetadataParsing/VideoAnnotation.php
@@ -9,7 +9,7 @@ class VideoAnnotation extends Annotation
     /**
      * @param Shape $shape
      * @param array<array<float>> $points
-     * @param array<LabelAndAnnotator> $labels
+     * @param array<LabelAndUser> $labels
      * @param array<float> $frames
      */
     public function __construct(

From 588359776a03ec10ce62d40076e2f460a8d576bb Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 22 Mar 2024 11:26:02 +0100
Subject: [PATCH 069/209] Implement user matching for metadata import

---
 .../Requests/StorePendingVolumeImport.php     |  10 +-
 app/Services/MetadataParsing/FileMetadata.php |  13 +-
 .../MetadataParsing/VolumeMetadata.php        |  42 +++++-
 .../Api/PendingVolumeImportControllerTest.php | 126 +++++++++++++++++-
 .../MetadataParsing/FileMetadataTest.php      |  17 +++
 .../MetadataParsing/VolumeMetadataTest.php    |  82 ++++++++++++
 6 files changed, 282 insertions(+), 8 deletions(-)

diff --git a/app/Http/Requests/StorePendingVolumeImport.php b/app/Http/Requests/StorePendingVolumeImport.php
index d096ee3e6..a0c771760 100644
--- a/app/Http/Requests/StorePendingVolumeImport.php
+++ b/app/Http/Requests/StorePendingVolumeImport.php
@@ -80,7 +80,6 @@ public function withValidator($validator)
                         return;
                     }
                 }
-
             }
 
             if ($pv->import_file_labels) {
@@ -99,7 +98,16 @@ public function withValidator($validator)
                         return;
                     }
                 }
+            }
 
+            $onlyLabels = $this->pendingVolume->only_annotation_labels ?: [];
+            $onlyLabels += $this->pendingVolume->only_file_labels ?: [];
+            $matchingUsers = $metadata->getMatchingUsers($pv->user_map ?? [], $onlyLabels);
+            foreach ($matchingUsers as $id => $value) {
+                if (is_null($value)) {
+                    $validator->errors()->add('id', "No matching database user could be found for metadata user ID {$id}.");
+                    return;
+                }
             }
         });
     }
diff --git a/app/Services/MetadataParsing/FileMetadata.php b/app/Services/MetadataParsing/FileMetadata.php
index cd3da9674..53a98c4ce 100644
--- a/app/Services/MetadataParsing/FileMetadata.php
+++ b/app/Services/MetadataParsing/FileMetadata.php
@@ -81,19 +81,30 @@ public function getAnnotationLabels(): array
     }
 
     /**
+     * @param array $onlyLabels List of metadata label IDs to filter the list of users.
+     *
      * @return array Users indexed by ID.
      */
-    public function getUsers(): array
+    public function getUsers(array $onlyLabels = []): array
     {
         $users = [];
+        $onlyLabels = array_flip($onlyLabels);
 
         foreach ($this->getAnnotations() as $annotation) {
             foreach ($annotation->labels as $lau) {
+                if ($onlyLabels && !array_key_exists($lau->label->id, $onlyLabels)) {
+                    continue;
+                }
+
                 $users[$lau->user->id] = $lau->user;
             }
         }
 
         foreach ($this->getFileLabels() as $lau) {
+            if ($onlyLabels && !array_key_exists($lau->label->id, $onlyLabels)) {
+                continue;
+            }
+
             $users[$lau->user->id] = $lau->user;
         }
 
diff --git a/app/Services/MetadataParsing/VolumeMetadata.php b/app/Services/MetadataParsing/VolumeMetadata.php
index 3d2a73de4..61524b8f6 100644
--- a/app/Services/MetadataParsing/VolumeMetadata.php
+++ b/app/Services/MetadataParsing/VolumeMetadata.php
@@ -3,6 +3,7 @@
 namespace Biigle\Services\MetadataParsing;
 
 use Biigle\MediaType;
+use Biigle\User as DbUser;
 use Illuminate\Support\Collection;
 
 class VolumeMetadata
@@ -103,17 +104,54 @@ public function getFileLabels(): array
     /**
      * Get all users associated with annotations and/or file labels.
      *
+     * @param array $onlyLabels List of metadata label IDs to filter the list of users.
+     *
      * @return array Users indexed by ID.
      */
-    public function getUsers(): array
+    public function getUsers(array $onlyLabels = []): array
     {
         $users = [];
 
         foreach ($this->files as $file) {
             // Use union to automatically remove duplicates.
-            $users += $file->getUsers();
+            $users += $file->getUsers($onlyLabels);
         }
 
         return $users;
     }
+
+    /**
+     * @param array $map Optional map of metadata user IDs to database user IDs. Metadata
+     * users not in this list will be matched by their UUID (if any).
+     * @param array $onlyLabels Consider only users belonging to annotation labels or
+     *  file labels with one of the specified metadata label IDs.
+     *
+     * @return array Map of metadata user IDs to User database model instances or null
+     * if no match was found.
+     */
+    public function getMatchingUsers(array $map = [], array $onlyLabels = []): array
+    {
+        $users = $this->getUsers($onlyLabels);
+
+        // Remove database user IDs that don't actually exist.
+        $idMap = DbUser::whereIn('id', array_unique($map))->pluck('id', 'id');
+        $map = array_filter($map, fn ($id) => $idMap->has($id));
+
+        // Fetch database user IDs based on UUIDs.
+        $fetchUuids = array_filter($users,
+            fn ($u) => !array_key_exists($u->id, $map) && !is_null($u->uuid)
+        );
+        $fetchUuids = array_map(fn ($u) => $u->uuid, $fetchUuids);
+        $uuidMap = DbUser::whereIn('uuid', $fetchUuids)->pluck('id', 'uuid');
+
+        foreach ($users as $user) {
+            if (array_key_exists($user->id, $map)) {
+                continue;
+            }
+
+            $map[$user->id] = $uuidMap->get($user->uuid, null);
+        }
+
+        return $map;
+    }
 }
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
index fde0aea44..6f52bca60 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
@@ -15,6 +15,7 @@
 use Biigle\Services\MetadataParsing\User;
 use Biigle\Services\MetadataParsing\VolumeMetadata;
 use Biigle\Shape;
+use Biigle\User as DbUser;
 use Biigle\Visibility;
 use Biigle\Volume;
 use Illuminate\Support\Facades\Cache;
@@ -439,6 +440,7 @@ public function testUpdateUserMapFileLabel()
 
     public function testStoreImport()
     {
+        $dbUser = DbUser::factory()->create();
         $metadata = new VolumeMetadata;
         $file = new ImageMetadata('1.jpg');
         $metadata->addFile($file);
@@ -455,6 +457,7 @@ public function testStoreImport()
             'user_id' => $this->admin()->id,
             'metadata_file_path' => 'mymeta.csv',
             'import_file_labels' => true,
+            'user_map' => [321 => $dbUser->id],
         ]);
         $id = $pv->id;
 
@@ -483,6 +486,7 @@ public function testStoreImport()
 
     public function testStoreImportNoImportAnnotationsSet()
     {
+        $dbUser = DbUser::factory()->create();
         $metadata = new VolumeMetadata;
         $file = new ImageMetadata('1.jpg');
         $metadata->addFile($file);
@@ -504,6 +508,7 @@ public function testStoreImportNoImportAnnotationsSet()
             'user_id' => $this->admin()->id,
             'metadata_file_path' => 'mymeta.csv',
             'volume_id' => $this->volume()->id,
+            'user_map' => [321 => $dbUser->id],
         ]);
         $id = $pv->id;
 
@@ -515,6 +520,7 @@ public function testStoreImportNoImportAnnotationsSet()
 
     public function testStoreImportNoImportFileLabelsSet()
     {
+        $dbUser = DbUser::factory()->create();
         $metadata = new VolumeMetadata;
         $file = new ImageMetadata('1.jpg');
         $metadata->addFile($file);
@@ -531,6 +537,7 @@ public function testStoreImportNoImportFileLabelsSet()
             'user_id' => $this->admin()->id,
             'metadata_file_path' => 'mymeta.csv',
             'volume_id' => $this->volume()->id,
+            'user_map' => [321 => $dbUser->id],
         ]);
         $id = $pv->id;
 
@@ -685,7 +692,29 @@ public function testStoreImportAlreadyImporting()
 
     public function testStoreImportMatchUserByUuid()
     {
-        //
+        $dbUser = DbUser::factory()->create();
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user', uuid: $dbUser->uuid);
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+            'import_file_labels' => true,
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+        $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertSuccessful();
     }
 
     public function testStoreImportMatchLabelByUuid()
@@ -695,7 +724,28 @@ public function testStoreImportMatchLabelByUuid()
 
     public function testStoreImportUserNoMatch()
     {
-        // uuid not found
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+            'import_file_labels' => true,
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+        $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertStatus(422);
     }
 
     public function testStoreImportLabelNoMatch()
@@ -705,12 +755,80 @@ public function testStoreImportLabelNoMatch()
 
     public function testStoreImportUserMatchOnlyWithAnnotationLabelFilter()
     {
-        // the user without match is ignored by only_annotation_labels
+        $dbUser = DbUser::factory()->create();
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label1 = new Label(123, 'my label');
+        $user1 = new User(321, 'joe user');
+        $lau = new LabelAndUser($label1, $user1);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+        $label2 = new Label(456, 'my label');
+        $user2 = new User(654, 'joe user');
+        $lau = new LabelAndUser($label2, $user2);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+            'import_annotations' => true,
+            'only_annotation_labels' => [123],
+            'user_map' => [321 => $dbUser->id],
+
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+        $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertSuccessful();
     }
 
     public function testStoreImportUserMatchOnlyWithFileLabelFilter()
     {
-        // the user without match is ignored by only_file_labels
+        $dbUser = DbUser::factory()->create();
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label1 = new Label(123, 'my label');
+        $user1 = new User(321, 'joe user');
+        $lau = new LabelAndUser($label1, $user1);
+        $file->addFileLabel($lau);
+        $label2 = new Label(456, 'my label');
+        $user2 = new User(654, 'joe user');
+        $lau = new LabelAndUser($label2, $user2);
+        $file->addFileLabel($lau);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+            'import_file_labels' => true,
+            'only_file_labels' => [123],
+            'user_map' => [321 => $dbUser->id],
+
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+        $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertSuccessful();
     }
 
     public function testStoreImportLabelMatchOnlyWithAnnotationLabelFilter()
diff --git a/tests/php/Services/MetadataParsing/FileMetadataTest.php b/tests/php/Services/MetadataParsing/FileMetadataTest.php
index 25c30477f..afa3a6809 100644
--- a/tests/php/Services/MetadataParsing/FileMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/FileMetadataTest.php
@@ -94,4 +94,21 @@ public function testGetUsers()
         $data->addFileLabel($lau);
         $this->assertEquals([321 => $user1, 432 => $user2], $data->getUsers());
     }
+
+    public function testGetUsersOnlyLabels()
+    {
+        $data = new ImageMetadata('filename');
+
+        $label1 = new Label(123, 'my label');
+        $user1 = new User(432, 'joe user');
+        $lau = new LabelAndUser($label1, $user1);
+        $data->addFileLabel($lau);
+
+        $label2 = new Label(456, 'my label');
+        $user2 = new User(654, 'joe user');
+        $lau = new LabelAndUser($label2, $user2);
+        $data->addFileLabel($lau);
+
+        $this->assertEquals([432 => $user1], $data->getUsers([123]));
+    }
 }
diff --git a/tests/php/Services/MetadataParsing/VolumeMetadataTest.php b/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
index 5c083bdbe..af6f6924d 100644
--- a/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
@@ -3,6 +3,7 @@
 namespace Biigle\Tests\Services\MetadataParsing;
 
 use Biigle\MediaType;
+use Biigle\User as DbUser;
 use Biigle\Services\MetadataParsing\FileMetadata;
 use Biigle\Services\MetadataParsing\ImageAnnotation;
 use Biigle\Services\MetadataParsing\ImageMetadata;
@@ -147,4 +148,85 @@ public function testGetUsers()
         $file->addFileLabel($lau);
         $this->assertEquals([321 => $user1, 432 => $user2], $metadata->getUsers());
     }
+
+    public function testGetUsersOnlyLabels()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('filename');
+        $metadata->addFile($file);
+        $label1 = new Label(123, 'my label');
+        $user1 = new User(321, 'joe user');
+        $lau = new LabelAndUser($label1, $user1);
+        $file->addFileLabel($lau);
+        $label2 = new Label(456, 'my label');
+        $user2 = new User(654, 'joe user');
+        $lau = new LabelAndUser($label2, $user2);
+        $file->addFileLabel($lau);
+
+        $this->assertEquals([321 => $user1], $metadata->getUsers([123]));
+    }
+
+    public function testGetMatchingUsersByMap()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('filename');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $la = new LabelAndUser($label, $user);
+        $file->addFileLabel($la);
+
+        $dbUser = DbUser::factory()->create();
+        $matches = $metadata->getMatchingUsers([321 => $dbUser->id]);
+        $this->assertEquals([321 => $dbUser->id], $matches);
+    }
+
+    public function testGetMatchingUsersByUuid()
+    {
+        $dbUser = DbUser::factory()->create();
+
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('filename');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user', uuid: $dbUser->uuid);
+        $la = new LabelAndUser($label, $user);
+        $file->addFileLabel($la);
+
+        $matches = $metadata->getMatchingUsers();
+        $this->assertEquals([321 => $dbUser->id], $matches);
+    }
+
+    public function testGetMatchingUsersNoMatch()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('filename');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user', uuid: "398f42c6-0f24-38de-a1c6-3c467fcb4250");
+        $la = new LabelAndUser($label, $user);
+        $file->addFileLabel($la);
+
+        $matches = $metadata->getMatchingUsers([321 => -1]);
+        $this->assertEquals([321 => null], $matches);
+    }
+
+    public function testGetMatchingUsersOnlyLabels()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('filename');
+        $metadata->addFile($file);
+        $label1 = new Label(123, 'my label');
+        $user1 = new User(321, 'joe user');
+        $la = new LabelAndUser($label1, $user1);
+        $file->addFileLabel($la);
+        $label2 = new Label(456, 'my label');
+        $user2 = new User(654, 'joe user');
+        $la = new LabelAndUser($label2, $user2);
+        $file->addFileLabel($la);
+
+        $dbUser = DbUser::factory()->create();
+        $matches = $metadata->getMatchingUsers([321 => $dbUser->id], [123]);
+        $this->assertEquals([321 => $dbUser->id], $matches);
+    }
 }

From b150c623ad097bd8f8c21e79ca4f00fade7aa571 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 22 Mar 2024 13:52:30 +0100
Subject: [PATCH 070/209] Implement label matching for metadata import

---
 .../Requests/StorePendingVolumeImport.php     |  46 +++----
 app/Services/MetadataParsing/FileMetadata.php |  67 ++++++++---
 .../MetadataParsing/VolumeMetadata.php        |  55 +++++++--
 .../Api/PendingVolumeImportControllerTest.php |  61 ++++++----
 .../MetadataParsing/FileMetadataTest.php      |  55 ++++++++-
 .../MetadataParsing/VolumeMetadataTest.php    | 113 +++++++++++++++++-
 6 files changed, 326 insertions(+), 71 deletions(-)

diff --git a/app/Http/Requests/StorePendingVolumeImport.php b/app/Http/Requests/StorePendingVolumeImport.php
index a0c771760..891c91a23 100644
--- a/app/Http/Requests/StorePendingVolumeImport.php
+++ b/app/Http/Requests/StorePendingVolumeImport.php
@@ -65,50 +65,50 @@ public function withValidator($validator)
             }
 
             if ($pv->import_annotations) {
-                $labels = $metadata->getAnnotationLabels();
+                $labels = $metadata->getAnnotationLabels($pv->only_annotation_labels ?: []);
 
                 if (empty($labels)) {
-                    $validator->errors()->add('id', 'There are no annotations to import.');
-                    return;
-                }
-
-                if ($pv->only_annotation_labels) {
-                    $remaining = array_intersect_key($labels, array_flip($pv->only_annotation_labels));
-
-                    if (empty($remaining)) {
+                    if ($pv->only_annotation_labels) {
                         $validator->errors()->add('id', 'There are no annotations to import with the chosen labels.');
-                        return;
+                    } else {
+                        $validator->errors()->add('id', 'There are no annotations to import.');
                     }
+
+                    return;
                 }
             }
 
             if ($pv->import_file_labels) {
-                $labels = $metadata->getFileLabels();
+                $labels = $metadata->getFileLabels($pv->only_file_labels ?: []);
 
                 if (empty($labels)) {
-                    $validator->errors()->add('id', 'There are no file labels to import.');
-                    return;
-                }
-
-                if ($pv->only_file_labels) {
-                    $remaining = array_intersect_key($labels, array_flip($pv->only_file_labels));
-
-                    if (empty($remaining)) {
+                    if ($pv->only_file_labels) {
                         $validator->errors()->add('id', 'There are no file labels to import with the chosen labels.');
-                        return;
+                    } else {
+                        $validator->errors()->add('id', 'There are no file labels to import.');
                     }
+
+                    return;
                 }
             }
 
-            $onlyLabels = $this->pendingVolume->only_annotation_labels ?: [];
-            $onlyLabels += $this->pendingVolume->only_file_labels ?: [];
-            $matchingUsers = $metadata->getMatchingUsers($pv->user_map ?? [], $onlyLabels);
+            $onlyLabels = ($pv->only_annotation_labels ?: []) + ($pv->only_file_labels ?: []);
+
+            $matchingUsers = $metadata->getMatchingUsers($pv->user_map ?: [], $onlyLabels);
             foreach ($matchingUsers as $id => $value) {
                 if (is_null($value)) {
                     $validator->errors()->add('id', "No matching database user could be found for metadata user ID {$id}.");
                     return;
                 }
             }
+
+            $matchingLabels = $metadata->getMatchingLabels($pv->label_map ?: [], $onlyLabels);
+            foreach ($matchingLabels as $id => $value) {
+                if (is_null($value)) {
+                    $validator->errors()->add('id', "No matching database label could be found for metadata label ID {$id}.");
+                    return;
+                }
+            }
         });
     }
 }
diff --git a/app/Services/MetadataParsing/FileMetadata.php b/app/Services/MetadataParsing/FileMetadata.php
index 53a98c4ce..cc260e695 100644
--- a/app/Services/MetadataParsing/FileMetadata.php
+++ b/app/Services/MetadataParsing/FileMetadata.php
@@ -67,14 +67,26 @@ public function hasFileLabels(): bool
     /**
      * @return array Labels indexed by ID.
      */
-    public function getAnnotationLabels(): array
+    public function getFileLabelLabels(array $onlyLabels = []): array
     {
         $labels = [];
 
-        foreach ($this->getAnnotations() as $annotation) {
-            foreach ($annotation->labels as $lau) {
-                $labels[$lau->label->id] = $lau->label;
-            }
+        foreach ($this->getFileLabelLabelAndUsers($onlyLabels) as $lau) {
+            $labels[$lau->label->id] = $lau->label;
+        }
+
+        return $labels;
+    }
+
+    /**
+     * @return array Labels indexed by ID.
+     */
+    public function getAnnotationLabels(array $onlyLabels = []): array
+    {
+        $labels = [];
+
+        foreach ($this->getAnnotationLabelAndUsers($onlyLabels) as $lau) {
+            $labels[$lau->label->id] = $lau->label;
         }
 
         return $labels;
@@ -88,26 +100,47 @@ public function getAnnotationLabels(): array
     public function getUsers(array $onlyLabels = []): array
     {
         $users = [];
+
+        foreach ($this->getAnnotationLabelAndUsers($onlyLabels) as $lau) {
+            $users[$lau->user->id] = $lau->user;
+        }
+
+        foreach ($this->getFileLabelLabelAndUsers($onlyLabels) as $lau) {
+            $users[$lau->user->id] = $lau->user;
+        }
+
+        return $users;
+    }
+
+    protected function getAnnotationLabelAndUsers(array $onlyLabels = []): array
+    {
+        $ret = [];
         $onlyLabels = array_flip($onlyLabels);
 
         foreach ($this->getAnnotations() as $annotation) {
-            foreach ($annotation->labels as $lau) {
-                if ($onlyLabels && !array_key_exists($lau->label->id, $onlyLabels)) {
-                    continue;
-                }
-
-                $users[$lau->user->id] = $lau->user;
+            if (!$onlyLabels) {
+                $add = $annotation->labels;
+            } else {
+                $add = array_filter($annotation->labels, fn ($lau) => array_key_exists($lau->label->id, $onlyLabels));
             }
+
+            $ret = array_merge($ret, $add);
         }
 
-        foreach ($this->getFileLabels() as $lau) {
-            if ($onlyLabels && !array_key_exists($lau->label->id, $onlyLabels)) {
-                continue;
-            }
+        return $ret;
+    }
 
-            $users[$lau->user->id] = $lau->user;
+    protected function getFileLabelLabelAndUsers(array $onlyLabels = []): array
+    {
+        if (!$onlyLabels) {
+            return $this->getFileLabels();
         }
 
-        return $users;
+        $onlyLabels = array_flip($onlyLabels);
+
+        return array_filter(
+            $this->getFileLabels(),
+            fn ($lau) => array_key_exists($lau->label->id, $onlyLabels)
+        );
     }
 }
diff --git a/app/Services/MetadataParsing/VolumeMetadata.php b/app/Services/MetadataParsing/VolumeMetadata.php
index 61524b8f6..e0f97a8ed 100644
--- a/app/Services/MetadataParsing/VolumeMetadata.php
+++ b/app/Services/MetadataParsing/VolumeMetadata.php
@@ -2,6 +2,7 @@
 
 namespace Biigle\Services\MetadataParsing;
 
+use Biigle\Label as DbLabel;
 use Biigle\MediaType;
 use Biigle\User as DbUser;
 use Illuminate\Support\Collection;
@@ -73,13 +74,13 @@ public function hasFileLabels(): bool
     /**
      * The returned array is indexed by label IDs.
      */
-    public function getAnnotationLabels(): array
+    public function getAnnotationLabels(array $onlyLabels = []): array
     {
         $labels = [];
 
         foreach ($this->files as $file) {
             // Use union to automatically remove duplicates.
-            $labels += $file->getAnnotationLabels();
+            $labels += $file->getAnnotationLabels($onlyLabels);
         }
 
         return $labels;
@@ -88,14 +89,13 @@ public function getAnnotationLabels(): array
     /**
      * The returned array is indexed by label IDs.
      */
-    public function getFileLabels(): array
+    public function getFileLabels(array $onlyLabels = []): array
     {
         $labels = [];
 
         foreach ($this->files as $file) {
-            foreach ($file->getFileLabels() as $fileLabel) {
-                $labels[$fileLabel->label->id] = $fileLabel->label;
-            }
+            // Use union to automatically remove duplicates.
+            $labels += $file->getFileLabelLabels($onlyLabels);
         }
 
         return $labels;
@@ -126,8 +126,8 @@ public function getUsers(array $onlyLabels = []): array
      * @param array $onlyLabels Consider only users belonging to annotation labels or
      *  file labels with one of the specified metadata label IDs.
      *
-     * @return array Map of metadata user IDs to User database model instances or null
-     * if no match was found.
+     * @return array Map of metadata user IDs to database user IDs or null if no match
+     * was found.
      */
     public function getMatchingUsers(array $map = [], array $onlyLabels = []): array
     {
@@ -138,7 +138,8 @@ public function getMatchingUsers(array $map = [], array $onlyLabels = []): array
         $map = array_filter($map, fn ($id) => $idMap->has($id));
 
         // Fetch database user IDs based on UUIDs.
-        $fetchUuids = array_filter($users,
+        $fetchUuids = array_filter(
+            $users,
             fn ($u) => !array_key_exists($u->id, $map) && !is_null($u->uuid)
         );
         $fetchUuids = array_map(fn ($u) => $u->uuid, $fetchUuids);
@@ -154,4 +155,40 @@ public function getMatchingUsers(array $map = [], array $onlyLabels = []): array
 
         return $map;
     }
+
+    /**
+     * @param array $map Optional map of metadata label IDs to database label IDs.
+     * Metadata labels not in this list will be matched by their UUID (if any).
+     * @param array $onlyLabels Consider only labels with one of the specified metadata
+     * label IDs.
+     *
+     * @return array Map of metadata label IDs to database label IDs or null if no match
+     * was found.
+     */
+    public function getMatchingLabels(array $map = [], array $onlyLabels = []): array
+    {
+        $labels = $this->getAnnotationLabels($onlyLabels) + $this->getFileLabels($onlyLabels);
+
+        // Remove database label IDs that don't actually exist.
+        $idMap = DbLabel::whereIn('id', array_unique($map))->pluck('id', 'id');
+        $map = array_filter($map, fn ($id) => $idMap->has($id));
+
+        // Fetch database label IDs based on UUIDs.
+        $fetchUuids = array_filter(
+            $labels,
+            fn ($l) => !array_key_exists($l->id, $map) && !is_null($l->uuid)
+        );
+        $fetchUuids = array_map(fn ($l) => $l->uuid, $fetchUuids);
+        $uuidMap = DbLabel::whereIn('uuid', $fetchUuids)->pluck('id', 'uuid');
+
+        foreach ($labels as $label) {
+            if (array_key_exists($label->id, $map)) {
+                continue;
+            }
+
+            $map[$label->id] = $uuidMap->get($label->uuid, null);
+        }
+
+        return $map;
+    }
 }
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
index 6f52bca60..21c53e022 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
@@ -441,6 +441,7 @@ public function testUpdateUserMapFileLabel()
     public function testStoreImport()
     {
         $dbUser = DbUser::factory()->create();
+        $dbLabel = DbLabel::factory()->create();
         $metadata = new VolumeMetadata;
         $file = new ImageMetadata('1.jpg');
         $metadata->addFile($file);
@@ -458,6 +459,7 @@ public function testStoreImport()
             'metadata_file_path' => 'mymeta.csv',
             'import_file_labels' => true,
             'user_map' => [321 => $dbUser->id],
+            'label_map' => [123 => $dbLabel->id],
         ]);
         $id = $pv->id;
 
@@ -487,6 +489,7 @@ public function testStoreImport()
     public function testStoreImportNoImportAnnotationsSet()
     {
         $dbUser = DbUser::factory()->create();
+        $dbLabel = DbLabel::factory()->create();
         $metadata = new VolumeMetadata;
         $file = new ImageMetadata('1.jpg');
         $metadata->addFile($file);
@@ -509,6 +512,7 @@ public function testStoreImportNoImportAnnotationsSet()
             'metadata_file_path' => 'mymeta.csv',
             'volume_id' => $this->volume()->id,
             'user_map' => [321 => $dbUser->id],
+            'label_map' => [123 => $dbLabel->id],
         ]);
         $id = $pv->id;
 
@@ -521,6 +525,7 @@ public function testStoreImportNoImportAnnotationsSet()
     public function testStoreImportNoImportFileLabelsSet()
     {
         $dbUser = DbUser::factory()->create();
+        $dbLabel = DbLabel::factory()->create();
         $metadata = new VolumeMetadata;
         $file = new ImageMetadata('1.jpg');
         $metadata->addFile($file);
@@ -538,6 +543,7 @@ public function testStoreImportNoImportFileLabelsSet()
             'metadata_file_path' => 'mymeta.csv',
             'volume_id' => $this->volume()->id,
             'user_map' => [321 => $dbUser->id],
+            'label_map' => [123 => $dbLabel->id],
         ]);
         $id = $pv->id;
 
@@ -690,13 +696,14 @@ public function testStoreImportAlreadyImporting()
         $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertStatus(422);
     }
 
-    public function testStoreImportMatchUserByUuid()
+    public function testStoreImportMatchByUuid()
     {
         $dbUser = DbUser::factory()->create();
+        $dbLabel = DbLabel::factory()->create();
         $metadata = new VolumeMetadata;
         $file = new ImageMetadata('1.jpg');
         $metadata->addFile($file);
-        $label = new Label(123, 'my label');
+        $label = new Label(123, 'my label', uuid: $dbLabel->uuid);
         $user = new User(321, 'joe user', uuid: $dbUser->uuid);
         $lau = new LabelAndUser($label, $user);
         $file->addFileLabel($lau);
@@ -717,13 +724,9 @@ public function testStoreImportMatchUserByUuid()
         $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertSuccessful();
     }
 
-    public function testStoreImportMatchLabelByUuid()
-    {
-        //
-    }
-
     public function testStoreImportUserNoMatch()
     {
+        $dbLabel = DbLabel::factory()->create();
         $metadata = new VolumeMetadata;
         $file = new ImageMetadata('1.jpg');
         $metadata->addFile($file);
@@ -741,6 +744,7 @@ public function testStoreImportUserNoMatch()
             'metadata_file_path' => 'mymeta.csv',
             'volume_id' => $this->volume()->id,
             'import_file_labels' => true,
+            'label_map' => [123 => $dbLabel->id],
         ]);
         $id = $pv->id;
 
@@ -750,12 +754,36 @@ public function testStoreImportUserNoMatch()
 
     public function testStoreImportLabelNoMatch()
     {
-        // uuid not found
+        $dbUser = DbUser::factory()->create();
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+            'import_file_labels' => true,
+            'user_map' => [321 => $dbUser->id],
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+        $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertStatus(422);
     }
 
-    public function testStoreImportUserMatchOnlyWithAnnotationLabelFilter()
+    public function testStoreImportMatchOnlyWithAnnotationLabelFilter()
     {
         $dbUser = DbUser::factory()->create();
+        $dbLabel = DbLabel::factory()->create();
         $metadata = new VolumeMetadata;
         $file = new ImageMetadata('1.jpg');
         $metadata->addFile($file);
@@ -789,6 +817,7 @@ public function testStoreImportUserMatchOnlyWithAnnotationLabelFilter()
             'import_annotations' => true,
             'only_annotation_labels' => [123],
             'user_map' => [321 => $dbUser->id],
+            'label_map' => [123 => $dbLabel->id],
 
         ]);
         $id = $pv->id;
@@ -797,9 +826,10 @@ public function testStoreImportUserMatchOnlyWithAnnotationLabelFilter()
         $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertSuccessful();
     }
 
-    public function testStoreImportUserMatchOnlyWithFileLabelFilter()
+    public function testStoreImportMatchOnlyWithFileLabelFilter()
     {
         $dbUser = DbUser::factory()->create();
+        $dbLabel = DbLabel::factory()->create();
         $metadata = new VolumeMetadata;
         $file = new ImageMetadata('1.jpg');
         $metadata->addFile($file);
@@ -823,6 +853,7 @@ public function testStoreImportUserMatchOnlyWithFileLabelFilter()
             'import_file_labels' => true,
             'only_file_labels' => [123],
             'user_map' => [321 => $dbUser->id],
+            'label_map' => [123 => $dbLabel->id],
 
         ]);
         $id = $pv->id;
@@ -830,14 +861,4 @@ public function testStoreImportUserMatchOnlyWithFileLabelFilter()
         $this->beAdmin();
         $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertSuccessful();
     }
-
-    public function testStoreImportLabelMatchOnlyWithAnnotationLabelFilter()
-    {
-        // the label without match is ignored by only_annotation_labels
-    }
-
-    public function testStoreImportLabelMatchOnlyWithFileLabelFilter()
-    {
-        // the label without match is ignored by only_file_labels
-    }
 }
diff --git a/tests/php/Services/MetadataParsing/FileMetadataTest.php b/tests/php/Services/MetadataParsing/FileMetadataTest.php
index afa3a6809..c019c6054 100644
--- a/tests/php/Services/MetadataParsing/FileMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/FileMetadataTest.php
@@ -44,6 +44,22 @@ public function testHasAnnotations()
         $this->assertTrue($data->hasAnnotations());
     }
 
+    public function testGetFileLabelLabels()
+    {
+        $data = new ImageMetadata('filename');
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+
+        $this->assertEquals([], $data->getFileLabelLabels());
+        $data->addFileLabel($lau);
+        $this->assertEquals([123 => $label], $data->getFileLabelLabels());
+
+        $label2 = new Label(456, 'my label');
+        $lau = new LabelAndUser($label2, $user);
+        $this->assertEquals([123 => $label], $data->getFileLabelLabels([123]));
+    }
+
     public function testHasFileLabels()
     {
         $data = new ImageMetadata('filename');
@@ -71,6 +87,16 @@ public function testGetAnnotationLabels()
         $this->assertEquals([], $data->getAnnotationLabels());
         $data->addAnnotation($annotation);
         $this->assertEquals([123 => $label], $data->getAnnotationLabels());
+
+        $label2 = new Label(456, 'my label');
+        $lau = new LabelAndUser($label2, $user);
+        $annotation2 = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+        $data->addAnnotation($annotation2);
+        $this->assertEquals([123 => $label], $data->getAnnotationLabels([123]));
     }
 
     public function testGetUsers()
@@ -95,7 +121,7 @@ public function testGetUsers()
         $this->assertEquals([321 => $user1, 432 => $user2], $data->getUsers());
     }
 
-    public function testGetUsersOnlyLabels()
+    public function testGetFileLabelUsersOnlyLabels()
     {
         $data = new ImageMetadata('filename');
 
@@ -111,4 +137,31 @@ public function testGetUsersOnlyLabels()
 
         $this->assertEquals([432 => $user1], $data->getUsers([123]));
     }
+
+    public function testGetAnnotationUsersOnlyLabels()
+    {
+        $data = new ImageMetadata('filename');
+
+        $label1 = new Label(123, 'my label');
+        $user1 = new User(432, 'joe user');
+        $lau = new LabelAndUser($label1, $user1);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+        $data->addAnnotation($annotation);
+
+        $label2 = new Label(456, 'my label');
+        $user2 = new User(654, 'joe user');
+        $lau = new LabelAndUser($label2, $user2);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+        $data->addAnnotation($annotation);
+
+        $this->assertEquals([432 => $user1], $data->getUsers([123]));
+    }
 }
diff --git a/tests/php/Services/MetadataParsing/VolumeMetadataTest.php b/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
index af6f6924d..0f9d10afe 100644
--- a/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
@@ -2,8 +2,8 @@
 
 namespace Biigle\Tests\Services\MetadataParsing;
 
+use Biigle\Label as DbLabel;
 use Biigle\MediaType;
-use Biigle\User as DbUser;
 use Biigle\Services\MetadataParsing\FileMetadata;
 use Biigle\Services\MetadataParsing\ImageAnnotation;
 use Biigle\Services\MetadataParsing\ImageMetadata;
@@ -12,6 +12,7 @@
 use Biigle\Services\MetadataParsing\User;
 use Biigle\Services\MetadataParsing\VolumeMetadata;
 use Biigle\Shape;
+use Biigle\User as DbUser;
 use TestCase;
 
 class VolumeMetadataTest extends TestCase
@@ -111,6 +112,34 @@ public function testGetAnnotationLabels()
         $this->assertEquals([123 => $label], $metadata->getAnnotationLabels());
     }
 
+    public function testGetAnnotationLabelsOnlyLabels()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('filename');
+        $metadata->addFile($file);
+
+        $label1 = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $la = new LabelAndUser($label1, $user);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$la],
+        );
+        $file->addAnnotation($annotation);
+
+        $label2 = new Label(456, 'my label');
+        $la = new LabelAndUser($label2, $user);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$la],
+        );
+        $file->addAnnotation($annotation);
+
+        $this->assertEquals([123 => $label1], $metadata->getAnnotationLabels([123]));
+    }
+
     public function testGetFileLabels()
     {
         $metadata = new VolumeMetadata;
@@ -125,6 +154,24 @@ public function testGetFileLabels()
         $this->assertEquals([123 => $label], $metadata->getFileLabels());
     }
 
+    public function testGetFileLabelsOnlyLabels()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('filename');
+        $metadata->addFile($file);
+
+        $label1 = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $la = new LabelAndUser($label1, $user);
+        $file->addFileLabel($la);
+
+        $label2 = new Label(456, 'my label');
+        $la = new LabelAndUser($label2, $user);
+        $file->addFileLabel($la);
+
+        $this->assertEquals([123 => $label1], $metadata->getFileLabels([123]));
+    }
+
     public function testGetUsers()
     {
         $metadata = new VolumeMetadata;
@@ -229,4 +276,68 @@ public function testGetMatchingUsersOnlyLabels()
         $matches = $metadata->getMatchingUsers([321 => $dbUser->id], [123]);
         $this->assertEquals([321 => $dbUser->id], $matches);
     }
+
+    public function testGetMatchingLabelsByMap()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('filename');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $la = new LabelAndUser($label, $user);
+        $file->addFileLabel($la);
+
+        $dbLabel = DbLabel::factory()->create();
+        $matches = $metadata->getMatchingLabels([123 => $dbLabel->id]);
+        $this->assertEquals([123 => $dbLabel->id], $matches);
+    }
+
+    public function testGetMatchingLabelsByUuid()
+    {
+        $dbLabel = DbLabel::factory()->create();
+
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('filename');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label', uuid: $dbLabel->uuid);
+        $user = new User(321, 'joe user');
+        $la = new LabelAndUser($label, $user);
+        $file->addFileLabel($la);
+
+        $matches = $metadata->getMatchingLabels();
+        $this->assertEquals([123 => $dbLabel->id], $matches);
+    }
+
+    public function testGetMatchingLabelsNoMatch()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('filename');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label', uuid: "398f42c6-0f24-38de-a1c6-3c467fcb4250");
+        $user = new User(321, 'joe user');
+        $la = new LabelAndUser($label, $user);
+        $file->addFileLabel($la);
+
+        $matches = $metadata->getMatchingLabels([123 => -1]);
+        $this->assertEquals([123 => null], $matches);
+    }
+
+    public function testGetMatchingLabelsOnlyLabels()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('filename');
+        $metadata->addFile($file);
+        $label1 = new Label(123, 'my label');
+        $user1 = new User(321, 'joe user');
+        $la = new LabelAndUser($label1, $user1);
+        $file->addFileLabel($la);
+        $label2 = new Label(456, 'my label');
+        $user2 = new User(654, 'joe user');
+        $la = new LabelAndUser($label2, $user2);
+        $file->addFileLabel($la);
+
+        $dbLabel = DbLabel::factory()->create();
+        $matches = $metadata->getMatchingLabels([123 => $dbLabel->id], [123]);
+        $this->assertEquals([123 => $dbLabel->id], $matches);
+    }
 }

From cc056ad34a42ce2b96b7c6cb87c51a367182c038 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 22 Mar 2024 16:18:45 +0100
Subject: [PATCH 071/209] Implement basic features for ImportVolumeMetadata job

---
 app/Jobs/ImportVolumeMetadata.php             | 140 +++++++++++++++++-
 app/PendingVolume.php                         |   5 +
 app/Services/MetadataParsing/Annotation.php   |  13 ++
 .../MetadataParsing/ImageAnnotation.php       |  10 +-
 .../MetadataParsing/VideoAnnotation.php       |  11 ++
 .../MetadataParsing/VolumeMetadata.php        |   8 +
 .../Api/PendingVolumeImportControllerTest.php |   8 +-
 tests/php/Jobs/ImportVolumeMetadataTest.php   | 117 +++++++++++++++
 .../MetadataParsing/ImageAnnotationTest.php   |  27 ++++
 .../MetadataParsing/VideoAnnotationTest.php   |  29 ++++
 .../MetadataParsing/VolumeMetadataTest.php    |  30 ++++
 11 files changed, 390 insertions(+), 8 deletions(-)
 create mode 100644 tests/php/Services/MetadataParsing/ImageAnnotationTest.php
 create mode 100644 tests/php/Services/MetadataParsing/VideoAnnotationTest.php

diff --git a/app/Jobs/ImportVolumeMetadata.php b/app/Jobs/ImportVolumeMetadata.php
index b5d712ae0..b173827b8 100644
--- a/app/Jobs/ImportVolumeMetadata.php
+++ b/app/Jobs/ImportVolumeMetadata.php
@@ -2,9 +2,17 @@
 
 namespace Biigle\Jobs;
 
+use Biigle\Image;
+use Biigle\ImageAnnotationLabel;
+use Biigle\ImageLabel;
 use Biigle\PendingVolume;
+use Biigle\Services\MetadataParsing\FileMetadata;
+use Biigle\VideoAnnotationLabel;
+use Biigle\VideoLabel;
+use Biigle\VolumeFile;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\DB;
 
 class ImportVolumeMetadata extends Job implements ShouldQueue
 {
@@ -21,17 +29,137 @@ class ImportVolumeMetadata extends Job implements ShouldQueue
      * Create a new job instance.
      *
      */
-    public function __construct(public PendingVolume $pendingVolume)
+    public function __construct(public PendingVolume $pv)
     {
         //
     }
 
     public function handle(): void
     {
-        // ignore annotations with deleted labels, set null to
-        // annotations with deleted users (as they could be deleted in the meantime).
-        // do not import annotations/file labels if the pending volume property is false.
-        //
-        // delete pending volume on success
+        DB::transaction(function () {
+            $metadata = $this->pv->getMetadata();
+            $onlyLabels = ($this->pv->only_annotation_labels ?: []) + ($this->pv->only_file_labels ?: []);
+            $userMap = $metadata->getMatchingUsers($this->pv->user_map ?: [], $onlyLabels);
+            $labelMap = $metadata->getMatchingLabels($this->pv->label_map ?: [], $onlyLabels);
+            foreach ($this->pv->volume->files()->lazyById() as $file) {
+                $metaFile = $metadata->getFile($file->filename);
+                if (!$metaFile) {
+                    continue;
+                }
+
+                if ($this->pv->import_annotations && $metaFile->hasAnnotations()) {
+                    $this->insertAnnotations($metaFile, $file, $userMap, $labelMap);
+                }
+
+                if ($this->pv->import_file_labels && $metaFile->hasFileLabels()) {
+                    $this->insertFileLabels($metaFile, $file, $userMap, $labelMap);
+                }
+            }
+        });
+
+        $this->pv->delete();
+    }
+
+    /**
+     * Insert metadata annotations of a file into the database.
+     */
+    protected function insertAnnotations(
+        FileMetadata $meta,
+        VolumeFile $file,
+        array $userMap,
+        array $labelMap
+    ): void {
+        $insertAnnotations = [];
+        $insertAnnotationLabels = [];
+
+        foreach ($meta->getAnnotations() as $annotation) {
+            // This will remove labels that should be ignored based on $onlyLabels and
+            // that have no match in the database.
+            $annotationLabels = array_filter(
+                $annotation->labels,
+                fn ($lau) => !is_null($labelMap[$lau->label->id] ?? null)
+            );
+
+            if (empty($annotationLabels)) {
+                continue;
+            }
+
+            $insertAnnotations[] = $annotation->getInsertData($file->id);
+
+            $insertAnnotationLabels[] = array_map(fn ($lau) => [
+                'label_id' => $labelMap[$lau->label->id],
+                'user_id' => $userMap[$lau->user->id],
+            ], $annotationLabels);
+        }
+
+        $file->annotations()->insert($insertAnnotations);
+
+        $ids = $file->annotations()
+            ->orderBy('id', 'desc')
+            ->take(count($insertAnnotations))
+            ->pluck('id')
+            ->reverse()
+            ->toArray();
+
+        $insertAnnotationLabels = array_combine($ids, $insertAnnotationLabels);
+
+        foreach ($insertAnnotationLabels as $id => &$insert) {
+            foreach ($insert as &$i) {
+                $i['annotation_id'] = $id;
+            }
+        }
+
+        // Flatten.
+        $insertAnnotationLabels = array_merge(...$insertAnnotationLabels);
+
+        if ($file instanceof Image) {
+            foreach ($insertAnnotationLabels as &$i) {
+                $i['confidence'] = 1.0;
+            }
+
+            ImageAnnotationLabel::insert($insertAnnotationLabels);
+        } else {
+            VideoAnnotationLabel::insert($insertAnnotationLabels);
+        }
+    }
+
+    /**
+     * Insert metadata file labels of a file into the database.
+     */
+    protected function insertFileLabels(
+        FileMetadata $meta,
+        VolumeFile $file,
+        array $userMap,
+        array $labelMap
+    ): void {
+        // This will remove labels that should be ignored based on $onlyLabels and
+        // that have no match in the database.
+        $fileLabels = array_filter(
+            $meta->getFileLabels(),
+            fn ($lau) => !is_null($labelMap[$lau->label->id] ?? null)
+        );
+
+        if (empty($fileLabels)) {
+            return;
+        }
+
+        $insertFileLabels = array_map(fn ($lau) => [
+            'label_id' => $labelMap[$lau->label->id],
+            'user_id' => $userMap[$lau->user->id],
+        ], $fileLabels);
+
+        if ($file instanceof Image) {
+            foreach ($insertFileLabels as &$i) {
+                $i['image_id'] = $file->id;
+            }
+
+            ImageLabel::insert($insertFileLabels);
+        } else {
+            foreach ($insertFileLabels as &$i) {
+                $i['video_id'] = $file->id;
+            }
+
+            VideoLabel::insert($insertFileLabels);
+        }
     }
 }
diff --git a/app/PendingVolume.php b/app/PendingVolume.php
index 7882297ff..5b28b527f 100644
--- a/app/PendingVolume.php
+++ b/app/PendingVolume.php
@@ -65,4 +65,9 @@ public function project(): BelongsTo
     {
         return $this->belongsTo(Project::class);
     }
+
+    public function volume(): BelongsTo
+    {
+        return $this->belongsTo(Volume::class);
+    }
 }
diff --git a/app/Services/MetadataParsing/Annotation.php b/app/Services/MetadataParsing/Annotation.php
index 5886f6351..544e57560 100644
--- a/app/Services/MetadataParsing/Annotation.php
+++ b/app/Services/MetadataParsing/Annotation.php
@@ -18,4 +18,17 @@ public function __construct(
     ) {
         //
     }
+
+    /**
+     * Get the array of metadata that can be used for Model::insert();
+     *
+     * @param int $id ID of the image/video database model.
+     */
+    public function getInsertData(int $id): array
+    {
+        return [
+            'points' => json_encode($this->points),
+            'shape_id' => $this->shape->id,
+        ];
+    }
 }
diff --git a/app/Services/MetadataParsing/ImageAnnotation.php b/app/Services/MetadataParsing/ImageAnnotation.php
index 3df781ed2..e57e784fc 100644
--- a/app/Services/MetadataParsing/ImageAnnotation.php
+++ b/app/Services/MetadataParsing/ImageAnnotation.php
@@ -4,5 +4,13 @@
 
 class ImageAnnotation extends Annotation
 {
-    //
+    /**
+     * {@inheritdoc}
+     */
+    public function getInsertData(int $id): array
+    {
+        return array_merge(parent::getInsertData($id), [
+            'image_id' => $id,
+        ]);
+    }
 }
diff --git a/app/Services/MetadataParsing/VideoAnnotation.php b/app/Services/MetadataParsing/VideoAnnotation.php
index d2736236b..0eae3fe3b 100644
--- a/app/Services/MetadataParsing/VideoAnnotation.php
+++ b/app/Services/MetadataParsing/VideoAnnotation.php
@@ -20,4 +20,15 @@ public function __construct(
     ) {
         //
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getInsertData(int $id): array
+    {
+        return array_merge(parent::getInsertData($id), [
+            'video_id' => $id,
+            'frames' => json_encode($this->frames),
+        ]);
+    }
 }
diff --git a/app/Services/MetadataParsing/VolumeMetadata.php b/app/Services/MetadataParsing/VolumeMetadata.php
index e0f97a8ed..f83a85488 100644
--- a/app/Services/MetadataParsing/VolumeMetadata.php
+++ b/app/Services/MetadataParsing/VolumeMetadata.php
@@ -133,6 +133,10 @@ public function getMatchingUsers(array $map = [], array $onlyLabels = []): array
     {
         $users = $this->getUsers($onlyLabels);
 
+        // Remove metadata user IDs that don't actually exist.
+        $idMap = array_flip(array_map(fn ($u) => $u->id, $users));
+        $map = array_filter($map, fn ($id) => array_key_exists($id, $idMap), ARRAY_FILTER_USE_KEY);
+
         // Remove database user IDs that don't actually exist.
         $idMap = DbUser::whereIn('id', array_unique($map))->pluck('id', 'id');
         $map = array_filter($map, fn ($id) => $idMap->has($id));
@@ -169,6 +173,10 @@ public function getMatchingLabels(array $map = [], array $onlyLabels = []): arra
     {
         $labels = $this->getAnnotationLabels($onlyLabels) + $this->getFileLabels($onlyLabels);
 
+        // Remove metadata label IDs that don't actually exist.
+        $idMap = array_flip(array_map(fn ($l) => $l->id, $labels));
+        $map = array_filter($map, fn ($id) => array_key_exists($id, $idMap), ARRAY_FILTER_USE_KEY);
+
         // Remove database label IDs that don't actually exist.
         $idMap = DbLabel::whereIn('id', array_unique($map))->pluck('id', 'id');
         $map = array_filter($map, fn ($id) => $idMap->has($id));
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
index 21c53e022..59bc4c120 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
@@ -478,7 +478,7 @@ public function testStoreImport()
         $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertSuccessful();
 
         Queue::assertPushed(ImportVolumeMetadata::class, function ($job) use ($pv) {
-            $this->assertEquals($pv->id, $job->pendingVolume->id);
+            $this->assertEquals($pv->id, $job->pv->id);
 
             return true;
         });
@@ -861,4 +861,10 @@ public function testStoreImportMatchOnlyWithFileLabelFilter()
         $this->beAdmin();
         $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertSuccessful();
     }
+
+    public function testStoreImportValidateAnnotationPoints()
+    {
+        // use validator of HasPointsAttribute, maybe convert it to a validation rule.
+        // and use this in regular annotation requests, too.
+    }
 }
diff --git a/tests/php/Jobs/ImportVolumeMetadataTest.php b/tests/php/Jobs/ImportVolumeMetadataTest.php
index eb8eba898..0c38e5381 100644
--- a/tests/php/Jobs/ImportVolumeMetadataTest.php
+++ b/tests/php/Jobs/ImportVolumeMetadataTest.php
@@ -2,12 +2,129 @@
 
 namespace Biigle\Tests\Jobs;
 
+use Biigle\Image;
+use Biigle\Jobs\ImportVolumeMetadata;
+use Biigle\Label as DbLabel;
+use Biigle\MediaType;
+use Biigle\PendingVolume;
+use Biigle\Services\MetadataParsing\ImageAnnotation;
+use Biigle\Services\MetadataParsing\ImageMetadata;
+use Biigle\Services\MetadataParsing\Label;
+use Biigle\Services\MetadataParsing\LabelAndUser;
+use Biigle\Services\MetadataParsing\User;
+use Biigle\Services\MetadataParsing\VolumeMetadata;
+use Biigle\Shape;
+use Biigle\User as DbUser;
+use Biigle\Volume;
+use Illuminate\Support\Facades\Cache;
 use TestCase;
 
 class ImportVolumeMetadataTest extends TestCase
 {
     public function testHandle()
+    {
+        $image = Image::factory()->create();
+        $dbUser = DbUser::factory()->create();
+        $dbLabel = DbLabel::factory()->create();
+
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata($image->filename);
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'media_type_id' => MediaType::imageId(),
+            'metadata_file_path' => 'mymeta.csv',
+            'import_file_labels' => true,
+            'import_annotations' => true,
+            'user_map' => [321 => $dbUser->id],
+            'label_map' => [123 => $dbLabel->id],
+            'volume_id' => $image->volume_id,
+        ]);
+        $id = $pv->id;
+
+        (new ImportVolumeMetadata($pv))->handle();
+
+        $annotations = $image->annotations;
+        $this->assertCount(1, $annotations);
+        $this->assertEquals([10, 10], $annotations[0]->points);
+        $this->assertEquals(Shape::pointId(), $annotations[0]->shape_id);
+        $annotationLabels = $annotations[0]->labels;
+        $this->assertCount(1, $annotationLabels);
+        $this->assertEquals($dbUser->id, $annotationLabels[0]->user_id);
+        $this->assertEquals($dbLabel->id, $annotationLabels[0]->label_id);
+
+        $fileLabels = $image->labels;
+        $this->assertCount(1, $fileLabels);
+        $this->assertEquals($dbUser->id, $fileLabels[0]->user_id);
+        $this->assertEquals($dbLabel->id, $fileLabels[0]->label_id);
+
+        $this->assertNull($pv->fresh());
+    }
+
+    public function testHandleVideo()
     {
         //
     }
+
+    public function testHandleMatchByUuid()
+    {
+        //
+    }
+
+    public function testHandleDeletedUser()
+    {
+        // set null
+    }
+
+    public function testHandleDeletedLabel()
+    {
+        // ignore
+    }
+
+    public function testHandleIgnoreAnnotations()
+    {
+        // if import_annotation === false
+    }
+
+    public function testHandleIgnoreFileLabels()
+    {
+        // if import_file_labels === false
+    }
+
+    public function testHandleFilterAnnotationLabels()
+    {
+        // respect only_annotation_labels
+    }
+
+    public function testHandleFilterFileLabels()
+    {
+        // respect only_file_labels
+    }
+
+    public function testHandleIgnoreMissingFiles()
+    {
+        // skip metadata files that don't exist in the volume
+    }
+
+    public function testHandleRetryWhileCreatingAsync()
+    {
+        // if the volume has creating_async === true, resubmit the import job and wait for 10 minutes (max. 12 times before failing?)
+    }
+
+    public function testHandleChunkAnnotations()
+    {
+        // configure the cunk size to 2 and test
+    }
 }
diff --git a/tests/php/Services/MetadataParsing/ImageAnnotationTest.php b/tests/php/Services/MetadataParsing/ImageAnnotationTest.php
new file mode 100644
index 000000000..c0c6f999b
--- /dev/null
+++ b/tests/php/Services/MetadataParsing/ImageAnnotationTest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Biigle\Tests\Services\MetadataParsing;
+
+use Biigle\Services\MetadataParsing\ImageAnnotation;
+use Biigle\Shape;
+use TestCase;
+
+class ImageAnnotationTest extends TestCase
+{
+    public function testGetInsertData()
+    {
+        $data = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [],
+        );
+
+        $expect = [
+            'image_id' => 123,
+            'points' => '[10,10]',
+            'shape_id' => Shape::pointId(),
+        ];
+
+        $this->assertEquals($expect, $data->getInsertData(123));
+    }
+}
diff --git a/tests/php/Services/MetadataParsing/VideoAnnotationTest.php b/tests/php/Services/MetadataParsing/VideoAnnotationTest.php
new file mode 100644
index 000000000..3e0bfe344
--- /dev/null
+++ b/tests/php/Services/MetadataParsing/VideoAnnotationTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Biigle\Tests\Services\MetadataParsing;
+
+use Biigle\Services\MetadataParsing\VideoAnnotation;
+use Biigle\Shape;
+use TestCase;
+
+class VideoAnnotationTest extends TestCase
+{
+    public function testGetInsertData()
+    {
+        $data = new VideoAnnotation(
+            shape: Shape::point(),
+            points: [[10, 10]],
+            frames: [1],
+            labels: [],
+        );
+
+        $expect = [
+            'video_id' => 123,
+            'points' => '[[10,10]]',
+            'shape_id' => Shape::pointId(),
+            'frames' => '[1]',
+        ];
+
+        $this->assertEquals($expect, $data->getInsertData(123));
+    }
+}
diff --git a/tests/php/Services/MetadataParsing/VolumeMetadataTest.php b/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
index 0f9d10afe..b26ba9233 100644
--- a/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
+++ b/tests/php/Services/MetadataParsing/VolumeMetadataTest.php
@@ -277,6 +277,21 @@ public function testGetMatchingUsersOnlyLabels()
         $this->assertEquals([321 => $dbUser->id], $matches);
     }
 
+    public function testGetMatchingUsersIgnoreNotInMetadata()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('filename');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $la = new LabelAndUser($label, $user);
+        $file->addFileLabel($la);
+
+        $dbUser = DbUser::factory()->create();
+        $matches = $metadata->getMatchingUsers([321 => $dbUser->id, 432 => $dbUser->id]);
+        $this->assertEquals([321 => $dbUser->id], $matches);
+    }
+
     public function testGetMatchingLabelsByMap()
     {
         $metadata = new VolumeMetadata;
@@ -340,4 +355,19 @@ public function testGetMatchingLabelsOnlyLabels()
         $matches = $metadata->getMatchingLabels([123 => $dbLabel->id], [123]);
         $this->assertEquals([123 => $dbLabel->id], $matches);
     }
+
+    public function testGetMatchingLabelsIgnoreNotInMetadata()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('filename');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $la = new LabelAndUser($label, $user);
+        $file->addFileLabel($la);
+
+        $dbLabel = DbLabel::factory()->create();
+        $matches = $metadata->getMatchingLabels([123 => $dbLabel->id, 234 => $dbLabel->id]);
+        $this->assertEquals([123 => $dbLabel->id], $matches);
+    }
 }

From dcddb257fa2cacb88786c9d682ab4dcb1801852d Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 22 Mar 2024 16:32:27 +0100
Subject: [PATCH 072/209] Fix array_merge with associative array unpacking

Unpacking could have lead to issues with non-unique IDs.
See: https://php.watch/versions/8.1/spread-operator-string-array-keys
---
 app/Jobs/ImportVolumeMetadata.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/Jobs/ImportVolumeMetadata.php b/app/Jobs/ImportVolumeMetadata.php
index b173827b8..0d50ecd60 100644
--- a/app/Jobs/ImportVolumeMetadata.php
+++ b/app/Jobs/ImportVolumeMetadata.php
@@ -101,10 +101,8 @@ protected function insertAnnotations(
             ->reverse()
             ->toArray();
 
-        $insertAnnotationLabels = array_combine($ids, $insertAnnotationLabels);
-
-        foreach ($insertAnnotationLabels as $id => &$insert) {
-            foreach ($insert as &$i) {
+        foreach ($ids as $index => $id) {
+            foreach ($insertAnnotationLabels[$index] as &$i) {
                 $i['annotation_id'] = $id;
             }
         }

From 1d8363e79d2ad126ad847869ef343921852a2f06 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 22 Mar 2024 17:06:28 +0100
Subject: [PATCH 073/209] Implement more tests for ImportVolumeMetadata job

---
 .../Api/PendingVolumeImportControllerTest.php |   1 +
 tests/php/Jobs/ImportVolumeMetadataTest.php   | 342 +++++++++++++++++-
 2 files changed, 335 insertions(+), 8 deletions(-)

diff --git a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
index 59bc4c120..b5593f522 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
@@ -866,5 +866,6 @@ public function testStoreImportValidateAnnotationPoints()
     {
         // use validator of HasPointsAttribute, maybe convert it to a validation rule.
         // and use this in regular annotation requests, too.
+        // also validate video anotation frames (i.e. if it is an array of floats)
     }
 }
diff --git a/tests/php/Jobs/ImportVolumeMetadataTest.php b/tests/php/Jobs/ImportVolumeMetadataTest.php
index 0c38e5381..a239e81fa 100644
--- a/tests/php/Jobs/ImportVolumeMetadataTest.php
+++ b/tests/php/Jobs/ImportVolumeMetadataTest.php
@@ -12,9 +12,11 @@
 use Biigle\Services\MetadataParsing\Label;
 use Biigle\Services\MetadataParsing\LabelAndUser;
 use Biigle\Services\MetadataParsing\User;
+use Biigle\Services\MetadataParsing\VideoAnnotation;
 use Biigle\Services\MetadataParsing\VolumeMetadata;
 use Biigle\Shape;
 use Biigle\User as DbUser;
+use Biigle\Video;
 use Biigle\Volume;
 use Illuminate\Support\Facades\Cache;
 use TestCase;
@@ -75,42 +77,366 @@ public function testHandle()
 
     public function testHandleVideo()
     {
-        //
+        $video = Video::factory()->create();
+        $dbUser = DbUser::factory()->create();
+        $dbLabel = DbLabel::factory()->create();
+
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata($video->filename);
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+        $annotation = new VideoAnnotation(
+            shape: Shape::point(),
+            points: [[10, 10]],
+            frames: [1],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'media_type_id' => MediaType::videoId(),
+            'metadata_file_path' => 'mymeta.csv',
+            'import_file_labels' => true,
+            'import_annotations' => true,
+            'user_map' => [321 => $dbUser->id],
+            'label_map' => [123 => $dbLabel->id],
+            'volume_id' => $video->volume_id,
+        ]);
+        $id = $pv->id;
+
+        (new ImportVolumeMetadata($pv))->handle();
+
+        $annotations = $video->annotations;
+        $this->assertCount(1, $annotations);
+        $this->assertEquals([[10, 10]], $annotations[0]->points);
+        $this->assertEquals([1], $annotations[0]->frames);
+        $this->assertEquals(Shape::pointId(), $annotations[0]->shape_id);
+        $annotationLabels = $annotations[0]->labels;
+        $this->assertCount(1, $annotationLabels);
+        $this->assertEquals($dbUser->id, $annotationLabels[0]->user_id);
+        $this->assertEquals($dbLabel->id, $annotationLabels[0]->label_id);
+
+        $fileLabels = $video->labels;
+        $this->assertCount(1, $fileLabels);
+        $this->assertEquals($dbUser->id, $fileLabels[0]->user_id);
+        $this->assertEquals($dbLabel->id, $fileLabels[0]->label_id);
+
+        $this->assertNull($pv->fresh());
     }
 
     public function testHandleMatchByUuid()
     {
-        //
+        $image = Image::factory()->create();
+        $dbUser = DbUser::factory()->create();
+        $dbLabel = DbLabel::factory()->create();
+
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata($image->filename);
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label', uuid: $dbLabel->uuid);
+        $user = new User(321, 'joe user', uuid: $dbUser->uuid);
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'media_type_id' => MediaType::imageId(),
+            'metadata_file_path' => 'mymeta.csv',
+            'import_file_labels' => true,
+            'import_annotations' => true,
+            'volume_id' => $image->volume_id,
+        ]);
+        $id = $pv->id;
+
+        (new ImportVolumeMetadata($pv))->handle();
+
+        $annotation = $image->annotations()->first();
+        $this->assertEquals($dbUser->id, $annotation->labels[0]->user_id);
+        $this->assertEquals($dbLabel->id, $annotation->labels[0]->label_id);
+
+        $this->assertEquals($dbUser->id, $image->labels[0]->user_id);
+        $this->assertEquals($dbLabel->id, $image->labels[0]->label_id);
     }
 
     public function testHandleDeletedUser()
     {
-        // set null
+        $image = Image::factory()->create();
+        $dbUser = DbUser::factory()->create();
+        $dbLabel = DbLabel::factory()->create();
+
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata($image->filename);
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'media_type_id' => MediaType::imageId(),
+            'metadata_file_path' => 'mymeta.csv',
+            'import_file_labels' => true,
+            'import_annotations' => true,
+            'user_map' => [321 => -1],
+            'label_map' => [123 => $dbLabel->id],
+            'volume_id' => $image->volume_id,
+        ]);
+        $id = $pv->id;
+
+        (new ImportVolumeMetadata($pv))->handle();
+
+        $annotation = $image->annotations()->first();
+        $this->assertNull($annotation->labels[0]->user_id);
+        $this->assertNull($image->labels[0]->user_id);
     }
 
     public function testHandleDeletedLabel()
     {
-        // ignore
+        $image = Image::factory()->create();
+        $dbUser = DbUser::factory()->create();
+        $dbLabel = DbLabel::factory()->create();
+
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata($image->filename);
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'media_type_id' => MediaType::imageId(),
+            'metadata_file_path' => 'mymeta.csv',
+            'import_file_labels' => true,
+            'import_annotations' => true,
+            'user_map' => [321 => $dbUser->id],
+            'label_map' => [123 => -1],
+            'volume_id' => $image->volume_id,
+        ]);
+        $id = $pv->id;
+
+        (new ImportVolumeMetadata($pv))->handle();
+
+        $this->assertFalse($image->annotations()->exists());
+        $this->assertFalse($image->labels()->exists());
     }
 
     public function testHandleIgnoreAnnotations()
     {
-        // if import_annotation === false
+        $image = Image::factory()->create();
+        $dbUser = DbUser::factory()->create();
+        $dbLabel = DbLabel::factory()->create();
+
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata($image->filename);
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'media_type_id' => MediaType::imageId(),
+            'metadata_file_path' => 'mymeta.csv',
+            'import_file_labels' => true,
+            'import_annotations' => false,
+            'user_map' => [321 => $dbUser->id],
+            'label_map' => [123 => $dbLabel->id],
+            'volume_id' => $image->volume_id,
+        ]);
+        $id = $pv->id;
+
+        (new ImportVolumeMetadata($pv))->handle();
+
+        $this->assertFalse($image->annotations()->exists());
+        $this->assertTrue($image->labels()->exists());
     }
 
     public function testHandleIgnoreFileLabels()
     {
-        // if import_file_labels === false
+        $image = Image::factory()->create();
+        $dbUser = DbUser::factory()->create();
+        $dbLabel = DbLabel::factory()->create();
+
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata($image->filename);
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'media_type_id' => MediaType::imageId(),
+            'metadata_file_path' => 'mymeta.csv',
+            'import_file_labels' => false,
+            'import_annotations' => true,
+            'user_map' => [321 => $dbUser->id],
+            'label_map' => [123 => $dbLabel->id],
+            'volume_id' => $image->volume_id,
+        ]);
+        $id = $pv->id;
+
+        (new ImportVolumeMetadata($pv))->handle();
+
+        $this->assertTrue($image->annotations()->exists());
+        $this->assertFalse($image->labels()->exists());
     }
 
     public function testHandleFilterAnnotationLabels()
     {
-        // respect only_annotation_labels
+        $image = Image::factory()->create();
+        $dbUser = DbUser::factory()->create();
+        $dbLabel1 = DbLabel::factory()->create();
+        $dbLabel2 = DbLabel::factory()->create();
+
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata($image->filename);
+        $metadata->addFile($file);
+        $label1 = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label1, $user);
+        $file->addFileLabel($lau);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        $label2 = new Label(234, 'my label');
+        $lau = new LabelAndUser($label2, $user);
+        $file->addFileLabel($lau);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [20, 20],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'media_type_id' => MediaType::imageId(),
+            'metadata_file_path' => 'mymeta.csv',
+            'import_file_labels' => true,
+            'import_annotations' => true,
+            'user_map' => [321 => $dbUser->id],
+            'label_map' => [123 => $dbLabel1->id, 234 => $dbLabel2->id],
+            'only_annotation_labels' => [123],
+            'volume_id' => $image->volume_id,
+        ]);
+        $id = $pv->id;
+
+        (new ImportVolumeMetadata($pv))->handle();
+
+        $annotations = $image->annotations;
+        $this->assertCount(1, $annotations);
+        $this->assertEquals([10, 10], $annotations[0]->points);
+        $this->assertEquals(Shape::pointId(), $annotations[0]->shape_id);
+        $annotationLabels = $annotations[0]->labels;
+        $this->assertCount(1, $annotationLabels);
+        $this->assertEquals($dbLabel1->id, $annotationLabels[0]->label_id);
+
+        $this->assertEquals(2, $image->labels()->count());
     }
 
     public function testHandleFilterFileLabels()
     {
-        // respect only_file_labels
+        $image = Image::factory()->create();
+        $dbUser = DbUser::factory()->create();
+        $dbLabel1 = DbLabel::factory()->create();
+        $dbLabel2 = DbLabel::factory()->create();
+
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata($image->filename);
+        $metadata->addFile($file);
+        $label1 = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label1, $user);
+        $file->addFileLabel($lau);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        $label2 = new Label(234, 'my label');
+        $lau = new LabelAndUser($label2, $user);
+        $file->addFileLabel($lau);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [20, 20],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'media_type_id' => MediaType::imageId(),
+            'metadata_file_path' => 'mymeta.csv',
+            'import_file_labels' => true,
+            'import_annotations' => true,
+            'user_map' => [321 => $dbUser->id],
+            'label_map' => [123 => $dbLabel1->id, 234 => $dbLabel2->id],
+            'only_file_labels' => [123],
+            'volume_id' => $image->volume_id,
+        ]);
+        $id = $pv->id;
+
+        (new ImportVolumeMetadata($pv))->handle();
+
+        $this->assertEquals(2, $image->annotations()->count());
+
+        $fileLabels = $image->labels;
+        $this->assertCount(1, $fileLabels);
+        $this->assertEquals($dbLabel1->id, $fileLabels[0]->label_id);
     }
 
     public function testHandleIgnoreMissingFiles()

From d798388a09c2cdb1c1c3f699bb8b1758a0a7a195 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 22 Mar 2024 17:06:54 +0100
Subject: [PATCH 074/209] WIP Add tests to highlight issue with union of
 ignored labels

---
 app/Http/Requests/StorePendingVolumeImport.php       |  4 +++-
 .../Api/PendingVolumeImportControllerTest.php        | 12 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/Http/Requests/StorePendingVolumeImport.php b/app/Http/Requests/StorePendingVolumeImport.php
index 891c91a23..a856e67d3 100644
--- a/app/Http/Requests/StorePendingVolumeImport.php
+++ b/app/Http/Requests/StorePendingVolumeImport.php
@@ -92,7 +92,9 @@ public function withValidator($validator)
                 }
             }
 
-            $onlyLabels = ($pv->only_annotation_labels ?: []) + ($pv->only_file_labels ?: []);
+            // Must not use union here because user/labels might be required for the
+            // annotation import but not the file label import (or vice versa).
+            $onlyLabels = array_intersect($pv->only_annotation_labels ?: [], $pv->only_file_labels ?: []);
 
             $matchingUsers = $metadata->getMatchingUsers($pv->user_map ?: [], $onlyLabels);
             foreach ($matchingUsers as $id => $value) {
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
index b5593f522..8e9f02a66 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
@@ -339,6 +339,18 @@ public function testUpdateLabelMapTryLabelNotAllowed()
         ])->assertStatus(422);
     }
 
+    public function testUpdateLabelMapFilterAnnotationButNotFileLabel()
+    {
+        // choose a label that should be ignored by only_annotation_labels but not by
+        // only_file_labels.
+    }
+
+    public function testUpdateLabelMapFilterFileLabelButNotAnnotation()
+    {
+        // choose a label that should be ignored by only_file_labels but not by
+        // only_annotation_labels.
+    }
+
     public function testUpdateUserMap()
     {
         $metadata = new VolumeMetadata;

From a2e9f3d6b68e393240e8d56e58a7373ee9d9544f Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Mon, 25 Mar 2024 13:11:42 +0100
Subject: [PATCH 075/209] Fix userMap and labelMap filtering for metadata
 import

The annotation and file label import have to be checked separately.
Otherwise a case where a label should be ignored in the annotation
import but not in the file label import (or vice versa) could produce
incorrect results.
---
 .../Requests/StorePendingVolumeImport.php     | 44 ++++++++++++-------
 app/Jobs/ImportVolumeMetadata.php             | 14 +++---
 .../Api/PendingVolumeImportControllerTest.php | 12 -----
 3 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/app/Http/Requests/StorePendingVolumeImport.php b/app/Http/Requests/StorePendingVolumeImport.php
index a856e67d3..293eb3d12 100644
--- a/app/Http/Requests/StorePendingVolumeImport.php
+++ b/app/Http/Requests/StorePendingVolumeImport.php
@@ -76,6 +76,22 @@ public function withValidator($validator)
 
                     return;
                 }
+
+                $matchingUsers = $metadata->getMatchingUsers($pv->user_map ?: [], $pv->only_annotation_labels ?: []);
+                foreach ($matchingUsers as $id => $value) {
+                    if (is_null($value)) {
+                        $validator->errors()->add('id', "No matching database user could be found for metadata user ID {$id}.");
+                        return;
+                    }
+                }
+
+                $matchingLabels = $metadata->getMatchingLabels($pv->label_map ?: [], $pv->only_annotation_labels ?: []);
+                foreach ($matchingLabels as $id => $value) {
+                    if (is_null($value)) {
+                        $validator->errors()->add('id', "No matching database label could be found for metadata label ID {$id}.");
+                        return;
+                    }
+                }
             }
 
             if ($pv->import_file_labels) {
@@ -90,25 +106,21 @@ public function withValidator($validator)
 
                     return;
                 }
-            }
 
-            // Must not use union here because user/labels might be required for the
-            // annotation import but not the file label import (or vice versa).
-            $onlyLabels = array_intersect($pv->only_annotation_labels ?: [], $pv->only_file_labels ?: []);
-
-            $matchingUsers = $metadata->getMatchingUsers($pv->user_map ?: [], $onlyLabels);
-            foreach ($matchingUsers as $id => $value) {
-                if (is_null($value)) {
-                    $validator->errors()->add('id', "No matching database user could be found for metadata user ID {$id}.");
-                    return;
+                $matchingUsers = $metadata->getMatchingUsers($pv->user_map ?: [], $pv->only_file_labels ?: []);
+                foreach ($matchingUsers as $id => $value) {
+                    if (is_null($value)) {
+                        $validator->errors()->add('id', "No matching database user could be found for metadata user ID {$id}.");
+                        return;
+                    }
                 }
-            }
 
-            $matchingLabels = $metadata->getMatchingLabels($pv->label_map ?: [], $onlyLabels);
-            foreach ($matchingLabels as $id => $value) {
-                if (is_null($value)) {
-                    $validator->errors()->add('id', "No matching database label could be found for metadata label ID {$id}.");
-                    return;
+                $matchingLabels = $metadata->getMatchingLabels($pv->label_map ?: [], $pv->only_file_labels ?: []);
+                foreach ($matchingLabels as $id => $value) {
+                    if (is_null($value)) {
+                        $validator->errors()->add('id', "No matching database label could be found for metadata label ID {$id}.");
+                        return;
+                    }
                 }
             }
         });
diff --git a/app/Jobs/ImportVolumeMetadata.php b/app/Jobs/ImportVolumeMetadata.php
index 0d50ecd60..f47647bb9 100644
--- a/app/Jobs/ImportVolumeMetadata.php
+++ b/app/Jobs/ImportVolumeMetadata.php
@@ -38,9 +38,13 @@ public function handle(): void
     {
         DB::transaction(function () {
             $metadata = $this->pv->getMetadata();
-            $onlyLabels = ($this->pv->only_annotation_labels ?: []) + ($this->pv->only_file_labels ?: []);
-            $userMap = $metadata->getMatchingUsers($this->pv->user_map ?: [], $onlyLabels);
-            $labelMap = $metadata->getMatchingLabels($this->pv->label_map ?: [], $onlyLabels);
+
+            $annotationUserMap = $metadata->getMatchingUsers($this->pv->user_map ?: [], $this->pv->only_annotation_labels ?: []);
+            $annotationLabelMap = $metadata->getMatchingLabels($this->pv->label_map ?: [], $this->pv->only_annotation_labels ?: []);
+
+            $fileLabelUserMap = $metadata->getMatchingUsers($this->pv->user_map ?: [], $this->pv->only_file_labels ?: []);
+            $fileLabelLabelMap = $metadata->getMatchingLabels($this->pv->label_map ?: [], $this->pv->only_file_labels ?: []);
+
             foreach ($this->pv->volume->files()->lazyById() as $file) {
                 $metaFile = $metadata->getFile($file->filename);
                 if (!$metaFile) {
@@ -48,11 +52,11 @@ public function handle(): void
                 }
 
                 if ($this->pv->import_annotations && $metaFile->hasAnnotations()) {
-                    $this->insertAnnotations($metaFile, $file, $userMap, $labelMap);
+                    $this->insertAnnotations($metaFile, $file, $annotationUserMap, $annotationLabelMap);
                 }
 
                 if ($this->pv->import_file_labels && $metaFile->hasFileLabels()) {
-                    $this->insertFileLabels($metaFile, $file, $userMap, $labelMap);
+                    $this->insertFileLabels($metaFile, $file, $fileLabelUserMap, $fileLabelLabelMap);
                 }
             }
         });
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
index 8e9f02a66..b5593f522 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
@@ -339,18 +339,6 @@ public function testUpdateLabelMapTryLabelNotAllowed()
         ])->assertStatus(422);
     }
 
-    public function testUpdateLabelMapFilterAnnotationButNotFileLabel()
-    {
-        // choose a label that should be ignored by only_annotation_labels but not by
-        // only_file_labels.
-    }
-
-    public function testUpdateLabelMapFilterFileLabelButNotAnnotation()
-    {
-        // choose a label that should be ignored by only_file_labels but not by
-        // only_annotation_labels.
-    }
-
     public function testUpdateUserMap()
     {
         $metadata = new VolumeMetadata;

From 7d64d642f2543ba88ecfb136455f85878f199704 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Mon, 25 Mar 2024 13:19:30 +0100
Subject: [PATCH 076/209] Configure default values for PendingVolume arrays

---
 app/Http/Requests/StorePendingVolumeImport.php    | 12 ++++++------
 app/Http/Requests/UpdatePendingVolumeLabelMap.php |  3 +--
 app/Jobs/ImportVolumeMetadata.php                 |  8 ++++----
 app/PendingVolume.php                             | 12 ++++++++++++
 tests/php/PendingVolumeTest.php                   |  8 ++++----
 5 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/app/Http/Requests/StorePendingVolumeImport.php b/app/Http/Requests/StorePendingVolumeImport.php
index 293eb3d12..1240a788d 100644
--- a/app/Http/Requests/StorePendingVolumeImport.php
+++ b/app/Http/Requests/StorePendingVolumeImport.php
@@ -65,7 +65,7 @@ public function withValidator($validator)
             }
 
             if ($pv->import_annotations) {
-                $labels = $metadata->getAnnotationLabels($pv->only_annotation_labels ?: []);
+                $labels = $metadata->getAnnotationLabels($pv->only_annotation_labels);
 
                 if (empty($labels)) {
                     if ($pv->only_annotation_labels) {
@@ -77,7 +77,7 @@ public function withValidator($validator)
                     return;
                 }
 
-                $matchingUsers = $metadata->getMatchingUsers($pv->user_map ?: [], $pv->only_annotation_labels ?: []);
+                $matchingUsers = $metadata->getMatchingUsers($pv->user_map, $pv->only_annotation_labels);
                 foreach ($matchingUsers as $id => $value) {
                     if (is_null($value)) {
                         $validator->errors()->add('id', "No matching database user could be found for metadata user ID {$id}.");
@@ -85,7 +85,7 @@ public function withValidator($validator)
                     }
                 }
 
-                $matchingLabels = $metadata->getMatchingLabels($pv->label_map ?: [], $pv->only_annotation_labels ?: []);
+                $matchingLabels = $metadata->getMatchingLabels($pv->label_map, $pv->only_annotation_labels);
                 foreach ($matchingLabels as $id => $value) {
                     if (is_null($value)) {
                         $validator->errors()->add('id', "No matching database label could be found for metadata label ID {$id}.");
@@ -95,7 +95,7 @@ public function withValidator($validator)
             }
 
             if ($pv->import_file_labels) {
-                $labels = $metadata->getFileLabels($pv->only_file_labels ?: []);
+                $labels = $metadata->getFileLabels($pv->only_file_labels);
 
                 if (empty($labels)) {
                     if ($pv->only_file_labels) {
@@ -107,7 +107,7 @@ public function withValidator($validator)
                     return;
                 }
 
-                $matchingUsers = $metadata->getMatchingUsers($pv->user_map ?: [], $pv->only_file_labels ?: []);
+                $matchingUsers = $metadata->getMatchingUsers($pv->user_map, $pv->only_file_labels);
                 foreach ($matchingUsers as $id => $value) {
                     if (is_null($value)) {
                         $validator->errors()->add('id', "No matching database user could be found for metadata user ID {$id}.");
@@ -115,7 +115,7 @@ public function withValidator($validator)
                     }
                 }
 
-                $matchingLabels = $metadata->getMatchingLabels($pv->label_map ?: [], $pv->only_file_labels ?: []);
+                $matchingLabels = $metadata->getMatchingLabels($pv->label_map, $pv->only_file_labels);
                 foreach ($matchingLabels as $id => $value) {
                     if (is_null($value)) {
                         $validator->errors()->add('id', "No matching database label could be found for metadata label ID {$id}.");
diff --git a/app/Http/Requests/UpdatePendingVolumeLabelMap.php b/app/Http/Requests/UpdatePendingVolumeLabelMap.php
index 1aeceab62..3017b20df 100644
--- a/app/Http/Requests/UpdatePendingVolumeLabelMap.php
+++ b/app/Http/Requests/UpdatePendingVolumeLabelMap.php
@@ -65,8 +65,7 @@ public function withValidator($validator)
                 }
             }
 
-            $onlyLabels = $this->pendingVolume->only_annotation_labels ?: [];
-            $onlyLabels += $this->pendingVolume->only_file_labels ?: [];
+            $onlyLabels = $this->pendingVolume->only_annotation_labels + $this->pendingVolume->only_file_labels;
             if (!empty($onlyLabels)) {
                 $diff = array_diff(array_keys($map), $onlyLabels);
                 if (!empty($diff)) {
diff --git a/app/Jobs/ImportVolumeMetadata.php b/app/Jobs/ImportVolumeMetadata.php
index f47647bb9..362c3e2cc 100644
--- a/app/Jobs/ImportVolumeMetadata.php
+++ b/app/Jobs/ImportVolumeMetadata.php
@@ -39,11 +39,11 @@ public function handle(): void
         DB::transaction(function () {
             $metadata = $this->pv->getMetadata();
 
-            $annotationUserMap = $metadata->getMatchingUsers($this->pv->user_map ?: [], $this->pv->only_annotation_labels ?: []);
-            $annotationLabelMap = $metadata->getMatchingLabels($this->pv->label_map ?: [], $this->pv->only_annotation_labels ?: []);
+            $annotationUserMap = $metadata->getMatchingUsers($this->pv->user_map, $this->pv->only_annotation_labels);
+            $annotationLabelMap = $metadata->getMatchingLabels($this->pv->label_map, $this->pv->only_annotation_labels);
 
-            $fileLabelUserMap = $metadata->getMatchingUsers($this->pv->user_map ?: [], $this->pv->only_file_labels ?: []);
-            $fileLabelLabelMap = $metadata->getMatchingLabels($this->pv->label_map ?: [], $this->pv->only_file_labels ?: []);
+            $fileLabelUserMap = $metadata->getMatchingUsers($this->pv->user_map, $this->pv->only_file_labels);
+            $fileLabelLabelMap = $metadata->getMatchingLabels($this->pv->label_map, $this->pv->only_file_labels);
 
             foreach ($this->pv->volume->files()->lazyById() as $file) {
                 $metaFile = $metadata->getFile($file->filename);
diff --git a/app/PendingVolume.php b/app/PendingVolume.php
index 5b28b527f..6c852ad90 100644
--- a/app/PendingVolume.php
+++ b/app/PendingVolume.php
@@ -52,6 +52,18 @@ class PendingVolume extends Model
         'user_map' => 'array',
     ];
 
+    /**
+     * Default values for attributes.
+     *
+     * @var array
+     */
+    protected $attributes = [
+        'only_annotation_labels' => '[]',
+        'only_file_labels' => '[]',
+        'label_map' => '[]',
+        'user_map' => '[]',
+    ];
+
     protected static function booted(): void
     {
         static::$metadataFileDisk = config('volumes.pending_metadata_storage_disk');
diff --git a/tests/php/PendingVolumeTest.php b/tests/php/PendingVolumeTest.php
index a7f5af707..4ebea1688 100644
--- a/tests/php/PendingVolumeTest.php
+++ b/tests/php/PendingVolumeTest.php
@@ -27,10 +27,10 @@ public function testAttributes()
         $this->assertNull($this->model->volume_id);
         $this->assertFalse($this->model->import_annotations);
         $this->assertFalse($this->model->import_file_labels);
-        $this->assertNull($this->model->only_annotation_labels);
-        $this->assertNull($this->model->only_file_labels);
-        $this->assertNull($this->model->label_map);
-        $this->assertNull($this->model->user_map);
+        $this->assertEquals([], $this->model->only_annotation_labels);
+        $this->assertEquals([], $this->model->only_file_labels);
+        $this->assertEquals([], $this->model->label_map);
+        $this->assertEquals([], $this->model->user_map);
         $this->assertFalse($this->model->importing);
     }
 

From 1e4159b8f2e4d2c266480fdfa0126249c78b1d8d Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Mon, 25 Mar 2024 13:55:26 +0100
Subject: [PATCH 077/209] Finish implementing ImportVolumeMetadata

---
 app/Jobs/ImportVolumeMetadata.php           | 59 +++++++++++--
 tests/php/Jobs/ImportVolumeMetadataTest.php | 95 ++++++++++++++++++---
 2 files changed, 133 insertions(+), 21 deletions(-)

diff --git a/app/Jobs/ImportVolumeMetadata.php b/app/Jobs/ImportVolumeMetadata.php
index 362c3e2cc..819663dd7 100644
--- a/app/Jobs/ImportVolumeMetadata.php
+++ b/app/Jobs/ImportVolumeMetadata.php
@@ -11,12 +11,20 @@
 use Biigle\VideoLabel;
 use Biigle\VolumeFile;
 use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\DB;
 
 class ImportVolumeMetadata extends Job implements ShouldQueue
 {
-    use SerializesModels;
+    use SerializesModels, InteractsWithQueue;
+
+    /**
+     * The number of annotation (label) rows to insert in one chunk.
+     *
+     * @var integer
+     */
+    public static $insertChunkSize = 5000;
 
     /**
      * Ignore this job if the pending volume does not exist any more.
@@ -25,6 +33,13 @@ class ImportVolumeMetadata extends Job implements ShouldQueue
      */
     protected $deleteWhenMissingModels = true;
 
+    /**
+     * The number of times the job may be attempted.
+     *
+     * @var int
+     */
+    public $tries = 12;
+
     /**
      * Create a new job instance.
      *
@@ -36,6 +51,14 @@ public function __construct(public PendingVolume $pv)
 
     public function handle(): void
     {
+        if ($this->pv->volume->creating_async) {
+            // Wait 10 minutes so the volume has a chance to finish creating the files.
+            // Do this for a maximum of 120 min (12 tries).
+            $this->release(600);
+
+            return;
+        }
+
         DB::transaction(function () {
             $metadata = $this->pv->getMetadata();
 
@@ -76,7 +99,7 @@ protected function insertAnnotations(
         $insertAnnotations = [];
         $insertAnnotationLabels = [];
 
-        foreach ($meta->getAnnotations() as $annotation) {
+        foreach ($meta->getAnnotations() as $index => $annotation) {
             // This will remove labels that should be ignored based on $onlyLabels and
             // that have no match in the database.
             $annotationLabels = array_filter(
@@ -94,34 +117,52 @@ protected function insertAnnotations(
                 'label_id' => $labelMap[$lau->label->id],
                 'user_id' => $userMap[$lau->user->id],
             ], $annotationLabels);
+
+            // Insert in chunks because a single file can have tens of thousands of
+            // annotations (e.g. a video or mosaic).
+            if (($index % static::$insertChunkSize) === 0) {
+                $this->insertAnnotationChunk($file, $insertAnnotations, $insertAnnotationLabels);
+                $insertAnnotations = [];
+                $insertAnnotationLabels = [];
+            }
         }
 
-        $file->annotations()->insert($insertAnnotations);
+        if (!empty($insertAnnotations)) {
+            $this->insertAnnotationChunk($file, $insertAnnotations, $insertAnnotationLabels);
+        }
+    }
+
+    protected function insertAnnotationChunk(
+        VolumeFile $file,
+        array $annotations,
+        array $annotationLabels
+    ): void {
+        $file->annotations()->insert($annotations);
 
         $ids = $file->annotations()
             ->orderBy('id', 'desc')
-            ->take(count($insertAnnotations))
+            ->take(count($annotations))
             ->pluck('id')
             ->reverse()
             ->toArray();
 
         foreach ($ids as $index => $id) {
-            foreach ($insertAnnotationLabels[$index] as &$i) {
+            foreach ($annotationLabels[$index] as &$i) {
                 $i['annotation_id'] = $id;
             }
         }
 
         // Flatten.
-        $insertAnnotationLabels = array_merge(...$insertAnnotationLabels);
+        $annotationLabels = array_merge(...$annotationLabels);
 
         if ($file instanceof Image) {
-            foreach ($insertAnnotationLabels as &$i) {
+            foreach ($annotationLabels as &$i) {
                 $i['confidence'] = 1.0;
             }
 
-            ImageAnnotationLabel::insert($insertAnnotationLabels);
+            ImageAnnotationLabel::insert($annotationLabels);
         } else {
-            VideoAnnotationLabel::insert($insertAnnotationLabels);
+            VideoAnnotationLabel::insert($annotationLabels);
         }
     }
 
diff --git a/tests/php/Jobs/ImportVolumeMetadataTest.php b/tests/php/Jobs/ImportVolumeMetadataTest.php
index a239e81fa..bbb965e1f 100644
--- a/tests/php/Jobs/ImportVolumeMetadataTest.php
+++ b/tests/php/Jobs/ImportVolumeMetadataTest.php
@@ -54,7 +54,6 @@ public function testHandle()
             'label_map' => [123 => $dbLabel->id],
             'volume_id' => $image->volume_id,
         ]);
-        $id = $pv->id;
 
         (new ImportVolumeMetadata($pv))->handle();
 
@@ -107,7 +106,6 @@ public function testHandleVideo()
             'label_map' => [123 => $dbLabel->id],
             'volume_id' => $video->volume_id,
         ]);
-        $id = $pv->id;
 
         (new ImportVolumeMetadata($pv))->handle();
 
@@ -158,7 +156,6 @@ public function testHandleMatchByUuid()
             'import_annotations' => true,
             'volume_id' => $image->volume_id,
         ]);
-        $id = $pv->id;
 
         (new ImportVolumeMetadata($pv))->handle();
 
@@ -201,7 +198,6 @@ public function testHandleDeletedUser()
             'label_map' => [123 => $dbLabel->id],
             'volume_id' => $image->volume_id,
         ]);
-        $id = $pv->id;
 
         (new ImportVolumeMetadata($pv))->handle();
 
@@ -241,7 +237,6 @@ public function testHandleDeletedLabel()
             'label_map' => [123 => -1],
             'volume_id' => $image->volume_id,
         ]);
-        $id = $pv->id;
 
         (new ImportVolumeMetadata($pv))->handle();
 
@@ -280,7 +275,6 @@ public function testHandleIgnoreAnnotations()
             'label_map' => [123 => $dbLabel->id],
             'volume_id' => $image->volume_id,
         ]);
-        $id = $pv->id;
 
         (new ImportVolumeMetadata($pv))->handle();
 
@@ -319,7 +313,6 @@ public function testHandleIgnoreFileLabels()
             'label_map' => [123 => $dbLabel->id],
             'volume_id' => $image->volume_id,
         ]);
-        $id = $pv->id;
 
         (new ImportVolumeMetadata($pv))->handle();
 
@@ -370,7 +363,6 @@ public function testHandleFilterAnnotationLabels()
             'only_annotation_labels' => [123],
             'volume_id' => $image->volume_id,
         ]);
-        $id = $pv->id;
 
         (new ImportVolumeMetadata($pv))->handle();
 
@@ -428,7 +420,6 @@ public function testHandleFilterFileLabels()
             'only_file_labels' => [123],
             'volume_id' => $image->volume_id,
         ]);
-        $id = $pv->id;
 
         (new ImportVolumeMetadata($pv))->handle();
 
@@ -441,16 +432,96 @@ public function testHandleFilterFileLabels()
 
     public function testHandleIgnoreMissingFiles()
     {
-        // skip metadata files that don't exist in the volume
+        $image = Image::factory()->create();
+        $dbUser = DbUser::factory()->create();
+        $dbLabel = DbLabel::factory()->create();
+
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('unknown.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'media_type_id' => MediaType::imageId(),
+            'metadata_file_path' => 'mymeta.csv',
+            'import_file_labels' => true,
+            'import_annotations' => true,
+            'user_map' => [321 => $dbUser->id],
+            'label_map' => [123 => $dbLabel->id],
+            'volume_id' => $image->volume_id,
+        ]);
+
+        (new ImportVolumeMetadata($pv))->handle();
+
+        $this->assertFalse($image->annotations()->exists());
+        $this->assertFalse($image->labels()->exists());
     }
 
     public function testHandleRetryWhileCreatingAsync()
     {
-        // if the volume has creating_async === true, resubmit the import job and wait for 10 minutes (max. 12 times before failing?)
+        $image = Image::factory()->create();
+        $volume = Volume::factory()->create();
+        $volume->creating_async = true;
+        $volume->save();
+
+        $pv = PendingVolume::factory()->create(['volume_id' => $volume->id]);
+
+        (new ImportVolumeMetadata($pv))->handle();
+
+        $this->assertNotNull($pv->fresh());
     }
 
     public function testHandleChunkAnnotations()
     {
-        // configure the cunk size to 2 and test
+        ImportVolumeMetadata::$insertChunkSize = 1;
+
+        $image = Image::factory()->create();
+        $dbUser = DbUser::factory()->create();
+        $dbLabel = DbLabel::factory()->create();
+
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata($image->filename);
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [20, 20],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'media_type_id' => MediaType::imageId(),
+            'metadata_file_path' => 'mymeta.csv',
+            'import_annotations' => true,
+            'user_map' => [321 => $dbUser->id],
+            'label_map' => [123 => $dbLabel->id],
+            'volume_id' => $image->volume_id,
+        ]);
+
+        (new ImportVolumeMetadata($pv))->handle();
+
+        $this->assertEquals(2, $image->annotations()->count());
     }
 }

From ce23e7a6141080a451456b3f6eb808b548fb7b05 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Mon, 25 Mar 2024 14:21:07 +0100
Subject: [PATCH 078/209] Add validation methods for metadata annotations

---
 app/Services/MetadataParsing/Annotation.php   | 25 ++++++-
 .../MetadataParsing/VideoAnnotation.php       | 42 ++++++++++-
 app/VideoAnnotation.php                       |  6 +-
 .../MetadataParsing/ImageAnnotationTest.php   | 28 ++++++++
 .../MetadataParsing/VideoAnnotationTest.php   | 69 +++++++++++++++++++
 5 files changed, 167 insertions(+), 3 deletions(-)

diff --git a/app/Services/MetadataParsing/Annotation.php b/app/Services/MetadataParsing/Annotation.php
index 544e57560..fabde1f87 100644
--- a/app/Services/MetadataParsing/Annotation.php
+++ b/app/Services/MetadataParsing/Annotation.php
@@ -3,9 +3,18 @@
 namespace Biigle\Services\MetadataParsing;
 
 use Biigle\Shape;
+use Biigle\Traits\HasPointsAttribute;
+use Exception;
 
 class Annotation
 {
+    use HasPointsAttribute;
+
+    /**
+     * Shape ID required for point validation.
+     */
+    public int $shape_id;
+
     /**
      * @param Shape $shape
      * @param array<float> $points
@@ -16,7 +25,7 @@ public function __construct(
         public array $points,
         public array $labels,
     ) {
-        //
+        $this->shape_id = $shape->id;
     }
 
     /**
@@ -31,4 +40,18 @@ public function getInsertData(int $id): array
             'shape_id' => $this->shape->id,
         ];
     }
+
+    /**
+     * Validatethe points and labels.
+     *
+     * @throws Exception If something is invalid.
+     */
+    public function validate(): void
+    {
+        if (empty($this->labels)) {
+            throw new Exception('The annotation has no labels.');
+        }
+
+        $this->validatePoints($this->points);
+    }
 }
diff --git a/app/Services/MetadataParsing/VideoAnnotation.php b/app/Services/MetadataParsing/VideoAnnotation.php
index 0eae3fe3b..4c9fbb781 100644
--- a/app/Services/MetadataParsing/VideoAnnotation.php
+++ b/app/Services/MetadataParsing/VideoAnnotation.php
@@ -3,6 +3,7 @@
 namespace Biigle\Services\MetadataParsing;
 
 use Biigle\Shape;
+use Exception;
 
 class VideoAnnotation extends Annotation
 {
@@ -18,7 +19,7 @@ public function __construct(
         public array $labels,
         public array $frames,
     ) {
-        //
+        parent::__construct($shape, $points, $labels);
     }
 
     /**
@@ -31,4 +32,43 @@ public function getInsertData(int $id): array
             'frames' => json_encode($this->frames),
         ]);
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function validate(): void
+    {
+        parent::validate();
+
+        foreach ($this->frames as $frame) {
+            if (!is_float($frame) && !is_int($frame)) {
+                throw new Exception("Video annotation frames must be numbers, got '{$frame}'.");
+            }
+        }
+    }
+
+    /**
+     * Similar to \Biigle\VideoAnnotation::validatePoints.
+     */
+    public function validatePoints(array $points = []): void
+    {
+        if ($this->shape_id === Shape::wholeFrameId()) {
+            if (count($this->points) !== 0) {
+                throw new Exception('Whole frame annotations cannot have point coordinates.');
+            }
+
+            return;
+        }
+
+        if (count($this->points) !== count($this->frames)) {
+            throw new Exception('The number of key frames does not match the number of annotation coordinates.');
+        }
+
+        // Gaps are represented as empty arrays
+        array_map(function ($point) {
+            if (count($point)) {
+                parent::validatePoints($point);
+            }
+        }, $this->points);
+    }
 }
diff --git a/app/VideoAnnotation.php b/app/VideoAnnotation.php
index a8bb6b9c1..720690dd0 100644
--- a/app/VideoAnnotation.php
+++ b/app/VideoAnnotation.php
@@ -106,7 +106,11 @@ public function validatePoints(array $points = [])
         }
 
         // Gaps are represented as empty arrays
-        array_map(function ($point) { if (count($point)) { parent::validatePoints($point); } }, $this->points);
+        array_map(function ($point) {
+            if (count($point)) {
+                parent::validatePoints($point);
+            }
+        }, $this->points);
     }
 
     /**
diff --git a/tests/php/Services/MetadataParsing/ImageAnnotationTest.php b/tests/php/Services/MetadataParsing/ImageAnnotationTest.php
index c0c6f999b..24a95605f 100644
--- a/tests/php/Services/MetadataParsing/ImageAnnotationTest.php
+++ b/tests/php/Services/MetadataParsing/ImageAnnotationTest.php
@@ -3,7 +3,11 @@
 namespace Biigle\Tests\Services\MetadataParsing;
 
 use Biigle\Services\MetadataParsing\ImageAnnotation;
+use Biigle\Services\MetadataParsing\Label;
+use Biigle\Services\MetadataParsing\LabelAndUser;
+use Biigle\Services\MetadataParsing\User;
 use Biigle\Shape;
+use Exception;
 use TestCase;
 
 class ImageAnnotationTest extends TestCase
@@ -24,4 +28,28 @@ public function testGetInsertData()
 
         $this->assertEquals($expect, $data->getInsertData(123));
     }
+
+    public function testValidateLabels()
+    {
+        $data = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [],
+        );
+
+        $this->expectException(Exception::class);
+        $data->validate();
+    }
+
+    public function testValidatePoints()
+    {
+        $data = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10, 10],
+            labels: [new LabelAndUser(new Label(1, 'x'), new User(2, 'y'))],
+        );
+
+        $this->expectException(Exception::class);
+        $data->validate();
+    }
 }
diff --git a/tests/php/Services/MetadataParsing/VideoAnnotationTest.php b/tests/php/Services/MetadataParsing/VideoAnnotationTest.php
index 3e0bfe344..9d724bff2 100644
--- a/tests/php/Services/MetadataParsing/VideoAnnotationTest.php
+++ b/tests/php/Services/MetadataParsing/VideoAnnotationTest.php
@@ -2,8 +2,12 @@
 
 namespace Biigle\Tests\Services\MetadataParsing;
 
+use Biigle\Services\MetadataParsing\Label;
+use Biigle\Services\MetadataParsing\LabelAndUser;
+use Biigle\Services\MetadataParsing\User;
 use Biigle\Services\MetadataParsing\VideoAnnotation;
 use Biigle\Shape;
+use Exception;
 use TestCase;
 
 class VideoAnnotationTest extends TestCase
@@ -26,4 +30,69 @@ public function testGetInsertData()
 
         $this->assertEquals($expect, $data->getInsertData(123));
     }
+
+    public function testValidateLabels()
+    {
+        $data = new VideoAnnotation(
+            shape: Shape::point(),
+            points: [[10, 10]],
+            frames: [1],
+            labels: [],
+        );
+
+        $this->expectException(Exception::class);
+        $data->validate();
+    }
+
+    public function testValidatePoints()
+    {
+        $data = new VideoAnnotation(
+            shape: Shape::point(),
+            points: [[10, 10, 10]],
+            frames: [1],
+            labels: [new LabelAndUser(new Label(1, 'x'), new User(2, 'y'))],
+        );
+
+        $this->expectException(Exception::class);
+        $data->validate();
+    }
+
+    public function testValidatePointsArray()
+    {
+        $data = new VideoAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            frames: [1],
+            labels: [new LabelAndUser(new Label(1, 'x'), new User(2, 'y'))],
+        );
+
+        $this->expectException(Exception::class);
+        $data->validate();
+    }
+
+    public function testValidateFramesArray1()
+    {
+        $data = new VideoAnnotation(
+            shape: Shape::point(),
+            points: [[10, 10]],
+            frames: [],
+            labels: [new LabelAndUser(new Label(1, 'x'), new User(2, 'y'))],
+        );
+
+        $this->expectException(Exception::class);
+        $data->validate();
+    }
+
+    public function testValidateFramesArray2()
+    {
+        $data = new VideoAnnotation(
+            shape: Shape::point(),
+            points: [[10, 10]],
+            frames: ['a'],
+            labels: [new LabelAndUser(new Label(1, 'x'), new User(2, 'y'))],
+        );
+
+        $this->expectException(Exception::class);
+        $data->validate();
+    }
 }

From d8748a14f7b2a1f3ebc64fc71d7c20a48b9bef7a Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Mon, 25 Mar 2024 14:27:33 +0100
Subject: [PATCH 079/209] Implement metadata annotation validation before
 import

---
 .../Requests/StorePendingVolumeImport.php     |  42 ++++---
 .../Api/PendingVolumeImportControllerTest.php | 113 +++++++++++++++++-
 2 files changed, 137 insertions(+), 18 deletions(-)

diff --git a/app/Http/Requests/StorePendingVolumeImport.php b/app/Http/Requests/StorePendingVolumeImport.php
index 1240a788d..ca9410e53 100644
--- a/app/Http/Requests/StorePendingVolumeImport.php
+++ b/app/Http/Requests/StorePendingVolumeImport.php
@@ -3,6 +3,7 @@
 namespace Biigle\Http\Requests;
 
 use Biigle\PendingVolume;
+use Exception;
 use Illuminate\Foundation\Http\FormRequest;
 
 class StorePendingVolumeImport extends FormRequest
@@ -64,20 +65,22 @@ public function withValidator($validator)
                 return;
             }
 
-            if ($pv->import_annotations) {
-                $labels = $metadata->getAnnotationLabels($pv->only_annotation_labels);
+            // Check file labels first because the annotations have a more expensive
+            // validation.
+            if ($pv->import_file_labels) {
+                $labels = $metadata->getFileLabels($pv->only_file_labels);
 
                 if (empty($labels)) {
-                    if ($pv->only_annotation_labels) {
-                        $validator->errors()->add('id', 'There are no annotations to import with the chosen labels.');
+                    if ($pv->only_file_labels) {
+                        $validator->errors()->add('id', 'There are no file labels to import with the chosen labels.');
                     } else {
-                        $validator->errors()->add('id', 'There are no annotations to import.');
+                        $validator->errors()->add('id', 'There are no file labels to import.');
                     }
 
                     return;
                 }
 
-                $matchingUsers = $metadata->getMatchingUsers($pv->user_map, $pv->only_annotation_labels);
+                $matchingUsers = $metadata->getMatchingUsers($pv->user_map, $pv->only_file_labels);
                 foreach ($matchingUsers as $id => $value) {
                     if (is_null($value)) {
                         $validator->errors()->add('id', "No matching database user could be found for metadata user ID {$id}.");
@@ -85,7 +88,7 @@ public function withValidator($validator)
                     }
                 }
 
-                $matchingLabels = $metadata->getMatchingLabels($pv->label_map, $pv->only_annotation_labels);
+                $matchingLabels = $metadata->getMatchingLabels($pv->label_map, $pv->only_file_labels);
                 foreach ($matchingLabels as $id => $value) {
                     if (is_null($value)) {
                         $validator->errors()->add('id', "No matching database label could be found for metadata label ID {$id}.");
@@ -94,20 +97,20 @@ public function withValidator($validator)
                 }
             }
 
-            if ($pv->import_file_labels) {
-                $labels = $metadata->getFileLabels($pv->only_file_labels);
+            if ($pv->import_annotations) {
+                $labels = $metadata->getAnnotationLabels($pv->only_annotation_labels);
 
                 if (empty($labels)) {
-                    if ($pv->only_file_labels) {
-                        $validator->errors()->add('id', 'There are no file labels to import with the chosen labels.');
+                    if ($pv->only_annotation_labels) {
+                        $validator->errors()->add('id', 'There are no annotations to import with the chosen labels.');
                     } else {
-                        $validator->errors()->add('id', 'There are no file labels to import.');
+                        $validator->errors()->add('id', 'There are no annotations to import.');
                     }
 
                     return;
                 }
 
-                $matchingUsers = $metadata->getMatchingUsers($pv->user_map, $pv->only_file_labels);
+                $matchingUsers = $metadata->getMatchingUsers($pv->user_map, $pv->only_annotation_labels);
                 foreach ($matchingUsers as $id => $value) {
                     if (is_null($value)) {
                         $validator->errors()->add('id', "No matching database user could be found for metadata user ID {$id}.");
@@ -115,13 +118,24 @@ public function withValidator($validator)
                     }
                 }
 
-                $matchingLabels = $metadata->getMatchingLabels($pv->label_map, $pv->only_file_labels);
+                $matchingLabels = $metadata->getMatchingLabels($pv->label_map, $pv->only_annotation_labels);
                 foreach ($matchingLabels as $id => $value) {
                     if (is_null($value)) {
                         $validator->errors()->add('id', "No matching database label could be found for metadata label ID {$id}.");
                         return;
                     }
                 }
+
+                foreach ($metadata->getFiles() as $file) {
+                    foreach ($file->getAnnotations() as $annotation) {
+                        try {
+                            $annotation->validate();
+                        } catch (Exception $e) {
+                            $validator->errors()->add('id', "Invalid annotation for file {$file->name}: ".$e->getMessage());
+                            return;
+                        }
+                    }
+                }
             }
         });
     }
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
index b5593f522..b845a9e58 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
@@ -13,6 +13,8 @@
 use Biigle\Services\MetadataParsing\Label;
 use Biigle\Services\MetadataParsing\LabelAndUser;
 use Biigle\Services\MetadataParsing\User;
+use Biigle\Services\MetadataParsing\VideoAnnotation;
+use Biigle\Services\MetadataParsing\VideoMetadata;
 use Biigle\Services\MetadataParsing\VolumeMetadata;
 use Biigle\Shape;
 use Biigle\User as DbUser;
@@ -862,10 +864,113 @@ public function testStoreImportMatchOnlyWithFileLabelFilter()
         $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertSuccessful();
     }
 
-    public function testStoreImportValidateAnnotationPoints()
+    public function testStoreImportValidateImageAnnotationPoints()
     {
-        // use validator of HasPointsAttribute, maybe convert it to a validation rule.
-        // and use this in regular annotation requests, too.
-        // also validate video anotation frames (i.e. if it is an array of floats)
+        $dbUser = DbUser::factory()->create();
+        $dbLabel = DbLabel::factory()->create();
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            // Incorrect points for the shape.
+            points: [10, 10, 10],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+            'user_map' => [321 => $dbUser->id],
+            'label_map' => [123 => $dbLabel->id],
+            'import_annotations' => true,
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+        $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertStatus(422);
+    }
+
+    public function testStoreImportValidateVideoAnnotationPoints()
+    {
+        $dbUser = DbUser::factory()->create();
+        $dbLabel = DbLabel::factory()->create();
+        $metadata = new VolumeMetadata;
+        $file = new VideoMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $annotation = new VideoAnnotation(
+            shape: Shape::point(),
+            // Must be an array of arrays.
+            points: [10, 10],
+            frames: [1],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::videoId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+            'user_map' => [321 => $dbUser->id],
+            'label_map' => [123 => $dbLabel->id],
+            'import_annotations' => true,
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+        $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertStatus(422);
+    }
+
+    public function testStoreImportValidateVideoAnnotationFrames()
+    {
+        $dbUser = DbUser::factory()->create();
+        $dbLabel = DbLabel::factory()->create();
+        $metadata = new VolumeMetadata;
+        $file = new VideoMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $annotation = new VideoAnnotation(
+            shape: Shape::point(),
+            points: [[10, 10]],
+            // Must have the same number of elements than points.
+            frames: [],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::videoId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+            'user_map' => [321 => $dbUser->id],
+            'label_map' => [123 => $dbLabel->id],
+            'import_annotations' => true,
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+        $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertStatus(422);
     }
 }

From 3482e0a207f90abe4bc2471c5f63d7eecfd2efbf Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Mon, 25 Mar 2024 14:35:37 +0100
Subject: [PATCH 080/209] Fix linter error

---
 app/Jobs/ImportVolumeMetadata.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Jobs/ImportVolumeMetadata.php b/app/Jobs/ImportVolumeMetadata.php
index 819663dd7..bf22ec3df 100644
--- a/app/Jobs/ImportVolumeMetadata.php
+++ b/app/Jobs/ImportVolumeMetadata.php
@@ -152,8 +152,9 @@ protected function insertAnnotationChunk(
             }
         }
 
-        // Flatten.
-        $annotationLabels = array_merge(...$annotationLabels);
+        // Flatten. Use array_values to prevent accidental array unpacking with string
+        // keys (which makes the linter complain).
+        $annotationLabels = array_merge(...array_values($annotationLabels));
 
         if ($file instanceof Image) {
             foreach ($annotationLabels as &$i) {

From 4d0e87d0cd234046f1e87a8da0c02f0a6b0a1700 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Mon, 25 Mar 2024 15:44:37 +0100
Subject: [PATCH 081/209] Add import annotations/file labels buttons to create
 volume step 2

---
 .../Views/Volumes/PendingVolumeController.php |  5 +++
 .../assets/js/volumes/createFormStep2.vue     | 20 ++++++++++
 .../views/volumes/create/step2.blade.php      | 40 ++++++++++++++++++-
 3 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
index 54acadf9b..45baae1b3 100644
--- a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
@@ -83,6 +83,9 @@ public function show(Request $request)
             $filenamesFromMeta = !empty($filenames);
         }
 
+        $hasAnnotations = $metadata && $metadata->hasAnnotations();
+        $hasFileLabels = $metadata && $metadata->hasFileLabels();
+
         return view('volumes.create.step2', [
             'pv' => $pv,
             'project' => $pv->project,
@@ -98,6 +101,8 @@ public function show(Request $request)
             'oldUrl' => $oldUrl,
             'oldHandle' => $oldHandle,
             'filenamesFromMeta' => $filenamesFromMeta,
+            'hasAnnotations' => $hasAnnotations,
+            'hasFileLabels' => $hasFileLabels,
         ]);
     }
 }
diff --git a/resources/assets/js/volumes/createFormStep2.vue b/resources/assets/js/volumes/createFormStep2.vue
index 4fe28b3ee..872de0d6d 100644
--- a/resources/assets/js/volumes/createFormStep2.vue
+++ b/resources/assets/js/volumes/createFormStep2.vue
@@ -28,6 +28,8 @@ export default {
             fileSource: FILE_SOURCE.REMOTE,
             handle: '',
             imageDiskCache: {},
+            importAnnotations: false,
+            importFileLabels: false,
             initialized: false,
             initializingBrowser: false,
             loadingBrowser: false,
@@ -113,6 +115,18 @@ export default {
                 'btn-info': this.isDiskFileSource,
             };
         },
+        importAnnotationsButtonClass() {
+            return {
+                active: this.importAnnotations,
+                'btn-info': this.importAnnotations,
+            };
+        },
+        importFileLabelsButtonClass() {
+            return {
+                active: this.importFileLabels,
+                'btn-info': this.importFileLabels,
+            };
+        },
     },
     methods: {
         fetchDirectories(disk, path) {
@@ -353,6 +367,12 @@ export default {
                 this.selectFile(file, directory, path, event);
             }
         },
+        toggleImportAnnotations() {
+            this.importAnnotations = !this.importAnnotations;
+        },
+        toggleImportFileLabels() {
+            this.importFileLabels = !this.importFileLabels;
+        },
     },
     watch: {
         storageDisk(disk) {
diff --git a/resources/views/volumes/create/step2.blade.php b/resources/views/volumes/create/step2.blade.php
index 146019238..ccb224c02 100644
--- a/resources/views/volumes/create/step2.blade.php
+++ b/resources/views/volumes/create/step2.blade.php
@@ -22,7 +22,7 @@
         @if ($restored)
             <div class="panel panel-info">
                 <div class="panel-body text-info">
-                    This is pending volume that you did not finish before.
+                    This is a pending volume that you did not finish before.
                 </div>
             </div>
         @endif
@@ -212,12 +212,48 @@
                     @endif
                 </div>
             </fieldset>
+
+            @if ($hasAnnotations || $hasFileLabels)
+                <fieldset>
+                     <legend>
+                         Import more metadata <span class="text-muted">(optional)</span>
+                     </legend>
+
+                     <div class="row">
+                        @if ($hasAnnotations)
+                             <div class="col-xs-6 form-group{{ $errors->has('import_annotations') ? ' has-error' : '' }}">
+                                <button type="button" class="btn btn-default btn-block" v-bind:class="importAnnotationsButtonClass" title="Import annotations after the volume was created" v-on:click="toggleImportAnnotations"><i class="fa fa-map-marker-alt"></i> Import Annotations</button>
+                                <input v-if="importAnnotations" type="hidden" name="import_annotations" value="1">
+                                @if ($errors->has('import_annotations'))
+                                    <span class="help-block">{{ $errors->first('import_annotations') }}</span>
+                                @endif
+                            </div>
+                        @endif
+
+                        @if ($hasFileLabels)
+                            <div class="col-xs-6 form-group{{ $errors->has('import_file_labels') ? ' has-error' : '' }}">
+                                <button type="button" class="btn btn-default btn-block" v-bind:class="importFileLabelsButtonClass" title="Import file labels after the volume was created" v-on:click="toggleImportFileLabels"><i class="fa fa-tag"></i> Import File Labels</button>
+                                <input v-if="importAnnotations" type="hidden" name="import_file_labels" value="1">
+                                @if ($errors->has('import_file_labels'))
+                                    <span class="help-block">{{ $errors->first('import_file_labels') }}</span>
+                                @endif
+                            </div>
+                        @endif
+                     </div>
+
+                    <span class="help-block">
+                        If you import more metadata, there will be additional steps after the volume was created.
+                    </span>
+                </fieldset>
+            @endif
+
             <div class="form-group">
                 <input type="hidden" name="_token" value="{{ csrf_token() }}">
                 <input type="hidden" name="_method" value="PUT">
                 <button type="submit" form="cancel-pending-volume" class="btn btn-default" :disabled="loading" title="Discard data and return to the previous step">Cancel</button>
                 <button v-if="!initialized" type="button" class="btn btn-success pull-right" disabled>Create</button>
-                <input v-cloak type="submit" class="btn btn-success pull-right" value="Create" :disabled="cannotSubmit" title="Create the volume">
+                <input v-cloak v-if="importAnnotations || importFileLabels" type="submit" class="btn btn-success pull-right" value="Create and continue" :disabled="cannotSubmit" title="Create the volume and continue to import more metadata">
+                <input v-cloak v-else type="submit" class="btn btn-success pull-right" value="Create" :disabled="cannotSubmit" title="Create the volume">
             </div>
         </form>
         <form id="cancel-pending-volume" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}") }}" v-on:submit="startLoading">

From 208252e9d0968b3101747720f472d3fe7701e08d Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Mon, 25 Mar 2024 16:21:13 +0100
Subject: [PATCH 082/209] Start to implement volumes.create.annotationLabels
 view

---
 .../Api/PendingVolumeController.php           |  31 +++--
 .../Views/Volumes/PendingVolumeController.php |  30 +++++
 .../volumes/create/annotationLabels.blade.php |  31 +++++
 routes/web.php                                |   5 +
 .../Api/PendingVolumeControllerTest.php       |  33 +++++-
 .../Volumes/PendingVolumeControllerTest.php   | 107 ++++++++++++++++++
 .../Views/Volumes/VolumeControllerTest.php    |  22 +++-
 7 files changed, 246 insertions(+), 13 deletions(-)
 create mode 100644 resources/views/volumes/create/annotationLabels.blade.php

diff --git a/app/Http/Controllers/Api/PendingVolumeController.php b/app/Http/Controllers/Api/PendingVolumeController.php
index 81a0436e6..59a8e38cb 100644
--- a/app/Http/Controllers/Api/PendingVolumeController.php
+++ b/app/Http/Controllers/Api/PendingVolumeController.php
@@ -109,23 +109,25 @@ public function store(StorePendingVolume $request)
      */
     public function update(UpdatePendingVolume $request)
     {
-        $volume = DB::transaction(function () use ($request) {
+        $pv = $request->pendingVolume;
+        $volume = DB::transaction(function () use ($request, $pv) {
+
             $volume = Volume::create([
                 'name' => $request->input('name'),
                 'url' => $request->input('url'),
-                'media_type_id' => $request->pendingVolume->media_type_id,
+                'media_type_id' => $pv->media_type_id,
                 'handle' => $request->input('handle'),
                 'creator_id' => $request->user()->id,
             ]);
 
-            $request->pendingVolume->project->volumes()->attach($volume);
+            $pv->project->volumes()->attach($volume);
 
-            if ($request->pendingVolume->hasMetadata()) {
+            if ($pv->hasMetadata()) {
                 $volume->update([
-                    'metadata_file_path' => $volume->id.'.'.pathinfo($request->pendingVolume->metadata_file_path, PATHINFO_EXTENSION)
+                    'metadata_file_path' => $volume->id.'.'.pathinfo($pv->metadata_file_path, PATHINFO_EXTENSION)
                 ]);
                 $stream = Storage::disk(config('volumes.pending_metadata_storage_disk'))
-                    ->readStream($request->pendingVolume->metadata_file_path);
+                    ->readStream($pv->metadata_file_path);
                 Storage::disk(config('volumes.metadata_storage_disk'))
                     ->writeStream($volume->metadata_file_path, $stream);
             }
@@ -147,18 +149,25 @@ public function update(UpdatePendingVolume $request)
         });
 
         if ($request->input('import_annotations') || $request->input('import_file_labels')) {
-            $request->pendingVolume->update([
+            $pv->update([
                 'volume_id' => $volume->id,
                 'import_annotations' => $request->input('import_annotations', false),
                 'import_file_labels' => $request->input('import_file_labels', false),
             ]);
         } else {
-            $request->pendingVolume->volume_id = $volume->id;
-            $request->pendingVolume->delete();
+            $pv->volume_id = $volume->id;
+            $pv->delete();
         }
 
         if ($this->isAutomatedRequest()) {
-            return $request->pendingVolume;
+            return $pv;
+        }
+
+        if ($pv->import_annotations) {
+            return redirect()
+                ->route('pending-volume-annotation-labels', $pv->id)
+                ->with('message', 'Volume created.')
+                ->with('messageType', 'success');
         }
 
         return redirect()
@@ -185,7 +194,7 @@ public function destroy(Request $request)
         $pv->delete();
 
         if (!$this->isAutomatedRequest()) {
-            return redirect()->route('create-volume', ['project' => $pv->project_id]);
+            return $this->fuzzyRedirect('create-volume', ['project' => $pv->project_id]);
         }
     }
 }
diff --git a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
index 45baae1b3..f679e7cb3 100644
--- a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
@@ -9,6 +9,7 @@
 use Biigle\PendingVolume;
 use Biigle\Role;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 
 class PendingVolumeController extends Controller
 {
@@ -105,4 +106,33 @@ public function show(Request $request)
             'hasFileLabels' => $hasFileLabels,
         ]);
     }
+
+    /**
+     * Show the form to select labels of metadata annotations to import.
+     *
+     * @param Request $request
+     */
+    public function showAnnotationLabels(Request $request)
+    {
+        $pv = PendingVolume::findOrFail($request->route('id'));
+        $this->authorize('update', $pv);
+
+        if (is_null($pv->volume_id)) {
+            return redirect()->route('pending-volume', $pv->id);
+        }
+
+        if (!$pv->hasMetadata()) {
+            abort(Response::HTTP_NOT_FOUND);
+        }
+
+        $metadata = $pv->getMetadata();
+
+        if (!$metadata->hasAnnotations()) {
+            abort(Response::HTTP_NOT_FOUND);
+        }
+
+        return view('volumes.create.annotationLabels', [
+            'pv' => $pv,
+        ]);
+    }
 }
diff --git a/resources/views/volumes/create/annotationLabels.blade.php b/resources/views/volumes/create/annotationLabels.blade.php
new file mode 100644
index 000000000..7b4108320
--- /dev/null
+++ b/resources/views/volumes/create/annotationLabels.blade.php
@@ -0,0 +1,31 @@
+@extends('app')
+
+@section('title', 'Select metadata anntation labels to import')
+
+@push('scripts')
+   <script type="text/javascript">
+
+   </script>
+@endpush
+
+@section('content')
+
+<div class="container">
+    <div id="create-volume-form-step-3" class="col-sm-8 col-sm-offset-2 col-lg-6 col-lg-offset-3">
+        <h2>Select labels to filter metadata annotations</h2>
+        <form role="form" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}/annotation-labels") }}" v-on:submit="startLoading">
+
+        <div class="form-group">
+             <input type="hidden" name="_token" value="{{ csrf_token() }}">
+             <button type="submit" form="cancel-pending-volume" class="btn btn-default" :disabled="loading" title="Discard metadata and continue to the new volume">Cancel</button>
+             <input type="submit" class="btn btn-success pull-right" value="Continue" :disabled="loading" title="Proceed to enter the volume details">
+         </div>
+      </form>
+      <form id="cancel-pending-volume" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}") }}" v-on:submit="startLoading">
+            <input type="hidden" name="_token" value="{{ csrf_token() }}">
+            <input type="hidden" name="_method" value="DELETE">
+            <input type="hidden" name="_redirect" value="{{route('volume', $pv->volume_id)}}">
+        </form>
+    </div>
+</div>
+@endsection
diff --git a/routes/web.php b/routes/web.php
index a4175adf6..3f6b41d33 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -252,6 +252,11 @@
             'as'   => 'pending-volume',
             'uses' => 'PendingVolumeController@show',
         ]);
+
+        $router->get('{id}/annotation-labels', [
+            'as'   => 'pending-volume-annotation-labels',
+            'uses' => 'PendingVolumeController@showAnnotationLabels',
+        ]);
     });
 
     $router->group(['namespace' => 'Volumes', 'prefix' => 'volumes'], function ($router) {
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
index ce8f519dc..bab7b3621 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
@@ -387,7 +387,7 @@ public function testUpdateFromUIWithoutImport()
         $disk->put('images/1.jpg', 'abc');
 
         $this->beAdmin();
-        $response = $this->put("/api/v1/pending-volumes/{$pv->id}", [
+        $response = $this->put("/api/v1/pending-volumes/{$id}", [
             'name' => 'my volume no. 1',
             'url' => 'test://images',
             'files' => ['1.jpg'],
@@ -397,6 +397,37 @@ public function testUpdateFromUIWithoutImport()
         $response->assertRedirectToRoute('volume', $volume->id);
     }
 
+    public function testUpdateFromUIWithAnnotationImport()
+    {
+        $disk = Storage::fake('test');
+        config(['volumes.editor_storage_disks' => ['test']]);
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+        ]);
+        $id = $pv->id;
+
+        $disk->makeDirectory('images');
+        $disk->put('images/1.jpg', 'abc');
+
+        $this->beAdmin();
+        $response = $this->put("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test://images',
+            'import_annotations' => true,
+            'files' => ['1.jpg'],
+        ]);
+        $volume = Volume::first();
+
+        $response->assertRedirectToRoute('pending-volume-annotation-labels', $id);
+    }
+
+    public function testUpdateFromUIWithFileLabelImport()
+    {
+        //
+    }
+
     public function testUpdateFileString()
     {
         $disk = Storage::fake('test');
diff --git a/tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php b/tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php
index bedf6ff58..438fae3a7 100644
--- a/tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php
@@ -4,6 +4,14 @@
 
 use ApiTestCase;
 use Biigle\PendingVolume;
+use Biigle\Services\MetadataParsing\ImageAnnotation;
+use Biigle\Services\MetadataParsing\ImageMetadata;
+use Biigle\Services\MetadataParsing\Label;
+use Biigle\Services\MetadataParsing\LabelAndUser;
+use Biigle\Services\MetadataParsing\User;
+use Biigle\Services\MetadataParsing\VolumeMetadata;
+use Biigle\Shape;
+use Illuminate\Support\Facades\Cache;
 
 class PendingVolumeControllerTest extends ApiTestCase
 {
@@ -24,4 +32,103 @@ public function testShow()
         $this->beAdmin();
         $this->get("pending-volumes/{$pv->id}")->assertStatus(200);
     }
+
+    public function testShowWithVolumeRedirectToSelectAnnotationLabels()
+    {
+        // volume_id is filled and import_annotations is true but only_annotation_labels, only_file_labels, label_map and user_map is empty.
+    }
+
+    public function testShowWithVolumeRedirectToSelectFileLabels()
+    {
+        // volume_id and only_annotation_labels are filled and import_file_labels is true but only_file_labels, label_map and user_map are empty.
+    }
+
+    public function testShowWithVolumeRedirectToLabelMap()
+    {
+        // volume_id and only_annotation_labels and/or only_file_labels are filled but label_map and user_map are empty.
+    }
+
+    public function testShowWithVolumeRedirectToUserMap()
+    {
+        // volume_id, only_annotation_labels and/or only_file_labels and label_map are filled but user_map is empty.
+    }
+
+    public function testShowSelectAnnotationLabels()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+            'volume_id' => $this->volume()->id,
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+
+        // not logged in
+        $this->get("pending-volumes/{$pv->id}/annotation-labels")->assertStatus(302);
+
+        // doesn't belong to pending volume
+        $this->beExpert();
+        $this->get("pending-volumes/{$pv->id}/annotation-labels")->assertStatus(403);
+
+        $this->beAdmin();
+        $this->get("pending-volumes/{$pv->id}/annotation-labels")->assertStatus(200);
+    }
+
+    public function testShowSelectAnnotationLabelsNoVolume()
+    {
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+        ]);
+
+        $this->beAdmin();
+        $this
+            ->get("pending-volumes/{$pv->id}/annotation-labels")
+            ->assertRedirectToRoute('pending-volume', $pv->id);
+    }
+
+    public function testShowSelectAnnotationLabelsNoMetadata()
+    {
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+            'volume_id' => $this->volume()->id,
+        ]);
+
+        $this->beAdmin();
+        $this->get("pending-volumes/{$pv->id}/annotation-labels")->assertStatus(404);
+    }
+
+    public function testShowSelectAnnotationLabelsNoAnnotations()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+            'volume_id' => $this->volume()->id,
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+
+        $this->beAdmin();
+        $this->get("pending-volumes/{$pv->id}/annotation-labels")->assertStatus(404);
+    }
 }
diff --git a/tests/php/Http/Controllers/Views/Volumes/VolumeControllerTest.php b/tests/php/Http/Controllers/Views/Volumes/VolumeControllerTest.php
index d0c5ec83c..74f687a11 100644
--- a/tests/php/Http/Controllers/Views/Volumes/VolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Views/Volumes/VolumeControllerTest.php
@@ -63,7 +63,7 @@ public function testCreate()
         $response->assertStatus(200);
     }
 
-    public function testCreateWithExisting()
+    public function testCreateWithExistingRedirectToStep2()
     {
         $pv = PendingVolume::factory()->create([
             'project_id' => $this->project()->id,
@@ -78,6 +78,26 @@ public function testCreateWithExisting()
             ->assertRedirectToRoute('pending-volume', $pv->id);
     }
 
+    public function testCreateWithExistingRedirectToSelectAnnotationLabels()
+    {
+        // volume_id is filled and import_annotations is true but only_annotation_labels, only_file_labels, label_map and user_map is empty.
+    }
+
+    public function testCreateWithExistingRedirectToSelectFileLabels()
+    {
+        // volume_id and only_annotation_labels are filled and import_file_labels is true but only_file_labels, label_map and user_map are empty.
+    }
+
+    public function testCreateWithExistingRedirectToLabelMap()
+    {
+        // volume_id and only_annotation_labels and/or only_file_labels are filled but label_map and user_map are empty.
+    }
+
+    public function testCreateWithExistingRedirectToUserMap()
+    {
+        // volume_id, only_annotation_labels and/or only_file_labels and label_map are filled but user_map is empty.
+    }
+
     public function testEdit()
     {
         $id = $this->volume()->id;

From 1c4a979350be438af6b85ebf00ce20545d5a958c Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Tue, 26 Mar 2024 15:23:18 +0100
Subject: [PATCH 083/209] Fix warning display in create volume v2 step 2

---
 resources/assets/js/volumes/createFormStep2.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/js/volumes/createFormStep2.vue b/resources/assets/js/volumes/createFormStep2.vue
index 872de0d6d..15a9f5367 100644
--- a/resources/assets/js/volumes/createFormStep2.vue
+++ b/resources/assets/js/volumes/createFormStep2.vue
@@ -389,7 +389,7 @@ export default {
             }
         },
         filenames() {
-            if (!this.metadataFilenames || !this.filenames || !this.filenames.includes('.')) {
+            if (this.metadataFilenames.length === 0 || !this.filenames || !this.filenames.includes('.')) {
                 this.filesDontMatchMetadata = false;
                 return;
             }

From 1d409bbc67f7e09152487931ab0caeb9f153ba79 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 27 Mar 2024 16:32:34 +0100
Subject: [PATCH 084/209] WIP Implement the select annotation labels view for
 metadata import

---
 .../Views/Volumes/PendingVolumeController.php |  4 ++
 app/Services/MetadataParsing/Label.php        | 26 ++++++++++-
 app/Services/MetadataParsing/User.php         | 18 +++++++-
 .../assets/js/volumes/createFormStep3.vue     | 45 +++++++++++++++++++
 resources/assets/js/volumes/main.js           |  2 +
 .../volumes/create/annotationLabels.blade.php | 44 +++++++++++++++---
 6 files changed, 130 insertions(+), 9 deletions(-)
 create mode 100644 resources/assets/js/volumes/createFormStep3.vue

diff --git a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
index f679e7cb3..398ad99a1 100644
--- a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
@@ -131,8 +131,12 @@ public function showAnnotationLabels(Request $request)
             abort(Response::HTTP_NOT_FOUND);
         }
 
+        // Use values() for a more compact JSON representation.
+        $labels = collect($metadata->getAnnotationLabels())->values();
+
         return view('volumes.create.annotationLabels', [
             'pv' => $pv,
+            'labels' => $labels,
         ]);
     }
 }
diff --git a/app/Services/MetadataParsing/Label.php b/app/Services/MetadataParsing/Label.php
index b771d224d..78753de64 100644
--- a/app/Services/MetadataParsing/Label.php
+++ b/app/Services/MetadataParsing/Label.php
@@ -2,7 +2,9 @@
 
 namespace Biigle\Services\MetadataParsing;
 
-class Label
+use JsonSerializable;
+
+class Label implements JsonSerializable
 {
     /**
      * @param string $id
@@ -20,4 +22,26 @@ public function __construct(
     ) {
         //
     }
+
+    public function jsonSerialize()
+    {
+        $ret = [
+            'id' => $this->id,
+            'name' => $this->name,
+        ];
+
+        if (!is_null($this->color)) {
+            $ret['color'] = $this->color;
+        }
+
+        if (!is_null($this->uuid)) {
+            $ret['uuid'] = $this->uuid;
+        }
+
+        if (!is_null($this->labelTreeUuid)) {
+            $ret['labelTreeUuid'] = $this->labelTreeUuid;
+        }
+
+        return $ret;
+    }
 }
diff --git a/app/Services/MetadataParsing/User.php b/app/Services/MetadataParsing/User.php
index e0affcb4c..c11d425dd 100644
--- a/app/Services/MetadataParsing/User.php
+++ b/app/Services/MetadataParsing/User.php
@@ -2,7 +2,9 @@
 
 namespace Biigle\Services\MetadataParsing;
 
-class User
+use JsonSerializable;
+
+class User implements JsonSerializable
 {
     /**
      * @param string $id
@@ -16,4 +18,18 @@ public function __construct(
     ) {
         //
     }
+
+    public function jsonSerialize()
+    {
+        $ret = [
+            'id' => $this->id,
+            'name' => $this->name,
+        ];
+
+        if (!is_null($this->uuid)) {
+            $ret['uuid'] = $this->uuid;
+        }
+
+        return $ret;
+    }
 }
diff --git a/resources/assets/js/volumes/createFormStep3.vue b/resources/assets/js/volumes/createFormStep3.vue
new file mode 100644
index 000000000..9f507cb30
--- /dev/null
+++ b/resources/assets/js/volumes/createFormStep3.vue
@@ -0,0 +1,45 @@
+<script>
+import LoaderMixin from '../core/mixins/loader';
+import LabelTrees from '../label-trees/components/labelTrees';
+
+
+export default {
+    mixins: [LoaderMixin],
+    components: {
+        LabelTrees
+    },
+    data() {
+        return {
+            labels: [],
+        };
+    },
+    computed: {
+        labelTrees() {
+            return [{
+                name: 'Metadata annotation labels',
+                labels: this.labels,
+            }];
+        },
+        cannotContinue() {
+            return this.loading || this.selectedLabels.length === 0;
+        },
+        selectedLabels() {
+            return this.labels.filter(l => l.selected);
+        },
+        allSelected() {
+            return this.labels.length === this.selectedLabels.length;
+        },
+    },
+    methods: {
+        //
+    },
+    created() {
+        this.labels = biigle.$require('volumes.labels').map(function (l) {
+            l.parent_id = null;
+            l.selected = true;
+
+            return l;
+        });
+    },
+};
+</script>
diff --git a/resources/assets/js/volumes/main.js b/resources/assets/js/volumes/main.js
index bdaf173b9..88766cb68 100644
--- a/resources/assets/js/volumes/main.js
+++ b/resources/assets/js/volumes/main.js
@@ -2,6 +2,7 @@ import './export';
 import AnnotationSessionPanel from './annotationSessionPanel';
 import CreateFormStep1 from './createFormStep1';
 import CreateFormStep2 from './createFormStep2';
+import CreateFormStep3 from './createFormStep3';
 import CloneForm from './cloneForm';
 import FileCount from './fileCount';
 import FilePanel from './filePanel';
@@ -13,6 +14,7 @@ import VolumeContainer from './volumeContainer';
 biigle.$mount('annotation-session-panel', AnnotationSessionPanel);
 biigle.$mount('create-volume-form-step-1', CreateFormStep1);
 biigle.$mount('create-volume-form-step-2', CreateFormStep2);
+biigle.$mount('create-volume-form-step-3', CreateFormStep3);
 biigle.$mount('clone-volume-form', CloneForm);
 biigle.$mount('file-panel', FilePanel);
 biigle.$mount('projects-breadcrumb', ProjectsBreadcrumb);
diff --git a/resources/views/volumes/create/annotationLabels.blade.php b/resources/views/volumes/create/annotationLabels.blade.php
index 7b4108320..8e95b382a 100644
--- a/resources/views/volumes/create/annotationLabels.blade.php
+++ b/resources/views/volumes/create/annotationLabels.blade.php
@@ -3,22 +3,52 @@
 @section('title', 'Select metadata anntation labels to import')
 
 @push('scripts')
-   <script type="text/javascript">
-
-   </script>
+    <script type="text/javascript">
+        biigle.$declare('volumes.labels', {!! $labels !!});
+    </script>
 @endpush
 
 @section('content')
 
 <div class="container">
     <div id="create-volume-form-step-3" class="col-sm-8 col-sm-offset-2 col-lg-6 col-lg-offset-3">
-        <h2>Select labels to filter metadata annotations</h2>
+        <h2>Choose labels to filter metadata annotations</h2>
+        <p class="text-muted">
+            If you wish to import only annotations with certain labels from the metadata file, you can choose these labels here. By default, all labels are selected. With <kbd>Alt</kbd>+click you can select and deselect all labels.
+        </p>
         <form role="form" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}/annotation-labels") }}" v-on:submit="startLoading">
 
+        <div class="well well-sm">
+            <label-trees :trees="labelTrees" :multiselect="true" :allow-select-siblings="true" :collapsible="false"></label-trees>
+        </div>
+
+        <div class="form-group{{ $errors->has('labels') ? ' has-error' : '' }}">
+            <div v-if="!allSelected">
+                <input v-for="label in selectedLabels" type="hidden" name="labels[]" :value="label.id">
+            </div>
+            @if ($errors->has('labels'))
+               <span class="help-block">{{ $errors->first('labels') }}</span>
+            @endif
+        </div>
+
+
+        <div class="clearfix">
+            <p v-if="allSelected" class="text-muted pull-right">
+                All labels are selected.
+            </p>
+            <p v-cloak v-else class="text-muted pull-right">
+                <span v-text="selectedLabels.length"></span> labels are selected.
+            </p>
+        </div>
+
         <div class="form-group">
-             <input type="hidden" name="_token" value="{{ csrf_token() }}">
-             <button type="submit" form="cancel-pending-volume" class="btn btn-default" :disabled="loading" title="Discard metadata and continue to the new volume">Cancel</button>
-             <input type="submit" class="btn btn-success pull-right" value="Continue" :disabled="loading" title="Proceed to enter the volume details">
+            <input type="hidden" name="_token" value="{{ csrf_token() }}">
+            <input type="hidden" name="_method" value="PUT">
+            <button type="submit" form="cancel-pending-volume" class="btn btn-default" :disabled="loading" title="Discard metadata and continue to the new volume" onclick="return confirm('Are you sure you want to abort the metadata import?')">Cancel</button>
+
+            <!-- continue to either the file label selection or the label map view -->
+            <a v-if="allSelected" @if ($pv->import_file_labels) href="" @else href="" @endif class="btn btn-success pull-right">Continue</a>
+             <input v-cloak v-else type="submit" class="btn btn-success pull-right" value="Continue" :disabled="cannotContinue" title="">
          </div>
       </form>
       <form id="cancel-pending-volume" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}") }}" v-on:submit="startLoading">

From 8462468b28e21ef50a78aa19c6d2b67aeebd6c34 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 27 Mar 2024 16:36:41 +0100
Subject: [PATCH 085/209] Fix linter error

---
 app/Services/MetadataParsing/Label.php | 2 +-
 app/Services/MetadataParsing/User.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Services/MetadataParsing/Label.php b/app/Services/MetadataParsing/Label.php
index 78753de64..1af4f3b47 100644
--- a/app/Services/MetadataParsing/Label.php
+++ b/app/Services/MetadataParsing/Label.php
@@ -23,7 +23,7 @@ public function __construct(
         //
     }
 
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         $ret = [
             'id' => $this->id,
diff --git a/app/Services/MetadataParsing/User.php b/app/Services/MetadataParsing/User.php
index c11d425dd..89c6e88b0 100644
--- a/app/Services/MetadataParsing/User.php
+++ b/app/Services/MetadataParsing/User.php
@@ -19,7 +19,7 @@ public function __construct(
         //
     }
 
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         $ret = [
             'id' => $this->id,

From 1fc82dacfe5c691a4cdbb8dad9f47e32733b3055 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 4 Apr 2024 15:12:15 +0200
Subject: [PATCH 086/209] Implement pending volume redirect to select
 annotation label view

---
 .../Views/Volumes/PendingVolumeController.php        |  8 ++++++++
 .../Views/Volumes/PendingVolumeControllerTest.php    | 12 +++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
index 398ad99a1..116cb7777 100644
--- a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
@@ -24,6 +24,14 @@ public function show(Request $request)
         $pv = PendingVolume::with('project')->findOrFail($request->route('id'));
         $this->authorize('access', $pv);
 
+        // If the volume was already created, we have to redirect to one of the subsequent
+        // steps.
+        if (!is_null($pv->volume_id)) {
+            if ($pv->import_annotations && empty($pv->only_annotation_labels) && empty($pv->only_file_labels) && empty($pv->label_map) && empty($pv->user_map)) {
+                return redirect()->route('pending-volume-annotation-labels', $pv->id);
+            }
+        }
+
         $disks = collect([]);
         $user = $request->user();
 
diff --git a/tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php b/tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php
index 438fae3a7..9bd84de57 100644
--- a/tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php
@@ -35,7 +35,17 @@ public function testShow()
 
     public function testShowWithVolumeRedirectToSelectAnnotationLabels()
     {
-        // volume_id is filled and import_annotations is true but only_annotation_labels, only_file_labels, label_map and user_map is empty.
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+            'volume_id' => $this->volume()->id,
+            'import_annotations' => true,
+        ]);
+
+        $this->beAdmin();
+        $this
+            ->get("pending-volumes/{$pv->id}")
+            ->assertRedirectToRoute('pending-volume-annotation-labels', $pv->id);
     }
 
     public function testShowWithVolumeRedirectToSelectFileLabels()

From 72299b79ba1e712e2bf8659d1048a1f94007f2b2 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 4 Apr 2024 15:44:46 +0200
Subject: [PATCH 087/209] Implement select metadata import step 4 view

---
 .../Views/Volumes/PendingVolumeController.php | 33 +++++++++
 .../assets/js/volumes/createFormStep4.vue     | 45 +++++++++++
 resources/assets/js/volumes/main.js           |  2 +
 .../volumes/create/annotationLabels.blade.php |  4 +-
 .../views/volumes/create/fileLabels.blade.php | 61 +++++++++++++++
 routes/web.php                                |  5 ++
 .../Volumes/PendingVolumeControllerTest.php   | 74 +++++++++++++++++++
 7 files changed, 222 insertions(+), 2 deletions(-)
 create mode 100644 resources/assets/js/volumes/createFormStep4.vue
 create mode 100644 resources/views/volumes/create/fileLabels.blade.php

diff --git a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
index 116cb7777..180a9942d 100644
--- a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
@@ -147,4 +147,37 @@ public function showAnnotationLabels(Request $request)
             'labels' => $labels,
         ]);
     }
+
+    /**
+     * Show the form to select labels of metadata file labels to import.
+     *
+     * @param Request $request
+     */
+    public function showFileLabels(Request $request)
+    {
+        $pv = PendingVolume::findOrFail($request->route('id'));
+        $this->authorize('update', $pv);
+
+        if (is_null($pv->volume_id)) {
+            return redirect()->route('pending-volume', $pv->id);
+        }
+
+        if (!$pv->hasMetadata()) {
+            abort(Response::HTTP_NOT_FOUND);
+        }
+
+        $metadata = $pv->getMetadata();
+
+        if (!$metadata->hasFileLabels()) {
+            abort(Response::HTTP_NOT_FOUND);
+        }
+
+        // Use values() for a more compact JSON representation.
+        $labels = collect($metadata->getFileLabels())->values();
+
+        return view('volumes.create.fileLabels', [
+            'pv' => $pv,
+            'labels' => $labels,
+        ]);
+    }
 }
diff --git a/resources/assets/js/volumes/createFormStep4.vue b/resources/assets/js/volumes/createFormStep4.vue
new file mode 100644
index 000000000..80a3f9c04
--- /dev/null
+++ b/resources/assets/js/volumes/createFormStep4.vue
@@ -0,0 +1,45 @@
+<script>
+import LoaderMixin from '../core/mixins/loader';
+import LabelTrees from '../label-trees/components/labelTrees';
+
+
+export default {
+    mixins: [LoaderMixin],
+    components: {
+        LabelTrees
+    },
+    data() {
+        return {
+            labels: [],
+        };
+    },
+    computed: {
+        labelTrees() {
+            return [{
+                name: 'Metadata file labels',
+                labels: this.labels,
+            }];
+        },
+        cannotContinue() {
+            return this.loading || this.selectedLabels.length === 0;
+        },
+        selectedLabels() {
+            return this.labels.filter(l => l.selected);
+        },
+        allSelected() {
+            return this.labels.length === this.selectedLabels.length;
+        },
+    },
+    methods: {
+        //
+    },
+    created() {
+        this.labels = biigle.$require('volumes.labels').map(function (l) {
+            l.parent_id = null;
+            l.selected = true;
+
+            return l;
+        });
+    },
+};
+</script>
diff --git a/resources/assets/js/volumes/main.js b/resources/assets/js/volumes/main.js
index 88766cb68..80770083a 100644
--- a/resources/assets/js/volumes/main.js
+++ b/resources/assets/js/volumes/main.js
@@ -3,6 +3,7 @@ import AnnotationSessionPanel from './annotationSessionPanel';
 import CreateFormStep1 from './createFormStep1';
 import CreateFormStep2 from './createFormStep2';
 import CreateFormStep3 from './createFormStep3';
+import CreateFormStep4 from './createFormStep4';
 import CloneForm from './cloneForm';
 import FileCount from './fileCount';
 import FilePanel from './filePanel';
@@ -15,6 +16,7 @@ biigle.$mount('annotation-session-panel', AnnotationSessionPanel);
 biigle.$mount('create-volume-form-step-1', CreateFormStep1);
 biigle.$mount('create-volume-form-step-2', CreateFormStep2);
 biigle.$mount('create-volume-form-step-3', CreateFormStep3);
+biigle.$mount('create-volume-form-step-4', CreateFormStep4);
 biigle.$mount('clone-volume-form', CloneForm);
 biigle.$mount('file-panel', FilePanel);
 biigle.$mount('projects-breadcrumb', ProjectsBreadcrumb);
diff --git a/resources/views/volumes/create/annotationLabels.blade.php b/resources/views/volumes/create/annotationLabels.blade.php
index 8e95b382a..6e432e195 100644
--- a/resources/views/volumes/create/annotationLabels.blade.php
+++ b/resources/views/volumes/create/annotationLabels.blade.php
@@ -46,8 +46,8 @@
             <input type="hidden" name="_method" value="PUT">
             <button type="submit" form="cancel-pending-volume" class="btn btn-default" :disabled="loading" title="Discard metadata and continue to the new volume" onclick="return confirm('Are you sure you want to abort the metadata import?')">Cancel</button>
 
-            <!-- continue to either the file label selection or the label map view -->
-            <a v-if="allSelected" @if ($pv->import_file_labels) href="" @else href="" @endif class="btn btn-success pull-right">Continue</a>
+            <!-- TODO: continue to the label map view -->
+            <a v-if="allSelected" @if ($pv->import_file_labels) href="{{ route('pending-volume-file-labels', $pv->id) }}" @else href="" @endif class="btn btn-success pull-right">Continue</a>
              <input v-cloak v-else type="submit" class="btn btn-success pull-right" value="Continue" :disabled="cannotContinue" title="">
          </div>
       </form>
diff --git a/resources/views/volumes/create/fileLabels.blade.php b/resources/views/volumes/create/fileLabels.blade.php
new file mode 100644
index 000000000..ea7a4ce6b
--- /dev/null
+++ b/resources/views/volumes/create/fileLabels.blade.php
@@ -0,0 +1,61 @@
+@extends('app')
+
+@section('title', 'Select metadata file labels to import')
+
+@push('scripts')
+    <script type="text/javascript">
+        biigle.$declare('volumes.labels', {!! $labels !!});
+    </script>
+@endpush
+
+@section('content')
+
+<div class="container">
+    <div id="create-volume-form-step-4" class="col-sm-8 col-sm-offset-2 col-lg-6 col-lg-offset-3">
+        <h2>Choose file labels to filter metadata</h2>
+        <p class="text-muted">
+            If you wish to import only certain file labels from the metadata file, you can choose these labels here. By default, all labels are selected. With <kbd>Alt</kbd>+click you can select and deselect all labels.
+        </p>
+        <form role="form" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}/file-labels") }}" v-on:submit="startLoading">
+
+        <div class="well well-sm">
+            <label-trees :trees="labelTrees" :multiselect="true" :allow-select-siblings="true" :collapsible="false"></label-trees>
+        </div>
+
+        <div class="form-group{{ $errors->has('labels') ? ' has-error' : '' }}">
+            <div v-if="!allSelected">
+                <input v-for="label in selectedLabels" type="hidden" name="labels[]" :value="label.id">
+            </div>
+            @if ($errors->has('labels'))
+               <span class="help-block">{{ $errors->first('labels') }}</span>
+            @endif
+        </div>
+
+
+        <div class="clearfix">
+            <p v-if="allSelected" class="text-muted pull-right">
+                All labels are selected.
+            </p>
+            <p v-cloak v-else class="text-muted pull-right">
+                <span v-text="selectedLabels.length"></span> labels are selected.
+            </p>
+        </div>
+
+        <div class="form-group">
+            <input type="hidden" name="_token" value="{{ csrf_token() }}">
+            <input type="hidden" name="_method" value="PUT">
+            <button type="submit" form="cancel-pending-volume" class="btn btn-default" :disabled="loading" title="Discard metadata and continue to the new volume" onclick="return confirm('Are you sure you want to abort the metadata import?')">Cancel</button>
+
+            <!-- TODO continue to the label map view -->
+            <a v-if="allSelected" href="" class="btn btn-success pull-right">Continue</a>
+             <input v-cloak v-else type="submit" class="btn btn-success pull-right" value="Continue" :disabled="cannotContinue" title="">
+         </div>
+      </form>
+      <form id="cancel-pending-volume" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}") }}" v-on:submit="startLoading">
+            <input type="hidden" name="_token" value="{{ csrf_token() }}">
+            <input type="hidden" name="_method" value="DELETE">
+            <input type="hidden" name="_redirect" value="{{route('volume', $pv->volume_id)}}">
+        </form>
+    </div>
+</div>
+@endsection
diff --git a/routes/web.php b/routes/web.php
index 3f6b41d33..c3dde910a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -257,6 +257,11 @@
             'as'   => 'pending-volume-annotation-labels',
             'uses' => 'PendingVolumeController@showAnnotationLabels',
         ]);
+
+        $router->get('{id}/file-labels', [
+            'as'   => 'pending-volume-file-labels',
+            'uses' => 'PendingVolumeController@showFileLabels',
+        ]);
     });
 
     $router->group(['namespace' => 'Volumes', 'prefix' => 'volumes'], function ($router) {
diff --git a/tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php b/tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php
index 9bd84de57..ff446b459 100644
--- a/tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php
@@ -141,4 +141,78 @@ public function testShowSelectAnnotationLabelsNoAnnotations()
         $this->beAdmin();
         $this->get("pending-volumes/{$pv->id}/annotation-labels")->assertStatus(404);
     }
+
+    public function testShowSelectFileLabels()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+            'volume_id' => $this->volume()->id,
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+
+        // not logged in
+        $this->get("pending-volumes/{$pv->id}/file-labels")->assertStatus(302);
+
+        // doesn't belong to pending volume
+        $this->beExpert();
+        $this->get("pending-volumes/{$pv->id}/file-labels")->assertStatus(403);
+
+        $this->beAdmin();
+        $this->get("pending-volumes/{$pv->id}/file-labels")->assertStatus(200);
+    }
+
+    public function testShowSelectFileLabelsNoVolume()
+    {
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+        ]);
+
+        $this->beAdmin();
+        $this
+            ->get("pending-volumes/{$pv->id}/file-labels")
+            ->assertRedirectToRoute('pending-volume', $pv->id);
+    }
+
+    public function testShowSelectFileLabelsNoMetadata()
+    {
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+            'volume_id' => $this->volume()->id,
+        ]);
+
+        $this->beAdmin();
+        $this->get("pending-volumes/{$pv->id}/file-labels")->assertStatus(404);
+    }
+
+    public function testShowSelectFileLabelsNoFileLabels()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+            'volume_id' => $this->volume()->id,
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+
+        $this->beAdmin();
+        $this->get("pending-volumes/{$pv->id}/file-labels")->assertStatus(404);
+    }
 }

From 34ca14727745549562ec38cd79d5d0ecbe77d807 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 4 Apr 2024 15:54:33 +0200
Subject: [PATCH 088/209] Add API redirect for import metadata step 3 UI
 requests

---
 .../Api/PendingVolumeImportController.php     |  8 ++-
 .../Api/PendingVolumeImportControllerTest.php | 50 +++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Api/PendingVolumeImportController.php b/app/Http/Controllers/Api/PendingVolumeImportController.php
index 3bab7edf8..33b5f8eaa 100644
--- a/app/Http/Controllers/Api/PendingVolumeImportController.php
+++ b/app/Http/Controllers/Api/PendingVolumeImportController.php
@@ -48,7 +48,13 @@ public function updateAnnotationLabels(UpdatePendingVolumeAnnotationLabels $requ
             'only_annotation_labels' => $request->input('labels'),
         ]);
 
-        return $request->pendingVolume;
+        if ($this->isAutomatedRequest()) {
+            return $request->pendingVolume;
+        }
+
+        if ($request->pendingVolume->import_file_labels) {
+            return redirect()->route('pending-volume-file-labels', $request->pendingVolume->id);
+        }
     }
 
     /**
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
index b845a9e58..9b1189438 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
@@ -88,6 +88,46 @@ public function testUpdateAnnotationLabels()
         $this->assertEquals([123], $pv->only_annotation_labels);
     }
 
+    public function testUpdateAnnotationLabelsRedirectToSelectFileLabels()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+            'import_file_labels' => true,
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+        $this->put("/api/v1/pending-volumes/{$id}/annotation-labels", [
+            'labels' => [123],
+        ])->assertRedirectToRoute('pending-volume-file-labels', $id);
+
+        // for non-automated requests, if import_file_labels === true
+    }
+
+    public function testUpdateAnnotationLabelsRedirectToLabelMap()
+    {
+        // for non-automated requests, if import_file_labels === false
+    }
+
     public function testUpdateFileLabels()
     {
         $metadata = new VolumeMetadata;
@@ -146,6 +186,11 @@ public function testUpdateFileLabels()
         $this->assertEquals([123], $pv->only_file_labels);
     }
 
+    public function testUpdateFileLabelsRedirectToLabelMap()
+    {
+        // for non-automated requests
+    }
+
     public function testUpdateLabelMap()
     {
         $metadata = new VolumeMetadata;
@@ -341,6 +386,11 @@ public function testUpdateLabelMapTryLabelNotAllowed()
         ])->assertStatus(422);
     }
 
+    public function testUpdateLabelMapRedirectToUserMap()
+    {
+        // for non-automated requests
+    }
+
     public function testUpdateUserMap()
     {
         $metadata = new VolumeMetadata;

From 48d09e73dbbd5105560d6bb086ea9d11bcc44741 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 4 Apr 2024 16:32:47 +0200
Subject: [PATCH 089/209] Implement empty metadata import label map view

---
 .../Api/PendingVolumeController.php           |  12 +-
 .../Api/PendingVolumeImportController.php     |   8 +-
 .../Views/Volumes/PendingVolumeController.php |  49 ++++++-
 .../Views/Volumes/VolumeController.php        |   3 +-
 .../volumes/create/annotationLabels.blade.php |   5 +-
 .../views/volumes/create/fileLabels.blade.php |   5 +-
 .../views/volumes/create/labelMap.blade.php   |  52 +++++++
 .../views/volumes/create/step2.blade.php      |   7 -
 routes/web.php                                |   5 +
 .../Api/PendingVolumeControllerTest.php       |  23 ++-
 .../Api/PendingVolumeImportControllerTest.php |  56 +++++++-
 .../Volumes/PendingVolumeControllerTest.php   | 132 +++++++++++++++++-
 12 files changed, 326 insertions(+), 31 deletions(-)
 create mode 100644 resources/views/volumes/create/labelMap.blade.php

diff --git a/app/Http/Controllers/Api/PendingVolumeController.php b/app/Http/Controllers/Api/PendingVolumeController.php
index 59a8e38cb..50cfe49f7 100644
--- a/app/Http/Controllers/Api/PendingVolumeController.php
+++ b/app/Http/Controllers/Api/PendingVolumeController.php
@@ -164,14 +164,14 @@ public function update(UpdatePendingVolume $request)
         }
 
         if ($pv->import_annotations) {
-            return redirect()
-                ->route('pending-volume-annotation-labels', $pv->id)
-                ->with('message', 'Volume created.')
-                ->with('messageType', 'success');
+            $redirect = redirect()->route('pending-volume-annotation-labels', $pv->id);;
+        } elseif ($pv->import_file_labels) {
+            $redirect = redirect()->route('pending-volume-file-labels', $pv->id);;
+        } else {
+            $redirect = redirect()->route('volume', $volume->id);
         }
 
-        return redirect()
-            ->route('volume', $volume->id)
+        return $redirect
             ->with('message', 'Volume created.')
             ->with('messageType', 'success');
     }
diff --git a/app/Http/Controllers/Api/PendingVolumeImportController.php b/app/Http/Controllers/Api/PendingVolumeImportController.php
index 33b5f8eaa..b1d1246f7 100644
--- a/app/Http/Controllers/Api/PendingVolumeImportController.php
+++ b/app/Http/Controllers/Api/PendingVolumeImportController.php
@@ -55,6 +55,8 @@ public function updateAnnotationLabels(UpdatePendingVolumeAnnotationLabels $requ
         if ($request->pendingVolume->import_file_labels) {
             return redirect()->route('pending-volume-file-labels', $request->pendingVolume->id);
         }
+
+        return redirect()->route('pending-volume-label-map', $request->pendingVolume->id);
     }
 
     /**
@@ -92,7 +94,11 @@ public function updateFileLabels(UpdatePendingVolumeFileLabels $request)
             'only_file_labels' => $request->input('labels'),
         ]);
 
-        return $request->pendingVolume;
+        if ($this->isAutomatedRequest()) {
+            return $request->pendingVolume;
+        }
+
+        return redirect()->route('pending-volume-label-map', $request->pendingVolume->id);
     }
 
     /**
diff --git a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
index 180a9942d..c194fed45 100644
--- a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
@@ -30,6 +30,22 @@ public function show(Request $request)
             if ($pv->import_annotations && empty($pv->only_annotation_labels) && empty($pv->only_file_labels) && empty($pv->label_map) && empty($pv->user_map)) {
                 return redirect()->route('pending-volume-annotation-labels', $pv->id);
             }
+
+            if ($pv->import_file_labels && empty($pv->only_file_labels) && empty($pv->label_map) && empty($pv->user_map)) {
+                return redirect()->route('pending-volume-file-labels', $pv->id);
+            }
+
+            if (empty($pv->label_map) && empty($pv->user_map)) {
+                return redirect()->route('pending-volume-label-map', $pv->id);
+            }
+
+            if (!$redirect) {
+                // TODO redirect to user map
+            }
+
+            return $redirect
+                ->with('message', 'This is a pending volume that you did not finish before.')
+                ->with('messageType', 'info');
         }
 
         $disks = collect([]);
@@ -67,8 +83,6 @@ public function show(Request $request)
         $isImageMediaType = $pv->media_type_id === MediaType::imageId();
         $mediaType = $isImageMediaType ? 'image' : 'video';
 
-        $restored = session()->has('restored');
-
         $metadata = null;
         $oldName = '';
         $oldUrl = '';
@@ -105,7 +119,6 @@ public function show(Request $request)
             'userDisk' => $userDisk,
             'mediaType' => $mediaType,
             'isImageMediaType' => $isImageMediaType,
-            'restored' => $restored,
             'oldName' => $oldName,
             'oldUrl' => $oldUrl,
             'oldHandle' => $oldHandle,
@@ -180,4 +193,34 @@ public function showFileLabels(Request $request)
             'labels' => $labels,
         ]);
     }
+
+    /**
+     * Show the form to select the label map for the metadata import.
+     *
+     * @param Request $request
+     */
+    public function showLabelMap(Request $request)
+    {
+        $pv = PendingVolume::findOrFail($request->route('id'));
+        $this->authorize('update', $pv);
+
+        if (is_null($pv->volume_id)) {
+            return redirect()->route('pending-volume', $pv->id);
+        }
+
+        if (!$pv->hasMetadata()) {
+            abort(Response::HTTP_NOT_FOUND);
+        }
+
+        $labels = $pv->getMetadata()->getMatchingLabels();
+
+        if (empty($labels)) {
+            abort(Response::HTTP_NOT_FOUND);
+        }
+
+        return view('volumes.create.labelMap', [
+            'pv' => $pv,
+            'labels' => $labels,
+        ]);
+    }
 }
diff --git a/app/Http/Controllers/Views/Volumes/VolumeController.php b/app/Http/Controllers/Views/Volumes/VolumeController.php
index 55a614c8b..acd531f99 100644
--- a/app/Http/Controllers/Views/Volumes/VolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/VolumeController.php
@@ -29,7 +29,8 @@ public function create(Request $request)
         if (!is_null($pv)) {
             return redirect()
                 ->route('pending-volume', $pv->id)
-                ->with('restored', true);
+                ->with('message', 'This is a pending volume that you did not finish before.')
+                ->with('messageType', 'info');
         }
 
         $mediaType = old('media_type', 'image');
diff --git a/resources/views/volumes/create/annotationLabels.blade.php b/resources/views/volumes/create/annotationLabels.blade.php
index 6e432e195..a58824d09 100644
--- a/resources/views/volumes/create/annotationLabels.blade.php
+++ b/resources/views/volumes/create/annotationLabels.blade.php
@@ -46,9 +46,8 @@
             <input type="hidden" name="_method" value="PUT">
             <button type="submit" form="cancel-pending-volume" class="btn btn-default" :disabled="loading" title="Discard metadata and continue to the new volume" onclick="return confirm('Are you sure you want to abort the metadata import?')">Cancel</button>
 
-            <!-- TODO: continue to the label map view -->
-            <a v-if="allSelected" @if ($pv->import_file_labels) href="{{ route('pending-volume-file-labels', $pv->id) }}" @else href="" @endif class="btn btn-success pull-right">Continue</a>
-             <input v-cloak v-else type="submit" class="btn btn-success pull-right" value="Continue" :disabled="cannotContinue" title="">
+            <a v-if="allSelected" @if ($pv->import_file_labels) href="{{ route('pending-volume-file-labels', $pv->id) }}" @else href="{{ route('pending-volume-label-map', $pv->id) }}" @endif class="btn btn-success pull-right">Continue</a>
+            <input v-cloak v-else type="submit" class="btn btn-success pull-right" value="Continue" :disabled="cannotContinue">
          </div>
       </form>
       <form id="cancel-pending-volume" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}") }}" v-on:submit="startLoading">
diff --git a/resources/views/volumes/create/fileLabels.blade.php b/resources/views/volumes/create/fileLabels.blade.php
index ea7a4ce6b..718db008d 100644
--- a/resources/views/volumes/create/fileLabels.blade.php
+++ b/resources/views/volumes/create/fileLabels.blade.php
@@ -46,9 +46,8 @@
             <input type="hidden" name="_method" value="PUT">
             <button type="submit" form="cancel-pending-volume" class="btn btn-default" :disabled="loading" title="Discard metadata and continue to the new volume" onclick="return confirm('Are you sure you want to abort the metadata import?')">Cancel</button>
 
-            <!-- TODO continue to the label map view -->
-            <a v-if="allSelected" href="" class="btn btn-success pull-right">Continue</a>
-             <input v-cloak v-else type="submit" class="btn btn-success pull-right" value="Continue" :disabled="cannotContinue" title="">
+            <a v-if="allSelected" href="{{ route('pending-volume-label-map', $pv->id) }}" class="btn btn-success pull-right">Continue</a>
+            <input v-cloak v-else type="submit" class="btn btn-success pull-right" value="Continue" :disabled="cannotContinue">
          </div>
       </form>
       <form id="cancel-pending-volume" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}") }}" v-on:submit="startLoading">
diff --git a/resources/views/volumes/create/labelMap.blade.php b/resources/views/volumes/create/labelMap.blade.php
new file mode 100644
index 000000000..7528585e5
--- /dev/null
+++ b/resources/views/volumes/create/labelMap.blade.php
@@ -0,0 +1,52 @@
+@extends('app')
+
+@section('title', 'Select the metadata import label mapping')
+
+@push('scripts')
+    <script type="text/javascript">
+        {{-- biigle.$declare('volumes.labels', {!! $labels !!}); --}}
+    </script>
+@endpush
+
+@section('content')
+
+<div class="container">
+    <div id="create-volume-form-step-5" class="col-sm-8 col-sm-offset-2 col-lg-6 col-lg-offset-3">
+        <h2>Metadata import label mapping</h2>
+        <p class="text-muted">
+
+        </p>
+        <form role="form" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}/label-map") }}" v-on:submit="startLoading">
+
+        <div class="form-group{{ $errors->has('label_map') ? ' has-error' : '' }}">
+            {{--<input v-for="label in selectedLabels" type="hidden" name="label_map[]" :value="label.id">--}}
+            @if ($errors->has('label_map'))
+               <span class="help-block">{{ $errors->first('label_map') }}</span>
+            @endif
+        </div>
+
+        <div class="clearfix">
+            <p v-if="allMapped" class="text-muted pull-right">
+                All labels are mapped.
+            </p>
+            <p v-cloak v-else class="text-muted pull-right">
+                <span v-text="danglingLabels.length"></span> labels must be mapped.
+            </p>
+        </div>
+
+        <div class="form-group">
+            <input type="hidden" name="_token" value="{{ csrf_token() }}">
+            <input type="hidden" name="_method" value="PUT">
+            <button type="submit" form="cancel-pending-volume" class="btn btn-default" :disabled="loading" title="Discard metadata and continue to the new volume" onclick="return confirm('Are you sure you want to abort the metadata import?')">Cancel</button>
+
+            <input type="submit" class="btn btn-success pull-right" value="Continue" :disabled="cannotContinue">
+         </div>
+      </form>
+      <form id="cancel-pending-volume" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}") }}" v-on:submit="startLoading">
+            <input type="hidden" name="_token" value="{{ csrf_token() }}">
+            <input type="hidden" name="_method" value="DELETE">
+            <input type="hidden" name="_redirect" value="{{route('volume', $pv->volume_id)}}">
+        </form>
+    </div>
+</div>
+@endsection
diff --git a/resources/views/volumes/create/step2.blade.php b/resources/views/volumes/create/step2.blade.php
index ccb224c02..4c0a58bd7 100644
--- a/resources/views/volumes/create/step2.blade.php
+++ b/resources/views/volumes/create/step2.blade.php
@@ -19,13 +19,6 @@
 <div class="container">
     <div id="create-volume-form-step-2" class="col-sm-8 col-sm-offset-2 col-lg-6 col-lg-offset-3">
         <h2>New {{$mediaType}} volume for {{ $project->name }}</h2>
-        @if ($restored)
-            <div class="panel panel-info">
-                <div class="panel-body text-info">
-                    This is a pending volume that you did not finish before.
-                </div>
-            </div>
-        @endif
         <form method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}") }}" v-on:submit="startLoading">
             <fieldset>
                 <legend>
diff --git a/routes/web.php b/routes/web.php
index c3dde910a..d2a9d91a4 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -262,6 +262,11 @@
             'as'   => 'pending-volume-file-labels',
             'uses' => 'PendingVolumeController@showFileLabels',
         ]);
+
+        $router->get('{id}/label-map', [
+            'as'   => 'pending-volume-label-map',
+            'uses' => 'PendingVolumeController@showLabelMap',
+        ]);
     });
 
     $router->group(['namespace' => 'Volumes', 'prefix' => 'volumes'], function ($router) {
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
index bab7b3621..510e4bb51 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
@@ -425,7 +425,28 @@ public function testUpdateFromUIWithAnnotationImport()
 
     public function testUpdateFromUIWithFileLabelImport()
     {
-        //
+        $disk = Storage::fake('test');
+        config(['volumes.editor_storage_disks' => ['test']]);
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+        ]);
+        $id = $pv->id;
+
+        $disk->makeDirectory('images');
+        $disk->put('images/1.jpg', 'abc');
+
+        $this->beAdmin();
+        $response = $this->put("/api/v1/pending-volumes/{$id}", [
+            'name' => 'my volume no. 1',
+            'url' => 'test://images',
+            'import_file_labels' => true,
+            'files' => ['1.jpg'],
+        ]);
+        $volume = Volume::first();
+
+        $response->assertRedirectToRoute('pending-volume-file-labels', $id);
     }
 
     public function testUpdateFileString()
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
index 9b1189438..a7ecab0e3 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
@@ -119,13 +119,39 @@ public function testUpdateAnnotationLabelsRedirectToSelectFileLabels()
         $this->put("/api/v1/pending-volumes/{$id}/annotation-labels", [
             'labels' => [123],
         ])->assertRedirectToRoute('pending-volume-file-labels', $id);
-
-        // for non-automated requests, if import_file_labels === true
     }
 
     public function testUpdateAnnotationLabelsRedirectToLabelMap()
     {
-        // for non-automated requests, if import_file_labels === false
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $annotation = new ImageAnnotation(
+            shape: Shape::point(),
+            points: [10, 10],
+            labels: [$lau],
+        );
+        $file->addAnnotation($annotation);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+            'import_file_labels' => false,
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+        $this->put("/api/v1/pending-volumes/{$id}/annotation-labels", [
+            'labels' => [123],
+        ])->assertRedirectToRoute('pending-volume-label-map', $id);
     }
 
     public function testUpdateFileLabels()
@@ -188,7 +214,29 @@ public function testUpdateFileLabels()
 
     public function testUpdateFileLabelsRedirectToLabelMap()
     {
-        // for non-automated requests
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+        $this->put("/api/v1/pending-volumes/{$id}/file-labels", [
+            'labels' => [123],
+        ])->assertRedirectToRoute('pending-volume-label-map', $id);
     }
 
     public function testUpdateLabelMap()
diff --git a/tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php b/tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php
index ff446b459..07e5b46a3 100644
--- a/tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php
@@ -50,12 +50,66 @@ public function testShowWithVolumeRedirectToSelectAnnotationLabels()
 
     public function testShowWithVolumeRedirectToSelectFileLabels()
     {
-        // volume_id and only_annotation_labels are filled and import_file_labels is true but only_file_labels, label_map and user_map are empty.
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+            'volume_id' => $this->volume()->id,
+            'import_file_labels' => true,
+            'only_annotation_labels' => [123],
+        ]);
+
+        $this->beAdmin();
+        $this
+            ->get("pending-volumes/{$pv->id}")
+            ->assertRedirectToRoute('pending-volume-file-labels', $pv->id);
     }
 
     public function testShowWithVolumeRedirectToLabelMap()
     {
-        // volume_id and only_annotation_labels and/or only_file_labels are filled but label_map and user_map are empty.
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+            'volume_id' => $this->volume()->id,
+            'only_annotation_labels' => [123],
+            'only_file_labels' => [123],
+        ]);
+
+        $this->beAdmin();
+        $this
+            ->get("pending-volumes/{$pv->id}")
+            ->assertRedirectToRoute('pending-volume-label-map', $pv->id);
+    }
+
+    public function testShowWithVolumeRedirectToLabelMapOnlyAnnotations()
+    {
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+            'volume_id' => $this->volume()->id,
+            'only_annotation_labels' => [123],
+            'import_annotations' => true,
+        ]);
+
+        $this->beAdmin();
+        $this
+            ->get("pending-volumes/{$pv->id}")
+            ->assertRedirectToRoute('pending-volume-label-map', $pv->id);
+    }
+
+    public function testShowWithVolumeRedirectToLabelMapOnlyFileLabels()
+    {
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+            'volume_id' => $this->volume()->id,
+            'only_file_labels' => [123],
+            'import_file_labels' => true,
+        ]);
+
+        $this->beAdmin();
+        $this
+            ->get("pending-volumes/{$pv->id}")
+            ->assertRedirectToRoute('pending-volume-label-map', $pv->id);
     }
 
     public function testShowWithVolumeRedirectToUserMap()
@@ -215,4 +269,78 @@ public function testShowSelectFileLabelsNoFileLabels()
         $this->beAdmin();
         $this->get("pending-volumes/{$pv->id}/file-labels")->assertStatus(404);
     }
+
+    public function testShowSelectLabelMap()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+            'volume_id' => $this->volume()->id,
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+
+        // not logged in
+        $this->get("pending-volumes/{$pv->id}/label-map")->assertStatus(302);
+
+        // doesn't belong to pending volume
+        $this->beExpert();
+        $this->get("pending-volumes/{$pv->id}/label-map")->assertStatus(403);
+
+        $this->beAdmin();
+        $this->get("pending-volumes/{$pv->id}/label-map")->assertStatus(200);
+    }
+
+    public function testShowSelectLabelMapNoVolume()
+    {
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+        ]);
+
+        $this->beAdmin();
+        $this
+            ->get("pending-volumes/{$pv->id}/label-map")
+            ->assertRedirectToRoute('pending-volume', $pv->id);
+    }
+
+    public function testShowSelectLabelMapNoMetadata()
+    {
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+            'volume_id' => $this->volume()->id,
+        ]);
+
+        $this->beAdmin();
+        $this->get("pending-volumes/{$pv->id}/label-map")->assertStatus(404);
+    }
+
+    public function testShowSelectLabelMapNoLabels()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+            'volume_id' => $this->volume()->id,
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+
+        $this->beAdmin();
+        $this->get("pending-volumes/{$pv->id}/label-map")->assertStatus(404);
+    }
 }

From ad177a39fbd12c0dd247a482784fe888407f5ef9 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 4 Apr 2024 16:43:21 +0200
Subject: [PATCH 090/209] Implement empty metadata import user map view

---
 .../Api/PendingVolumeImportController.php     |   6 +-
 .../Views/Volumes/PendingVolumeController.php |  50 +++++--
 .../views/volumes/create/userMap.blade.php    |  52 ++++++++
 routes/web.php                                |   5 +
 .../Api/PendingVolumeImportControllerTest.php |  25 +++-
 .../Volumes/PendingVolumeControllerTest.php   | 122 +++++++++++++++++-
 6 files changed, 244 insertions(+), 16 deletions(-)
 create mode 100644 resources/views/volumes/create/userMap.blade.php

diff --git a/app/Http/Controllers/Api/PendingVolumeImportController.php b/app/Http/Controllers/Api/PendingVolumeImportController.php
index b1d1246f7..653277d10 100644
--- a/app/Http/Controllers/Api/PendingVolumeImportController.php
+++ b/app/Http/Controllers/Api/PendingVolumeImportController.php
@@ -137,7 +137,11 @@ public function updateLabelMap(UpdatePendingVolumeLabelMap $request)
             'label_map' => $request->input('label_map'),
         ]);
 
-        return $request->pendingVolume;
+        if ($this->isAutomatedRequest()) {
+            return $request->pendingVolume;
+        }
+
+        return redirect()->route('pending-volume-user-map', $request->pendingVolume->id);
     }
 
     /**
diff --git a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
index c194fed45..19abafc57 100644
--- a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
@@ -28,19 +28,13 @@ public function show(Request $request)
         // steps.
         if (!is_null($pv->volume_id)) {
             if ($pv->import_annotations && empty($pv->only_annotation_labels) && empty($pv->only_file_labels) && empty($pv->label_map) && empty($pv->user_map)) {
-                return redirect()->route('pending-volume-annotation-labels', $pv->id);
-            }
-
-            if ($pv->import_file_labels && empty($pv->only_file_labels) && empty($pv->label_map) && empty($pv->user_map)) {
-                return redirect()->route('pending-volume-file-labels', $pv->id);
-            }
-
-            if (empty($pv->label_map) && empty($pv->user_map)) {
-                return redirect()->route('pending-volume-label-map', $pv->id);
-            }
-
-            if (!$redirect) {
-                // TODO redirect to user map
+                $redirect = redirect()->route('pending-volume-annotation-labels', $pv->id);
+            } elseif ($pv->import_file_labels && empty($pv->only_file_labels) && empty($pv->label_map) && empty($pv->user_map)) {
+                $redirect = redirect()->route('pending-volume-file-labels', $pv->id);
+            } elseif (empty($pv->label_map) && empty($pv->user_map)) {
+                $redirect = redirect()->route('pending-volume-label-map', $pv->id);
+            } else {
+                $redirect = redirect()->route('pending-volume-user-map', $pv->id);
             }
 
             return $redirect
@@ -223,4 +217,34 @@ public function showLabelMap(Request $request)
             'labels' => $labels,
         ]);
     }
+
+    /**
+     * Show the form to select the user map for the metadata import.
+     *
+     * @param Request $request
+     */
+    public function showUserMap(Request $request)
+    {
+        $pv = PendingVolume::findOrFail($request->route('id'));
+        $this->authorize('update', $pv);
+
+        if (is_null($pv->volume_id)) {
+            return redirect()->route('pending-volume', $pv->id);
+        }
+
+        if (!$pv->hasMetadata()) {
+            abort(Response::HTTP_NOT_FOUND);
+        }
+
+        $users = $pv->getMetadata()->getMatchingUsers();
+
+        if (empty($users)) {
+            abort(Response::HTTP_NOT_FOUND);
+        }
+
+        return view('volumes.create.userMap', [
+            'pv' => $pv,
+            'users' => $users,
+        ]);
+    }
 }
diff --git a/resources/views/volumes/create/userMap.blade.php b/resources/views/volumes/create/userMap.blade.php
new file mode 100644
index 000000000..85d3bde41
--- /dev/null
+++ b/resources/views/volumes/create/userMap.blade.php
@@ -0,0 +1,52 @@
+@extends('app')
+
+@section('title', 'Select the metadata import user mapping')
+
+@push('scripts')
+    <script type="text/javascript">
+        {{-- biigle.$declare('volumes.labels', {!! $labels !!}); --}}
+    </script>
+@endpush
+
+@section('content')
+
+<div class="container">
+    <div id="create-volume-form-step-5" class="col-sm-8 col-sm-offset-2 col-lg-6 col-lg-offset-3">
+        <h2>Metadata import user mapping</h2>
+        <p class="text-muted">
+
+        </p>
+        <form role="form" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}/user-map") }}" v-on:submit="startLoading">
+
+        <div class="form-group{{ $errors->has('user_map') ? ' has-error' : '' }}">
+            {{--<input v-for="label in selectedLabels" type="hidden" name="user_map[]" :value="label.id">--}}
+            @if ($errors->has('user_map'))
+               <span class="help-block">{{ $errors->first('user_map') }}</span>
+            @endif
+        </div>
+
+        <div class="clearfix">
+            <p v-if="allMapped" class="text-muted pull-right">
+                All users are mapped.
+            </p>
+            <p v-cloak v-else class="text-muted pull-right">
+                <span v-text="danglingLabels.length"></span> users must be mapped.
+            </p>
+        </div>
+
+        <div class="form-group">
+            <input type="hidden" name="_token" value="{{ csrf_token() }}">
+            <input type="hidden" name="_method" value="PUT">
+            <button type="submit" form="cancel-pending-volume" class="btn btn-default" :disabled="loading" title="Discard metadata and continue to the new volume" onclick="return confirm('Are you sure you want to abort the metadata import?')">Cancel</button>
+
+            <input type="submit" class="btn btn-success pull-right" value="Continue" :disabled="cannotContinue">
+         </div>
+      </form>
+      <form id="cancel-pending-volume" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}") }}" v-on:submit="startLoading">
+            <input type="hidden" name="_token" value="{{ csrf_token() }}">
+            <input type="hidden" name="_method" value="DELETE">
+            <input type="hidden" name="_redirect" value="{{route('volume', $pv->volume_id)}}">
+        </form>
+    </div>
+</div>
+@endsection
diff --git a/routes/web.php b/routes/web.php
index d2a9d91a4..3dc7e9258 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -267,6 +267,11 @@
             'as'   => 'pending-volume-label-map',
             'uses' => 'PendingVolumeController@showLabelMap',
         ]);
+
+        $router->get('{id}/user-map', [
+            'as'   => 'pending-volume-user-map',
+            'uses' => 'PendingVolumeController@showUserMap',
+        ]);
     });
 
     $router->group(['namespace' => 'Volumes', 'prefix' => 'volumes'], function ($router) {
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
index a7ecab0e3..d1dd3aa22 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
@@ -436,7 +436,30 @@ public function testUpdateLabelMapTryLabelNotAllowed()
 
     public function testUpdateLabelMapRedirectToUserMap()
     {
-        // for non-automated requests
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+
+        $this->put("/api/v1/pending-volumes/{$id}/label-map", [
+            'label_map' => [123 => $this->labelRoot()->id],
+        ])->assertRedirectToRoute('pending-volume-user-map', $id);
     }
 
     public function testUpdateUserMap()
diff --git a/tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php b/tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php
index 07e5b46a3..1729c09e3 100644
--- a/tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php
@@ -114,7 +114,53 @@ public function testShowWithVolumeRedirectToLabelMapOnlyFileLabels()
 
     public function testShowWithVolumeRedirectToUserMap()
     {
-        // volume_id, only_annotation_labels and/or only_file_labels and label_map are filled but user_map is empty.
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+            'volume_id' => $this->volume()->id,
+            'only_annotation_labels' => [123],
+            'only_file_labels' => [123],
+            'label_map' => ['123' => 456],
+        ]);
+
+        $this->beAdmin();
+        $this
+            ->get("pending-volumes/{$pv->id}")
+            ->assertRedirectToRoute('pending-volume-user-map', $pv->id);
+    }
+
+    public function testShowWithVolumeRedirectToUserMapOnlyAnnotations()
+    {
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+            'volume_id' => $this->volume()->id,
+            'only_annotation_labels' => [123],
+            'import_annotations' => true,
+            'label_map' => ['123' => 456],
+        ]);
+
+        $this->beAdmin();
+        $this
+            ->get("pending-volumes/{$pv->id}")
+            ->assertRedirectToRoute('pending-volume-user-map', $pv->id);
+    }
+
+    public function testShowWithVolumeRedirectToUserMapOnlyFileLabels()
+    {
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+            'volume_id' => $this->volume()->id,
+            'only_file_labels' => [123],
+            'import_file_labels' => true,
+            'label_map' => ['123' => 456],
+        ]);
+
+        $this->beAdmin();
+        $this
+            ->get("pending-volumes/{$pv->id}")
+            ->assertRedirectToRoute('pending-volume-user-map', $pv->id);
     }
 
     public function testShowSelectAnnotationLabels()
@@ -343,4 +389,78 @@ public function testShowSelectLabelMapNoLabels()
         $this->beAdmin();
         $this->get("pending-volumes/{$pv->id}/label-map")->assertStatus(404);
     }
+
+    public function testShowSelectUserMap()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+            'volume_id' => $this->volume()->id,
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+
+        // not logged in
+        $this->get("pending-volumes/{$pv->id}/user-map")->assertStatus(302);
+
+        // doesn't belong to pending volume
+        $this->beExpert();
+        $this->get("pending-volumes/{$pv->id}/user-map")->assertStatus(403);
+
+        $this->beAdmin();
+        $this->get("pending-volumes/{$pv->id}/user-map")->assertStatus(200);
+    }
+
+    public function testShowSelectUserMapNoVolume()
+    {
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+        ]);
+
+        $this->beAdmin();
+        $this
+            ->get("pending-volumes/{$pv->id}/user-map")
+            ->assertRedirectToRoute('pending-volume', $pv->id);
+    }
+
+    public function testShowSelectUserMapNoMetadata()
+    {
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+            'volume_id' => $this->volume()->id,
+        ]);
+
+        $this->beAdmin();
+        $this->get("pending-volumes/{$pv->id}/user-map")->assertStatus(404);
+    }
+
+    public function testShowSelectUserMapNoUsers()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+            'volume_id' => $this->volume()->id,
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+
+        $this->beAdmin();
+        $this->get("pending-volumes/{$pv->id}/user-map")->assertStatus(404);
+    }
 }

From 35d6c38be791c923809a0ca441f6b528eb018498 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 4 Apr 2024 16:46:37 +0200
Subject: [PATCH 091/209] Fix CS

---
 app/Http/Controllers/Api/PendingVolumeController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Api/PendingVolumeController.php b/app/Http/Controllers/Api/PendingVolumeController.php
index 50cfe49f7..8dc2acb24 100644
--- a/app/Http/Controllers/Api/PendingVolumeController.php
+++ b/app/Http/Controllers/Api/PendingVolumeController.php
@@ -164,9 +164,9 @@ public function update(UpdatePendingVolume $request)
         }
 
         if ($pv->import_annotations) {
-            $redirect = redirect()->route('pending-volume-annotation-labels', $pv->id);;
+            $redirect = redirect()->route('pending-volume-annotation-labels', $pv->id);
         } elseif ($pv->import_file_labels) {
-            $redirect = redirect()->route('pending-volume-file-labels', $pv->id);;
+            $redirect = redirect()->route('pending-volume-file-labels', $pv->id);
         } else {
             $redirect = redirect()->route('volume', $volume->id);
         }

From 99a54d66c7c3c78e43089bf6ad59f1cd5270825e Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 5 Apr 2024 17:02:31 +0200
Subject: [PATCH 092/209] WIP Work on label map view for metadata import

---
 .../Views/Volumes/PendingVolumeController.php | 46 +++++++++++++-
 .../js/volumes/components/labelMapping.vue    | 30 ++++++++++
 .../volumes/components/labelMappingItem.vue   | 51 ++++++++++++++++
 .../assets/js/volumes/createFormStep5.vue     | 53 ++++++++++++++++
 resources/assets/js/volumes/main.js           |  2 +
 .../volumes/components/_label-mapping.scss    | 13 ++++
 resources/assets/sass/volumes/main.scss       |  1 +
 .../views/volumes/create/labelMap.blade.php   | 60 ++++++++++---------
 .../views/volumes/create/userMap.blade.php    | 52 ++++++++--------
 9 files changed, 252 insertions(+), 56 deletions(-)
 create mode 100644 resources/assets/js/volumes/components/labelMapping.vue
 create mode 100644 resources/assets/js/volumes/components/labelMappingItem.vue
 create mode 100644 resources/assets/js/volumes/createFormStep5.vue
 create mode 100644 resources/assets/sass/volumes/components/_label-mapping.scss

diff --git a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
index 19abafc57..c76e00844 100644
--- a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
@@ -206,15 +206,57 @@ public function showLabelMap(Request $request)
             abort(Response::HTTP_NOT_FOUND);
         }
 
-        $labels = $pv->getMetadata()->getMatchingLabels();
 
-        if (empty($labels)) {
+
+        $onlyLabels = $pv->only_annotation_labels + $pv->only_file_labels;
+        $labelMap = collect($pv->getMetadata()->getMatchingLabels(onlyLabels: $onlyLabels));
+
+        if ($labelMap->isEmpty()) {
             abort(Response::HTTP_NOT_FOUND);
         }
 
+        $labels = [];
+
+        if ($pv->import_file_labels) {
+            $labels += $metadata->getFileLabels($pv->only_file_labels);
+        }
+
+        if ($pv->import_annotations) {
+            $labels += $metadata->getAnnotationLabels($pv->only_annotation_labels);
+        }
+
+        $labels = collect($labels)->values();
+
+        $project = $pv->project;
+
+        // These label trees are required to display the pre-mapped labels.
+        $labelTrees =
+            LabelTree::whereIn('id', fn ($query) =>
+                $query->select('label_tree_id')
+                    ->from('labels')
+                    ->whereIn('id', $labelMap->values()->unique()->filter())
+            )
+            ->get()
+            ->keyBy('id');
+
+        // These trees can also be used for manual mapping.
+        $labelTrees = $labelTrees->union($project->labelTrees->keyBy('id'))->values();
+
+        $labelTrees->load('labels');
+
+        // Hide attributes for a more compact JSON representation.
+        $labelTrees->each(function ($tree) {
+            $tree->makeHidden(['visibility_id', 'created_at', 'updated_at']);
+            $tree->labels->each(function ($label) {
+                $label->makeHidden(['source_id', 'label_source_id', 'label_tree_id', 'parent_id']);
+            });
+        });
+
         return view('volumes.create.labelMap', [
             'pv' => $pv,
+            'labelMap' => $labelMap,
             'labels' => $labels,
+            'labelTrees' => $labelTrees,
         ]);
     }
 
diff --git a/resources/assets/js/volumes/components/labelMapping.vue b/resources/assets/js/volumes/components/labelMapping.vue
new file mode 100644
index 000000000..41bf78bdb
--- /dev/null
+++ b/resources/assets/js/volumes/components/labelMapping.vue
@@ -0,0 +1,30 @@
+<template>
+<table class="label-mapping">
+    <item
+        v-for="label in fromLabels"
+        :label="label"
+        :key="label.id"
+        :labels="toLabels"
+        ></item>
+</table>
+</template>
+
+<script>
+import Item from './labelMappingItem';
+
+export default {
+    components: {
+        item: Item,
+    },
+    props: {
+        fromLabels: {
+            required: true,
+            type: Array,
+        },
+        toLabels: {
+            default: () => {},
+            type: Object,
+        },
+    },
+};
+</script>
diff --git a/resources/assets/js/volumes/components/labelMappingItem.vue b/resources/assets/js/volumes/components/labelMappingItem.vue
new file mode 100644
index 000000000..d14396bc5
--- /dev/null
+++ b/resources/assets/js/volumes/components/labelMappingItem.vue
@@ -0,0 +1,51 @@
+<template>
+<tr class="label-tree-label">
+    <td class="label-tree-label__name">
+        <span class="label-tree-label__color" :style="colorStyle"></span>
+        <span v-text="label.name"></span>
+    </td>
+    <td>
+        <i class="fas fa-chevron-right"></i>
+    </td>
+    <td class="label-tree-label__name">
+        <div v-if="mappedLabel">
+            <span class="label-tree-label__color" :style="mappedLabelColorStyle"></span>
+            <span v-text="mappedLabel.name"></span>
+        </div>
+    </td>
+</tr>
+</template>
+
+<script>
+export default {
+    props: {
+        label: {
+            required: true,
+            type: Object,
+        },
+        labels: {
+            default: () => {},
+            type: Object,
+        },
+    },
+    computed: {
+        colorStyle() {
+            return {
+                'background-color': '#' + this.label.color,
+            };
+        },
+        mappedLabelColorStyle() {
+            if (!this.mappedLabel) {
+                return '';
+            }
+
+            return {
+                'background-color': '#' + this.mappedLabel.color,
+            };
+        },
+        mappedLabel() {
+            return this.labels[this.label.mappedLabel] || null;
+        }
+    },
+};
+</script>
diff --git a/resources/assets/js/volumes/createFormStep5.vue b/resources/assets/js/volumes/createFormStep5.vue
new file mode 100644
index 000000000..7037f844f
--- /dev/null
+++ b/resources/assets/js/volumes/createFormStep5.vue
@@ -0,0 +1,53 @@
+<script>
+import LoaderMixin from '../core/mixins/loader';
+import LabelMapping from './components/labelMapping';
+
+export default {
+    mixins: [LoaderMixin],
+    components: {
+        labelMapping: LabelMapping,
+    },
+    data() {
+        return {
+            labels: [],
+            labelMap: {},
+            labelTrees: [],
+        };
+    },
+    computed: {
+        cannotContinue() {
+            return this.loading || this.hasDanglingLabels;
+        },
+        hasDanglingLabels() {
+            return this.danglingLabels.length > 0;
+        },
+        danglingLabels() {
+            return this.labels.filter(l => l.mappedLabel === null);
+        },
+        flatLabels() {
+            let labels = {};
+            this.labelTrees.forEach(function (tree) {
+                tree.labels.forEach(function (label) {
+                    labels[label.id] = label;
+                });
+            });
+
+            return labels;
+        }
+    },
+    methods: {
+        //
+    },
+    created() {
+        this.labelMap = biigle.$require('volumes.labelMap');
+
+        this.labels = biigle.$require('volumes.labels').map((label) => {
+            label.mappedLabel = this.labelMap[label.id];
+
+            return label;
+        });
+
+        this.labelTrees = biigle.$require('volumes.labelTrees');
+    },
+};
+</script>
diff --git a/resources/assets/js/volumes/main.js b/resources/assets/js/volumes/main.js
index 80770083a..c605f6f73 100644
--- a/resources/assets/js/volumes/main.js
+++ b/resources/assets/js/volumes/main.js
@@ -4,6 +4,7 @@ import CreateFormStep1 from './createFormStep1';
 import CreateFormStep2 from './createFormStep2';
 import CreateFormStep3 from './createFormStep3';
 import CreateFormStep4 from './createFormStep4';
+import CreateFormStep5 from './createFormStep5';
 import CloneForm from './cloneForm';
 import FileCount from './fileCount';
 import FilePanel from './filePanel';
@@ -17,6 +18,7 @@ biigle.$mount('create-volume-form-step-1', CreateFormStep1);
 biigle.$mount('create-volume-form-step-2', CreateFormStep2);
 biigle.$mount('create-volume-form-step-3', CreateFormStep3);
 biigle.$mount('create-volume-form-step-4', CreateFormStep4);
+biigle.$mount('create-volume-form-step-5', CreateFormStep5);
 biigle.$mount('clone-volume-form', CloneForm);
 biigle.$mount('file-panel', FilePanel);
 biigle.$mount('projects-breadcrumb', ProjectsBreadcrumb);
diff --git a/resources/assets/sass/volumes/components/_label-mapping.scss b/resources/assets/sass/volumes/components/_label-mapping.scss
new file mode 100644
index 000000000..5f6abea81
--- /dev/null
+++ b/resources/assets/sass/volumes/components/_label-mapping.scss
@@ -0,0 +1,13 @@
+.label-mapping {
+    width: 100%;
+
+    tr:hover {
+        color: white;
+        background-color: $gray-lighter;
+        border-radius: $border-radius-small;
+    }
+
+    .label-tree-label__name:hover {
+        cursor: inherit;
+    }
+}
diff --git a/resources/assets/sass/volumes/main.scss b/resources/assets/sass/volumes/main.scss
index 9cd3c1485..6a18c0872 100644
--- a/resources/assets/sass/volumes/main.scss
+++ b/resources/assets/sass/volumes/main.scss
@@ -38,6 +38,7 @@ $volume-image-padding: 0.5em;
 @import 'components/sorting-tab';
 @import 'components/volume-image-grid-image';
 @import 'components/file-label-list';
+@import 'components/label-mapping';
 
 @import 'edit';
 @import 'search';
diff --git a/resources/views/volumes/create/labelMap.blade.php b/resources/views/volumes/create/labelMap.blade.php
index 7528585e5..4ab9a4dde 100644
--- a/resources/views/volumes/create/labelMap.blade.php
+++ b/resources/views/volumes/create/labelMap.blade.php
@@ -4,45 +4,49 @@
 
 @push('scripts')
     <script type="text/javascript">
-        {{-- biigle.$declare('volumes.labels', {!! $labels !!}); --}}
+        biigle.$declare('volumes.labelMap', {!! $labelMap !!});
+        biigle.$declare('volumes.labels', {!! $labels !!});
+        biigle.$declare('volumes.labelTrees', {!! $labelTrees !!});
     </script>
 @endpush
 
 @section('content')
 
 <div class="container">
-    <div id="create-volume-form-step-5" class="col-sm-8 col-sm-offset-2 col-lg-6 col-lg-offset-3">
+    <div id="create-volume-form-step-5" class="col-sm-10 col-sm-offset-1 col-lg-8 col-lg-offset-2">
         <h2>Metadata import label mapping</h2>
         <p class="text-muted">
-
+            Each label from the metadata file must be mapped to a label in the BIIGLE database. Some labels can be mapped automatically. The rest must be mapped manually. You can also create new labels based on the metadata information.
         </p>
         <form role="form" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}/label-map") }}" v-on:submit="startLoading">
 
-        <div class="form-group{{ $errors->has('label_map') ? ' has-error' : '' }}">
-            {{--<input v-for="label in selectedLabels" type="hidden" name="label_map[]" :value="label.id">--}}
-            @if ($errors->has('label_map'))
-               <span class="help-block">{{ $errors->first('label_map') }}</span>
-            @endif
-        </div>
-
-        <div class="clearfix">
-            <p v-if="allMapped" class="text-muted pull-right">
-                All labels are mapped.
-            </p>
-            <p v-cloak v-else class="text-muted pull-right">
-                <span v-text="danglingLabels.length"></span> labels must be mapped.
-            </p>
-        </div>
-
-        <div class="form-group">
-            <input type="hidden" name="_token" value="{{ csrf_token() }}">
-            <input type="hidden" name="_method" value="PUT">
-            <button type="submit" form="cancel-pending-volume" class="btn btn-default" :disabled="loading" title="Discard metadata and continue to the new volume" onclick="return confirm('Are you sure you want to abort the metadata import?')">Cancel</button>
-
-            <input type="submit" class="btn btn-success pull-right" value="Continue" :disabled="cannotContinue">
-         </div>
-      </form>
-      <form id="cancel-pending-volume" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}") }}" v-on:submit="startLoading">
+            <label-mapping :from-labels="labels" :to-labels="flatLabels"></label-mapping>
+
+            <div class="form-group{{ $errors->has('label_map') ? ' has-error' : '' }}">
+                {{--<input v-for="label in selectedLabels" type="hidden" name="label_map[]" :value="label.id">--}}
+                @if ($errors->has('label_map'))
+                   <span class="help-block">{{ $errors->first('label_map') }}</span>
+                @endif
+            </div>
+
+            <div class="clearfix">
+                <p v-if="!hasDanglingLabels" class="text-muted pull-right">
+                    All labels are mapped.
+                </p>
+                <p v-cloak v-else class="text-muted pull-right">
+                    <span v-text="danglingLabels.length"></span> labels must be mapped.
+                </p>
+            </div>
+
+            <div class="form-group">
+                <input type="hidden" name="_token" value="{{ csrf_token() }}">
+                <input type="hidden" name="_method" value="PUT">
+                <button type="submit" form="cancel-pending-volume" class="btn btn-default" :disabled="loading" title="Discard metadata and continue to the new volume" onclick="return confirm('Are you sure you want to abort the metadata import?')">Cancel</button>
+
+                <input type="submit" class="btn btn-success pull-right" value="Continue" :disabled="cannotContinue">
+            </div>
+        </form>
+        <form id="cancel-pending-volume" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}") }}" v-on:submit="startLoading">
             <input type="hidden" name="_token" value="{{ csrf_token() }}">
             <input type="hidden" name="_method" value="DELETE">
             <input type="hidden" name="_redirect" value="{{route('volume', $pv->volume_id)}}">
diff --git a/resources/views/volumes/create/userMap.blade.php b/resources/views/volumes/create/userMap.blade.php
index 85d3bde41..99822bb72 100644
--- a/resources/views/volumes/create/userMap.blade.php
+++ b/resources/views/volumes/create/userMap.blade.php
@@ -14,35 +14,35 @@
     <div id="create-volume-form-step-5" class="col-sm-8 col-sm-offset-2 col-lg-6 col-lg-offset-3">
         <h2>Metadata import user mapping</h2>
         <p class="text-muted">
-
+            TODO
         </p>
         <form role="form" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}/user-map") }}" v-on:submit="startLoading">
 
-        <div class="form-group{{ $errors->has('user_map') ? ' has-error' : '' }}">
-            {{--<input v-for="label in selectedLabels" type="hidden" name="user_map[]" :value="label.id">--}}
-            @if ($errors->has('user_map'))
-               <span class="help-block">{{ $errors->first('user_map') }}</span>
-            @endif
-        </div>
-
-        <div class="clearfix">
-            <p v-if="allMapped" class="text-muted pull-right">
-                All users are mapped.
-            </p>
-            <p v-cloak v-else class="text-muted pull-right">
-                <span v-text="danglingLabels.length"></span> users must be mapped.
-            </p>
-        </div>
-
-        <div class="form-group">
-            <input type="hidden" name="_token" value="{{ csrf_token() }}">
-            <input type="hidden" name="_method" value="PUT">
-            <button type="submit" form="cancel-pending-volume" class="btn btn-default" :disabled="loading" title="Discard metadata and continue to the new volume" onclick="return confirm('Are you sure you want to abort the metadata import?')">Cancel</button>
-
-            <input type="submit" class="btn btn-success pull-right" value="Continue" :disabled="cannotContinue">
-         </div>
-      </form>
-      <form id="cancel-pending-volume" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}") }}" v-on:submit="startLoading">
+            <div class="form-group{{ $errors->has('user_map') ? ' has-error' : '' }}">
+                {{--<input v-for="label in selectedLabels" type="hidden" name="user_map[]" :value="label.id">--}}
+                @if ($errors->has('user_map'))
+                   <span class="help-block">{{ $errors->first('user_map') }}</span>
+                @endif
+            </div>
+
+            <div class="clearfix">
+                <p v-if="allMapped" class="text-muted pull-right">
+                    All users are mapped.
+                </p>
+                <p v-cloak v-else class="text-muted pull-right">
+                    <span v-text="danglingLabels.length"></span> users must be mapped.
+                </p>
+            </div>
+
+            <div class="form-group">
+                <input type="hidden" name="_token" value="{{ csrf_token() }}">
+                <input type="hidden" name="_method" value="PUT">
+                <button type="submit" form="cancel-pending-volume" class="btn btn-default" :disabled="loading" title="Discard metadata and continue to the new volume" onclick="return confirm('Are you sure you want to abort the metadata import?')">Cancel</button>
+
+                <input type="submit" class="btn btn-success pull-right" value="Continue" :disabled="cannotContinue">
+            </div>
+        </form>
+        <form id="cancel-pending-volume" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}") }}" v-on:submit="startLoading">
             <input type="hidden" name="_token" value="{{ csrf_token() }}">
             <input type="hidden" name="_method" value="DELETE">
             <input type="hidden" name="_redirect" value="{{route('volume', $pv->volume_id)}}">

From da511318637a20bf8c7c74950ca04a9c564f6edd Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Tue, 9 Apr 2024 14:50:07 +0200
Subject: [PATCH 093/209] Fix LabelTypeahead component

---
 .../assets/js/core/components/typeahead.vue   | 10 ++++++---
 .../label-trees/components/labelTypeahead.vue |  6 ++++--
 .../components/labelTypeaheadItem.vue         | 21 +++++++++++++++++++
 .../components/_labelTypeahead.scss           |  2 +-
 4 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 resources/assets/js/label-trees/components/labelTypeaheadItem.vue

diff --git a/resources/assets/js/core/components/typeahead.vue b/resources/assets/js/core/components/typeahead.vue
index 9870607dd..7f514f350 100644
--- a/resources/assets/js/core/components/typeahead.vue
+++ b/resources/assets/js/core/components/typeahead.vue
@@ -19,7 +19,8 @@
         item-key="name"
         >
         <template slot="item" slot-scope="props">
-            <typeahead-item
+            <component
+                :is="itemComponent"
                 @click.native="emitInternalValue"
                 v-for="(item, index) in props.items"
                 :key="index"
@@ -28,7 +29,7 @@
                 :item-key="moreInfo"
                 :class="{active: props.activeIndex === index}"
                 >
-            </typeahead-item>
+            </component>
         </template>
     </typeahead>
 </div>
@@ -46,7 +47,6 @@ import TypeaheadItem from './typeaheadItem';
 export default {
     components: {
         typeahead: Typeahead,
-        typeaheadItem: TypeaheadItem,
     },
     props: {
         items: {
@@ -77,6 +77,10 @@ export default {
             type: Number,
             default: 5,
         },
+        itemComponent: {
+            type: Object,
+            default: () => TypeaheadItem,
+        },
     },
     data() {
         return {
diff --git a/resources/assets/js/label-trees/components/labelTypeahead.vue b/resources/assets/js/label-trees/components/labelTypeahead.vue
index d7d6198e1..fc31923a4 100644
--- a/resources/assets/js/label-trees/components/labelTypeahead.vue
+++ b/resources/assets/js/label-trees/components/labelTypeahead.vue
@@ -1,4 +1,5 @@
 <script>
+import LabelTypeaheadItem from './labelTypeaheadItem';
 import Typeahead from '../../core/components/typeahead';
 
 /**
@@ -9,8 +10,9 @@ import Typeahead from '../../core/components/typeahead';
 export default {
     mixins: [Typeahead],
     props: {
-        template: {
-            default: `<span class="label-typeahead-item"><span v-if="item.color" :style="{'background-color': '#' + item.color}" class="label-color"></span><span v-text="item.name"></span></span>`,
+        itemComponent: {
+            type: Object,
+            default: () => LabelTypeaheadItem,
         },
     },
 };
diff --git a/resources/assets/js/label-trees/components/labelTypeaheadItem.vue b/resources/assets/js/label-trees/components/labelTypeaheadItem.vue
new file mode 100644
index 000000000..6ef716361
--- /dev/null
+++ b/resources/assets/js/label-trees/components/labelTypeaheadItem.vue
@@ -0,0 +1,21 @@
+<template>
+<li>
+    <a href="#" @click.prevent="props.select(item)">
+        <div class="label-typeahead-item">
+            <span v-if="item.color" :style="{'background-color': '#' + item.color}" class="label-color"></span>
+            <span v-html="props.highlight(item)"></span>
+            <span v-if="info">
+                <br><small class="typeahead-item-info" v-text="info" :title="info"></small>
+            </span>
+        </div>
+    </a>
+</li>
+</template>
+
+<script>
+import TypeaheadItem from '../../core/components/typeaheadItem';
+
+export default {
+    mixins: [TypeaheadItem],
+};
+</script>
diff --git a/resources/assets/sass/label-trees/components/_labelTypeahead.scss b/resources/assets/sass/label-trees/components/_labelTypeahead.scss
index 4436ac6f3..0bc0d5a1e 100644
--- a/resources/assets/sass/label-trees/components/_labelTypeahead.scss
+++ b/resources/assets/sass/label-trees/components/_labelTypeahead.scss
@@ -2,7 +2,7 @@
     position: relative;
     // Negate the default padding of the list item of the typeahead.
     margin-left: -15px;
-    padding: $padding-small-vertical 22px;
+    padding: $padding-small-vertical 0 0 22px;
 
     .label-color {
         position: absolute;

From c8eb8200b482e795d87f4309f245de28c23927f8 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Tue, 9 Apr 2024 15:25:23 +0200
Subject: [PATCH 094/209] Improve volume import label map endpoint

---
 .../Controllers/Api/PendingVolumeImportController.php  |  5 ++---
 app/Http/Requests/UpdatePendingVolumeLabelMap.php      |  1 +
 .../Api/PendingVolumeImportControllerTest.php          | 10 ++++++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Api/PendingVolumeImportController.php b/app/Http/Controllers/Api/PendingVolumeImportController.php
index 653277d10..52430c6d6 100644
--- a/app/Http/Controllers/Api/PendingVolumeImportController.php
+++ b/app/Http/Controllers/Api/PendingVolumeImportController.php
@@ -133,9 +133,8 @@ public function updateFileLabels(UpdatePendingVolumeFileLabels $request)
      */
     public function updateLabelMap(UpdatePendingVolumeLabelMap $request)
     {
-        $request->pendingVolume->update([
-            'label_map' => $request->input('label_map'),
-        ]);
+        $map = array_map('intval', $request->input('label_map'));
+        $request->pendingVolume->update(['label_map' => $map]);
 
         if ($this->isAutomatedRequest()) {
             return $request->pendingVolume;
diff --git a/app/Http/Requests/UpdatePendingVolumeLabelMap.php b/app/Http/Requests/UpdatePendingVolumeLabelMap.php
index 3017b20df..04ba8acfc 100644
--- a/app/Http/Requests/UpdatePendingVolumeLabelMap.php
+++ b/app/Http/Requests/UpdatePendingVolumeLabelMap.php
@@ -29,6 +29,7 @@ public function rules(): array
     {
         return [
             'label_map' => 'required|array|min:1',
+            'label_map.*' => 'int',
         ];
     }
 
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
index d1dd3aa22..48e81a3bf 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
@@ -282,6 +282,11 @@ public function testUpdateLabelMap()
             'label_map' => [],
         ])->assertStatus(422);
 
+        // Map values must be ints.
+        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
+            'label_map' => ['abc', 'def'],
+        ])->assertStatus(422);
+
         // No volume attached yet.
         $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
             'label_map' => [123 => $this->labelRoot()->id],
@@ -300,11 +305,12 @@ public function testUpdateLabelMap()
         ])->assertStatus(422);
 
         $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
-            'label_map' => [123 => $this->labelRoot()->id],
+            'label_map' => [123 => "{$this->labelRoot()->id}"],
         ])->assertSuccessful();
 
         $pv->refresh();
-        $this->assertEquals([123 => $this->labelRoot()->id], $pv->label_map);
+        // Values should be cast to int.
+        $this->assertSame([123 => $this->labelRoot()->id], $pv->label_map);
     }
 
     public function testUpdateLabelMapFileLabel()

From 9aa6a4403e9ab373b2e79765319ba7aee9a06b45 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Tue, 9 Apr 2024 16:02:22 +0200
Subject: [PATCH 095/209] Implement basic features for volume import label map
 view

---
 .../js/volumes/components/labelMapping.vue    | 13 +++--
 .../volumes/components/labelMappingItem.vue   | 58 ++++++++++++++-----
 .../assets/js/volumes/createFormStep5.vue     | 16 ++++-
 .../volumes/components/_label-mapping.scss    | 17 +++++-
 .../views/volumes/create/labelMap.blade.php   | 15 ++++-
 5 files changed, 90 insertions(+), 29 deletions(-)

diff --git a/resources/assets/js/volumes/components/labelMapping.vue b/resources/assets/js/volumes/components/labelMapping.vue
index 41bf78bdb..9b5bf8cce 100644
--- a/resources/assets/js/volumes/components/labelMapping.vue
+++ b/resources/assets/js/volumes/components/labelMapping.vue
@@ -1,12 +1,13 @@
 <template>
-<table class="label-mapping">
+<div class="label-mapping">
     <item
         v-for="label in fromLabels"
         :label="label"
         :key="label.id"
         :labels="toLabels"
+        :trees="trees"
         ></item>
-</table>
+</div>
 </template>
 
 <script>
@@ -22,8 +23,12 @@ export default {
             type: Array,
         },
         toLabels: {
-            default: () => {},
-            type: Object,
+            default: () => [],
+            type: Array,
+        },
+        trees: {
+            default: () => [],
+            type: Array,
         },
     },
 };
diff --git a/resources/assets/js/volumes/components/labelMappingItem.vue b/resources/assets/js/volumes/components/labelMappingItem.vue
index d14396bc5..16778ccae 100644
--- a/resources/assets/js/volumes/components/labelMappingItem.vue
+++ b/resources/assets/js/volumes/components/labelMappingItem.vue
@@ -1,31 +1,52 @@
 <template>
-<tr class="label-tree-label">
-    <td class="label-tree-label__name">
-        <span class="label-tree-label__color" :style="colorStyle"></span>
-        <span v-text="label.name"></span>
-    </td>
-    <td>
+<div class="label-tree-label label-mapping-item">
+    <div class="label-mapping-item-column">
+        <div class="label-tree-label__name">
+            <span class="label-tree-label__color" :style="colorStyle"></span>
+            <span v-text="label.name"></span>
+        </div>
+    </div>
+    <div class="label-mapping-item-chevron">
         <i class="fas fa-chevron-right"></i>
-    </td>
-    <td class="label-tree-label__name">
-        <div v-if="mappedLabel">
+    </div>
+    <div class="label-mapping-item-column">
+        <div v-if="mappedLabel" class="label-tree-label__name">
             <span class="label-tree-label__color" :style="mappedLabelColorStyle"></span>
-            <span v-text="mappedLabel.name"></span>
+            {{mappedLabel.name}}<br>
+            <span class="text-muted">{{mappedLabel.labelTreeName}}</span>
+        </div>
+        <div v-else>
+            <typeahead
+                :items="labels"
+                :clear-on-select="true"
+                @select="handleSelect"
+                more-info="labelTreeName"
+                placeholder="Label name"
+                ></typeahead>
         </div>
-    </td>
-</tr>
+    </div>
+</div>
 </template>
 
 <script>
+import Typeahead from '../../label-trees/components/labelTypeahead';
+
 export default {
+    components: {
+        Typeahead,
+    },
     props: {
         label: {
             required: true,
             type: Object,
         },
         labels: {
-            default: () => {},
-            type: Object,
+            default: () => [],
+            type: Array,
+        },
+        trees: {
+            default: () => [],
+            type: Array,
         },
     },
     computed: {
@@ -44,8 +65,13 @@ export default {
             };
         },
         mappedLabel() {
-            return this.labels[this.label.mappedLabel] || null;
-        }
+            return this.labels.find(l => l.id === this.label.mappedLabel) || null;
+        },
+    },
+    methods: {
+        handleSelect(label) {
+            this.label.mappedLabel = label.id;
+        },
     },
 };
 </script>
diff --git a/resources/assets/js/volumes/createFormStep5.vue b/resources/assets/js/volumes/createFormStep5.vue
index 7037f844f..8b5656730 100644
--- a/resources/assets/js/volumes/createFormStep5.vue
+++ b/resources/assets/js/volumes/createFormStep5.vue
@@ -25,15 +25,25 @@ export default {
             return this.labels.filter(l => l.mappedLabel === null);
         },
         flatLabels() {
-            let labels = {};
+            let labels = [];
+
             this.labelTrees.forEach(function (tree) {
                 tree.labels.forEach(function (label) {
-                    labels[label.id] = label;
+                    label.labelTreeName = tree.name;
                 });
+                Array.prototype.push.apply(labels, tree.labels);
             });
 
             return labels;
-        }
+        },
+        flatTrees() {
+            return this.labelTrees.map(t => {
+                return {id: t.id, name: t.name};
+            });
+        },
+        mappedLabels() {
+            return this.labels.filter(l => l.mappedLabel);
+        },
     },
     methods: {
         //
diff --git a/resources/assets/sass/volumes/components/_label-mapping.scss b/resources/assets/sass/volumes/components/_label-mapping.scss
index 5f6abea81..f0676c8d5 100644
--- a/resources/assets/sass/volumes/components/_label-mapping.scss
+++ b/resources/assets/sass/volumes/components/_label-mapping.scss
@@ -1,7 +1,8 @@
-.label-mapping {
-    width: 100%;
+.label-mapping-item {
+    margin-bottom: $padding-small-vertical;
+    display: flex;
 
-    tr:hover {
+    &:hover {
         color: white;
         background-color: $gray-lighter;
         border-radius: $border-radius-small;
@@ -10,4 +11,14 @@
     .label-tree-label__name:hover {
         cursor: inherit;
     }
+
+    .label-mapping-item-column {
+        flex: 1;
+    }
+
+    .label-mapping-item-chevron {
+        flex: 0 0 40px;
+        padding: $padding-small-vertical 0;
+        text-align: center;
+    }
 }
diff --git a/resources/views/volumes/create/labelMap.blade.php b/resources/views/volumes/create/labelMap.blade.php
index 4ab9a4dde..de4a0871e 100644
--- a/resources/views/volumes/create/labelMap.blade.php
+++ b/resources/views/volumes/create/labelMap.blade.php
@@ -20,15 +20,24 @@
         </p>
         <form role="form" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}/label-map") }}" v-on:submit="startLoading">
 
-            <label-mapping :from-labels="labels" :to-labels="flatLabels"></label-mapping>
-
             <div class="form-group{{ $errors->has('label_map') ? ' has-error' : '' }}">
-                {{--<input v-for="label in selectedLabels" type="hidden" name="label_map[]" :value="label.id">--}}
+                <input
+                    v-for="label in mappedLabels"
+                    type="hidden"
+                    :name="'label_map[' + label.id + ']'"
+                    :value="label.mappedLabel"
+                    >
                 @if ($errors->has('label_map'))
                    <span class="help-block">{{ $errors->first('label_map') }}</span>
                 @endif
             </div>
 
+            <label-mapping
+                :from-labels="labels"
+                :to-labels="flatLabels"
+                :trees="flatTrees"
+                ></label-mapping>
+
             <div class="clearfix">
                 <p v-if="!hasDanglingLabels" class="text-muted pull-right">
                     All labels are mapped.

From efd0a51c60712215c297252533494f8614abd819 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Tue, 9 Apr 2024 17:23:43 +0200
Subject: [PATCH 096/209] Finish volume import label map view

---
 .../js/volumes/components/labelMapping.vue    |  15 ++
 .../volumes/components/labelMappingItem.vue   | 145 ++++++++++++++++--
 .../assets/js/volumes/createFormStep5.vue     |  21 ++-
 .../volumes/components/_label-mapping.scss    |  16 +-
 .../views/volumes/create/labelMap.blade.php   |   3 +
 5 files changed, 185 insertions(+), 15 deletions(-)

diff --git a/resources/assets/js/volumes/components/labelMapping.vue b/resources/assets/js/volumes/components/labelMapping.vue
index 9b5bf8cce..f1d4fd851 100644
--- a/resources/assets/js/volumes/components/labelMapping.vue
+++ b/resources/assets/js/volumes/components/labelMapping.vue
@@ -6,6 +6,9 @@
         :key="label.id"
         :labels="toLabels"
         :trees="trees"
+        :loading="loading"
+        @select="emitSelect"
+        @create="emitCreate"
         ></item>
 </div>
 </template>
@@ -30,6 +33,18 @@ export default {
             default: () => [],
             type: Array,
         },
+        loading: {
+            default: false,
+            type: Boolean,
+        },
+    },
+    methods: {
+        emitSelect(label, id) {
+            this.$emit('select', label, id);
+        },
+        emitCreate(label, treeId, newLabel) {
+            this.$emit('create', label, treeId, newLabel);
+        },
     },
 };
 </script>
diff --git a/resources/assets/js/volumes/components/labelMappingItem.vue b/resources/assets/js/volumes/components/labelMappingItem.vue
index 16778ccae..bbc8bdd8a 100644
--- a/resources/assets/js/volumes/components/labelMappingItem.vue
+++ b/resources/assets/js/volumes/components/labelMappingItem.vue
@@ -6,23 +6,91 @@
             <span v-text="label.name"></span>
         </div>
     </div>
-    <div class="label-mapping-item-chevron">
+    <div class="label-mapping-item-chevron" :class="chevronClass">
         <i class="fas fa-chevron-right"></i>
     </div>
     <div class="label-mapping-item-column">
-        <div v-if="mappedLabel" class="label-tree-label__name">
+        <div v-if="mappedLabel" class="label-tree-label__name clearfix">
+            <button
+                class="btn btn-default pull-right"
+                title="Change mapped label"
+                type="button"
+                :disabled="loading"
+                @click="handleChange"
+                ><i class="fa fa-pen"></i></button>
+
             <span class="label-tree-label__color" :style="mappedLabelColorStyle"></span>
             {{mappedLabel.name}}<br>
             <span class="text-muted">{{mappedLabel.labelTreeName}}</span>
         </div>
-        <div v-else>
-            <typeahead
-                :items="labels"
-                :clear-on-select="true"
-                @select="handleSelect"
-                more-info="labelTreeName"
-                placeholder="Label name"
-                ></typeahead>
+        <div v-else class="clearfix">
+            <div v-if="creating" class="create-form">
+                <div class="row">
+                    <div class="col-xs-8">
+                        <select class="form-control" v-model="selectedTree">
+                            <option
+                                v-for="tree in trees"
+                                :value="tree.id"
+                                :key="tree.id"
+                                >{{tree.name}}</option>
+                        </select>
+                    </div>
+                    <div class="col-xs-4">
+                        <input
+                            class="form-control"
+                            type="color"
+                            name="color"
+                            v-model="selectedColor"
+                            >
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-xs-8">
+                        <input
+                            class="form-control"
+                            type="text"
+                            name="name"
+                            placeholder="New label name"
+                            v-model="selectedName"
+                            >
+                    </div>
+                    <div class="col-xs-4 clearfix">
+                        <span class="pull-right">
+                            <button
+                                class="btn btn-default"
+                                type="button"
+                                title="Cancel creating a new label"
+                                :disabled="loading"
+                                @click="cancelCreating"
+                                ><i class="fa fa-times"></i></button>
+                            <button
+                                class="btn btn-success"
+                                type="button"
+                                title="Create the new label"
+                                :disabled="cantCreate"
+                                @click="emitCreate"
+                                ><i class="fa fa-check"></i></button>
+                        </span>
+                    </div>
+                </div>
+            </div>
+            <div v-else>
+                <button
+                    class="btn btn-default pull-right"
+                    title="Create a new label"
+                    type="button"
+                    :disabled="loading"
+                    @click="handleCreate"
+                    ><i class="fa fa-plus"></i></button>
+
+                <typeahead
+                    :items="labels"
+                    :clear-on-select="true"
+                    more-info="labelTreeName"
+                    placeholder="Label name"
+                    @select="handleSelect"
+                    ></typeahead>
+            </div>
         </div>
     </div>
 </div>
@@ -30,11 +98,20 @@
 
 <script>
 import Typeahead from '../../label-trees/components/labelTypeahead';
+import {randomColor} from '../../label-trees/utils';
 
 export default {
     components: {
         Typeahead,
     },
+    data() {
+        return {
+            creating: false,
+            selectedTree: null,
+            selectedColor: '',
+            selectedName: '',
+        };
+    },
     props: {
         label: {
             required: true,
@@ -48,6 +125,10 @@ export default {
             default: () => [],
             type: Array,
         },
+        loading: {
+            default: false,
+            type: Boolean,
+        },
     },
     computed: {
         colorStyle() {
@@ -67,10 +148,52 @@ export default {
         mappedLabel() {
             return this.labels.find(l => l.id === this.label.mappedLabel) || null;
         },
+        chevronClass() {
+            return this.label.mappedLabel ? 'text-muted' : 'text-info';
+        },
+        cantCreate() {
+            return this.loading || !this.selectedTree || !this.selectedColor || !this.selectedName;
+        },
     },
     methods: {
         handleSelect(label) {
-            this.label.mappedLabel = label.id;
+            this.$emit('select', this.label, label.id);
+        },
+        handleChange() {
+            this.$emit('select', this.label, null);
+        },
+        handleCreate() {
+            this.creating = true;
+            if (!this.selectedColor) {
+                this.initializeColor();
+            }
+
+            if (!this.selectedName) {
+                this.selectedName = this.label.name;
+            }
+        },
+        cancelCreating() {
+            this.creating = false;
+        },
+        initializeColor() {
+            if ((typeof this.label.color === 'string') && /^#?([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/.test(this.label.color)) {
+                this.selectedColor = this.label.color.replace(/^#*/, '#');
+            } else {
+                this.selectedColor = randomColor();
+            }
+        },
+        emitCreate() {
+            this.$emit('create', this.label, this.selectedTree, {
+                name: this.selectedName,
+                color: this.selectedColor,
+            });
+        },
+    },
+    watch: {
+        mappedLabel(label, oldLabel) {
+            if (this.creating && label && !oldLabel) {
+                this.creating = false;
+            }
         },
     },
 };
diff --git a/resources/assets/js/volumes/createFormStep5.vue b/resources/assets/js/volumes/createFormStep5.vue
index 8b5656730..b74990c08 100644
--- a/resources/assets/js/volumes/createFormStep5.vue
+++ b/resources/assets/js/volumes/createFormStep5.vue
@@ -1,6 +1,7 @@
 <script>
-import LoaderMixin from '../core/mixins/loader';
+import LabelApi from '../core/api/labels';
 import LabelMapping from './components/labelMapping';
+import LoaderMixin from '../core/mixins/loader';
 
 export default {
     mixins: [LoaderMixin],
@@ -46,7 +47,23 @@ export default {
         },
     },
     methods: {
-        //
+        handleSelect(label, id) {
+            label.mappedLabel = id;
+        },
+        handleCreate(metaLabel, treeId, newLabel) {
+            this.startLoading();
+            LabelApi.save({label_tree_id: treeId}, newLabel)
+                .then(
+                    (response) => this.handleCreatedLabel(metaLabel, response.body[0]),
+                    this.handleErrorResponse
+                )
+                .finally(this.finishLoading);
+        },
+        handleCreatedLabel(metaLabel, newLabel) {
+            const tree = this.labelTrees.find(t => t.id === newLabel.label_tree_id);
+            tree.labels.push(newLabel);
+            this.handleSelect(metaLabel, newLabel.id);
+        },
     },
     created() {
         this.labelMap = biigle.$require('volumes.labelMap');
diff --git a/resources/assets/sass/volumes/components/_label-mapping.scss b/resources/assets/sass/volumes/components/_label-mapping.scss
index f0676c8d5..30a981d11 100644
--- a/resources/assets/sass/volumes/components/_label-mapping.scss
+++ b/resources/assets/sass/volumes/components/_label-mapping.scss
@@ -1,3 +1,7 @@
+.label-mapping {
+    margin-bottom: 1em;
+}
+
 .label-mapping-item {
     margin-bottom: $padding-small-vertical;
     display: flex;
@@ -8,8 +12,12 @@
         border-radius: $border-radius-small;
     }
 
-    .label-tree-label__name:hover {
-        cursor: inherit;
+    .label-tree-label__name {
+        padding-right: 0;
+
+        &:hover {
+            cursor: inherit;
+        }
     }
 
     .label-mapping-item-column {
@@ -21,4 +29,8 @@
         padding: $padding-small-vertical 0;
         text-align: center;
     }
+
+    .create-form .row:not(:last-child) {
+        padding-bottom: $padding-small-vertical;
+    }
 }
diff --git a/resources/views/volumes/create/labelMap.blade.php b/resources/views/volumes/create/labelMap.blade.php
index de4a0871e..fc93fd18d 100644
--- a/resources/views/volumes/create/labelMap.blade.php
+++ b/resources/views/volumes/create/labelMap.blade.php
@@ -36,6 +36,9 @@
                 :from-labels="labels"
                 :to-labels="flatLabels"
                 :trees="flatTrees"
+                :loading="loading"
+                v-on:select="handleSelect"
+                v-on:create="handleCreate"
                 ></label-mapping>
 
             <div class="clearfix">

From 1f2cd4da6cab7bb7370cb392adc5e2688fe47af3 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 10 Apr 2024 15:42:04 +0200
Subject: [PATCH 097/209] Polish label map view

---
 .../Views/Volumes/PendingVolumeController.php | 15 +++++---
 .../volumes/components/labelMappingItem.vue   | 38 ++++++++++---------
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
index c76e00844..481178e0e 100644
--- a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
@@ -206,15 +206,20 @@ public function showLabelMap(Request $request)
             abort(Response::HTTP_NOT_FOUND);
         }
 
+        $metadata = $pv->getMetadata();
 
 
         $onlyLabels = $pv->only_annotation_labels + $pv->only_file_labels;
-        $labelMap = collect($pv->getMetadata()->getMatchingLabels(onlyLabels: $onlyLabels));
+        $labelMap = collect($metadata->getMatchingLabels(onlyLabels: $onlyLabels));
 
         if ($labelMap->isEmpty()) {
             abort(Response::HTTP_NOT_FOUND);
         }
 
+        // Merge with previously selected map on error.
+        $oldMap = collect(old('label_map', []))->map(fn ($v) => intval($v));
+        $labelMap = $oldMap->union($labelMap);
+
         $labels = [];
 
         if ($pv->import_file_labels) {
@@ -231,13 +236,13 @@ public function showLabelMap(Request $request)
 
         // These label trees are required to display the pre-mapped labels.
         $labelTrees =
-            LabelTree::whereIn('id', fn ($query) =>
+            LabelTree::whereIn(
+                'id',
+                fn ($query) =>
                 $query->select('label_tree_id')
                     ->from('labels')
                     ->whereIn('id', $labelMap->values()->unique()->filter())
-            )
-            ->get()
-            ->keyBy('id');
+            )->get()->keyBy('id');
 
         // These trees can also be used for manual mapping.
         $labelTrees = $labelTrees->union($project->labelTrees->keyBy('id'))->values();
diff --git a/resources/assets/js/volumes/components/labelMappingItem.vue b/resources/assets/js/volumes/components/labelMappingItem.vue
index bbc8bdd8a..b7a13e405 100644
--- a/resources/assets/js/volumes/components/labelMappingItem.vue
+++ b/resources/assets/js/volumes/components/labelMappingItem.vue
@@ -17,7 +17,7 @@
                 type="button"
                 :disabled="loading"
                 @click="handleChange"
-                ><i class="fa fa-pen"></i></button>
+                ><i class="fa fa-pen fa-fw"></i></button>
 
             <span class="label-tree-label__color" :style="mappedLabelColorStyle"></span>
             {{mappedLabel.name}}<br>
@@ -27,13 +27,13 @@
             <div v-if="creating" class="create-form">
                 <div class="row">
                     <div class="col-xs-8">
-                        <select class="form-control" v-model="selectedTree">
-                            <option
-                                v-for="tree in trees"
-                                :value="tree.id"
-                                :key="tree.id"
-                                >{{tree.name}}</option>
-                        </select>
+                        <input
+                            class="form-control"
+                            type="text"
+                            name="name"
+                            placeholder="New label name"
+                            v-model="selectedName"
+                            >
                     </div>
                     <div class="col-xs-4">
                         <input
@@ -46,13 +46,17 @@
                 </div>
                 <div class="row">
                     <div class="col-xs-8">
-                        <input
+                        <select
                             class="form-control"
-                            type="text"
-                            name="name"
-                            placeholder="New label name"
-                            v-model="selectedName"
+                            v-model="selectedTree"
                             >
+                            <option value="" disabled selected>-- label tree --</option>
+                            <option
+                                v-for="tree in trees"
+                                :value="tree.id"
+                                :key="tree.id"
+                                >{{tree.name}}</option>
+                        </select>
                     </div>
                     <div class="col-xs-4 clearfix">
                         <span class="pull-right">
@@ -62,14 +66,14 @@
                                 title="Cancel creating a new label"
                                 :disabled="loading"
                                 @click="cancelCreating"
-                                ><i class="fa fa-times"></i></button>
+                                ><i class="fa fa-times fa-fw"></i></button>
                             <button
                                 class="btn btn-success"
                                 type="button"
                                 title="Create the new label"
                                 :disabled="cantCreate"
                                 @click="emitCreate"
-                                ><i class="fa fa-check"></i></button>
+                                ><i class="fa fa-check fa-fw"></i></button>
                         </span>
                     </div>
                 </div>
@@ -81,7 +85,7 @@
                     type="button"
                     :disabled="loading"
                     @click="handleCreate"
-                    ><i class="fa fa-plus"></i></button>
+                    ><i class="fa fa-plus fa-fw"></i></button>
 
                 <typeahead
                     :items="labels"
@@ -107,7 +111,7 @@ export default {
     data() {
         return {
             creating: false,
-            selectedTree: null,
+            selectedTree: '',
             selectedColor: '',
             selectedName: '',
         };

From 1f940513a530e8e116d0578d12e9e6af88720e0c Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 10 Apr 2024 16:43:45 +0200
Subject: [PATCH 098/209] Implement volume import user map view

---
 .../Api/PendingVolumeImportController.php     |  5 +-
 .../Views/Volumes/PendingVolumeController.php | 16 +++-
 .../Requests/UpdatePendingVolumeUserMap.php   |  1 +
 .../js/volumes/components/userMapping.vue     | 45 ++++++++++
 .../js/volumes/components/userMappingItem.vue | 89 +++++++++++++++++++
 .../assets/js/volumes/createFormStep5.vue     |  5 +-
 .../assets/js/volumes/createFormStep6.vue     | 67 ++++++++++++++
 resources/assets/js/volumes/main.js           |  2 +
 .../volumes/components/_user-mapping.scss     | 25 ++++++
 resources/assets/sass/volumes/main.scss       |  1 +
 .../views/volumes/create/labelMap.blade.php   |  5 +-
 .../views/volumes/create/userMap.blade.php    | 32 +++++--
 .../Api/PendingVolumeImportControllerTest.php |  4 +-
 13 files changed, 279 insertions(+), 18 deletions(-)
 create mode 100644 resources/assets/js/volumes/components/userMapping.vue
 create mode 100644 resources/assets/js/volumes/components/userMappingItem.vue
 create mode 100644 resources/assets/js/volumes/createFormStep6.vue
 create mode 100644 resources/assets/sass/volumes/components/_user-mapping.scss

diff --git a/app/Http/Controllers/Api/PendingVolumeImportController.php b/app/Http/Controllers/Api/PendingVolumeImportController.php
index 52430c6d6..f6b9c064c 100644
--- a/app/Http/Controllers/Api/PendingVolumeImportController.php
+++ b/app/Http/Controllers/Api/PendingVolumeImportController.php
@@ -176,9 +176,8 @@ public function updateLabelMap(UpdatePendingVolumeLabelMap $request)
      */
     public function updateUserMap(UpdatePendingVolumeUserMap $request)
     {
-        $request->pendingVolume->update([
-            'user_map' => $request->input('user_map'),
-        ]);
+        $map = array_map('intval', $request->input('user_map'));
+        $request->pendingVolume->update(['user_map' => $map]);
 
         return $request->pendingVolume;
     }
diff --git a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
index 481178e0e..a89cf6181 100644
--- a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
@@ -283,14 +283,26 @@ public function showUserMap(Request $request)
             abort(Response::HTTP_NOT_FOUND);
         }
 
-        $users = $pv->getMetadata()->getMatchingUsers();
+        $metadata = $pv->getMetadata();
+
+        $onlyLabels = $pv->only_annotation_labels + $pv->only_file_labels;
+        $userMap = collect($metadata->getMatchingUsers(onlyLabels: $onlyLabels));
 
-        if (empty($users)) {
+        if ($userMap->isEmpty()) {
             abort(Response::HTTP_NOT_FOUND);
         }
 
+        // Merge with previously selected map on error.
+        $oldMap = collect(old('user_map', []))->map(fn ($v) => intval($v));
+        $userMap = $oldMap->union($userMap);
+
+        $users = collect($metadata->getUsers($onlyLabels))
+            ->values()
+            ->pluck('name', 'id');
+
         return view('volumes.create.userMap', [
             'pv' => $pv,
+            'userMap' => $userMap,
             'users' => $users,
         ]);
     }
diff --git a/app/Http/Requests/UpdatePendingVolumeUserMap.php b/app/Http/Requests/UpdatePendingVolumeUserMap.php
index 6fa6e2805..a57d44851 100644
--- a/app/Http/Requests/UpdatePendingVolumeUserMap.php
+++ b/app/Http/Requests/UpdatePendingVolumeUserMap.php
@@ -27,6 +27,7 @@ public function rules(): array
     {
         return [
             'user_map' => 'required|array|min:1',
+            'user_map.*' => 'int',
         ];
     }
 
diff --git a/resources/assets/js/volumes/components/userMapping.vue b/resources/assets/js/volumes/components/userMapping.vue
new file mode 100644
index 000000000..e9c4b06e9
--- /dev/null
+++ b/resources/assets/js/volumes/components/userMapping.vue
@@ -0,0 +1,45 @@
+<template>
+<div class="user-mapping">
+    <item
+        v-for="user in fromUsers"
+        :user="user"
+        :key="user.id"
+        :users="toUsers"
+        :loading="loading"
+        @select="emitSelect"
+        @select-self="emitSelectSelf"
+        ></item>
+</div>
+</template>
+
+<script>
+import Item from './userMappingItem';
+
+export default {
+    components: {
+        Item,
+    },
+    props: {
+        fromUsers: {
+            required: true,
+            type: Array,
+        },
+        toUsers: {
+            default: () => [],
+            type: Array,
+        },
+        loading: {
+            default: false,
+            type: Boolean,
+        },
+    },
+    methods: {
+        emitSelect(user, id) {
+            this.$emit('select', user, id);
+        },
+        emitSelectSelf(user) {
+            this.$emit('select-self', user);
+        },
+    },
+};
+</script>
diff --git a/resources/assets/js/volumes/components/userMappingItem.vue b/resources/assets/js/volumes/components/userMappingItem.vue
new file mode 100644
index 000000000..f0f1e6c4d
--- /dev/null
+++ b/resources/assets/js/volumes/components/userMappingItem.vue
@@ -0,0 +1,89 @@
+<template>
+<div class="user-mapping-item">
+    <div class="user-mapping-item-column">
+        {{user.name}}
+    </div>
+    <div class="user-mapping-item-chevron" :class="chevronClass">
+        <i class="fas fa-chevron-right"></i>
+    </div>
+    <div class="user-mapping-item-column">
+        <div v-if="mappedUser" class="clearfix">
+            <button
+                class="btn btn-default pull-right"
+                title="Change mapped user"
+                type="button"
+                :disabled="loading"
+                @click="handleChange"
+                ><i class="fa fa-pen fa-fw"></i></button>
+
+            {{mappedUser.name}}<br>
+            <span class="text-muted">{{mappedUser.affiliation}}</span>
+        </div>
+        <div v-else class="clearfix">
+            <button
+                class="btn btn-default pull-right"
+                title="Select yourself"
+                type="button"
+                :disabled="loading"
+                @click="handleSelectSelf"
+                ><i class="fa fa-user fa-fw"></i></button>
+
+            <typeahead
+                :items="users"
+                :clear-on-select="true"
+                more-info="affiliation"
+                placeholder="User name"
+                @select="handleSelect"
+                ></typeahead>
+        </div>
+    </div>
+</div>
+</template>
+
+<script>
+import Typeahead from '../../core/components/typeahead';
+
+export default {
+    components: {
+        Typeahead,
+    },
+    data() {
+        return {
+            //
+        };
+    },
+    props: {
+        user: {
+            required: true,
+            type: Object,
+        },
+        users: {
+            default: () => [],
+            type: Array,
+        },
+        loading: {
+            default: false,
+            type: Boolean,
+        },
+    },
+    computed: {
+        mappedUser() {
+            return this.users.find(u => u.id === this.user.mappedUser) || null;
+        },
+        chevronClass() {
+            return this.user.mappedUser ? 'text-muted' : 'text-info';
+        },
+    },
+    methods: {
+        handleSelect(user) {
+            this.$emit('select', this.user, user.id);
+        },
+        handleSelectSelf() {
+            this.$emit('select-self', this.user);
+        },
+        handleChange() {
+            this.$emit('select', this.user, null);
+        },
+    },
+};
+</script>
diff --git a/resources/assets/js/volumes/createFormStep5.vue b/resources/assets/js/volumes/createFormStep5.vue
index b74990c08..3a5f378c7 100644
--- a/resources/assets/js/volumes/createFormStep5.vue
+++ b/resources/assets/js/volumes/createFormStep5.vue
@@ -11,7 +11,6 @@ export default {
     data() {
         return {
             labels: [],
-            labelMap: {},
             labelTrees: [],
         };
     },
@@ -66,10 +65,10 @@ export default {
         },
     },
     created() {
-        this.labelMap = biigle.$require('volumes.labelMap');
+        const labelMap = biigle.$require('volumes.labelMap');
 
         this.labels = biigle.$require('volumes.labels').map((label) => {
-            label.mappedLabel = this.labelMap[label.id];
+            label.mappedLabel = labelMap[label.id];
 
             return label;
         });
diff --git a/resources/assets/js/volumes/createFormStep6.vue b/resources/assets/js/volumes/createFormStep6.vue
new file mode 100644
index 000000000..a5401bde9
--- /dev/null
+++ b/resources/assets/js/volumes/createFormStep6.vue
@@ -0,0 +1,67 @@
+<script>
+import UserApi from '../core/api/users';
+import UserMapping from './components/userMapping';
+import LoaderMixin from '../core/mixins/loader';
+
+export default {
+    mixins: [LoaderMixin],
+    components: {
+        UserMapping,
+    },
+    data() {
+        return {
+            users: [],
+            allUsers: [],
+            ownUserId: null,
+        };
+    },
+    computed: {
+        cannotContinue() {
+            return this.loading || this.hasDanglingUsers;
+        },
+        hasDanglingUsers() {
+            return this.danglingUsers.length > 0;
+        },
+        danglingUsers() {
+            return this.users.filter(l => l.mappedUser === null);
+        },
+        mappedUsers() {
+            return this.users.filter(l => l.mappedUser);
+        },
+    },
+    methods: {
+        handleSelect(user, id) {
+            user.mappedUser = id;
+        },
+        handleSelectSelf(user) {
+            user.mappedUser = this.ownUserId;
+        },
+        initAllUsers(response) {
+            this.allUsers = response.body.map(u => {
+                return {
+                    id: u.id,
+                    name: `${u.firstname} ${u.lastname}`,
+                    affiliation: u.affiliation,
+                };
+            });
+        },
+    },
+    created() {
+        this.startLoading()
+        UserApi.query().then(this.initAllUsers).finally(this.finishLoading);
+
+        const userMap = biigle.$require('volumes.userMap');
+
+        const users = biigle.$require('volumes.users');
+        this.users = Object.keys(users).map(k => {
+            return {
+                id: k,
+                name: users[k],
+                mappedUser: userMap[k],
+            };
+        });
+
+        this.ownUserId = biigle.$require('volumes.ownUserId')
+    },
+};
+</script>
diff --git a/resources/assets/js/volumes/main.js b/resources/assets/js/volumes/main.js
index c605f6f73..61e8d25e0 100644
--- a/resources/assets/js/volumes/main.js
+++ b/resources/assets/js/volumes/main.js
@@ -5,6 +5,7 @@ import CreateFormStep2 from './createFormStep2';
 import CreateFormStep3 from './createFormStep3';
 import CreateFormStep4 from './createFormStep4';
 import CreateFormStep5 from './createFormStep5';
+import CreateFormStep6 from './createFormStep6';
 import CloneForm from './cloneForm';
 import FileCount from './fileCount';
 import FilePanel from './filePanel';
@@ -19,6 +20,7 @@ biigle.$mount('create-volume-form-step-2', CreateFormStep2);
 biigle.$mount('create-volume-form-step-3', CreateFormStep3);
 biigle.$mount('create-volume-form-step-4', CreateFormStep4);
 biigle.$mount('create-volume-form-step-5', CreateFormStep5);
+biigle.$mount('create-volume-form-step-6', CreateFormStep6);
 biigle.$mount('clone-volume-form', CloneForm);
 biigle.$mount('file-panel', FilePanel);
 biigle.$mount('projects-breadcrumb', ProjectsBreadcrumb);
diff --git a/resources/assets/sass/volumes/components/_user-mapping.scss b/resources/assets/sass/volumes/components/_user-mapping.scss
new file mode 100644
index 000000000..f186b788d
--- /dev/null
+++ b/resources/assets/sass/volumes/components/_user-mapping.scss
@@ -0,0 +1,25 @@
+.user-mapping {
+    margin-bottom: 1em;
+}
+
+.user-mapping-item {
+    margin-bottom: $padding-small-vertical;
+    padding: $padding-small-vertical $padding-small-horizontal;
+    padding-right: 0;
+    display: flex;
+
+    &:hover {
+        color: white;
+        background-color: $gray-lighter;
+        border-radius: $border-radius-small;
+    }
+
+    .user-mapping-item-column {
+        flex: 1;
+    }
+
+    .user-mapping-item-chevron {
+        flex: 0 0 40px;
+        text-align: center;
+    }
+}
diff --git a/resources/assets/sass/volumes/main.scss b/resources/assets/sass/volumes/main.scss
index 6a18c0872..22fdab82b 100644
--- a/resources/assets/sass/volumes/main.scss
+++ b/resources/assets/sass/volumes/main.scss
@@ -39,6 +39,7 @@ $volume-image-padding: 0.5em;
 @import 'components/volume-image-grid-image';
 @import 'components/file-label-list';
 @import 'components/label-mapping';
+@import 'components/user-mapping';
 
 @import 'edit';
 @import 'search';
diff --git a/resources/views/volumes/create/labelMap.blade.php b/resources/views/volumes/create/labelMap.blade.php
index fc93fd18d..0e0f7af6c 100644
--- a/resources/views/volumes/create/labelMap.blade.php
+++ b/resources/views/volumes/create/labelMap.blade.php
@@ -55,7 +55,10 @@
                 <input type="hidden" name="_method" value="PUT">
                 <button type="submit" form="cancel-pending-volume" class="btn btn-default" :disabled="loading" title="Discard metadata and continue to the new volume" onclick="return confirm('Are you sure you want to abort the metadata import?')">Cancel</button>
 
-                <input type="submit" class="btn btn-success pull-right" value="Continue" :disabled="cannotContinue">
+                <span class="pull-right">
+                    <loader :active="loading"></loader>
+                    <input type="submit" class="btn btn-success" value="Continue" :disabled="cannotContinue">
+                </span>
             </div>
         </form>
         <form id="cancel-pending-volume" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}") }}" v-on:submit="startLoading">
diff --git a/resources/views/volumes/create/userMap.blade.php b/resources/views/volumes/create/userMap.blade.php
index 99822bb72..9a3ab26bf 100644
--- a/resources/views/volumes/create/userMap.blade.php
+++ b/resources/views/volumes/create/userMap.blade.php
@@ -4,33 +4,48 @@
 
 @push('scripts')
     <script type="text/javascript">
-        {{-- biigle.$declare('volumes.labels', {!! $labels !!}); --}}
+        biigle.$declare('volumes.userMap', {!! $userMap !!});
+        biigle.$declare('volumes.users', {!! $users !!});
+        biigle.$declare('volumes.ownUserId', {!! $user->id !!});
     </script>
 @endpush
 
 @section('content')
 
 <div class="container">
-    <div id="create-volume-form-step-5" class="col-sm-8 col-sm-offset-2 col-lg-6 col-lg-offset-3">
+    <div id="create-volume-form-step-6" class="col-sm-10 col-sm-offset-1 col-lg-8 col-lg-offset-2">
         <h2>Metadata import user mapping</h2>
         <p class="text-muted">
-            TODO
+            Each user from the metadata file must be mapped to a user in the BIIGLE database. Some labels can be mapped automatically. The rest must be mapped manually.
         </p>
         <form role="form" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}/user-map") }}" v-on:submit="startLoading">
 
             <div class="form-group{{ $errors->has('user_map') ? ' has-error' : '' }}">
-                {{--<input v-for="label in selectedLabels" type="hidden" name="user_map[]" :value="label.id">--}}
+                <input
+                    v-for="user in mappedUsers"
+                    type="hidden"
+                    :name="'user_map[' + user.id + ']'"
+                    :value="user.mappedUser"
+                    >
                 @if ($errors->has('user_map'))
                    <span class="help-block">{{ $errors->first('user_map') }}</span>
                 @endif
             </div>
 
+            <user-mapping
+                :from-users="users"
+                :to-users="allUsers"
+                :loading="loading"
+                v-on:select="handleSelect"
+                v-on:select-self="handleSelectSelf"
+                ></user-mapping>
+
             <div class="clearfix">
-                <p v-if="allMapped" class="text-muted pull-right">
+                <p v-if="!hasDanglingUsers" class="text-muted pull-right">
                     All users are mapped.
                 </p>
                 <p v-cloak v-else class="text-muted pull-right">
-                    <span v-text="danglingLabels.length"></span> users must be mapped.
+                    <span v-text="danglingUsers.length"></span> users must be mapped.
                 </p>
             </div>
 
@@ -39,7 +54,10 @@
                 <input type="hidden" name="_method" value="PUT">
                 <button type="submit" form="cancel-pending-volume" class="btn btn-default" :disabled="loading" title="Discard metadata and continue to the new volume" onclick="return confirm('Are you sure you want to abort the metadata import?')">Cancel</button>
 
-                <input type="submit" class="btn btn-success pull-right" value="Continue" :disabled="cannotContinue">
+                <span class="pull-right">
+                    <loader :active="loading"></loader>
+                    <input type="submit" class="btn btn-success" value="Continue" :disabled="cannotContinue">
+                </span>
             </div>
         </form>
         <form id="cancel-pending-volume" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}") }}" v-on:submit="startLoading">
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
index 48e81a3bf..b30e64cc4 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
@@ -529,11 +529,11 @@ public function testUpdateUserMap()
         ])->assertStatus(422);
 
         $this->putJson("/api/v1/pending-volumes/{$id}/user-map", [
-            'user_map' => [321 => $this->user()->id],
+            'user_map' => [321 => "{$this->user()->id}"],
         ])->assertSuccessful();
 
         $pv->refresh();
-        $this->assertEquals([321 => $this->user()->id], $pv->user_map);
+        $this->assertSame([321 => $this->user()->id], $pv->user_map);
     }
 
     public function testUpdateUserMapFileLabel()

From a028d878afec16fb8221a0bd261f2036cb59127f Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 10 Apr 2024 16:47:33 +0200
Subject: [PATCH 099/209] Add missing use

---
 app/Http/Controllers/Views/Volumes/PendingVolumeController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
index a89cf6181..a4d162fa8 100644
--- a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
@@ -3,6 +3,7 @@
 namespace Biigle\Http\Controllers\Views\Volumes;
 
 use Biigle\Http\Controllers\Views\Controller;
+use Biigle\LabelTree;
 use Biigle\MediaType;
 use Biigle\Modules\UserDisks\UserDisk;
 use Biigle\Modules\UserStorage\UserStorageServiceProvider;

From 86ecebed1520eb012f7fce449fc706ff5be8cc80 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 11 Apr 2024 15:29:46 +0200
Subject: [PATCH 100/209] Implement finish volume metadata import view

---
 .../Api/PendingVolumeImportController.php     | 13 ++-
 .../Views/Volumes/PendingVolumeController.php | 40 ++++++++-
 .../assets/js/volumes/createFormStep7.vue     |  7 ++
 resources/assets/js/volumes/main.js           |  2 +
 .../views/volumes/create/finish.blade.php     | 90 +++++++++++++++++++
 routes/web.php                                |  5 ++
 .../Api/PendingVolumeImportControllerTest.php | 60 +++++++++++++
 .../Volumes/PendingVolumeControllerTest.php   | 74 +++++++++++++++
 8 files changed, 289 insertions(+), 2 deletions(-)
 create mode 100644 resources/assets/js/volumes/createFormStep7.vue
 create mode 100644 resources/views/volumes/create/finish.blade.php

diff --git a/app/Http/Controllers/Api/PendingVolumeImportController.php b/app/Http/Controllers/Api/PendingVolumeImportController.php
index f6b9c064c..993e5a2d6 100644
--- a/app/Http/Controllers/Api/PendingVolumeImportController.php
+++ b/app/Http/Controllers/Api/PendingVolumeImportController.php
@@ -179,7 +179,11 @@ public function updateUserMap(UpdatePendingVolumeUserMap $request)
         $map = array_map('intval', $request->input('user_map'));
         $request->pendingVolume->update(['user_map' => $map]);
 
-        return $request->pendingVolume;
+        if ($this->isAutomatedRequest()) {
+            return $request->pendingVolume;
+        }
+
+        return redirect()->route('pending-volume-finish', $request->pendingVolume->id);
     }
 
     /**
@@ -200,5 +204,12 @@ public function storeImport(StorePendingVolumeImport $request)
             $request->pendingVolume->update(['importing' => true]);
             Queue::push(new ImportVolumeMetadata($request->pendingVolume));
         });
+
+        if (!$this->isAutomatedRequest()) {
+            return redirect()
+                ->route('volume', $request->pendingVolume->volume_id)
+                ->with('message', 'Metadata import in progress')
+                ->with('messageType', 'success');
+        }
     }
 }
diff --git a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
index a4d162fa8..24abe9876 100644
--- a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
@@ -209,7 +209,6 @@ public function showLabelMap(Request $request)
 
         $metadata = $pv->getMetadata();
 
-
         $onlyLabels = $pv->only_annotation_labels + $pv->only_file_labels;
         $labelMap = collect($metadata->getMatchingLabels(onlyLabels: $onlyLabels));
 
@@ -307,4 +306,43 @@ public function showUserMap(Request $request)
             'users' => $users,
         ]);
     }
+
+    /**
+     * Show the view to finish the metadata import.
+     *
+     * @param Request $request
+     */
+    public function showFinish(Request $request)
+    {
+        $pv = PendingVolume::findOrFail($request->route('id'));
+        $this->authorize('update', $pv);
+
+        if (is_null($pv->volume_id)) {
+            return redirect()->route('pending-volume', $pv->id);
+        }
+
+        if (!$pv->hasMetadata()) {
+            abort(Response::HTTP_NOT_FOUND);
+        }
+
+        $metadata = $pv->getMetadata();
+
+        if (empty($metadata->getUsers())) {
+            abort(Response::HTTP_NOT_FOUND);
+        }
+
+        $onlyLabels = $pv->only_annotation_labels + $pv->only_file_labels;
+
+        $labelMap = $metadata->getMatchingLabels($pv->label_map, $onlyLabels);
+        $labelMapOk = array_search(null, $labelMap) === false;
+
+        $userMap = $metadata->getMatchingUsers($pv->user_map, $onlyLabels);
+        $userMapOk = array_search(null, $userMap) === false;
+
+        return view('volumes.create.finish', [
+            'pv' => $pv,
+            'labelMapOk' => $labelMapOk,
+            'userMapOk' => $userMapOk,
+        ]);
+    }
 }
diff --git a/resources/assets/js/volumes/createFormStep7.vue b/resources/assets/js/volumes/createFormStep7.vue
new file mode 100644
index 000000000..742b5bb00
--- /dev/null
+++ b/resources/assets/js/volumes/createFormStep7.vue
@@ -0,0 +1,7 @@
+<script>
+import LoaderMixin from '../core/mixins/loader';
+
+export default {
+    mixins: [LoaderMixin],
+};
+</script>
diff --git a/resources/assets/js/volumes/main.js b/resources/assets/js/volumes/main.js
index 61e8d25e0..396be858c 100644
--- a/resources/assets/js/volumes/main.js
+++ b/resources/assets/js/volumes/main.js
@@ -6,6 +6,7 @@ import CreateFormStep3 from './createFormStep3';
 import CreateFormStep4 from './createFormStep4';
 import CreateFormStep5 from './createFormStep5';
 import CreateFormStep6 from './createFormStep6';
+import CreateFormStep7 from './createFormStep7';
 import CloneForm from './cloneForm';
 import FileCount from './fileCount';
 import FilePanel from './filePanel';
@@ -21,6 +22,7 @@ biigle.$mount('create-volume-form-step-3', CreateFormStep3);
 biigle.$mount('create-volume-form-step-4', CreateFormStep4);
 biigle.$mount('create-volume-form-step-5', CreateFormStep5);
 biigle.$mount('create-volume-form-step-6', CreateFormStep6);
+biigle.$mount('create-volume-form-step-7', CreateFormStep7);
 biigle.$mount('clone-volume-form', CloneForm);
 biigle.$mount('file-panel', FilePanel);
 biigle.$mount('projects-breadcrumb', ProjectsBreadcrumb);
diff --git a/resources/views/volumes/create/finish.blade.php b/resources/views/volumes/create/finish.blade.php
new file mode 100644
index 000000000..d488a0062
--- /dev/null
+++ b/resources/views/volumes/create/finish.blade.php
@@ -0,0 +1,90 @@
+@extends('app')
+
+@section('title', 'Finish the metadata import')
+
+@section('content')
+
+<div class="container">
+    <div id="create-volume-form-step-7" class="col-sm-8 col-sm-offset-2 col-lg-6 col-lg-offset-3">
+        <h2>Finish metadata import</h2>
+
+        <ul class="list-group">
+            @if ($pv->import_annotations)
+                @if (empty($pv->only_annotation_labels))
+                    <li class="list-group-item">
+                        All annotations will be imported
+                        <span class="pull-right text-success"><i class="fa fa-check"></i></span>
+                    </li>
+                @else
+                    <li class="list-group-item">
+                        Annotations with selected labels will be imported
+                        <span class="pull-right text-success"><i class="fa fa-check"></i></span>
+                    </li>
+                @endif
+            @endif
+            @if ($pv->import_file_labels)
+                @if (empty($pv->only_file_labels))
+                    <li class="list-group-item">
+                        All file labels will be imported
+                        <span class="pull-right text-success"><i class="fa fa-check"></i></span>
+                    </li>
+                @else
+                    <li class="list-group-item">
+                        Selected file labels will be imported
+                        <span class="pull-right text-success"><i class="fa fa-check"></i></span>
+                    </li>
+                @endif
+            @endif
+            @if ($labelMapOk)
+                <li class="list-group-item">
+                    All labels are mapped
+                    <span class="pull-right text-success"><i class="fa fa-check"></i></span>
+                </li>
+            @else
+                <li class="list-group-item text-danger">
+                    Labels are not mapped
+                    <span class="pull-right"><i class="fa fa-times"></i></span>
+                </li>
+            @endif
+            @if ($userMapOk)
+                <li class="list-group-item">
+                    All users are mapped
+                    <span class="pull-right text-success"><i class="fa fa-check"></i></span>
+                </li>
+            @else
+                <li class="list-group-item text-danger">
+                    Users are not mapped
+                    <span class="pull-right"><i class="fa fa-times"></i></span>
+                </li>
+            @endif
+        </ul>
+
+        @if (!$labelMapOk)
+            <a href="{{route('pending-volume-label-map', $pv->id)}}" class="btn btn-warning pull-right">Back to label mapping</a>
+
+            <button type="submit" form="cancel-pending-volume" class="btn btn-default" :disabled="loading" title="Discard metadata and continue to the new volume" onclick="return confirm('Are you sure you want to abort the metadata import?')">Cancel</button>
+        @elseif (!$userMapOk)
+            <a href="{{route('pending-volume-user-map', $pv->id)}}" class="btn btn-warning pull-right">Back to user mapping</a>
+
+            <button type="submit" form="cancel-pending-volume" class="btn btn-default" :disabled="loading" title="Discard metadata and continue to the new volume" onclick="return confirm('Are you sure you want to abort the metadata import?')">Cancel</button>
+        @else
+            <form role="form" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}/import") }}" v-on:submit="startLoading">
+                <div class="form-group{{ $errors->has('id') ? ' has-error' : '' }}">
+                    @if ($errors->has('id'))
+                       <span class="help-block">{{ $errors->first('id') }}</span>
+                    @endif
+                    <input type="hidden" name="_token" value="{{ csrf_token() }}">
+                    <button type="submit" form="cancel-pending-volume" class="btn btn-default" :disabled="loading" title="Discard metadata and continue to the new volume" onclick="return confirm('Are you sure you want to abort the metadata import?')">Cancel</button>
+
+                    <input type="submit" class="btn btn-success pull-right" value="Finish import" :disabled="loading">
+                </div>
+            </form>
+        @endif
+        <form id="cancel-pending-volume" method="POST" action="{{ url("api/v1/pending-volumes/{$pv->id}") }}" v-on:submit="startLoading">
+            <input type="hidden" name="_token" value="{{ csrf_token() }}">
+            <input type="hidden" name="_method" value="DELETE">
+            <input type="hidden" name="_redirect" value="{{route('volume', $pv->volume_id)}}">
+        </form>
+    </div>
+</div>
+@endsection
diff --git a/routes/web.php b/routes/web.php
index 3dc7e9258..bdf0911a7 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -272,6 +272,11 @@
             'as'   => 'pending-volume-user-map',
             'uses' => 'PendingVolumeController@showUserMap',
         ]);
+
+        $router->get('{id}/finish', [
+            'as'   => 'pending-volume-finish',
+            'uses' => 'PendingVolumeController@showFinish',
+        ]);
     });
 
     $router->group(['namespace' => 'Volumes', 'prefix' => 'volumes'], function ($router) {
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
index b30e64cc4..d88d4b1ef 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
@@ -567,6 +567,34 @@ public function testUpdateUserMapFileLabel()
         $this->assertEquals([321 => $this->user()->id], $pv->user_map);
     }
 
+    public function testUpdateUserMapRedirectToFinish()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+
+        $this->put("/api/v1/pending-volumes/{$id}/user-map", [
+            'user_map' => [321 => $this->user()->id],
+        ])->assertRedirectToRoute('pending-volume-finish', $id);
+    }
+
     public function testStoreImport()
     {
         $dbUser = DbUser::factory()->create();
@@ -817,6 +845,8 @@ public function testStoreImportAlreadyImporting()
             'metadata_file_path' => 'mymeta.csv',
             'volume_id' => $this->volume()->id,
             'import_file_labels' => true,
+            'label_map' => [123 => $this->labelRoot()->id],
+            'user_map' => [321 => $this->user()->id],
             'importing' => true,
         ]);
         $id = $pv->id;
@@ -1100,4 +1130,34 @@ public function testStoreImportValidateVideoAnnotationFrames()
         $this->beAdmin();
         $this->postJson("/api/v1/pending-volumes/{$id}/import")->assertStatus(422);
     }
+
+    public function testStoreImportRedirectToVolume()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+            'import_file_labels' => true,
+            'label_map' => [123 => $this->labelRoot()->id],
+            'user_map' => [321 => $this->user()->id],
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+        $this
+            ->post("/api/v1/pending-volumes/{$id}/import")
+            ->assertRedirectToRoute('volume', $this->volume()->id);
+    }
 }
diff --git a/tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php b/tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php
index 1729c09e3..0b5c38744 100644
--- a/tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Views/Volumes/PendingVolumeControllerTest.php
@@ -463,4 +463,78 @@ public function testShowSelectUserMapNoUsers()
         $this->beAdmin();
         $this->get("pending-volumes/{$pv->id}/user-map")->assertStatus(404);
     }
+
+    public function testShowFinishImport()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+            'volume_id' => $this->volume()->id,
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+
+        // not logged in
+        $this->get("pending-volumes/{$pv->id}/finish")->assertStatus(302);
+
+        // doesn't belong to pending volume
+        $this->beExpert();
+        $this->get("pending-volumes/{$pv->id}/finish")->assertStatus(403);
+
+        $this->beAdmin();
+        $this->get("pending-volumes/{$pv->id}/finish")->assertStatus(200);
+    }
+
+    public function testShowFinishImportNoVolume()
+    {
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+        ]);
+
+        $this->beAdmin();
+        $this
+            ->get("pending-volumes/{$pv->id}/finish")
+            ->assertRedirectToRoute('pending-volume', $pv->id);
+    }
+
+    public function testShowFinishImportNoMetadata()
+    {
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+            'volume_id' => $this->volume()->id,
+        ]);
+
+        $this->beAdmin();
+        $this->get("pending-volumes/{$pv->id}/finish")->assertStatus(404);
+    }
+
+    public function testShowFinishImportNoUsers()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'user_id' => $this->admin()->id,
+            'project_id' => $this->project()->id,
+            'volume_id' => $this->volume()->id,
+            'metadata_file_path' => 'mymeta.csv',
+        ]);
+
+        $this->beAdmin();
+        $this->get("pending-volumes/{$pv->id}/finish")->assertStatus(404);
+    }
 }

From 0a8aa81338d98af6417c37aa50420a8cc9dfbe73 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 11 Apr 2024 15:30:02 +0200
Subject: [PATCH 101/209] Remove unnecessary steps

The user is first redirected to the pending volume view and from
there to the subsequent steps if relevant.
---
 .../Views/Volumes/VolumeControllerTest.php    | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/tests/php/Http/Controllers/Views/Volumes/VolumeControllerTest.php b/tests/php/Http/Controllers/Views/Volumes/VolumeControllerTest.php
index 74f687a11..8fd78f228 100644
--- a/tests/php/Http/Controllers/Views/Volumes/VolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Views/Volumes/VolumeControllerTest.php
@@ -78,26 +78,6 @@ public function testCreateWithExistingRedirectToStep2()
             ->assertRedirectToRoute('pending-volume', $pv->id);
     }
 
-    public function testCreateWithExistingRedirectToSelectAnnotationLabels()
-    {
-        // volume_id is filled and import_annotations is true but only_annotation_labels, only_file_labels, label_map and user_map is empty.
-    }
-
-    public function testCreateWithExistingRedirectToSelectFileLabels()
-    {
-        // volume_id and only_annotation_labels are filled and import_file_labels is true but only_file_labels, label_map and user_map are empty.
-    }
-
-    public function testCreateWithExistingRedirectToLabelMap()
-    {
-        // volume_id and only_annotation_labels and/or only_file_labels are filled but label_map and user_map are empty.
-    }
-
-    public function testCreateWithExistingRedirectToUserMap()
-    {
-        // volume_id, only_annotation_labels and/or only_file_labels and label_map are filled but user_map is empty.
-    }
-
     public function testEdit()
     {
         $id = $this->volume()->id;

From c8c67f46f2786cea2e08c16b7f90cdcbbb773461 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 11 Apr 2024 16:29:56 +0200
Subject: [PATCH 102/209] Update manual for new create volume flow

---
 resources/views/manual/index.blade.php        |  8 ++++
 .../volumes/annotation-import.blade.php       | 44 +++++++++++++++++++
 .../tutorials/volumes/file-metadata.blade.php | 41 ++++++++---------
 3 files changed, 70 insertions(+), 23 deletions(-)
 create mode 100644 resources/views/manual/tutorials/volumes/annotation-import.blade.php

diff --git a/resources/views/manual/index.blade.php b/resources/views/manual/index.blade.php
index 3dc373773..e3ca7efbe 100644
--- a/resources/views/manual/index.blade.php
+++ b/resources/views/manual/index.blade.php
@@ -93,6 +93,14 @@
                 File labels are labels that are attached to whole images or videos.
             </p>
 
+            <h4>
+                <a href="{{route('manual-tutorials', ['volumes', 'annotation-import'])}}">Annotation and file label import</a>
+            </h4>
+
+            <p>
+                Import annotations and file labels from metadata files.
+            </p>
+
             <h3>Files</h3>
 
             <h4>
diff --git a/resources/views/manual/tutorials/volumes/annotation-import.blade.php b/resources/views/manual/tutorials/volumes/annotation-import.blade.php
new file mode 100644
index 000000000..8baf57104
--- /dev/null
+++ b/resources/views/manual/tutorials/volumes/annotation-import.blade.php
@@ -0,0 +1,44 @@
+@extends('manual.base')
+
+@section('manual-title') Annotation and file label import @stop
+
+@section('manual-content')
+<div class="row">
+    <p class="lead">
+        Import annotations and file labels from metadata files.
+    </p>
+    <p>
+        Some <a href="{{route('manual-tutorials', ['volumes', 'file-metadata'])}}">metadata file formats</a> also support storing of annotation and/or file label information for images and videos. If you upload such a metadata file, the form to create a new volume will offer the options to import the annotations and/or file labels for the new volume, too. If you select one of these options, you are guided through a multi-step flow for the import. The individual steps are explained below.
+    </p>
+
+    <h3>1. Create the volume</h3>
+    <p>
+        The import begins when you create the new volume and selected one of the options to import annotations and/or file labels. While the volume is created in the background, you are redirected to the next step.
+    </p>
+
+    <h3>2. Choose annotation labels</h3>
+    <p>
+        This step only applies if you enabled the annotation import in step 1. In this step you are asked to choose all labels of annotations that should be imported. You can select only a subset of labels to import only certain annotations or you can select all labels to import all annotations.
+    </p>
+
+    <h3>3. Choose file labels</h3>
+    <p>
+        This step only applies if you enabled the file label import in step 1. In this step you are asked to choose all file labels that should be imported. You can select only a subset of labels to import only certain file labels or you can select all labels.
+    </p>
+
+    <h3>4. Label mapping</h3>
+    <p>
+        In this step you have to select one label from the BIIGLE database for each label of the metadata file that should be imported. Sometimes the metadata file stores unique identifiers for labels which enables BIIGLE to choose labels automatically. By default, you may choose any label from a label tree that is associated to the project to which the newly created volume (in step 1.) was added. You can also create new labels with pre-filled name (and maybe color) based on the metadata information.
+    </p>
+
+    <h3>5. User mapping</h3>
+    <p>
+        In this step you have to select one user from the BIIGLE database for each user of the metadata file (i.e. creators of annotations and/or file labels) that should be imported. Sometimes the metadata file stores unique identifiers for users which enables BIIGLE to choose users automatically. You can choose any user of the BIIGLE instance (including your own).
+    </p>
+
+    <h3>6. Finish import</h3>
+    <p>
+        This step verifies if all required information for the import is available or if you have to go back and provide additional information. When you click <button class="btn btn-success btn-xs">Finish import</button>, you are redirected to the newly created volume (in step 1.) while the annotation and/or file label import proceeds in the background.
+    </p>
+</div>
+@endsection
diff --git a/resources/views/manual/tutorials/volumes/file-metadata.blade.php b/resources/views/manual/tutorials/volumes/file-metadata.blade.php
index 7c011d713..d64637bd2 100644
--- a/resources/views/manual/tutorials/volumes/file-metadata.blade.php
+++ b/resources/views/manual/tutorials/volumes/file-metadata.blade.php
@@ -11,7 +11,10 @@
             BIIGLE supports metadata like the date and time of creation or the geo coordinates of a file. Every time a new image volume is created, BIIGLE attempts to automatically read the metadata from the EXIF information of JPEG files. This doesn't work for videos or if the images have another format than JPEG.
         </p>
         <p>
-            In this case you can upload a metadata file. BIIGLE supports the <a href="https://marine-imaging.com/fair/ifdos/iFDO-overview">iFDO standard</a> for import of the metadata fields described below. Additionally, there is a custom CSV format for metadata import. The CSV file should use <code>,</code> as delimiter, <code>&quot;</code> as enclosure and <code>\</code> as escape characters. Please note the additional explanation of <a href="#video-metadata">video metadata</a> below. The following columns are supported (multiple synonyms exist for some colums, including the standard proposed in <a href="#ref1">[1]</a>):
+            In this case you can upload a metadata file. By default, BIIGLE supports a simple CSV file format for file metadata. More file formats supported by this instance may be found <a href="#additional-formats">below</a>.
+        </p>
+        <p>
+            The CSV file should use <code>,</code> as delimiter, <code>&quot;</code> as enclosure and <code>\</code> as escape characters. Please note the additional explanation of <a href="#video-metadata">video metadata</a> below. The following columns are supported (multiple synonyms exist for some colums, including the standard proposed in <a href="#ref1">[1]</a>):
         </p>
         <table class="table">
             <thead>
@@ -117,13 +120,13 @@
 image_2.png,2016-12-19 17:09:31,52.215,28.501,-1502.5,28.25,2.1
 </pre>
         <p>
-            The metadata CSV file can be uploaded when a new volume is created. For existing volumes, metadata can be uploaded by volume admins on the volume edit page that you can reach with the <button class="btn btn-default btn-xs"><span class="fa fa-pencil-alt" aria-hidden="true"></span></button> button of the volume overview.
+            The metadata CSV file can be uploaded when a new volume is created. For existing volumes, metadata can be uploaded by volume admins on the volume edit page that you can reach with the <button class="btn btn-default btn-xs"><span class="fa fa-pencil-alt" aria-hidden="true"></span></button> button of the volume overview. This will replace any previously imported metadata.
         </p>
     </div>
     <div class="row">
         <h3><a name="video-metadata"></a>Video metadata</h3>
         <p>
-            Video metadata can be imported in the "basic" or the "timestamped" form. The basic form is equivalent to image metadata where a video file can have at most one entry in the metadata CSV file. The timestamped form requires the <code>taken_at</code> column and allows to import many metadata values for different times of the same video. To import timestamped video metadata, add multiple rows with the same filename but different <code>taken_at</code> timestamp to the metadata CSV. Metadata will be ordered by timestamp and the earliest timestamp will be assumed to mark the beginning of the video.
+            Video metadata can be imported either in the "basic" or the "timestamped" form. The basic form is equivalent to image metadata where a video file can have at most one entry in the metadata CSV file. The timestamped form requires the <code>taken_at</code> column and allows to import many metadata values for different times of the same video. To import timestamped video metadata, add multiple rows with the same filename but different <code>taken_at</code> timestamp to the metadata CSV. Metadata will be ordered by timestamp and the earliest timestamp will be assumed to mark the beginning of the video.
         </p>
         <p>
             Example:
@@ -133,26 +136,18 @@
 video_1.mp4,2016-12-19 17:09:00,52.112,28.001,-1500.5,30.25,2.6
 video_1.mp4,2016-12-19 17:10:00,52.122,28.011,-1505.5,25.0,5.5
 </pre>
-        <p>
-            Video metadata can be updated using the metadata upload of the volume edit page. Videos having "basic" metadata cannot be updated with "timestamped" metadata and vice versa. Timestamped metadata is merged with the information of the new CSV file if the <code>taken_at</code> timestamps of a video do not match exactly. For example, if a video already has the metadata of the example CSV shown above and now the following metadata file is uploaded:
-        </p>
-        <pre>
-filename,taken_at,lng,lat
-video_1.mp4,2016-12-19 17:09:00,52.115,28.003
-video_1.mp4,2016-12-19 17:09:30,52.118,28.005
-</pre>
-        <p>
-            The metadata of the video will be merged as follows:
-        </p>
-        <pre>
-filename,taken_at,lng,lat,gps_altitude,distance_to_ground,area
-video_1.mp4,2016-12-19 17:09:00,52.115,28.003,-1500.5,30.25,2.6
-video_1.mp4,2016-12-19 17:09:30,52.118,28.005,null,null,null
-video_1.mp4,2016-12-19 17:10:00,52.122,28.011,-1505.5,25.0,5.5
-</pre>
-        <p>
-            Note that the existing metadata with the same timestamp is updated with new metadata in the <code>lng</code> and <code>lat</code> fields. If metadata is missing for a timestamp, <code>null</code> is inserted.
-        </p>
+    </div>
+    <div class="row">
+        <h3><a name="additional-formats"></a>Additional metadata file formats</h3>
+        @if (empty(app('modules')->getViewMixins('metadataParsers')))
+            <p class="text-muted">
+                No additional file formats are supported.
+            </p>
+        @else
+            <ul>
+                @mixin('metadataParsers')
+            </ul>
+        @endif
     </div>
     <div class="row">
         <h3>References</h3>

From 92fc963454f75fbfeab3e769fb88c571e5f7593b Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 12 Apr 2024 17:04:24 +0200
Subject: [PATCH 103/209] WIP Start to implement explicit metadata parser
 specification

---
 .../Api/PendingVolumeController.php           |  7 ++-
 .../Api/ProjectVolumeController.php           |  1 +
 .../Api/Volumes/MetadataController.php        |  2 +
 app/Http/Requests/StorePendingVolume.php      | 17 ++++--
 app/Http/Requests/StoreVolume.php             | 23 ++++++--
 app/Http/Requests/StoreVolumeMetadata.php     | 14 +++--
 app/PendingVolume.php                         |  1 +
 .../MetadataParsing/ParserFactory.php         | 19 ++-----
 app/Traits/HasMetadataFile.php                |  7 +--
 app/Volume.php                                |  1 +
 ...06_143800_create_pending_volumes_table.php | 10 ++--
 .../Api/PendingVolumeControllerTest.php       | 45 ++++++++++++++++
 .../Api/ProjectVolumeControllerTest.php       |  8 +++
 .../Api/Volumes/MetadataControllerTest.php    | 54 ++++++++++++++++---
 tests/php/Jobs/CloneImagesOrVideosTest.php    |  3 ++
 tests/php/Jobs/UpdateVolumeMetadataTest.php   |  9 ++++
 tests/php/PendingVolumeTest.php               |  3 ++
 .../MetadataParsing/ParserFactoryTest.php     |  5 ++
 tests/php/VolumeTest.php                      |  2 +
 19 files changed, 188 insertions(+), 43 deletions(-)

diff --git a/app/Http/Controllers/Api/PendingVolumeController.php b/app/Http/Controllers/Api/PendingVolumeController.php
index 8dc2acb24..c04a28809 100644
--- a/app/Http/Controllers/Api/PendingVolumeController.php
+++ b/app/Http/Controllers/Api/PendingVolumeController.php
@@ -34,7 +34,8 @@ class PendingVolumeController extends Controller
      *
      * @apiParam (Required attributes) {String} media_type The media type of the new volume (`image` or `video`).
      *
-     * @apiParam (Optional attributes) {File} metadata_file A file with volume and image/video metadata. By default, this can be a CSV. See "metadata columns" for the possible columns. Each column may occur only once. There must be at least one column other than `filename`. For video metadata, multiple rows can contain metadata from different times of the same video. In this case, the `filename` of the rows must match and each row needs a (different) `taken_at` timestamp. Other file formats may be supported through modules.
+     * @apiParam (Optional attributes) {File} metadata_file A file with volume and image/video metadata. By default, this can be a CSV. See "metadata columns" for the possible columns. Each column may occur only once. There must be at least one column other than `filename`. For video metadata, multiple rows can contain metadata from different times of the same video. In this case, the `filename` of the rows must match and each row needs a (different) `taken_at` timestamp. Other file formats may be supported through modules. This attribute is required if `metadata_parser` is specified.
+     * @apiParam (Optional attributes) {String} metadata_parser The class namespace of the metadata parser to use. The default CSV parsers are: `Biigle\Services\MetadataParsing\ImageCsvParser` and `Biigle\Services\MetadataParsing\VideoCsvParser`. This attribute is required if `metadata_file` is specified.
      *
      * @apiParam (metadata columns) {String} filename The filename of the file the metadata belongs to. This column is required.
      * @apiParam (metadata columns) {String} taken_at The date and time where the file was taken. Example: `2016-12-19 12:49:00`
@@ -60,6 +61,7 @@ public function store(StorePendingVolume $request)
         $pv = $request->project->pendingVolumes()->create([
             'media_type_id' => $request->input('media_type_id'),
             'user_id' => $request->user()->id,
+            'metadata_parser' => $request->input('metadata_parser', null),
         ]);
 
         if ($request->has('metadata_file')) {
@@ -124,7 +126,8 @@ public function update(UpdatePendingVolume $request)
 
             if ($pv->hasMetadata()) {
                 $volume->update([
-                    'metadata_file_path' => $volume->id.'.'.pathinfo($pv->metadata_file_path, PATHINFO_EXTENSION)
+                    'metadata_file_path' => $volume->id.'.'.pathinfo($pv->metadata_file_path, PATHINFO_EXTENSION),
+                    'metadata_parser' => $pv->metadata_parser,
                 ]);
                 $stream = Storage::disk(config('volumes.pending_metadata_storage_disk'))
                     ->readStream($pv->metadata_file_path);
diff --git a/app/Http/Controllers/Api/ProjectVolumeController.php b/app/Http/Controllers/Api/ProjectVolumeController.php
index 415897dd9..fc6c90cea 100644
--- a/app/Http/Controllers/Api/ProjectVolumeController.php
+++ b/app/Http/Controllers/Api/ProjectVolumeController.php
@@ -106,6 +106,7 @@ public function store(StoreVolume $request)
             $volume->url = $request->input('url');
             $volume->media_type_id = $request->input('media_type_id');
             $volume->handle = $request->input('handle');
+            $volume->metadata_parser = $request->metadataParser;
             $volume->creator()->associate($request->user());
             $volume->save();
             $request->project->volumes()->attach($volume);
diff --git a/app/Http/Controllers/Api/Volumes/MetadataController.php b/app/Http/Controllers/Api/Volumes/MetadataController.php
index c43224450..3fd392921 100644
--- a/app/Http/Controllers/Api/Volumes/MetadataController.php
+++ b/app/Http/Controllers/Api/Volumes/MetadataController.php
@@ -61,6 +61,7 @@ public function show($id)
      * @apiParam {Number} id The volume ID.
      *
      * @apiParam (attributes) {File} file A file with volume and image/video metadata. By default, this can be a CSV. See "metadata columns" for the possible columns. Each column may occur only once. There must be at least one column other than `filename`. For video metadata, multiple rows can contain metadata from different times of the same video. In this case, the `filename` of the rows must match and each row needs a (different) `taken_at` timestamp. Other file formats may be supported through modules.
+     * @apiParam (attributes) {String} parser The class namespace of the metadata parser to use. The default CSV parsers are: `Biigle\Services\MetadataParsing\ImageCsvParser` and `Biigle\Services\MetadataParsing\VideoCsvParser`.
      *
      * @apiParam (metadata columns) {String} filename The filename of the file the metadata belongs to. This column is required.
      * @apiParam (metadata columns) {String} taken_at The date and time where the file was taken. Example: `2016-12-19 12:49:00`
@@ -80,6 +81,7 @@ public function store(StoreVolumeMetadata $request)
         // is not guaranteed that the file is overwritten.
         $request->volume->deleteMetadata();
         $request->volume->saveMetadata($request->file('file'));
+        $request->volume->update(['metadata_parser' => $request->input('metadata_parser')]);
         Queue::push(new UpdateVolumeMetadata($request->volume));
     }
 
diff --git a/app/Http/Requests/StorePendingVolume.php b/app/Http/Requests/StorePendingVolume.php
index 1e7da492c..5b9d6eb01 100644
--- a/app/Http/Requests/StorePendingVolume.php
+++ b/app/Http/Requests/StorePendingVolume.php
@@ -32,8 +32,12 @@ public function rules(): array
 
         $rules = [
             'media_type' => ['required', Rule::in(array_keys(MediaType::INSTANCES))],
+            'metadata_parser' => [
+                'required_with:metadata_file',
+            ],
             // Allow a maximum of 500 MB.
             'metadata_file' => [
+                'required_with:metadata_parser',
                 'file',
                 'max:500000',
             ],
@@ -70,9 +74,16 @@ public function withValidator($validator)
 
             if ($file = $this->file('metadata_file')) {
                 $type = $this->input('media_type');
-                $parser = ParserFactory::getParserForFile($file, $type);
-                if (is_null($parser)) {
-                    $validator->errors()->add('metadata_file', 'Unknown metadata file format for this media type.');
+                $parserClass = $this->input('metadata_parser');
+
+                if (!ParserFactory::has($type, $parserClass)) {
+                    $validator->errors()->add('metadata_parser', 'Unknown metadata parser for this media type.');
+                    return;
+                }
+
+                $parser = new $parserClass($file);
+                if (!$parser->recognizesFile()) {
+                    $validator->errors()->add('metadata_file', 'Unknown metadata file format.');
                     return;
                 }
 
diff --git a/app/Http/Requests/StoreVolume.php b/app/Http/Requests/StoreVolume.php
index 5428dece1..9034a7076 100644
--- a/app/Http/Requests/StoreVolume.php
+++ b/app/Http/Requests/StoreVolume.php
@@ -9,7 +9,8 @@
 use Biigle\Rules\VideoMetadata;
 use Biigle\Rules\VolumeFiles;
 use Biigle\Rules\VolumeUrl;
-use Biigle\Services\MetadataParsing\ParserFactory;
+use Biigle\Services\MetadataParsing\ImageCsvParser;
+use Biigle\Services\MetadataParsing\VideoCsvParser;
 use Biigle\Volume;
 use File;
 use Illuminate\Foundation\Http\FormRequest;
@@ -25,6 +26,13 @@ class StoreVolume extends FormRequest
      */
     public $project;
 
+    /**
+     * Class name of the metadata parser that should be used.
+     *
+     * @var string|null
+     */
+    public $metadataParser = null;
+
     /**
      * Filled if an uploaded metadata text was stored in a file.
      *
@@ -100,9 +108,16 @@ public function withValidator($validator)
 
             if ($file = $this->file('metadata_csv')) {
                 $type = $this->input('media_type');
-                $parser = ParserFactory::getParserForFile($file, $type);
-                if (is_null($parser)) {
-                    $validator->errors()->add('metadata', 'Unknown metadata file format for this media type.');
+
+                $parser = match ($type) {
+                    'video' => new VideoCsvParser($file),
+                    default => new ImageCsvParser($file),
+                };
+
+                $this->metadataParser = get_class($parser);
+
+                if (!$parser->recognizesFile()) {
+                    $validator->errors()->add('metadata_file', 'Unknown metadata file format.');
                     return;
                 }
 
diff --git a/app/Http/Requests/StoreVolumeMetadata.php b/app/Http/Requests/StoreVolumeMetadata.php
index 81779a484..d1d12bb26 100644
--- a/app/Http/Requests/StoreVolumeMetadata.php
+++ b/app/Http/Requests/StoreVolumeMetadata.php
@@ -40,6 +40,7 @@ public function rules()
         $mimeTypes = ParserFactory::getKnownMimeTypes($type);
 
         return [
+            'parser' => 'required',
             'file' => [
                 'required',
                 'file',
@@ -63,9 +64,16 @@ public function withValidator($validator)
             }
 
             $type = $this->volume->isImageVolume() ? 'image' : 'video';
-            $parser = ParserFactory::getParserForFile($this->file('file'), $type);
-            if (is_null($parser)) {
-                $validator->errors()->add('file', 'Unknown metadata file format for this media type.');
+            $parserClass = $this->input('parser');
+
+            if (!ParserFactory::has($type, $parserClass)) {
+                $validator->errors()->add('parser', 'Unknown metadata parser for this media type.');
+                return;
+            }
+
+            $parser = new $parserClass($this->file('file'));
+            if (!$parser->recognizesFile()) {
+                $validator->errors()->add('file', 'Unknown metadata file format.');
                 return;
             }
 
diff --git a/app/PendingVolume.php b/app/PendingVolume.php
index 6c852ad90..4705d124c 100644
--- a/app/PendingVolume.php
+++ b/app/PendingVolume.php
@@ -21,6 +21,7 @@ class PendingVolume extends Model
         'user_id',
         'project_id',
         'metadata_file_path',
+        'metadata_parser',
         'volume_id',
         'import_annotations',
         'import_file_labels',
diff --git a/app/Services/MetadataParsing/ParserFactory.php b/app/Services/MetadataParsing/ParserFactory.php
index be34d5d9c..7b23b1622 100644
--- a/app/Services/MetadataParsing/ParserFactory.php
+++ b/app/Services/MetadataParsing/ParserFactory.php
@@ -3,7 +3,6 @@
 namespace Biigle\Services\MetadataParsing;
 
 use Exception;
-use SplFileInfo;
 
 class ParserFactory
 {
@@ -17,23 +16,11 @@ class ParserFactory
     ];
 
     /**
-     * Get the first parser that recognizes the file.
+     * Check if the metadata parser exists for the given type.
      */
-    public static function getParserForFile(SplFileInfo $file, string $type): ?MetadataParser
+    public static function has(string $type, string $class): bool
     {
-        if (isset(static::$mockParser)) {
-            return static::$mockParser;
-        }
-
-        $parsers = self::$parsers[$type] ?? [];
-        foreach ($parsers as $parserClass) {
-            $parser = new $parserClass($file);
-            if ($parser->recognizesFile()) {
-                return $parser;
-            }
-        }
-
-        return null;
+        return in_array($class, static::$parsers[$type] ?? []);
     }
 
     /**
diff --git a/app/Traits/HasMetadataFile.php b/app/Traits/HasMetadataFile.php
index aa2218d30..befd72514 100644
--- a/app/Traits/HasMetadataFile.php
+++ b/app/Traits/HasMetadataFile.php
@@ -3,7 +3,6 @@
 namespace Biigle\Traits;
 
 use Biigle\MediaType;
-use Biigle\Services\MetadataParsing\ParserFactory;
 use Biigle\Services\MetadataParsing\VolumeMetadata;
 use Cache;
 use Illuminate\Http\UploadedFile;
@@ -49,10 +48,8 @@ public function getMetadata(): ?VolumeMetadata
                 $to = fopen($tmpPath, 'w');
                 stream_copy_to_stream($from, $to);
                 $type = ($this->media_type_id === MediaType::imageId()) ? 'image' : 'video';
-                $parser = ParserFactory::getParserForFile(new SplFileInfo($tmpPath), $type);
-                if (is_null($parser)) {
-                    return null;
-                }
+
+                $parser = new $this->metadata_parser(new SplFileInfo($tmpPath));
 
                 return $parser->getMetadata();
             } finally {
diff --git a/app/Volume.php b/app/Volume.php
index 98244a5f8..400d58834 100644
--- a/app/Volume.php
+++ b/app/Volume.php
@@ -50,6 +50,7 @@ class Volume extends Model
         'handle',
         'creator_id',
         'metadata_file_path',
+        'metadata_parser',
     ];
 
     /**
diff --git a/database/migrations/2024_03_06_143800_create_pending_volumes_table.php b/database/migrations/2024_03_06_143800_create_pending_volumes_table.php
index 5f2af385a..4286c5d16 100644
--- a/database/migrations/2024_03_06_143800_create_pending_volumes_table.php
+++ b/database/migrations/2024_03_06_143800_create_pending_volumes_table.php
@@ -34,9 +34,6 @@ public function up(): void
                 ->constrained()
                 ->onDelete('cascade');
 
-            // Path of the file in the pending_metadata_storage_disk.
-            $table->string('metadata_file_path', 256)->nullable();
-
             // Specify if the pending volume should be used to import annotations.
             $table->boolean('import_annotations')->default(false);
 
@@ -47,6 +44,11 @@ public function up(): void
             // pending volume.
             $table->boolean('importing')->default(false);
 
+            // Path of the file in the pending_metadata_storage_disk.
+            $table->string('metadata_file_path', 256)->nullable();
+            // Class name of the metadata parser for the metadata file.
+            $table->string('metadata_parser', 256)->nullable();
+
             // Used to filter the imported annotations.
             $table->jsonb('only_annotation_labels')->nullable();
             // Used to filter the imported file labels.
@@ -63,6 +65,7 @@ public function up(): void
 
         Schema::table('volumes', function (Blueprint $table) {
             $table->string('metadata_file_path', 256)->nullable();
+            $table->string('metadata_parser', 256)->nullable();
         });
     }
 
@@ -73,6 +76,7 @@ public function down(): void
     {
         Schema::table('volumes', function (Blueprint $table) {
             $table->dropColumn('metadata_file_path');
+            $table->dropColumn('metadata_parser');
         });
 
         Schema::dropIfExists('pending_volumes');
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
index 510e4bb51..9c36a4919 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeControllerTest.php
@@ -6,6 +6,8 @@
 use Biigle\Jobs\CreateNewImagesOrVideos;
 use Biigle\MediaType;
 use Biigle\PendingVolume;
+use Biigle\Services\MetadataParsing\ImageCsvParser;
+use Biigle\Services\MetadataParsing\VideoCsvParser;
 use Biigle\Volume;
 use Exception;
 use FileCache;
@@ -73,10 +75,12 @@ public function testStoreImageWithFile()
         $this->beAdmin();
         $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
             'media_type' => 'image',
+            'metadata_parser' => ImageCsvParser::class,
             'metadata_file' => $file,
         ])->assertStatus(201);
 
         $pv = PendingVolume::where('project_id', $id)->first();
+        $this->assertEquals(ImageCsvParser::class, $pv->metadata_parser);
         $this->assertNotNull($pv->metadata_file_path);
         $disk->assertExists($pv->metadata_file_path);
     }
@@ -91,6 +95,7 @@ public function testStoreImageWithFileUnknown()
         $this->beAdmin();
         $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
             'media_type' => 'image',
+            'metadata_parser' => ImageCsvParser::class,
             'metadata_file' => $file,
         ])->assertStatus(422);
     }
@@ -105,6 +110,22 @@ public function testStoreImageWithFileInvalid()
         $this->beAdmin();
         $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
             'media_type' => 'image',
+            'metadata_parser' => ImageCsvParser::class,
+            'metadata_file' => $file,
+        ])->assertStatus(422);
+    }
+
+    public function testStoreImageWithParserUnknown()
+    {
+        $disk = Storage::fake('pending-metadata');
+        $csv = __DIR__."/../../../../files/image-metadata.csv";
+        $file = new UploadedFile($csv, 'metadata.csv', 'text/csv', null, true);
+
+        $id = $this->project()->id;
+        $this->beAdmin();
+        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
+            'media_type' => 'image',
+            'metadata_parser' => 'my-parser',
             'metadata_file' => $file,
         ])->assertStatus(422);
     }
@@ -119,10 +140,12 @@ public function testStoreVideoWithFile()
         $this->beAdmin();
         $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
             'media_type' => 'video',
+            'metadata_parser' => VideoCsvParser::class,
             'metadata_file' => $file,
         ])->assertStatus(201);
 
         $pv = PendingVolume::where('project_id', $id)->first();
+        $this->assertEquals(VideoCsvParser::class, $pv->metadata_parser);
         $this->assertNotNull($pv->metadata_file_path);
         $disk->assertExists($pv->metadata_file_path);
     }
@@ -137,6 +160,7 @@ public function testStoreVideoWithFileUnknown()
         $this->beAdmin();
         $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
             'media_type' => 'video',
+            'metadata_parser' => VideoCsvParser::class,
             'metadata_file' => $file,
         ])->assertStatus(422);
     }
@@ -151,6 +175,22 @@ public function testStoreVideoWithFileInvalid()
         $this->beAdmin();
         $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
             'media_type' => 'video',
+            'metadata_parser' => VideoCsvParser::class,
+            'metadata_file' => $file,
+        ])->assertStatus(422);
+    }
+
+    public function testStoreVideoWithParserUnknown()
+    {
+        $disk = Storage::fake('pending-metadata');
+        $csv = __DIR__."/../../../../files/video-metadata.csv";
+        $file = new UploadedFile($csv, 'metadata.csv', 'text/csv', null, true);
+
+        $id = $this->project()->id;
+        $this->beAdmin();
+        $this->json('POST', "/api/v1/projects/{$id}/pending-volumes", [
+            'media_type' => 'video',
+            'metadata_parser' => 'my-parser',
             'metadata_file' => $file,
         ])->assertStatus(422);
     }
@@ -286,6 +326,7 @@ public function testUpdateImagesWithMetadata()
             'media_type_id' => MediaType::imageId(),
             'user_id' => $this->admin()->id,
             'metadata_file_path' => 'mymeta.csv',
+            'metadata_parser' => ImageCsvParser::class,
         ]);
         $id = $pv->id;
         $pendingMetaDisk->put('mymeta.csv', 'abc');
@@ -301,6 +342,7 @@ public function testUpdateImagesWithMetadata()
         ])->assertSuccessful();
 
         $volume = $this->project()->volumes()->first();
+        $this->assertEquals(ImageCsvParser::class, $volume->metadata_parser);
         $this->assertTrue($volume->hasMetadata());
         $metaDisk->assertExists($volume->metadata_file_path);
         $pendingMetaDisk->assertMissing($pv->metadata_file_path);
@@ -317,6 +359,7 @@ public function testUpdateImportAnnotations()
             'media_type_id' => MediaType::imageId(),
             'user_id' => $this->admin()->id,
             'metadata_file_path' => 'mymeta.csv',
+            'metadata_parser' => ImageCsvParser::class,
         ]);
         $id = $pv->id;
         $pendingMetaDisk->put('mymeta.csv', 'abc');
@@ -350,6 +393,7 @@ public function testUpdateImportFileLabels()
             'media_type_id' => MediaType::imageId(),
             'user_id' => $this->admin()->id,
             'metadata_file_path' => 'mymeta.csv',
+            'metadata_parser' => ImageCsvParser::class,
         ]);
         $id = $pv->id;
         $pendingMetaDisk->put('mymeta.csv', 'abc');
@@ -714,6 +758,7 @@ public function testUpdateVideosWithMetadata()
             'media_type_id' => MediaType::videoId(),
             'user_id' => $this->admin()->id,
             'metadata_file_path' => 'mymeta.csv',
+            'metadata_parser' => VideoCsvParser::class,
         ]);
         $id = $pv->id;
         $pendingMetaDisk->put('mymeta.csv', 'abc');
diff --git a/tests/php/Http/Controllers/Api/ProjectVolumeControllerTest.php b/tests/php/Http/Controllers/Api/ProjectVolumeControllerTest.php
index d819e5850..98503fa8e 100644
--- a/tests/php/Http/Controllers/Api/ProjectVolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/ProjectVolumeControllerTest.php
@@ -7,6 +7,8 @@
 use Biigle\Jobs\CreateNewImagesOrVideos;
 use Biigle\Jobs\DeleteVolume;
 use Biigle\Role;
+use Biigle\Services\MetadataParsing\ImageCsvParser;
+use Biigle\Services\MetadataParsing\VideoCsvParser;
 use Biigle\Tests\ProjectTest;
 use Biigle\Tests\VolumeTest;
 use Biigle\Video;
@@ -448,6 +450,7 @@ public function testStoreEmptyImageMetadataText()
 
         $volume = $this->project()->volumes()->first();
         $this->assertNull($volume->metadata_file_path);
+        $this->assertNull($volume->metadata_parser);
     }
 
     public function testStoreImageMetadataText()
@@ -470,6 +473,7 @@ public function testStoreImageMetadataText()
 
         $volume = Volume::orderBy('id', 'desc')->first();
         $this->assertNotNull($volume->metadata_file_path);
+        $this->assertEquals(ImageCsvParser::class, $volume->metadata_parser);
     }
 
     public function testStoreImageMetadataCsv()
@@ -493,6 +497,7 @@ public function testStoreImageMetadataCsv()
 
         $volume = Volume::orderBy('id', 'desc')->first();
         $this->assertNotNull($volume->metadata_file_path);
+        $this->assertEquals(ImageCsvParser::class, $volume->metadata_parser);
     }
 
     public function testStoreImageMetadataInvalid()
@@ -532,6 +537,7 @@ public function testStoreEmptyVideoMetadataText()
 
         $volume = $this->project()->volumes()->first();
         $this->assertNull($volume->metadata_file_path);
+        $this->assertNull($volume->metadata_parser);
     }
 
     public function testStoreVideoMetadataText()
@@ -554,6 +560,7 @@ public function testStoreVideoMetadataText()
 
         $volume = Volume::orderBy('id', 'desc')->first();
         $this->assertNotNull($volume->metadata_file_path);
+        $this->assertEquals(VideoCsvParser::class, $volume->metadata_parser);
     }
 
     public function testStoreVideoMetadataCsv()
@@ -579,6 +586,7 @@ public function testStoreVideoMetadataCsv()
 
         $volume = Volume::orderBy('id', 'desc')->first();
         $this->assertNotNull($volume->metadata_file_path);
+        $this->assertEquals(VideoCsvParser::class, $volume->metadata_parser);
     }
 
     public function testStoreVideoMetadataInvalid()
diff --git a/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php b/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php
index d19573602..a8e9c44a2 100644
--- a/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php
+++ b/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php
@@ -5,6 +5,8 @@
 use ApiTestCase;
 use Biigle\Jobs\UpdateVolumeMetadata;
 use Biigle\MediaType;
+use Biigle\Services\MetadataParsing\ImageCsvParser;
+use Biigle\Services\MetadataParsing\VideoCsvParser;
 use Illuminate\Http\UploadedFile;
 use Queue;
 use Storage;
@@ -55,15 +57,30 @@ public function testStoreImageMetadata()
         $csv = new UploadedFile(__DIR__."/../../../../../files/image-metadata.csv", 'image-metadata.csv', 'text/csv', null, true);
         $this->beEditor();
         // no permissions
-        $this->postJson("/api/v1/volumes/{$id}/metadata", ['file' => $csv])
+        $this->postJson("/api/v1/volumes/{$id}/metadata", [
+            'file' => $csv,
+            'parser' => ImageCsvParser::class,
+        ])
             ->assertStatus(403);
 
         $this->beAdmin();
         // file required
-        $this->postJson("/api/v1/volumes/{$id}/metadata")->assertStatus(422);
+        $this->postJson("/api/v1/volumes/{$id}/metadata", [
+            'parser' => ImageCsvParser::class,
+        ])
+            ->assertStatus(422);
+
+        // parser required
+        $this->postJson("/api/v1/volumes/{$id}/metadata", [
+            'file' => $csv,
+        ])
+            ->assertStatus(422);
 
 
-        $this->postJson("/api/v1/volumes/{$id}/metadata", ['file' => $csv])
+        $this->postJson("/api/v1/volumes/{$id}/metadata", [
+            'file' => $csv,
+            'parser' => ImageCsvParser::class,
+        ])
             ->assertStatus(200);
 
         Queue::assertPushed(UpdateVolumeMetadata::class, function ($job) {
@@ -78,7 +95,22 @@ public function testStoreImageMetadataInvalid()
         $id = $this->volume()->id;
         $csv = new UploadedFile(__DIR__."/../../../../../files/image-metadata-invalid.csv", 'image-metadata-invalid.csv', 'text/csv', null, true);
         $this->beAdmin();
-        $this->postJson("/api/v1/volumes/{$id}/metadata", ['file' => $csv])
+        $this->postJson("/api/v1/volumes/{$id}/metadata", [
+            'file' => $csv,
+            'parser' => ImageCsvParser::class,
+        ])
+            ->assertStatus(422);
+    }
+
+    public function testStoreImageMetadataUnknown()
+    {
+        $id = $this->volume()->id;
+        $csv = new UploadedFile(__DIR__."/../../../../../files/image-metadata.csv", 'image-metadata.csv', 'text/csv', null, true);
+        $this->beAdmin();
+        $this->postJson("/api/v1/volumes/{$id}/metadata", [
+            'file' => $csv,
+            'parser' => 'unknown',
+        ])
             ->assertStatus(422);
     }
 
@@ -92,7 +124,10 @@ public function testStoreVideoMetadataCsv()
         $csv = new UploadedFile(__DIR__."/../../../../../files/video-metadata.csv", 'metadata.csv', 'text/csv', null, true);
 
         $this->beAdmin();
-        $this->postJson("/api/v1/volumes/{$id}/metadata", ['file' => $csv])
+        $this->postJson("/api/v1/volumes/{$id}/metadata", [
+            'file' => $csv,
+            'parser' => VideoCsvParser::class,
+        ])
             ->assertSuccessful();
 
         Queue::assertPushed(UpdateVolumeMetadata::class, function ($job) {
@@ -109,7 +144,10 @@ public function testStoreMetadataIncorrectEncoding()
         $csv = new UploadedFile(__DIR__."/../../../../../files/image-metadata-strange-encoding.csv", 'metadata.csv', 'text/csv', null, true);
 
         $this->beAdmin();
-        $this->postJson("/api/v1/volumes/{$id}/metadata", ['file' => $csv])
+        $this->postJson("/api/v1/volumes/{$id}/metadata", [
+            'file' => $csv,
+            'parser' => ImageCsvParser::class,
+        ])
             ->assertStatus(422);
     }
 
@@ -133,6 +171,8 @@ public function testDestroy()
         $this->deleteJson("/api/v1/volumes/{$id}/metadata")
             ->assertSuccessful();
 
-        $this->assertFalse($volume->fresh()->hasMetadata());
+        $volume->refresh();
+        $this->assertFalse($volume->hasMetadata());
+        $this->assertNull($volume->parser);
     }
 }
diff --git a/tests/php/Jobs/CloneImagesOrVideosTest.php b/tests/php/Jobs/CloneImagesOrVideosTest.php
index e016c605f..167a44ffe 100644
--- a/tests/php/Jobs/CloneImagesOrVideosTest.php
+++ b/tests/php/Jobs/CloneImagesOrVideosTest.php
@@ -8,6 +8,7 @@
 use Biigle\MediaType;
 use Biigle\Modules\Largo\Jobs\ProcessAnnotatedImage;
 use Biigle\Modules\Largo\Jobs\ProcessAnnotatedVideo;
+use Biigle\Services\MetadataParsing\ImageCsvParser;
 use Biigle\Tests\ImageAnnotationLabelTest;
 use Biigle\Tests\ImageAnnotationTest;
 use Biigle\Tests\ImageLabelTest;
@@ -580,6 +581,7 @@ public function testCloneVolumeMetadataFile()
             'media_type_id' => MediaType::imageId(),
             'created_at' => '2022-11-09 14:37:00',
             'updated_at' => '2022-11-09 14:37:00',
+            'metadata_parser' => ImageCsvParser::class,
         ])->fresh();
 
         $copy = $volume->replicate();
@@ -602,6 +604,7 @@ public function testCloneVolumeMetadataFile()
 
         $this->assertTrue($copy->hasMetadata());
         $this->assertNotNull($copy->getMetadata());
+        $this->assertEquals(ImageCsvParser::class, $copy->metadata_parser);
     }
 
     public function testHandleVolumeImages()
diff --git a/tests/php/Jobs/UpdateVolumeMetadataTest.php b/tests/php/Jobs/UpdateVolumeMetadataTest.php
index 4d94ece3f..d010edc2c 100644
--- a/tests/php/Jobs/UpdateVolumeMetadataTest.php
+++ b/tests/php/Jobs/UpdateVolumeMetadataTest.php
@@ -5,6 +5,8 @@
 use Biigle\Image;
 use Biigle\Jobs\UpdateVolumeMetadata;
 use Biigle\MediaType;
+use Biigle\Services\MetadataParsing\ImageCsvParser;
+use Biigle\Services\MetadataParsing\VideoCsvParser;
 use Biigle\Video;
 use Biigle\Volume;
 use Carbon\Carbon;
@@ -18,6 +20,7 @@ public function testHandleImageAdd()
         $volume = Volume::factory()->create([
             'media_type_id' => MediaType::imageId(),
             'metadata_file_path' => 'mymeta.csv',
+            'metadata_parser' => ImageCsvParser::class,
         ]);
 
         $image = Image::factory()->create([
@@ -55,6 +58,7 @@ public function testHandleImageUpdate()
         $volume = Volume::factory()->create([
             'media_type_id' => MediaType::imageId(),
             'metadata_file_path' => 'mymeta.csv',
+            'metadata_parser' => ImageCsvParser::class,
         ]);
 
         $image = Image::factory()->create([
@@ -98,6 +102,7 @@ public function testHandleImageMerge()
         $volume = Volume::factory()->create([
             'media_type_id' => MediaType::imageId(),
             'metadata_file_path' => 'mymeta.csv',
+            'metadata_parser' => ImageCsvParser::class,
         ]);
 
         $image = Image::factory()->create([
@@ -138,6 +143,7 @@ public function testHandleVideoAdd()
         $volume = Volume::factory()->create([
             'media_type_id' => MediaType::videoId(),
             'metadata_file_path' => 'mymeta.csv',
+            'metadata_parser' => VideoCsvParser::class,
         ]);
 
         $video = Video::factory()->create([
@@ -172,6 +178,7 @@ public function testHandleVideoUpdate()
         $volume = Volume::factory()->create([
             'media_type_id' => MediaType::videoId(),
             'metadata_file_path' => 'mymeta.csv',
+            'metadata_parser' => VideoCsvParser::class,
         ]);
 
         $video = Video::factory()->create([
@@ -215,6 +222,7 @@ public function testHandleVideoMergeWithoutTakenAt()
         $volume = Volume::factory()->create([
             'media_type_id' => MediaType::videoId(),
             'metadata_file_path' => 'mymeta.csv',
+            'metadata_parser' => VideoCsvParser::class,
         ]);
 
         $video = Video::factory()->create([
@@ -255,6 +263,7 @@ public function testHandleVideoReplaceWithTakenAt()
         $volume = Volume::factory()->create([
             'media_type_id' => MediaType::videoId(),
             'metadata_file_path' => 'mymeta.csv',
+            'metadata_parser' => VideoCsvParser::class,
         ]);
 
         $video = Video::factory()->create([
diff --git a/tests/php/PendingVolumeTest.php b/tests/php/PendingVolumeTest.php
index 4ebea1688..c4455e8e4 100644
--- a/tests/php/PendingVolumeTest.php
+++ b/tests/php/PendingVolumeTest.php
@@ -3,6 +3,7 @@
 namespace Biigle\Tests;
 
 use Biigle\PendingVolume;
+use Biigle\Services\MetadataParsing\ImageCsvParser;
 use Illuminate\Database\UniqueConstraintViolationException;
 use Illuminate\Http\UploadedFile;
 use ModelTestCase;
@@ -24,6 +25,7 @@ public function testAttributes()
         $this->assertNotNull($this->model->created_at);
         $this->assertNotNull($this->model->updated_at);
         $this->assertNull($this->model->metadata_file_path);
+        $this->assertNull($this->model->metadata_parser);
         $this->assertNull($this->model->volume_id);
         $this->assertFalse($this->model->import_annotations);
         $this->assertFalse($this->model->import_file_labels);
@@ -73,6 +75,7 @@ public function testGetMetadata()
         $disk = Storage::fake('pending-metadata');
         $this->model->metadata_file_path = $this->model->id.'.csv';
         $disk->put($this->model->metadata_file_path, "filename,area\n1.jpg,2.5");
+        $this->model->metadata_parser = ImageCsvParser::class;
         $metadata = $this->model->getMetadata();
         $fileMeta = $metadata->getFile('1.jpg');
         $this->assertEquals(2.5, $fileMeta->area);
diff --git a/tests/php/Services/MetadataParsing/ParserFactoryTest.php b/tests/php/Services/MetadataParsing/ParserFactoryTest.php
index c90090308..62c4da05a 100644
--- a/tests/php/Services/MetadataParsing/ParserFactoryTest.php
+++ b/tests/php/Services/MetadataParsing/ParserFactoryTest.php
@@ -67,6 +67,11 @@ public static function getKnownMimeTypes(): array
         return [];
     }
 
+    public static function getName(): string
+    {
+        return 'Test';
+    }
+
     public function recognizesFile(): bool
     {
         return false;
diff --git a/tests/php/VolumeTest.php b/tests/php/VolumeTest.php
index bdea4bf9e..9461749c8 100644
--- a/tests/php/VolumeTest.php
+++ b/tests/php/VolumeTest.php
@@ -7,6 +7,7 @@
 use Biigle\Image;
 use Biigle\MediaType;
 use Biigle\Role;
+use Biigle\Services\MetadataParsing\ImageCsvParser;
 use Biigle\Volume;
 use Cache;
 use Carbon\Carbon;
@@ -591,6 +592,7 @@ public function testGetMetadata()
         $disk = Storage::fake('metadata');
         $this->model->metadata_file_path = $this->model->id.'.csv';
         $disk->put($this->model->metadata_file_path, "filename,area\n1.jpg,2.5");
+        $this->model->metadata_parser = ImageCsvParser::class;
         $metadata = $this->model->getMetadata();
         $fileMeta = $metadata->getFile('1.jpg');
         $this->assertEquals(2.5, $fileMeta->area);

From 3e2d0a06bd03f1a920f000e642f8c9d6e57e0f61 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Mon, 15 Apr 2024 16:13:20 +0200
Subject: [PATCH 104/209] Fix CS

---
 .../php/Jobs/CreateNewImagesOrVideosTest.php  | 13 ++++++++++
 .../MetadataParsing/ParserFactoryTest.php     | 24 +++++++------------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/tests/php/Jobs/CreateNewImagesOrVideosTest.php b/tests/php/Jobs/CreateNewImagesOrVideosTest.php
index b7c1b00b6..90c72fc54 100644
--- a/tests/php/Jobs/CreateNewImagesOrVideosTest.php
+++ b/tests/php/Jobs/CreateNewImagesOrVideosTest.php
@@ -11,6 +11,9 @@
 use Illuminate\Support\Facades\Queue;
 use Illuminate\Support\Facades\Storage;
 use TestCase;
+use Biigle\Services\MetadataParsing\ImageCsvParser;
+use Biigle\Services\MetadataParsing\VideoCsvParser;
+
 
 class CreateNewImagesOrVideosTest extends TestCase
 {
@@ -67,6 +70,7 @@ public function testHandleImageMetadata()
         $volume = VolumeTest::create([
             'media_type_id' => MediaType::imageId(),
             'metadata_file_path' => 'mymeta.csv',
+            'metadata_parser' => ImageCsvParser::class,
         ]);
         $disk = Storage::fake('metadata');
         $disk->put($volume->metadata_file_path, <<<CSV
@@ -91,6 +95,7 @@ public function testHandleImageMetadataEmptyCells()
         $volume = VolumeTest::create([
             'media_type_id' => MediaType::imageId(),
             'metadata_file_path' => 'mymeta.csv',
+            'metadata_parser' => ImageCsvParser::class,
         ]);
         $disk = Storage::fake('metadata');
         $disk->put($volume->metadata_file_path, <<<CSV
@@ -111,6 +116,7 @@ public function testHandleImageMetadataIncomplete()
         $volume = VolumeTest::create([
             'media_type_id' => MediaType::imageId(),
             'metadata_file_path' => 'mymeta.csv',
+            'metadata_parser' => ImageCsvParser::class,
         ]);
         $disk = Storage::fake('metadata');
         $disk->put($volume->metadata_file_path, <<<CSV
@@ -128,6 +134,7 @@ public function testHandleVideoMetadata()
         $volume = VolumeTest::create([
             'media_type_id' => MediaType::videoId(),
             'metadata_file_path' => 'mymeta.csv',
+            'metadata_parser' => VideoCsvParser::class,
         ]);
         $disk = Storage::fake('metadata');
         $disk->put($volume->metadata_file_path, <<<CSV
@@ -157,6 +164,7 @@ public function testHandleVideoMetadataEmptyCells()
         $volume = VolumeTest::create([
             'media_type_id' => MediaType::videoId(),
             'metadata_file_path' => 'mymeta.csv',
+            'metadata_parser' => VideoCsvParser::class,
         ]);
         $disk = Storage::fake('metadata');
         $disk->put($volume->metadata_file_path, <<<CSV
@@ -177,6 +185,7 @@ public function testHandleVideoMetadataZeroSingle()
         $volume = VolumeTest::create([
             'media_type_id' => MediaType::videoId(),
             'metadata_file_path' => 'mymeta.csv',
+            'metadata_parser' => VideoCsvParser::class,
         ]);
         $disk = Storage::fake('metadata');
         $disk->put($volume->metadata_file_path, <<<CSV
@@ -196,6 +205,7 @@ public function testHandleVideoMetadataZero()
         $volume = VolumeTest::create([
             'media_type_id' => MediaType::videoId(),
             'metadata_file_path' => 'mymeta.csv',
+            'metadata_parser' => VideoCsvParser::class,
         ]);
         $disk = Storage::fake('metadata');
         $disk->put($volume->metadata_file_path, <<<CSV
@@ -216,6 +226,7 @@ public function testHandleVideoMetadataBasic()
         $volume = VolumeTest::create([
             'media_type_id' => MediaType::videoId(),
             'metadata_file_path' => 'mymeta.csv',
+            'metadata_parser' => VideoCsvParser::class,
         ]);
         $disk = Storage::fake('metadata');
         $disk->put($volume->metadata_file_path, <<<CSV
@@ -236,6 +247,7 @@ public function testHandleVideoMetadataIncomplete()
         $volume = VolumeTest::create([
             'media_type_id' => MediaType::videoId(),
             'metadata_file_path' => 'mymeta.csv',
+            'metadata_parser' => VideoCsvParser::class,
         ]);
         $disk = Storage::fake('metadata');
         $disk->put($volume->metadata_file_path, <<<CSV
@@ -253,6 +265,7 @@ public function testHandleMetadataDateParsing()
         $volume = VolumeTest::create([
             'media_type_id' => MediaType::imageId(),
             'metadata_file_path' => 'mymeta.csv',
+            'metadata_parser' => VideoCsvParser::class,
         ]);
         $disk = Storage::fake('metadata');
         $disk->put($volume->metadata_file_path, <<<CSV
diff --git a/tests/php/Services/MetadataParsing/ParserFactoryTest.php b/tests/php/Services/MetadataParsing/ParserFactoryTest.php
index 62c4da05a..30ec5d7ae 100644
--- a/tests/php/Services/MetadataParsing/ParserFactoryTest.php
+++ b/tests/php/Services/MetadataParsing/ParserFactoryTest.php
@@ -12,32 +12,24 @@
 
 class ParserFactoryTest extends TestCase
 {
-    public function testGetParserForFileImage()
+    public function testHasImage()
     {
-        $file = new File(__DIR__."/../../../files/image-metadata.csv");
-        $parser = ParserFactory::getParserForFile($file, 'image');
-        $this->assertInstanceOf(ImageCsvParser::class, $parser);
+        $this->assertTrue(ParserFactory::has('image', ImageCsvParser::class));
     }
 
-    public function testGetParserForFileVideo()
+    public function testHasVideo()
     {
-        $file = new File(__DIR__."/../../../files/video-metadata.csv");
-        $parser = ParserFactory::getParserForFile($file, 'video');
-        $this->assertInstanceOf(VideoCsvParser::class, $parser);
+        $this->assertTrue(ParserFactory::has('video', VideoCsvParser::class));
     }
 
-    public function testGetParserForFileUnknownFile()
+    public function testHasUnknownType()
     {
-        $file = new File(__DIR__."/../../../files/test.mp4");
-        $parser = ParserFactory::getParserForFile($file, 'video');
-        $this->assertNull($parser);
+        $this->assertFalse(ParserFactory::has('unknown', ImageCsvParser::class));
     }
 
-    public function testGetParserForFileUnknownType()
+    public function testHasUnknownParser()
     {
-        $file = new File(__DIR__."/../../../files/image-metadata.csv");
-        $parser = ParserFactory::getParserForFile($file, 'test');
-        $this->assertNull($parser);
+        $this->assertFalse(ParserFactory::has('image', 'unknown'));
     }
 
     public function testExtend()

From 064728d19ee847c47b44fc959ba7605983bd17dd Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Mon, 15 Apr 2024 16:25:23 +0200
Subject: [PATCH 105/209] Implement metadata parser selection in the UI

---
 .../Views/Volumes/VolumeController.php        | 25 ++++++++++++++++---
 app/Http/Requests/StorePendingVolume.php      |  6 ++---
 app/Http/Requests/StoreVolumeMetadata.php     |  6 ++++-
 app/Services/MetadataParsing/CsvParser.php    |  8 ++++++
 .../MetadataParsing/MetadataParser.php        |  7 ++++++
 .../MetadataParsing/ParserFactory.php         | 13 ----------
 .../assets/js/volumes/createFormStep1.vue     | 17 +++++++++++--
 .../assets/js/volumes/metadataUpload.vue      | 16 +++++++-----
 .../views/volumes/create/step1.blade.php      | 20 ++++++++++++---
 resources/views/volumes/edit.blade.php        |  1 +
 .../views/volumes/edit/metadata.blade.php     | 18 ++++++++-----
 .../php/Jobs/CreateNewImagesOrVideosTest.php  |  5 ++--
 .../MetadataParsing/ParserFactoryTest.php     | 11 --------
 13 files changed, 101 insertions(+), 52 deletions(-)

diff --git a/app/Http/Controllers/Views/Volumes/VolumeController.php b/app/Http/Controllers/Views/Volumes/VolumeController.php
index acd531f99..37dd4d42a 100644
--- a/app/Http/Controllers/Views/Volumes/VolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/VolumeController.php
@@ -35,12 +35,21 @@ public function create(Request $request)
 
         $mediaType = old('media_type', 'image');
 
-        $mimeTypes = ParserFactory::getKnownMimeTypes($mediaType);
+        $parsers = collect(ParserFactory::$parsers);
+        foreach ($parsers as $type => $p) {
+            $parsers[$type] = array_map(function ($class) {
+                return [
+                    'parserClass' => $class,
+                    'name' => $class::getName(),
+                    'mimeTypes' => $class::getKnownMimeTypes(),
+                ];
+            }, $p);
+        }
 
         return view('volumes.create.step1', [
             'project' => $project,
             'mediaType' => $mediaType,
-            'mimeTypes' => $mimeTypes,
+            'parsers' => $parsers,
         ]);
     }
 
@@ -104,7 +113,15 @@ public function edit(Request $request, $id)
         $sessions = $volume->annotationSessions()->with('users')->get();
         $projects = $this->getProjects($request->user(), $volume);
         $type = $volume->mediaType->name;
-        $mimeTypes = ParserFactory::getKnownMimeTypes($type);
+
+        $parsers = collect(ParserFactory::$parsers[$type] ?? [])
+            ->map(function ($class) {
+                return [
+                    'parserClass' => $class,
+                    'name' => $class::getName(),
+                    'mimeTypes' => $class::getKnownMimeTypes(),
+                ];
+            });
 
         return view('volumes.edit', [
             'projects' => $projects,
@@ -113,7 +130,7 @@ public function edit(Request $request, $id)
             'annotationSessions' => $sessions,
             'today' => Carbon::today(),
             'type' => $type,
-            'mimeTypes' => $mimeTypes,
+            'parsers' => $parsers,
         ]);
     }
 
diff --git a/app/Http/Requests/StorePendingVolume.php b/app/Http/Requests/StorePendingVolume.php
index 5b9d6eb01..db1098ffd 100644
--- a/app/Http/Requests/StorePendingVolume.php
+++ b/app/Http/Requests/StorePendingVolume.php
@@ -43,9 +43,9 @@ public function rules(): array
             ],
         ];
 
-        if ($this->has('media_type')) {
-            $mimeTypes = ParserFactory::getKnownMimeTypes($this->input('media_type'));
-            $rules['metadata_file'][] = 'mimetypes:'.implode(',', $mimeTypes);
+        $parserClass = $this->input('metadata_parser', false);
+        if ($this->has('media_type') && $parserClass && ParserFactory::has($this->has('media_type'), $parserClass)) {
+            $rules['metadata_file'][] = 'mimetypes:'.implode(',', $parserClass::getKnownMimeTypes());
         }
 
         return $rules;
diff --git a/app/Http/Requests/StoreVolumeMetadata.php b/app/Http/Requests/StoreVolumeMetadata.php
index d1d12bb26..df0753b2d 100644
--- a/app/Http/Requests/StoreVolumeMetadata.php
+++ b/app/Http/Requests/StoreVolumeMetadata.php
@@ -37,7 +37,11 @@ public function authorize()
     public function rules()
     {
         $type = $this->volume->isImageVolume() ? 'image' : 'video';
-        $mimeTypes = ParserFactory::getKnownMimeTypes($type);
+        $parserClass = $this->input('parser', false);
+        $mimeTypes = [];
+        if ($parserClass && ParserFactory::has($type, $parserClass)) {
+            $mimeTypes = $parserClass::getKnownMimeTypes();
+        }
 
         return [
             'parser' => 'required',
diff --git a/app/Services/MetadataParsing/CsvParser.php b/app/Services/MetadataParsing/CsvParser.php
index e93df94b2..eb11e4eda 100644
--- a/app/Services/MetadataParsing/CsvParser.php
+++ b/app/Services/MetadataParsing/CsvParser.php
@@ -38,6 +38,14 @@ public static function getKnownMimeTypes(): array
         ];
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public static function getName(): string
+    {
+        return 'BIIGLE CSV';
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/app/Services/MetadataParsing/MetadataParser.php b/app/Services/MetadataParsing/MetadataParser.php
index 9bfeac2b0..1a298c1fe 100644
--- a/app/Services/MetadataParsing/MetadataParser.php
+++ b/app/Services/MetadataParsing/MetadataParser.php
@@ -16,6 +16,13 @@ abstract class MetadataParser
      */
     abstract public static function getKnownMimeTypes(): array;
 
+    /**
+     * Get the name of the parser to show it to users selecting files.
+     *
+     * Example: 'BIIGLE CSV'
+     */
+    abstract public static function getName(): string;
+
     public function __construct(public SplFileInfo $file)
     {
         //
diff --git a/app/Services/MetadataParsing/ParserFactory.php b/app/Services/MetadataParsing/ParserFactory.php
index 7b23b1622..346c0b9b8 100644
--- a/app/Services/MetadataParsing/ParserFactory.php
+++ b/app/Services/MetadataParsing/ParserFactory.php
@@ -34,17 +34,4 @@ public static function extend(string $parserClass, string $type): void
 
         self::$parsers[$type][] = $parserClass;
     }
-
-    /**
-     * Get the MIME types recognized by all metadata parsers of the media type.
-     */
-    public static function getKnownMimeTypes(string $type): array
-    {
-        $mimes = [];
-        foreach (static::$parsers[$type] ?? [] as $parser) {
-            $mimes = array_merge($mimes, $parser::getKnownMimeTypes());
-        }
-
-        return $mimes;
-    }
 }
diff --git a/resources/assets/js/volumes/createFormStep1.vue b/resources/assets/js/volumes/createFormStep1.vue
index 85de24d15..3107c9510 100644
--- a/resources/assets/js/volumes/createFormStep1.vue
+++ b/resources/assets/js/volumes/createFormStep1.vue
@@ -1,4 +1,5 @@
 <script>
+import Dropdown from 'uiv/dist/Dropdown';
 import LoaderMixin from '../core/mixins/loader';
 
 export const MEDIA_TYPE = {
@@ -8,11 +9,16 @@ export const MEDIA_TYPE = {
 
 export default {
     mixins: [LoaderMixin],
+    components: {
+        Dropdown,
+    },
     data() {
         return {
             mediaType: MEDIA_TYPE.IMAGE,
             hasFile: false,
             initialized: false,
+            parsers: [],
+            selectedParser: null,
         };
     },
     computed: {
@@ -40,6 +46,9 @@ export default {
                 'btn-info': this.hasFile,
             };
         },
+        availableParsers() {
+            return this.parsers[this.mediaType] || [];
+        },
     },
     methods: {
         selectImageMediaType() {
@@ -48,8 +57,11 @@ export default {
         selectVideoMediaType() {
             this.mediaType = MEDIA_TYPE.VIDEO;
         },
-        selectFile() {
-            this.$refs.metadataFileField.click();
+        selectFile(parser) {
+            this.selectedParser = parser;
+            // Use $nextTick so the input element will have the appropriate MIME type
+            // filter from the selected parser.
+            this.$nextTick(() => this.$refs.metadataFileField.click());
         },
         handleSelectedFile() {
             this.hasFile = this.$refs.metadataFileField.files.length > 0;
@@ -57,6 +69,7 @@ export default {
     },
     created() {
         this.mediaType = biigle.$require('volumes.mediaType');
+        this.parsers = biigle.$require('volumes.parsers');
         // Used to hide a dummy button that masks a flashing selected state on load.
         this.initialized = true;
     },
diff --git a/resources/assets/js/volumes/metadataUpload.vue b/resources/assets/js/volumes/metadataUpload.vue
index cf0211395..15d183354 100644
--- a/resources/assets/js/volumes/metadataUpload.vue
+++ b/resources/assets/js/volumes/metadataUpload.vue
@@ -19,11 +19,10 @@ export default {
             success: false,
             message: undefined,
             hasMetadata: false,
+            parsers: [],
+            selectedParser: null,
         };
     },
-    computed: {
-        //
-    },
     methods: {
         handleSuccess() {
             this.error = false;
@@ -42,13 +41,11 @@ export default {
                 this.handleErrorResponse(response);
             }
         },
-        submitFile() {
-            this.$refs.fileInput.click();
-        },
         handleFile(event) {
             this.startLoading();
             let data = new FormData();
             data.append('file', event.target.files[0]);
+            data.append('parser', this.selectedParser.parserClass);
             MetadataApi.save({id: this.volumeId}, data)
                 .then(() => this.hasMetadata = true)
                 .then(this.handleSuccess)
@@ -65,10 +62,17 @@ export default {
             this.hasMetadata = false;
             MessageStore.success('The metadata file was deleted.');
         },
+        selectFile(parser) {
+            this.selectedParser = parser;
+            // Use $nextTick so the input element will have the appropriate MIME type
+            // filter from the selected parser.
+            this.$nextTick(() => this.$refs.fileInput.click());
+        },
     },
     created() {
         this.volumeId = biigle.$require('volumes.id');
         this.hasMetadata = biigle.$require('volumes.hasMetadata');
+        this.parsers = biigle.$require('volumes.parsers');
     },
 };
 </script>
diff --git a/resources/views/volumes/create/step1.blade.php b/resources/views/volumes/create/step1.blade.php
index 8d11c6e08..4064640d7 100644
--- a/resources/views/volumes/create/step1.blade.php
+++ b/resources/views/volumes/create/step1.blade.php
@@ -5,6 +5,7 @@
 @push('scripts')
    <script type="text/javascript">
       biigle.$declare('volumes.mediaType', '{!! $mediaType !!}');
+      biigle.$declare('volumes.parsers', {!! $parsers !!});
    </script>
 @endpush
 
@@ -41,14 +42,27 @@
             <legend>
                 Select a metadata file <span class="text-muted">(optional)</span>
             </legend>
-            <div class="form-group{{ $errors->has('metadata_file') ? ' has-error' : '' }}">
+            <div class="form-group{{ $errors->hasAny(['metadata_file', 'metadata_parser']) ? ' has-error' : '' }}">
                 <p class="text-center">
-                    <button class="btn btn-default btn-lg" type="button" v-on:click="selectFile" :class="fileButtonClass"><i class="fa fa-file-alt"></i> Select a file</button>
+                    <dropdown tag="span">
+                        <button class="btn btn-default btn-lg dropdown-toggle" :class="fileButtonClass" type="button"><i class="fa fa-file-alt"></i> Select a file <span class="caret"></span></button>
+                        <template slot="dropdown">
+                            <li v-for="parser in availableParsers">
+                                <a href="#" v-on:click.prevent="selectFile(parser)" v-text="parser.name"></a>
+                            </li>
+                        </template>
+                    </dropdown>
                 </p>
-                <input class="hidden" name="metadata_file" type="file" ref="metadataFileField" v-on:change="handleSelectedFile" accept="{{implode(',', $mimeTypes)}}">
+                <input class="hidden" name="metadata_file" type="file" ref="metadataFileField" v-on:change="handleSelectedFile" :accept="selectedParser?.mimeTypes">
+                <input v-if="hasFile" type="hidden" name="metadata_parser" :value="selectedParser?.parserClass">
+
                 @if ($errors->has('metadata_file'))
                    <p class="help-block">{{ $errors->first('metadata_file') }}</p>
                 @endif
+
+                @if ($errors->has('metadata_parser'))
+                   <p class="help-block">{{ $errors->first('metadata_parser') }}</p>
+                @endif
                 <p class="help-block">
                     By default, BIIGLE supports a CSV metadata format. Other supported formats may be listed in <a href="{{route('manual-tutorials', ['volumes', 'file-metadata'])}}" target="_blank">the manual</a>. Image metadata may be overridden by EXIF information during the creation of the volume.
                 </p>
diff --git a/resources/views/volumes/edit.blade.php b/resources/views/volumes/edit.blade.php
index 7b52f5e57..690be059c 100644
--- a/resources/views/volumes/edit.blade.php
+++ b/resources/views/volumes/edit.blade.php
@@ -7,6 +7,7 @@
         biigle.$declare('volumes.annotationSessions', {!! $annotationSessions !!});
         biigle.$declare('volumes.type', '{!! $type !!}');
         biigle.$declare('volumes.hasMetadata', '{!! $volume->hasMetadata() !!}');
+        biigle.$declare('volumes.parsers', {!! $parsers !!});
     </script>
     @mixin('volumesEditScripts')
 @endpush
diff --git a/resources/views/volumes/edit/metadata.blade.php b/resources/views/volumes/edit/metadata.blade.php
index 8e97c4967..37d83d876 100644
--- a/resources/views/volumes/edit/metadata.blade.php
+++ b/resources/views/volumes/edit/metadata.blade.php
@@ -24,12 +24,18 @@
         <p>
             Upload a metadata file to attach it to the volume and update the @if ($volume->isImageVolume()) image @else video @endif metadata.
         </p>
-        <form class="form" v-on:submit.prevent="submitFile">
-            <div class="form-group">
-                <input class="hidden" ref="fileInput" type="file" name="file" v-on:change="handleFile" accept="{{implode(',', $mimeTypes)}}">
-                <button class="btn btn-default" type="submit" :disabled="loading">Upload file</button>
-            </div>
-        </form>
+        <p class="text-center">
+            <dropdown tag="span">
+                <button class="btn btn-default dropdown-toggle" type="button" :disabled="loading"><i class="fa fa-file-alt"></i> Upload file <span class="caret"></span></button>
+                <template slot="dropdown">
+                    <li v-for="parser in parsers">
+                        <a href="#" v-on:click.prevent="selectFile(parser)" v-text="parser.name"></a>
+                    </li>
+                </template>
+            </dropdown>
+        </p>
+
+        <input class="hidden" ref="fileInput" type="file" name="file" v-on:change="handleFile" :accept="selectedParser?.mimeTypes">
 
         <div class="alert alert-danger" v-if="error" v-text="error" v-cloak></div>
         <div class="alert alert-success" v-if="success" v-cloak>
diff --git a/tests/php/Jobs/CreateNewImagesOrVideosTest.php b/tests/php/Jobs/CreateNewImagesOrVideosTest.php
index 90c72fc54..b8dd94a30 100644
--- a/tests/php/Jobs/CreateNewImagesOrVideosTest.php
+++ b/tests/php/Jobs/CreateNewImagesOrVideosTest.php
@@ -5,15 +5,14 @@
 use Biigle\Jobs\CreateNewImagesOrVideos;
 use Biigle\Jobs\ProcessNewVolumeFiles;
 use Biigle\MediaType;
+use Biigle\Services\MetadataParsing\ImageCsvParser;
+use Biigle\Services\MetadataParsing\VideoCsvParser;
 use Biigle\Tests\VolumeTest;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Queue;
 use Illuminate\Support\Facades\Storage;
 use TestCase;
-use Biigle\Services\MetadataParsing\ImageCsvParser;
-use Biigle\Services\MetadataParsing\VideoCsvParser;
-
 
 class CreateNewImagesOrVideosTest extends TestCase
 {
diff --git a/tests/php/Services/MetadataParsing/ParserFactoryTest.php b/tests/php/Services/MetadataParsing/ParserFactoryTest.php
index 30ec5d7ae..de18a0aff 100644
--- a/tests/php/Services/MetadataParsing/ParserFactoryTest.php
+++ b/tests/php/Services/MetadataParsing/ParserFactoryTest.php
@@ -7,7 +7,6 @@
 use Biigle\Services\MetadataParsing\ParserFactory;
 use Biigle\Services\MetadataParsing\VideoCsvParser;
 use Biigle\Services\MetadataParsing\VolumeMetadata;
-use Symfony\Component\HttpFoundation\File\File;
 use TestCase;
 
 class ParserFactoryTest extends TestCase
@@ -40,16 +39,6 @@ public function testExtend()
         $this->expectException(\Exception::class);
         ParserFactory::extend(TestParser2::class, 'image');
     }
-
-    public function testGetKnownMimeTypes()
-    {
-        $types = ParserFactory::getKnownMimeTypes('image');
-        $this->assertContains('text/csv', $types);
-        $types = ParserFactory::getKnownMimeTypes('video');
-        $this->assertContains('text/csv', $types);
-        $types = ParserFactory::getKnownMimeTypes('unknown');
-        $this->assertEquals([], $types);
-    }
 }
 
 class TestParser extends MetadataParser

From f73effd7f43e469a90e10507ba06ff9350f66c7f Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 24 Apr 2024 10:33:07 +0200
Subject: [PATCH 106/209] Remove PHP YAML extension from Docker images

---
 .docker/all-php.ini       |  3 ---
 .docker/app.dockerfile    | 11 -----------
 .docker/worker.dockerfile | 14 --------------
 3 files changed, 28 deletions(-)
 delete mode 100644 .docker/all-php.ini

diff --git a/.docker/all-php.ini b/.docker/all-php.ini
deleted file mode 100644
index ca8d0b189..000000000
--- a/.docker/all-php.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-# Turn off serializing of PHP objects in YAML.
-yaml.decode_php = 0
-yaml.decode_binary = 0
diff --git a/.docker/app.dockerfile b/.docker/app.dockerfile
index 07555e352..a59c614a8 100644
--- a/.docker/app.dockerfile
+++ b/.docker/app.dockerfile
@@ -5,7 +5,6 @@ MAINTAINER Martin Zurowietz <martin@cebitec.uni-bielefeld.de>
 LABEL org.opencontainers.image.source https://github.com/biigle/core
 
 RUN ln -s "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
-ADD ".docker/all-php.ini" "$PHP_INI_DIR/conf.d/all.ini"
 ADD ".docker/app-php.ini" "$PHP_INI_DIR/conf.d/app.ini"
 
 RUN apk add --no-cache \
@@ -27,16 +26,6 @@ RUN apk add --no-cache \
         soap \
     && apk del --purge .build-deps
 
-# Configure proxy if there is any. See: https://stackoverflow.com/a/2266500/1796523
-RUN [ -z "$HTTP_PROXY" ] || pear config-set http_proxy $HTTP_PROXY
-RUN apk add --no-cache yaml \
-    && apk add --no-cache --virtual .build-deps g++ make autoconf yaml-dev \
-    && pecl install yaml \
-    && docker-php-ext-enable yaml \
-    && apk del --purge .build-deps
-# Unset proxy configuration again.
-RUN [ -z "$HTTP_PROXY" ] || pear config-set http_proxy ""
-
 ARG PHPREDIS_VERSION=5.3.7
 RUN curl -L -o /tmp/redis.tar.gz https://github.com/phpredis/phpredis/archive/${PHPREDIS_VERSION}.tar.gz \
     && tar -xzf /tmp/redis.tar.gz \
diff --git a/.docker/worker.dockerfile b/.docker/worker.dockerfile
index 5339ed683..e56bcbd72 100644
--- a/.docker/worker.dockerfile
+++ b/.docker/worker.dockerfile
@@ -20,7 +20,6 @@ RUN LC_ALL=C.UTF-8 apt-get update \
     && rm -r /var/lib/apt/lists/*
 
 RUN ln -s "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
-ADD ".docker/all-php.ini" "$PHP_INI_DIR/conf.d/all.ini"
 
 RUN LC_ALL=C.UTF-8 apt-get update \
     && apt-get install -y --no-install-recommends \
@@ -51,19 +50,6 @@ RUN LC_ALL=C.UTF-8 apt-get update \
 # Configure proxy if there is any. See: https://stackoverflow.com/a/2266500/1796523
 RUN [ -z "$HTTP_PROXY" ] || pear config-set http_proxy $HTTP_PROXY
 
-RUN LC_ALL=C.UTF-8 apt-get update \
-    && apt-get install -y --no-install-recommends \
-        libyaml-dev \
-    && apt-get install -y --no-install-recommends \
-        libyaml-0-2 \
-    && pecl install yaml \
-    && printf "\n" | docker-php-ext-enable yaml \
-    && apt-get purge -y \
-        libyaml-dev \
-    && apt-get -y autoremove \
-    && apt-get clean \
-    && rm -r /var/lib/apt/lists/*
-
 ARG PHPREDIS_VERSION=5.3.7
 RUN curl -L -o /tmp/redis.tar.gz https://github.com/phpredis/phpredis/archive/${PHPREDIS_VERSION}.tar.gz \
     && tar -xzf /tmp/redis.tar.gz \

From 952015be611492eb892b98185b93a28f1b289c99 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 24 Apr 2024 10:33:27 +0200
Subject: [PATCH 107/209] Remove metadata label label tree UUID

---
 app/Services/MetadataParsing/Label.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/Services/MetadataParsing/Label.php b/app/Services/MetadataParsing/Label.php
index 1af4f3b47..2c8e13655 100644
--- a/app/Services/MetadataParsing/Label.php
+++ b/app/Services/MetadataParsing/Label.php
@@ -11,14 +11,12 @@ class Label implements JsonSerializable
      * @param string $name
      * @param ?string $color The BIIGLE label color
      * @param ?string $uuid The BIIGLE label UUID.
-     * @param ?string $labelTreeUuid The BIIGLE label tree UUID.
      */
     public function __construct(
         public string $id,
         public string $name,
         public ?string $color = null,
         public ?string $uuid = null,
-        public ?string $labelTreeUuid = null,
     ) {
         //
     }
@@ -38,10 +36,6 @@ public function jsonSerialize(): mixed
             $ret['uuid'] = $this->uuid;
         }
 
-        if (!is_null($this->labelTreeUuid)) {
-            $ret['labelTreeUuid'] = $this->labelTreeUuid;
-        }
-
         return $ret;
     }
 }

From 569a2732d4a5cff28d201eaf43a919bdb87c458f Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 22 May 2024 16:03:51 +0200
Subject: [PATCH 108/209] Improve final overview before annotation import

---
 .../Controllers/Views/Volumes/PendingVolumeController.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
index 24abe9876..b13b24733 100644
--- a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
@@ -334,10 +334,10 @@ public function showFinish(Request $request)
         $onlyLabels = $pv->only_annotation_labels + $pv->only_file_labels;
 
         $labelMap = $metadata->getMatchingLabels($pv->label_map, $onlyLabels);
-        $labelMapOk = array_search(null, $labelMap) === false;
+        $labelMapOk = !empty($labelMap) && array_search(null, $labelMap) === false;
 
         $userMap = $metadata->getMatchingUsers($pv->user_map, $onlyLabels);
-        $userMapOk = array_search(null, $userMap) === false;
+        $userMapOk = !empty($userMap) && array_search(null, $userMap) === false;
 
         return view('volumes.create.finish', [
             'pv' => $pv,

From dfea5e6d2b252848e7f161ebac0e2754fa313479 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 12 Jul 2024 16:53:37 +0200
Subject: [PATCH 109/209] Upgrade to Laravel 11

Resolves https://github.com/biigle/core/issues/800
---
 .docker/app.dockerfile                        |    8 +-
 .docker/worker.dockerfile                     |    8 +-
 .env.example                                  |   30 +-
 .../Api/AnnotationSessionController.php       |    6 +-
 .../Api/ProjectInvitationController.php       |    4 +-
 .../Requests/DestroyAnnotationSession.php     |    6 +-
 app/Http/Requests/UpdateAnnotationSession.php |    6 +-
 composer.json                                 |   24 +-
 composer.lock                                 | 3601 +++++++++--------
 config/app.php                                |   65 +-
 config/auth.php                               |   48 +-
 config/cache.php                              |   27 +-
 config/database.php                           |   73 +-
 config/filesystems.php                        |   12 +-
 config/hashing.php                            |   52 -
 config/logging.php                            |   43 +-
 config/mail.php                               |   54 +-
 config/queue.php                              |   35 +-
 config/services.php                           |   17 +-
 config/session.php                            |   72 +-
 config/view.php                               |   36 -
 ...16_07_18_082516_add_images_uuid_column.php |    5 -
 ...016_12_07_124425_add_image_geo_columns.php |    7 +-
 ..._160857_add_user_label_label_tree_uuid.php |    5 -
 .../2020_07_14_074339_add_video_volumes.php   |    6 +-
 phpunit.xml                                   |    3 +-
 26 files changed, 2231 insertions(+), 2022 deletions(-)
 delete mode 100644 config/hashing.php
 delete mode 100644 config/view.php

diff --git a/.docker/app.dockerfile b/.docker/app.dockerfile
index 07555e352..db8397fb6 100644
--- a/.docker/app.dockerfile
+++ b/.docker/app.dockerfile
@@ -1,6 +1,6 @@
-# PHP 8.1.13
-#FROM php:8.1-fpm-alpine
-FROM php@sha256:88407bcb4821e7a9da273d9dad746e1f795e9a6480d9cba5ba502d7836e23718
+# PHP 8.2.21
+#FROM php:8.2-fpm-alpine
+FROM php@sha256:95c34aeeef07aa9774e0b70d5b70065ab0647ece183ebe007c5f2e6b5db16725
 MAINTAINER Martin Zurowietz <martin@cebitec.uni-bielefeld.de>
 LABEL org.opencontainers.image.source https://github.com/biigle/core
 
@@ -37,7 +37,7 @@ RUN apk add --no-cache yaml \
 # Unset proxy configuration again.
 RUN [ -z "$HTTP_PROXY" ] || pear config-set http_proxy ""
 
-ARG PHPREDIS_VERSION=5.3.7
+ARG PHPREDIS_VERSION=6.0.2
 RUN curl -L -o /tmp/redis.tar.gz https://github.com/phpredis/phpredis/archive/${PHPREDIS_VERSION}.tar.gz \
     && tar -xzf /tmp/redis.tar.gz \
     && rm /tmp/redis.tar.gz \
diff --git a/.docker/worker.dockerfile b/.docker/worker.dockerfile
index 5339ed683..377057b43 100644
--- a/.docker/worker.dockerfile
+++ b/.docker/worker.dockerfile
@@ -1,6 +1,6 @@
-# PHP 8.1.27
-# FROM php:8.1
-FROM php@sha256:9b5dfb7deef3e48d67b2599e4d3967bb3ece19fd5ba09cb8e7ee10f5facf36e0
+# PHP 8.2.21
+# FROM php:8.2
+FROM php@sha256:a61daae986bdf9bbeff9a514e3598a4f72bb2e3d01a0b3d0eff960bbfe85acdf
 MAINTAINER Martin Zurowietz <martin@cebitec.uni-bielefeld.de>
 LABEL org.opencontainers.image.source https://github.com/biigle/core
 
@@ -64,7 +64,7 @@ RUN LC_ALL=C.UTF-8 apt-get update \
     && apt-get clean \
     && rm -r /var/lib/apt/lists/*
 
-ARG PHPREDIS_VERSION=5.3.7
+ARG PHPREDIS_VERSION=6.0.2
 RUN curl -L -o /tmp/redis.tar.gz https://github.com/phpredis/phpredis/archive/${PHPREDIS_VERSION}.tar.gz \
     && tar -xzf /tmp/redis.tar.gz \
     && rm /tmp/redis.tar.gz \
diff --git a/.env.example b/.env.example
index 95fc1dfb5..bfaa548c0 100644
--- a/.env.example
+++ b/.env.example
@@ -8,7 +8,17 @@ APP_DEBUG=true
 APP_URL="http://localhost:8000"
 APP_TIMEZONE="Europe/Berlin"
 
+APP_LOCALE=en
+APP_FALLBACK_LOCALE=en
+APP_FAKER_LOCALE=en_US
+
+APP_MAINTENANCE_DRIVER=file
+# APP_MAINTENANCE_STORE=database
+
+BCRYPT_ROUNDS=12
+
 LOG_CHANNEL=single
+LOG_STACK=single
 LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
@@ -40,23 +50,29 @@ MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 #HTTP_PROXY=host:port
 
 # normally you don't have to edit these
-CACHE_DRIVER="file"
-FILESYSTEM_DISK=local
 SESSION_DRIVER="file"
 SESSION_LIFETIME=120
 SESSION_SECURE_COOKIE=false
-QUEUE_CONNECTION="database"
+SESSION_ENCRYPT=false
+SESSION_PATH=/
+SESSION_DOMAIN=null
+
+BROADCAST_CONNECTION=log
+FILESYSTEM_DISK=local
+QUEUE_CONNECTION=database
+
+CACHE_STORE=file
+CACHE_PREFIX=
 
 MEMCACHED_HOST=127.0.0.1
 
+REDIS_CLIENT=phpredis
 REDIS_HOST="127.0.0.1"
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
-# see config/mail.php for what drivers are available
-# default is the PHP mail function which doesn't require any credentials
-MAIL_MAILER="log"
-MAIL_HOST="smtp.mailtrap.io"
+MAIL_MAILER=log
+MAIL_HOST=127.0.0.1
 MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
diff --git a/app/Http/Controllers/Api/AnnotationSessionController.php b/app/Http/Controllers/Api/AnnotationSessionController.php
index 424e94a7d..16286ecab 100644
--- a/app/Http/Controllers/Api/AnnotationSessionController.php
+++ b/app/Http/Controllers/Api/AnnotationSessionController.php
@@ -46,7 +46,7 @@ class AnnotationSessionController extends Controller
      */
     public function update(UpdateAnnotationSession $request)
     {
-        $session = $request->session;
+        $session = $request->annotationSession;
 
         if ($request->filled('starts_at')) {
             $newStartsAt = Carbon::parse($request->input('starts_at'))
@@ -161,10 +161,10 @@ public function update(UpdateAnnotationSession $request)
      */
     public function destroy(DestroyAnnotationSession $request, $id)
     {
-        if (!$request->input('force') && $request->session->annotations()->exists()) {
+        if (!$request->input('force') && $request->annotationSession->annotations()->exists()) {
             abort(400, 'There are annotations belonging to this annotation session. Use the force attribute to delete it anyway (the annotations will not be deleted).');
         }
 
-        $request->session->delete();
+        $request->annotationSession->delete();
     }
 }
diff --git a/app/Http/Controllers/Api/ProjectInvitationController.php b/app/Http/Controllers/Api/ProjectInvitationController.php
index afa1e1f3b..8f23992fb 100644
--- a/app/Http/Controllers/Api/ProjectInvitationController.php
+++ b/app/Http/Controllers/Api/ProjectInvitationController.php
@@ -9,7 +9,7 @@
 use Biigle\Role;
 use DB;
 use Endroid\QrCode\Encoding\Encoding;
-use Endroid\QrCode\ErrorCorrectionLevel\ErrorCorrectionLevelLow;
+use Endroid\QrCode\ErrorCorrectionLevel;
 use Endroid\QrCode\QrCode;
 use Endroid\QrCode\Writer\SvgWriter;
 use Ramsey\Uuid\Uuid;
@@ -137,7 +137,7 @@ public function showQrCode($id)
 
         $qrCode = QrCode::create(route('project-invitation', $invitation->uuid))
             ->setEncoding(new Encoding('UTF-8'))
-            ->setErrorCorrectionLevel(new ErrorCorrectionLevelLow())
+            ->setErrorCorrectionLevel(ErrorCorrectionLevel::Low)
             ->setSize(300)
             ->setMargin(10);
 
diff --git a/app/Http/Requests/DestroyAnnotationSession.php b/app/Http/Requests/DestroyAnnotationSession.php
index bf98d25e9..bd0d5f9cb 100644
--- a/app/Http/Requests/DestroyAnnotationSession.php
+++ b/app/Http/Requests/DestroyAnnotationSession.php
@@ -12,7 +12,7 @@ class DestroyAnnotationSession extends FormRequest
      *
      * @var AnnotationSession
      */
-    public $session;
+    public $annotationSession;
 
     /**
      * Determine if the user is authorized to make this request.
@@ -21,9 +21,9 @@ class DestroyAnnotationSession extends FormRequest
      */
     public function authorize()
     {
-        $this->session = AnnotationSession::findOrFail($this->route('id'));
+        $this->annotationSession = AnnotationSession::findOrFail($this->route('id'));
 
-        return $this->user()->can('update', $this->session->volume);
+        return $this->user()->can('update', $this->annotationSession->volume);
     }
 
     /**
diff --git a/app/Http/Requests/UpdateAnnotationSession.php b/app/Http/Requests/UpdateAnnotationSession.php
index 646bd21b5..7b2769969 100644
--- a/app/Http/Requests/UpdateAnnotationSession.php
+++ b/app/Http/Requests/UpdateAnnotationSession.php
@@ -12,7 +12,7 @@ class UpdateAnnotationSession extends FormRequest
      *
      * @var AnnotationSession
      */
-    public $session;
+    public $annotationSession;
 
     /**
      * Determine if the user is authorized to make this request.
@@ -21,9 +21,9 @@ class UpdateAnnotationSession extends FormRequest
      */
     public function authorize()
     {
-        $this->session = AnnotationSession::findOrFail($this->route('id'));
+        $this->annotationSession = AnnotationSession::findOrFail($this->route('id'));
 
-        return $this->user()->can('update', $this->session->volume);
+        return $this->user()->can('update', $this->annotationSession->volume);
     }
 
     /**
diff --git a/composer.json b/composer.json
index 6d7909886..e8dd919cb 100644
--- a/composer.json
+++ b/composer.json
@@ -16,37 +16,35 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "ext-exif": "*",
         "ext-json": "*",
         "ext-pgsql": "*",
         "ext-soap": "*",
         "ext-vips": "*",
         "ext-yaml": "*",
-        "biigle/laravel-file-cache": "^4.0",
-        "doctrine/dbal": "^3.0",
+        "biigle/laravel-file-cache": "^5.0",
         "duncan3dc/bom-string": "^1.1",
-        "endroid/qr-code": "^4.6",
+        "endroid/qr-code": "^5.0",
         "guzzlehttp/guzzle": "^7.2",
         "jcupitt/vips": "^1.0",
-        "laravel/framework": "^10.0",
-        "laravel/tinker": "^2.8",
+        "laravel/framework": "^11.0",
+        "laravel/tinker": "^2.9",
         "laravel/ui": "^4.0",
         "msurguy/honeypot": "^1.0",
         "pgvector/pgvector": "^0.1.4",
         "php-ffmpeg/php-ffmpeg": "^1.0",
         "pusher/pusher-php-server": "^7.2",
-        "ramsey/uuid": "^4.0",
-        "ramsey/uuid-doctrine": "^1.8"
+        "ramsey/uuid": "^4.0"
     },
     "require-dev": {
-        "fakerphp/faker": "^1.4",
+        "fakerphp/faker": "^1.23",
         "filp/whoops": "^2.0",
         "friendsofphp/php-cs-fixer": "^3.0",
-        "mockery/mockery": "^1.3.1",
-        "nunomaduro/collision": "^7.0",
+        "mockery/mockery": "^1.6",
+        "nunomaduro/collision": "^8.1",
         "phpunit/phpunit": "^10.0",
-        "psalm/plugin-laravel": "^2.0"
+        "psalm/plugin-laravel": "^2.9"
     },
     "autoload": {
         "psr-4": {
@@ -121,7 +119,7 @@
             "composer/package-versions-deprecated": true
         },
         "platform": {
-            "php": "8.1.13"
+            "php": "8.2.21"
         }
     },
     "prefer-stable": true
diff --git a/composer.lock b/composer.lock
index 17fc7c075..f8ade6a8d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,32 +4,32 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "ca56d5f114fc956ac8efe6bcdefe8180",
+    "content-hash": "02ee39b4637053d9c8f3afb2dbe3da94",
     "packages": [
         {
             "name": "bacon/bacon-qr-code",
-            "version": "2.0.8",
+            "version": "v3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Bacon/BaconQrCode.git",
-                "reference": "8674e51bb65af933a5ffaf1c308a660387c35c22"
+                "reference": "510de6eca6248d77d31b339d62437cc995e2fb41"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/8674e51bb65af933a5ffaf1c308a660387c35c22",
-                "reference": "8674e51bb65af933a5ffaf1c308a660387c35c22",
+                "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/510de6eca6248d77d31b339d62437cc995e2fb41",
+                "reference": "510de6eca6248d77d31b339d62437cc995e2fb41",
                 "shasum": ""
             },
             "require": {
                 "dasprid/enum": "^1.0.3",
                 "ext-iconv": "*",
-                "php": "^7.1 || ^8.0"
+                "php": "^8.1"
             },
             "require-dev": {
-                "phly/keep-a-changelog": "^2.1",
-                "phpunit/phpunit": "^7 | ^8 | ^9",
-                "spatie/phpunit-snapshot-assertions": "^4.2.9",
-                "squizlabs/php_codesniffer": "^3.4"
+                "phly/keep-a-changelog": "^2.12",
+                "phpunit/phpunit": "^10.5.11 || 11.0.4",
+                "spatie/phpunit-snapshot-assertions": "^5.1.5",
+                "squizlabs/php_codesniffer": "^3.9"
             },
             "suggest": {
                 "ext-imagick": "to generate QR code images"
@@ -56,35 +56,35 @@
             "homepage": "https://github.com/Bacon/BaconQrCode",
             "support": {
                 "issues": "https://github.com/Bacon/BaconQrCode/issues",
-                "source": "https://github.com/Bacon/BaconQrCode/tree/2.0.8"
+                "source": "https://github.com/Bacon/BaconQrCode/tree/v3.0.0"
             },
-            "time": "2022-12-07T17:46:57+00:00"
+            "time": "2024-04-18T11:16:25+00:00"
         },
         {
             "name": "biigle/laravel-file-cache",
-            "version": "v4.5.2",
+            "version": "v5.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/biigle/laravel-file-cache.git",
-                "reference": "9881936f67f81b40bc2974d0bbe07577547e57b2"
+                "reference": "d86edcfc8c52dec6a9419766f1eebde83ab3d7a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/biigle/laravel-file-cache/zipball/9881936f67f81b40bc2974d0bbe07577547e57b2",
-                "reference": "9881936f67f81b40bc2974d0bbe07577547e57b2",
+                "url": "https://api.github.com/repos/biigle/laravel-file-cache/zipball/d86edcfc8c52dec6a9419766f1eebde83ab3d7a9",
+                "reference": "d86edcfc8c52dec6a9419766f1eebde83ab3d7a9",
                 "shasum": ""
             },
             "require": {
                 "guzzlehttp/guzzle": "^7.0",
-                "illuminate/console": "^9.0 || ^10.0",
-                "illuminate/filesystem": "^9.0 || ^10.0",
-                "illuminate/support": "^9.0 || ^10.0",
-                "symfony/finder": "^6.0"
+                "illuminate/console": "^11.0",
+                "illuminate/filesystem": "^11.0",
+                "illuminate/support": "^11.0",
+                "symfony/finder": "^7.0"
             },
             "require-dev": {
-                "laravel/laravel": "^9.0 || ^10.0",
+                "laravel/laravel": "^11.0",
                 "mockery/mockery": "^1.2",
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
@@ -115,31 +115,31 @@
             "description": "Fetch and cache files from local filesystem, cloud storage or public webservers in Laravel",
             "support": {
                 "issues": "https://github.com/biigle/laravel-file-cache/issues",
-                "source": "https://github.com/biigle/laravel-file-cache/tree/v4.5.2"
+                "source": "https://github.com/biigle/laravel-file-cache/tree/v5.0.0"
             },
-            "time": "2024-02-21T14:50:23+00:00"
+            "time": "2024-07-12T14:42:44+00:00"
         },
         {
             "name": "brick/math",
-            "version": "0.11.0",
+            "version": "0.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/brick/math.git",
-                "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478"
+                "reference": "f510c0a40911935b77b86859eb5223d58d660df1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/brick/math/zipball/0ad82ce168c82ba30d1c01ec86116ab52f589478",
-                "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478",
+                "url": "https://api.github.com/repos/brick/math/zipball/f510c0a40911935b77b86859eb5223d58d660df1",
+                "reference": "f510c0a40911935b77b86859eb5223d58d660df1",
                 "shasum": ""
             },
             "require": {
-                "php": "^8.0"
+                "php": "^8.1"
             },
             "require-dev": {
                 "php-coveralls/php-coveralls": "^2.2",
-                "phpunit/phpunit": "^9.0",
-                "vimeo/psalm": "5.0.0"
+                "phpunit/phpunit": "^10.1",
+                "vimeo/psalm": "5.16.0"
             },
             "type": "library",
             "autoload": {
@@ -159,12 +159,17 @@
                 "arithmetic",
                 "bigdecimal",
                 "bignum",
+                "bignumber",
                 "brick",
-                "math"
+                "decimal",
+                "integer",
+                "math",
+                "mathematics",
+                "rational"
             ],
             "support": {
                 "issues": "https://github.com/brick/math/issues",
-                "source": "https://github.com/brick/math/tree/0.11.0"
+                "source": "https://github.com/brick/math/tree/0.12.1"
             },
             "funding": [
                 {
@@ -172,30 +177,30 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-01-15T23:15:59+00:00"
+            "time": "2023-11-29T23:19:16+00:00"
         },
         {
             "name": "carbonphp/carbon-doctrine-types",
-            "version": "2.1.0",
+            "version": "3.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/CarbonPHP/carbon-doctrine-types.git",
-                "reference": "99f76ffa36cce3b70a4a6abce41dba15ca2e84cb"
+                "reference": "18ba5ddfec8976260ead6e866180bd5d2f71aa1d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/99f76ffa36cce3b70a4a6abce41dba15ca2e84cb",
-                "reference": "99f76ffa36cce3b70a4a6abce41dba15ca2e84cb",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/18ba5ddfec8976260ead6e866180bd5d2f71aa1d",
+                "reference": "18ba5ddfec8976260ead6e866180bd5d2f71aa1d",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.4 || ^8.0"
+                "php": "^8.1"
             },
             "conflict": {
-                "doctrine/dbal": "<3.7.0 || >=4.0.0"
+                "doctrine/dbal": "<4.0.0 || >=5.0.0"
             },
             "require-dev": {
-                "doctrine/dbal": "^3.7.0",
+                "doctrine/dbal": "^4.0.0",
                 "nesbot/carbon": "^2.71.0 || ^3.0.0",
                 "phpunit/phpunit": "^10.3"
             },
@@ -225,7 +230,7 @@
             ],
             "support": {
                 "issues": "https://github.com/CarbonPHP/carbon-doctrine-types/issues",
-                "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/2.1.0"
+                "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/3.2.0"
             },
             "funding": [
                 {
@@ -241,7 +246,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-11T17:09:12+00:00"
+            "time": "2024-02-09T16:56:22+00:00"
         },
         {
             "name": "dasprid/enum",
@@ -295,16 +300,16 @@
         },
         {
             "name": "dflydev/dot-access-data",
-            "version": "v3.0.2",
+            "version": "v3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dflydev/dflydev-dot-access-data.git",
-                "reference": "f41715465d65213d644d3141a6a93081be5d3549"
+                "reference": "a23a2bf4f31d3518f3ecb38660c95715dfead60f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/f41715465d65213d644d3141a6a93081be5d3549",
-                "reference": "f41715465d65213d644d3141a6a93081be5d3549",
+                "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/a23a2bf4f31d3518f3ecb38660c95715dfead60f",
+                "reference": "a23a2bf4f31d3518f3ecb38660c95715dfead60f",
                 "shasum": ""
             },
             "require": {
@@ -364,42 +369,39 @@
             ],
             "support": {
                 "issues": "https://github.com/dflydev/dflydev-dot-access-data/issues",
-                "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.2"
+                "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.3"
             },
-            "time": "2022-10-27T11:44:00+00:00"
+            "time": "2024-07-08T12:26:09+00:00"
         },
         {
-            "name": "doctrine/cache",
-            "version": "2.2.0",
+            "name": "doctrine/inflector",
+            "version": "2.0.10",
             "source": {
                 "type": "git",
-                "url": "https://github.com/doctrine/cache.git",
-                "reference": "1ca8f21980e770095a31456042471a57bc4c68fb"
+                "url": "https://github.com/doctrine/inflector.git",
+                "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/1ca8f21980e770095a31456042471a57bc4c68fb",
-                "reference": "1ca8f21980e770095a31456042471a57bc4c68fb",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc",
+                "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc",
                 "shasum": ""
             },
             "require": {
-                "php": "~7.1 || ^8.0"
-            },
-            "conflict": {
-                "doctrine/common": ">2.2,<2.4"
+                "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "cache/integration-tests": "dev-master",
-                "doctrine/coding-standard": "^9",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "psr/cache": "^1.0 || ^2.0 || ^3.0",
-                "symfony/cache": "^4.4 || ^5.4 || ^6",
-                "symfony/var-exporter": "^4.4 || ^5.4 || ^6"
+                "doctrine/coding-standard": "^11.0",
+                "phpstan/phpstan": "^1.8",
+                "phpstan/phpstan-phpunit": "^1.1",
+                "phpstan/phpstan-strict-rules": "^1.3",
+                "phpunit/phpunit": "^8.5 || ^9.5",
+                "vimeo/psalm": "^4.25 || ^5.4"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache"
+                    "Doctrine\\Inflector\\": "lib/Doctrine/Inflector"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -428,22 +430,23 @@
                     "email": "schmittjoh@gmail.com"
                 }
             ],
-            "description": "PHP Doctrine Cache library is a popular cache implementation that supports many different drivers such as redis, memcache, apc, mongodb and others.",
-            "homepage": "https://www.doctrine-project.org/projects/cache.html",
+            "description": "PHP Doctrine Inflector is a small library that can perform string manipulations with regard to upper/lowercase and singular/plural forms of words.",
+            "homepage": "https://www.doctrine-project.org/projects/inflector.html",
             "keywords": [
-                "abstraction",
-                "apcu",
-                "cache",
-                "caching",
-                "couchdb",
-                "memcached",
+                "inflection",
+                "inflector",
+                "lowercase",
+                "manipulation",
                 "php",
-                "redis",
-                "xcache"
+                "plural",
+                "singular",
+                "strings",
+                "uppercase",
+                "words"
             ],
             "support": {
-                "issues": "https://github.com/doctrine/cache/issues",
-                "source": "https://github.com/doctrine/cache/tree/2.2.0"
+                "issues": "https://github.com/doctrine/inflector/issues",
+                "source": "https://github.com/doctrine/inflector/tree/2.0.10"
             },
             "funding": [
                 {
@@ -455,59 +458,40 @@
                     "type": "patreon"
                 },
                 {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache",
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finflector",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-20T20:07:39+00:00"
+            "time": "2024-02-18T20:23:39+00:00"
         },
         {
-            "name": "doctrine/dbal",
-            "version": "3.8.3",
+            "name": "doctrine/lexer",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/doctrine/dbal.git",
-                "reference": "db922ba9436b7b18a23d1653a0b41ff2369ca41c"
+                "url": "https://github.com/doctrine/lexer.git",
+                "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/db922ba9436b7b18a23d1653a0b41ff2369ca41c",
-                "reference": "db922ba9436b7b18a23d1653a0b41ff2369ca41c",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd",
+                "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd",
                 "shasum": ""
             },
             "require": {
-                "composer-runtime-api": "^2",
-                "doctrine/cache": "^1.11|^2.0",
-                "doctrine/deprecations": "^0.5.3|^1",
-                "doctrine/event-manager": "^1|^2",
-                "php": "^7.4 || ^8.0",
-                "psr/cache": "^1|^2|^3",
-                "psr/log": "^1|^2|^3"
+                "php": "^8.1"
             },
             "require-dev": {
-                "doctrine/coding-standard": "12.0.0",
-                "fig/log-test": "^1",
-                "jetbrains/phpstorm-stubs": "2023.1",
-                "phpstan/phpstan": "1.10.58",
-                "phpstan/phpstan-strict-rules": "^1.5",
-                "phpunit/phpunit": "9.6.16",
-                "psalm/plugin-phpunit": "0.18.4",
-                "slevomat/coding-standard": "8.13.1",
-                "squizlabs/php_codesniffer": "3.9.0",
-                "symfony/cache": "^5.4|^6.0|^7.0",
-                "symfony/console": "^4.4|^5.4|^6.0|^7.0",
-                "vimeo/psalm": "4.30.0"
-            },
-            "suggest": {
-                "symfony/console": "For helpful console commands such as SQL execution and import of files."
+                "doctrine/coding-standard": "^12",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^10.5",
+                "psalm/plugin-phpunit": "^0.18.3",
+                "vimeo/psalm": "^5.21"
             },
-            "bin": [
-                "bin/doctrine-dbal"
-            ],
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\DBAL\\": "src"
+                    "Doctrine\\Common\\Lexer\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -524,39 +508,22 @@
                     "email": "roman@code-factory.org"
                 },
                 {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
                 }
             ],
-            "description": "Powerful PHP database abstraction layer (DBAL) with many features for database schema introspection and management.",
-            "homepage": "https://www.doctrine-project.org/projects/dbal.html",
+            "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
+            "homepage": "https://www.doctrine-project.org/projects/lexer.html",
             "keywords": [
-                "abstraction",
-                "database",
-                "db2",
-                "dbal",
-                "mariadb",
-                "mssql",
-                "mysql",
-                "oci8",
-                "oracle",
-                "pdo",
-                "pgsql",
-                "postgresql",
-                "queryobject",
-                "sasql",
-                "sql",
-                "sqlite",
-                "sqlserver",
-                "sqlsrv"
-            ],
-            "support": {
-                "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/3.8.3"
+                "annotations",
+                "docblock",
+                "lexer",
+                "parser",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/doctrine/lexer/issues",
+                "source": "https://github.com/doctrine/lexer/tree/3.0.1"
             },
             "funding": [
                 {
@@ -568,179 +535,166 @@
                     "type": "patreon"
                 },
                 {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdbal",
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-03T15:55:06+00:00"
+            "time": "2024-02-05T11:56:58+00:00"
         },
         {
-            "name": "doctrine/deprecations",
-            "version": "1.1.3",
+            "name": "dragonmantank/cron-expression",
+            "version": "v3.3.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/doctrine/deprecations.git",
-                "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab"
+                "url": "https://github.com/dragonmantank/cron-expression.git",
+                "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
-                "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
+                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/adfb1f505deb6384dc8b39804c5065dd3c8c8c0a",
+                "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1 || ^8.0"
+                "php": "^7.2|^8.0",
+                "webmozart/assert": "^1.0"
             },
-            "require-dev": {
-                "doctrine/coding-standard": "^9",
-                "phpstan/phpstan": "1.4.10 || 1.10.15",
-                "phpstan/phpstan-phpunit": "^1.0",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "psalm/plugin-phpunit": "0.18.4",
-                "psr/log": "^1 || ^2 || ^3",
-                "vimeo/psalm": "4.30.0 || 5.12.0"
+            "replace": {
+                "mtdowling/cron-expression": "^1.0"
             },
-            "suggest": {
-                "psr/log": "Allows logging deprecations via PSR-3 logger implementation"
+            "require-dev": {
+                "phpstan/extension-installer": "^1.0",
+                "phpstan/phpstan": "^1.0",
+                "phpstan/phpstan-webmozart-assert": "^1.0",
+                "phpunit/phpunit": "^7.0|^8.0|^9.0"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations"
+                    "Cron\\": "src/Cron/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
-            "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.",
-            "homepage": "https://www.doctrine-project.org/",
+            "authors": [
+                {
+                    "name": "Chris Tankersley",
+                    "email": "chris@ctankersley.com",
+                    "homepage": "https://github.com/dragonmantank"
+                }
+            ],
+            "description": "CRON for PHP: Calculate the next or previous run date and determine if a CRON expression is due",
+            "keywords": [
+                "cron",
+                "schedule"
+            ],
             "support": {
-                "issues": "https://github.com/doctrine/deprecations/issues",
-                "source": "https://github.com/doctrine/deprecations/tree/1.1.3"
+                "issues": "https://github.com/dragonmantank/cron-expression/issues",
+                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.3"
             },
-            "time": "2024-01-30T19:34:25+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/dragonmantank",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-08-10T19:36:49+00:00"
         },
         {
-            "name": "doctrine/event-manager",
-            "version": "2.0.0",
+            "name": "duncan3dc/bom-string",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/doctrine/event-manager.git",
-                "reference": "750671534e0241a7c50ea5b43f67e23eb5c96f32"
+                "url": "https://github.com/duncan3dc/bom-string.git",
+                "reference": "5133c4747b6cecfe8510c05e86777663a4194f30"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/event-manager/zipball/750671534e0241a7c50ea5b43f67e23eb5c96f32",
-                "reference": "750671534e0241a7c50ea5b43f67e23eb5c96f32",
+                "url": "https://api.github.com/repos/duncan3dc/bom-string/zipball/5133c4747b6cecfe8510c05e86777663a4194f30",
+                "reference": "5133c4747b6cecfe8510c05e86777663a4194f30",
                 "shasum": ""
             },
             "require": {
-                "php": "^8.1"
-            },
-            "conflict": {
-                "doctrine/common": "<2.9"
+                "ext-mbstring": "*",
+                "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^10",
-                "phpstan/phpstan": "^1.8.8",
-                "phpunit/phpunit": "^9.5",
-                "vimeo/psalm": "^4.28"
+                "maglnet/composer-require-checker": "^2.0 || ^3.0",
+                "nikic/php-parser": "^4.12.0",
+                "phpstan/phpstan": "^0.12.100",
+                "phpunit/phpunit": "^8.5.38",
+                "squizlabs/php_codesniffer": "^3.4.3"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Common\\": "src"
+                    "duncan3dc\\Bom\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "Apache-2.0"
             ],
             "authors": [
                 {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                },
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com"
+                    "name": "Craig Duncan",
+                    "email": "git@duncanc.co.uk",
+                    "homepage": "https://github.com/duncan3dc",
+                    "role": "Developer"
                 }
             ],
-            "description": "The Doctrine Event Manager is a simple PHP event system that was built to be used with the various Doctrine projects.",
-            "homepage": "https://www.doctrine-project.org/projects/event-manager.html",
+            "description": "A small PHP library to handle byte order marks (BOM)",
+            "homepage": "https://github.com/duncan3dc/bom-string",
             "keywords": [
-                "event",
-                "event dispatcher",
-                "event manager",
-                "event system",
-                "events"
+                "bom",
+                "utf-16",
+                "utf-8",
+                "utf16",
+                "utf8"
             ],
             "support": {
-                "issues": "https://github.com/doctrine/event-manager/issues",
-                "source": "https://github.com/doctrine/event-manager/tree/2.0.0"
+                "issues": "https://github.com/duncan3dc/bom-string/issues",
+                "source": "https://github.com/duncan3dc/bom-string/tree/1.2.0"
             },
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fevent-manager",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-10-12T20:59:15+00:00"
+            "time": "2024-06-26T11:28:58+00:00"
         },
         {
-            "name": "doctrine/inflector",
-            "version": "2.0.10",
+            "name": "egulias/email-validator",
+            "version": "4.0.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/doctrine/inflector.git",
-                "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc"
+                "url": "https://github.com/egulias/EmailValidator.git",
+                "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc",
-                "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ebaaf5be6c0286928352e054f2d5125608e5405e",
+                "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0"
+                "doctrine/lexer": "^2.0 || ^3.0",
+                "php": ">=8.1",
+                "symfony/polyfill-intl-idn": "^1.26"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^11.0",
-                "phpstan/phpstan": "^1.8",
-                "phpstan/phpstan-phpunit": "^1.1",
-                "phpstan/phpstan-strict-rules": "^1.3",
-                "phpunit/phpunit": "^8.5 || ^9.5",
-                "vimeo/psalm": "^4.25 || ^5.4"
+                "phpunit/phpunit": "^10.2",
+                "vimeo/psalm": "^5.12"
+            },
+            "suggest": {
+                "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Inflector\\": "lib/Doctrine/Inflector"
+                    "Egulias\\EmailValidator\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -749,88 +703,69 @@
             ],
             "authors": [
                 {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
+                    "name": "Eduardo Gulias Davis"
                 }
             ],
-            "description": "PHP Doctrine Inflector is a small library that can perform string manipulations with regard to upper/lowercase and singular/plural forms of words.",
-            "homepage": "https://www.doctrine-project.org/projects/inflector.html",
+            "description": "A library for validating emails against several RFCs",
+            "homepage": "https://github.com/egulias/EmailValidator",
             "keywords": [
-                "inflection",
-                "inflector",
-                "lowercase",
-                "manipulation",
-                "php",
-                "plural",
-                "singular",
-                "strings",
-                "uppercase",
-                "words"
+                "email",
+                "emailvalidation",
+                "emailvalidator",
+                "validation",
+                "validator"
             ],
             "support": {
-                "issues": "https://github.com/doctrine/inflector/issues",
-                "source": "https://github.com/doctrine/inflector/tree/2.0.10"
+                "issues": "https://github.com/egulias/EmailValidator/issues",
+                "source": "https://github.com/egulias/EmailValidator/tree/4.0.2"
             },
             "funding": [
                 {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finflector",
-                    "type": "tidelift"
+                    "url": "https://github.com/egulias",
+                    "type": "github"
                 }
             ],
-            "time": "2024-02-18T20:23:39+00:00"
+            "time": "2023-10-06T06:47:41+00:00"
         },
         {
-            "name": "doctrine/lexer",
-            "version": "3.0.1",
+            "name": "endroid/qr-code",
+            "version": "5.0.9",
             "source": {
                 "type": "git",
-                "url": "https://github.com/doctrine/lexer.git",
-                "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd"
+                "url": "https://github.com/endroid/qr-code.git",
+                "reference": "3dcdfab4c9122874f3915d8bf80a43b9df11852d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd",
-                "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd",
+                "url": "https://api.github.com/repos/endroid/qr-code/zipball/3dcdfab4c9122874f3915d8bf80a43b9df11852d",
+                "reference": "3dcdfab4c9122874f3915d8bf80a43b9df11852d",
                 "shasum": ""
             },
             "require": {
+                "bacon/bacon-qr-code": "^3.0",
                 "php": "^8.1"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^12",
-                "phpstan/phpstan": "^1.10",
-                "phpunit/phpunit": "^10.5",
-                "psalm/plugin-phpunit": "^0.18.3",
-                "vimeo/psalm": "^5.21"
+                "endroid/quality": "dev-main",
+                "ext-gd": "*",
+                "khanamiryan/qrcode-detector-decoder": "^2.0.2",
+                "setasign/fpdf": "^1.8.2"
+            },
+            "suggest": {
+                "ext-gd": "Enables you to write PNG images",
+                "khanamiryan/qrcode-detector-decoder": "Enables you to use the image validator",
+                "roave/security-advisories": "Makes sure package versions with known security issues are not installed",
+                "setasign/fpdf": "Enables you to use the PDF writer"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "5.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Common\\Lexer\\": "src"
+                    "Endroid\\QrCode\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -839,78 +774,55 @@
             ],
             "authors": [
                 {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
+                    "name": "Jeroen van den Enden",
+                    "email": "info@endroid.nl"
                 }
             ],
-            "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
-            "homepage": "https://www.doctrine-project.org/projects/lexer.html",
+            "description": "Endroid QR Code",
+            "homepage": "https://github.com/endroid/qr-code",
             "keywords": [
-                "annotations",
-                "docblock",
-                "lexer",
-                "parser",
-                "php"
+                "code",
+                "endroid",
+                "php",
+                "qr",
+                "qrcode"
             ],
             "support": {
-                "issues": "https://github.com/doctrine/lexer/issues",
-                "source": "https://github.com/doctrine/lexer/tree/3.0.1"
+                "issues": "https://github.com/endroid/qr-code/issues",
+                "source": "https://github.com/endroid/qr-code/tree/5.0.9"
             },
             "funding": [
                 {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer",
-                    "type": "tidelift"
+                    "url": "https://github.com/endroid",
+                    "type": "github"
                 }
             ],
-            "time": "2024-02-05T11:56:58+00:00"
+            "time": "2024-05-08T08:09:28+00:00"
         },
         {
-            "name": "dragonmantank/cron-expression",
-            "version": "v3.3.3",
+            "name": "evenement/evenement",
+            "version": "v3.0.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/dragonmantank/cron-expression.git",
-                "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a"
+                "url": "https://github.com/igorw/evenement.git",
+                "reference": "0a16b0d71ab13284339abb99d9d2bd813640efbc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/adfb1f505deb6384dc8b39804c5065dd3c8c8c0a",
-                "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a",
+                "url": "https://api.github.com/repos/igorw/evenement/zipball/0a16b0d71ab13284339abb99d9d2bd813640efbc",
+                "reference": "0a16b0d71ab13284339abb99d9d2bd813640efbc",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2|^8.0",
-                "webmozart/assert": "^1.0"
-            },
-            "replace": {
-                "mtdowling/cron-expression": "^1.0"
+                "php": ">=7.0"
             },
             "require-dev": {
-                "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "^1.0",
-                "phpstan/phpstan-webmozart-assert": "^1.0",
-                "phpunit/phpunit": "^7.0|^8.0|^9.0"
+                "phpunit/phpunit": "^9 || ^6"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Cron\\": "src/Cron/"
+                    "Evenement\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -919,120 +831,117 @@
             ],
             "authors": [
                 {
-                    "name": "Chris Tankersley",
-                    "email": "chris@ctankersley.com",
-                    "homepage": "https://github.com/dragonmantank"
+                    "name": "Igor Wiedler",
+                    "email": "igor@wiedler.ch"
                 }
             ],
-            "description": "CRON for PHP: Calculate the next or previous run date and determine if a CRON expression is due",
+            "description": "Événement is a very simple event dispatching library for PHP",
             "keywords": [
-                "cron",
-                "schedule"
+                "event-dispatcher",
+                "event-emitter"
             ],
             "support": {
-                "issues": "https://github.com/dragonmantank/cron-expression/issues",
-                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.3"
+                "issues": "https://github.com/igorw/evenement/issues",
+                "source": "https://github.com/igorw/evenement/tree/v3.0.2"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/dragonmantank",
-                    "type": "github"
-                }
-            ],
-            "time": "2023-08-10T19:36:49+00:00"
+            "time": "2023-08-08T05:53:35+00:00"
         },
         {
-            "name": "duncan3dc/bom-string",
-            "version": "1.1.0",
+            "name": "fruitcake/php-cors",
+            "version": "v1.3.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/duncan3dc/bom-string.git",
-                "reference": "7310a919404cff41d8c268251cc794052cbbfab7"
+                "url": "https://github.com/fruitcake/php-cors.git",
+                "reference": "3d158f36e7875e2f040f37bc0573956240a5a38b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/duncan3dc/bom-string/zipball/7310a919404cff41d8c268251cc794052cbbfab7",
-                "reference": "7310a919404cff41d8c268251cc794052cbbfab7",
+                "url": "https://api.github.com/repos/fruitcake/php-cors/zipball/3d158f36e7875e2f040f37bc0573956240a5a38b",
+                "reference": "3d158f36e7875e2f040f37bc0573956240a5a38b",
                 "shasum": ""
             },
             "require": {
-                "ext-mbstring": "*",
-                "php": "^7.2 || ^8.0"
+                "php": "^7.4|^8.0",
+                "symfony/http-foundation": "^4.4|^5.4|^6|^7"
             },
             "require-dev": {
-                "maglnet/composer-require-checker": "^2.0",
-                "phpstan/phpstan": "^0.11.7",
-                "phpunit/phpunit": "^8.1",
-                "squizlabs/php_codesniffer": "^3.4"
+                "phpstan/phpstan": "^1.4",
+                "phpunit/phpunit": "^9",
+                "squizlabs/php_codesniffer": "^3.5"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
-                    "duncan3dc\\Bom\\": "src/"
+                    "Fruitcake\\Cors\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "Apache-2.0"
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Craig Duncan",
-                    "email": "git@duncanc.co.uk",
-                    "homepage": "https://github.com/duncan3dc",
-                    "role": "Developer"
+                    "name": "Fruitcake",
+                    "homepage": "https://fruitcake.nl"
+                },
+                {
+                    "name": "Barryvdh",
+                    "email": "barryvdh@gmail.com"
                 }
             ],
-            "description": "A small PHP library to handle byte order marks (BOM)",
-            "homepage": "https://github.com/duncan3dc/bom-string",
+            "description": "Cross-origin resource sharing library for the Symfony HttpFoundation",
+            "homepage": "https://github.com/fruitcake/php-cors",
             "keywords": [
-                "bom",
-                "utf-16",
-                "utf-8",
-                "utf16",
-                "utf8"
+                "cors",
+                "laravel",
+                "symfony"
             ],
             "support": {
-                "issues": "https://github.com/duncan3dc/bom-string/issues",
-                "source": "https://github.com/duncan3dc/bom-string/tree/1.1.0"
+                "issues": "https://github.com/fruitcake/php-cors/issues",
+                "source": "https://github.com/fruitcake/php-cors/tree/v1.3.0"
             },
-            "time": "2020-10-04T15:23:04+00:00"
+            "funding": [
+                {
+                    "url": "https://fruitcake.nl",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/barryvdh",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-10-12T05:21:21+00:00"
         },
         {
-            "name": "egulias/email-validator",
-            "version": "4.0.2",
+            "name": "graham-campbell/result-type",
+            "version": "v1.1.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/egulias/EmailValidator.git",
-                "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e"
+                "url": "https://github.com/GrahamCampbell/Result-Type.git",
+                "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ebaaf5be6c0286928352e054f2d5125608e5405e",
-                "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e",
+                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/fbd48bce38f73f8a4ec8583362e732e4095e5862",
+                "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862",
                 "shasum": ""
             },
             "require": {
-                "doctrine/lexer": "^2.0 || ^3.0",
-                "php": ">=8.1",
-                "symfony/polyfill-intl-idn": "^1.26"
+                "php": "^7.2.5 || ^8.0",
+                "phpoption/phpoption": "^1.9.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.2",
-                "vimeo/psalm": "^5.12"
-            },
-            "suggest": {
-                "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
+                "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.0.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
-                    "Egulias\\EmailValidator\\": "src"
+                    "GrahamCampbell\\ResultType\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1041,259 +950,9 @@
             ],
             "authors": [
                 {
-                    "name": "Eduardo Gulias Davis"
-                }
-            ],
-            "description": "A library for validating emails against several RFCs",
-            "homepage": "https://github.com/egulias/EmailValidator",
-            "keywords": [
-                "email",
-                "emailvalidation",
-                "emailvalidator",
-                "validation",
-                "validator"
-            ],
-            "support": {
-                "issues": "https://github.com/egulias/EmailValidator/issues",
-                "source": "https://github.com/egulias/EmailValidator/tree/4.0.2"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/egulias",
-                    "type": "github"
-                }
-            ],
-            "time": "2023-10-06T06:47:41+00:00"
-        },
-        {
-            "name": "endroid/qr-code",
-            "version": "4.8.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/endroid/qr-code.git",
-                "reference": "0db25b506a8411a5e1644ebaa67123a6eb7b6a77"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/endroid/qr-code/zipball/0db25b506a8411a5e1644ebaa67123a6eb7b6a77",
-                "reference": "0db25b506a8411a5e1644ebaa67123a6eb7b6a77",
-                "shasum": ""
-            },
-            "require": {
-                "bacon/bacon-qr-code": "^2.0.5",
-                "php": "^8.1"
-            },
-            "conflict": {
-                "khanamiryan/qrcode-detector-decoder": "^1.0.6"
-            },
-            "require-dev": {
-                "endroid/quality": "dev-master",
-                "ext-gd": "*",
-                "khanamiryan/qrcode-detector-decoder": "^1.0.4||^2.0.2",
-                "setasign/fpdf": "^1.8.2"
-            },
-            "suggest": {
-                "ext-gd": "Enables you to write PNG images",
-                "khanamiryan/qrcode-detector-decoder": "Enables you to use the image validator",
-                "roave/security-advisories": "Makes sure package versions with known security issues are not installed",
-                "setasign/fpdf": "Enables you to use the PDF writer"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Endroid\\QrCode\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jeroen van den Enden",
-                    "email": "info@endroid.nl"
-                }
-            ],
-            "description": "Endroid QR Code",
-            "homepage": "https://github.com/endroid/qr-code",
-            "keywords": [
-                "code",
-                "endroid",
-                "php",
-                "qr",
-                "qrcode"
-            ],
-            "support": {
-                "issues": "https://github.com/endroid/qr-code/issues",
-                "source": "https://github.com/endroid/qr-code/tree/4.8.5"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/endroid",
-                    "type": "github"
-                }
-            ],
-            "time": "2023-09-29T14:03:20+00:00"
-        },
-        {
-            "name": "evenement/evenement",
-            "version": "v3.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/igorw/evenement.git",
-                "reference": "0a16b0d71ab13284339abb99d9d2bd813640efbc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/igorw/evenement/zipball/0a16b0d71ab13284339abb99d9d2bd813640efbc",
-                "reference": "0a16b0d71ab13284339abb99d9d2bd813640efbc",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9 || ^6"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Evenement\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Igor Wiedler",
-                    "email": "igor@wiedler.ch"
-                }
-            ],
-            "description": "Événement is a very simple event dispatching library for PHP",
-            "keywords": [
-                "event-dispatcher",
-                "event-emitter"
-            ],
-            "support": {
-                "issues": "https://github.com/igorw/evenement/issues",
-                "source": "https://github.com/igorw/evenement/tree/v3.0.2"
-            },
-            "time": "2023-08-08T05:53:35+00:00"
-        },
-        {
-            "name": "fruitcake/php-cors",
-            "version": "v1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/fruitcake/php-cors.git",
-                "reference": "3d158f36e7875e2f040f37bc0573956240a5a38b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/fruitcake/php-cors/zipball/3d158f36e7875e2f040f37bc0573956240a5a38b",
-                "reference": "3d158f36e7875e2f040f37bc0573956240a5a38b",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.4|^8.0",
-                "symfony/http-foundation": "^4.4|^5.4|^6|^7"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "^1.4",
-                "phpunit/phpunit": "^9",
-                "squizlabs/php_codesniffer": "^3.5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Fruitcake\\Cors\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fruitcake",
-                    "homepage": "https://fruitcake.nl"
-                },
-                {
-                    "name": "Barryvdh",
-                    "email": "barryvdh@gmail.com"
-                }
-            ],
-            "description": "Cross-origin resource sharing library for the Symfony HttpFoundation",
-            "homepage": "https://github.com/fruitcake/php-cors",
-            "keywords": [
-                "cors",
-                "laravel",
-                "symfony"
-            ],
-            "support": {
-                "issues": "https://github.com/fruitcake/php-cors/issues",
-                "source": "https://github.com/fruitcake/php-cors/tree/v1.3.0"
-            },
-            "funding": [
-                {
-                    "url": "https://fruitcake.nl",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/barryvdh",
-                    "type": "github"
-                }
-            ],
-            "time": "2023-10-12T05:21:21+00:00"
-        },
-        {
-            "name": "graham-campbell/result-type",
-            "version": "v1.1.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/GrahamCampbell/Result-Type.git",
-                "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/fbd48bce38f73f8a4ec8583362e732e4095e5862",
-                "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2.5 || ^8.0",
-                "phpoption/phpoption": "^1.9.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "GrahamCampbell\\ResultType\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Graham Campbell",
-                    "email": "hello@gjcampbell.co.uk",
-                    "homepage": "https://github.com/GrahamCampbell"
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
                 }
             ],
             "description": "An Implementation Of The Result Type",
@@ -1794,16 +1453,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v10.48.4",
+            "version": "v11.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "7e0701bf59cb76a51f7c1f7bea51c0c0c29c0b72"
+                "reference": "ba85f1c019bed59b3c736c9c4502805efd0ba84b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/7e0701bf59cb76a51f7c1f7bea51c0c0c29c0b72",
-                "reference": "7e0701bf59cb76a51f7c1f7bea51c0c0c29c0b72",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/ba85f1c019bed59b3c736c9c4502805efd0ba84b",
+                "reference": "ba85f1c019bed59b3c736c9c4502805efd0ba84b",
                 "shasum": ""
             },
             "require": {
@@ -1819,44 +1478,44 @@
                 "ext-openssl": "*",
                 "ext-session": "*",
                 "ext-tokenizer": "*",
-                "fruitcake/php-cors": "^1.2",
+                "fruitcake/php-cors": "^1.3",
+                "guzzlehttp/guzzle": "^7.8",
                 "guzzlehttp/uri-template": "^1.0",
-                "laravel/prompts": "^0.1.9",
+                "laravel/prompts": "^0.1.18",
                 "laravel/serializable-closure": "^1.3",
                 "league/commonmark": "^2.2.1",
                 "league/flysystem": "^3.8.0",
                 "monolog/monolog": "^3.0",
-                "nesbot/carbon": "^2.67",
-                "nunomaduro/termwind": "^1.13",
-                "php": "^8.1",
+                "nesbot/carbon": "^2.72.2|^3.0",
+                "nunomaduro/termwind": "^2.0",
+                "php": "^8.2",
                 "psr/container": "^1.1.1|^2.0.1",
                 "psr/log": "^1.0|^2.0|^3.0",
                 "psr/simple-cache": "^1.0|^2.0|^3.0",
                 "ramsey/uuid": "^4.7",
-                "symfony/console": "^6.2",
-                "symfony/error-handler": "^6.2",
-                "symfony/finder": "^6.2",
-                "symfony/http-foundation": "^6.4",
-                "symfony/http-kernel": "^6.2",
-                "symfony/mailer": "^6.2",
-                "symfony/mime": "^6.2",
-                "symfony/process": "^6.2",
-                "symfony/routing": "^6.2",
-                "symfony/uid": "^6.2",
-                "symfony/var-dumper": "^6.2",
+                "symfony/console": "^7.0",
+                "symfony/error-handler": "^7.0",
+                "symfony/finder": "^7.0",
+                "symfony/http-foundation": "^7.0",
+                "symfony/http-kernel": "^7.0",
+                "symfony/mailer": "^7.0",
+                "symfony/mime": "^7.0",
+                "symfony/polyfill-php83": "^1.28",
+                "symfony/process": "^7.0",
+                "symfony/routing": "^7.0",
+                "symfony/uid": "^7.0",
+                "symfony/var-dumper": "^7.0",
                 "tijsverkoyen/css-to-inline-styles": "^2.2.5",
                 "vlucas/phpdotenv": "^5.4.1",
                 "voku/portable-ascii": "^2.0"
             },
             "conflict": {
-                "carbonphp/carbon-doctrine-types": ">=3.0",
-                "doctrine/dbal": ">=4.0",
                 "mockery/mockery": "1.6.8",
-                "phpunit/phpunit": ">=11.0.0",
                 "tightenco/collect": "<5.5.33"
             },
             "provide": {
                 "psr/container-implementation": "1.1|2.0",
+                "psr/log-implementation": "1.0|2.0|3.0",
                 "psr/simple-cache-implementation": "1.0|2.0|3.0"
             },
             "replace": {
@@ -1892,36 +1551,35 @@
                 "illuminate/testing": "self.version",
                 "illuminate/translation": "self.version",
                 "illuminate/validation": "self.version",
-                "illuminate/view": "self.version"
+                "illuminate/view": "self.version",
+                "spatie/once": "*"
             },
             "require-dev": {
                 "ably/ably-php": "^1.0",
                 "aws/aws-sdk-php": "^3.235.5",
-                "doctrine/dbal": "^3.5.1",
                 "ext-gmp": "*",
-                "fakerphp/faker": "^1.21",
-                "guzzlehttp/guzzle": "^7.5",
+                "fakerphp/faker": "^1.23",
                 "league/flysystem-aws-s3-v3": "^3.0",
                 "league/flysystem-ftp": "^3.0",
                 "league/flysystem-path-prefixing": "^3.3",
                 "league/flysystem-read-only": "^3.3",
                 "league/flysystem-sftp-v3": "^3.0",
-                "mockery/mockery": "^1.5.1",
+                "mockery/mockery": "^1.6",
                 "nyholm/psr7": "^1.2",
-                "orchestra/testbench-core": "^8.23.4",
-                "pda/pheanstalk": "^4.0",
-                "phpstan/phpstan": "^1.4.7",
-                "phpunit/phpunit": "^10.0.7",
+                "orchestra/testbench-core": "^9.1.5",
+                "pda/pheanstalk": "^5.0",
+                "phpstan/phpstan": "^1.11.5",
+                "phpunit/phpunit": "^10.5|^11.0",
                 "predis/predis": "^2.0.2",
-                "symfony/cache": "^6.2",
-                "symfony/http-client": "^6.2.4",
-                "symfony/psr-http-message-bridge": "^2.0"
+                "resend/resend-php": "^0.10.0",
+                "symfony/cache": "^7.0",
+                "symfony/http-client": "^7.0",
+                "symfony/psr-http-message-bridge": "^7.0"
             },
             "suggest": {
                 "ably/ably-php": "Required to use the Ably broadcast driver (^1.0).",
                 "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.235.5).",
-                "brianium/paratest": "Required to run tests in parallel (^6.0).",
-                "doctrine/dbal": "Required to rename columns and drop SQLite columns (^3.5.1).",
+                "brianium/paratest": "Required to run tests in parallel (^7.0|^8.0).",
                 "ext-apcu": "Required to use the APC cache driver.",
                 "ext-fileinfo": "Required to use the Filesystem class.",
                 "ext-ftp": "Required to use the Flysystem FTP driver.",
@@ -1930,34 +1588,34 @@
                 "ext-pcntl": "Required to use all features of the queue worker and console signal trapping.",
                 "ext-pdo": "Required to use all database features.",
                 "ext-posix": "Required to use all features of the queue worker.",
-                "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0).",
+                "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0|^6.0).",
                 "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
                 "filp/whoops": "Required for friendly error pages in development (^2.14.3).",
-                "guzzlehttp/guzzle": "Required to use the HTTP Client and the ping methods on schedules (^7.5).",
                 "laravel/tinker": "Required to use the tinker console command (^2.0).",
                 "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.0).",
                 "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.0).",
                 "league/flysystem-path-prefixing": "Required to use the scoped driver (^3.3).",
                 "league/flysystem-read-only": "Required to use read-only disks (^3.3)",
                 "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.0).",
-                "mockery/mockery": "Required to use mocking (^1.5.1).",
+                "mockery/mockery": "Required to use mocking (^1.6).",
                 "nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).",
-                "pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).",
-                "phpunit/phpunit": "Required to use assertions and run tests (^9.5.8|^10.0.7).",
+                "pda/pheanstalk": "Required to use the beanstalk queue driver (^5.0).",
+                "phpunit/phpunit": "Required to use assertions and run tests (^10.5|^11.0).",
                 "predis/predis": "Required to use the predis connector (^2.0.2).",
                 "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
                 "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).",
-                "symfony/cache": "Required to PSR-6 cache bridge (^6.2).",
-                "symfony/filesystem": "Required to enable support for relative symbolic links (^6.2).",
-                "symfony/http-client": "Required to enable support for the Symfony API mail transports (^6.2).",
-                "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^6.2).",
-                "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^6.2).",
-                "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0)."
+                "resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0).",
+                "symfony/cache": "Required to PSR-6 cache bridge (^7.0).",
+                "symfony/filesystem": "Required to enable support for relative symbolic links (^7.0).",
+                "symfony/http-client": "Required to enable support for the Symfony API mail transports (^7.0).",
+                "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.0).",
+                "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.0).",
+                "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.0)."
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "10.x-dev"
+                    "dev-master": "11.x-dev"
                 }
             },
             "autoload": {
@@ -1997,20 +1655,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-03-21T13:36:36+00:00"
+            "time": "2024-07-09T15:38:12+00:00"
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.1.17",
+            "version": "v0.1.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "8ee9f87f7f9eadcbe21e9e72cd4176b2f06cd5b5"
+                "reference": "409b0b4305273472f3754826e68f4edbd0150149"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/8ee9f87f7f9eadcbe21e9e72cd4176b2f06cd5b5",
-                "reference": "8ee9f87f7f9eadcbe21e9e72cd4176b2f06cd5b5",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/409b0b4305273472f3754826e68f4edbd0150149",
+                "reference": "409b0b4305273472f3754826e68f4edbd0150149",
                 "shasum": ""
             },
             "require": {
@@ -2050,11 +1708,12 @@
             "license": [
                 "MIT"
             ],
+            "description": "Add beautiful and user-friendly forms to your command-line applications.",
             "support": {
                 "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.1.17"
+                "source": "https://github.com/laravel/prompts/tree/v0.1.24"
             },
-            "time": "2024-03-13T16:05:43+00:00"
+            "time": "2024-06-17T13:58:22+00:00"
         },
         {
             "name": "laravel/serializable-closure",
@@ -2184,16 +1843,16 @@
         },
         {
             "name": "laravel/ui",
-            "version": "v4.5.1",
+            "version": "v4.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/ui.git",
-                "reference": "a3562953123946996a503159199d6742d5534e61"
+                "reference": "c75396f63268c95b053c8e4814eb70e0875e9628"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/ui/zipball/a3562953123946996a503159199d6742d5534e61",
-                "reference": "a3562953123946996a503159199d6742d5534e61",
+                "url": "https://api.github.com/repos/laravel/ui/zipball/c75396f63268c95b053c8e4814eb70e0875e9628",
+                "reference": "c75396f63268c95b053c8e4814eb70e0875e9628",
                 "shasum": ""
             },
             "require": {
@@ -2241,9 +1900,9 @@
                 "ui"
             ],
             "support": {
-                "source": "https://github.com/laravel/ui/tree/v4.5.1"
+                "source": "https://github.com/laravel/ui/tree/v4.5.2"
             },
-            "time": "2024-03-21T18:12:29+00:00"
+            "time": "2024-05-08T18:07:10+00:00"
         },
         {
             "name": "league/commonmark",
@@ -2435,16 +2094,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "3.26.0",
+            "version": "3.28.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "072735c56cc0da00e10716dd90d5a7f7b40b36be"
+                "reference": "e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/072735c56cc0da00e10716dd90d5a7f7b40b36be",
-                "reference": "072735c56cc0da00e10716dd90d5a7f7b40b36be",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c",
+                "reference": "e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c",
                 "shasum": ""
             },
             "require": {
@@ -2468,10 +2127,13 @@
                 "composer/semver": "^3.0",
                 "ext-fileinfo": "*",
                 "ext-ftp": "*",
+                "ext-mongodb": "^1.3",
                 "ext-zip": "*",
                 "friendsofphp/php-cs-fixer": "^3.5",
                 "google/cloud-storage": "^1.23",
+                "guzzlehttp/psr7": "^2.6",
                 "microsoft/azure-storage-blob": "^1.1",
+                "mongodb/mongodb": "^1.2",
                 "phpseclib/phpseclib": "^3.0.36",
                 "phpstan/phpstan": "^1.10",
                 "phpunit/phpunit": "^9.5.11|^10.0",
@@ -2509,32 +2171,22 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.26.0"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.28.0"
             },
-            "funding": [
-                {
-                    "url": "https://ecologi.com/frankdejonge",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/frankdejonge",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-03-25T11:49:53+00:00"
+            "time": "2024-05-22T10:09:12+00:00"
         },
         {
             "name": "league/flysystem-local",
-            "version": "3.25.1",
+            "version": "3.28.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-local.git",
-                "reference": "61a6a90d6e999e4ddd9ce5adb356de0939060b92"
+                "reference": "13f22ea8be526ea58c2ddff9e158ef7c296e4f40"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/61a6a90d6e999e4ddd9ce5adb356de0939060b92",
-                "reference": "61a6a90d6e999e4ddd9ce5adb356de0939060b92",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/13f22ea8be526ea58c2ddff9e158ef7c296e4f40",
+                "reference": "13f22ea8be526ea58c2ddff9e158ef7c296e4f40",
                 "shasum": ""
             },
             "require": {
@@ -2568,19 +2220,9 @@
                 "local"
             ],
             "support": {
-                "source": "https://github.com/thephpleague/flysystem-local/tree/3.25.1"
+                "source": "https://github.com/thephpleague/flysystem-local/tree/3.28.0"
             },
-            "funding": [
-                {
-                    "url": "https://ecologi.com/frankdejonge",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/frankdejonge",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-03-15T19:58:44+00:00"
+            "time": "2024-05-06T20:05:52+00:00"
         },
         {
             "name": "league/mime-type-detection",
@@ -2640,16 +2282,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "3.5.0",
+            "version": "3.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "c915e2634718dbc8a4a15c61b0e62e7a44e14448"
+                "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c915e2634718dbc8a4a15c61b0e62e7a44e14448",
-                "reference": "c915e2634718dbc8a4a15c61b0e62e7a44e14448",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f4393b648b78a5408747de94fca38beb5f7e9ef8",
+                "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8",
                 "shasum": ""
             },
             "require": {
@@ -2672,7 +2314,7 @@
                 "phpstan/phpstan": "^1.9",
                 "phpstan/phpstan-deprecation-rules": "^1.0",
                 "phpstan/phpstan-strict-rules": "^1.4",
-                "phpunit/phpunit": "^10.1",
+                "phpunit/phpunit": "^10.5.17",
                 "predis/predis": "^1.1 || ^2",
                 "ruflin/elastica": "^7",
                 "symfony/mailer": "^5.4 || ^6",
@@ -2725,7 +2367,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/3.5.0"
+                "source": "https://github.com/Seldaek/monolog/tree/3.7.0"
             },
             "funding": [
                 {
@@ -2737,31 +2379,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-10-27T15:32:31+00:00"
+            "time": "2024-06-28T09:40:51+00:00"
         },
         {
             "name": "msurguy/honeypot",
-            "version": "1.2.0",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/msurguy/Honeypot.git",
-                "reference": "2c8c5d70fcf39294aa042b4e7ffe194ea19698d0"
+                "reference": "9442256826f6416c3748813ed652ccf8a6ee9d77"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/msurguy/Honeypot/zipball/2c8c5d70fcf39294aa042b4e7ffe194ea19698d0",
-                "reference": "2c8c5d70fcf39294aa042b4e7ffe194ea19698d0",
+                "url": "https://api.github.com/repos/msurguy/Honeypot/zipball/9442256826f6416c3748813ed652ccf8a6ee9d77",
+                "reference": "9442256826f6416c3748813ed652ccf8a6ee9d77",
                 "shasum": ""
             },
             "require": {
-                "illuminate/config": "4.*|5.*|6.*|7.*|8.*|9.*|^10.0",
-                "illuminate/support": "4.*|5.*|6.*|7.*|8.*|9.*|^10.0",
-                "illuminate/translation": "4.*|5.*|6.*|7.*|8.*|9.*|^10.0",
+                "illuminate/config": "4.*|5.*|6.*|7.*|8.*|9.*|^10.0|^11.0",
+                "illuminate/support": "4.*|5.*|6.*|7.*|8.*|9.*|^10.0|^11.0",
+                "illuminate/translation": "4.*|5.*|6.*|7.*|8.*|9.*|^10.0|^11.0",
                 "php": ">=5.3.0"
             },
             "require-dev": {
                 "mockery/mockery": "0.9.*|^1.4.4",
-                "phpunit/phpunit": "4.0.*|^9.5.10"
+                "phpunit/phpunit": "4.0.*|^9.5.10|^10.5"
             },
             "type": "library",
             "extra": {
@@ -2798,48 +2440,47 @@
             ],
             "support": {
                 "issues": "https://github.com/msurguy/Honeypot/issues",
-                "source": "https://github.com/msurguy/Honeypot/tree/1.2.0"
+                "source": "https://github.com/msurguy/Honeypot/tree/1.3.0"
             },
-            "time": "2023-01-30T22:58:33+00:00"
+            "time": "2024-05-03T21:55:03+00:00"
         },
         {
             "name": "nesbot/carbon",
-            "version": "2.72.3",
+            "version": "3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "0c6fd108360c562f6e4fd1dedb8233b423e91c83"
+                "reference": "39c8ef752db6865717cc3fba63970c16f057982c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/0c6fd108360c562f6e4fd1dedb8233b423e91c83",
-                "reference": "0c6fd108360c562f6e4fd1dedb8233b423e91c83",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/39c8ef752db6865717cc3fba63970c16f057982c",
+                "reference": "39c8ef752db6865717cc3fba63970c16f057982c",
                 "shasum": ""
             },
             "require": {
                 "carbonphp/carbon-doctrine-types": "*",
                 "ext-json": "*",
-                "php": "^7.1.8 || ^8.0",
+                "php": "^8.1",
                 "psr/clock": "^1.0",
+                "symfony/clock": "^6.3 || ^7.0",
                 "symfony/polyfill-mbstring": "^1.0",
-                "symfony/polyfill-php80": "^1.16",
-                "symfony/translation": "^3.4 || ^4.0 || ^5.0 || ^6.0"
+                "symfony/translation": "^4.4.18 || ^5.2.1|| ^6.0 || ^7.0"
             },
             "provide": {
                 "psr/clock-implementation": "1.0"
             },
             "require-dev": {
-                "doctrine/dbal": "^2.0 || ^3.1.4 || ^4.0",
-                "doctrine/orm": "^2.7 || ^3.0",
-                "friendsofphp/php-cs-fixer": "^3.0",
-                "kylekatarnls/multi-tester": "^2.0",
-                "ondrejmirtes/better-reflection": "*",
-                "phpmd/phpmd": "^2.9",
-                "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "^0.12.99 || ^1.7.14",
-                "phpunit/php-file-iterator": "^2.0.5 || ^3.0.6",
-                "phpunit/phpunit": "^7.5.20 || ^8.5.26 || ^9.5.20",
-                "squizlabs/php_codesniffer": "^3.4"
+                "doctrine/dbal": "^3.6.3 || ^4.0",
+                "doctrine/orm": "^2.15.2 || ^3.0",
+                "friendsofphp/php-cs-fixer": "^3.57.2",
+                "kylekatarnls/multi-tester": "^2.5.3",
+                "ondrejmirtes/better-reflection": "^6.25.0.4",
+                "phpmd/phpmd": "^2.15.0",
+                "phpstan/extension-installer": "^1.3.1",
+                "phpstan/phpstan": "^1.11.2",
+                "phpunit/phpunit": "^10.5.20",
+                "squizlabs/php_codesniffer": "^3.9.0"
             },
             "bin": [
                 "bin/carbon"
@@ -2847,8 +2488,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-3.x": "3.x-dev",
-                    "dev-master": "2.x-dev"
+                    "dev-master": "3.x-dev",
+                    "dev-2.x": "2.x-dev"
                 },
                 "laravel": {
                     "providers": [
@@ -2907,7 +2548,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-25T10:35:09+00:00"
+            "time": "2024-06-20T15:52:59+00:00"
         },
         {
             "name": "nette/schema",
@@ -3115,33 +2756,32 @@
         },
         {
             "name": "nunomaduro/termwind",
-            "version": "v1.15.1",
+            "version": "v2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/termwind.git",
-                "reference": "8ab0b32c8caa4a2e09700ea32925441385e4a5dc"
+                "reference": "58c4c58cf23df7f498daeb97092e34f5259feb6a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/8ab0b32c8caa4a2e09700ea32925441385e4a5dc",
-                "reference": "8ab0b32c8caa4a2e09700ea32925441385e4a5dc",
+                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/58c4c58cf23df7f498daeb97092e34f5259feb6a",
+                "reference": "58c4c58cf23df7f498daeb97092e34f5259feb6a",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
-                "php": "^8.0",
-                "symfony/console": "^5.3.0|^6.0.0"
+                "php": "^8.2",
+                "symfony/console": "^7.0.4"
             },
             "require-dev": {
-                "ergebnis/phpstan-rules": "^1.0.",
-                "illuminate/console": "^8.0|^9.0",
-                "illuminate/support": "^8.0|^9.0",
-                "laravel/pint": "^1.0.0",
-                "pestphp/pest": "^1.21.0",
-                "pestphp/pest-plugin-mock": "^1.0",
-                "phpstan/phpstan": "^1.4.6",
-                "phpstan/phpstan-strict-rules": "^1.1.0",
-                "symfony/var-dumper": "^5.2.7|^6.0.0",
+                "ergebnis/phpstan-rules": "^2.2.0",
+                "illuminate/console": "^11.0.0",
+                "laravel/pint": "^1.14.0",
+                "mockery/mockery": "^1.6.7",
+                "pestphp/pest": "^2.34.1",
+                "phpstan/phpstan": "^1.10.59",
+                "phpstan/phpstan-strict-rules": "^1.5.2",
+                "symfony/var-dumper": "^7.0.4",
                 "thecodingmachine/phpstan-strict-rules": "^1.0.0"
             },
             "type": "library",
@@ -3150,6 +2790,9 @@
                     "providers": [
                         "Termwind\\Laravel\\TermwindServiceProvider"
                     ]
+                },
+                "branch-alias": {
+                    "dev-2.x": "2.x-dev"
                 }
             },
             "autoload": {
@@ -3181,7 +2824,7 @@
             ],
             "support": {
                 "issues": "https://github.com/nunomaduro/termwind/issues",
-                "source": "https://github.com/nunomaduro/termwind/tree/v1.15.1"
+                "source": "https://github.com/nunomaduro/termwind/tree/v2.0.1"
             },
             "funding": [
                 {
@@ -3197,7 +2840,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-08T01:06:31+00:00"
+            "time": "2024-03-06T16:17:14+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -3251,16 +2894,16 @@
         },
         {
             "name": "paragonie/sodium_compat",
-            "version": "v1.20.0",
+            "version": "v1.21.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/sodium_compat.git",
-                "reference": "e592a3e06d1fa0d43988c7c7d9948ca836f644b6"
+                "reference": "bb312875dcdd20680419564fe42ba1d9564b9e37"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/e592a3e06d1fa0d43988c7c7d9948ca836f644b6",
-                "reference": "e592a3e06d1fa0d43988c7c7d9948ca836f644b6",
+                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/bb312875dcdd20680419564fe42ba1d9564b9e37",
+                "reference": "bb312875dcdd20680419564fe42ba1d9564b9e37",
                 "shasum": ""
             },
             "require": {
@@ -3331,9 +2974,9 @@
             ],
             "support": {
                 "issues": "https://github.com/paragonie/sodium_compat/issues",
-                "source": "https://github.com/paragonie/sodium_compat/tree/v1.20.0"
+                "source": "https://github.com/paragonie/sodium_compat/tree/v1.21.1"
             },
-            "time": "2023-04-30T00:54:53+00:00"
+            "time": "2024-04-22T22:05:04+00:00"
         },
         {
             "name": "pgvector/pgvector",
@@ -3805,20 +3448,20 @@
         },
         {
             "name": "psr/http-factory",
-            "version": "1.0.2",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-factory.git",
-                "reference": "e616d01114759c4c489f93b099585439f795fe35"
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
-                "reference": "e616d01114759c4c489f93b099585439f795fe35",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0.0",
+                "php": ">=7.1",
                 "psr/http-message": "^1.0 || ^2.0"
             },
             "type": "library",
@@ -3842,7 +3485,7 @@
                     "homepage": "https://www.php-fig.org/"
                 }
             ],
-            "description": "Common interfaces for PSR-7 HTTP message factories",
+            "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
             "keywords": [
                 "factory",
                 "http",
@@ -3854,9 +3497,9 @@
                 "response"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-factory/tree/1.0.2"
+                "source": "https://github.com/php-fig/http-factory"
             },
-            "time": "2023-04-10T20:10:41+00:00"
+            "time": "2024-04-15T12:06:14+00:00"
         },
         {
             "name": "psr/http-message",
@@ -4014,16 +3657,16 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.12.3",
+            "version": "v0.12.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73"
+                "reference": "2fd717afa05341b4f8152547f142cd2f130f6818"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73",
-                "reference": "b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/2fd717afa05341b4f8152547f142cd2f130f6818",
+                "reference": "2fd717afa05341b4f8152547f142cd2f130f6818",
                 "shasum": ""
             },
             "require": {
@@ -4087,9 +3730,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.12.3"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.12.4"
             },
-            "time": "2024-04-02T15:57:53+00:00"
+            "time": "2024-06-10T01:18:23+00:00"
         },
         {
             "name": "pusher/pusher-php-server",
@@ -4287,20 +3930,20 @@
         },
         {
             "name": "ramsey/uuid",
-            "version": "4.7.5",
+            "version": "4.7.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
-                "reference": "5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e"
+                "reference": "91039bc1faa45ba123c4328958e620d382ec7088"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e",
-                "reference": "5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/91039bc1faa45ba123c4328958e620d382ec7088",
+                "reference": "91039bc1faa45ba123c4328958e620d382ec7088",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11",
+                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12",
                 "ext-json": "*",
                 "php": "^8.0",
                 "ramsey/collection": "^1.2 || ^2.0"
@@ -4363,7 +4006,7 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/uuid/issues",
-                "source": "https://github.com/ramsey/uuid/tree/4.7.5"
+                "source": "https://github.com/ramsey/uuid/tree/4.7.6"
             },
             "funding": [
                 {
@@ -4375,74 +4018,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-08T05:53:05+00:00"
-        },
-        {
-            "name": "ramsey/uuid-doctrine",
-            "version": "1.8.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ramsey/uuid-doctrine.git",
-                "reference": "6867db3f39b9088dd8909b2523c1d2bfe274e541"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid-doctrine/zipball/6867db3f39b9088dd8909b2523c1d2bfe274e541",
-                "reference": "6867db3f39b9088dd8909b2523c1d2bfe274e541",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/dbal": "^2.5 || ^3.0",
-                "php": "^5.4 || ^7 || ^8",
-                "ramsey/uuid": "^3.5 || ^4"
-            },
-            "require-dev": {
-                "doctrine/orm": "^2.5",
-                "mockery/mockery": "^0.9.11 || ^1",
-                "php-parallel-lint/php-parallel-lint": "^1",
-                "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7 || ^8 || ^9",
-                "squizlabs/php_codesniffer": "^3.5"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Ramsey\\Uuid\\Doctrine\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Ben Ramsey",
-                    "email": "ben@benramsey.com",
-                    "homepage": "https://benramsey.com"
-                }
-            ],
-            "description": "Use ramsey/uuid as a Doctrine field type.",
-            "keywords": [
-                "database",
-                "doctrine",
-                "guid",
-                "identifier",
-                "uuid"
-            ],
-            "support": {
-                "issues": "https://github.com/ramsey/uuid-doctrine/issues",
-                "source": "https://github.com/ramsey/uuid-doctrine/tree/1.8.2"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/ramsey",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/ramsey/uuid-doctrine",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-11-03T19:30:26+00:00"
+            "time": "2024-04-27T21:32:50+00:00"
         },
         {
             "name": "spatie/temporary-directory",
@@ -4507,31 +4083,32 @@
         },
         {
             "name": "symfony/cache",
-            "version": "v6.4.6",
+            "version": "v7.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache.git",
-                "reference": "b59bbf9c093b592d77110f9ee70c74dff89294cb"
+                "reference": "e933e1d947ffb88efcdd34a2bd51561cab7deaae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/b59bbf9c093b592d77110f9ee70c74dff89294cb",
-                "reference": "b59bbf9c093b592d77110f9ee70c74dff89294cb",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/e933e1d947ffb88efcdd34a2bd51561cab7deaae",
+                "reference": "e933e1d947ffb88efcdd34a2bd51561cab7deaae",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "psr/cache": "^2.0|^3.0",
                 "psr/log": "^1.1|^2|^3",
                 "symfony/cache-contracts": "^2.5|^3",
+                "symfony/deprecation-contracts": "^2.5|^3.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/var-exporter": "^6.3.6|^7.0"
+                "symfony/var-exporter": "^6.4|^7.0"
             },
             "conflict": {
-                "doctrine/dbal": "<2.13.1",
-                "symfony/dependency-injection": "<5.4",
-                "symfony/http-kernel": "<5.4",
-                "symfony/var-dumper": "<5.4"
+                "doctrine/dbal": "<3.6",
+                "symfony/dependency-injection": "<6.4",
+                "symfony/http-kernel": "<6.4",
+                "symfony/var-dumper": "<6.4"
             },
             "provide": {
                 "psr/cache-implementation": "2.0|3.0",
@@ -4540,15 +4117,15 @@
             },
             "require-dev": {
                 "cache/integration-tests": "dev-master",
-                "doctrine/dbal": "^2.13.1|^3|^4",
+                "doctrine/dbal": "^3.6|^4",
                 "predis/predis": "^1.1|^2.0",
                 "psr/simple-cache": "^1.0|^2.0|^3.0",
-                "symfony/config": "^5.4|^6.0|^7.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/filesystem": "^5.4|^6.0|^7.0",
-                "symfony/http-kernel": "^5.4|^6.0|^7.0",
-                "symfony/messenger": "^5.4|^6.0|^7.0",
-                "symfony/var-dumper": "^5.4|^6.0|^7.0"
+                "symfony/config": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/filesystem": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/messenger": "^6.4|^7.0",
+                "symfony/var-dumper": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -4583,7 +4160,7 @@
                 "psr6"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache/tree/v6.4.6"
+                "source": "https://github.com/symfony/cache/tree/v7.1.2"
             },
             "funding": [
                 {
@@ -4599,20 +4176,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-27T13:27:42+00:00"
+            "time": "2024-06-11T13:32:38+00:00"
         },
         {
             "name": "symfony/cache-contracts",
-            "version": "v3.4.2",
+            "version": "v3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache-contracts.git",
-                "reference": "2c9db6509a1b21dad229606897639d3284f54b2a"
+                "reference": "df6a1a44c890faded49a5fca33c2d5c5fd3c2197"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/2c9db6509a1b21dad229606897639d3284f54b2a",
-                "reference": "2c9db6509a1b21dad229606897639d3284f54b2a",
+                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/df6a1a44c890faded49a5fca33c2d5c5fd3c2197",
+                "reference": "df6a1a44c890faded49a5fca33c2d5c5fd3c2197",
                 "shasum": ""
             },
             "require": {
@@ -4622,7 +4199,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.4-dev"
+                    "dev-main": "3.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -4659,7 +4236,81 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache-contracts/tree/v3.4.2"
+                "source": "https://github.com/symfony/cache-contracts/tree/v3.5.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-04-18T09:32:20+00:00"
+        },
+        {
+            "name": "symfony/clock",
+            "version": "v7.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/clock.git",
+                "reference": "3dfc8b084853586de51dd1441c6242c76a28cbe7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/clock/zipball/3dfc8b084853586de51dd1441c6242c76a28cbe7",
+                "reference": "3dfc8b084853586de51dd1441c6242c76a28cbe7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "psr/clock": "^1.0",
+                "symfony/polyfill-php83": "^1.28"
+            },
+            "provide": {
+                "psr/clock-implementation": "1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "Resources/now.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Component\\Clock\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Decouples applications from the system clock",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "clock",
+                "psr20",
+                "time"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/clock/tree/v7.1.1"
             },
             "funding": [
                 {
@@ -4675,51 +4326,50 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T14:51:35+00:00"
+            "time": "2024-05-31T14:57:53+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v6.4.6",
+            "version": "v7.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "a2708a5da5c87d1d0d52937bdeac625df659e11f"
+                "reference": "0aa29ca177f432ab68533432db0de059f39c92ae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/a2708a5da5c87d1d0d52937bdeac625df659e11f",
-                "reference": "a2708a5da5c87d1d0d52937bdeac625df659e11f",
+                "url": "https://api.github.com/repos/symfony/console/zipball/0aa29ca177f432ab68533432db0de059f39c92ae",
+                "reference": "0aa29ca177f432ab68533432db0de059f39c92ae",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.5|^3",
+                "php": ">=8.2",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/string": "^5.4|^6.0|^7.0"
+                "symfony/string": "^6.4|^7.0"
             },
             "conflict": {
-                "symfony/dependency-injection": "<5.4",
-                "symfony/dotenv": "<5.4",
-                "symfony/event-dispatcher": "<5.4",
-                "symfony/lock": "<5.4",
-                "symfony/process": "<5.4"
+                "symfony/dependency-injection": "<6.4",
+                "symfony/dotenv": "<6.4",
+                "symfony/event-dispatcher": "<6.4",
+                "symfony/lock": "<6.4",
+                "symfony/process": "<6.4"
             },
             "provide": {
                 "psr/log-implementation": "1.0|2.0|3.0"
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0|^7.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+                "symfony/config": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/event-dispatcher": "^6.4|^7.0",
                 "symfony/http-foundation": "^6.4|^7.0",
                 "symfony/http-kernel": "^6.4|^7.0",
-                "symfony/lock": "^5.4|^6.0|^7.0",
-                "symfony/messenger": "^5.4|^6.0|^7.0",
-                "symfony/process": "^5.4|^6.0|^7.0",
-                "symfony/stopwatch": "^5.4|^6.0|^7.0",
-                "symfony/var-dumper": "^5.4|^6.0|^7.0"
+                "symfony/lock": "^6.4|^7.0",
+                "symfony/messenger": "^6.4|^7.0",
+                "symfony/process": "^6.4|^7.0",
+                "symfony/stopwatch": "^6.4|^7.0",
+                "symfony/var-dumper": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -4753,7 +4403,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.4.6"
+                "source": "https://github.com/symfony/console/tree/v7.1.2"
             },
             "funding": [
                 {
@@ -4769,24 +4419,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-29T19:07:53+00:00"
+            "time": "2024-06-28T10:03:55+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v6.4.3",
+            "version": "v7.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "ee0f7ed5cf298cc019431bb3b3977ebc52b86229"
+                "reference": "1c7cee86c6f812896af54434f8ce29c8d94f9ff4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/ee0f7ed5cf298cc019431bb3b3977ebc52b86229",
-                "reference": "ee0f7ed5cf298cc019431bb3b3977ebc52b86229",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/1c7cee86c6f812896af54434f8ce29c8d94f9ff4",
+                "reference": "1c7cee86c6f812896af54434f8ce29c8d94f9ff4",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "type": "library",
             "autoload": {
@@ -4818,7 +4468,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v6.4.3"
+                "source": "https://github.com/symfony/css-selector/tree/v7.1.1"
             },
             "funding": [
                 {
@@ -4834,20 +4484,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T14:51:35+00:00"
+            "time": "2024-05-31T14:57:53+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.4.0",
+            "version": "v3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf"
+                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf",
-                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
+                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
                 "shasum": ""
             },
             "require": {
@@ -4856,7 +4506,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.4-dev"
+                    "dev-main": "3.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -4885,7 +4535,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0"
             },
             "funding": [
                 {
@@ -4901,26 +4551,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-23T14:45:45+00:00"
+            "time": "2024-04-18T09:32:20+00:00"
         },
         {
             "name": "symfony/error-handler",
-            "version": "v6.4.6",
+            "version": "v7.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "64db1c1802e3a4557e37ba33031ac39f452ac5d4"
+                "reference": "2412d3dddb5c9ea51a39cfbff1c565fc9844ca32"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/64db1c1802e3a4557e37ba33031ac39f452ac5d4",
-                "reference": "64db1c1802e3a4557e37ba33031ac39f452ac5d4",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/2412d3dddb5c9ea51a39cfbff1c565fc9844ca32",
+                "reference": "2412d3dddb5c9ea51a39cfbff1c565fc9844ca32",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "psr/log": "^1|^2|^3",
-                "symfony/var-dumper": "^5.4|^6.0|^7.0"
+                "symfony/var-dumper": "^6.4|^7.0"
             },
             "conflict": {
                 "symfony/deprecation-contracts": "<2.5",
@@ -4929,7 +4579,7 @@
             "require-dev": {
                 "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/http-kernel": "^6.4|^7.0",
-                "symfony/serializer": "^5.4|^6.0|^7.0"
+                "symfony/serializer": "^6.4|^7.0"
             },
             "bin": [
                 "Resources/bin/patch-type-declarations"
@@ -4960,7 +4610,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v6.4.6"
+                "source": "https://github.com/symfony/error-handler/tree/v7.1.2"
             },
             "funding": [
                 {
@@ -4976,28 +4626,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-19T11:56:30+00:00"
+            "time": "2024-06-25T19:55:06+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v6.4.3",
+            "version": "v7.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "ae9d3a6f3003a6caf56acd7466d8d52378d44fef"
+                "reference": "9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ae9d3a6f3003a6caf56acd7466d8d52378d44fef",
-                "reference": "ae9d3a6f3003a6caf56acd7466d8d52378d44fef",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7",
+                "reference": "9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/event-dispatcher-contracts": "^2.5|^3"
             },
             "conflict": {
-                "symfony/dependency-injection": "<5.4",
+                "symfony/dependency-injection": "<6.4",
                 "symfony/service-contracts": "<2.5"
             },
             "provide": {
@@ -5006,13 +4656,13 @@
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0|^7.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/error-handler": "^5.4|^6.0|^7.0",
-                "symfony/expression-language": "^5.4|^6.0|^7.0",
-                "symfony/http-foundation": "^5.4|^6.0|^7.0",
+                "symfony/config": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/error-handler": "^6.4|^7.0",
+                "symfony/expression-language": "^6.4|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/stopwatch": "^5.4|^6.0|^7.0"
+                "symfony/stopwatch": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -5040,7 +4690,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.3"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.1.1"
             },
             "funding": [
                 {
@@ -5056,20 +4706,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T14:51:35+00:00"
+            "time": "2024-05-31T14:57:53+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.4.2",
+            "version": "v3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "4e64b49bf370ade88e567de29465762e316e4224"
+                "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/4e64b49bf370ade88e567de29465762e316e4224",
-                "reference": "4e64b49bf370ade88e567de29465762e316e4224",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/8f93aec25d41b72493c6ddff14e916177c9efc50",
+                "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50",
                 "shasum": ""
             },
             "require": {
@@ -5079,7 +4729,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.4-dev"
+                    "dev-main": "3.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -5116,7 +4766,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.2"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.0"
             },
             "funding": [
                 {
@@ -5132,27 +4782,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T14:51:35+00:00"
+            "time": "2024-04-18T09:32:20+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v6.4.0",
+            "version": "v7.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "11d736e97f116ac375a81f96e662911a34cd50ce"
+                "reference": "fbb0ba67688b780efbc886c1a0a0948dcf7205d6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/11d736e97f116ac375a81f96e662911a34cd50ce",
-                "reference": "11d736e97f116ac375a81f96e662911a34cd50ce",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/fbb0ba67688b780efbc886c1a0a0948dcf7205d6",
+                "reference": "fbb0ba67688b780efbc886c1a0a0948dcf7205d6",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "symfony/filesystem": "^6.0|^7.0"
+                "symfony/filesystem": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -5180,7 +4830,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.4.0"
+                "source": "https://github.com/symfony/finder/tree/v7.1.1"
             },
             "funding": [
                 {
@@ -5196,40 +4846,40 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-10-31T17:30:12+00:00"
+            "time": "2024-05-31T14:57:53+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v6.4.4",
+            "version": "v7.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "ebc713bc6e6f4b53f46539fc158be85dfcd77304"
+                "reference": "74d171d5b6a1d9e4bfee09a41937c17a7536acfa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ebc713bc6e6f4b53f46539fc158be85dfcd77304",
-                "reference": "ebc713bc6e6f4b53f46539fc158be85dfcd77304",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/74d171d5b6a1d9e4bfee09a41937c17a7536acfa",
+                "reference": "74d171d5b6a1d9e4bfee09a41937c17a7536acfa",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.5|^3",
+                "php": ">=8.2",
                 "symfony/polyfill-mbstring": "~1.1",
                 "symfony/polyfill-php83": "^1.27"
             },
             "conflict": {
-                "symfony/cache": "<6.3"
+                "doctrine/dbal": "<3.6",
+                "symfony/cache": "<6.4"
             },
             "require-dev": {
-                "doctrine/dbal": "^2.13.1|^3|^4",
+                "doctrine/dbal": "^3.6|^4",
                 "predis/predis": "^1.1|^2.0",
-                "symfony/cache": "^6.3|^7.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/expression-language": "^5.4|^6.0|^7.0",
-                "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4|^7.0",
-                "symfony/mime": "^5.4|^6.0|^7.0",
-                "symfony/rate-limiter": "^5.4|^6.0|^7.0"
+                "symfony/cache": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/expression-language": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/mime": "^6.4|^7.0",
+                "symfony/rate-limiter": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -5257,7 +4907,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v6.4.4"
+                "source": "https://github.com/symfony/http-foundation/tree/v7.1.1"
             },
             "funding": [
                 {
@@ -5273,76 +4923,77 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-08T15:01:18+00:00"
+            "time": "2024-05-31T14:57:53+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v6.4.6",
+            "version": "v7.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "060038863743fd0cd982be06acecccf246d35653"
+                "reference": "ae3fa717db4d41a55d14c2bd92399e37cf5bc0f6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/060038863743fd0cd982be06acecccf246d35653",
-                "reference": "060038863743fd0cd982be06acecccf246d35653",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/ae3fa717db4d41a55d14c2bd92399e37cf5bc0f6",
+                "reference": "ae3fa717db4d41a55d14c2bd92399e37cf5bc0f6",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "psr/log": "^1|^2|^3",
                 "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/error-handler": "^6.4|^7.0",
-                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+                "symfony/event-dispatcher": "^6.4|^7.0",
                 "symfony/http-foundation": "^6.4|^7.0",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
-                "symfony/browser-kit": "<5.4",
-                "symfony/cache": "<5.4",
-                "symfony/config": "<6.1",
-                "symfony/console": "<5.4",
+                "symfony/browser-kit": "<6.4",
+                "symfony/cache": "<6.4",
+                "symfony/config": "<6.4",
+                "symfony/console": "<6.4",
                 "symfony/dependency-injection": "<6.4",
-                "symfony/doctrine-bridge": "<5.4",
-                "symfony/form": "<5.4",
-                "symfony/http-client": "<5.4",
+                "symfony/doctrine-bridge": "<6.4",
+                "symfony/form": "<6.4",
+                "symfony/http-client": "<6.4",
                 "symfony/http-client-contracts": "<2.5",
-                "symfony/mailer": "<5.4",
-                "symfony/messenger": "<5.4",
-                "symfony/translation": "<5.4",
+                "symfony/mailer": "<6.4",
+                "symfony/messenger": "<6.4",
+                "symfony/translation": "<6.4",
                 "symfony/translation-contracts": "<2.5",
-                "symfony/twig-bridge": "<5.4",
+                "symfony/twig-bridge": "<6.4",
                 "symfony/validator": "<6.4",
-                "symfony/var-dumper": "<6.3",
-                "twig/twig": "<2.13"
+                "symfony/var-dumper": "<6.4",
+                "twig/twig": "<3.0.4"
             },
             "provide": {
                 "psr/log-implementation": "1.0|2.0|3.0"
             },
             "require-dev": {
                 "psr/cache": "^1.0|^2.0|^3.0",
-                "symfony/browser-kit": "^5.4|^6.0|^7.0",
-                "symfony/clock": "^6.2|^7.0",
-                "symfony/config": "^6.1|^7.0",
-                "symfony/console": "^5.4|^6.0|^7.0",
-                "symfony/css-selector": "^5.4|^6.0|^7.0",
+                "symfony/browser-kit": "^6.4|^7.0",
+                "symfony/clock": "^6.4|^7.0",
+                "symfony/config": "^6.4|^7.0",
+                "symfony/console": "^6.4|^7.0",
+                "symfony/css-selector": "^6.4|^7.0",
                 "symfony/dependency-injection": "^6.4|^7.0",
-                "symfony/dom-crawler": "^5.4|^6.0|^7.0",
-                "symfony/expression-language": "^5.4|^6.0|^7.0",
-                "symfony/finder": "^5.4|^6.0|^7.0",
+                "symfony/dom-crawler": "^6.4|^7.0",
+                "symfony/expression-language": "^6.4|^7.0",
+                "symfony/finder": "^6.4|^7.0",
                 "symfony/http-client-contracts": "^2.5|^3",
-                "symfony/process": "^5.4|^6.0|^7.0",
-                "symfony/property-access": "^5.4.5|^6.0.5|^7.0",
-                "symfony/routing": "^5.4|^6.0|^7.0",
-                "symfony/serializer": "^6.4.4|^7.0.4",
-                "symfony/stopwatch": "^5.4|^6.0|^7.0",
-                "symfony/translation": "^5.4|^6.0|^7.0",
+                "symfony/process": "^6.4|^7.0",
+                "symfony/property-access": "^7.1",
+                "symfony/routing": "^6.4|^7.0",
+                "symfony/serializer": "^7.1",
+                "symfony/stopwatch": "^6.4|^7.0",
+                "symfony/translation": "^6.4|^7.0",
                 "symfony/translation-contracts": "^2.5|^3",
-                "symfony/uid": "^5.4|^6.0|^7.0",
+                "symfony/uid": "^6.4|^7.0",
                 "symfony/validator": "^6.4|^7.0",
-                "symfony/var-exporter": "^6.2|^7.0",
-                "twig/twig": "^2.13|^3.0.4"
+                "symfony/var-dumper": "^6.4|^7.0",
+                "symfony/var-exporter": "^6.4|^7.0",
+                "twig/twig": "^3.0.4"
             },
             "type": "library",
             "autoload": {
@@ -5370,7 +5021,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v6.4.6"
+                "source": "https://github.com/symfony/http-kernel/tree/v7.1.2"
             },
             "funding": [
                 {
@@ -5386,43 +5037,43 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-03T06:09:15+00:00"
+            "time": "2024-06-28T13:13:31+00:00"
         },
         {
             "name": "symfony/mailer",
-            "version": "v6.4.6",
+            "version": "v7.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mailer.git",
-                "reference": "677f34a6f4b4559e08acf73ae0aec460479e5859"
+                "reference": "8fcff0af9043c8f8a8e229437cea363e282f9aee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailer/zipball/677f34a6f4b4559e08acf73ae0aec460479e5859",
-                "reference": "677f34a6f4b4559e08acf73ae0aec460479e5859",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/8fcff0af9043c8f8a8e229437cea363e282f9aee",
+                "reference": "8fcff0af9043c8f8a8e229437cea363e282f9aee",
                 "shasum": ""
             },
             "require": {
                 "egulias/email-validator": "^2.1.10|^3|^4",
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "psr/event-dispatcher": "^1",
                 "psr/log": "^1|^2|^3",
-                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
-                "symfony/mime": "^6.2|^7.0",
+                "symfony/event-dispatcher": "^6.4|^7.0",
+                "symfony/mime": "^6.4|^7.0",
                 "symfony/service-contracts": "^2.5|^3"
             },
             "conflict": {
                 "symfony/http-client-contracts": "<2.5",
-                "symfony/http-kernel": "<5.4",
-                "symfony/messenger": "<6.2",
-                "symfony/mime": "<6.2",
-                "symfony/twig-bridge": "<6.2.1"
+                "symfony/http-kernel": "<6.4",
+                "symfony/messenger": "<6.4",
+                "symfony/mime": "<6.4",
+                "symfony/twig-bridge": "<6.4"
             },
             "require-dev": {
-                "symfony/console": "^5.4|^6.0|^7.0",
-                "symfony/http-client": "^5.4|^6.0|^7.0",
-                "symfony/messenger": "^6.2|^7.0",
-                "symfony/twig-bridge": "^6.2|^7.0"
+                "symfony/console": "^6.4|^7.0",
+                "symfony/http-client": "^6.4|^7.0",
+                "symfony/messenger": "^6.4|^7.0",
+                "symfony/twig-bridge": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -5450,7 +5101,7 @@
             "description": "Helps sending emails",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/mailer/tree/v6.4.6"
+                "source": "https://github.com/symfony/mailer/tree/v7.1.2"
             },
             "funding": [
                 {
@@ -5466,25 +5117,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-27T21:14:17+00:00"
+            "time": "2024-06-28T08:00:31+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v6.4.6",
+            "version": "v7.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "14762b86918823cb42e3558cdcca62e58b5227fe"
+                "reference": "26a00b85477e69a4bab63b66c5dce64f18b0cbfc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/14762b86918823cb42e3558cdcca62e58b5227fe",
-                "reference": "14762b86918823cb42e3558cdcca62e58b5227fe",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/26a00b85477e69a4bab63b66c5dce64f18b0cbfc",
+                "reference": "26a00b85477e69a4bab63b66c5dce64f18b0cbfc",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.5|^3",
+                "php": ">=8.2",
                 "symfony/polyfill-intl-idn": "^1.10",
                 "symfony/polyfill-mbstring": "^1.0"
             },
@@ -5492,18 +5142,18 @@
                 "egulias/email-validator": "~3.0.0",
                 "phpdocumentor/reflection-docblock": "<3.2.2",
                 "phpdocumentor/type-resolver": "<1.4.0",
-                "symfony/mailer": "<5.4",
-                "symfony/serializer": "<6.3.2"
+                "symfony/mailer": "<6.4",
+                "symfony/serializer": "<6.4.3|>7.0,<7.0.3"
             },
             "require-dev": {
                 "egulias/email-validator": "^2.1.10|^3.1|^4",
                 "league/html-to-markdown": "^5.0",
                 "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/process": "^5.4|^6.4|^7.0",
-                "symfony/property-access": "^5.4|^6.0|^7.0",
-                "symfony/property-info": "^5.4|^6.0|^7.0",
-                "symfony/serializer": "^6.3.2|^7.0"
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/process": "^6.4|^7.0",
+                "symfony/property-access": "^6.4|^7.0",
+                "symfony/property-info": "^6.4|^7.0",
+                "symfony/serializer": "^6.4.3|^7.0.3"
             },
             "type": "library",
             "autoload": {
@@ -5535,7 +5185,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v6.4.6"
+                "source": "https://github.com/symfony/mime/tree/v7.1.2"
             },
             "funding": [
                 {
@@ -5551,20 +5201,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-21T19:36:20+00:00"
+            "time": "2024-06-28T10:03:55+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.29.0",
+            "version": "v1.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
+                "reference": "0424dff1c58f028c451efff2045f5d92410bd540"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
-                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540",
+                "reference": "0424dff1c58f028c451efff2045f5d92410bd540",
                 "shasum": ""
             },
             "require": {
@@ -5614,7 +5264,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0"
             },
             "funding": [
                 {
@@ -5630,20 +5280,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-05-31T15:07:36+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.29.0",
+            "version": "v1.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f"
+                "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f",
-                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/64647a7c30b2283f5d49b874d84a18fc22054b7a",
+                "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a",
                 "shasum": ""
             },
             "require": {
@@ -5692,7 +5342,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.30.0"
             },
             "funding": [
                 {
@@ -5708,20 +5358,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-05-31T15:07:36+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.29.0",
+            "version": "v1.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "a287ed7475f85bf6f61890146edbc932c0fff919"
+                "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a287ed7475f85bf6f61890146edbc932c0fff919",
-                "reference": "a287ed7475f85bf6f61890146edbc932c0fff919",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a6e83bdeb3c84391d1dfe16f42e40727ce524a5c",
+                "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c",
                 "shasum": ""
             },
             "require": {
@@ -5776,7 +5426,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.30.0"
             },
             "funding": [
                 {
@@ -5792,20 +5442,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-05-31T15:07:36+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.29.0",
+            "version": "v1.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d"
+                "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d",
-                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/a95281b0be0d9ab48050ebd988b967875cdb9fdb",
+                "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb",
                 "shasum": ""
             },
             "require": {
@@ -5857,7 +5507,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.30.0"
             },
             "funding": [
                 {
@@ -5873,20 +5523,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-05-31T15:07:36+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.29.0",
+            "version": "v1.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
+                "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
-                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c",
+                "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c",
                 "shasum": ""
             },
             "require": {
@@ -5937,7 +5587,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.0"
             },
             "funding": [
                 {
@@ -5953,20 +5603,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-06-19T12:30:46+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.29.0",
+            "version": "v1.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25"
+                "reference": "10112722600777e02d2745716b70c5db4ca70442"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/861391a8da9a04cbad2d232ddd9e4893220d6e25",
-                "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/10112722600777e02d2745716b70c5db4ca70442",
+                "reference": "10112722600777e02d2745716b70c5db4ca70442",
                 "shasum": ""
             },
             "require": {
@@ -6010,7 +5660,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.30.0"
             },
             "funding": [
                 {
@@ -6026,20 +5676,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-06-19T12:30:46+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.29.0",
+            "version": "v1.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
+                "reference": "77fa7995ac1b21ab60769b7323d600a991a90433"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
-                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/77fa7995ac1b21ab60769b7323d600a991a90433",
+                "reference": "77fa7995ac1b21ab60769b7323d600a991a90433",
                 "shasum": ""
             },
             "require": {
@@ -6090,7 +5740,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.30.0"
             },
             "funding": [
                 {
@@ -6106,25 +5756,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-05-31T15:07:36+00:00"
         },
         {
             "name": "symfony/polyfill-php83",
-            "version": "v1.29.0",
+            "version": "v1.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php83.git",
-                "reference": "86fcae159633351e5fd145d1c47de6c528f8caff"
+                "reference": "dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/86fcae159633351e5fd145d1c47de6c528f8caff",
-                "reference": "86fcae159633351e5fd145d1c47de6c528f8caff",
+                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9",
+                "reference": "dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1",
-                "symfony/polyfill-php80": "^1.14"
+                "php": ">=7.1"
             },
             "type": "library",
             "extra": {
@@ -6167,7 +5816,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php83/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-php83/tree/v1.30.0"
             },
             "funding": [
                 {
@@ -6183,20 +5832,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-06-19T12:35:24+00:00"
         },
         {
             "name": "symfony/polyfill-uuid",
-            "version": "v1.29.0",
+            "version": "v1.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-uuid.git",
-                "reference": "3abdd21b0ceaa3000ee950097bc3cf9efc137853"
+                "reference": "2ba1f33797470debcda07fe9dce20a0003df18e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/3abdd21b0ceaa3000ee950097bc3cf9efc137853",
-                "reference": "3abdd21b0ceaa3000ee950097bc3cf9efc137853",
+                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/2ba1f33797470debcda07fe9dce20a0003df18e9",
+                "reference": "2ba1f33797470debcda07fe9dce20a0003df18e9",
                 "shasum": ""
             },
             "require": {
@@ -6246,7 +5895,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.30.0"
             },
             "funding": [
                 {
@@ -6262,24 +5911,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-05-31T15:07:36+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v6.4.4",
+            "version": "v7.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "710e27879e9be3395de2b98da3f52a946039f297"
+                "reference": "febf90124323a093c7ee06fdb30e765ca3c20028"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/710e27879e9be3395de2b98da3f52a946039f297",
-                "reference": "710e27879e9be3395de2b98da3f52a946039f297",
+                "url": "https://api.github.com/repos/symfony/process/zipball/febf90124323a093c7ee06fdb30e765ca3c20028",
+                "reference": "febf90124323a093c7ee06fdb30e765ca3c20028",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "type": "library",
             "autoload": {
@@ -6307,7 +5956,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v6.4.4"
+                "source": "https://github.com/symfony/process/tree/v7.1.1"
             },
             "funding": [
                 {
@@ -6323,40 +5972,38 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-20T12:31:00+00:00"
+            "time": "2024-05-31T14:57:53+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v6.4.6",
+            "version": "v7.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "f2591fd1f8c6e3734656b5d6b3829e8bf81f507c"
+                "reference": "60c31bab5c45af7f13091b87deb708830f3c96c0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/f2591fd1f8c6e3734656b5d6b3829e8bf81f507c",
-                "reference": "f2591fd1f8c6e3734656b5d6b3829e8bf81f507c",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/60c31bab5c45af7f13091b87deb708830f3c96c0",
+                "reference": "60c31bab5c45af7f13091b87deb708830f3c96c0",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/deprecation-contracts": "^2.5|^3"
             },
             "conflict": {
-                "doctrine/annotations": "<1.12",
-                "symfony/config": "<6.2",
-                "symfony/dependency-injection": "<5.4",
-                "symfony/yaml": "<5.4"
+                "symfony/config": "<6.4",
+                "symfony/dependency-injection": "<6.4",
+                "symfony/yaml": "<6.4"
             },
             "require-dev": {
-                "doctrine/annotations": "^1.12|^2",
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^6.2|^7.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/expression-language": "^5.4|^6.0|^7.0",
-                "symfony/http-foundation": "^5.4|^6.0|^7.0",
-                "symfony/yaml": "^5.4|^6.0|^7.0"
+                "symfony/config": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/expression-language": "^6.4|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/yaml": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -6390,7 +6037,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v6.4.6"
+                "source": "https://github.com/symfony/routing/tree/v7.1.1"
             },
             "funding": [
                 {
@@ -6406,25 +6053,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-28T13:28:49+00:00"
+            "time": "2024-05-31T14:57:53+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.4.2",
+            "version": "v3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "11bbf19a0fb7b36345861e85c5768844c552906e"
+                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/11bbf19a0fb7b36345861e85c5768844c552906e",
-                "reference": "11bbf19a0fb7b36345861e85c5768844c552906e",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
+                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
-                "psr/container": "^1.1|^2.0"
+                "psr/container": "^1.1|^2.0",
+                "symfony/deprecation-contracts": "^2.5|^3"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2"
@@ -6432,7 +6080,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.4-dev"
+                    "dev-main": "3.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -6472,7 +6120,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.4.2"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.5.0"
             },
             "funding": [
                 {
@@ -6488,24 +6136,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-19T21:51:00+00:00"
+            "time": "2024-04-18T09:32:20+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v6.4.4",
+            "version": "v7.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9"
+                "reference": "14221089ac66cf82e3cf3d1c1da65de305587ff8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9",
-                "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9",
+                "url": "https://api.github.com/repos/symfony/string/zipball/14221089ac66cf82e3cf3d1c1da65de305587ff8",
+                "reference": "14221089ac66cf82e3cf3d1c1da65de305587ff8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-intl-grapheme": "~1.0",
                 "symfony/polyfill-intl-normalizer": "~1.0",
@@ -6515,11 +6163,12 @@
                 "symfony/translation-contracts": "<2.5"
             },
             "require-dev": {
-                "symfony/error-handler": "^5.4|^6.0|^7.0",
-                "symfony/http-client": "^5.4|^6.0|^7.0",
-                "symfony/intl": "^6.2|^7.0",
+                "symfony/emoji": "^7.1",
+                "symfony/error-handler": "^6.4|^7.0",
+                "symfony/http-client": "^6.4|^7.0",
+                "symfony/intl": "^6.4|^7.0",
                 "symfony/translation-contracts": "^2.5|^3.0",
-                "symfony/var-exporter": "^5.4|^6.0|^7.0"
+                "symfony/var-exporter": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -6558,7 +6207,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.4.4"
+                "source": "https://github.com/symfony/string/tree/v7.1.2"
             },
             "funding": [
                 {
@@ -6574,37 +6223,36 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-01T13:16:41+00:00"
+            "time": "2024-06-28T09:27:18+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v6.4.4",
+            "version": "v7.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "bce6a5a78e94566641b2594d17e48b0da3184a8e"
+                "reference": "cf5ae136e124fc7681b34ce9fac9d5b9ae8ceee3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/bce6a5a78e94566641b2594d17e48b0da3184a8e",
-                "reference": "bce6a5a78e94566641b2594d17e48b0da3184a8e",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/cf5ae136e124fc7681b34ce9fac9d5b9ae8ceee3",
+                "reference": "cf5ae136e124fc7681b34ce9fac9d5b9ae8ceee3",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.5|^3",
+                "php": ">=8.2",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/translation-contracts": "^2.5|^3.0"
             },
             "conflict": {
-                "symfony/config": "<5.4",
-                "symfony/console": "<5.4",
-                "symfony/dependency-injection": "<5.4",
+                "symfony/config": "<6.4",
+                "symfony/console": "<6.4",
+                "symfony/dependency-injection": "<6.4",
                 "symfony/http-client-contracts": "<2.5",
-                "symfony/http-kernel": "<5.4",
+                "symfony/http-kernel": "<6.4",
                 "symfony/service-contracts": "<2.5",
-                "symfony/twig-bundle": "<5.4",
-                "symfony/yaml": "<5.4"
+                "symfony/twig-bundle": "<6.4",
+                "symfony/yaml": "<6.4"
             },
             "provide": {
                 "symfony/translation-implementation": "2.3|3.0"
@@ -6612,17 +6260,17 @@
             "require-dev": {
                 "nikic/php-parser": "^4.18|^5.0",
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0|^7.0",
-                "symfony/console": "^5.4|^6.0|^7.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/finder": "^5.4|^6.0|^7.0",
+                "symfony/config": "^6.4|^7.0",
+                "symfony/console": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/finder": "^6.4|^7.0",
                 "symfony/http-client-contracts": "^2.5|^3.0",
-                "symfony/http-kernel": "^5.4|^6.0|^7.0",
-                "symfony/intl": "^5.4|^6.0|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/intl": "^6.4|^7.0",
                 "symfony/polyfill-intl-icu": "^1.21",
-                "symfony/routing": "^5.4|^6.0|^7.0",
+                "symfony/routing": "^6.4|^7.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/yaml": "^5.4|^6.0|^7.0"
+                "symfony/yaml": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -6653,7 +6301,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v6.4.4"
+                "source": "https://github.com/symfony/translation/tree/v7.1.1"
             },
             "funding": [
                 {
@@ -6669,20 +6317,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-20T13:16:58+00:00"
+            "time": "2024-05-31T14:57:53+00:00"
         },
         {
             "name": "symfony/translation-contracts",
-            "version": "v3.4.2",
+            "version": "v3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "43810bdb2ddb5400e5c5e778e27b210a0ca83b6b"
+                "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/43810bdb2ddb5400e5c5e778e27b210a0ca83b6b",
-                "reference": "43810bdb2ddb5400e5c5e778e27b210a0ca83b6b",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/b9d2189887bb6b2e0367a9fc7136c5239ab9b05a",
+                "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a",
                 "shasum": ""
             },
             "require": {
@@ -6691,7 +6339,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.4-dev"
+                    "dev-main": "3.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -6731,7 +6379,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v3.4.2"
+                "source": "https://github.com/symfony/translation-contracts/tree/v3.5.0"
             },
             "funding": [
                 {
@@ -6747,28 +6395,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T14:51:35+00:00"
+            "time": "2024-04-18T09:32:20+00:00"
         },
         {
             "name": "symfony/uid",
-            "version": "v6.4.3",
+            "version": "v7.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/uid.git",
-                "reference": "1d31267211cc3a2fff32bcfc7c1818dac41b6fc0"
+                "reference": "bb59febeecc81528ff672fad5dab7f06db8c8277"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/1d31267211cc3a2fff32bcfc7c1818dac41b6fc0",
-                "reference": "1d31267211cc3a2fff32bcfc7c1818dac41b6fc0",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/bb59febeecc81528ff672fad5dab7f06db8c8277",
+                "reference": "bb59febeecc81528ff672fad5dab7f06db8c8277",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/polyfill-uuid": "^1.15"
             },
             "require-dev": {
-                "symfony/console": "^5.4|^6.0|^7.0"
+                "symfony/console": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -6805,7 +6453,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/uid/tree/v6.4.3"
+                "source": "https://github.com/symfony/uid/tree/v7.1.1"
             },
             "funding": [
                 {
@@ -6821,38 +6469,36 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T14:51:35+00:00"
+            "time": "2024-05-31T14:57:53+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v6.4.6",
+            "version": "v7.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "95bd2706a97fb875185b51ecaa6112ec184233d4"
+                "reference": "5857c57c6b4b86524c08cf4f4bc95327270a816d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/95bd2706a97fb875185b51ecaa6112ec184233d4",
-                "reference": "95bd2706a97fb875185b51ecaa6112ec184233d4",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/5857c57c6b4b86524c08cf4f4bc95327270a816d",
+                "reference": "5857c57c6b4b86524c08cf4f4bc95327270a816d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.5|^3",
+                "php": ">=8.2",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "symfony/console": "<5.4"
+                "symfony/console": "<6.4"
             },
             "require-dev": {
                 "ext-iconv": "*",
-                "symfony/console": "^5.4|^6.0|^7.0",
-                "symfony/error-handler": "^6.3|^7.0",
-                "symfony/http-kernel": "^5.4|^6.0|^7.0",
-                "symfony/process": "^5.4|^6.0|^7.0",
-                "symfony/uid": "^5.4|^6.0|^7.0",
-                "twig/twig": "^2.13|^3.0.4"
+                "symfony/console": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/process": "^6.4|^7.0",
+                "symfony/uid": "^6.4|^7.0",
+                "twig/twig": "^3.0.4"
             },
             "bin": [
                 "Resources/bin/var-dump-server"
@@ -6890,7 +6536,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v6.4.6"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.1.2"
             },
             "funding": [
                 {
@@ -6906,30 +6552,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-19T11:56:30+00:00"
+            "time": "2024-06-28T08:00:31+00:00"
         },
         {
             "name": "symfony/var-exporter",
-            "version": "v6.4.6",
+            "version": "v7.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-exporter.git",
-                "reference": "20888cf4d11de203613515cf0587828bf5af0fe7"
+                "reference": "b80a669a2264609f07f1667f891dbfca25eba44c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/20888cf4d11de203613515cf0587828bf5af0fe7",
-                "reference": "20888cf4d11de203613515cf0587828bf5af0fe7",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/b80a669a2264609f07f1667f891dbfca25eba44c",
+                "reference": "b80a669a2264609f07f1667f891dbfca25eba44c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.5|^3"
+                "php": ">=8.2"
             },
             "require-dev": {
                 "symfony/property-access": "^6.4|^7.0",
                 "symfony/serializer": "^6.4|^7.0",
-                "symfony/var-dumper": "^5.4|^6.0|^7.0"
+                "symfony/var-dumper": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -6967,7 +6612,7 @@
                 "serialize"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-exporter/tree/v6.4.6"
+                "source": "https://github.com/symfony/var-exporter/tree/v7.1.2"
             },
             "funding": [
                 {
@@ -6983,7 +6628,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-20T21:07:14+00:00"
+            "time": "2024-06-28T08:00:31+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -7347,16 +6992,16 @@
         },
         {
             "name": "amphp/byte-stream",
-            "version": "v1.8.1",
+            "version": "v1.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/amphp/byte-stream.git",
-                "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd"
+                "reference": "4f0e968ba3798a423730f567b1b50d3441c16ddc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/amphp/byte-stream/zipball/acbd8002b3536485c997c4e019206b3f10ca15bd",
-                "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd",
+                "url": "https://api.github.com/repos/amphp/byte-stream/zipball/4f0e968ba3798a423730f567b1b50d3441c16ddc",
+                "reference": "4f0e968ba3798a423730f567b1b50d3441c16ddc",
                 "shasum": ""
             },
             "require": {
@@ -7372,11 +7017,6 @@
                 "psalm/phar": "^3.11.4"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
             "autoload": {
                 "files": [
                     "lib/functions.php"
@@ -7400,7 +7040,7 @@
                 }
             ],
             "description": "A stream abstraction to make working with non-blocking I/O simple.",
-            "homepage": "http://amphp.org/byte-stream",
+            "homepage": "https://amphp.org/byte-stream",
             "keywords": [
                 "amp",
                 "amphp",
@@ -7410,9 +7050,8 @@
                 "stream"
             ],
             "support": {
-                "irc": "irc://irc.freenode.org/amphp",
                 "issues": "https://github.com/amphp/byte-stream/issues",
-                "source": "https://github.com/amphp/byte-stream/tree/v1.8.1"
+                "source": "https://github.com/amphp/byte-stream/tree/v1.8.2"
             },
             "funding": [
                 {
@@ -7420,20 +7059,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-03-30T17:13:30+00:00"
+            "time": "2024-04-13T18:00:56+00:00"
         },
         {
             "name": "barryvdh/laravel-ide-helper",
-            "version": "v3.0.0",
+            "version": "v3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-ide-helper.git",
-                "reference": "bc1d67f01ce8c77e3f97d48ba51fa1d81874f622"
+                "reference": "591e7d665fbab8a3b682e451641706341573eb80"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/bc1d67f01ce8c77e3f97d48ba51fa1d81874f622",
-                "reference": "bc1d67f01ce8c77e3f97d48ba51fa1d81874f622",
+                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/591e7d665fbab8a3b682e451641706341573eb80",
+                "reference": "591e7d665fbab8a3b682e451641706341573eb80",
                 "shasum": ""
             },
             "require": {
@@ -7465,7 +7104,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.1-dev"
                 },
                 "laravel": {
                     "providers": [
@@ -7502,7 +7141,7 @@
             ],
             "support": {
                 "issues": "https://github.com/barryvdh/laravel-ide-helper/issues",
-                "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v3.0.0"
+                "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v3.1.0"
             },
             "funding": [
                 {
@@ -7514,7 +7153,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-01T12:53:18+00:00"
+            "time": "2024-07-12T14:20:51+00:00"
         },
         {
             "name": "barryvdh/reflection-docblock",
@@ -7568,18 +7207,82 @@
             },
             "time": "2023-06-14T05:06:27+00:00"
         },
+        {
+            "name": "clue/ndjson-react",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/clue/reactphp-ndjson.git",
+                "reference": "392dc165fce93b5bb5c637b67e59619223c931b0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/clue/reactphp-ndjson/zipball/392dc165fce93b5bb5c637b67e59619223c931b0",
+                "reference": "392dc165fce93b5bb5c637b67e59619223c931b0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3",
+                "react/stream": "^1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35",
+                "react/event-loop": "^1.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Clue\\React\\NDJson\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering"
+                }
+            ],
+            "description": "Streaming newline-delimited JSON (NDJSON) parser and encoder for ReactPHP.",
+            "homepage": "https://github.com/clue/reactphp-ndjson",
+            "keywords": [
+                "NDJSON",
+                "json",
+                "jsonlines",
+                "newline",
+                "reactphp",
+                "streaming"
+            ],
+            "support": {
+                "issues": "https://github.com/clue/reactphp-ndjson/issues",
+                "source": "https://github.com/clue/reactphp-ndjson/tree/v1.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://clue.engineering/support",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/clue",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-12-23T10:58:28+00:00"
+        },
         {
             "name": "composer/class-map-generator",
-            "version": "1.1.1",
+            "version": "1.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/class-map-generator.git",
-                "reference": "8286a62d243312ed99b3eee20d5005c961adb311"
+                "reference": "b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/class-map-generator/zipball/8286a62d243312ed99b3eee20d5005c961adb311",
-                "reference": "8286a62d243312ed99b3eee20d5005c961adb311",
+                "url": "https://api.github.com/repos/composer/class-map-generator/zipball/b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3",
+                "reference": "b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3",
                 "shasum": ""
             },
             "require": {
@@ -7623,7 +7326,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/class-map-generator/issues",
-                "source": "https://github.com/composer/class-map-generator/tree/1.1.1"
+                "source": "https://github.com/composer/class-map-generator/tree/1.3.4"
             },
             "funding": [
                 {
@@ -7639,20 +7342,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-15T12:53:41+00:00"
+            "time": "2024-06-12T14:13:04+00:00"
         },
         {
             "name": "composer/pcre",
-            "version": "3.1.3",
+            "version": "3.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/pcre.git",
-                "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8"
+                "reference": "04229f163664973f68f38f6f73d917799168ef24"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/5b16e25a5355f1f3afdfc2f954a0a80aec4826a8",
-                "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/04229f163664973f68f38f6f73d917799168ef24",
+                "reference": "04229f163664973f68f38f6f73d917799168ef24",
                 "shasum": ""
             },
             "require": {
@@ -7694,7 +7397,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/3.1.3"
+                "source": "https://github.com/composer/pcre/tree/3.1.4"
             },
             "funding": [
                 {
@@ -7710,20 +7413,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-19T10:26:25+00:00"
+            "time": "2024-05-27T13:40:54+00:00"
         },
         {
             "name": "composer/semver",
-            "version": "3.4.0",
+            "version": "3.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32"
+                "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32",
-                "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32",
+                "url": "https://api.github.com/repos/composer/semver/zipball/c51258e759afdb17f1fd1fe83bc12baaef6309d6",
+                "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6",
                 "shasum": ""
             },
             "require": {
@@ -7775,7 +7478,7 @@
             "support": {
                 "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/semver/issues",
-                "source": "https://github.com/composer/semver/tree/3.4.0"
+                "source": "https://github.com/composer/semver/tree/3.4.2"
             },
             "funding": [
                 {
@@ -7791,20 +7494,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-08-31T09:50:34+00:00"
+            "time": "2024-07-12T11:35:52+00:00"
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "3.0.4",
+            "version": "3.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255"
+                "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/4f988f8fdf580d53bdb2d1278fe93d1ed5462255",
-                "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6c1925561632e83d60a44492e0b344cf48ab85ef",
+                "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef",
                 "shasum": ""
             },
             "require": {
@@ -7841,7 +7544,7 @@
             "support": {
                 "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/3.0.4"
+                "source": "https://github.com/composer/xdebug-handler/tree/3.0.5"
             },
             "funding": [
                 {
@@ -7857,7 +7560,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-26T18:29:49+00:00"
+            "time": "2024-05-06T16:37:16+00:00"
         },
         {
             "name": "dnoegel/php-xdg-base-dir",
@@ -7897,36 +7600,83 @@
             "time": "2019-12-04T15:06:13+00:00"
         },
         {
-            "name": "fakerphp/faker",
-            "version": "v1.23.1",
+            "name": "doctrine/deprecations",
+            "version": "1.1.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/FakerPHP/Faker.git",
-                "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b"
+                "url": "https://github.com/doctrine/deprecations.git",
+                "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/bfb4fe148adbf78eff521199619b93a52ae3554b",
-                "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b",
+                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
+                "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.4 || ^8.0",
-                "psr/container": "^1.0 || ^2.0",
-                "symfony/deprecation-contracts": "^2.2 || ^3.0"
-            },
-            "conflict": {
-                "fzaninotto/faker": "*"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.4.1",
-                "doctrine/persistence": "^1.3 || ^2.0",
-                "ext-intl": "*",
-                "phpunit/phpunit": "^9.5.26",
-                "symfony/phpunit-bridge": "^5.4.16"
+                "doctrine/coding-standard": "^9",
+                "phpstan/phpstan": "1.4.10 || 1.10.15",
+                "phpstan/phpstan-phpunit": "^1.0",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "psalm/plugin-phpunit": "0.18.4",
+                "psr/log": "^1 || ^2 || ^3",
+                "vimeo/psalm": "4.30.0 || 5.12.0"
             },
             "suggest": {
-                "doctrine/orm": "Required to use Faker\\ORM\\Doctrine",
+                "psr/log": "Allows logging deprecations via PSR-3 logger implementation"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.",
+            "homepage": "https://www.doctrine-project.org/",
+            "support": {
+                "issues": "https://github.com/doctrine/deprecations/issues",
+                "source": "https://github.com/doctrine/deprecations/tree/1.1.3"
+            },
+            "time": "2024-01-30T19:34:25+00:00"
+        },
+        {
+            "name": "fakerphp/faker",
+            "version": "v1.23.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/FakerPHP/Faker.git",
+                "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/bfb4fe148adbf78eff521199619b93a52ae3554b",
+                "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.4 || ^8.0",
+                "psr/container": "^1.0 || ^2.0",
+                "symfony/deprecation-contracts": "^2.2 || ^3.0"
+            },
+            "conflict": {
+                "fzaninotto/faker": "*"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.4.1",
+                "doctrine/persistence": "^1.3 || ^2.0",
+                "ext-intl": "*",
+                "phpunit/phpunit": "^9.5.26",
+                "symfony/phpunit-bridge": "^5.4.16"
+            },
+            "suggest": {
+                "doctrine/orm": "Required to use Faker\\ORM\\Doctrine",
                 "ext-curl": "Required by Faker\\Provider\\Image to download images.",
                 "ext-dom": "Required by Faker\\Provider\\HtmlLorem for generating random HTML.",
                 "ext-iconv": "Required by Faker\\Provider\\ru_RU\\Text::realText() for generating real Russian text.",
@@ -8194,25 +7944,32 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.52.1",
+            "version": "v3.59.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "6e77207f0d851862ceeb6da63e6e22c01b1587bc"
+                "reference": "30ba9ecc2b0e5205e578fe29973c15653d9bfd29"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/6e77207f0d851862ceeb6da63e6e22c01b1587bc",
-                "reference": "6e77207f0d851862ceeb6da63e6e22c01b1587bc",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/30ba9ecc2b0e5205e578fe29973c15653d9bfd29",
+                "reference": "30ba9ecc2b0e5205e578fe29973c15653d9bfd29",
                 "shasum": ""
             },
             "require": {
+                "clue/ndjson-react": "^1.0",
                 "composer/semver": "^3.4",
                 "composer/xdebug-handler": "^3.0.3",
                 "ext-filter": "*",
                 "ext-json": "*",
                 "ext-tokenizer": "*",
+                "fidry/cpu-core-counter": "^1.0",
                 "php": "^7.4 || ^8.0",
+                "react/child-process": "^0.6.5",
+                "react/event-loop": "^1.0",
+                "react/promise": "^2.0 || ^3.0",
+                "react/socket": "^1.0",
+                "react/stream": "^1.0",
                 "sebastian/diff": "^4.0 || ^5.0 || ^6.0",
                 "symfony/console": "^5.4 || ^6.0 || ^7.0",
                 "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0",
@@ -8226,15 +7983,16 @@
                 "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0"
             },
             "require-dev": {
-                "facile-it/paraunit": "^1.3 || ^2.0",
+                "facile-it/paraunit": "^1.3 || ^2.3",
+                "infection/infection": "^0.29.5",
                 "justinrainbow/json-schema": "^5.2",
                 "keradus/cli-executor": "^2.1",
                 "mikey179/vfsstream": "^1.6.11",
                 "php-coveralls/php-coveralls": "^2.7",
                 "php-cs-fixer/accessible-object": "^1.1",
-                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.4",
-                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.4",
-                "phpunit/phpunit": "^9.6 || ^10.5.5 || ^11.0.2",
+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.5",
+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.5",
+                "phpunit/phpunit": "^9.6.19 || ^10.5.21 || ^11.2",
                 "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0",
                 "symfony/yaml": "^5.4 || ^6.0 || ^7.0"
             },
@@ -8249,7 +8007,10 @@
             "autoload": {
                 "psr-4": {
                     "PhpCsFixer\\": "src/"
-                }
+                },
+                "exclude-from-classmap": [
+                    "src/Fixer/Internal/*"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -8274,7 +8035,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.52.1"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.59.3"
             },
             "funding": [
                 {
@@ -8282,7 +8043,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-19T21:02:43+00:00"
+            "time": "2024-06-16T14:17:03+00:00"
         },
         {
             "name": "hamcrest/hamcrest-php",
@@ -8337,16 +8098,16 @@
         },
         {
             "name": "mockery/mockery",
-            "version": "1.6.11",
+            "version": "1.6.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "81a161d0b135df89951abd52296adf97deb0723d"
+                "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/81a161d0b135df89951abd52296adf97deb0723d",
-                "reference": "81a161d0b135df89951abd52296adf97deb0723d",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/1f4efdd7d3beafe9807b08156dfcb176d18f1699",
+                "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699",
                 "shasum": ""
             },
             "require": {
@@ -8416,20 +8177,20 @@
                 "security": "https://github.com/mockery/mockery/security/advisories",
                 "source": "https://github.com/mockery/mockery"
             },
-            "time": "2024-03-21T18:34:15+00:00"
+            "time": "2024-05-16T03:13:13+00:00"
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.11.1",
+            "version": "1.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
+                "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
+                "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
                 "shasum": ""
             },
             "require": {
@@ -8437,11 +8198,12 @@
             },
             "conflict": {
                 "doctrine/collections": "<1.6.8",
-                "doctrine/common": "<2.13.3 || >=3,<3.2.2"
+                "doctrine/common": "<2.13.3 || >=3 <3.2.2"
             },
             "require-dev": {
                 "doctrine/collections": "^1.6.8",
                 "doctrine/common": "^2.13.3 || ^3.2.2",
+                "phpspec/prophecy": "^1.10",
                 "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
             },
             "type": "library",
@@ -8467,7 +8229,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0"
             },
             "funding": [
                 {
@@ -8475,7 +8237,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-08T13:26:56+00:00"
+            "time": "2024-06-12T14:39:25+00:00"
         },
         {
             "name": "netresearch/jsonmapper",
@@ -8530,40 +8292,38 @@
         },
         {
             "name": "nunomaduro/collision",
-            "version": "v7.10.0",
+            "version": "v8.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/collision.git",
-                "reference": "49ec67fa7b002712da8526678abd651c09f375b2"
+                "reference": "13e5d538b95a744d85f447a321ce10adb28e9af9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/49ec67fa7b002712da8526678abd651c09f375b2",
-                "reference": "49ec67fa7b002712da8526678abd651c09f375b2",
+                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/13e5d538b95a744d85f447a321ce10adb28e9af9",
+                "reference": "13e5d538b95a744d85f447a321ce10adb28e9af9",
                 "shasum": ""
             },
             "require": {
-                "filp/whoops": "^2.15.3",
-                "nunomaduro/termwind": "^1.15.1",
-                "php": "^8.1.0",
-                "symfony/console": "^6.3.4"
+                "filp/whoops": "^2.15.4",
+                "nunomaduro/termwind": "^2.0.1",
+                "php": "^8.2.0",
+                "symfony/console": "^7.0.4"
             },
             "conflict": {
-                "laravel/framework": ">=11.0.0"
+                "laravel/framework": "<11.0.0 || >=12.0.0",
+                "phpunit/phpunit": "<10.5.1 || >=12.0.0"
             },
             "require-dev": {
-                "brianium/paratest": "^7.3.0",
-                "laravel/framework": "^10.28.0",
-                "laravel/pint": "^1.13.3",
-                "laravel/sail": "^1.25.0",
-                "laravel/sanctum": "^3.3.1",
-                "laravel/tinker": "^2.8.2",
-                "nunomaduro/larastan": "^2.6.4",
-                "orchestra/testbench-core": "^8.13.0",
-                "pestphp/pest": "^2.23.2",
-                "phpunit/phpunit": "^10.4.1",
-                "sebastian/environment": "^6.0.1",
-                "spatie/laravel-ignition": "^2.3.1"
+                "larastan/larastan": "^2.9.2",
+                "laravel/framework": "^11.0.0",
+                "laravel/pint": "^1.14.0",
+                "laravel/sail": "^1.28.2",
+                "laravel/sanctum": "^4.0.0",
+                "laravel/tinker": "^2.9.0",
+                "orchestra/testbench-core": "^9.0.0",
+                "pestphp/pest": "^2.34.1 || ^3.0.0",
+                "sebastian/environment": "^6.0.1 || ^7.0.0"
             },
             "type": "library",
             "extra": {
@@ -8571,6 +8331,9 @@
                     "providers": [
                         "NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider"
                     ]
+                },
+                "branch-alias": {
+                    "dev-8.x": "8.x-dev"
                 }
             },
             "autoload": {
@@ -8622,59 +8385,56 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2023-10-11T15:45:01+00:00"
+            "time": "2024-03-06T16:20:09+00:00"
         },
         {
             "name": "orchestra/testbench-core",
-            "version": "v8.23.5",
+            "version": "v9.1.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/orchestral/testbench-core.git",
-                "reference": "0e5c930d247f50d1d6d5997441e57891af862634"
+                "reference": "872742adfc2a05c4ae6b0b4f1eb8961575ec2580"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/orchestral/testbench-core/zipball/0e5c930d247f50d1d6d5997441e57891af862634",
-                "reference": "0e5c930d247f50d1d6d5997441e57891af862634",
+                "url": "https://api.github.com/repos/orchestral/testbench-core/zipball/872742adfc2a05c4ae6b0b4f1eb8961575ec2580",
+                "reference": "872742adfc2a05c4ae6b0b4f1eb8961575ec2580",
                 "shasum": ""
             },
             "require": {
                 "composer-runtime-api": "^2.2",
-                "php": "^8.1",
+                "php": "^8.2",
                 "symfony/polyfill-php83": "^1.28"
             },
             "conflict": {
-                "brianium/paratest": "<6.4.0 || >=7.0.0 <7.1.4 || >=8.0.0",
-                "laravel/framework": "<10.48.2 || >=11.0.0",
-                "nunomaduro/collision": "<6.4.0 || >=7.0.0 <7.4.0 || >=8.0.0",
-                "orchestra/testbench-dusk": "<8.21.0 || >=9.0.0",
-                "orchestra/workbench": "<1.0.0",
-                "phpunit/phpunit": "<9.6.0 || >=10.6.0"
+                "brianium/paratest": "<7.3.0 || >=8.0.0",
+                "laravel/framework": "<11.1.0 || >=12.0.0",
+                "nunomaduro/collision": "<8.0.0 || >=9.0.0",
+                "phpunit/phpunit": "<10.5.0 || 11.0.0 || >=11.3.0"
             },
             "require-dev": {
-                "fakerphp/faker": "^1.21",
-                "laravel/framework": "^10.48.2",
+                "fakerphp/faker": "^1.23",
+                "laravel/framework": "^11.1",
                 "laravel/pint": "^1.6",
-                "mockery/mockery": "^1.5.1",
-                "phpstan/phpstan": "^1.10.7",
-                "phpunit/phpunit": "^10.1",
-                "spatie/laravel-ray": "^1.32.4",
-                "symfony/process": "^6.2",
-                "symfony/yaml": "^6.2",
+                "mockery/mockery": "^1.6",
+                "phpstan/phpstan": "^1.11",
+                "phpunit/phpunit": "^10.5 || ^11.0.1",
+                "spatie/laravel-ray": "^1.35",
+                "symfony/process": "^7.0",
+                "symfony/yaml": "^7.0",
                 "vlucas/phpdotenv": "^5.4.1"
             },
             "suggest": {
-                "brianium/paratest": "Allow using parallel testing (^6.4 || ^7.1.4).",
+                "brianium/paratest": "Allow using parallel tresting (^7.3).",
                 "ext-pcntl": "Required to use all features of the console signal trapping.",
-                "fakerphp/faker": "Allow using Faker for testing (^1.21).",
-                "laravel/framework": "Required for testing (^10.48.2).",
-                "mockery/mockery": "Allow using Mockery for testing (^1.5.1).",
-                "nunomaduro/collision": "Allow using Laravel style tests output and parallel testing (^6.4 || ^7.4).",
-                "orchestra/testbench-browser-kit": "Allow using legacy Laravel BrowserKit for testing (^8.0).",
-                "orchestra/testbench-dusk": "Allow using Laravel Dusk for testing (^8.0).",
-                "phpunit/phpunit": "Allow using PHPUnit for testing (^9.6 || ^10.1).",
-                "symfony/process": "Required to use Orchestra\\Testbench\\remote function (^6.2).",
-                "symfony/yaml": "Required for Testbench CLI (^6.2).",
+                "fakerphp/faker": "Allow using Faker for testing (^1.23).",
+                "laravel/framework": "Required for testing (^11.1).",
+                "mockery/mockery": "Allow using Mockery for testing (^1.6).",
+                "nunomaduro/collision": "Allow using Laravel style tests output and parallel testing (^8.0).",
+                "orchestra/testbench-dusk": "Allow using Laravel Dusk for testing (^9.0).",
+                "phpunit/phpunit": "Allow using PHPUnit for testing (^10.5 || ^11.0).",
+                "symfony/process": "Required to use Orchestra\\Testbench\\remote function (^7.0).",
+                "symfony/yaml": "Required for Testbench CLI (^7.0).",
                 "vlucas/phpdotenv": "Required for Testbench CLI (^5.4.1)."
             },
             "bin": [
@@ -8714,7 +8474,7 @@
                 "issues": "https://github.com/orchestral/testbench/issues",
                 "source": "https://github.com/orchestral/testbench-core"
             },
-            "time": "2024-03-25T04:32:37+00:00"
+            "time": "2024-07-10T01:22:27+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -8889,28 +8649,35 @@
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "5.3.0",
+            "version": "5.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170"
+                "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c",
+                "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c",
                 "shasum": ""
             },
             "require": {
+                "doctrine/deprecations": "^1.1",
                 "ext-filter": "*",
-                "php": "^7.2 || ^8.0",
+                "php": "^7.4 || ^8.0",
                 "phpdocumentor/reflection-common": "^2.2",
-                "phpdocumentor/type-resolver": "^1.3",
+                "phpdocumentor/type-resolver": "^1.7",
+                "phpstan/phpdoc-parser": "^1.7",
                 "webmozart/assert": "^1.9.1"
             },
             "require-dev": {
-                "mockery/mockery": "~1.3.2",
-                "psalm/phar": "^4.8"
+                "mockery/mockery": "~1.3.5",
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan": "^1.8",
+                "phpstan/phpstan-mockery": "^1.1",
+                "phpstan/phpstan-webmozart-assert": "^1.2",
+                "phpunit/phpunit": "^9.5",
+                "vimeo/psalm": "^5.13"
             },
             "type": "library",
             "extra": {
@@ -8934,15 +8701,15 @@
                 },
                 {
                     "name": "Jaap van Otterdijk",
-                    "email": "account@ijaap.nl"
+                    "email": "opensource@ijaap.nl"
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
             "support": {
                 "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0"
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.1"
             },
-            "time": "2021-10-19T17:43:47+00:00"
+            "time": "2024-05-21T05:55:05+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
@@ -9004,16 +8771,16 @@
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "1.28.0",
+            "version": "1.29.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb"
+                "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb",
-                "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/fcaefacf2d5c417e928405b71b400d4ce10daaf4",
+                "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4",
                 "shasum": ""
             },
             "require": {
@@ -9045,22 +8812,22 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.28.0"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.29.1"
             },
-            "time": "2024-04-03T18:51:33+00:00"
+            "time": "2024-05-31T08:52:43+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "10.1.14",
+            "version": "10.1.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b"
+                "reference": "5da8b1728acd1e6ffdf2ff32ffbdfd04307f26ae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e3f51450ebffe8e0efdf7346ae966a656f7d5e5b",
-                "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/5da8b1728acd1e6ffdf2ff32ffbdfd04307f26ae",
+                "reference": "5da8b1728acd1e6ffdf2ff32ffbdfd04307f26ae",
                 "shasum": ""
             },
             "require": {
@@ -9117,7 +8884,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.14"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.15"
             },
             "funding": [
                 {
@@ -9125,7 +8892,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-12T15:33:41+00:00"
+            "time": "2024-06-29T08:25:15+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -9203,326 +8970,825 @@
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "ext-pcntl": "*",
+                "phpunit/phpunit": "^10.0"
+            },
+            "suggest": {
+                "ext-pcntl": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Invoke callables with a timeout",
+            "homepage": "https://github.com/sebastianbergmann/php-invoker/",
+            "keywords": [
+                "process"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
+                "source": "https://github.com/sebastianbergmann/php-invoker/tree/4.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-03T06:56:09+00:00"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/0c7b06ff49e3d5072f057eb1fa59258bf287a748",
+                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+                "security": "https://github.com/sebastianbergmann/php-text-template/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-08-31T14:07:24+00:00"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "6.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/e2a2d67966e740530f4a3343fe2e030ffdc1161d",
+                "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "6.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/6.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-03T06:57:52+00:00"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "10.5.27",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "2425f713b2a5350568ccb1a2d3984841a23e83c5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2425f713b2a5350568ccb1a2d3984841a23e83c5",
+                "reference": "2425f713b2a5350568ccb1a2d3984841a23e83c5",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-xml": "*",
+                "ext-xmlwriter": "*",
+                "myclabs/deep-copy": "^1.12.0",
+                "phar-io/manifest": "^2.0.4",
+                "phar-io/version": "^3.2.1",
+                "php": ">=8.1",
+                "phpunit/php-code-coverage": "^10.1.15",
+                "phpunit/php-file-iterator": "^4.1.0",
+                "phpunit/php-invoker": "^4.0.0",
+                "phpunit/php-text-template": "^3.0.1",
+                "phpunit/php-timer": "^6.0.0",
+                "sebastian/cli-parser": "^2.0.1",
+                "sebastian/code-unit": "^2.0.0",
+                "sebastian/comparator": "^5.0.1",
+                "sebastian/diff": "^5.1.1",
+                "sebastian/environment": "^6.1.0",
+                "sebastian/exporter": "^5.1.2",
+                "sebastian/global-state": "^6.0.2",
+                "sebastian/object-enumerator": "^5.0.0",
+                "sebastian/recursion-context": "^5.0.0",
+                "sebastian/type": "^4.0.0",
+                "sebastian/version": "^4.0.1"
+            },
+            "suggest": {
+                "ext-soap": "To be able to generate mocks based on WSDL files"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "10.5-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/Framework/Assert/Functions.php"
+                ],
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.27"
+            },
+            "funding": [
+                {
+                    "url": "https://phpunit.de/sponsors.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-07-10T11:48:06+00:00"
+        },
+        {
+            "name": "psalm/plugin-laravel",
+            "version": "v2.11.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/psalm/psalm-plugin-laravel.git",
+                "reference": "ffd51399b672959331ed3ef4eaae13984474e2f0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/psalm/psalm-plugin-laravel/zipball/ffd51399b672959331ed3ef4eaae13984474e2f0",
+                "reference": "ffd51399b672959331ed3ef4eaae13984474e2f0",
+                "shasum": ""
+            },
+            "require": {
+                "barryvdh/laravel-ide-helper": "^2.13 || ^3.0",
+                "ext-simplexml": "*",
+                "illuminate/config": "^10.48 || ^11.0",
+                "illuminate/container": "^10.48 || ^11.0",
+                "illuminate/contracts": "^10.48 || ^11.0",
+                "illuminate/database": "^10.48 || ^11.0",
+                "illuminate/events": "^10.48 || ^11.0",
+                "illuminate/http": "^10.48 || ^11.0",
+                "illuminate/routing": "^10.48 || ^11.0",
+                "illuminate/support": "^10.48 || ^11.0",
+                "illuminate/view": "^10.48 || ^11.0",
+                "nikic/php-parser": "^4.18 || ^5.0",
+                "orchestra/testbench-core": "^8.22 || ^9.0",
+                "php": "^8.1",
+                "symfony/console": "^6.0 || ^7.0",
+                "symfony/finder": "^6.0 || ^7.0",
+                "vimeo/psalm": "^5.20"
+            },
+            "require-dev": {
+                "laravel/framework": "^10.48 || ^11.0",
+                "phpunit/phpunit": "^10.5 || ^11.0",
+                "phpyh/psalm-tester": "^0.1.0",
+                "ramsey/collection": "^1.3",
+                "rector/rector": "^1.0",
+                "slevomat/coding-standard": "^8.8",
+                "squizlabs/php_codesniffer": "*",
+                "symfony/http-foundation": "^6.0 || ^7.0"
+            },
+            "type": "psalm-plugin",
+            "extra": {
+                "psalm": {
+                    "pluginClass": "Psalm\\LaravelPlugin\\Plugin"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psalm\\LaravelPlugin\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Matthew Brown",
+                    "email": "github@muglug.com"
+                }
+            ],
+            "description": "Psalm plugin for Laravel",
+            "homepage": "https://github.com/psalm/psalm-plugin-laravel",
+            "support": {
+                "issues": "https://github.com/psalm/psalm-plugin-laravel/issues",
+                "source": "https://github.com/psalm/psalm-plugin-laravel/tree/v2.11.0"
+            },
+            "time": "2024-03-19T21:40:03+00:00"
+        },
+        {
+            "name": "react/cache",
+            "version": "v1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/cache.git",
+                "reference": "d47c472b64aa5608225f47965a484b75c7817d5b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/cache/zipball/d47c472b64aa5608225f47965a484b75c7817d5b",
+                "reference": "d47c472b64aa5608225f47965a484b75c7817d5b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0",
+                "react/promise": "^3.0 || ^2.0 || ^1.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\Cache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "Async, Promise-based cache interface for ReactPHP",
+            "keywords": [
+                "cache",
+                "caching",
+                "promise",
+                "reactphp"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/cache/issues",
+                "source": "https://github.com/reactphp/cache/tree/v1.2.0"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2022-11-30T15:59:55+00:00"
+        },
+        {
+            "name": "react/child-process",
+            "version": "v0.6.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/child-process.git",
+                "reference": "e71eb1aa55f057c7a4a0d08d06b0b0a484bead43"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/child-process/zipball/e71eb1aa55f057c7a4a0d08d06b0b0a484bead43",
+                "reference": "e71eb1aa55f057c7a4a0d08d06b0b0a484bead43",
+                "shasum": ""
+            },
+            "require": {
+                "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+                "php": ">=5.3.0",
+                "react/event-loop": "^1.2",
+                "react/stream": "^1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35",
+                "react/socket": "^1.8",
+                "sebastian/environment": "^5.0 || ^3.0 || ^2.0 || ^1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\ChildProcess\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "Event-driven library for executing child processes with ReactPHP.",
+            "keywords": [
+                "event-driven",
+                "process",
+                "reactphp"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/child-process/issues",
+                "source": "https://github.com/reactphp/child-process/tree/v0.6.5"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/WyriHaximus",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/clue",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-09-16T13:41:56+00:00"
+        },
+        {
+            "name": "react/dns",
+            "version": "v1.13.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/dns.git",
+                "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/dns/zipball/eb8ae001b5a455665c89c1df97f6fb682f8fb0f5",
+                "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0",
+                "react/cache": "^1.0 || ^0.6 || ^0.5",
+                "react/event-loop": "^1.2",
+                "react/promise": "^3.2 || ^2.7 || ^1.2.1"
             },
             "require-dev": {
-                "ext-pcntl": "*",
-                "phpunit/phpunit": "^10.0"
-            },
-            "suggest": {
-                "ext-pcntl": "*"
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
+                "react/async": "^4.3 || ^3 || ^2",
+                "react/promise-timer": "^1.11"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "4.0-dev"
-                }
-            },
             "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+                "psr-4": {
+                    "React\\Dns\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
                 }
             ],
-            "description": "Invoke callables with a timeout",
-            "homepage": "https://github.com/sebastianbergmann/php-invoker/",
+            "description": "Async DNS resolver for ReactPHP",
             "keywords": [
-                "process"
+                "async",
+                "dns",
+                "dns-resolver",
+                "reactphp"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
-                "source": "https://github.com/sebastianbergmann/php-invoker/tree/4.0.0"
+                "issues": "https://github.com/reactphp/dns/issues",
+                "source": "https://github.com/reactphp/dns/tree/v1.13.0"
             },
             "funding": [
                 {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
                 }
             ],
-            "time": "2023-02-03T06:56:09+00:00"
+            "time": "2024-06-13T14:18:03+00:00"
         },
         {
-            "name": "phpunit/php-text-template",
-            "version": "3.0.1",
+            "name": "react/event-loop",
+            "version": "v1.5.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748"
+                "url": "https://github.com/reactphp/event-loop.git",
+                "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/0c7b06ff49e3d5072f057eb1fa59258bf287a748",
-                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748",
+                "url": "https://api.github.com/repos/reactphp/event-loop/zipball/bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354",
+                "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=5.3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
             },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.0-dev"
-                }
+            "suggest": {
+                "ext-pcntl": "For signal handling support when using the StreamSelectLoop"
             },
+            "type": "library",
             "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+                "psr-4": {
+                    "React\\EventLoop\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
                 }
             ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "description": "ReactPHP's core reactor event loop that libraries can use for evented I/O.",
             "keywords": [
-                "template"
+                "asynchronous",
+                "event-loop"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
-                "security": "https://github.com/sebastianbergmann/php-text-template/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.1"
+                "issues": "https://github.com/reactphp/event-loop/issues",
+                "source": "https://github.com/reactphp/event-loop/tree/v1.5.0"
             },
             "funding": [
                 {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
                 }
             ],
-            "time": "2023-08-31T14:07:24+00:00"
+            "time": "2023-11-13T13:48:05+00:00"
         },
         {
-            "name": "phpunit/php-timer",
-            "version": "6.0.0",
+            "name": "react/promise",
+            "version": "v3.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d"
+                "url": "https://github.com/reactphp/promise.git",
+                "reference": "8a164643313c71354582dc850b42b33fa12a4b63"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/e2a2d67966e740530f4a3343fe2e030ffdc1161d",
-                "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d",
+                "url": "https://api.github.com/repos/reactphp/promise/zipball/8a164643313c71354582dc850b42b33fa12a4b63",
+                "reference": "8a164643313c71354582dc850b42b33fa12a4b63",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=7.1.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpstan/phpstan": "1.10.39 || 1.4.10",
+                "phpunit/phpunit": "^9.6 || ^7.5"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "6.0-dev"
-                }
-            },
             "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+                "files": [
+                    "src/functions_include.php"
+                ],
+                "psr-4": {
+                    "React\\Promise\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
                 }
             ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "description": "A lightweight implementation of CommonJS Promises/A for PHP",
             "keywords": [
-                "timer"
+                "promise",
+                "promises"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
-                "source": "https://github.com/sebastianbergmann/php-timer/tree/6.0.0"
+                "issues": "https://github.com/reactphp/promise/issues",
+                "source": "https://github.com/reactphp/promise/tree/v3.2.0"
             },
             "funding": [
                 {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
                 }
             ],
-            "time": "2023-02-03T06:57:52+00:00"
+            "time": "2024-05-24T10:39:05+00:00"
         },
         {
-            "name": "phpunit/phpunit",
-            "version": "10.5.16",
+            "name": "react/socket",
+            "version": "v1.15.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "18f8d4a5f52b61fdd9370aaae3167daa0eeb69cd"
+                "url": "https://github.com/reactphp/socket.git",
+                "reference": "216d3aec0b87f04a40ca04f481e6af01bdd1d038"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/18f8d4a5f52b61fdd9370aaae3167daa0eeb69cd",
-                "reference": "18f8d4a5f52b61fdd9370aaae3167daa0eeb69cd",
+                "url": "https://api.github.com/repos/reactphp/socket/zipball/216d3aec0b87f04a40ca04f481e6af01bdd1d038",
+                "reference": "216d3aec0b87f04a40ca04f481e6af01bdd1d038",
                 "shasum": ""
             },
             "require": {
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-libxml": "*",
-                "ext-mbstring": "*",
-                "ext-xml": "*",
-                "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.10.1",
-                "phar-io/manifest": "^2.0.3",
-                "phar-io/version": "^3.0.2",
-                "php": ">=8.1",
-                "phpunit/php-code-coverage": "^10.1.5",
-                "phpunit/php-file-iterator": "^4.0",
-                "phpunit/php-invoker": "^4.0",
-                "phpunit/php-text-template": "^3.0",
-                "phpunit/php-timer": "^6.0",
-                "sebastian/cli-parser": "^2.0",
-                "sebastian/code-unit": "^2.0",
-                "sebastian/comparator": "^5.0",
-                "sebastian/diff": "^5.0",
-                "sebastian/environment": "^6.0",
-                "sebastian/exporter": "^5.1",
-                "sebastian/global-state": "^6.0.1",
-                "sebastian/object-enumerator": "^5.0",
-                "sebastian/recursion-context": "^5.0",
-                "sebastian/type": "^4.0",
-                "sebastian/version": "^4.0"
+                "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+                "php": ">=5.3.0",
+                "react/dns": "^1.11",
+                "react/event-loop": "^1.2",
+                "react/promise": "^3 || ^2.6 || ^1.2.1",
+                "react/stream": "^1.2"
             },
-            "suggest": {
-                "ext-soap": "To be able to generate mocks based on WSDL files"
+            "require-dev": {
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
+                "react/async": "^4 || ^3 || ^2",
+                "react/promise-stream": "^1.4",
+                "react/promise-timer": "^1.10"
             },
-            "bin": [
-                "phpunit"
-            ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "10.5-dev"
-                }
-            },
             "autoload": {
-                "files": [
-                    "src/Framework/Assert/Functions.php"
-                ],
-                "classmap": [
-                    "src/"
-                ]
+                "psr-4": {
+                    "React\\Socket\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
                 }
             ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
+            "description": "Async, streaming plaintext TCP/IP and secure TLS socket server and client connections for ReactPHP",
             "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
+                "Connection",
+                "Socket",
+                "async",
+                "reactphp",
+                "stream"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.16"
+                "issues": "https://github.com/reactphp/socket/issues",
+                "source": "https://github.com/reactphp/socket/tree/v1.15.0"
             },
             "funding": [
                 {
-                    "url": "https://phpunit.de/sponsors.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
-                    "type": "tidelift"
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
                 }
             ],
-            "time": "2024-03-28T10:08:10+00:00"
+            "time": "2023-12-15T11:02:10+00:00"
         },
         {
-            "name": "psalm/plugin-laravel",
-            "version": "v2.11.0",
+            "name": "react/stream",
+            "version": "v1.4.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/psalm/psalm-plugin-laravel.git",
-                "reference": "ffd51399b672959331ed3ef4eaae13984474e2f0"
+                "url": "https://github.com/reactphp/stream.git",
+                "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/psalm/psalm-plugin-laravel/zipball/ffd51399b672959331ed3ef4eaae13984474e2f0",
-                "reference": "ffd51399b672959331ed3ef4eaae13984474e2f0",
+                "url": "https://api.github.com/repos/reactphp/stream/zipball/1e5b0acb8fe55143b5b426817155190eb6f5b18d",
+                "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d",
                 "shasum": ""
             },
             "require": {
-                "barryvdh/laravel-ide-helper": "^2.13 || ^3.0",
-                "ext-simplexml": "*",
-                "illuminate/config": "^10.48 || ^11.0",
-                "illuminate/container": "^10.48 || ^11.0",
-                "illuminate/contracts": "^10.48 || ^11.0",
-                "illuminate/database": "^10.48 || ^11.0",
-                "illuminate/events": "^10.48 || ^11.0",
-                "illuminate/http": "^10.48 || ^11.0",
-                "illuminate/routing": "^10.48 || ^11.0",
-                "illuminate/support": "^10.48 || ^11.0",
-                "illuminate/view": "^10.48 || ^11.0",
-                "nikic/php-parser": "^4.18 || ^5.0",
-                "orchestra/testbench-core": "^8.22 || ^9.0",
-                "php": "^8.1",
-                "symfony/console": "^6.0 || ^7.0",
-                "symfony/finder": "^6.0 || ^7.0",
-                "vimeo/psalm": "^5.20"
+                "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+                "php": ">=5.3.8",
+                "react/event-loop": "^1.2"
             },
             "require-dev": {
-                "laravel/framework": "^10.48 || ^11.0",
-                "phpunit/phpunit": "^10.5 || ^11.0",
-                "phpyh/psalm-tester": "^0.1.0",
-                "ramsey/collection": "^1.3",
-                "rector/rector": "^1.0",
-                "slevomat/coding-standard": "^8.8",
-                "squizlabs/php_codesniffer": "*",
-                "symfony/http-foundation": "^6.0 || ^7.0"
-            },
-            "type": "psalm-plugin",
-            "extra": {
-                "psalm": {
-                    "pluginClass": "Psalm\\LaravelPlugin\\Plugin"
-                }
+                "clue/stream-filter": "~1.2",
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
             },
+            "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Psalm\\LaravelPlugin\\": "src"
+                    "React\\Stream\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -9531,17 +9797,48 @@
             ],
             "authors": [
                 {
-                    "name": "Matthew Brown",
-                    "email": "github@muglug.com"
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
                 }
             ],
-            "description": "Psalm plugin for Laravel",
-            "homepage": "https://github.com/psalm/psalm-plugin-laravel",
+            "description": "Event-driven readable and writable streams for non-blocking I/O in ReactPHP",
+            "keywords": [
+                "event-driven",
+                "io",
+                "non-blocking",
+                "pipe",
+                "reactphp",
+                "readable",
+                "stream",
+                "writable"
+            ],
             "support": {
-                "issues": "https://github.com/psalm/psalm-plugin-laravel/issues",
-                "source": "https://github.com/psalm/psalm-plugin-laravel/tree/v2.11.0"
+                "issues": "https://github.com/reactphp/stream/issues",
+                "source": "https://github.com/reactphp/stream/tree/v1.4.0"
             },
-            "time": "2024-03-19T21:40:03+00:00"
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2024-06-11T12:45:25+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -10461,16 +10758,16 @@
         },
         {
             "name": "spatie/array-to-xml",
-            "version": "3.2.3",
+            "version": "3.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/array-to-xml.git",
-                "reference": "c95fd4db94ec199f798d4b5b4a81757bd20d88ab"
+                "reference": "f56b220fe2db1ade4c88098d83413ebdfc3bf876"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/c95fd4db94ec199f798d4b5b4a81757bd20d88ab",
-                "reference": "c95fd4db94ec199f798d4b5b4a81757bd20d88ab",
+                "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/f56b220fe2db1ade4c88098d83413ebdfc3bf876",
+                "reference": "f56b220fe2db1ade4c88098d83413ebdfc3bf876",
                 "shasum": ""
             },
             "require": {
@@ -10483,6 +10780,11 @@
                 "spatie/pest-plugin-snapshots": "^1.1"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Spatie\\ArrayToXml\\": "src"
@@ -10508,7 +10810,7 @@
                 "xml"
             ],
             "support": {
-                "source": "https://github.com/spatie/array-to-xml/tree/3.2.3"
+                "source": "https://github.com/spatie/array-to-xml/tree/3.3.0"
             },
             "funding": [
                 {
@@ -10520,27 +10822,30 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-02-07T10:39:02+00:00"
+            "time": "2024-05-01T10:20:27+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v6.4.6",
+            "version": "v7.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "9919b5509ada52cc7f66f9a35c86a4a29955c9d3"
+                "reference": "92a91985250c251de9b947a14bb2c9390b1a562c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/9919b5509ada52cc7f66f9a35c86a4a29955c9d3",
-                "reference": "9919b5509ada52cc7f66f9a35c86a4a29955c9d3",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/92a91985250c251de9b947a14bb2c9390b1a562c",
+                "reference": "92a91985250c251de9b947a14bb2c9390b1a562c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-mbstring": "~1.8"
             },
+            "require-dev": {
+                "symfony/process": "^6.4|^7.0"
+            },
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -10567,7 +10872,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v6.4.6"
+                "source": "https://github.com/symfony/filesystem/tree/v7.1.2"
             },
             "funding": [
                 {
@@ -10583,24 +10888,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-21T19:36:20+00:00"
+            "time": "2024-06-28T10:03:55+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v6.4.0",
+            "version": "v7.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "22301f0e7fdeaacc14318928612dee79be99860e"
+                "reference": "47aa818121ed3950acd2b58d1d37d08a94f9bf55"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/22301f0e7fdeaacc14318928612dee79be99860e",
-                "reference": "22301f0e7fdeaacc14318928612dee79be99860e",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/47aa818121ed3950acd2b58d1d37d08a94f9bf55",
+                "reference": "47aa818121ed3950acd2b58d1d37d08a94f9bf55",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/deprecation-contracts": "^2.5|^3"
             },
             "type": "library",
@@ -10634,7 +10939,7 @@
                 "options"
             ],
             "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v6.4.0"
+                "source": "https://github.com/symfony/options-resolver/tree/v7.1.1"
             },
             "funding": [
                 {
@@ -10650,20 +10955,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-08-08T10:16:24+00:00"
+            "time": "2024-05-31T14:57:53+00:00"
         },
         {
             "name": "symfony/polyfill-php81",
-            "version": "v1.29.0",
+            "version": "v1.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php81.git",
-                "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d"
+                "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d",
-                "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d",
+                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/3fb075789fb91f9ad9af537c4012d523085bd5af",
+                "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af",
                 "shasum": ""
             },
             "require": {
@@ -10710,7 +11015,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.30.0"
             },
             "funding": [
                 {
@@ -10726,24 +11031,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-06-19T12:30:46+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v6.4.3",
+            "version": "v7.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "416596166641f1f728b0a64f5b9dd07cceb410c1"
+                "reference": "5b75bb1ac2ba1b9d05c47fc4b3046a625377d23d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/416596166641f1f728b0a64f5b9dd07cceb410c1",
-                "reference": "416596166641f1f728b0a64f5b9dd07cceb410c1",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/5b75bb1ac2ba1b9d05c47fc4b3046a625377d23d",
+                "reference": "5b75bb1ac2ba1b9d05c47fc4b3046a625377d23d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/service-contracts": "^2.5|^3"
             },
             "type": "library",
@@ -10772,7 +11077,7 @@
             "description": "Provides a way to profile code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v6.4.3"
+                "source": "https://github.com/symfony/stopwatch/tree/v7.1.1"
             },
             "funding": [
                 {
@@ -10788,7 +11093,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T14:35:58+00:00"
+            "time": "2024-05-31T14:57:53+00:00"
         },
         {
             "name": "theseer/tokenizer",
@@ -10842,16 +11147,16 @@
         },
         {
             "name": "vimeo/psalm",
-            "version": "5.23.1",
+            "version": "5.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vimeo/psalm.git",
-                "reference": "8471a896ccea3526b26d082f4461eeea467f10a4"
+                "reference": "01a8eb06b9e9cc6cfb6a320bf9fb14331919d505"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vimeo/psalm/zipball/8471a896ccea3526b26d082f4461eeea467f10a4",
-                "reference": "8471a896ccea3526b26d082f4461eeea467f10a4",
+                "url": "https://api.github.com/repos/vimeo/psalm/zipball/01a8eb06b9e9cc6cfb6a320bf9fb14331919d505",
+                "reference": "01a8eb06b9e9cc6cfb6a320bf9fb14331919d505",
                 "shasum": ""
             },
             "require": {
@@ -10948,7 +11253,7 @@
                 "issues": "https://github.com/vimeo/psalm/issues",
                 "source": "https://github.com/vimeo/psalm"
             },
-            "time": "2024-03-11T20:33:46+00:00"
+            "time": "2024-06-16T15:08:35+00:00"
         }
     ],
     "aliases": [],
@@ -10957,7 +11262,7 @@
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
-        "php": "^8.1",
+        "php": "^8.2",
         "ext-exif": "*",
         "ext-json": "*",
         "ext-pgsql": "*",
@@ -10967,7 +11272,7 @@
     },
     "platform-dev": [],
     "platform-overrides": {
-        "php": "8.1.13"
+        "php": "8.2.21"
     },
     "plugin-api-version": "2.2.0"
 }
diff --git a/config/app.php b/config/app.php
index 331a3756c..f1bd54480 100644
--- a/config/app.php
+++ b/config/app.php
@@ -10,9 +10,9 @@
     | Application Name
     |--------------------------------------------------------------------------
     |
-    | This value is the name of your application. This value is used when the
+    | This value is the name of your application, which will be used when the
     | framework needs to place the application's name in a notification or
-    | any other location as required by the application or its packages.
+    | other UI elements where an application name needs to be displayed.
     |
     */
 
@@ -51,7 +51,7 @@
     |
     | This URL is used by the console to properly generate URLs when using
     | the Artisan command line tool. You should set this to the root of
-    | your application so that it is used when running Artisan tasks.
+    | the application so that it's available within Artisan commands.
     |
     */
 
@@ -77,8 +77,8 @@
     |--------------------------------------------------------------------------
     |
     | Here you may specify the default timezone for your application, which
-    | will be used by the PHP date and date-time functions. We have gone
-    | ahead and set this to a sensible default for you out of the box.
+    | will be used by the PHP date and date-time functions. The timezone
+    | is set to "UTC" by default as it is suitable for most use cases.
     |
     */
 
@@ -90,52 +90,55 @@
     |--------------------------------------------------------------------------
     |
     | The application locale determines the default locale that will be used
-    | by the translation service provider. You are free to set this value
-    | to any of the locales which will be supported by the application.
+    | by Laravel's translation / localization methods. This option can be
+    | set to any locale for which you plan to have translation strings.
     |
     */
 
-    'locale' => 'en',
+    'locale' => env('APP_LOCALE', 'en'),
 
-    /*
-    |--------------------------------------------------------------------------
-    | Application Fallback Locale
-    |--------------------------------------------------------------------------
-    |
-    | The fallback locale determines the locale to use when the current one
-    | is not available. You may change the value to correspond to any of
-    | the language folders that are provided through your application.
-    |
-    */
+    'fallback_locale' => env('APP_FALLBACK_LOCALE', 'en'),
 
-    'fallback_locale' => 'en',
+    'faker_locale' => env('APP_FAKER_LOCALE', 'en_US'),
 
     /*
     |--------------------------------------------------------------------------
-    | Faker Locale
+    | Encryption Key
     |--------------------------------------------------------------------------
     |
-    | This locale will be used by the Faker PHP library when generating fake
-    | data for your database seeds. For example, this will be used to get
-    | localized telephone numbers, street address information and more.
+    | This key is utilized by Laravel's encryption services and should be set
+    | to a random, 32 character string to ensure that all encrypted values
+    | are secure. You should do this prior to deploying the application.
     |
     */
-    'faker_locale' => 'en_US',
+
+    'cipher' => 'AES-256-CBC',
+
+    'key' => env('APP_KEY'),
+
+    'previous_keys' => [
+        ...array_filter(
+            explode(',', env('APP_PREVIOUS_KEYS', ''))
+        ),
+    ],
 
     /*
     |--------------------------------------------------------------------------
-    | Encryption Key
+    | Maintenance Mode Driver
     |--------------------------------------------------------------------------
     |
-    | This key is used by the Illuminate encrypter service and should be set
-    | to a random, 32 character string, otherwise these encrypted strings
-    | will not be safe. Please do this before deploying an application!
+    | These configuration options determine the driver used to determine and
+    | manage Laravel's "maintenance mode" status. The "cache" driver will
+    | allow maintenance mode to be controlled across multiple machines.
+    |
+    | Supported drivers: "file", "cache"
     |
     */
 
-    'key' => env('APP_KEY'),
-
-    'cipher' => 'AES-256-CBC',
+    'maintenance' => [
+        'driver' => env('APP_MAINTENANCE_DRIVER', 'file'),
+        'store' => env('APP_MAINTENANCE_STORE', 'database'),
+    ],
 
     /*
     |--------------------------------------------------------------------------
diff --git a/config/auth.php b/config/auth.php
index b2aee44a5..e7aad33ae 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -7,15 +7,15 @@
     | Authentication Defaults
     |--------------------------------------------------------------------------
     |
-    | This option controls the default authentication "guard" and password
-    | reset options for your application. You may change these defaults
+    | This option defines the default authentication "guard" and password
+    | reset "broker" for your application. You may change these values
     | as required, but they're a perfect start for most applications.
     |
     */
 
     'defaults' => [
-        'guard' => 'web',
-        'passwords' => 'users',
+        'guard' => env('AUTH_GUARD', 'web'),
+        'passwords' => env('AUTH_PASSWORD_BROKER', 'users'),
     ],
 
     /*
@@ -25,11 +25,11 @@
     |
     | Next, you may define every authentication guard for your application.
     | Of course, a great default configuration has been defined for you
-    | here which uses session storage and the Eloquent user provider.
+    | which utilizes session storage plus the Eloquent user provider.
     |
-    | All authentication drivers have a user provider. This defines how the
+    | All authentication guards have a user provider, which defines how the
     | users are actually retrieved out of your database or other storage
-    | mechanisms used by this application to persist your user's data.
+    | system used by the application. Typically, Eloquent is utilized.
     |
     | Supported: "session"
     |
@@ -59,12 +59,12 @@
     | User Providers
     |--------------------------------------------------------------------------
     |
-    | All authentication drivers have a user provider. This defines how the
+    | All authentication guards have a user provider, which defines how the
     | users are actually retrieved out of your database or other storage
-    | mechanisms used by this application to persist your user's data.
+    | system used by the application. Typically, Eloquent is utilized.
     |
     | If you have multiple user tables or models you may configure multiple
-    | sources which represent each model / table. These sources may then
+    | providers to represent the model / table. These providers may then
     | be assigned to any extra authentication guards you have defined.
     |
     | Supported: "database", "eloquent"
@@ -74,7 +74,7 @@
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model' => Biigle\User::class,
+            'model' => env('AUTH_MODEL', Biigle\User::class),
         ],
 
         'federated-search-instances' => [
@@ -93,13 +93,9 @@
     | Resetting Passwords
     |--------------------------------------------------------------------------
     |
-    | Here you may set the options for resetting passwords including the view
-    | that is your password reset e-mail. You may also set the name of the
-    | table that maintains all of the reset tokens for your application.
-    |
-    | You may specify multiple password reset configurations if you have more
-    | than one user table or model in the application and you want to have
-    | separate password reset settings based on the specific user types.
+    | These configuration options specify the behavior of Laravel's password
+    | reset functionality, including the table utilized for token storage
+    | and the user provider that is invoked to actually retrieve users.
     |
     | The expiry time is the number of minutes that each reset token will be
     | considered valid. This security feature keeps tokens short-lived so
@@ -110,9 +106,23 @@
     'passwords' => [
         'users' => [
             'provider' => 'users',
-            'table' => 'password_resets',
+            'table' => env('AUTH_PASSWORD_RESET_TOKEN_TABLE', 'password_resets'),
             'expire' => 60,
+            'throttle' => 60,
         ],
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Password Confirmation Timeout
+    |--------------------------------------------------------------------------
+    |
+    | Here you may define the amount of seconds before a password confirmation
+    | times out and the user is prompted to re-enter their password via the
+    | confirmation screen. By default, the timeout lasts for three hours.
+    |
+    */
+
+    'password_timeout' => 10800,
+
 ];
diff --git a/config/cache.php b/config/cache.php
index 1b32f850d..ccf8135ec 100644
--- a/config/cache.php
+++ b/config/cache.php
@@ -9,13 +9,13 @@
     | Default Cache Store
     |--------------------------------------------------------------------------
     |
-    | This option controls the default cache connection that gets used while
-    | using this caching library. This connection is used when another is
-    | not explicitly specified when executing a given caching function.
+    | This option controls the default cache store that will be used by the
+    | framework. This connection is utilized if another isn't explicitly
+    | specified when running a cache operation inside the application.
     |
     */
 
-    'default' => env('CACHE_DRIVER', 'file'),
+    'default' => env('CACHE_STORE', env('CACHE_DRIVER', 'file')),
 
     /*
     |--------------------------------------------------------------------------
@@ -26,8 +26,8 @@
     | well as their drivers. You may even define multiple stores for the
     | same cache driver to group types of items stored in your caches.
     |
-    | Supported: "apc", "array", "database", "file",
-    |            "memcached", "redis", "dynamodb", "octane", "null"
+    | Supported drivers: "array", "database", "file", "memcached",
+    |                    "redis", "dynamodb", "octane", "null"
     |
     */
 
@@ -44,9 +44,10 @@
 
         'database' => [
             'driver' => 'database',
-            'table' => 'cache',
-            'connection' => null,
-            'lock_connection' => null,
+            'connection' => env('DB_CACHE_CONNECTION'),
+            'table' => env('DB_CACHE_TABLE', 'cache'),
+            'lock_connection' => env('DB_CACHE_LOCK_CONNECTION'),
+            'lock_table' => env('DB_CACHE_LOCK_TABLE'),
         ],
 
         'file' => [
@@ -76,8 +77,8 @@
 
         'redis' => [
             'driver' => 'redis',
-            'connection' => 'cache',
-            'lock_connection' => 'default',
+            'connection' => env('REDIS_CACHE_CONNECTION', 'cache'),
+            'lock_connection' => env('REDIS_CACHE_LOCK_CONNECTION', 'default'),
         ],
 
         'dynamodb' => [
@@ -100,8 +101,8 @@
     | Cache Key Prefix
     |--------------------------------------------------------------------------
     |
-    | When utilizing a RAM based store such as APC or Memcached, there might
-    | be other applications utilizing the same cache. So, we'll specify a
+    | When utilizing the APC, database, memcached, Redis, and DynamoDB cache
+    | stores, there might be other applications using the same cache. For
     | value to get prefixed to all our keys so we can avoid collisions.
     |
     */
diff --git a/config/database.php b/config/database.php
index 90ce98207..c59e1a8df 100644
--- a/config/database.php
+++ b/config/database.php
@@ -10,8 +10,9 @@
     |--------------------------------------------------------------------------
     |
     | Here you may specify which of the database connections below you wish
-    | to use as your default connection for all database work. Of course
-    | you may use many connections at once using the Database library.
+    | to use as your default connection for database operations. This is
+    | the connection which will be utilized unless another connection
+    | is explicitly specified when you execute a query / statement.
     |
     */
 
@@ -22,74 +23,29 @@
     | Database Connections
     |--------------------------------------------------------------------------
     |
-    | Here are each of the database connections setup for your application.
-    | Of course, examples of configuring each database platform that is
-    | supported by Laravel is shown below to make development simple.
-    |
-    |
-    | All database work in Laravel is done through the PHP PDO facilities
-    | so make sure you have the driver for your particular database of
-    | choice installed on your machine before you begin development.
+    | Below are all of the database connections defined for your application.
+    | An example configuration is provided for each database system which
+    | is supported by Laravel. You're free to add / remove connections.
     |
     */
 
     'connections' => [
 
-        'sqlite' => [
-            'driver' => 'sqlite',
-            'url' => env('DATABASE_URL'),
-            'database' => env('DB_DATABASE', database_path('database.sqlite')),
-            'prefix' => '',
-            'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
-        ],
-
-        'mysql' => [
-            'driver' => 'mysql',
-            'url' => env('DATABASE_URL'),
-            'host' => env('DB_HOST', 'localhost'),
-            'port' => env('DB_PORT', '3306'),
-            'database' => env('DB_DATABASE', 'forge'),
-            'username' => env('DB_USERNAME', 'forge'),
-            'password' => env('DB_PASSWORD', ''),
-            'unix_socket' => env('DB_SOCKET', ''),
-            'charset' => 'utf8mb4',
-            'collation' => null,
-            'prefix' => '',
-            'prefix_indexes' => true,
-            'strict' => true,
-            'engine' => null,
-            'options' => extension_loaded('pdo_mysql') ? array_filter([
-                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
-            ]) : [],
-        ],
-
         'pgsql' => [
             'driver' => 'pgsql',
-            'url' => env('DATABASE_URL'),
+            'url' => env('DB_URL'),
             'host' => env('DB_HOST', 'localhost'),
             'port' => env('DB_PORT', '5432'),
-            'database' => env('DB_DATABASE', 'forge'),
-            'username' => env('DB_USERNAME', 'forge'),
+            'database' => env('DB_DATABASE', 'laravel'),
+            'username' => env('DB_USERNAME', 'root'),
             'password' => env('DB_PASSWORD', ''),
-            'charset' => 'utf8',
+            'charset' => env('DB_CHARSET', 'utf8'),
             'prefix' => '',
             'prefix_indexes' => true,
             'search_path' => 'public',
             'sslmode' => 'prefer',
         ],
 
-        'sqlsrv' => [
-            'driver' => 'sqlsrv',
-            'url' => env('DATABASE_URL'),
-            'host' => env('DB_HOST', 'localhost'),
-            'port' => env('DB_PORT', '1433'),
-            'database' => env('DB_DATABASE', 'forge'),
-            'username' => env('DB_USERNAME', 'forge'),
-            'password' => env('DB_PASSWORD', ''),
-            'charset' => 'utf8',
-            'prefix' => '',
-            'prefix_indexes' => true,
-        ],
     ],
 
     /*
@@ -99,11 +55,14 @@
     |
     | This table keeps track of all the migrations that have already run for
     | your application. Using this information, we can determine which of
-    | the migrations on disk haven't actually been run in the database.
+    | the migrations on disk haven't actually been run on the database.
     |
     */
 
-    'migrations' => 'migrations',
+    'migrations' => [
+        'table' => 'migrations',
+        'update_date_on_publish' => true,
+    ],
 
     /*
     |--------------------------------------------------------------------------
@@ -112,7 +71,7 @@
     |
     | Redis is an open source, fast, and advanced key-value store that also
     | provides a richer body of commands than a typical key-value system
-    | such as APC or Memcached. Laravel makes it easy to dig right in.
+    | such as Memcached. You may define your connection settings here.
     |
     */
 
diff --git a/config/filesystems.php b/config/filesystems.php
index 68fd13004..d5e3f0196 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -9,7 +9,7 @@
     |
     | Here you may specify the default filesystem disk that should be used
     | by the framework. A "local" driver, as well as a variety of cloud
-    | based drivers are available for your choosing. Just store away!
+    | based disks are available to your application for file storage.
     |
     | Supported: "local", "ftp", "sftp", "s3"
     |
@@ -22,11 +22,13 @@
     | Filesystem Disks
     |--------------------------------------------------------------------------
     |
-    | Here you may configure as many filesystem "disks" as you wish, and you
-    | may even configure multiple disks of the same driver. Defaults have
-    | been setup for each driver as an example of the required options.
+    | Below you may configure as many filesystem disks as necessary, and you
+    | may even configure multiple disks for the same driver. Examples for
+    | most supported storage drivers are configured here for reference.
     |
-    | Note: Disks with the name "user-[number]" or "disk-[number]" may be reserved
+    | Supported drivers: "local", "ftp", "sftp", "s3"
+    |
+    | NOTE: Disks with the name "user-[number]" or "disk-[number]" may be reserved
     | for the biigle/user-storage and biigle/user-disks modules.
     */
 
diff --git a/config/hashing.php b/config/hashing.php
deleted file mode 100644
index ae44a3e87..000000000
--- a/config/hashing.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Default Hash Driver
-    |--------------------------------------------------------------------------
-    |
-    | This option controls the default hash driver that will be used to hash
-    | passwords for your application. By default, the bcrypt algorithm is
-    | used; however, you remain free to modify this option if you wish.
-    |
-    | Supported: "bcrypt", "argon", "argon2id"
-    |
-    */
-
-    'driver' => 'bcrypt',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Bcrypt Options
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify the configuration options that should be used when
-    | passwords are hashed using the Bcrypt algorithm. This will allow you
-    | to control the amount of time it takes to hash the given password.
-    |
-    */
-
-    'bcrypt' => [
-        'rounds' => env('BCRYPT_ROUNDS', 12),
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Argon Options
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify the configuration options that should be used when
-    | passwords are hashed using the Argon algorithm. These will allow you
-    | to control the amount of time it takes to hash the given password.
-    |
-    */
-
-    'argon' => [
-        'memory' => 65536,
-        'threads' => 1,
-        'time' => 4,
-    ],
-
-];
diff --git a/config/logging.php b/config/logging.php
index 0ef2b9db6..5086718c7 100644
--- a/config/logging.php
+++ b/config/logging.php
@@ -1,6 +1,7 @@
 <?php
 
 use Biigle\Logging\CreateRedisLogger;
+use Monolog\Handler\NullHandler;
 use Monolog\Handler\StreamHandler;
 use Monolog\Handler\SyslogUdpHandler;
 use Monolog\Processor\PsrLogMessageProcessor;
@@ -12,11 +13,9 @@
     | Default Log Channel
     |--------------------------------------------------------------------------
     |
-    | This option defines the default log channel that gets used when writing
-    | messages to the logs. The name specified in this option should match
-    | one of the channels defined in the "channels" configuration array.
-    |
-    | APP_LOG is for backwards compatibility of the config of Laravel 5.5.
+    | This option defines the default log channel that is utilized to write
+    | messages to your logs. The value provided here should match one of
+    | the channels present in the list of "channels" configured below.
     |
     */
 
@@ -33,27 +32,29 @@
     |
     */
 
-    'deprecations' => env('LOG_DEPRECATIONS_CHANNEL', 'null'),
+    'deprecations' => [
+        'channel' => env('LOG_DEPRECATIONS_CHANNEL', 'null'),
+        'trace' => env('LOG_DEPRECATIONS_TRACE', false),
+    ],
 
     /*
     |--------------------------------------------------------------------------
     | Log Channels
     |--------------------------------------------------------------------------
     |
-    | Here you may configure the log channels for your application. Out of
-    | the box, Laravel uses the Monolog PHP logging library. This gives
-    | you a variety of powerful log handlers / formatters to utilize.
+    | Here you may configure the log channels for your application. Laravel
+    | utilizes the Monolog PHP logging library, which includes a variety
+    | of powerful log handlers and formatters that you're free to use.
     |
-    | Available Drivers: "single", "daily", "slack", "syslog",
-    |                    "errorlog", "monolog",
-    |                    "custom", "stack"
+    | Available drivers: "single", "daily", "slack", "syslog",
+    |                    "errorlog", "monolog", "custom", "stack"
     |
     */
 
     'channels' => [
         'stack' => [
             'driver' => 'stack',
-            'channels' => ['daily'],
+            'channels' => explode(',', env('LOG_STACK', 'single')),
             'ignore_exceptions' => false,
         ],
 
@@ -68,15 +69,15 @@
             'driver' => 'daily',
             'path' => storage_path('logs/laravel.log'),
             'level' => env('LOG_LEVEL', 'debug'),
-            'days' => 14,
+            'days' => env('LOG_DAILY_DAYS', 14),
             'replace_placeholders' => true,
         ],
 
         'slack' => [
             'driver' => 'slack',
             'url' => env('LOG_SLACK_WEBHOOK_URL'),
-            'username' => 'Laravel Log',
-            'emoji' => ':boom:',
+            'username' => env('LOG_SLACK_USERNAME', 'Laravel Log'),
+            'emoji' => env('LOG_SLACK_EMOJI', ':boom:'),
             'level' => 'critical',
             'replace_placeholders' => true,
         ],
@@ -115,6 +116,7 @@
         'syslog' => [
             'driver' => 'syslog',
             'level' => env('LOG_LEVEL', 'debug'),
+            'facility' => env('LOG_SYSLOG_FACILITY', LOG_USER),
             'replace_placeholders' => true,
         ],
 
@@ -123,6 +125,15 @@
             'level' => env('LOG_LEVEL', 'debug'),
             'replace_placeholders' => true,
         ],
+
+        'null' => [
+            'driver' => 'monolog',
+            'handler' => NullHandler::class,
+        ],
+
+        'emergency' => [
+            'path' => storage_path('logs/laravel.log'),
+        ],
     ],
 
 ];
diff --git a/config/mail.php b/config/mail.php
index 891a420a4..b3b28649b 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -7,13 +7,14 @@
     | Default Mailer
     |--------------------------------------------------------------------------
     |
-    | This option controls the default mailer that is used to send any email
-    | messages sent by your application. Alternative mailers may be setup
-    | and used as needed; however, this mailer will be used by default.
+    | This option controls the default mailer that is used to send all email
+    | messages unless another mailer is explicitly specified when sending
+    | the message. All additional mailers can be configured within the
+    | "mailers" array. Examples of each type of mailer are provided.
     |
     */
 
-    'default' => env('MAIL_MAILER', env('MAIL_DRIVER', 'smtp')),
+    'default' => env('MAIL_MAILER', env('MAIL_DRIVER', 'log')),
 
     /*
     |--------------------------------------------------------------------------
@@ -24,12 +25,13 @@
     | their respective settings. Several examples have been configured for
     | you and you are free to add your own as your application requires.
     |
-    | Laravel supports a variety of mail "transport" drivers to be used while
-    | sending an e-mail. You will specify which one you are using for your
-    | mailers below. You are free to add additional mailers as required.
+    | Laravel supports a variety of mail "transport" drivers that can be used
+    | when delivering an email. You may specify which one you're using for
+    | your mailers below. You may also add additional mailers if needed.
     |
-    | Supported: "smtp", "sendmail", "mailgun", "ses",
-    |            "postmark", "log", "array", "failover"
+    | Supported: "smtp", "sendmail", "mailgun", "ses", "ses-v2",
+    |            "postmark", "resend", "log", "array",
+    |            "failover", "roundrobin"
     |
     */
 
@@ -37,20 +39,21 @@
         'smtp' => [
             'transport' => 'smtp',
             'url' => env('MAIL_URL'),
-            'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
-            'port' => env('MAIL_PORT', 587),
+            'host' => env('MAIL_HOST', '127.0.0.1'),
+            'port' => env('MAIL_PORT', 2525),
             'encryption' => env('MAIL_ENCRYPTION', 'tls'),
             'username' => env('MAIL_USERNAME'),
             'password' => env('MAIL_PASSWORD'),
             'timeout' => null,
+            'local_domain' => env('MAIL_EHLO_DOMAIN', parse_url(env('APP_URL', 'http://localhost'), PHP_URL_HOST)),
         ],
 
         'ses' => [
             'transport' => 'ses',
         ],
 
-        'mailgun' => [
-            'transport' => 'mailgun',
+        'resend' => [
+            'transport' => 'resend',
         ],
 
         'postmark' => [
@@ -85,9 +88,9 @@
     | Global "From" Address
     |--------------------------------------------------------------------------
     |
-    | You may wish for all e-mails sent by your application to be sent from
-    | the same address. Here, you may specify a name and address that is
-    | used globally for all e-mails that are sent by your application.
+    | You may wish for all emails sent by your application to be sent from
+    | the same address. Here you may specify a name and address that is
+    | used globally for all emails that are sent by your application.
     |
     */
 
@@ -96,23 +99,4 @@
         'name' => env('MAIL_FROM_NAME', 'BIIGLE'),
     ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | Markdown Mail Settings
-    |--------------------------------------------------------------------------
-    |
-    | If you are using Markdown based email rendering, you may configure your
-    | theme and component paths here, allowing you to customize the design
-    | of the emails. Or, you may simply stick with the Laravel defaults!
-    |
-    */
-
-    'markdown' => [
-        'theme' => 'default',
-
-        'paths' => [
-            resource_path('views/vendor/mail'),
-        ],
-    ],
-
 ];
diff --git a/config/queue.php b/config/queue.php
index 12865de8e..374288796 100644
--- a/config/queue.php
+++ b/config/queue.php
@@ -7,24 +7,22 @@
     | Default Queue Connection Name
     |--------------------------------------------------------------------------
     |
-    | The Laravel queue API supports a variety of back-ends via an unified
-    | API, giving you convenient access to each back-end using the same
-    | syntax for every one. Here you may define a default connection.
-    |
-    | QUEUE_DRIVER for backwards compatibility of Laravel 5.6.
+    | Laravel's queue supports a variety of backends via a single, unified
+    | API, giving you convenient access to each backend using identical
+    | syntax for each. The default queue connection is defined below.
     |
     */
 
-    'default' => env('QUEUE_CONNECTION', env('QUEUE_DRIVER', 'sync')),
+    'default' => env('QUEUE_CONNECTION', env('QUEUE_DRIVER', 'database')),
 
     /*
     |--------------------------------------------------------------------------
     | Queue Connections
     |--------------------------------------------------------------------------
     |
-    | Here you may configure the connection information for each server that
-    | is used by your application. A default configuration has been added
-    | for each back-end shipped with Laravel. You are free to add more.
+    | Here you may configure the connection options for every queue backend
+    | used by your application. An example configuration is provided for
+    | each backend supported by Laravel. You're also free to add more.
     |
     | Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null"
     |
@@ -38,17 +36,18 @@
 
         'database' => [
             'driver' => 'database',
-            'table' => 'jobs',
-            'queue' => 'default',
-            'retry_after' => 1800,
+            'connection' => env('DB_QUEUE_CONNECTION'),
+            'table' => env('DB_QUEUE_TABLE', 'jobs'),
+            'queue' => env('DB_QUEUE', 'default'),
+            'retry_after' => (int) env('DB_QUEUE_RETRY_AFTER', 1800),
             'after_commit' => false,
         ],
 
         'beanstalkd' => [
             'driver' => 'beanstalkd',
-            'host' => 'localhost',
-            'queue' => 'default',
-            'retry_after' => 1800,
+            'host' => env('BEANSTALKD_QUEUE_HOST', 'localhost'),
+            'queue' => env('BEANSTALKD_QUEUE', 'default'),
+            'retry_after' => (int) env('BEANSTALKD_QUEUE_RETRY_AFTER', 1800),
             'block_for' => 0,
             'after_commit' => false,
         ],
@@ -66,9 +65,9 @@
 
         'redis' => [
             'driver' => 'redis',
-            'connection' => 'default',
+            'connection' => env('REDIS_QUEUE_CONNECTION', 'default'),
             'queue' => env('REDIS_QUEUE', 'default'),
-            'retry_after' => 1800,
+            'retry_after' => (int) env('REDIS_QUEUE_RETRY_AFTER', 1800),
             'block_for' => null,
             'after_commit' => false,
         ],
@@ -87,7 +86,7 @@
     */
 
     'batching' => [
-        'database' => env('DB_CONNECTION', 'mysql'),
+        'database' => env('DB_CONNECTION', 'sqlite'),
         'table' => 'job_batches',
     ],
 
diff --git a/config/services.php b/config/services.php
index 2a1d616c7..27a36175f 100644
--- a/config/services.php
+++ b/config/services.php
@@ -14,12 +14,6 @@
     |
     */
 
-    'mailgun' => [
-        'domain' => env('MAILGUN_DOMAIN'),
-        'secret' => env('MAILGUN_SECRET'),
-        'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'),
-    ],
-
     'postmark' => [
         'token' => env('POSTMARK_TOKEN'),
     ],
@@ -30,4 +24,15 @@
         'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
     ],
 
+    'resend' => [
+        'key' => env('RESEND_KEY'),
+    ],
+
+    'slack' => [
+        'notifications' => [
+            'bot_user_oauth_token' => env('SLACK_BOT_USER_OAUTH_TOKEN'),
+            'channel' => env('SLACK_BOT_USER_DEFAULT_CHANNEL'),
+        ],
+    ],
+
 ];
diff --git a/config/session.php b/config/session.php
index c8b6fe9e1..88b2ba3d7 100644
--- a/config/session.php
+++ b/config/session.php
@@ -9,16 +9,16 @@
     | Default Session Driver
     |--------------------------------------------------------------------------
     |
-    | This option controls the default session "driver" that will be used on
-    | requests. By default, we will use the lightweight native driver but
-    | you may specify any of the other wonderful drivers provided here.
+    | This option determines the default session driver that is utilized for
+    | incoming requests. Laravel supports a variety of storage options to
+    | persist session data. Database storage is a great default choice.
     |
     | Supported: "file", "cookie", "database", "apc",
     |            "memcached", "redis", "dynamodb", "array"
     |
     */
 
-    'driver' => env('SESSION_DRIVER', 'file'),
+    'driver' => env('SESSION_DRIVER', 'database'),
 
     /*
     |--------------------------------------------------------------------------
@@ -27,13 +27,14 @@
     |
     | Here you may specify the number of minutes that you wish the session
     | to be allowed to remain idle before it expires. If you want them
-    | to immediately expire on the browser closing, set that option.
+    | to expire immediately when the browser is closed then you may
+    | indicate that via the expire_on_close configuration option.
     |
     */
 
     'lifetime' => env('SESSION_LIFETIME', 120),
 
-    'expire_on_close' => false,
+    'expire_on_close' => env('SESSION_EXPIRE_ON_CLOSE', false),
 
     /*
     |--------------------------------------------------------------------------
@@ -41,21 +42,21 @@
     |--------------------------------------------------------------------------
     |
     | This option allows you to easily specify that all of your session data
-    | should be encrypted before it is stored. All encryption will be run
-    | automatically by Laravel and you can use the Session like normal.
+    | should be encrypted before it's stored. All encryption is performed
+    | automatically by Laravel and you may use the session like normal.
     |
     */
 
-    'encrypt' => false,
+    'encrypt' => env('SESSION_ENCRYPT', false),
 
     /*
     |--------------------------------------------------------------------------
     | Session File Location
     |--------------------------------------------------------------------------
     |
-    | When using the native session driver, we need a location where session
-    | files may be stored. A default has been set for you but a different
-    | location may be specified. This is only needed for file sessions.
+    | When utilizing the "file" session driver, the session files are placed
+    | on disk. The default storage location is defined here; however, you
+    | are free to provide another location where they should be stored.
     |
     */
 
@@ -79,22 +80,22 @@
     | Session Database Table
     |--------------------------------------------------------------------------
     |
-    | When using the "database" session driver, you may specify the table we
-    | should use to manage the sessions. Of course, a sensible default is
-    | provided for you; however, you are free to change this as needed.
+    | When using the "database" session driver, you may specify the table to
+    | be used to store sessions. Of course, a sensible default is defined
+    | for you; however, you're welcome to change this to another table.
     |
     */
 
-    'table' => 'sessions',
+    'table' => env('SESSION_TABLE', 'sessions'),
 
     /*
     |--------------------------------------------------------------------------
     | Session Cache Store
     |--------------------------------------------------------------------------
     |
-    | While using one of the framework's cache driven session backends you may
-    | list a cache store that should be used for these sessions. This value
-    | must match with one of the application's configured cache "stores".
+    | When using one of the framework's cache driven session backends, you may
+    | define the cache store which should be used to store the session data
+    | between requests. This must match one of your defined cache stores.
     |
     | Affects: "apc", "dynamodb", "memcached", "redis"
     |
@@ -138,20 +139,20 @@
     |
     | The session cookie path determines the path for which the cookie will
     | be regarded as available. Typically, this will be the root path of
-    | your application but you are free to change this when necessary.
+    | your application, but you're free to change this when necessary.
     |
     */
 
-    'path' => '/',
+    'path' => env('SESSION_PATH', '/'),
 
     /*
     |--------------------------------------------------------------------------
     | Session Cookie Domain
     |--------------------------------------------------------------------------
     |
-    | Here you may change the domain of the cookie used to identify a session
-    | in your application. This will determine which domains the cookie is
-    | available to in your application. A sensible default has been set.
+    | This value determines the domain and subdomains the session cookie is
+    | available to. By default, the cookie will be available to the root
+    | domain and all subdomains. Typically, this shouldn't be changed.
     |
     */
 
@@ -177,11 +178,11 @@
     |
     | Setting this value to true will prevent JavaScript from accessing the
     | value of the cookie and the cookie will only be accessible through
-    | the HTTP protocol. You are free to modify this option if needed.
+    | the HTTP protocol. It's unlikely you should disable this option.
     |
     */
 
-    'http_only' => true,
+    'http_only' => env('SESSION_HTTP_ONLY', true),
 
     /*
     |--------------------------------------------------------------------------
@@ -190,11 +191,26 @@
     |
     | This option determines how your cookies behave when cross-site requests
     | take place, and can be used to mitigate CSRF attacks. By default, we
-    | will set this value to "lax" since this is a secure default value.
+    | will set this value to "lax" to permit secure cross-site requests.
+    |
+    | See: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie#samesitesamesite-value
     |
     | Supported: "lax", "strict", "none", null
     |
     */
-    'same_site' => "lax",
+    'same_site' => env('SESSION_SAME_SITE', 'lax'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Partitioned Cookies
+    |--------------------------------------------------------------------------
+    |
+    | Setting this value to true will tie the cookie to the top-level site for
+    | a cross-site context. Partitioned cookies are accepted by the browser
+    | when flagged "secure" and the Same-Site attribute is set to "none".
+    |
+    */
+
+    'partitioned' => env('SESSION_PARTITIONED_COOKIE', false),
 
 ];
diff --git a/config/view.php b/config/view.php
deleted file mode 100644
index 22b8a18d3..000000000
--- a/config/view.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | View Storage Paths
-    |--------------------------------------------------------------------------
-    |
-    | Most templating systems load templates from disk. Here you may specify
-    | an array of paths that should be checked for your views. Of course
-    | the usual Laravel view path has already been registered for you.
-    |
-    */
-
-    'paths' => [
-        resource_path('views'),
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Compiled View Path
-    |--------------------------------------------------------------------------
-    |
-    | This option determines where all the compiled Blade templates will be
-    | stored for your application. Typically, this is within the storage
-    | directory. However, as usual, you are free to change this value.
-    |
-    */
-
-    'compiled' => env(
-        'VIEW_COMPILED_PATH',
-        realpath(storage_path('framework/views'))
-    ),
-
-];
diff --git a/database/migrations/2016_07_18_082516_add_images_uuid_column.php b/database/migrations/2016_07_18_082516_add_images_uuid_column.php
index 3182be2fa..b0489f127 100644
--- a/database/migrations/2016_07_18_082516_add_images_uuid_column.php
+++ b/database/migrations/2016_07_18_082516_add_images_uuid_column.php
@@ -1,7 +1,6 @@
 <?php
 
 use Biigle\Image;
-use Doctrine\DBAL\Types\Type;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Ramsey\Uuid\Doctrine\UuidType;
@@ -30,10 +29,6 @@ public function up()
         Image::reguard();
 
         Schema::table('images', function (Blueprint $table) {
-            // make doctrine/dbal work with uuid type
-            if (!Type::hasType('uuid')) {
-                Type::addType('uuid', UuidType::class);
-            }
             $table->uuid('uuid')
                 ->nullable(false)
                 ->change();
diff --git a/database/migrations/2016_12_07_124425_add_image_geo_columns.php b/database/migrations/2016_12_07_124425_add_image_geo_columns.php
index 5d04e0854..9c9d41714 100644
--- a/database/migrations/2016_12_07_124425_add_image_geo_columns.php
+++ b/database/migrations/2016_12_07_124425_add_image_geo_columns.php
@@ -18,11 +18,8 @@ public function up()
          | coordinates and time where the image was taken.
          */
         Schema::table('images', function (Blueprint $table) {
-            // lat is bounded by +-90 and lng by +-180 so if we take a float with 11
-            // digits and 8 after the decimal point we can store all coordinates with
-            // a resolution up to a mm (http://stackoverflow.com/a/9059066/1796523)
-            $table->float('lat', 11, 8)->nullable();
-            $table->float('lng', 11, 8)->nullable();
+            $table->float('lat')->nullable();
+            $table->float('lng')->nullable();
 
             $table->timestamp('taken_at')->nullable();
         });
diff --git a/database/migrations/2018_03_20_160857_add_user_label_label_tree_uuid.php b/database/migrations/2018_03_20_160857_add_user_label_label_tree_uuid.php
index c71c04477..3a2cc1e9e 100644
--- a/database/migrations/2018_03_20_160857_add_user_label_label_tree_uuid.php
+++ b/database/migrations/2018_03_20_160857_add_user_label_label_tree_uuid.php
@@ -1,6 +1,5 @@
 <?php
 
-use Doctrine\DBAL\Types\Type;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -16,10 +15,6 @@ class AddUserLabelLabelTreeUuid extends Migration
      */
     public function up()
     {
-        // Make doctrine/dbal work with uuid type.
-        if (!Type::hasType('uuid')) {
-            Type::addType('uuid', UuidType::class);
-        }
         $this->addUuidToTable('users');
         $this->addUuidToTable('label_trees');
         $this->addUuidToTable('labels');
diff --git a/database/migrations/2020_07_14_074339_add_video_volumes.php b/database/migrations/2020_07_14_074339_add_video_volumes.php
index 6ffdae87d..98a1fa4eb 100644
--- a/database/migrations/2020_07_14_074339_add_video_volumes.php
+++ b/database/migrations/2020_07_14_074339_add_video_volumes.php
@@ -52,7 +52,7 @@ public function up()
                 'created_at',
                 'updated_at',
             ]);
-            $table->integer('volume_id')->nullable(false)->change();
+            $table->integer('volume_id')->nullable(false)->unsigned()->change();
         });
     }
 
@@ -76,7 +76,7 @@ public function down()
                 ->on('users')
                 ->onDelete('set null');
 
-            $table->integer('volume_id')->nullable(true)->change();
+            $table->integer('volume_id')->nullable(true)->unsigned()->change();
 
             $table->string('url')->nullable();
             $table->string('name')->nullable();
@@ -101,7 +101,7 @@ public function down()
 
         Schema::table('videos', function (Blueprint $table) {
             $table->dropColumn(['volume_id', 'filename']);
-            $table->integer('project_id')->nullable(false)->change();
+            $table->integer('project_id')->nullable(false)->unsigned()->change();
             $table->string('url')->nullable(false)->change();
             $table->string('name')->nullable(false)->change();
         });
diff --git a/phpunit.xml b/phpunit.xml
index 2b47f3e9e..aabd29c6c 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -16,9 +16,10 @@
     </source>
     <php>
         <env name="APP_ENV" value="testing"/>
+        <env name="APP_MAINTENANCE_DRIVER" value="file"/>
         <env name="LOG_CHANNEL" value="errorlog"/>
         <env name="BCRYPT_ROUNDS" value="4"/>
-        <env name="CACHE_DRIVER" value="array"/>
+        <env name="CACHE_STORE" value="array"/>
         <env name="MAIL_MAILER" value="array"/>
         <env name="BROADCAST_DRIVER" value="null"/>
         <env name="SESSION_DRIVER" value="array"/>

From 364d190cec5774b5e785b58fb5a66be56181759e Mon Sep 17 00:00:00 2001
From: aneust <aneustaedter@techfak.uni-bielefeld.de>
Date: Mon, 15 Jul 2024 22:43:55 +0200
Subject: [PATCH 110/209] update test to check code

---
 tests/php/Jobs/ProcessNewImageTest.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tests/php/Jobs/ProcessNewImageTest.php b/tests/php/Jobs/ProcessNewImageTest.php
index 73a9088a5..7a67e0ed8 100644
--- a/tests/php/Jobs/ProcessNewImageTest.php
+++ b/tests/php/Jobs/ProcessNewImageTest.php
@@ -61,6 +61,25 @@ public function testHandleCollectMetadataZeroDate()
         $this->assertEquals(null, $image->taken_at);
     }
 
+    public function testHandleCollectMetadataAreaYaw()
+    {
+        $volume = VolumeTest::create();
+        $image = ImageTest::create([
+            'filename' => 'exif-test.jpg',
+            'volume_id' => $volume->id,
+            'attrs' => [
+                'metadata' => ['area' => 2.6],
+            ],
+        ]);
+
+        with(new ProcessNewImageMock($image))->handle();
+
+        $image = $image->fresh();
+
+        $this->assertEquals(47.75,$image->metadata['yaw']);
+        $this->assertEquals(2.6 ,$image->metadata['area']);
+    }
+
     public function testHandleMakeThumbnail()
     {
         if (!function_exists('vips_call')) {

From 09cbfd96891ce0e528bfa50c42f19a9a1306d4d5 Mon Sep 17 00:00:00 2001
From: aneust <aneustaedter@techfak.uni-bielefeld.de>
Date: Mon, 15 Jul 2024 23:50:14 +0200
Subject: [PATCH 111/209] extended metadata collection with yaw and area

---
 app/Jobs/ProcessNewImage.php | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/app/Jobs/ProcessNewImage.php b/app/Jobs/ProcessNewImage.php
index 10491f3d9..03ee9b133 100644
--- a/app/Jobs/ProcessNewImage.php
+++ b/app/Jobs/ProcessNewImage.php
@@ -206,6 +206,18 @@ protected function collectMetadata(Image $image, $path)
                     'gps_altitude' => $ref * $this->fracToFloat($exif['GPSAltitude']),
                 ]);
             }
+
+            if($this->hasGpsImgDirInfo($exif)){
+                $image->metadata = array_merge($image->metadata, [
+                    'yaw' => $ref * $this->fracToFloat($exif['GPSImgDirection']),
+                ]);
+            }
+
+            if($this->hasSubjectAreaInfo($exif)){
+                $image->metadata = array_merge($image->metadata, [
+                    'area' => $ref * $this->fracToFloat($exif['SubjectArea']),
+                ]);
+            }
         }
 
         $image->save();
@@ -248,6 +260,28 @@ protected function hasExtendedGpsInfo(array $exif)
             array_key_exists('GPSAltitudeRef', $exif);
     }
 
+    /**
+     * Check if an exif array contains GPSImgDirection information.
+     *
+     * @param  array   $exif
+     * @return bool
+     */
+    protected function hasGpsImgDirInfo(array $exif)
+    {
+        return array_key_exists('GPSImgDirection', $exif);
+    }
+
+    /**
+     * Check if an exif array contains SubjectArea information.
+     *
+     * @param  array   $exif
+     * @return bool
+     */
+    protected function hasSubjectAreaInfo(array $exif)
+    {
+        return array_key_exists('SubjectArea', $exif);
+    }
+
     /**
      * Get the exif information of an image if possible.
      *

From bbf2aaa5a028aefaf9829849bf4c82b6d7e5bf64 Mon Sep 17 00:00:00 2001
From: aneust <aneustaedter@techfak.uni-bielefeld.de>
Date: Tue, 16 Jul 2024 08:19:22 +0200
Subject: [PATCH 112/209] used composer fix

---
 app/Jobs/ProcessNewImage.php           | 4 ++--
 tests/php/Jobs/ProcessNewImageTest.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Jobs/ProcessNewImage.php b/app/Jobs/ProcessNewImage.php
index 03ee9b133..3fca31df8 100644
--- a/app/Jobs/ProcessNewImage.php
+++ b/app/Jobs/ProcessNewImage.php
@@ -207,13 +207,13 @@ protected function collectMetadata(Image $image, $path)
                 ]);
             }
 
-            if($this->hasGpsImgDirInfo($exif)){
+            if ($this->hasGpsImgDirInfo($exif)) {
                 $image->metadata = array_merge($image->metadata, [
                     'yaw' => $ref * $this->fracToFloat($exif['GPSImgDirection']),
                 ]);
             }
 
-            if($this->hasSubjectAreaInfo($exif)){
+            if ($this->hasSubjectAreaInfo($exif)) {
                 $image->metadata = array_merge($image->metadata, [
                     'area' => $ref * $this->fracToFloat($exif['SubjectArea']),
                 ]);
diff --git a/tests/php/Jobs/ProcessNewImageTest.php b/tests/php/Jobs/ProcessNewImageTest.php
index 7a67e0ed8..8b3eb4db0 100644
--- a/tests/php/Jobs/ProcessNewImageTest.php
+++ b/tests/php/Jobs/ProcessNewImageTest.php
@@ -76,8 +76,8 @@ public function testHandleCollectMetadataAreaYaw()
 
         $image = $image->fresh();
 
-        $this->assertEquals(47.75,$image->metadata['yaw']);
-        $this->assertEquals(2.6 ,$image->metadata['area']);
+        $this->assertEquals(47.75, $image->metadata['yaw']);
+        $this->assertEquals(2.6, $image->metadata['area']);
     }
 
     public function testHandleMakeThumbnail()

From 97afea99b4ad48d9ab3e9f399ef675c2dd705c50 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 17 Jul 2024 10:13:13 +0200
Subject: [PATCH 113/209] Fix namespace of test classes

---
 .../php/Http/Controllers/Api/LabelTreeMergeControllerTest.php  | 2 +-
 .../Controllers/Views/LabelTrees/LabelTreeControllerTest.php   | 2 +-
 .../Views/LabelTrees/LabelTreeMembersControllerTest.php        | 2 +-
 .../Views/LabelTrees/LabelTreeMergeControllerTest.php          | 2 +-
 .../Views/LabelTrees/LabelTreeProjectsControllerTest.php       | 2 +-
 .../Views/LabelTrees/LabelTreeVersionsControllerTest.php       | 2 +-
 tests/php/Services/LabelSourceAdapters/WormsAdapterTest.php    | 3 ++-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/php/Http/Controllers/Api/LabelTreeMergeControllerTest.php b/tests/php/Http/Controllers/Api/LabelTreeMergeControllerTest.php
index 369e0ac54..1459d0bed 100644
--- a/tests/php/Http/Controllers/Api/LabelTreeMergeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/LabelTreeMergeControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Biigle\Http\Controllers\Api;
+namespace Biigle\Tests\Http\Controllers\Api;
 
 use ApiTestCase;
 use Biigle\Role;
diff --git a/tests/php/Http/Controllers/Views/LabelTrees/LabelTreeControllerTest.php b/tests/php/Http/Controllers/Views/LabelTrees/LabelTreeControllerTest.php
index 551da333d..c4e44b1a9 100644
--- a/tests/php/Http/Controllers/Views/LabelTrees/LabelTreeControllerTest.php
+++ b/tests/php/Http/Controllers/Views/LabelTrees/LabelTreeControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Biigle\Http\Controllers\Views\LabelTrees;
+namespace Biigle\Tests\Http\Controllers\Views\LabelTrees;
 
 use Biigle\Role;
 use Biigle\Tests\LabelTreeTest;
diff --git a/tests/php/Http/Controllers/Views/LabelTrees/LabelTreeMembersControllerTest.php b/tests/php/Http/Controllers/Views/LabelTrees/LabelTreeMembersControllerTest.php
index 1b5f3cc22..20fb29561 100644
--- a/tests/php/Http/Controllers/Views/LabelTrees/LabelTreeMembersControllerTest.php
+++ b/tests/php/Http/Controllers/Views/LabelTrees/LabelTreeMembersControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Biigle\Http\Controllers\Views\LabelTrees;
+namespace Biigle\Tests\Http\Controllers\Views\LabelTrees;
 
 use Biigle\Role;
 use Biigle\Tests\LabelTreeTest;
diff --git a/tests/php/Http/Controllers/Views/LabelTrees/LabelTreeMergeControllerTest.php b/tests/php/Http/Controllers/Views/LabelTrees/LabelTreeMergeControllerTest.php
index da4028d8c..501c0820a 100644
--- a/tests/php/Http/Controllers/Views/LabelTrees/LabelTreeMergeControllerTest.php
+++ b/tests/php/Http/Controllers/Views/LabelTrees/LabelTreeMergeControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Biigle\Http\Controllers\Views\LabelTrees;
+namespace Biigle\Tests\Http\Controllers\Views\LabelTrees;
 
 use Biigle\Role;
 use Biigle\Tests\LabelTreeTest;
diff --git a/tests/php/Http/Controllers/Views/LabelTrees/LabelTreeProjectsControllerTest.php b/tests/php/Http/Controllers/Views/LabelTrees/LabelTreeProjectsControllerTest.php
index 2f50164df..c604aa039 100644
--- a/tests/php/Http/Controllers/Views/LabelTrees/LabelTreeProjectsControllerTest.php
+++ b/tests/php/Http/Controllers/Views/LabelTrees/LabelTreeProjectsControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Biigle\Http\Controllers\Views\LabelTrees;
+namespace Biigle\Tests\Http\Controllers\Views\LabelTrees;
 
 use Biigle\Tests\LabelTreeTest;
 use Biigle\Tests\UserTest;
diff --git a/tests/php/Http/Controllers/Views/LabelTrees/LabelTreeVersionsControllerTest.php b/tests/php/Http/Controllers/Views/LabelTrees/LabelTreeVersionsControllerTest.php
index 8353c1dd7..34e6ea5aa 100644
--- a/tests/php/Http/Controllers/Views/LabelTrees/LabelTreeVersionsControllerTest.php
+++ b/tests/php/Http/Controllers/Views/LabelTrees/LabelTreeVersionsControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Biigle\Http\Controllers\Views\LabelTrees;
+namespace Biigle\Tests\Http\Controllers\Views\LabelTrees;
 
 use Biigle\Role;
 use Biigle\Tests\LabelTreeTest;
diff --git a/tests/php/Services/LabelSourceAdapters/WormsAdapterTest.php b/tests/php/Services/LabelSourceAdapters/WormsAdapterTest.php
index 0b85eb891..8e3fb2d09 100644
--- a/tests/php/Services/LabelSourceAdapters/WormsAdapterTest.php
+++ b/tests/php/Services/LabelSourceAdapters/WormsAdapterTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Biigle\Services\LabelSourceAdapters;
+namespace Biigle\Tests\Services\LabelSourceAdapters;
 
 use App;
+use Biigle\Services\LabelSourceAdapters\WormsAdapter;
 use Biigle\Tests\LabelTest;
 use Biigle\Tests\LabelTreeTest;
 use Illuminate\Http\Request;

From bd330c50fc8e277f9ac5e59f814daf40fad652a2 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 17 Jul 2024 10:40:25 +0200
Subject: [PATCH 114/209] Fix CS issues

---
 database/migrations/2016_07_18_082516_add_images_uuid_column.php | 1 -
 .../2018_03_20_160857_add_user_label_label_tree_uuid.php         | 1 -
 2 files changed, 2 deletions(-)

diff --git a/database/migrations/2016_07_18_082516_add_images_uuid_column.php b/database/migrations/2016_07_18_082516_add_images_uuid_column.php
index b0489f127..501dc256f 100644
--- a/database/migrations/2016_07_18_082516_add_images_uuid_column.php
+++ b/database/migrations/2016_07_18_082516_add_images_uuid_column.php
@@ -3,7 +3,6 @@
 use Biigle\Image;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
-use Ramsey\Uuid\Doctrine\UuidType;
 use Ramsey\Uuid\Uuid;
 
 class AddImagesUuidColumn extends Migration
diff --git a/database/migrations/2018_03_20_160857_add_user_label_label_tree_uuid.php b/database/migrations/2018_03_20_160857_add_user_label_label_tree_uuid.php
index 3a2cc1e9e..bc08ac188 100644
--- a/database/migrations/2018_03_20_160857_add_user_label_label_tree_uuid.php
+++ b/database/migrations/2018_03_20_160857_add_user_label_label_tree_uuid.php
@@ -3,7 +3,6 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-use Ramsey\Uuid\Doctrine\UuidType;
 use Ramsey\Uuid\Uuid;
 
 class AddUserLabelLabelTreeUuid extends Migration

From 7bebd048fac32bd1fc699109a547e3966341a9d1 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 17 Jul 2024 10:40:35 +0200
Subject: [PATCH 115/209] Enable parallel CS fixer

---
 .php-cs-fixer.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
index 45a52dcba..1a0af90a7 100644
--- a/.php-cs-fixer.php
+++ b/.php-cs-fixer.php
@@ -14,6 +14,7 @@
     ->ignoreVCS(true);
 
 return (new PhpCsFixer\Config())
+    ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
     ->setRules([
         '@PSR2' => true,
         'ordered_imports' => true,

From b43f743121d3b3c0ec24327ef8fd847f3594bb22 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 17 Jul 2024 15:13:49 +0200
Subject: [PATCH 116/209] Update Docker image labels

---
 .docker/app.dockerfile    | 4 ++--
 .docker/web.dockerfile    | 4 ++--
 .docker/worker.dockerfile | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.docker/app.dockerfile b/.docker/app.dockerfile
index db8397fb6..ac825ecc4 100644
--- a/.docker/app.dockerfile
+++ b/.docker/app.dockerfile
@@ -1,8 +1,8 @@
 # PHP 8.2.21
 #FROM php:8.2-fpm-alpine
 FROM php@sha256:95c34aeeef07aa9774e0b70d5b70065ab0647ece183ebe007c5f2e6b5db16725
-MAINTAINER Martin Zurowietz <martin@cebitec.uni-bielefeld.de>
-LABEL org.opencontainers.image.source https://github.com/biigle/core
+LABEL org.opencontainers.image.authors="Martin Zurowietz <m.zurowietz@uni-bielefeld.de>"
+LABEL org.opencontainers.image.source="https://github.com/biigle/core"
 
 RUN ln -s "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 ADD ".docker/all-php.ini" "$PHP_INI_DIR/conf.d/all.ini"
diff --git a/.docker/web.dockerfile b/.docker/web.dockerfile
index 7260dc22d..aa1c55f47 100644
--- a/.docker/web.dockerfile
+++ b/.docker/web.dockerfile
@@ -1,7 +1,7 @@
 # FROM nginx:1.21-alpine
 FROM nginx@sha256:5a0df7fb7c8c03e4158ae9974bfbd6a15da2bdfdeded4fb694367ec812325d31
-MAINTAINER Martin Zurowietz <martin@cebitec.uni-bielefeld.de>
-LABEL org.opencontainers.image.source https://github.com/biigle/core
+LABEL org.opencontainers.image.authors="Martin Zurowietz <m.zurowietz@uni-bielefeld.de>"
+LABEL org.opencontainers.image.source="https://github.com/biigle/core"
 
 ADD .docker/vhost.conf /etc/nginx/conf.d/default.conf
 ADD .docker/ffdhe2048.txt /etc/nginx/conf.d/ffdhe2048.txt
diff --git a/.docker/worker.dockerfile b/.docker/worker.dockerfile
index 377057b43..7f0139d74 100644
--- a/.docker/worker.dockerfile
+++ b/.docker/worker.dockerfile
@@ -1,8 +1,8 @@
 # PHP 8.2.21
 # FROM php:8.2
 FROM php@sha256:a61daae986bdf9bbeff9a514e3598a4f72bb2e3d01a0b3d0eff960bbfe85acdf
-MAINTAINER Martin Zurowietz <martin@cebitec.uni-bielefeld.de>
-LABEL org.opencontainers.image.source https://github.com/biigle/core
+LABEL org.opencontainers.image.authors="Martin Zurowietz <m.zurowietz@uni-bielefeld.de>"
+LABEL org.opencontainers.image.source="https://github.com/biigle/core"
 
 RUN LC_ALL=C.UTF-8 apt-get update \
     && apt-get install -y --no-install-recommends \

From 8fa9ed5282d2ae8372e018270e6e0d80e244842b Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 17 Jul 2024 15:14:48 +0200
Subject: [PATCH 117/209] Upgrade jcupitt/vips to v2

---
 .docker/worker.dockerfile              | 19 ++++++------
 app/Facades/VipsImage.php              | 18 ------------
 app/Jobs/ProcessNewImage.php           | 16 +++++++++--
 app/Jobs/ProcessNewVideo.php           |  2 +-
 app/Jobs/TileSingleImage.php           |  2 +-
 app/Providers/AppServiceProvider.php   |  2 --
 composer.json                          |  3 +-
 composer.lock                          | 31 ++++++++++----------
 config/app.php                         |  1 -
 tests/php/Jobs/ProcessNewImageTest.php | 40 ++++++++++++--------------
 10 files changed, 58 insertions(+), 76 deletions(-)
 delete mode 100644 app/Facades/VipsImage.php

diff --git a/.docker/worker.dockerfile b/.docker/worker.dockerfile
index 7f0139d74..3b7942265 100644
--- a/.docker/worker.dockerfile
+++ b/.docker/worker.dockerfile
@@ -21,16 +21,21 @@ RUN LC_ALL=C.UTF-8 apt-get update \
 
 RUN ln -s "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 ADD ".docker/all-php.ini" "$PHP_INI_DIR/conf.d/all.ini"
+# Enable FFI for jcupitt/vips.
+# See: https://github.com/libvips/php-vips?tab=readme-ov-file#install
+RUN echo "ffi.enable = true" > "$PHP_INI_DIR/conf.d/vips.ini"
 
 RUN LC_ALL=C.UTF-8 apt-get update \
     && apt-get install -y --no-install-recommends \
         libxml2-dev \
         libzip-dev \
         libpq-dev \
+        libffi-dev \
     && apt-get install -y --no-install-recommends \
         libxml2 \
         libzip4 \
         postgresql-client \
+        libffi8 \
     && docker-php-ext-configure pgsql -with-pgsql=/usr/bin/pgsql \
     && docker-php-ext-install -j$(nproc) \
         exif \
@@ -40,10 +45,12 @@ RUN LC_ALL=C.UTF-8 apt-get update \
         pgsql \
         soap \
         zip \
+        ffi \
     && apt-get purge -y \
         libxml2-dev \
         libzip-dev \
         libpq-dev \
+        libffi-dev \
     && apt-get -y autoremove \
     && apt-get clean \
     && rm -r /var/lib/apt/lists/*
@@ -72,18 +79,8 @@ RUN curl -L -o /tmp/redis.tar.gz https://github.com/phpredis/phpredis/archive/${
     && mv phpredis-${PHPREDIS_VERSION} /usr/src/php/ext/redis \
     && docker-php-ext-install -j$(nproc) redis
 
-# ENV PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:${PKG_CONFIG_PATH}"
-
 RUN LC_ALL=C.UTF-8 apt-get update \
-    && apt-get install -y --no-install-recommends \
-        libvips-dev \
-    && apt-get install -y --no-install-recommends \
-        libvips42 \
-    && pecl install vips \
-    && docker-php-ext-enable vips \
-    && apt-get purge -y \
-        libvips-dev \
-    && apt-get -y autoremove \
+    && apt-get install -y --no-install-recommends libvips42 \
     && apt-get clean \
     && rm -r /var/lib/apt/lists/*
 
diff --git a/app/Facades/VipsImage.php b/app/Facades/VipsImage.php
deleted file mode 100644
index 0ce3a9428..000000000
--- a/app/Facades/VipsImage.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Biigle\Facades;
-
-use Illuminate\Support\Facades\Facade;
-
-class VipsImage extends Facade
-{
-    /**
-     * Get the registered name of the component.
-     *
-     * @return string
-     */
-    protected static function getFacadeAccessor()
-    {
-        return 'vips-image';
-    }
-}
diff --git a/app/Jobs/ProcessNewImage.php b/app/Jobs/ProcessNewImage.php
index 10491f3d9..88cac0fcb 100644
--- a/app/Jobs/ProcessNewImage.php
+++ b/app/Jobs/ProcessNewImage.php
@@ -13,8 +13,8 @@
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Storage;
+use Jcupitt\Vips\Image as VipsImage;
 use Log;
-use VipsImage;
 
 class ProcessNewImage extends Job implements ShouldQueue
 {
@@ -153,7 +153,7 @@ protected function collectMetadata(Image $image, $path)
         $image->mimetype = File::mimeType($path);
 
         try {
-            $i = VipsImage::newFromFile($path);
+            $i = $this->getVipsImage($path);
             $image->width = $i->width;
             $image->height = $i->height;
         } catch (Exception $e) {
@@ -346,4 +346,16 @@ protected function submitTileJob(Image $image)
         $image->save();
         TileSingleImage::dispatch($image);
     }
+
+    /**
+     * Get a Vips image instance for the file.
+     *
+     * @param string $path
+     *
+     * @return VipsImage
+     */
+    protected function getVipsImage(string $path)
+    {
+        return VipsImage::newFromFile($path);
+    }
 }
diff --git a/app/Jobs/ProcessNewVideo.php b/app/Jobs/ProcessNewVideo.php
index 0c830c4da..d120a5387 100644
--- a/app/Jobs/ProcessNewVideo.php
+++ b/app/Jobs/ProcessNewVideo.php
@@ -16,9 +16,9 @@
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
+use Jcupitt\Vips\Image as VipsImage;
 use Log;
 use Throwable;
-use VipsImage;
 
 class ProcessNewVideo extends Job implements ShouldQueue
 {
diff --git a/app/Jobs/TileSingleImage.php b/app/Jobs/TileSingleImage.php
index f0f262379..70b16070e 100644
--- a/app/Jobs/TileSingleImage.php
+++ b/app/Jobs/TileSingleImage.php
@@ -11,9 +11,9 @@
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Storage;
+use Jcupitt\Vips\Image as VipsImage;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
-use VipsImage;
 
 class TileSingleImage extends Job implements ShouldQueue
 {
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 35f5a25f5..b5d699a52 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -24,8 +24,6 @@ public function register(): void
         // via dependency injection.
         $this->app->alias('modules', \Biigle\Services\Modules::class);
 
-        $this->app->bind('vips-image', fn () => new \Jcupitt\Vips\Image(null));
-
         // The custom implementation allows "config resolvers" which are required by
         // the user-storage and user-disks modules, for example.
         Storage::swap(new FilesystemManager($this->app));
diff --git a/composer.json b/composer.json
index e8dd919cb..a4e5605c5 100644
--- a/composer.json
+++ b/composer.json
@@ -21,13 +21,12 @@
         "ext-json": "*",
         "ext-pgsql": "*",
         "ext-soap": "*",
-        "ext-vips": "*",
         "ext-yaml": "*",
         "biigle/laravel-file-cache": "^5.0",
         "duncan3dc/bom-string": "^1.1",
         "endroid/qr-code": "^5.0",
         "guzzlehttp/guzzle": "^7.2",
-        "jcupitt/vips": "^1.0",
+        "jcupitt/vips": "^2.4",
         "laravel/framework": "^11.0",
         "laravel/tinker": "^2.9",
         "laravel/ui": "^4.0",
diff --git a/composer.lock b/composer.lock
index f8ade6a8d..4ea3754f6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "02ee39b4637053d9c8f3afb2dbe3da94",
+    "content-hash": "645e77ff31b1268fe3d6869d69ea2971",
     "packages": [
         {
             "name": "bacon/bacon-qr-code",
@@ -1392,33 +1392,33 @@
         },
         {
             "name": "jcupitt/vips",
-            "version": "v1.0.10",
+            "version": "v2.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/libvips/php-vips.git",
-                "reference": "cb8c9a9a43c974b4d128fe96cdc394eeaded28f4"
+                "reference": "69c343e0bc7bac6dc82f4f16f985d8d6a15eb05a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/libvips/php-vips/zipball/cb8c9a9a43c974b4d128fe96cdc394eeaded28f4",
-                "reference": "cb8c9a9a43c974b4d128fe96cdc394eeaded28f4",
+                "url": "https://api.github.com/repos/libvips/php-vips/zipball/69c343e0bc7bac6dc82f4f16f985d8d6a15eb05a",
+                "reference": "69c343e0bc7bac6dc82f4f16f985d8d6a15eb05a",
                 "shasum": ""
             },
             "require": {
-                "ext-vips": ">=0.1.2",
-                "php": ">=7.2",
+                "ext-ffi": "*",
+                "php": ">=7.4",
                 "psr/log": "^1.1.3|^2.0|^3.0"
             },
             "require-dev": {
-                "php-parallel-lint/php-parallel-lint": "^1.2",
-                "phpdocumentor/phpdocumentor": "3.0.0",
-                "phpunit/phpunit": "^9.3",
-                "squizlabs/php_codesniffer": "^3.5"
+                "php-parallel-lint/php-parallel-lint": "^1.3",
+                "phpdocumentor/shim": "^3.3",
+                "phpunit/phpunit": "^9.5",
+                "squizlabs/php_codesniffer": "^3.7"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
@@ -1447,9 +1447,9 @@
             ],
             "support": {
                 "issues": "https://github.com/libvips/php-vips/issues",
-                "source": "https://github.com/libvips/php-vips/tree/v1.0.10"
+                "source": "https://github.com/libvips/php-vips/tree/v2.4.0"
             },
-            "time": "2022-12-04T16:21:42+00:00"
+            "time": "2024-04-09T09:27:18+00:00"
         },
         {
             "name": "laravel/framework",
@@ -11267,12 +11267,11 @@
         "ext-json": "*",
         "ext-pgsql": "*",
         "ext-soap": "*",
-        "ext-vips": "*",
         "ext-yaml": "*"
     },
     "platform-dev": [],
     "platform-overrides": {
         "php": "8.2.21"
     },
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.6.0"
 }
diff --git a/config/app.php b/config/app.php
index f1bd54480..e52ee8d13 100644
--- a/config/app.php
+++ b/config/app.php
@@ -186,7 +186,6 @@
     'aliases' => Facade::defaultAliases()->merge([
         'Honeypot' => Msurguy\Honeypot\HoneypotFacade::class,
         'Modules' => Biigle\Facades\Modules::class,
-        'VipsImage' => Biigle\Facades\VipsImage::class,
         // Insert aliases here.
     ])->toArray(),
 
diff --git a/tests/php/Jobs/ProcessNewImageTest.php b/tests/php/Jobs/ProcessNewImageTest.php
index 73a9088a5..d2f54ccbe 100644
--- a/tests/php/Jobs/ProcessNewImageTest.php
+++ b/tests/php/Jobs/ProcessNewImageTest.php
@@ -11,7 +11,6 @@
 use Queue;
 use Storage;
 use TestCase;
-use VipsImage;
 
 class ProcessNewImageTest extends TestCase
 {
@@ -105,12 +104,14 @@ public function testHandleTileSmallImage()
         $volume = VolumeTest::create();
         $image = ImageTest::create(['volume_id' => $volume->id]);
 
-        VipsImage::shouldReceive('newFromFile')
-            ->once()
-            ->andReturn(new ImageMock(100, 200));
+        $job = new ProcessNewImageMock($image);
+        $job->vipsImage = new class {
+            public $width = 100;
+            public $height = 200;
+        };
 
         Queue::fake();
-        with(new ProcessNewImageMock($image))->handle();
+        $job->handle();
 
         Queue::assertNotPushed(TileSingleImage::class);
         $this->assertFalse($image->tiled);
@@ -123,12 +124,14 @@ public function testHandleTileLargeImage()
         $volume = VolumeTest::create();
         $image = ImageTest::create(['volume_id' => $volume->id]);
 
-        VipsImage::shouldReceive('newFromFile')
-            ->once()
-            ->andReturn(new ImageMock(400, 200));
+        $job = new ProcessNewImageMock($image);
+        $job->vipsImage = new class {
+            public $width = 400;
+            public $height = 200;
+        };
 
         Queue::fake();
-        with(new ProcessNewImageMock($image))->handle();
+        $job->handle();
 
         Queue::assertPushed(TileSingleImage::class, fn ($job) => $job->image->id === $image->id);
         $image->refresh();
@@ -194,22 +197,10 @@ public function testHandleMergeMetadata()
     }
 }
 
-class ImageMock extends \Jcupitt\Vips\Image
-{
-    public $width;
-    public $height;
-
-    public function __construct($width, $height)
-    {
-        parent::__construct(null);
-        $this->width = $width;
-        $this->height = $height;
-    }
-}
-
 class ProcessNewImageMock extends ProcessNewImage
 {
     public $exif = false;
+    public $vipsImage = null;
 
     protected function makeThumbnail(Image $image, $path)
     {
@@ -224,4 +215,9 @@ protected function getExif($path)
 
         return parent::getExif($path);
     }
+
+    protected function getVipsImage($path)
+    {
+        return $this->vipsImage ?: parent::getVipsImage($path);
+    }
 }

From 83903e7ff75db12d7870c20d091d211ca13e57f9 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 18 Jul 2024 09:45:48 +0200
Subject: [PATCH 118/209] Remove skipped test constraint

---
 tests/php/Jobs/ProcessNewImageTest.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/php/Jobs/ProcessNewImageTest.php b/tests/php/Jobs/ProcessNewImageTest.php
index d2f54ccbe..899d1b5ab 100644
--- a/tests/php/Jobs/ProcessNewImageTest.php
+++ b/tests/php/Jobs/ProcessNewImageTest.php
@@ -62,9 +62,6 @@ public function testHandleCollectMetadataZeroDate()
 
     public function testHandleMakeThumbnail()
     {
-        if (!function_exists('vips_call')) {
-            $this->markTestSkipped('Requires the PHP vips extension.');
-        }
         Storage::fake('test-thumbs');
         config(['thumbnails.storage_disk' => 'test-thumbs']);
 

From 59f33fbf3a53f6a248546c5e2d46f37dd59022ad Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 18 Jul 2024 09:57:06 +0200
Subject: [PATCH 119/209] Use native method of reusing PDO object in tests

---
 tests/TestCase.php | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/tests/TestCase.php b/tests/TestCase.php
index dd25deb8c..5290fba86 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -10,7 +10,6 @@ class TestCase extends BaseTestCase
 {
     use CreatesApplication, MockeryPHPUnitIntegration, RefreshDatabase;
 
-    public static $cachedPdo;
     protected $baseUrl = 'http://localhost';
 
     /**
@@ -30,18 +29,16 @@ public function setUp(): void
         ]]);
     }
 
-    public function tearDown(): void
-    {
-        parent::tearDown();
-    }
-
-    protected function beforeRefreshingDatabase()
+    /**
+     * Determine if an in-memory database is being used.
+     *
+     * @return bool
+     */
+    protected function usingInMemoryDatabase()
     {
-        // Cache PDO for faster tests.
-        if (static::$cachedPdo) {
-            DB::setPdo(static::$cachedPdo);
-        } else {
-            static::$cachedPdo = DB::getPdo();
-        }
+        // We are not using SQLite in-memory (which can be detected automatically) but
+        // Postgres on a ramdisk, so we hardcode this to true. This will make the tests
+        // reuse the PDO object for speedup.
+        return true;
     }
 }

From 69a5b7aacfc3ceb5b5c729cf3ba3df604158152c Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 19 Jul 2024 14:14:47 +0200
Subject: [PATCH 120/209] Fix pull-modules command

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 6d7909886..eb8d559b1 100644
--- a/composer.json
+++ b/composer.json
@@ -107,7 +107,7 @@
             "@php vendor/bin/psalm"
         ],
         "pull-modules": [
-            "PPWD=$PWD; for f in $(find vendor/biigle -mindepth 1 -maxdepth 1 -type d); do cd $f; git pull; cd $PPWD; done"
+            "PPWD=$PWD; for f in $(find vendor/biigle -mindepth 1 -maxdepth 1 -type d); do cd $f; git checkout $(basename $(git symbolic-ref refs/remotes/origin/HEAD)); git pull; cd $PPWD; done"
         ]
     },
     "config": {

From a576f04c0644966f4e01f12d17d250c4812a9f46 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Tue, 23 Jul 2024 09:27:56 +0200
Subject: [PATCH 121/209] Check encoding of email string for API requests

---
 app/Services/Auth/ApiGuard.php           |  5 ++++-
 tests/php/Services/Auth/ApiGuardTest.php | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/app/Services/Auth/ApiGuard.php b/app/Services/Auth/ApiGuard.php
index fbc9991d6..f49cd75b7 100644
--- a/app/Services/Auth/ApiGuard.php
+++ b/app/Services/Auth/ApiGuard.php
@@ -25,8 +25,11 @@ public function user()
         $user = null;
 
         $token = $this->getTokenForRequest();
+        $email = $this->request->getUser();
 
-        if (!empty($token)) {
+        // Check the encoding bcause a user can put anything into the string and cause
+        // a server/database error with weird strings.
+        if (!empty($token) && !empty($email) && mb_detect_encoding($email) !== false) {
             $user = $this->provider->retrieveByCredentials(
                 ['email' => strtolower($this->request->getUser())]
             );
diff --git a/tests/php/Services/Auth/ApiGuardTest.php b/tests/php/Services/Auth/ApiGuardTest.php
index 898331380..17e2b316b 100644
--- a/tests/php/Services/Auth/ApiGuardTest.php
+++ b/tests/php/Services/Auth/ApiGuardTest.php
@@ -92,6 +92,25 @@ public function testEmailCaseInsensitive()
         $response->assertStatus(200);
     }
 
+    public function testEmailEncoding()
+    {
+        $token = ApiTokenTest::create([
+            // 'test_token', hashed with 4 rounds as defined in phpunit.xml
+            'hash' => '$2y$04$9Ncj6qJVqenJ13VtdtV5yOca8rQyN1UwATdGpAQ80FeRjS67.Efaq',
+        ]);
+
+        $token->owner->email = 'test@test.com';
+        $token->owner->save();
+
+        // The request would produce a 500 error if the string was not escaped properly.
+        // The string is from a real request that we observed.
+        $response = $this->json('GET', '/api/v1/users', [], [
+            'PHP_AUTH_USER' => "\x81\x5C\x91\xE7=e\x17\xDD\x9Do\x19lgF",
+            'PHP_AUTH_PW' => 'test_token',
+        ]);
+        $response->assertStatus(401);
+    }
+
     public function testTouchToken()
     {
         $token = ApiTokenTest::create([

From 23d493ee72d56a07213bff84feec95b65d8dbf49 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Tue, 23 Jul 2024 09:29:04 +0200
Subject: [PATCH 122/209] Reuse variable

---
 app/Services/Auth/ApiGuard.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Services/Auth/ApiGuard.php b/app/Services/Auth/ApiGuard.php
index f49cd75b7..17aca366f 100644
--- a/app/Services/Auth/ApiGuard.php
+++ b/app/Services/Auth/ApiGuard.php
@@ -31,7 +31,7 @@ public function user()
         // a server/database error with weird strings.
         if (!empty($token) && !empty($email) && mb_detect_encoding($email) !== false) {
             $user = $this->provider->retrieveByCredentials(
-                ['email' => strtolower($this->request->getUser())]
+                ['email' => strtolower($email)]
             );
         }
 

From 15b4214f06ca85a28e9c512d62f085b36af72bd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Langenk=C3=A4mper?= <dlangenk@gmail.com>
Date: Tue, 23 Jul 2024 14:48:08 +0200
Subject: [PATCH 123/209] Generate colors from username using md5 hash. This
 way the colors are consistent.

---
 .../projects/components/charts/sankeyPlot.vue |  12 +-
 .../components/charts/timelinePlot.vue        |  39 ++--
 .../components/charts/usernameToColor.js      | 184 ++++++++++++++++++
 3 files changed, 212 insertions(+), 23 deletions(-)
 create mode 100644 resources/assets/js/projects/components/charts/usernameToColor.js

diff --git a/resources/assets/js/projects/components/charts/sankeyPlot.vue b/resources/assets/js/projects/components/charts/sankeyPlot.vue
index d39d841a5..2aa75f774 100644
--- a/resources/assets/js/projects/components/charts/sankeyPlot.vue
+++ b/resources/assets/js/projects/components/charts/sankeyPlot.vue
@@ -1,5 +1,5 @@
 <template>
-     <v-chart class="chart grid-col-span-3" :option="option" ></v-chart>
+    <v-chart class="chart grid-col-span-3" :option="option"></v-chart>
 </template>
 
 <script>
@@ -8,6 +8,7 @@ import { SankeyChart } from 'echarts/charts';
 import { CanvasRenderer } from 'echarts/renderers';
 import { TitleComponent, TooltipComponent } from 'echarts/components';
 import VChart, { THEME_KEY } from "vue-echarts";
+import { usernameToColor } from "./usernameToColor";
 
 export default {
     components: {
@@ -34,7 +35,7 @@ export default {
         data() {
             // returns an array of User-names and volume-names
             let volNames = this.volumeAnnotations.map(entry => {
-                return this.names.find(x => x.id ===  entry.volume_id).name;
+                return this.names.find(x => x.id === entry.volume_id).name;
             });
             volNames = [...new Set(volNames)];
 
@@ -48,20 +49,19 @@ export default {
 
             let combined = userNames.concat(...volNames);
             combined = combined.map(entry => {
-                return {name: entry}
+                return { name: entry, itemStyle: { color: usernameToColor(entry) } };
             })
-
             return combined;
         },
 
         links() {
             let result_array = [];
 
-            for(let obj of this.volumeAnnotations) {
+            for (let obj of this.volumeAnnotations) {
                 // create a single link-entry
                 let entry = {
                     source: obj.fullname === " " ? "Deleted Account" : obj.fullname,
-                    target: this.names.find(x => x.id ===  obj.volume_id).name,
+                    target: this.names.find(x => x.id === obj.volume_id).name,
                     value: obj.count
                 };
                 // append to result array
diff --git a/resources/assets/js/projects/components/charts/timelinePlot.vue b/resources/assets/js/projects/components/charts/timelinePlot.vue
index 8db35d4b6..9f344ef4f 100644
--- a/resources/assets/js/projects/components/charts/timelinePlot.vue
+++ b/resources/assets/js/projects/components/charts/timelinePlot.vue
@@ -1,20 +1,22 @@
 <template>
-    <v-chart class="chart grid-col-span-3" :option="option" :update-options="updateOptions" @updateAxisPointer="handleUpdate"></v-chart>
+    <v-chart class="chart grid-col-span-3" :option="option" :update-options="updateOptions"
+        @updateAxisPointer="handleUpdate"></v-chart>
 </template>
 
 <script>
 import * as echarts from 'echarts/core';
 import {
-  DatasetComponent,
-  TooltipComponent,
-  GridComponent,
-  LegendComponent,
-  TitleComponent,
+    DatasetComponent,
+    TooltipComponent,
+    GridComponent,
+    LegendComponent,
+    TitleComponent,
 } from 'echarts/components';
 import { LineChart, PieChart } from 'echarts/charts';
 import { LabelLayout } from 'echarts/features';
 import { CanvasRenderer } from 'echarts/renderers';
 import VChart, { THEME_KEY } from "vue-echarts";
+import { usernameToColor } from "./usernameToColor";
 
 export default {
     props: {
@@ -54,9 +56,14 @@ export default {
                 },
                 encode: {
                     itemName: 'year',
-                    tooltip:  0,
+                    tooltip: 0,
                     value: 0
                 },
+                itemStyle: {
+                    color: function (params) {
+                        return usernameToColor(params.name);
+                    }
+                }
             },
         };
     },
@@ -82,9 +89,9 @@ export default {
             // filter duplicated years
             xAxis = [...new Set(xAxis)];
 
-             // sort the years (increasing)
+            // sort the years (increasing)
             return xAxis.sort();
-        }
+        },
     },
     computed: {
         sourcedata() {
@@ -106,7 +113,7 @@ export default {
             // create object with "year-slots" for each user (e.g. {id: {"2020":0, "2021":0, "2022":0]}))
             for (let id in users) {
                 let yearDict = {};
-                for(let y of xAxis) {
+                for (let y of xAxis) {
                     yearDict[y] = 0;
                 }
                 idDict[id] = yearDict;
@@ -142,12 +149,11 @@ export default {
                 let name = users[entry[0]];
                 // case of deleted account
                 if (name === " ") {
-                    chartdata.push([sum, 'Deleted Account', ...Object.values(entry[1]) ]);
+                    chartdata.push([sum, 'Deleted Account', ...Object.values(entry[1])]);
                 } else { // case of existing user
-                    chartdata.push([sum, name, ...Object.values(entry[1]) ]);
+                    chartdata.push([sum, name, ...Object.values(entry[1])]);
                 }
             });
-
             return chartdata;
         },
         createTimelineSeries() {
@@ -158,7 +164,7 @@ export default {
             // create a series of data which is specific to each user
             // skip first entry (idx=1), as it is an array of x-axis names and not user-data
             // sourcedata-structure: [['all', 'year', 2020, 2021, 2022], [1195,"Name1",1195,0,0], [6,"Name2",0,2,4]]
-            for (let idx=1; idx < this.sourcedata.length; idx++) {
+            for (let idx = 1; idx < this.sourcedata.length; idx++) {
                 let snippet = {
                     name: this.sourcedata[idx][1],
                     type: 'line',
@@ -166,18 +172,17 @@ export default {
                     seriesLayoutBy: 'row',
                     emphasis: { focus: 'series' },
                     // skip first two entries as they are irrelevant for the timeline-data
-                    data: this.sourcedata[idx].slice(2, end)
+                    data: this.sourcedata[idx].slice(2, end),
+                    itemStyle: { "color": usernameToColor(this.sourcedata[idx][1]) },
                 };
                 series.push(snippet)
             }
-
             return series;
         },
         option() {
             let seriesObj = this.createTimelineSeries;
             // append the pie-chart specific snippet
             seriesObj.push(this.pieObj);
-
             return {
                 legend: {
                     left: '2%',
diff --git a/resources/assets/js/projects/components/charts/usernameToColor.js b/resources/assets/js/projects/components/charts/usernameToColor.js
new file mode 100644
index 000000000..7f6026bf7
--- /dev/null
+++ b/resources/assets/js/projects/components/charts/usernameToColor.js
@@ -0,0 +1,184 @@
+export function usernameToColor(username) {
+    function md5(string) {
+        function md5cycle(x, k) {
+            var a = x[0],
+                b = x[1],
+                c = x[2],
+                d = x[3];
+
+            a = ff(a, b, c, d, k[0], 7, -680876936);
+            d = ff(d, a, b, c, k[1], 12, -389564586);
+            c = ff(c, d, a, b, k[2], 17, 606105819);
+            b = ff(b, c, d, a, k[3], 22, -1044525330);
+            a = ff(a, b, c, d, k[4], 7, -176418897);
+            d = ff(d, a, b, c, k[5], 12, 1200080426);
+            c = ff(c, d, a, b, k[6], 17, -1473231341);
+            b = ff(b, c, d, a, k[7], 22, -45705983);
+            a = ff(a, b, c, d, k[8], 7, 1770035416);
+            d = ff(d, a, b, c, k[9], 12, -1958414417);
+            c = ff(c, d, a, b, k[10], 17, -42063);
+            b = ff(b, c, d, a, k[11], 22, -1990404162);
+            a = ff(a, b, c, d, k[12], 7, 1804603682);
+            d = ff(d, a, b, c, k[13], 12, -40341101);
+            c = ff(c, d, a, b, k[14], 17, -1502002290);
+            b = ff(b, c, d, a, k[15], 22, 1236535329);
+
+            a = gg(a, b, c, d, k[1], 5, -165796510);
+            d = gg(d, a, b, c, k[6], 9, -1069501632);
+            c = gg(c, d, a, b, k[11], 14, 643717713);
+            b = gg(b, c, d, a, k[0], 20, -373897302);
+            a = gg(a, b, c, d, k[5], 5, -701558691);
+            d = gg(d, a, b, c, k[10], 9, 38016083);
+            c = gg(c, d, a, b, k[15], 14, -660478335);
+            b = gg(b, c, d, a, k[4], 20, -405537848);
+            a = gg(a, b, c, d, k[9], 5, 568446438);
+            d = gg(d, a, b, c, k[14], 9, -1019803690);
+            c = gg(c, d, a, b, k[3], 14, -187363961);
+            b = gg(b, c, d, a, k[8], 20, 1163531501);
+            a = gg(a, b, c, d, k[13], 5, -1444681467);
+            d = gg(d, a, b, c, k[2], 9, -51403784);
+            c = gg(c, d, a, b, k[7], 14, 1735328473);
+            b = gg(b, c, d, a, k[12], 20, -1926607734);
+
+            a = hh(a, b, c, d, k[5], 4, -378558);
+            d = hh(d, a, b, c, k[8], 11, -2022574463);
+            c = hh(c, d, a, b, k[11], 16, 1839030562);
+            b = hh(b, c, d, a, k[14], 23, -35309556);
+            a = hh(a, b, c, d, k[1], 4, -1530992060);
+            d = hh(d, a, b, c, k[4], 11, 1272893353);
+            c = hh(c, d, a, b, k[7], 16, -155497632);
+            b = hh(b, c, d, a, k[10], 23, -1094730640);
+            a = hh(a, b, c, d, k[13], 4, 681279174);
+            d = hh(d, a, b, c, k[0], 11, -358537222);
+            c = hh(c, d, a, b, k[3], 16, -722521979);
+            b = hh(b, c, d, a, k[6], 23, 76029189);
+            a = hh(a, b, c, d, k[9], 4, -640364487);
+            d = hh(d, a, b, c, k[12], 11, -421815835);
+            c = hh(c, d, a, b, k[15], 16, 530742520);
+            b = hh(b, c, d, a, k[2], 23, -995338651);
+
+            a = ii(a, b, c, d, k[0], 6, -198630844);
+            d = ii(d, a, b, c, k[7], 10, 1126891415);
+            c = ii(c, d, a, b, k[14], 15, -1416354905);
+            b = ii(b, c, d, a, k[5], 21, -57434055);
+            a = ii(a, b, c, d, k[12], 6, 1700485571);
+            d = ii(d, a, b, c, k[3], 10, -1894986606);
+            c = ii(c, d, a, b, k[10], 15, -1051523);
+            b = ii(b, c, d, a, k[1], 21, -2054922799);
+            a = ii(a, b, c, d, k[8], 6, 1873313359);
+            d = ii(d, a, b, c, k[15], 10, -30611744);
+            c = ii(c, d, a, b, k[6], 15, -1560198380);
+            b = ii(b, c, d, a, k[13], 21, 1309151649);
+            a = ii(a, b, c, d, k[4], 6, -145523070);
+            d = ii(d, a, b, c, k[11], 10, -1120210379);
+            c = ii(c, d, a, b, k[2], 15, 718787259);
+            b = ii(b, c, d, a, k[9], 21, -343485551);
+
+            x[0] = add32(a, x[0]);
+            x[1] = add32(b, x[1]);
+            x[2] = add32(c, x[2]);
+            x[3] = add32(d, x[3]);
+        }
+
+        function cmn(q, a, b, x, s, t) {
+            a = add32(add32(a, q), add32(x, t));
+            return add32((a << s) | (a >>> (32 - s)), b);
+        }
+
+        function ff(a, b, c, d, x, s, t) {
+            return cmn((b & c) | (~b & d), a, b, x, s, t);
+        }
+
+        function gg(a, b, c, d, x, s, t) {
+            return cmn((b & d) | (c & ~d), a, b, x, s, t);
+        }
+
+        function hh(a, b, c, d, x, s, t) {
+            return cmn(b ^ c ^ d, a, b, x, s, t);
+        }
+
+        function ii(a, b, c, d, x, s, t) {
+            return cmn(c ^ (b | ~d), a, b, x, s, t);
+        }
+
+        function md51(s) {
+            var n = s.length,
+                state = [1732584193, -271733879, -1732584194, 271733878],
+                i;
+            for (i = 64; i <= s.length; i += 64) {
+                md5cycle(state, md5blk(s.substring(i - 64, i)));
+            }
+            s = s.substring(i - 64);
+            var tail = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+            for (i = 0; i < s.length; i++) {
+                tail[i >> 2] |= s.charCodeAt(i) << ((i % 4) << 3);
+            }
+            tail[i >> 2] |= 0x80 << ((i % 4) << 3);
+            if (i > 55) {
+                md5cycle(state, tail);
+                for (i = 0; i < 16; i++) {
+                    tail[i] = 0;
+                }
+            }
+            tail[14] = n * 8;
+            md5cycle(state, tail);
+            return state;
+        }
+
+        function md5blk(s) {
+            var md5blks = [],
+                i;
+            for (i = 0; i < 64; i += 4) {
+                md5blks[i >> 2] = s.charCodeAt(i) + (s.charCodeAt(i + 1) << 8) + (s.charCodeAt(i + 2) << 16) + (s.charCodeAt(i + 3) << 24);
+            }
+            return md5blks;
+        }
+
+        var hex_chr = '0123456789abcdef'.split('');
+
+        function rhex(n) {
+            var s = '',
+                j = 0;
+            for (; j < 4; j++) {
+                s += hex_chr[(n >> (j * 8 + 4)) & 0x0f] + hex_chr[(n >> (j * 8)) & 0x0f];
+            }
+            return s;
+        }
+
+        function hex(x) {
+            for (var i = 0; i < x.length; i++) {
+                x[i] = rhex(x[i]);
+            }
+            return x.join('');
+        }
+
+        function md5(s) {
+            return hex(md51(s));
+        }
+
+        function add32(a, b) {
+            return (a + b) & 0xffffffff;
+        }
+
+        if (md5('hello') != '5d41402abc4b2a76b9719d911017c592') {
+            function add32(x, y) {
+                var lsw = (x & 0xffff) + (y & 0xffff),
+                    msw = (x >> 16) + (y >> 16) + (lsw >> 16);
+                return (msw << 16) | (lsw & 0xffff);
+            }
+        }
+
+    return md5(string);
+}
+
+const hash = md5(username);
+const r = parseInt(hash.substring(0, 2), 16);
+const g = parseInt(hash.substring(2, 4), 16);
+const b = parseInt(hash.substring(4, 6), 16);
+
+function toHex(value) {
+    return value.toString(16).padStart(2, '0');
+}
+
+return `#${toHex(r)}${toHex(g)}${toHex(b)}`;
+}
\ No newline at end of file

From fd1dea44e6b0afbd6e1d7d0becd383ccfc15d613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Langenk=C3=A4mper?= <dlangenk@gmail.com>
Date: Tue, 23 Jul 2024 15:13:59 +0200
Subject: [PATCH 124/209] fix lint error

---
 .../components/charts/usernameToColor.js      | 316 +++++++++---------
 1 file changed, 152 insertions(+), 164 deletions(-)

diff --git a/resources/assets/js/projects/components/charts/usernameToColor.js b/resources/assets/js/projects/components/charts/usernameToColor.js
index 7f6026bf7..b9adffef3 100644
--- a/resources/assets/js/projects/components/charts/usernameToColor.js
+++ b/resources/assets/js/projects/components/charts/usernameToColor.js
@@ -1,184 +1,172 @@
-export function usernameToColor(username) {
-    function md5(string) {
-        function md5cycle(x, k) {
-            var a = x[0],
-                b = x[1],
-                c = x[2],
-                d = x[3];
-
-            a = ff(a, b, c, d, k[0], 7, -680876936);
-            d = ff(d, a, b, c, k[1], 12, -389564586);
-            c = ff(c, d, a, b, k[2], 17, 606105819);
-            b = ff(b, c, d, a, k[3], 22, -1044525330);
-            a = ff(a, b, c, d, k[4], 7, -176418897);
-            d = ff(d, a, b, c, k[5], 12, 1200080426);
-            c = ff(c, d, a, b, k[6], 17, -1473231341);
-            b = ff(b, c, d, a, k[7], 22, -45705983);
-            a = ff(a, b, c, d, k[8], 7, 1770035416);
-            d = ff(d, a, b, c, k[9], 12, -1958414417);
-            c = ff(c, d, a, b, k[10], 17, -42063);
-            b = ff(b, c, d, a, k[11], 22, -1990404162);
-            a = ff(a, b, c, d, k[12], 7, 1804603682);
-            d = ff(d, a, b, c, k[13], 12, -40341101);
-            c = ff(c, d, a, b, k[14], 17, -1502002290);
-            b = ff(b, c, d, a, k[15], 22, 1236535329);
-
-            a = gg(a, b, c, d, k[1], 5, -165796510);
-            d = gg(d, a, b, c, k[6], 9, -1069501632);
-            c = gg(c, d, a, b, k[11], 14, 643717713);
-            b = gg(b, c, d, a, k[0], 20, -373897302);
-            a = gg(a, b, c, d, k[5], 5, -701558691);
-            d = gg(d, a, b, c, k[10], 9, 38016083);
-            c = gg(c, d, a, b, k[15], 14, -660478335);
-            b = gg(b, c, d, a, k[4], 20, -405537848);
-            a = gg(a, b, c, d, k[9], 5, 568446438);
-            d = gg(d, a, b, c, k[14], 9, -1019803690);
-            c = gg(c, d, a, b, k[3], 14, -187363961);
-            b = gg(b, c, d, a, k[8], 20, 1163531501);
-            a = gg(a, b, c, d, k[13], 5, -1444681467);
-            d = gg(d, a, b, c, k[2], 9, -51403784);
-            c = gg(c, d, a, b, k[7], 14, 1735328473);
-            b = gg(b, c, d, a, k[12], 20, -1926607734);
-
-            a = hh(a, b, c, d, k[5], 4, -378558);
-            d = hh(d, a, b, c, k[8], 11, -2022574463);
-            c = hh(c, d, a, b, k[11], 16, 1839030562);
-            b = hh(b, c, d, a, k[14], 23, -35309556);
-            a = hh(a, b, c, d, k[1], 4, -1530992060);
-            d = hh(d, a, b, c, k[4], 11, 1272893353);
-            c = hh(c, d, a, b, k[7], 16, -155497632);
-            b = hh(b, c, d, a, k[10], 23, -1094730640);
-            a = hh(a, b, c, d, k[13], 4, 681279174);
-            d = hh(d, a, b, c, k[0], 11, -358537222);
-            c = hh(c, d, a, b, k[3], 16, -722521979);
-            b = hh(b, c, d, a, k[6], 23, 76029189);
-            a = hh(a, b, c, d, k[9], 4, -640364487);
-            d = hh(d, a, b, c, k[12], 11, -421815835);
-            c = hh(c, d, a, b, k[15], 16, 530742520);
-            b = hh(b, c, d, a, k[2], 23, -995338651);
-
-            a = ii(a, b, c, d, k[0], 6, -198630844);
-            d = ii(d, a, b, c, k[7], 10, 1126891415);
-            c = ii(c, d, a, b, k[14], 15, -1416354905);
-            b = ii(b, c, d, a, k[5], 21, -57434055);
-            a = ii(a, b, c, d, k[12], 6, 1700485571);
-            d = ii(d, a, b, c, k[3], 10, -1894986606);
-            c = ii(c, d, a, b, k[10], 15, -1051523);
-            b = ii(b, c, d, a, k[1], 21, -2054922799);
-            a = ii(a, b, c, d, k[8], 6, 1873313359);
-            d = ii(d, a, b, c, k[15], 10, -30611744);
-            c = ii(c, d, a, b, k[6], 15, -1560198380);
-            b = ii(b, c, d, a, k[13], 21, 1309151649);
-            a = ii(a, b, c, d, k[4], 6, -145523070);
-            d = ii(d, a, b, c, k[11], 10, -1120210379);
-            c = ii(c, d, a, b, k[2], 15, 718787259);
-            b = ii(b, c, d, a, k[9], 21, -343485551);
-
-            x[0] = add32(a, x[0]);
-            x[1] = add32(b, x[1]);
-            x[2] = add32(c, x[2]);
-            x[3] = add32(d, x[3]);
-        }
-
-        function cmn(q, a, b, x, s, t) {
-            a = add32(add32(a, q), add32(x, t));
-            return add32((a << s) | (a >>> (32 - s)), b);
-        }
-
-        function ff(a, b, c, d, x, s, t) {
-            return cmn((b & c) | (~b & d), a, b, x, s, t);
-        }
+function rhex(n) {
+    var hex_chr = '0123456789abcdef'.split('');
+    var s = '',
+        j = 0;
+    for (; j < 4; j++) {
+        s += hex_chr[(n >> (j * 8 + 4)) & 0x0f] + hex_chr[(n >> (j * 8)) & 0x0f];
+    }
+    return s;
+}
 
-        function gg(a, b, c, d, x, s, t) {
-            return cmn((b & d) | (c & ~d), a, b, x, s, t);
-        }
+function hex(x) {
+    for (var i = 0; i < x.length; i++) {
+        x[i] = rhex(x[i]);
+    }
+    return x.join('');
+}
 
-        function hh(a, b, c, d, x, s, t) {
-            return cmn(b ^ c ^ d, a, b, x, s, t);
-        }
+function md5(s) {
+    return hex(md51(s));
+}
 
-        function ii(a, b, c, d, x, s, t) {
-            return cmn(c ^ (b | ~d), a, b, x, s, t);
-        }
+function add32(a, b) {
+    return (a + b) & 0xffffffff;
+}
 
-        function md51(s) {
-            var n = s.length,
-                state = [1732584193, -271733879, -1732584194, 271733878],
-                i;
-            for (i = 64; i <= s.length; i += 64) {
-                md5cycle(state, md5blk(s.substring(i - 64, i)));
-            }
-            s = s.substring(i - 64);
-            var tail = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-            for (i = 0; i < s.length; i++) {
-                tail[i >> 2] |= s.charCodeAt(i) << ((i % 4) << 3);
-            }
-            tail[i >> 2] |= 0x80 << ((i % 4) << 3);
-            if (i > 55) {
-                md5cycle(state, tail);
-                for (i = 0; i < 16; i++) {
-                    tail[i] = 0;
-                }
-            }
-            tail[14] = n * 8;
-            md5cycle(state, tail);
-            return state;
-        }
+function cmn(q, a, b, x, s, t) {
+    a = add32(add32(a, q), add32(x, t));
+    return add32((a << s) | (a >>> (32 - s)), b);
+}
 
-        function md5blk(s) {
-            var md5blks = [],
-                i;
-            for (i = 0; i < 64; i += 4) {
-                md5blks[i >> 2] = s.charCodeAt(i) + (s.charCodeAt(i + 1) << 8) + (s.charCodeAt(i + 2) << 16) + (s.charCodeAt(i + 3) << 24);
-            }
-            return md5blks;
-        }
+function ff(a, b, c, d, x, s, t) {
+    return cmn((b & c) | (~b & d), a, b, x, s, t);
+}
 
-        var hex_chr = '0123456789abcdef'.split('');
+function gg(a, b, c, d, x, s, t) {
+    return cmn((b & d) | (c & ~d), a, b, x, s, t);
+}
 
-        function rhex(n) {
-            var s = '',
-                j = 0;
-            for (; j < 4; j++) {
-                s += hex_chr[(n >> (j * 8 + 4)) & 0x0f] + hex_chr[(n >> (j * 8)) & 0x0f];
-            }
-            return s;
-        }
+function hh(a, b, c, d, x, s, t) {
+    return cmn(b ^ c ^ d, a, b, x, s, t);
+}
 
-        function hex(x) {
-            for (var i = 0; i < x.length; i++) {
-                x[i] = rhex(x[i]);
-            }
-            return x.join('');
-        }
+function ii(a, b, c, d, x, s, t) {
+    return cmn(c ^ (b | ~d), a, b, x, s, t);
+}
 
-        function md5(s) {
-            return hex(md51(s));
+function md51(s) {
+    var n = s.length,
+        state = [1732584193, -271733879, -1732584194, 271733878],
+        i;
+    for (i = 64; i <= s.length; i += 64) {
+        md5cycle(state, md5blk(s.substring(i - 64, i)));
+    }
+    s = s.substring(i - 64);
+    var tail = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+    for (i = 0; i < s.length; i++) {
+        tail[i >> 2] |= s.charCodeAt(i) << ((i % 4) << 3);
+    }
+    tail[i >> 2] |= 0x80 << ((i % 4) << 3);
+    if (i > 55) {
+        md5cycle(state, tail);
+        for (i = 0; i < 16; i++) {
+            tail[i] = 0;
         }
+    }
+    tail[14] = n * 8;
+    md5cycle(state, tail);
+    return state;
+}
 
-        function add32(a, b) {
-            return (a + b) & 0xffffffff;
-        }
+function md5blk(s) {
+    var md5blks = [],
+        i;
+    for (i = 0; i < 64; i += 4) {
+        md5blks[i >> 2] = s.charCodeAt(i) + (s.charCodeAt(i + 1) << 8) + (s.charCodeAt(i + 2) << 16) + (s.charCodeAt(i + 3) << 24);
+    }
+    return md5blks;
+}
 
-        if (md5('hello') != '5d41402abc4b2a76b9719d911017c592') {
-            function add32(x, y) {
-                var lsw = (x & 0xffff) + (y & 0xffff),
-                    msw = (x >> 16) + (y >> 16) + (lsw >> 16);
-                return (msw << 16) | (lsw & 0xffff);
-            }
-        }
 
-    return md5(string);
+function md5cycle(x, k) {
+    var a = x[0],
+        b = x[1],
+        c = x[2],
+        d = x[3];
+
+    a = ff(a, b, c, d, k[0], 7, -680876936);
+    d = ff(d, a, b, c, k[1], 12, -389564586);
+    c = ff(c, d, a, b, k[2], 17, 606105819);
+    b = ff(b, c, d, a, k[3], 22, -1044525330);
+    a = ff(a, b, c, d, k[4], 7, -176418897);
+    d = ff(d, a, b, c, k[5], 12, 1200080426);
+    c = ff(c, d, a, b, k[6], 17, -1473231341);
+    b = ff(b, c, d, a, k[7], 22, -45705983);
+    a = ff(a, b, c, d, k[8], 7, 1770035416);
+    d = ff(d, a, b, c, k[9], 12, -1958414417);
+    c = ff(c, d, a, b, k[10], 17, -42063);
+    b = ff(b, c, d, a, k[11], 22, -1990404162);
+    a = ff(a, b, c, d, k[12], 7, 1804603682);
+    d = ff(d, a, b, c, k[13], 12, -40341101);
+    c = ff(c, d, a, b, k[14], 17, -1502002290);
+    b = ff(b, c, d, a, k[15], 22, 1236535329);
+
+    a = gg(a, b, c, d, k[1], 5, -165796510);
+    d = gg(d, a, b, c, k[6], 9, -1069501632);
+    c = gg(c, d, a, b, k[11], 14, 643717713);
+    b = gg(b, c, d, a, k[0], 20, -373897302);
+    a = gg(a, b, c, d, k[5], 5, -701558691);
+    d = gg(d, a, b, c, k[10], 9, 38016083);
+    c = gg(c, d, a, b, k[15], 14, -660478335);
+    b = gg(b, c, d, a, k[4], 20, -405537848);
+    a = gg(a, b, c, d, k[9], 5, 568446438);
+    d = gg(d, a, b, c, k[14], 9, -1019803690);
+    c = gg(c, d, a, b, k[3], 14, -187363961);
+    b = gg(b, c, d, a, k[8], 20, 1163531501);
+    a = gg(a, b, c, d, k[13], 5, -1444681467);
+    d = gg(d, a, b, c, k[2], 9, -51403784);
+    c = gg(c, d, a, b, k[7], 14, 1735328473);
+    b = gg(b, c, d, a, k[12], 20, -1926607734);
+
+    a = hh(a, b, c, d, k[5], 4, -378558);
+    d = hh(d, a, b, c, k[8], 11, -2022574463);
+    c = hh(c, d, a, b, k[11], 16, 1839030562);
+    b = hh(b, c, d, a, k[14], 23, -35309556);
+    a = hh(a, b, c, d, k[1], 4, -1530992060);
+    d = hh(d, a, b, c, k[4], 11, 1272893353);
+    c = hh(c, d, a, b, k[7], 16, -155497632);
+    b = hh(b, c, d, a, k[10], 23, -1094730640);
+    a = hh(a, b, c, d, k[13], 4, 681279174);
+    d = hh(d, a, b, c, k[0], 11, -358537222);
+    c = hh(c, d, a, b, k[3], 16, -722521979);
+    b = hh(b, c, d, a, k[6], 23, 76029189);
+    a = hh(a, b, c, d, k[9], 4, -640364487);
+    d = hh(d, a, b, c, k[12], 11, -421815835);
+    c = hh(c, d, a, b, k[15], 16, 530742520);
+    b = hh(b, c, d, a, k[2], 23, -995338651);
+
+    a = ii(a, b, c, d, k[0], 6, -198630844);
+    d = ii(d, a, b, c, k[7], 10, 1126891415);
+    c = ii(c, d, a, b, k[14], 15, -1416354905);
+    b = ii(b, c, d, a, k[5], 21, -57434055);
+    a = ii(a, b, c, d, k[12], 6, 1700485571);
+    d = ii(d, a, b, c, k[3], 10, -1894986606);
+    c = ii(c, d, a, b, k[10], 15, -1051523);
+    b = ii(b, c, d, a, k[1], 21, -2054922799);
+    a = ii(a, b, c, d, k[8], 6, 1873313359);
+    d = ii(d, a, b, c, k[15], 10, -30611744);
+    c = ii(c, d, a, b, k[6], 15, -1560198380);
+    b = ii(b, c, d, a, k[13], 21, 1309151649);
+    a = ii(a, b, c, d, k[4], 6, -145523070);
+    d = ii(d, a, b, c, k[11], 10, -1120210379);
+    c = ii(c, d, a, b, k[2], 15, 718787259);
+    b = ii(b, c, d, a, k[9], 21, -343485551);
+
+    x[0] = add32(a, x[0]);
+    x[1] = add32(b, x[1]);
+    x[2] = add32(c, x[2]);
+    x[3] = add32(d, x[3]);
 }
 
-const hash = md5(username);
-const r = parseInt(hash.substring(0, 2), 16);
-const g = parseInt(hash.substring(2, 4), 16);
-const b = parseInt(hash.substring(4, 6), 16);
-
 function toHex(value) {
     return value.toString(16).padStart(2, '0');
 }
 
-return `#${toHex(r)}${toHex(g)}${toHex(b)}`;
+export function usernameToColor(username) {
+    const hash = md5(username);
+    const r = parseInt(hash.substring(0, 2), 16);
+    const g = parseInt(hash.substring(2, 4), 16);
+    const b = parseInt(hash.substring(4, 6), 16);
+
+    return `#${toHex(r)}${toHex(g)}${toHex(b)}`;
 }
\ No newline at end of file

From 4b617b8e90acf9bc7ac5075d0615a1563a6f2d23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Langenk=C3=A4mper?= <dlangenk@gmail.com>
Date: Tue, 23 Jul 2024 15:46:22 +0200
Subject: [PATCH 125/209] truncates long image names in the navbar/content

---
 resources/views/volumes/images/index.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/volumes/images/index.blade.php b/resources/views/volumes/images/index.blade.php
index bba1aef2e..62dde3c54 100644
--- a/resources/views/volumes/images/index.blade.php
+++ b/resources/views/volumes/images/index.blade.php
@@ -5,7 +5,7 @@
 <div class="container">
     <div class="row">
         <h2 class="col-lg-12 clearfix">
-            {{ $image->filename }}
+            {{ mb_strimwidth($image->filename, 0, 63, '...')}}
             <span class="pull-right">
                 <a href="{{route('volume', $volume->id)}}" title="Back to {{ $volume->name }}" class="btn btn-default">back</a>
                 @mixin('imagesIndexButtons')
@@ -31,6 +31,6 @@
 @section('navbar')
 <div class="navbar-text navbar-volumes-breadcrumbs">
     @include('volumes.partials.projectsBreadcrumb', ['projects' => $volume->projects])/ <a href="{{route('volume', $volume->id)}}" class="navbar-link" title="Show volume {{$volume->name}}">{{$volume->name}}</a>
-    / <strong title="{{$image->filename}}">{{$image->filename}}</strong> @include('volumes.partials.annotationSessionIndicator')
+    / <strong title="{{mb_strimwidth($image->filename, 0, 63, '...')}}">{{mb_strimwidth($image->filename, 0, 63, '...')}}</strong> @include('volumes.partials.annotationSessionIndicator')
 </div>
 @endsection

From 841d7c53d1fc21e8cbbdbda85a6e6fe6a7e67d04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Langenk=C3=A4mper?= <dlangenk@gmail.com>
Date: Wed, 24 Jul 2024 11:04:23 +0200
Subject: [PATCH 126/209] use css instead of php for truncating

---
 .../views/volumes/images/index.blade.php      | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/resources/views/volumes/images/index.blade.php b/resources/views/volumes/images/index.blade.php
index 62dde3c54..3f624d2ca 100644
--- a/resources/views/volumes/images/index.blade.php
+++ b/resources/views/volumes/images/index.blade.php
@@ -1,16 +1,17 @@
 @extends('app')
-@section('title', $image->filename)
+@section('full-navbar', true)
+@section('title', "$image->filename")
 
 @section('content')
 <div class="container">
     <div class="row">
-        <h2 class="col-lg-12 clearfix">
-            {{ mb_strimwidth($image->filename, 0, 63, '...')}}
-            <span class="pull-right">
+        <h2 class="col-lg-12 clearfix annotations-breadcrumb">
+            {{ $image->filename }}
+        </h2>
+        <span class="pull-right">
                 <a href="{{route('volume', $volume->id)}}" title="Back to {{ $volume->name }}" class="btn btn-default">back</a>
                 @mixin('imagesIndexButtons')
             </span>
-        </h2>
     </div>
     <div class="row">
         <div class="col-sm-6 col-lg-4">
@@ -29,8 +30,14 @@
 @endsection
 
 @section('navbar')
-<div class="navbar-text navbar-volumes-breadcrumbs">
-    @include('volumes.partials.projectsBreadcrumb', ['projects' => $volume->projects])/ <a href="{{route('volume', $volume->id)}}" class="navbar-link" title="Show volume {{$volume->name}}">{{$volume->name}}</a>
-    / <strong title="{{mb_strimwidth($image->filename, 0, 63, '...')}}">{{mb_strimwidth($image->filename, 0, 63, '...')}}</strong> @include('volumes.partials.annotationSessionIndicator')
+<div class="navbar-text">
+    <div class="annotations-project-dd">
+        @include('volumes.partials.projectsBreadcrumb', ['projects' => $volume->projects]) /
+    </div>
+    <div class="annotations-breadcrumb">
+    <a href="{{route('volume', $volume->id)}}" class="navbar-link" title="Show volume {{$volume->name}}">{{$volume->name}}</a> /
+            <strong>{{$image->filename}}</strong>
+    </div>
+    @include('volumes.partials.annotationSessionIndicator')
 </div>
 @endsection

From f83ca91718e503805abaca12a2ab72897c624828 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 24 Jul 2024 12:54:16 +0200
Subject: [PATCH 127/209] Polish handling of long image filenames

---
 resources/assets/sass/volumes/main.scss        | 11 +++++++++--
 resources/views/volumes/images/index.blade.php | 15 +++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/resources/assets/sass/volumes/main.scss b/resources/assets/sass/volumes/main.scss
index 0a674fc1d..7d9821cc6 100644
--- a/resources/assets/sass/volumes/main.scss
+++ b/resources/assets/sass/volumes/main.scss
@@ -14,8 +14,9 @@ $volume-image-padding: 0.5em;
 }
 
 .navbar-text.navbar-volumes-breadcrumbs {
-    &, a {
-        color: $text-color;
+
+    .annotations-breadcrumb {
+        max-width: 600px;
     }
 }
 
@@ -41,6 +42,12 @@ $volume-image-padding: 0.5em;
     text-overflow: ellipsis;
 }
 
+.file-info-title {
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+}
+
 @import 'components/image-grid';
 @import 'components/image-grid-image';
 @import 'components/image-grid-progress';
diff --git a/resources/views/volumes/images/index.blade.php b/resources/views/volumes/images/index.blade.php
index 3f624d2ca..862df3aea 100644
--- a/resources/views/volumes/images/index.blade.php
+++ b/resources/views/volumes/images/index.blade.php
@@ -1,17 +1,16 @@
 @extends('app')
-@section('full-navbar', true)
-@section('title', "$image->filename")
+@section('title', $image->filename)
 
 @section('content')
 <div class="container">
     <div class="row">
-        <h2 class="col-lg-12 clearfix annotations-breadcrumb">
+        <h2 class="col-lg-12 clearfix file-info-title" title="{{ $image->filename }}">
             {{ $image->filename }}
-        </h2>
-        <span class="pull-right">
+            <span class="pull-right">
                 <a href="{{route('volume', $volume->id)}}" title="Back to {{ $volume->name }}" class="btn btn-default">back</a>
                 @mixin('imagesIndexButtons')
             </span>
+        </h2>
     </div>
     <div class="row">
         <div class="col-sm-6 col-lg-4">
@@ -30,13 +29,13 @@
 @endsection
 
 @section('navbar')
-<div class="navbar-text">
+<div class="navbar-text navbar-volumes-breadcrumbs">
     <div class="annotations-project-dd">
         @include('volumes.partials.projectsBreadcrumb', ['projects' => $volume->projects]) /
     </div>
     <div class="annotations-breadcrumb">
-    <a href="{{route('volume', $volume->id)}}" class="navbar-link" title="Show volume {{$volume->name}}">{{$volume->name}}</a> /
-            <strong>{{$image->filename}}</strong>
+        <a href="{{route('volume', $volume->id)}}" class="navbar-link" title="Show volume {{$volume->name}}">{{$volume->name}}</a> /
+        <strong title="{{$image->filename}}">{{$image->filename}}</strong>
     </div>
     @include('volumes.partials.annotationSessionIndicator')
 </div>

From 689c0218df1f41a984fbf35d7893dd5d77b814b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Langenk=C3=A4mper?= <dlangenk@gmail.com>
Date: Wed, 24 Jul 2024 16:48:02 +0200
Subject: [PATCH 128/209] much simpler hash function, hsl instead of rgb for
 brighter results

---
 .../components/charts/usernameToColor.js      | 187 +++---------------
 1 file changed, 26 insertions(+), 161 deletions(-)

diff --git a/resources/assets/js/projects/components/charts/usernameToColor.js b/resources/assets/js/projects/components/charts/usernameToColor.js
index b9adffef3..dc6969662 100644
--- a/resources/assets/js/projects/components/charts/usernameToColor.js
+++ b/resources/assets/js/projects/components/charts/usernameToColor.js
@@ -1,172 +1,37 @@
-function rhex(n) {
-    var hex_chr = '0123456789abcdef'.split('');
-    var s = '',
-        j = 0;
-    for (; j < 4; j++) {
-        s += hex_chr[(n >> (j * 8 + 4)) & 0x0f] + hex_chr[(n >> (j * 8)) & 0x0f];
+// Simple hash function to convert the name to a number
+function simpleHash(str) {
+    let hash = 0;
+    for (let i = 0; i < str.length; i++) {
+        hash = str.charCodeAt(i) + ((hash << 5) - hash);
     }
-    return s;
+    return hash;
 }
-
-function hex(x) {
-    for (var i = 0; i < x.length; i++) {
-        x[i] = rhex(x[i]);
-    }
-    return x.join('');
-}
-
-function md5(s) {
-    return hex(md51(s));
-}
-
-function add32(a, b) {
-    return (a + b) & 0xffffffff;
-}
-
-function cmn(q, a, b, x, s, t) {
-    a = add32(add32(a, q), add32(x, t));
-    return add32((a << s) | (a >>> (32 - s)), b);
-}
-
-function ff(a, b, c, d, x, s, t) {
-    return cmn((b & c) | (~b & d), a, b, x, s, t);
-}
-
-function gg(a, b, c, d, x, s, t) {
-    return cmn((b & d) | (c & ~d), a, b, x, s, t);
-}
-
-function hh(a, b, c, d, x, s, t) {
-    return cmn(b ^ c ^ d, a, b, x, s, t);
-}
-
-function ii(a, b, c, d, x, s, t) {
-    return cmn(c ^ (b | ~d), a, b, x, s, t);
-}
-
-function md51(s) {
-    var n = s.length,
-        state = [1732584193, -271733879, -1732584194, 271733878],
-        i;
-    for (i = 64; i <= s.length; i += 64) {
-        md5cycle(state, md5blk(s.substring(i - 64, i)));
-    }
-    s = s.substring(i - 64);
-    var tail = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-    for (i = 0; i < s.length; i++) {
-        tail[i >> 2] |= s.charCodeAt(i) << ((i % 4) << 3);
-    }
-    tail[i >> 2] |= 0x80 << ((i % 4) << 3);
-    if (i > 55) {
-        md5cycle(state, tail);
-        for (i = 0; i < 16; i++) {
-            tail[i] = 0;
-        }
-    }
-    tail[14] = n * 8;
-    md5cycle(state, tail);
-    return state;
-}
-
-function md5blk(s) {
-    var md5blks = [],
-        i;
-    for (i = 0; i < 64; i += 4) {
-        md5blks[i >> 2] = s.charCodeAt(i) + (s.charCodeAt(i + 1) << 8) + (s.charCodeAt(i + 2) << 16) + (s.charCodeAt(i + 3) << 24);
-    }
-    return md5blks;
-}
-
-
-function md5cycle(x, k) {
-    var a = x[0],
-        b = x[1],
-        c = x[2],
-        d = x[3];
-
-    a = ff(a, b, c, d, k[0], 7, -680876936);
-    d = ff(d, a, b, c, k[1], 12, -389564586);
-    c = ff(c, d, a, b, k[2], 17, 606105819);
-    b = ff(b, c, d, a, k[3], 22, -1044525330);
-    a = ff(a, b, c, d, k[4], 7, -176418897);
-    d = ff(d, a, b, c, k[5], 12, 1200080426);
-    c = ff(c, d, a, b, k[6], 17, -1473231341);
-    b = ff(b, c, d, a, k[7], 22, -45705983);
-    a = ff(a, b, c, d, k[8], 7, 1770035416);
-    d = ff(d, a, b, c, k[9], 12, -1958414417);
-    c = ff(c, d, a, b, k[10], 17, -42063);
-    b = ff(b, c, d, a, k[11], 22, -1990404162);
-    a = ff(a, b, c, d, k[12], 7, 1804603682);
-    d = ff(d, a, b, c, k[13], 12, -40341101);
-    c = ff(c, d, a, b, k[14], 17, -1502002290);
-    b = ff(b, c, d, a, k[15], 22, 1236535329);
-
-    a = gg(a, b, c, d, k[1], 5, -165796510);
-    d = gg(d, a, b, c, k[6], 9, -1069501632);
-    c = gg(c, d, a, b, k[11], 14, 643717713);
-    b = gg(b, c, d, a, k[0], 20, -373897302);
-    a = gg(a, b, c, d, k[5], 5, -701558691);
-    d = gg(d, a, b, c, k[10], 9, 38016083);
-    c = gg(c, d, a, b, k[15], 14, -660478335);
-    b = gg(b, c, d, a, k[4], 20, -405537848);
-    a = gg(a, b, c, d, k[9], 5, 568446438);
-    d = gg(d, a, b, c, k[14], 9, -1019803690);
-    c = gg(c, d, a, b, k[3], 14, -187363961);
-    b = gg(b, c, d, a, k[8], 20, 1163531501);
-    a = gg(a, b, c, d, k[13], 5, -1444681467);
-    d = gg(d, a, b, c, k[2], 9, -51403784);
-    c = gg(c, d, a, b, k[7], 14, 1735328473);
-    b = gg(b, c, d, a, k[12], 20, -1926607734);
-
-    a = hh(a, b, c, d, k[5], 4, -378558);
-    d = hh(d, a, b, c, k[8], 11, -2022574463);
-    c = hh(c, d, a, b, k[11], 16, 1839030562);
-    b = hh(b, c, d, a, k[14], 23, -35309556);
-    a = hh(a, b, c, d, k[1], 4, -1530992060);
-    d = hh(d, a, b, c, k[4], 11, 1272893353);
-    c = hh(c, d, a, b, k[7], 16, -155497632);
-    b = hh(b, c, d, a, k[10], 23, -1094730640);
-    a = hh(a, b, c, d, k[13], 4, 681279174);
-    d = hh(d, a, b, c, k[0], 11, -358537222);
-    c = hh(c, d, a, b, k[3], 16, -722521979);
-    b = hh(b, c, d, a, k[6], 23, 76029189);
-    a = hh(a, b, c, d, k[9], 4, -640364487);
-    d = hh(d, a, b, c, k[12], 11, -421815835);
-    c = hh(c, d, a, b, k[15], 16, 530742520);
-    b = hh(b, c, d, a, k[2], 23, -995338651);
-
-    a = ii(a, b, c, d, k[0], 6, -198630844);
-    d = ii(d, a, b, c, k[7], 10, 1126891415);
-    c = ii(c, d, a, b, k[14], 15, -1416354905);
-    b = ii(b, c, d, a, k[5], 21, -57434055);
-    a = ii(a, b, c, d, k[12], 6, 1700485571);
-    d = ii(d, a, b, c, k[3], 10, -1894986606);
-    c = ii(c, d, a, b, k[10], 15, -1051523);
-    b = ii(b, c, d, a, k[1], 21, -2054922799);
-    a = ii(a, b, c, d, k[8], 6, 1873313359);
-    d = ii(d, a, b, c, k[15], 10, -30611744);
-    c = ii(c, d, a, b, k[6], 15, -1560198380);
-    b = ii(b, c, d, a, k[13], 21, 1309151649);
-    a = ii(a, b, c, d, k[4], 6, -145523070);
-    d = ii(d, a, b, c, k[11], 10, -1120210379);
-    c = ii(c, d, a, b, k[2], 15, 718787259);
-    b = ii(b, c, d, a, k[9], 21, -343485551);
-
-    x[0] = add32(a, x[0]);
-    x[1] = add32(b, x[1]);
-    x[2] = add32(c, x[2]);
-    x[3] = add32(d, x[3]);
+// Convert HSL to RGB
+function hslToRgb(h, s, l) {
+    s /= 100;
+    l /= 100;
+    const k = n => (n + h / 30) % 12;
+    const a = s * Math.min(l, 1 - l);
+    const f = n =>
+        l - a * Math.max(Math.min(k(n) - 3, 9 - k(n), 1), -1);
+    return [Math.round(f(0) * 255), Math.round(f(8) * 255), Math.round(f(4) * 255)];
 }
 
+// Format the RGB components into a hexadecimal color code
 function toHex(value) {
     return value.toString(16).padStart(2, '0');
 }
 
-export function usernameToColor(username) {
-    const hash = md5(username);
-    const r = parseInt(hash.substring(0, 2), 16);
-    const g = parseInt(hash.substring(2, 4), 16);
-    const b = parseInt(hash.substring(4, 6), 16);
+export function usernameToColor(name) {
+    // Convert name to a numeric hash value
+    const hash = simpleHash(name);
+
+    // Use the hash to generate a unique hue
+    const hue = hash % 360;
+    const saturation = 70; // Keep saturation high for bright colors
+    const lightness = 60;  // Keep lightness moderate for bright colors
+
+    const [r, g, b] = hslToRgb(hue, saturation, lightness);
 
     return `#${toHex(r)}${toHex(g)}${toHex(b)}`;
 }
\ No newline at end of file

From 09a25084a8775d67e88c4801f6da845bac877698 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Langenk=C3=A4mper?= <dlangenk@gmail.com>
Date: Wed, 24 Jul 2024 21:57:50 +0200
Subject: [PATCH 129/209] create prj: disable button on submit

---
 resources/views/projects/create.blade.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/resources/views/projects/create.blade.php b/resources/views/projects/create.blade.php
index 13a27b8e4..55a3d29bb 100644
--- a/resources/views/projects/create.blade.php
+++ b/resources/views/projects/create.blade.php
@@ -24,8 +24,20 @@
 			</div>
 			<input type="hidden" name="_token" value="{{ csrf_token() }}">
 			<a href="{{ URL::previous() }}" class="btn btn-link">Cancel</a>
-			<input type="submit" class="btn btn-success pull-right" value="Create">
+			<input id="submit-button" type="submit" class="btn btn-success pull-right" value="Create">
 		</form>
 	</div>
 </div>
 @endsection
+
+<script>
+	document.addEventListener('DOMContentLoaded', function() {
+		const submitButton = document.getElementById('submit-button');
+
+		submitButton.addEventListener('click', function(event) {
+			this.disabled = true;
+			this.value = 'Creating project...';
+			this.form.submit();
+		});
+	});
+</script>
\ No newline at end of file

From 46d3106d679f147f36759175aaf8df4d69238ee7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Langenk=C3=A4mper?= <dlangenk@gmail.com>
Date: Thu, 25 Jul 2024 09:31:34 +0200
Subject: [PATCH 130/209] moved js func body into html def

---
 resources/views/projects/create.blade.php | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/resources/views/projects/create.blade.php b/resources/views/projects/create.blade.php
index 55a3d29bb..67292a4a7 100644
--- a/resources/views/projects/create.blade.php
+++ b/resources/views/projects/create.blade.php
@@ -24,20 +24,8 @@
 			</div>
 			<input type="hidden" name="_token" value="{{ csrf_token() }}">
 			<a href="{{ URL::previous() }}" class="btn btn-link">Cancel</a>
-			<input id="submit-button" type="submit" class="btn btn-success pull-right" value="Create">
+			<input id="submit-button" type="submit" class="btn btn-success pull-right" value="Create" onclick="this.disabled = true;this.value = 'Creating project...';this.form.submit();">
 		</form>
 	</div>
 </div>
-@endsection
-
-<script>
-	document.addEventListener('DOMContentLoaded', function() {
-		const submitButton = document.getElementById('submit-button');
-
-		submitButton.addEventListener('click', function(event) {
-			this.disabled = true;
-			this.value = 'Creating project...';
-			this.form.submit();
-		});
-	});
-</script>
\ No newline at end of file
+@endsection
\ No newline at end of file

From 6334ee57df3bc6623b3be1969bfe05a2a5b1d1fb Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <mzur@users.noreply.github.com>
Date: Thu, 25 Jul 2024 09:34:31 +0200
Subject: [PATCH 131/209] Update resources/views/projects/create.blade.php

---
 resources/views/projects/create.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/projects/create.blade.php b/resources/views/projects/create.blade.php
index 67292a4a7..19e3042e6 100644
--- a/resources/views/projects/create.blade.php
+++ b/resources/views/projects/create.blade.php
@@ -24,7 +24,7 @@
 			</div>
 			<input type="hidden" name="_token" value="{{ csrf_token() }}">
 			<a href="{{ URL::previous() }}" class="btn btn-link">Cancel</a>
-			<input id="submit-button" type="submit" class="btn btn-success pull-right" value="Create" onclick="this.disabled = true;this.value = 'Creating project...';this.form.submit();">
+			<input type="submit" class="btn btn-success pull-right" value="Create" onclick="this.disabled = true;this.value = 'Creating project...';this.form.submit();">
 		</form>
 	</div>
 </div>

From 14cac332e755a16ba4911b9475e600404ee21526 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 25 Jul 2024 11:44:42 +0200
Subject: [PATCH 132/209] Replace Psalm with Larastan

---
 composer.json |    6 +-
 composer.lock | 1320 ++++++++-----------------------------------------
 phpstan.neon  |   18 +
 psalm.xml     |   24 -
 4 files changed, 217 insertions(+), 1151 deletions(-)
 create mode 100644 phpstan.neon
 delete mode 100644 psalm.xml

diff --git a/composer.json b/composer.json
index a4e5605c5..fedb1241b 100644
--- a/composer.json
+++ b/composer.json
@@ -40,10 +40,10 @@
         "fakerphp/faker": "^1.23",
         "filp/whoops": "^2.0",
         "friendsofphp/php-cs-fixer": "^3.0",
+        "larastan/larastan": "^2.0",
         "mockery/mockery": "^1.6",
         "nunomaduro/collision": "^8.1",
-        "phpunit/phpunit": "^10.0",
-        "psalm/plugin-laravel": "^2.9"
+        "phpunit/phpunit": "^10.0"
     },
     "autoload": {
         "psr-4": {
@@ -101,7 +101,7 @@
             "php doctum.phar update doctum.php"
         ],
         "lint": [
-            "@php vendor/bin/psalm"
+            "@php vendor/bin/phpstan analyse"
         ],
         "pull-modules": [
             "PPWD=$PWD; for f in $(find vendor/biigle -mindepth 1 -maxdepth 1 -type d); do cd $f; git pull; cd $PPWD; done"
diff --git a/composer.lock b/composer.lock
index 4ea3754f6..56dc1d6d6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "645e77ff31b1268fe3d6869d69ea2971",
+    "content-hash": "26105c05d2a99ac2b5480415e6692182",
     "packages": [
         {
             "name": "bacon/bacon-qr-code",
@@ -6901,312 +6901,6 @@
         }
     ],
     "packages-dev": [
-        {
-            "name": "amphp/amp",
-            "version": "v2.6.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/amphp/amp.git",
-                "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/amphp/amp/zipball/ded3d9be08f526089eb7ee8d9f16a9768f9dec2d",
-                "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "amphp/php-cs-fixer-config": "dev-master",
-                "amphp/phpunit-util": "^1",
-                "ext-json": "*",
-                "jetbrains/phpstorm-stubs": "^2019.3",
-                "phpunit/phpunit": "^7 | ^8 | ^9",
-                "react/promise": "^2",
-                "vimeo/psalm": "^3.12"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "lib/functions.php",
-                    "lib/Internal/functions.php"
-                ],
-                "psr-4": {
-                    "Amp\\": "lib"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Daniel Lowrey",
-                    "email": "rdlowrey@php.net"
-                },
-                {
-                    "name": "Aaron Piotrowski",
-                    "email": "aaron@trowski.com"
-                },
-                {
-                    "name": "Bob Weinand",
-                    "email": "bobwei9@hotmail.com"
-                },
-                {
-                    "name": "Niklas Keller",
-                    "email": "me@kelunik.com"
-                }
-            ],
-            "description": "A non-blocking concurrency framework for PHP applications.",
-            "homepage": "https://amphp.org/amp",
-            "keywords": [
-                "async",
-                "asynchronous",
-                "awaitable",
-                "concurrency",
-                "event",
-                "event-loop",
-                "future",
-                "non-blocking",
-                "promise"
-            ],
-            "support": {
-                "irc": "irc://irc.freenode.org/amphp",
-                "issues": "https://github.com/amphp/amp/issues",
-                "source": "https://github.com/amphp/amp/tree/v2.6.4"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/amphp",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-03-21T18:52:26+00:00"
-        },
-        {
-            "name": "amphp/byte-stream",
-            "version": "v1.8.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/amphp/byte-stream.git",
-                "reference": "4f0e968ba3798a423730f567b1b50d3441c16ddc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/amphp/byte-stream/zipball/4f0e968ba3798a423730f567b1b50d3441c16ddc",
-                "reference": "4f0e968ba3798a423730f567b1b50d3441c16ddc",
-                "shasum": ""
-            },
-            "require": {
-                "amphp/amp": "^2",
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "amphp/php-cs-fixer-config": "dev-master",
-                "amphp/phpunit-util": "^1.4",
-                "friendsofphp/php-cs-fixer": "^2.3",
-                "jetbrains/phpstorm-stubs": "^2019.3",
-                "phpunit/phpunit": "^6 || ^7 || ^8",
-                "psalm/phar": "^3.11.4"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "lib/functions.php"
-                ],
-                "psr-4": {
-                    "Amp\\ByteStream\\": "lib"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Aaron Piotrowski",
-                    "email": "aaron@trowski.com"
-                },
-                {
-                    "name": "Niklas Keller",
-                    "email": "me@kelunik.com"
-                }
-            ],
-            "description": "A stream abstraction to make working with non-blocking I/O simple.",
-            "homepage": "https://amphp.org/byte-stream",
-            "keywords": [
-                "amp",
-                "amphp",
-                "async",
-                "io",
-                "non-blocking",
-                "stream"
-            ],
-            "support": {
-                "issues": "https://github.com/amphp/byte-stream/issues",
-                "source": "https://github.com/amphp/byte-stream/tree/v1.8.2"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/amphp",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-04-13T18:00:56+00:00"
-        },
-        {
-            "name": "barryvdh/laravel-ide-helper",
-            "version": "v3.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/barryvdh/laravel-ide-helper.git",
-                "reference": "591e7d665fbab8a3b682e451641706341573eb80"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/591e7d665fbab8a3b682e451641706341573eb80",
-                "reference": "591e7d665fbab8a3b682e451641706341573eb80",
-                "shasum": ""
-            },
-            "require": {
-                "barryvdh/reflection-docblock": "^2.1.1",
-                "composer/class-map-generator": "^1.0",
-                "ext-json": "*",
-                "illuminate/console": "^10 || ^11",
-                "illuminate/database": "^10.38 || ^11",
-                "illuminate/filesystem": "^10 || ^11",
-                "illuminate/support": "^10 || ^11",
-                "nikic/php-parser": "^4.18 || ^5",
-                "php": "^8.1",
-                "phpdocumentor/type-resolver": "^1.1.0"
-            },
-            "require-dev": {
-                "ext-pdo_sqlite": "*",
-                "friendsofphp/php-cs-fixer": "^3",
-                "illuminate/config": "^9 || ^10 || ^11",
-                "illuminate/view": "^9 || ^10 || ^11",
-                "mockery/mockery": "^1.4",
-                "orchestra/testbench": "^8 || ^9",
-                "phpunit/phpunit": "^10.5",
-                "spatie/phpunit-snapshot-assertions": "^4 || ^5",
-                "vimeo/psalm": "^5.4"
-            },
-            "suggest": {
-                "illuminate/events": "Required for automatic helper generation (^6|^7|^8|^9|^10|^11)."
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1-dev"
-                },
-                "laravel": {
-                    "providers": [
-                        "Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider"
-                    ]
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Barryvdh\\LaravelIdeHelper\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Barry vd. Heuvel",
-                    "email": "barryvdh@gmail.com"
-                }
-            ],
-            "description": "Laravel IDE Helper, generates correct PHPDocs for all Facade classes, to improve auto-completion.",
-            "keywords": [
-                "autocomplete",
-                "codeintel",
-                "helper",
-                "ide",
-                "laravel",
-                "netbeans",
-                "phpdoc",
-                "phpstorm",
-                "sublime"
-            ],
-            "support": {
-                "issues": "https://github.com/barryvdh/laravel-ide-helper/issues",
-                "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v3.1.0"
-            },
-            "funding": [
-                {
-                    "url": "https://fruitcake.nl",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/barryvdh",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-07-12T14:20:51+00:00"
-        },
-        {
-            "name": "barryvdh/reflection-docblock",
-            "version": "v2.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/barryvdh/ReflectionDocBlock.git",
-                "reference": "e6811e927f0ecc37cc4deaa6627033150343e597"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/e6811e927f0ecc37cc4deaa6627033150343e597",
-                "reference": "e6811e927f0ecc37cc4deaa6627033150343e597",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^8.5.14|^9"
-            },
-            "suggest": {
-                "dflydev/markdown": "~1.0",
-                "erusev/parsedown": "~1.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Barryvdh": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "mike.vanriel@naenius.com"
-                }
-            ],
-            "support": {
-                "source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.1.1"
-            },
-            "time": "2023-06-14T05:06:27+00:00"
-        },
         {
             "name": "clue/ndjson-react",
             "version": "v1.3.0",
@@ -7271,79 +6965,6 @@
             ],
             "time": "2022-12-23T10:58:28+00:00"
         },
-        {
-            "name": "composer/class-map-generator",
-            "version": "1.3.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/class-map-generator.git",
-                "reference": "b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/class-map-generator/zipball/b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3",
-                "reference": "b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3",
-                "shasum": ""
-            },
-            "require": {
-                "composer/pcre": "^2.1 || ^3.1",
-                "php": "^7.2 || ^8.0",
-                "symfony/finder": "^4.4 || ^5.3 || ^6 || ^7"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "^1.6",
-                "phpstan/phpstan-deprecation-rules": "^1",
-                "phpstan/phpstan-phpunit": "^1",
-                "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/filesystem": "^5.4 || ^6",
-                "symfony/phpunit-bridge": "^5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Composer\\ClassMapGenerator\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "https://seld.be"
-                }
-            ],
-            "description": "Utilities to scan PHP code and generate class maps.",
-            "keywords": [
-                "classmap"
-            ],
-            "support": {
-                "issues": "https://github.com/composer/class-map-generator/issues",
-                "source": "https://github.com/composer/class-map-generator/tree/1.3.4"
-            },
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-06-12T14:13:04+00:00"
-        },
         {
             "name": "composer/pcre",
             "version": "3.1.4",
@@ -7562,90 +7183,6 @@
             ],
             "time": "2024-05-06T16:37:16+00:00"
         },
-        {
-            "name": "dnoegel/php-xdg-base-dir",
-            "version": "v0.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/dnoegel/php-xdg-base-dir.git",
-                "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd",
-                "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~7.0|~6.0|~5.0|~4.8.35"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "XdgBaseDir\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "implementation of xdg base directory specification for php",
-            "support": {
-                "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues",
-                "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1"
-            },
-            "time": "2019-12-04T15:06:13+00:00"
-        },
-        {
-            "name": "doctrine/deprecations",
-            "version": "1.1.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/deprecations.git",
-                "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
-                "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1 || ^8.0"
-            },
-            "require-dev": {
-                "doctrine/coding-standard": "^9",
-                "phpstan/phpstan": "1.4.10 || 1.10.15",
-                "phpstan/phpstan-phpunit": "^1.0",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "psalm/plugin-phpunit": "0.18.4",
-                "psr/log": "^1 || ^2 || ^3",
-                "vimeo/psalm": "4.30.0 || 5.12.0"
-            },
-            "suggest": {
-                "psr/log": "Allows logging deprecations via PSR-3 logger implementation"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.",
-            "homepage": "https://www.doctrine-project.org/",
-            "support": {
-                "issues": "https://github.com/doctrine/deprecations/issues",
-                "source": "https://github.com/doctrine/deprecations/tree/1.1.3"
-            },
-            "time": "2024-01-30T19:34:25+00:00"
-        },
         {
             "name": "fakerphp/faker",
             "version": "v1.23.1",
@@ -7709,107 +7246,6 @@
             },
             "time": "2024-01-02T13:46:09+00:00"
         },
-        {
-            "name": "felixfbecker/advanced-json-rpc",
-            "version": "v3.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/felixfbecker/php-advanced-json-rpc.git",
-                "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/b5f37dbff9a8ad360ca341f3240dc1c168b45447",
-                "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447",
-                "shasum": ""
-            },
-            "require": {
-                "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
-                "php": "^7.1 || ^8.0",
-                "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.0 || ^8.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "AdvancedJsonRpc\\": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "ISC"
-            ],
-            "authors": [
-                {
-                    "name": "Felix Becker",
-                    "email": "felix.b@outlook.com"
-                }
-            ],
-            "description": "A more advanced JSONRPC implementation",
-            "support": {
-                "issues": "https://github.com/felixfbecker/php-advanced-json-rpc/issues",
-                "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/v3.2.1"
-            },
-            "time": "2021-06-11T22:34:44+00:00"
-        },
-        {
-            "name": "felixfbecker/language-server-protocol",
-            "version": "v1.5.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/felixfbecker/php-language-server-protocol.git",
-                "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/6e82196ffd7c62f7794d778ca52b69feec9f2842",
-                "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "*",
-                "squizlabs/php_codesniffer": "^3.1",
-                "vimeo/psalm": "^4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "LanguageServerProtocol\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "ISC"
-            ],
-            "authors": [
-                {
-                    "name": "Felix Becker",
-                    "email": "felix.b@outlook.com"
-                }
-            ],
-            "description": "PHP classes for the Language Server Protocol",
-            "keywords": [
-                "language",
-                "microsoft",
-                "php",
-                "server"
-            ],
-            "support": {
-                "issues": "https://github.com/felixfbecker/php-language-server-protocol/issues",
-                "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/v1.5.2"
-            },
-            "time": "2022-03-02T22:36:06+00:00"
-        },
         {
             "name": "fidry/cpu-core-counter",
             "version": "1.1.0",
@@ -8096,6 +7532,108 @@
             },
             "time": "2020-07-09T08:09:16+00:00"
         },
+        {
+            "name": "larastan/larastan",
+            "version": "v2.9.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/larastan/larastan.git",
+                "reference": "340badd89b0eb5bddbc503a4829c08cf9a2819d7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/340badd89b0eb5bddbc503a4829c08cf9a2819d7",
+                "reference": "340badd89b0eb5bddbc503a4829c08cf9a2819d7",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "illuminate/console": "^9.52.16 || ^10.28.0 || ^11.0",
+                "illuminate/container": "^9.52.16 || ^10.28.0 || ^11.0",
+                "illuminate/contracts": "^9.52.16 || ^10.28.0 || ^11.0",
+                "illuminate/database": "^9.52.16 || ^10.28.0 || ^11.0",
+                "illuminate/http": "^9.52.16 || ^10.28.0 || ^11.0",
+                "illuminate/pipeline": "^9.52.16 || ^10.28.0 || ^11.0",
+                "illuminate/support": "^9.52.16 || ^10.28.0 || ^11.0",
+                "php": "^8.0.2",
+                "phpmyadmin/sql-parser": "^5.9.0",
+                "phpstan/phpstan": "^1.11.2"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "^12.0",
+                "nikic/php-parser": "^4.19.1",
+                "orchestra/canvas": "^7.11.1 || ^8.11.0 || ^9.0.2",
+                "orchestra/testbench": "^7.33.0 || ^8.13.0 || ^9.0.3",
+                "phpunit/phpunit": "^9.6.13 || ^10.5.16"
+            },
+            "suggest": {
+                "orchestra/testbench": "Using Larastan for analysing a package needs Testbench"
+            },
+            "type": "phpstan-extension",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                },
+                "phpstan": {
+                    "includes": [
+                        "extension.neon"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Larastan\\Larastan\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Can Vural",
+                    "email": "can9119@gmail.com"
+                },
+                {
+                    "name": "Nuno Maduro",
+                    "email": "enunomaduro@gmail.com"
+                }
+            ],
+            "description": "Larastan - Discover bugs in your code without running it. A phpstan/phpstan wrapper for Laravel",
+            "keywords": [
+                "PHPStan",
+                "code analyse",
+                "code analysis",
+                "larastan",
+                "laravel",
+                "package",
+                "php",
+                "static analysis"
+            ],
+            "support": {
+                "issues": "https://github.com/larastan/larastan/issues",
+                "source": "https://github.com/larastan/larastan/tree/v2.9.8"
+            },
+            "funding": [
+                {
+                    "url": "https://www.paypal.com/paypalme/enunomaduro",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/canvural",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nunomaduro",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/nunomaduro",
+                    "type": "patreon"
+                }
+            ],
+            "time": "2024-07-06T17:46:02+00:00"
+        },
         {
             "name": "mockery/mockery",
             "version": "1.6.12",
@@ -8239,57 +7777,6 @@
             ],
             "time": "2024-06-12T14:39:25+00:00"
         },
-        {
-            "name": "netresearch/jsonmapper",
-            "version": "v4.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/cweiske/jsonmapper.git",
-                "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/132c75c7dd83e45353ebb9c6c9f591952995bbf0",
-                "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "ext-pcre": "*",
-                "ext-reflection": "*",
-                "ext-spl": "*",
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0 || ~10.0",
-                "squizlabs/php_codesniffer": "~3.5"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "JsonMapper": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "OSL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "Christian Weiske",
-                    "email": "cweiske@cweiske.de",
-                    "homepage": "http://github.com/cweiske/jsonmapper/",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Map nested JSON structures onto PHP classes",
-            "support": {
-                "email": "cweiske@cweiske.de",
-                "issues": "https://github.com/cweiske/jsonmapper/issues",
-                "source": "https://github.com/cweiske/jsonmapper/tree/v4.4.1"
-            },
-            "time": "2024-01-31T06:18:54+00:00"
-        },
         {
             "name": "nunomaduro/collision",
             "version": "v8.1.1",
@@ -8385,96 +7872,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-03-06T16:20:09+00:00"
-        },
-        {
-            "name": "orchestra/testbench-core",
-            "version": "v9.1.9",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/orchestral/testbench-core.git",
-                "reference": "872742adfc2a05c4ae6b0b4f1eb8961575ec2580"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/orchestral/testbench-core/zipball/872742adfc2a05c4ae6b0b4f1eb8961575ec2580",
-                "reference": "872742adfc2a05c4ae6b0b4f1eb8961575ec2580",
-                "shasum": ""
-            },
-            "require": {
-                "composer-runtime-api": "^2.2",
-                "php": "^8.2",
-                "symfony/polyfill-php83": "^1.28"
-            },
-            "conflict": {
-                "brianium/paratest": "<7.3.0 || >=8.0.0",
-                "laravel/framework": "<11.1.0 || >=12.0.0",
-                "nunomaduro/collision": "<8.0.0 || >=9.0.0",
-                "phpunit/phpunit": "<10.5.0 || 11.0.0 || >=11.3.0"
-            },
-            "require-dev": {
-                "fakerphp/faker": "^1.23",
-                "laravel/framework": "^11.1",
-                "laravel/pint": "^1.6",
-                "mockery/mockery": "^1.6",
-                "phpstan/phpstan": "^1.11",
-                "phpunit/phpunit": "^10.5 || ^11.0.1",
-                "spatie/laravel-ray": "^1.35",
-                "symfony/process": "^7.0",
-                "symfony/yaml": "^7.0",
-                "vlucas/phpdotenv": "^5.4.1"
-            },
-            "suggest": {
-                "brianium/paratest": "Allow using parallel tresting (^7.3).",
-                "ext-pcntl": "Required to use all features of the console signal trapping.",
-                "fakerphp/faker": "Allow using Faker for testing (^1.23).",
-                "laravel/framework": "Required for testing (^11.1).",
-                "mockery/mockery": "Allow using Mockery for testing (^1.6).",
-                "nunomaduro/collision": "Allow using Laravel style tests output and parallel testing (^8.0).",
-                "orchestra/testbench-dusk": "Allow using Laravel Dusk for testing (^9.0).",
-                "phpunit/phpunit": "Allow using PHPUnit for testing (^10.5 || ^11.0).",
-                "symfony/process": "Required to use Orchestra\\Testbench\\remote function (^7.0).",
-                "symfony/yaml": "Required for Testbench CLI (^7.0).",
-                "vlucas/phpdotenv": "Required for Testbench CLI (^5.4.1)."
-            },
-            "bin": [
-                "testbench"
-            ],
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "src/functions.php"
-                ],
-                "psr-4": {
-                    "Orchestra\\Testbench\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mior Muhammad Zaki",
-                    "email": "crynobone@gmail.com",
-                    "homepage": "https://github.com/crynobone"
-                }
-            ],
-            "description": "Testing Helper for Laravel Development",
-            "homepage": "https://packages.tools/testbench",
-            "keywords": [
-                "BDD",
-                "TDD",
-                "dev",
-                "laravel",
-                "laravel-packages",
-                "testing"
-            ],
-            "support": {
-                "issues": "https://github.com/orchestral/testbench/issues",
-                "source": "https://github.com/orchestral/testbench-core"
-            },
-            "time": "2024-07-10T01:22:27+00:00"
+            "time": "2024-03-06T16:20:09+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -8595,226 +7993,150 @@
             "time": "2022-02-21T01:04:05+00:00"
         },
         {
-            "name": "phpdocumentor/reflection-common",
-            "version": "2.2.0",
+            "name": "phpmyadmin/sql-parser",
+            "version": "5.9.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
+                "url": "https://github.com/phpmyadmin/sql-parser.git",
+                "reference": "011fa18a4e55591fac6545a821921dd1d61c6984"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+                "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/011fa18a4e55591fac6545a821921dd1d61c6984",
+                "reference": "011fa18a4e55591fac6545a821921dd1d61c6984",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0"
+                "php": "^7.2 || ^8.0",
+                "symfony/polyfill-mbstring": "^1.3",
+                "symfony/polyfill-php80": "^1.16"
             },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.x": "2.x-dev"
-                }
+            "conflict": {
+                "phpmyadmin/motranslator": "<3.0"
+            },
+            "require-dev": {
+                "phpbench/phpbench": "^1.1",
+                "phpmyadmin/coding-standard": "^3.0",
+                "phpmyadmin/motranslator": "^4.0 || ^5.0",
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan": "^1.9.12",
+                "phpstan/phpstan-phpunit": "^1.3.3",
+                "phpunit/php-code-coverage": "*",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "psalm/plugin-phpunit": "^0.16.1",
+                "vimeo/psalm": "^4.11",
+                "zumba/json-serializer": "~3.0.2"
             },
+            "suggest": {
+                "ext-mbstring": "For best performance",
+                "phpmyadmin/motranslator": "Translate messages to your favorite locale"
+            },
+            "bin": [
+                "bin/highlight-query",
+                "bin/lint-query",
+                "bin/sql-parser",
+                "bin/tokenize-query"
+            ],
+            "type": "library",
             "autoload": {
                 "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src/"
+                    "PhpMyAdmin\\SqlParser\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "GPL-2.0-or-later"
             ],
             "authors": [
                 {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
+                    "name": "The phpMyAdmin Team",
+                    "email": "developers@phpmyadmin.net",
+                    "homepage": "https://www.phpmyadmin.net/team/"
                 }
             ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
+            "description": "A validating SQL lexer and parser with a focus on MySQL dialect.",
+            "homepage": "https://github.com/phpmyadmin/sql-parser",
             "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
+                "analysis",
+                "lexer",
+                "parser",
+                "query linter",
+                "sql",
+                "sql lexer",
+                "sql linter",
+                "sql parser",
+                "sql syntax highlighter",
+                "sql tokenizer"
             ],
             "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
-            },
-            "time": "2020-06-27T09:03:43+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "5.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c",
-                "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/deprecations": "^1.1",
-                "ext-filter": "*",
-                "php": "^7.4 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.2",
-                "phpdocumentor/type-resolver": "^1.7",
-                "phpstan/phpdoc-parser": "^1.7",
-                "webmozart/assert": "^1.9.1"
-            },
-            "require-dev": {
-                "mockery/mockery": "~1.3.5",
-                "phpstan/extension-installer": "^1.1",
-                "phpstan/phpstan": "^1.8",
-                "phpstan/phpstan-mockery": "^1.1",
-                "phpstan/phpstan-webmozart-assert": "^1.2",
-                "phpunit/phpunit": "^9.5",
-                "vimeo/psalm": "^5.13"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
+                "issues": "https://github.com/phpmyadmin/sql-parser/issues",
+                "source": "https://github.com/phpmyadmin/sql-parser"
             },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                },
+            "funding": [
                 {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
+                    "url": "https://www.phpmyadmin.net/donate/",
+                    "type": "other"
                 }
             ],
-            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.1"
-            },
-            "time": "2024-05-21T05:55:05+00:00"
+            "time": "2024-01-20T20:34:02+00:00"
         },
         {
-            "name": "phpdocumentor/type-resolver",
-            "version": "1.8.2",
+            "name": "phpstan/phpstan",
+            "version": "1.11.8",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "153ae662783729388a584b4361f2545e4d841e3c"
+                "url": "https://github.com/phpstan/phpstan.git",
+                "reference": "6adbd118e6c0515dd2f36b06cde1d6da40f1b8ec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c",
-                "reference": "153ae662783729388a584b4361f2545e4d841e3c",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/6adbd118e6c0515dd2f36b06cde1d6da40f1b8ec",
+                "reference": "6adbd118e6c0515dd2f36b06cde1d6da40f1b8ec",
                 "shasum": ""
             },
             "require": {
-                "doctrine/deprecations": "^1.0",
-                "php": "^7.3 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.0",
-                "phpstan/phpdoc-parser": "^1.13"
+                "php": "^7.2|^8.0"
             },
-            "require-dev": {
-                "ext-tokenizer": "*",
-                "phpbench/phpbench": "^1.2",
-                "phpstan/extension-installer": "^1.1",
-                "phpstan/phpstan": "^1.8",
-                "phpstan/phpstan-phpunit": "^1.1",
-                "phpunit/phpunit": "^9.5",
-                "rector/rector": "^0.13.9",
-                "vimeo/psalm": "^4.25"
+            "conflict": {
+                "phpstan/phpstan-shim": "*"
             },
+            "bin": [
+                "phpstan",
+                "phpstan.phar"
+            ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-1.x": "1.x-dev"
-                }
-            },
             "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
+                "files": [
+                    "bootstrap.php"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
+            "description": "PHPStan - PHP Static Analysis Tool",
+            "keywords": [
+                "dev",
+                "static analysis"
             ],
-            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
             "support": {
-                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.2"
-            },
-            "time": "2024-02-23T11:10:43+00:00"
-        },
-        {
-            "name": "phpstan/phpdoc-parser",
-            "version": "1.29.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/fcaefacf2d5c417e928405b71b400d4ce10daaf4",
-                "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4",
-                "shasum": ""
+                "docs": "https://phpstan.org/user-guide/getting-started",
+                "forum": "https://github.com/phpstan/phpstan/discussions",
+                "issues": "https://github.com/phpstan/phpstan/issues",
+                "security": "https://github.com/phpstan/phpstan/security/policy",
+                "source": "https://github.com/phpstan/phpstan-src"
             },
-            "require": {
-                "php": "^7.2 || ^8.0"
-            },
-            "require-dev": {
-                "doctrine/annotations": "^2.0",
-                "nikic/php-parser": "^4.15",
-                "php-parallel-lint/php-parallel-lint": "^1.2",
-                "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "^1.5",
-                "phpstan/phpstan-phpunit": "^1.1",
-                "phpstan/phpstan-strict-rules": "^1.0",
-                "phpunit/phpunit": "^9.5",
-                "symfony/process": "^5.2"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "PHPStan\\PhpDocParser\\": [
-                        "src/"
-                    ]
+            "funding": [
+                {
+                    "url": "https://github.com/ondrejmirtes",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/phpstan",
+                    "type": "github"
                 }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
             ],
-            "description": "PHPDoc parser with support for nullable, intersection and generic types",
-            "support": {
-                "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.29.1"
-            },
-            "time": "2024-05-31T08:52:43+00:00"
+            "time": "2024-07-24T07:01:22+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -9238,78 +8560,6 @@
             ],
             "time": "2024-07-10T11:48:06+00:00"
         },
-        {
-            "name": "psalm/plugin-laravel",
-            "version": "v2.11.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/psalm/psalm-plugin-laravel.git",
-                "reference": "ffd51399b672959331ed3ef4eaae13984474e2f0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/psalm/psalm-plugin-laravel/zipball/ffd51399b672959331ed3ef4eaae13984474e2f0",
-                "reference": "ffd51399b672959331ed3ef4eaae13984474e2f0",
-                "shasum": ""
-            },
-            "require": {
-                "barryvdh/laravel-ide-helper": "^2.13 || ^3.0",
-                "ext-simplexml": "*",
-                "illuminate/config": "^10.48 || ^11.0",
-                "illuminate/container": "^10.48 || ^11.0",
-                "illuminate/contracts": "^10.48 || ^11.0",
-                "illuminate/database": "^10.48 || ^11.0",
-                "illuminate/events": "^10.48 || ^11.0",
-                "illuminate/http": "^10.48 || ^11.0",
-                "illuminate/routing": "^10.48 || ^11.0",
-                "illuminate/support": "^10.48 || ^11.0",
-                "illuminate/view": "^10.48 || ^11.0",
-                "nikic/php-parser": "^4.18 || ^5.0",
-                "orchestra/testbench-core": "^8.22 || ^9.0",
-                "php": "^8.1",
-                "symfony/console": "^6.0 || ^7.0",
-                "symfony/finder": "^6.0 || ^7.0",
-                "vimeo/psalm": "^5.20"
-            },
-            "require-dev": {
-                "laravel/framework": "^10.48 || ^11.0",
-                "phpunit/phpunit": "^10.5 || ^11.0",
-                "phpyh/psalm-tester": "^0.1.0",
-                "ramsey/collection": "^1.3",
-                "rector/rector": "^1.0",
-                "slevomat/coding-standard": "^8.8",
-                "squizlabs/php_codesniffer": "*",
-                "symfony/http-foundation": "^6.0 || ^7.0"
-            },
-            "type": "psalm-plugin",
-            "extra": {
-                "psalm": {
-                    "pluginClass": "Psalm\\LaravelPlugin\\Plugin"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psalm\\LaravelPlugin\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Matthew Brown",
-                    "email": "github@muglug.com"
-                }
-            ],
-            "description": "Psalm plugin for Laravel",
-            "homepage": "https://github.com/psalm/psalm-plugin-laravel",
-            "support": {
-                "issues": "https://github.com/psalm/psalm-plugin-laravel/issues",
-                "source": "https://github.com/psalm/psalm-plugin-laravel/tree/v2.11.0"
-            },
-            "time": "2024-03-19T21:40:03+00:00"
-        },
         {
             "name": "react/cache",
             "version": "v1.2.0",
@@ -10756,74 +10006,6 @@
             ],
             "time": "2023-02-07T11:34:05+00:00"
         },
-        {
-            "name": "spatie/array-to-xml",
-            "version": "3.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/spatie/array-to-xml.git",
-                "reference": "f56b220fe2db1ade4c88098d83413ebdfc3bf876"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/f56b220fe2db1ade4c88098d83413ebdfc3bf876",
-                "reference": "f56b220fe2db1ade4c88098d83413ebdfc3bf876",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "php": "^8.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "^1.2",
-                "pestphp/pest": "^1.21",
-                "spatie/pest-plugin-snapshots": "^1.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Spatie\\ArrayToXml\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Freek Van der Herten",
-                    "email": "freek@spatie.be",
-                    "homepage": "https://freek.dev",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Convert an array to xml",
-            "homepage": "https://github.com/spatie/array-to-xml",
-            "keywords": [
-                "array",
-                "convert",
-                "xml"
-            ],
-            "support": {
-                "source": "https://github.com/spatie/array-to-xml/tree/3.3.0"
-            },
-            "funding": [
-                {
-                    "url": "https://spatie.be/open-source/support-us",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/spatie",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-05-01T10:20:27+00:00"
-        },
         {
             "name": "symfony/filesystem",
             "version": "v7.1.2",
@@ -11144,116 +10326,6 @@
                 }
             ],
             "time": "2024-03-03T12:36:25+00:00"
-        },
-        {
-            "name": "vimeo/psalm",
-            "version": "5.25.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/vimeo/psalm.git",
-                "reference": "01a8eb06b9e9cc6cfb6a320bf9fb14331919d505"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/vimeo/psalm/zipball/01a8eb06b9e9cc6cfb6a320bf9fb14331919d505",
-                "reference": "01a8eb06b9e9cc6cfb6a320bf9fb14331919d505",
-                "shasum": ""
-            },
-            "require": {
-                "amphp/amp": "^2.4.2",
-                "amphp/byte-stream": "^1.5",
-                "composer-runtime-api": "^2",
-                "composer/semver": "^1.4 || ^2.0 || ^3.0",
-                "composer/xdebug-handler": "^2.0 || ^3.0",
-                "dnoegel/php-xdg-base-dir": "^0.1.1",
-                "ext-ctype": "*",
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-libxml": "*",
-                "ext-mbstring": "*",
-                "ext-simplexml": "*",
-                "ext-tokenizer": "*",
-                "felixfbecker/advanced-json-rpc": "^3.1",
-                "felixfbecker/language-server-protocol": "^1.5.2",
-                "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1 || ^1.0.0",
-                "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
-                "nikic/php-parser": "^4.16",
-                "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
-                "sebastian/diff": "^4.0 || ^5.0 || ^6.0",
-                "spatie/array-to-xml": "^2.17.0 || ^3.0",
-                "symfony/console": "^4.1.6 || ^5.0 || ^6.0 || ^7.0",
-                "symfony/filesystem": "^5.4 || ^6.0 || ^7.0"
-            },
-            "conflict": {
-                "nikic/php-parser": "4.17.0"
-            },
-            "provide": {
-                "psalm/psalm": "self.version"
-            },
-            "require-dev": {
-                "amphp/phpunit-util": "^2.0",
-                "bamarni/composer-bin-plugin": "^1.4",
-                "brianium/paratest": "^6.9",
-                "ext-curl": "*",
-                "mockery/mockery": "^1.5",
-                "nunomaduro/mock-final-classes": "^1.1",
-                "php-parallel-lint/php-parallel-lint": "^1.2",
-                "phpstan/phpdoc-parser": "^1.6",
-                "phpunit/phpunit": "^9.6",
-                "psalm/plugin-mockery": "^1.1",
-                "psalm/plugin-phpunit": "^0.18",
-                "slevomat/coding-standard": "^8.4",
-                "squizlabs/php_codesniffer": "^3.6",
-                "symfony/process": "^4.4 || ^5.0 || ^6.0 || ^7.0"
-            },
-            "suggest": {
-                "ext-curl": "In order to send data to shepherd",
-                "ext-igbinary": "^2.0.5 is required, used to serialize caching data"
-            },
-            "bin": [
-                "psalm",
-                "psalm-language-server",
-                "psalm-plugin",
-                "psalm-refactor",
-                "psalter"
-            ],
-            "type": "project",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.x-dev",
-                    "dev-4.x": "4.x-dev",
-                    "dev-3.x": "3.x-dev",
-                    "dev-2.x": "2.x-dev",
-                    "dev-1.x": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psalm\\": "src/Psalm/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Matthew Brown"
-                }
-            ],
-            "description": "A static analysis tool for finding errors in PHP applications",
-            "keywords": [
-                "code",
-                "inspection",
-                "php",
-                "static analysis"
-            ],
-            "support": {
-                "docs": "https://psalm.dev/docs",
-                "issues": "https://github.com/vimeo/psalm/issues",
-                "source": "https://github.com/vimeo/psalm"
-            },
-            "time": "2024-06-16T15:08:35+00:00"
         }
     ],
     "aliases": [],
diff --git a/phpstan.neon b/phpstan.neon
new file mode 100644
index 000000000..47fe8bf05
--- /dev/null
+++ b/phpstan.neon
@@ -0,0 +1,18 @@
+includes:
+    - vendor/larastan/larastan/extension.neon
+
+parameters:
+
+    paths:
+        - app/
+
+    # Level 9 is the highest level
+    level: 5
+
+#    ignoreErrors:
+#        - '#PHPDoc tag @var#'
+#
+#    excludePaths:
+#        - ./*/*/FileToBeExcluded.php
+#
+#    checkMissingIterableValueType: false
diff --git a/psalm.xml b/psalm.xml
deleted file mode 100644
index 7a856fff4..000000000
--- a/psalm.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    errorLevel="7"
-    resolveFromConfigFile="true"
-    findUnusedBaselineEntry="true"
-    findUnusedCode="false"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="https://getpsalm.org/schema/config"
-    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
->
-    <projectFiles>
-        <directory name="app"/>
-        <ignoreFiles>
-            <directory name="vendor"/>
-        </ignoreFiles>
-    </projectFiles>
-    <plugins>
-        <pluginClass class="Psalm\LaravelPlugin\Plugin"/>
-    </plugins>
-    <issueHandlers>
-        <!-- <MissingClosureParamType errorLevel="suppress" /> -->
-        <!-- <MissingClosureReturnType errorLevel="suppress" /> -->
-    </issueHandlers>
-</psalm>

From b01063fdd1ebd590e9c4251265379982392ece0d Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 25 Jul 2024 11:46:00 +0200
Subject: [PATCH 133/209] Work on fixing type annotations

---
 app/Annotation.php                            |  17 +--
 app/AnnotationLabel.php                       |  10 +-
 app/AnnotationSession.php                     |   6 +-
 app/Announcement.php                          |   4 +-
 app/ApiToken.php                              |   2 +-
 app/Console/Commands/MigrateTiledImages.php   |   2 +-
 app/Console/Commands/UpdateImageMetadata.php  | 101 ------------------
 app/Console/Commands/UpdateVideoMetadata.php  |   2 +-
 app/Exceptions/Handler.php                    |   2 +-
 app/FederatedSearchInstance.php               |   8 +-
 .../Api/AnnotationSessionController.php       |   2 -
 .../Filters/AnnotationController.php          |   2 +-
 .../Filters/AnnotationUserController.php      |   2 +-
 .../VolumeAnnotationLabelController.php       |   2 +-
 .../Annotations/VolumeImageAreaController.php |   2 +-
 .../Api/AnnouncementController.php            |   4 +-
 .../Controllers/Api/ApiTokenController.php    |   6 +-
 app/ImageAnnotation.php                       |  10 +-
 app/MediaType.php                             |   5 +
 app/Role.php                                  |   9 ++
 app/User.php                                  |   3 +
 app/VideoAnnotation.php                       |  10 +-
 app/Volume.php                                |   2 +-
 app/VolumeFile.php                            |   5 +-
 24 files changed, 65 insertions(+), 153 deletions(-)
 delete mode 100644 app/Console/Commands/UpdateImageMetadata.php

diff --git a/app/Annotation.php b/app/Annotation.php
index 440edd9a2..8e2883c12 100644
--- a/app/Annotation.php
+++ b/app/Annotation.php
@@ -11,6 +11,9 @@
 /**
  * An image annotation is a region of an image that can be labeled by the users.
  * It consists of one or many points and has a specific shape.
+ *
+ * @property array $points
+ * @property string $created_at
  */
 abstract class Annotation extends Model implements AnnotationContract
 {
@@ -19,7 +22,7 @@ abstract class Annotation extends Model implements AnnotationContract
     /**
      * The attributes excluded from the model's JSON form.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $hidden = [
         'pivot',
@@ -28,7 +31,7 @@ abstract class Annotation extends Model implements AnnotationContract
     /**
      * The attributes that should be casted to native types.
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $casts = [
         'points' => 'array',
@@ -40,7 +43,7 @@ abstract class Annotation extends Model implements AnnotationContract
      * @param \Illuminate\Database\Query\Builder $query
      * @param User $user The user to whom the restrictions should apply ('own' user)
      *
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return \Illuminate\Database\Query\Builder
      */
     public function scopeVisibleFor($query, User $user)
     {
@@ -73,7 +76,7 @@ public function scopeVisibleFor($query, User $user)
      * @param \Illuminate\Database\Query\Builder $query
      * @param Label $label
      *
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return \Illuminate\Database\Query\Builder
      */
     public function scopeWithLabel($query, Label $label)
     {
@@ -93,7 +96,7 @@ public function scopeWithLabel($query, Label $label)
      * @param \Illuminate\Database\Query\Builder $query
      * @param AnnotationSession $session
      * @param User $user The user to whom the restrictions should apply ('own' user)
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return \Illuminate\Database\Query\Builder
      */
     public function scopeAllowedBySession($query, AnnotationSession $session, User $user)
     {
@@ -153,14 +156,14 @@ public function scopeAllowedBySession($query, AnnotationSession $session, User $
     /**
      * The file, this annotation belongs to.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<VolumeFile, Annotation>
      */
     abstract public function file();
 
     /**
      * The labels, this annotation got assigned by the users.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany<AnnotationLabel, Annotation>
      */
     abstract public function labels();
 
diff --git a/app/AnnotationLabel.php b/app/AnnotationLabel.php
index c630ccd64..44d5390bd 100644
--- a/app/AnnotationLabel.php
+++ b/app/AnnotationLabel.php
@@ -12,7 +12,7 @@ abstract class AnnotationLabel extends Model
     /**
      * The attributes that are mass assignable.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $fillable = [
         'label_id',
@@ -23,7 +23,7 @@ abstract class AnnotationLabel extends Model
     /**
      * The attributes that should be casted to native types.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $casts = [
         'user_id' => 'int',
@@ -33,14 +33,14 @@ abstract class AnnotationLabel extends Model
     /**
      * The annotation, this annotation label belongs to.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<Annotation, AnnotationLabel>
      */
     abstract public function annotation();
 
     /**
      * The label, this annotation label belongs to.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<Label, AnnotationLabel>
      */
     public function label()
     {
@@ -50,7 +50,7 @@ public function label()
     /**
      * The user who created this annotation label.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<User, AnnotationLabel>
      */
     public function user()
     {
diff --git a/app/AnnotationSession.php b/app/AnnotationSession.php
index f583681ed..e3a93fa36 100644
--- a/app/AnnotationSession.php
+++ b/app/AnnotationSession.php
@@ -18,7 +18,7 @@ class AnnotationSession extends Model
     /**
      * The attributes that should be casted to native types.
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $casts = [
         'starts_at' => 'datetime',
@@ -31,7 +31,7 @@ class AnnotationSession extends Model
     /**
      * The accessors to append to the model's array form.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $appends = [
         'starts_at_iso8601',
@@ -113,7 +113,7 @@ public function getVolumeFileAnnotations(VolumeFile $file, User $user)
      *
      * This is **not** an Eloquent relation!
      *
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return \Illuminate\Database\Eloquent\Builder<ImageAnnotation>|\Illuminate\Database\Eloquent\Builder<VideoAnnotation>
      */
     public function annotations()
     {
diff --git a/app/Announcement.php b/app/Announcement.php
index 78acd2607..1a4b276ca 100644
--- a/app/Announcement.php
+++ b/app/Announcement.php
@@ -22,14 +22,14 @@ class Announcement extends Model
     /**
      * The attributes that are mass assignable.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $fillable = ['title', 'show_until', 'body'];
 
     /**
      * The attributes that should be casted to native types.
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $casts = [
         'show_until' => 'datetime',
diff --git a/app/ApiToken.php b/app/ApiToken.php
index 8f3aa4cbe..451fb783a 100644
--- a/app/ApiToken.php
+++ b/app/ApiToken.php
@@ -12,7 +12,7 @@ class ApiToken extends Model
     /**
      * The attributes excluded from the model's JSON form.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $hidden = [
         'hash',
diff --git a/app/Console/Commands/MigrateTiledImages.php b/app/Console/Commands/MigrateTiledImages.php
index c1b014910..72ff13dac 100644
--- a/app/Console/Commands/MigrateTiledImages.php
+++ b/app/Console/Commands/MigrateTiledImages.php
@@ -38,7 +38,7 @@ public function handle()
         $query = Image::where('tiled', true);
         $bar = $this->output->createProgressBar($query->count());
 
-        $query->eachById(function ($image) use ($dryRun, $bar, $disk) {
+        $query->eachById(function (Image $image) use ($dryRun, $bar, $disk) {
             if (!$dryRun) {
                 Queue::push(new MigrateTiledImage($image, $disk));
             }
diff --git a/app/Console/Commands/UpdateImageMetadata.php b/app/Console/Commands/UpdateImageMetadata.php
deleted file mode 100644
index 3e3097db1..000000000
--- a/app/Console/Commands/UpdateImageMetadata.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-namespace Biigle\Console\Commands;
-
-use Biigle\Image;
-use Biigle\Volume;
-use Illuminate\Console\Command;
-
-class UpdateImageMetadata extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'update-image-metadata
-        {--dry-run : Don\'t strip obsolete metadata or push jobs to the queue}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Reprocess all images to store metadata like height, width, size od mimetype in the DB';
-
-    /**
-     * Is this a dry run?
-     *
-     * @var bool
-     */
-    protected $dryRun;
-
-    /**
-     * Handle the command.
-     *
-     * @return void
-     */
-    public function handle()
-    {
-        $this->dryRun = $this->option('dry-run');
-        $this->stripTileProperties();
-        $this->dispatchReprocessJobs();
-    }
-
-    /**
-     * Removes the tileProperties attribute from images.
-     */
-    protected function stripTileProperties()
-    {
-        $images = Image::whereRaw("jsonb_exists(attrs::jsonb, 'tileProperties')")
-            ->select('id', 'attrs')
-            ->get();
-
-        $this->line('Removing obsolete image tileProperties.');
-
-        $total = $images->count();
-
-        if ($total > 0) {
-            $remaining = $total;
-            $bar = $this->output->createProgressBar($total);
-
-            foreach ($images as $image) {
-                $attrs = $image->attrs;
-                unset($attrs['tileProperties']);
-                $image->attrs = $attrs;
-                if (!$this->dryRun) {
-                    $image->save();
-                }
-
-                $remaining--;
-
-                if ($remaining % 1000 === 0) {
-                    $bar->setProgress($total - $remaining);
-                }
-            }
-
-            $bar->setProgress($total);
-            $bar->finish();
-            $this->line('');
-        }
-
-        $this->info('Done.');
-    }
-
-    /**
-     * Dispatches jobs to process all images anew.
-     */
-    protected function dispatchReprocessJobs()
-    {
-        $volumes = Volume::select('id')->get();
-        $this->line('Submitting jobs to reprocess images.');
-
-        foreach ($volumes as $volume) {
-            if (!$this->dryRun) {
-                $volume->handleNewImages();
-            }
-        }
-
-        $this->info('Done.');
-    }
-}
diff --git a/app/Console/Commands/UpdateVideoMetadata.php b/app/Console/Commands/UpdateVideoMetadata.php
index feeb1588d..400c62d78 100644
--- a/app/Console/Commands/UpdateVideoMetadata.php
+++ b/app/Console/Commands/UpdateVideoMetadata.php
@@ -38,7 +38,7 @@ class UpdateVideoMetadata extends Command
     /**
      * The FFProbe video instance.
      *
-     * @var FFProbe
+     * @var FFProbe|null
      */
     protected $ffprobe;
 
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 225da6d57..028e9e1ac 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -35,7 +35,7 @@ public function register(): void
      * Prepare exception for rendering.
      *
      * @param  Throwable  $e
-     * @return \Exception
+     * @return Throwable
      */
     protected function prepareException(Throwable $e)
     {
diff --git a/app/FederatedSearchInstance.php b/app/FederatedSearchInstance.php
index 2a1a71a21..225391b6e 100644
--- a/app/FederatedSearchInstance.php
+++ b/app/FederatedSearchInstance.php
@@ -15,7 +15,7 @@ class FederatedSearchInstance extends Model implements AuthenticatableContract
     /**
      * The attributes that are mass assignable.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $fillable = [
         'name',
@@ -28,7 +28,7 @@ class FederatedSearchInstance extends Model implements AuthenticatableContract
     /**
      * The attributes excluded from the model's JSON form.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $hidden = [
         'local_token',
@@ -38,7 +38,7 @@ class FederatedSearchInstance extends Model implements AuthenticatableContract
     /**
      * The attributes that should be casted to native types.
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $casts = [
         'index_interval' => 'int',
@@ -100,7 +100,7 @@ public function setRemoteTokenAttribute($value)
      */
     public function getRemoteTokenAttribute()
     {
-        if (!isset($this->attributes['remote_token']) || is_null($this->attributes['remote_token'])) {
+        if (!isset($this->attributes['remote_token'])) {
             return null;
         } else {
             return decrypt($this->attributes['remote_token']);
diff --git a/app/Http/Controllers/Api/AnnotationSessionController.php b/app/Http/Controllers/Api/AnnotationSessionController.php
index 16286ecab..f64b72d39 100644
--- a/app/Http/Controllers/Api/AnnotationSessionController.php
+++ b/app/Http/Controllers/Api/AnnotationSessionController.php
@@ -42,7 +42,6 @@ class AnnotationSessionController extends Controller
      * }
      *
      * @param UpdateAnnotationSession $request
-     * @return \Illuminate\Http\Response
      */
     public function update(UpdateAnnotationSession $request)
     {
@@ -157,7 +156,6 @@ public function update(UpdateAnnotationSession $request)
      *
      * @param DestroyAnnotationSession $request
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
     public function destroy(DestroyAnnotationSession $request, $id)
     {
diff --git a/app/Http/Controllers/Api/Annotations/Filters/AnnotationController.php b/app/Http/Controllers/Api/Annotations/Filters/AnnotationController.php
index 37ed83410..7a7094073 100644
--- a/app/Http/Controllers/Api/Annotations/Filters/AnnotationController.php
+++ b/app/Http/Controllers/Api/Annotations/Filters/AnnotationController.php
@@ -26,7 +26,7 @@ class AnnotationController extends Controller
      *
      * @param Request $request
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Support\Collection<int|string, mixed>
      */
     public function index(Request $request, $id)
     {
diff --git a/app/Http/Controllers/Api/Annotations/Filters/AnnotationUserController.php b/app/Http/Controllers/Api/Annotations/Filters/AnnotationUserController.php
index 19af1e5ff..e0768ada2 100644
--- a/app/Http/Controllers/Api/Annotations/Filters/AnnotationUserController.php
+++ b/app/Http/Controllers/Api/Annotations/Filters/AnnotationUserController.php
@@ -28,7 +28,7 @@ class AnnotationUserController extends Controller
      * @param Request $request
      * @param  int  $tid
      * @param  int  $uid
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Support\Collection<int|string, mixed>
      */
     public function index(Request $request, $tid, $uid)
     {
diff --git a/app/Http/Controllers/Api/Annotations/VolumeAnnotationLabelController.php b/app/Http/Controllers/Api/Annotations/VolumeAnnotationLabelController.php
index 49219fb9e..ef550cd1d 100644
--- a/app/Http/Controllers/Api/Annotations/VolumeAnnotationLabelController.php
+++ b/app/Http/Controllers/Api/Annotations/VolumeAnnotationLabelController.php
@@ -39,7 +39,7 @@ class VolumeAnnotationLabelController extends Controller
      * ]
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Database\Eloquent\Collection<int, Label>
      */
     public function index($id)
     {
diff --git a/app/Http/Controllers/Api/Annotations/VolumeImageAreaController.php b/app/Http/Controllers/Api/Annotations/VolumeImageAreaController.php
index 3a42452d9..e9c06fd0f 100644
--- a/app/Http/Controllers/Api/Annotations/VolumeImageAreaController.php
+++ b/app/Http/Controllers/Api/Annotations/VolumeImageAreaController.php
@@ -26,7 +26,7 @@ class VolumeImageAreaController extends Controller
      * }
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Support\Collection<int|string, mixed>
      */
     public function index($id)
     {
diff --git a/app/Http/Controllers/Api/AnnouncementController.php b/app/Http/Controllers/Api/AnnouncementController.php
index 2156e071a..3c6c548ea 100644
--- a/app/Http/Controllers/Api/AnnouncementController.php
+++ b/app/Http/Controllers/Api/AnnouncementController.php
@@ -21,7 +21,7 @@ class AnnouncementController extends Controller
      * @apiParam (Optional parameters) {Number} show_until Date and time until the announcement should be shown. Only one announcement can be shown at a time. If not specified, the announcement will be shown indefinitely.
      *
      * @param StoreAnnouncement $request
-     * @return Announcement
+     * @return Announcement|\Illuminate\Http\RedirectResponse
      */
     public function store(StoreAnnouncement $request)
     {
@@ -47,7 +47,7 @@ public function store(StoreAnnouncement $request)
      * @apiParam {Number} id The announcement ID.
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|null
      */
     public function destroy($id)
     {
diff --git a/app/Http/Controllers/Api/ApiTokenController.php b/app/Http/Controllers/Api/ApiTokenController.php
index 83bf925dd..f0d0f3819 100644
--- a/app/Http/Controllers/Api/ApiTokenController.php
+++ b/app/Http/Controllers/Api/ApiTokenController.php
@@ -40,7 +40,7 @@ public function __construct()
      * ]
      *
      * @param Request $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Database\Eloquent\Collection<int, ApiToken>
      */
     public function index(Request $request)
     {
@@ -72,7 +72,7 @@ public function index(Request $request)
      * }
      *
      * @param Request $request
-     * @return \Illuminate\Http\Response
+     * @return ApiToken|\Illuminate\Http\RedirectResponse
      */
     public function store(Request $request)
     {
@@ -108,7 +108,7 @@ public function store(Request $request)
      *
      * @param Request $request
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|null
      */
     public function destroy(Request $request, $id)
     {
diff --git a/app/ImageAnnotation.php b/app/ImageAnnotation.php
index b25e16443..d07e9a85e 100644
--- a/app/ImageAnnotation.php
+++ b/app/ImageAnnotation.php
@@ -22,7 +22,7 @@ class ImageAnnotation extends Annotation
     /**
      * The image, this annotation belongs to.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<Image, ImageAnnotation>
      */
     public function image()
     {
@@ -30,9 +30,7 @@ public function image()
     }
 
     /**
-     * The file, this annotation belongs to.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * {@inheritdoc}
      */
     public function file()
     {
@@ -50,9 +48,7 @@ public function getFileIdAttribute()
     }
 
     /**
-     * The labels, this annotation got assigned by the users.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     * {@inheritdoc}
      */
     public function labels()
     {
diff --git a/app/MediaType.php b/app/MediaType.php
index 41b26af2a..9b2566119 100644
--- a/app/MediaType.php
+++ b/app/MediaType.php
@@ -8,6 +8,11 @@
 
 /**
  * Volumes can contain either images or videos as media type.
+ *
+ * @method static MediaType image()
+ * @method static int imageId()
+ * @method static MediaType video()
+ * @method static int videoId()
  */
 class MediaType extends Model
 {
diff --git a/app/Role.php b/app/Role.php
index 2b1beaab2..eab80d70b 100644
--- a/app/Role.php
+++ b/app/Role.php
@@ -9,6 +9,15 @@
 /**
  * A role of a user. Users have one global role and can have many project-
  * specific roles.
+ *
+ * @method static Role admin()
+ * @method static int adminId()
+ * @method static Role expert()
+ * @method static int expertId()
+ * @method static Role editor()
+ * @method static int editorId()
+ * @method static Role guest()
+ * @method static int guestId()
  */
 class Role extends Model
 {
diff --git a/app/User.php b/app/User.php
index 083002359..f70700c3a 100644
--- a/app/User.php
+++ b/app/User.php
@@ -7,6 +7,9 @@
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 
+/**
+ * @property string $uuid
+ */
 class User extends Authenticatable
 {
     use Notifiable, HasJsonAttributes, HasFactory;
diff --git a/app/VideoAnnotation.php b/app/VideoAnnotation.php
index a8bb6b9c1..72eee719b 100644
--- a/app/VideoAnnotation.php
+++ b/app/VideoAnnotation.php
@@ -33,7 +33,7 @@ class VideoAnnotation extends Annotation
     /**
      * The video, this annotation belongs to.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<Video, VideoAnnotation>
      */
     public function video()
     {
@@ -41,9 +41,7 @@ public function video()
     }
 
     /**
-     * The file, this annotation belongs to.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * {@inheritdoc}
      */
     public function file()
     {
@@ -61,9 +59,7 @@ public function getFileIdAttribute()
     }
 
     /**
-     * The labels that are attached to this annotation.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * {@inheritdoc}
      */
     public function labels()
     {
diff --git a/app/Volume.php b/app/Volume.php
index c99b9d686..675cb45e0 100644
--- a/app/Volume.php
+++ b/app/Volume.php
@@ -234,7 +234,7 @@ public function activeAnnotationSession()
      * session.
      *
      * @param User $user
-     * @return AnnotationSession
+     * @return AnnotationSession|null
      */
     public function getActiveAnnotationSession(User $user)
     {
diff --git a/app/VolumeFile.php b/app/VolumeFile.php
index 146ee5e73..ff4451206 100644
--- a/app/VolumeFile.php
+++ b/app/VolumeFile.php
@@ -7,6 +7,9 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * @property int $id
+ */
 abstract class VolumeFile extends Model implements FileContract
 {
     use HasJsonAttributes, HasFactory;
@@ -164,7 +167,7 @@ abstract public function labels();
     /**
      * The annotations that belong to this file.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany<\Biigle\Annotation, \Biigle\VolumeFile>
      */
     abstract public function annotations();
 }

From 981b0881e76fedfcac7c2e1f6194b7fc920c0194 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Langenk=C3=A4mper?= <dlangenk@gmail.com>
Date: Thu, 25 Jul 2024 15:46:45 +0200
Subject: [PATCH 134/209] change timeline to show month instead of years

---
 .../Api/Volumes/StatisticsController.php      |  4 ++--
 .../Projects/ProjectStatisticsController.php  |  4 ++--
 .../components/charts/timelinePlot.vue        | 24 +++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/Http/Controllers/Api/Volumes/StatisticsController.php b/app/Http/Controllers/Api/Volumes/StatisticsController.php
index af46ee3a8..f6bf401b2 100644
--- a/app/Http/Controllers/Api/Volumes/StatisticsController.php
+++ b/app/Http/Controllers/Api/Volumes/StatisticsController.php
@@ -44,8 +44,8 @@ public function index($id)
 
         $annotationTimeSeries = $baseQuery->clone()
             ->leftJoin('users', 'users.id', '=', "{$type}_annotation_labels.user_id")
-            ->selectRaw("{$type}_annotation_labels.user_id, concat(users.firstname, ' ', users.lastname) as fullname, count({$type}_annotation_labels.id), EXTRACT(YEAR from {$type}_annotations.created_at)::integer as year")
-            ->groupBy("{$type}_annotation_labels.user_id", 'fullname', 'year')
+            ->selectRaw("{$type}_annotation_labels.user_id, concat(users.firstname, ' ', users.lastname) as fullname, count({$type}_annotation_labels.id), concat(EXTRACT(YEAR from {$type}_annotations.created_at)::integer,'-',EXTRACT(MONTH from {$type}_annotations.created_at)::integer) as yearmonth")
+            ->groupBy("{$type}_annotation_labels.user_id", 'fullname', 'yearmonth')
             ->orderBy("{$type}_annotation_labels.user_id")
             ->get();
 
diff --git a/app/Http/Controllers/Views/Projects/ProjectStatisticsController.php b/app/Http/Controllers/Views/Projects/ProjectStatisticsController.php
index 04e70c4a8..d9eef5caf 100644
--- a/app/Http/Controllers/Views/Projects/ProjectStatisticsController.php
+++ b/app/Http/Controllers/Views/Projects/ProjectStatisticsController.php
@@ -112,8 +112,8 @@ protected function getVolumeStatistics(Project $project, $type)
 
         $annotationTimeSeries = $baseQuery->clone()
             ->leftJoin('users', 'users.id', '=', "{$type}_annotation_labels.user_id")
-            ->selectRaw("{$type}_annotation_labels.user_id, concat(users.firstname, ' ', users.lastname) as fullname, count({$type}_annotation_labels.id), EXTRACT(YEAR from {$type}_annotations.created_at)::integer as year")
-            ->groupBy("{$type}_annotation_labels.user_id", 'fullname', 'year')
+            ->selectRaw("{$type}_annotation_labels.user_id, concat(users.firstname, ' ', users.lastname) as fullname, count({$type}_annotation_labels.id), concat(EXTRACT(YEAR from {$type}_annotations.created_at)::integer,'-',EXTRACT(MONTH from {$type}_annotations.created_at)::integer) as yearmonth")
+            ->groupBy("{$type}_annotation_labels.user_id", 'fullname', 'yearmonth')
             ->orderBy("{$type}_annotation_labels.user_id")
             ->get();
 
diff --git a/resources/assets/js/projects/components/charts/timelinePlot.vue b/resources/assets/js/projects/components/charts/timelinePlot.vue
index 8db35d4b6..a6a7b4a5c 100644
--- a/resources/assets/js/projects/components/charts/timelinePlot.vue
+++ b/resources/assets/js/projects/components/charts/timelinePlot.vue
@@ -53,7 +53,7 @@ export default {
                     formatter: '{b}: {@[0]} ({d}%)',
                 },
                 encode: {
-                    itemName: 'year',
+                    itemName: 'yearmonth',
                     tooltip:  0,
                     value: 0
                 },
@@ -74,12 +74,12 @@ export default {
             this.pieObj.encode.value = dimension;
             this.pieObj.encode.tooltip = dimension;
         },
-        extractYear() {
-            // helper-function to get all X-Axis data (years)
+        extractYearMonth() {
+            // helper-function to get all X-Axis data (yearsmonth)
             let xAxis = this.annotationTimeSeries.map((entry) => {
-                return entry.year.toString();
+                return entry.yearmonth.toString();
             });
-            // filter duplicated years
+            // filter duplicated yearsmonth
             xAxis = [...new Set(xAxis)];
 
              // sort the years (increasing)
@@ -92,7 +92,7 @@ export default {
             // returns array of type [xAxis-array, annotation-array-user1, annotation-array-user2, etc.]:
             // [['all', 'year', 2020, 2021, 2022], [1195,"Name1",1195,0,0], [6,"Name2",0,2,4], [...]]
             let dat = this.annotationTimeSeries;
-            let xAxis = this.extractYear();
+            let xAxis = this.extractYearMonth();
             let chartdata = [];
 
             let users = {};
@@ -116,19 +116,19 @@ export default {
 
             // assemble the annotations of each user in correct order of year
             // each user has its own year-timeseries in idDict (e.g. {id: {"2020":10, "2021":4, "2022":6]})
-            for (let year of xAxis) {
+            for (let yearmonth of xAxis) {
                 for (let entry of dat) {
-                    if (entry.year.toString() === year) {
-                        idDict[entry.user_id][year] += entry.count;
+                    if (entry.yearmonth.toString() === yearmonth) {
+                        idDict[entry.user_id][yearmonth] += entry.count;
                     } else {
-                        idDict[entry.user_id][year] += 0;
+                        idDict[entry.user_id][yearmonth] += 0;
                     }
                 }
             }
 
             // setup of whole chartdata object
             // include axis-name in front
-            xAxis.unshift('year');
+            xAxis.unshift('yearmonth');
             // include an entry of the sum over all years
             xAxis.unshift('all');
             chartdata.push(xAxis);
@@ -215,7 +215,7 @@ export default {
                 },
                 xAxis: {
                     type: 'category',
-                    data: this.extractYear()
+                    data: this.extractYearMonth()
                 },
                 yAxis: {
                     gridIndex: 0,

From 8f5c3113f9ea25897e133a2a701e4ecc15fc2e73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Langenk=C3=A4mper?= <dlangenk@gmail.com>
Date: Thu, 25 Jul 2024 16:23:31 +0200
Subject: [PATCH 135/209] double digit month, better query

---
 app/Http/Controllers/Api/Volumes/StatisticsController.php       | 2 +-
 .../Controllers/Views/Projects/ProjectStatisticsController.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Api/Volumes/StatisticsController.php b/app/Http/Controllers/Api/Volumes/StatisticsController.php
index f6bf401b2..014827821 100644
--- a/app/Http/Controllers/Api/Volumes/StatisticsController.php
+++ b/app/Http/Controllers/Api/Volumes/StatisticsController.php
@@ -44,7 +44,7 @@ public function index($id)
 
         $annotationTimeSeries = $baseQuery->clone()
             ->leftJoin('users', 'users.id', '=', "{$type}_annotation_labels.user_id")
-            ->selectRaw("{$type}_annotation_labels.user_id, concat(users.firstname, ' ', users.lastname) as fullname, count({$type}_annotation_labels.id), concat(EXTRACT(YEAR from {$type}_annotations.created_at)::integer,'-',EXTRACT(MONTH from {$type}_annotations.created_at)::integer) as yearmonth")
+            ->selectRaw("{$type}_annotation_labels.user_id, concat(users.firstname, ' ', users.lastname) as fullname, count({$type}_annotation_labels.id), to_char({$type}_annotations.created_at, 'YYYY-MM') as yearmonth")
             ->groupBy("{$type}_annotation_labels.user_id", 'fullname', 'yearmonth')
             ->orderBy("{$type}_annotation_labels.user_id")
             ->get();
diff --git a/app/Http/Controllers/Views/Projects/ProjectStatisticsController.php b/app/Http/Controllers/Views/Projects/ProjectStatisticsController.php
index d9eef5caf..99f6f1f19 100644
--- a/app/Http/Controllers/Views/Projects/ProjectStatisticsController.php
+++ b/app/Http/Controllers/Views/Projects/ProjectStatisticsController.php
@@ -112,7 +112,7 @@ protected function getVolumeStatistics(Project $project, $type)
 
         $annotationTimeSeries = $baseQuery->clone()
             ->leftJoin('users', 'users.id', '=', "{$type}_annotation_labels.user_id")
-            ->selectRaw("{$type}_annotation_labels.user_id, concat(users.firstname, ' ', users.lastname) as fullname, count({$type}_annotation_labels.id), concat(EXTRACT(YEAR from {$type}_annotations.created_at)::integer,'-',EXTRACT(MONTH from {$type}_annotations.created_at)::integer) as yearmonth")
+            ->selectRaw("{$type}_annotation_labels.user_id, concat(users.firstname, ' ', users.lastname) as fullname, count({$type}_annotation_labels.id), to_char({$type}_annotations.created_at, 'YYYY-MM') as yearmonth")
             ->groupBy("{$type}_annotation_labels.user_id", 'fullname', 'yearmonth')
             ->orderBy("{$type}_annotation_labels.user_id")
             ->get();

From 276e94db58f5db9be287d74a093a6e8123db95cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Langenk=C3=A4mper?= <dlangenk@gmail.com>
Date: Thu, 25 Jul 2024 20:11:37 +0200
Subject: [PATCH 136/209] update tests to new yearmonth structure

---
 .../Controllers/Api/Volumes/StatisticsControllerTest.php  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/php/Http/Controllers/Api/Volumes/StatisticsControllerTest.php b/tests/php/Http/Controllers/Api/Volumes/StatisticsControllerTest.php
index 122dc76bc..97c695327 100644
--- a/tests/php/Http/Controllers/Api/Volumes/StatisticsControllerTest.php
+++ b/tests/php/Http/Controllers/Api/Volumes/StatisticsControllerTest.php
@@ -91,13 +91,13 @@ public function testImageStatistics()
                     'count' => 1,
                     'fullname' => $user1->firstname . " " . $user1->lastname,
                     'user_id' => $user1->id,
-                    'year' => $annotation1->created_at->year,
+                    'yearmonth' => $annotation1->created_at->year . "-" . sprintf("%02d", $annotation1->created_at->month),
                 ],
                 [
                     'count' => 1,
                     'fullname' => $user2->firstname . " " . $user2->lastname,
                     'user_id' => $user2->id,
-                    'year' => $annotation2->created_at->year,
+                    'yearmonth' => $annotation2->created_at->year . "-" . sprintf("%02d", $annotation1->created_at->month),
                 ]
             ],
             'volumeAnnotations' => [
@@ -188,13 +188,13 @@ public function testVideoStatistics()
                     'count' => 1,
                     'fullname' => $user1->firstname . " " . $user1->lastname,
                     'user_id' => $user1->id,
-                    'year' => $annotation1->created_at->year,
+                    'yearmonth' => $annotation1->created_at->year . "-" . sprintf("%02d", $annotation1->created_at->month),
                 ],
                 [
                     'count' => 1,
                     'fullname' => $user2->firstname . " " . $user2->lastname,
                     'user_id' => $user2->id,
-                    'year' => $annotation2->created_at->year,
+                    'yearmonth' => $annotation2->created_at->year . "-" . sprintf("%02d", $annotation1->created_at->month),
                 ]
             ],
             'volumeAnnotations' => [

From ef328f523925cf42ba268708236f6c4b7353f302 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Langenk=C3=A4mper?= <dlangenk@gmail.com>
Date: Thu, 25 Jul 2024 22:40:02 +0200
Subject: [PATCH 137/209] use css hsl color and use userID; change hash to care
 for id input

---
 .../projects/components/charts/IDToColor.js   | 21 +++++++++++
 .../projects/components/charts/sankeyPlot.vue | 21 +++++++++--
 .../components/charts/timelinePlot.vue        | 12 +++---
 .../components/charts/usernameToColor.js      | 37 -------------------
 4 files changed, 45 insertions(+), 46 deletions(-)
 create mode 100644 resources/assets/js/projects/components/charts/IDToColor.js
 delete mode 100644 resources/assets/js/projects/components/charts/usernameToColor.js

diff --git a/resources/assets/js/projects/components/charts/IDToColor.js b/resources/assets/js/projects/components/charts/IDToColor.js
new file mode 100644
index 000000000..f82235467
--- /dev/null
+++ b/resources/assets/js/projects/components/charts/IDToColor.js
@@ -0,0 +1,21 @@
+export function IDToColor(id) {
+    let hash = 0;
+    while (id > 0) {
+      hash += id & 0xFF;
+      hash += (hash << 10);
+      hash ^= (hash >> 6);
+      id = id >> 8;
+    }
+    hash += (hash << 3);
+    hash ^= (hash >> 11);
+    hash += (hash << 15);
+    id=hash & 0xFFFFFFFF; // Ensure it fits in 32 bits
+
+
+    // Use the hash to generate a unique hue
+    const hue = id % 360;
+    const saturation = 70 + (hash % 31); // Ensure saturation is between 70 and 100
+    const lightness = 50 + (hash % 41);  // Ensure lightness is between 50 and 90
+
+    return `hsl(${hue} ${saturation}% ${lightness}%)`;
+}
\ No newline at end of file
diff --git a/resources/assets/js/projects/components/charts/sankeyPlot.vue b/resources/assets/js/projects/components/charts/sankeyPlot.vue
index 2aa75f774..2d0fe066f 100644
--- a/resources/assets/js/projects/components/charts/sankeyPlot.vue
+++ b/resources/assets/js/projects/components/charts/sankeyPlot.vue
@@ -8,7 +8,7 @@ import { SankeyChart } from 'echarts/charts';
 import { CanvasRenderer } from 'echarts/renderers';
 import { TitleComponent, TooltipComponent } from 'echarts/components';
 import VChart, { THEME_KEY } from "vue-echarts";
-import { usernameToColor } from "./usernameToColor";
+import { IDToColor } from "./IDToColor";
 
 export default {
     components: {
@@ -47,10 +47,23 @@ export default {
             })
             userNames = [...new Set(userNames)];
 
-            let combined = userNames.concat(...volNames);
-            combined = combined.map(entry => {
-                return { name: entry, itemStyle: { color: usernameToColor(entry) } };
+            let userIds = this.volumeAnnotations.map(entry => {
+                return entry.user_id;
             })
+            userIds = [...new Set(userIds)];
+
+            let volIds = this.volumeAnnotations.map(entry => {
+                return entry.volume_id;
+            });
+            volIds = [...new Set(volIds)];
+
+
+            let combined = userNames.concat(...volNames);
+            let combinedIds = userIds.concat(...volIds);
+
+            combined = combined.map((entry, index) => {
+                return { name: entry, itemStyle: { color: IDToColor(combinedIds[index]) } };
+            });
             return combined;
         },
 
diff --git a/resources/assets/js/projects/components/charts/timelinePlot.vue b/resources/assets/js/projects/components/charts/timelinePlot.vue
index 9f344ef4f..773cbc2c7 100644
--- a/resources/assets/js/projects/components/charts/timelinePlot.vue
+++ b/resources/assets/js/projects/components/charts/timelinePlot.vue
@@ -16,7 +16,7 @@ import { LineChart, PieChart } from 'echarts/charts';
 import { LabelLayout } from 'echarts/features';
 import { CanvasRenderer } from 'echarts/renderers';
 import VChart, { THEME_KEY } from "vue-echarts";
-import { usernameToColor } from "./usernameToColor";
+import { IDToColor } from "./IDToColor";
 
 export default {
     props: {
@@ -61,7 +61,7 @@ export default {
                 },
                 itemStyle: {
                     color: function (params) {
-                        return usernameToColor(params.name);
+                        return IDToColor(params.data[params.data.length - 1]);
                     }
                 }
             },
@@ -139,6 +139,7 @@ export default {
             // include an entry of the sum over all years
             xAxis.unshift('all');
             chartdata.push(xAxis);
+
             // reduce user-timeseries to values only
             Object.entries(idDict).forEach(entry => {
                 // calculate the sum over all years and include in the array on position 0
@@ -147,11 +148,12 @@ export default {
                     sum += val;
                 })
                 let name = users[entry[0]];
+                let userid = entry[0];
                 // case of deleted account
                 if (name === " ") {
-                    chartdata.push([sum, 'Deleted Account', ...Object.values(entry[1])]);
+                    chartdata.push([sum, 'Deleted Account', ...Object.values(entry[1]),userid]);
                 } else { // case of existing user
-                    chartdata.push([sum, name, ...Object.values(entry[1])]);
+                    chartdata.push([sum, name, ...Object.values(entry[1]),userid]);
                 }
             });
             return chartdata;
@@ -173,7 +175,7 @@ export default {
                     emphasis: { focus: 'series' },
                     // skip first two entries as they are irrelevant for the timeline-data
                     data: this.sourcedata[idx].slice(2, end),
-                    itemStyle: { "color": usernameToColor(this.sourcedata[idx][1]) },
+                    itemStyle: { "color": IDToColor(this.sourcedata[idx][end]) },
                 };
                 series.push(snippet)
             }
diff --git a/resources/assets/js/projects/components/charts/usernameToColor.js b/resources/assets/js/projects/components/charts/usernameToColor.js
deleted file mode 100644
index dc6969662..000000000
--- a/resources/assets/js/projects/components/charts/usernameToColor.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Simple hash function to convert the name to a number
-function simpleHash(str) {
-    let hash = 0;
-    for (let i = 0; i < str.length; i++) {
-        hash = str.charCodeAt(i) + ((hash << 5) - hash);
-    }
-    return hash;
-}
-// Convert HSL to RGB
-function hslToRgb(h, s, l) {
-    s /= 100;
-    l /= 100;
-    const k = n => (n + h / 30) % 12;
-    const a = s * Math.min(l, 1 - l);
-    const f = n =>
-        l - a * Math.max(Math.min(k(n) - 3, 9 - k(n), 1), -1);
-    return [Math.round(f(0) * 255), Math.round(f(8) * 255), Math.round(f(4) * 255)];
-}
-
-// Format the RGB components into a hexadecimal color code
-function toHex(value) {
-    return value.toString(16).padStart(2, '0');
-}
-
-export function usernameToColor(name) {
-    // Convert name to a numeric hash value
-    const hash = simpleHash(name);
-
-    // Use the hash to generate a unique hue
-    const hue = hash % 360;
-    const saturation = 70; // Keep saturation high for bright colors
-    const lightness = 60;  // Keep lightness moderate for bright colors
-
-    const [r, g, b] = hslToRgb(hue, saturation, lightness);
-
-    return `#${toHex(r)}${toHex(g)}${toHex(b)}`;
-}
\ No newline at end of file

From af177e875d630b12573ee9be5ff25f4378300996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Langenk=C3=A4mper?= <dlangenk@gmail.com>
Date: Thu, 25 Jul 2024 22:50:31 +0200
Subject: [PATCH 138/209] updated documentation for attaching volumes

---
 resources/views/manual/tutorials/projects/about.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/manual/tutorials/projects/about.blade.php b/resources/views/manual/tutorials/projects/about.blade.php
index 839957a1a..6ba15f37e 100644
--- a/resources/views/manual/tutorials/projects/about.blade.php
+++ b/resources/views/manual/tutorials/projects/about.blade.php
@@ -62,7 +62,7 @@
             A volume is a collection of images or videos that belong together (like a directory in a file system). Each project can have one or more volumes attached to it. Unlike label trees, volumes always belong to at least one project. If a volume belongs to no project any more, it will be deleted.
         </p>
         <p>
-            Project admins can create or delete volumes. To create a volume, click the <button class="btn btn-default btn-xs">Create Volume</button> button of the volumes tab in the project overview. A new volume will be automatically attached to the project it was created for. Volumes can be shared between projects, too. You can attach existing volumes of any project where you are also admin. To do this, enter the name of the volume you want to attach in the input field on the top right of the volumes tab and hit enter. Hover the mouse over a volume thumbnail and click the <button class="btn btn-default btn-xs"><i class="fa fa-trash"></i></button> button to detach or delete a volume. A volume is deleted only if this is the last project that it is attached to (there will be an additional request for confirmation in this case). Be careful when doing this since deleting a volume deletes all annotations and cannot be undone!
+            Project admins can create or delete volumes. To create a volume, click the <button class="btn btn-default btn-xs">Create Volume</button> button of the volumes tab in the project overview. A new volume will be automatically attached to the project it was created for. Volumes can also be shared with other projects where you are also an admin. To do this, enter the name of the volume you want to attach in the input field on the top right of the volumes tab and hit enter. The volume is now attached to both projects. Changes made from one project will also be visible in the other project. To detach or delete a volume, hover the mouse over a volume thumbnail and click the <button class="btn btn-default btn-xs"><i class="fa fa-trash"></i></button> button. A volume is deleted only if this is the last project that it is attached to (there will be an additional request for confirmation in this case). Be careful when doing this since deleting a volume deletes all annotations and cannot be undone!
         </p>
         <p>
             Hover the mouse over a volume thumbnail and click the <button class="btn btn-default btn-xs"><i class="fa fa-chart-bar"></i></button> button in order to see some charts of this volume, such as the per-user contribution of annotations, the ratio of annotated vs. not-annotated files, or the abundance of annotation labels. For further details, have a look at the Charts section below.

From 3ed8290ec33d8ba51259bb7e427a086ae5b2492a Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 26 Jul 2024 09:09:47 +0200
Subject: [PATCH 139/209] Update developing docs

---
 DEVELOPING.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/DEVELOPING.md b/DEVELOPING.md
index f5fadd97f..8e57a6601 100644
--- a/DEVELOPING.md
+++ b/DEVELOPING.md
@@ -7,14 +7,18 @@ To develop BIIGLE on your local machine you can use Docker containers. This way
 First, install the following software:
 
 - PHP >= 8.0
-- [Docker](https://docs.docker.com/install/)
+- [Docker Engine](https://docs.docker.com/engine/install/)
 - [Docker Compose](https://docs.docker.com/compose/install/)
 - [Composer](https://getcomposer.org/doc/00-intro.md#installation-linux-unix-macos)
 - Recommended: The `unzip` tool
 
+> [!IMPORTANT]  
+> The link above points to Docker Engine on purpose. Docker Desktop (on Linux) may have problems mounting the filesystem with the correct permissions.
+
 On Linux: Make sure to add your user to the new `docker` group with `sudo usermod -aG docker $(whoami)`, then log out and back in. Otherwise you have to call all `docker` or `docker compose` commands with `sudo`.
 
-**Note:** Older versions of Docker Compose used the `docker-compose` command. Newer versions use `docker compose`.
+> [!NOTE]
+> Older versions of Docker Compose used the `docker-compose` command. Newer versions use `docker compose`.
 
 Now you can proceed with the development setup:
 

From 93506a929828a5ceae0334e73292ee9982b84a5c Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 26 Jul 2024 09:10:49 +0200
Subject: [PATCH 140/209] Remove obsolete note

---
 DEVELOPING.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/DEVELOPING.md b/DEVELOPING.md
index 8e57a6601..e9f514615 100644
--- a/DEVELOPING.md
+++ b/DEVELOPING.md
@@ -17,9 +17,6 @@ First, install the following software:
 
 On Linux: Make sure to add your user to the new `docker` group with `sudo usermod -aG docker $(whoami)`, then log out and back in. Otherwise you have to call all `docker` or `docker compose` commands with `sudo`.
 
-> [!NOTE]
-> Older versions of Docker Compose used the `docker-compose` command. Newer versions use `docker compose`.
-
 Now you can proceed with the development setup:
 
 ### 1. Download the project files

From 2acbdbeeb4767785ffc8777cd89ea0d5e9e5a440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Langenk=C3=A4mper?= <dlangenk@gmail.com>
Date: Fri, 26 Jul 2024 09:27:02 +0200
Subject: [PATCH 141/209] prevent double clicks for point annotations

---
 .../components/annotationCanvas/drawInteractions.vue     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/resources/assets/js/annotations/components/annotationCanvas/drawInteractions.vue b/resources/assets/js/annotations/components/annotationCanvas/drawInteractions.vue
index a0c94fb5f..b5a890498 100644
--- a/resources/assets/js/annotations/components/annotationCanvas/drawInteractions.vue
+++ b/resources/assets/js/annotations/components/annotationCanvas/drawInteractions.vue
@@ -12,6 +12,7 @@ import snapInteraction from '../../snapInteraction.vue';
  */
 
 let drawInteraction;
+let lastdrawnPoint = 0;
 
 // Custom OpenLayers freehandCondition that is true if a pen is used for input or
 // if Shift is pressed otherwise.
@@ -104,6 +105,14 @@ export default {
                 });
 
                 drawInteraction.on('drawend', (e) => {
+                    // Prevent double click from creating two points.
+                    if (this.isDrawingPoint){
+                        const now = new Date().getTime();
+                        if (now - lastdrawnPoint < 400) {
+                            return;
+                        }
+                        lastdrawnPoint = new Date().getTime();
+                    }
                     this.handleNewFeature(e);
                     this.drawEnded = true;
                 });

From ae5ec5592c8a608cec9e94899f49fe5492b62d93 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 26 Jul 2024 09:29:12 +0200
Subject: [PATCH 142/209] Increase minimum lightness of chart colors

---
 resources/assets/js/projects/components/charts/IDToColor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/assets/js/projects/components/charts/IDToColor.js b/resources/assets/js/projects/components/charts/IDToColor.js
index f82235467..baded9b87 100644
--- a/resources/assets/js/projects/components/charts/IDToColor.js
+++ b/resources/assets/js/projects/components/charts/IDToColor.js
@@ -15,7 +15,7 @@ export function IDToColor(id) {
     // Use the hash to generate a unique hue
     const hue = id % 360;
     const saturation = 70 + (hash % 31); // Ensure saturation is between 70 and 100
-    const lightness = 50 + (hash % 41);  // Ensure lightness is between 50 and 90
+    const lightness = 70 + (hash % 21);  // Ensure lightness is between 70 and 90
 
     return `hsl(${hue} ${saturation}% ${lightness}%)`;
-}
\ No newline at end of file
+}

From 8be3211981866ed1ea3b65e488d9731b772a841a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Langenk=C3=A4mper?= <dlangenk@gmail.com>
Date: Fri, 26 Jul 2024 09:38:37 +0200
Subject: [PATCH 143/209] Correct hash -> id

---
 resources/assets/js/projects/components/charts/IDToColor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/assets/js/projects/components/charts/IDToColor.js b/resources/assets/js/projects/components/charts/IDToColor.js
index f82235467..5ce2f2f9c 100644
--- a/resources/assets/js/projects/components/charts/IDToColor.js
+++ b/resources/assets/js/projects/components/charts/IDToColor.js
@@ -14,8 +14,8 @@ export function IDToColor(id) {
 
     // Use the hash to generate a unique hue
     const hue = id % 360;
-    const saturation = 70 + (hash % 31); // Ensure saturation is between 70 and 100
-    const lightness = 50 + (hash % 41);  // Ensure lightness is between 50 and 90
+    const saturation = 70 + (id % 31); // Ensure saturation is between 70 and 100
+    const lightness = 50 + (id % 41);  // Ensure lightness is between 50 and 90
 
     return `hsl(${hue} ${saturation}% ${lightness}%)`;
 }
\ No newline at end of file

From 01da1b97d1b276bd050cd933d942bbad541e0719 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 26 Jul 2024 10:20:18 +0200
Subject: [PATCH 144/209] Update PyTorch version to fix vulnerability

---
 .docker/requirements.txt  | 2 +-
 .docker/worker.dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.docker/requirements.txt b/.docker/requirements.txt
index faffb90b9..7dbeb64f7 100644
--- a/.docker/requirements.txt
+++ b/.docker/requirements.txt
@@ -8,6 +8,6 @@ matplotlib==3.6.*
 PyExcelerate==0.6.7
 Pillow==10.3.0
 Shapely==1.8.1
-torch==2.1.*
+torch==2.2.*
 torchvision==0.16.*
 pandas==1.5.3
diff --git a/.docker/worker.dockerfile b/.docker/worker.dockerfile
index 5339ed683..057504bea 100644
--- a/.docker/worker.dockerfile
+++ b/.docker/worker.dockerfile
@@ -97,7 +97,7 @@ RUN LC_ALL=C.UTF-8 apt-get update \
         PyExcelerate==0.6.7 \
         Pillow==10.2.0 \
     && pip3 install --no-cache-dir --break-system-packages --index-url https://download.pytorch.org/whl/cpu \
-        torch==2.1.* \
+        torch==2.2.* \
         torchvision==0.16.* \
     && apt-get purge -y \
         python3-pip \

From 8f570a3d063c7a9e7f54955052fc64fcf3920633 Mon Sep 17 00:00:00 2001
From: aneust <aneustaedter@techfak.uni-bielefeld.de>
Date: Fri, 26 Jul 2024 10:41:15 +0200
Subject: [PATCH 145/209] Adapted Tests des ProcessNewimage-Jobs

---
 tests/php/Jobs/ProcessNewImageTest.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/php/Jobs/ProcessNewImageTest.php b/tests/php/Jobs/ProcessNewImageTest.php
index 8b3eb4db0..bc7a34c54 100644
--- a/tests/php/Jobs/ProcessNewImageTest.php
+++ b/tests/php/Jobs/ProcessNewImageTest.php
@@ -65,15 +65,15 @@ public function testHandleCollectMetadataAreaYaw()
     {
         $volume = VolumeTest::create();
         $image = ImageTest::create([
-            'filename' => 'exif-test.jpg',
             'volume_id' => $volume->id,
-            'attrs' => [
-                'metadata' => ['area' => 2.6],
-            ],
         ]);
 
-        with(new ProcessNewImageMock($image))->handle();
-
+        $job = new ProcessNewImageMock($image);
+        $job->exif = [
+            'GPSImgDirection' => 47.75,
+            'SubjectArea' => 2.6,
+        ];
+        $job->handle();
         $image = $image->fresh();
 
         $this->assertEquals(47.75, $image->metadata['yaw']);

From 5f4956e4fcd5ff18ce5e47765bc52e7d6c020dd9 Mon Sep 17 00:00:00 2001
From: aneust <aneustaedter@techfak.uni-bielefeld.de>
Date: Fri, 26 Jul 2024 10:47:02 +0200
Subject: [PATCH 146/209] Removed unnecessary parameter $ref for yaw and area

---
 app/Jobs/ProcessNewImage.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Jobs/ProcessNewImage.php b/app/Jobs/ProcessNewImage.php
index 3fca31df8..dde40d12e 100644
--- a/app/Jobs/ProcessNewImage.php
+++ b/app/Jobs/ProcessNewImage.php
@@ -209,13 +209,13 @@ protected function collectMetadata(Image $image, $path)
 
             if ($this->hasGpsImgDirInfo($exif)) {
                 $image->metadata = array_merge($image->metadata, [
-                    'yaw' => $ref * $this->fracToFloat($exif['GPSImgDirection']),
+                    'yaw' => $this->fracToFloat($exif['GPSImgDirection']),
                 ]);
             }
 
             if ($this->hasSubjectAreaInfo($exif)) {
                 $image->metadata = array_merge($image->metadata, [
-                    'area' => $ref * $this->fracToFloat($exif['SubjectArea']),
+                    'area' => $this->fracToFloat($exif['SubjectArea']),
                 ]);
             }
         }

From 2127984ea95cbace2ee0590b90ffcc158ebaafed Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 26 Jul 2024 10:48:14 +0200
Subject: [PATCH 147/209] Fix torchvision compatibility

---
 .docker/requirements.txt  | 2 +-
 .docker/worker.dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.docker/requirements.txt b/.docker/requirements.txt
index 7dbeb64f7..f166494ff 100644
--- a/.docker/requirements.txt
+++ b/.docker/requirements.txt
@@ -9,5 +9,5 @@ PyExcelerate==0.6.7
 Pillow==10.3.0
 Shapely==1.8.1
 torch==2.2.*
-torchvision==0.16.*
+torchvision==0.17.*
 pandas==1.5.3
diff --git a/.docker/worker.dockerfile b/.docker/worker.dockerfile
index 057504bea..24522c673 100644
--- a/.docker/worker.dockerfile
+++ b/.docker/worker.dockerfile
@@ -98,7 +98,7 @@ RUN LC_ALL=C.UTF-8 apt-get update \
         Pillow==10.2.0 \
     && pip3 install --no-cache-dir --break-system-packages --index-url https://download.pytorch.org/whl/cpu \
         torch==2.2.* \
-        torchvision==0.16.* \
+        torchvision==0.17.* \
     && apt-get purge -y \
         python3-pip \
     && apt-get -y autoremove \

From 70d2295f8f6cb1feb00bc06525c3bff175b546a8 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 26 Jul 2024 12:24:29 +0200
Subject: [PATCH 148/209] Fix type errors

---
 app/Annotation.php                            |  2 +-
 app/AnnotationLabel.php                       |  2 +-
 app/AnnotationSession.php                     |  2 +-
 app/FederatedSearchModel.php                  |  2 +-
 .../Api/FederatedSearchInstanceController.php |  7 ++--
 .../Api/ImageAnnotationBulkController.php     |  6 +++-
 .../Api/ImageAnnotationController.php         |  3 +-
 .../Api/ImageAnnotationLabelController.php    |  6 ++--
 app/Http/Controllers/Api/LabelController.php  |  3 +-
 .../Controllers/Api/LabelSourceController.php |  2 +-
 .../LabelTreeAuthorizedProjectController.php  |  4 +--
 .../Controllers/Api/LabelTreeController.php   | 14 ++++----
 .../Api/LabelTreeLabelController.php          |  2 +-
 app/Http/Requests/StoreLabelTree.php          |  4 +--
 app/Jobs/CloneImagesOrVideos.php              | 34 +++++++++----------
 app/Label.php                                 |  2 ++
 app/LabelTree.php                             |  2 ++
 app/Visibility.php                            |  5 +++
 18 files changed, 58 insertions(+), 44 deletions(-)

diff --git a/app/Annotation.php b/app/Annotation.php
index 8e2883c12..b13541613 100644
--- a/app/Annotation.php
+++ b/app/Annotation.php
@@ -163,7 +163,7 @@ abstract public function file();
     /**
      * The labels, this annotation got assigned by the users.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany<AnnotationLabel, Annotation>
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany<AnnotationLabel>
      */
     abstract public function labels();
 
diff --git a/app/AnnotationLabel.php b/app/AnnotationLabel.php
index 44d5390bd..86ca99efd 100644
--- a/app/AnnotationLabel.php
+++ b/app/AnnotationLabel.php
@@ -23,7 +23,7 @@ abstract class AnnotationLabel extends Model
     /**
      * The attributes that should be casted to native types.
      *
-     * @var array<int, string>
+     * @var array<string, string>
      */
     protected $casts = [
         'user_id' => 'int',
diff --git a/app/AnnotationSession.php b/app/AnnotationSession.php
index e3a93fa36..4e5af3df6 100644
--- a/app/AnnotationSession.php
+++ b/app/AnnotationSession.php
@@ -65,7 +65,7 @@ public function users()
      * @param VolumeFile $file The file to get the annotations from
      * @param User $user The user to whom the restrictions should apply ('own' user)
      *
-     * @return \Illuminate\Support\Collection
+     * @return \Illuminate\Database\Eloquent\Collection
      */
     public function getVolumeFileAnnotations(VolumeFile $file, User $user)
     {
diff --git a/app/FederatedSearchModel.php b/app/FederatedSearchModel.php
index 38e5095ef..6f2114375 100644
--- a/app/FederatedSearchModel.php
+++ b/app/FederatedSearchModel.php
@@ -13,7 +13,7 @@ class FederatedSearchModel extends Model
     /**
      * The attributes that should be casted to native types.
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $casts = [
         'attrs' => 'array',
diff --git a/app/Http/Controllers/Api/FederatedSearchInstanceController.php b/app/Http/Controllers/Api/FederatedSearchInstanceController.php
index 24025486a..85de3fbb1 100644
--- a/app/Http/Controllers/Api/FederatedSearchInstanceController.php
+++ b/app/Http/Controllers/Api/FederatedSearchInstanceController.php
@@ -31,7 +31,7 @@ class FederatedSearchInstanceController extends Controller
      * }
      *
      * @param StoreFederatedSearchInstance $request
-     * @return \Illuminate\Http\Response
+     * @return FederatedSearchInstance|\Illuminate\Http\RedirectResponse
      */
     public function store(StoreFederatedSearchInstance $request)
     {
@@ -61,7 +61,7 @@ public function store(StoreFederatedSearchInstance $request)
      * @apiParam (Attributes that can be updated) {Boolean} local_token Set to `true` to (re-)set a new token that can be used by the remote instance to authenticate to the local instance. A new token is returned only once in plain text as `new_local_token`. Set this attribute to `false` to clear the local token and thus deny access by the remote instance.
      *
      * @param UpdateFederatedSearchInstance $request
-     * @return \Illuminate\Http\Response
+     * @return FederatedSearchInstance|\Illuminate\Http\RedirectResponse
      */
     public function update(UpdateFederatedSearchInstance $request)
     {
@@ -94,6 +94,7 @@ public function update(UpdateFederatedSearchInstance $request)
 
         if ($this->isAutomatedRequest()) {
             if (isset($token)) {
+                /** @phpstan-ignore-next-line */
                 $instance->new_local_token = $token;
             }
 
@@ -120,7 +121,7 @@ public function update(UpdateFederatedSearchInstance $request)
      * @apiParam {Number} id ID of the instance to disconnect
      *
      * @param int $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|null
      */
     public function destroy($id)
     {
diff --git a/app/Http/Controllers/Api/ImageAnnotationBulkController.php b/app/Http/Controllers/Api/ImageAnnotationBulkController.php
index c22472999..f81e6134a 100644
--- a/app/Http/Controllers/Api/ImageAnnotationBulkController.php
+++ b/app/Http/Controllers/Api/ImageAnnotationBulkController.php
@@ -90,7 +90,9 @@ public function store(StoreImageAnnotations $request)
 
             $annotation->points = $input['points'];
             $annotation->image_id = $input['image_id'];
+            /** @phpstan-ignore-next-line */
             $annotation->label_id = $input['label_id'];
+            /** @phpstan-ignore-next-line */
             $annotation->confidence = $input['confidence'];
 
             return $annotation;
@@ -98,10 +100,12 @@ public function store(StoreImageAnnotations $request)
 
         DB::transaction(function () use ($request, $annotations) {
             $annotations->each(function ($annotation) use ($request) {
+                /** @phpstan-ignore-next-line */
                 $label = $request->labels[$annotation->label_id];
+                /** @phpstan-ignore-next-line */
                 $confidence = $annotation->confidence;
                 unset($annotation->label_id, $annotation->confidence);
-                
+
                 $this->authorize('attach-label', [$annotation, $label]);
                 $annotation->save();
 
diff --git a/app/Http/Controllers/Api/ImageAnnotationController.php b/app/Http/Controllers/Api/ImageAnnotationController.php
index 02e118401..64461ec36 100644
--- a/app/Http/Controllers/Api/ImageAnnotationController.php
+++ b/app/Http/Controllers/Api/ImageAnnotationController.php
@@ -60,7 +60,7 @@ class ImageAnnotationController extends Controller
      *
      * @param Request $request
      * @param int $id image id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Database\Eloquent\Collection<int, ImageAnnotation>
      */
     public function index(Request $request, $id)
     {
@@ -266,7 +266,6 @@ public function store(StoreImageAnnotation $request)
      *
      * @param Request $request
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
     public function update(Request $request, $id)
     {
diff --git a/app/Http/Controllers/Api/ImageAnnotationLabelController.php b/app/Http/Controllers/Api/ImageAnnotationLabelController.php
index 357a19e7d..1e233f6d6 100644
--- a/app/Http/Controllers/Api/ImageAnnotationLabelController.php
+++ b/app/Http/Controllers/Api/ImageAnnotationLabelController.php
@@ -73,7 +73,7 @@ class ImageAnnotationLabelController extends Controller
      * ]
      *
      * @param int $id ImageAnnotation ID
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Database\Eloquent\Collection<int, ImageAnnotationLabel>
      */
     public function index($id)
     {
@@ -161,7 +161,7 @@ public function index($id)
      * }
      *
      * @param StoreImageAnnotationLabel $request
-     * @return \Illuminate\Http\Response
+     * @return ImageAnnotationLabel|null
      */
     public function store(StoreImageAnnotationLabel $request)
     {
@@ -187,7 +187,7 @@ public function store(StoreImageAnnotationLabel $request)
 
             AnnotationLabelAttached::dispatch($annotationLabel);
 
-            return response($annotationLabel, 201);
+            return $annotationLabel;
         } catch (QueryException $e) {
             // Although we check for existence above, this error happened some time.
             // I suspect some kind of race condition between PHP FPM workers.
diff --git a/app/Http/Controllers/Api/LabelController.php b/app/Http/Controllers/Api/LabelController.php
index 37b5f696b..e757ce4f1 100644
--- a/app/Http/Controllers/Api/LabelController.php
+++ b/app/Http/Controllers/Api/LabelController.php
@@ -22,7 +22,6 @@ class LabelController extends Controller
      * @apiParam (Attributes that can be updated) {Number} parent_id ID of the parent label for ordering in a tree-like structure.
      *
      * @param UpdateLabel $request
-     * @return \Illuminate\Http\Response
      */
     public function update(UpdateLabel $request)
     {
@@ -47,7 +46,7 @@ public function update(UpdateLabel $request)
      * @apiParam {Number} id The label ID
      *
      * @param DestroyLabel $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function destroy(DestroyLabel $request)
     {
diff --git a/app/Http/Controllers/Api/LabelSourceController.php b/app/Http/Controllers/Api/LabelSourceController.php
index df9adcc00..f2f3ec432 100644
--- a/app/Http/Controllers/Api/LabelSourceController.php
+++ b/app/Http/Controllers/Api/LabelSourceController.php
@@ -20,7 +20,7 @@ class LabelSourceController extends Controller
      *
      * @param Request $request
      * @param int $id
-     * @return \Illuminate\Http\Response
+     * @return array
      */
     public function find(Request $request, $id)
     {
diff --git a/app/Http/Controllers/Api/LabelTreeAuthorizedProjectController.php b/app/Http/Controllers/Api/LabelTreeAuthorizedProjectController.php
index 944ad83d6..8d3adaf3c 100644
--- a/app/Http/Controllers/Api/LabelTreeAuthorizedProjectController.php
+++ b/app/Http/Controllers/Api/LabelTreeAuthorizedProjectController.php
@@ -23,7 +23,7 @@ class LabelTreeAuthorizedProjectController extends Controller
      * @apiParam (Required attributes) {Number} id ID of the project to authorize
      *
      * @param StoreLabelTreeAuthorizedProject $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|null
      */
     public function store(StoreLabelTreeAuthorizedProject $request)
     {
@@ -67,7 +67,7 @@ public function store(StoreLabelTreeAuthorizedProject $request)
      * @param Request $request
      * @param  int  $lid
      * @param  int  $pid
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|null
      */
     public function destroy(Request $request, $lid, $pid)
     {
diff --git a/app/Http/Controllers/Api/LabelTreeController.php b/app/Http/Controllers/Api/LabelTreeController.php
index 6624c82be..abf2c6b95 100644
--- a/app/Http/Controllers/Api/LabelTreeController.php
+++ b/app/Http/Controllers/Api/LabelTreeController.php
@@ -34,7 +34,7 @@ class LabelTreeController extends Controller
      * ]
      *
      * @param Request $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Database\Eloquent\Collection<int, LabelTree>
      */
     public function index(Request $request)
     {
@@ -94,14 +94,16 @@ public function index(Request $request)
      * }
      *
      *
-     * @return \Illuminate\Http\Response
+     * @return LabelTree
      */
     public function show($id)
     {
         $tree = LabelTree::findOrFail($id);
         $this->authorize('access', $tree);
 
-        return $tree->load('labels', 'members', 'version', 'versions');
+        $tree->load(['labels', 'members', 'version', 'versions']);
+
+        return $tree;
     }
 
     /**
@@ -132,7 +134,7 @@ public function show($id)
      * }
      *
      * @param StoreLabelTree $request
-     * @return \Illuminate\Http\Response
+     * @return LabelTree|\Illuminate\Http\RedirectResponse
      */
     public function store(StoreLabelTree $request)
     {
@@ -184,7 +186,7 @@ public function store(StoreLabelTree $request)
      * @apiParam (Attributes that can be updated) {Number} visibility_id ID of the new visibility of the label tree (public or private).
      *
      * @param UpdateLabelTree $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|null
      */
     public function update(UpdateLabelTree $request)
     {
@@ -236,7 +238,7 @@ public function update(UpdateLabelTree $request)
      * @apiParam {Number} id The label tree ID.
      *
      * @param DestroyLabelTree $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|null
      */
     public function destroy(DestroyLabelTree $request)
     {
diff --git a/app/Http/Controllers/Api/LabelTreeLabelController.php b/app/Http/Controllers/Api/LabelTreeLabelController.php
index 2398f8b82..9fee3ff9d 100644
--- a/app/Http/Controllers/Api/LabelTreeLabelController.php
+++ b/app/Http/Controllers/Api/LabelTreeLabelController.php
@@ -41,7 +41,7 @@ class LabelTreeLabelController extends Controller
      * ]
      *
      * @param StoreLabel $request
-     * @return \Illuminate\Http\Response
+     * @return array|\Illuminate\Http\RedirectResponse
      */
     public function store(StoreLabel $request)
     {
diff --git a/app/Http/Requests/StoreLabelTree.php b/app/Http/Requests/StoreLabelTree.php
index 38d0b75cd..284fad460 100644
--- a/app/Http/Requests/StoreLabelTree.php
+++ b/app/Http/Requests/StoreLabelTree.php
@@ -11,14 +11,14 @@ class StoreLabelTree extends FormRequest
     /**
      * The project to which the new label tree should be attached (if any).
      *
-     * @var Project
+     * @var Project|null
      */
     public $project;
 
     /**
      * The upstream label tree that should be forked (if any)
      *
-     * @var LabelTree
+     * @var LabelTree|null
      */
     public $upstreamLabelTree;
 
diff --git a/app/Jobs/CloneImagesOrVideos.php b/app/Jobs/CloneImagesOrVideos.php
index 776213afe..50d019443 100644
--- a/app/Jobs/CloneImagesOrVideos.php
+++ b/app/Jobs/CloneImagesOrVideos.php
@@ -166,23 +166,23 @@ public function postProcessCloning($volume)
         // generated (mostly) before the annotation thumbnails.
         $delay = now()->addSeconds(30);
 
-        if (class_exists(ProcessAnnotatedImage::class)) {
-            $volume->images()->whereHas('annotations')
-                ->eachById(function ($image) use ($delay) {
-                    ProcessAnnotatedImage::dispatch($image)
-                        ->delay($delay)
-                        ->onQueue(config('largo.generate_annotation_patch_queue'));
-                });
-        }
-
-        if (class_exists(ProcessAnnotatedVideo::class)) {
-            $volume->videos()
-                ->whereHas('annotations')->eachById(function ($video) use ($delay) {
-                    ProcessAnnotatedVideo::dispatch($video)
-                        ->delay($delay)
-                        ->onQueue(config('largo.generate_annotation_patch_queue'));
-                });
-        }
+        // if (class_exists(ProcessAnnotatedImage::class)) {
+        //     $volume->images()->whereHas('annotations')
+        //         ->eachById(function ($image) use ($delay) {
+        //             ProcessAnnotatedImage::dispatch($image)
+        //                 ->delay($delay)
+        //                 ->onQueue(config('largo.generate_annotation_patch_queue'));
+        //         });
+        // }
+
+        // if (class_exists(ProcessAnnotatedVideo::class)) {
+        //     $volume->videos()
+        //         ->whereHas('annotations')->eachById(function ($video) use ($delay) {
+        //             ProcessAnnotatedVideo::dispatch($video)
+        //                 ->delay($delay)
+        //                 ->onQueue(config('largo.generate_annotation_patch_queue'));
+        //         });
+        // }
     }
 
     /**
diff --git a/app/Label.php b/app/Label.php
index 2090550fe..494a2e434 100644
--- a/app/Label.php
+++ b/app/Label.php
@@ -13,6 +13,8 @@
  * with `rock`.
  *
  * Labels can be ordered in a tree-like structure.
+ *
+ * @property string $uuid
  */
 class Label extends Model
 {
diff --git a/app/LabelTree.php b/app/LabelTree.php
index f27efaaba..6f871b311 100644
--- a/app/LabelTree.php
+++ b/app/LabelTree.php
@@ -14,6 +14,8 @@
  * Admins can also manage members and modify the tree (name, visibility etc).
  * Label trees can be public or private. Private trees maintain a list of projects
  * that are authorized to use the tree. This list is maintained by label tree admins.
+ *
+ * @property string $uuid
  */
 class LabelTree extends Model
 {
diff --git a/app/Visibility.php b/app/Visibility.php
index 4b05b4a76..0dd602e9a 100644
--- a/app/Visibility.php
+++ b/app/Visibility.php
@@ -8,6 +8,11 @@
 
 /**
  * The visibility of a model.
+ *
+ * @method static Visibility public()
+ * @method static int publicId()
+ * @method static Visibility private()
+ * @method static int privateId()
  */
 class Visibility extends Model
 {

From 5c79ec76882ce21126fb3bc6c6f5cb323724d272 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Langenk=C3=A4mper?= <dlangenk@gmail.com>
Date: Fri, 26 Jul 2024 12:34:35 +0200
Subject: [PATCH 149/209] removes the visual points if no annotation was
 created but now the map is dragged.

---
 .../annotationCanvas/drawInteractions.vue       | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/resources/assets/js/annotations/components/annotationCanvas/drawInteractions.vue b/resources/assets/js/annotations/components/annotationCanvas/drawInteractions.vue
index b5a890498..91a76dfce 100644
--- a/resources/assets/js/annotations/components/annotationCanvas/drawInteractions.vue
+++ b/resources/assets/js/annotations/components/annotationCanvas/drawInteractions.vue
@@ -4,6 +4,7 @@ import Keyboard from '../../../core/keyboard';
 import Styles from '../../stores/styles';
 import { shiftKeyOnly } from '@biigle/ol/events/condition';
 import snapInteraction from '../../snapInteraction.vue';
+import { Point } from '@biigle/ol/geom';
 
 /**
  * Mixin for the annotationCanvas component that contains logic for the draw interactions.
@@ -12,7 +13,7 @@ import snapInteraction from '../../snapInteraction.vue';
  */
 
 let drawInteraction;
-let lastdrawnPoint = 0;
+let lastdrawnPoint = {time:0, point: new Point(0,0)};
 
 // Custom OpenLayers freehandCondition that is true if a pen is used for input or
 // if Shift is pressed otherwise.
@@ -105,15 +106,13 @@ export default {
                 });
 
                 drawInteraction.on('drawend', (e) => {
-                    // Prevent double click from creating two points.
-                    if (this.isDrawingPoint){
-                        const now = new Date().getTime();
-                        if (now - lastdrawnPoint < 400) {
-                            return;
-                        }
-                        lastdrawnPoint = new Date().getTime();
+                    if (this.isDrawingPoint && new Date().getTime() - lastdrawnPoint['time'] < 400 && lastdrawnPoint['point'].distanceTo(e.feature.getGeometry()) < 5) {
+                        this.annotationSource.removeFeature(e.feature);
+                    } else {
+                        this.handleNewFeature(e);
+                        lastdrawnPoint['time'] = new Date().getTime();
+                        lastdrawnPoint['point'] = e.feature.getGeometry();
                     }
-                    this.handleNewFeature(e);
                     this.drawEnded = true;
                 });
 

From d41dc046f4da4e434692ea4766e8780801969800 Mon Sep 17 00:00:00 2001
From: Leane Schlundt <lhecht@techfak.de>
Date: Tue, 30 Jul 2024 10:56:27 +0200
Subject: [PATCH 150/209] Fix input slider focus

Remove slider focus after usage so that keyboard events are working again.
---
 resources/assets/js/annotations/components/settingsTab.vue | 3 +++
 resources/views/annotations/show/tabs/settings.blade.php   | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/resources/assets/js/annotations/components/settingsTab.vue b/resources/assets/js/annotations/components/settingsTab.vue
index 1dcf56d1f..1b6e3668a 100644
--- a/resources/assets/js/annotations/components/settingsTab.vue
+++ b/resources/assets/js/annotations/components/settingsTab.vue
@@ -116,6 +116,9 @@ export default {
                 this.annotationOpacity = 1;
             }
         },
+        removeFocus(id) {
+            document.getElementById(id).blur();
+        }
     },
     watch: {
         annotationOpacity(opacity) {
diff --git a/resources/views/annotations/show/tabs/settings.blade.php b/resources/views/annotations/show/tabs/settings.blade.php
index 2e8f13210..a41fa91d7 100644
--- a/resources/views/annotations/show/tabs/settings.blade.php
+++ b/resources/views/annotations/show/tabs/settings.blade.php
@@ -10,12 +10,12 @@
 
             <div class="sidebar-tab__section">
                 <h5 title="Set the opacity of annotations on the map">Annotation Opacity (<span v-text="annotationOpacity"></span>)</h5>
-                <input type="range" min="0" max="1" step="0.1" v-model="annotationOpacity">
+                <input id="annotationOpacity" type="range" min="0" max="1" step="0.1" v-model="annotationOpacity" v-on:click='removeFocus("annotationOpacity")'>
             </div>
 
             <div class="sidebar-tab__section">
                 <h5 title="Set the number of caches images ">Cached Images (<span v-text="cachedImagesCount"></span>)</h5>
-                <input type="range" min="1" max="50" step="1" v-model="cachedImagesCount">
+                <input id="cachedImagesCount" type="range" min="1" max="50" step="1" v-model="cachedImagesCount" v-on:click='removeFocus("cachedImagesCount")'>
             </div>
 
             <div class="sidebar-tab__section">

From 5ed201c3572fc617a23a4ac0165c8c47a90045b5 Mon Sep 17 00:00:00 2001
From: Leane Schlundt <lhecht@techfak.de>
Date: Thu, 1 Aug 2024 10:09:30 +0200
Subject: [PATCH 151/209] Add image sort where last annotation timestamp is
 used

---
 .../Views/Volumes/VolumeController.php        | 10 +++++-
 resources/assets/js/volumes/stores/sorters.js | 34 +++++++++++++++++++
 resources/views/volumes/show.blade.php        |  1 +
 3 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Views/Volumes/VolumeController.php b/app/Http/Controllers/Views/Volumes/VolumeController.php
index 17266ecea..42c5ea183 100644
--- a/app/Http/Controllers/Views/Volumes/VolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/VolumeController.php
@@ -107,13 +107,21 @@ public function index(Request $request, $id)
 
         $type = $volume->mediaType->name;
 
+        $annotations = $volume->files->mapWithKeys(fn ($f) => [$f->id => $f->annotations]);
+        $lastAnnotationTimestamps = $annotations->mapWithKeys(fn ($as, $i) => [
+            $i => $as->isEmpty() ?
+            Carbon::minValue()->toDateTimeString() :
+            ($as->map(fn ($a) => $a->created_at->toDateTimeString()))->max()
+        ]);
+
         return view('volumes.show', compact(
             'volume',
             'labelTrees',
             'projects',
             'fileIds',
             'thumbUriTemplate',
-            'type'
+            'type',
+            'lastAnnotationTimestamps'
         ));
     }
 
diff --git a/resources/assets/js/volumes/stores/sorters.js b/resources/assets/js/volumes/stores/sorters.js
index 50478cb0f..d6d918fe8 100644
--- a/resources/assets/js/volumes/stores/sorters.js
+++ b/resources/assets/js/volumes/stores/sorters.js
@@ -99,6 +99,39 @@ let randomSorter = {
     },
 };
 
+let annotationTime = {
+    id: 'annotationTime',
+    types: ['image', 'video'],
+    component: {
+        mixins: [SortComponent],
+        data() {
+            return {
+                timestamps: [],
+                title: 'Sort images by last created annotation',
+                text: 'Last annotated',
+                id: 'annotationTime',
+            };
+        },
+        computed: {
+            sortedAnnotations() {
+                return Object.entries(this.timestamps).sort(this.compare);
+            }
+        },
+        methods: {
+            getSequence() {
+                let ids = this.sortedAnnotations.map(e => e[0]);
+                return new Vue.Promise.resolve(ids);
+            },
+            compare(a, b) {
+                return Date.parse(b[1]) - Date.parse(a[1]);
+            }
+        },
+        created() {
+            this.timestamps = biigle.$require('volumes.annotationTimestamps');
+        },
+    },
+};
+
 /**
  * Store for the volume image sorters
  */
@@ -107,4 +140,5 @@ export default [
     filenameSorter,
     idSorter,
     randomSorter,
+    annotationTime,
 ];
diff --git a/resources/views/volumes/show.blade.php b/resources/views/volumes/show.blade.php
index 467b0612d..25f8ca3d8 100644
--- a/resources/views/volumes/show.blade.php
+++ b/resources/views/volumes/show.blade.php
@@ -8,6 +8,7 @@
         biigle.$declare('volumes.type', '{!! $type !!}');
         {{-- Add file IDs as array, too, because the ordering is important! --}}
         biigle.$declare('volumes.fileIds', {!! $fileIds->keys() !!});
+        biigle.$declare('volumes.annotationTimestamps', {!! $lastAnnotationTimestamps !!});
         biigle.$declare('volumes.fileUuids', {!! $fileIds !!});
         biigle.$declare('volumes.thumbUri', '{{ $thumbUriTemplate }}');
         @if ($volume->isImageVolume())

From 484c5582ab7f1babb1d2f46f9f5264393076e3eb Mon Sep 17 00:00:00 2001
From: aneust <aneustaedter@techfak.uni-bielefeld.de>
Date: Sat, 17 Aug 2024 13:54:39 +0200
Subject: [PATCH 152/209] Added a "Recently joined" button to the admin users
 page

- This button filters and displays users who have recently joined within the last 7 days.
- The button shows a badge with the count of such users.
- This enhancement makes it easier for admins to quickly access and review the most recently joined users.
---
 resources/views/admin/users.blade.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/views/admin/users.blade.php b/resources/views/admin/users.blade.php
index b2fcdc5a3..5e8d20512 100644
--- a/resources/views/admin/users.blade.php
+++ b/resources/views/admin/users.blade.php
@@ -8,13 +8,17 @@
         The user was deleted.
     </div>
 @endif
-<a href="{{route('admin-users-new')}}" class="btn btn-default" title="Create a new user">New user</a>
+<a href="{{route('admin-users-recent')}}" class="btn btn-default" title="Get Recent Users">
+    Recently joined
+    <span class="badge">{{$usersCount}}</span>
+</a>
 <form class="form-inline inline-block-form" action="{{route('admin-users')}}" method="get">
     <input class="form-control" type="text" name="q" placeholder="Search users" value="{{$query}}">
 </form>
 @if ($query)
     <a href="{{route('admin-users')}}" class="btn btn-info" title="Clear filtering"><i class="fas fa-times"></i></a>
 @endif
+<a href="{{route('admin-users-new')}}" class="btn btn-default" title="Create a new user">New user</a>
 <table class="table table-hover">
     <thead>
         <tr>

From 1354be81dcaffde7d5aee46a5c47f9f41917bd5f Mon Sep 17 00:00:00 2001
From: aneust <aneustaedter@techfak.uni-bielefeld.de>
Date: Sat, 17 Aug 2024 14:08:27 +0200
Subject: [PATCH 153/209] Implemented function to display recently joined users

---
 .../Views/Admin/UsersController.php           | 42 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Views/Admin/UsersController.php b/app/Http/Controllers/Views/Admin/UsersController.php
index 8bd7a75cf..3260f6541 100644
--- a/app/Http/Controllers/Views/Admin/UsersController.php
+++ b/app/Http/Controllers/Views/Admin/UsersController.php
@@ -23,7 +23,7 @@ class UsersController extends Controller
      */
     public function get(Request $request)
     {
-        $users = User::select('id', 'firstname', 'lastname', 'email', 'login_at', 'role_id', 'affiliation')
+        $users = User::select('id', 'firstname', 'lastname', 'email', 'login_at', 'created_at', 'role_id', 'affiliation')
             ->when($request->has('q'), function ($query) use ($request) {
                 $q = $request->get('q');
                 $query->where(function ($query) use ($q) {
@@ -44,11 +44,51 @@ public function get(Request $request)
             Role::guestId() => 'Guest',
         ];
 
+        $usersCount = User::whereDate('created_at', '>=', now()->subDays(7)->setTime(0, 0, 0)->toDateTimeString())
+            ->count();
+
         return view('admin.users', [
             'users' => $users,
             'roleClass' => $this->roleClassMap(),
             'roleNames' => $roleNames,
             'query' => $request->get('q'),
+            'usersCount' => $usersCount
+        ]);
+    }
+
+    /**
+     * Shows newest users.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function getRecentUsers()
+    {
+        /*
+        <form class="form-inline inline-block-form" action="{{route('admin-users')}}" method="get">
+            <button class="button">Recently joined</button>
+            <span class="badge" href="{{route('admin-users')}}">{{$usersCount}}</span>
+        </form>*/
+        // Fetch users created in the last 7 days
+        $users = User::select('id', 'firstname', 'lastname', 'email', 'login_at', 'created_at', 'role_id', 'affiliation')
+            // Orders by created_at in descending order
+            ->whereDate('created_at', '>=', now()->subDays(7)->setTime(0, 0, 0)->toDateTimeString())
+            ->orderBy('created_at', 'desc')
+            ->paginate(100);
+            
+        $roleNames = [
+            Role::adminId() => 'Admin',
+            Role::editorId() => 'Editor',
+            Role::guestId() => 'Guest',
+        ];
+
+        // $usersCount = User::whereDate('created_at', '>=', now()->subDays(7)->setTime(0, 0, 0)->toDateTimeString())->count();
+        $usersCount = $users->total();
+
+        return view('admin.users.recent', [
+            'users' => $users,
+            'roleNames' => $roleNames,
+            'usersCount' => $usersCount,
+            'roleClass' => $this->roleClassMap(),
         ]);
     }
 

From 03c912638467e8f58be0f8c68e58b14a3af8607c Mon Sep 17 00:00:00 2001
From: aneust <aneustaedter@techfak.uni-bielefeld.de>
Date: Sat, 17 Aug 2024 14:14:23 +0200
Subject: [PATCH 154/209] Added route for displaying recently joined users in
 the admin area

---
 routes/web.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/routes/web.php b/routes/web.php
index 0970d1c79..e8aa3c2e3 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -114,6 +114,11 @@
             'uses' => 'UsersController@get',
         ]);
 
+        $router->get('users/recent', [
+            'as' => 'admin-users-recent',
+            'uses' => 'UsersController@getRecentUsers',
+        ]);
+
         $router->get('users/new', [
             'as' => 'admin-users-new',
             'uses' => 'UsersController@newUser',

From 165fc5808051803b4a8ef958b6f9fcf9b2d30893 Mon Sep 17 00:00:00 2001
From: aneust <aneustaedter@techfak.uni-bielefeld.de>
Date: Sat, 17 Aug 2024 14:16:03 +0200
Subject: [PATCH 155/209] Created 'Recent Users' view to admin area

---
 resources/views/admin/users/recent.blade.php | 62 ++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 resources/views/admin/users/recent.blade.php

diff --git a/resources/views/admin/users/recent.blade.php b/resources/views/admin/users/recent.blade.php
new file mode 100644
index 000000000..5ee480ded
--- /dev/null
+++ b/resources/views/admin/users/recent.blade.php
@@ -0,0 +1,62 @@
+@extends('admin.base')
+
+@section('title', 'Recent Users')
+
+@section('admin-content')
+@if ($usersCount > 0)
+    <div class="alert alert-info" role="alert">
+        There are {{$usersCount}} users who joined in the last 7 days.
+    </div>
+@endif
+<table class="table table-hover">
+    <thead>
+        <tr>
+            <th>Name</th>
+            <th>Email</th>
+            <th>Role</th>
+            <th>Affiliation</th>
+            <th>Activity</th>
+            <th>Created</th>
+        </tr>
+    </thead>
+    <tbody>
+        @forelse($users as $u)
+            <tr>
+                <td>
+                    <a href="{{route('admin-users-show', $u->id)}}">{{$u->firstname}} {{$u->lastname}}</a>
+                </td>
+                <td><a href="mailto:{{$u->email}}">{{$u->email}}</a></td>
+                <td>
+                    <span class="label label-{{$roleClass[$u->role_id]}}" title="{{$roleNames[$u->role_id]}}">{{$roleNames[$u->role_id][0]}}</span>
+                </td>
+                <td>
+                    @if ($u->affiliation)
+                        <span title="{{$u->affiliation}}">{{Str::limit($u->affiliation, 20)}}</span>
+                    @else
+                        <span class="text-muted">none</span>
+                    @endif
+                </td>
+                <td>
+                    @if ($u->login_at)
+                        <time datetime="{{$u->login_at->toAtomString()}}" title="{{$u->login_at->toDateTimeString()}}">{{$u->login_at->diffForHumans()}}</time>
+                    @else
+                        <span class="text-muted">none</span>
+                    @endif
+                </td>
+                <td>
+                    <time datetime="{{$u->created_at->toAtomString()}}" title="{{$u->created_at->toDateTimeString()}}">{{$u->created_at->diffForHumans()}}</time>
+                </td>
+            </tr>
+        @empty
+            <tr>
+                <td colspan="5" class="text-muted">
+                    No users found.
+                </td>
+            </tr>
+        @endforelse
+    </tbody>
+</table>
+<nav class="text-center">
+    {{$users->links()}}
+</nav>
+@endsection
\ No newline at end of file

From 4cfe7631b6cad153f7aa3def449f6a48cc988891 Mon Sep 17 00:00:00 2001
From: aneust <aneustaedter@techfak.uni-bielefeld.de>
Date: Sat, 17 Aug 2024 16:36:10 +0200
Subject: [PATCH 156/209] Adjusted the view to display only a message, when no
 new users found

---
 resources/views/admin/users/recent.blade.php | 98 ++++++++++----------
 1 file changed, 48 insertions(+), 50 deletions(-)

diff --git a/resources/views/admin/users/recent.blade.php b/resources/views/admin/users/recent.blade.php
index 5ee480ded..ca00d554a 100644
--- a/resources/views/admin/users/recent.blade.php
+++ b/resources/views/admin/users/recent.blade.php
@@ -7,56 +7,54 @@
     <div class="alert alert-info" role="alert">
         There are {{$usersCount}} users who joined in the last 7 days.
     </div>
-@endif
-<table class="table table-hover">
-    <thead>
-        <tr>
-            <th>Name</th>
-            <th>Email</th>
-            <th>Role</th>
-            <th>Affiliation</th>
-            <th>Activity</th>
-            <th>Created</th>
-        </tr>
-    </thead>
-    <tbody>
-        @forelse($users as $u)
-            <tr>
-                <td>
-                    <a href="{{route('admin-users-show', $u->id)}}">{{$u->firstname}} {{$u->lastname}}</a>
-                </td>
-                <td><a href="mailto:{{$u->email}}">{{$u->email}}</a></td>
-                <td>
-                    <span class="label label-{{$roleClass[$u->role_id]}}" title="{{$roleNames[$u->role_id]}}">{{$roleNames[$u->role_id][0]}}</span>
-                </td>
-                <td>
-                    @if ($u->affiliation)
-                        <span title="{{$u->affiliation}}">{{Str::limit($u->affiliation, 20)}}</span>
-                    @else
-                        <span class="text-muted">none</span>
-                    @endif
-                </td>
-                <td>
-                    @if ($u->login_at)
-                        <time datetime="{{$u->login_at->toAtomString()}}" title="{{$u->login_at->toDateTimeString()}}">{{$u->login_at->diffForHumans()}}</time>
-                    @else
-                        <span class="text-muted">none</span>
-                    @endif
-                </td>
-                <td>
-                    <time datetime="{{$u->created_at->toAtomString()}}" title="{{$u->created_at->toDateTimeString()}}">{{$u->created_at->diffForHumans()}}</time>
-                </td>
-            </tr>
-        @empty
+    <table class="table table-hover">
+        <thead>
             <tr>
-                <td colspan="5" class="text-muted">
-                    No users found.
-                </td>
+                <th>Name</th>
+                <th>Email</th>
+                <th>Role</th>
+                <th>Affiliation</th>
+                <th>Activity</th>
+                <th>Created</th>
             </tr>
-        @endforelse
-    </tbody>
-</table>
-<nav class="text-center">
-    {{$users->links()}}
-</nav>
+        </thead>
+        <tbody>
+            @foreach($users as $u)
+                <tr>
+                    <td>
+                        <a href="{{route('admin-users-show', $u->id)}}">{{$u->firstname}} {{$u->lastname}}</a>
+                    </td>
+                    <td><a href="mailto:{{$u->email}}">{{$u->email}}</a></td>
+                    <td>
+                        <span class="label label-{{$roleClass[$u->role_id]}}" title="{{$roleNames[$u->role_id]}}">{{$roleNames[$u->role_id][0]}}</span>
+                    </td>
+                    <td>
+                        @if ($u->affiliation)
+                            <span title="{{$u->affiliation}}">{{Str::limit($u->affiliation, 20)}}</span>
+                        @else
+                            <span class="text-muted">none</span>
+                        @endif
+                    </td>
+                    <td>
+                        @if ($u->login_at)
+                            <time datetime="{{$u->login_at->toAtomString()}}" title="{{$u->login_at->toDateTimeString()}}">{{$u->login_at->diffForHumans()}}</time>
+                        @else
+                            <span class="text-muted">none</span>
+                        @endif
+                    </td>
+                    <td>
+                        <time datetime="{{$u->created_at->toAtomString()}}" title="{{$u->created_at->toDateTimeString()}}">{{$u->created_at->diffForHumans()}}</time>
+                    </td>
+                </tr>
+            @endforeach
+        </tbody>
+    </table>
+    <nav class="text-center">
+        {{$users->links()}}
+    </nav>
+@else
+    <div class="alert alert-info" role="alert">
+        No recently joined users found.
+    </div>
+@endif
 @endsection
\ No newline at end of file

From 89369af2047d68aed8fba206ca25d74230cde9f8 Mon Sep 17 00:00:00 2001
From: Leane Schlundt <lhecht@techfak.de>
Date: Mon, 19 Aug 2024 09:48:01 +0200
Subject: [PATCH 157/209] Replace assertEquals by assertSame

Use strong check for checking equality.
---
 tests/php/AnnotationSessionTest.php           |  6 +-
 tests/php/AnnouncementTest.php                |  8 +-
 .../Commands/PruneNotificationsTest.php       |  2 +-
 tests/php/FederatedSearchInstanceTest.php     |  8 +-
 .../Api/AnnotationSessionControllerTest.php   |  6 +-
 .../Api/AnnouncementControllerTest.php        |  2 +-
 .../Api/ApiTokenControllerTest.php            |  4 +-
 .../FederatedSearchInstanceControllerTest.php | 22 ++---
 .../Api/ImageAnnotationBulkControllerTest.php | 14 +--
 .../Api/ImageAnnotationControllerTest.php     | 14 +--
 .../ImageAnnotationLabelControllerTest.php    | 12 +--
 .../Controllers/Api/ImageControllerTest.php   |  2 +-
 .../Api/ImageLabelControllerTest.php          |  8 +-
 .../Controllers/Api/LabelControllerTest.php   |  6 +-
 ...belTreeAuthorizedProjectControllerTest.php | 24 ++---
 .../Api/LabelTreeControllerTest.php           | 38 ++++----
 .../Api/LabelTreeLabelControllerTest.php      | 10 +-
 .../Api/LabelTreeUserControllerTest.php       | 16 ++--
 .../Api/LabelTreeVersionControllerTest.php    | 16 ++--
 .../Api/LinkVideoAnnotationControllerTest.php | 24 ++---
 .../Api/NotificationControllerTest.php        | 12 +--
 .../Controllers/Api/ProjectControllerTest.php |  8 +-
 .../Api/ProjectInvitationControllerTest.php   | 20 ++--
 .../Api/ProjectLabelTreeControllerTest.php    |  6 +-
 .../Api/ProjectUserControllerTest.php         |  8 +-
 .../Api/ProjectVolumeControllerTest.php       |  6 +-
 .../SplitVideoAnnotationControllerTest.php    |  6 +-
 .../Controllers/Api/UserControllerTest.php    | 40 ++++----
 .../Api/UserRegistrationControllerTest.php    |  2 +-
 .../Api/UserSettingsControllerTest.php        |  2 +-
 .../Api/VideoAnnotationControllerTest.php     | 30 +++---
 .../VideoAnnotationLabelControllerTest.php    |  4 +-
 .../Api/VideoFileControllerTest.php           |  4 +-
 .../Api/VideoLabelControllerTest.php          |  8 +-
 .../VolumeAnnotationSessionControllerTest.php |  2 +-
 .../Controllers/Api/VolumeControllerTest.php  | 12 +--
 .../Api/VolumeFileControllerTest.php          | 12 +--
 .../Api/Volumes/IfdoControllerTest.php        |  2 +-
 .../Api/Volumes/MetadataControllerTest.php    | 28 +++---
 .../Http/Controllers/Auth/ControllerTest.php  |  4 +-
 .../Auth/RegisterControllerTest.php           | 34 +++----
 tests/php/ImageAnnotationTest.php             | 20 ++--
 tests/php/ImageTest.php                       | 38 ++++----
 tests/php/Jobs/CloneImagesOrVideosTest.php    | 32 +++----
 .../php/Jobs/CreateNewImagesOrVideosTest.php  | 36 +++----
 .../Jobs/GenerateFederatedSearchIndexTest.php | 14 +--
 tests/php/Jobs/ProcessNewImageTest.php        | 20 ++--
 tests/php/Jobs/ProcessNewVideoTest.php        | 28 +++---
 tests/php/Jobs/TileSingleImageTest.php        |  2 +-
 tests/php/Jobs/TrackObjectTest.php            | 44 ++++-----
 .../Jobs/UpdateFederatedSearchIndexTest.php   | 44 ++++-----
 tests/php/LabelSourceTest.php                 |  2 +-
 tests/php/LabelTest.php                       |  8 +-
 tests/php/LabelTreeTest.php                   | 32 +++----
 tests/php/LabelTreeVersionTest.php            |  2 +-
 tests/php/ProjectTest.php                     | 46 ++++-----
 tests/php/ProjectUserIntegrityTest.php        |  8 +-
 tests/php/ProjectVolumeIntegrityTest.php      |  4 +-
 tests/php/RoleTest.php                        |  8 +-
 tests/php/Rules/VolumeUrlTest.php             |  4 +-
 tests/php/Services/Auth/ApiGuardTest.php      |  2 +-
 .../LabelSourceAdapters/WormsAdapterTest.php  | 26 +++---
 tests/php/Services/ModulesTest.php            |  8 +-
 tests/php/Traits/ParsesMetadataTest.php       | 93 ++++++++++---------
 tests/php/UserTest.php                        | 18 ++--
 tests/php/VideoAnnotationTest.php             | 22 ++---
 tests/php/VideoTest.php                       | 34 +++----
 tests/php/VisibilityTest.php                  |  4 +-
 tests/php/VolumeTest.php                      | 60 ++++++------
 69 files changed, 576 insertions(+), 575 deletions(-)

diff --git a/tests/php/AnnotationSessionTest.php b/tests/php/AnnotationSessionTest.php
index 9fe59cf0e..d1b3869b9 100644
--- a/tests/php/AnnotationSessionTest.php
+++ b/tests/php/AnnotationSessionTest.php
@@ -60,7 +60,7 @@ public function testUsers()
         $user = UserTest::create();
         $this->model->users()->attach($user);
         $sessionUser = $this->model->users()->first();
-        $this->assertEquals([
+        $this->assertSame([
             'id' => $user->id,
             'firstname' => $user->firstname,
             'lastname' => $user->lastname,
@@ -608,8 +608,8 @@ public function testStartsAtEndsAtISO8601()
             'ends_at' => '2016-09-07T00:00:00.000+02:00',
         ]);
 
-        $this->assertEquals('2016-09-04T22:00:00+00:00', $session->starts_at_iso8601);
-        $this->assertEquals('2016-09-06T22:00:00+00:00', $session->ends_at_iso8601);
+        $this->assertSame('2016-09-04T22:00:00+00:00', $session->starts_at_iso8601);
+        $this->assertSame('2016-09-06T22:00:00+00:00', $session->ends_at_iso8601);
 
         $this->assertArrayHasKey('starts_at_iso8601', $session->toArray());
         $this->assertArrayHasKey('ends_at_iso8601', $session->toArray());
diff --git a/tests/php/AnnouncementTest.php b/tests/php/AnnouncementTest.php
index d57950585..bcc88d121 100644
--- a/tests/php/AnnouncementTest.php
+++ b/tests/php/AnnouncementTest.php
@@ -40,15 +40,15 @@ public function testScopeActive()
     {
         $this->model->show_until = '2022-10-20 16:17:00';
         $this->model->save();
-        $this->assertEquals(0, Announcement::active()->count());
+        $this->assertSame(0, Announcement::active()->count());
 
         $this->model->show_until = now()->addDay();
         $this->model->save();
-        $this->assertEquals(1, Announcement::active()->count());
+        $this->assertSame(1, Announcement::active()->count());
 
         $this->model->show_until = null;
         $this->model->save();
-        $this->assertEquals(1, Announcement::active()->count());
+        $this->assertSame(1, Announcement::active()->count());
     }
 
     public function testGetActive()
@@ -56,7 +56,7 @@ public function testGetActive()
         $this->model->show_until = now()->addDay();
         $this->model->save();
 
-        $this->assertEquals($this->model->id, Announcement::getActive()->id);
+        $this->assertSame($this->model->id, Announcement::getActive()->id);
 
         $this->model->delete();
         $this->assertNull(Announcement::getActive());
diff --git a/tests/php/Console/Commands/PruneNotificationsTest.php b/tests/php/Console/Commands/PruneNotificationsTest.php
index e01c79e28..49382704f 100644
--- a/tests/php/Console/Commands/PruneNotificationsTest.php
+++ b/tests/php/Console/Commands/PruneNotificationsTest.php
@@ -45,7 +45,7 @@ public function testHandle()
         ]);
 
         (new PruneNotifications)->handle();
-        $this->assertEquals(2, DatabaseNotification::count());
+        $this->assertSame(2, DatabaseNotification::count());
         $this->assertNull(DatabaseNotification::find('1'));
     }
 }
diff --git a/tests/php/FederatedSearchInstanceTest.php b/tests/php/FederatedSearchInstanceTest.php
index 02af49d12..5aa2c1d3e 100644
--- a/tests/php/FederatedSearchInstanceTest.php
+++ b/tests/php/FederatedSearchInstanceTest.php
@@ -51,19 +51,19 @@ public function testScopeWithRemoteToken()
     public function testSetRemoteTokenAttribute()
     {
         $this->model->remote_token = 'test';
-        $this->assertEquals('test', decrypt($this->model->getAttributes()['remote_token']));
+        $this->assertSame('test', decrypt($this->model->getAttributes()['remote_token']));
     }
 
     public function testGetRemoteTokenAttribute()
     {
         $this->model->setRawAttributes(['remote_token' => encrypt('test')]);
-        $this->assertEquals('test', $this->model->remote_token);
+        $this->assertSame('test', $this->model->remote_token);
     }
 
     public function testCreateLocalToken()
     {
         $token = $this->model->createLocalToken();
-        $this->assertEquals(64, strlen($token));
-        $this->assertEquals(hash('sha256', $token), $this->model->local_token);
+        $this->assertSame(64, strlen($token));
+        $this->assertSame(hash('sha256', $token), $this->model->local_token);
     }
 }
diff --git a/tests/php/Http/Controllers/Api/AnnotationSessionControllerTest.php b/tests/php/Http/Controllers/Api/AnnotationSessionControllerTest.php
index a4a832659..4733fabfd 100644
--- a/tests/php/Http/Controllers/Api/AnnotationSessionControllerTest.php
+++ b/tests/php/Http/Controllers/Api/AnnotationSessionControllerTest.php
@@ -90,9 +90,9 @@ public function testUpdate()
 
         $session = $session->fresh();
 
-        $this->assertEquals('my cool name', $session->name);
-        $this->assertEquals('2016-09-07', $session->ends_at->format('Y-m-d'));
-        $this->assertEquals([$this->admin()->id], $session->users()->pluck('id')->all());
+        $this->assertSame('my cool name', $session->name);
+        $this->assertSame('2016-09-07', $session->ends_at->format('Y-m-d'));
+        $this->assertSame([$this->admin()->id], $session->users()->pluck('id')->all());
     }
 
     public function testUpdateTimezones()
diff --git a/tests/php/Http/Controllers/Api/AnnouncementControllerTest.php b/tests/php/Http/Controllers/Api/AnnouncementControllerTest.php
index 48470812d..37702322a 100644
--- a/tests/php/Http/Controllers/Api/AnnouncementControllerTest.php
+++ b/tests/php/Http/Controllers/Api/AnnouncementControllerTest.php
@@ -40,7 +40,7 @@ public function testStore()
             // show_until must be in the future
             ->assertStatus(422);
 
-        $this->assertEquals(0, Announcement::count());
+        $this->assertSame(0, Announcement::count());
 
         $this
             ->json('POST', '/api/v1/announcements', [
diff --git a/tests/php/Http/Controllers/Api/ApiTokenControllerTest.php b/tests/php/Http/Controllers/Api/ApiTokenControllerTest.php
index 04ac07497..11f5690cb 100644
--- a/tests/php/Http/Controllers/Api/ApiTokenControllerTest.php
+++ b/tests/php/Http/Controllers/Api/ApiTokenControllerTest.php
@@ -55,13 +55,13 @@ public function testStore()
         // missing purpose
         $response->assertStatus(422);
 
-        $this->assertEquals(1, $token->owner->apiTokens()->count());
+        $this->assertSame(1, $token->owner->apiTokens()->count());
 
         $response = $this->json('POST', '/api/v1/api-tokens', ['purpose' => 'abc'])
             ->assertJsonFragment(['purpose' => 'abc']);
 
         $response->assertSuccessful();
-        $this->assertEquals(2, $token->owner->apiTokens()->count());
+        $this->assertSame(2, $token->owner->apiTokens()->count());
         $this->assertStringContainsString('"token":"', $response->getContent());
 
         $response = $this->post('/api/v1/api-tokens', ['purpose' => 'def'])
diff --git a/tests/php/Http/Controllers/Api/FederatedSearchInstanceControllerTest.php b/tests/php/Http/Controllers/Api/FederatedSearchInstanceControllerTest.php
index cb758bcea..0273e59b4 100644
--- a/tests/php/Http/Controllers/Api/FederatedSearchInstanceControllerTest.php
+++ b/tests/php/Http/Controllers/Api/FederatedSearchInstanceControllerTest.php
@@ -49,8 +49,8 @@ public function testStore()
 
         $instance = FederatedSearchInstance::first();
         $this->assertNotNull($instance);
-        $this->assertEquals('my instance', $instance->name);
-        $this->assertEquals('https://example.com', $instance->url);
+        $this->assertSame('my instance', $instance->name);
+        $this->assertSame('https://example.com', $instance->url);
         $this->assertNull($instance->local_token);
         $this->assertNull($instance->remote_token);
         $this->assertNull($instance->indexed_at);
@@ -86,8 +86,8 @@ public function testUpdate()
             ->assertStatus(200);
 
         $instance->refresh();
-        $this->assertEquals('my updated instance', $instance->name);
-        $this->assertEquals('https://www.example.com', $instance->url);
+        $this->assertSame('my updated instance', $instance->name);
+        $this->assertSame('https://www.example.com', $instance->url);
     }
 
     public function testUpdateSetRemoteToken()
@@ -116,12 +116,12 @@ public function testUpdateSetRemoteToken()
             ])
             ->assertStatus(200);
 
-        $this->assertEquals('mytoken', $instance->fresh()->remote_token);
+        $this->assertSame('mytoken', $instance->fresh()->remote_token);
         $this->assertCount(1, $container);
         $request = $container[0]['request'];
-        $this->assertEquals('https://example.com/api/v1/federated-search-index', strval($request->getUri()));
-        $this->assertEquals('Bearer mytoken', $request->getHeaderLine('Authorization'));
-        $this->assertEquals('HEAD', $request->getMethod());
+        $this->assertSame('https://example.com/api/v1/federated-search-index', strval($request->getUri()));
+        $this->assertSame('Bearer mytoken', $request->getHeaderLine('Authorization'));
+        $this->assertSame('HEAD', $request->getMethod());
         Bus::assertDispatched(UpdateFederatedSearchIndex::class);
     }
 
@@ -254,9 +254,9 @@ public function testUpdateUrlWithRemoteToken()
         Bus::assertNotDispatched(UpdateFederatedSearchIndex::class);
         $this->assertCount(1, $container);
         $request = $container[0]['request'];
-        $this->assertEquals('https://www.example.com/api/v1/federated-search-index', strval($request->getUri()));
-        $this->assertEquals('Bearer mytoken', $request->getHeaderLine('Authorization'));
-        $this->assertEquals('HEAD', $request->getMethod());
+        $this->assertSame('https://www.example.com/api/v1/federated-search-index', strval($request->getUri()));
+        $this->assertSame('Bearer mytoken', $request->getHeaderLine('Authorization'));
+        $this->assertSame('HEAD', $request->getMethod());
     }
 
     public function testUpdateGetLocalToken()
diff --git a/tests/php/Http/Controllers/Api/ImageAnnotationBulkControllerTest.php b/tests/php/Http/Controllers/Api/ImageAnnotationBulkControllerTest.php
index d4e436504..2d9e63911 100644
--- a/tests/php/Http/Controllers/Api/ImageAnnotationBulkControllerTest.php
+++ b/tests/php/Http/Controllers/Api/ImageAnnotationBulkControllerTest.php
@@ -94,12 +94,12 @@ public function store($url)
             ])
             ->assertStatus(200);
 
-        $this->assertEquals(3, $this->annotation->image->annotations()->count());
+        $this->assertSame(3, $this->annotation->image->annotations()->count());
         $annotation = $this->annotation->image->annotations()->orderBy('id', 'desc')->first();
-        $this->assertEquals(Shape::pointId(), $annotation->shape_id);
-        $this->assertEquals([100, 100], $annotation->points);
-        $this->assertEquals(1, $annotation->labels()->count());
-        $this->assertEquals($this->labelRoot()->id, $annotation->labels()->first()->label_id);
+        $this->assertSame(Shape::pointId(), $annotation->shape_id);
+        $this->assertSame([100, 100], $annotation->points);
+        $this->assertSame(1, $annotation->labels()->count());
+        $this->assertSame($this->labelRoot()->id, $annotation->labels()->first()->label_id);
     }
 
     public function testStoreValidation()
@@ -193,7 +193,7 @@ public function storeValidation($url)
             ]])
             ->assertStatus(422);
 
-        $this->assertEquals(1, $this->annotation->image->annotations()->count());
+        $this->assertSame(1, $this->annotation->image->annotations()->count());
 
         $this
             ->postJson($url, [[
@@ -259,7 +259,7 @@ public function testStoreLabelIdIsString()
             ])
             ->assertStatus(200);
 
-        $this->assertEquals(2, $this->annotation->image->annotations()->count());
+        $this->assertSame(2, $this->annotation->image->annotations()->count());
     }
 
     public function testStoreLabelIdIsFloat()
diff --git a/tests/php/Http/Controllers/Api/ImageAnnotationControllerTest.php b/tests/php/Http/Controllers/Api/ImageAnnotationControllerTest.php
index 3907af2ae..1ede2435e 100644
--- a/tests/php/Http/Controllers/Api/ImageAnnotationControllerTest.php
+++ b/tests/php/Http/Controllers/Api/ImageAnnotationControllerTest.php
@@ -285,8 +285,8 @@ public function testStore()
 
         $annotation = $this->image->annotations->first();
         $this->assertNotNull($annotation);
-        $this->assertEquals(2, sizeof($annotation->points));
-        $this->assertEquals(1, $annotation->labels()->count());
+        $this->assertSame(2, sizeof($annotation->points));
+        $this->assertSame(1, $annotation->labels()->count());
     }
 
     public function testStoreValidatePoints()
@@ -342,16 +342,16 @@ public function update($url)
 
         $this->annotation = $this->annotation->fresh();
 
-        $this->assertEquals(4, sizeof($this->annotation->points));
-        $this->assertEquals(15, $this->annotation->points[1]);
+        $this->assertSame(4, sizeof($this->annotation->points));
+        $this->assertSame(15, $this->annotation->points[1]);
 
         $response = $this->json('PUT', "{$url}/{$id}", ['points' => [20, 25]]);
         $response->assertStatus(200);
 
         $this->annotation = $this->annotation->fresh();
 
-        $this->assertEquals(2, sizeof($this->annotation->points));
-        $this->assertEquals(25, $this->annotation->points[1]);
+        $this->assertSame(2, sizeof($this->annotation->points));
+        $this->assertSame(25, $this->annotation->points[1]);
     }
 
     public function testUpdateInvalidPoints()
@@ -429,7 +429,7 @@ public function updateChangeShape($url)
             ->assertStatus(200);
 
         $this->annotation->refresh();
-        $this->assertEquals(Shape::circleId(), $this->annotation->shape_id);
+        $this->assertSame(Shape::circleId(), $this->annotation->shape_id);
     }
 
     public function testDestroy()
diff --git a/tests/php/Http/Controllers/Api/ImageAnnotationLabelControllerTest.php b/tests/php/Http/Controllers/Api/ImageAnnotationLabelControllerTest.php
index dba26c170..186c53fc7 100644
--- a/tests/php/Http/Controllers/Api/ImageAnnotationLabelControllerTest.php
+++ b/tests/php/Http/Controllers/Api/ImageAnnotationLabelControllerTest.php
@@ -129,7 +129,7 @@ public function store($url)
         ]);
         $response->assertStatus(422);
 
-        $this->assertEquals(0, $this->annotation->labels()->count());
+        $this->assertSame(0, $this->annotation->labels()->count());
 
         $this->beUser();
         $response = $this->post("{$url}/{$id}/labels", [
@@ -151,7 +151,7 @@ public function store($url)
             'confidence' => 0.1,
         ]);
         $response->assertStatus(201);
-        $this->assertEquals(1, $this->annotation->labels()->count());
+        $this->assertSame(1, $this->annotation->labels()->count());
 
         Event::assertDispatched(AnnotationLabelAttached::class);
 
@@ -163,7 +163,7 @@ public function store($url)
         $response->assertStatus(201);
 
         Event::assertDispatched(AnnotationLabelAttached::class);
-        $this->assertEquals(2, $this->annotation->labels()->count());
+        $this->assertSame(2, $this->annotation->labels()->count());
         $response->assertJsonFragment([
             'id' => $this->labelRoot()->id,
             'name' => $this->labelRoot()->name,
@@ -184,7 +184,7 @@ public function store($url)
         ]);
         // the same user cannot attach the same label twice
         $response->assertStatus(400);
-        $this->assertEquals(2, $this->annotation->labels()->count());
+        $this->assertSame(2, $this->annotation->labels()->count());
     }
 
     public function testUpdate()
@@ -225,14 +225,14 @@ public function update($url)
         $response = $this->put("{$url}/{$id}");
         $response->assertStatus(200);
 
-        $this->assertEquals(0.5, $annotationLabel->fresh()->confidence);
+        $this->assertSame(0.5, $annotationLabel->fresh()->confidence);
         $this->beEditor();
         $response = $this->put("{$url}/{$id}", [
             '_token' => Session::token(),
             'confidence' => 0.1,
         ]);
         $response->assertStatus(200);
-        $this->assertEquals(0.1, $annotationLabel->fresh()->confidence);
+        $this->assertSame(0.1, $annotationLabel->fresh()->confidence);
     }
 
     public function testDestroy()
diff --git a/tests/php/Http/Controllers/Api/ImageControllerTest.php b/tests/php/Http/Controllers/Api/ImageControllerTest.php
index cd3970fb7..898dc25ef 100644
--- a/tests/php/Http/Controllers/Api/ImageControllerTest.php
+++ b/tests/php/Http/Controllers/Api/ImageControllerTest.php
@@ -56,7 +56,7 @@ public function testShowFile()
 
         $response = $this->get("/api/v1/images/{$id}/file");
         $response->assertStatus(200);
-        $this->assertEquals('image/jpeg', $response->headers->get('content-type'));
+        $this->assertSame('image/jpeg', $response->headers->get('content-type'));
     }
 
     public function testShowFileTiled()
diff --git a/tests/php/Http/Controllers/Api/ImageLabelControllerTest.php b/tests/php/Http/Controllers/Api/ImageLabelControllerTest.php
index 753f237f7..5d225d977 100644
--- a/tests/php/Http/Controllers/Api/ImageLabelControllerTest.php
+++ b/tests/php/Http/Controllers/Api/ImageLabelControllerTest.php
@@ -54,7 +54,7 @@ public function testStore()
         $response = $this->json('POST', "/api/v1/images/{$id}/labels");
         $response->assertStatus(422);
 
-        $this->assertEquals(0, $this->image->labels()->count());
+        $this->assertSame(0, $this->image->labels()->count());
 
         $this->beUser();
         $response = $this->post("/api/v1/images/{$id}/labels", [
@@ -73,7 +73,7 @@ public function testStore()
             'label_id' => $this->labelRoot()->id,
         ]);
         $response->assertSuccessful();
-        $this->assertEquals(1, $this->image->labels()->count());
+        $this->assertSame(1, $this->image->labels()->count());
 
         $this->beAdmin();
         // the same label cannot be attached twice
@@ -81,13 +81,13 @@ public function testStore()
             'label_id' => $this->labelRoot()->id,
         ]);
         $response->assertStatus(400);
-        $this->assertEquals(1, $this->image->labels()->count());
+        $this->assertSame(1, $this->image->labels()->count());
 
         $response = $this->json('POST', "/api/v1/images/{$id}/labels", [
             'label_id' => $this->labelChild()->id,
         ]);
         $response->assertSuccessful();
-        $this->assertEquals(2, $this->image->labels()->count());
+        $this->assertSame(2, $this->image->labels()->count());
         $response->assertJsonFragment([
             'id' => $this->labelChild()->id,
             'name' => $this->labelChild()->name,
diff --git a/tests/php/Http/Controllers/Api/LabelControllerTest.php b/tests/php/Http/Controllers/Api/LabelControllerTest.php
index ee35317ae..3e15b55bb 100644
--- a/tests/php/Http/Controllers/Api/LabelControllerTest.php
+++ b/tests/php/Http/Controllers/Api/LabelControllerTest.php
@@ -58,9 +58,9 @@ public function testUpdate()
         $response->assertStatus(200);
 
         $label = $label->fresh();
-        $this->assertEquals('new label name', $label->name);
-        $this->assertEquals('bada55', $label->color);
-        $this->assertEquals($sibling->id, $label->parent_id);
+        $this->assertSame('new label name', $label->name);
+        $this->assertSame('bada55', $label->color);
+        $this->assertSame($sibling->id, $label->parent_id);
     }
 
     public function testUpdateVersionedTree()
diff --git a/tests/php/Http/Controllers/Api/LabelTreeAuthorizedProjectControllerTest.php b/tests/php/Http/Controllers/Api/LabelTreeAuthorizedProjectControllerTest.php
index 07d5c628d..ba29ae679 100644
--- a/tests/php/Http/Controllers/Api/LabelTreeAuthorizedProjectControllerTest.php
+++ b/tests/php/Http/Controllers/Api/LabelTreeAuthorizedProjectControllerTest.php
@@ -39,13 +39,13 @@ public function testStore()
         $response->assertStatus(200);
         $this->assertTrue($tree->authorizedProjects()->exists());
 
-        $this->assertEquals(1, $tree->authorizedProjects()->count());
+        $this->assertSame(1, $tree->authorizedProjects()->count());
         $response = $this->json('POST', "/api/v1/label-trees/{$tree->id}/authorized-projects", [
             'id' => $this->project()->id,
         ]);
         // should not fail if same project is authorized twice but should not add it twice
         $response->assertStatus(200);
-        $this->assertEquals(1, $tree->authorizedProjects()->count());
+        $this->assertSame(1, $tree->authorizedProjects()->count());
     }
 
     public function testStoreFormRequest()
@@ -57,7 +57,7 @@ public function testStoreFormRequest()
         $response = $this->post("/api/v1/label-trees/{$tree->id}/authorized-projects", [
             'id' => $this->project()->id,
         ]);
-        $this->assertEquals(1, $tree->authorizedProjects()->count());
+        $this->assertSame(1, $tree->authorizedProjects()->count());
         $response->assertRedirect('/');
         $response->assertSessionHas('saved', true);
 
@@ -65,7 +65,7 @@ public function testStoreFormRequest()
             'id' => $this->project()->id,
             '_redirect' => 'settings',
         ]);
-        $this->assertEquals(1, $tree->authorizedProjects()->count());
+        $this->assertSame(1, $tree->authorizedProjects()->count());
         $response->assertRedirect('/settings');
         $response->assertSessionHas('saved', true);
     }
@@ -119,25 +119,25 @@ public function testDestroy()
         $response->assertStatus(403);
 
         $this->beAdmin();
-        $this->assertEquals(1, $tree->authorizedProjects()->count());
-        $this->assertEquals(1, $tree->projects()->count());
+        $this->assertSame(1, $tree->authorizedProjects()->count());
+        $this->assertSame(1, $tree->projects()->count());
         $response = $this->json('DELETE', "/api/v1/label-trees/{$tree->id}/authorized-projects/{$project->id}");
         $response->assertStatus(200);
-        $this->assertEquals(0, $tree->authorizedProjects()->count());
-        $this->assertEquals(1, $tree->projects()->count());
+        $this->assertSame(0, $tree->authorizedProjects()->count());
+        $this->assertSame(1, $tree->projects()->count());
 
         $tree->authorizedProjects()->attach($project->id);
         $tree->visibility_id = Visibility::privateId();
         $tree->save();
 
-        $this->assertEquals(1, $tree->authorizedProjects()->count());
-        $this->assertEquals(1, $tree->projects()->count());
+        $this->assertSame(1, $tree->authorizedProjects()->count());
+        $this->assertSame(1, $tree->projects()->count());
         $response = $this->json('DELETE', "/api/v1/label-trees/{$tree->id}/authorized-projects/{$project->id}");
         // if the tree is private and project authorization is removed, the
         // tree should be removed from the project as well
         $response->assertStatus(200);
-        $this->assertEquals(0, $tree->authorizedProjects()->count());
-        $this->assertEquals(0, $tree->projects()->count());
+        $this->assertSame(0, $tree->authorizedProjects()->count());
+        $this->assertSame(0, $tree->projects()->count());
     }
 
     public function testDestroyFormRequest()
diff --git a/tests/php/Http/Controllers/Api/LabelTreeControllerTest.php b/tests/php/Http/Controllers/Api/LabelTreeControllerTest.php
index a3eb0ac3b..c0bbc1ae1 100644
--- a/tests/php/Http/Controllers/Api/LabelTreeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/LabelTreeControllerTest.php
@@ -154,21 +154,21 @@ public function testUpdate()
         ]);
         $response->assertStatus(200);
 
-        $this->assertEquals('my test', $tree->fresh()->name);
+        $this->assertSame('my test', $tree->fresh()->name);
 
         $response = $this->json('PUT', "/api/v1/label-trees/{$id}", [
             'description' => 'this is my test',
         ]);
         $response->assertStatus(200);
 
-        $this->assertEquals('this is my test', $tree->fresh()->description);
+        $this->assertSame('this is my test', $tree->fresh()->description);
 
         $response = $this->json('PUT', "/api/v1/label-trees/{$id}", [
             'visibility_id' => Visibility::publicId(),
         ]);
         $response->assertStatus(200);
 
-        $this->assertEquals(Visibility::publicId(), $tree->fresh()->visibility_id);
+        $this->assertSame(Visibility::publicId(), $tree->fresh()->visibility_id);
     }
 
     public function testUpdateFormRequest()
@@ -185,7 +185,7 @@ public function testUpdateFormRequest()
         $response = $this->put("/api/v1/label-trees/{$id}", [
             'name' => 'abc',
         ]);
-        $this->assertEquals('abc', $tree->fresh()->name);
+        $this->assertSame('abc', $tree->fresh()->name);
         $response->assertRedirect('/');
         $response->assertSessionHas('saved', true);
 
@@ -193,7 +193,7 @@ public function testUpdateFormRequest()
             'description' => 'abc',
             '_redirect' => 'settings',
         ]);
-        $this->assertEquals('abc', $tree->fresh()->description);
+        $this->assertSame('abc', $tree->fresh()->description);
         $response->assertRedirect('/settings');
         $response->assertSessionHas('saved', true);
     }
@@ -217,7 +217,7 @@ public function testUpdateVisibility()
             'visibility_id' => strval(Visibility::privateId()),
         ]);
 
-        $this->assertEquals($authorized->id, $tree->projects()->pluck('id')->first());
+        $this->assertSame($authorized->id, $tree->projects()->pluck('id')->first());
     }
 
     public function testUpdatePropagateVisibility()
@@ -236,7 +236,7 @@ public function testUpdatePropagateVisibility()
             ])
             ->assertStatus(200);
 
-        $this->assertEquals(Visibility::publicId(), $tree->fresh()->visibility_id);
+        $this->assertSame(Visibility::publicId(), $tree->fresh()->visibility_id);
     }
 
     public function testUpdatePropagateName()
@@ -255,7 +255,7 @@ public function testUpdatePropagateName()
             ])
             ->assertStatus(200);
 
-        $this->assertEquals('My Cool Tree', $tree->fresh()->name);
+        $this->assertSame('My Cool Tree', $tree->fresh()->name);
     }
 
     public function testStore()
@@ -286,7 +286,7 @@ public function testStore()
         // visibility must exist
         $response->assertStatus(422);
 
-        $this->assertEquals(0, LabelTree::count());
+        $this->assertSame(0, LabelTree::count());
 
         $response = $this->json('POST', '/api/v1/label-trees', [
             'name' => 'abc',
@@ -295,7 +295,7 @@ public function testStore()
         // description is optional
         $response->assertSuccessful();
 
-        $this->assertEquals(1, LabelTree::count());
+        $this->assertSame(1, LabelTree::count());
 
         $response = $this->json('POST', '/api/v1/label-trees', [
             'name' => 'abc',
@@ -305,7 +305,7 @@ public function testStore()
         ]);
         $response->assertSuccessful();
 
-        $this->assertEquals(2, LabelTree::count());
+        $this->assertSame(2, LabelTree::count());
 
         $tree = LabelTree::orderBy('id', 'desc')->first();
         $this->assertNotNull($tree->uuid);
@@ -314,7 +314,7 @@ public function testStore()
         // creator gets first label tree admin
         $member = $tree->members()->find($this->user()->id);
         $this->assertNotNull($member);
-        $this->assertEquals(Role::adminId(), $member->role_id);
+        $this->assertSame(Role::adminId(), $member->role_id);
     }
 
     public function testStoreAuthorization()
@@ -368,8 +368,8 @@ public function testStoreTargetProject()
         ]);
         $response->assertSuccessful();
         $tree = LabelTree::first();
-        $this->assertEquals($this->project()->id, $tree->projects()->first()->id);
-        $this->assertEquals($this->project()->id, $tree->authorizedProjects()->first()->id);
+        $this->assertSame($this->project()->id, $tree->projects()->first()->id);
+        $this->assertSame($this->project()->id, $tree->authorizedProjects()->first()->id);
     }
 
     public function testStoreFormRequest()
@@ -381,7 +381,7 @@ public function testStoreFormRequest()
             'visibility_id' => Visibility::publicId(),
             'description' => 'my description',
         ]);
-        $this->assertEquals(1, LabelTree::count());
+        $this->assertSame(1, LabelTree::count());
 
         $response = $this->post('/api/v1/label-trees', [
             'name' => 'abc',
@@ -389,7 +389,7 @@ public function testStoreFormRequest()
             'description' => 'my description',
             '_redirect' => 'settings',
         ]);
-        $this->assertEquals(2, LabelTree::count());
+        $this->assertSame(2, LabelTree::count());
         $response->assertRedirect('/settings');
         $response->assertSessionHas('newTree');
     }
@@ -443,14 +443,14 @@ public function testStoreFork()
             ->assertSuccessful();
 
         $tree = LabelTree::orderBy('id', 'desc')->first();
-        $this->assertEquals('abc', $tree->name);
-        $this->assertEquals('my description', $tree->description);
+        $this->assertSame('abc', $tree->name);
+        $this->assertSame('my description', $tree->description);
         $this->assertTrue($tree->members()->where('id', $this->guest()->id)->exists());
         $parent = $tree->labels()->where('name', $baseParent->name)->first();
         $this->assertNotNull($parent);
         $child = $tree->labels()->where('name', $baseChild->name)->first();
         $this->assertNotNull($child);
-        $this->assertEquals($parent->id, $child->parent_id);
+        $this->assertSame($parent->id, $child->parent_id);
     }
 
     public function testDestroy()
diff --git a/tests/php/Http/Controllers/Api/LabelTreeLabelControllerTest.php b/tests/php/Http/Controllers/Api/LabelTreeLabelControllerTest.php
index 9bda666c7..6021b742d 100644
--- a/tests/php/Http/Controllers/Api/LabelTreeLabelControllerTest.php
+++ b/tests/php/Http/Controllers/Api/LabelTreeLabelControllerTest.php
@@ -60,7 +60,7 @@ public function testStoreNormal()
         // parent id must be integer
         $response->assertStatus(422);
 
-        $this->assertEquals(1, $tree->labels()->count());
+        $this->assertSame(1, $tree->labels()->count());
         $this->assertFalse($parent->children()->exists());
         $response = $this->json('POST', "/api/v1/label-trees/{$tree->id}/labels", [
             'name' => 'new label',
@@ -68,7 +68,7 @@ public function testStoreNormal()
             'parent_id' => $parent->id,
         ]);
         $response->assertStatus(200);
-        $this->assertEquals(2, $tree->labels()->count());
+        $this->assertSame(2, $tree->labels()->count());
         $this->assertTrue($parent->children()->exists());
 
         $response = $this->json('POST', "/api/v1/label-trees/{$tree->id}/labels", [
@@ -76,7 +76,7 @@ public function testStoreNormal()
             'color' => 'bada55',
         ]);
         $response->assertStatus(200);
-        $this->assertEquals(3, $tree->labels()->count());
+        $this->assertSame(3, $tree->labels()->count());
 
         $label = $tree->labels()->where('name', 'new label 2')->first();
 
@@ -102,7 +102,7 @@ public function testStoreFormRequest()
             'name' => 'new label',
             'color' => 'bada55',
         ]);
-        $this->assertEquals(1, $tree->labels()->count());
+        $this->assertSame(1, $tree->labels()->count());
         $response->assertRedirect('/');
         $response->assertSessionHas('saved', true);
 
@@ -111,7 +111,7 @@ public function testStoreFormRequest()
             'color' => 'bada55',
             '_redirect' => 'settings',
         ]);
-        $this->assertEquals(2, $tree->labels()->count());
+        $this->assertSame(2, $tree->labels()->count());
         $response->assertRedirect('/settings');
         $response->assertSessionHas('saved', true);
     }
diff --git a/tests/php/Http/Controllers/Api/LabelTreeUserControllerTest.php b/tests/php/Http/Controllers/Api/LabelTreeUserControllerTest.php
index 3ef911552..f0888c396 100644
--- a/tests/php/Http/Controllers/Api/LabelTreeUserControllerTest.php
+++ b/tests/php/Http/Controllers/Api/LabelTreeUserControllerTest.php
@@ -36,18 +36,18 @@ public function testUpdate()
         // cannot update the own user
         $response->assertStatus(403);
 
-        $this->assertEquals(1, $t->members()->where('label_tree_user.role_id', Role::adminId())->count());
+        $this->assertSame(1, $t->members()->where('label_tree_user.role_id', Role::adminId())->count());
         $response = $this->json('PUT', "/api/v1/label-trees/{$t->id}/users/{$u->id}", [
             'role_id' => Role::adminId(),
         ]);
         $response->assertStatus(200);
-        $this->assertEquals(2, $t->members()->where('label_tree_user.role_id', Role::adminId())->count());
+        $this->assertSame(2, $t->members()->where('label_tree_user.role_id', Role::adminId())->count());
 
         $response = $this->json('PUT', "/api/v1/label-trees/{$t->id}/users/{$u->id}", [
             'role_id' => Role::editorId(),
         ]);
         $response->assertStatus(200);
-        $this->assertEquals(1, $t->members()->where('label_tree_user.role_id', Role::adminId())->count());
+        $this->assertSame(1, $t->members()->where('label_tree_user.role_id', Role::adminId())->count());
     }
 
     public function testUpdateGlobalGuest()
@@ -74,7 +74,7 @@ public function testUpdateFormRequest()
         $response = $this->put("/api/v1/label-trees/{$t->id}/users/{$u->id}", [
             'role_id' => Role::adminId(),
         ]);
-        $this->assertEquals(2, $t->members()->where('label_tree_user.role_id', Role::adminId())->count());
+        $this->assertSame(2, $t->members()->where('label_tree_user.role_id', Role::adminId())->count());
         $response->assertRedirect('/');
         $response->assertSessionHas('saved', true);
 
@@ -82,7 +82,7 @@ public function testUpdateFormRequest()
             'role_id' => Role::editorId(),
             '_redirect' => 'settings',
         ]);
-        $this->assertEquals(1, $t->members()->where('label_tree_user.role_id', Role::adminId())->count());
+        $this->assertSame(1, $t->members()->where('label_tree_user.role_id', Role::adminId())->count());
         $response->assertRedirect('/settings');
         $response->assertSessionHas('saved', true);
     }
@@ -139,7 +139,7 @@ public function testStore()
         $response->assertStatus(200);
         $user = $tree->members()->find($this->user()->id);
         $this->assertNotNull($user);
-        $this->assertEquals(Role::editorId(), $user->role_id);
+        $this->assertSame(Role::editorId(), $user->role_id);
     }
 
     public function testStoreGlobalGuest()
@@ -168,7 +168,7 @@ public function testStoreFormRequest()
             'id' => $this->user()->id,
             'role_id' => Role::editorId(),
         ]);
-        $this->assertEquals(2, $tree->members()->count());
+        $this->assertSame(2, $tree->members()->count());
         $response->assertRedirect('/');
         $response->assertSessionHas('saved', true);
 
@@ -177,7 +177,7 @@ public function testStoreFormRequest()
             'role_id' => Role::editorId(),
             '_redirect' => 'settings',
         ]);
-        $this->assertEquals(3, $tree->members()->count());
+        $this->assertSame(3, $tree->members()->count());
         $response->assertRedirect('/settings');
         $response->assertSessionHas('saved', true);
     }
diff --git a/tests/php/Http/Controllers/Api/LabelTreeVersionControllerTest.php b/tests/php/Http/Controllers/Api/LabelTreeVersionControllerTest.php
index 8b9cdb8ff..6ac6b884c 100644
--- a/tests/php/Http/Controllers/Api/LabelTreeVersionControllerTest.php
+++ b/tests/php/Http/Controllers/Api/LabelTreeVersionControllerTest.php
@@ -49,14 +49,14 @@ public function testStore()
 
         $version = $master->versions()->first();
         $this->assertNotNull($version);
-        $this->assertEquals('v1.0', $version->name);
-        $this->assertEquals($master->id, $version->label_tree_id);
+        $this->assertSame('v1.0', $version->name);
+        $this->assertSame($master->id, $version->label_tree_id);
 
         $versionTree = LabelTree::where('version_id', $version->id)->first();
         $this->assertNotNull($versionTree);
-        $this->assertEquals($master->name, $versionTree->name);
-        $this->assertEquals('First version.', $versionTree->description);
-        $this->assertEquals($master->visibility_id, $versionTree->visibility_id);
+        $this->assertSame($master->name, $versionTree->name);
+        $this->assertSame('First version.', $versionTree->description);
+        $this->assertSame($master->visibility_id, $versionTree->visibility_id);
         $this->assertNotEquals($master->uuid, $versionTree->uuid);
 
         $this->assertNotNull($versionTree->authorizedProjects()->find($this->project()->id));
@@ -66,7 +66,7 @@ public function testStore()
         $this->assertEquals($labels->pluck('name'), $versionLabels->pluck('name'));
         $this->assertEquals($labels->pluck('color'), $versionLabels->pluck('color'));
         $this->assertNotEquals($labels->pluck('uuid'), $versionLabels->pluck('uuid'));
-        $this->assertEquals($versionLabels[0]->parent_id, $versionLabels[1]->id);
+        $this->assertSame($versionLabels[0]->parent_id, $versionLabels[1]->id);
         $this->assertNull($versionLabels[1]->parent_id);
     }
 
@@ -82,7 +82,7 @@ public function testStoreDoi()
             ])
             ->assertStatus(200);
         $version = $master->versions()->first();
-        $this->assertEquals('10.5281/zenodo.xxxxxxx', $version->doi);
+        $this->assertSame('10.5281/zenodo.xxxxxxx', $version->doi);
     }
 
     public function testStoreDoiEmpty()
@@ -123,7 +123,7 @@ public function testUpdate()
             ])
             ->assertStatus(200);
 
-        $this->assertEquals('10.5281/zenodo.xxxxxxx', $version->fresh()->doi);
+        $this->assertSame('10.5281/zenodo.xxxxxxx', $version->fresh()->doi);
     }
 
     public function testDestroy()
diff --git a/tests/php/Http/Controllers/Api/LinkVideoAnnotationControllerTest.php b/tests/php/Http/Controllers/Api/LinkVideoAnnotationControllerTest.php
index 70876df82..9828b7acf 100644
--- a/tests/php/Http/Controllers/Api/LinkVideoAnnotationControllerTest.php
+++ b/tests/php/Http/Controllers/Api/LinkVideoAnnotationControllerTest.php
@@ -75,7 +75,7 @@ public function testStoreValidation()
             ->assertStatus(200)
             ->assertJsonFragment(['id' => $a1->id]);
 
-        $this->assertEquals(1, $this->video->annotations()->count());
+        $this->assertSame(1, $this->video->annotations()->count());
         $this->assertNull($a2->fresh());
     }
 
@@ -169,8 +169,8 @@ public function testStoreBefore()
             ->assertStatus(200);
 
         $a1->refresh();
-        $this->assertEquals([1.0, 2.0, null, 3.0, 4.0], $a1->frames);
-        $this->assertEquals([[30, 30], [40, 40], [], [10, 10], [20, 20]], $a1->points);
+        $this->assertSame([1, 2, null, 3, 4], $a1->frames);
+        $this->assertSame([[30, 30], [40, 40], [], [10, 10], [20, 20]], $a1->points);
     }
 
     public function testStoreAfter()
@@ -197,8 +197,8 @@ public function testStoreAfter()
             ->assertStatus(200);
 
         $a1->refresh();
-        $this->assertEquals([1.0, 2.0, null, 3.0, 4.0], $a1->frames);
-        $this->assertEquals([[10, 10], [20, 20], [], [30, 30], [40, 40]], $a1->points);
+        $this->assertSame([1, 2, null, 3, 4], $a1->frames);
+        $this->assertSame([[10, 10], [20, 20], [], [30, 30], [40, 40]], $a1->points);
     }
 
     public function testStoreMergeLabels()
@@ -244,10 +244,10 @@ public function testStoreMergeLabels()
             ])
             ->assertStatus(200);
 
-        $this->assertEquals(3, $a1->labels()->count());
+        $this->assertSame(3, $a1->labels()->count());
         $this->assertNotNull($l1->fresh());
-        $this->assertEquals($a1->id, $l2->fresh()->annotation_id);
-        $this->assertEquals($a1->id, $l3->fresh()->annotation_id);
+        $this->assertSame($a1->id, $l2->fresh()->annotation_id);
+        $this->assertSame($a1->id, $l3->fresh()->annotation_id);
         $this->assertNull($l4->fresh());
     }
 
@@ -275,8 +275,8 @@ public function testStoreTouching()
             ->assertStatus(200);
 
         $a1->refresh();
-        $this->assertEquals([1.0, 2.0, 3.0], $a1->frames);
-        $this->assertEquals([[10, 10], [20, 20], [40, 40]], $a1->points);
+        $this->assertSame([1, 2, 3], $a1->frames);
+        $this->assertSame([[10, 10], [20, 20], [40, 40]], $a1->points);
     }
 
     public function testStoreSingleFrameTouching()
@@ -328,7 +328,7 @@ public function testStoreWholeFrame()
             ->assertStatus(200);
 
         $a1->refresh();
-        $this->assertEquals([1.0, null, 2.0], $a1->frames);
-        $this->assertEquals([], $a1->points);
+        $this->assertSame([1, null, 2], $a1->frames);
+        $this->assertEmpty($a1->points);
     }
 }
diff --git a/tests/php/Http/Controllers/Api/NotificationControllerTest.php b/tests/php/Http/Controllers/Api/NotificationControllerTest.php
index e8310f3c0..96a800687 100644
--- a/tests/php/Http/Controllers/Api/NotificationControllerTest.php
+++ b/tests/php/Http/Controllers/Api/NotificationControllerTest.php
@@ -14,7 +14,7 @@ public function testUpdate()
         $user->notify(new InAppNotification('test', 'test'));
         $notification = $user->notifications()->first();
         $this->doTestApiRoute('PUT', '/api/v1/notifications/'.$notification->id);
-        $this->assertEquals(1, $user->unreadNotifications()->count());
+        $this->assertSame(1, $user->unreadNotifications()->count());
 
         $this->be(UserTest::create());
         $response = $this->put('/api/v1/notifications/'.$notification->id)
@@ -23,7 +23,7 @@ public function testUpdate()
         $this->be($user);
         $response = $this->put('/api/v1/notifications/'.$notification->id)
             ->assertStatus(200);
-        $this->assertEquals(0, $user->unreadNotifications()->count());
+        $this->assertSame(0, $user->unreadNotifications()->count());
 
         // only unread notifications can be marked as read
         $response = $this->put('/api/v1/notifications/'.$notification->id)
@@ -36,7 +36,7 @@ public function testDestroy()
         $user->notify(new InAppNotification('test', 'test'));
         $notification = $user->notifications()->first();
         $this->doTestApiRoute('DELETE', '/api/v1/notifications/'.$notification->id);
-        $this->assertEquals(1, $user->notifications()->count());
+        $this->assertSame(1, $user->notifications()->count());
 
         $this->be(UserTest::create());
         $response = $this->delete('/api/v1/notifications/'.$notification->id)
@@ -45,7 +45,7 @@ public function testDestroy()
         $this->be($user);
         $response = $this->delete('/api/v1/notifications/'.$notification->id)
             ->assertStatus(200);
-        $this->assertEquals(0, $user->notifications()->count());
+        $this->assertSame(0, $user->notifications()->count());
     }
 
     public function testUpdateAll()
@@ -58,8 +58,8 @@ public function testUpdateAll()
         $this->doTestApiRoute('PUT', '/api/v1/notifications/all');
 
         $this->be($user);
-        $this->assertEquals(3, $user->unreadNotifications()->count());
+        $this->assertSame(3, $user->unreadNotifications()->count());
         $this->put('/api/v1/notifications/all')->assertSuccessful();
-        $this->assertEquals(0, $user->unreadNotifications()->count());
+        $this->assertSame(0, $user->unreadNotifications()->count());
     }
 }
diff --git a/tests/php/Http/Controllers/Api/ProjectControllerTest.php b/tests/php/Http/Controllers/Api/ProjectControllerTest.php
index 6ae047f8b..7e4277a8a 100644
--- a/tests/php/Http/Controllers/Api/ProjectControllerTest.php
+++ b/tests/php/Http/Controllers/Api/ProjectControllerTest.php
@@ -88,8 +88,8 @@ public function testUpdate()
         $response->assertStatus(200);
 
         $project = $this->project()->fresh();
-        $this->assertEquals('my test', $project->name);
-        $this->assertEquals('this is my test', $project->description);
+        $this->assertSame('my test', $project->name);
+        $this->assertSame('this is my test', $project->description);
         $this->assertNotEquals(0, $project->creator_id);
     }
 
@@ -102,7 +102,7 @@ public function testStore()
         $response = $this->json('POST', '/api/v1/projects');
         $response->assertStatus(422);
 
-        $this->assertEquals(1, Project::count());
+        $this->assertSame(1, Project::count());
 
         $response = $this->json('POST', '/api/v1/projects', [
             'name' => 'test project',
@@ -114,7 +114,7 @@ public function testStore()
         $this->assertStringStartsWith('{', $content);
         $this->assertStringEndsWith('}', $content);
         $this->assertStringContainsString('"name":"test project"', $content);
-        $this->assertEquals(2, Project::count());
+        $this->assertSame(2, Project::count());
     }
 
     public function testStoreAuthorization()
diff --git a/tests/php/Http/Controllers/Api/ProjectInvitationControllerTest.php b/tests/php/Http/Controllers/Api/ProjectInvitationControllerTest.php
index b654083f6..26cb79838 100644
--- a/tests/php/Http/Controllers/Api/ProjectInvitationControllerTest.php
+++ b/tests/php/Http/Controllers/Api/ProjectInvitationControllerTest.php
@@ -38,15 +38,15 @@ public function testStore()
                 'expires_at' => $timestamp,
             ])
             ->assertSuccessful();
-
+    
         $invitation = $this->project()->invitations()->first();
         $this->assertNotNull($invitation);
-        $this->assertEquals($timestamp, $invitation->expires_at);
-        $this->assertEquals(0, $invitation->current_uses);
+        $this->assertSame($timestamp->toDateTimeString(), $invitation->expires_at->tz($timestamp->timezone)->toDateTimeString());
+        $this->assertSame(0, $invitation->current_uses);
         $this->assertNotNull($invitation->uuid);
         $this->assertNull($invitation->max_uses);
         $this->assertFalse($invitation->add_to_sessions);
-        $this->assertEquals(Role::editorId(), $invitation->role_id);
+        $this->assertSame(Role::editorId(), $invitation->role_id);
     }
 
     public function testStoreOptionalAttributes()
@@ -95,8 +95,8 @@ public function testStoreOptionalAttributes()
 
         $invitation = $this->project()->invitations()->first();
         $this->assertNotNull($invitation);
-        $this->assertEquals(10, $invitation->max_uses);
-        $this->assertEquals(Role::editorId(), $invitation->role_id);
+        $this->assertSame(10, $invitation->max_uses);
+        $this->assertSame(Role::editorId(), $invitation->role_id);
         $this->assertTrue($invitation->add_to_sessions);
     }
 
@@ -160,11 +160,11 @@ public function testJoin()
             ])
             ->assertSuccessful();
 
-        $this->assertEquals(0, $invitation->current_uses);
+        $this->assertSame(0, $invitation->current_uses);
         $projectUser = $this->project()->users()->find($this->user()->id);
         $this->assertNotNull($projectUser);
-        $this->assertEquals(Role::guestId(), $projectUser->project_role_id);
-        $this->assertEquals(1, $invitation->fresh()->current_uses);
+        $this->assertSame(Role::guestId(), $projectUser->project_role_id);
+        $this->assertSame(1, $invitation->fresh()->current_uses);
     }
 
     public function testJoinRedirect()
@@ -232,7 +232,7 @@ public function testJoinAlreadyMember()
             ])
             ->assertSuccessful();
 
-        $this->assertEquals(0, $invitation->fresh()->current_uses);
+        $this->assertSame(0, $invitation->fresh()->current_uses);
     }
 
     public function testJoinAddToSessions()
diff --git a/tests/php/Http/Controllers/Api/ProjectLabelTreeControllerTest.php b/tests/php/Http/Controllers/Api/ProjectLabelTreeControllerTest.php
index bbbf06240..f52d2bed6 100644
--- a/tests/php/Http/Controllers/Api/ProjectLabelTreeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/ProjectLabelTreeControllerTest.php
@@ -118,20 +118,20 @@ public function testStore()
             'id' => $authorized->id,
         ]);
         $response->assertStatus(200);
-        $this->assertEquals($count + 1, $p->labelTrees()->count());
+        $this->assertSame($count + 1, $p->labelTrees()->count());
 
         $response = $this->json('POST', "/api/v1/projects/{$p->id}/label-trees", [
             'id' => $public->id,
         ]);
         $response->assertStatus(200);
-        $this->assertEquals($count + 2, $p->labelTrees()->count());
+        $this->assertSame($count + 2, $p->labelTrees()->count());
 
         // if the tree is already attached, ignore and respond with success
         $response = $this->json('POST', "/api/v1/projects/{$p->id}/label-trees", [
             'id' => $public->id,
         ]);
         $response->assertStatus(200);
-        $this->assertEquals($count + 2, $p->labelTrees()->count());
+        $this->assertSame($count + 2, $p->labelTrees()->count());
     }
 
     public function testStoreFormRequest()
diff --git a/tests/php/Http/Controllers/Api/ProjectUserControllerTest.php b/tests/php/Http/Controllers/Api/ProjectUserControllerTest.php
index 23924b080..ffc4cf2cc 100644
--- a/tests/php/Http/Controllers/Api/ProjectUserControllerTest.php
+++ b/tests/php/Http/Controllers/Api/ProjectUserControllerTest.php
@@ -74,14 +74,14 @@ public function testUpdate()
             ->assertStatus(422)
             ->assertJsonFragment(['The last admin of '.$this->project()->name.' cannot be removed. The admin status must be passed on to another user first.']);
 
-        $this->assertEquals(2, $this->project()->users()->find($this->editor()->id)->project_role_id);
+        $this->assertSame(2, $this->project()->users()->find($this->editor()->id)->project_role_id);
 
         $response = $this->put("/api/v1/projects/{$id}/users/".$this->editor()->id, [
             'project_role_id' => Role::guestId(),
         ]);
 
         $response->assertStatus(200);
-        $this->assertEquals(3, $this->project()->users()->find($this->editor()->id)->project_role_id);
+        $this->assertSame(3, $this->project()->users()->find($this->editor()->id)->project_role_id);
     }
 
     public function testUpdateGlobalGuest()
@@ -144,8 +144,8 @@ public function testAttach()
 
         $response->assertStatus(200);
         $newUser = $this->project()->users()->find($id);
-        $this->assertEquals($id, $newUser->id);
-        $this->assertEquals(Role::editorId(), $newUser->project_role_id);
+        $this->assertSame($id, $newUser->id);
+        $this->assertSame(Role::editorId(), $newUser->project_role_id);
     }
 
     public function testAttachGlobalGuest()
diff --git a/tests/php/Http/Controllers/Api/ProjectVolumeControllerTest.php b/tests/php/Http/Controllers/Api/ProjectVolumeControllerTest.php
index 3881dcfd3..75ac8a3eb 100644
--- a/tests/php/Http/Controllers/Api/ProjectVolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/ProjectVolumeControllerTest.php
@@ -154,7 +154,7 @@ public function testStoreImages()
         ]);
         $response->assertSuccessful();
         $content = $response->getContent();
-        $this->assertEquals($count + 1, $this->project()->volumes()->count());
+        $this->assertSame($count + 1, $this->project()->volumes()->count());
         $this->assertStringStartsWith('{', $content);
         $this->assertStringEndsWith('}', $content);
 
@@ -193,7 +193,7 @@ public function testStoreHandle()
             ])
             ->assertStatus(201);
         $volume = Volume::orderBy('id', 'desc')->first();
-        $this->assertEquals('10.3389/fmars.2017.00083', $volume->handle);
+        $this->assertSame('10.3389/fmars.2017.00083', $volume->handle);
 
         // Some DOIs can contain multiple slashes.
         $this
@@ -419,7 +419,7 @@ public function testStoreVideos()
             'files' => '1.mp4, 2.mp4',
         ]);
         $response->assertSuccessful();
-        $this->assertEquals($count + 1, $this->project()->volumes()->count());
+        $this->assertSame($count + 1, $this->project()->volumes()->count());
 
         $id = json_decode($response->getContent())->id;
         Queue::assertPushed(CreateNewImagesOrVideos::class, function ($job) use ($id) {
diff --git a/tests/php/Http/Controllers/Api/SplitVideoAnnotationControllerTest.php b/tests/php/Http/Controllers/Api/SplitVideoAnnotationControllerTest.php
index 401a73c9b..9cbfb46a5 100644
--- a/tests/php/Http/Controllers/Api/SplitVideoAnnotationControllerTest.php
+++ b/tests/php/Http/Controllers/Api/SplitVideoAnnotationControllerTest.php
@@ -69,11 +69,11 @@ public function testStore()
             ])
             ->assertStatus(200);
 
-        $this->assertEquals(2, $this->video->annotations()->count());
+        $this->assertSame(2, $this->video->annotations()->count());
         $this->video->annotations->each(function ($annotation) use ($label) {
             $compare = $annotation->labels()->first();
-            $this->assertEquals($label->label_id, $compare->label_id);
-            $this->assertEquals($label->user_id, $compare->user_id);
+            $this->assertSame($label->label_id, $compare->label_id);
+            $this->assertSame($label->user_id, $compare->user_id);
         });
     }
 
diff --git a/tests/php/Http/Controllers/Api/UserControllerTest.php b/tests/php/Http/Controllers/Api/UserControllerTest.php
index 642ce3de5..5b4facb66 100644
--- a/tests/php/Http/Controllers/Api/UserControllerTest.php
+++ b/tests/php/Http/Controllers/Api/UserControllerTest.php
@@ -186,7 +186,7 @@ public function testUpdate()
             'auth_password' => 'adminpassword',
         ]);
         $response->assertStatus(200);
-        $this->assertEquals('new@email.me', $this->guest()->fresh()->email);
+        $this->assertSame('new@email.me', $this->guest()->fresh()->email);
 
         $response = $this->json('PUT', '/api/v1/users/'.$this->guest()->id, [
             'role_id' => 999,
@@ -208,7 +208,7 @@ public function testUpdate()
         // wrong password
         $response->assertStatus(422);
 
-        $this->assertEquals(Role::editorId(), $this->guest()->fresh()->role_id);
+        $this->assertSame(Role::editorId(), $this->guest()->fresh()->role_id);
 
         $response = $this->put('/api/v1/users/'.$this->guest()->id, [
             'role_id' => Role::adminId(),
@@ -216,7 +216,7 @@ public function testUpdate()
             '_redirect' => 'settings/profile',
         ]);
         $response->assertRedirect('settings/profile');
-        $this->assertEquals(Role::adminId(), $this->guest()->fresh()->role_id);
+        $this->assertSame(Role::adminId(), $this->guest()->fresh()->role_id);
 
         $this->get('/');
         $response = $this->put('/api/v1/users/'.$this->guest()->id, [
@@ -227,8 +227,8 @@ public function testUpdate()
         ]);
         $response->assertRedirect('/');
 
-        $this->assertEquals('jack', $this->guest()->fresh()->firstname);
-        $this->assertEquals('jackson', $this->guest()->fresh()->lastname);
+        $this->assertSame('jack', $this->guest()->fresh()->firstname);
+        $this->assertSame('jackson', $this->guest()->fresh()->lastname);
         $this->assertNotEquals('', $this->guest()->fresh()->password);
     }
 
@@ -253,7 +253,7 @@ public function testUpdateEmailCaseInsensitive()
             'auth_password' => 'adminpassword',
         ]);
         $response->assertStatus(200);
-        $this->assertEquals('test2@test.com', $this->guest()->fresh()->email);
+        $this->assertSame('test2@test.com', $this->guest()->fresh()->email);
     }
 
     public function testUpdateAffiliation()
@@ -263,7 +263,7 @@ public function testUpdateAffiliation()
         $this->putJson("api/v1/users/{$user->id}", ['affiliation' => 'My Company'])
             ->assertStatus(200);
 
-        $this->assertEquals('My Company', $user->fresh()->affiliation);
+        $this->assertSame('My Company', $user->fresh()->affiliation);
 
         $this->putJson("api/v1/users/{$user->id}", ['affiliation' => ''])
             ->assertStatus(200);
@@ -290,7 +290,7 @@ public function testUpdateRole()
                 'auth_password' => 'adminpassword',
             ])
             ->assertStatus(200);
-        $this->assertEquals(Role::editorId(), $user->fresh()->role_id);
+        $this->assertSame(Role::editorId(), $user->fresh()->role_id);
         $this
             ->putJson("api/v1/users/{$user->id}", [
                 'role_id' => Role::expertId(),
@@ -303,7 +303,7 @@ public function testUpdateRole()
                 'auth_password' => 'adminpassword',
             ])
             ->assertStatus(200);
-        $this->assertEquals(Role::adminId(), $user->fresh()->role_id);
+        $this->assertSame(Role::adminId(), $user->fresh()->role_id);
     }
 
     public function testUpdateCanReview()
@@ -421,9 +421,9 @@ public function testUpdateOwn()
 
         $user = $this->guest()->fresh();
         $this->assertTrue(Hash::check('newpassword', $user->password));
-        $this->assertEquals('jack', $user->firstname);
-        $this->assertEquals('jackson', $user->lastname);
-        $this->assertEquals('new@email.me', $user->email);
+        $this->assertSame('jack', $user->firstname);
+        $this->assertSame('jackson', $user->lastname);
+        $this->assertSame('new@email.me', $user->email);
     }
 
     public function testUpdateOwnEmailCaseInsensitive()
@@ -447,7 +447,7 @@ public function testUpdateOwnEmailCaseInsensitive()
             'auth_password' => 'guest-password',
         ]);
         $response->assertStatus(200);
-        $this->assertEquals('test2@test.com', $this->guest()->fresh()->email);
+        $this->assertSame('test2@test.com', $this->guest()->fresh()->email);
     }
 
     public function testUpdateOwnAffiliation()
@@ -456,7 +456,7 @@ public function testUpdateOwnAffiliation()
         $this->putJson('api/v1/users/my', ['affiliation' => 'My Company'])
             ->assertStatus(200);
 
-        $this->assertEquals('My Company', $this->guest()->fresh()->affiliation);
+        $this->assertSame('My Company', $this->guest()->fresh()->affiliation);
 
         $this->putJson('api/v1/users/my', ['affiliation' => ''])
             ->assertStatus(200);
@@ -493,11 +493,11 @@ public function testStore()
         $response->assertSuccessful();
 
         $newUser = User::find(User::max('id'));
-        $this->assertEquals('jack', $newUser->firstname);
-        $this->assertEquals('jackson', $newUser->lastname);
-        $this->assertEquals('new@email.me', $newUser->email);
-        $this->assertEquals('My Company', $newUser->affiliation);
-        $this->assertEquals(Role::editorId(), $newUser->role_id);
+        $this->assertSame('jack', $newUser->firstname);
+        $this->assertSame('jackson', $newUser->lastname);
+        $this->assertSame('new@email.me', $newUser->email);
+        $this->assertSame('My Company', $newUser->affiliation);
+        $this->assertSame(Role::editorId(), $newUser->role_id);
 
         $response = $this->json('POST', '/api/v1/users', [
             'password' => 'newpassword',
@@ -552,7 +552,7 @@ public function testStoreUuid()
         ])->assertSuccessful();
 
         $user = User::where('email', 'new2@email.me')->first();
-        $this->assertEquals('c796ccec-c746-308f-8009-9f1f68e2aa62', $user->uuid);
+        $this->assertSame('c796ccec-c746-308f-8009-9f1f68e2aa62', $user->uuid);
 
         $this->json('POST', '/api/v1/users', [
             'password' => 'password',
diff --git a/tests/php/Http/Controllers/Api/UserRegistrationControllerTest.php b/tests/php/Http/Controllers/Api/UserRegistrationControllerTest.php
index f0d334ef3..06207df44 100644
--- a/tests/php/Http/Controllers/Api/UserRegistrationControllerTest.php
+++ b/tests/php/Http/Controllers/Api/UserRegistrationControllerTest.php
@@ -25,7 +25,7 @@ public function testAcceptRegistration()
         $this->beGlobalReviewer();
         $this->getJson("/api/v1/accept-user-registration/{$user->id}")
             ->assertStatus(200);
-        $this->assertEquals(Role::editorId(), $user->fresh()->role_id);
+        $this->assertSame(Role::editorId(), $user->fresh()->role_id);
 
         $this->getJson("/api/v1/accept-user-registration/{$user->id}")
             ->assertStatus(404);
diff --git a/tests/php/Http/Controllers/Api/UserSettingsControllerTest.php b/tests/php/Http/Controllers/Api/UserSettingsControllerTest.php
index 0f571da40..4aa889364 100644
--- a/tests/php/Http/Controllers/Api/UserSettingsControllerTest.php
+++ b/tests/php/Http/Controllers/Api/UserSettingsControllerTest.php
@@ -40,7 +40,7 @@ public function testUpdateAdditionalRules()
         $this->putJson("/api/v1/users/my/settings", ['test' => 123])
             ->assertStatus(200);
 
-        $this->assertEquals(['test' => 123], $this->user()->fresh()->settings);
+        $this->assertSame(['test' => 123], $this->user()->fresh()->settings);
     }
 
     public function testUpdateIncludeFederatedSearch()
diff --git a/tests/php/Http/Controllers/Api/VideoAnnotationControllerTest.php b/tests/php/Http/Controllers/Api/VideoAnnotationControllerTest.php
index fb1ef1afa..69cba4f5f 100644
--- a/tests/php/Http/Controllers/Api/VideoAnnotationControllerTest.php
+++ b/tests/php/Http/Controllers/Api/VideoAnnotationControllerTest.php
@@ -287,9 +287,9 @@ public function testStore()
 
         $annotation = $this->video->annotations()->first();
         $this->assertNotNull($annotation);
-        $this->assertEquals([[10, 11]], $annotation->points);
-        $this->assertEquals([0.0], $annotation->frames);
-        $this->assertEquals(1, $annotation->labels()->count());
+        $this->assertSame([[10, 11]], $annotation->points);
+        $this->assertSame([0], $annotation->frames);
+        $this->assertSame(1, $annotation->labels()->count());
     }
 
     public function testStoreValidatePoints()
@@ -551,7 +551,7 @@ public function testStoreAndTrackIncrementRateLimit()
             ])
             ->assertSuccessful();
 
-        $this->assertEquals(1, Cache::get(TrackObject::getRateLimitCacheKey($this->editor())));
+        $this->assertSame(1, Cache::get(TrackObject::getRateLimitCacheKey($this->editor())));
     }
 
     public function testStoreAndTrackRestrictRateLimit()
@@ -584,7 +584,7 @@ public function testTrackingJobLimit()
                 'track' => true,
             ])->assertSuccessful();
 
-        $this->assertEquals(1, Cache::get(TrackObject::getRateLimitCacheKey($this->editor())));
+        $this->assertSame(1, Cache::get(TrackObject::getRateLimitCacheKey($this->editor())));
         $this->assertFalse($res->json()['trackingJobLimitReached']);
 
         Cache::set(TrackObject::getRateLimitCacheKey($this->editor()), 9);
@@ -597,7 +597,7 @@ public function testTrackingJobLimit()
                 'track' => true,
             ])->assertSuccessful();
         
-        $this->assertEquals(10, Cache::get(TrackObject::getRateLimitCacheKey($this->editor())));
+        $this->assertSame(10, Cache::get(TrackObject::getRateLimitCacheKey($this->editor())));
         $this->assertTrue($res->json()['trackingJobLimitReached']);
     }
 
@@ -634,9 +634,9 @@ public function testStoreWholeFrameAnnotation()
 
         $annotation = $this->video->annotations()->first();
         $this->assertNotNull($annotation);
-        $this->assertEquals([], $annotation->points);
-        $this->assertEquals([0.0, 1.5], $annotation->frames);
-        $this->assertEquals(1, $annotation->labels()->count());
+        $this->assertEmpty($annotation->points);
+        $this->assertSame([0, 1.5], $annotation->frames);
+        $this->assertSame(1, $annotation->labels()->count());
     }
 
     public function testStoreWholeFrameSingleFrameAnnotation()
@@ -652,9 +652,9 @@ public function testStoreWholeFrameSingleFrameAnnotation()
 
         $annotation = $this->video->annotations()->first();
         $this->assertNotNull($annotation);
-        $this->assertEquals([], $annotation->points);
-        $this->assertEquals([0.0], $annotation->frames);
-        $this->assertEquals(1, $annotation->labels()->count());
+        $this->assertEmpty($annotation->points);
+        $this->assertSame([0], $annotation->frames);
+        $this->assertSame(1, $annotation->labels()->count());
     }
 
     public function testStoreAndTrackWholeFrameAnnotation()
@@ -723,8 +723,8 @@ public function testUpdate()
             ->assertStatus(200);
 
         $annotation = $annotation->fresh();
-        $this->assertEquals([[10, 20], [30, 40]], $annotation->points);
-        $this->assertEquals([1.0, 10.0], $annotation->frames);
+        $this->assertSame([[10, 20], [30, 40]], $annotation->points);
+        $this->assertSame([1, 10], $annotation->frames);
     }
 
     public function testUpdateValidatePoints()
@@ -785,7 +785,7 @@ public function testUpdateWholeFrameAnnotation()
             ->assertStatus(200);
 
         $annotation = $annotation->fresh();
-        $this->assertEquals([1.0, 2.0, null, 3.0, 4.0], $annotation->frames);
+        $this->assertSame([1, 2, null, 3, 4], $annotation->frames);
     }
 
     public function testDestroy()
diff --git a/tests/php/Http/Controllers/Api/VideoAnnotationLabelControllerTest.php b/tests/php/Http/Controllers/Api/VideoAnnotationLabelControllerTest.php
index 353d7e04d..8f4aa797a 100644
--- a/tests/php/Http/Controllers/Api/VideoAnnotationLabelControllerTest.php
+++ b/tests/php/Http/Controllers/Api/VideoAnnotationLabelControllerTest.php
@@ -52,8 +52,8 @@ public function testStore()
 
         $label = $annotation->labels()->first();
         $this->assertNotNull($label);
-        $this->assertEquals($this->labelRoot()->id, $label->label_id);
-        $this->assertEquals($this->editor()->id, $label->user_id);
+        $this->assertSame($this->labelRoot()->id, $label->label_id);
+        $this->assertSame($this->editor()->id, $label->user_id);
         Event::assertDispatched(AnnotationLabelAttached::class);
 
         $this
diff --git a/tests/php/Http/Controllers/Api/VideoFileControllerTest.php b/tests/php/Http/Controllers/Api/VideoFileControllerTest.php
index 9a19c9576..3232776da 100644
--- a/tests/php/Http/Controllers/Api/VideoFileControllerTest.php
+++ b/tests/php/Http/Controllers/Api/VideoFileControllerTest.php
@@ -69,9 +69,9 @@ public function testShowPartial()
                 ->getJson("api/v1/videos/{$video->id}/file")
                 ->assertStatus(206);
 
-            $this->assertEquals(6, $response->headers->get('Content-Length'));
+            $this->assertSame(6, intval($response->headers->get('Content-Length')));
             $this->assertTrue($response->headers->has('Content-Range'));
-            $this->assertEquals('bytes 3-8/9', $response->headers->get('Content-Range'));
+            $this->assertSame('bytes 3-8/9', $response->headers->get('Content-Range'));
         } finally {
             $disk->deleteDirectory('files');
         }
diff --git a/tests/php/Http/Controllers/Api/VideoLabelControllerTest.php b/tests/php/Http/Controllers/Api/VideoLabelControllerTest.php
index f54265fb9..bfd31dc52 100644
--- a/tests/php/Http/Controllers/Api/VideoLabelControllerTest.php
+++ b/tests/php/Http/Controllers/Api/VideoLabelControllerTest.php
@@ -53,7 +53,7 @@ public function testStore()
         $this
             ->postJson("/api/v1/videos/{$id}/labels")->assertStatus(422);
 
-        $this->assertEquals(0, $this->video->labels()->count());
+        $this->assertSame(0, $this->video->labels()->count());
 
         $this->beUser();
         $this
@@ -75,7 +75,7 @@ public function testStore()
                 'label_id' => $this->labelRoot()->id,
             ])
             ->assertSuccessful();
-        $this->assertEquals(1, $this->video->labels()->count());
+        $this->assertSame(1, $this->video->labels()->count());
 
         $this->beAdmin();
         // the same label cannot be attached twice
@@ -84,7 +84,7 @@ public function testStore()
                 'label_id' => $this->labelRoot()->id,
             ])
             ->assertStatus(400);
-        $this->assertEquals(1, $this->video->labels()->count());
+        $this->assertSame(1, $this->video->labels()->count());
 
         $this
             ->postJson("/api/v1/videos/{$id}/labels", [
@@ -102,7 +102,7 @@ public function testStore()
                 'lastname' => $this->admin()->lastname,
                 'role_id' => $this->admin()->role_id,
             ]);
-        $this->assertEquals(2, $this->video->labels()->count());
+        $this->assertSame(2, $this->video->labels()->count());
     }
 
     public function testDestroy()
diff --git a/tests/php/Http/Controllers/Api/VolumeAnnotationSessionControllerTest.php b/tests/php/Http/Controllers/Api/VolumeAnnotationSessionControllerTest.php
index 0e732bb1f..0362be438 100644
--- a/tests/php/Http/Controllers/Api/VolumeAnnotationSessionControllerTest.php
+++ b/tests/php/Http/Controllers/Api/VolumeAnnotationSessionControllerTest.php
@@ -119,7 +119,7 @@ public function testStore()
             'users' => [$this->admin()->id],
         ]);
         $response->assertSuccessful();
-        $this->assertEquals(2, $this->volume()->annotationSessions()->count());
+        $this->assertSame(2, $this->volume()->annotationSessions()->count());
 
         $session = $this->volume()->annotationSessions()
             ->with('users')
diff --git a/tests/php/Http/Controllers/Api/VolumeControllerTest.php b/tests/php/Http/Controllers/Api/VolumeControllerTest.php
index 44c8cdc43..a65711e59 100644
--- a/tests/php/Http/Controllers/Api/VolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/VolumeControllerTest.php
@@ -95,9 +95,9 @@ public function testUpdate()
             'media_type_id' => MediaType::videoId(),
         ]);
         $response->assertStatus(200);
-        $this->assertEquals('the new volume', $this->volume()->fresh()->name);
+        $this->assertSame('the new volume', $this->volume()->fresh()->name);
         // Media type cannot be updated.
-        $this->assertEquals(MediaType::imageId(), $this->volume()->fresh()->media_type_id);
+        $this->assertSame(MediaType::imageId(), $this->volume()->fresh()->media_type_id);
         Queue::assertNothingPushed();
     }
 
@@ -120,7 +120,7 @@ public function testUpdateHandle()
             ])
             ->assertStatus(200);
         $this->volume()->refresh();
-        $this->assertEquals('10.3389/fmars.2017.00083', $this->volume()->handle);
+        $this->assertSame('10.3389/fmars.2017.00083', $this->volume()->handle);
 
         // Some DOIs can contain multiple slashes.
         $this
@@ -169,7 +169,7 @@ public function testUpdateUrl()
             ])
             ->assertStatus(200);
 
-        $this->assertEquals('editor-test://volumes', $this->volume()->fresh()->url);
+        $this->assertSame('editor-test://volumes', $this->volume()->fresh()->url);
 
         $this->beGlobalAdmin();
         $this
@@ -182,7 +182,7 @@ public function testUpdateUrl()
                 'url' => 'admin-test://volumes',
             ])
             ->assertStatus(200);
-        $this->assertEquals('admin-test://volumes', $this->volume()->fresh()->url);
+        $this->assertSame('admin-test://volumes', $this->volume()->fresh()->url);
         Queue::assertPushed(ProcessNewVolumeFiles::class);
     }
 
@@ -201,7 +201,7 @@ public function testUpdateInvalidUrl()
             'url' => 'admin-test://aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
         ])->assertStatus(422);
         
-        $this->assertEquals('The url must not be greater than 256 characters.', $response->exception->getMessage());
+        $this->assertSame('The url must not be greater than 256 characters.', $response->exception->getMessage());
         Queue::assertNothingPushed();
     }
 
diff --git a/tests/php/Http/Controllers/Api/VolumeFileControllerTest.php b/tests/php/Http/Controllers/Api/VolumeFileControllerTest.php
index 9a9fb31a7..851ce82b8 100644
--- a/tests/php/Http/Controllers/Api/VolumeFileControllerTest.php
+++ b/tests/php/Http/Controllers/Api/VolumeFileControllerTest.php
@@ -74,7 +74,7 @@ public function testStoreImage()
         $this->beAdmin();
         $this->json('POST', "/api/v1/volumes/{$id}/files")->assertStatus(422);
 
-        $this->assertEquals(1, $this->volume()->images()->count());
+        $this->assertSame(1, $this->volume()->images()->count());
 
         $this
             ->json('POST', "/api/v1/volumes/{$id}/files", [
@@ -110,8 +110,8 @@ public function testStoreImage()
 
         $response->assertSimilarJson($images->toArray());
 
-        $this->assertEquals(1, $images->where('filename', '1.jpg')->count());
-        $this->assertEquals(1, $images->where('filename', '2.jpg')->count());
+        $this->assertSame(1, $images->where('filename', '1.jpg')->count());
+        $this->assertSame(1, $images->where('filename', '2.jpg')->count());
         Queue::assertPushed(ProcessNewVolumeFiles::class);
         Event::assertDispatched('images.created');
     }
@@ -178,7 +178,7 @@ public function testStoreVideo()
             ])->id;
         VideoTest::create(['filename' => 'no.mp4', 'volume_id' => $id]);
 
-        $this->assertEquals(1, $this->volume()->videos()->count());
+        $this->assertSame(1, $this->volume()->videos()->count());
 
         $this->beAdmin();
 
@@ -216,8 +216,8 @@ public function testStoreVideo()
 
         $response->assertSimilarJson($files->toArray());
 
-        $this->assertEquals(1, $files->where('filename', '1.mp4')->count());
-        $this->assertEquals(1, $files->where('filename', '2.mp4')->count());
+        $this->assertSame(1, $files->where('filename', '1.mp4')->count());
+        $this->assertSame(1, $files->where('filename', '2.mp4')->count());
         Queue::assertPushed(ProcessNewVolumeFiles::class);
     }
 
diff --git a/tests/php/Http/Controllers/Api/Volumes/IfdoControllerTest.php b/tests/php/Http/Controllers/Api/Volumes/IfdoControllerTest.php
index 861ffbe5c..f78817d5c 100644
--- a/tests/php/Http/Controllers/Api/Volumes/IfdoControllerTest.php
+++ b/tests/php/Http/Controllers/Api/Volumes/IfdoControllerTest.php
@@ -29,7 +29,7 @@ public function testGet()
 
         $response = $this->getJson("/api/v1/volumes/{$id}/ifdo");
         $response->assertStatus(200);
-        $this->assertEquals("attachment; filename=biigle-volume-{$id}-ifdo.yaml", $response->headers->get('content-disposition'));
+        $this->assertSame("attachment; filename=biigle-volume-{$id}-ifdo.yaml", $response->headers->get('content-disposition'));
     }
 
     public function testDestroy()
diff --git a/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php b/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php
index 9237a93bf..df5209f34 100644
--- a/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php
+++ b/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php
@@ -60,15 +60,15 @@ public function testStoreImageMetadata()
         $png = $png->fresh();
         $jpg = $jpg->fresh();
 
-        $this->assertEquals('2016-12-19 12:27:00', $jpg->taken_at);
-        $this->assertEquals(52.220, $jpg->lng);
-        $this->assertEquals(28.123, $jpg->lat);
-        $this->assertEquals(-1500, $jpg->metadata['gps_altitude']);
-        $this->assertEquals(2.6, $jpg->metadata['area']);
+        $this->assertSame('2016-12-19 12:27:00', $jpg->taken_at->toDateTimeString());
+        $this->assertSame(52.220, $jpg->lng);
+        $this->assertSame(28.123, $jpg->lat);
+        $this->assertSame(-1500, intval($jpg->metadata['gps_altitude']));
+        $this->assertSame(2.6, floatval($jpg->metadata['area']));
         // Import should update but not destroy existing metadata.
-        $this->assertEquals(10, $jpg->metadata['distance_to_ground']);
-        $this->assertEquals(4000, $jpg->metadata['water_depth']);
-        $this->assertEquals(180, $jpg->metadata['yaw']);
+        $this->assertSame(10, intval($jpg->metadata['distance_to_ground']));
+        $this->assertSame(4000, $jpg->metadata['water_depth']);
+        $this->assertSame(180, intval($jpg->metadata['yaw']));
 
         $this->assertNull($png->taken_at);
         $this->assertNull($png->lng);
@@ -106,9 +106,9 @@ public function testStoreDeprecatedFileAttribute()
             ->assertSuccessful();
 
         $image->refresh();
-        $this->assertEquals(4000, $image->metadata['water_depth']);
-        $this->assertEquals(10, $image->metadata['distance_to_ground']);
-        $this->assertEquals(2.6, $image->metadata['area']);
+        $this->assertSame(4000, $image->metadata['water_depth']);
+        $this->assertSame(10, intval($image->metadata['distance_to_ground']));
+        $this->assertSame(2.6, floatval($image->metadata['area']));
     }
 
     public function testStoreImageMetadataText()
@@ -130,9 +130,9 @@ public function testStoreImageMetadataText()
         ])->assertSuccessful();
 
         $image->refresh();
-        $this->assertEquals(4000, $image->metadata['water_depth']);
-        $this->assertEquals(10, $image->metadata['distance_to_ground']);
-        $this->assertEquals(2.5, $image->metadata['area']);
+        $this->assertSame(4000, $image->metadata['water_depth']);
+        $this->assertSame(10, intval($image->metadata['distance_to_ground']));
+        $this->assertSame(2.5, floatval($image->metadata['area']));
     }
 
     public function testStoreVideoMetadataCsv()
diff --git a/tests/php/Http/Controllers/Auth/ControllerTest.php b/tests/php/Http/Controllers/Auth/ControllerTest.php
index b35eaec64..c68fb79f5 100644
--- a/tests/php/Http/Controllers/Auth/ControllerTest.php
+++ b/tests/php/Http/Controllers/Auth/ControllerTest.php
@@ -70,7 +70,7 @@ public function testLoginSuccess()
 
         // login_at attribute should be set after login
         $this->assertNotNull($user->fresh()->login_at);
-        $this->assertEquals($user->id, Auth::user()->id);
+        $this->assertSame($user->id, Auth::user()->id);
         $response->assertRedirect('/');
     }
 
@@ -88,7 +88,7 @@ public function testLoginCaseInsensitive()
             'password' => 'password',
         ]);
 
-        $this->assertEquals($user->id, Auth::user()->id);
+        $this->assertSame($user->id, Auth::user()->id);
     }
 
     public function testLogout()
diff --git a/tests/php/Http/Controllers/Auth/RegisterControllerTest.php b/tests/php/Http/Controllers/Auth/RegisterControllerTest.php
index c43b337f4..fea7a811e 100644
--- a/tests/php/Http/Controllers/Auth/RegisterControllerTest.php
+++ b/tests/php/Http/Controllers/Auth/RegisterControllerTest.php
@@ -63,10 +63,10 @@ public function testRegisterSuccess()
 
         $user = User::where('email', 'e@ma.il')->first();
         $this->assertNotNull($user);
-        $this->assertEquals('a', $user->firstname);
-        $this->assertEquals('b', $user->lastname);
-        $this->assertEquals('something', $user->affiliation);
-        $this->assertEquals(Role::editorId(), $user->role_id);
+        $this->assertSame('a', $user->firstname);
+        $this->assertSame('b', $user->lastname);
+        $this->assertSame('something', $user->affiliation);
+        $this->assertSame(Role::editorId(), $user->role_id);
     }
 
     public function testRegisterHoneypot()
@@ -103,7 +103,7 @@ public function testRegisterHoneypot()
     public function testRegisterEmailTaken()
     {
         UserTest::create(['email' => 'test@test.com']);
-        $this->assertEquals(1, User::count());
+        $this->assertSame(1, User::count());
 
         $response = $this->get('register');
         $response = $this->post('register', [
@@ -114,13 +114,13 @@ public function testRegisterEmailTaken()
             'lastname'  => 'b',
         ])->assertRedirect('register');
 
-        $this->assertEquals(1, User::count());
+        $this->assertSame(1, User::count());
     }
 
     public function testRegisterEmailTakenCaseInsensitive()
     {
         UserTest::create(['email' => 'test@test.com']);
-        $this->assertEquals(1, User::count());
+        $this->assertSame(1, User::count());
 
         $response = $this->get('register');
         $response = $this->post('register', [
@@ -131,13 +131,13 @@ public function testRegisterEmailTakenCaseInsensitive()
             'lastname'  => 'b',
         ])->assertRedirect('register');
 
-        $this->assertEquals(1, User::count());
+        $this->assertSame(1, User::count());
     }
 
     public function testRegisterWhenLoggedIn()
     {
         $this->be(UserTest::create());
-        $this->assertEquals(1, User::count());
+        $this->assertSame(1, User::count());
 
         $this->get('register')->assertRedirect('/');
 
@@ -149,7 +149,7 @@ public function testRegisterWhenLoggedIn()
             'lastname'  => 'b',
         ])->assertRedirect('/');
 
-        $this->assertEquals(1, User::count());
+        $this->assertSame(1, User::count());
     }
 
     public function testRegisterPrivacy()
@@ -170,7 +170,7 @@ public function testRegisterPrivacy()
             'homepage' => 'honeypotvalue',
         ])->assertRedirect('register');
 
-        $this->assertEquals(0, User::count());
+        $this->assertSame(0, User::count());
 
         $response = $this->post('register', [
             '_token'    => Session::token(),
@@ -183,7 +183,7 @@ public function testRegisterPrivacy()
             'privacy' => '1',
         ])->assertRedirect('/');
 
-        $this->assertEquals(1, User::count());
+        $this->assertSame(1, User::count());
     }
 
     public function testRegisterTerms()
@@ -204,7 +204,7 @@ public function testRegisterTerms()
             'homepage' => 'honeypotvalue',
         ])->assertRedirect('register');
 
-        $this->assertEquals(0, User::count());
+        $this->assertSame(0, User::count());
 
         $response = $this->post('register', [
             '_token'    => Session::token(),
@@ -217,7 +217,7 @@ public function testRegisterTerms()
             'terms' => '1',
         ])->assertRedirect('/');
 
-        $this->assertEquals(1, User::count());
+        $this->assertSame(1, User::count());
     }
 
     public function testRegisterAdminConfirmationDisabled()
@@ -252,13 +252,13 @@ public function testRegisterAdminConfirmationEnabled()
         $user = User::where('email', 'e@ma.il')->first();
 
         Notification::assertSentTo(new AnonymousNotifiable, RegistrationConfirmation::class, function ($notification) use ($user) {
-            $this->assertEquals($user->id, $notification->user->id);
-            $this->assertEquals($user->email, $notification->toMail(null)->replyTo[0][0]);
+            $this->assertSame($user->id, $notification->user->id);
+            $this->assertSame($user->email, $notification->toMail(null)->replyTo[0][0]);
 
             return true;
         });
         $this->assertNotNull($user);
-        $this->assertEquals(Role::guestId(), $user->role_id);
+        $this->assertSame(Role::guestId(), $user->role_id);
     }
 
     public function testRegisterAdminConfirmationPossibleDuplicates()
diff --git a/tests/php/ImageAnnotationTest.php b/tests/php/ImageAnnotationTest.php
index 0c41b1ea4..23d3a137f 100644
--- a/tests/php/ImageAnnotationTest.php
+++ b/tests/php/ImageAnnotationTest.php
@@ -42,7 +42,7 @@ public function testCastPoints()
         $annotation = static::make();
         $annotation->points = [1, 2, 3, 4];
         $annotation->save();
-        $this->assertEquals([1, 2, 3, 4], $annotation->fresh()->points);
+        $this->assertSame([1, 2, 3, 4], $annotation->fresh()->points);
     }
 
     public function testRoundPoints()
@@ -50,7 +50,7 @@ public function testRoundPoints()
         $annotation = static::make();
         $annotation->points = [1.23456789, 2.23456789, 3.1415];
         $annotation->save();
-        $this->assertEquals([1.23, 2.23, 3.14], $annotation->fresh()->points);
+        $this->assertSame([1.23, 2.23, 3.14], $annotation->fresh()->points);
     }
 
     public function testLabels()
@@ -64,10 +64,10 @@ public function testLabels()
             'confidence' => 0.5,
         ]);
         $this->modelLabel->save();
-        $this->assertEquals(1, $this->model->labels()->count());
+        $this->assertSame(1, $this->model->labels()->count());
         $label = $this->model->labels()->first();
-        $this->assertEquals(0.5, $label->confidence);
-        $this->assertEquals($user->id, $label->user->id);
+        $this->assertSame(0.5, $label->confidence);
+        $this->assertSame($user->id, $label->user->id);
     }
 
     public function testValidatePointsInteger()
@@ -308,7 +308,7 @@ public function testScopeAllowedBySessionHideBoth()
         ]);
 
         $ids = ImageAnnotation::allowedBySession($session, $ownUser)->pluck('id')->toArray();
-        $this->assertEquals([$a3->id], $ids);
+        $this->assertSame([$a3->id], $ids);
     }
 
     public function testScopeVisibleFor()
@@ -335,18 +335,18 @@ public function testScopeWithLabel()
         $al1 = ImageAnnotationLabelTest::create();
         $al2 = ImageAnnotationLabelTest::create();
 
-        $this->assertEquals($al1->annotation->id, ImageAnnotation::withLabel($al1->label)->first()->id);
+        $this->assertSame($al1->annotation->id, ImageAnnotation::withLabel($al1->label)->first()->id);
     }
 
     public function testGetPoints()
     {
         $annotation = static::make(['points' => [1, 2]]);
-        $this->assertEquals([1, 2], $annotation->getPoints());
+        $this->assertSame([1, 2], $annotation->getPoints());
     }
 
     public function testGetShape()
     {
-        $this->assertEquals($this->model->shape, $this->model->getShape());
+        $this->assertSame($this->model->shape, $this->model->getShape());
     }
 
     public function testGetFile()
@@ -356,6 +356,6 @@ public function testGetFile()
 
     public function testGetFileIdAttribute()
     {
-        $this->assertEquals($this->model->image_id, $this->model->file_id);
+        $this->assertSame($this->model->image_id, $this->model->file_id);
     }
 }
diff --git a/tests/php/ImageTest.php b/tests/php/ImageTest.php
index 286699e97..88dfc378a 100644
--- a/tests/php/ImageTest.php
+++ b/tests/php/ImageTest.php
@@ -33,7 +33,7 @@ public function testAttributes()
 
     public function testGetUrl()
     {
-        $this->assertEquals($this->model->url, $this->model->getUrl());
+        $this->assertSame($this->model->url, $this->model->getUrl());
     }
 
     public function testHiddenAttributes()
@@ -75,7 +75,7 @@ public function testAnnotations()
     {
         $annotation = ImageAnnotationTest::create(['image_id' => $this->model->id]);
         ImageAnnotationTest::create(['image_id' => $this->model->id]);
-        $this->assertEquals(2, $this->model->annotations()->count());
+        $this->assertSame(2, $this->model->annotations()->count());
         $this->assertNotNull($this->model->annotations()->find($annotation->id));
     }
 
@@ -84,9 +84,9 @@ public function testGetFile()
         $this->model->mimetype = 'image/jpeg';
         $this->model->size = 123;
         $response = $this->model->getFile();
-        $this->assertEquals(200, $response->getStatusCode());
-        $this->assertEquals('image/jpeg', $response->headers->get('content-type'));
-        $this->assertEquals(123, $response->headers->get('content-length'));
+        $this->assertSame(200, $response->getStatusCode());
+        $this->assertSame('image/jpeg', $response->headers->get('content-type'));
+        $this->assertSame(123, intval($response->headers->get('content-length')));
     }
 
     public function testGetFileNotFound()
@@ -102,7 +102,7 @@ public function testGetFileRemote()
     {
         $this->model->volume->url = 'http://localhost';
         $response = $this->model->getFile();
-        $this->assertEquals($this->model->url, $response->getTargetUrl());
+        $this->assertSame($this->model->url, $response->getTargetUrl());
     }
 
     public function testGetFileTiled()
@@ -146,7 +146,7 @@ public function testGetFileTempUrl()
         Storage::shouldReceive('disk')->andReturn($mock);
 
         $response = $this->model->getFile();
-        $this->assertEquals('https://example.com', $response->getTargetUrl());
+        $this->assertSame('https://example.com', $response->getTargetUrl());
     }
 
     public function testGetFileDiskNotFound()
@@ -176,16 +176,16 @@ public function testTiledImagesDeletedEventOnDelete()
     public function testLabels()
     {
         $il = ImageLabelTest::create(['image_id' => $this->model->id]);
-        $this->assertEquals(1, $this->model->labels()->count());
+        $this->assertSame(1, $this->model->labels()->count());
         $label = $this->model->labels()->first();
-        $this->assertEquals($il->id, $label->id);
+        $this->assertSame($il->id, $label->id);
     }
 
     public function testCastsAttrs()
     {
         $this->model->attrs = ['a', 'b', 'c'];
         $this->model->save();
-        $this->assertEquals(['a', 'b', 'c'], $this->model->fresh()->attrs);
+        $this->assertSame(['a', 'b', 'c'], $this->model->fresh()->attrs);
     }
 
     public function testTakenAt()
@@ -193,7 +193,7 @@ public function testTakenAt()
         $now = Carbon::now();
         $this->model->taken_at = $now;
         $this->model->save();
-        $this->assertEquals($now->timestamp, $this->model->fresh()->taken_at->timestamp);
+        $this->assertSame($now->timestamp, $this->model->fresh()->taken_at->timestamp);
     }
 
     public function testLatLng()
@@ -202,8 +202,8 @@ public function testLatLng()
         $this->model->lng = 44.4;
         $this->model->save();
         $this->model = $this->model->fresh();
-        $this->assertEquals(55.5, $this->model->lat);
-        $this->assertEquals(44.4, $this->model->lng);
+        $this->assertSame(55.5, $this->model->lat);
+        $this->assertSame(44.4, $this->model->lng);
     }
 
     public function testTiledDefaultFalse()
@@ -216,10 +216,10 @@ public function testTiledDefaultFalse()
 
     public function testSetGetMetadataAttribute()
     {
-        $this->assertEquals([], $this->model->metadata);
+        $this->assertSame([], $this->model->metadata);
         $this->model->metadata = ['water_depth' => 4000];
         $this->model->save();
-        $this->assertEquals(['water_depth' => 4000], $this->model->fresh()->metadata);
+        $this->assertSame(['water_depth' => 4000], $this->model->fresh()->metadata);
     }
 
     public function testSetGetWidthHeight()
@@ -228,8 +228,8 @@ public function testSetGetWidthHeight()
         $this->model->height = 375;
         $this->model->save();
         $this->model->refresh();
-        $this->assertEquals(500, $this->model->width);
-        $this->assertEquals(375, $this->model->height);
+        $this->assertSame(500, $this->model->width);
+        $this->assertSame(375, $this->model->height);
     }
 
     public function testSetGetSize()
@@ -237,7 +237,7 @@ public function testSetGetSize()
         $this->model->size = 12345;
         $this->model->save();
         $this->model->refresh();
-        $this->assertEquals(12345, $this->model->size);
+        $this->assertSame(12345, $this->model->size);
     }
 
     public function testSetGetMimetype()
@@ -245,7 +245,7 @@ public function testSetGetMimetype()
         $this->model->mimetype = 'image/jpeg';
         $this->model->save();
         $this->model->refresh();
-        $this->assertEquals('image/jpeg', $this->model->mimetype);
+        $this->assertSame('image/jpeg', $this->model->mimetype);
     }
 
     public function testSetGetTilingInProgress()
diff --git a/tests/php/Jobs/CloneImagesOrVideosTest.php b/tests/php/Jobs/CloneImagesOrVideosTest.php
index 907b34ee3..499676f1c 100644
--- a/tests/php/Jobs/CloneImagesOrVideosTest.php
+++ b/tests/php/Jobs/CloneImagesOrVideosTest.php
@@ -69,7 +69,7 @@ public function testCloneImageVolume()
         $this->assertFalse($copy->creating_async);
 
         $ignore = ['id', 'created_at', 'updated_at'];
-        $this->assertEquals(
+        $this->assertSame(
             $volume->makeHidden($ignore)->toArray(),
             $copy->makeHidden($ignore)->toArray()
         );
@@ -151,21 +151,21 @@ public function testCloneVolumeImages()
 
         $this->assertNotNull($newImageLabel);
         $this->assertNotNull($newImage);
-        $this->assertEquals($volume->images()->count(), $copy->images()->count());
+        $this->assertSame($volume->images()->count(), $copy->images()->count());
         $this->assertNotEquals($oldImage->id, $newImage->id);
         $this->assertNotEquals($oldImage->uuid, $newImage->uuid);
-        $this->assertEquals($copy->id, $newImage->volume_id);
+        $this->assertSame($copy->id, $newImage->volume_id);
         $this->assertNotEquals($oldImageLabel->id, $newImageLabel->id);
         $this->assertNotEquals($oldImageLabel->image_id, $newImageLabel->image_id);
 
         $ignore = ['id', 'volume_id', 'uuid'];
-        $this->assertEquals(
+        $this->assertSame(
             $oldImage->makeHidden($ignore)->toArray(),
             $newImage->makeHidden($ignore)->toArray(),
         );
 
         $ignore = ['id', 'image_id'];
-        $this->assertEquals(
+        $this->assertSame(
             $oldImageLabel->makeHidden($ignore)->toArray(),
             $newImageLabel->makeHidden($ignore)->toArray(),
         );
@@ -213,7 +213,7 @@ public function testCloneVolumeImagesWithSomeLabels()
         $newImage = $copy->images()->first();
         $newImageLabel = $newImage->labels()->get();
 
-        $this->assertEquals(2, $newImageLabel->count());
+        $this->assertSame(2, $newImageLabel->count());
         $this->assertContains($l2->label_id, $newImageLabel->pluck('label_id'));
         $this->assertContains($l3->label_id, $newImageLabel->pluck('label_id'));
     }
@@ -259,10 +259,10 @@ public function testCloneVolumeVideos()
 
         $this->assertNotNull($newVideo);
         $this->assertNotNull($newVideoLabel);
-        $this->assertEquals($volume->videos()->count(), $copy->videos()->count());
+        $this->assertSame($volume->videos()->count(), $copy->videos()->count());
         $this->assertNotEquals($oldVideo->id, $newVideo->id);
         $this->assertNotEquals($oldVideo->uuid, $newVideo->uuid);
-        $this->assertEquals($copy->id, $newVideo->volume_id);
+        $this->assertSame($copy->id, $newVideo->volume_id);
         $this->assertNotEquals($oldVideoLabel->id, $newVideoLabel->id);
         $this->assertNotEquals($oldVideoLabel->video_id, $newVideoLabel->video_id);
 
@@ -320,7 +320,7 @@ public function testCloneVolumeVideosWithSomeLabels()
         $newVideo = $copy->videos()->first();
         $newVideoLabels = $newVideo->labels()->get();
 
-        $this->assertEquals(2, $newVideoLabels->count());
+        $this->assertSame(2, $newVideoLabels->count());
         $this->assertContains($l2->label_id, $newVideoLabels->pluck('label_id'));
         $this->assertContains($l3->label_id, $newVideoLabels->pluck('label_id'));
     }
@@ -365,9 +365,9 @@ public function testCloneVolumeImageAnnotations()
         $this->assertNotNull($newAnnotationLabel);
         $this->assertNotEquals($oldAnnotation->id, $newAnnotation->id);
         $this->assertNotEquals($oldAnnotation->image_id, $newAnnotation->image_id);
-        $this->assertEquals($newAnnotation->image_id, $newImage->id);
+        $this->assertSame($newAnnotation->image_id, $newImage->id);
         $this->assertNotEquals($oldAnnotationLabel->id, $newAnnotationLabel->id);
-        $this->assertEquals($newAnnotation->id, $newAnnotationLabel->annotation_id);
+        $this->assertSame($newAnnotation->id, $newAnnotationLabel->annotation_id);
 
         $ignore = ['id', 'image_id'];
         $this->assertEquals(
@@ -417,7 +417,7 @@ public function testCloneVolumeImageAnnotationsWithSomeLabels()
         $newAnnotation = $newImage->annotations()->first();
         $newAnnotationLabels = $newAnnotation->labels()->get();
 
-        $this->assertEquals(2, $newAnnotationLabels->count());
+        $this->assertSame(2, $newAnnotationLabels->count());
         $this->assertContains($l2->label_id, $newAnnotationLabels->pluck('label_id'));
         $this->assertContains($l3->label_id, $newAnnotationLabels->pluck('label_id'));
     }
@@ -487,9 +487,9 @@ public function testCloneVolumeVideoAnnotations()
         $this->assertNotNull($newAnnotationLabel);
         $this->assertNotEquals($oldAnnotation->id, $newAnnotation->id);
         $this->assertNotEquals($oldAnnotation->video_id, $newAnnotation->video_id);
-        $this->assertEquals($newVideo->id, $newAnnotation->video_id);
+        $this->assertSame($newVideo->id, $newAnnotation->video_id);
         $this->assertNotEquals($oldAnnotationLabel->id, $newAnnotationLabel->id);
-        $this->assertEquals($newAnnotation->id, $newAnnotationLabel->annotation_id);
+        $this->assertSame($newAnnotation->id, $newAnnotationLabel->annotation_id);
 
         $ignore = ['id', 'video_id'];
         $this->assertEquals(
@@ -540,7 +540,7 @@ public function testCloneVolumeVideoAnnotationsWithSomeLabels()
         $newAnnotation = $newVideo->annotations()->first();
         $newAnnotationLabels = $newAnnotation->labels()->get();
 
-        $this->assertEquals(2, $newAnnotationLabels->count());
+        $this->assertSame(2, $newAnnotationLabels->count());
         $this->assertContains($l2->label_id, $newAnnotationLabels->pluck('label_id'));
         $this->assertContains($l3->label_id, $newAnnotationLabels->pluck('label_id'));
     }
@@ -602,7 +602,7 @@ public function testCloneVolumeIfDoFiles()
 
         $this->assertNotNull($copy->getIfdo());
         $this->assertTrue($copy->hasIfdo());
-        $this->assertEquals($volume->getIfdo(), $copy->getIfdo());
+        $this->assertSame($volume->getIfdo(), $copy->getIfdo());
     }
 
     public function testHandleVolumeImages()
diff --git a/tests/php/Jobs/CreateNewImagesOrVideosTest.php b/tests/php/Jobs/CreateNewImagesOrVideosTest.php
index 06044f071..6dce211e1 100644
--- a/tests/php/Jobs/CreateNewImagesOrVideosTest.php
+++ b/tests/php/Jobs/CreateNewImagesOrVideosTest.php
@@ -74,13 +74,13 @@ public function testHandleImageMetadata()
 
         with(new CreateNewImagesOrVideos($volume, $filenames, $metadata))->handle();
         $image = $volume->images()->first();
-        $this->assertEquals('2016-12-19 12:27:00', $image->taken_at);
-        $this->assertEquals(52.220, $image->lng);
-        $this->assertEquals(28.123, $image->lat);
-        $this->assertEquals(-1500, $image->metadata['gps_altitude']);
-        $this->assertEquals(2.6, $image->metadata['area']);
-        $this->assertEquals(10, $image->metadata['distance_to_ground']);
-        $this->assertEquals(180, $image->metadata['yaw']);
+        $this->assertSame('2016-12-19 12:27:00', $image->taken_at->toDateTimeString());
+        $this->assertSame(52.220, $image->lng);
+        $this->assertSame(28.123, $image->lat);
+        $this->assertSame(-1500, intval($image->metadata['gps_altitude']));
+        $this->assertSame(2.6, floatval($image->metadata['area']));
+        $this->assertSame(10, intval($image->metadata['distance_to_ground']));
+        $this->assertSame(180, intval($image->metadata['yaw']));
     }
 
     public function testHandleImageMetadataEmptyCells()
@@ -96,8 +96,8 @@ public function testHandleImageMetadataEmptyCells()
 
         with(new CreateNewImagesOrVideos($volume, $filenames, $metadata))->handle();
         $image = $volume->images()->first();
-        $this->assertEquals(52.220, $image->lng);
-        $this->assertEquals(28.123, $image->lat);
+        $this->assertSame(52.220, $image->lng);
+        $this->assertSame(28.123, $image->lat);
         $this->assertEmpty($image->metadata);
     }
 
@@ -113,7 +113,7 @@ public function testHandleImageMetadataIncomplete()
         ];
 
         with(new CreateNewImagesOrVideos($volume, $filenames, $metadata))->handle();
-        $this->assertEquals(2, $volume->images()->count());
+        $this->assertSame(2, $volume->images()->count());
     }
 
     public function testHandleVideoMetadata()
@@ -136,12 +136,12 @@ public function testHandleVideoMetadata()
             Carbon::parse('2016-12-19 12:28:00'),
         ];
         $this->assertEquals($expect, $video->taken_at);
-        $this->assertEquals([52.220, 52.230], $video->lng);
-        $this->assertEquals([28.123, 28.133], $video->lat);
-        $this->assertEquals([-1500, -1505], $video->metadata['gps_altitude']);
-        $this->assertEquals([2.6, 1.6], $video->metadata['area']);
-        $this->assertEquals([10, 5], $video->metadata['distance_to_ground']);
-        $this->assertEquals([180, 181], $video->metadata['yaw']);
+        $this->assertSame([52.220, 52.230], $video->lng);
+        $this->assertSame([28.123, 28.133], $video->lat);
+        $this->assertSame([-1500, -1505], $video->metadata['gps_altitude']);
+        $this->assertSame([2.6, 1.6], $video->metadata['area']);
+        $this->assertSame([10, 5], $video->metadata['distance_to_ground']);
+        $this->assertSame([180, 181], $video->metadata['yaw']);
     }
 
     public function testHandleVideoMetadataEmptyCells()
@@ -227,7 +227,7 @@ public function testHandleVideoMetadataIncomplete()
         ];
 
         with(new CreateNewImagesOrVideos($volume, $filenames, $metadata))->handle();
-        $this->assertEquals(2, $volume->videos()->count());
+        $this->assertSame(2, $volume->videos()->count());
     }
 
     public function testHandleMetadataDateParsing()
@@ -243,6 +243,6 @@ public function testHandleMetadataDateParsing()
 
         with(new CreateNewImagesOrVideos($volume, $filenames, $metadata))->handle();
         $image = $volume->images()->first();
-        $this->assertEquals('2019-05-01 10:35:00', $image->taken_at);
+        $this->assertSame('2019-05-01 10:35:00', $image->taken_at->toDateTimeString());
     }
 }
diff --git a/tests/php/Jobs/GenerateFederatedSearchIndexTest.php b/tests/php/Jobs/GenerateFederatedSearchIndexTest.php
index 3df954463..2fbf63813 100644
--- a/tests/php/Jobs/GenerateFederatedSearchIndexTest.php
+++ b/tests/php/Jobs/GenerateFederatedSearchIndexTest.php
@@ -25,7 +25,7 @@ public function testHandle()
         ];
 
         $index = Cache::get(config('biigle.federated_search.cache_key'));
-        $this->assertEquals($expect, $index);
+        $this->assertSame($expect, $index);
     }
 
     public function testHandleLabelTree()
@@ -54,7 +54,7 @@ public function testHandleLabelTree()
         ];
         $index = Cache::get(config('biigle.federated_search.cache_key'));
         $this->assertEquals($expectTrees, $index['label_trees']);
-        $this->assertEquals($expectUsers, $index['users']);
+        $this->assertSame($expectUsers, $index['users']);
     }
 
     public function testHandleLabelTreeVersion()
@@ -66,7 +66,7 @@ public function testHandleLabelTreeVersion()
         (new GenerateFederatedSearchIndex)->handle();
         $index = Cache::get(config('biigle.federated_search.cache_key'));
         $this->assertCount(1, $index['label_trees']);
-        $this->assertEquals($version->label_tree_id, $index['label_trees'][0]['id']);
+        $this->assertSame($version->label_tree_id, $index['label_trees'][0]['id']);
     }
 
     public function testHandleLabelTreeGlobal()
@@ -104,7 +104,7 @@ public function testHandleProject()
         ];
         $index = Cache::get(config('biigle.federated_search.cache_key'));
         $this->assertEquals($expectProjects, $index['projects']);
-        $this->assertEquals($expectUsers, $index['users']);
+        $this->assertSame($expectUsers, $index['users']);
     }
 
     public function testHandleProjectLabelTrees()
@@ -117,7 +117,7 @@ public function testHandleProjectLabelTrees()
         $project->labelTrees()->attach($tree);
         (new GenerateFederatedSearchIndex)->handle();
         $index = Cache::get(config('biigle.federated_search.cache_key'));
-        $this->assertEquals([$tree->id], $index['projects'][0]['label_trees']);
+        $this->assertSame([$tree->id], $index['projects'][0]['label_trees']);
     }
 
     public function testHandleProjectVolumes()
@@ -127,7 +127,7 @@ public function testHandleProjectVolumes()
         $project->volumes()->attach($volume);
         (new GenerateFederatedSearchIndex)->handle();
         $index = Cache::get(config('biigle.federated_search.cache_key'));
-        $this->assertEquals([$volume->id], $index['projects'][0]['volumes']);
+        $this->assertSame([$volume->id], $index['projects'][0]['volumes']);
     }
 
     public function testHandleVolume()
@@ -166,6 +166,6 @@ public function testHandleUsers()
         ];
 
         $index = Cache::get(config('biigle.federated_search.cache_key'));
-        $this->assertEquals($expect, $index['users']);
+        $this->assertSame($expect, $index['users']);
     }
 }
diff --git a/tests/php/Jobs/ProcessNewImageTest.php b/tests/php/Jobs/ProcessNewImageTest.php
index bc7a34c54..5184f515f 100644
--- a/tests/php/Jobs/ProcessNewImageTest.php
+++ b/tests/php/Jobs/ProcessNewImageTest.php
@@ -34,14 +34,14 @@ public function testHandleCollectMetadata()
 
         $image = $image->fresh();
 
-        $this->assertEquals('2011-12-31 17:07:29', (string) $image->taken_at);
+        $this->assertSame('2011-12-31 17:07:29', (string) $image->taken_at);
         $this->assertEqualsWithDelta(12.486211944, $image->lng, 0.000001);
         $this->assertEqualsWithDelta(41.8898575, $image->lat, 0.000001);
-        $this->assertEquals(56.819, $image->metadata['gps_altitude']);
-        $this->assertEquals(500, $image->width);
-        $this->assertEquals(375, $image->height);
-        $this->assertEquals(62411, $image->size);
-        $this->assertEquals('image/jpeg', $image->mimetype);
+        $this->assertSame(56.819, $image->metadata['gps_altitude']);
+        $this->assertSame(500, $image->width);
+        $this->assertSame(375, $image->height);
+        $this->assertSame(62411, $image->size);
+        $this->assertSame('image/jpeg', $image->mimetype);
         $this->assertTrue($volume->hasGeoInfo());
     }
 
@@ -58,7 +58,7 @@ public function testHandleCollectMetadataZeroDate()
         $job->exif = ['DateTimeOriginal' => '0000-00-00 00:00:00'];
         $job->handle();
         $image = $image->fresh();
-        $this->assertEquals(null, $image->taken_at);
+        $this->assertSame(null, $image->taken_at);
     }
 
     public function testHandleCollectMetadataAreaYaw()
@@ -76,8 +76,8 @@ public function testHandleCollectMetadataAreaYaw()
         $job->handle();
         $image = $image->fresh();
 
-        $this->assertEquals(47.75, $image->metadata['yaw']);
-        $this->assertEquals(2.6, $image->metadata['area']);
+        $this->assertSame(47.75, floatval($image->metadata['yaw']));
+        $this->assertSame(2.6, floatval($image->metadata['area']));
     }
 
     public function testHandleMakeThumbnail()
@@ -209,7 +209,7 @@ public function testHandleMergeMetadata()
             'distance_to_ground' => 5,
             'gps_altitude' => 500,
         ];
-        $this->assertEquals($expect, $image->metadata);
+        $this->assertSame($expect, $image->metadata);
     }
 }
 
diff --git a/tests/php/Jobs/ProcessNewVideoTest.php b/tests/php/Jobs/ProcessNewVideoTest.php
index 1262b85ea..a6869dacd 100644
--- a/tests/php/Jobs/ProcessNewVideoTest.php
+++ b/tests/php/Jobs/ProcessNewVideoTest.php
@@ -21,8 +21,8 @@ public function testHandleThumbnails()
         $job->duration = 10;
 
         $job->handle();
-        $this->assertEquals(10, $video->fresh()->duration);
-        $this->assertEquals([0.5, 5, 9.5], $job->times);
+        $this->assertSame(10, intval($video->fresh()->duration));
+        $this->assertSame([0.5, 5.0, 9.5], $job->times);
 
         $disk = Storage::disk('video-thumbs');
         $fragment = fragment_uuid_path($video->uuid);
@@ -40,7 +40,7 @@ public function testHandleNotFound()
             $job->handle();
             $this->fail('Expected an exception.');
         } catch (Exception $e) {
-            $this->assertEquals(Video::ERROR_NOT_FOUND, $video->fresh()->error);
+            $this->assertSame(Video::ERROR_NOT_FOUND, $video->fresh()->error);
         }
     }
 
@@ -55,7 +55,7 @@ public function testHandleTooLarge()
             $job->handle();
             $this->fail('Expected an exception.');
         } catch (Exception $e) {
-            $this->assertEquals(Video::ERROR_TOO_LARGE, $video->fresh()->error);
+            $this->assertSame(Video::ERROR_TOO_LARGE, $video->fresh()->error);
         }
     }
 
@@ -64,7 +64,7 @@ public function testHandleMimeType()
         $video = VideoTest::create(['filename' => 'test.mp4']);
         $job = new ProcessNewVideoStub($video);
         $job->handle();
-        $this->assertEquals('video/mp4', $video->fresh()->mimeType);
+        $this->assertSame('video/mp4', $video->fresh()->mimeType);
     }
 
     public function testHandleInvalidMimeType()
@@ -72,8 +72,8 @@ public function testHandleInvalidMimeType()
         $video = VideoTest::create(['filename' => 'test-image.jpg']);
         $job = new ProcessNewVideoStub($video);
         $job->handle();
-        $this->assertEquals('image/jpeg', $video->fresh()->mimeType);
-        $this->assertEquals(Video::ERROR_MIME_TYPE, $video->fresh()->error);
+        $this->assertSame('image/jpeg', $video->fresh()->mimeType);
+        $this->assertSame(Video::ERROR_MIME_TYPE, $video->fresh()->error);
     }
 
     public function testHandleInvalidMimeTypeFileCache()
@@ -87,7 +87,7 @@ public function testHandleInvalidMimeTypeFileCache()
             $job->handle();
             $this->fail('Expected an exception.');
         } catch (Exception $e) {
-            $this->assertEquals(Video::ERROR_MIME_TYPE, $video->fresh()->error);
+            $this->assertSame(Video::ERROR_MIME_TYPE, $video->fresh()->error);
         }
     }
 
@@ -96,7 +96,7 @@ public function testHandleSize()
         $video = VideoTest::create(['filename' => 'test.mp4']);
         $job = new ProcessNewVideoStub($video);
         $job->handle();
-        $this->assertEquals(104500, $video->fresh()->size);
+        $this->assertSame(104500, $video->fresh()->size);
     }
 
     public function testHandleDimensions()
@@ -104,8 +104,8 @@ public function testHandleDimensions()
         $video = VideoTest::create(['filename' => 'test.mp4']);
         $job = new ProcessNewVideoStub($video);
         $job->handle();
-        $this->assertEquals(120, $video->fresh()->width);
-        $this->assertEquals(144, $video->fresh()->height);
+        $this->assertSame(120, $video->fresh()->width);
+        $this->assertSame(144, $video->fresh()->height);
     }
 
     public function testHandleMalformed()
@@ -113,7 +113,7 @@ public function testHandleMalformed()
         $video = VideoTest::create(['filename' => 'test_malformed.mp4']);
         $job = new ProcessNewVideoStub($video);
         $job->handle();
-        $this->assertEquals(Video::ERROR_MALFORMED, $video->fresh()->error);
+        $this->assertSame(Video::ERROR_MALFORMED, $video->fresh()->error);
     }
 
     public function testHandleInvalidCodec()
@@ -122,7 +122,7 @@ public function testHandleInvalidCodec()
         $job = new ProcessNewVideoStub($video);
         $job->codec = 'h265';
         $job->handle();
-        $this->assertEquals(Video::ERROR_CODEC, $video->fresh()->error);
+        $this->assertSame(Video::ERROR_CODEC, $video->fresh()->error);
     }
 
     public function testHandleKeepErrorOnError()
@@ -136,7 +136,7 @@ public function testHandleKeepErrorOnError()
             $job->handle();
             $this->fail('Expected an exception.');
         } catch (Exception $e) {
-            $this->assertEquals(Video::ERROR_MALFORMED, $video->fresh()->error);
+            $this->assertSame(Video::ERROR_MALFORMED, $video->fresh()->error);
         }
     }
 
diff --git a/tests/php/Jobs/TileSingleImageTest.php b/tests/php/Jobs/TileSingleImageTest.php
index 7eed98310..ace04048a 100644
--- a/tests/php/Jobs/TileSingleImageTest.php
+++ b/tests/php/Jobs/TileSingleImageTest.php
@@ -55,7 +55,7 @@ public function testQueue()
         config(['image.tiles.queue' => 'myqueue']);
         $image = ImageTest::create();
         $job = new TileSingleImageStub($image);
-        $this->assertEquals('myqueue', $job->queue);
+        $this->assertSame('myqueue', $job->queue);
     }
 }
 
diff --git a/tests/php/Jobs/TrackObjectTest.php b/tests/php/Jobs/TrackObjectTest.php
index 4e1237cad..902e6d002 100644
--- a/tests/php/Jobs/TrackObjectTest.php
+++ b/tests/php/Jobs/TrackObjectTest.php
@@ -41,10 +41,10 @@ public function testHandle()
 
         $job = new TrackObjectStub($annotation, $user);
         $job->handle();
-        $this->assertEquals(2, count($job->files));
+        $this->assertSame(2, count($job->files));
         $input = json_decode($job->files[0], true);
-        $this->assertEquals(0.5, $input['start_time']);
-        $this->assertEquals(123, $input['keyframe_distance']);
+        $this->assertSame(0.5, $input['start_time']);
+        $this->assertSame(123, $input['keyframe_distance']);
         $this->assertArrayHasKey('video_path', $input);
 
         foreach ($job->paths as $path) {
@@ -89,7 +89,7 @@ public function testHandleCacheKeyMany()
         $job = new TrackObjectStub($annotation, $user);
         $job->handle();
 
-        $this->assertEquals(1, Cache::get(TrackObjectStub::getRateLimitCacheKey($user)));
+        $this->assertSame(1, Cache::get(TrackObjectStub::getRateLimitCacheKey($user)));
     }
 
     public function testHandlePoint()
@@ -109,17 +109,17 @@ public function testHandlePoint()
         $job->handle();
 
         Event::assertDispatched(function (ObjectTrackingSucceeded $event) use ($annotation, $user) {
-            $this->assertEquals($user->id, $event->user->id);
-            $this->assertEquals($annotation->id, $event->annotation->id);
+            $this->assertSame($user->id, $event->user->id);
+            $this->assertSame($annotation->id, $event->annotation->id);
             return true;
         });
 
-        $this->assertEquals([0.5, 1.0, 2.0, 3.0], $annotation->fresh()->frames);
+        $this->assertSame([0.5, 1, 2, 3], $annotation->fresh()->frames);
         $expect = [[0, 0], [10, 10], [20, 20], [30, 30]];
-        $this->assertEquals($expect, $annotation->fresh()->points);
+        $this->assertSame($expect, $annotation->fresh()->points);
 
         $input = json_decode($job->files[0], true);
-        $this->assertEquals([-15, -15, 30, 30], $input['start_window']);
+        $this->assertSame([-15, -15, 30, 30], $input['start_window']);
     }
 
     public function testHandleCirlce()
@@ -137,17 +137,17 @@ public function testHandleCirlce()
         $job->handle();
 
         Event::assertDispatched(function (ObjectTrackingSucceeded $event) use ($annotation, $user) {
-            $this->assertEquals($user->id, $event->user->id);
-            $this->assertEquals($annotation->id, $event->annotation->id);
+            $this->assertSame($user->id, $event->user->id);
+            $this->assertSame($annotation->id, $event->annotation->id);
             return true;
         });
 
-        $this->assertEquals([0.5, 1.0, 2.0, 3.0], $annotation->fresh()->frames);
+        $this->assertSame([0.5, 1, 2, 3], $annotation->fresh()->frames);
         $expect = [[10, 10, 5], [10, 10, 5], [20, 20, 6], [30, 30, 7]];
-        $this->assertEquals($expect, $annotation->fresh()->points);
+        $this->assertSame($expect, $annotation->fresh()->points);
 
         $input = json_decode($job->files[0], true);
-        $this->assertEquals([5, 5, 10, 10], $input['start_window']);
+        $this->assertSame([5, 5, 10, 10], $input['start_window']);
     }
 
     public function testHandleFailure()
@@ -164,14 +164,14 @@ public function testHandleFailure()
         $job->throw = true;
         $job->handle();
         Event::assertDispatched(function (ObjectTrackingFailed $event) use ($annotation, $user) {
-            $this->assertEquals($user->id, $event->user->id);
-            $this->assertEquals($annotation->id, $event->annotation->id);
+            $this->assertSame($user->id, $event->user->id);
+            $this->assertSame($annotation->id, $event->annotation->id);
             return true;
         });
 
         $annotation->refresh();
-        $this->assertEquals([0.5], $annotation->frames);
-        $this->assertEquals([[10, 10]], $annotation->points);
+        $this->assertSame([0.5], $annotation->frames);
+        $this->assertSame([[10, 10]], $annotation->points);
     }
 
     public function testHandleEmpty()
@@ -189,14 +189,14 @@ public function testHandleEmpty()
         $job->keyframes = '[]';
         $job->handle();
         Event::assertDispatched(function (ObjectTrackingFailed $event) use ($annotation, $user) {
-            $this->assertEquals($user->id, $event->user->id);
-            $this->assertEquals($annotation->id, $event->annotation->id);
+            $this->assertSame($user->id, $event->user->id);
+            $this->assertSame($annotation->id, $event->annotation->id);
             return true;
         });
 
         $annotation->refresh();
-        $this->assertEquals([0.5], $annotation->frames);
-        $this->assertEquals([[10, 10, 5]], $annotation->points);
+        $this->assertSame([0.5], $annotation->frames);
+        $this->assertSame([[10, 10, 5]], $annotation->points);
     }
 }
 
diff --git a/tests/php/Jobs/UpdateFederatedSearchIndexTest.php b/tests/php/Jobs/UpdateFederatedSearchIndexTest.php
index 902dd8f6c..fd5520e31 100644
--- a/tests/php/Jobs/UpdateFederatedSearchIndexTest.php
+++ b/tests/php/Jobs/UpdateFederatedSearchIndexTest.php
@@ -38,8 +38,8 @@ public function testHandleRequest()
 
         $this->assertCount(1, $container);
         $request = $container[0]['request'];
-        $this->assertEquals('https://example.com/api/v1/federated-search-index', strval($request->getUri()));
-        $this->assertEquals('Bearer my_token', $request->getHeaderLine('Authorization'));
+        $this->assertSame('https://example.com/api/v1/federated-search-index', strval($request->getUri()));
+        $this->assertSame('Bearer my_token', $request->getHeaderLine('Authorization'));
         $this->assertNotNull($instance->fresh()->indexed_at);
     }
 
@@ -104,12 +104,12 @@ public function testHandleLabelTrees()
 
         $model = FederatedSearchModel::first();
         $this->assertNotNull($model);
-        $this->assertEquals($labelTree['name'], $model->name);
-        $this->assertEquals($labelTree['description'], $model->description);
-        $this->assertEquals($labelTree['created_at'], $model->created_at);
-        $this->assertEquals($labelTree['updated_at'], $model->updated_at);
-        $this->assertEquals($instance->url.$labelTree['url'], $model->url);
-        $this->assertEquals(LabelTree::class, $model->type);
+        $this->assertSame($labelTree['name'], $model->name);
+        $this->assertSame($labelTree['description'], $model->description);
+        $this->assertSame($labelTree['created_at'], $model->created_at->toDateTimeString());
+        $this->assertSame($labelTree['updated_at'], $model->updated_at->toDateTimeString());
+        $this->assertSame($instance->url.$labelTree['url'], $model->url);
+        $this->assertSame(LabelTree::class, $model->type);
 
         $this->assertTrue($user->federatedSearchModels()->exists());
     }
@@ -153,13 +153,13 @@ public function testHandleProjects()
 
         $model = FederatedSearchModel::first();
         $this->assertNotNull($model);
-        $this->assertEquals($project['name'], $model->name);
-        $this->assertEquals($project['description'], $model->description);
-        $this->assertEquals($project['created_at'], $model->created_at);
-        $this->assertEquals($project['updated_at'], $model->updated_at);
-        $this->assertEquals($instance->url.$project['url'], $model->url);
-        $this->assertEquals($project['thumbnail_url'], $model->thumbnailUrl);
-        $this->assertEquals(Project::class, $model->type);
+        $this->assertSame($project['name'], $model->name);
+        $this->assertSame($project['description'], $model->description);
+        $this->assertSame($project['created_at'], $model->created_at->toDateTimeString());
+        $this->assertSame($project['updated_at'], $model->updated_at->toDateTimeString());
+        $this->assertSame($instance->url.$project['url'], $model->url);
+        $this->assertSame($project['thumbnail_url'], $model->thumbnailUrl);
+        $this->assertSame(Project::class, $model->type);
 
         $this->assertTrue($user->federatedSearchModels()->projects()->exists());
     }
@@ -309,14 +309,14 @@ public function testHandleVolumes()
 
         $model = FederatedSearchModel::where('name', 'remote volume')->first();
         $this->assertNotNull($model);
-        $this->assertEquals($volume['name'], $model->name);
+        $this->assertSame($volume['name'], $model->name);
         $this->assertNull($model->description);
-        $this->assertEquals($volume['created_at'], $model->created_at);
-        $this->assertEquals($volume['updated_at'], $model->updated_at);
-        $this->assertEquals($instance->url.$volume['url'], $model->url);
-        $this->assertEquals($volume['thumbnail_url'], $model->thumbnailUrl);
-        $this->assertEquals($volume['thumbnail_urls'], $model->thumbnailUrls->toArray());
-        $this->assertEquals(Volume::class, $model->type);
+        $this->assertSame($volume['created_at'], $model->created_at->toDateTimeString());
+        $this->assertSame($volume['updated_at'], $model->updated_at->toDateTimeString());
+        $this->assertSame($instance->url.$volume['url'], $model->url);
+        $this->assertSame($volume['thumbnail_url'], $model->thumbnailUrl);
+        $this->assertSame($volume['thumbnail_urls'], $model->thumbnailUrls->toArray());
+        $this->assertSame(Volume::class, $model->type);
     }
 
     public function testHandleCleanupDanglingModels()
diff --git a/tests/php/LabelSourceTest.php b/tests/php/LabelSourceTest.php
index 19f5e0289..e86dac58e 100644
--- a/tests/php/LabelSourceTest.php
+++ b/tests/php/LabelSourceTest.php
@@ -42,6 +42,6 @@ public function testGetAdapter()
 
         $source = self::create(['name' => 'ab_cd']);
 
-        $this->assertEquals($mock, $source->getAdapter());
+        $this->assertSame($mock, $source->getAdapter());
     }
 }
diff --git a/tests/php/LabelTest.php b/tests/php/LabelTest.php
index d01455cc2..1546fe9da 100644
--- a/tests/php/LabelTest.php
+++ b/tests/php/LabelTest.php
@@ -54,7 +54,7 @@ public function testParent()
     {
         $parent = self::create();
         $child = self::create(['parent_id' => $parent->id]);
-        $this->assertEquals($parent->id, $child->parent->id);
+        $this->assertSame($parent->id, $child->parent->id);
     }
 
     public function testParentOnDeleteCascade()
@@ -69,7 +69,7 @@ public function testTree()
     {
         $tree = LabelTreeTest::create();
         $label = self::create(['label_tree_id' => $tree->id]);
-        $this->assertEquals($tree->id, $label->tree->id);
+        $this->assertSame($tree->id, $label->tree->id);
     }
 
     public function testLabelTreeOnDeleteCascade()
@@ -84,14 +84,14 @@ public function testChildren()
     {
         $parent = self::create();
         $child = self::create(['parent_id' => $parent->id]);
-        $this->assertEquals($child->id, $parent->children()->first()->id);
+        $this->assertSame($child->id, $parent->children()->first()->id);
     }
 
     public function testSetColorAttribute()
     {
         $label = self::create();
         $label->color = '#aabbcc';
-        $this->assertEquals('aabbcc', $label->color);
+        $this->assertSame('aabbcc', $label->color);
     }
 
     public function testIsUsedAnnotationLabel()
diff --git a/tests/php/LabelTreeTest.php b/tests/php/LabelTreeTest.php
index 976f1907d..ccfba4e15 100644
--- a/tests/php/LabelTreeTest.php
+++ b/tests/php/LabelTreeTest.php
@@ -116,7 +116,7 @@ public function testAddMember()
     {
         $this->assertFalse($this->model->members()->exists());
         $this->model->addMember(UserTest::create(), Role::admin());
-        $this->assertEquals(Role::adminId(), $this->model->members()->first()->role_id);
+        $this->assertSame(Role::adminId(), $this->model->members()->first()->role_id);
     }
 
     public function testAddMemberUserExists()
@@ -143,9 +143,9 @@ public function testUpdateMember()
     {
         $user = UserTest::create();
         $this->model->addMember($user, Role::editor());
-        $this->assertEquals(Role::editorId(), $this->model->members()->first()->role_id);
+        $this->assertSame(Role::editorId(), $this->model->members()->first()->role_id);
         $this->model->updateMember($user, Role::admin());
-        $this->assertEquals(Role::adminId(), $this->model->members()->first()->role_id);
+        $this->assertSame(Role::adminId(), $this->model->members()->first()->role_id);
     }
 
     public function testProjects()
@@ -190,7 +190,7 @@ public function testDetachUnauthorizedProjects()
         // label trees without users are attached by default
         $tree->authorizedProjects()->attach($authorized->id);
         $tree->detachUnauthorizedProjects();
-        $this->assertEquals([$authorized->id], array_map('intval', $tree->projects()->pluck('id')->all()));
+        $this->assertSame([$authorized->id], array_map('intval', $tree->projects()->pluck('id')->all()));
     }
 
     public function testDetachUnauthorizedProjectsPropagateToVersions()
@@ -206,7 +206,7 @@ public function testDetachUnauthorizedProjectsPropagateToVersions()
         $version->labelTree->authorizedProjects()->attach($authorized->id);
         $this->model->authorizedProjects()->attach($authorized->id);
         $version->labelTree->detachUnauthorizedProjects();
-        $this->assertEquals([$authorized->id], $this->model->projects()->pluck('id')->all());
+        $this->assertSame([$authorized->id], $this->model->projects()->pluck('id')->all());
     }
 
     public function testOrderLabelsByName()
@@ -220,7 +220,7 @@ public function testOrderLabelsByName()
             'name' => 'a',
         ]);
 
-        $this->assertEquals('a', $this->model->labels()->first()->name);
+        $this->assertSame('a', $this->model->labels()->first()->name);
     }
 
     public function testScopeAccessibleBy()
@@ -232,18 +232,18 @@ public function testScopeAccessibleBy()
         $tree3 = self::create(['visibility_id' => Visibility::privateId()]);
 
         $ids = LabelTree::accessibleBy($user)->pluck('id')->toArray();
-        $this->assertEquals([$tree->id], $ids);
+        $this->assertSame([$tree->id], $ids);
 
         $tree2->addMember($user, Role::editor());
 
         $ids = LabelTree::accessibleBy($user)->pluck('id')->toArray();
-        $this->assertEquals([$tree->id, $tree2->id], $ids);
+        $this->assertSame([$tree->id, $tree2->id], $ids);
 
         $project = ProjectTest::create(['creator_id' => $user->id]);
         $project->labelTrees()->attach($tree3);
 
         $ids = LabelTree::accessibleBy($user)->pluck('id')->toArray();
-        $this->assertEquals([$tree->id, $tree2->id, $tree3->id], $ids);
+        $this->assertSame([$tree->id, $tree2->id, $tree3->id], $ids);
     }
 
     public function testScopeAccessibleByAdmin()
@@ -265,9 +265,9 @@ public function testVersion()
 
     public function testVersions()
     {
-        $this->assertEquals(0, $this->model->versions()->count());
+        $this->assertSame(0, $this->model->versions()->count());
         $version = LabelTreeVersionTest::create(['label_tree_id' => $this->model->id]);
-        $this->assertEquals(1, $this->model->versions()->count());
+        $this->assertSame(1, $this->model->versions()->count());
     }
 
     public function testCascadeDeleteMaster()
@@ -297,7 +297,7 @@ public function testScopeWithoutVersions()
         $version = LabelTreeVersionTest::create();
         $this->model->version_id = $version->id;
         $this->model->save();
-        $this->assertEquals([$version->label_tree_id], LabelTree::withoutVersions()->pluck('id')->all());
+        $this->assertSame([$version->label_tree_id], LabelTree::withoutVersions()->pluck('id')->all());
     }
 
     public function testScopeGlobal()
@@ -307,7 +307,7 @@ public function testScopeGlobal()
         $this->model->save();
 
         $ids = LabelTree::global()->pluck('id')->all();
-        $this->assertEquals([$version->label_tree_id], $ids);
+        $this->assertSame([$version->label_tree_id], $ids);
         $version->labelTree->addMember(UserTest::create(), Role::adminId());
         $this->assertFalse(LabelTree::global()->exists());
     }
@@ -322,8 +322,8 @@ public function testGetVersionedNameAttribute()
         $this->model->version_id = $version->id;
         $this->model->save();
 
-        $this->assertEquals('master tree', $version->labelTree->versionedName);
-        $this->assertEquals('versioned tree @ v1.0', $this->model->versionedName);
+        $this->assertSame('master tree', $version->labelTree->versionedName);
+        $this->assertSame('versioned tree @ v1.0', $this->model->versionedName);
     }
 
     public function testReplicateLabelsOf()
@@ -341,6 +341,6 @@ public function testReplicateLabelsOf()
         $this->assertNotNull($newParent);
         $newChild = $tree->labels()->where('name', $child->name)->first();
         $this->assertNotNull($newChild);
-        $this->assertEquals($newParent->id, $newChild->parent_id);
+        $this->assertSame($newParent->id, $newChild->parent_id);
     }
 }
diff --git a/tests/php/LabelTreeVersionTest.php b/tests/php/LabelTreeVersionTest.php
index 1eae48da7..0fd1b9ad5 100644
--- a/tests/php/LabelTreeVersionTest.php
+++ b/tests/php/LabelTreeVersionTest.php
@@ -46,6 +46,6 @@ public function testDoiNullable()
     public function testNormalizeDoi()
     {
         $this->model->doi = 'https://doi.org/10.5281/zenodo.xxxxxxx';
-        $this->assertEquals('10.5281/zenodo.xxxxxxx', $this->model->doi);
+        $this->assertSame('10.5281/zenodo.xxxxxxx', $this->model->doi);
     }
 }
diff --git a/tests/php/ProjectTest.php b/tests/php/ProjectTest.php
index 3261393ad..22785ffa6 100644
--- a/tests/php/ProjectTest.php
+++ b/tests/php/ProjectTest.php
@@ -52,19 +52,19 @@ public function testCreatorNullable()
     {
         $this->model->creator()->dissociate();
         $this->model->save();
-        $this->assertEquals(null, $this->model->creator_id);
+        $this->assertSame(null, $this->model->creator_id);
     }
 
     public function testCreatorOnDeleteSetNull()
     {
         $this->model->creator()->delete();
-        $this->assertEquals(null, $this->model->fresh()->creator);
+        $this->assertSame(null, $this->model->fresh()->creator);
     }
 
     public function testCreator()
     {
         // creator will be user as well
-        $this->assertEquals($this->model->creator->id, $this->model->users()->first()->id);
+        $this->assertSame($this->model->creator->id, $this->model->users()->first()->id);
     }
 
     public function testUsers()
@@ -84,8 +84,8 @@ public function testAdmins()
         // the creator doesn't count
         $this->model->creator->delete();
 
-        $this->assertEquals(2, $this->model->users()->count());
-        $this->assertEquals(1, $this->model->admins()->count());
+        $this->assertSame(2, $this->model->users()->count());
+        $this->assertSame(1, $this->model->admins()->count());
     }
 
     public function testEditors()
@@ -96,8 +96,8 @@ public function testEditors()
         $this->model->addUserId($member->id, Role::guestId());
 
         // count the project creator, too
-        $this->assertEquals(3, $this->model->users()->count());
-        $this->assertEquals(1, $this->model->editors()->count());
+        $this->assertSame(3, $this->model->users()->count());
+        $this->assertSame(1, $this->model->editors()->count());
     }
 
     public function testGuests()
@@ -106,16 +106,16 @@ public function testGuests()
         $this->model->addUserId($member->id, Role::guestId());
 
         // count the project creator, too
-        $this->assertEquals(2, $this->model->users()->count());
-        $this->assertEquals(1, $this->model->guests()->count());
+        $this->assertSame(2, $this->model->users()->count());
+        $this->assertSame(1, $this->model->guests()->count());
     }
 
     public function testVolumes()
     {
         $volume = VolumeTest::make();
         $this->model->volumes()->save($volume);
-        $this->assertEquals($volume->id, $this->model->volumes()->first()->id);
-        $this->assertEquals(1, $this->model->volumes()->count());
+        $this->assertSame($volume->id, $this->model->volumes()->first()->id);
+        $this->assertSame(1, $this->model->volumes()->count());
     }
 
     public function testAddUserId()
@@ -126,7 +126,7 @@ public function testAddUserId()
         $this->model->addUserId($user->id, Role::editorId());
         $user = $this->model->users()->find($user->id);
         $this->assertNotNull($user);
-        $this->assertEquals(Role::editorId(), $user->project_role_id);
+        $this->assertSame(Role::editorId(), $user->project_role_id);
 
         // a user can only be added once regardless the role
         $this->expectException(QueryException::class);
@@ -155,9 +155,9 @@ public function testChangeRole()
     {
         $user = UserTest::create();
         $this->model->addUserId($user->id, Role::adminId());
-        $this->assertEquals(Role::adminId(), $this->model->users()->find($user->id)->project_role_id);
+        $this->assertSame(Role::adminId(), $this->model->users()->find($user->id)->project_role_id);
         $this->model->changeRole($user->id, Role::editorId());
-        $this->assertEquals(Role::editorId(), $this->model->users()->find($user->id)->project_role_id);
+        $this->assertSame(Role::editorId(), $this->model->users()->find($user->id)->project_role_id);
     }
 
     public function testRemoveVolume()
@@ -220,7 +220,7 @@ public function testLabelTrees()
     {
         $count = $this->model->labelTrees()->count();
         LabelTreeTest::create()->projects()->attach($this->model->id);
-        $this->assertEquals($count + 1, $this->model->labelTrees()->count());
+        $this->assertSame($count + 1, $this->model->labelTrees()->count());
     }
 
     public function testAuthorizedLabelTrees()
@@ -245,12 +245,12 @@ public function testDefaultLabelTreesWithoutVersions()
         $tree = LabelTreeTest::create(['version_id' => $version->id]);
         $project = self::create();
         $ids = $project->labelTrees()->pluck('id')->all();
-        $this->assertEquals([$version->labelTree->id], $ids);
+        $this->assertSame([$version->labelTree->id], $ids);
     }
 
     public function testGetThumbnailUrlAttributeNull()
     {
-        $this->assertEquals(null, $this->model->thumbnailUrl);
+        $this->assertSame(null, $this->model->thumbnailUrl);
     }
 
     public function testGetThumbnailUrlAttributeImage()
@@ -298,8 +298,8 @@ public function testScopeInCommon()
         $p->volumes()->attach($v);
 
         $projects = Project::inCommon($user, $v->id)->pluck('id');
-        $this->assertEquals(1, $projects->count());
-        $this->assertEquals($this->model->id, $projects[0]);
+        $this->assertSame(1, $projects->count());
+        $this->assertSame($this->model->id, $projects[0]);
 
         $projects = Project::inCommon($user, $v->id, [Role::adminId()])->pluck('id');
         $this->assertEmpty($projects);
@@ -309,20 +309,20 @@ public function testImageVolumes()
     {
         $v = VolumeTest::create(['media_type_id' => MediaType::videoId()]);
         $this->model->addVolumeId($v->id);
-        $this->assertEquals(0, $this->model->imageVolumes()->count());
+        $this->assertSame(0, $this->model->imageVolumes()->count());
         $v = VolumeTest::create(['media_type_id' => MediaType::imageId()]);
         $this->model->addVolumeId($v->id);
-        $this->assertEquals(1, $this->model->imageVolumes()->count());
+        $this->assertSame(1, $this->model->imageVolumes()->count());
     }
 
     public function testVideoVolumes()
     {
         $v = VolumeTest::create(['media_type_id' => MediaType::imageId()]);
         $this->model->addVolumeId($v->id);
-        $this->assertEquals(0, $this->model->videoVolumes()->count());
+        $this->assertSame(0, $this->model->videoVolumes()->count());
         $v = VolumeTest::create(['media_type_id' => MediaType::videoId()]);
         $this->model->addVolumeId($v->id);
-        $this->assertEquals(1, $this->model->videoVolumes()->count());
+        $this->assertSame(1, $this->model->videoVolumes()->count());
     }
 
     public function testScopeAccessibleBy()
diff --git a/tests/php/ProjectUserIntegrityTest.php b/tests/php/ProjectUserIntegrityTest.php
index 7200f503b..845c2aacb 100644
--- a/tests/php/ProjectUserIntegrityTest.php
+++ b/tests/php/ProjectUserIntegrityTest.php
@@ -23,9 +23,9 @@ public function testProjectOnDeleteCascade()
         $user = UserTest::create();
         $project->addUserId($user->id, RoleTest::create()->id);
 
-        $this->assertEquals(1, $user->projects()->count());
+        $this->assertSame(1, $user->projects()->count());
         $project->delete();
-        $this->assertEquals(0, $user->projects()->count());
+        $this->assertSame(0, $user->projects()->count());
     }
 
     public function testUserOnDeleteCascade()
@@ -35,9 +35,9 @@ public function testUserOnDeleteCascade()
         $project->addUserId($member->id, Role::guestId());
 
         // count the project creator, too
-        $this->assertEquals(2, $project->users()->count());
+        $this->assertSame(2, $project->users()->count());
         $member->delete();
-        $this->assertEquals(1, $project->users()->count());
+        $this->assertSame(1, $project->users()->count());
     }
 
     public function testUserProjectRoleUnique()
diff --git a/tests/php/ProjectVolumeIntegrityTest.php b/tests/php/ProjectVolumeIntegrityTest.php
index 415b3766a..329d24821 100644
--- a/tests/php/ProjectVolumeIntegrityTest.php
+++ b/tests/php/ProjectVolumeIntegrityTest.php
@@ -12,9 +12,9 @@ public function testVolumeOnDeleteCascade()
         $project = ProjectTest::create();
         $volume = VolumeTest::make();
         $project->volumes()->save($volume);
-        $this->assertEquals(1, $project->volumes()->count());
+        $this->assertSame(1, $project->volumes()->count());
         $volume->delete();
-        $this->assertEquals(0, $project->volumes()->count());
+        $this->assertSame(0, $project->volumes()->count());
     }
 
     public function testProjectOnDeleteRestrict()
diff --git a/tests/php/RoleTest.php b/tests/php/RoleTest.php
index 0512ae9a0..1f4ed7ced 100644
--- a/tests/php/RoleTest.php
+++ b/tests/php/RoleTest.php
@@ -43,25 +43,25 @@ public function testOnDeleteRestrict()
 
     public function testAdmin()
     {
-        $this->assertEquals('admin', Role::admin()->name);
+        $this->assertSame('admin', Role::admin()->name);
         $this->assertNotNull(Role::adminId());
     }
 
     public function testExpert()
     {
-        $this->assertEquals('expert', Role::expert()->name);
+        $this->assertSame('expert', Role::expert()->name);
         $this->assertNotNull(Role::expertId());
     }
 
     public function testEditor()
     {
-        $this->assertEquals('editor', Role::editor()->name);
+        $this->assertSame('editor', Role::editor()->name);
         $this->assertNotNull(Role::editorId());
     }
 
     public function testGuest()
     {
-        $this->assertEquals('guest', Role::guest()->name);
+        $this->assertSame('guest', Role::guest()->name);
         $this->assertNotNull(Role::guestId());
     }
 }
diff --git a/tests/php/Rules/VolumeUrlTest.php b/tests/php/Rules/VolumeUrlTest.php
index a47a3c412..a1a76e0bf 100644
--- a/tests/php/Rules/VolumeUrlTest.php
+++ b/tests/php/Rules/VolumeUrlTest.php
@@ -142,8 +142,8 @@ public function testRemoteOk()
         $this->assertTrue($validator->passes(null, 'http://localhost'));
 
         $request = $container[0]['request'];
-        $this->assertEquals('HEAD', $request->getMethod());
-        $this->assertEquals('http://localhost', (string) $request->getUri());
+        $this->assertSame('HEAD', $request->getMethod());
+        $this->assertSame('http://localhost', (string) $request->getUri());
     }
 
     public function testRemoteOfflineMode()
diff --git a/tests/php/Services/Auth/ApiGuardTest.php b/tests/php/Services/Auth/ApiGuardTest.php
index 17e2b316b..65465b284 100644
--- a/tests/php/Services/Auth/ApiGuardTest.php
+++ b/tests/php/Services/Auth/ApiGuardTest.php
@@ -120,7 +120,7 @@ public function testTouchToken()
         $token->updated_at = Carbon::now(-5);
         $token->save();
 
-        $this->assertEquals($token->updated_at, $token->fresh()->updated_at);
+        $this->assertSame($token->updated_at->toDateTimeString(), $token->fresh()->updated_at->toDateTimeString());
 
         $response = $this->call('GET', '/api/v1/users', [], [], [], [
             'PHP_AUTH_USER' => $token->owner->email,
diff --git a/tests/php/Services/LabelSourceAdapters/WormsAdapterTest.php b/tests/php/Services/LabelSourceAdapters/WormsAdapterTest.php
index 0b85eb891..4938f145c 100644
--- a/tests/php/Services/LabelSourceAdapters/WormsAdapterTest.php
+++ b/tests/php/Services/LabelSourceAdapters/WormsAdapterTest.php
@@ -88,7 +88,7 @@ public function testFind()
             ],
         ]];
 
-        $this->assertEquals($expect, $results);
+        $this->assertSame($expect, $results);
     }
 
     public function testFindAccepted()
@@ -117,7 +117,7 @@ public function testFindEmpty()
         $adapter->setSoapClient($mock);
         $request = new Request;
         $results = $adapter->find($request);
-        $this->assertEquals([], $results);
+        $this->assertSame([], $results);
     }
 
     public function testFindThrowException()
@@ -138,7 +138,7 @@ public function testFindThrowException()
             $adapter->find($request);
             $this->assertFalse(true);
         } catch (ServiceUnavailableHttpException $e) {
-            $this->assertEquals('The WoRMS server is currently unavailable.', $e->getMessage());
+            $this->assertSame('The WoRMS server is currently unavailable.', $e->getMessage());
         }
     }
 
@@ -175,7 +175,7 @@ public function testCreateNormal()
             $labels = $adapter->create($tree->id, $request);
             $this->assertTrue(false);
         } catch (ValidationException $e) {
-            $this->assertEquals(['source_id' => ['The AphiaID does not exist.']], $e->errors());
+            $this->assertSame(['source_id' => ['The AphiaID does not exist.']], $e->errors());
         }
 
         $request->merge([
@@ -184,12 +184,12 @@ public function testCreateNormal()
 
         $labels = $adapter->create($tree->id, $request);
         $this->assertTrue($tree->labels()->where('id', $labels[0]->id)->exists());
-        $this->assertEquals('My Kolga', $labels[0]->name);
-        $this->assertEquals('bada55', $labels[0]->color);
-        $this->assertEquals('124731', $labels[0]->source_id);
-        $this->assertEquals(1, $labels[0]->label_source_id);
-        $this->assertEquals($label->id, $labels[0]->parent_id);
-        $this->assertEquals($tree->id, $labels[0]->label_tree_id);
+        $this->assertSame('My Kolga', $labels[0]->name);
+        $this->assertSame('bada55', $labels[0]->color);
+        $this->assertSame('124731', $labels[0]->source_id);
+        $this->assertSame(1, $labels[0]->label_source_id);
+        $this->assertSame($label->id, $labels[0]->parent_id);
+        $this->assertSame($tree->id, $labels[0]->label_tree_id);
         $this->assertNotNull($labels[0]->uuid);
     }
 
@@ -213,7 +213,7 @@ public function testCreateThrowException()
             $adapter->create($tree->id, $request);
             $this->assertFalse(true);
         } catch (ServiceUnavailableHttpException $e) {
-            $this->assertEquals('The WoRMS server is currently unavailable.', $e->getMessage());
+            $this->assertSame('The WoRMS server is currently unavailable.', $e->getMessage());
         }
     }
 
@@ -266,7 +266,7 @@ public function testCreateParentRecursiveError()
             $labels = $adapter->create(1, $request);
             $this->assertTrue(false);
         } catch (ValidationException $e) {
-            $this->assertEquals(['parent_id' => ['The label must not have a parent if it should be created recursively.']], $e->errors());
+            $this->assertSame(['parent_id' => ['The label must not have a parent if it should be created recursively.']], $e->errors());
         }
     }
 
@@ -326,7 +326,7 @@ public function testCreateRecursive()
 
         $labels = $adapter->create($tree->id, $request);
         $this->assertCount(2, $labels);
-        $this->assertEquals(3, $tree->labels()->count());
+        $this->assertSame(3, $tree->labels()->count());
 
         $parent = $tree->labels()->where('source_id', 123514)->first();
         $expect = [
diff --git a/tests/php/Services/ModulesTest.php b/tests/php/Services/ModulesTest.php
index 386b67827..a2f2a76da 100644
--- a/tests/php/Services/ModulesTest.php
+++ b/tests/php/Services/ModulesTest.php
@@ -24,7 +24,7 @@ public function testGetControllerMixins()
         Modules::registerControllerMixin('myModule', 'dashboard', $func);
 
         $this->assertEmpty(Modules::getControllerMixins('nonexistent'));
-        $this->assertEquals(['myModule' => $func], Modules::getControllerMixins('dashboard'));
+        $this->assertSame(['myModule' => $func], Modules::getControllerMixins('dashboard'));
     }
 
     public function testRegister()
@@ -41,7 +41,7 @@ public function testRegister()
 
         $this->assertArrayHasKey('myModule', Modules::getViewMixins('dashboard'));
         $this->assertArrayHasKey('myModule', Modules::getViewMixins('settings'));
-        $this->assertEquals(['myModule' => $func], Modules::getControllerMixins('dashboard'));
+        $this->assertSame(['myModule' => $func], Modules::getControllerMixins('dashboard'));
         $this->assertContains('my/path', Modules::getApidocPaths());
     }
 
@@ -49,7 +49,7 @@ public function testRegisterViewMixinOrdering()
     {
         Modules::registerViewMixin('subtest', 'index.test');
         Modules::registerViewMixin('test', 'index');
-        $this->assertEquals(['test' => ['subtest' => []]], Modules::getViewMixins('index'));
+        $this->assertSame(['test' => ['subtest' => []]], Modules::getViewMixins('index'));
     }
 
     public function testCallControllerMixins()
@@ -58,7 +58,7 @@ public function testCallControllerMixins()
         Modules::registerControllerMixin('myModule2', 'dashboard', ControllerMixinStub::class.'@call');
 
         $values = Modules::callControllerMixins('dashboard', ['arg' => 1]);
-        $this->assertEquals(['callable' => true, 'callableWithAtSign' => true], $values);
+        $this->assertSame(['callable' => true, 'callableWithAtSign' => true], $values);
     }
 }
 
diff --git a/tests/php/Traits/ParsesMetadataTest.php b/tests/php/Traits/ParsesMetadataTest.php
index ea3d08d20..ac6b89a08 100644
--- a/tests/php/Traits/ParsesMetadataTest.php
+++ b/tests/php/Traits/ParsesMetadataTest.php
@@ -17,7 +17,7 @@ public function testParseMetadataOk()
             ['filename', 'taken_at', 'lng', 'lat', 'gps_altitude', 'distance_to_ground', 'area', 'yaw'],
             ['abc.jpg', '2016-12-19 12:27:00', '52.220', '28.123', '-1500', '10', '2.6', '180'],
         ];
-        $this->assertEquals($expect, $stub->parseMetadata($input));
+        $this->assertSame($expect, $stub->parseMetadata($input));
     }
 
     public function testParseMetadataCaseInsensitive()
@@ -28,7 +28,7 @@ public function testParseMetadataCaseInsensitive()
             ['filename', 'taken_at', 'lng', 'lat', 'gps_altitude', 'distance_to_ground', 'area'],
             ['abc.jpg', '2016-12-19 12:27:00', '52.220', '28.123', '-1500', '10', '2.6'],
         ];
-        $this->assertEquals($expect, $stub->parseMetadata($input));
+        $this->assertSame($expect, $stub->parseMetadata($input));
     }
 
     public function testParseMetadataSynonyms1()
@@ -39,7 +39,7 @@ public function testParseMetadataSynonyms1()
             ['filename', 'lng', 'lat', 'yaw'],
             ['abc.jpg', '52.220', '28.123', '180'],
         ];
-        $this->assertEquals($expect, $stub->parseMetadata($input));
+        $this->assertSame($expect, $stub->parseMetadata($input));
     }
 
     public function testParseMetadataSynonyms2()
@@ -50,7 +50,7 @@ public function testParseMetadataSynonyms2()
             ['filename', 'lng', 'lat'],
             ['abc.jpg', '52.220', '28.123'],
         ];
-        $this->assertEquals($expect, $stub->parseMetadata($input));
+        $this->assertSame($expect, $stub->parseMetadata($input));
     }
 
     public function testParseMetadataSynonyms3()
@@ -61,7 +61,7 @@ public function testParseMetadataSynonyms3()
             ['filename', 'taken_at', 'lng', 'lat', 'gps_altitude', 'distance_to_ground', 'area', 'yaw'],
             ['abc.jpg', '2016-12-19 12:27:00', '52.220', '28.123', '-1500', '10', '2.6', '180'],
         ];
-        $this->assertEquals($expect, $stub->parseMetadata($input));
+        $this->assertSame($expect, $stub->parseMetadata($input));
     }
 
     public function testParseMetadataEmptyCells()
@@ -72,7 +72,7 @@ public function testParseMetadataEmptyCells()
             ['filename', 'taken_at', 'lng', 'lat', 'gps_altitude', 'distance_to_ground', 'area', 'yaw'],
             ['abc.jpg', '', '52.220', '28.123', '', '', '', ''],
         ];
-        $this->assertEquals($expect, $stub->parseMetadata($input));
+        $this->assertSame($expect, $stub->parseMetadata($input));
     }
 
     public function testParseMetadataFile()
@@ -84,7 +84,7 @@ public function testParseMetadataFile()
             ['filename', 'taken_at', 'lng', 'lat', 'gps_altitude', 'distance_to_ground', 'area', 'yaw'],
             ['abc.jpg', '2016-12-19 12:27:00', '52.220', '28.123', '-1500', '10', '2.6', '180'],
         ];
-        $this->assertEquals($expect, $stub->parseMetadataFile($file));
+        $this->assertSame($expect, $stub->parseMetadataFile($file));
     }
 
     public function testParseMetadataFileBOM()
@@ -96,7 +96,7 @@ public function testParseMetadataFileBOM()
             ['filename', 'taken_at', 'lng', 'lat', 'gps_altitude', 'distance_to_ground', 'area', 'yaw'],
             ['abc.jpg', '2016-12-19 12:27:00', '52.220', '28.123', '-1500', '10', '2.6', '180'],
         ];
-        $this->assertEquals($expect, $stub->parseMetadataFile($file));
+        $this->assertSame($expect, $stub->parseMetadataFile($file));
     }
 
     public function testParseIfdo()
@@ -112,16 +112,16 @@ public function testParseIfdo()
 IFDO;
         $expect = [
             'name' => 'myvolume',
-            'url' => '',
             'handle' => '20.500.12085/d7546c4b-307f-4d42-8554-33236c577450',
-            'media_type' => 'image',
             'uuid' => 'd7546c4b-307f-4d42-8554-33236c577450',
+            'url' => '',
+            'media_type' => 'image',
             'files' => [
                 ['filename'],
                 ['myimage.jpg'],
             ],
         ];
-        $this->assertEquals($expect, $stub->parseIfdo($input));
+        $this->assertSame($expect, $stub->parseIfdo($input));
     }
 
     public function testParseIfdoHeader()
@@ -146,16 +146,16 @@ public function testParseIfdoHeader()
 IFDO;
         $expect = [
             'name' => 'myvolume',
-            'url' => 'https://hdl.handle.net/20.500.12085/d7546c4b-307f-4d42-8554-33236c577450@data',
             'handle' => '20.500.12085/d7546c4b-307f-4d42-8554-33236c577450',
-            'media_type' => 'image',
             'uuid' => 'd7546c4b-307f-4d42-8554-33236c577450',
+            'url' => 'https://hdl.handle.net/20.500.12085/d7546c4b-307f-4d42-8554-33236c577450@data',
+            'media_type' => 'image',
             'files' => [
                 ['filename', 'area', 'distance_to_ground', 'gps_altitude', 'lat', 'lng', 'taken_at', 'yaw'],
-                ['myimage.jpg', '5.0', '2', '-2248.0', '11.8581802', '-117.0214864', '2019-04-06 04:29:27.000000', '20'],
+                ['myimage.jpg', 5.0, 2, -2248.0, 11.8581802, -117.0214864, '2019-04-06 04:29:27.000000', 20],
             ],
         ];
-        $this->assertEquals($expect, $stub->parseIfdo($input));
+        $this->assertSame($expect, $stub->parseIfdo($input));
     }
 
     public function testParseIfdoVideoType()
@@ -172,16 +172,16 @@ public function testParseIfdoVideoType()
 IFDO;
         $expect = [
             'name' => 'myvolume',
-            'url' => '',
             'handle' => '20.500.12085/d7546c4b-307f-4d42-8554-33236c577450',
-            'media_type' => 'video',
             'uuid' => 'd7546c4b-307f-4d42-8554-33236c577450',
+            'url' => '',
+            'media_type' => 'video',
             'files' => [
                 ['filename'],
                 ['myvideo.mp4'],
             ],
         ];
-        $this->assertEquals($expect, $stub->parseIfdo($input));
+        $this->assertSame($expect, $stub->parseIfdo($input));
     }
 
     public function testParseIfdoSlideIsImageType()
@@ -198,16 +198,16 @@ public function testParseIfdoSlideIsImageType()
 IFDO;
         $expect = [
             'name' => 'myvolume',
-            'url' => '',
             'handle' => '20.500.12085/d7546c4b-307f-4d42-8554-33236c577450',
-            'media_type' => 'image',
             'uuid' => 'd7546c4b-307f-4d42-8554-33236c577450',
+            'url' => '',
+            'media_type' => 'image',
             'files' => [
                 ['filename'],
                 ['myimage.jpg'],
             ],
         ];
-        $this->assertEquals($expect, $stub->parseIfdo($input));
+        $this->assertSame($expect, $stub->parseIfdo($input));
     }
 
     public function testParseIfdoItems()
@@ -230,16 +230,16 @@ public function testParseIfdoItems()
 IFDO;
         $expect = [
             'name' => 'myvolume',
-            'url' => '',
             'handle' => '20.500.12085/d7546c4b-307f-4d42-8554-33236c577450',
-            'media_type' => 'image',
             'uuid' => 'd7546c4b-307f-4d42-8554-33236c577450',
+            'url' => '',
+            'media_type' => 'image',
             'files' => [
                 ['filename', 'area', 'distance_to_ground', 'gps_altitude', 'lat', 'lng', 'taken_at', 'yaw'],
-                ['myimage.jpg', '5.0', '2', '-2248.0', '11.8581802', '-117.0214864', '2019-04-06 04:29:27.000000', '20'],
+                ['myimage.jpg', 5.0, 2, -2248.0, 11.8581802, -117.0214864, '2019-04-06 04:29:27.000000', 20],
             ],
         ];
-        $this->assertEquals($expect, $stub->parseIfdo($input));
+        $this->assertSame($expect, $stub->parseIfdo($input));
     }
 
     public function testParseIfdoImageArrayItems()
@@ -262,16 +262,17 @@ public function testParseIfdoImageArrayItems()
 IFDO;
         $expect = [
             'name' => 'myvolume',
-            'url' => '',
             'handle' => '20.500.12085/d7546c4b-307f-4d42-8554-33236c577450',
-            'media_type' => 'image',
             'uuid' => 'd7546c4b-307f-4d42-8554-33236c577450',
+            'url' => '',
+            'media_type' => 'image',
             'files' => [
                 ['filename', 'area', 'distance_to_ground', 'gps_altitude', 'lat', 'lng', 'taken_at', 'yaw'],
-                ['myimage.jpg', '5.0', '2', '-2248.0', '11.8581802', '-117.0214864', '2019-04-06 04:29:27.000000', '20'],
+                ['myimage.jpg', 5.0, 2, -2248.0, 11.8581802, -117.0214864, '2019-04-06 04:29:27.000000', 20],
+
             ],
         ];
-        $this->assertEquals($expect, $stub->parseIfdo($input));
+        $this->assertSame($expect, $stub->parseIfdo($input));
     }
 
     public function testParseIfdoItemsOverrideHeader()
@@ -297,16 +298,16 @@ public function testParseIfdoItemsOverrideHeader()
 IFDO;
         $expect = [
             'name' => 'myvolume',
-            'url' => '',
             'handle' => '20.500.12085/d7546c4b-307f-4d42-8554-33236c577450',
-            'media_type' => 'image',
             'uuid' => 'd7546c4b-307f-4d42-8554-33236c577450',
+            'url' => '',
+            'media_type' => 'image',
             'files' => [
                 ['filename', 'area', 'distance_to_ground', 'gps_altitude', 'lat', 'lng', 'taken_at', 'yaw'],
-                ['myimage.jpg', '5.1', '3', '-2248.0', '11.8581802', '-117.0214864', '2019-04-06 05:29:27.000000', '20'],
+                ['myimage.jpg', 5.1, 3, -2248.0, 11.8581802, -117.0214864, '2019-04-06 05:29:27.000000', 20],
             ],
         ];
-        $this->assertEquals($expect, $stub->parseIfdo($input));
+        $this->assertSame($expect, $stub->parseIfdo($input));
     }
 
     public function testParseIfdoSubItemsOverrideDefaultsAndHeader()
@@ -335,17 +336,17 @@ public function testParseIfdoSubItemsOverrideDefaultsAndHeader()
 IFDO;
         $expect = [
             'name' => 'myvolume',
-            'url' => '',
             'handle' => '20.500.12085/d7546c4b-307f-4d42-8554-33236c577450',
-            'media_type' => 'video',
             'uuid' => 'd7546c4b-307f-4d42-8554-33236c577450',
+            'url' => '',
+            'media_type' => 'video',
             'files' => [
                 ['filename', 'area', 'distance_to_ground', 'gps_altitude', 'lat', 'lng', 'taken_at', 'yaw'],
-                ['myvideo.mp4', '5.1', '3', '-2248.0', '11.8581802', '-117.0214864', '2019-04-06 05:29:27.000000', '20'],
-                ['myvideo.mp4', '5.1', '4', '-2248.0', '11.8581802', '-117.0214864', '2019-04-06 05:30:27.000000', '20'],
+                ['myvideo.mp4', 5.1, 3, -2248.0, 11.8581802, -117.0214864, '2019-04-06 05:29:27.000000', 20],
+                ['myvideo.mp4', 5.1, 4, -2248.0, 11.8581802, -117.0214864, '2019-04-06 05:30:27.000000', 20],
             ],
         ];
-        $this->assertEquals($expect, $stub->parseIfdo($input));
+        $this->assertSame($expect, $stub->parseIfdo($input));
     }
 
     public function testParseIfdoFile()
@@ -355,17 +356,17 @@ public function testParseIfdoFile()
         $file = new UploadedFile($path, 'ifdo.yaml', 'application/yaml', null, true);
         $expect = [
             'name' => 'SO268 SO268-2_100-1_OFOS SO_CAM-1_Photo_OFOS',
-            'url' => 'https://hdl.handle.net/20.500.12085/d7546c4b-307f-4d42-8554-33236c577450@data',
             'handle' => '20.500.12085/d7546c4b-307f-4d42-8554-33236c577450',
-            'media_type' => 'image',
             'uuid' => 'd7546c4b-307f-4d42-8554-33236c577450',
+            'url' => 'https://hdl.handle.net/20.500.12085/d7546c4b-307f-4d42-8554-33236c577450@data',
+            'media_type' => 'image',
             'files' => [
                 ['filename', 'area', 'distance_to_ground', 'gps_altitude', 'lat', 'lng', 'taken_at', 'yaw'],
-                ['SO268-2_100-1_OFOS_SO_CAM-1_20190406_042927.JPG', '5.0', '2', '-2248.0', '11.8581802', '-117.0214864', '2019-04-06 04:29:27.000000', '20'],
-                ['SO268-2_100-1_OFOS_SO_CAM-1_20190406_052726.JPG', '5.1', '2.1', '-4129.6', '11.8582192', '-117.0214286', '2019-04-06 05:27:26.000000', '21'],
+                ['SO268-2_100-1_OFOS_SO_CAM-1_20190406_042927.JPG', 5.0, 2, -2248.0, 11.8581802, -117.0214864, '2019-04-06 04:29:27.000000', 20],
+                ['SO268-2_100-1_OFOS_SO_CAM-1_20190406_052726.JPG', 5.1, 2.1, -4129.6, 11.8582192, -117.0214286, '2019-04-06 05:27:26.000000', 21],
             ],
         ];
-        $this->assertEquals($expect, $stub->parseIfdoFile($file));
+        $this->assertSame($expect, $stub->parseIfdoFile($file));
     }
 
     public function testParseIfdoNoHeader()
@@ -391,13 +392,13 @@ public function testParseIfdoNoItems()
 IFDO;
         $expect = [
             'name' => 'myvolume',
-            'url' => '',
             'handle' => '20.500.12085/d7546c4b-307f-4d42-8554-33236c577450',
-            'media_type' => 'image',
             'uuid' => 'd7546c4b-307f-4d42-8554-33236c577450',
+            'url' => '',
+            'media_type' => 'image',
             'files' => [],
         ];
-        $this->assertEquals($expect, $stub->parseIfdo($input));
+        $this->assertSame($expect, $stub->parseIfdo($input));
     }
 
     public function testParseIfdoNoName()
diff --git a/tests/php/UserTest.php b/tests/php/UserTest.php
index 5a8cd919a..5a0cae83f 100644
--- a/tests/php/UserTest.php
+++ b/tests/php/UserTest.php
@@ -32,7 +32,7 @@ public function testEmailToLowercase()
     {
         $this->model->email = 'Test@Example.com';
         $this->model->save();
-        $this->assertEquals('test@example.com', $this->model->fresh()->email);
+        $this->assertSame('test@example.com', $this->model->fresh()->email);
     }
 
     public function testCastsLoginAt()
@@ -99,7 +99,7 @@ public function testProjects()
         $project->addUserId($this->model->id, $role->id);
 
         $p = $this->model->projects()->first();
-        $this->assertEquals($project->id, $p->id);
+        $this->assertSame($project->id, $p->id);
         $this->assertFalse($p->pivot->pinned);
     }
 
@@ -112,7 +112,7 @@ public function testLabelTrees()
 
     public function testRole()
     {
-        $this->assertEquals(Role::editorId(), $this->model->role->id);
+        $this->assertSame(Role::editorId(), $this->model->role->id);
     }
 
     public function testIsGlobalAdminAttribute()
@@ -164,22 +164,22 @@ public function testCheckCanBeDeletedLabelTrees()
     public function testCastSettings()
     {
         $user = self::create(['attrs' => ['settings' => ['abc' => 'def']]]);
-        $this->assertEquals(['abc' => 'def'], $user->fresh()->settings);
+        $this->assertSame(['abc' => 'def'], $user->fresh()->settings);
     }
 
     public function testSetSettings()
     {
         $this->model->setSettings(['a' => true]);
         $this->model->save();
-        $this->assertEquals(['a' => true], $this->model->fresh()->settings);
+        $this->assertSame(['a' => true], $this->model->fresh()->settings);
 
         $this->model->setSettings(['b' => 20]);
         $this->model->save();
-        $this->assertEquals(['a' => true, 'b' => 20], $this->model->fresh()->settings);
+        $this->assertSame(['a' => true, 'b' => 20], $this->model->fresh()->settings);
 
         $this->model->setSettings(['a' => null, 'b' => 10]);
         $this->model->save();
-        $this->assertEquals(['b' => 10], $this->model->fresh()->settings);
+        $this->assertSame(['b' => 10], $this->model->fresh()->settings);
 
         $this->model->setSettings(['a' => null, 'b' => null]);
         $this->model->save();
@@ -189,9 +189,9 @@ public function testSetSettings()
     public function testGetSettings()
     {
         $this->assertNull($this->model->getSettings('mysetting'));
-        $this->assertEquals('a', $this->model->getSettings('mysetting', 'a'));
+        $this->assertSame('a', $this->model->getSettings('mysetting', 'a'));
         $this->model->setSettings(['mysetting' => 'b']);
-        $this->assertEquals('b', $this->model->getSettings('mysetting', 'a'));
+        $this->assertSame('b', $this->model->getSettings('mysetting', 'a'));
     }
 
     public function testGetIsInSuperUserModeAttribute()
diff --git a/tests/php/VideoAnnotationTest.php b/tests/php/VideoAnnotationTest.php
index bbe480fdb..bbe32b037 100644
--- a/tests/php/VideoAnnotationTest.php
+++ b/tests/php/VideoAnnotationTest.php
@@ -38,7 +38,7 @@ public function testRoundPoints()
     {
         $this->model->points = [[1.23456789, 2.23456789, 3.1415]];
         $this->model->save();
-        $this->assertEquals([[1.23, 2.23, 3.14]], $this->model->fresh()->points);
+        $this->assertSame([[1.23, 2.23, 3.14]], $this->model->fresh()->points);
     }
 
     public function testValidatePointsFramesMismatch()
@@ -139,7 +139,7 @@ public function testInterpolatePointsPoint()
         $this->model->shape_id = Shape::pointId();
         $this->model->points = [[0, 0], [10, 10]];
         $this->model->frames = [0.0, 1.0];
-        $this->assertEquals([5, 5], $this->model->interpolatePoints(0.5));
+        $this->assertSame([5.0, 5.0], $this->model->interpolatePoints(0.5));
     }
 
     public function testInterpolatePointsInt()
@@ -147,7 +147,7 @@ public function testInterpolatePointsInt()
         $this->model->shape_id = Shape::pointId();
         $this->model->points = [[0, 0], [10, 10]];
         $this->model->frames = [0, 1];
-        $this->assertEquals([10, 10], $this->model->interpolatePoints(1));
+        $this->assertSame([10, 10], $this->model->interpolatePoints(1));
     }
 
     public function testInterpolatePointsRectangle()
@@ -159,8 +159,8 @@ public function testInterpolatePointsRectangle()
         ];
         $this->model->frames = [0.0, 1.0];
 
-        $expect = [11.25, 5, 16.25, 10, 6.25, 20, 1.25, 15];
-        $this->assertEquals($expect, $this->model->interpolatePoints(0.5));
+        $expect = [11.25, 5.0, 16.25, 10.0, 6.25, 20.0, 1.25, 15.0];
+        $this->assertSame($expect, $this->model->interpolatePoints(0.5));
     }
 
     public function testInterpolatePointsCircle()
@@ -168,7 +168,7 @@ public function testInterpolatePointsCircle()
         $this->model->shape_id = Shape::circleId();
         $this->model->points = [[0, 0, 5], [10, 10, 10]];
         $this->model->frames = [0.0, 1.0];
-        $this->assertEquals([5, 5, 7.5], $this->model->interpolatePoints(0.5));
+        $this->assertSame([5.0, 5.0, 7.5], $this->model->interpolatePoints(0.5));
     }
 
     public function testInterpolatePointsLineString()
@@ -368,7 +368,7 @@ public function testScopeAllowedBySessionHideBoth()
         ]);
 
         $ids = VideoAnnotation::allowedBySession($session, $ownUser)->pluck('id')->toArray();
-        $this->assertEquals([$a3->id], $ids);
+        $this->assertSame([$a3->id], $ids);
     }
 
     public function testScopeVisibleFor()
@@ -395,18 +395,18 @@ public function testScopeWithLabel()
         $al1 = VideoAnnotationLabelTest::create();
         $al2 = VideoAnnotationLabelTest::create();
 
-        $this->assertEquals($al1->annotation->id, VideoAnnotation::withLabel($al1->label)->first()->id);
+        $this->assertSame($al1->annotation->id, VideoAnnotation::withLabel($al1->label)->first()->id);
     }
 
     public function testGetPoints()
     {
         $annotation = static::make(['points' => [[1, 2]]]);
-        $this->assertEquals([[1, 2]], $annotation->getPoints());
+        $this->assertSame([[1, 2]], $annotation->getPoints());
     }
 
     public function testGetShape()
     {
-        $this->assertEquals($this->model->shape, $this->model->getShape());
+        $this->assertSame($this->model->shape, $this->model->getShape());
     }
 
     public function testGetFile()
@@ -416,6 +416,6 @@ public function testGetFile()
 
     public function testGetFileIdAttribute()
     {
-        $this->assertEquals($this->model->video_id, $this->model->file_id);
+        $this->assertSame($this->model->video_id, $this->model->file_id);
     }
 }
diff --git a/tests/php/VideoTest.php b/tests/php/VideoTest.php
index 19bb254e1..3a941db29 100644
--- a/tests/php/VideoTest.php
+++ b/tests/php/VideoTest.php
@@ -22,7 +22,7 @@ public function testAttributes()
         $this->assertNotNull($this->model->url);
         $this->assertNotNull($this->model->volume);
         $this->assertNotNull($this->model->duration);
-        $this->assertEquals([], $this->model->attrs);
+        $this->assertSame([], $this->model->attrs);
     }
 
     public function testAnnotations()
@@ -64,51 +64,51 @@ public function testGetErrorAttribute()
     {
         $this->assertNull($this->model->error);
         $this->model->attrs = ['error' => 'not-found'];
-        $this->assertEquals('not-found', $this->model->error);
+        $this->assertSame('not-found', $this->model->error);
     }
 
     public function testSetErrorAttribute()
     {
         $this->model->error = 'not-found';
-        $this->assertEquals(['error' => 'not-found'], $this->model->attrs);
+        $this->assertSame(['error' => 'not-found'], $this->model->attrs);
     }
 
     public function testGetMimeTypeAttribute()
     {
         $this->assertNull($this->model->mimeType);
         $this->model->attrs = ['mimetype' => 'video/mp4'];
-        $this->assertEquals('video/mp4', $this->model->mimeType);
+        $this->assertSame('video/mp4', $this->model->mimeType);
     }
 
     public function testSetMimeTypeAttribute()
     {
         $this->model->mimeType = 'video/mp4';
-        $this->assertEquals(['mimetype' => 'video/mp4'], $this->model->attrs);
+        $this->assertSame(['mimetype' => 'video/mp4'], $this->model->attrs);
     }
 
     public function testGetSizeAttribute()
     {
         $this->assertNull($this->model->size);
         $this->model->attrs = ['size' => 123];
-        $this->assertEquals(123, $this->model->size);
+        $this->assertSame(123, $this->model->size);
     }
 
     public function testSetSizeAttribute()
     {
         $this->model->size = 123;
-        $this->assertEquals(['size' => 123], $this->model->attrs);
+        $this->assertSame(['size' => 123], $this->model->attrs);
     }
 
     public function testSetWidthAttribute()
     {
         $this->model->width = 123;
-        $this->assertEquals(['width' => 123], $this->model->attrs);
+        $this->assertSame(['width' => 123], $this->model->attrs);
     }
 
     public function testSetHeightAttribute()
     {
         $this->model->height = 123;
-        $this->assertEquals(['height' => 123], $this->model->attrs);
+        $this->assertSame(['height' => 123], $this->model->attrs);
     }
 
     public function testHasBeenProcessed()
@@ -121,9 +121,9 @@ public function testHasBeenProcessed()
     public function testLabels()
     {
         $vl = VideoLabelTest::create(['video_id' => $this->model->id]);
-        $this->assertEquals(1, $this->model->labels()->count());
+        $this->assertSame(1, $this->model->labels()->count());
         $label = $this->model->labels()->first();
-        $this->assertEquals($vl->id, $label->id);
+        $this->assertSame($vl->id, $label->id);
     }
 
     public function testImagesDeletedEventOnDelete()
@@ -141,8 +141,8 @@ public function testTakenAt()
         $this->model->taken_at = [$now, $then];
         $this->model->save();
         $takenAt = $this->model->fresh()->taken_at;
-        $this->assertEquals($now->timestamp, $takenAt[0]->timestamp);
-        $this->assertEquals($then->timestamp, $takenAt[1]->timestamp);
+        $this->assertSame($now->timestamp, $takenAt[0]->timestamp);
+        $this->assertSame($then->timestamp, $takenAt[1]->timestamp);
     }
 
     public function testSetGetLngAttribute()
@@ -151,7 +151,7 @@ public function testSetGetLngAttribute()
         $this->assertNull($this->model->lng);
         $this->model->lng = $expect;
         $this->model->save();
-        $this->assertEquals($expect, $this->model->fresh()->lng);
+        $this->assertSame($expect, $this->model->fresh()->lng);
     }
 
     public function testSetGetLatAttribute()
@@ -160,15 +160,15 @@ public function testSetGetLatAttribute()
         $this->assertNull($this->model->lat);
         $this->model->lat = $expect;
         $this->model->save();
-        $this->assertEquals($expect, $this->model->fresh()->lat);
+        $this->assertSame($expect, $this->model->fresh()->lat);
     }
 
     public function testSetGetMetadataAttribute()
     {
         $expect = ['area' => [2.6, 1.6]];
-        $this->assertEquals([], $this->model->metadata);
+        $this->assertSame([], $this->model->metadata);
         $this->model->metadata = $expect;
         $this->model->save();
-        $this->assertEquals($expect, $this->model->fresh()->metadata);
+        $this->assertSame($expect, $this->model->fresh()->metadata);
     }
 }
diff --git a/tests/php/VisibilityTest.php b/tests/php/VisibilityTest.php
index 33f7c5999..46847562d 100644
--- a/tests/php/VisibilityTest.php
+++ b/tests/php/VisibilityTest.php
@@ -34,11 +34,11 @@ public function testNameUnique()
 
     public function testPublic()
     {
-        $this->assertEquals('public', Visibility::public()->name);
+        $this->assertSame('public', Visibility::public()->name);
     }
 
     public function testPrivate()
     {
-        $this->assertEquals('private', Visibility::private()->name);
+        $this->assertSame('private', Visibility::private()->name);
     }
 }
diff --git a/tests/php/VolumeTest.php b/tests/php/VolumeTest.php
index 504a9ea2c..199caaafc 100644
--- a/tests/php/VolumeTest.php
+++ b/tests/php/VolumeTest.php
@@ -72,23 +72,23 @@ public function testCreatorOnDeleteSetNull()
     public function testImages()
     {
         $image = ImageTest::create(['volume_id' => $this->model->id]);
-        $this->assertEquals($image->id, $this->model->images()->first()->id);
+        $this->assertSame($image->id, $this->model->images()->first()->id);
     }
 
     public function testVideos()
     {
         $video = VideoTest::create(['volume_id' => $this->model->id]);
-        $this->assertEquals($video->id, $this->model->videos()->first()->id);
+        $this->assertSame($video->id, $this->model->videos()->first()->id);
     }
 
     public function testFiles()
     {
         $image = ImageTest::create(['volume_id' => $this->model->id]);
         $video = VideoTest::create(['volume_id' => $this->model->id]);
-        $this->assertEquals($image->uuid, $this->model->files()->first()->uuid);
+        $this->assertSame($image->uuid, $this->model->files()->first()->uuid);
         $this->model->media_type_id = MediaType::videoId();
         $this->model->save();
-        $this->assertEquals($video->uuid, $this->model->files()->first()->uuid);
+        $this->assertSame($video->uuid, $this->model->files()->first()->uuid);
     }
 
     public function testIsImageVolume()
@@ -110,34 +110,34 @@ public function testIsVideoVolume()
     public function testProjects()
     {
         $project = ProjectTest::create();
-        $this->assertEquals(0, $this->model->projects()->count());
+        $this->assertSame(0, $this->model->projects()->count());
         $project->volumes()->attach($this->model);
-        $this->assertEquals(1, $this->model->projects()->count());
+        $this->assertSame(1, $this->model->projects()->count());
     }
 
     public function testCastsAttrs()
     {
         $this->model->attrs = [1, 2, 3];
         $this->model->save();
-        $this->assertEquals([1, 2, 3], $this->model->fresh()->attrs);
+        $this->assertSame([1, 2, 3], $this->model->fresh()->attrs);
     }
 
     public function testParseFilesQueryString()
     {
         $return = Volume::parseFilesQueryString('');
-        $this->assertEquals([], $return);
+        $this->assertSame([], $return);
 
         $return = Volume::parseFilesQueryString(', 1.jpg , , 2.jpg, , , ');
-        $this->assertEquals(['1.jpg', '2.jpg'], $return);
+        $this->assertSame(['1.jpg', '2.jpg'], $return);
 
         $return = Volume::parseFilesQueryString(' 1.jpg ');
-        $this->assertEquals(['1.jpg'], $return);
+        $this->assertSame(['1.jpg'], $return);
 
         $return = Volume::parseFilesQueryString("'1.jpg', '2.jpg'");
-        $this->assertEquals(['1.jpg', '2.jpg'], $return);
+        $this->assertSame(['1.jpg', '2.jpg'], $return);
 
         $return = Volume::parseFilesQueryString('"1.jpg", "2.jpg"');
-        $this->assertEquals(['1.jpg', '2.jpg'], $return);
+        $this->assertSame(['1.jpg', '2.jpg'], $return);
     }
 
     public function testImagesDeletedEventOnDelete()
@@ -182,7 +182,7 @@ public function testActiveAnnotationSession()
             'ends_at' => Carbon::yesterday(),
         ]);
 
-        $this->assertEquals($active->id, $this->model->activeAnnotationSession->id);
+        $this->assertSame($active->id, $this->model->activeAnnotationSession->id);
     }
 
     public function testHasConflictingAnnotationSession()
@@ -293,11 +293,11 @@ public function testUsers()
 
         $users = $this->model->users()->get();
         // project creators are counted, too
-        $this->assertEquals(5, $users->count());
-        $this->assertEquals(1, $users->where('id', $u1->id)->count());
-        $this->assertEquals(1, $users->where('id', $u2->id)->count());
-        $this->assertEquals(1, $users->where('id', $u3->id)->count());
-        $this->assertEquals(0, $users->where('id', $u4->id)->count());
+        $this->assertSame(5, $users->count());
+        $this->assertSame(1, $users->where('id', $u1->id)->count());
+        $this->assertSame(1, $users->where('id', $u2->id)->count());
+        $this->assertSame(1, $users->where('id', $u3->id)->count());
+        $this->assertSame(0, $users->where('id', $u4->id)->count());
     }
 
     public function testIsRemote()
@@ -320,7 +320,7 @@ public function testOrderedImages()
             'filename' => 'a.jpg',
             'volume_id' => $this->model->id,
         ]);
-        $this->assertEquals('a.jpg', $this->model->orderedImages()->first()->filename);
+        $this->assertSame('a.jpg', $this->model->orderedImages()->first()->filename);
     }
 
     public function testOrderedFilesImage()
@@ -333,7 +333,7 @@ public function testOrderedFilesImage()
             'filename' => 'a.jpg',
             'volume_id' => $this->model->id,
         ]);
-        $this->assertEquals('a.jpg', $this->model->orderedFiles()->first()->filename);
+        $this->assertSame('a.jpg', $this->model->orderedFiles()->first()->filename);
     }
 
     public function testOrderedFilesVideo()
@@ -348,12 +348,12 @@ public function testOrderedFilesVideo()
             'filename' => 'a.mp4',
             'volume_id' => $this->model->id,
         ]);
-        $this->assertEquals('a.mp4', $this->model->orderedFiles()->first()->filename);
+        $this->assertSame('a.mp4', $this->model->orderedFiles()->first()->filename);
     }
 
     public function testGetThumbnailAttributeNull()
     {
-        $this->assertEquals(null, $this->model->thumbnail);
+        $this->assertSame(null, $this->model->thumbnail);
     }
 
     public function testGetThumbnailAttributeImage()
@@ -372,11 +372,11 @@ public function testGetThumbnailAttributeImage()
         ]);
 
         // Should be the middle image ordered by name.
-        $this->assertEquals($i2->uuid, $this->model->thumbnail->uuid);
+        $this->assertSame($i2->uuid, $this->model->thumbnail->uuid);
 
         // If the thumbnail is deleted, purge the cache so a new thumbnail is selected.
         $i2->delete();
-        $this->assertEquals($i1->uuid, $this->model->thumbnail->uuid);
+        $this->assertSame($i1->uuid, $this->model->thumbnail->uuid);
     }
 
     public function testGetThumbnailAttributeVideo()
@@ -397,11 +397,11 @@ public function testGetThumbnailAttributeVideo()
         ]);
 
         // Should be the middle image ordered by name.
-        $this->assertEquals($v2->uuid, $this->model->thumbnail->uuid);
+        $this->assertSame($v2->uuid, $this->model->thumbnail->uuid);
 
         // If the thumbnail is deleted, purge the cache so a new thumbnail is selected.
         $v2->delete();
-        $this->assertEquals($v1->uuid, $this->model->thumbnail->uuid);
+        $this->assertSame($v1->uuid, $this->model->thumbnail->uuid);
     }
 
     public function testHasGeoInfo()
@@ -447,7 +447,7 @@ public function testHandleAttribute()
     {
         $this->model->handle = '10.3389/fmars.2017.00083';
         $this->model->save();
-        $this->assertEquals('10.3389/fmars.2017.00083', $this->model->fresh()->handle);
+        $this->assertSame('10.3389/fmars.2017.00083', $this->model->fresh()->handle);
     }
 
     public function testScopeAccessibleBy()
@@ -468,10 +468,10 @@ public function testScopeAccessibleBy()
     public function testSanitizeUrl()
     {
         $this->model->url = 'http://example.com/images/';
-        $this->assertEquals('http://example.com/images', $this->model->url);
+        $this->assertSame('http://example.com/images', $this->model->url);
 
         $this->model->url = 'disk://';
-        $this->assertEquals('disk://', $this->model->url);
+        $this->assertSame('disk://', $this->model->url);
     }
 
     public function testGetThumbnailsAttribute()
@@ -623,6 +623,6 @@ public function testGetIfdo()
         $this->assertNull($this->model->getIfdo());
         $disk->put($this->model->id.'.yaml', 'abc: def');
         $ifdo = $this->model->getIfdo();
-        $this->assertEquals(['abc' => 'def'], $ifdo);
+        $this->assertSame(['abc' => 'def'], $ifdo);
     }
 }

From 08bb6424e0c90b4d035be6c80ceb453166ec4798 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Tue, 20 Aug 2024 10:36:37 +0200
Subject: [PATCH 158/209] Fix test that sometimes fails

---
 tests/php/LabelTreeTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/php/LabelTreeTest.php b/tests/php/LabelTreeTest.php
index 976f1907d..c0c3cdb59 100644
--- a/tests/php/LabelTreeTest.php
+++ b/tests/php/LabelTreeTest.php
@@ -242,7 +242,7 @@ public function testScopeAccessibleBy()
         $project = ProjectTest::create(['creator_id' => $user->id]);
         $project->labelTrees()->attach($tree3);
 
-        $ids = LabelTree::accessibleBy($user)->pluck('id')->toArray();
+        $ids = LabelTree::accessibleBy($user)->orderBy('id')->pluck('id')->toArray();
         $this->assertEquals([$tree->id, $tree2->id, $tree3->id], $ids);
     }
 

From 71e47b4a463cda32c0a94336f3d8bbf21666fc58 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Tue, 20 Aug 2024 11:37:16 +0200
Subject: [PATCH 159/209] Update last drawn point and time only if drawing
 points

---
 .../annotationCanvas/drawInteractions.vue     | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/resources/assets/js/annotations/components/annotationCanvas/drawInteractions.vue b/resources/assets/js/annotations/components/annotationCanvas/drawInteractions.vue
index 91a76dfce..9a3233a92 100644
--- a/resources/assets/js/annotations/components/annotationCanvas/drawInteractions.vue
+++ b/resources/assets/js/annotations/components/annotationCanvas/drawInteractions.vue
@@ -13,7 +13,9 @@ import { Point } from '@biigle/ol/geom';
  */
 
 let drawInteraction;
-let lastdrawnPoint = {time:0, point: new Point(0,0)};
+
+const POINT_CLICK_COOLDOWN = 400;
+const POINT_CLICK_DISTANCE = 5;
 
 // Custom OpenLayers freehandCondition that is true if a pen is used for input or
 // if Shift is pressed otherwise.
@@ -32,6 +34,8 @@ export default {
     data() {
         return {
             drawEnded: true,
+            lastDrawnPoint: new Point(0, 0),
+            lastDrawnPointTime: 0,
         }
     },
     computed: {
@@ -106,21 +110,29 @@ export default {
                 });
 
                 drawInteraction.on('drawend', (e) => {
-                    if (this.isDrawingPoint && new Date().getTime() - lastdrawnPoint['time'] < 400 && lastdrawnPoint['point'].distanceTo(e.feature.getGeometry()) < 5) {
-                        this.annotationSource.removeFeature(e.feature);
-                    } else {
-                        this.handleNewFeature(e);
-                        lastdrawnPoint['time'] = new Date().getTime();
-                        lastdrawnPoint['point'] = e.feature.getGeometry();
-                    }
                     this.drawEnded = true;
+
+                    if (this.isDrawingPoint) {
+                        if (this.isPointDoubleClick(e)) {
+                            this.annotationSource.removeFeature(e.feature);
+                            return;
+                        }
+                        this.lastDrawnPointTime = new Date().getTime();
+                        this.lastDrawnPoint = e.feature.getGeometry();
+                    }
+
+                    this.handleNewFeature(e);
                 });
 
                 drawInteraction.on('drawabort', () => {
-                        this.drawEnded = true;
-                    });
+                    this.drawEnded = true;
+                });
             }
         },
+        isPointDoubleClick(e) {
+            return new Date().getTime() - this.lastDrawnPointTime < POINT_CLICK_COOLDOWN
+                && this.lastDrawnPoint.distanceTo(e.feature.getGeometry()) < POINT_CLICK_DISTANCE;
+        },
     },
     watch: {
         selectedLabel(label) {

From 8679c00cdf0373458b1b9e16f705841046eed5cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Langenk=C3=A4mper?= <dlangenk@gmail.com>
Date: Tue, 20 Aug 2024 13:13:06 +0200
Subject: [PATCH 160/209] fixed distanceto with custom computeDistance method

---
 .../components/annotationCanvas/drawInteractions.vue     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/resources/assets/js/annotations/components/annotationCanvas/drawInteractions.vue b/resources/assets/js/annotations/components/annotationCanvas/drawInteractions.vue
index 91a76dfce..18185be44 100644
--- a/resources/assets/js/annotations/components/annotationCanvas/drawInteractions.vue
+++ b/resources/assets/js/annotations/components/annotationCanvas/drawInteractions.vue
@@ -6,6 +6,13 @@ import { shiftKeyOnly } from '@biigle/ol/events/condition';
 import snapInteraction from '../../snapInteraction.vue';
 import { Point } from '@biigle/ol/geom';
 
+
+function computeDistance(point1, point2) {
+    let p1=point1.getCoordinates();
+    let p2=point2.getCoordinates();
+    return Math.sqrt(Math.pow(p2[0] - p1[0], 2) + Math.pow(p2[1] - p1[1], 2));
+}
+
 /**
  * Mixin for the annotationCanvas component that contains logic for the draw interactions.
  *
@@ -106,7 +113,7 @@ export default {
                 });
 
                 drawInteraction.on('drawend', (e) => {
-                    if (this.isDrawingPoint && new Date().getTime() - lastdrawnPoint['time'] < 400 && lastdrawnPoint['point'].distanceTo(e.feature.getGeometry()) < 5) {
+                    if (this.isDrawingPoint && new Date().getTime() - lastdrawnPoint['time'] < 400 && computeDistance(lastdrawnPoint['point'],e.feature.getGeometry()) < 5) {
                         this.annotationSource.removeFeature(e.feature);
                     } else {
                         this.handleNewFeature(e);

From 8b85a87f39d780cf795c47ae2047ea483ed34009 Mon Sep 17 00:00:00 2001
From: Leane Schlundt <lhecht@techfak.de>
Date: Wed, 21 Aug 2024 07:46:32 +0200
Subject: [PATCH 161/209] Revert "Fix input slider focus"

This reverts commit d41dc046f4da4e434692ea4766e8780801969800.
---
 resources/assets/js/annotations/components/settingsTab.vue | 3 ---
 resources/views/annotations/show/tabs/settings.blade.php   | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/resources/assets/js/annotations/components/settingsTab.vue b/resources/assets/js/annotations/components/settingsTab.vue
index 1b6e3668a..1dcf56d1f 100644
--- a/resources/assets/js/annotations/components/settingsTab.vue
+++ b/resources/assets/js/annotations/components/settingsTab.vue
@@ -116,9 +116,6 @@ export default {
                 this.annotationOpacity = 1;
             }
         },
-        removeFocus(id) {
-            document.getElementById(id).blur();
-        }
     },
     watch: {
         annotationOpacity(opacity) {
diff --git a/resources/views/annotations/show/tabs/settings.blade.php b/resources/views/annotations/show/tabs/settings.blade.php
index a41fa91d7..2e8f13210 100644
--- a/resources/views/annotations/show/tabs/settings.blade.php
+++ b/resources/views/annotations/show/tabs/settings.blade.php
@@ -10,12 +10,12 @@
 
             <div class="sidebar-tab__section">
                 <h5 title="Set the opacity of annotations on the map">Annotation Opacity (<span v-text="annotationOpacity"></span>)</h5>
-                <input id="annotationOpacity" type="range" min="0" max="1" step="0.1" v-model="annotationOpacity" v-on:click='removeFocus("annotationOpacity")'>
+                <input type="range" min="0" max="1" step="0.1" v-model="annotationOpacity">
             </div>
 
             <div class="sidebar-tab__section">
                 <h5 title="Set the number of caches images ">Cached Images (<span v-text="cachedImagesCount"></span>)</h5>
-                <input id="cachedImagesCount" type="range" min="1" max="50" step="1" v-model="cachedImagesCount" v-on:click='removeFocus("cachedImagesCount")'>
+                <input type="range" min="1" max="50" step="1" v-model="cachedImagesCount">
             </div>
 
             <div class="sidebar-tab__section">

From 448107887c4fd9380ea8eb7f61c530de81ac97fb Mon Sep 17 00:00:00 2001
From: Leane Schlundt <lhecht@techfak.de>
Date: Wed, 21 Aug 2024 07:48:55 +0200
Subject: [PATCH 162/209] Fix slider focus by using blur with onmouseup

---
 resources/views/annotations/show/tabs/settings.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/annotations/show/tabs/settings.blade.php b/resources/views/annotations/show/tabs/settings.blade.php
index 2e8f13210..a9fece479 100644
--- a/resources/views/annotations/show/tabs/settings.blade.php
+++ b/resources/views/annotations/show/tabs/settings.blade.php
@@ -10,12 +10,12 @@
 
             <div class="sidebar-tab__section">
                 <h5 title="Set the opacity of annotations on the map">Annotation Opacity (<span v-text="annotationOpacity"></span>)</h5>
-                <input type="range" min="0" max="1" step="0.1" v-model="annotationOpacity">
+                <input type="range" min="0" max="1" step="0.1" v-model="annotationOpacity" onmouseup="this.blur()">
             </div>
 
             <div class="sidebar-tab__section">
                 <h5 title="Set the number of caches images ">Cached Images (<span v-text="cachedImagesCount"></span>)</h5>
-                <input type="range" min="1" max="50" step="1" v-model="cachedImagesCount">
+                <input type="range" min="1" max="50" step="1" v-model="cachedImagesCount" onmouseup="this.blur()">
             </div>
 
             <div class="sidebar-tab__section">

From 8c333c54308d990370d783a4e4bf8075240dd71b Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 21 Aug 2024 10:28:52 +0200
Subject: [PATCH 163/209] Fix removal of point feature after double click

---
 .../components/annotationCanvas/drawInteractions.vue       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/assets/js/annotations/components/annotationCanvas/drawInteractions.vue b/resources/assets/js/annotations/components/annotationCanvas/drawInteractions.vue
index 2476dbddf..2e0b3fd1d 100644
--- a/resources/assets/js/annotations/components/annotationCanvas/drawInteractions.vue
+++ b/resources/assets/js/annotations/components/annotationCanvas/drawInteractions.vue
@@ -121,7 +121,12 @@ export default {
 
                     if (this.isDrawingPoint) {
                         if (this.isPointDoubleClick(e)) {
-                            this.annotationSource.removeFeature(e.feature);
+                            // The feature is added to the source only after this event
+                            // is handled, so removel has to happen after the addfeature
+                            // event.
+                            this.annotationSource.once('addfeature', function () {
+                                this.removeFeature(e.feature);
+                            });
                             return;
                         }
                         this.lastDrawnPointTime = new Date().getTime();

From 6f03b397bbf49ce49f5ea1baf65865b0733aecc8 Mon Sep 17 00:00:00 2001
From: aneust <aneustaedter@techfak.uni-bielefeld.de>
Date: Wed, 21 Aug 2024 20:16:58 +0200
Subject: [PATCH 164/209] Rearranged fields search input, "recently joined"
 button, "new user" button

---
 resources/views/admin/users.blade.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/resources/views/admin/users.blade.php b/resources/views/admin/users.blade.php
index 5e8d20512..62398b46d 100644
--- a/resources/views/admin/users.blade.php
+++ b/resources/views/admin/users.blade.php
@@ -8,16 +8,19 @@
         The user was deleted.
     </div>
 @endif
-<a href="{{route('admin-users-recent')}}" class="btn btn-default" title="Get Recent Users">
-    Recently joined
-    <span class="badge">{{$usersCount}}</span>
-</a>
 <form class="form-inline inline-block-form" action="{{route('admin-users')}}" method="get">
     <input class="form-control" type="text" name="q" placeholder="Search users" value="{{$query}}">
 </form>
 @if ($query)
     <a href="{{route('admin-users')}}" class="btn btn-info" title="Clear filtering"><i class="fas fa-times"></i></a>
 @endif
+<a href="{{route('admin-users')}}?recent=1" class="btn btn-default" title="Get Recent Users">
+    Recently joined
+    <span class="badge">{{$usersCount}}</span>
+</a>
+@if(request('recent'))
+    <a href="{{route('admin-users')}}" class="btn btn-info" title="Clear filtering"><i class="fas fa-times"></i></a>
+@endif
 <a href="{{route('admin-users-new')}}" class="btn btn-default" title="Create a new user">New user</a>
 <table class="table table-hover">
     <thead>

From 70a96b16e544df07035bb5f06b355fe7d9a57126 Mon Sep 17 00:00:00 2001
From: aneust <aneustaedter@techfak.uni-bielefeld.de>
Date: Wed, 21 Aug 2024 20:22:06 +0200
Subject: [PATCH 165/209] Removed "recent user" view instead the list of users
 is filtered in the same view

---
 resources/views/admin/users/recent.blade.php | 60 --------------------
 routes/web.php                               |  5 --
 2 files changed, 65 deletions(-)
 delete mode 100644 resources/views/admin/users/recent.blade.php

diff --git a/resources/views/admin/users/recent.blade.php b/resources/views/admin/users/recent.blade.php
deleted file mode 100644
index ca00d554a..000000000
--- a/resources/views/admin/users/recent.blade.php
+++ /dev/null
@@ -1,60 +0,0 @@
-@extends('admin.base')
-
-@section('title', 'Recent Users')
-
-@section('admin-content')
-@if ($usersCount > 0)
-    <div class="alert alert-info" role="alert">
-        There are {{$usersCount}} users who joined in the last 7 days.
-    </div>
-    <table class="table table-hover">
-        <thead>
-            <tr>
-                <th>Name</th>
-                <th>Email</th>
-                <th>Role</th>
-                <th>Affiliation</th>
-                <th>Activity</th>
-                <th>Created</th>
-            </tr>
-        </thead>
-        <tbody>
-            @foreach($users as $u)
-                <tr>
-                    <td>
-                        <a href="{{route('admin-users-show', $u->id)}}">{{$u->firstname}} {{$u->lastname}}</a>
-                    </td>
-                    <td><a href="mailto:{{$u->email}}">{{$u->email}}</a></td>
-                    <td>
-                        <span class="label label-{{$roleClass[$u->role_id]}}" title="{{$roleNames[$u->role_id]}}">{{$roleNames[$u->role_id][0]}}</span>
-                    </td>
-                    <td>
-                        @if ($u->affiliation)
-                            <span title="{{$u->affiliation}}">{{Str::limit($u->affiliation, 20)}}</span>
-                        @else
-                            <span class="text-muted">none</span>
-                        @endif
-                    </td>
-                    <td>
-                        @if ($u->login_at)
-                            <time datetime="{{$u->login_at->toAtomString()}}" title="{{$u->login_at->toDateTimeString()}}">{{$u->login_at->diffForHumans()}}</time>
-                        @else
-                            <span class="text-muted">none</span>
-                        @endif
-                    </td>
-                    <td>
-                        <time datetime="{{$u->created_at->toAtomString()}}" title="{{$u->created_at->toDateTimeString()}}">{{$u->created_at->diffForHumans()}}</time>
-                    </td>
-                </tr>
-            @endforeach
-        </tbody>
-    </table>
-    <nav class="text-center">
-        {{$users->links()}}
-    </nav>
-@else
-    <div class="alert alert-info" role="alert">
-        No recently joined users found.
-    </div>
-@endif
-@endsection
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index e8aa3c2e3..0970d1c79 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -114,11 +114,6 @@
             'uses' => 'UsersController@get',
         ]);
 
-        $router->get('users/recent', [
-            'as' => 'admin-users-recent',
-            'uses' => 'UsersController@getRecentUsers',
-        ]);
-
         $router->get('users/new', [
             'as' => 'admin-users-new',
             'uses' => 'UsersController@newUser',

From 8c820ec9143d89d6118ed6d3156535acea473ac5 Mon Sep 17 00:00:00 2001
From: aneust <aneustaedter@techfak.uni-bielefeld.de>
Date: Wed, 21 Aug 2024 20:23:15 +0200
Subject: [PATCH 166/209] Applied requested changes

---
 .../Views/Admin/UsersController.php           | 42 +++----------------
 1 file changed, 5 insertions(+), 37 deletions(-)

diff --git a/app/Http/Controllers/Views/Admin/UsersController.php b/app/Http/Controllers/Views/Admin/UsersController.php
index 3260f6541..96be5209e 100644
--- a/app/Http/Controllers/Views/Admin/UsersController.php
+++ b/app/Http/Controllers/Views/Admin/UsersController.php
@@ -32,6 +32,10 @@ public function get(Request $request)
                         ->orWhere('email', 'ilike', "%$q%");
                 });
             })
+            ->when(
+                $request->get('recent'),
+                fn ($query) => $query->where('created_at', '>=', now()->subWeek())
+            )
             // Orders by login_at in descending order (most recent first) but puts
             // users with login_at=NULL at the end.
             ->orderByRaw('login_at IS NULL, login_at DESC')
@@ -44,7 +48,7 @@ public function get(Request $request)
             Role::guestId() => 'Guest',
         ];
 
-        $usersCount = User::whereDate('created_at', '>=', now()->subDays(7)->setTime(0, 0, 0)->toDateTimeString())
+        $usersCount = User::whereDate('created_at', '>=', now()->subWeek())
             ->count();
 
         return view('admin.users', [
@@ -56,42 +60,6 @@ public function get(Request $request)
         ]);
     }
 
-    /**
-     * Shows newest users.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function getRecentUsers()
-    {
-        /*
-        <form class="form-inline inline-block-form" action="{{route('admin-users')}}" method="get">
-            <button class="button">Recently joined</button>
-            <span class="badge" href="{{route('admin-users')}}">{{$usersCount}}</span>
-        </form>*/
-        // Fetch users created in the last 7 days
-        $users = User::select('id', 'firstname', 'lastname', 'email', 'login_at', 'created_at', 'role_id', 'affiliation')
-            // Orders by created_at in descending order
-            ->whereDate('created_at', '>=', now()->subDays(7)->setTime(0, 0, 0)->toDateTimeString())
-            ->orderBy('created_at', 'desc')
-            ->paginate(100);
-            
-        $roleNames = [
-            Role::adminId() => 'Admin',
-            Role::editorId() => 'Editor',
-            Role::guestId() => 'Guest',
-        ];
-
-        // $usersCount = User::whereDate('created_at', '>=', now()->subDays(7)->setTime(0, 0, 0)->toDateTimeString())->count();
-        $usersCount = $users->total();
-
-        return view('admin.users.recent', [
-            'users' => $users,
-            'roleNames' => $roleNames,
-            'usersCount' => $usersCount,
-            'roleClass' => $this->roleClassMap(),
-        ]);
-    }
-
     /**
      * Shows the admin new user page.
      *

From 125f669ed196753e8b377fe5ff49ffa961e56c38 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 22 Aug 2024 08:19:15 +0200
Subject: [PATCH 167/209] Tweak UI of recent users filtering in admin area

---
 resources/views/admin/users.blade.php | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/resources/views/admin/users.blade.php b/resources/views/admin/users.blade.php
index 62398b46d..ac2100843 100644
--- a/resources/views/admin/users.blade.php
+++ b/resources/views/admin/users.blade.php
@@ -8,20 +8,19 @@
         The user was deleted.
     </div>
 @endif
-<form class="form-inline inline-block-form" action="{{route('admin-users')}}" method="get">
-    <input class="form-control" type="text" name="q" placeholder="Search users" value="{{$query}}">
-</form>
-@if ($query)
-    <a href="{{route('admin-users')}}" class="btn btn-info" title="Clear filtering"><i class="fas fa-times"></i></a>
-@endif
-<a href="{{route('admin-users')}}?recent=1" class="btn btn-default" title="Get Recent Users">
-    Recently joined
-    <span class="badge">{{$usersCount}}</span>
-</a>
-@if(request('recent'))
-    <a href="{{route('admin-users')}}" class="btn btn-info" title="Clear filtering"><i class="fas fa-times"></i></a>
-@endif
-<a href="{{route('admin-users-new')}}" class="btn btn-default" title="Create a new user">New user</a>
+<div class="clearfix">
+    <form class="form-inline inline-block-form" action="{{route('admin-users')}}" method="get">
+        <input class="form-control" type="text" name="q" placeholder="Search users" value="{{$query}}">
+    </form>
+    @if ($query)
+        <a href="{{route('admin-users')}}" class="btn btn-info" title="Clear filtering"><i class="fas fa-times"></i></a>
+    @endif
+    <a @if (request('recent')) href="{{route('admin-users')}}" class="btn btn-info active" @else href="{{route('admin-users')}}?recent=1" class="btn btn-default" @endif title="Show users who joined within the last 7 days">
+        Recently joined
+        <span class="badge">{{$usersCount}}</span>
+    </a>
+    <a href="{{route('admin-users-new')}}" class="btn btn-default pull-right" title="Create a new user">New user</a>
+</div>
 <table class="table table-hover">
     <thead>
         <tr>

From 5e05711d26c866a79da400a9bb8fc5b354f599a3 Mon Sep 17 00:00:00 2001
From: Leane Schlundt <lhecht@techfak.de>
Date: Thu, 22 Aug 2024 08:40:05 +0200
Subject: [PATCH 168/209] Use numeric values for metadata

---
 .../Api/Volumes/MetadataController.php           |  5 +++--
 .../Api/Volumes/MetadataControllerTest.php       | 16 ++++++++--------
 tests/php/Jobs/CreateNewImagesOrVideosTest.php   | 10 +++++-----
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/Http/Controllers/Api/Volumes/MetadataController.php b/app/Http/Controllers/Api/Volumes/MetadataController.php
index 7ba285721..efead8095 100644
--- a/app/Http/Controllers/Api/Volumes/MetadataController.php
+++ b/app/Http/Controllers/Api/Volumes/MetadataController.php
@@ -101,8 +101,9 @@ protected function updateImageMetadata(StoreVolumeMetadata $request)
             }
             $image->fillable(ImageMetadata::ALLOWED_ATTRIBUTES);
             $image->fill($fill->toArray());
-
-            $metadata = $row->only(ImageMetadata::ALLOWED_METADATA);
+            $metadata = $row
+                ->only(ImageMetadata::ALLOWED_METADATA)
+                ->map(fn ($str) => strpos($str, '.') ? floatval($str) : intval($str));
             $image->metadata = array_merge($image->metadata, $metadata->toArray());
             $image->save();
         }
diff --git a/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php b/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php
index df5209f34..a10067672 100644
--- a/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php
+++ b/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php
@@ -63,12 +63,12 @@ public function testStoreImageMetadata()
         $this->assertSame('2016-12-19 12:27:00', $jpg->taken_at->toDateTimeString());
         $this->assertSame(52.220, $jpg->lng);
         $this->assertSame(28.123, $jpg->lat);
-        $this->assertSame(-1500, intval($jpg->metadata['gps_altitude']));
-        $this->assertSame(2.6, floatval($jpg->metadata['area']));
+        $this->assertSame(-1500, $jpg->metadata['gps_altitude']);
+        $this->assertSame(2.6, $jpg->metadata['area']);
         // Import should update but not destroy existing metadata.
-        $this->assertSame(10, intval($jpg->metadata['distance_to_ground']));
+        $this->assertSame(10, $jpg->metadata['distance_to_ground']);
         $this->assertSame(4000, $jpg->metadata['water_depth']);
-        $this->assertSame(180, intval($jpg->metadata['yaw']));
+        $this->assertSame(180, $jpg->metadata['yaw']);
 
         $this->assertNull($png->taken_at);
         $this->assertNull($png->lng);
@@ -107,8 +107,8 @@ public function testStoreDeprecatedFileAttribute()
 
         $image->refresh();
         $this->assertSame(4000, $image->metadata['water_depth']);
-        $this->assertSame(10, intval($image->metadata['distance_to_ground']));
-        $this->assertSame(2.6, floatval($image->metadata['area']));
+        $this->assertSame(10, $image->metadata['distance_to_ground']);
+        $this->assertSame(2.6, $image->metadata['area']);
     }
 
     public function testStoreImageMetadataText()
@@ -131,8 +131,8 @@ public function testStoreImageMetadataText()
 
         $image->refresh();
         $this->assertSame(4000, $image->metadata['water_depth']);
-        $this->assertSame(10, intval($image->metadata['distance_to_ground']));
-        $this->assertSame(2.5, floatval($image->metadata['area']));
+        $this->assertSame(10, $image->metadata['distance_to_ground']);
+        $this->assertSame(2.5, $image->metadata['area']);
     }
 
     public function testStoreVideoMetadataCsv()
diff --git a/tests/php/Jobs/CreateNewImagesOrVideosTest.php b/tests/php/Jobs/CreateNewImagesOrVideosTest.php
index 6dce211e1..fc7ee3abd 100644
--- a/tests/php/Jobs/CreateNewImagesOrVideosTest.php
+++ b/tests/php/Jobs/CreateNewImagesOrVideosTest.php
@@ -69,7 +69,7 @@ public function testHandleImageMetadata()
         $filenames = ['a.jpg'];
         $metadata = [
             ['filename', 'taken_at', 'lng', 'lat', 'gps_altitude', 'distance_to_ground', 'area', 'yaw'],
-            ['a.jpg', '2016-12-19 12:27:00', '52.220', '28.123', '-1500', '10', '2.6', '180'],
+            ['a.jpg', '2016-12-19 12:27:00', '52.220', '28.123', -1500, 10, 2.6, 180],
         ];
 
         with(new CreateNewImagesOrVideos($volume, $filenames, $metadata))->handle();
@@ -77,10 +77,10 @@ public function testHandleImageMetadata()
         $this->assertSame('2016-12-19 12:27:00', $image->taken_at->toDateTimeString());
         $this->assertSame(52.220, $image->lng);
         $this->assertSame(28.123, $image->lat);
-        $this->assertSame(-1500, intval($image->metadata['gps_altitude']));
-        $this->assertSame(2.6, floatval($image->metadata['area']));
-        $this->assertSame(10, intval($image->metadata['distance_to_ground']));
-        $this->assertSame(180, intval($image->metadata['yaw']));
+        $this->assertSame(-1500, $image->metadata['gps_altitude']);
+        $this->assertSame(2.6, $image->metadata['area']);
+        $this->assertSame(10, $image->metadata['distance_to_ground']);
+        $this->assertSame(180, $image->metadata['yaw']);
     }
 
     public function testHandleImageMetadataEmptyCells()

From 003bc8380bce8298a5674e262dd99795227076a0 Mon Sep 17 00:00:00 2001
From: Leane Schlundt <lhecht@techfak.de>
Date: Thu, 22 Aug 2024 09:06:11 +0200
Subject: [PATCH 169/209] Fix wrong numerical representation

---
 tests/php/Jobs/ProcessNewImageTest.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/php/Jobs/ProcessNewImageTest.php b/tests/php/Jobs/ProcessNewImageTest.php
index 5184f515f..7bf04cc38 100644
--- a/tests/php/Jobs/ProcessNewImageTest.php
+++ b/tests/php/Jobs/ProcessNewImageTest.php
@@ -70,14 +70,14 @@ public function testHandleCollectMetadataAreaYaw()
 
         $job = new ProcessNewImageMock($image);
         $job->exif = [
-            'GPSImgDirection' => 47.75,
-            'SubjectArea' => 2.6,
+            'GPSImgDirection' => "191/4",
+            'SubjectArea' => "13/5",
         ];
         $job->handle();
         $image = $image->fresh();
 
-        $this->assertSame(47.75, floatval($image->metadata['yaw']));
-        $this->assertSame(2.6, floatval($image->metadata['area']));
+        $this->assertSame(47.75, $image->metadata['yaw']);
+        $this->assertSame(2.6, $image->metadata['area']);
     }
 
     public function testHandleMakeThumbnail()

From 4ef3d5b4859a9ec3e84e8e61366f8f270f6255b1 Mon Sep 17 00:00:00 2001
From: Leane Schlundt <lhecht@techfak.de>
Date: Thu, 22 Aug 2024 09:08:05 +0200
Subject: [PATCH 170/209] Fix wrong type

---
 tests/php/Jobs/ProcessNewVideoTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/php/Jobs/ProcessNewVideoTest.php b/tests/php/Jobs/ProcessNewVideoTest.php
index a6869dacd..19788f7cb 100644
--- a/tests/php/Jobs/ProcessNewVideoTest.php
+++ b/tests/php/Jobs/ProcessNewVideoTest.php
@@ -18,10 +18,10 @@ public function testHandleThumbnails()
         config(['videos.thumbnail_count' => 3]);
         $video = VideoTest::create(['filename' => 'test.mp4']);
         $job = new ProcessNewVideoStub($video);
-        $job->duration = 10;
+        $job->duration = 10.0;
 
         $job->handle();
-        $this->assertSame(10, intval($video->fresh()->duration));
+        $this->assertSame(10.0, $video->fresh()->duration);
         $this->assertSame([0.5, 5.0, 9.5], $job->times);
 
         $disk = Storage::disk('video-thumbs');

From 93554c63069a8db1226c2f566dfa65a32f7d4aeb Mon Sep 17 00:00:00 2001
From: Leane Schlundt <lhecht@techfak.de>
Date: Thu, 22 Aug 2024 09:12:03 +0200
Subject: [PATCH 171/209] Use assertEquals for simplicity

---
 .../Http/Controllers/Api/ProjectInvitationControllerTest.php    | 2 +-
 tests/php/Services/Auth/ApiGuardTest.php                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/php/Http/Controllers/Api/ProjectInvitationControllerTest.php b/tests/php/Http/Controllers/Api/ProjectInvitationControllerTest.php
index 26cb79838..4b347ee59 100644
--- a/tests/php/Http/Controllers/Api/ProjectInvitationControllerTest.php
+++ b/tests/php/Http/Controllers/Api/ProjectInvitationControllerTest.php
@@ -41,7 +41,7 @@ public function testStore()
     
         $invitation = $this->project()->invitations()->first();
         $this->assertNotNull($invitation);
-        $this->assertSame($timestamp->toDateTimeString(), $invitation->expires_at->tz($timestamp->timezone)->toDateTimeString());
+        $this->assertEquals($timestamp, $invitation->expires_at);
         $this->assertSame(0, $invitation->current_uses);
         $this->assertNotNull($invitation->uuid);
         $this->assertNull($invitation->max_uses);
diff --git a/tests/php/Services/Auth/ApiGuardTest.php b/tests/php/Services/Auth/ApiGuardTest.php
index 65465b284..17e2b316b 100644
--- a/tests/php/Services/Auth/ApiGuardTest.php
+++ b/tests/php/Services/Auth/ApiGuardTest.php
@@ -120,7 +120,7 @@ public function testTouchToken()
         $token->updated_at = Carbon::now(-5);
         $token->save();
 
-        $this->assertSame($token->updated_at->toDateTimeString(), $token->fresh()->updated_at->toDateTimeString());
+        $this->assertEquals($token->updated_at, $token->fresh()->updated_at);
 
         $response = $this->call('GET', '/api/v1/users', [], [], [], [
             'PHP_AUTH_USER' => $token->owner->email,

From 2f5564b06fb5e041c3b36462aec9b3ebda08110d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Langenk=C3=A4mper?= <dlangenk@gmail.com>
Date: Thu, 22 Aug 2024 12:14:41 +0200
Subject: [PATCH 172/209] fill in the missing yearmonths

---
 .../components/charts/timelinePlot.vue        | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/resources/assets/js/projects/components/charts/timelinePlot.vue b/resources/assets/js/projects/components/charts/timelinePlot.vue
index 39815a6b4..69a957072 100644
--- a/resources/assets/js/projects/components/charts/timelinePlot.vue
+++ b/resources/assets/js/projects/components/charts/timelinePlot.vue
@@ -86,11 +86,30 @@ export default {
             let xAxis = this.annotationTimeSeries.map((entry) => {
                 return entry.yearmonth.toString();
             });
+            // sort the yearmonths entries
+            xAxis = xAxis.sort();
+
             // filter duplicated yearsmonth
             xAxis = [...new Set(xAxis)];
 
+            // fill in the missing yearmonths
+            for (let i = 0; i < xAxis.length - 1; i++) {
+                let currentYearMonth = xAxis[i];
+                let nextYearMonth = xAxis[i + 1];
+                let currentDate = new Date(currentYearMonth);
+                let nextDate = new Date(nextYearMonth);
+                while (currentDate < nextDate) {
+                    currentDate.setMonth(currentDate.getMonth() + 1);
+                    let year = currentDate.getFullYear();
+                    let month = currentDate.getMonth() + 1;
+                    let yearMonth = year + '-' + (month < 10 ? '0' + month : month);
+                    xAxis.splice(i + 1, 0, yearMonth);
+                    i++;
+                }
+            }
+
             // sort the years (increasing)
-            return xAxis.sort();
+            return xAxis;
         },
     },
     computed: {
@@ -123,6 +142,7 @@ export default {
 
             // assemble the annotations of each user in correct order of year
             // each user has its own year-timeseries in idDict (e.g. {id: {"2020":10, "2021":4, "2022":6]})
+
             for (let yearmonth of xAxis) {
                 for (let entry of dat) {
                     if (entry.yearmonth.toString() === yearmonth) {
@@ -132,6 +152,7 @@ export default {
                     }
                 }
             }
+            console.log('idDict: ', idDict);
 
             // setup of whole chartdata object
             // include axis-name in front
@@ -142,6 +163,7 @@ export default {
 
             // reduce user-timeseries to values only
             Object.entries(idDict).forEach(entry => {
+                console.log('entry: ', entry);
                 // calculate the sum over all years and include in the array on position 0
                 let sum = 0;
                 Object.values(entry[1]).forEach(val => {
@@ -156,6 +178,7 @@ export default {
                     chartdata.push([sum, name, ...Object.values(entry[1]),userid]);
                 }
             });
+            console.log('chartdata: ', chartdata);
             return chartdata;
         },
         createTimelineSeries() {

From 48329f8cbbf03aa7be6524500943f6f8e8d3364d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Langenk=C3=A4mper?= <dlangenk@gmail.com>
Date: Thu, 22 Aug 2024 13:37:47 +0200
Subject: [PATCH 173/209] remove debug msgs

---
 .../assets/js/projects/components/charts/timelinePlot.vue      | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/resources/assets/js/projects/components/charts/timelinePlot.vue b/resources/assets/js/projects/components/charts/timelinePlot.vue
index 69a957072..3391f0c03 100644
--- a/resources/assets/js/projects/components/charts/timelinePlot.vue
+++ b/resources/assets/js/projects/components/charts/timelinePlot.vue
@@ -152,7 +152,6 @@ export default {
                     }
                 }
             }
-            console.log('idDict: ', idDict);
 
             // setup of whole chartdata object
             // include axis-name in front
@@ -163,7 +162,6 @@ export default {
 
             // reduce user-timeseries to values only
             Object.entries(idDict).forEach(entry => {
-                console.log('entry: ', entry);
                 // calculate the sum over all years and include in the array on position 0
                 let sum = 0;
                 Object.values(entry[1]).forEach(val => {
@@ -178,7 +176,6 @@ export default {
                     chartdata.push([sum, name, ...Object.values(entry[1]),userid]);
                 }
             });
-            console.log('chartdata: ', chartdata);
             return chartdata;
         },
         createTimelineSeries() {

From edd7dc1a92390f58a72b0cad963bab4e659ca99b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Langenk=C3=A4mper?= <dlangenk@gmail.com>
Date: Thu, 22 Aug 2024 13:56:24 +0200
Subject: [PATCH 174/209] fixed too many month that were added

---
 .../assets/js/projects/components/charts/timelinePlot.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/assets/js/projects/components/charts/timelinePlot.vue b/resources/assets/js/projects/components/charts/timelinePlot.vue
index 3391f0c03..4da1edbd5 100644
--- a/resources/assets/js/projects/components/charts/timelinePlot.vue
+++ b/resources/assets/js/projects/components/charts/timelinePlot.vue
@@ -91,14 +91,14 @@ export default {
 
             // filter duplicated yearsmonth
             xAxis = [...new Set(xAxis)];
-
+            
             // fill in the missing yearmonths
             for (let i = 0; i < xAxis.length - 1; i++) {
                 let currentYearMonth = xAxis[i];
                 let nextYearMonth = xAxis[i + 1];
                 let currentDate = new Date(currentYearMonth);
                 let nextDate = new Date(nextYearMonth);
-                while (currentDate < nextDate) {
+                while (currentDate.getMonth() < nextDate.getMonth() - 1 || currentDate.getFullYear() < nextDate.getFullYear()) {
                     currentDate.setMonth(currentDate.getMonth() + 1);
                     let year = currentDate.getFullYear();
                     let month = currentDate.getMonth() + 1;
@@ -137,8 +137,8 @@ export default {
                 }
                 idDict[id] = yearDict;
             }
-            // console.log('xAxis: ', xAxis);
-            // console.log('ID: ', id_unique);
+        
+        
 
             // assemble the annotations of each user in correct order of year
             // each user has its own year-timeseries in idDict (e.g. {id: {"2020":10, "2021":4, "2022":6]})

From 07da3c9cf9e83aabc36b33cd14eb3e00dcb27ad5 Mon Sep 17 00:00:00 2001
From: Leane Schlundt <lhecht@techfak.de>
Date: Mon, 26 Aug 2024 08:35:17 +0200
Subject: [PATCH 175/209] Return timestamps by using api endpoint

---
 app/Http/Controllers/Api/VolumeController.php | 32 +++++++++++++++++++
 .../Views/Volumes/VolumeController.php        |  8 -----
 resources/assets/js/volumes/api/volumes.js    |  4 +++
 resources/assets/js/volumes/stores/sorters.js | 24 ++++++++------
 resources/views/volumes/show.blade.php        |  1 -
 routes/api.php                                |  3 ++
 6 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/app/Http/Controllers/Api/VolumeController.php b/app/Http/Controllers/Api/VolumeController.php
index 2ced33713..c81c5237f 100644
--- a/app/Http/Controllers/Api/VolumeController.php
+++ b/app/Http/Controllers/Api/VolumeController.php
@@ -209,4 +209,36 @@ public function clone(CloneVolume $request)
             ->with('messageType', 'success');
 
     }
+
+    /**
+     * Return volume's annotation timestamps of newest annotations
+     *
+     * @param int $id
+     * @return object
+     * @api {get} volumes{/id}/files/annotation-timestamps Get the newest annotation timestamps of the volume
+     * @apiGroup Volumes
+     * @apiPermission projectMember
+     *
+     * @apiParam {Number} id The volume ID.
+     *
+     * @apiSuccessExample {json} Success response:
+     * {
+     *  1: "2024-08-23T07:06:31.000000Z", 
+     *  2: "2024-08-23T06:40:29.000000Z", 
+     *  3: "2024-08-23T06:40:35.000000Z", 
+     * }
+     *
+     */
+    public function getAnnotationTimestamps($id)
+    {
+        $volume = Volume::findOrFail($id);
+        $this->authorize('access', $volume);
+
+        $timestamps = $volume->files
+            ->flatMap(fn ($file) => $file->annotations)
+            ->groupBy('file_id')
+            ->map(fn ($annotations) => $annotations->max('created_at'));
+
+        return $timestamps;
+    }
 }
diff --git a/app/Http/Controllers/Views/Volumes/VolumeController.php b/app/Http/Controllers/Views/Volumes/VolumeController.php
index 42c5ea183..c22d6cb78 100644
--- a/app/Http/Controllers/Views/Volumes/VolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/VolumeController.php
@@ -107,13 +107,6 @@ public function index(Request $request, $id)
 
         $type = $volume->mediaType->name;
 
-        $annotations = $volume->files->mapWithKeys(fn ($f) => [$f->id => $f->annotations]);
-        $lastAnnotationTimestamps = $annotations->mapWithKeys(fn ($as, $i) => [
-            $i => $as->isEmpty() ?
-            Carbon::minValue()->toDateTimeString() :
-            ($as->map(fn ($a) => $a->created_at->toDateTimeString()))->max()
-        ]);
-
         return view('volumes.show', compact(
             'volume',
             'labelTrees',
@@ -121,7 +114,6 @@ public function index(Request $request, $id)
             'fileIds',
             'thumbUriTemplate',
             'type',
-            'lastAnnotationTimestamps'
         ));
     }
 
diff --git a/resources/assets/js/volumes/api/volumes.js b/resources/assets/js/volumes/api/volumes.js
index 627c4ada5..09d95ba95 100644
--- a/resources/assets/js/volumes/api/volumes.js
+++ b/resources/assets/js/volumes/api/volumes.js
@@ -92,5 +92,9 @@ export default Vue.resource('api/v1/volumes{/id}', {}, {
     clone: {
         method: 'POST',
         url: 'api/v1/volumes{/id}/clone-to{/project_id}'
+    },
+    getAnnotationTimestamps:{
+        method: 'GET',
+        url: 'api/v1/volumes{/id}/files/annotation-timestamps'
     }
 });
diff --git a/resources/assets/js/volumes/stores/sorters.js b/resources/assets/js/volumes/stores/sorters.js
index d6d918fe8..a51e00573 100644
--- a/resources/assets/js/volumes/stores/sorters.js
+++ b/resources/assets/js/volumes/stores/sorters.js
@@ -1,4 +1,5 @@
 import SortComponent from '../components/sortComponent';
+import VolumeApi from '../api/volumes';
 
 let filenameSorter = {
     id: 'filename',
@@ -106,28 +107,33 @@ let annotationTime = {
         mixins: [SortComponent],
         data() {
             return {
-                timestamps: [],
+                volumeId: -1,
+                fileIds: [],
                 title: 'Sort images by last created annotation',
                 text: 'Last annotated',
                 id: 'annotationTime',
+
             };
         },
-        computed: {
-            sortedAnnotations() {
-                return Object.entries(this.timestamps).sort(this.compare);
-            }
-        },
         methods: {
             getSequence() {
-                let ids = this.sortedAnnotations.map(e => e[0]);
-                return new Vue.Promise.resolve(ids);
+                return VolumeApi.getAnnotationTimestamps({'id': this.volumeId})
+                .then((res) => res.body)
+                .then((timestamps) => {
+                    let sorted = Object.entries(timestamps).sort(this.compare);
+                    sorted = sorted.map(e => parseInt(e[0]));
+                    let diff = this.fileIds.filter(id => !sorted.includes(id));
+                    sorted = sorted.concat(diff);
+                    return sorted;                   
+                });
             },
             compare(a, b) {
                 return Date.parse(b[1]) - Date.parse(a[1]);
             }
         },
         created() {
-            this.timestamps = biigle.$require('volumes.annotationTimestamps');
+            this.volumeId = biigle.$require('volumes.volumeId');
+            this.fileIds = biigle.$require('volumes.fileIds');
         },
     },
 };
diff --git a/resources/views/volumes/show.blade.php b/resources/views/volumes/show.blade.php
index 25f8ca3d8..467b0612d 100644
--- a/resources/views/volumes/show.blade.php
+++ b/resources/views/volumes/show.blade.php
@@ -8,7 +8,6 @@
         biigle.$declare('volumes.type', '{!! $type !!}');
         {{-- Add file IDs as array, too, because the ordering is important! --}}
         biigle.$declare('volumes.fileIds', {!! $fileIds->keys() !!});
-        biigle.$declare('volumes.annotationTimestamps', {!! $lastAnnotationTimestamps !!});
         biigle.$declare('volumes.fileUuids', {!! $fileIds !!});
         biigle.$declare('volumes.thumbUri', '{{ $thumbUriTemplate }}');
         @if ($volume->isImageVolume())
diff --git a/routes/api.php b/routes/api.php
index 1c4997bc0..f2427ba95 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -282,6 +282,9 @@
     'volumes/{id}/clone-to/{id2}', 'VolumeController@clone'
 );
 
+$router->get(
+    'volumes/{id}/files/annotation-timestamps', 'VolumeController@getAnnotationTimestamps');
+
 $router->resource('volumes', 'VolumeController', [
     'only' => ['index', 'show', 'update'],
     'parameters' => ['volumes' => 'id'],

From d913027abbebd16a5fa5417e3d8c6633f139d21c Mon Sep 17 00:00:00 2001
From: Leane Schlundt <lhecht@techfak.de>
Date: Mon, 26 Aug 2024 08:38:38 +0200
Subject: [PATCH 176/209] Add test

---
 .../Controllers/Api/VolumeControllerTest.php  | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/tests/php/Http/Controllers/Api/VolumeControllerTest.php b/tests/php/Http/Controllers/Api/VolumeControllerTest.php
index 44c8cdc43..cd8b71e54 100644
--- a/tests/php/Http/Controllers/Api/VolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/VolumeControllerTest.php
@@ -11,6 +11,9 @@
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Storage;
 use Queue;
+use Biigle\Tests\ImageAnnotationTest;
+use Biigle\Tests\UserTest;
+use Biigle\Tests\ImageTest;
 
 class VolumeControllerTest extends ApiTestCase
 {
@@ -306,4 +309,50 @@ public function testCloneVolume()
         $response->assertStatus(201);
         Queue::assertPushed(CloneImagesOrVideos::class);
     }
+
+    public function testGetAnnotationTimestamps(){
+
+        $volume = $this
+            ->volume([
+                'created_at' => '2022-11-09 14:37:00',
+                'updated_at' => '2022-11-09 14:37:00',
+            ])
+            ->fresh();
+
+        $img = ImageTest::create([
+            'filename' => 'test123.jpg',
+            'volume_id' => $volume->id,
+        ]);
+        ImageAnnotationTest::create([
+            'created_at' => '2023-11-09 06:37:00',
+            'image_id' => $img->id,
+        ]);
+        ImageAnnotationTest::create([
+            'created_at' => '2020-11-09 06:37:00',
+            'image_id' => $img->id,
+        ]);
+        $img2 = ImageTest::create([
+            'filename' => 'test321.jpg',
+            'volume_id' => $volume->id
+        ]);
+        ImageAnnotationTest::create([
+            'created_at' => '2024-11-09 14:37:00',
+            'image_id' => $img2->id,
+        ]);
+
+        $this->be(UserTest::create());
+        $this->getJson("/api/v1/volumes/{$volume->id}/files/annotation-timestamps")->assertForbidden();
+        
+        $this->beGuest();
+        $response = $this->getJson("/api/v1/volumes/{$volume->id}/files/annotation-timestamps");
+        
+        $response->assertSuccessful();
+        $content = json_decode($response->getContent(), true);
+
+        $this->assertCount(2, $content);
+        $this->assertNotNull($content[$img->id]);
+        $this->assertNotNull($content[$img2->id]);
+        $this->assertSame($content[$img->id], "2023-11-09T05:37:00.000000Z");
+        $this->assertSame($content[$img2->id], "2024-11-09T13:37:00.000000Z");
+    }
 }

From d32f8365526d3602b1c58c8ec234b2b11d4eadc9 Mon Sep 17 00:00:00 2001
From: Leane Schlundt <lhecht@techfak.de>
Date: Mon, 26 Aug 2024 08:49:38 +0200
Subject: [PATCH 177/209] Fix lint error and apply smaller changes

---
 app/Http/Controllers/Api/VolumeController.php       |  6 +++---
 .../Controllers/Views/Volumes/VolumeController.php  |  2 +-
 routes/api.php                                      |  3 ++-
 .../Http/Controllers/Api/VolumeControllerTest.php   | 13 +++++++------
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/Api/VolumeController.php b/app/Http/Controllers/Api/VolumeController.php
index c81c5237f..7fb3917bb 100644
--- a/app/Http/Controllers/Api/VolumeController.php
+++ b/app/Http/Controllers/Api/VolumeController.php
@@ -223,9 +223,9 @@ public function clone(CloneVolume $request)
      *
      * @apiSuccessExample {json} Success response:
      * {
-     *  1: "2024-08-23T07:06:31.000000Z", 
-     *  2: "2024-08-23T06:40:29.000000Z", 
-     *  3: "2024-08-23T06:40:35.000000Z", 
+     *  1: "2024-08-23T07:06:31.000000Z",
+     *  2: "2024-08-23T06:40:29.000000Z",
+     *  3: "2024-08-23T06:40:35.000000Z",
      * }
      *
      */
diff --git a/app/Http/Controllers/Views/Volumes/VolumeController.php b/app/Http/Controllers/Views/Volumes/VolumeController.php
index c22d6cb78..17266ecea 100644
--- a/app/Http/Controllers/Views/Volumes/VolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/VolumeController.php
@@ -113,7 +113,7 @@ public function index(Request $request, $id)
             'projects',
             'fileIds',
             'thumbUriTemplate',
-            'type',
+            'type'
         ));
     }
 
diff --git a/routes/api.php b/routes/api.php
index f2427ba95..62c6adfd3 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -283,7 +283,8 @@
 );
 
 $router->get(
-    'volumes/{id}/files/annotation-timestamps', 'VolumeController@getAnnotationTimestamps');
+    'volumes/{id}/files/annotation-timestamps', 'VolumeController@getAnnotationTimestamps'
+);
 
 $router->resource('volumes', 'VolumeController', [
     'only' => ['index', 'show', 'update'],
diff --git a/tests/php/Http/Controllers/Api/VolumeControllerTest.php b/tests/php/Http/Controllers/Api/VolumeControllerTest.php
index cd8b71e54..944e14380 100644
--- a/tests/php/Http/Controllers/Api/VolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/VolumeControllerTest.php
@@ -7,13 +7,13 @@
 use Biigle\Jobs\ProcessNewVolumeFiles;
 use Biigle\MediaType;
 use Biigle\Role;
+use Biigle\Tests\ImageAnnotationTest;
+use Biigle\Tests\ImageTest;
 use Biigle\Tests\ProjectTest;
+use Biigle\Tests\UserTest;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Storage;
 use Queue;
-use Biigle\Tests\ImageAnnotationTest;
-use Biigle\Tests\UserTest;
-use Biigle\Tests\ImageTest;
 
 class VolumeControllerTest extends ApiTestCase
 {
@@ -310,7 +310,8 @@ public function testCloneVolume()
         Queue::assertPushed(CloneImagesOrVideos::class);
     }
 
-    public function testGetAnnotationTimestamps(){
+    public function testGetAnnotationTimestamps()
+    {
 
         $volume = $this
             ->volume([
@@ -342,10 +343,10 @@ public function testGetAnnotationTimestamps(){
 
         $this->be(UserTest::create());
         $this->getJson("/api/v1/volumes/{$volume->id}/files/annotation-timestamps")->assertForbidden();
-        
+
         $this->beGuest();
         $response = $this->getJson("/api/v1/volumes/{$volume->id}/files/annotation-timestamps");
-        
+
         $response->assertSuccessful();
         $content = json_decode($response->getContent(), true);
 

From 16361f30a4634c3f1bb3ee791b8d822c30ccb9d1 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 29 Aug 2024 11:56:59 +0200
Subject: [PATCH 178/209] Fix type errors

---
 app/Annotation.php                            |  8 ++--
 app/AnnotationLabel.php                       | 11 +++--
 app/AnnotationSession.php                     |  4 +-
 app/ApiToken.php                              |  2 +-
 app/FederatedSearchInstance.php               |  3 +-
 app/FederatedSearchModel.php                  |  5 ++-
 .../Views/Volumes/VolumeController.php        |  4 +-
 app/Http/Middleware/AuthenticateRegister.php  |  2 +
 app/Http/Requests/StoreImageAnnotations.php   |  6 +--
 app/Http/Requests/StorePinnedProject.php      |  2 +-
 app/Image.php                                 | 10 ++---
 app/ImageAnnotation.php                       |  2 +-
 app/ImageAnnotationLabel.php                  |  6 +--
 app/ImageLabel.php                            |  6 +--
 app/Jobs/CreateNewImagesOrVideos.php          |  2 +-
 app/Jobs/ProcessNewImage.php                  | 16 +++----
 app/Jobs/ProcessNewVideo.php                  | 13 ++++--
 app/Label.php                                 | 10 ++---
 app/LabelTree.php                             | 38 ++++++++---------
 app/LabelTreeVersion.php                      |  4 +-
 app/Logging/CreateRedisLogger.php             |  3 +-
 app/Logging/LogManager.php                    |  1 +
 app/MediaType.php                             |  2 +-
 app/Policies/AnnotationPolicy.php             |  2 +-
 app/Policies/CachedPolicy.php                 |  2 +-
 app/Policies/VolumeFilePolicy.php             |  2 +-
 app/Project.php                               | 33 +++++++--------
 app/ProjectInvitation.php                     |  8 ++--
 app/Role.php                                  |  2 +-
 app/Services/Auth/ApiGuard.php                |  2 +-
 .../LabelSourceAdapters/WormsAdapter.php      |  4 +-
 app/Shape.php                                 | 17 +++++++-
 app/Traits/ParsesMetadata.php                 | 27 ++++--------
 app/User.php                                  | 14 +++----
 app/Video.php                                 | 16 +++----
 app/VideoAnnotation.php                       |  4 +-
 app/VideoAnnotationLabel.php                  |  2 +-
 app/VideoLabel.php                            |  6 +--
 app/Visibility.php                            |  2 +-
 app/Volume.php                                | 42 +++++++++----------
 app/VolumeFile.php                            |  8 ++--
 app/VolumeFileLabel.php                       | 12 ++++--
 42 files changed, 191 insertions(+), 174 deletions(-)

diff --git a/app/Annotation.php b/app/Annotation.php
index b13541613..e06977830 100644
--- a/app/Annotation.php
+++ b/app/Annotation.php
@@ -12,8 +12,10 @@
  * An image annotation is a region of an image that can be labeled by the users.
  * It consists of one or many points and has a specific shape.
  *
+ * @property int $id
  * @property array $points
  * @property string $created_at
+ * @property int $shape_id
  */
 abstract class Annotation extends Model implements AnnotationContract
 {
@@ -156,14 +158,14 @@ public function scopeAllowedBySession($query, AnnotationSession $session, User $
     /**
      * The file, this annotation belongs to.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<VolumeFile, Annotation>
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<covariant VolumeFile, covariant Annotation>
      */
     abstract public function file();
 
     /**
      * The labels, this annotation got assigned by the users.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany<AnnotationLabel>
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany<covariant AnnotationLabel>
      */
     abstract public function labels();
 
@@ -177,7 +179,7 @@ abstract public function getFileIdAttribute();
     /**
      * The shape of this annotation.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<Shape>
      */
     public function shape()
     {
diff --git a/app/AnnotationLabel.php b/app/AnnotationLabel.php
index 86ca99efd..03e906157 100644
--- a/app/AnnotationLabel.php
+++ b/app/AnnotationLabel.php
@@ -5,6 +5,11 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * @property int $id
+ * @property int $annotation_id
+ * @property int $user_id
+ */
 abstract class AnnotationLabel extends Model
 {
     use HasFactory;
@@ -33,14 +38,14 @@ abstract class AnnotationLabel extends Model
     /**
      * The annotation, this annotation label belongs to.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<Annotation, AnnotationLabel>
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<covariant Annotation, covariant AnnotationLabel>
      */
     abstract public function annotation();
 
     /**
      * The label, this annotation label belongs to.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<Label, AnnotationLabel>
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<Label, covariant AnnotationLabel>
      */
     public function label()
     {
@@ -50,7 +55,7 @@ public function label()
     /**
      * The user who created this annotation label.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<User, AnnotationLabel>
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<User, covariant AnnotationLabel>
      */
     public function user()
     {
diff --git a/app/AnnotationSession.php b/app/AnnotationSession.php
index 4e5af3df6..26bf601fc 100644
--- a/app/AnnotationSession.php
+++ b/app/AnnotationSession.php
@@ -41,7 +41,7 @@ class AnnotationSession extends Model
     /**
      * The volume, this annotation session belongs to.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<Volume, AnnotationSession>
      */
     public function volume()
     {
@@ -51,7 +51,7 @@ public function volume()
     /**
      * The users, this annotation session is restricted to.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany<User>
      */
     public function users()
     {
diff --git a/app/ApiToken.php b/app/ApiToken.php
index 451fb783a..46bc6a133 100644
--- a/app/ApiToken.php
+++ b/app/ApiToken.php
@@ -21,7 +21,7 @@ class ApiToken extends Model
     /**
      * The user, this token belongs to.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<User, ApiToken>
      */
     public function owner()
     {
diff --git a/app/FederatedSearchInstance.php b/app/FederatedSearchInstance.php
index 225391b6e..ba0bcb1c9 100644
--- a/app/FederatedSearchInstance.php
+++ b/app/FederatedSearchInstance.php
@@ -72,7 +72,8 @@ public function scopeWithRemoteToken($query)
     /**
      * The models that belong to this instance.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany<Federa
+     * >
      */
     public function models()
     {
diff --git a/app/FederatedSearchModel.php b/app/FederatedSearchModel.php
index 6f2114375..120775ea0 100644
--- a/app/FederatedSearchModel.php
+++ b/app/FederatedSearchModel.php
@@ -58,7 +58,8 @@ public function scopeVolumes($query)
     /**
      * The instance, this model belongs to.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<Feder
+     * , FederatedSearchModel>
      */
     public function instance()
     {
@@ -68,7 +69,7 @@ public function instance()
     /**
      * The users who can access this model.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany<User>
      */
     public function users()
     {
diff --git a/app/Http/Controllers/Views/Volumes/VolumeController.php b/app/Http/Controllers/Views/Volumes/VolumeController.php
index 17266ecea..ad3f4fd63 100644
--- a/app/Http/Controllers/Views/Volumes/VolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/VolumeController.php
@@ -20,7 +20,7 @@ class VolumeController extends Controller
      * Shows the create volume page.
      *
      * @param Request $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\View\View
      */
     public function create(Request $request)
     {
@@ -64,7 +64,7 @@ public function create(Request $request)
         return view('volumes.create', [
             'project' => $project,
             'disks' => $disks,
-            'hasDisks' => !empty($disks),
+            'hasDisks' => $disks->isNotEmpty(),
             'mediaType' => $mediaType,
             'filenames' => $filenames,
             'offlineMode' => $offlineMode,
diff --git a/app/Http/Middleware/AuthenticateRegister.php b/app/Http/Middleware/AuthenticateRegister.php
index 341165582..fed559787 100644
--- a/app/Http/Middleware/AuthenticateRegister.php
+++ b/app/Http/Middleware/AuthenticateRegister.php
@@ -17,5 +17,7 @@ protected function redirectTo($request)
         if (!$request->expectsJson()) {
             return route('register');
         }
+
+        return '';
     }
 }
diff --git a/app/Http/Requests/StoreImageAnnotations.php b/app/Http/Requests/StoreImageAnnotations.php
index 221db9e4c..d04523520 100644
--- a/app/Http/Requests/StoreImageAnnotations.php
+++ b/app/Http/Requests/StoreImageAnnotations.php
@@ -18,21 +18,21 @@ class StoreImageAnnotations extends FormRequest
     /**
      * Unique image IDs of this request.
      *
-     * @var array
+     * @var \Illuminate\Support\Collection
      */
     public $imageIds;
 
     /**
      * The images on which the annotations should be created.
      *
-     * @var array
+     * @var \Illuminate\Database\Eloquent\Collection
      */
     public $images;
 
     /**
      * The labels that should be attached to the new annotations.
      *
-     * @var array
+     * @var \Illuminate\Database\Eloquent\Collection
      */
     public $labels;
 
diff --git a/app/Http/Requests/StorePinnedProject.php b/app/Http/Requests/StorePinnedProject.php
index 8b59787be..7f7b3f952 100644
--- a/app/Http/Requests/StorePinnedProject.php
+++ b/app/Http/Requests/StorePinnedProject.php
@@ -48,7 +48,7 @@ public function withValidator($validator)
         $validator->after(function ($validator) {
             $pinnedCount = $this->user()->projects()->where('pinned', true)->count();
 
-            if ($pinnedCount === 3 && !$this->project->pivot->pinned) {
+            if ($pinnedCount === 3 && !$this->project->getRelationValue('pivot')->pinned) {
                 $validator->errors()->add('id', 'You cannot pin more than three projects.');
             }
         });
diff --git a/app/Image.php b/app/Image.php
index c6eab803b..62841fa36 100644
--- a/app/Image.php
+++ b/app/Image.php
@@ -28,7 +28,7 @@ class Image extends VolumeFile
     /**
      * The attributes hidden in the model's JSON form.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $hidden = [
         'labels',
@@ -37,7 +37,7 @@ class Image extends VolumeFile
     /**
      * The attributes that should be casted to native types.
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $casts = [
         'attrs' => 'array',
@@ -50,7 +50,7 @@ class Image extends VolumeFile
     /**
      * The annotations on this image.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany<ImageAnnotation>
      */
     public function annotations()
     {
@@ -60,7 +60,7 @@ public function annotations()
     /**
      * The labels, this image got attached by the users.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany<ImageLabel>
      */
     public function labels()
     {
@@ -70,7 +70,7 @@ public function labels()
     /**
      * Get the original image as download response.
      *
-     * @return Response
+     * @return array<string, mixed>|\Illuminate\Http\RedirectResponse|\Symfony\Component\HttpFoundation\StreamedResponse
      */
     public function getFile()
     {
diff --git a/app/ImageAnnotation.php b/app/ImageAnnotation.php
index d07e9a85e..080c9f6c6 100644
--- a/app/ImageAnnotation.php
+++ b/app/ImageAnnotation.php
@@ -11,7 +11,7 @@ class ImageAnnotation extends Annotation
     /**
     * The attributes that should be casted to native types.
     *
-    * @var array
+    * @var array<string, string>
     */
     protected $casts = [
         'image_id' => 'int',
diff --git a/app/ImageAnnotationLabel.php b/app/ImageAnnotationLabel.php
index 3e899fdd6..1554d3c3e 100644
--- a/app/ImageAnnotationLabel.php
+++ b/app/ImageAnnotationLabel.php
@@ -10,7 +10,7 @@ class ImageAnnotationLabel extends AnnotationLabel
     /**
      * The attributes excluded from the model's JSON form.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $hidden = [
         'created_at',
@@ -20,7 +20,7 @@ class ImageAnnotationLabel extends AnnotationLabel
     /**
      * The attributes that should be casted to native types.
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $casts = [
         'user_id' => 'int',
@@ -31,7 +31,7 @@ class ImageAnnotationLabel extends AnnotationLabel
     /**
      * The annotation, this annotation label belongs to.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<ImageAnnotation, ImageAnnotationLabel>
      */
     public function annotation()
     {
diff --git a/app/ImageLabel.php b/app/ImageLabel.php
index 15e1fe209..f54cdffd3 100644
--- a/app/ImageLabel.php
+++ b/app/ImageLabel.php
@@ -5,9 +5,7 @@
 class ImageLabel extends VolumeFileLabel
 {
     /**
-     * The file, this volume file label belongs to.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * {@inheritdoc}
      */
     public function file()
     {
@@ -17,7 +15,7 @@ public function file()
     /**
      * The image, this image label belongs to.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<Image, ImageLabel>
      */
     public function image()
     {
diff --git a/app/Jobs/CreateNewImagesOrVideos.php b/app/Jobs/CreateNewImagesOrVideos.php
index c266698b2..7280b7a87 100644
--- a/app/Jobs/CreateNewImagesOrVideos.php
+++ b/app/Jobs/CreateNewImagesOrVideos.php
@@ -130,7 +130,7 @@ protected function createFiles($filenames, $metadataMap)
             ]);
 
             $metadata = collect($metadataMap->get($filename));
-            if ($metadata) {
+            if ($metadata->isNotEmpty()) {
                 // Remove empty cells.
                 $metadata = $metadata->filter();
                 $insert = array_merge(
diff --git a/app/Jobs/ProcessNewImage.php b/app/Jobs/ProcessNewImage.php
index 88cac0fcb..27b39b823 100644
--- a/app/Jobs/ProcessNewImage.php
+++ b/app/Jobs/ProcessNewImage.php
@@ -296,18 +296,14 @@ protected function fracToFloat($frac)
         $parts = explode('/', $frac);
         $count = count($parts);
 
-        if ($count === 0) {
-            return 0;
-        } elseif ($count === 1) {
-            return $parts[0];
+        // Don't use !== 0 to catch all incorrect values.
+        if ($count === 2 && $parts[1] != 0) {
+            return floatval($parts[0]) / floatval($parts[1]);
+        } elseif (is_numeric($parts[0])) {
+            return floatval($parts[0]);
         }
 
-        // Don't use === to catch all incorrect values.
-        if ($parts[1] == 0) {
-            return 0;
-        }
-
-        return floatval($parts[0]) / floatval($parts[1]);
+        return 0;
     }
 
     /**
diff --git a/app/Jobs/ProcessNewVideo.php b/app/Jobs/ProcessNewVideo.php
index d120a5387..09309608d 100644
--- a/app/Jobs/ProcessNewVideo.php
+++ b/app/Jobs/ProcessNewVideo.php
@@ -40,11 +40,16 @@ class ProcessNewVideo extends Job implements ShouldQueue
 
     /**
      * The FFMpeg video instance.
-     *
-     * @var \FFMpeg\Media\Video
      */
     protected $ffmpegVideo;
 
+    /**
+     * The FFProbe instance.
+     *
+     * @var FFProbe|null
+     */
+    protected $ffprobe;
+
     /**
      * Ignore this job if the video does not exist any more.
      *
@@ -232,8 +237,8 @@ protected function generateVideoThumbnail($path, $time, $width, $height, $format
             $this->ffmpegVideo = FFMpeg::create()->open($path);
         }
 
-        $buffer = $this->ffmpegVideo->frame(TimeCode::fromSeconds($time))
-            ->save(null, false, true);
+        $buffer = (string) $this->ffmpegVideo->frame(TimeCode::fromSeconds($time))
+            ->save('', false, true);
 
         return VipsImage::thumbnail_buffer($buffer, $width, ['height' => $height])
             ->writeToBuffer(".{$format}", [
diff --git a/app/Label.php b/app/Label.php
index 494a2e434..b3fe69e33 100644
--- a/app/Label.php
+++ b/app/Label.php
@@ -23,7 +23,7 @@ class Label extends Model
     /**
      * The attributes hidden from the model's JSON form.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $hidden = [
         'uuid',
@@ -32,7 +32,7 @@ class Label extends Model
     /**
      * The attributes that should be casted to native types.
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $casts = [
         'parent_id' => 'int',
@@ -84,7 +84,7 @@ public function scopeUsed($query)
     /**
      * The parent label if the labels are ordered in a tree-like structure.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<Label, Label>
      */
     public function parent()
     {
@@ -94,7 +94,7 @@ public function parent()
     /**
      * The label tree this label belongs to.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<LabelTree, Label>
      */
     public function tree()
     {
@@ -105,7 +105,7 @@ public function tree()
      * The child labels of this label if they are ordered in a tree-like
      * structue.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany<Label>
      */
     public function children()
     {
diff --git a/app/LabelTree.php b/app/LabelTree.php
index 6f871b311..7ac3b921d 100644
--- a/app/LabelTree.php
+++ b/app/LabelTree.php
@@ -24,7 +24,7 @@ class LabelTree extends Model
     /**
      * The attributes hidden from the model's JSON form.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $hidden = [
         'pivot',
@@ -35,7 +35,7 @@ class LabelTree extends Model
     /**
      * The attributes that should be casted to native types.
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $casts = [
         'visibility_id' => 'int',
@@ -59,8 +59,8 @@ public function memberCanLooseAdminStatus(User $member)
     /**
      * Scope a query to public label trees.
      *
-     * @param \Illuminate\Database\Eloquent\Builder $query
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @param \Illuminate\Database\Eloquent\Builder<LabelTree> $query
+     * @return \Illuminate\Database\Eloquent\Builder<LabelTree>
      */
     public function scopePublicTrees($query)
     {
@@ -70,8 +70,8 @@ public function scopePublicTrees($query)
     /**
      * Scope a query to private label trees.
      *
-     * @param \Illuminate\Database\Eloquent\Builder $query
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @param \Illuminate\Database\Eloquent\Builder<LabelTree> $query
+     * @return \Illuminate\Database\Eloquent\Builder<LabelTree>
      */
     public function scopePrivateTrees($query)
     {
@@ -81,9 +81,9 @@ public function scopePrivateTrees($query)
     /**
      * Scope a query to all trees that are accessible by a user.
      *
-     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param \Illuminate\Database\Eloquent\Builder<LabelTree> $query
      * @param User $user
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return \Illuminate\Database\Eloquent\Builder<LabelTree>
      */
     public function scopeAccessibleBy($query, User $user)
     {
@@ -119,9 +119,9 @@ public function scopeAccessibleBy($query, User $user)
     /**
      * Scope a query to all trees that are not a varsion of another tree.
      *
-     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param \Illuminate\Database\Eloquent\Builder<LabelTree> $query
      *
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return \Illuminate\Database\Eloquent\Builder<LabelTree>
      */
     public function scopeWithoutVersions($query)
     {
@@ -131,9 +131,9 @@ public function scopeWithoutVersions($query)
     /**
      * Scope a query to all "global" trees.
      *
-     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param \Illuminate\Database\Eloquent\Builder<LabelTree> $query
      *
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return \Illuminate\Database\Eloquent\Builder<LabelTree>
      */
     public function scopeGlobal($query)
     {
@@ -145,7 +145,7 @@ public function scopeGlobal($query)
     /**
      * The version of this label tree (if it is a version of a master label tree).
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<LabelTreeVersion, LabelTree>
      */
     public function version()
     {
@@ -155,7 +155,7 @@ public function version()
     /**
      * The versions of this (master) label tree.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany<LabelTreeVersion>
      */
     public function versions()
     {
@@ -165,7 +165,7 @@ public function versions()
     /**
      * The visibility of the label tree.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<Visibility, LabelTree>
      */
     public function visibility()
     {
@@ -175,7 +175,7 @@ public function visibility()
     /**
      * The members of this label tree. Every member has a tree-specific role.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany<User>
      */
     public function members()
     {
@@ -187,7 +187,7 @@ public function members()
     /**
      * The labels that belong to this tree.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany<Label>
      */
     public function labels()
     {
@@ -265,7 +265,7 @@ public function memberCanBeRemoved(User $member)
     /**
      * The projects that are using this label tree.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany<Project>
      */
     public function projects()
     {
@@ -275,7 +275,7 @@ public function projects()
     /**
      * The projects that are authorized to use this private label tree.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany<Project>
      */
     public function authorizedProjects()
     {
diff --git a/app/LabelTreeVersion.php b/app/LabelTreeVersion.php
index c77c6ecf9..cccbcee97 100644
--- a/app/LabelTreeVersion.php
+++ b/app/LabelTreeVersion.php
@@ -19,7 +19,7 @@ class LabelTreeVersion extends Model
     /**
      * The attributes that should be casted to native types.
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $casts = [
         'label_tree_id' => 'int',
@@ -28,7 +28,7 @@ class LabelTreeVersion extends Model
     /**
      * The "master" label tree of this version.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<LabelTree, LabelTreeVersion>
      */
     public function labelTree()
     {
diff --git a/app/Logging/CreateRedisLogger.php b/app/Logging/CreateRedisLogger.php
index 25d223b07..4ba2e787f 100644
--- a/app/Logging/CreateRedisLogger.php
+++ b/app/Logging/CreateRedisLogger.php
@@ -25,7 +25,8 @@ public function __invoke(array $config): Logger
         $level = $this->level($config);
 
         $client = Redis::connection($connection)->client();
-        $handler = new RedisHandler($client, 'log', $level, true, $capSize);
+        /** @phpstan-ignore property.nonObject */
+        $handler = new RedisHandler($client, 'log', $level->value, true, $capSize);
         $formatter = tap(new JsonFormatter, function ($formatter) {
             $formatter->includeStacktraces();
         });
diff --git a/app/Logging/LogManager.php b/app/Logging/LogManager.php
index 5365adc35..742d918a2 100644
--- a/app/Logging/LogManager.php
+++ b/app/Logging/LogManager.php
@@ -106,6 +106,7 @@ public function getRedisLogMessages($level = 'debug')
 
         return collect($client->lrange('log', 0, -1))
             ->map(fn ($message) => json_decode($message, true))
+            /** @phpstan-ignore property.nonObject */
             ->filter(fn ($message) => $message['level'] >= $level->value);
     }
 
diff --git a/app/MediaType.php b/app/MediaType.php
index 9b2566119..e87497f52 100644
--- a/app/MediaType.php
+++ b/app/MediaType.php
@@ -21,7 +21,7 @@ class MediaType extends Model
     /**
      * The constant instances of this model.
      *
-     * @var array
+     * @var array<string, string>
      */
     const INSTANCES = [
         'image' => 'image',
diff --git a/app/Policies/AnnotationPolicy.php b/app/Policies/AnnotationPolicy.php
index 9a4fb6958..d04223d3f 100644
--- a/app/Policies/AnnotationPolicy.php
+++ b/app/Policies/AnnotationPolicy.php
@@ -120,7 +120,7 @@ public function attachLabel(User $user, Annotation $annotation, Label $label)
                 ->pluck('project_id');
 
             // User must be editor, expert or admin in one of the projects.
-            return !empty($projectIds)
+            return $projectIds->isNotEmpty()
                 // Label must belong to a label tree that is used by one of the projects.
                 && DB::table('label_tree_project')
                     ->whereIn('project_id', $projectIds)
diff --git a/app/Policies/CachedPolicy.php b/app/Policies/CachedPolicy.php
index 714b90fcc..0d5235481 100644
--- a/app/Policies/CachedPolicy.php
+++ b/app/Policies/CachedPolicy.php
@@ -21,7 +21,7 @@ class CachedPolicy
     /**
      * The cache instance to use for caching policies.
      *
-     * @var Cache
+     * @var \Illuminate\Contracts\Cache\Repository
      */
     protected $cache;
 
diff --git a/app/Policies/VolumeFilePolicy.php b/app/Policies/VolumeFilePolicy.php
index 58b964633..83a8dd580 100644
--- a/app/Policies/VolumeFilePolicy.php
+++ b/app/Policies/VolumeFilePolicy.php
@@ -102,7 +102,7 @@ public function attachLabel(User $user, VolumeFile $file, Label $label)
             ])->pluck('id');
 
             // User must be editor, expert or admin in one of the projects.
-            return !empty($projectIds)
+            return $projectIds->isNotEmpty()
                 // Label must belong to a label tree that is used by one of the projects.
                 && DB::table('label_tree_project')
                     ->whereIn('project_id', $projectIds)
diff --git a/app/Project.php b/app/Project.php
index 4098402ff..d314b7d58 100644
--- a/app/Project.php
+++ b/app/Project.php
@@ -15,7 +15,7 @@ class Project extends Model
     /**
      * The attributes hidden from the model's JSON form.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $hidden = [
         'pivot',
@@ -69,7 +69,7 @@ public function scopeAccessibleBy($query, User $user)
      * The members of this project. Every member has a project-specific
      * `project_role_id` besides their global user role.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany<User>
      */
     public function users()
     {
@@ -80,7 +80,7 @@ public function users()
     /**
      * All members of this project with the `admin` role.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany<User>
      */
     public function admins()
     {
@@ -90,7 +90,7 @@ public function admins()
     /**
      * All members of this project with the `editor` role.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany<User>
      */
     public function editors()
     {
@@ -100,7 +100,7 @@ public function editors()
     /**
      * All members of this project with the `guest` role.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany<User>
      */
     public function guests()
     {
@@ -112,7 +112,7 @@ public function guests()
      * automatically added to the project's users with the 'admin' role by
      * the ProjectObserver.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<User, Project>
      */
     public function creator()
     {
@@ -122,7 +122,7 @@ public function creator()
     /**
      * The project invitations of this project.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany<ProjectInvitation>
      */
     public function invitations()
     {
@@ -182,7 +182,7 @@ public function removeUserId($userId)
     /**
      * The volumes of this project.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany<Volume>
      */
     public function volumes()
     {
@@ -192,7 +192,7 @@ public function volumes()
     /**
      * The image volumes of this project.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany<Volume>
      */
     public function imageVolumes()
     {
@@ -202,7 +202,7 @@ public function imageVolumes()
     /**
      * The video volumes of this project.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany<Volume>
      */
     public function videoVolumes()
     {
@@ -218,7 +218,7 @@ public function videoVolumes()
      */
     public function addVolumeId($id)
     {
-        $this->volumes()->syncWithoutDetaching($id);
+        $this->volumes()->syncWithoutDetaching([$id]);
         // Maybe we get a new thumbnail now.
         Cache::forget("project-thumbnail-url-{$this->id}");
     }
@@ -231,13 +231,8 @@ public function addVolumeId($id)
      * @param bool $force Delete the volume completely if this is the last
      * project it belongs to
      */
-    public function removeVolume($volume, $force = false)
+    public function removeVolume(Volume $volume, $force = false)
     {
-        if (!$volume) {
-            // nothing to remove
-            return;
-        }
-
         // this is the last project the volume belongs to, so it should be
         // deleted
         if ($volume->projects()->count() === 1) {
@@ -282,7 +277,7 @@ public function removeAllVolumes($force = false)
     /**
      * The label trees, this project is using.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany<LabelTree>
      */
     public function labelTrees()
     {
@@ -292,7 +287,7 @@ public function labelTrees()
     /**
      * The private label trees that authorized this project to use them.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany<LabelTree>
      */
     public function authorizedLabelTrees()
     {
diff --git a/app/ProjectInvitation.php b/app/ProjectInvitation.php
index 532b050f4..8ac5573ed 100644
--- a/app/ProjectInvitation.php
+++ b/app/ProjectInvitation.php
@@ -12,7 +12,7 @@ class ProjectInvitation extends Model
     /**
      * The attributes that are mass assignable.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $fillable = [
         'uuid',
@@ -26,7 +26,7 @@ class ProjectInvitation extends Model
     /**
      * The attributes that should be casted to native types.
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $casts = [
         'expires_at' => 'datetime',
@@ -36,7 +36,7 @@ class ProjectInvitation extends Model
     /**
      * The accessors to append to the model's array form.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $appends = [
         'expires_at_for_humans',
@@ -45,7 +45,7 @@ class ProjectInvitation extends Model
     /**
      * The project to which this invitation belongs.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<Project, ProjectInvitation>
      */
     public function project()
     {
diff --git a/app/Role.php b/app/Role.php
index eab80d70b..f9a0a26d7 100644
--- a/app/Role.php
+++ b/app/Role.php
@@ -26,7 +26,7 @@ class Role extends Model
     /**
      * The constant instances of this model.
      *
-     * @var array
+     * @var array<string, string>
      */
     const INSTANCES = [
         'admin' => 'admin',
diff --git a/app/Services/Auth/ApiGuard.php b/app/Services/Auth/ApiGuard.php
index fbc9991d6..f7afb23af 100644
--- a/app/Services/Auth/ApiGuard.php
+++ b/app/Services/Auth/ApiGuard.php
@@ -33,7 +33,7 @@ public function user()
         }
 
         if (!empty($user)) {
-            $candidates = ApiToken::where('owner_id', $user->id)
+            $candidates = ApiToken::where('owner_id', $user->getAuthIdentifier())
                 ->select('id', 'hash')
                 ->get();
             foreach ($candidates as $candidate) {
diff --git a/app/Services/LabelSourceAdapters/WormsAdapter.php b/app/Services/LabelSourceAdapters/WormsAdapter.php
index 1ad8ad162..cf9bc58ca 100644
--- a/app/Services/LabelSourceAdapters/WormsAdapter.php
+++ b/app/Services/LabelSourceAdapters/WormsAdapter.php
@@ -29,7 +29,7 @@ class WormsAdapter implements LabelSourceAdapterContract
     /**
      * SOAP client for the WoRMS webservice.
      *
-     * @var SoapClient
+     * @var SoapClient|null
      */
     protected $client;
 
@@ -221,7 +221,7 @@ private function parseItem($item)
      *
      * @param array $attributes All label attributes
      *
-     * @return array Array containing the single label
+     * @return Label Label
      */
     private function createSingleLabel(array $attributes)
     {
diff --git a/app/Shape.php b/app/Shape.php
index 77342a5ab..e89fc541a 100644
--- a/app/Shape.php
+++ b/app/Shape.php
@@ -8,6 +8,21 @@
 
 /**
  * A shape, e.g. `point` or `circle`.
+ *
+ * @method static Shape point()
+ * @method static int pointId()
+ * @method static Shape line()
+ * @method static int lineId()
+ * @method static Shape polygon()
+ * @method static int polygonId()
+ * @method static Shape circle()
+ * @method static int circleId()
+ * @method static Shape rectangle()
+ * @method static int rectangleId()
+ * @method static Shape ellipse()
+ * @method static int ellipseId()
+ * @method static Shape wholeFrame()
+ * @method static int wholeFrameId()
  */
 class Shape extends Model
 {
@@ -16,7 +31,7 @@ class Shape extends Model
     /**
      * The constant instances of this model.
      *
-     * @var array
+     * @var array<string, string>
      */
     const INSTANCES = [
         'point' => 'Point',
diff --git a/app/Traits/ParsesMetadata.php b/app/Traits/ParsesMetadata.php
index 7289a912c..755699399 100644
--- a/app/Traits/ParsesMetadata.php
+++ b/app/Traits/ParsesMetadata.php
@@ -45,34 +45,25 @@ trait ParsesMetadata
 
     /**
      * Parse a metadata CSV string to an array.
-     *
-     * @param string $content
-     *
-     * @return array
      */
-    public function parseMetadata($content)
+    public function parseMetadata(string $content): array
     {
         // Split string by rows but respect possible escaped linebreaks.
         $rows = str_getcsv($content, "\n");
         // Now parse individual rows.
         $rows = array_map('str_getcsv', $rows);
 
+        $rows[0][0] = Util::removeBom($rows[0][0]);
 
-        if (!empty($rows) && is_array($rows[0])) {
-            if (!empty($rows[0])) {
-                $rows[0][0] = Util::removeBom($rows[0][0]);
-            }
+        $rows[0] = array_map('strtolower', $rows[0]);
 
-            $rows[0] = array_map('strtolower', $rows[0]);
-
-            $rows[0] = array_map(function ($column) {
-                if (array_key_exists($column, $this->columnSynonyms)) {
-                    return $this->columnSynonyms[$column];
-                }
+        $rows[0] = array_map(function ($column) {
+            if (array_key_exists($column, $this->columnSynonyms)) {
+                return $this->columnSynonyms[$column];
+            }
 
-                return $column;
-            }, $rows[0]);
-        }
+            return $column;
+        }, $rows[0]);
 
         return $rows;
     }
diff --git a/app/User.php b/app/User.php
index f70700c3a..b5ee80848 100644
--- a/app/User.php
+++ b/app/User.php
@@ -17,7 +17,7 @@ class User extends Authenticatable
     /**
      * The attributes hidden from the model's JSON form.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $hidden = [
         'password',
@@ -29,7 +29,7 @@ class User extends Authenticatable
     /**
      * The attributes that should be casted to native types.
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $casts = [
         'role_id' => 'int',
@@ -53,7 +53,7 @@ public function setEmailAttribute($value)
     /**
      * The projects, this user is a member of.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany<Project>
      */
     public function projects()
     {
@@ -63,7 +63,7 @@ public function projects()
     /**
      * The label trees, this user is a member of.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany<LabelTree>
      */
     public function labelTrees()
     {
@@ -73,7 +73,7 @@ public function labelTrees()
     /**
      * The global role of this user.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<Role, User>
      */
     public function role()
     {
@@ -83,7 +83,7 @@ public function role()
     /**
      * Api tokens of this user.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany<ApiToken>
      */
     public function apiTokens()
     {
@@ -93,7 +93,7 @@ public function apiTokens()
     /**
      * The federated search models that the user can access
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany<FederatedSearchModel>
      */
     public function federatedSearchModels()
     {
diff --git a/app/Video.php b/app/Video.php
index 4247b6ba5..4ae691bab 100644
--- a/app/Video.php
+++ b/app/Video.php
@@ -71,7 +71,7 @@ class Video extends VolumeFile
     /**
      * The attributes that are mass assignable.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $fillable = [
         'filename',
@@ -84,7 +84,7 @@ class Video extends VolumeFile
     /**
      * The attributes that should be casted to native types.
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $casts = [
         'attrs' => 'array',
@@ -96,7 +96,7 @@ class Video extends VolumeFile
     /**
      * The attributes hidden from the model's JSON form.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $hidden = [
         'attrs',
@@ -105,7 +105,7 @@ class Video extends VolumeFile
     /**
      * The annotations that belong to this video.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany<VideoAnnotation>
      */
     public function annotations()
     {
@@ -158,7 +158,7 @@ public function getThumbnailsUrlAttribute()
     /**
      * Get the error attribute.
      *
-     * @return string
+     * @return int|null
      */
     public function getErrorAttribute()
     {
@@ -168,7 +168,7 @@ public function getErrorAttribute()
     /**
      * Set the error attribute.
      *
-     * @param string $value
+     * @param int|null $value
      */
     public function setErrorAttribute($value)
     {
@@ -188,7 +188,7 @@ public function hasBeenProcessed()
     /**
      * The labels, this video got attached by the users.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany<VideoLabel>
      */
     public function labels()
     {
@@ -210,7 +210,7 @@ public function setTakenAtAttribute(array $value)
     /**
      * Get the taken_at timestamps.
      *
-     * @return array
+     * @return array|null
      */
     public function getTakenAtAttribute()
     {
diff --git a/app/VideoAnnotation.php b/app/VideoAnnotation.php
index 72eee719b..cce6798cf 100644
--- a/app/VideoAnnotation.php
+++ b/app/VideoAnnotation.php
@@ -9,7 +9,7 @@ class VideoAnnotation extends Annotation
     /**
      * The attributes that are mass assignable.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $fillable = [
         'video_id',
@@ -21,7 +21,7 @@ class VideoAnnotation extends Annotation
     /**
      * The attributes that should be casted to native types.
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $casts = [
         'video_id' => 'int',
diff --git a/app/VideoAnnotationLabel.php b/app/VideoAnnotationLabel.php
index 15f405b08..c3c4304b1 100644
--- a/app/VideoAnnotationLabel.php
+++ b/app/VideoAnnotationLabel.php
@@ -7,7 +7,7 @@ class VideoAnnotationLabel extends AnnotationLabel
     /**
      * The video annotation, this annotation label belongs to.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<VideoAnnotation, VideoAnnotationLabel>
      */
     public function annotation()
     {
diff --git a/app/VideoLabel.php b/app/VideoLabel.php
index e2ae41ca8..1989884e5 100644
--- a/app/VideoLabel.php
+++ b/app/VideoLabel.php
@@ -5,9 +5,7 @@
 class VideoLabel extends VolumeFileLabel
 {
     /**
-     * The file, this volume file label belongs to.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * {@inheritdoc}
      */
     public function file()
     {
@@ -17,7 +15,7 @@ public function file()
     /**
      * The video, this video label belongs to.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<Video, VideoLabel>
      */
     public function video()
     {
diff --git a/app/Visibility.php b/app/Visibility.php
index 0dd602e9a..0b90334f8 100644
--- a/app/Visibility.php
+++ b/app/Visibility.php
@@ -21,7 +21,7 @@ class Visibility extends Model
     /**
      * The constant instances of this model.
      *
-     * @var array
+     * @var array<string, string>
      */
     const INSTANCES = [
         'public' => 'public',
diff --git a/app/Volume.php b/app/Volume.php
index 675cb45e0..d0fa01c45 100644
--- a/app/Volume.php
+++ b/app/Volume.php
@@ -44,7 +44,7 @@ class Volume extends Model
     /**
      * The attributes hidden from the model's JSON form.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $hidden = [
         'pivot',
@@ -54,7 +54,7 @@ class Volume extends Model
     /**
      * The attributes that should be casted to native types.
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $casts = [
         'attrs' => 'array',
@@ -71,7 +71,7 @@ class Volume extends Model
     public static function parseFilesQueryString(string $string)
     {
         // Remove whitespace as well as enclosing '' or "".
-        return preg_split('/[\"\'\s]*,[\"\'\s]*/', trim($string, " \t\n\r\0\x0B'\""), null, PREG_SPLIT_NO_EMPTY);
+        return preg_split('/[\"\'\s]*,[\"\'\s]*/', trim($string, " \t\n\r\0\x0B'\""), 0, PREG_SPLIT_NO_EMPTY);
     }
 
     /**
@@ -100,7 +100,7 @@ public function scopeAccessibleBy($query, User $user)
     /**
      * The user that created the volume.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<User, Volume>
      */
     public function creator()
     {
@@ -110,7 +110,7 @@ public function creator()
     /**
      * The media type of this volume.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<MediaType, Volume>
      */
     public function mediaType()
     {
@@ -120,7 +120,7 @@ public function mediaType()
     /**
      * The images belonging to this volume.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany<Image>
      */
     public function images()
     {
@@ -130,7 +130,7 @@ public function images()
     /**
      * The videos belonging to this volume.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany<Video>
      */
     public function videos()
     {
@@ -140,7 +140,7 @@ public function videos()
     /**
      * The images or videos belonging to this volume.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany<covariant VolumeFile>
      */
     public function files()
     {
@@ -155,7 +155,7 @@ public function files()
      * The images belonging to this volume ordered by filename (ascending).
      *
      * @deprecated Use `orderedFiles` instead.
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany<VolumeFile>
      */
     public function orderedImages()
     {
@@ -165,7 +165,7 @@ public function orderedImages()
     /**
      * The images belonging to this volume ordered by filename (ascending).
      *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany<VolumeFile>
      */
     public function orderedFiles()
     {
@@ -194,7 +194,7 @@ public function users()
     /**
      * The project(s), this volume belongs to.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany<Project>
      */
     public function projects()
     {
@@ -204,7 +204,7 @@ public function projects()
     /**
      * The annotation sessions of this volume.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany<AnnotationSession>
      */
     public function annotationSessions()
     {
@@ -214,7 +214,7 @@ public function annotationSessions()
     /**
      * The active annotation sessions of this volume (if any).
      *
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne<AnnotationSession>
      */
     public function activeAnnotationSession()
     {
@@ -259,7 +259,7 @@ public function getActiveAnnotationSession(User $user)
     public function hasConflictingAnnotationSession(AnnotationSession $session)
     {
         return $this->annotationSessions()
-            ->when(!is_null($session->id), fn ($query) => $query->where('id', '!=', $session->id))
+            ->when($session->id, fn ($query) => $query->where('id', '!=', $session->id))
             ->where(function ($query) use ($session) {
                 $query->where(function ($query) use ($session) {
                     $query->where('starts_at', '<=', $session->starts_at)
@@ -291,7 +291,7 @@ public function isRemote()
     /**
      * An image that can be used as unique thumbnail for this volume.
      *
-     * @return Image
+     * @return Image|null
      */
     public function getThumbnailAttribute()
     {
@@ -303,7 +303,7 @@ public function getThumbnailAttribute()
     /**
      * URL to the thumbnail image of this volume.
      *
-     * @return string
+     * @return string|null
      */
     public function getThumbnailUrlAttribute()
     {
@@ -341,7 +341,7 @@ public function getThumbnailsAttribute()
      */
     public function getThumbnailsUrlAttribute()
     {
-        return $this->thumbnails->map(fn ($file) => $file->thumbnailUrl);
+        return $this->thumbnails->map(fn ($file) => $file->thumbnailUrl)->toArray();
     }
 
     /**
@@ -391,7 +391,7 @@ public function setUrlAttribute($value)
     /**
      * Set the creating_async attribute of this volume.
      *
-     * @param string $value
+     * @param bool $value
      */
     public function setCreatingAsyncAttribute($value)
     {
@@ -403,11 +403,11 @@ public function setCreatingAsyncAttribute($value)
     /**
      * Get the creating_async attribute of this volume.
      *
-     * @return string
+     * @return bool
      */
     public function getCreatingAsyncAttribute()
     {
-        return $this->getJsonAttr('creating_async', false);
+        return (bool) $this->getJsonAttr('creating_async', false);
     }
 
     /**
@@ -485,7 +485,7 @@ public function deleteIfdo()
     /**
      * Download the iFDO that is attached to this volume.
      *
-     * @return Response
+     * @return \Symfony\Component\HttpFoundation\StreamedResponse
      */
     public function downloadIfdo()
     {
diff --git a/app/VolumeFile.php b/app/VolumeFile.php
index ff4451206..a7f8238c3 100644
--- a/app/VolumeFile.php
+++ b/app/VolumeFile.php
@@ -9,6 +9,8 @@
 
 /**
  * @property int $id
+ * @property int $volume_id
+ * @property string $filename
  */
 abstract class VolumeFile extends Model implements FileContract
 {
@@ -43,7 +45,7 @@ public function getUrl()
     /**
      * The volume this video belongs to.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<Volume, covariant VolumeFile>
      */
     public function volume()
     {
@@ -160,14 +162,14 @@ abstract public function getThumbnailUrlAttribute();
     /**
      * The labels, this volume file got attached by the users.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany<covariant VolumeFileLabel>
      */
     abstract public function labels();
 
     /**
      * The annotations that belong to this file.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany<\Biigle\Annotation, \Biigle\VolumeFile>
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany<covariant Annotation>
      */
     abstract public function annotations();
 }
diff --git a/app/VolumeFileLabel.php b/app/VolumeFileLabel.php
index e02c54402..2df64e608 100644
--- a/app/VolumeFileLabel.php
+++ b/app/VolumeFileLabel.php
@@ -7,6 +7,10 @@
 
 /**
  * Pivot object for the connection between VolumeFiles and Labels.
+ *
+ * @property int $id
+ * @property int $user_id
+ * @property int $label_id
  */
 abstract class VolumeFileLabel extends Model
 {
@@ -15,7 +19,7 @@ abstract class VolumeFileLabel extends Model
     /**
      * The attributes that should be casted to native types.
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $casts = [
         'user_id' => 'int',
@@ -25,14 +29,14 @@ abstract class VolumeFileLabel extends Model
     /**
      * The file, this volume file label belongs to.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<covariant VolumeFile, covariant VolumeFileLabel>
      */
     abstract public function file();
 
     /**
      * The label, this video label belongs to.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<Label, covariant VolumeFileLabel>
      */
     public function label()
     {
@@ -42,7 +46,7 @@ public function label()
     /**
      * The user who created this video label.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<User, covariant VolumeFileLabel>
      */
     public function user()
     {

From 4576759da3f2999812ef35c54c9c784588ef74b2 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 29 Aug 2024 13:28:56 +0200
Subject: [PATCH 179/209] Fix type errors

---
 app/Http/Controllers/Api/VideoAnnotationController.php |  5 ++---
 app/Http/Controllers/Api/VideoFileController.php       |  2 +-
 app/Http/Controllers/Api/VideoLabelController.php      |  2 +-
 app/Http/Controllers/Api/VisibilityController.php      |  2 +-
 .../Api/VolumeAnnotationSessionController.php          |  2 +-
 app/Http/Controllers/Api/VolumeController.php          |  6 +++---
 app/Http/Controllers/Api/VolumeFileController.php      |  4 ++--
 app/Http/Controllers/Api/VolumeFileLabelController.php |  4 ++--
 app/Http/Controllers/Api/Volumes/BrowserController.php |  8 ++++----
 .../Controllers/Api/Volumes/FileLabelsController.php   |  2 +-
 .../Controllers/Api/Volumes/FilenamesController.php    |  2 +-
 .../Api/Volumes/Filters/AnnotationLabelController.php  |  2 +-
 .../Api/Volumes/Filters/AnyFileLabelController.php     |  2 +-
 .../Api/Volumes/Filters/FileLabelController.php        |  2 +-
 .../Api/Volumes/Filters/FileLabelUserController.php    |  2 +-
 .../Api/Volumes/Filters/FilenameController.php         |  2 +-
 app/Http/Controllers/Api/Volumes/IfdoController.php    |  4 +---
 .../Controllers/Api/Volumes/MetadataController.php     |  4 +++-
 .../Controllers/Api/Volumes/ParseIfdoController.php    |  2 +-
 .../Controllers/Api/Volumes/StatisticsController.php   |  2 +-
 .../Api/Volumes/UsedFileLabelsController.php           |  2 +-
 app/Http/Controllers/Api/Volumes/UserController.php    |  2 +-
 app/Http/Controllers/Auth/RegisterController.php       |  4 ++--
 app/Http/Controllers/Auth/ResetPasswordController.php  |  1 -
 .../Views/Admin/AnnouncementsController.php            |  4 ----
 .../Views/Admin/FederatedSearchController.php          |  1 -
 app/Http/Controllers/Views/Admin/IndexController.php   |  1 -
 .../Controllers/Views/Admin/LabelTreesController.php   |  2 --
 app/Http/Controllers/Views/Admin/LogsController.php    |  4 ----
 app/Http/Controllers/Views/Admin/UsersController.php   |  8 --------
 .../Views/Annotations/AnnotationToolController.php     |  2 --
 .../Views/Annotations/ImageAnnotationController.php    |  2 +-
 app/Http/Controllers/Views/DashboardController.php     |  5 -----
 app/Http/Controllers/Views/ImprintController.php       |  2 --
 .../Views/LabelTrees/LabelTreeMembersController.php    |  1 -
 .../Views/LabelTrees/LabelTreeMergeController.php      |  4 ----
 .../Views/LabelTrees/LabelTreeProjectsController.php   |  5 -----
 .../Views/LabelTrees/LabelTreeVersionsController.php   |  4 +---
 .../Views/LabelTrees/LabelTreesController.php          |  9 +--------
 app/Http/Controllers/Views/ManualController.php        |  4 ----
 .../Views/Notifications/NotificationsController.php    |  3 +--
 app/Http/Controllers/Views/PrivacyController.php       |  2 --
 .../Views/Projects/ProjectInvitationController.php     |  2 +-
 .../Views/Projects/ProjectLabelTreeController.php      |  3 +--
 .../Views/Projects/ProjectStatisticsController.php     |  3 +--
 .../Views/Projects/ProjectUserController.php           |  3 +--
 .../Controllers/Views/Projects/ProjectsController.php  |  7 ++-----
 app/Http/Controllers/Views/SearchController.php        | 10 ++++++----
 app/Http/Controllers/Views/SettingsController.php      |  8 +-------
 app/Http/Controllers/Views/TermsController.php         |  2 --
 .../Views/Videos/VideoAnnotationController.php         |  2 +-
 app/Http/Controllers/Views/Videos/VideoController.php  |  2 --
 app/Http/Controllers/Views/Volumes/ImageController.php |  1 -
 .../Views/Volumes/VolumeCloneController.php            |  5 +----
 .../Controllers/Views/Volumes/VolumeController.php     |  5 -----
 55 files changed, 53 insertions(+), 133 deletions(-)

diff --git a/app/Http/Controllers/Api/VideoAnnotationController.php b/app/Http/Controllers/Api/VideoAnnotationController.php
index ff6a17446..c9d9a7334 100644
--- a/app/Http/Controllers/Api/VideoAnnotationController.php
+++ b/app/Http/Controllers/Api/VideoAnnotationController.php
@@ -209,7 +209,7 @@ public function store(StoreVideoAnnotation $request)
             $points = json_decode($points);
         }
 
-        $annotation = VideoAnnotation::make([
+        $annotation = new VideoAnnotation([
             'video_id' => $request->video->id,
             'shape_id' => $request->input('shape_id'),
             'points' => $points,
@@ -240,6 +240,7 @@ public function store(StoreVideoAnnotation $request)
             $queue = config('videos.track_object_queue');
             Queue::pushOn($queue, new TrackObject($annotation, $request->user()));
             Cache::increment(TrackObject::getRateLimitCacheKey($request->user()));
+            /** @phpstan-ignore property.notFound */
             $annotation->trackingJobLimitReached = $currentJobs === ($maxJobs - 1);
         }
 
@@ -267,7 +268,6 @@ public function store(StoreVideoAnnotation $request)
      * }
      *
      * @param UpdateVideoAnnotation $request
-     * @return \Illuminate\Http\Response
      */
     public function update(UpdateVideoAnnotation $request)
     {
@@ -301,7 +301,6 @@ public function update(UpdateVideoAnnotation $request)
      * @apiParam {Number} id The annotation ID.
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
     public function destroy($id)
     {
diff --git a/app/Http/Controllers/Api/VideoFileController.php b/app/Http/Controllers/Api/VideoFileController.php
index ab3b5ccf5..51df639bb 100644
--- a/app/Http/Controllers/Api/VideoFileController.php
+++ b/app/Http/Controllers/Api/VideoFileController.php
@@ -68,7 +68,7 @@ public function show(Request $request, $id)
             $offset = $range[0];
             $length = $range[1] - $range[0] + 1;
             $total = $video->size;
-            $response->headers->set('Content-Length', $length);
+            $response->headers->set('Content-Length', "$length");
             $response->headers->set('Content-Range', 'bytes '.implode('-', $range).'/'.$total);
             $response->setStatusCode(206);
 
diff --git a/app/Http/Controllers/Api/VideoLabelController.php b/app/Http/Controllers/Api/VideoLabelController.php
index c817ca970..2aa9e612a 100644
--- a/app/Http/Controllers/Api/VideoLabelController.php
+++ b/app/Http/Controllers/Api/VideoLabelController.php
@@ -72,7 +72,7 @@ class VideoLabelController extends VolumeFileLabelController
      * }
      *
      * @param StoreVideoLabel $request
-     * @return \Illuminate\Http\Response
+     * @return \Biigle\VolumeFileLabel
      */
     public function store(StoreVideoLabel $request)
     {
diff --git a/app/Http/Controllers/Api/VisibilityController.php b/app/Http/Controllers/Api/VisibilityController.php
index 9becc64e1..c78a2169a 100644
--- a/app/Http/Controllers/Api/VisibilityController.php
+++ b/app/Http/Controllers/Api/VisibilityController.php
@@ -26,7 +26,7 @@ class VisibilityController extends Controller
      *    }
      * ]
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Database\Eloquent\Collection
      */
     public function index()
     {
diff --git a/app/Http/Controllers/Api/VolumeAnnotationSessionController.php b/app/Http/Controllers/Api/VolumeAnnotationSessionController.php
index 84494160a..1ac6b66a7 100644
--- a/app/Http/Controllers/Api/VolumeAnnotationSessionController.php
+++ b/app/Http/Controllers/Api/VolumeAnnotationSessionController.php
@@ -44,7 +44,7 @@ class VolumeAnnotationSessionController extends Controller
      * ]
      *
      * @param int $id volume id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Database\Eloquent\Collection
      */
     public function index($id)
     {
diff --git a/app/Http/Controllers/Api/VolumeController.php b/app/Http/Controllers/Api/VolumeController.php
index 2ced33713..41f03b3a0 100644
--- a/app/Http/Controllers/Api/VolumeController.php
+++ b/app/Http/Controllers/Api/VolumeController.php
@@ -19,7 +19,7 @@ class VolumeController extends Controller
      * Shows all volumes the user has access to.
      *
      * @param Request $request
-     * @return Response
+     * @return \Illuminate\Database\Eloquent\Collection
      * @api {get} volumes Get accessible volumes
      * @apiGroup Volumes
      * @apiName IndexVolumes
@@ -112,7 +112,7 @@ public function show(Request $request, $id)
      * Updates the attributes of the specified volume.
      *
      * @param UpdateVolume $request
-     * @return Response
+     * @return \Illuminate\Http\RedirectResponse|null
      * @api {put} volumes/:id Update a volume
      * @apiGroup Volumes
      * @apiName UpdateVolumes
@@ -153,7 +153,7 @@ public function update(UpdateVolume $request)
      * Clones volume to destination project.
      *
      * @param CloneVolume $request
-     * @return Response
+     * @return Volume|\Illuminate\Http\RedirectResponse
      * @api {post} volumes/:id/clone-to/:project_id Clones a volume
      * @apiGroup Volumes
      * @apiName CloneVolume
diff --git a/app/Http/Controllers/Api/VolumeFileController.php b/app/Http/Controllers/Api/VolumeFileController.php
index ef3af4d85..71305abf3 100644
--- a/app/Http/Controllers/Api/VolumeFileController.php
+++ b/app/Http/Controllers/Api/VolumeFileController.php
@@ -24,7 +24,7 @@ class VolumeFileController extends Controller
      *
      * @param  int  $id
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Support\Collection
      */
     public function index($id)
     {
@@ -70,7 +70,7 @@ public function index($id)
      *
      *
      * @param StoreVolumeFile $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Database\Eloquent\Collection
      */
     public function store(StoreVolumeFile $request)
     {
diff --git a/app/Http/Controllers/Api/VolumeFileLabelController.php b/app/Http/Controllers/Api/VolumeFileLabelController.php
index 9ae82f02d..cd893ab14 100644
--- a/app/Http/Controllers/Api/VolumeFileLabelController.php
+++ b/app/Http/Controllers/Api/VolumeFileLabelController.php
@@ -28,11 +28,12 @@ public function index($id)
      * Creates a new label for the specified file.
      *
      * @param StoreVolumeFileLabel $request
-     * @return \Illuminate\Http\Response
+     * @return \Biigle\VolumeFileLabel
      */
     public function baseStore(StoreVolumeFileLabel $request)
     {
         $model = $this->getFileLabelModel();
+        /** @var \Biigle\VolumeFileLabel */
         $fileLabel = new $model;
         $fileLabel->user()->associate($request->user());
         $fileLabel->label()->associate($request->label);
@@ -58,7 +59,6 @@ public function baseStore(StoreVolumeFileLabel $request)
      * Deletes the specified file label.
      *
      * @param int  $id
-     * @return \Illuminate\Http\Response
      */
     public function destroy($id)
     {
diff --git a/app/Http/Controllers/Api/Volumes/BrowserController.php b/app/Http/Controllers/Api/Volumes/BrowserController.php
index 0eba09873..e619a2bd4 100644
--- a/app/Http/Controllers/Api/Volumes/BrowserController.php
+++ b/app/Http/Controllers/Api/Volumes/BrowserController.php
@@ -33,7 +33,7 @@ class BrowserController extends Controller
      *
      * @param  Request $request
      * @param  string $disk
-     * @return \Illuminate\Http\Response
+     * @return array
      */
     public function indexDirectories(Request $request, $disk)
     {
@@ -82,7 +82,7 @@ public function indexDirectories(Request $request, $disk)
      *
      * @param  Request $request
      * @param  string $disk
-     * @return \Illuminate\Http\Response
+     * @return array
      */
     public function indexImages(Request $request, $disk)
     {
@@ -114,7 +114,7 @@ public function indexImages(Request $request, $disk)
      *
      * @param  Request $request
      * @param  string $disk
-     * @return \Illuminate\Http\Response
+     * @return array
      */
     public function indexVideos(Request $request, $disk)
     {
@@ -132,7 +132,7 @@ public function indexVideos(Request $request, $disk)
      * @param string $disk
      * @param string $regex
      *
-     * @return \Illuminate\Http\Response
+     * @return array
      */
     protected function indexFiles(Request $request, $disk, $regex)
     {
diff --git a/app/Http/Controllers/Api/Volumes/FileLabelsController.php b/app/Http/Controllers/Api/Volumes/FileLabelsController.php
index b6b8277c9..60d646ef8 100644
--- a/app/Http/Controllers/Api/Volumes/FileLabelsController.php
+++ b/app/Http/Controllers/Api/Volumes/FileLabelsController.php
@@ -44,7 +44,7 @@ class FileLabelsController extends Controller
      * }
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Support\Collection
      */
     public function index($id)
     {
diff --git a/app/Http/Controllers/Api/Volumes/FilenamesController.php b/app/Http/Controllers/Api/Volumes/FilenamesController.php
index 5532c90ac..0145eebd8 100644
--- a/app/Http/Controllers/Api/Volumes/FilenamesController.php
+++ b/app/Http/Controllers/Api/Volumes/FilenamesController.php
@@ -25,7 +25,7 @@ class FilenamesController extends Controller
      * }
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Support\Collection
      */
     public function index($id)
     {
diff --git a/app/Http/Controllers/Api/Volumes/Filters/AnnotationLabelController.php b/app/Http/Controllers/Api/Volumes/Filters/AnnotationLabelController.php
index 080258eda..c6e513571 100644
--- a/app/Http/Controllers/Api/Volumes/Filters/AnnotationLabelController.php
+++ b/app/Http/Controllers/Api/Volumes/Filters/AnnotationLabelController.php
@@ -28,7 +28,7 @@ class AnnotationLabelController extends Controller
      * @param Request $request
      * @param  int  $tid
      * @param  int  $lid
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Support\Collection
      */
     public function index(Request $request, $tid, $lid)
     {
diff --git a/app/Http/Controllers/Api/Volumes/Filters/AnyFileLabelController.php b/app/Http/Controllers/Api/Volumes/Filters/AnyFileLabelController.php
index 266373c65..49e672df7 100644
--- a/app/Http/Controllers/Api/Volumes/Filters/AnyFileLabelController.php
+++ b/app/Http/Controllers/Api/Volumes/Filters/AnyFileLabelController.php
@@ -21,7 +21,7 @@ class AnyFileLabelController extends Controller
      * [1, 5, 6]
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Support\Collection
      */
     public function index($id)
     {
diff --git a/app/Http/Controllers/Api/Volumes/Filters/FileLabelController.php b/app/Http/Controllers/Api/Volumes/Filters/FileLabelController.php
index ca626589a..109f9d542 100644
--- a/app/Http/Controllers/Api/Volumes/Filters/FileLabelController.php
+++ b/app/Http/Controllers/Api/Volumes/Filters/FileLabelController.php
@@ -24,7 +24,7 @@ class FileLabelController extends Controller
      *
      * @param  int  $vid
      * @param  int  $lid
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Support\Collection
      */
     public function index($vid, $lid)
     {
diff --git a/app/Http/Controllers/Api/Volumes/Filters/FileLabelUserController.php b/app/Http/Controllers/Api/Volumes/Filters/FileLabelUserController.php
index 8ab127b5e..de1d3f116 100644
--- a/app/Http/Controllers/Api/Volumes/Filters/FileLabelUserController.php
+++ b/app/Http/Controllers/Api/Volumes/Filters/FileLabelUserController.php
@@ -24,7 +24,7 @@ class FileLabelUserController extends Controller
      *
      * @param  int  $vid
      * @param  int  $uid
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Support\Collection
      */
     public function index($vid, $uid)
     {
diff --git a/app/Http/Controllers/Api/Volumes/Filters/FilenameController.php b/app/Http/Controllers/Api/Volumes/Filters/FilenameController.php
index 1da167675..87b1f60da 100644
--- a/app/Http/Controllers/Api/Volumes/Filters/FilenameController.php
+++ b/app/Http/Controllers/Api/Volumes/Filters/FilenameController.php
@@ -23,7 +23,7 @@ class FilenameController extends Controller
      *
      * @param  int  $id
      * @param  string  $pattern
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Support\Collection
      */
     public function index($id, $pattern)
     {
diff --git a/app/Http/Controllers/Api/Volumes/IfdoController.php b/app/Http/Controllers/Api/Volumes/IfdoController.php
index 6e27cb797..11f3afac2 100644
--- a/app/Http/Controllers/Api/Volumes/IfdoController.php
+++ b/app/Http/Controllers/Api/Volumes/IfdoController.php
@@ -17,7 +17,7 @@ class IfdoController extends Controller
      ~
      * @param int $id
      *
-     * @return \Illuminate\Http\Response
+     * @return \Symfony\Component\HttpFoundation\StreamedResponse
      */
     public function show($id)
     {
@@ -36,8 +36,6 @@ public function show($id)
      * @apiPermission projectAdmin
      ~
      * @param int $id
-     *
-     * @return \Illuminate\Http\Response
      */
     public function destroy($id)
     {
diff --git a/app/Http/Controllers/Api/Volumes/MetadataController.php b/app/Http/Controllers/Api/Volumes/MetadataController.php
index 7ba285721..520b104a2 100644
--- a/app/Http/Controllers/Api/Volumes/MetadataController.php
+++ b/app/Http/Controllers/Api/Volumes/MetadataController.php
@@ -54,7 +54,7 @@ class MetadataController extends Controller
      *
      * @param StoreVolumeMetadata $request
      *
-     * @return \Illuminate\Http\Response
+     * @return void
      */
     public function store(StoreVolumeMetadata $request)
     {
@@ -187,9 +187,11 @@ protected function mergeVideoMetadata(Video $video, Collection $rows)
         $origTakenAtNull = $origTakenAt->combine($origTakenAt->map(fn ($x) => null));
         $newTakenAtNull = $newTakenAt->combine($newTakenAt->map(fn ($x) => null));
 
+        /** @var \Illuminate\Support\Collection<string, mixed> */
         $originalAttributes = collect(VideoMetadata::ALLOWED_ATTRIBUTES)
             ->mapWithKeys(fn ($key) => [$key => $video->$key]);
 
+        /** @var \Illuminate\Support\Collection<string, mixed> */
         $originalMetadata = collect(VideoMetadata::ALLOWED_METADATA)
             ->mapWithKeys(fn ($key) => [$key => null])
             ->merge($video->metadata);
diff --git a/app/Http/Controllers/Api/Volumes/ParseIfdoController.php b/app/Http/Controllers/Api/Volumes/ParseIfdoController.php
index 6a325a90a..530cd4b50 100644
--- a/app/Http/Controllers/Api/Volumes/ParseIfdoController.php
+++ b/app/Http/Controllers/Api/Volumes/ParseIfdoController.php
@@ -20,7 +20,7 @@ class ParseIfdoController extends Controller
      *
      * @param StoreParseIfdo $request
      *
-     * @return \Illuminate\Http\Response
+     * @return array
      */
     public function store(StoreParseIfdo $request)
     {
diff --git a/app/Http/Controllers/Api/Volumes/StatisticsController.php b/app/Http/Controllers/Api/Volumes/StatisticsController.php
index af46ee3a8..ae37d123e 100644
--- a/app/Http/Controllers/Api/Volumes/StatisticsController.php
+++ b/app/Http/Controllers/Api/Volumes/StatisticsController.php
@@ -21,7 +21,7 @@ class StatisticsController extends Controller
      *
      * @param  int  $id
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Support\Collection
      */
     public function index($id)
     {
diff --git a/app/Http/Controllers/Api/Volumes/UsedFileLabelsController.php b/app/Http/Controllers/Api/Volumes/UsedFileLabelsController.php
index ea1a88149..8a45783b2 100644
--- a/app/Http/Controllers/Api/Volumes/UsedFileLabelsController.php
+++ b/app/Http/Controllers/Api/Volumes/UsedFileLabelsController.php
@@ -37,7 +37,7 @@ class UsedFileLabelsController extends Controller
      * ]
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Database\Eloquent\Collection<int, Label>
      */
     public function index($id)
     {
diff --git a/app/Http/Controllers/Api/Volumes/UserController.php b/app/Http/Controllers/Api/Volumes/UserController.php
index 1b3d404c3..48d5c6e0b 100644
--- a/app/Http/Controllers/Api/Volumes/UserController.php
+++ b/app/Http/Controllers/Api/Volumes/UserController.php
@@ -42,7 +42,7 @@ class UserController extends Controller
      *
      * @param  int  $id
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Database\Eloquent\Collection
      */
     public function index($id)
     {
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index ae5bad4fc..ed6539699 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -117,7 +117,7 @@ protected function create(array $data)
     /**
      * Show the application registration form.
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\View\View
      */
     public function showRegistrationForm()
     {
@@ -132,7 +132,7 @@ public function showRegistrationForm()
      * Handle a registration request for the application.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
      */
     public function register(Request $request)
     {
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
index 02e30c16d..abb816744 100644
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -31,7 +31,6 @@ class ResetPasswordController extends Controller
     public function __construct()
     {
         $this->middleware('guest');
-        $this->redirectTo = route('home');
     }
 
     /**
diff --git a/app/Http/Controllers/Views/Admin/AnnouncementsController.php b/app/Http/Controllers/Views/Admin/AnnouncementsController.php
index 3e3cfb0fe..980cb254f 100644
--- a/app/Http/Controllers/Views/Admin/AnnouncementsController.php
+++ b/app/Http/Controllers/Views/Admin/AnnouncementsController.php
@@ -9,8 +9,6 @@ class AnnouncementsController extends Controller
 {
     /**
      * Shows the admin announcements page.
-     *
-     * @return \Illuminate\Http\Response
      */
     public function index()
     {
@@ -24,8 +22,6 @@ public function index()
 
     /**
      * Shows the admin new announcement page.
-     *
-     * @return \Illuminate\Http\Response
      */
     public function create()
     {
diff --git a/app/Http/Controllers/Views/Admin/FederatedSearchController.php b/app/Http/Controllers/Views/Admin/FederatedSearchController.php
index f623fdee9..36bc7afd6 100644
--- a/app/Http/Controllers/Views/Admin/FederatedSearchController.php
+++ b/app/Http/Controllers/Views/Admin/FederatedSearchController.php
@@ -12,7 +12,6 @@ class FederatedSearchController extends Controller
      * Show the federated search admin page.
      *
      * @param Request $request
-     * @return \Illuminate\Http\Response
      */
     public function index(Request $request)
     {
diff --git a/app/Http/Controllers/Views/Admin/IndexController.php b/app/Http/Controllers/Views/Admin/IndexController.php
index c775d0a9b..3f5a1253e 100644
--- a/app/Http/Controllers/Views/Admin/IndexController.php
+++ b/app/Http/Controllers/Views/Admin/IndexController.php
@@ -15,7 +15,6 @@ class IndexController extends Controller
      * Shows the admin dashboard.
      *
      * @param Modules $modules
-     * @return \Illuminate\Http\Response
      */
     public function get(Modules $modules)
     {
diff --git a/app/Http/Controllers/Views/Admin/LabelTreesController.php b/app/Http/Controllers/Views/Admin/LabelTreesController.php
index e6eff69e2..43b70a37f 100644
--- a/app/Http/Controllers/Views/Admin/LabelTreesController.php
+++ b/app/Http/Controllers/Views/Admin/LabelTreesController.php
@@ -9,8 +9,6 @@ class LabelTreesController extends Controller
 {
     /**
      * Show the label tree admin page.
-     *
-     * @return \Illuminate\Http\Response
      */
     public function index()
     {
diff --git a/app/Http/Controllers/Views/Admin/LogsController.php b/app/Http/Controllers/Views/Admin/LogsController.php
index 59ee8efa0..7598de919 100644
--- a/app/Http/Controllers/Views/Admin/LogsController.php
+++ b/app/Http/Controllers/Views/Admin/LogsController.php
@@ -12,8 +12,6 @@ class LogsController extends Controller
 {
     /**
      * Shows the available logfiles.
-     *
-     * @return \Illuminate\Http\Response
      */
     public function index(Request $request)
     {
@@ -63,8 +61,6 @@ public function index(Request $request)
 
     /**
      * Shows a specific logfile.
-     *
-     * @return \Illuminate\Http\Response
      */
     public function show($file)
     {
diff --git a/app/Http/Controllers/Views/Admin/UsersController.php b/app/Http/Controllers/Views/Admin/UsersController.php
index 8bd7a75cf..04d0c1486 100644
--- a/app/Http/Controllers/Views/Admin/UsersController.php
+++ b/app/Http/Controllers/Views/Admin/UsersController.php
@@ -19,7 +19,6 @@ class UsersController extends Controller
      * Shows the admin users page.
      *
      * @param Request $request
-     * @return \Illuminate\Http\Response
      */
     public function get(Request $request)
     {
@@ -54,8 +53,6 @@ public function get(Request $request)
 
     /**
      * Shows the admin new user page.
-     *
-     * @return \Illuminate\Http\Response
      */
     public function newUser()
     {
@@ -64,8 +61,6 @@ public function newUser()
 
     /**
      * Shows the admin edit user page.
-     *
-     * @return \Illuminate\Http\Response
      */
     public function edit($id)
     {
@@ -80,8 +75,6 @@ public function edit($id)
 
     /**
      * Shows the admin delete user page.
-     *
-     * @return \Illuminate\Http\Response
      */
     public function delete($id)
     {
@@ -94,7 +87,6 @@ public function delete($id)
      *
      * @param Modules $modules
      * @param int $id User ID
-     * @return \Illuminate\Http\Response
      */
     public function show(Modules $modules, $id)
     {
diff --git a/app/Http/Controllers/Views/Annotations/AnnotationToolController.php b/app/Http/Controllers/Views/Annotations/AnnotationToolController.php
index 6dbdf9909..8221b1aa1 100644
--- a/app/Http/Controllers/Views/Annotations/AnnotationToolController.php
+++ b/app/Http/Controllers/Views/Annotations/AnnotationToolController.php
@@ -19,8 +19,6 @@ class AnnotationToolController extends Controller
      *
      * @param Request $request
      * @param int $id the image ID
-     *
-     * @return \Illuminate\Http\Response
      */
     public function show(Request $request, $id)
     {
diff --git a/app/Http/Controllers/Views/Annotations/ImageAnnotationController.php b/app/Http/Controllers/Views/Annotations/ImageAnnotationController.php
index 766e4a2ae..c009f249b 100644
--- a/app/Http/Controllers/Views/Annotations/ImageAnnotationController.php
+++ b/app/Http/Controllers/Views/Annotations/ImageAnnotationController.php
@@ -11,7 +11,7 @@ class ImageAnnotationController extends Controller
      * Redirect to the annotator link that shows a specified annotation.
      *
      * @param int $id Image annotation ID
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function show($id)
     {
diff --git a/app/Http/Controllers/Views/DashboardController.php b/app/Http/Controllers/Views/DashboardController.php
index 00c209ea3..28b7c6120 100644
--- a/app/Http/Controllers/Views/DashboardController.php
+++ b/app/Http/Controllers/Views/DashboardController.php
@@ -26,7 +26,6 @@ public function __construct()
      * Show the application dashboard to the user.
      *
      * @param Guard $auth
-     * @return \Illuminate\Http\Response
      */
     public function index(Guard $auth)
     {
@@ -41,8 +40,6 @@ public function index(Guard $auth)
      * Show the dashboard for a logged in user.
      *
      * @param User $user
-     *
-     * @return \Illuminate\Http\Response
      */
     protected function indexDashboard(User $user)
     {
@@ -162,8 +159,6 @@ public function videosActivityItems(User $user, $limit = 3, $newerThan = null)
 
     /**
      * Show the landing page if no user is authenticated.
-     *
-     * @return \Illuminate\Http\Response
      */
     protected function indexLandingPage()
     {
diff --git a/app/Http/Controllers/Views/ImprintController.php b/app/Http/Controllers/Views/ImprintController.php
index 0d60cb2e3..9084350fb 100644
--- a/app/Http/Controllers/Views/ImprintController.php
+++ b/app/Http/Controllers/Views/ImprintController.php
@@ -9,8 +9,6 @@ class ImprintController extends Controller
 {
     /**
      * Show the the imprint view.
-     *
-     * @return \Illuminate\Http\Response
      */
     public function show()
     {
diff --git a/app/Http/Controllers/Views/LabelTrees/LabelTreeMembersController.php b/app/Http/Controllers/Views/LabelTrees/LabelTreeMembersController.php
index eec802c05..d632f8296 100644
--- a/app/Http/Controllers/Views/LabelTrees/LabelTreeMembersController.php
+++ b/app/Http/Controllers/Views/LabelTrees/LabelTreeMembersController.php
@@ -16,7 +16,6 @@ class LabelTreeMembersController extends Controller
      *
      * @param Request $request
      * @param int $id project ID
-     * @return \Illuminate\Http\Response
      */
     public function show(Request $request, $id)
     {
diff --git a/app/Http/Controllers/Views/LabelTrees/LabelTreeMergeController.php b/app/Http/Controllers/Views/LabelTrees/LabelTreeMergeController.php
index 5d7c855c0..41fb67da0 100644
--- a/app/Http/Controllers/Views/LabelTrees/LabelTreeMergeController.php
+++ b/app/Http/Controllers/Views/LabelTrees/LabelTreeMergeController.php
@@ -13,8 +13,6 @@ class LabelTreeMergeController extends Controller
      *
      * @param Request $request
      * @param int $id ID of the base label tree
-     *
-     * @return mixed
      */
     public function index(Request $request, $id)
     {
@@ -37,8 +35,6 @@ public function index(Request $request, $id)
      *
      * @param int $id1 ID of the base label tree
      * @param int $id2 ID of the label tree to merge into the base
-     *
-     * @return mixed
      */
     public function show($id1, $id2)
     {
diff --git a/app/Http/Controllers/Views/LabelTrees/LabelTreeProjectsController.php b/app/Http/Controllers/Views/LabelTrees/LabelTreeProjectsController.php
index 08372cb6f..6d3975ddd 100644
--- a/app/Http/Controllers/Views/LabelTrees/LabelTreeProjectsController.php
+++ b/app/Http/Controllers/Views/LabelTrees/LabelTreeProjectsController.php
@@ -16,7 +16,6 @@ class LabelTreeProjectsController extends Controller
      *
      * @param Request $request
      * @param int $id project ID
-     * @return \Illuminate\Http\Response
      */
     public function show(Request $request, $id)
     {
@@ -37,8 +36,6 @@ public function show(Request $request, $id)
      *
      * @param LabelTree $tree
      * @param User $user
-     *
-     * @return \Illuminate\Http\Response
      */
     protected function showMasterLabelTree(LabelTree $tree, User $user)
     {
@@ -90,8 +87,6 @@ protected function showMasterLabelTree(LabelTree $tree, User $user)
      *
      * @param LabelTree $tree
      * @param User $user
-     *
-     * @return \Illuminate\Http\Response
      */
     protected function showVersionedLabelTree(LabelTree $tree, User $user)
     {
diff --git a/app/Http/Controllers/Views/LabelTrees/LabelTreeVersionsController.php b/app/Http/Controllers/Views/LabelTrees/LabelTreeVersionsController.php
index dafbd5ce8..79416ce99 100644
--- a/app/Http/Controllers/Views/LabelTrees/LabelTreeVersionsController.php
+++ b/app/Http/Controllers/Views/LabelTrees/LabelTreeVersionsController.php
@@ -16,7 +16,7 @@ class LabelTreeVersionsController extends Controller
      * @param int $tid Label tree ID
      * @param int $vid Label tree version ID
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function show(Request $request, $tid, $vid)
     {
@@ -32,8 +32,6 @@ public function show(Request $request, $tid, $vid)
      * Show the create label tree version page.
      *
      * @param int $id Label tree ID
-     *
-     * @return \Illuminate\Http\Response
      */
     public function create($id)
     {
diff --git a/app/Http/Controllers/Views/LabelTrees/LabelTreesController.php b/app/Http/Controllers/Views/LabelTrees/LabelTreesController.php
index 2e1385d3c..e2b97ccfb 100644
--- a/app/Http/Controllers/Views/LabelTrees/LabelTreesController.php
+++ b/app/Http/Controllers/Views/LabelTrees/LabelTreesController.php
@@ -17,8 +17,6 @@ class LabelTreesController extends Controller
      *
      * @param Request $request
      * @param int $id Label tree ID
-     *
-     * @return \Illuminate\Http\Response
      */
     public function show(Request $request, $id)
     {
@@ -38,7 +36,7 @@ public function show(Request $request, $id)
      * Show the label tree list.
      *
      * @deprecated This is a legacy route and got replaced by the global search.
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function index()
     {
@@ -49,7 +47,6 @@ public function index()
      * Show the create label tree page.
      *
      * @param Request $request
-     * @return \Illuminate\Http\Response
      */
     public function create(Request $request)
     {
@@ -89,8 +86,6 @@ public function create(Request $request)
      *
      * @param LabelTree $tree
      * @param User $user
-     *
-     * @return \Illuminate\Http\Response
      */
     protected function showMasterLabelTree(LabelTree $tree, User $user)
     {
@@ -118,8 +113,6 @@ protected function showMasterLabelTree(LabelTree $tree, User $user)
      *
      * @param LabelTree $tree
      * @param User $user
-     *
-     * @return \Illuminate\Http\Response
      */
     protected function showVersionedLabelTree(LabelTree $tree, User $user)
     {
diff --git a/app/Http/Controllers/Views/ManualController.php b/app/Http/Controllers/Views/ManualController.php
index db99e4b3b..ed7a1f316 100644
--- a/app/Http/Controllers/Views/ManualController.php
+++ b/app/Http/Controllers/Views/ManualController.php
@@ -9,8 +9,6 @@ class ManualController extends Controller
 {
     /**
      * Show the application manual to the user.
-     *
-     * @return \Illuminate\Http\Response
      */
     public function index()
     {
@@ -22,7 +20,6 @@ public function index()
      *
      * @param string $module Name of the module or name of the article
      * @param string $article Article name (only if the article belongs to a module)
-     * @return \Illuminate\Http\Response
      */
     public function tutorialsArticle($module, $article = null)
     {
@@ -44,7 +41,6 @@ public function tutorialsArticle($module, $article = null)
      *
      * @param string $module Name of the module or name of the article
      * @param string $article Article name (only if the article belongs to a module)
-     * @return \Illuminate\Http\Response
      */
     public function documentationArticle($module, $article = null)
     {
diff --git a/app/Http/Controllers/Views/Notifications/NotificationsController.php b/app/Http/Controllers/Views/Notifications/NotificationsController.php
index fe9e9c541..66f801b69 100644
--- a/app/Http/Controllers/Views/Notifications/NotificationsController.php
+++ b/app/Http/Controllers/Views/Notifications/NotificationsController.php
@@ -13,12 +13,11 @@ class NotificationsController extends Controller
      *
      * @param Request $request
      * @param Guard $auth
-     * @return \Illuminate\Http\Response
      */
     public function index(Request $request, Guard $auth)
     {
-        $all = (boolean) $request->input('all', false);
         $user = $auth->user();
+        $all = (boolean) $request->input('all', false);
         $notifications = $all ? $user->notifications : $user->unreadNotifications;
 
         foreach ($notifications as $n) {
diff --git a/app/Http/Controllers/Views/PrivacyController.php b/app/Http/Controllers/Views/PrivacyController.php
index 7e0d6196e..efa5a1dfa 100644
--- a/app/Http/Controllers/Views/PrivacyController.php
+++ b/app/Http/Controllers/Views/PrivacyController.php
@@ -9,8 +9,6 @@ class PrivacyController extends Controller
 {
     /**
      * Show the the privacy view.
-     *
-     * @return \Illuminate\Http\Response
      */
     public function show()
     {
diff --git a/app/Http/Controllers/Views/Projects/ProjectInvitationController.php b/app/Http/Controllers/Views/Projects/ProjectInvitationController.php
index 150262729..fa05864e6 100644
--- a/app/Http/Controllers/Views/Projects/ProjectInvitationController.php
+++ b/app/Http/Controllers/Views/Projects/ProjectInvitationController.php
@@ -27,7 +27,7 @@ public function __construct()
      *
      * @param Request $request
      * @param string $uuid Invitation UUID
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
      */
     public function show(Request $request, $uuid)
     {
diff --git a/app/Http/Controllers/Views/Projects/ProjectLabelTreeController.php b/app/Http/Controllers/Views/Projects/ProjectLabelTreeController.php
index cbff19415..e9e89276b 100644
--- a/app/Http/Controllers/Views/Projects/ProjectLabelTreeController.php
+++ b/app/Http/Controllers/Views/Projects/ProjectLabelTreeController.php
@@ -13,7 +13,6 @@ class ProjectLabelTreeController extends Controller
      *
      * @param Request $request
      * @param int $id project ID
-     * @return \Illuminate\Http\Response
      */
     public function show(Request $request, $id)
     {
@@ -27,7 +26,7 @@ public function show(Request $request, $id)
 
         $userProject = $request->user()->projects()->where('id', $id)->first();
         $isMember = $userProject !== null;
-        $isPinned = $isMember && $userProject->pivot->pinned;
+        $isPinned = $isMember && $userProject->getRelationValue('pivot')->pinned;
         $canPin = $isMember && 3 > $request->user()
             ->projects()
             ->wherePivot('pinned', true)
diff --git a/app/Http/Controllers/Views/Projects/ProjectStatisticsController.php b/app/Http/Controllers/Views/Projects/ProjectStatisticsController.php
index 04e70c4a8..5fa7fc1f8 100644
--- a/app/Http/Controllers/Views/Projects/ProjectStatisticsController.php
+++ b/app/Http/Controllers/Views/Projects/ProjectStatisticsController.php
@@ -17,7 +17,6 @@ class ProjectStatisticsController extends Controller
      *
      * @param Request $request
      * @param int $id project ID
-     * @return \Illuminate\Http\Response
      */
     public function show(Request $request, $id)
     {
@@ -26,7 +25,7 @@ public function show(Request $request, $id)
 
         $userProject = $request->user()->projects()->where('id', $id)->first();
         $isMember = $userProject !== null;
-        $isPinned = $isMember && $userProject->pivot->pinned;
+        $isPinned = $isMember && $userProject->getRelationValue('pivot')->pinned;
         $canPin = $isMember && 3 > $request->user()
             ->projects()
             ->wherePivot('pinned', true)
diff --git a/app/Http/Controllers/Views/Projects/ProjectUserController.php b/app/Http/Controllers/Views/Projects/ProjectUserController.php
index a474218e3..d05475897 100644
--- a/app/Http/Controllers/Views/Projects/ProjectUserController.php
+++ b/app/Http/Controllers/Views/Projects/ProjectUserController.php
@@ -14,7 +14,6 @@ class ProjectUserController extends Controller
      *
      * @param Request $request
      * @param int $id project ID
-     * @return \Illuminate\Http\Response
      */
     public function show(Request $request, $id)
     {
@@ -43,7 +42,7 @@ public function show(Request $request, $id)
 
         $userProject = $request->user()->projects()->where('id', $id)->first();
         $isMember = $userProject !== null;
-        $isPinned = $isMember && $userProject->pivot->pinned;
+        $isPinned = $isMember && $userProject->getRelationValue('pivot')->pinned;
         $canPin = $isMember && 3 > $request->user()
             ->projects()
             ->wherePivot('pinned', true)
diff --git a/app/Http/Controllers/Views/Projects/ProjectsController.php b/app/Http/Controllers/Views/Projects/ProjectsController.php
index e04d206ef..a294f00b6 100644
--- a/app/Http/Controllers/Views/Projects/ProjectsController.php
+++ b/app/Http/Controllers/Views/Projects/ProjectsController.php
@@ -10,8 +10,6 @@ class ProjectsController extends Controller
 {
     /**
      * Shows the create project page.
-     *
-     * @return \Illuminate\Http\Response
      */
     public function create()
     {
@@ -24,7 +22,7 @@ public function create()
      * Shows the project index page.
      *
      * @deprecated This is a legacy route and got replaced by the global search.
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function index()
     {
@@ -36,7 +34,6 @@ public function index()
      *
      * @param Request $request
      * @param int $id project ID
-     * @return \Illuminate\Http\Response
      */
     protected function show(Request $request, $id)
     {
@@ -57,7 +54,7 @@ protected function show(Request $request, $id)
 
         $userProject = $request->user()->projects()->where('id', $id)->first();
         $isMember = $userProject !== null;
-        $isPinned = $isMember && $userProject->pivot->pinned;
+        $isPinned = $isMember && $userProject->getRelationValue('pivot')->pinned;
         $canPin = $isMember && 3 > $request->user()
             ->projects()
             ->wherePivot('pinned', true)
diff --git a/app/Http/Controllers/Views/SearchController.php b/app/Http/Controllers/Views/SearchController.php
index 63f3b6e63..a2830500d 100644
--- a/app/Http/Controllers/Views/SearchController.php
+++ b/app/Http/Controllers/Views/SearchController.php
@@ -21,7 +21,6 @@ class SearchController extends Controller
      * @param Guard $auth
      * @param Request $request
      * @param Modules $modules
-     * @return \Illuminate\Http\Response
      */
     public function index(Guard $auth, Request $request, Modules $modules)
     {
@@ -88,7 +87,7 @@ protected function searchLabelTrees(User $user, $query, $type, $includeFederated
                     });
                 });
 
-            $queryBuilder = $queryBuilder->union($queryBuilder2);
+            $queryBuilder = $queryBuilder->union(fn () => $queryBuilder2);
         }
 
 
@@ -103,6 +102,7 @@ protected function searchLabelTrees(User $user, $query, $type, $includeFederated
             $external = FederatedSearchModel::whereIn('id', $collection->where('external', true)->pluck('id'))->get()->keyBy('id');
 
             $results->setCollection($collection->map(function ($item) use ($internal, $external) {
+                /** @phpstan-ignore property.notFound */
                 if ($item->external) {
                     return $external[$item->id];
                 }
@@ -159,7 +159,7 @@ protected function searchProjects(User $user, $query, $type, $includeFederatedSe
                     });
                 });
 
-            $queryBuilder = $queryBuilder->union($queryBuilder2);
+            $queryBuilder = $queryBuilder->union(fn () => $queryBuilder2);
         }
 
 
@@ -174,6 +174,7 @@ protected function searchProjects(User $user, $query, $type, $includeFederatedSe
             $external = FederatedSearchModel::whereIn('id', $collection->where('external', true)->pluck('id'))->get()->keyBy('id');
 
             $results->setCollection($collection->map(function ($item) use ($internal, $external) {
+                /** @phpstan-ignore property.notFound */
                 if ($item->external) {
                     return $external[$item->id];
                 }
@@ -224,7 +225,7 @@ protected function searchVolumes(User $user, $query, $type, $includeFederatedSea
                     });
                 });
 
-            $queryBuilder = $queryBuilder->union($queryBuilder2);
+            $queryBuilder = $queryBuilder->union(fn () => $queryBuilder2);
         }
 
 
@@ -239,6 +240,7 @@ protected function searchVolumes(User $user, $query, $type, $includeFederatedSea
             $external = FederatedSearchModel::whereIn('id', $collection->where('external', true)->pluck('id'))->get()->keyBy('id');
 
             $results->setCollection($collection->map(function ($item) use ($internal, $external) {
+                /** @phpstan-ignore property.notFound */
                 if ($item->external) {
                     return $external[$item->id];
                 }
diff --git a/app/Http/Controllers/Views/SettingsController.php b/app/Http/Controllers/Views/SettingsController.php
index 3faf4272c..be12d6d3f 100644
--- a/app/Http/Controllers/Views/SettingsController.php
+++ b/app/Http/Controllers/Views/SettingsController.php
@@ -10,7 +10,7 @@ class SettingsController extends Controller
     /**
      * Redirects to the profile settings.
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function index()
     {
@@ -21,7 +21,6 @@ public function index()
      * Shows the profile settings.
      *
      * @param Guard $auth
-     * @return \Illuminate\Http\Response
      */
     public function profile(Guard $auth)
     {
@@ -34,7 +33,6 @@ public function profile(Guard $auth)
      * Shows the account settings.
      *
      * @param Guard $auth
-     * @return \Illuminate\Http\Response
      */
     public function account(Guard $auth)
     {
@@ -48,7 +46,6 @@ public function account(Guard $auth)
      * Shows the authentication settings.
      *
      * @param Guard $auth
-     * @return \Illuminate\Http\Response
      */
     public function authentication(Guard $auth)
     {
@@ -61,7 +58,6 @@ public function authentication(Guard $auth)
      * Shows the tokens settings.
      *
      * @param Guard $auth
-     * @return \Illuminate\Http\Response
      */
     public function tokens(Guard $auth)
     {
@@ -76,8 +72,6 @@ public function tokens(Guard $auth)
 
     /**
      * Shows the notification settings.
-     *
-     * @return \Illuminate\Http\Response
      */
     public function notifications()
     {
diff --git a/app/Http/Controllers/Views/TermsController.php b/app/Http/Controllers/Views/TermsController.php
index b5b529a69..994f8abc3 100644
--- a/app/Http/Controllers/Views/TermsController.php
+++ b/app/Http/Controllers/Views/TermsController.php
@@ -9,8 +9,6 @@ class TermsController extends Controller
 {
     /**
      * Show the the terms view.
-     *
-     * @return \Illuminate\Http\Response
      */
     public function show()
     {
diff --git a/app/Http/Controllers/Views/Videos/VideoAnnotationController.php b/app/Http/Controllers/Views/Videos/VideoAnnotationController.php
index d532f356d..bd82a7c01 100644
--- a/app/Http/Controllers/Views/Videos/VideoAnnotationController.php
+++ b/app/Http/Controllers/Views/Videos/VideoAnnotationController.php
@@ -11,7 +11,7 @@ class VideoAnnotationController extends Controller
      * Redirect to the annotator link that shows a specified annotation.
      *
      * @param int $id Video annotation ID
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function show($id)
     {
diff --git a/app/Http/Controllers/Views/Videos/VideoController.php b/app/Http/Controllers/Views/Videos/VideoController.php
index 873fd9d74..97b58c87f 100644
--- a/app/Http/Controllers/Views/Videos/VideoController.php
+++ b/app/Http/Controllers/Views/Videos/VideoController.php
@@ -18,8 +18,6 @@ class VideoController extends Controller
      *
      * @param Request $request
      * @param int $id
-     *
-     * @return mixed
      */
     public function show(Request $request, $id)
     {
diff --git a/app/Http/Controllers/Views/Volumes/ImageController.php b/app/Http/Controllers/Views/Volumes/ImageController.php
index 8b190719c..250d22563 100644
--- a/app/Http/Controllers/Views/Volumes/ImageController.php
+++ b/app/Http/Controllers/Views/Volumes/ImageController.php
@@ -12,7 +12,6 @@ class ImageController extends Controller
      * Shows the image index page.
      *
      * @param int $id volume ID
-     * @return \Illuminate\Http\Response
      */
     public function index($id)
     {
diff --git a/app/Http/Controllers/Views/Volumes/VolumeCloneController.php b/app/Http/Controllers/Views/Volumes/VolumeCloneController.php
index 5d7b5ebe7..de5c05fb7 100644
--- a/app/Http/Controllers/Views/Volumes/VolumeCloneController.php
+++ b/app/Http/Controllers/Views/Volumes/VolumeCloneController.php
@@ -2,7 +2,6 @@
 
 namespace Biigle\Http\Controllers\Views\Volumes;
 
-use \Illuminate\Contracts\View\View;
 use Biigle\Http\Controllers\Views\Controller;
 use Biigle\LabelTree;
 use Biigle\Project;
@@ -16,8 +15,6 @@ class VolumeCloneController extends Controller
      * Shows the volume clone page.
      * @param Request $request
      * @param $id volume ID
-     *
-     * @return View
      **/
     public function clone(Request $request, $id)
     {
@@ -37,7 +34,7 @@ public function clone(Request $request, $id)
         }
 
         // Collection of projects where cloned volume can be copied to.
-        $destProjects = $destProjectQuery->select('name', 'id')->get();
+        $destProjects = $destProjectQuery->select(['name', 'id'])->get();
 
         $labelTrees = LabelTree::select('id', 'name', 'version_id')
             ->with('labels', 'version')
diff --git a/app/Http/Controllers/Views/Volumes/VolumeController.php b/app/Http/Controllers/Views/Volumes/VolumeController.php
index ad3f4fd63..77c699398 100644
--- a/app/Http/Controllers/Views/Volumes/VolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/VolumeController.php
@@ -20,7 +20,6 @@ class VolumeController extends Controller
      * Shows the create volume page.
      *
      * @param Request $request
-     * @return \Illuminate\View\View
      */
     public function create(Request $request)
     {
@@ -77,8 +76,6 @@ public function create(Request $request)
      *
      * @param Request $request
      * @param int $id volume ID
-     *
-     * @return \Illuminate\Http\Response
      */
     public function index(Request $request, $id)
     {
@@ -122,8 +119,6 @@ public function index(Request $request, $id)
      *
      * @param Request $request
      * @param int $id volume ID
-     *
-     * @return \Illuminate\Http\Response
      */
     public function edit(Request $request, $id)
     {

From ba4783177545fcae80492f6e42fa95f60ad07b9c Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 30 Aug 2024 10:36:19 +0200
Subject: [PATCH 180/209] Fix type errors

---
 app/Annotation.php                                 |  2 +-
 app/AnnotationLabel.php                            |  1 +
 app/FederatedSearchInstance.php                    |  3 +--
 app/FederatedSearchModel.php                       |  3 +--
 app/Http/Controllers/Api/ImageController.php       |  2 +-
 app/Http/Controllers/Api/ImageLabelController.php  |  2 +-
 app/Http/Controllers/Api/LabelController.php       |  1 -
 .../Controllers/Api/LabelTreeMergeController.php   |  2 +-
 .../Controllers/Api/LabelTreeUserController.php    |  6 +++---
 .../Controllers/Api/LabelTreeVersionController.php |  5 ++---
 .../Api/LinkVideoAnnotationController.php          |  2 +-
 app/Http/Controllers/Api/MediaTypeController.php   |  2 +-
 .../Controllers/Api/NotificationController.php     | 13 +++++++++----
 app/Http/Controllers/Api/ProjectController.php     |  8 ++++----
 .../Api/ProjectInvitationController.php            |  5 ++---
 .../Controllers/Api/ProjectLabelTreeController.php |  8 ++++----
 app/Http/Controllers/Api/ProjectUserController.php |  5 +----
 .../Controllers/Api/ProjectVolumeController.php    |  6 ++----
 .../Api/ProjectsAttachableVolumesController.php    |  2 +-
 app/Http/Controllers/Api/RoleController.php        |  2 +-
 app/Http/Controllers/Api/ShapeController.php       |  2 +-
 .../Api/SplitVideoAnnotationController.php         |  4 ++--
 app/Http/Controllers/Api/UserController.php        | 14 +++++++-------
 .../Controllers/Api/UserSettingsController.php     |  2 +-
 app/Http/Controllers/Views/DashboardController.php |  2 ++
 app/Label.php                                      |  1 +
 26 files changed, 52 insertions(+), 53 deletions(-)

diff --git a/app/Annotation.php b/app/Annotation.php
index e06977830..b915d69f4 100644
--- a/app/Annotation.php
+++ b/app/Annotation.php
@@ -179,7 +179,7 @@ abstract public function getFileIdAttribute();
     /**
      * The shape of this annotation.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<Shape>
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<Shape, Annotation>
      */
     public function shape()
     {
diff --git a/app/AnnotationLabel.php b/app/AnnotationLabel.php
index 03e906157..754dc2139 100644
--- a/app/AnnotationLabel.php
+++ b/app/AnnotationLabel.php
@@ -9,6 +9,7 @@
  * @property int $id
  * @property int $annotation_id
  * @property int $user_id
+ * @property int $label_id
  */
 abstract class AnnotationLabel extends Model
 {
diff --git a/app/FederatedSearchInstance.php b/app/FederatedSearchInstance.php
index ba0bcb1c9..974ac6fe7 100644
--- a/app/FederatedSearchInstance.php
+++ b/app/FederatedSearchInstance.php
@@ -72,8 +72,7 @@ public function scopeWithRemoteToken($query)
     /**
      * The models that belong to this instance.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany<Federa
-     * >
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany<FederatedSearchModel>
      */
     public function models()
     {
diff --git a/app/FederatedSearchModel.php b/app/FederatedSearchModel.php
index 120775ea0..d89f6bb29 100644
--- a/app/FederatedSearchModel.php
+++ b/app/FederatedSearchModel.php
@@ -58,8 +58,7 @@ public function scopeVolumes($query)
     /**
      * The instance, this model belongs to.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<Feder
-     * , FederatedSearchModel>
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<FederatedSearchInstance, FederatedSearchModel>
      */
     public function instance()
     {
diff --git a/app/Http/Controllers/Api/ImageController.php b/app/Http/Controllers/Api/ImageController.php
index 2d5e32e1e..fe9ccee14 100644
--- a/app/Http/Controllers/Api/ImageController.php
+++ b/app/Http/Controllers/Api/ImageController.php
@@ -54,7 +54,7 @@ public function show($id)
      * @apiParam {Number} id The image ID.
      *
      * @param int $id image id
-     * @return \Illuminate\Http\Response
+     * @return array<string, mixed>|\Illuminate\Http\RedirectResponse|\Symfony\Component\HttpFoundation\StreamedResponse
      */
     public function showFile($id)
     {
diff --git a/app/Http/Controllers/Api/ImageLabelController.php b/app/Http/Controllers/Api/ImageLabelController.php
index 8d5593385..a11bd207a 100644
--- a/app/Http/Controllers/Api/ImageLabelController.php
+++ b/app/Http/Controllers/Api/ImageLabelController.php
@@ -72,7 +72,7 @@ class ImageLabelController extends VolumeFileLabelController
      * }
      *
      * @param StoreImageLabel $request
-     * @return \Illuminate\Http\Response
+     * @return \Biigle\VolumeFileLabel
      */
     public function store(StoreImageLabel $request)
     {
diff --git a/app/Http/Controllers/Api/LabelController.php b/app/Http/Controllers/Api/LabelController.php
index e757ce4f1..51a771fd8 100644
--- a/app/Http/Controllers/Api/LabelController.php
+++ b/app/Http/Controllers/Api/LabelController.php
@@ -46,7 +46,6 @@ public function update(UpdateLabel $request)
      * @apiParam {Number} id The label ID
      *
      * @param DestroyLabel $request
-     * @return \Illuminate\Http\RedirectResponse
      */
     public function destroy(DestroyLabel $request)
     {
diff --git a/app/Http/Controllers/Api/LabelTreeMergeController.php b/app/Http/Controllers/Api/LabelTreeMergeController.php
index f92611947..d19ef8e4b 100644
--- a/app/Http/Controllers/Api/LabelTreeMergeController.php
+++ b/app/Http/Controllers/Api/LabelTreeMergeController.php
@@ -42,7 +42,7 @@ class LabelTreeMergeController extends Controller
      * }
      *
      * @param StoreLabelTreeMerge $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|null
      */
     public function store(StoreLabelTreeMerge $request)
     {
diff --git a/app/Http/Controllers/Api/LabelTreeUserController.php b/app/Http/Controllers/Api/LabelTreeUserController.php
index c5ffb098e..b26909049 100644
--- a/app/Http/Controllers/Api/LabelTreeUserController.php
+++ b/app/Http/Controllers/Api/LabelTreeUserController.php
@@ -22,7 +22,7 @@ class LabelTreeUserController extends Controller
      * @apiParam (Required attributes) {Number} role_id ID of the role of the new member (admin or editor).
      *
      * @param StoreLabelTreeUser $request
-     * @return \Illuminate\Http\Response
+     * @return \Biigle\LabelTree|\Illuminate\Http\RedirectResponse
      */
     public function store(StoreLabelTreeUser $request)
     {
@@ -50,7 +50,7 @@ public function store(StoreLabelTreeUser $request)
      * @apiParam (Attributes that can be updated) {Number} role_id New role of the member (admin or editor)
      *
      * @param UpdateLabelTreeUser $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|null
      */
     public function update(UpdateLabelTreeUser $request)
     {
@@ -77,7 +77,7 @@ public function update(UpdateLabelTreeUser $request)
      * @apiParam {Number} uid User ID of the member.
      *
      * @param DestroyLabelTreeUser $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|null
      */
     public function destroy(DestroyLabelTreeUser $request)
     {
diff --git a/app/Http/Controllers/Api/LabelTreeVersionController.php b/app/Http/Controllers/Api/LabelTreeVersionController.php
index 43ec57a74..707d52fbb 100644
--- a/app/Http/Controllers/Api/LabelTreeVersionController.php
+++ b/app/Http/Controllers/Api/LabelTreeVersionController.php
@@ -36,7 +36,7 @@ class LabelTreeVersionController extends Controller
      * }
      *
      * @param StoreLabelTreeVersion $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|null
      */
     public function store(StoreLabelTreeVersion $request)
     {
@@ -83,7 +83,6 @@ public function store(StoreLabelTreeVersion $request)
      * @apiParam (Required attributes) {String} doi DOI that should be associated with the new label tree version.
      *
      * @param UpdateLabelTreeVersion $request
-     * @return \Illuminate\Http\Response
      */
     public function update(UpdateLabelTreeVersion $request)
     {
@@ -103,7 +102,7 @@ public function update(UpdateLabelTreeVersion $request)
      * @apiParam {Number} id The label tree version ID.
      *
      * @param DestroyLabelTreeVersion $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|null
      */
     public function destroy(DestroyLabelTreeVersion $request)
     {
diff --git a/app/Http/Controllers/Api/LinkVideoAnnotationController.php b/app/Http/Controllers/Api/LinkVideoAnnotationController.php
index 08b885328..2cc3e235d 100644
--- a/app/Http/Controllers/Api/LinkVideoAnnotationController.php
+++ b/app/Http/Controllers/Api/LinkVideoAnnotationController.php
@@ -54,7 +54,7 @@ class LinkVideoAnnotationController extends Controller
      * }
      *
      * @param LinkVideoAnnotation $request
-     * @return \Illuminate\Http\Response
+     * @return VideoAnnotation
      */
     public function store(LinkVideoAnnotation $request)
     {
diff --git a/app/Http/Controllers/Api/MediaTypeController.php b/app/Http/Controllers/Api/MediaTypeController.php
index 3f9cff19e..6e89bdda7 100644
--- a/app/Http/Controllers/Api/MediaTypeController.php
+++ b/app/Http/Controllers/Api/MediaTypeController.php
@@ -26,7 +26,7 @@ class MediaTypeController extends Controller
      *    }
      * ]
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Database\Eloquent\Collection
      */
     public function index()
     {
diff --git a/app/Http/Controllers/Api/NotificationController.php b/app/Http/Controllers/Api/NotificationController.php
index f2ec45f7a..aa47ef854 100644
--- a/app/Http/Controllers/Api/NotificationController.php
+++ b/app/Http/Controllers/Api/NotificationController.php
@@ -3,6 +3,7 @@
 namespace Biigle\Http\Controllers\Api;
 
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 
 class NotificationController extends Controller
 {
@@ -20,11 +21,13 @@ class NotificationController extends Controller
      *
      * @param Request $request
      * @param int $id Image ID
-     * @return \Illuminate\Http\Response
      */
     public function update(Request $request, $id)
     {
-        $notification = $request->user()->unreadNotifications()->findOrFail($id);
+        $notification = $request->user()->unreadNotifications()->find($id);
+        if (is_null($notification)) {
+            abort(Response::HTTP_NOT_FOUND);
+        }
         $notification->markAsRead();
     }
 
@@ -57,11 +60,13 @@ public function updateAll(Request $request)
      *
      * @param Request $request
      * @param int  $id
-     * @return \Illuminate\Http\Response
      */
     public function destroy(Request $request, $id)
     {
-        $notification = $request->user()->notifications()->findOrFail($id);
+        $notification = $request->user()->notifications()->find($id);
+        if (is_null($notification)) {
+            abort(Response::HTTP_NOT_FOUND);
+        }
         $notification->delete();
     }
 }
diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php
index 635ab0dcb..6f06f288d 100644
--- a/app/Http/Controllers/Api/ProjectController.php
+++ b/app/Http/Controllers/Api/ProjectController.php
@@ -32,7 +32,7 @@ class ProjectController extends Controller
      * ]
      *
      * @param Request $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Database\Eloquent\Collection
      */
     public function index(Request $request)
     {
@@ -87,7 +87,7 @@ public function show($id)
      * @apiParam (Required attributes) {String} description Description of the new project.
      *
      * @param StoreProject $request
-     * @return Project
+     * @return Project|\Illuminate\Http\RedirectResponse
      */
     public function store(StoreProject $request)
     {
@@ -121,7 +121,7 @@ public function store(StoreProject $request)
      * @apiParam (Attributes that can be updated) {String} description Description of the project.
      *
      * @param UpdateProject $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|null
      */
     public function update(UpdateProject $request)
     {
@@ -153,7 +153,7 @@ public function update(UpdateProject $request)
      *
      * @param Request $request
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|null
      */
     public function destroy(Request $request, $id)
     {
diff --git a/app/Http/Controllers/Api/ProjectInvitationController.php b/app/Http/Controllers/Api/ProjectInvitationController.php
index 8f23992fb..a0a874633 100644
--- a/app/Http/Controllers/Api/ProjectInvitationController.php
+++ b/app/Http/Controllers/Api/ProjectInvitationController.php
@@ -33,7 +33,7 @@ class ProjectInvitationController extends Controller
      * @apiParam (Optional attributes) {Boolean} add_to_sessions If set to `true`, all users joining the project will automatically be added to all annotation sessions of all volumes that belong to the project.
      *
      * @param StoreProjectInvitation $request
-     * @return \Illuminate\Http\Response
+     * @return ProjectInvitation
      */
     public function store(StoreProjectInvitation $request)
     {
@@ -62,7 +62,7 @@ public function store(StoreProjectInvitation $request)
      * @param JoinProjectInvitation $request
      * @param int $id
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|null
      */
     public function join(JoinProjectInvitation $request, $id)
     {
@@ -108,7 +108,6 @@ public function join(JoinProjectInvitation $request, $id)
      * @apiParam {Number} id The invitation ID.
      *
      * @param int $id
-     * @return \Illuminate\Http\Response
      */
     public function destroy($id)
     {
diff --git a/app/Http/Controllers/Api/ProjectLabelTreeController.php b/app/Http/Controllers/Api/ProjectLabelTreeController.php
index 2db28f374..1a57fbc08 100644
--- a/app/Http/Controllers/Api/ProjectLabelTreeController.php
+++ b/app/Http/Controllers/Api/ProjectLabelTreeController.php
@@ -45,7 +45,7 @@ class ProjectLabelTreeController extends Controller
      * ]
      *
      * @param int $id Project ID
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Database\Eloquent\Collection
      */
     public function index($id)
     {
@@ -86,7 +86,7 @@ public function index($id)
      * ]
      *
      * @param int $id Project ID
-     * @return \Illuminate\Http\Response
+     * @return array<int, LabelTree>
      */
     public function available($id)
     {
@@ -122,7 +122,7 @@ public function available($id)
      * id: 3
      *
      * @param StoreProjectLabelTree $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|null
      */
     public function store(StoreProjectLabelTree $request)
     {
@@ -147,7 +147,7 @@ public function store(StoreProjectLabelTree $request)
      * @param Request $request
      * @param  int  $pid
      * @param  int  $lid
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|null
      */
     public function destroy(Request $request, $pid, $lid)
     {
diff --git a/app/Http/Controllers/Api/ProjectUserController.php b/app/Http/Controllers/Api/ProjectUserController.php
index 97077229e..76d956b83 100644
--- a/app/Http/Controllers/Api/ProjectUserController.php
+++ b/app/Http/Controllers/Api/ProjectUserController.php
@@ -36,7 +36,7 @@ class ProjectUserController extends Controller
      * ]
      *
      * @param int $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Database\Eloquent\Collection
      */
     public function index($id)
     {
@@ -60,7 +60,6 @@ public function index($id)
      * @apiParam (Attributes that can be updated) {Number} project_role_id The project role of the member. Users with the global guest role cannot become project admins.
      *
      * @param UpdateProjectUser $request
-     * @return \Illuminate\Http\Response
      */
     public function update(UpdateProjectUser $request)
     {
@@ -84,7 +83,6 @@ public function update(UpdateProjectUser $request)
      * project_role_id: 3
      *
      * @param AttachProjectUser $request
-     * @return \Illuminate\Http\Response
      */
     public function attach(AttachProjectUser $request)
     {
@@ -106,7 +104,6 @@ public function attach(AttachProjectUser $request)
      * @apiParam {Number} uid The user ID of the member.
      *
      * @param DestroyProjectUser $request
-     * @return \Illuminate\Http\Response
      */
     public function destroy(DestroyProjectUser $request)
     {
diff --git a/app/Http/Controllers/Api/ProjectVolumeController.php b/app/Http/Controllers/Api/ProjectVolumeController.php
index 47e1e53e2..f5925cca3 100644
--- a/app/Http/Controllers/Api/ProjectVolumeController.php
+++ b/app/Http/Controllers/Api/ProjectVolumeController.php
@@ -43,7 +43,7 @@ class ProjectVolumeController extends Controller
      * ]
      *
      * @param int $id Project ID
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Database\Eloquent\Collection
      */
     public function index($id)
     {
@@ -103,7 +103,7 @@ public function index($id)
      * }
      *
      * @param StoreVolume $request
-     * @return Volume
+     * @return Volume|\Illuminate\Http\RedirectResponse
      */
     public function store(StoreVolume $request)
     {
@@ -167,7 +167,6 @@ public function store(StoreVolume $request)
      * @param Request $request
      * @param int $projectId
      * @param int $volumeId
-     * @return \Illuminate\Http\Response
      */
     public function attach(Request $request, $projectId, $volumeId)
     {
@@ -199,7 +198,6 @@ public function attach(Request $request, $projectId, $volumeId)
      * @param Request $request
      * @param  int  $projectId
      * @param  int  $volumeId
-     * @return \Illuminate\Http\Response
      */
     public function destroy(Request $request, $projectId, $volumeId)
     {
diff --git a/app/Http/Controllers/Api/ProjectsAttachableVolumesController.php b/app/Http/Controllers/Api/ProjectsAttachableVolumesController.php
index 94bccbd0e..70232d8e8 100644
--- a/app/Http/Controllers/Api/ProjectsAttachableVolumesController.php
+++ b/app/Http/Controllers/Api/ProjectsAttachableVolumesController.php
@@ -35,7 +35,7 @@ class ProjectsAttachableVolumesController extends Controller
      * @param Request $request
      * @param int $id Project ID
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Database\Eloquent\Collection
      */
     public function index(Request $request, $id)
     {
diff --git a/app/Http/Controllers/Api/RoleController.php b/app/Http/Controllers/Api/RoleController.php
index a19c3978c..b7e11a44e 100644
--- a/app/Http/Controllers/Api/RoleController.php
+++ b/app/Http/Controllers/Api/RoleController.php
@@ -30,7 +30,7 @@ class RoleController extends Controller
      *    }
      * ]
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Database\Eloquent\Collection
      */
     public function index()
     {
diff --git a/app/Http/Controllers/Api/ShapeController.php b/app/Http/Controllers/Api/ShapeController.php
index 9d0f1fec4..3c5d712bd 100644
--- a/app/Http/Controllers/Api/ShapeController.php
+++ b/app/Http/Controllers/Api/ShapeController.php
@@ -26,7 +26,7 @@ class ShapeController extends Controller
      *    }
      * ]
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Database\Eloquent\Collection
      */
     public function index()
     {
diff --git a/app/Http/Controllers/Api/SplitVideoAnnotationController.php b/app/Http/Controllers/Api/SplitVideoAnnotationController.php
index 10537f8b7..946aa4fa6 100644
--- a/app/Http/Controllers/Api/SplitVideoAnnotationController.php
+++ b/app/Http/Controllers/Api/SplitVideoAnnotationController.php
@@ -79,7 +79,7 @@ class SplitVideoAnnotationController extends Controller
      * ]
      *
      * @param SplitVideoAnnotation $request
-     * @return \Illuminate\Http\Response
+     * @return array<int, VideoAnnotation>
      */
     public function store(SplitVideoAnnotation $request)
     {
@@ -130,7 +130,7 @@ public function store(SplitVideoAnnotation $request)
             }
         }
 
-        $newAnnotation = VideoAnnotation::make([
+        $newAnnotation = new VideoAnnotation([
             'video_id' => $oldAnnotation->video_id,
             'shape_id' => $oldAnnotation->shape_id,
             'points' => $newPoints,
diff --git a/app/Http/Controllers/Api/UserController.php b/app/Http/Controllers/Api/UserController.php
index 6bef665a8..1c7649f8e 100644
--- a/app/Http/Controllers/Api/UserController.php
+++ b/app/Http/Controllers/Api/UserController.php
@@ -57,7 +57,7 @@ public function __construct()
      * ]
      *
      * @param string $pattern
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Database\Eloquent\Collection
      */
     public function find($pattern)
     {
@@ -98,7 +98,7 @@ public function find($pattern)
      * ]
      *
      * @param Request $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Database\Eloquent\Collection
      */
     public function index(Request $request)
     {
@@ -204,7 +204,7 @@ public function showOwn(Request $request)
      * auth_password: 'password123'
      *
      * @param UpdateUser $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|null
      */
     public function update(UpdateUser $request)
     {
@@ -265,7 +265,7 @@ public function update(UpdateUser $request)
      * super_user_mode: 0
      *
      * @param UpdateOwnUser $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|null
      */
     public function updateOwn(UpdateOwnUser $request)
     {
@@ -328,7 +328,7 @@ public function updateOwn(UpdateOwnUser $request)
      * }
      *
      * @param StoreUser $request
-     * @return User
+     * @return User|\Illuminate\Http\RedirectResponse
      */
     public function store(StoreUser $request)
     {
@@ -375,7 +375,7 @@ public function store(StoreUser $request)
      * @apiParam {Number} id The user ID.
      *
      * @param DestroyUser $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|null
      */
     public function destroy(DestroyUser $request)
     {
@@ -404,7 +404,7 @@ public function destroy(DestroyUser $request)
      * @apiDescription This action is allowed only by session cookie authentication. If the user is the last admin of a project, they cannot be deleted. The admin role needs to be passed on to another member of the project first.
      *
      * @param DestroyOwnUser $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|null
      */
     public function destroyOwn(DestroyOwnUser $request)
     {
diff --git a/app/Http/Controllers/Api/UserSettingsController.php b/app/Http/Controllers/Api/UserSettingsController.php
index 2603a44bc..e472ec940 100644
--- a/app/Http/Controllers/Api/UserSettingsController.php
+++ b/app/Http/Controllers/Api/UserSettingsController.php
@@ -17,7 +17,7 @@ class UserSettingsController extends Controller
      * attributes which cannot be documented here.
      *
      * @param UpdateUserSettings $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|null
      */
     public function update(UpdateUserSettings $request)
     {
diff --git a/app/Http/Controllers/Views/DashboardController.php b/app/Http/Controllers/Views/DashboardController.php
index 28b7c6120..905f16cb5 100644
--- a/app/Http/Controllers/Views/DashboardController.php
+++ b/app/Http/Controllers/Views/DashboardController.php
@@ -118,6 +118,7 @@ public function annotationsActivityItems(User $user, $limit = 3, $newerThan = nu
             ->map(function ($item) {
                 return [
                     'item' => $item,
+                    /** @phpstan-ignore property.notFound */
                     'created_at' => $item->annotation_labels_created_at,
                     'include' => 'annotations.dashboardActivityItem',
                 ];
@@ -150,6 +151,7 @@ public function videosActivityItems(User $user, $limit = 3, $newerThan = null)
             ->map(function ($item) {
                 return [
                     'item' => $item,
+                    /** @phpstan-ignore property.notFound */
                     'created_at' => $item->video_annotation_labels_created_at,
                     'include' => 'videos.dashboardActivityItem',
                 ];
diff --git a/app/Label.php b/app/Label.php
index b3fe69e33..610c399a9 100644
--- a/app/Label.php
+++ b/app/Label.php
@@ -14,6 +14,7 @@
  *
  * Labels can be ordered in a tree-like structure.
  *
+ * @property int $id
  * @property string $uuid
  */
 class Label extends Model

From d78ad52ab9614cb82245a4a52c625e6625a14619 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 30 Aug 2024 11:28:55 +0200
Subject: [PATCH 181/209] Fix type errors

---
 .../Controllers/Api/ImageAnnotationBulkController.php  | 10 +++++-----
 .../Controllers/Api/ProjectInvitationController.php    |  2 +-
 .../Views/Notifications/NotificationsController.php    |  9 ++++-----
 app/Http/Requests/StoreImageAnnotations.php            |  4 ++--
 app/Jobs/CloneImagesOrVideos.php                       |  4 ++++
 app/Jobs/GenerateFederatedSearchIndex.php              | 10 +++++-----
 app/Jobs/ProcessNewVolumeFiles.php                     |  3 ++-
 7 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/app/Http/Controllers/Api/ImageAnnotationBulkController.php b/app/Http/Controllers/Api/ImageAnnotationBulkController.php
index f81e6134a..0d5aa982e 100644
--- a/app/Http/Controllers/Api/ImageAnnotationBulkController.php
+++ b/app/Http/Controllers/Api/ImageAnnotationBulkController.php
@@ -90,19 +90,19 @@ public function store(StoreImageAnnotations $request)
 
             $annotation->points = $input['points'];
             $annotation->image_id = $input['image_id'];
-            /** @phpstan-ignore-next-line */
+            /** @phpstan-ignore property.notFound */
             $annotation->label_id = $input['label_id'];
-            /** @phpstan-ignore-next-line */
+            /** @phpstan-ignore property.notFound */
             $annotation->confidence = $input['confidence'];
 
             return $annotation;
         });
 
         DB::transaction(function () use ($request, $annotations) {
-            $annotations->each(function ($annotation) use ($request) {
-                /** @phpstan-ignore-next-line */
+            $annotations->each(function (ImageAnnotation $annotation) use ($request) {
+                /** @phpstan-ignore property.notFound */
                 $label = $request->labels[$annotation->label_id];
-                /** @phpstan-ignore-next-line */
+                /** @phpstan-ignore property.notFound */
                 $confidence = $annotation->confidence;
                 unset($annotation->label_id, $annotation->confidence);
 
diff --git a/app/Http/Controllers/Api/ProjectInvitationController.php b/app/Http/Controllers/Api/ProjectInvitationController.php
index a0a874633..bfa235ec3 100644
--- a/app/Http/Controllers/Api/ProjectInvitationController.php
+++ b/app/Http/Controllers/Api/ProjectInvitationController.php
@@ -83,7 +83,7 @@ public function join(JoinProjectInvitation $request, $id)
                 if ($invitation->add_to_sessions) {
                     AnnotationSession::join('project_volume', 'annotation_sessions.volume_id', '=', 'project_volume.volume_id')
                         ->where('project_volume.project_id', $project->id)
-                        ->eachById(fn ($session) => $session->users()->syncWithoutDetaching([$userId]));
+                        ->eachById(fn (AnnotationSession $session) => $session->users()->syncWithoutDetaching([$userId]));
                 }
             }
 
diff --git a/app/Http/Controllers/Views/Notifications/NotificationsController.php b/app/Http/Controllers/Views/Notifications/NotificationsController.php
index 66f801b69..cc982e5b2 100644
--- a/app/Http/Controllers/Views/Notifications/NotificationsController.php
+++ b/app/Http/Controllers/Views/Notifications/NotificationsController.php
@@ -3,7 +3,6 @@
 namespace Biigle\Http\Controllers\Views\Notifications;
 
 use Biigle\Http\Controllers\Controller;
-use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Http\Request;
 
 class NotificationsController extends Controller
@@ -12,13 +11,13 @@ class NotificationsController extends Controller
      * Shows the notification center.
      *
      * @param Request $request
-     * @param Guard $auth
      */
-    public function index(Request $request, Guard $auth)
+    public function index(Request $request)
     {
-        $user = $auth->user();
+        $user = $request->user();
         $all = (boolean) $request->input('all', false);
-        $notifications = $all ? $user->notifications : $user->unreadNotifications;
+        $notifications = $all ? $user->notifications() : $user->unreadNotifications();
+        $notifications = $notifications->get();
 
         foreach ($notifications as $n) {
             $n->created_at_diff = $n->created_at->diffForHumans();
diff --git a/app/Http/Requests/StoreImageAnnotations.php b/app/Http/Requests/StoreImageAnnotations.php
index d04523520..d6bffa5d6 100644
--- a/app/Http/Requests/StoreImageAnnotations.php
+++ b/app/Http/Requests/StoreImageAnnotations.php
@@ -25,14 +25,14 @@ class StoreImageAnnotations extends FormRequest
     /**
      * The images on which the annotations should be created.
      *
-     * @var \Illuminate\Database\Eloquent\Collection
+     * @var \Illuminate\Database\Eloquent\Collection<\Biigle\Image>
      */
     public $images;
 
     /**
      * The labels that should be attached to the new annotations.
      *
-     * @var \Illuminate\Database\Eloquent\Collection
+     * @var \Illuminate\Database\Eloquent\Collection<int, Label>
      */
     public $labels;
 
diff --git a/app/Jobs/CloneImagesOrVideos.php b/app/Jobs/CloneImagesOrVideos.php
index 50d019443..687024cd6 100644
--- a/app/Jobs/CloneImagesOrVideos.php
+++ b/app/Jobs/CloneImagesOrVideos.php
@@ -247,6 +247,7 @@ private function copyImageAnnotation($volume, $copy, $selectedFileIds, $selected
                 $chunkNewImageIds = [];
                 // Consider all previous image chunks when calculating the start of the index.
                 $baseImageIndex = ($page - 1) * $chunkSize;
+                /** @var Image $image */
                 foreach ($chunk as $index => $image) {
                     $newImageId = $newImageIds[$baseImageIndex + $index];
                     // Collect relevant image IDs for the annotation query below.
@@ -271,6 +272,7 @@ private function copyImageAnnotation($volume, $copy, $selectedFileIds, $selected
                     ->orderBy('id')
                     ->pluck('id');
                 $insertData = [];
+                /** @var Image $image */
                 foreach ($chunk as $image) {
                     foreach ($image->annotations as $annotation) {
                         if ($annotation->labels->isEmpty()) {
@@ -390,6 +392,7 @@ private function copyVideoAnnotation($volume, $copy, $selectedFileIds, $selected
                 $chunkNewVideoIds = [];
                 // Consider all previous video chunks when calculating the start of the index.
                 $baseVideoIndex = ($page - 1) * $chunkSize;
+                /** @var Video $video */
                 foreach ($chunk as $index => $video) {
                     $newVideoId = $newVideoIds[$baseVideoIndex + $index];
                     // Collect relevant video IDs for the annotation query below.
@@ -415,6 +418,7 @@ private function copyVideoAnnotation($volume, $copy, $selectedFileIds, $selected
                     ->orderBy('id')
                     ->pluck('id');
                 $insertData = [];
+                /** @var Video $video */
                 foreach ($chunk as $video) {
                     foreach ($video->annotations as $annotation) {
                         if ($annotation->labels->isEmpty()) {
diff --git a/app/Jobs/GenerateFederatedSearchIndex.php b/app/Jobs/GenerateFederatedSearchIndex.php
index 34a73980d..2f91b7484 100644
--- a/app/Jobs/GenerateFederatedSearchIndex.php
+++ b/app/Jobs/GenerateFederatedSearchIndex.php
@@ -36,7 +36,7 @@ public function handle()
         $index['users'] = [];
         User::whereIn('id', array_unique($userIds))
             ->select('id', 'uuid')
-            ->eachById(function ($user) use (&$index) {
+            ->eachById(function (User $user) use (&$index) {
                 $index['users'][] = [
                     'id' => $user->id,
                     'uuid' => $user->uuid,
@@ -59,7 +59,7 @@ protected function generateLabelTreeIndex()
         // Versions and global label trees should not be indexed.
         LabelTree::withoutVersions()
             ->whereHas('members')
-            ->eachById(function ($tree) use (&$trees) {
+            ->eachById(function (LabelTree $tree) use (&$trees) {
                 $trees[] = [
                     'id' => $tree->id,
                     'name' => $tree->name,
@@ -82,7 +82,7 @@ protected function generateLabelTreeIndex()
     protected function generateProjectIndex()
     {
         $projects = [];
-        Project::eachById(function ($project) use (&$projects) {
+        Project::eachById(function (Project $project) use (&$projects) {
             $projects[] = [
                 'id' => $project->id,
                 'name' => $project->name,
@@ -115,7 +115,7 @@ protected function generateProjectIndex()
     protected function generateVolumeIndex()
     {
         $volumes = [];
-        Volume::eachById(function ($volume) use (&$volumes) {
+        Volume::eachById(function (Volume $volume) use (&$volumes) {
             $volumes[] = [
                 'id' => $volume->id,
                 'name' => $volume->name,
@@ -123,7 +123,7 @@ protected function generateVolumeIndex()
                 'updated_at' => strval($volume->updated_at),
                 'url' => route('volume', $volume->id, false),
                 'thumbnail_url' => $volume->thumbnailUrl,
-                'thumbnail_urls' => $volume->thumbnailUrls,
+                'thumbnail_urls' => $volume->thumbnailsUrl,
             ];
         });
 
diff --git a/app/Jobs/ProcessNewVolumeFiles.php b/app/Jobs/ProcessNewVolumeFiles.php
index 4e1b87af1..a79f4ae1c 100644
--- a/app/Jobs/ProcessNewVolumeFiles.php
+++ b/app/Jobs/ProcessNewVolumeFiles.php
@@ -2,6 +2,7 @@
 
 namespace Biigle\Jobs;
 
+use Biigle\Video;
 use Biigle\Volume;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Queue\InteractsWithQueue;
@@ -62,7 +63,7 @@ public function handle()
             $query->eachById([ProcessNewImage::class, 'dispatch']);
         } else {
             $queue = config('videos.process_new_video_queue');
-            $query->eachById(fn ($v) => ProcessNewVideo::dispatch($v)->onQueue($queue));
+            $query->eachById(fn (Video $v) => ProcessNewVideo::dispatch($v)->onQueue($queue));
         }
     }
 }

From 286ca986794ab95424300e5a6a7dfc55b6163e99 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 30 Aug 2024 12:00:13 +0200
Subject: [PATCH 182/209] Fix type errors and tests

---
 app/Http/Controllers/Views/SearchController.php     | 9 ++++++---
 app/Volume.php                                      | 4 ++--
 tests/php/Jobs/GenerateFederatedSearchIndexTest.php | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Views/SearchController.php b/app/Http/Controllers/Views/SearchController.php
index a2830500d..e5b182962 100644
--- a/app/Http/Controllers/Views/SearchController.php
+++ b/app/Http/Controllers/Views/SearchController.php
@@ -75,6 +75,7 @@ protected function searchLabelTrees(User $user, $query, $type, $includeFederated
             });
 
         if ($includeFederatedSearch) {
+            /** @var \Illuminate\Database\Query\Builder $queryBuilder2 */
             $queryBuilder2 = $user->federatedSearchModels()
                 ->labelTrees()
                 ->selectRaw("id, name, description, updated_at, true as external")
@@ -87,7 +88,7 @@ protected function searchLabelTrees(User $user, $query, $type, $includeFederated
                     });
                 });
 
-            $queryBuilder = $queryBuilder->union(fn () => $queryBuilder2);
+            $queryBuilder = $queryBuilder->union($queryBuilder2);
         }
 
 
@@ -147,6 +148,7 @@ protected function searchProjects(User $user, $query, $type, $includeFederatedSe
             });
 
         if ($includeFederatedSearch) {
+            /** @var \Illuminate\Database\Query\Builder $queryBuilder2 */
             $queryBuilder2 = $user->federatedSearchModels()
                 ->projects()
                 ->selectRaw("id, name, description, updated_at, true as external")
@@ -159,7 +161,7 @@ protected function searchProjects(User $user, $query, $type, $includeFederatedSe
                     });
                 });
 
-            $queryBuilder = $queryBuilder->union(fn () => $queryBuilder2);
+            $queryBuilder = $queryBuilder->union($queryBuilder2);
         }
 
 
@@ -214,6 +216,7 @@ protected function searchVolumes(User $user, $query, $type, $includeFederatedSea
             });
 
         if ($includeFederatedSearch) {
+            /** @var \Illuminate\Database\Query\Builder $queryBuilder2 */
             $queryBuilder2 = $user->federatedSearchModels()
                 ->volumes()
                 ->selectRaw("id, name, updated_at, true as external")
@@ -225,7 +228,7 @@ protected function searchVolumes(User $user, $query, $type, $includeFederatedSea
                     });
                 });
 
-            $queryBuilder = $queryBuilder->union(fn () => $queryBuilder2);
+            $queryBuilder = $queryBuilder->union($queryBuilder2);
         }
 
 
diff --git a/app/Volume.php b/app/Volume.php
index d0fa01c45..e3907a728 100644
--- a/app/Volume.php
+++ b/app/Volume.php
@@ -337,11 +337,11 @@ public function getThumbnailsAttribute()
     /**
      * URLs to the thumbnail images of this volume.
      *
-     * @return array
+     * @return \Illuminate\Support\Collection
      */
     public function getThumbnailsUrlAttribute()
     {
-        return $this->thumbnails->map(fn ($file) => $file->thumbnailUrl)->toArray();
+        return $this->thumbnails->map(fn ($file) => $file->thumbnailUrl);
     }
 
     /**
diff --git a/tests/php/Jobs/GenerateFederatedSearchIndexTest.php b/tests/php/Jobs/GenerateFederatedSearchIndexTest.php
index 3df954463..30e3da04f 100644
--- a/tests/php/Jobs/GenerateFederatedSearchIndexTest.php
+++ b/tests/php/Jobs/GenerateFederatedSearchIndexTest.php
@@ -143,7 +143,7 @@ public function testHandleVolume()
                 'updated_at' => $volume->updated_at,
                 'url' => "/volumes/{$volume->id}",
                 'thumbnail_url' => $volume->thumbnailUrl,
-                'thumbnail_urls' => $volume->thumbnailUrls,
+                'thumbnail_urls' => $volume->thumbnailsUrl,
             ]
         ];
 

From 09997aa1836d51bfd8a17c2950ccf2feb926f136 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 30 Aug 2024 16:02:04 +0200
Subject: [PATCH 183/209] Fix PHP version in actions

---
 .github/workflows/lint.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index d3030564e..97b90c73c 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -35,7 +35,7 @@ jobs:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '8.1'
+        php-version: '8.2'
 
     - uses: actions/checkout@v1
       with:
@@ -50,7 +50,7 @@ jobs:
     - name: Set testing key
       run: echo "APP_KEY=base64:STZFA4bQKDjE2mlpRPmsJ/okG0eCh4RHd9BghtZeYmQ=" >> .env
 
-    - name: Run Psalm
+    - name: Run Linter
       run: composer lint
 
   cs-php:
@@ -61,7 +61,7 @@ jobs:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '8.1'
+        php-version: '8.2'
         tools: cs2pr
 
     - uses: actions/checkout@v1

From b06dedd61a2edc73289ee16ac5d3086ec34f95e2 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 30 Aug 2024 17:00:18 +0200
Subject: [PATCH 184/209] Remove code specific to biigle/largo

---
 app/Jobs/CloneImagesOrVideos.php           | 38 +------------
 tests/php/Jobs/CloneImagesOrVideosTest.php | 66 ----------------------
 2 files changed, 2 insertions(+), 102 deletions(-)

diff --git a/app/Jobs/CloneImagesOrVideos.php b/app/Jobs/CloneImagesOrVideos.php
index 687024cd6..e4b988943 100644
--- a/app/Jobs/CloneImagesOrVideos.php
+++ b/app/Jobs/CloneImagesOrVideos.php
@@ -8,8 +8,6 @@
 use Biigle\ImageAnnotation;
 use Biigle\ImageAnnotationLabel;
 use Biigle\ImageLabel;
-use Biigle\Modules\Largo\Jobs\ProcessAnnotatedImage;
-use Biigle\Modules\Largo\Jobs\ProcessAnnotatedVideo;
 use Biigle\Project;
 use Biigle\Traits\ChecksMetadataStrings;
 use Biigle\Video;
@@ -137,7 +135,7 @@ public function handle()
                 }
             }
             if ($copy->files()->exists()) {
-                $this->postProcessCloning($copy);
+                ProcessNewVolumeFiles::dispatch($copy);
             }
 
             //save ifdo-file if exist
@@ -148,43 +146,11 @@ public function handle()
 
             $copy->save();
 
-            event('volume.cloned', [$copy->id]);
+            event('volume.cloned', $copy);
         });
 
     }
 
-    /**
-     * Initiate file thumbnail creation
-     * @param Volume $volume for which thumbnail creation should be started
-     * @return void
-     **/
-    public function postProcessCloning($volume)
-    {
-        ProcessNewVolumeFiles::dispatch($volume);
-
-        // Give the ProcessNewVolumeFiles job a head start so the file thumbnails are
-        // generated (mostly) before the annotation thumbnails.
-        $delay = now()->addSeconds(30);
-
-        // if (class_exists(ProcessAnnotatedImage::class)) {
-        //     $volume->images()->whereHas('annotations')
-        //         ->eachById(function ($image) use ($delay) {
-        //             ProcessAnnotatedImage::dispatch($image)
-        //                 ->delay($delay)
-        //                 ->onQueue(config('largo.generate_annotation_patch_queue'));
-        //         });
-        // }
-
-        // if (class_exists(ProcessAnnotatedVideo::class)) {
-        //     $volume->videos()
-        //         ->whereHas('annotations')->eachById(function ($video) use ($delay) {
-        //             ProcessAnnotatedVideo::dispatch($video)
-        //                 ->delay($delay)
-        //                 ->onQueue(config('largo.generate_annotation_patch_queue'));
-        //         });
-        // }
-    }
-
     /**
      * Copies (selected) images from given volume to volume copy.
      *
diff --git a/tests/php/Jobs/CloneImagesOrVideosTest.php b/tests/php/Jobs/CloneImagesOrVideosTest.php
index 907b34ee3..522757e80 100644
--- a/tests/php/Jobs/CloneImagesOrVideosTest.php
+++ b/tests/php/Jobs/CloneImagesOrVideosTest.php
@@ -626,70 +626,4 @@ public function testHandleVolumeImages()
         Queue::assertPushed(ProcessNewVolumeFiles::class);
         Queue::assertNotPushed(ProcessAnnotatedImage::class);
     }
-
-    public function testHandleImageAnnotationPatches()
-    {
-        if (!class_exists(ProcessAnnotatedImage::class)) {
-            $this->markTestSkipped('Requires '.ProcessAnnotatedImage::class);
-        }
-
-        // The target project.
-        $project = ProjectTest::create();
-
-        $volume = VolumeTest::create([
-            'media_type_id' => MediaType::imageId(),
-            'created_at' => '2022-11-09 14:37:00',
-            'updated_at' => '2022-11-09 14:37:00',
-        ])->fresh();// Use fresh() to load even the null fields.
-        $copy = $volume->replicate();
-        $copy->save();
-
-        $oldImage = ImageTest::create(['volume_id' => $volume->id])->fresh();
-        $oldAnnotation = ImageAnnotationTest::create(['image_id' => $oldImage->id]);
-        ImageAnnotationLabelTest::create(['annotation_id' => $oldAnnotation->id]);
-
-        $request = new Request([
-            'project' => $project,
-            'volume' => $volume,
-            'clone_annotations' => true,
-        ]);
-        (new CloneImagesOrVideos($request, $copy))->handle();
-
-        // One job for the creation of the annotation and one job for ProcessAnnotatedImage
-        Queue::assertPushed(ProcessNewVolumeFiles::class);
-        Queue::assertPushed(ProcessAnnotatedImage::class);
-    }
-
-    public function testHandleVideoAnnotationPatches()
-    {
-        if (!class_exists(ProcessAnnotatedVideo::class)) {
-            $this->markTestSkipped('Requires '.ProcessAnnotatedVideo::class);
-        }
-
-        // The target project.
-        $project = ProjectTest::create();
-
-        $volume = VolumeTest::create([
-            'media_type_id' => MediaType::videoId(),
-            'created_at' => '2022-11-09 14:37:00',
-            'updated_at' => '2022-11-09 14:37:00',
-        ])->fresh();// Use fresh() to load even the null fields.
-        $copy = $volume->replicate();
-        $copy->save();
-
-        $oldVideo = VideoTest::create(['volume_id' => $volume->id])->fresh();
-        $oldAnnotation = VideoAnnotationTest::create(['video_id' => $oldVideo->id]);
-        VideoAnnotationLabelTest::create(['annotation_id' => $oldAnnotation->id]);
-
-        $request = new Request([
-            'project' => $project,
-            'volume' => $volume,
-            'clone_annotations' => true,
-        ]);
-        (new CloneImagesOrVideos($request, $copy))->handle();
-
-        // One job for the creation of the annotation and one job for ProcessAnnotatedVideo
-        Queue::assertPushed(ProcessNewVolumeFiles::class);
-        Queue::assertPushed(ProcessAnnotatedVideo::class);
-    }
 }

From 9befc054a82ad66e61ebdef79239693ecf3393c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Aug 2024 23:39:33 +0000
Subject: [PATCH 185/209] Bump opencv-contrib-python-headless in /.docker in
 the pip group

Bumps the pip group in /.docker with 1 update: [opencv-contrib-python-headless](https://github.com/opencv/opencv-python).


Updates `opencv-contrib-python-headless` from 4.6.0 to 4.8.1.78
- [Release notes](https://github.com/opencv/opencv-python/releases)
- [Commits](https://github.com/opencv/opencv-python/commits)

---
updated-dependencies:
- dependency-name: opencv-contrib-python-headless
  dependency-type: direct:production
  dependency-group: pip
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .docker/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.docker/requirements.txt b/.docker/requirements.txt
index f166494ff..ba4e5d835 100644
--- a/.docker/requirements.txt
+++ b/.docker/requirements.txt
@@ -1,7 +1,7 @@
 # This file is just used to get security alerts from GitHub. Make sure the versions match
 # in worker.dockerfile.
 numpy==1.24.*
-opencv-contrib-python-headless==4.6.0
+opencv-contrib-python-headless==4.8.1.78
 scipy==1.10.*
 scikit-learn==1.2.*
 matplotlib==3.6.*

From 5353a226140087df6f855603cf65bd121251365c Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Mon, 2 Sep 2024 14:47:15 +0200
Subject: [PATCH 186/209] Fix CS issue

---
 tests/php/Jobs/CloneImagesOrVideosTest.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/php/Jobs/CloneImagesOrVideosTest.php b/tests/php/Jobs/CloneImagesOrVideosTest.php
index 522757e80..a15cf3fc9 100644
--- a/tests/php/Jobs/CloneImagesOrVideosTest.php
+++ b/tests/php/Jobs/CloneImagesOrVideosTest.php
@@ -5,8 +5,6 @@
 use Biigle\Jobs\CloneImagesOrVideos;
 use Biigle\Jobs\ProcessNewVolumeFiles;
 use Biigle\MediaType;
-use Biigle\Modules\Largo\Jobs\ProcessAnnotatedImage;
-use Biigle\Modules\Largo\Jobs\ProcessAnnotatedVideo;
 use Biigle\Tests\ImageAnnotationLabelTest;
 use Biigle\Tests\ImageAnnotationTest;
 use Biigle\Tests\ImageLabelTest;
@@ -624,6 +622,5 @@ public function testHandleVolumeImages()
         (new CloneImagesOrVideos($request, $copy))->handle();
 
         Queue::assertPushed(ProcessNewVolumeFiles::class);
-        Queue::assertNotPushed(ProcessAnnotatedImage::class);
     }
 }

From 99791b74a8a668c0a788e718266bf6bcc17f3eac Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Mon, 2 Sep 2024 15:54:07 +0200
Subject: [PATCH 187/209] Fix failing test

---
 app/Video.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Video.php b/app/Video.php
index 4ae691bab..6087299db 100644
--- a/app/Video.php
+++ b/app/Video.php
@@ -214,9 +214,9 @@ public function setTakenAtAttribute(array $value)
      */
     public function getTakenAtAttribute()
     {
-        $array = json_decode($this->attributes['taken_at'] ?? null);
+        $array = json_decode($this->attributes['taken_at'] ?? '[]');
 
-        if (!is_array($array)) {
+        if (empty($array) || !is_array($array)) {
             return null;
         }
 

From 9a89156c8c4d0586fddec74e460e575623668da5 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Mon, 2 Sep 2024 16:01:14 +0200
Subject: [PATCH 188/209] Update dependencies

---
 composer.lock | 560 +++++++++++++++++++++++++-------------------------
 1 file changed, 285 insertions(+), 275 deletions(-)

diff --git a/composer.lock b/composer.lock
index 56dc1d6d6..6980983b0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -250,23 +250,23 @@
         },
         {
             "name": "dasprid/enum",
-            "version": "1.0.5",
+            "version": "1.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/DASPRiD/Enum.git",
-                "reference": "6faf451159fb8ba4126b925ed2d78acfce0dc016"
+                "reference": "8dfd07c6d2cf31c8da90c53b83c026c7696dda90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/6faf451159fb8ba4126b925ed2d78acfce0dc016",
-                "reference": "6faf451159fb8ba4126b925ed2d78acfce0dc016",
+                "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/8dfd07c6d2cf31c8da90c53b83c026c7696dda90",
+                "reference": "8dfd07c6d2cf31c8da90c53b83c026c7696dda90",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1 <9.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7 | ^8 | ^9",
+                "phpunit/phpunit": "^7 || ^8 || ^9 || ^10 || ^11",
                 "squizlabs/php_codesniffer": "*"
             },
             "type": "library",
@@ -294,9 +294,9 @@
             ],
             "support": {
                 "issues": "https://github.com/DASPRiD/Enum/issues",
-                "source": "https://github.com/DASPRiD/Enum/tree/1.0.5"
+                "source": "https://github.com/DASPRiD/Enum/tree/1.0.6"
             },
-            "time": "2023-08-25T16:18:39+00:00"
+            "time": "2024-08-09T14:30:48+00:00"
         },
         {
             "name": "dflydev/dot-access-data",
@@ -919,24 +919,24 @@
         },
         {
             "name": "graham-campbell/result-type",
-            "version": "v1.1.2",
+            "version": "v1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/GrahamCampbell/Result-Type.git",
-                "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862"
+                "reference": "3ba905c11371512af9d9bdd27d99b782216b6945"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/fbd48bce38f73f8a4ec8583362e732e4095e5862",
-                "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862",
+                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/3ba905c11371512af9d9bdd27d99b782216b6945",
+                "reference": "3ba905c11371512af9d9bdd27d99b782216b6945",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2.5 || ^8.0",
-                "phpoption/phpoption": "^1.9.2"
+                "phpoption/phpoption": "^1.9.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28"
             },
             "type": "library",
             "autoload": {
@@ -965,7 +965,7 @@
             ],
             "support": {
                 "issues": "https://github.com/GrahamCampbell/Result-Type/issues",
-                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.2"
+                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.3"
             },
             "funding": [
                 {
@@ -977,26 +977,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-12T22:16:48+00:00"
+            "time": "2024-07-20T21:45:45+00:00"
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.8.1",
+            "version": "7.9.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "41042bc7ab002487b876a0683fc8dce04ddce104"
+                "reference": "d281ed313b989f213357e3be1a179f02196ac99b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104",
-                "reference": "41042bc7ab002487b876a0683fc8dce04ddce104",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d281ed313b989f213357e3be1a179f02196ac99b",
+                "reference": "d281ed313b989f213357e3be1a179f02196ac99b",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "guzzlehttp/promises": "^1.5.3 || ^2.0.1",
-                "guzzlehttp/psr7": "^1.9.1 || ^2.5.1",
+                "guzzlehttp/promises": "^1.5.3 || ^2.0.3",
+                "guzzlehttp/psr7": "^2.7.0",
                 "php": "^7.2.5 || ^8.0",
                 "psr/http-client": "^1.0",
                 "symfony/deprecation-contracts": "^2.2 || ^3.0"
@@ -1007,9 +1007,9 @@
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
                 "ext-curl": "*",
-                "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999",
+                "guzzle/client-integration-tests": "3.0.2",
                 "php-http/message-factory": "^1.1",
-                "phpunit/phpunit": "^8.5.36 || ^9.6.15",
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20",
                 "psr/log": "^1.1 || ^2.0 || ^3.0"
             },
             "suggest": {
@@ -1087,7 +1087,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.8.1"
+                "source": "https://github.com/guzzle/guzzle/tree/7.9.2"
             },
             "funding": [
                 {
@@ -1103,20 +1103,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-03T20:35:24+00:00"
+            "time": "2024-07-24T11:22:20+00:00"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "2.0.2",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223"
+                "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223",
-                "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8",
+                "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8",
                 "shasum": ""
             },
             "require": {
@@ -1124,7 +1124,7 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "phpunit/phpunit": "^8.5.36 || ^9.6.15"
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20"
             },
             "type": "library",
             "extra": {
@@ -1170,7 +1170,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/2.0.2"
+                "source": "https://github.com/guzzle/promises/tree/2.0.3"
             },
             "funding": [
                 {
@@ -1186,20 +1186,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-03T20:19:20+00:00"
+            "time": "2024-07-18T10:29:17+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.6.2",
+            "version": "2.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221"
+                "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221",
-                "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
+                "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
                 "shasum": ""
             },
             "require": {
@@ -1214,8 +1214,8 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "http-interop/http-factory-tests": "^0.9",
-                "phpunit/phpunit": "^8.5.36 || ^9.6.15"
+                "http-interop/http-factory-tests": "0.9.0",
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20"
             },
             "suggest": {
                 "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
@@ -1286,7 +1286,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.6.2"
+                "source": "https://github.com/guzzle/psr7/tree/2.7.0"
             },
             "funding": [
                 {
@@ -1302,7 +1302,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-03T20:05:35+00:00"
+            "time": "2024-07-18T11:15:46+00:00"
         },
         {
             "name": "guzzlehttp/uri-template",
@@ -1453,16 +1453,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.15.0",
+            "version": "v11.21.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "ba85f1c019bed59b3c736c9c4502805efd0ba84b"
+                "reference": "9d9d36708d56665b12185493f684abce38ad2d30"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/ba85f1c019bed59b3c736c9c4502805efd0ba84b",
-                "reference": "ba85f1c019bed59b3c736c9c4502805efd0ba84b",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/9d9d36708d56665b12185493f684abce38ad2d30",
+                "reference": "9d9d36708d56665b12185493f684abce38ad2d30",
                 "shasum": ""
             },
             "require": {
@@ -1655,20 +1655,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-07-09T15:38:12+00:00"
+            "time": "2024-08-20T15:00:52+00:00"
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.1.24",
+            "version": "v0.1.25",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "409b0b4305273472f3754826e68f4edbd0150149"
+                "reference": "7b4029a84c37cb2725fc7f011586e2997040bc95"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/409b0b4305273472f3754826e68f4edbd0150149",
-                "reference": "409b0b4305273472f3754826e68f4edbd0150149",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/7b4029a84c37cb2725fc7f011586e2997040bc95",
+                "reference": "7b4029a84c37cb2725fc7f011586e2997040bc95",
                 "shasum": ""
             },
             "require": {
@@ -1711,32 +1711,33 @@
             "description": "Add beautiful and user-friendly forms to your command-line applications.",
             "support": {
                 "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.1.24"
+                "source": "https://github.com/laravel/prompts/tree/v0.1.25"
             },
-            "time": "2024-06-17T13:58:22+00:00"
+            "time": "2024-08-12T22:06:33+00:00"
         },
         {
             "name": "laravel/serializable-closure",
-            "version": "v1.3.3",
+            "version": "v1.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/serializable-closure.git",
-                "reference": "3dbf8a8e914634c48d389c1234552666b3d43754"
+                "reference": "61b87392d986dc49ad5ef64e75b1ff5fee24ef81"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/3dbf8a8e914634c48d389c1234552666b3d43754",
-                "reference": "3dbf8a8e914634c48d389c1234552666b3d43754",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/61b87392d986dc49ad5ef64e75b1ff5fee24ef81",
+                "reference": "61b87392d986dc49ad5ef64e75b1ff5fee24ef81",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.3|^8.0"
             },
             "require-dev": {
-                "nesbot/carbon": "^2.61",
+                "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
+                "nesbot/carbon": "^2.61|^3.0",
                 "pestphp/pest": "^1.21.3",
                 "phpstan/phpstan": "^1.8.2",
-                "symfony/var-dumper": "^5.4.11"
+                "symfony/var-dumper": "^5.4.11|^6.2.0|^7.0.0"
             },
             "type": "library",
             "extra": {
@@ -1773,7 +1774,7 @@
                 "issues": "https://github.com/laravel/serializable-closure/issues",
                 "source": "https://github.com/laravel/serializable-closure"
             },
-            "time": "2023-11-08T14:08:06+00:00"
+            "time": "2024-08-02T07:48:17+00:00"
         },
         {
             "name": "laravel/tinker",
@@ -1906,16 +1907,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.4.2",
+            "version": "2.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "91c24291965bd6d7c46c46a12ba7492f83b1cadf"
+                "reference": "b650144166dfa7703e62a22e493b853b58d874b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/91c24291965bd6d7c46c46a12ba7492f83b1cadf",
-                "reference": "91c24291965bd6d7c46c46a12ba7492f83b1cadf",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/b650144166dfa7703e62a22e493b853b58d874b0",
+                "reference": "b650144166dfa7703e62a22e493b853b58d874b0",
                 "shasum": ""
             },
             "require": {
@@ -1928,8 +1929,8 @@
             },
             "require-dev": {
                 "cebe/markdown": "^1.0",
-                "commonmark/cmark": "0.30.3",
-                "commonmark/commonmark.js": "0.30.0",
+                "commonmark/cmark": "0.31.1",
+                "commonmark/commonmark.js": "0.31.1",
                 "composer/package-versions-deprecated": "^1.8",
                 "embed/embed": "^4.4",
                 "erusev/parsedown": "^1.0",
@@ -1951,7 +1952,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.5-dev"
+                    "dev-main": "2.6-dev"
                 }
             },
             "autoload": {
@@ -2008,7 +2009,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-02T11:59:32+00:00"
+            "time": "2024-08-16T11:46:16+00:00"
         },
         {
             "name": "league/config",
@@ -2446,16 +2447,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "3.6.0",
+            "version": "3.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "39c8ef752db6865717cc3fba63970c16f057982c"
+                "reference": "bbd3eef89af8ba66a3aa7952b5439168fbcc529f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/39c8ef752db6865717cc3fba63970c16f057982c",
-                "reference": "39c8ef752db6865717cc3fba63970c16f057982c",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/bbd3eef89af8ba66a3aa7952b5439168fbcc529f",
+                "reference": "bbd3eef89af8ba66a3aa7952b5439168fbcc529f",
                 "shasum": ""
             },
             "require": {
@@ -2548,7 +2549,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-20T15:52:59+00:00"
+            "time": "2024-08-19T06:22:39+00:00"
         },
         {
             "name": "nette/schema",
@@ -2614,20 +2615,20 @@
         },
         {
             "name": "nette/utils",
-            "version": "v4.0.4",
+            "version": "v4.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/utils.git",
-                "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218"
+                "reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/utils/zipball/d3ad0aa3b9f934602cb3e3902ebccf10be34d218",
-                "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218",
+                "url": "https://api.github.com/repos/nette/utils/zipball/736c567e257dbe0fcf6ce81b4d6dbe05c6899f96",
+                "reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0 <8.4"
+                "php": "8.0 - 8.4"
             },
             "conflict": {
                 "nette/finder": "<3",
@@ -2694,31 +2695,33 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/utils/issues",
-                "source": "https://github.com/nette/utils/tree/v4.0.4"
+                "source": "https://github.com/nette/utils/tree/v4.0.5"
             },
-            "time": "2024-01-17T16:50:36+00:00"
+            "time": "2024-08-07T15:39:19+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.19.1",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b"
+                "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4e1b88d21c69391150ace211e9eaf05810858d0b",
-                "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/683130c2ff8c2739f4822ff7ac5c873ec529abd1",
+                "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1",
                 "shasum": ""
             },
             "require": {
+                "ext-ctype": "*",
+                "ext-json": "*",
                 "ext-tokenizer": "*",
-                "php": ">=7.1"
+                "php": ">=7.4"
             },
             "require-dev": {
                 "ircmaxell/php-yacc": "^0.0.7",
-                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+                "phpunit/phpunit": "^9.0"
             },
             "bin": [
                 "bin/php-parse"
@@ -2726,7 +2729,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.9-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -2750,9 +2753,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.1"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.1.0"
             },
-            "time": "2024-03-17T08:10:35+00:00"
+            "time": "2024-07-01T20:03:41+00:00"
         },
         {
             "name": "nunomaduro/termwind",
@@ -3121,16 +3124,16 @@
         },
         {
             "name": "phpoption/phpoption",
-            "version": "1.9.2",
+            "version": "1.9.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/php-option.git",
-                "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820"
+                "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/80735db690fe4fc5c76dfa7f9b770634285fa820",
-                "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820",
+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/e3fac8b24f56113f7cb96af14958c0dd16330f54",
+                "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54",
                 "shasum": ""
             },
             "require": {
@@ -3138,13 +3141,13 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28"
             },
             "type": "library",
             "extra": {
                 "bamarni-bin": {
                     "bin-links": true,
-                    "forward-command": true
+                    "forward-command": false
                 },
                 "branch-alias": {
                     "dev-master": "1.9-dev"
@@ -3180,7 +3183,7 @@
             ],
             "support": {
                 "issues": "https://github.com/schmittjoh/php-option/issues",
-                "source": "https://github.com/schmittjoh/php-option/tree/1.9.2"
+                "source": "https://github.com/schmittjoh/php-option/tree/1.9.3"
             },
             "funding": [
                 {
@@ -3192,7 +3195,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-12T21:59:55+00:00"
+            "time": "2024-07-20T21:41:07+00:00"
         },
         {
             "name": "psr/cache",
@@ -3556,16 +3559,16 @@
         },
         {
             "name": "psr/log",
-            "version": "3.0.0",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001"
+                "reference": "79dff0b268932c640297f5208d6298f71855c03e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001",
-                "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/79dff0b268932c640297f5208d6298f71855c03e",
+                "reference": "79dff0b268932c640297f5208d6298f71855c03e",
                 "shasum": ""
             },
             "require": {
@@ -3600,9 +3603,9 @@
                 "psr-3"
             ],
             "support": {
-                "source": "https://github.com/php-fig/log/tree/3.0.0"
+                "source": "https://github.com/php-fig/log/tree/3.0.1"
             },
-            "time": "2021-07-14T16:46:02+00:00"
+            "time": "2024-08-21T13:31:24+00:00"
         },
         {
             "name": "psr/simple-cache",
@@ -4083,16 +4086,16 @@
         },
         {
             "name": "symfony/cache",
-            "version": "v7.1.2",
+            "version": "v7.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache.git",
-                "reference": "e933e1d947ffb88efcdd34a2bd51561cab7deaae"
+                "reference": "b61e464d7687bb7e8f677d5031c632bf3820df18"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/e933e1d947ffb88efcdd34a2bd51561cab7deaae",
-                "reference": "e933e1d947ffb88efcdd34a2bd51561cab7deaae",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/b61e464d7687bb7e8f677d5031c632bf3820df18",
+                "reference": "b61e464d7687bb7e8f677d5031c632bf3820df18",
                 "shasum": ""
             },
             "require": {
@@ -4160,7 +4163,7 @@
                 "psr6"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache/tree/v7.1.2"
+                "source": "https://github.com/symfony/cache/tree/v7.1.4"
             },
             "funding": [
                 {
@@ -4176,7 +4179,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-11T13:32:38+00:00"
+            "time": "2024-08-12T09:59:40+00:00"
         },
         {
             "name": "symfony/cache-contracts",
@@ -4330,16 +4333,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.1.2",
+            "version": "v7.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "0aa29ca177f432ab68533432db0de059f39c92ae"
+                "reference": "1eed7af6961d763e7832e874d7f9b21c3ea9c111"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/0aa29ca177f432ab68533432db0de059f39c92ae",
-                "reference": "0aa29ca177f432ab68533432db0de059f39c92ae",
+                "url": "https://api.github.com/repos/symfony/console/zipball/1eed7af6961d763e7832e874d7f9b21c3ea9c111",
+                "reference": "1eed7af6961d763e7832e874d7f9b21c3ea9c111",
                 "shasum": ""
             },
             "require": {
@@ -4403,7 +4406,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.1.2"
+                "source": "https://github.com/symfony/console/tree/v7.1.4"
             },
             "funding": [
                 {
@@ -4419,7 +4422,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-28T10:03:55+00:00"
+            "time": "2024-08-15T22:48:53+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -4555,16 +4558,16 @@
         },
         {
             "name": "symfony/error-handler",
-            "version": "v7.1.2",
+            "version": "v7.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "2412d3dddb5c9ea51a39cfbff1c565fc9844ca32"
+                "reference": "432bb369952795c61ca1def65e078c4a80dad13c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/2412d3dddb5c9ea51a39cfbff1c565fc9844ca32",
-                "reference": "2412d3dddb5c9ea51a39cfbff1c565fc9844ca32",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/432bb369952795c61ca1def65e078c4a80dad13c",
+                "reference": "432bb369952795c61ca1def65e078c4a80dad13c",
                 "shasum": ""
             },
             "require": {
@@ -4610,7 +4613,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v7.1.2"
+                "source": "https://github.com/symfony/error-handler/tree/v7.1.3"
             },
             "funding": [
                 {
@@ -4626,7 +4629,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-25T19:55:06+00:00"
+            "time": "2024-07-26T13:02:51+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -4786,16 +4789,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v7.1.1",
+            "version": "v7.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "fbb0ba67688b780efbc886c1a0a0948dcf7205d6"
+                "reference": "d95bbf319f7d052082fb7af147e0f835a695e823"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/fbb0ba67688b780efbc886c1a0a0948dcf7205d6",
-                "reference": "fbb0ba67688b780efbc886c1a0a0948dcf7205d6",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/d95bbf319f7d052082fb7af147e0f835a695e823",
+                "reference": "d95bbf319f7d052082fb7af147e0f835a695e823",
                 "shasum": ""
             },
             "require": {
@@ -4830,7 +4833,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v7.1.1"
+                "source": "https://github.com/symfony/finder/tree/v7.1.4"
             },
             "funding": [
                 {
@@ -4846,20 +4849,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-08-13T14:28:19+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v7.1.1",
+            "version": "v7.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "74d171d5b6a1d9e4bfee09a41937c17a7536acfa"
+                "reference": "f602d5c17d1fa02f8019ace2687d9d136b7f4a1a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/74d171d5b6a1d9e4bfee09a41937c17a7536acfa",
-                "reference": "74d171d5b6a1d9e4bfee09a41937c17a7536acfa",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f602d5c17d1fa02f8019ace2687d9d136b7f4a1a",
+                "reference": "f602d5c17d1fa02f8019ace2687d9d136b7f4a1a",
                 "shasum": ""
             },
             "require": {
@@ -4907,7 +4910,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v7.1.1"
+                "source": "https://github.com/symfony/http-foundation/tree/v7.1.3"
             },
             "funding": [
                 {
@@ -4923,20 +4926,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-07-26T12:41:01+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v7.1.2",
+            "version": "v7.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "ae3fa717db4d41a55d14c2bd92399e37cf5bc0f6"
+                "reference": "6efcbd1b3f444f631c386504fc83eeca25963747"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/ae3fa717db4d41a55d14c2bd92399e37cf5bc0f6",
-                "reference": "ae3fa717db4d41a55d14c2bd92399e37cf5bc0f6",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6efcbd1b3f444f631c386504fc83eeca25963747",
+                "reference": "6efcbd1b3f444f631c386504fc83eeca25963747",
                 "shasum": ""
             },
             "require": {
@@ -5021,7 +5024,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v7.1.2"
+                "source": "https://github.com/symfony/http-kernel/tree/v7.1.4"
             },
             "funding": [
                 {
@@ -5037,7 +5040,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-28T13:13:31+00:00"
+            "time": "2024-08-30T17:02:28+00:00"
         },
         {
             "name": "symfony/mailer",
@@ -5121,16 +5124,16 @@
         },
         {
             "name": "symfony/mime",
-            "version": "v7.1.2",
+            "version": "v7.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "26a00b85477e69a4bab63b66c5dce64f18b0cbfc"
+                "reference": "ccaa6c2503db867f472a587291e764d6a1e58758"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/26a00b85477e69a4bab63b66c5dce64f18b0cbfc",
-                "reference": "26a00b85477e69a4bab63b66c5dce64f18b0cbfc",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/ccaa6c2503db867f472a587291e764d6a1e58758",
+                "reference": "ccaa6c2503db867f472a587291e764d6a1e58758",
                 "shasum": ""
             },
             "require": {
@@ -5185,7 +5188,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v7.1.2"
+                "source": "https://github.com/symfony/mime/tree/v7.1.4"
             },
             "funding": [
                 {
@@ -5201,7 +5204,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-28T10:03:55+00:00"
+            "time": "2024-08-13T14:28:19+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -5915,16 +5918,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v7.1.1",
+            "version": "v7.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "febf90124323a093c7ee06fdb30e765ca3c20028"
+                "reference": "7f2f542c668ad6c313dc4a5e9c3321f733197eca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/febf90124323a093c7ee06fdb30e765ca3c20028",
-                "reference": "febf90124323a093c7ee06fdb30e765ca3c20028",
+                "url": "https://api.github.com/repos/symfony/process/zipball/7f2f542c668ad6c313dc4a5e9c3321f733197eca",
+                "reference": "7f2f542c668ad6c313dc4a5e9c3321f733197eca",
                 "shasum": ""
             },
             "require": {
@@ -5956,7 +5959,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v7.1.1"
+                "source": "https://github.com/symfony/process/tree/v7.1.3"
             },
             "funding": [
                 {
@@ -5972,20 +5975,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-07-26T12:44:47+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v7.1.1",
+            "version": "v7.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "60c31bab5c45af7f13091b87deb708830f3c96c0"
+                "reference": "1500aee0094a3ce1c92626ed8cf3c2037e86f5a7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/60c31bab5c45af7f13091b87deb708830f3c96c0",
-                "reference": "60c31bab5c45af7f13091b87deb708830f3c96c0",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/1500aee0094a3ce1c92626ed8cf3c2037e86f5a7",
+                "reference": "1500aee0094a3ce1c92626ed8cf3c2037e86f5a7",
                 "shasum": ""
             },
             "require": {
@@ -6037,7 +6040,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v7.1.1"
+                "source": "https://github.com/symfony/routing/tree/v7.1.4"
             },
             "funding": [
                 {
@@ -6053,7 +6056,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-08-29T08:16:25+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -6140,16 +6143,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v7.1.2",
+            "version": "v7.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "14221089ac66cf82e3cf3d1c1da65de305587ff8"
+                "reference": "6cd670a6d968eaeb1c77c2e76091c45c56bc367b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/14221089ac66cf82e3cf3d1c1da65de305587ff8",
-                "reference": "14221089ac66cf82e3cf3d1c1da65de305587ff8",
+                "url": "https://api.github.com/repos/symfony/string/zipball/6cd670a6d968eaeb1c77c2e76091c45c56bc367b",
+                "reference": "6cd670a6d968eaeb1c77c2e76091c45c56bc367b",
                 "shasum": ""
             },
             "require": {
@@ -6207,7 +6210,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.1.2"
+                "source": "https://github.com/symfony/string/tree/v7.1.4"
             },
             "funding": [
                 {
@@ -6223,20 +6226,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-28T09:27:18+00:00"
+            "time": "2024-08-12T09:59:40+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v7.1.1",
+            "version": "v7.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "cf5ae136e124fc7681b34ce9fac9d5b9ae8ceee3"
+                "reference": "8d5e50c813ba2859a6dfc99a0765c550507934a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/cf5ae136e124fc7681b34ce9fac9d5b9ae8ceee3",
-                "reference": "cf5ae136e124fc7681b34ce9fac9d5b9ae8ceee3",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/8d5e50c813ba2859a6dfc99a0765c550507934a1",
+                "reference": "8d5e50c813ba2859a6dfc99a0765c550507934a1",
                 "shasum": ""
             },
             "require": {
@@ -6301,7 +6304,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v7.1.1"
+                "source": "https://github.com/symfony/translation/tree/v7.1.3"
             },
             "funding": [
                 {
@@ -6317,7 +6320,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-07-26T12:41:01+00:00"
         },
         {
             "name": "symfony/translation-contracts",
@@ -6399,16 +6402,16 @@
         },
         {
             "name": "symfony/uid",
-            "version": "v7.1.1",
+            "version": "v7.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/uid.git",
-                "reference": "bb59febeecc81528ff672fad5dab7f06db8c8277"
+                "reference": "82177535395109075cdb45a70533aa3d7a521cdf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/bb59febeecc81528ff672fad5dab7f06db8c8277",
-                "reference": "bb59febeecc81528ff672fad5dab7f06db8c8277",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/82177535395109075cdb45a70533aa3d7a521cdf",
+                "reference": "82177535395109075cdb45a70533aa3d7a521cdf",
                 "shasum": ""
             },
             "require": {
@@ -6453,7 +6456,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/uid/tree/v7.1.1"
+                "source": "https://github.com/symfony/uid/tree/v7.1.4"
             },
             "funding": [
                 {
@@ -6469,20 +6472,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-08-12T09:59:40+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v7.1.2",
+            "version": "v7.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "5857c57c6b4b86524c08cf4f4bc95327270a816d"
+                "reference": "a5fa7481b199090964d6fd5dab6294d5a870c7aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/5857c57c6b4b86524c08cf4f4bc95327270a816d",
-                "reference": "5857c57c6b4b86524c08cf4f4bc95327270a816d",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/a5fa7481b199090964d6fd5dab6294d5a870c7aa",
+                "reference": "a5fa7481b199090964d6fd5dab6294d5a870c7aa",
                 "shasum": ""
             },
             "require": {
@@ -6536,7 +6539,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v7.1.2"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.1.4"
             },
             "funding": [
                 {
@@ -6552,7 +6555,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-28T08:00:31+00:00"
+            "time": "2024-08-30T16:12:47+00:00"
         },
         {
             "name": "symfony/var-exporter",
@@ -6685,23 +6688,23 @@
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v5.6.0",
+            "version": "v5.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4"
+                "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4",
-                "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/a59a13791077fe3d44f90e7133eb68e7d22eaff2",
+                "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2",
                 "shasum": ""
             },
             "require": {
                 "ext-pcre": "*",
-                "graham-campbell/result-type": "^1.1.2",
+                "graham-campbell/result-type": "^1.1.3",
                 "php": "^7.2.5 || ^8.0",
-                "phpoption/phpoption": "^1.9.2",
+                "phpoption/phpoption": "^1.9.3",
                 "symfony/polyfill-ctype": "^1.24",
                 "symfony/polyfill-mbstring": "^1.24",
                 "symfony/polyfill-php80": "^1.24"
@@ -6718,7 +6721,7 @@
             "extra": {
                 "bamarni-bin": {
                     "bin-links": true,
-                    "forward-command": true
+                    "forward-command": false
                 },
                 "branch-alias": {
                     "dev-master": "5.6-dev"
@@ -6753,7 +6756,7 @@
             ],
             "support": {
                 "issues": "https://github.com/vlucas/phpdotenv/issues",
-                "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.0"
+                "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.1"
             },
             "funding": [
                 {
@@ -6765,7 +6768,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-12T22:43:29+00:00"
+            "time": "2024-07-20T21:52:34+00:00"
         },
         {
             "name": "voku/portable-ascii",
@@ -6967,30 +6970,38 @@
         },
         {
             "name": "composer/pcre",
-            "version": "3.1.4",
+            "version": "3.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/pcre.git",
-                "reference": "04229f163664973f68f38f6f73d917799168ef24"
+                "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/04229f163664973f68f38f6f73d917799168ef24",
-                "reference": "04229f163664973f68f38f6f73d917799168ef24",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/63aaeac21d7e775ff9bc9d45021e1745c97521c4",
+                "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.4 || ^8.0"
             },
+            "conflict": {
+                "phpstan/phpstan": "<1.11.10"
+            },
             "require-dev": {
-                "phpstan/phpstan": "^1.3",
+                "phpstan/phpstan": "^1.11.10",
                 "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^5"
+                "phpunit/phpunit": "^8 || ^9"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
                     "dev-main": "3.x-dev"
+                },
+                "phpstan": {
+                    "includes": [
+                        "extension.neon"
+                    ]
                 }
             },
             "autoload": {
@@ -7018,7 +7029,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/3.1.4"
+                "source": "https://github.com/composer/pcre/tree/3.3.1"
             },
             "funding": [
                 {
@@ -7034,7 +7045,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-27T13:40:54+00:00"
+            "time": "2024-08-27T18:44:43+00:00"
         },
         {
             "name": "composer/semver",
@@ -7248,16 +7259,16 @@
         },
         {
             "name": "fidry/cpu-core-counter",
-            "version": "1.1.0",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theofidry/cpu-core-counter.git",
-                "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42"
+                "reference": "8520451a140d3f46ac33042715115e290cf5785f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/f92996c4d5c1a696a6a970e20f7c4216200fcc42",
-                "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42",
+                "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/8520451a140d3f46ac33042715115e290cf5785f",
+                "reference": "8520451a140d3f46ac33042715115e290cf5785f",
                 "shasum": ""
             },
             "require": {
@@ -7297,7 +7308,7 @@
             ],
             "support": {
                 "issues": "https://github.com/theofidry/cpu-core-counter/issues",
-                "source": "https://github.com/theofidry/cpu-core-counter/tree/1.1.0"
+                "source": "https://github.com/theofidry/cpu-core-counter/tree/1.2.0"
             },
             "funding": [
                 {
@@ -7305,7 +7316,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-02-07T09:43:46+00:00"
+            "time": "2024-08-06T10:04:20+00:00"
         },
         {
             "name": "filp/whoops",
@@ -7380,16 +7391,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.59.3",
+            "version": "v3.64.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "30ba9ecc2b0e5205e578fe29973c15653d9bfd29"
+                "reference": "58dd9c931c785a79739310aef5178928305ffa67"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/30ba9ecc2b0e5205e578fe29973c15653d9bfd29",
-                "reference": "30ba9ecc2b0e5205e578fe29973c15653d9bfd29",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/58dd9c931c785a79739310aef5178928305ffa67",
+                "reference": "58dd9c931c785a79739310aef5178928305ffa67",
                 "shasum": ""
             },
             "require": {
@@ -7471,7 +7482,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.59.3"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.64.0"
             },
             "funding": [
                 {
@@ -7479,7 +7490,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-06-16T14:17:03+00:00"
+            "time": "2024-08-30T23:09:38+00:00"
         },
         {
             "name": "hamcrest/hamcrest-php",
@@ -7779,38 +7790,38 @@
         },
         {
             "name": "nunomaduro/collision",
-            "version": "v8.1.1",
+            "version": "v8.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/collision.git",
-                "reference": "13e5d538b95a744d85f447a321ce10adb28e9af9"
+                "reference": "e7d1aa8ed753f63fa816932bbc89678238843b4a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/13e5d538b95a744d85f447a321ce10adb28e9af9",
-                "reference": "13e5d538b95a744d85f447a321ce10adb28e9af9",
+                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/e7d1aa8ed753f63fa816932bbc89678238843b4a",
+                "reference": "e7d1aa8ed753f63fa816932bbc89678238843b4a",
                 "shasum": ""
             },
             "require": {
                 "filp/whoops": "^2.15.4",
                 "nunomaduro/termwind": "^2.0.1",
                 "php": "^8.2.0",
-                "symfony/console": "^7.0.4"
+                "symfony/console": "^7.1.3"
             },
             "conflict": {
                 "laravel/framework": "<11.0.0 || >=12.0.0",
                 "phpunit/phpunit": "<10.5.1 || >=12.0.0"
             },
             "require-dev": {
-                "larastan/larastan": "^2.9.2",
-                "laravel/framework": "^11.0.0",
-                "laravel/pint": "^1.14.0",
-                "laravel/sail": "^1.28.2",
-                "laravel/sanctum": "^4.0.0",
+                "larastan/larastan": "^2.9.8",
+                "laravel/framework": "^11.19.0",
+                "laravel/pint": "^1.17.1",
+                "laravel/sail": "^1.31.0",
+                "laravel/sanctum": "^4.0.2",
                 "laravel/tinker": "^2.9.0",
-                "orchestra/testbench-core": "^9.0.0",
-                "pestphp/pest": "^2.34.1 || ^3.0.0",
-                "sebastian/environment": "^6.0.1 || ^7.0.0"
+                "orchestra/testbench-core": "^9.2.3",
+                "pestphp/pest": "^2.35.0 || ^3.0.0",
+                "sebastian/environment": "^6.1.0 || ^7.0.0"
             },
             "type": "library",
             "extra": {
@@ -7872,7 +7883,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-03-06T16:20:09+00:00"
+            "time": "2024-08-03T15:32:23+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -7994,16 +8005,16 @@
         },
         {
             "name": "phpmyadmin/sql-parser",
-            "version": "5.9.0",
+            "version": "5.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmyadmin/sql-parser.git",
-                "reference": "011fa18a4e55591fac6545a821921dd1d61c6984"
+                "reference": "91d980ab76c3f152481e367f62b921adc38af451"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/011fa18a4e55591fac6545a821921dd1d61c6984",
-                "reference": "011fa18a4e55591fac6545a821921dd1d61c6984",
+                "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/91d980ab76c3f152481e367f62b921adc38af451",
+                "reference": "91d980ab76c3f152481e367f62b921adc38af451",
                 "shasum": ""
             },
             "require": {
@@ -8021,8 +8032,7 @@
                 "phpstan/extension-installer": "^1.1",
                 "phpstan/phpstan": "^1.9.12",
                 "phpstan/phpstan-phpunit": "^1.3.3",
-                "phpunit/php-code-coverage": "*",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "phpunit/phpunit": "^8.5 || ^9.6",
                 "psalm/plugin-phpunit": "^0.16.1",
                 "vimeo/psalm": "^4.11",
                 "zumba/json-serializer": "~3.0.2"
@@ -8078,20 +8088,20 @@
                     "type": "other"
                 }
             ],
-            "time": "2024-01-20T20:34:02+00:00"
+            "time": "2024-08-29T20:56:34+00:00"
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.11.8",
+            "version": "1.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "6adbd118e6c0515dd2f36b06cde1d6da40f1b8ec"
+                "reference": "384af967d35b2162f69526c7276acadce534d0e1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/6adbd118e6c0515dd2f36b06cde1d6da40f1b8ec",
-                "reference": "6adbd118e6c0515dd2f36b06cde1d6da40f1b8ec",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/384af967d35b2162f69526c7276acadce534d0e1",
+                "reference": "384af967d35b2162f69526c7276acadce534d0e1",
                 "shasum": ""
             },
             "require": {
@@ -8136,36 +8146,36 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-07-24T07:01:22+00:00"
+            "time": "2024-08-27T09:18:05+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "10.1.15",
+            "version": "10.1.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "5da8b1728acd1e6ffdf2ff32ffbdfd04307f26ae"
+                "reference": "7e308268858ed6baedc8704a304727d20bc07c77"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/5da8b1728acd1e6ffdf2ff32ffbdfd04307f26ae",
-                "reference": "5da8b1728acd1e6ffdf2ff32ffbdfd04307f26ae",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7e308268858ed6baedc8704a304727d20bc07c77",
+                "reference": "7e308268858ed6baedc8704a304727d20bc07c77",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.18 || ^5.0",
+                "nikic/php-parser": "^4.19.1 || ^5.1.0",
                 "php": ">=8.1",
-                "phpunit/php-file-iterator": "^4.0",
-                "phpunit/php-text-template": "^3.0",
-                "sebastian/code-unit-reverse-lookup": "^3.0",
-                "sebastian/complexity": "^3.0",
-                "sebastian/environment": "^6.0",
-                "sebastian/lines-of-code": "^2.0",
-                "sebastian/version": "^4.0",
-                "theseer/tokenizer": "^1.2.0"
+                "phpunit/php-file-iterator": "^4.1.0",
+                "phpunit/php-text-template": "^3.0.1",
+                "sebastian/code-unit-reverse-lookup": "^3.0.0",
+                "sebastian/complexity": "^3.2.0",
+                "sebastian/environment": "^6.1.0",
+                "sebastian/lines-of-code": "^2.0.2",
+                "sebastian/version": "^4.0.1",
+                "theseer/tokenizer": "^1.2.3"
             },
             "require-dev": {
                 "phpunit/phpunit": "^10.1"
@@ -8177,7 +8187,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "10.1-dev"
+                    "dev-main": "10.1.x-dev"
                 }
             },
             "autoload": {
@@ -8206,7 +8216,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.15"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.16"
             },
             "funding": [
                 {
@@ -8214,7 +8224,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-06-29T08:25:15+00:00"
+            "time": "2024-08-22T04:31:57+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -8461,16 +8471,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.5.27",
+            "version": "10.5.30",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "2425f713b2a5350568ccb1a2d3984841a23e83c5"
+                "reference": "b15524febac0153876b4ba9aab3326c2ee94c897"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2425f713b2a5350568ccb1a2d3984841a23e83c5",
-                "reference": "2425f713b2a5350568ccb1a2d3984841a23e83c5",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b15524febac0153876b4ba9aab3326c2ee94c897",
+                "reference": "b15524febac0153876b4ba9aab3326c2ee94c897",
                 "shasum": ""
             },
             "require": {
@@ -8491,7 +8501,7 @@
                 "phpunit/php-timer": "^6.0.0",
                 "sebastian/cli-parser": "^2.0.1",
                 "sebastian/code-unit": "^2.0.0",
-                "sebastian/comparator": "^5.0.1",
+                "sebastian/comparator": "^5.0.2",
                 "sebastian/diff": "^5.1.1",
                 "sebastian/environment": "^6.1.0",
                 "sebastian/exporter": "^5.1.2",
@@ -8542,7 +8552,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.27"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.30"
             },
             "funding": [
                 {
@@ -8558,7 +8568,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-10T11:48:06+00:00"
+            "time": "2024-08-13T06:09:37+00:00"
         },
         {
             "name": "react/cache",
@@ -8934,31 +8944,31 @@
         },
         {
             "name": "react/socket",
-            "version": "v1.15.0",
+            "version": "v1.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/reactphp/socket.git",
-                "reference": "216d3aec0b87f04a40ca04f481e6af01bdd1d038"
+                "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/socket/zipball/216d3aec0b87f04a40ca04f481e6af01bdd1d038",
-                "reference": "216d3aec0b87f04a40ca04f481e6af01bdd1d038",
+                "url": "https://api.github.com/repos/reactphp/socket/zipball/23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1",
+                "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1",
                 "shasum": ""
             },
             "require": {
                 "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
                 "php": ">=5.3.0",
-                "react/dns": "^1.11",
+                "react/dns": "^1.13",
                 "react/event-loop": "^1.2",
-                "react/promise": "^3 || ^2.6 || ^1.2.1",
-                "react/stream": "^1.2"
+                "react/promise": "^3.2 || ^2.6 || ^1.2.1",
+                "react/stream": "^1.4"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
-                "react/async": "^4 || ^3 || ^2",
+                "react/async": "^4.3 || ^3.3 || ^2",
                 "react/promise-stream": "^1.4",
-                "react/promise-timer": "^1.10"
+                "react/promise-timer": "^1.11"
             },
             "type": "library",
             "autoload": {
@@ -9002,7 +9012,7 @@
             ],
             "support": {
                 "issues": "https://github.com/reactphp/socket/issues",
-                "source": "https://github.com/reactphp/socket/tree/v1.15.0"
+                "source": "https://github.com/reactphp/socket/tree/v1.16.0"
             },
             "funding": [
                 {
@@ -9010,7 +9020,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2023-12-15T11:02:10+00:00"
+            "time": "2024-07-26T10:38:09+00:00"
         },
         {
             "name": "react/stream",
@@ -9260,16 +9270,16 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "5.0.1",
+            "version": "5.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "2db5010a484d53ebf536087a70b4a5423c102372"
+                "reference": "2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2db5010a484d53ebf536087a70b4a5423c102372",
-                "reference": "2db5010a484d53ebf536087a70b4a5423c102372",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53",
+                "reference": "2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53",
                 "shasum": ""
             },
             "require": {
@@ -9280,7 +9290,7 @@
                 "sebastian/exporter": "^5.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.3"
+                "phpunit/phpunit": "^10.4"
             },
             "type": "library",
             "extra": {
@@ -9325,7 +9335,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
                 "security": "https://github.com/sebastianbergmann/comparator/security/policy",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.1"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.2"
             },
             "funding": [
                 {
@@ -9333,7 +9343,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-14T13:18:12+00:00"
+            "time": "2024-08-12T06:03:08+00:00"
         },
         {
             "name": "sebastian/complexity",

From 949d8fc6aec3f5b275f00735674a63b071200a22 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Tue, 3 Sep 2024 09:09:42 +0200
Subject: [PATCH 189/209] Work on type errors

---
 app/Services/MetadataParsing/Annotation.php      | 10 +++++++++-
 app/Services/MetadataParsing/VideoAnnotation.php |  1 +
 app/Services/MetadataParsing/VideoCsvParser.php  |  4 +++-
 app/Traits/HasMetadataFile.php                   |  4 ++--
 app/Volume.php                                   |  2 +-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/Services/MetadataParsing/Annotation.php b/app/Services/MetadataParsing/Annotation.php
index fabde1f87..45d973e66 100644
--- a/app/Services/MetadataParsing/Annotation.php
+++ b/app/Services/MetadataParsing/Annotation.php
@@ -17,7 +17,7 @@ class Annotation
 
     /**
      * @param Shape $shape
-     * @param array<float> $points
+     * @param array<float>|array<array<float>> $points
      * @param array<LabelAndUser> $labels
      */
     public function __construct(
@@ -54,4 +54,12 @@ public function validate(): void
 
         $this->validatePoints($this->points);
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setPointsAttribute(array $points)
+    {
+        $this->points = array_map(fn ($coordinate) => round($coordinate, 2), $points);
+    }
 }
diff --git a/app/Services/MetadataParsing/VideoAnnotation.php b/app/Services/MetadataParsing/VideoAnnotation.php
index 4c9fbb781..cd3af3d99 100644
--- a/app/Services/MetadataParsing/VideoAnnotation.php
+++ b/app/Services/MetadataParsing/VideoAnnotation.php
@@ -41,6 +41,7 @@ public function validate(): void
         parent::validate();
 
         foreach ($this->frames as $frame) {
+            /** @phpstan-ignore booleanAnd.alwaysFalse */
             if (!is_float($frame) && !is_int($frame)) {
                 throw new Exception("Video annotation frames must be numbers, got '{$frame}'.");
             }
diff --git a/app/Services/MetadataParsing/VideoCsvParser.php b/app/Services/MetadataParsing/VideoCsvParser.php
index 9a66cc517..23b83c89d 100644
--- a/app/Services/MetadataParsing/VideoCsvParser.php
+++ b/app/Services/MetadataParsing/VideoCsvParser.php
@@ -41,7 +41,9 @@ public function getMetadata(): VolumeMetadata
 
             // If the file already exists but takenAt is null, replace the file by newly
             // adding it.
-            if (!is_null($fileData = $data->getFile($name)) && !is_null($takenAt)) {
+            /** @var VideoMetadata|null */
+            $fileData = $data->getFile($name);
+            if (!is_null($fileData) && !is_null($takenAt)) {
                 $fileData->addFrame(
                     takenAt: $takenAt,
                     lat: $this->maybeCastToFloat($getValue($row, 'lat')),
diff --git a/app/Traits/HasMetadataFile.php b/app/Traits/HasMetadataFile.php
index befd72514..5a382d91f 100644
--- a/app/Traits/HasMetadataFile.php
+++ b/app/Traits/HasMetadataFile.php
@@ -24,7 +24,7 @@ public function hasMetadata(): bool
 
     public function saveMetadata(UploadedFile $file): void
     {
-        $this->metadata_file_path = $this->id;
+        $this->metadata_file_path = "$this->id";
         if ($extension = $file->getClientOriginalExtension()) {
             $this->metadata_file_path .= '.'.$extension;
         }
@@ -44,8 +44,8 @@ public function getMetadata(): ?VolumeMetadata
         return Cache::store('array')->remember($key, 60, function () use ($disk) {
             $tmpPath = tempnam(sys_get_temp_dir(), 'metadata');
             try {
-                $from = Storage::disk($disk)->readStream($this->metadata_file_path);
                 $to = fopen($tmpPath, 'w');
+                $from = Storage::disk($disk)->readStream($this->metadata_file_path);
                 stream_copy_to_stream($from, $to);
                 $type = ($this->media_type_id === MediaType::imageId()) ? 'image' : 'video';
 
diff --git a/app/Volume.php b/app/Volume.php
index 7cbf2b701..376608b9f 100644
--- a/app/Volume.php
+++ b/app/Volume.php
@@ -41,7 +41,7 @@ class Volume extends Model
     /**
      * The attributes that are mass assignable.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $fillable = [
         'name',

From 5a4399f7e3c5a9a8e2a5599236a6aac5959c4723 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Tue, 3 Sep 2024 12:17:59 +0200
Subject: [PATCH 190/209] Fix type issues

---
 app/Http/Controllers/Api/Volumes/MetadataController.php   | 4 +---
 .../Controllers/Views/Volumes/PendingVolumeController.php | 3 +--
 app/Http/Requests/StorePendingVolume.php                  | 2 +-
 app/Http/Requests/StoreVolume.php                         | 2 +-
 app/Image.php                                             | 4 ++--
 app/PendingVolume.php                                     | 8 ++++----
 app/Project.php                                           | 2 +-
 app/Rules/ImageMetadata.php                               | 7 ++++---
 app/Services/MetadataParsing/FileMetadata.php             | 2 +-
 app/Traits/HasMetadataFile.php                            | 4 +++-
 app/VolumeFile.php                                        | 6 +-----
 11 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/app/Http/Controllers/Api/Volumes/MetadataController.php b/app/Http/Controllers/Api/Volumes/MetadataController.php
index 026849c87..5cab2cc8a 100644
--- a/app/Http/Controllers/Api/Volumes/MetadataController.php
+++ b/app/Http/Controllers/Api/Volumes/MetadataController.php
@@ -22,7 +22,7 @@ class MetadataController extends Controller
      ~
      * @param int $id
      *
-     * @return \Illuminate\Http\Response
+     * @return \Symfony\Component\HttpFoundation\StreamedResponse
      */
     public function show($id)
     {
@@ -96,8 +96,6 @@ public function store(StoreVolumeMetadata $request)
      * volume files.
      ~
      * @param int $id
-     *
-     * @return \Illuminate\Http\Response
      */
     public function destroy($id)
     {
diff --git a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
index b13b24733..c6dae116f 100644
--- a/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
+++ b/app/Http/Controllers/Views/Volumes/PendingVolumeController.php
@@ -18,7 +18,6 @@ class PendingVolumeController extends Controller
      * Shows the pending volume page to continue/finish a new volume.
      *
      * @param Request $request
-     * @return \Illuminate\Http\Response
      */
     public function show(Request $request)
     {
@@ -108,7 +107,7 @@ public function show(Request $request)
             'pv' => $pv,
             'project' => $pv->project,
             'disks' => $disks,
-            'hasDisks' => !empty($disks),
+            'hasDisks' => $disks->isNotEmpty(),
             'filenames' => $filenames,
             'offlineMode' => $offlineMode,
             'userDisk' => $userDisk,
diff --git a/app/Http/Requests/StorePendingVolume.php b/app/Http/Requests/StorePendingVolume.php
index db1098ffd..ee9ffda41 100644
--- a/app/Http/Requests/StorePendingVolume.php
+++ b/app/Http/Requests/StorePendingVolume.php
@@ -44,7 +44,7 @@ public function rules(): array
         ];
 
         $parserClass = $this->input('metadata_parser', false);
-        if ($this->has('media_type') && $parserClass && ParserFactory::has($this->has('media_type'), $parserClass)) {
+        if ($this->has('media_type') && $parserClass && ParserFactory::has($this->input('media_type'), $parserClass)) {
             $rules['metadata_file'][] = 'mimetypes:'.implode(',', $parserClass::getKnownMimeTypes());
         }
 
diff --git a/app/Http/Requests/StoreVolume.php b/app/Http/Requests/StoreVolume.php
index f527b8543..b40e1358a 100644
--- a/app/Http/Requests/StoreVolume.php
+++ b/app/Http/Requests/StoreVolume.php
@@ -36,7 +36,7 @@ class StoreVolume extends FormRequest
     /**
      * Filled if an uploaded metadata text was stored in a file.
      *
-     * @var string
+     * @var string|null
      */
     protected $metadataPath;
 
diff --git a/app/Image.php b/app/Image.php
index 0e3a0ed0a..926aa6aaa 100644
--- a/app/Image.php
+++ b/app/Image.php
@@ -16,7 +16,7 @@ class Image extends VolumeFile
     /**
      * Allowed image MIME types.
      *
-     * @var array
+     * @var array<int, string>
      */
     const MIMES = [
         'image/jpeg',
@@ -28,7 +28,7 @@ class Image extends VolumeFile
     /**
      * The attributes that are mass assignable.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $fillable = [
         'filename',
diff --git a/app/PendingVolume.php b/app/PendingVolume.php
index 4705d124c..9820d6144 100644
--- a/app/PendingVolume.php
+++ b/app/PendingVolume.php
@@ -14,7 +14,7 @@ class PendingVolume extends Model
     /**
      * The attributes that are mass assignable.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $fillable = [
         'media_type_id',
@@ -35,7 +35,7 @@ class PendingVolume extends Model
     /**
      * The attributes that should be hidden for arrays.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $hidden = [
         'metadata_file_path',
@@ -44,7 +44,7 @@ class PendingVolume extends Model
     /**
      * The attributes that should be cast.
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $casts = [
         'only_annotation_labels' => 'array',
@@ -56,7 +56,7 @@ class PendingVolume extends Model
     /**
      * Default values for attributes.
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $attributes = [
         'only_annotation_labels' => '[]',
diff --git a/app/Project.php b/app/Project.php
index c0fc27fb2..0fa35a528 100644
--- a/app/Project.php
+++ b/app/Project.php
@@ -212,7 +212,7 @@ public function videoVolumes()
     /**
      * The pending volumes of this project.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany<PendingVolume>
      */
     public function pendingVolumes()
     {
diff --git a/app/Rules/ImageMetadata.php b/app/Rules/ImageMetadata.php
index c7ba060ae..baac3e370 100644
--- a/app/Rules/ImageMetadata.php
+++ b/app/Rules/ImageMetadata.php
@@ -3,6 +3,7 @@
 namespace Biigle\Rules;
 
 use Biigle\Services\MetadataParsing\FileMetadata;
+use Biigle\Services\MetadataParsing\ImageMetadata as ImageMetadataObject;
 use Biigle\Services\MetadataParsing\VolumeMetadata;
 use Illuminate\Contracts\Validation\Rule;
 
@@ -74,10 +75,10 @@ public function message()
         return $this->message;
     }
 
-    protected function fileMetadataPasses(FileMetadata $file)
+    protected function fileMetadataPasses(ImageMetadataObject $file)
     {
         if (!is_null($file->lng)) {
-            if (!is_numeric($file->lng) || abs($file->lng) > 180) {
+            if (abs($file->lng) > 180) {
                 $this->message = "'{$file->lng}' is no valid longitude for file {$file->name}.";
 
                 return false;
@@ -91,7 +92,7 @@ protected function fileMetadataPasses(FileMetadata $file)
         }
 
         if (!is_null($file->lat)) {
-            if (!is_numeric($file->lat) || abs($file->lat) > 90) {
+            if (abs($file->lat) > 90) {
                 $this->message = "'{$file->lat}' is no valid latitude for file {$file->name}.";
 
                 return false;
diff --git a/app/Services/MetadataParsing/FileMetadata.php b/app/Services/MetadataParsing/FileMetadata.php
index cc260e695..ea03650d9 100644
--- a/app/Services/MetadataParsing/FileMetadata.php
+++ b/app/Services/MetadataParsing/FileMetadata.php
@@ -5,7 +5,7 @@
 class FileMetadata
 {
     /**
-     * @var array<ImageAnnotation>
+     * @var array<Annotation>
      */
     public array $annotations = [];
 
diff --git a/app/Traits/HasMetadataFile.php b/app/Traits/HasMetadataFile.php
index 5a382d91f..04e779a80 100644
--- a/app/Traits/HasMetadataFile.php
+++ b/app/Traits/HasMetadataFile.php
@@ -53,7 +53,9 @@ public function getMetadata(): ?VolumeMetadata
 
                 return $parser->getMetadata();
             } finally {
-                fclose($to);
+                if (isset($to) && is_resource($to)) {
+                    fclose($to);
+                }
                 File::delete($tmpPath);
             }
         });
diff --git a/app/VolumeFile.php b/app/VolumeFile.php
index 9211d3eb2..af7771d6c 100644
--- a/app/VolumeFile.php
+++ b/app/VolumeFile.php
@@ -54,8 +54,6 @@ public function volume()
 
     /**
      * Set the metadata attribute.
-     *
-     * @param array $value
      */
     public function setMetadataAttribute(?array $value)
     {
@@ -64,10 +62,8 @@ public function setMetadataAttribute(?array $value)
 
     /**
      * Get the metadata attribute.
-     *
-     * @return array
      */
-    public function getMetadataAttribute()
+    public function getMetadataAttribute(): ?array
     {
         return $this->getJsonAttr('metadata', []);
     }

From 16e85cff9fbb8ddaf4f92ef92a2f7420047a8b01 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Tue, 3 Sep 2024 12:28:29 +0200
Subject: [PATCH 191/209] Configure lint PHP action with GitHub output and add
 test error

---
 .github/workflows/lint.yml | 2 +-
 app/Image.php              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 97b90c73c..f2a28ef7e 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -51,7 +51,7 @@ jobs:
       run: echo "APP_KEY=base64:STZFA4bQKDjE2mlpRPmsJ/okG0eCh4RHd9BghtZeYmQ=" >> .env
 
     - name: Run Linter
-      run: composer lint
+      run: composer lint -- --error-format=github
 
   cs-php:
 
diff --git a/app/Image.php b/app/Image.php
index 926aa6aaa..538d6c953 100644
--- a/app/Image.php
+++ b/app/Image.php
@@ -28,7 +28,7 @@ class Image extends VolumeFile
     /**
      * The attributes that are mass assignable.
      *
-     * @var array<int, string>
+     * @var array<string, string>
      */
     protected $fillable = [
         'filename',

From 6995a74f0ddb3cbd63a3b4c71374747b5c7cd085 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Tue, 3 Sep 2024 12:30:52 +0200
Subject: [PATCH 192/209] Fix intentional type error

---
 app/Image.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Image.php b/app/Image.php
index 538d6c953..926aa6aaa 100644
--- a/app/Image.php
+++ b/app/Image.php
@@ -28,7 +28,7 @@ class Image extends VolumeFile
     /**
      * The attributes that are mass assignable.
      *
-     * @var array<string, string>
+     * @var array<int, string>
      */
     protected $fillable = [
         'filename',

From b97415e4bb3d2cec7801c6ce4dd5df744f48d408 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Tue, 3 Sep 2024 13:03:13 +0200
Subject: [PATCH 193/209] Fix type issues

---
 app/Rules/ImageMetadata.php                    |  3 +--
 app/Services/MetadataParsing/FileMetadata.php  | 12 ++++++++++--
 app/Services/MetadataParsing/ImageMetadata.php | 13 -------------
 app/Services/MetadataParsing/VideoMetadata.php |  2 +-
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/app/Rules/ImageMetadata.php b/app/Rules/ImageMetadata.php
index baac3e370..7bf789dca 100644
--- a/app/Rules/ImageMetadata.php
+++ b/app/Rules/ImageMetadata.php
@@ -3,7 +3,6 @@
 namespace Biigle\Rules;
 
 use Biigle\Services\MetadataParsing\FileMetadata;
-use Biigle\Services\MetadataParsing\ImageMetadata as ImageMetadataObject;
 use Biigle\Services\MetadataParsing\VolumeMetadata;
 use Illuminate\Contracts\Validation\Rule;
 
@@ -75,7 +74,7 @@ public function message()
         return $this->message;
     }
 
-    protected function fileMetadataPasses(ImageMetadataObject $file)
+    protected function fileMetadataPasses(FileMetadata $file)
     {
         if (!is_null($file->lng)) {
             if (abs($file->lng) > 180) {
diff --git a/app/Services/MetadataParsing/FileMetadata.php b/app/Services/MetadataParsing/FileMetadata.php
index ea03650d9..be9aa6895 100644
--- a/app/Services/MetadataParsing/FileMetadata.php
+++ b/app/Services/MetadataParsing/FileMetadata.php
@@ -16,8 +16,16 @@ class FileMetadata
      */
     public array $labels = [];
 
-    public function __construct(public string $name)
-    {
+    public function __construct(
+        public string $name,
+        public ?float $lat = null,
+        public ?float $lng = null,
+        public ?string $takenAt = null,
+        public ?float $area = null,
+        public ?float $distanceToGround = null,
+        public ?float $gpsAltitude = null,
+        public ?float $yaw = null,
+    ) {
         $this->name = trim($this->name);
     }
 
diff --git a/app/Services/MetadataParsing/ImageMetadata.php b/app/Services/MetadataParsing/ImageMetadata.php
index 93848fed4..526314da1 100644
--- a/app/Services/MetadataParsing/ImageMetadata.php
+++ b/app/Services/MetadataParsing/ImageMetadata.php
@@ -6,19 +6,6 @@
 
 class ImageMetadata extends FileMetadata
 {
-    public function __construct(
-        public string $name,
-        public ?float $lat = null,
-        public ?float $lng = null,
-        public ?string $takenAt = null,
-        public ?float $area = null,
-        public ?float $distanceToGround = null,
-        public ?float $gpsAltitude = null,
-        public ?float $yaw = null,
-    ) {
-        parent::__construct($name);
-    }
-
     /**
      * Determines if any metadata field other than the name is filled.
      */
diff --git a/app/Services/MetadataParsing/VideoMetadata.php b/app/Services/MetadataParsing/VideoMetadata.php
index a18d7f458..d554301e2 100644
--- a/app/Services/MetadataParsing/VideoMetadata.php
+++ b/app/Services/MetadataParsing/VideoMetadata.php
@@ -19,7 +19,7 @@ public function __construct(
         public ?float $gpsAltitude = null,
         public ?float $yaw = null
     ) {
-        parent::__construct($name);
+        parent::__construct($name, $lat, $lng, $takenAt, $area, $distanceToGround, $gpsAltitude, $yaw);
 
         $this->frames = collect([]);
 

From aa37ac9d10a823cdfa0dc41ed47e829dd9ee287a Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Tue, 3 Sep 2024 16:21:21 +0200
Subject: [PATCH 194/209] Fix metadata import issues

---
 .../Requests/UpdatePendingVolumeLabelMap.php  |  2 +-
 app/Jobs/CreateNewImagesOrVideos.php          |  5 ++-
 .../Api/PendingVolumeImportControllerTest.php | 36 +++++++++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/app/Http/Requests/UpdatePendingVolumeLabelMap.php b/app/Http/Requests/UpdatePendingVolumeLabelMap.php
index 04ba8acfc..b384ac48c 100644
--- a/app/Http/Requests/UpdatePendingVolumeLabelMap.php
+++ b/app/Http/Requests/UpdatePendingVolumeLabelMap.php
@@ -87,7 +87,7 @@ public function withValidator($validator)
                         ->where('visibility_id', Visibility::publicId())
                         ->union(
                             DB::table('label_tree_user')
-                                ->select('id')
+                                ->select('label_tree_id as id')
                                 ->where('user_id', $this->user()->id)
                         );
                 })
diff --git a/app/Jobs/CreateNewImagesOrVideos.php b/app/Jobs/CreateNewImagesOrVideos.php
index e5873a66b..4f43c9216 100644
--- a/app/Jobs/CreateNewImagesOrVideos.php
+++ b/app/Jobs/CreateNewImagesOrVideos.php
@@ -121,7 +121,8 @@ protected function createFiles(array $filenames, ?VolumeMetadata $metadata): arr
                 }, $fileMeta->getInsertData());
             }
 
-            $metaKeys += array_keys($insert);
+
+            $metaKeys = array_merge($metaKeys, array_keys($insert));
 
             $insert = array_merge($insert, [
                 'filename' => $filename,
@@ -132,6 +133,8 @@ protected function createFiles(array $filenames, ?VolumeMetadata $metadata): arr
             $insertData[] = $insert;
         }
 
+        $metaKeys = array_unique($metaKeys);
+
         // Ensure that each item has the same keys even if some are missing metadata.
         if (!empty($metaKeys)) {
             $fill = array_fill_keys($metaKeys, null);
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
index d88d4b1ef..b69b5a78b 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
@@ -8,6 +8,7 @@
 use Biigle\LabelTree;
 use Biigle\MediaType;
 use Biigle\PendingVolume;
+use Biigle\Role;
 use Biigle\Services\MetadataParsing\ImageAnnotation;
 use Biigle\Services\MetadataParsing\ImageMetadata;
 use Biigle\Services\MetadataParsing\Label;
@@ -440,6 +441,41 @@ public function testUpdateLabelMapTryLabelNotAllowed()
         ])->assertStatus(422);
     }
 
+    public function testUpdateLabelMapTryLabelPrivate()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+        ]);
+        $id = $pv->id;
+
+        $dbLabel = DbLabel::factory()->create([
+            'label_tree_id' => LabelTree::factory()->create([
+                'visibility_id' => Visibility::privateId(),
+            ])->id,
+        ]);
+
+        $dbLabel->tree->addMember($this->admin(), Role::admin());
+
+        $this->beAdmin();
+        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
+            'label_map' => [123 => $dbLabel->id],
+        ])->assertStatus(200);
+    }
+
     public function testUpdateLabelMapRedirectToUserMap()
     {
         $metadata = new VolumeMetadata;

From 70758897c862b2962b9060600876d172bd2e508f Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 4 Sep 2024 09:34:15 +0200
Subject: [PATCH 195/209] Add timestamps to imported annotations and labels

---
 app/Jobs/ImportVolumeMetadata.php           | 8 +++++++-
 tests/php/Jobs/ImportVolumeMetadataTest.php | 8 ++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/Jobs/ImportVolumeMetadata.php b/app/Jobs/ImportVolumeMetadata.php
index bf22ec3df..4506c5bf5 100644
--- a/app/Jobs/ImportVolumeMetadata.php
+++ b/app/Jobs/ImportVolumeMetadata.php
@@ -98,6 +98,7 @@ protected function insertAnnotations(
     ): void {
         $insertAnnotations = [];
         $insertAnnotationLabels = [];
+        $now = now()->toDateTimeString();
 
         foreach ($meta->getAnnotations() as $index => $annotation) {
             // This will remove labels that should be ignored based on $onlyLabels and
@@ -111,11 +112,16 @@ protected function insertAnnotations(
                 continue;
             }
 
-            $insertAnnotations[] = $annotation->getInsertData($file->id);
+            $insertAnnotations[] = array_merge($annotation->getInsertData($file->id), [
+                'created_at' => $now,
+                'updated_at' => $now,
+            ]);
 
             $insertAnnotationLabels[] = array_map(fn ($lau) => [
                 'label_id' => $labelMap[$lau->label->id],
                 'user_id' => $userMap[$lau->user->id],
+                'created_at' => $now,
+                'updated_at' => $now,
             ], $annotationLabels);
 
             // Insert in chunks because a single file can have tens of thousands of
diff --git a/tests/php/Jobs/ImportVolumeMetadataTest.php b/tests/php/Jobs/ImportVolumeMetadataTest.php
index bbb965e1f..5fbbfaf73 100644
--- a/tests/php/Jobs/ImportVolumeMetadataTest.php
+++ b/tests/php/Jobs/ImportVolumeMetadataTest.php
@@ -61,10 +61,14 @@ public function testHandle()
         $this->assertCount(1, $annotations);
         $this->assertEquals([10, 10], $annotations[0]->points);
         $this->assertEquals(Shape::pointId(), $annotations[0]->shape_id);
+        $this->assertNotNull($annotations[0]->created_at);
+        $this->assertNotNull($annotations[0]->updated_at);
         $annotationLabels = $annotations[0]->labels;
         $this->assertCount(1, $annotationLabels);
         $this->assertEquals($dbUser->id, $annotationLabels[0]->user_id);
         $this->assertEquals($dbLabel->id, $annotationLabels[0]->label_id);
+        $this->assertNotNull($annotationLabels[0]->created_at);
+        $this->assertNotNull($annotationLabels[0]->updated_at);
 
         $fileLabels = $image->labels;
         $this->assertCount(1, $fileLabels);
@@ -114,10 +118,14 @@ public function testHandleVideo()
         $this->assertEquals([[10, 10]], $annotations[0]->points);
         $this->assertEquals([1], $annotations[0]->frames);
         $this->assertEquals(Shape::pointId(), $annotations[0]->shape_id);
+        $this->assertNotNull($annotations[0]->created_at);
+        $this->assertNotNull($annotations[0]->updated_at);
         $annotationLabels = $annotations[0]->labels;
         $this->assertCount(1, $annotationLabels);
         $this->assertEquals($dbUser->id, $annotationLabels[0]->user_id);
         $this->assertEquals($dbLabel->id, $annotationLabels[0]->label_id);
+        $this->assertNotNull($annotationLabels[0]->created_at);
+        $this->assertNotNull($annotationLabels[0]->updated_at);
 
         $fileLabels = $video->labels;
         $this->assertCount(1, $fileLabels);

From 3d4b07678155f5ab6c17724aa5f7d2d603ef15e2 Mon Sep 17 00:00:00 2001
From: Leane Schlundt <lhecht@techfak.de>
Date: Wed, 4 Sep 2024 09:49:24 +0200
Subject: [PATCH 196/209] Make query more efficent by returning sorted file ids

---
 app/Http/Controllers/Api/VolumeController.php | 31 ++++++++++++-------
 resources/assets/js/volumes/api/volumes.js    |  2 +-
 resources/assets/js/volumes/stores/sorters.js | 14 ++-------
 routes/api.php                                |  2 +-
 4 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/app/Http/Controllers/Api/VolumeController.php b/app/Http/Controllers/Api/VolumeController.php
index 7fb3917bb..b453a1b23 100644
--- a/app/Http/Controllers/Api/VolumeController.php
+++ b/app/Http/Controllers/Api/VolumeController.php
@@ -211,11 +211,11 @@ public function clone(CloneVolume $request)
     }
 
     /**
-     * Return volume's annotation timestamps of newest annotations
+     * Return file ids which are sorted by annotations.created_at
      *
      * @param int $id
      * @return object
-     * @api {get} volumes{/id}/files/annotation-timestamps Get the newest annotation timestamps of the volume
+     * @api {get} volumes{/id}/files/annotation-timestamps Get sorted file ids of volume
      * @apiGroup Volumes
      * @apiPermission projectMember
      *
@@ -223,22 +223,31 @@ public function clone(CloneVolume $request)
      *
      * @apiSuccessExample {json} Success response:
      * {
-     *  1: "2024-08-23T07:06:31.000000Z",
-     *  2: "2024-08-23T06:40:29.000000Z",
-     *  3: "2024-08-23T06:40:35.000000Z",
+     *  1: 1,
+     *  2: 2,
+     *  3: 3,
      * }
      *
      */
-    public function getAnnotationTimestamps($id)
+    public function getFileIdsSortedByAnnotationTimestamps($id)
     {
         $volume = Volume::findOrFail($id);
         $this->authorize('access', $volume);
 
-        $timestamps = $volume->files
-            ->flatMap(fn ($file) => $file->annotations)
-            ->groupBy('file_id')
-            ->map(fn ($annotations) => $annotations->max('created_at'));
+        if ($volume->isImageVolume()) {
+            $ids = $volume->files()
+                ->leftJoin('image_annotations', 'images.id', "=", "image_id")
+                ->groupBy('images.id')
+                ->selectRaw('images.id, max(created_at) as created_at');
+        } else {
+            $ids = $volume->files()
+                ->leftJoin('video_annotations', 'videos.id', "=", "video_id")
+                ->groupBy('videos.id')
+                ->selectRaw('videos.id, max(created_at) as created_at');
+        }
 
-        return $timestamps;
+        return $ids->get()
+            ->sortByDesc('created_at')
+            ->pluck('id');
     }
 }
diff --git a/resources/assets/js/volumes/api/volumes.js b/resources/assets/js/volumes/api/volumes.js
index 09d95ba95..d8ba94b7b 100644
--- a/resources/assets/js/volumes/api/volumes.js
+++ b/resources/assets/js/volumes/api/volumes.js
@@ -93,7 +93,7 @@ export default Vue.resource('api/v1/volumes{/id}', {}, {
         method: 'POST',
         url: 'api/v1/volumes{/id}/clone-to{/project_id}'
     },
-    getAnnotationTimestamps:{
+    getFileIdsSortedByAnnotationTimestamps:{
         method: 'GET',
         url: 'api/v1/volumes{/id}/files/annotation-timestamps'
     }
diff --git a/resources/assets/js/volumes/stores/sorters.js b/resources/assets/js/volumes/stores/sorters.js
index a51e00573..c6c3b18b0 100644
--- a/resources/assets/js/volumes/stores/sorters.js
+++ b/resources/assets/js/volumes/stores/sorters.js
@@ -1,5 +1,6 @@
 import SortComponent from '../components/sortComponent';
 import VolumeApi from '../api/volumes';
+import {handleErrorResponse} from '../../core/messages/store';
 
 let filenameSorter = {
     id: 'filename',
@@ -117,19 +118,10 @@ let annotationTime = {
         },
         methods: {
             getSequence() {
-                return VolumeApi.getAnnotationTimestamps({'id': this.volumeId})
+                return VolumeApi.getFileIdsSortedByAnnotationTimestamps({'id': this.volumeId})
                 .then((res) => res.body)
-                .then((timestamps) => {
-                    let sorted = Object.entries(timestamps).sort(this.compare);
-                    sorted = sorted.map(e => parseInt(e[0]));
-                    let diff = this.fileIds.filter(id => !sorted.includes(id));
-                    sorted = sorted.concat(diff);
-                    return sorted;                   
-                });
+                .catch(handleErrorResponse);           
             },
-            compare(a, b) {
-                return Date.parse(b[1]) - Date.parse(a[1]);
-            }
         },
         created() {
             this.volumeId = biigle.$require('volumes.volumeId');
diff --git a/routes/api.php b/routes/api.php
index 62c6adfd3..a9e7f2199 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -283,7 +283,7 @@
 );
 
 $router->get(
-    'volumes/{id}/files/annotation-timestamps', 'VolumeController@getAnnotationTimestamps'
+    'volumes/{id}/files/annotation-timestamps', 'VolumeController@getFileIdsSortedByAnnotationTimestamps'
 );
 
 $router->resource('volumes', 'VolumeController', [

From cad49aceb5e4e8959397244af7d717b074eed165 Mon Sep 17 00:00:00 2001
From: Leane Schlundt <lhecht@techfak.de>
Date: Wed, 4 Sep 2024 10:06:28 +0200
Subject: [PATCH 197/209] Update test

---
 tests/php/Http/Controllers/Api/VolumeControllerTest.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tests/php/Http/Controllers/Api/VolumeControllerTest.php b/tests/php/Http/Controllers/Api/VolumeControllerTest.php
index 944e14380..5966d9e10 100644
--- a/tests/php/Http/Controllers/Api/VolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/VolumeControllerTest.php
@@ -310,7 +310,7 @@ public function testCloneVolume()
         Queue::assertPushed(CloneImagesOrVideos::class);
     }
 
-    public function testGetAnnotationTimestamps()
+    public function testGetFileIdsSortedByAnnotationTimestamps()
     {
 
         $volume = $this
@@ -351,9 +351,7 @@ public function testGetAnnotationTimestamps()
         $content = json_decode($response->getContent(), true);
 
         $this->assertCount(2, $content);
-        $this->assertNotNull($content[$img->id]);
-        $this->assertNotNull($content[$img2->id]);
-        $this->assertSame($content[$img->id], "2023-11-09T05:37:00.000000Z");
-        $this->assertSame($content[$img2->id], "2024-11-09T13:37:00.000000Z");
+        $this->assertSame($content[0], $img2->id);
+        $this->assertSame($content[1], $img->id);
     }
 }

From 898ddc7e598375207feb6b4f49f0aee82be89927 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 4 Sep 2024 15:42:15 +0200
Subject: [PATCH 198/209] Fix YAML extension configuration

---
 composer.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/composer.json b/composer.json
index d1d3511c0..47ea8f77b 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,6 @@
         "ext-json": "*",
         "ext-pgsql": "*",
         "ext-soap": "*",
-        "ext-yaml": "*",
         "biigle/laravel-file-cache": "^5.0",
         "duncan3dc/bom-string": "^1.1",
         "endroid/qr-code": "^5.0",

From 86d1f59ecae2d16757329f65c5997edac34c888b Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Wed, 4 Sep 2024 15:50:02 +0200
Subject: [PATCH 199/209] Sync composer.lock

---
 composer.lock | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/composer.lock b/composer.lock
index 6980983b0..98dae92b5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "26105c05d2a99ac2b5480415e6692182",
+    "content-hash": "6d930ed39a43085df3e6367f5754876e",
     "packages": [
         {
             "name": "bacon/bacon-qr-code",
@@ -10348,8 +10348,7 @@
         "ext-exif": "*",
         "ext-json": "*",
         "ext-pgsql": "*",
-        "ext-soap": "*",
-        "ext-yaml": "*"
+        "ext-soap": "*"
     },
     "platform-dev": [],
     "platform-overrides": {

From b77a3cee5c30714b3b4993c957ff6a971c009fde Mon Sep 17 00:00:00 2001
From: Leane Schlundt <lhecht@techfak.de>
Date: Thu, 5 Sep 2024 07:39:38 +0200
Subject: [PATCH 200/209] Use full attribute names

---
 app/Http/Controllers/Api/VolumeController.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Api/VolumeController.php b/app/Http/Controllers/Api/VolumeController.php
index b453a1b23..4ca974c7e 100644
--- a/app/Http/Controllers/Api/VolumeController.php
+++ b/app/Http/Controllers/Api/VolumeController.php
@@ -236,14 +236,14 @@ public function getFileIdsSortedByAnnotationTimestamps($id)
 
         if ($volume->isImageVolume()) {
             $ids = $volume->files()
-                ->leftJoin('image_annotations', 'images.id', "=", "image_id")
+                ->leftJoin('image_annotations', 'images.id', "=", "image_annotations.image_id")
                 ->groupBy('images.id')
-                ->selectRaw('images.id, max(created_at) as created_at');
+                ->selectRaw('images.id, max(image_annotations.created_at) as created_at');
         } else {
             $ids = $volume->files()
-                ->leftJoin('video_annotations', 'videos.id', "=", "video_id")
+                ->leftJoin('video_annotations', 'videos.id', "=", "video_annotations.video_id")
                 ->groupBy('videos.id')
-                ->selectRaw('videos.id, max(created_at) as created_at');
+                ->selectRaw('videos.id, max(video_annotations.created_at) as created_at');
         }
 
         return $ids->get()

From 5b017c119a2cff8c70ab253cd63ed840b7d3e081 Mon Sep 17 00:00:00 2001
From: Leane Schlundt <lhecht@techfak.de>
Date: Thu, 5 Sep 2024 08:09:17 +0200
Subject: [PATCH 201/209] Sort elements in database

---
 app/Http/Controllers/Api/VolumeController.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Api/VolumeController.php b/app/Http/Controllers/Api/VolumeController.php
index 4ca974c7e..2c7dee9d5 100644
--- a/app/Http/Controllers/Api/VolumeController.php
+++ b/app/Http/Controllers/Api/VolumeController.php
@@ -238,16 +238,16 @@ public function getFileIdsSortedByAnnotationTimestamps($id)
             $ids = $volume->files()
                 ->leftJoin('image_annotations', 'images.id', "=", "image_annotations.image_id")
                 ->groupBy('images.id')
-                ->selectRaw('images.id, max(image_annotations.created_at) as created_at');
+                ->selectRaw('images.id, max(image_annotations.created_at) as created_at')
+                ->orderByRaw("created_at desc nulls last");
         } else {
             $ids = $volume->files()
                 ->leftJoin('video_annotations', 'videos.id', "=", "video_annotations.video_id")
                 ->groupBy('videos.id')
-                ->selectRaw('videos.id, max(video_annotations.created_at) as created_at');
+                ->selectRaw('videos.id, max(video_annotations.created_at) as created_at')
+                ->orderByRaw("created_at desc nulls last");
         }
 
-        return $ids->get()
-            ->sortByDesc('created_at')
-            ->pluck('id');
+        return $ids->pluck('id');
     }
 }

From 240f161e73c87b8fa1e42c7dc47355c64f40b3ce Mon Sep 17 00:00:00 2001
From: Leane Schlundt <lhecht@techfak.de>
Date: Thu, 5 Sep 2024 08:12:23 +0200
Subject: [PATCH 202/209] Add test case for image volumes

---
 .../Http/Controllers/Api/VolumeControllerTest.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/tests/php/Http/Controllers/Api/VolumeControllerTest.php b/tests/php/Http/Controllers/Api/VolumeControllerTest.php
index 5966d9e10..668fc7729 100644
--- a/tests/php/Http/Controllers/Api/VolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/VolumeControllerTest.php
@@ -320,6 +320,17 @@ public function testGetFileIdsSortedByAnnotationTimestamps()
             ])
             ->fresh();
 
+        $this->be(UserTest::create());
+        $this->getJson("/api/v1/volumes/{$volume->id}/files/annotation-timestamps")->assertForbidden();
+
+        $this->beGuest();
+        $response = $this->getJson("/api/v1/volumes/{$volume->id}/files/annotation-timestamps");
+
+        $response->assertSuccessful();
+        $content = json_decode($response->getContent(), true);
+
+        $this->assertCount(0, $content);
+
         $img = ImageTest::create([
             'filename' => 'test123.jpg',
             'volume_id' => $volume->id,
@@ -341,10 +352,6 @@ public function testGetFileIdsSortedByAnnotationTimestamps()
             'image_id' => $img2->id,
         ]);
 
-        $this->be(UserTest::create());
-        $this->getJson("/api/v1/volumes/{$volume->id}/files/annotation-timestamps")->assertForbidden();
-
-        $this->beGuest();
         $response = $this->getJson("/api/v1/volumes/{$volume->id}/files/annotation-timestamps");
 
         $response->assertSuccessful();

From f23d4111d224c81bc284376dbf9dbf0f924483aa Mon Sep 17 00:00:00 2001
From: Leane Schlundt <lhecht@techfak.de>
Date: Thu, 5 Sep 2024 08:17:36 +0200
Subject: [PATCH 203/209] Add tests for videos

---
 .../Controllers/Api/VolumeControllerTest.php  | 57 ++++++++++++++++++-
 1 file changed, 56 insertions(+), 1 deletion(-)

diff --git a/tests/php/Http/Controllers/Api/VolumeControllerTest.php b/tests/php/Http/Controllers/Api/VolumeControllerTest.php
index 668fc7729..61a7e609b 100644
--- a/tests/php/Http/Controllers/Api/VolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/VolumeControllerTest.php
@@ -11,6 +11,8 @@
 use Biigle\Tests\ImageTest;
 use Biigle\Tests\ProjectTest;
 use Biigle\Tests\UserTest;
+use Biigle\Tests\VideoAnnotationTest;
+use Biigle\Tests\VideoTest;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Storage;
 use Queue;
@@ -310,7 +312,7 @@ public function testCloneVolume()
         Queue::assertPushed(CloneImagesOrVideos::class);
     }
 
-    public function testGetFileIdsSortedByAnnotationTimestamps()
+    public function testGetImageIdsSortedByAnnotationTimestamps()
     {
 
         $volume = $this
@@ -361,4 +363,57 @@ public function testGetFileIdsSortedByAnnotationTimestamps()
         $this->assertSame($content[0], $img2->id);
         $this->assertSame($content[1], $img->id);
     }
+
+    public function testGetVideoIdsSortedByAnnotationTimestamps()
+    {
+
+        $volume = $this
+            ->volume([
+                'created_at' => '2022-11-09 14:37:00',
+                'updated_at' => '2022-11-09 14:37:00',
+                'media_type_id' => MediaType::videoId()
+            ])
+            ->fresh();
+
+        $this->be(UserTest::create());
+        $this->getJson("/api/v1/volumes/{$volume->id}/files/annotation-timestamps")->assertForbidden();
+
+        $this->beGuest();
+        $response = $this->getJson("/api/v1/volumes/{$volume->id}/files/annotation-timestamps");
+
+        $response->assertSuccessful();
+        $content = json_decode($response->getContent(), true);
+
+        $this->assertCount(0, $content);
+
+        $video = VideoTest::create([
+            'filename' => 'test123.jpg',
+            'volume_id' => $volume->id,
+        ]);
+        VideoAnnotationTest::create([
+            'created_at' => '2023-11-09 06:37:00',
+            'video_id' => $video->id,
+        ]);
+        VideoAnnotationTest::create([
+            'created_at' => '2020-11-09 06:37:00',
+            'video_id' => $video->id,
+        ]);
+        $video2 = VideoTest::create([
+            'filename' => 'test321.jpg',
+            'volume_id' => $volume->id
+        ]);
+        VideoAnnotationTest::create([
+            'created_at' => '2024-11-09 14:37:00',
+            'video_id' => $video2->id,
+        ]);
+
+        $response = $this->getJson("/api/v1/volumes/{$volume->id}/files/annotation-timestamps");
+
+        $response->assertSuccessful();
+        $content = json_decode($response->getContent(), true);
+
+        $this->assertCount(2, $content);
+        $this->assertSame($content[0], $video2->id);
+        $this->assertSame($content[1], $video->id);
+    }
 }

From 7b586f151d296cb3de804e7a9f3e9394eebd2b97 Mon Sep 17 00:00:00 2001
From: Leane Schlundt <lhecht@techfak.de>
Date: Thu, 5 Sep 2024 08:32:18 +0200
Subject: [PATCH 204/209] Add test with volume containing a single file

---
 .../Controllers/Api/VolumeControllerTest.php  | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/tests/php/Http/Controllers/Api/VolumeControllerTest.php b/tests/php/Http/Controllers/Api/VolumeControllerTest.php
index 61a7e609b..418f6f4a1 100644
--- a/tests/php/Http/Controllers/Api/VolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/VolumeControllerTest.php
@@ -326,17 +326,20 @@ public function testGetImageIdsSortedByAnnotationTimestamps()
         $this->getJson("/api/v1/volumes/{$volume->id}/files/annotation-timestamps")->assertForbidden();
 
         $this->beGuest();
+
+        $img = ImageTest::create([
+            'filename' => 'test123.jpg',
+            'volume_id' => $volume->id,
+        ]);
+
         $response = $this->getJson("/api/v1/volumes/{$volume->id}/files/annotation-timestamps");
 
         $response->assertSuccessful();
         $content = json_decode($response->getContent(), true);
 
-        $this->assertCount(0, $content);
+        $this->assertCount(1, $content);
+        $this->assertSame($content[0], $img->id);
 
-        $img = ImageTest::create([
-            'filename' => 'test123.jpg',
-            'volume_id' => $volume->id,
-        ]);
         ImageAnnotationTest::create([
             'created_at' => '2023-11-09 06:37:00',
             'image_id' => $img->id,
@@ -379,17 +382,20 @@ public function testGetVideoIdsSortedByAnnotationTimestamps()
         $this->getJson("/api/v1/volumes/{$volume->id}/files/annotation-timestamps")->assertForbidden();
 
         $this->beGuest();
+
+        $video = VideoTest::create([
+            'filename' => 'test123.jpg',
+            'volume_id' => $volume->id,
+        ]);
+
         $response = $this->getJson("/api/v1/volumes/{$volume->id}/files/annotation-timestamps");
 
         $response->assertSuccessful();
         $content = json_decode($response->getContent(), true);
 
-        $this->assertCount(0, $content);
+        $this->assertCount(1, $content);
+        $this->assertSame($content[0], $video->id);
 
-        $video = VideoTest::create([
-            'filename' => 'test123.jpg',
-            'volume_id' => $volume->id,
-        ]);
         VideoAnnotationTest::create([
             'created_at' => '2023-11-09 06:37:00',
             'video_id' => $video->id,

From 34dd7ae8ebcff41caa078bfacb5e3132968575a5 Mon Sep 17 00:00:00 2001
From: Leane Schlundt <lhecht@techfak.de>
Date: Thu, 5 Sep 2024 08:36:30 +0200
Subject: [PATCH 205/209] Revert "Add test with volume containing a single
 file"

This reverts commit 7b586f151d296cb3de804e7a9f3e9394eebd2b97.
---
 .../Controllers/Api/VolumeControllerTest.php  | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/tests/php/Http/Controllers/Api/VolumeControllerTest.php b/tests/php/Http/Controllers/Api/VolumeControllerTest.php
index 418f6f4a1..61a7e609b 100644
--- a/tests/php/Http/Controllers/Api/VolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/VolumeControllerTest.php
@@ -326,20 +326,17 @@ public function testGetImageIdsSortedByAnnotationTimestamps()
         $this->getJson("/api/v1/volumes/{$volume->id}/files/annotation-timestamps")->assertForbidden();
 
         $this->beGuest();
-
-        $img = ImageTest::create([
-            'filename' => 'test123.jpg',
-            'volume_id' => $volume->id,
-        ]);
-
         $response = $this->getJson("/api/v1/volumes/{$volume->id}/files/annotation-timestamps");
 
         $response->assertSuccessful();
         $content = json_decode($response->getContent(), true);
 
-        $this->assertCount(1, $content);
-        $this->assertSame($content[0], $img->id);
+        $this->assertCount(0, $content);
 
+        $img = ImageTest::create([
+            'filename' => 'test123.jpg',
+            'volume_id' => $volume->id,
+        ]);
         ImageAnnotationTest::create([
             'created_at' => '2023-11-09 06:37:00',
             'image_id' => $img->id,
@@ -382,20 +379,17 @@ public function testGetVideoIdsSortedByAnnotationTimestamps()
         $this->getJson("/api/v1/volumes/{$volume->id}/files/annotation-timestamps")->assertForbidden();
 
         $this->beGuest();
-
-        $video = VideoTest::create([
-            'filename' => 'test123.jpg',
-            'volume_id' => $volume->id,
-        ]);
-
         $response = $this->getJson("/api/v1/volumes/{$volume->id}/files/annotation-timestamps");
 
         $response->assertSuccessful();
         $content = json_decode($response->getContent(), true);
 
-        $this->assertCount(1, $content);
-        $this->assertSame($content[0], $video->id);
+        $this->assertCount(0, $content);
 
+        $video = VideoTest::create([
+            'filename' => 'test123.jpg',
+            'volume_id' => $volume->id,
+        ]);
         VideoAnnotationTest::create([
             'created_at' => '2023-11-09 06:37:00',
             'video_id' => $video->id,

From 66f3e36eeefd0d4cf77efeef10d3f6ee01b4f3fb Mon Sep 17 00:00:00 2001
From: Leane Schlundt <lhecht@techfak.de>
Date: Thu, 5 Sep 2024 08:44:17 +0200
Subject: [PATCH 206/209] Add file without annotations to test

---
 .../Http/Controllers/Api/VolumeControllerTest.php  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tests/php/Http/Controllers/Api/VolumeControllerTest.php b/tests/php/Http/Controllers/Api/VolumeControllerTest.php
index 61a7e609b..2ebfaffbc 100644
--- a/tests/php/Http/Controllers/Api/VolumeControllerTest.php
+++ b/tests/php/Http/Controllers/Api/VolumeControllerTest.php
@@ -353,15 +353,20 @@ public function testGetImageIdsSortedByAnnotationTimestamps()
             'created_at' => '2024-11-09 14:37:00',
             'image_id' => $img2->id,
         ]);
+        $img3 = ImageTest::create([
+            'filename' => 'test321321.jpg',
+            'volume_id' => $volume->id
+        ]);
 
         $response = $this->getJson("/api/v1/volumes/{$volume->id}/files/annotation-timestamps");
 
         $response->assertSuccessful();
         $content = json_decode($response->getContent(), true);
 
-        $this->assertCount(2, $content);
+        $this->assertCount(3, $content);
         $this->assertSame($content[0], $img2->id);
         $this->assertSame($content[1], $img->id);
+        $this->assertSame($content[2], $img3->id);
     }
 
     public function testGetVideoIdsSortedByAnnotationTimestamps()
@@ -406,14 +411,19 @@ public function testGetVideoIdsSortedByAnnotationTimestamps()
             'created_at' => '2024-11-09 14:37:00',
             'video_id' => $video2->id,
         ]);
+        $video3 = VideoTest::create([
+            'filename' => 'test321123.jpg',
+            'volume_id' => $volume->id
+        ]);
 
         $response = $this->getJson("/api/v1/volumes/{$volume->id}/files/annotation-timestamps");
 
         $response->assertSuccessful();
         $content = json_decode($response->getContent(), true);
 
-        $this->assertCount(2, $content);
+        $this->assertCount(3, $content);
         $this->assertSame($content[0], $video2->id);
         $this->assertSame($content[1], $video->id);
+        $this->assertSame($content[2], $video3->id);
     }
 }

From aad44801b73755a55ee8c11d38b1a0c818565704 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <mzur@users.noreply.github.com>
Date: Thu, 5 Sep 2024 09:24:29 +0200
Subject: [PATCH 207/209] Fix apidoc

---
 app/Http/Controllers/Api/VolumeController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Api/VolumeController.php b/app/Http/Controllers/Api/VolumeController.php
index 2c7dee9d5..2eb86c822 100644
--- a/app/Http/Controllers/Api/VolumeController.php
+++ b/app/Http/Controllers/Api/VolumeController.php
@@ -215,8 +215,9 @@ public function clone(CloneVolume $request)
      *
      * @param int $id
      * @return object
-     * @api {get} volumes{/id}/files/annotation-timestamps Get sorted file ids of volume
+     * @api {get} volumes{/id}/files/annotation-timestamps Get file ids sorted by recently annotated
      * @apiGroup Volumes
+     * @apiName VolumeSortByAnnotated
      * @apiPermission projectMember
      *
      * @apiParam {Number} id The volume ID.

From 9967b1bca8436963c0158c1b168c131682e6e660 Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Thu, 5 Sep 2024 13:43:04 +0200
Subject: [PATCH 208/209] Fix error with label and user mapping during
 annotation import

The error happened when two or more import labels/users were mapped
to the same database label/user.
---
 .../Requests/UpdatePendingVolumeLabelMap.php  |  9 ++-
 .../Requests/UpdatePendingVolumeUserMap.php   |  5 +-
 .../Api/PendingVolumeImportControllerTest.php | 81 +++++++++++++++++++
 3 files changed, 89 insertions(+), 6 deletions(-)

diff --git a/app/Http/Requests/UpdatePendingVolumeLabelMap.php b/app/Http/Requests/UpdatePendingVolumeLabelMap.php
index b384ac48c..d276fe0c3 100644
--- a/app/Http/Requests/UpdatePendingVolumeLabelMap.php
+++ b/app/Http/Requests/UpdatePendingVolumeLabelMap.php
@@ -74,12 +74,13 @@ public function withValidator($validator)
                 }
             }
 
-            $count = Label::whereIn('id', array_values($map))->count();
-            if (count($map) !== $count) {
+            $uniqueIds = array_values(array_unique($map));
+            $count = Label::whereIn('id', $uniqueIds)->count();
+            if (count($uniqueIds) !== $count) {
                 $validator->errors()->add('label_map', 'Some label IDs do not exist in the database.');
             }
 
-            $count = Label::whereIn('id', array_values($map))
+            $count = Label::whereIn('id', $uniqueIds)
                 ->whereIn('label_tree_id', function ($query) {
                     // All public and all accessible private label trees.
                     $query->select('id')
@@ -93,7 +94,7 @@ public function withValidator($validator)
                 })
                 ->count();
 
-            if (count($map) !== $count) {
+            if (count($uniqueIds) !== $count) {
                 $validator->errors()->add('label_map', 'You do not have access to some label IDs in the database.');
             }
         });
diff --git a/app/Http/Requests/UpdatePendingVolumeUserMap.php b/app/Http/Requests/UpdatePendingVolumeUserMap.php
index a57d44851..28451f48e 100644
--- a/app/Http/Requests/UpdatePendingVolumeUserMap.php
+++ b/app/Http/Requests/UpdatePendingVolumeUserMap.php
@@ -64,8 +64,9 @@ public function withValidator($validator)
                 }
             }
 
-            $count = User::whereIn('id', array_values($map))->count();
-            if (count($map) !== $count) {
+            $uniqueIds = array_values(array_unique($map));
+            $count = User::whereIn('id', $uniqueIds)->count();
+            if (count($uniqueIds) !== $count) {
                 $validator->errors()->add('user_map', 'Some user IDs do not exist in the database.');
             }
         });
diff --git a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
index b69b5a78b..cb57fd96d 100644
--- a/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
+++ b/tests/php/Http/Controllers/Api/PendingVolumeImportControllerTest.php
@@ -504,6 +504,47 @@ public function testUpdateLabelMapRedirectToUserMap()
         ])->assertRedirectToRoute('pending-volume-user-map', $id);
     }
 
+    public function testUpdateLabelMapDuplicate()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+
+        $label = new Label(321, 'my label 2');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+
+        $this->putJson("/api/v1/pending-volumes/{$id}/label-map", [
+            'label_map' => [
+                123 => $this->labelRoot()->id,
+                321 => $this->labelRoot()->id,
+            ],
+        ])->assertSuccessful();
+
+        $pv->refresh();
+        $this->assertEquals([
+            123 => $this->labelRoot()->id,
+            321 => $this->labelRoot()->id,
+        ], $pv->label_map);
+    }
+
     public function testUpdateUserMap()
     {
         $metadata = new VolumeMetadata;
@@ -631,6 +672,46 @@ public function testUpdateUserMapRedirectToFinish()
         ])->assertRedirectToRoute('pending-volume-finish', $id);
     }
 
+    public function testUpdateUserMapDuplicate()
+    {
+        $metadata = new VolumeMetadata;
+        $file = new ImageMetadata('1.jpg');
+        $metadata->addFile($file);
+        $label = new Label(123, 'my label');
+        $user = new User(321, 'joe user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+        $user = new User(123, 'jane user');
+        $lau = new LabelAndUser($label, $user);
+        $file->addFileLabel($lau);
+
+        Cache::store('array')->put('metadata-pending-metadata-mymeta.csv', $metadata);
+
+        $pv = PendingVolume::factory()->create([
+            'project_id' => $this->project()->id,
+            'media_type_id' => MediaType::imageId(),
+            'user_id' => $this->admin()->id,
+            'metadata_file_path' => 'mymeta.csv',
+            'volume_id' => $this->volume()->id,
+        ]);
+        $id = $pv->id;
+
+        $this->beAdmin();
+
+        $this->putJson("/api/v1/pending-volumes/{$id}/user-map", [
+            'user_map' => [
+                321 => $this->user()->id,
+                123 => $this->user()->id,
+            ],
+        ])->assertSuccessful();
+
+        $pv->refresh();
+        $this->assertEquals([
+            321 => $this->user()->id,
+            123 => $this->user()->id,
+        ], $pv->user_map);
+    }
+
     public function testStoreImport()
     {
         $dbUser = DbUser::factory()->create();

From dac829fd87cab5e26023b2792dae9901a3e9400d Mon Sep 17 00:00:00 2001
From: Martin Zurowietz <martin@zurowietz.de>
Date: Fri, 6 Sep 2024 15:10:39 +0200
Subject: [PATCH 209/209] Fix error with federated search user

The FederatedSearchuser has no notifications.
---
 app/Providers/AppServiceProvider.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index b5d699a52..6614d2121 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -5,6 +5,7 @@
 use Auth;
 use Biigle\Announcement;
 use Biigle\Support\FilesystemManager;
+use Biigle\User;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Storage;
@@ -38,7 +39,7 @@ public function boot(): void
             // Make some variables available in any view.
             $user = Auth::user();
             $view->with('user', $user);
-            if ($user) {
+            if ($user instanceof User) {
                 $view->with('hasNotification', $user->unreadNotifications()->exists());
             }
             $view->with('announcement', Announcement::getActive());