fix some problems

app/Http/Controllers/CycleController.php

@@ -14,12 +14,10 @@ class CycleController extends Controller
         $user = auth( 'api' )->user();
 
         $Cycles = Cycle::when( $user->cant( 'showAll' , Cycle::class ) , function ( $query ) use ( $user ) {
-            if ( $user->hasRole( 'Supervisor' ) ) {
+            if ( $user->hasRole( 'Supervisor' ) and $user->hasRole( 'User' ) ) {
                 $query->whereHas( 'user' , function ( $query ) use ( $user ) {
                     $query->where( 'medical_center_id' , $user->medical_center_id );
                 } );
-            } else {
-                $query->where( 'user_id' , $user->id );
             }
         } )
             ->when( $request->has( 'cycle_id' ) && $request->cycle_id != '' , function ( $query ) use ( $request ) {

app/Http/Controllers/LabelController.php

@@ -14,12 +14,10 @@ class LabelController extends Controller
         $user = auth( 'api' )->user();
 
         $Labels = Label::when( $user->cant( 'showAll' , Label::class ) , function ( $query ) use ( $user ) {
-            if ( $user->hasRole( 'Supervisor' ) ) {
+            if ( $user->hasRole( 'Supervisor' ) and $user->hasRole( 'User' ) ) {
                 $query->whereHas( 'user' , function ( $query ) use ( $user ) {
                     $query->where( 'medical_center_id' , $user->medical_center_id );
                 } );
-            } else {
-                $query->where( 'user_id' , $user->id );
             }
         } )
             ->when( $request->has( 'sterilizer_id' ) && $request->sterilizer_id != '' , function ( $query ) use ( $request ) {

app/Http/Controllers/PackageController.php

@@ -6,45 +6,26 @@ use App\Constants\StatusTypeEnum;
 use App\Http\Requests\ChangeStatusRequest;
 use App\Http\Requests\StorePackageRequest;
 use App\Http\Resources\PackageResource;
+use App\Interfaces\PackageRepositoryInterface;
 use App\Item;
 use App\Package;
 use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
 use Packages\Messaging\src\Facades\MessageResponse;
 
 class PackageController extends Controller
 {
-    public function index( Request $request )
+    public function index(Request $request): AnonymousResourceCollection
     {
-        $Packages = Package::when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) {
-            $query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
-        } )
-            ->when( $request->has( 'package_id' ) && $request->package_id != '' , function ( $query ) use ( $request ) {
-                $query->where( 'id' , $request->package_id );
-            } )
-            ->when( $request->has( 'medical_center_id' ) && $request->medical_center_id != '' && $request->medical_center_id != 'undefined' , function ( $query ) use ( $request ) {
-                $query->whereHas( 'user' , function ( $query ) use ( $request ) {
-                    $query->where( 'medical_center_id' , $request->medical_center_id );
-                } );
-            } )
-            ->with( [
-                'user' ,
-                'user.medical_center' => function ( $query ) {
-                    $query->select( 'id' , 'name' , 'address' , 'phone_number' );
-                } ,
-            ] );
-
         $user = auth('api')->user();
-        if ( $user->hasRole( 'User' ) ) {
-            $Packages = $Packages->whereHas( 'user' , function ( $query ) use ( $user ) {
-                $query->where( 'medical_center_id' , $user->medical_center_id );
-            } )->where( "status" , StatusTypeEnum::APPROVED );
-        } elseif ( $user->hasRole( 'Supervisor' ) ) {
-            $Packages = $Packages->whereHas( 'user' , function ( $query ) use ( $user ) {
-                $query->where( 'medical_center_id' , $user->medical_center_id );
-            } );
-        }
 
-        $Packages = $Packages->orderByDesc( 'id' )->paginate( 10 );
+        if ($user->hasRole('User')) {
+            $Packages = app(PackageRepositoryInterface::class)->indexForUser($request, $user);
+        } elseif ($user->hasRole('Supervisor')) {
+            $Packages = app(PackageRepositoryInterface::class)->indexForSupervisor($request, $user);
+        } else {
+            $Packages = app(PackageRepositoryInterface::class)->indexForAdmin($request, $user);
+        }
 
         return PackageResource::collection($Packages);
     }

app/Interfaces/PackageRepositoryInterface.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Interfaces;
+
+interface PackageRepositoryInterface
+{
+    public function indexForUser($request , $user);
+
+    public function indexForSupervisor($request , $user);
+
+    public function indexForAdmin($request , $user);
+}

app/Policies/PackagePolicy.php

@@ -15,7 +15,11 @@ class PackagePolicy
 
     public function delete(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) ||
+            ($User->hasRole('User') && $Package->user_id == $User->id)
+        )
             return true;
     }
 

app/Providers/AppServiceProvider.php

@@ -2,6 +2,8 @@
 
 namespace App\Providers;
 
+use App\Interfaces\PackageRepositoryInterface;
+use App\Repositories\PackageRepository;
 use Illuminate\Support\ServiceProvider;
 
 class AppServiceProvider extends ServiceProvider
@@ -13,7 +15,10 @@ class AppServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        
+        $this->app->bind(
+            PackageRepositoryInterface::class,
+            PackageRepository::class
+        );
     }
 
     /**
@@ -22,7 +27,5 @@ class AppServiceProvider extends ServiceProvider
      * @return void
      */
     public function boot()
-    {
+    {}
-        //
-    }
 }

app/Repositories/PackageRepository.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Repositories;
+
+use App\Constants\StatusTypeEnum;
+use App\Interfaces\PackageRepositoryInterface;
+use App\Package;
+
+class PackageRepository implements PackageRepositoryInterface
+{
+    public function indexForUser($request, $user)
+    {
+        return Package::when($request->has('name') && $request->name != '', function ($query) use ($request) {
+            $query->where('name', 'LIKE', '%'.$request->name.'%');
+        })
+            ->when($request->has('package_id') && $request->package_id != '', function ($query) use ($request) {
+                $query->where('id', $request->package_id);
+            })
+            ->when($request->has('medical_center_id') && $request->medical_center_id != '' && $request->medical_center_id != 'undefined', function ($query) use ($request) {
+                $query->whereHas('user', function ($query) use ($request) {
+                    $query->where('medical_center_id', $request->medical_center_id);
+                });
+            })
+            ->with([
+                'user',
+                'user.medical_center' => function ($query) {
+                    $query->select('id', 'name', 'address', 'phone_number');
+                },
+            ])
+            ->whereHas('user', function ($query) use ($user) {
+                $query->where('medical_center_id', $user->medical_center_id);
+            })
+            ->where("user_id", $user->id)
+            ->orWhere("status", StatusTypeEnum::APPROVED)
+            ->orderByDesc('id')
+            ->paginate(10);
+    }
+
+    public function indexForSupervisor($request, $user)
+    {
+        return Package::when($request->has('name') && $request->name != '', function ($query) use ($request) {
+            $query->where('name', 'LIKE', '%'.$request->name.'%');
+        })
+            ->when($request->has('package_id') && $request->package_id != '', function ($query) use ($request) {
+                $query->where('id', $request->package_id);
+            })
+            ->when($request->has('medical_center_id') && $request->medical_center_id != '' && $request->medical_center_id != 'undefined', function ($query) use ($request) {
+                $query->whereHas('user', function ($query) use ($request) {
+                    $query->where('medical_center_id', $request->medical_center_id);
+                });
+            })
+            ->with([
+                'user',
+                'user.medical_center' => function ($query) {
+                    $query->select('id', 'name', 'address', 'phone_number');
+                },
+            ])->whereHas('user', function ($query) use ($user) {
+                $query->where('medical_center_id', $user->medical_center_id);
+            })
+            ->orderByDesc('id')
+            ->paginate(10);
+    }
+
+    public function indexForAdmin($request, $user)
+    {
+        return Package::when($request->has('name') && $request->name != '', function ($query) use ($request) {
+            $query->where('name', 'LIKE', '%'.$request->name.'%');
+        })
+            ->when($request->has('package_id') && $request->package_id != '', function ($query) use ($request) {
+                $query->where('id', $request->package_id);
+            })
+            ->when($request->has('medical_center_id') && $request->medical_center_id != '' && $request->medical_center_id != 'undefined', function ($query) use ($request) {
+                $query->whereHas('user', function ($query) use ($request) {
+                    $query->where('medical_center_id', $request->medical_center_id);
+                });
+            })
+            ->with([
+                'user',
+                'user.medical_center' => function ($query) {
+                    $query->select('id', 'name', 'address', 'phone_number');
+                },
+            ])
+            ->orderByDesc('id')
+            ->paginate(10);
+    }
+}