correct some issues
This commit is contained in:
@@ -70,7 +70,7 @@ class TasksController extends Controller
|
||||
|
||||
try {
|
||||
|
||||
$task = Task::find($request["task_id"]);
|
||||
$task = Task::with('event')->find($request["task_id"]);
|
||||
|
||||
if ($task->users()->where('user_id', $id)->exists()) {
|
||||
return response()->json(["message" => "User already assigned to this task"], 400);
|
||||
@@ -209,6 +209,11 @@ class TasksController extends Controller
|
||||
return response()->json(["message" => "Task not found"], 404);
|
||||
}
|
||||
|
||||
if (!$task->event) {
|
||||
Log::error("Relation 'event' manquante pour la tâche ID: " . $task->id);
|
||||
return response()->json(["message" => "Task is missing its parent event"], 422);
|
||||
}
|
||||
|
||||
$isAssigned = $task->users()->where('user_id', $id)->exists();
|
||||
if (!$isAssigned) {
|
||||
return response()->json(["message" => "User is not assigned to this task"], 400);
|
||||
|
||||
@@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
class Task extends Model
|
||||
{
|
||||
/** @use HasFactory<\Database\Factories\TaskFactory> */
|
||||
use HasFactory;
|
||||
|
||||
protected $fillable = [
|
||||
|
||||
@@ -8,17 +8,17 @@ use Illuminate\Auth\Access\Response;
|
||||
|
||||
class EventsPolicy
|
||||
{
|
||||
public function create(User $user, Events $model): bool
|
||||
public function create(User $user): bool
|
||||
{
|
||||
return $user->role === 1 || $user->role === 2;
|
||||
}
|
||||
|
||||
public function update(User $user, Events $model): bool
|
||||
public function update(User $user): bool
|
||||
{
|
||||
return $user->role === 1 || $user->role === 2;
|
||||
}
|
||||
|
||||
public function delete(User $user, Events $model): bool
|
||||
public function delete(User $user): bool
|
||||
{
|
||||
return $user->role === 1 || $user->role === 2;
|
||||
}
|
||||
|
||||
@@ -8,27 +8,27 @@ use Illuminate\Auth\Access\Response;
|
||||
|
||||
class TasksPolicy
|
||||
{
|
||||
public function create(User $user, Task $model): bool
|
||||
public function create(User $user): bool
|
||||
{
|
||||
return $user->role === 1 || $user->role === 2;
|
||||
}
|
||||
|
||||
public function assignOther(User $user, Task $model): bool
|
||||
public function assignOther(User $user): bool
|
||||
{
|
||||
return $user->role === 1 || $user->role === 2;
|
||||
}
|
||||
|
||||
public function unassignOther(User $user, Task $model): bool
|
||||
public function unassignOther(User $user): bool
|
||||
{
|
||||
return $user->role === 1 || $user->role === 2;
|
||||
}
|
||||
|
||||
public function delete(User $user, Task $model): bool
|
||||
public function delete(User $user): bool
|
||||
{
|
||||
return $user->role === 1 || $user->role === 2;
|
||||
}
|
||||
|
||||
public function update(User $user, Task $model): bool
|
||||
public function update(User $user): bool
|
||||
{
|
||||
return $user->role === 1 || $user->role === 2;
|
||||
}
|
||||
|
||||
@@ -7,17 +7,17 @@ use Illuminate\Auth\Access\Response;
|
||||
|
||||
class UsersPolicy
|
||||
{
|
||||
public function deleteOther(User $user, User $model): bool
|
||||
public function deleteOther(User $user): bool
|
||||
{
|
||||
return $user->role === 1;
|
||||
}
|
||||
|
||||
public function validate(User $user, User $model): bool
|
||||
public function validate(User $user): bool
|
||||
{
|
||||
return $user->role === 1 || $user->role === 2;
|
||||
}
|
||||
|
||||
public function addRole(User $user, User $model): bool
|
||||
public function addRole(User $user): bool
|
||||
{
|
||||
return $user->role === 1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user