use soft delete and fix some errors for model

dinwwwh · May 14, 2023 · 6366526 · 6366526
1 parent 3567d76
commit 6366526
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 4 deletions.
diff --git a/database/migrations/create_vietnamese_administrative_units_table.php.stub b/database/migrations/create_vietnamese_administrative_units_table.php.stub
@@ -15,6 +15,7 @@ return new class extends Migration
             $table->string('name', 50)->index();
 
             $table->timestamps();
+            $table->softDeletes();
         });
 
         Schema::create(config('vietnamese-administrative-units.district.table', 'districts'), function (Blueprint $table) {
@@ -26,6 +27,7 @@ return new class extends Migration
             $table->string('name', 50)->index();
 
             $table->timestamps();
+            $table->softDeletes();
         });
 
         Schema::create(config('vietnamese-administrative-units.ward.table', 'wards'), function (Blueprint $table) {
@@ -37,6 +39,7 @@ return new class extends Migration
             $table->string('name', 50)->index();
 
             $table->timestamps();
+            $table->softDeletes();
         });
     }
 };
diff --git a/src/Models/District.php b/src/Models/District.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * @property int $id
@@ -15,10 +16,12 @@
 class District extends Model
 {
     use HasFactory;
+    use SoftDeletes;
 
     protected $fillable = [
         'code',
         'name',
+        'province_id',
     ];
 
     public function getTable()
@@ -28,7 +31,7 @@ public function getTable()
 
     public function province()
     {
-        return $this->belongsTo(config('vietnamese-administrative-units.province.model', Province::class));
+        return $this->belongsTo(config('vietnamese-administrative-units.province.model', Province::class))->withTrashed();
     }
 
     public function wards()

diff --git a/src/Models/Province.php b/src/Models/Province.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * @property int $id
@@ -14,6 +15,7 @@
 class Province extends Model
 {
     use HasFactory;
+    use SoftDeletes;
 
     protected $fillable = [
         'code',

diff --git a/src/Models/Ward.php b/src/Models/Ward.php
@@ -4,21 +4,23 @@
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * @property int $id
  * @property string $code
  * @property string $name
- * @property Province $province
- * @property Ward[]|\Illuminate\Database\Eloquent\Collection $wards
+ * @property District $district
  */
 class Ward extends Model
 {
     use HasFactory;
+    use SoftDeletes;
 
     protected $fillable = [
         'code',
         'name',
+        'district_id',
     ];
 
     public function getTable()
@@ -28,6 +30,6 @@ public function getTable()
 
     public function district()
     {
-        return $this->belongsTo(config('vietnamese-administrative-units.district.model', District::class));
+        return $this->belongsTo(config('vietnamese-administrative-units.district.model', District::class))->withTrashed();
     }
 }
diff --git a/tests/ModelTest.php b/tests/ModelTest.php
@@ -3,6 +3,7 @@
 use Dilee\VietnameseAdministrativeUnits\Models\District;
 use Dilee\VietnameseAdministrativeUnits\Models\Province;
 use Dilee\VietnameseAdministrativeUnits\Models\Ward;
+use function Pest\Laravel\assertDatabaseCount;
 
 it('relationships are working', function () {
     Ward::factory()->count(10)->create();
@@ -13,3 +14,23 @@
     expect($ward->district->province)->toBeInstanceOf(Province::class);
     expect($ward->district->province->districts)->toHaveCount(1);
 });
+
+it('bypass soft delete', function () {
+    /** @var Ward */
+    $ward = Ward::factory()->create();
+
+    $district = $ward->district;
+    $province = $district->province;
+
+    $district->delete();
+    $province->delete();
+
+    assertDatabaseCount('provinces', 1);
+    assertDatabaseCount('districts', 1);
+    assertDatabaseCount('wards', 1);
+
+    $ward = Ward::first();
+
+    expect($ward->district)->toBeInstanceOf(District::class);
+    expect($ward->district->province)->toBeInstanceOf(Province::class);
+});