From e345034978f9d5491cfac8759364111e030f57fa Mon Sep 17 00:00:00 2001
From: mahdi purHosseini <mahdip9811@gmail.com>
Date: Wed, 3 Jan 2024 14:24:19 +0330
Subject: [PATCH] fix policies

---
 app/Http/Controllers/ItemController.php   |  2 --
 app/Http/Requests/StoreItemRequest.php    |  5 +----
 app/Http/Requests/StorePackageRequest.php |  6 +-----
 app/Policies/ItemPolicy.php               | 12 +++++-------
 app/Policies/PackagePolicy.php            | 12 +++++-------
 5 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php
index b14b16b7..1b8738f3 100644
--- a/app/Http/Controllers/ItemController.php
+++ b/app/Http/Controllers/ItemController.php
@@ -151,9 +151,7 @@ class ItemController extends Controller
             'user_id' => auth( 'api' )->user()->id ,
             'creator_id' => auth( 'api' )->user()->id
         ] );
-
         MediaHelper::moveMediaTo( $Item );
-
         return MessageResponse::success( trans( 'messages.success' ) );
     }
 
diff --git a/app/Http/Requests/StoreItemRequest.php b/app/Http/Requests/StoreItemRequest.php
index 0d5ac368..13e11162 100644
--- a/app/Http/Requests/StoreItemRequest.php
+++ b/app/Http/Requests/StoreItemRequest.php
@@ -2,16 +2,13 @@
 
 namespace App\Http\Requests;
 
-use App\Item;
 use Illuminate\Foundation\Http\FormRequest;
 
 class StoreItemRequest extends FormRequest
 {
     public function authorize()
     {
-        if ($this->method() == 'POST') {
-            return auth('api')->check() &&  auth('api')->user()->can('store', Item::class);
-        } else {
+        if ($this->method() != 'POST') {
             $Item = $this->route('Item');
             return auth('api')->check() && $Item && auth('api')->user()->can('update', $Item);
         }
diff --git a/app/Http/Requests/StorePackageRequest.php b/app/Http/Requests/StorePackageRequest.php
index 64294deb..4618d899 100644
--- a/app/Http/Requests/StorePackageRequest.php
+++ b/app/Http/Requests/StorePackageRequest.php
@@ -2,16 +2,13 @@
 
 namespace App\Http\Requests;
 
-use App\Package;
 use Illuminate\Foundation\Http\FormRequest;
 
 class StorePackageRequest extends FormRequest
 {
     public function authorize()
     {
-        if ($this->method() == 'POST') {
-            return auth('api')->check() &&  auth('api')->user()->can('store', Package::class);
-        } else {
+        if ($this->method() != 'POST') {
             $Package = $this->route('Package');
             return auth('api')->check() && $Package && auth('api')->user()->can('update', $Package);
         }
@@ -37,7 +34,6 @@ class StorePackageRequest extends FormRequest
                     'items' => 'required',
                 ];
                 break;
-
             }
             default:
                 break;
diff --git a/app/Policies/ItemPolicy.php b/app/Policies/ItemPolicy.php
index 22b771ee..2f7a191f 100644
--- a/app/Policies/ItemPolicy.php
+++ b/app/Policies/ItemPolicy.php
@@ -26,13 +26,11 @@ class ItemPolicy
 
     public function update( User $User , Item $Item )
     {
-        if ( $User->hasRole( 'Admin' ) || ( $User->hasRole( 'Supervisor' ) && $Item->user->medical_center_id == $User->medical_center_id ) )
-            return true;
-    }
-
-    public function store( User $User )
-    {
-        if ( $User->hasRole( 'Admin' ) || $User->hasRole( 'Supervisor' ) )
+        if (
+            $User->hasRole( 'Admin' ) ||
+            ( $User->hasRole( 'Supervisor' ) && $Item->user->medical_center_id == $User->medical_center_id ) ||
+            $Item->user_id == $User->id
+        )
             return true;
     }
 
diff --git a/app/Policies/PackagePolicy.php b/app/Policies/PackagePolicy.php
index d632346a..e0722009 100644
--- a/app/Policies/PackagePolicy.php
+++ b/app/Policies/PackagePolicy.php
@@ -4,7 +4,6 @@ namespace App\Policies;
 
 use App\User;
 use App\Package;
-use Doctrine\Tests\Common\Inflector\InflectorTest;
 
 class PackagePolicy
 {
@@ -22,15 +21,14 @@ class PackagePolicy
 
     public function update(User $User, Package $Package)
     {
-        if($User->hasRole('Admin') || ($User->hasRole('Supervisor') && $Package->user->medical_center_id == $User->medical_center_id))
+        if(
+            $User->hasRole('Admin') ||
+            ($User->hasRole('Supervisor') && $Package->user->medical_center_id == $User->medical_center_id ) ||
+            $Package->user_id == $User->id
+        )
             return true;
     }
 
-    public function store(User $User)
-    {
-      if($User->hasRole('Admin') || $User->hasRole('Supervisor'))
-          return true;
-    }
     public function verifyPackage(User $User, Package $Package)
     {
         if($User->hasRole('Admin') || ($User->hasRole('Supervisor') && $Package->user->medical_center_id == $User->medical_center_id))