RMS/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve all of the code

Browse Source
This commit is contained in:
joddyabott
2025-05-19 11:53:09 +03:30
parent 355941d1e1
commit 3ee7a49ce9
4 changed files with 96 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
app/Http/Controllers/V3/Dashboard/Mission/CartableController.php
View File

@@ -1,82 +0,0 @@
<?php
namespace App\Http\Controllers\V3\Dashboard\Mission;
use App\Http\Controllers\Controller;
use App\Http\Requests\V3\Mission\RequestPortal\StoreRequest;
use App\Http\Requests\V3\Mission\RequestPortal\UpdateRequest;
use App\Http\Traits\ApiResponse;
use App\Models\Mission;
use App\Services\Missions\CartableService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
class CartableController extends Controller
{
use ApiResponse;
public function index(Request $request,CartableService $cartableService): JsonResponse
{
return response()->json($cartableService->datatable($request));
}
public function store(StoreRequest $request): JsonResponse
{
$mission = Mission::query()->create([
'user_id'=> auth()->user()->id(),
'state_id' => $request->state_id,
'state_name' => $request->state_name,
'requested_machine_type' =>$request->requested_machine_type,
'requested_machine_numbers' =>$request->requested_machine_numbers,
'type' =>$request->type,
'start_date' =>$request->start_date,
'end_date' =>$request->end_date,
'request_date' =>$request->request_date,
'description' =>$request->description,
'start_point' =>$request->start_point,
'end_point' =>$request->end_point,
]);
$mission->rahdaran()->attach($request->rahdaran);
return $this->successResponse();
}
public function show(Mission $mission): JsonResponse
{
return $this->successResponse($mission);
}
public function update(UpdateRequest $request,Mission $mission): JsonResponse
{
$mission->update([
'state_id' => $request->state_id,
'state_name' => $request->state_name,
'requested_machine_type' =>$request->requested_machine_type,
'requested_machine_numbers' =>$request->requested_machine_numbers,
'type' =>$request->type,
'start_date' =>$request->start_date,
'end_date' =>$request->end_date,
'request_date' =>$request->request_date,
'description' =>$request->description,
'start_point' =>$request->start_point,
'end_point' =>$request->end_point,
]);
$mission->rahdaran()->sync($request->rahdaran);
return $this->successResponse();
}
public function destroy(Mission $mission): JsonResponse
{
$mission->rahdaran()->detach();
$mission->delete();
return $this->successResponse();
}
}

87
app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php Normal file
View File

@@ -0,0 +1,87 @@
<?php
namespace App\Http\Controllers\V3\Dashboard\Mission;
use App\Enums\MissionStates;
use App\Http\Controllers\Controller;
use App\Http\Requests\V3\Mission\RequestPortal\StoreRequest;
use App\Http\Requests\V3\Mission\RequestPortal\UpdateRequest;
use App\Http\Traits\ApiResponse;
use App\Models\Mission;
use App\Services\Mission\RequestPortalService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
class RequestPortalController extends Controller
{
use ApiResponse;
public function index(Request $request, RequestPortalService $requestPortalService): JsonResponse
{
return response()->json($requestPortalService->datatable($request));
}
public function store(StoreRequest $request): JsonResponse
{
DB::transaction(function () use ($request) {
$state = MissionStates::REQUEST_CREATED->value;
$mission = Mission::query()->create([
'user_id'=> auth()->user()->id,
'state_id' =>$state,
'state_name' => MissionStates::name($state),
'requested_machine_type' => $request->requested_machine_type,
'requested_machine_numbers' => $request->requested_machine_numbers,
'type' => $request->type,
'start_date' => $request->start_date,
'end_date' => $request->end_date,
'request_date' => $request->request_date,
'description' => $request->description,
'start_point' => $request->start_point,
'end_point' => $request->end_point,
]);
$mission->rahdaran()->attach($request->rahdaran);
});
return $this->successResponse();
}
public function show(Mission $mission): JsonResponse
{
return $this->successResponse($mission);
}
public function update(UpdateRequest $request,Mission $mission): JsonResponse
{
DB::transaction(function () use ($mission, $request) {
$state = MissionStates::REQUEST_CREATED->value;
$mission->update([
'state_id' =>$state,
'state_name' => MissionStates::name($state),
'requested_machine_type' => $request->requested_machine_type,
'requested_machine_numbers' => $request->requested_machine_numbers,
'type' => $request->type,
'start_date' => $request->start_date,
'end_date' => $request->end_date,
'request_date' => $request->request_date,
'description' => $request->description,
'start_point' => $request->start_point,
'end_point' => $request->end_point,
]);
$mission->rahdaran()->sync($request->rahdaran);
});
return $this->successResponse();
}
public function destroy(Mission $mission): JsonResponse
{
DB::transaction(function () use ($mission) {
$mission->rahdaran()->detach();
$mission->delete();
});
return $this->successResponse();
}
}

19
app/Services/Mission/CartableService.php → app/Services/Mission/RequestPortalService.php
View File

@@ -1,6 +1,6 @@
<?php
namespace App\Services\Missions;
namespace App\Services\Mission;
use App\Facades\DataTable\DataTableFacade;
@@ -8,31 +8,26 @@ use App\Http\Traits\ApiResponse;
use App\Models\Mission;
use Illuminate\Http\Request;
class CartableService
class RequestPortalService
{
use ApiResponse;
public function datatable(Request $request)
{
$user = auth()->user();
$allowedFilters = ['*'];
$allowedSortings = ['*'];
$query = Mission::query();
if ($user->hasPermissionTo('mission-manage-city')) {
$query->where('city_id', $user->edarate_shahri_id);
$query->where('edarate_shahri_id', '=', $user->edarate_shahri_id);
}
elseif ($user->hasPermissionTo('mission-manage-province')) {
$query->where('province_id', $user->province_id);
}
elseif ($user->hasPermissionTo('mission-manage-country')) {
$query->where('province_id', '=', $user->province_id);
}
return DataTableFacade::run(
$query,
$request,
allowedFilters: $allowedFilters,
allowedSortings: $allowedSortings
allowedFilters: ['*'],
allowedSortings: ['*']
);
}

4
routes/v3.php
View File

@@ -7,7 +7,7 @@ use App\Http\Controllers\V3\Dashboard\Azmayesh\AzmayeshController;
use App\Http\Controllers\V3\Dashboard\Azmayesh\AzmayeshSampleController;
use App\Http\Controllers\V3\Dashboard\Azmayesh\AzmayeshTypeController;
use App\Http\Controllers\V3\Dashboard\ItemsManagementController;
use App\Http\Controllers\V3\Dashboard\Mission\CartableController;
use App\Http\Controllers\V3\Dashboard\Mission\RequestPortalController;
use App\Http\Controllers\V3\Dashboard\ObservedItemController;
use App\Http\Controllers\V3\Dashboard\AccidentReceiptController;
use App\Http\Controllers\V3\Dashboard\OtpManagementController;
@@ -427,7 +427,7 @@ Route::prefix('road_maintenance_station')
});
Route::prefix('missions')
->name('missions.')
->controller(CartableController::class)
->controller(RequestPortalController::class)
->group(function () {
Route::get('/', 'index')->name('index');
Route::post('/', 'store')->name('store');