From dd85f7f5e2c552b53f53feed3710e554b0b7cd52 Mon Sep 17 00:00:00 2001 From: "ehsan.moradi" Date: Mon, 5 May 2025 17:26:36 +0330 Subject: [PATCH] change GetInputs api --- app/Http/Controllers/TestTypeController.php | 17 ++++++----------- routes/api.php | 2 +- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/TestTypeController.php b/app/Http/Controllers/TestTypeController.php index 09dd6241..0d5c4e26 100644 --- a/app/Http/Controllers/TestTypeController.php +++ b/app/Http/Controllers/TestTypeController.php @@ -7,6 +7,7 @@ use App\Models\Input; use App\Models\Option; use App\Models\TestResult; use App\Models\TestType; +use Exception; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; use Milon\Barcode\Facades\DNS1DFacade; @@ -380,20 +381,13 @@ class TestTypeController extends Controller ///////////////////////////////////////////////////////////////////////////////////// - public function getInputs(Request $request) + public function getInputs(int $testTypeId) { if (auth('api')->user()->can('getInputs')) { return MessageResponse::error(trans('messages.failed')); } - if ($request->test_result_id !== '') { - $testTypeId = TestResult::find($request->test_result_id); - } - if (isset($testTypeId) && $testTypeId) { - $testType = TestType::select('id', 'name', 'unique_code', 'device_label')->find($testTypeId->test_type_id); - } else { - $testType = TestType::where('name', $request->name)->orWhere('unique_code', $request->unique_code)->select('id', 'name', 'unique_code', 'device_label')->first(); - } - if (isset($testType) && $testType) { + try { + $testType = TestType::select('id', 'name', 'unique_code', 'device_label')->findOrFail($testTypeId); $inputs = Input::select('id', 'name', 'type', 'size', 'parent_id', 'require_scanner')->with( ['options' => function ($query) { @@ -408,8 +402,9 @@ class TestTypeController extends Controller )->whereNull('parent_id')->where('test_type_id', $testType->id)->get(); return MessageResponse::data(['testType' => $testType, 'inputs' => $inputs]); + } catch(Exception $e) { + return MessageResponse::error(); } - return MessageResponse::error(); } public function list() diff --git a/routes/api.php b/routes/api.php index 8721deed..27953f21 100644 --- a/routes/api.php +++ b/routes/api.php @@ -35,7 +35,7 @@ Route::middleware('auth:api')->group(function () { Route::post('/TestTypes/Barcode/{TestType}', [TestTypeController::class, 'generateBarcode']); Route::resource('TestTypes', TestTypeController::class); Route::resource('MedicalCenters', MedicalCenterController::class); - Route::post('/GetInputs', [TestTypeController::class, 'getInputs']); + Route::get('/GetInputs/{id}', [TestTypeController::class, 'getInputs']); // Route::post('/GetInputs', [TestTypeController::class, 'getInputs']) این بود قبلا Route::get('/GetInfo', [UserController::class, 'getInfo']); Route::get('Users/MedicalCenter/{MedicalCenter}', [UserController::class, 'getByMedicalCenter']);