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/Console/Commands/NewUser.php

@@ -38,9 +38,9 @@
         $u->uuid = Uuid::uuid4();
 
         if ($this->confirm('Should the user be global admin? [y|N]')) {
-            $u->role_id = Role::adminId();
+            $u->role_id = Role::ADMIN->value;
         } else {
-            $u->role_id = Role::editorId();
+            $u->role_id = Role::EDITOR->value;
         }
 
         if ($this->confirm('Do you wish to auto-generate a password? [y|N]')) {

app/Http/Controllers/Api/Import/PublicLabelTreeImportController.php

@@ -49,7 +49,7 @@ public function store(Request $request, ArchiveManager $manager)
                 }
                 $tree = DB::transaction(function () use ($import, $request) {
                     $tree = $import->perform();
-                    $tree->addMember($request->user(), Role::admin());
+                    $tree->addMember($request->user(), Role::ADMIN);
 
                     return $tree;
                 });

app/Http/Controllers/Api/LabelTreeController.php

@@ -145,7 +145,7 @@ public function store(StoreLabelTree $request)
             $tree->description = $request->input('description');
             $tree->uuid = Uuid::uuid4();
             $tree->save();
-            $tree->addMember($request->user(), Role::admin());
+            $tree->addMember($request->user(), Role::ADMIN);
 
             if (isset($request->project)) {
                 $tree->projects()->attach($request->project);

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/PendingVolumeController.php

@@ -86,7 +86,7 @@ public function store(StorePendingVolume $request)
      */
     public function storeVolume(StorePendingVolumeFromVolume $request)
     {
-        $project = Project::inCommon($request->user(), $request->volume->id, [Role::adminId()])->first();
+        $project = Project::inCommon($request->user(), $request->volume->id, [Role::ADMIN->value])->first();
 
         // Delete individually to trigger deletion of metadata files.
         $project->pendingVolumes()->where('user_id', $request->user()->id)

app/Http/Controllers/Api/ProjectInvitationController.php

@@ -41,7 +41,7 @@ public function store(StoreProjectInvitation $request)
             'uuid' => Uuid::uuid4(),
             'project_id' => $request->project->id,
             'expires_at' => $request->input('expires_at'),
-            'role_id' => $request->input('role_id', Role::editorId()),
+            'role_id' => $request->input('role_id', Role::EDITOR->value),
             'max_uses' => $request->input('max_uses'),
             'add_to_sessions' => $request->input('add_to_sessions', false),
         ]);
@@ -77,7 +77,7 @@ public function join(JoinProjectInvitation $request, $id)
             $project = $request->invitation->project;
             $userId = $request->user()->id;
             if (!$project->users()->where('user_id', $userId)->exists()) {
-                $project->addUserId($userId, $request->invitation->role_id);
+                $project->addUserId($userId, $request->invitation->role_id->value);
                 $invitation->increment('current_uses');
 
                 if ($invitation->add_to_sessions) {

app/Http/Controllers/Api/ProjectsAttachableVolumesController.php

@@ -44,14 +44,13 @@ 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')
                 ->whereIn('project_id', fn ($query) => $query->select('project_id')
                     ->from('project_user')
                     ->where('user_id', $request->user()->id)
-                    ->where('project_role_id', Role::adminId())
+                    ->where('project_role_id', Role::ADMIN->value)
                     ->where('project_id', '!=', $id)))
             ->where('name', 'ilike', "%{$name}%")
             // Do not return volumes that are already attached to this project.
@@ -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/UserController.php

@@ -222,18 +222,18 @@
             $user->password = bcrypt($request->input('password'));
         }
 
-        $user->role_id = $request->input('role_id', $user->role_id);
+        $user->role_id = $request->input('role_id', $user->role_id->value);
         $user->firstname = $request->input('firstname', $user->firstname);
         $user->lastname = $request->input('lastname', $user->lastname);
         $user->email = $request->input('email', $user->email);
         $user->affiliation = $request->input('affiliation', $user->affiliation);
-        if ($request->filled('can_review') && $user->role_id === Role::editorId()) {
+        if ($request->filled('can_review') && $user->role_id->value === Role::EDITOR->value) {
             $user->canReview = (bool) $request->input('can_review');
         } else {
             $user->canReview = false;
         }
 
-        if ($request->filled('rate_limit') && $user->role_id === Role::editorId()) {
+        if ($request->filled('rate_limit') && $user->role_id->value === Role::EDITOR->value) {
             $user->hasNoRateLimit = !boolval($request->input('rate_limit'));
         } else {
             $user->hasNoRateLimit = false;
@@ -352,7 +352,7 @@
         $user->email = $request->input('email');
         $user->affiliation = $request->input('affiliation');
         $user->password = bcrypt($request->input('password'));
-        $user->role_id = Role::editorId();
+        $user->role_id = Role::EDITOR->value;
         if ($request->filled('uuid')) {
             $user->uuid = $request->input('uuid');
         } else {

app/Http/Controllers/Api/UserRegistrationController.php

@@ -40,8 +40,8 @@
             abort(Response::HTTP_NOT_FOUND);
         }
 
-        $user = User::where('role_id', Role::guestId())->findOrFail($id);
-        $user->role_id = Role::editorId();
+        $user = User::where('role_id', Role::GUEST->value)->findOrFail($id);
+        $user->role_id = Role::EDITOR->value;
         $user->save();
 
         $user->notify(new RegistrationAccepted);
@@ -80,7 +80,7 @@
             abort(Response::HTTP_NOT_FOUND);
         }
 
-        $user = User::where('role_id', Role::guestId())->findOrFail($id);
+        $user = User::where('role_id', Role::GUEST->value)->findOrFail($id);
         $user->notifyNow(new RegistrationRejected);
         $user->delete();
 

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/Auth/RegisterController.php

@@ -99,9 +99,9 @@
         $user->password = Hash::make($data['password']);
         $user->uuid = Uuid::uuid4();
         if ($this->isAdminConfirmationEnabled()) {
-            $user->role_id = Role::guestId();
+            $user->role_id = Role::GUEST->value;
         } else {
-            $user->role_id = Role::editorId();
+            $user->role_id = Role::EDITOR->value;
         }
 
         app()->make(Modules::class)->callControllerMixins('createNewUser', [

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/Admin/ImportController.php

@@ -114,7 +114,7 @@ protected function showLabelTreeImport(LabelTreeImport $import, $token)
 
         $excludedLabelTreeCandidatesCount = $importLabelTreesCount - $labelTreeCandidatesCount;
 
-        $adminRoleId = Role::adminId();
+        $adminRoleId = Role::ADMIN->value;
 
         return view('import.showLabelTree', compact(
             'importLabelTreesCount',
@@ -161,7 +161,7 @@ protected function showVolumeImport(VolumeImport $import, string $token)
         $userCandidates = $import->getUserImportCandidates()
             ->map([$this, 'hideUserCredentials']);
 
-        $adminRoleId = Role::adminId();
+        $adminRoleId = Role::ADMIN->value;
 
         return view('import.showVolume', compact(
             'volumeCandidates',

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

@@ -42,9 +42,9 @@ public function get(Request $request)
             ->paginate(100);
 
         $roleNames = [
-            Role::adminId() => 'Admin',
-            Role::editorId() => 'Editor',
-            Role::guestId() => 'Guest',
+            Role::ADMIN->value => 'Admin',
+            Role::EDITOR->value => 'Editor',
+            Role::GUEST->value => 'Guest',
         ];
 
         $usersCount = User::whereDate('created_at', '>=', now()->subWeek())
@@ -75,9 +75,9 @@ public function edit($id)
         return view('admin.users.edit')
             ->with('affectedUser', User::findOrFail($id))
             ->with('roles', [
-                Role::admin(),
-                Role::editor(),
-                Role::guest(),
+                Role::ADMIN,
+                Role::EDITOR,
+                Role::GUEST,
             ]);
     }
 
@@ -99,7 +99,7 @@ public function delete($id)
     public function show(Modules $modules, $id)
     {
         $user = User::findOrFail($id);
-        $roleClass = $this->roleClassMap($user->role_id);
+        $roleClass = $this->roleClassMap($user->role_id->value);
         $values = $this->showProject($user);
         $values = array_merge($values, $this->showVolume($user));
         $values = array_merge($values, $this->showAnnotations($user));
@@ -122,9 +122,9 @@ public function show(Modules $modules, $id)
     protected function roleClassMap($id = null)
     {
         $map = [
-            Role::adminId() => 'danger',
-            Role::editorId() => 'primary',
-            Role::guestId() => 'default',
+            Role::ADMIN->value => 'danger',
+            Role::EDITOR->value => 'primary',
+            Role::GUEST->value => 'default',
         ];
 
         if (!is_null($id)) {

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

@@ -36,9 +36,9 @@ public function show(Request $request, $id)
             // Array of all project IDs that the user and the image have in common
             // and where the user is editor, expert or admin.
             $projectIds = Project::inCommon($user, $image->volume_id, [
-                Role::editorId(),
-                Role::expertId(),
-                Role::adminId(),
+                Role::EDITOR->value,
+                Role::EXPERT->value,
+                Role::ADMIN->value,
             ])->pluck('id');
         }
 
@@ -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')