Eloquent firstOrNotFound

[albertcito]

Is there a possibility to add this function firstOrNotFound to eloquent. For instance firstOrFail it returns a ModelNotFoundException that is right and I catch it in my error report. But sometimes I would like just to return a 404 error, because it is a controlled error. In that case I would like a function like this:

public function firstOrNotFound(Builder $query): mixed
{
    $model = $query->first();

    if (!$model) {
        throw new NotFoundHttpException();
    }

    return $model;
}

Someone knows how to add that function as global function in my code using eloquent and typed data? Right now I return mixed because that is a global class that extends all models. And I call it in this way:

$user = User::firstOrNotFound( 
  User::where('email', '[email protected]')
);

[albertcito]

Looks like I should use this function firstOr:

User::where('email', '[email protected]')->firstOr(
  callback: fn () => throw new NotFoundHttpException(),
);

[shaedrich]

Either that, or firstOrFail() could be changed to

/**
 * Execute the query and get the first result or throw an exception.
 *
 * @param  array|string  $columns
 * @param  class-string  $exception
 * @return \Illuminate\Database\Eloquent\Model|static
 *
 * @throws \Illuminate\Database\Eloquent\ModelNotFoundException<\Illuminate\Database\Eloquent\Model>|Exception
 */
public function firstOrFail($columns = ['*'], $exception = ModelNotFoundException::class)
    {
        if (! is_null($model = $this->first($columns))) {
            return $model;
        }

        if (!class_exists($exception) || !is_subclass_of($exception, Exception::class)) {
            $exception = ModelNotFoundException::class;
        }

        throw (new $exception)->setModel(get_class($this->model));
    }