chore: remove user relation for person model (#21)

* removed user relationship from Person

* fix

* fix

* wip

* removed user from PersonImporter.php

* cleanup

* wip

Author: chinmaypurav

app/Filament/Concerns/IncomeExpenseResourceTrait.php

@@ -42,8 +42,7 @@ public static function form(Form $form): Form
                 Select::make('person_id')
                     ->relationship(
                         'person',
-                        'name',
-                        fn (Builder $query): Builder => $query->where('user_id', auth()->id())
+                        'name'
                     )
                     ->nullable(),
 

app/Filament/Imports/PersonImporter.php

@@ -14,10 +14,6 @@ class PersonImporter extends Importer
     public static function getColumns(): array
     {
         return [
-            ImportColumn::make('user')
-                ->requiredMapping()
-                ->relationship(resolveUsing: 'name')
-                ->rules(['required']),
             ImportColumn::make('name')
                 ->requiredMapping()
                 ->rules(['required', 'max:255']),

app/Filament/Resources/PersonResource.php

@@ -14,8 +14,6 @@
 use Filament\Tables\Actions\EditAction;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
 
 class PersonResource extends Resource
 {
@@ -70,24 +68,8 @@ public static function getPages(): array
         ];
     }
 
-    public static function getGlobalSearchEloquentQuery(): Builder
-    {
-        return parent::getGlobalSearchEloquentQuery()->with(['user']);
-    }
-
     public static function getGloballySearchableAttributes(): array
     {
-        return ['name', 'user.name'];
-    }
-
-    public static function getGlobalSearchResultDetails(Model $record): array
-    {
-        $details = [];
-
-        if ($record->user) {
-            $details['User'] = $record->user->name;
-        }
-
-        return $details;
+        return ['name'];
     }
 }

app/Models/Person.php

@@ -4,24 +4,17 @@
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class Person extends Model
 {
     use HasFactory;
 
     protected $fillable = [
-        'user_id',
         'name',
         'nick_name',
     ];
 
-    public function user(): BelongsTo
-    {
-        return $this->belongsTo(User::class);
-    }
-
     public function expenses(): HasMany
     {
         return $this->hasMany(Expense::class, 'person_id');

app/Models/User.php

@@ -53,11 +53,6 @@ public function accounts(): HasMany
         return $this->hasMany(Account::class, 'user_id');
     }
 
-    public function people(): HasMany
-    {
-        return $this->hasMany(Person::class, 'user_id');
-    }
-
     public function expenses(): HasMany
     {
         return $this->hasMany(Expense::class, 'user_id');

database/factories/PersonFactory.php

@@ -3,7 +3,6 @@
 namespace Database\Factories;
 
 use App\Models\Person;
-use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Carbon;
 
@@ -17,8 +16,6 @@ public function definition(): array
             'created_at' => Carbon::now(),
             'updated_at' => Carbon::now(),
             'name' => fake()->name(),
-
-            'user_id' => User::factory(),
         ];
     }
 }

database/migrations/2024_04_28_132717_create_people_table.php

@@ -1,6 +1,5 @@
 <?php
 
-use App\Models\User;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -11,8 +10,7 @@ public function up(): void
     {
         Schema::create('people', function (Blueprint $table) {
             $table->id();
-            $table->foreignIdFor(User::class);
-            $table->string('name');
+            $table->string('name')->unique();
             $table->string('nick_name')->nullable();
             $table->timestamps();
         });

tests/Feature/Models/PersonTest.php

@@ -3,17 +3,10 @@
 use App\Models\Expense;
 use App\Models\Income;
 use App\Models\Person;
-use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
 uses(RefreshDatabase::class);
 
-it('belongs to a user', function () {
-    $person = Person::factory()->has(User::factory())->create();
-
-    expect($person->user)->toBeInstanceOf(User::class);
-});
-
 it('has incomes', function () {
     $person = Person::factory()
         ->has(Income::factory()->count(2))

tests/Feature/Models/UserTest.php

@@ -3,7 +3,6 @@
 use App\Models\Account;
 use App\Models\Expense;
 use App\Models\Income;
-use App\Models\Person;
 use App\Models\Transfer;
 use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
@@ -20,16 +19,6 @@
         ->each->toBeInstanceOf(Account::class);
 });
 
-it('has people', function () {
-    $user = User::factory()
-        ->has(Person::factory()->count(2))
-        ->create();
-
-    expect($user->people)
-        ->toHaveCount(2)
-        ->each->toBeInstanceOf(Person::class);
-});
-
 it('has incomes', function () {
     $user = User::factory()
         ->has(Income::factory()->count(2))

tests/Feature/Person/PersonCRUDTest.php

@@ -71,7 +71,7 @@
 
 it('can delete person', function () {
 
-    $person = Person::factory()->for($this->user)->create();
+    $person = Person::factory()->create();
 
     livewire(PersonResource\Pages\EditPerson::class, [
         'record' => $person->getRouteKey(),