cssd-doc/cssd-back
1
0
Fork 0
mirror of https://git.meshkee.com/cssd/cssd-back.git synced 2026-10-10 19:41:07 +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();
$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
+1 -3
View File
@@ -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
+105 -124
View File
@@ -6,193 +6,174 @@ 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();
$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 );
} );
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);
}
$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 ) {
$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' );
} ,
"transfers" => function ( $query ) {
$query->with( [
'user' => function ( $query ) {
$query->select( 'id' , 'name' , 'cell_number' );
} ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' , 'address' , 'phone_number' );
$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');
},
"transfers" => function ($query) {
$query->with([
'user' => function ($query) {
$query->select('id', 'name', 'cell_number');
},
'user.medical_center' => function ($query) {
$query->select('id', 'name', 'address', 'phone_number');
}
] );
]);
}
] );
]);
$user = auth( 'api' )->user();
if ( $user->hasRole( 'User' ) ) {
$Packages = $Packages->where( "user_id" , $user->id );
} elseif ( $user->hasRole( 'Supervisor' ) ) {
$Packages = $Packages->whereHas( 'user' , function ( $query ) use ( $user ) {
$query->where( 'medical_center_id' , $user->medical_center_id );
} );
$user = auth('api')->user();
if ($user->hasRole('User')) {
$Packages = $Packages->where("user_id", $user->id);
} 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' )->get();
$Packages = $Packages->orderByDesc('id')->get();
return PackageResource::collection( $Packages );
return PackageResource::collection($Packages);
}
public function getPackages()
{
$Packages = Package::where( "status" , StatusTypeEnum::APPROVED )
->orderByDesc( 'id' )
$Packages = Package::where("status", StatusTypeEnum::APPROVED)
->orderByDesc('id')
->get();
return PackageResource::collection( $Packages );
return PackageResource::collection($Packages);
}
public function show( Package $Package )
public function show(Package $Package)
{
$Package->load( [
'user' ,
'creator' ,
'items' ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' , 'address' , 'phone_number' );
} ,
"transfers" => function ( $query ) {
$query->with( [
'user' => function ( $query ) {
$query->select( 'id' , 'name' , 'cell_number' );
} ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' , 'address' , 'phone_number' );
$Package->load([
'user',
'creator',
'items',
'user.medical_center' => function ($query) {
$query->select('id', 'name', 'address', 'phone_number');
},
"transfers" => function ($query) {
$query->with([
'user' => function ($query) {
$query->select('id', 'name', 'cell_number');
},
'user.medical_center' => function ($query) {
$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 = [
'name' => $request->name ,
'note' => $request->note ,
'status' => StatusTypeEnum::SUSPENDED ,
'user_id' => auth( 'api' )->user()->id ,
'creator_id' => auth( 'api' )->user()->id
'name' => $request->name,
'note' => $request->note,
'status' => StatusTypeEnum::SUSPENDED,
'user_id' => auth('api')->user()->id,
'creator_id' => auth('api')->user()->id
];
$Package = Package::create( $PackageData );
foreach ( $request->items as $itemId ) {
$item = Item::where( "id" , $itemId )->first();
if ( $item ) {
$item->update( [
$Package = Package::create($PackageData);
foreach ($request->items as $itemId) {
$item = Item::where("id", $itemId)->first();
if ($item) {
$item->update([
"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' );
return PackageResource::make( $Package );
$Package->load('items');
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 ) {
$item = Item::where( "id" , $itemId )->first();
if ( $item ) {
$item->update( [
foreach ($request->items as $itemId) {
$item = Item::where("id", $itemId)->first();
if ($item) {
$item->update([
"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 ) ) {
return MessageResponse::error( trans( 'messages.access_denied' ) );
if (auth('api')->user()->cant('delete', $Package)) {
return MessageResponse::error(trans('messages.access_denied'));
}
if ( count( $Package->items ) ) {
foreach ( $Package->items as $item ) {
$item->update( [
if (count($Package->items)) {
foreach ($Package->items as $item) {
$item->update([
"package_id" => null
] );
]);
}
}
if ( count( $Package->labels ) ) {
if (count($Package->labels)) {
$Package->labels()->delete();
}
$Package->transfersAll()->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 ) ) {
return MessageResponse::error( trans( 'messages.access_denied' ) );
if (auth('api')->user()->cant('changeStatus', Package::class)) {
return MessageResponse::error(trans('messages.access_denied'));
}
$Package->update( [ "status" => $request->status ] );
return MessageResponse::success( trans( 'messages.success' ) , null , $Package );
$Package->update(["status" => $request->status]);
return MessageResponse::success(trans('messages.success'), null, $Package);
}
}