cssd-doc/cssd-back
1
0
Fork 0
mirror of https://git.meshkee.com/cssd/cssd-back.git synced 2026-10-13 17:51:05 +03:30
Code Issues Packages Projects Releases Wiki Activity

fix some problems

Browse Source
This commit is contained in:
mahdi purHosseini
2024-03-17 10:49:50 +03:30
parent 3e3735098c
commit 156e30a595
8 changed files with 226 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/CycleController.php
+1 -3
View File
@@ -14,12 +14,10 @@ class CycleController extends Controller
$user = auth( 'api' )->user(); $user = auth( 'api' )->user();
$Cycles = Cycle::when( $user->cant( 'showAll' , Cycle::class ) , function ( $query ) use ( $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->whereHas( 'user' , function ( $query ) use ( $user ) {
$query->where( 'medical_center_id' , $user->medical_center_id ); $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 ) { ->when( $request->has( 'cycle_id' ) && $request->cycle_id != '' , function ( $query ) use ( $request ) {
app/Http/Controllers/LabelController.php
+1 -3
View File
@@ -14,12 +14,10 @@ class LabelController extends Controller
$user = auth( 'api' )->user(); $user = auth( 'api' )->user();
$Labels = Label::when( $user->cant( 'showAll' , Label::class ) , function ( $query ) use ( $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->whereHas( 'user' , function ( $query ) use ( $user ) {
$query->where( 'medical_center_id' , $user->medical_center_id ); $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 ) { ->when( $request->has( 'sterilizer_id' ) && $request->sterilizer_id != '' , function ( $query ) use ( $request ) {
app/Http/Controllers/PackageController.php
+105 -124
View File
@@ -6,193 +6,174 @@ use App\Constants\StatusTypeEnum;
use App\Http\Requests\ChangeStatusRequest; use App\Http\Requests\ChangeStatusRequest;
use App\Http\Requests\StorePackageRequest; use App\Http\Requests\StorePackageRequest;
use App\Http\Resources\PackageResource; use App\Http\Resources\PackageResource;
use App\Interfaces\PackageRepositoryInterface;
use App\Item; use App\Item;
use App\Package; use App\Package;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
use Packages\Messaging\src\Facades\MessageResponse; use Packages\Messaging\src\Facades\MessageResponse;
class PackageController extends Controller 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 ) { $user = auth('api')->user();
$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')) {
if ( $user->hasRole( 'User' ) ) { $Packages = app(PackageRepositoryInterface::class)->indexForUser($request, $user);
$Packages = $Packages->whereHas( 'user' , function ( $query ) use ( $user ) { } elseif ($user->hasRole('Supervisor')) {
$query->where( 'medical_center_id' , $user->medical_center_id ); $Packages = app(PackageRepositoryInterface::class)->indexForSupervisor($request, $user);
} )->where( "status" , StatusTypeEnum::APPROVED ); } else {
} elseif ( $user->hasRole( 'Supervisor' ) ) { $Packages = app(PackageRepositoryInterface::class)->indexForAdmin($request, $user);
$Packages = $Packages->whereHas( 'user' , function ( $query ) use ( $user ) {
$query->where( 'medical_center_id' , $user->medical_center_id );
} );
} }
$Packages = $Packages->orderByDesc( 'id' )->paginate( 10 ); return PackageResource::collection($Packages);
return PackageResource::collection( $Packages );
} }
public function myPackages( Request $request ) public function myPackages(Request $request)
{ {
$Packages = Package::when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) { $Packages = Package::when($request->has('name') && $request->name != '', function ($query) use ($request) {
$query->where( 'name' , 'LIKE' , '%' . $request->name . '%' ); $query->where('name', 'LIKE', '%'.$request->name.'%');
} ) })
->when( $request->has( 'package_id' ) && $request->package_id != '' , function ( $query ) use ( $request ) { ->when($request->has('package_id') && $request->package_id != '', function ($query) use ($request) {
$query->where( 'id' , $request->package_id ); $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 ) { ->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->whereHas('user', function ($query) use ($request) {
$query->where( 'medical_center_id' , $request->medical_center_id ); $query->where('medical_center_id', $request->medical_center_id);
} ); });
} ) })
->with( [ ->with([
'user' , 'user',
'user.medical_center' => function ( $query ) { 'user.medical_center' => function ($query) {
$query->select( 'id' , 'name' , 'address' , 'phone_number' ); $query->select('id', 'name', 'address', 'phone_number');
} , },
"transfers" => function ( $query ) { "transfers" => function ($query) {
$query->with( [ $query->with([
'user' => function ( $query ) { 'user' => function ($query) {
$query->select( 'id' , 'name' , 'cell_number' ); $query->select('id', 'name', 'cell_number');
} , },
'user.medical_center' => function ( $query ) { 'user.medical_center' => function ($query) {
$query->select( 'id' , 'name' , 'address' , 'phone_number' ); $query->select('id', 'name', 'address', 'phone_number');
} }
] ); ]);
} }
] ); ]);
$user = auth( 'api' )->user(); $user = auth('api')->user();
if ( $user->hasRole( 'User' ) ) { if ($user->hasRole('User')) {
$Packages = $Packages->where( "user_id" , $user->id ); $Packages = $Packages->where("user_id", $user->id);
} elseif ( $user->hasRole( 'Supervisor' ) ) { } elseif ($user->hasRole('Supervisor')) {
$Packages = $Packages->whereHas( 'user' , function ( $query ) use ( $user ) { $Packages = $Packages->whereHas('user', function ($query) use ($user) {
$query->where( 'medical_center_id' , $user->medical_center_id ); $query->where('medical_center_id', $user->medical_center_id);
} ); });
} }
$Packages = $Packages->orderByDesc( 'id' )->get(); $Packages = $Packages->orderByDesc('id')->get();
return PackageResource::collection( $Packages ); return PackageResource::collection($Packages);
} }
public function getPackages() public function getPackages()
{ {
$Packages = Package::where( "status" , StatusTypeEnum::APPROVED ) $Packages = Package::where("status", StatusTypeEnum::APPROVED)
->orderByDesc( 'id' ) ->orderByDesc('id')
->get(); ->get();
return PackageResource::collection( $Packages ); return PackageResource::collection($Packages);
} }
public function show( Package $Package ) public function show(Package $Package)
{ {
$Package->load( [ $Package->load([
'user' , 'user',
'creator' , 'creator',
'items' , 'items',
'user.medical_center' => function ( $query ) { 'user.medical_center' => function ($query) {
$query->select( 'id' , 'name' , 'address' , 'phone_number' ); $query->select('id', 'name', 'address', 'phone_number');
} , },
"transfers" => function ( $query ) { "transfers" => function ($query) {
$query->with( [ $query->with([
'user' => function ( $query ) { 'user' => function ($query) {
$query->select( 'id' , 'name' , 'cell_number' ); $query->select('id', 'name', 'cell_number');
} , },
'user.medical_center' => function ( $query ) { 'user.medical_center' => function ($query) {
$query->select( 'id' , 'name' , 'address' , 'phone_number' ); $query->select('id', 'name', 'address', 'phone_number');
} }
] ); ]);
} }
] ); ]);
return PackageResource::make( $Package ); return PackageResource::make($Package);
} }
public function store( StorePackageRequest $request ) public function store(StorePackageRequest $request)
{ {
$PackageData = [ $PackageData = [
'name' => $request->name , 'name' => $request->name,
'note' => $request->note , 'note' => $request->note,
'status' => StatusTypeEnum::SUSPENDED , 'status' => StatusTypeEnum::SUSPENDED,
'user_id' => auth( 'api' )->user()->id , 'user_id' => auth('api')->user()->id,
'creator_id' => auth( 'api' )->user()->id 'creator_id' => auth('api')->user()->id
]; ];
$Package = Package::create( $PackageData ); $Package = Package::create($PackageData);
foreach ( $request->items as $itemId ) { foreach ($request->items as $itemId) {
$item = Item::where( "id" , $itemId )->first(); $item = Item::where("id", $itemId)->first();
if ( $item ) { if ($item) {
$item->update( [ $item->update([
"package_id" => $Package->id "package_id" => $Package->id
] ); ]);
} }
} }
return MessageResponse::success( trans( 'messages.success' ) ); return MessageResponse::success(trans('messages.success'));
} }
public function edit( Package $Package ) public function edit(Package $Package)
{ {
$Package->load( 'items' ); $Package->load('items');
return PackageResource::make( $Package ); return PackageResource::make($Package);
} }
public function update( StorePackageRequest $request , Package $Package ) public function update(StorePackageRequest $request, Package $Package)
{ {
$Package->update( $request->except( [ 'items' ] ) ); $Package->update($request->except(['items']));
foreach ( $request->items as $itemId ) { foreach ($request->items as $itemId) {
$item = Item::where( "id" , $itemId )->first(); $item = Item::where("id", $itemId)->first();
if ( $item ) { if ($item) {
$item->update( [ $item->update([
"package_id" => $Package->id "package_id" => $Package->id
] ); ]);
} }
} }
return MessageResponse::success( trans( 'messages.success' ) ); return MessageResponse::success(trans('messages.success'));
} }
public function destroy( Package $Package ) public function destroy(Package $Package)
{ {
if ( auth( 'api' )->user()->cant( 'delete' , $Package ) ) { if (auth('api')->user()->cant('delete', $Package)) {
return MessageResponse::error( trans( 'messages.access_denied' ) ); return MessageResponse::error(trans('messages.access_denied'));
} }
if ( count( $Package->items ) ) { if (count($Package->items)) {
foreach ( $Package->items as $item ) { foreach ($Package->items as $item) {
$item->update( [ $item->update([
"package_id" => null "package_id" => null
] ); ]);
} }
} }
if ( count( $Package->labels ) ) { if (count($Package->labels)) {
$Package->labels()->delete(); $Package->labels()->delete();
} }
$Package->transfersAll()->delete(); $Package->transfersAll()->delete();
$Package->delete(); $Package->delete();
return MessageResponse::success( trans( 'messages.success' ) ); return MessageResponse::success(trans('messages.success'));
} }
public function changeStatus( ChangeStatusRequest $request , Package $Package ) public function changeStatus(ChangeStatusRequest $request, Package $Package)
{ {
if ( auth( 'api' )->user()->cant( 'changeStatus' , Package::class ) ) { if (auth('api')->user()->cant('changeStatus', Package::class)) {
return MessageResponse::error( trans( 'messages.access_denied' ) ); return MessageResponse::error(trans('messages.access_denied'));
} }
$Package->update( [ "status" => $request->status ] ); $Package->update(["status" => $request->status]);
return MessageResponse::success( trans( 'messages.success' ) , null , $Package ); return MessageResponse::success(trans('messages.success'), null, $Package);
} }
} }
app/Interfaces/PackageRepositoryInterface.php
+12
View File
@@ -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/Package.php
+9 -9
View File
@@ -7,45 +7,45 @@ use Illuminate\Database\Eloquent\Model;
class Package extends Model class Package extends Model
{ {
public $fillable = [ 'name' , 'user_id' , 'note' , 'status' , 'creator_id' ]; public $fillable = ['name', 'user_id', 'note', 'status', 'creator_id'];
public function user() public function user()
{ {
return $this->belongsTo( 'App\User' ); return $this->belongsTo('App\User');
} }
public function creator() public function creator()
{ {
return $this->belongsTo( 'App\User' , "creator_id" ); return $this->belongsTo('App\User', "creator_id");
} }
public function items() public function items()
{ {
return $this->hasMany( 'App\Item' ); return $this->hasMany('App\Item');
} }
public function labels() public function labels()
{ {
return $this->hasMany( 'App\Label' ); return $this->hasMany('App\Label');
} }
public function transfersAll() public function transfersAll()
{ {
return $this->morphMany( 'App\Transfer' , "transferable" )->orderBy("id" , "desc"); return $this->morphMany('App\Transfer', "transferable")->orderBy("id", "desc");
} }
public function transfers() public function transfers()
{ {
return $this->morphMany( 'App\Transfer' , "transferable" )->where( "status" , StatusTypeEnum::APPROVED )->orderBy("id" , "desc"); return $this->morphMany('App\Transfer', "transferable")->where("status", StatusTypeEnum::APPROVED)->orderBy("id", "desc");
} }
public function latestTransfer() public function latestTransfer()
{ {
return $this->morphOne( 'App\Transfer' , "transferable" )->where( "status" , StatusTypeEnum::APPROVED )->orderBy("id" , "desc")->latest(); return $this->morphOne('App\Transfer', "transferable")->where("status", StatusTypeEnum::APPROVED)->orderBy("id", "desc")->latest();
} }
public function transferActive() public function transferActive()
{ {
return $this->morphMany( 'App\Transfer' , "transferable" )->where( "status" , StatusTypeEnum::APPROVED )->whereNull( "to_date" )->orderBy("id" , "desc"); return $this->morphMany('App\Transfer', "transferable")->where("status", StatusTypeEnum::APPROVED)->whereNull("to_date")->orderBy("id", "desc");
} }
} }
app/Policies/PackagePolicy.php
+5 -1
View File
@@ -15,7 +15,11 @@ class PackagePolicy
public function delete(User $User, Package $Package) 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; return true;
} }
app/Providers/AppServiceProvider.php
+7 -4
View File
@@ -2,6 +2,8 @@
namespace App\Providers; namespace App\Providers;
use App\Interfaces\PackageRepositoryInterface;
use App\Repositories\PackageRepository;
use Illuminate\Support\ServiceProvider; use Illuminate\Support\ServiceProvider;
class AppServiceProvider extends ServiceProvider class AppServiceProvider extends ServiceProvider
@@ -13,7 +15,10 @@ class AppServiceProvider extends ServiceProvider
*/ */
public function register() public function register()
{ {
$this->app->bind(
PackageRepositoryInterface::class,
PackageRepository::class
);
} }
/** /**
@@ -22,7 +27,5 @@ class AppServiceProvider extends ServiceProvider
* @return void * @return void
*/ */
public function boot() public function boot()
{ {}
//
}
} }
app/Repositories/PackageRepository.php
+86
View File
@@ -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);
}
}