improve code in controller and form request for V3 whit pint package
This commit is contained in:
@@ -17,12 +17,13 @@ use Illuminate\Http\Request;
|
||||
class AzmayeshController extends Controller
|
||||
{
|
||||
use ApiResponse;
|
||||
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*/
|
||||
public function index(Request $request): JsonResponse
|
||||
{
|
||||
$columns = array(
|
||||
$columns = [
|
||||
'id',
|
||||
'request_date',
|
||||
'report_date',
|
||||
@@ -37,8 +38,8 @@ class AzmayeshController extends Controller
|
||||
'updated_at',
|
||||
'created_at',
|
||||
'user_name',
|
||||
'contract_subitem_id'
|
||||
);
|
||||
'contract_subitem_id',
|
||||
];
|
||||
|
||||
$allowedFilters = $columns;
|
||||
$allowedSortings = $columns;
|
||||
@@ -81,7 +82,7 @@ class AzmayeshController extends Controller
|
||||
'province_name' => $province->name_fa,
|
||||
'user_id' => $user->id,
|
||||
'user_name' => $user->name,
|
||||
'contract_subitem_id' => $request->contract_subitem_id
|
||||
'contract_subitem_id' => $request->contract_subitem_id,
|
||||
]);
|
||||
|
||||
$user->addActivityComplete(1158);
|
||||
@@ -121,7 +122,7 @@ class AzmayeshController extends Controller
|
||||
'applicant' => $request->applicant ?? '-',
|
||||
'province_id' => $province->id,
|
||||
'province_name' => $province->name_fa,
|
||||
'contract_subitem_id' => $request->contract_subitem_id
|
||||
'contract_subitem_id' => $request->contract_subitem_id,
|
||||
]);
|
||||
|
||||
auth()->user()->addActivityComplete(1159);
|
||||
@@ -140,8 +141,7 @@ class AzmayeshController extends Controller
|
||||
auth()->user()->addActivityComplete(1160);
|
||||
|
||||
return $this->successResponse();
|
||||
}
|
||||
catch (QueryException $exception) {
|
||||
} catch (QueryException $exception) {
|
||||
return $this->errorResponse('امکان حذف وجود ندارد');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,14 +15,15 @@ use Illuminate\Http\Request;
|
||||
class AzmayeshSampleController extends Controller
|
||||
{
|
||||
use ApiResponse;
|
||||
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*/
|
||||
public function index(Request $request, string $azmayesh_id): JsonResponse
|
||||
{
|
||||
$columns = array(
|
||||
'id', 'updated_at', 'created_at'
|
||||
);
|
||||
$columns = [
|
||||
'id', 'updated_at', 'created_at',
|
||||
];
|
||||
|
||||
$allowedFilters = $columns;
|
||||
$allowedSortings = $columns;
|
||||
|
||||
@@ -20,9 +20,9 @@ class AzmayeshTypeController extends Controller
|
||||
|
||||
public function index(Request $request): JsonResponse
|
||||
{
|
||||
$columns = array(
|
||||
'id', 'name', 'updated_at', 'created_at'
|
||||
);
|
||||
$columns = [
|
||||
'id', 'name', 'updated_at', 'created_at',
|
||||
];
|
||||
|
||||
$allowedFilters = $columns;
|
||||
$allowedSortings = $columns;
|
||||
@@ -52,16 +52,14 @@ class AzmayeshTypeController extends Controller
|
||||
|
||||
public function store(StoreRequest $request): JsonResponse
|
||||
{
|
||||
DB::transaction(function () use ($request)
|
||||
{
|
||||
DB::transaction(function () use ($request) {
|
||||
$azmayeshType = AzmayeshType::query()->create([
|
||||
'name' => $request->name
|
||||
'name' => $request->name,
|
||||
]);
|
||||
|
||||
$fieldsID = [];
|
||||
|
||||
foreach ($request->fields as $field)
|
||||
{
|
||||
foreach ($request->fields as $field) {
|
||||
$azmayeshField = AzmayeshField::query()->firstOrCreate($field, $field);
|
||||
$fieldsID[] = $azmayeshField->id;
|
||||
}
|
||||
@@ -87,16 +85,14 @@ class AzmayeshTypeController extends Controller
|
||||
*/
|
||||
public function update(UpdateRequest $request, AzmayeshType $azmayeshType): JsonResponse
|
||||
{
|
||||
DB::transaction(function () use ($request, $azmayeshType)
|
||||
{
|
||||
DB::transaction(function () use ($request, $azmayeshType) {
|
||||
$azmayeshType->update([
|
||||
'name' => $request->name
|
||||
'name' => $request->name,
|
||||
]);
|
||||
|
||||
$fieldsID = [];
|
||||
|
||||
foreach ($request->fields as $field)
|
||||
{
|
||||
foreach ($request->fields as $field) {
|
||||
$azmayeshField = AzmayeshField::query()->updateOrCreate($field, $field);
|
||||
$fieldsID[] = $azmayeshField->id;
|
||||
}
|
||||
@@ -120,8 +116,7 @@ class AzmayeshTypeController extends Controller
|
||||
auth()->user()->addActivityComplete(1164);
|
||||
|
||||
return $this->successResponse();
|
||||
}
|
||||
catch (QueryException $exception) {
|
||||
} catch (QueryException $exception) {
|
||||
return $this->errorResponse('امکان حذف وجود ندارد. ابتدا آزمایش های مرتبط با این نوع را حذف نمایید');
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user