From 1a15a5d7ede1b879a916f816ec850b74d6c9e401 Mon Sep 17 00:00:00 2001 From: Witel Group Date: Sun, 3 Nov 2024 06:26:26 +0000 Subject: [PATCH] change the migration columns and add form request --- .../V3/Azmayesh/AzmayeshController.php | 54 ++++--- .../V3/Azmayesh/AzmayeshSampleController.php | 90 ++++++++++++ .../V3/Azmayesh/AzmayeshTypeController.php | 2 +- .../Requests/V3/Azmayesh/StoreRequest.php | 40 ++++++ .../Requests/V3/Azmayesh/UpdateRequest.php | 40 ++++++ .../V3/AzmayeshSample/StoreRequest.php | 29 ++++ .../V3/AzmayeshSample/UpdateRequest.php | 29 ++++ app/Models/AzmayeshField.php | 10 +- ...22_092756_create_azmayesh_fields_table.php | 4 +- ...4_10_22_092800_create_azmayeshes_table.php | 8 +- ...2_114035_create_azmayesh_samples_table.php | 4 +- database/seeders/AzmayeshFieldSeeder.php | 18 +++ database/seeders/AzmayeshSampleSeeder.php | 6 +- database/seeders/AzmayeshSeeder.php | 134 ++++++++++++++---- database/seeders/AzmayeshTypeSeeder.php | 24 ++++ routes/v3.php | 18 ++- 16 files changed, 444 insertions(+), 66 deletions(-) create mode 100644 app/Http/Controllers/V3/Azmayesh/AzmayeshSampleController.php create mode 100644 app/Http/Requests/V3/Azmayesh/StoreRequest.php create mode 100644 app/Http/Requests/V3/Azmayesh/UpdateRequest.php create mode 100644 app/Http/Requests/V3/AzmayeshSample/StoreRequest.php create mode 100644 app/Http/Requests/V3/AzmayeshSample/UpdateRequest.php diff --git a/app/Http/Controllers/V3/Azmayesh/AzmayeshController.php b/app/Http/Controllers/V3/Azmayesh/AzmayeshController.php index aea47c94..e6aa7574 100644 --- a/app/Http/Controllers/V3/Azmayesh/AzmayeshController.php +++ b/app/Http/Controllers/V3/Azmayesh/AzmayeshController.php @@ -10,6 +10,8 @@ use App\Models\AzmayeshType; use App\Models\Province; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; +use App\Http\Requests\V3\Azmayesh\StoreRequest; +use App\Http\Requests\V3\Azmayesh\UpdateRequest; class AzmayeshController extends Controller { @@ -48,27 +50,27 @@ class AzmayeshController extends Controller /** * Store a newly created resource in storage. */ - public function store(Request $request): JsonResponse + public function store(StoreRequest $request): JsonResponse { - $azmayeshType = AzmayeshType::query()->find($request->azmayesh_type_id); - $province = Province::query()->find($request->province_id); + $azmayeshType = AzmayeshType::query()->findOrFail($request->azmayesh_type_id); + $province = Province::query()->findOrFail($request->province_id); Azmayesh::query()->create([ 'lat' => $request->lat, 'lng' => $request->lng, 'azmayesh_type_id' => $azmayeshType->id, 'azmayesh_type_name' => $azmayeshType->name, - 'request_date' => $request->lat, - 'report_date' => $request->lat, - 'request_number' => $request->lat, - 'employer' => $request->lat, - 'contractor' => $request->lat, - 'work_number' => $request->lat, - 'project_name' => $request->lat, - 'consultant' => $request->lat, - 'applicant' => $request->lat, + 'request_date' => $request->request_date, + 'report_date' => $request->report_date, + 'request_number' => $request->request_number ?? '-', + 'employer' => $request->employer ?? '-', + 'contractor' => $request->contractor ?? '-', + 'work_number' => $request->work_number ?? '-', + 'project_name' => $request->project_name, + 'consultant' => $request->consultant ?? '-', + 'applicant' => $request->applicant ?? '-', 'province_id' => $province->id, - 'province_name' => $province->name, + 'province_name' => $province->name_fa, ]); return $this->successResponse(); @@ -85,19 +87,27 @@ class AzmayeshController extends Controller /** * Update the specified resource in storage. */ - public function update(Request $request, Azmayesh $azmayesh): JsonResponse + public function update(UpdateRequest $request, Azmayesh $azmayesh): JsonResponse { - $province = Province::query()->find($request->province_id); + $province = Province::query()->findOrFail($request->province_id); + $azmayeshType = AzmayeshType::query()->findOrFail($request->azmayesh_type_id); $azmayesh->update([ - 'name' => $request->name, - 'username' => $request->username, - 'email' => $request->email, - 'phone_number' => $request->phone_number, - 'national_id' => $request->national_id, - 'position' => $request->position, + 'lat' => $request->lat, + 'lng' => $request->lng, + 'azmayesh_type_id' => $azmayeshType->id, + 'azmayesh_type_name' => $azmayeshType->name, + 'request_date' => $request->request_date, + 'report_date' => $request->report_date, + 'request_number' => $request->request_number ?? '-', + 'employer' => $request->employer ?? '-', + 'contractor' => $request->contractor ?? '-', + 'work_number' => $request->work_number ?? '-', + 'project_name' => $request->project_name, + 'consultant' => $request->consultant ?? '-', + 'applicant' => $request->applicant ?? '-', 'province_id' => $province->id, - 'province_name' => $province->name, + 'province_name' => $province->name_fa, ]); return $this->successResponse(); diff --git a/app/Http/Controllers/V3/Azmayesh/AzmayeshSampleController.php b/app/Http/Controllers/V3/Azmayesh/AzmayeshSampleController.php new file mode 100644 index 00000000..a6861062 --- /dev/null +++ b/app/Http/Controllers/V3/Azmayesh/AzmayeshSampleController.php @@ -0,0 +1,90 @@ +where('azmayesh_id', '=', $azmayesh_id); + + $data = DataTableFacade::run( + $query, + $request, + allowedFilters: $allowedFilters, + allowedSortings: $allowedSortings); + + return response()->json($data); + } + + /** + * Store a newly created resource in storage. + */ + public function store(StoreRequest $request): JsonResponse + { + $azmayesh = Azmayesh::query()->findOrFail($request->azmayesh_id); + + AzmayeshSample::query()->create([ + 'azmayesh_id' => $azmayesh->id, + 'azmayesh_project_name' => $azmayesh->project_name, + 'data' => $request->data, + ]); + + return $this->successResponse(); + } + + /** + * Display the specified resource. + */ + public function show(AzmayeshSample $azmayeshSample) + { + return $this->successResponse($azmayeshSample); + } + + /** + * Update the specified resource in storage. + */ + public function update(UpdateRequest $request, AzmayeshSample $azmayeshSample) + { + $azmayeshSample->update([ + 'azmayesh_id' => $azmayesh->id, + 'azmayesh_project_name' => $azmayesh->project_name, + 'data' => json_encode($request->data), + ]); + + return $this->successResponse(); + } + + /** + * Remove the specified resource from storage. + */ + public function destroy(AzmayeshSample $azmayeshSample) + { + $azmayeshSample->delete(); + + return $this->successResponse(); + } +} diff --git a/app/Http/Controllers/V3/Azmayesh/AzmayeshTypeController.php b/app/Http/Controllers/V3/Azmayesh/AzmayeshTypeController.php index f9d1cf88..1f9f0b8d 100644 --- a/app/Http/Controllers/V3/Azmayesh/AzmayeshTypeController.php +++ b/app/Http/Controllers/V3/Azmayesh/AzmayeshTypeController.php @@ -21,7 +21,7 @@ class AzmayeshTypeController extends Controller public function fields(AzmayeshType $azmayeshType): JsonResponse { - $fields = $azmayeshType->azmayeshFields; + $fields = $azmayeshType->azmayeshFields->select('id', 'name', 'unit', 'type', 'option'); return $this->successResponse($fields); } diff --git a/app/Http/Requests/V3/Azmayesh/StoreRequest.php b/app/Http/Requests/V3/Azmayesh/StoreRequest.php new file mode 100644 index 00000000..aea7c1c4 --- /dev/null +++ b/app/Http/Requests/V3/Azmayesh/StoreRequest.php @@ -0,0 +1,40 @@ +|string> + */ + public function rules(): array + { + return [ + 'lat' => 'required|string', + 'lng' => 'required|string', + 'azmayesh_type_id' => 'required|exists:azmayesh_types,id', + 'request_date' => 'date', + 'report_date' => 'date', + 'request_number' => 'string', + 'employer' => 'string', + 'contractor' => 'string', + 'work_number' => 'string', + 'project_name' => 'required|string', + 'consultant' => 'string', + 'applicant' => 'string', + 'province_id' => 'required|exists:provinces,id', + ]; + } +} diff --git a/app/Http/Requests/V3/Azmayesh/UpdateRequest.php b/app/Http/Requests/V3/Azmayesh/UpdateRequest.php new file mode 100644 index 00000000..ad2854b2 --- /dev/null +++ b/app/Http/Requests/V3/Azmayesh/UpdateRequest.php @@ -0,0 +1,40 @@ +|string> + */ + public function rules(): array + { + return [ + 'lat' => 'required|string', + 'lng' => 'required|string', + 'azmayesh_type_id' => 'required|exists:azmayesh_types,id', + 'request_date' => 'date', + 'report_date' => 'date', + 'request_number' => 'string', + 'employer' => 'string', + 'contractor' => 'string', + 'work_number' => 'string', + 'project_name' => 'required|string', + 'consultant' => 'string', + 'applicant' => 'string', + 'province_id' => 'required|exists:provinces,id', + ]; + } +} diff --git a/app/Http/Requests/V3/AzmayeshSample/StoreRequest.php b/app/Http/Requests/V3/AzmayeshSample/StoreRequest.php new file mode 100644 index 00000000..fb1a5ea5 --- /dev/null +++ b/app/Http/Requests/V3/AzmayeshSample/StoreRequest.php @@ -0,0 +1,29 @@ +|string> + */ + public function rules(): array + { + return [ + 'azmayesh_id' => 'required|exists:azmayeshes,id', + 'data' => 'required', + ]; + } +} diff --git a/app/Http/Requests/V3/AzmayeshSample/UpdateRequest.php b/app/Http/Requests/V3/AzmayeshSample/UpdateRequest.php new file mode 100644 index 00000000..4ce5d38d --- /dev/null +++ b/app/Http/Requests/V3/AzmayeshSample/UpdateRequest.php @@ -0,0 +1,29 @@ +|string> + */ + public function rules(): array + { + return [ + 'azmayesh_id' => 'required|exists:azmayeshes,id', + 'data' => 'required', + ]; + } +} diff --git a/app/Models/AzmayeshField.php b/app/Models/AzmayeshField.php index d6bd90a2..efb49a4a 100644 --- a/app/Models/AzmayeshField.php +++ b/app/Models/AzmayeshField.php @@ -5,6 +5,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsToMany; +use Illuminate\Database\Eloquent\Casts\Attribute; class AzmayeshField extends Model { @@ -12,8 +13,15 @@ class AzmayeshField extends Model protected $guarded = []; + protected function option(): Attribute + { + return Attribute::make( + get: fn ($value) => json_decode($value), + ); + } + public function azmayeshTypes(): BelongsToMany { - return $this->belongsToMany(AzmayeshType::class); + return $this->belongsToMany(AzmayeshType::class, 'azmayesh_field_azmayesh_type'); } } diff --git a/database/migrations/2024_10_22_092756_create_azmayesh_fields_table.php b/database/migrations/2024_10_22_092756_create_azmayesh_fields_table.php index b68d79c7..56584489 100644 --- a/database/migrations/2024_10_22_092756_create_azmayesh_fields_table.php +++ b/database/migrations/2024_10_22_092756_create_azmayesh_fields_table.php @@ -14,9 +14,9 @@ return new class extends Migration Schema::create('azmayesh_fields', function (Blueprint $table) { $table->id(); $table->string('name'); - $table->string('unit'); + $table->string('unit')->nullable(); $table->string('type'); - $table->string('option')->nullable(); + $table->json('option')->nullable(); $table->timestamps(); }); } diff --git a/database/migrations/2024_10_22_092800_create_azmayeshes_table.php b/database/migrations/2024_10_22_092800_create_azmayeshes_table.php index f477cea9..a740e91d 100644 --- a/database/migrations/2024_10_22_092800_create_azmayeshes_table.php +++ b/database/migrations/2024_10_22_092800_create_azmayeshes_table.php @@ -20,12 +20,12 @@ return new class extends Migration $table->unsignedTinyInteger('province_id'); $table->foreign('province_id')->references('id')->on('provinces'); $table->string('province_name'); - $table->date('request_date'); - $table->date('report_date'); - $table->integer('request_number'); + $table->date('request_date')->nullable(); + $table->date('report_date')->nullable(); + $table->string('request_number'); $table->string('employer'); $table->string('contractor'); - $table->integer('work_number'); + $table->string('work_number'); $table->string('project_name'); $table->string('consultant'); $table->string('applicant'); diff --git a/database/migrations/2024_10_22_114035_create_azmayesh_samples_table.php b/database/migrations/2024_10_22_114035_create_azmayesh_samples_table.php index a4e61680..ae579b37 100644 --- a/database/migrations/2024_10_22_114035_create_azmayesh_samples_table.php +++ b/database/migrations/2024_10_22_114035_create_azmayesh_samples_table.php @@ -13,8 +13,8 @@ return new class extends Migration { Schema::create('azmayesh_samples', function (Blueprint $table) { $table->id(); - $table->foreignId('azmayesh_id')->constrained('azmayeshes'); - $table->string('azmayesh_name'); + $table->foreignId('azmayesh_id')->constrained('azmayeshes')->cascadeOnDelete(); + $table->string('azmayesh_project_name'); $table->json('data'); $table->timestamps(); }); diff --git a/database/seeders/AzmayeshFieldSeeder.php b/database/seeders/AzmayeshFieldSeeder.php index a4201fa3..123e2b4b 100644 --- a/database/seeders/AzmayeshFieldSeeder.php +++ b/database/seeders/AzmayeshFieldSeeder.php @@ -32,6 +32,24 @@ class AzmayeshFieldSeeder extends Seeder 'created_at' => now(), 'updated_at' => now() ], + [ + 'id' => 3, + 'name' => 'تاریخ آزمایش', + 'unit' => '-', + 'type' => 'date', + 'option' => null, + 'created_at' => now(), + 'updated_at' => now() + ], + [ + 'id' => 4, + 'name' => 'وضعیت سینی', + 'unit' => '-', + 'type' => 'select', + 'option' => json_encode(['طولی', 'عرضی']), + 'created_at' => now(), + 'updated_at' => now() + ], ]); } } diff --git a/database/seeders/AzmayeshSampleSeeder.php b/database/seeders/AzmayeshSampleSeeder.php index 66a53b02..c602e92e 100644 --- a/database/seeders/AzmayeshSampleSeeder.php +++ b/database/seeders/AzmayeshSampleSeeder.php @@ -17,10 +17,8 @@ class AzmayeshSampleSeeder extends Seeder DB::table('azmayesh_samples')->insert([ [ 'id' => 1, - 'azmayesh_id' => Azmayesh::factory(), - 'azmayesh_name' => function (array $attributes) { - return Azmayesh::query()->find($attributes['azmayesh_id'])->name; - }, + 'azmayesh_id' => 1, + 'azmayesh_project_name' => 'اجرای پروژه پل میرزای شیرازی شریفیه', 'data' => json_encode([ 1 => 'test' ]), diff --git a/database/seeders/AzmayeshSeeder.php b/database/seeders/AzmayeshSeeder.php index 65c04fea..b404afdb 100644 --- a/database/seeders/AzmayeshSeeder.php +++ b/database/seeders/AzmayeshSeeder.php @@ -16,41 +16,121 @@ class AzmayeshSeeder extends Seeder DB::table('azmayeshes')->insert([ [ 'id' => 1, - 'lat' => '13.45', - 'lng' => '11.85', + 'lat' => '36.2816000000', + 'lng' => '50.0153000000', 'azmayesh_type_id' => 1, - 'azmayesh_type_name' => 'test', - 'province_id' => 11, - 'province_name' => 'test', - 'request_date' => '1403-07-04', - 'report_date' => '1403-07-05', - 'request_number' => 0, - 'employer' => 'test', - 'contractor' => 'test', - 'work_number' => 0, - 'project_name' => 'test', - 'consultant' => 'test', - 'applicant' => 'test', + 'azmayesh_type_name' => 'تعیین مقاومت فشاری بتن', + 'province_id' => 20, + 'province_name' => 'قزوین', + 'request_date' => '1403-02-12', + 'report_date' => '1403-02-12', + 'request_number' => '-', + 'employer' => 'شهرداری شریفیه', + 'contractor' => 'شرکت طرح گستر رواق', + 'work_number' => '020040035', + 'project_name' => 'اجرای پروژه پل میرزای شیرازی شریفیه', + 'consultant' => '-', + 'applicant' => 'شهرداری شریفیه', 'created_at' => now(), 'updated_at' => now() ], [ 'id' => 2, - 'lat' => '13.45', - 'lng' => '11.85', - 'azmayesh_type_id' => 1, - 'azmayesh_type_name' => 'test', - 'province_id' => 11, - 'province_name' => 'test', + 'lat' => '36.2816000000', + 'lng' => '50.0153000000', + 'azmayesh_type_id' => 4, + 'azmayesh_type_name' => 'تعیین تراکم نسبی', + 'province_id' => 20, + 'province_name' => 'قزوین', + 'request_date' => '1403-01-15', + 'report_date' => '1403-07-07', + 'request_number' => '-', + 'employer' => 'شهرداری الوند', + 'contractor' => '-', + 'work_number' => '020040001', + 'project_name' => 'کنترل کیفی پروژه های اجرایی شهرداری الوند', + 'consultant' => '-', + 'applicant' => 'شهرداری الوند', + 'created_at' => now(), + 'updated_at' => now() + ], + [ + 'id' => 3, + 'lat' => '36.2816000000', + 'lng' => '50.0153000000', + 'azmayesh_type_id' => 3, + 'azmayesh_type_name' => 'مقدار قیر پاشیده شده', + 'province_id' => 20, + 'province_name' => 'قزوین', 'request_date' => '1403-07-04', 'report_date' => '1403-07-05', - 'request_number' => '0', - 'employer' => 'test', - 'contractor' => 'test', - 'work_number' => '0', - 'project_name' => 'test', - 'consultant' => 'test', - 'applicant' => 'test', + 'request_number' => '-', + 'employer' => 'بنیاد مسکن استان قزوین', + 'contractor' => 'امور اجرایی و ماشین آلات عمرانی بنیاد مسکن', + 'work_number' => '-', + 'project_name' => 'کنترل کیفی پروژه های روستای ولدآباد', + 'consultant' => '-', + 'applicant' => 'بنیاد مسکن استان قزوین', + 'created_at' => now(), + 'updated_at' => now() + ], + [ + 'id' => 4, + 'lat' => '36.2816000000', + 'lng' => '50.0153000000', + 'azmayesh_type_id' => 1, + 'azmayesh_type_name' => 'تعیین مقاومت فشاری بتن', + 'province_id' => 20, + 'province_name' => 'قزوین', + 'request_date' => '1403-06-15', + 'report_date' => null, + 'request_number' => '15/28296', + 'employer' => 'اداره کل راهداری و حمل و نقل جاده ای استان قزوین', + 'contractor' => 'شرکت تاژه صنعت سنگسر', + 'work_number' => '010060027', + 'project_name' => 'نیوجرسی مفصلی جهت ایمن سازی آزادراه های قزوین-کرج و قزوین-زنجان', + 'consultant' => '-', + 'applicant' => 'اداره کل راهداری و حمل و نقل جاده ای استان قزوین', + 'created_at' => now(), + 'updated_at' => now() + ], + [ + 'id' => 5, + 'lat' => '36.2816000000', + 'lng' => '50.0153000000', + 'azmayesh_type_id' => 2, + 'azmayesh_type_name' => 'دانه بندی و نتایج آزمایش های آسفالت گرم', + 'province_id' => 20, + 'province_name' => 'قزوین', + 'request_date' => '1403-06-27', + 'report_date' => '1403-07-07', + 'request_number' => 'راهداری-مجتمع آقای کلانی', + 'employer' => 'اداره کل راهداری و حمل و نقل جاده ای استان قزوین', + 'contractor' => 'شرکت آرتان راهسازان البرز قزوین', + 'work_number' => '010100005', + 'project_name' => 'احداث راه های دسترسی مجتمع خدمات رفاهی حوزه آبیک-مجتمع آقای کلانی', + 'consultant' => '-', + 'applicant' => 'اداره کل راهداری و حمل و نقل جاده ای استان قزوین', + 'created_at' => now(), + 'updated_at' => now() + ], + [ + 'id' => 6, + 'lat' => '36.2816000000', + 'lng' => '50.0153000000', + 'azmayesh_type_id' => 5, + 'azmayesh_type_name' => 'دانه بندی و نتایج آزمایش های مصالح سنگی', + 'province_id' => 20, + 'province_name' => 'قزوین', + 'request_date' => '1403-03-20', + 'report_date' => '1403-07-09', + 'request_number' => '1400/4361-ص', + 'employer' => 'شرکت سهامی عام کارخانجات قند قزوین', + 'contractor' => '-', + 'work_number' => '070020123', + 'project_name' => 'آماده سازی محوطه دپوی سیلو کارخانه قند قزوین', + 'consultant' => '-', + 'applicant' => 'شرکت سهامی عام کارخانجات قند قزوین', 'created_at' => now(), 'updated_at' => now() ], diff --git a/database/seeders/AzmayeshTypeSeeder.php b/database/seeders/AzmayeshTypeSeeder.php index 3d3f56e3..77244255 100644 --- a/database/seeders/AzmayeshTypeSeeder.php +++ b/database/seeders/AzmayeshTypeSeeder.php @@ -20,6 +20,30 @@ class AzmayeshTypeSeeder extends Seeder 'created_at' => now(), 'updated_at' => now() ], + [ + 'id' => 2, + 'name' => 'دانه بندی و نتایج آزمایش های آسفالت گرم', + 'created_at' => now(), + 'updated_at' => now() + ], + [ + 'id' => 3, + 'name' => 'مقدار قیر پاشیده شده', + 'created_at' => now(), + 'updated_at' => now() + ], + [ + 'id' => 4, + 'name' => 'تعیین تراکم نسبی', + 'created_at' => now(), + 'updated_at' => now() + ], + [ + 'id' => 5, + 'name' => 'دانه بندی و نتایج آزمایش های مصالح سنگی', + 'created_at' => now(), + 'updated_at' => now() + ], ]); } } diff --git a/routes/v3.php b/routes/v3.php index bf6e68a6..7dc98798 100644 --- a/routes/v3.php +++ b/routes/v3.php @@ -1,6 +1,7 @@ name('azmayesh_types') + ->name('azmayesh_types.') ->controller(AzmayeshTypeController::class) ->group(function () { Route::get('/', 'index')->name('index'); Route::get('/fields/{azmayeshType}', 'fields')->name('fields'); }); -Route::prefix('azmayeshes') +Route::prefix('azmayesh_samples') + ->name('azmayesh_samples.') + ->controller(AzmayeshSampleController::class) + ->group(function () { + Route::get('/index/{azmayesh_id}', 'index')->name('index'); + Route::get('/{azmayeshSample}', 'show')->name('show'); + Route::post('/store', 'store')->name('store'); + Route::post('/update/{azmayeshSample}', 'update')->name('update'); + Route::post('/delete/{azmayeshSample}', 'destroy')->name('delete'); + }); + + Route::prefix('azmayeshes') ->name('azmayeshes.') ->controller(AzmayeshController::class) ->group(function () { @@ -51,5 +63,5 @@ Route::prefix('azmayeshes') Route::get('/{azmayesh}', 'show')->name('show'); Route::post('/store', 'store')->name('store'); Route::post('/update/{azmayesh}', 'update')->name('update'); - Route::post('/delete/{azmayesh}', 'delete')->name('delete'); + Route::post('/delete/{azmayesh}', 'destroy')->name('delete'); });