Remove static models

app/Annotation.php

@@ -193,11 +193,11 @@ abstract public function getFileIdAttribute();
     /**
      * The shape of this annotation.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<Shape, $this>
+     * @return Shape
      */
-    public function shape()
+    public function getShapeAttribute()
     {
-        return $this->belongsTo(Shape::class);
+        return Shape::from($this->shape_id);
     }
 
     /**
@@ -213,7 +213,7 @@ public function getPoints(): array
      */
     public function getShape(): Shape
     {
-        return $this->shape;
+        return Shape::from($this->shape_id);
     }
 
     /**

app/Http/Controllers/Api/MediaTypeController.php

@@ -26,11 +26,11 @@ class MediaTypeController extends Controller
      *    }
      * ]
      *
-     * @return \Illuminate\Database\Eloquent\Collection
+     * @return \Illuminate\Support\Collection<int, array>
      */
     public function index()
     {
-        return MediaType::all();
+        return collect(MediaType::cases())->map->toArray()->values();
     }
 
     /**
@@ -54,6 +54,8 @@ public function index()
      */
     public function show($id)
     {
-        return MediaType::findOrFail($id);
+        $mediaType = MediaType::tryFrom((int) $id);
+        abort_if($mediaType === null, 404);
+        return $mediaType;
     }
 }

app/Http/Controllers/Api/ProjectsAttachableVolumesController.php

@@ -44,7 +44,6 @@ public function index(Request $request, $id, $name)
         $this->authorize('update', $project);
 
         $volumes = Volume::select('id', 'name', 'updated_at', 'media_type_id')
-            ->with('mediaType')
             // All volumes of other projects where the user has admin rights on.
             ->whereIn('id', fn ($query) => $query->select('volume_id')
                 ->from('project_volume')
@@ -68,6 +67,7 @@ public function index(Request $request, $id, $name)
         $volumes->each(function ($item) use ($hidden) {
             $item->append('thumbnailUrl')
                 ->append('thumbnailsUrl')
+                ->setAttribute('media_type', $item->mediaType) // TODO compare with others for test, test index and fuzzy search
                 ->makeHidden($hidden);
         });
 

app/Http/Controllers/Api/ReportsController.php

@@ -86,10 +86,10 @@ public function destroy($id)
      * @apiGroup Reports
      * @apiName IndexReports
      * @apiPermission user
-     * @return \Illuminate\Database\Eloquent\Collection
+     * @return \Illuminate\Support\Collection
      */
     public function index()
     {
-        return ReportType::all();
+        return collect(ReportType::cases())->map->toArray()->values();
     }
 }

app/Http/Controllers/Api/RoleController.php

@@ -30,11 +30,11 @@ class RoleController extends Controller
      *    }
      * ]
      *
-     * @return \Illuminate\Database\Eloquent\Collection
+     * @return \Illuminate\Support\Collection<int, array>
      */
     public function index()
     {
-        return Role::all();
+        return collect(Role::cases())->map->toArray()->values();
     }
 
     /**
@@ -56,8 +56,10 @@ public function index()
      * @param  int  $id
      * @return Role
      */
-    public function show($id)
+    public function show($id): Role
     {
-        return Role::findOrFail($id);
+        $role = Role::tryFrom((int) $id);
+        abort_if($role === null, 404);
+        return $role;
     }
 }

app/Http/Controllers/Api/ShapeController.php

@@ -26,11 +26,11 @@ class ShapeController extends Controller
      *    }
      * ]
      *
-     * @return \Illuminate\Database\Eloquent\Collection
+     * @return \Illuminate\Support\Collection<int, array>
      */
     public function index()
     {
-        return Shape::all();
+        return collect(Shape::cases())->map->toArray()->values();
     }
 
     /**
@@ -54,6 +54,8 @@ public function index()
      */
     public function show($id)
     {
-        return Shape::findOrFail($id);
+        $shape = Shape::tryFrom((int) $id);
+        abort_if($shape === null, 404);
+        return $shape;
     }
 }

app/Http/Controllers/Api/VisibilityController.php

@@ -26,11 +26,11 @@ class VisibilityController extends Controller
      *    }
      * ]
      *
-     * @return \Illuminate\Database\Eloquent\Collection
+     * @return \Illuminate\Support\Collection
      */
     public function index()
     {
-        return Visibility::all();
+        return collect(Visibility::cases())->map->toArray()->values();
     }
 
     /**
@@ -54,6 +54,8 @@ public function index()
      */
     public function show($id)
     {
-        return Visibility::findOrFail($id);
+        $visibility = Visibility::tryFrom((int) $id);
+        abort_if($visibility === null, 404);
+        return $visibility;
     }
 }

app/Http/Controllers/Views/Admin/ExportController.php

@@ -19,7 +19,10 @@ public function index()
             abort(404);
         }
 
-        $mediaTypes = MediaType::pluck('id', 'name');
+        $mediaTypes = collect(MediaType::cases())->mapWithKeys(
+            fn (MediaType $mediaType)
+            => [$mediaType->label() => $mediaType->value]
+        );
 
         return view('export.index', compact('allowedExports', 'mediaTypes'));
     }

app/Http/Controllers/Views/Annotations/AnnotationToolController.php

@@ -56,7 +56,7 @@ public function show(Request $request, $id)
             })
             ->get();
 
-        $shapes = Shape::pluck('name', 'id');
+        $shapes = Shape::pluckById();
 
         $annotationSessions = $image->volume->annotationSessions()
             ->select('id', 'name', 'starts_at', 'ends_at')

app/Http/Controllers/Views/LabelTrees/LabelTreeMembersController.php

@@ -42,8 +42,8 @@ public function show(Request $request, $id)
 
 
         $visibilities = collect([
-            Visibility::publicId() => Visibility::public()->name,
-            Visibility::privateId() => Visibility::private()->name,
+            Visibility::publicId() => Visibility::public()->label(),
+            Visibility::privateId() => Visibility::private()->label(),
         ]);
 
         return view('label-trees.show.members', [

app/Http/Controllers/Views/LabelTrees/LabelTreeProjectsController.php

@@ -67,8 +67,8 @@ protected function showMasterLabelTree(LabelTree $tree, User $user)
         }
 
         $visibilities = collect([
-            Visibility::publicId() => Visibility::public()->name,
-            Visibility::privateId() => Visibility::private()->name,
+            Visibility::publicId() => Visibility::public()->label(),
+            Visibility::privateId() => Visibility::private()->label(),
         ]);
 
         return view('label-trees.show.projects', [

app/Http/Controllers/Views/LabelTrees/LabelTreesController.php

@@ -71,7 +71,7 @@ public function create(Request $request)
             $upstreamLabelTree = null;
         }
 
-        $selectedVisibility = (int) old('visibility_id') ?: $visibilities[0]->id;
+        $selectedVisibility = (int) old('visibility_id') ?: $visibilities[0]->value;
 
         return view('label-trees.create', compact(
             'visibilities',
@@ -94,8 +94,8 @@ protected function showMasterLabelTree(LabelTree $tree, User $user)
             ->get();
 
         $visibilities = collect([
-            Visibility::publicId() => Visibility::public()->name,
-            Visibility::privateId() => Visibility::private()->name,
+            Visibility::publicId() => Visibility::public()->label(),
+            Visibility::privateId() => Visibility::private()->label(),
         ]);
 
         return view('label-trees.show.labels', [

app/Http/Controllers/Views/Projects/LargoController.php

@@ -37,7 +37,7 @@ public function index(Request $request, $id)
         $patchUrlTemplate = Storage::disk(config('largo.patch_storage_disk'))
             ->url(':prefix/:id.'.config('largo.patch_format'));
 
-        $shapes = Shape::pluck('name', 'id');
+        $shapes = Shape::pluckById();
 
         return view('largo.project', [
             'project' => $project,

app/Http/Controllers/Views/Projects/ProjectReportsController.php

@@ -38,11 +38,7 @@ protected function show(Request $request, $id)
             ->wherePivot('pinned', true)
             ->count();
 
-        $types = ReportType::when($hasImageVolume, fn ($q) => $q->where('name', 'like', 'Image%'))
-            ->when($hasVideoVolume, fn ($q) => $q->orWhere('name', 'like', 'Video%'))
-            ->orderBy('name', 'asc')
-            ->get();
-
+        $types = ReportType::getSortedTypes($hasImageVolume, $hasVideoVolume);
 
         $hasExportArea = $project->imageVolumes()
             ->whereNotNull('attrs->export_area')

app/Http/Controllers/Views/Projects/ProjectStatisticsController.php

@@ -33,9 +33,11 @@ public function show(Request $request, $id)
 
         $volumes = $project->volumes()
             ->select('id', 'name', 'updated_at', 'media_type_id')
-            ->with('mediaType')
             ->orderBy('created_at', 'desc')
-            ->get();
+            ->get()
+            ->each(function ($item) {
+                $item->setAttribute('media_type', $item->mediaType); // TODO no test
+            });
 
 
         $totalImages = Image::whereIn('images.volume_id', fn ($query) => $query->select('volume_id')

app/Http/Controllers/Views/Projects/ProjectUserController.php

@@ -25,7 +25,7 @@ public function show(Request $request, $id)
             Role::expert(),
             Role::editor(),
             Role::guest(),
-        ]);
+        ])->map->toArray();
 
         $roleOrder = [
             Role::guestId(),

app/Http/Controllers/Views/Projects/ProjectsController.php

@@ -43,12 +43,12 @@ protected function show(Request $request, $id)
         $hidden = ['doi'];
         $volumes = $project->volumes()
             ->select('id', 'name', 'updated_at', 'media_type_id')
-            ->with('mediaType')
             ->orderBy('created_at', 'desc')
             ->get()
             ->each(function ($item) use ($hidden) {
                 $item->append('thumbnailUrl')
                     ->append('thumbnailsUrl')
+                    ->setAttribute('media_type', $item->mediaType) // TODO no test for this
                     ->makeHidden($hidden);
             });
 

app/Http/Controllers/Views/Videos/VideoController.php

@@ -26,7 +26,7 @@ public function show(Request $request, $id)
         $user = $request->user();
         $volume = $video->volume;
 
-        $shapes = Shape::where('name', '!=', 'Ellipse')->pluck('name', 'id');
+        $shapes = Shape::pluckById(Shape::ellipse());
 
         if ($user->can('sudo')) {
             // Global admins have no restrictions.

app/Http/Controllers/Views/Volumes/LargoController.php

@@ -54,7 +54,7 @@ public function index(Request $request, $id)
         $patchUrlTemplate = Storage::disk(config('largo.patch_storage_disk'))
             ->url(':prefix/:id.'.config('largo.patch_format'));
 
-        $shapes = Shape::pluck('name', 'id');
+        $shapes = Shape::pluckById();
 
         if (!$volume->isVideoVolume()) {
             $wholeframeId = Shape::wholeFrameId();

app/Http/Controllers/Views/Volumes/VolumeController.php

@@ -78,7 +78,7 @@ public function index(Request $request, $id)
             $thumbUriTemplate = thumbnail_url(':uuid', config('videos.thumbnail_storage_disk'));
         }
 
-        $type = $volume->mediaType->name;
+        $type = $volume->mediaType->label();
 
         return view('volumes.show', compact(
             'volume',
@@ -102,7 +102,7 @@ public function edit(Request $request, $id)
         $this->authorize('update', $volume);
         $sessions = $volume->annotationSessions()->with('users')->get();
         $projects = $this->getProjects($request->user(), $volume);
-        $type = $volume->mediaType->name;
+        $type = $volume->mediaType->label();
 
         $parsers = collect(ParserFactory::$parsers[$type] ?? [])
             ->map(fn ($class) => [
@@ -114,7 +114,7 @@ public function edit(Request $request, $id)
         return view('volumes.edit', [
             'projects' => $projects,
             'volume' => $volume,
-            'mediaTypes' => MediaType::all(),
+            'mediaTypes' => collect(MediaType::cases())->map->toArray(),
             'annotationSessions' => $sessions,
             'today' => Carbon::today(),
             'type' => $type,

app/Http/Controllers/Views/Volumes/VolumeReportsController.php

@@ -24,10 +24,7 @@ public function show(Request $request, $id)
         $volume = Volume::findOrFail($id);
         $this->authorize('access', $volume);
         $sessions = $volume->annotationSessions()->orderBy('starts_at', 'desc')->get();
-        $types = ReportType::when($volume->isImageVolume(), fn ($q) => $q->where('name', 'like', 'Image%'))
-            ->when($volume->isVideoVolume(), fn ($q) => $q->where('name', 'like', 'Video%'))
-            ->orderBy('name', 'asc')
-            ->get();
+        $types = ReportType::getSortedTypes($volume->isImageVolume(), $volume->isVideoVolume());
 
         $user = $request->user();
 

app/Http/Requests/StoreImageAnnotation.php

@@ -6,6 +6,7 @@
 use Biigle\Rules\AnnotationPoints;
 use Biigle\Shape;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
 
 class StoreImageAnnotation extends FormRequest
 {
@@ -52,7 +53,7 @@ function ($attribute, $value, $fail) {
                 },
             ],
             'confidence'  => 'required|numeric|between:0,1',
-            'shape_id' => 'required|integer|exists:shapes,id',
+            'shape_id' => ['required', 'integer', Rule::in(Shape::pluckById()->keys()->all())],
             'points'   => [
                 'bail',
                 'required',

app/Http/Requests/StoreImageAnnotations.php

@@ -81,7 +81,7 @@ public function authorize()
     public function rules()
     {
         // Image annotations cannot have the whole frame shape.
-        $shapeIds = Shape::whereKeyNot(Shape::wholeFrameId())->pluck('id');
+        $shapeIds = Shape::pluckById(Shape::wholeFrame())->keys();
 
         return [
             '*.image_id' => 'required|integer',

app/Http/Requests/StoreLabelTree.php

@@ -4,7 +4,9 @@
 
 use Biigle\LabelTree;
 use Biigle\Project;
+use Biigle\Visibility;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
 
 class StoreLabelTree extends FormRequest
 {
@@ -41,7 +43,7 @@ public function rules()
     {
         return [
             'name' => 'required|max:256',
-            'visibility_id' => 'required|integer|exists:visibilities,id',
+            'visibility_id' => ['required', 'integer', Rule::in(array_column(Visibility::cases(), 'value'))],
             'project_id' => 'integer|exists:projects,id',
             'upstream_label_tree_id' => 'integer|exists:label_trees,id',
         ];

app/Http/Requests/StorePendingVolume.php

@@ -29,9 +29,8 @@ public function authorize(): bool
      */
     public function rules(): array
     {
-
         $rules = [
-            'media_type' => ['required', Rule::in(array_keys(MediaType::INSTANCES))],
+            'media_type' => ['required', Rule::in(MediaType::labels())],
             'metadata_parser' => [
                 'required_with:metadata_file',
             ],
@@ -108,8 +107,8 @@ 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]);
+        if (in_array($type, MediaType::labels())) {
+            $this->merge(['media_type_id' => MediaType::fromLabel(strtoupper($type))->value]);
         }
     }
 }