correct some issues
This commit is contained in:
1 parent
ab1df4d692
commit
c3122072da
10 files changed
+39
-25
No files matched your search
@@ -70,7 +70,7 @@ class TasksController extends Controller
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
||||||
$task = Task::find($request["task_id"]);
|
$task = Task::with('event')->find($request["task_id"]);
|
||||||
|
|
||||||
if ($task->users()->where('user_id', $id)->exists()) {
|
if ($task->users()->where('user_id', $id)->exists()) {
|
||||||
return response()->json(["message" => "User already assigned to this task"], 400);
|
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);
|
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();
|
$isAssigned = $task->users()->where('user_id', $id)->exists();
|
||||||
if (!$isAssigned) {
|
if (!$isAssigned) {
|
||||||
return response()->json(["message" => "User is not assigned to this task"], 400);
|
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
|
class Task extends Model
|
||||||
{
|
{
|
||||||
/** @use HasFactory<\Database\Factories\TaskFactory> */
|
|
||||||
use HasFactory;
|
use HasFactory;
|
||||||
|
|
||||||
protected $fillable = [
|
protected $fillable = [
|
||||||
|
|||||||
@@ -8,17 +8,17 @@ use Illuminate\Auth\Access\Response;
|
|||||||
|
|
||||||
class EventsPolicy
|
class EventsPolicy
|
||||||
{
|
{
|
||||||
public function create(User $user, Events $model): bool
|
public function create(User $user): bool
|
||||||
{
|
{
|
||||||
return $user->role === 1 || $user->role === 2;
|
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;
|
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;
|
return $user->role === 1 || $user->role === 2;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,27 +8,27 @@ use Illuminate\Auth\Access\Response;
|
|||||||
|
|
||||||
class TasksPolicy
|
class TasksPolicy
|
||||||
{
|
{
|
||||||
public function create(User $user, Task $model): bool
|
public function create(User $user): bool
|
||||||
{
|
{
|
||||||
return $user->role === 1 || $user->role === 2;
|
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;
|
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;
|
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;
|
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;
|
return $user->role === 1 || $user->role === 2;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,17 +7,17 @@ use Illuminate\Auth\Access\Response;
|
|||||||
|
|
||||||
class UsersPolicy
|
class UsersPolicy
|
||||||
{
|
{
|
||||||
public function deleteOther(User $user, User $model): bool
|
public function deleteOther(User $user): bool
|
||||||
{
|
{
|
||||||
return $user->role === 1;
|
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;
|
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;
|
return $user->role === 1;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ delete {
|
|||||||
}
|
}
|
||||||
|
|
||||||
vars:pre-request {
|
vars:pre-request {
|
||||||
id:
|
id: 1
|
||||||
}
|
}
|
||||||
|
|
||||||
settings {
|
settings {
|
||||||
|
|||||||
@@ -17,8 +17,8 @@ body:json {
|
|||||||
}
|
}
|
||||||
|
|
||||||
vars:pre-request {
|
vars:pre-request {
|
||||||
id: 1
|
id: 3
|
||||||
task_id: 3
|
task_id: 2
|
||||||
}
|
}
|
||||||
|
|
||||||
settings {
|
settings {
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ delete {
|
|||||||
}
|
}
|
||||||
|
|
||||||
vars:pre-request {
|
vars:pre-request {
|
||||||
id:
|
id: 1
|
||||||
}
|
}
|
||||||
|
|
||||||
settings {
|
settings {
|
||||||
|
|||||||
@@ -12,16 +12,26 @@ post {
|
|||||||
|
|
||||||
body:json {
|
body:json {
|
||||||
{
|
{
|
||||||
"event_id": 1,
|
"event_id": "{{event_id}}",
|
||||||
"name": "test12",
|
"name": "{{name}}",
|
||||||
"location": "blahhhhh",
|
"location": "{{location}}",
|
||||||
"description": "blouuuuuuuuuuh",
|
"description": "{{description}}",
|
||||||
"start": "2025-11-09 15:30:00",
|
"start": "{{start}}",
|
||||||
"end": "2025-11-09 15:30:00",
|
"end": "{{end}}",
|
||||||
"max_participants": 10
|
"max_participants": "{{max_participants}}"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
vars:pre-request {
|
||||||
|
event_id: 1
|
||||||
|
name: Organisation plage
|
||||||
|
location: la rochelle
|
||||||
|
description: il faut organiser la sortie
|
||||||
|
start: 2025-01-15T13:45
|
||||||
|
end: 2025-03-15T13:00
|
||||||
|
max_participants: 5
|
||||||
|
}
|
||||||
|
|
||||||
settings {
|
settings {
|
||||||
encodeUrl: true
|
encodeUrl: true
|
||||||
timeout: 0
|
timeout: 0
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
headers {
|
headers {
|
||||||
Accept: application/json
|
Accept: application/json
|
||||||
X-XSRF-TOKEN: eyJpdiI6ImFwSWk4NFdMcWJkcGF2YjRZQlQrRlE9PSIsInZhbHVlIjoiUXlyeFBkZFhDWmF1WE85OW1uY3c4ak1MM2dWMWlKRy9DRkN0MVNPNGVUUmthT1MxZ2hKREZhT0Y4d25idk5RdnZEcFh2UTRlbWpzYXRwSkNWL2Y5V2xlaEtYN09KMHpMQnQ4RzJvaElmWnFzTXEvSTJzZmZBenJEa2ZPelpydHoiLCJtYWMiOiIxNmIwNGRhNWQwYzIwZjBiYjA1ZTZlYzA2Y2NiY2FiNDY0NTZmNzU4NGIyZDYxODVhZGEwZWJiZmMwOGEwNzlmIiwidGFnIjoiIn0=
|
X-XSRF-TOKEN: eyJpdiI6IndFcmlWNnVVS2VFaXFHOVhzYS9iUEE9PSIsInZhbHVlIjoidWZHRUdvRy9tMWpRRnVxL0dkc2d4ZDRnTkwvVEtObndORFZpWWpNL0VTOWNOR3NHczV1V1pFUC9MdS9YTE9nMmJpZ1ViOVFmR05QaDZaN251TlNlQnl6MFB6VWNYNjdHT0NqTlBYNjRjaEY2SlhWNHk5WWwrQ09teTRwN2dzdDYiLCJtYWMiOiJhYjY0N2EwMzEzNTk4ODlkMjZkYTE0YTY1NTllN2VkODlhYjU0M2RmYzNjYzI3NDZkYjAwNWU5OTBiNDFjMjc4IiwidGFnIjoiIn0=
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user