Merge branch 'feature/FMSWebService' into 'develop'

change harim table

See merge request witelgroup/rms_v2!168

database/migrations/2025_07_30_153041_create_harims_table.php

@@ -13,35 +13,36 @@ return new class extends Migration
     {
         Schema::create('harims', function (Blueprint $table) {
             $table->id();
+            $table->unsignedBigInteger('panjare_vahed_id');
+            $table->string('national_id');
+            $table->string('phone_number');
             $table->foreignId('state_id')->constrained('harim_states');
             $table->string('state_name');
-            $table->string('first_name');
-            $table->string('last_name');
-            $table->string('phone_number');
-            $table->string('request_number');
             $table->date('request_date');
             $table->unsignedTinyInteger('province_id');
             $table->foreign('province_id')->references('id')->on('provinces');
             $table->string('province_name');
-            $table->unsignedSmallInteger('city_id');
+            $table->unsignedSmallInteger('city_id')->nullable();
             $table->foreign('city_id')->references('id')->on('cities');
-            $table->string('city_name');
+            $table->string('city_name')->nullable();
             $table->unsignedBigInteger('edareh_shahri_id');
             $table->foreign('edareh_shahri_id')->references('id')->on('edarate_shahri');
-            $table->string('county');
-            $table->string('division');
-            $table->string('village');
-            $table->integer('grand_area');
-            $table->integer('plan_area');
             $table->string('requested_organization');
             $table->string('plan_group');
             $table->string('plan_title');
-            $table->string('address');
-            $table->string('file');
-            $table->json('polygon');
-            $table->boolean('need_road_access')->nullable();
-            $table->boolean('is_file_good')->nullable();
             $table->boolean('is_possible')->nullable();
+            $table->string('worksheet_id');
+            $table->json('response_options')->nullable();
+            $table->string('isic');
+            $table->polygon('primary_area');
+            $table->polygon('forbidden_area')->nullable();
+            $table->polygon('final_area')->nullable();
+            $table->polygon('final_plan')->nullable();
+            $table->polygon('access_road')->nullable();
+            $table->boolean('need_payment')->nullable();
+            $table->string('payment_amount')->nullable();
+            $table->boolean('need_access_road')->nullable();
+            $table->boolean('access_road_allowed')->nullable();
             $table->timestamps();
         });
     }

database/migrations/2025_07_30_153216_create_harim_histories_table.php

@@ -15,7 +15,7 @@ return new class extends Migration
             $table->id();
             $table->foreignId('previous_state_id')->constrained('harim_states');
             $table->string('previous_state_name');
-            $table->foreignId('harim_id')->constrained('harims');
+            $table->foreignId('harim_id')->constrained('harims')->cascadeOnDelete();
             $table->foreignId('action_id')->constrained('harim_actions');
             $table->string('action_name');
             $table->unsignedInteger('expert_id');

database/migrations/2025_08_19_144959_change_column_in_harims_table.php

@@ -1,42 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('harims', function (Blueprint $table) {
-            $table->dropColumn(['first_name', 'last_name', 'request_number', 'county']);
-            $table->unsignedBigInteger('panjare_vahed_id');
-            $table->string('national_id');
-            $table->string('worksheet_id');
-            $table->json('response_options')->nullable();
-            $table->string('isic');
-            $table->polygon('primary_area');
-            $table->polygon('forbidden_area')->nullable();
-            $table->polygon('final_area');
-            $table->polygon('final_plan');
-            $table->polygon('access_road')->nullable();
-            $table->string('payment_amount');
-            $table->boolean('need_payment');
-            $table->boolean('need_access_road');
-            $table->boolean('access_road_allowed')->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('harims', function (Blueprint $table) {
-            //
-        });
-    }
-};