Merge pull request #1445 from liberu-genealogy/copilot/fix-remaining-tests-logic

Fix 10 test errors and 2 test failures across multiple models and services

Author: delicatacurtis

app/Actions/Jetstream/InviteTeamMember.php

@@ -9,6 +9,7 @@
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Str;
 use Illuminate\Validation\Rule;
 use Laravel\Jetstream\Contracts\InvitesTeamMembers;
 use Laravel\Jetstream\Events\InvitingTeamMember;
@@ -32,6 +33,7 @@ public function invite(User $user, Team $team, string $email, ?string $role = nu
         $invitation = $team->teamInvitations()->create([
             'email' => $email,
             'role'  => $role,
+            'token' => Str::random(64),
         ]);
 
         Mail::to($email)->send(new TeamInvitation($invitation));

app/Http/Livewire/FanChartComponent.php

@@ -14,6 +14,11 @@ public function getColumnSpan(): int|string|array
         return 'full';
     }
 
+    public function getColumnStart(): int|string|array|null
+    {
+        return null;
+    }
+
     public function render()
     {
         $this->people = Person::all();

app/Models/DnaMatching.php

@@ -13,6 +13,7 @@ class DnaMatching extends Model
     use BelongsToTenant;
 
     protected $fillable = [
+        'user_id',
         'file1',
         'file2',
         'image',

app/Models/Person.php

@@ -96,6 +96,11 @@ public function familiesAsWife()
         return $this->hasMany(Family::class, 'wife_id');
     }
 
+    public function families(): \Illuminate\Support\Collection
+    {
+        return $this->familiesAsHusband->merge($this->familiesAsWife);
+    }
+
     public function parents()
     {
         if (!$this->childInFamily) {

app/Models/PersonPhoto.php

@@ -27,6 +27,10 @@ class PersonPhoto extends Model
         'analyzed_at',
     ];
 
+    protected $attributes = [
+        'is_analyzed' => false,
+    ];
+
     protected $casts = [
         'is_analyzed' => 'boolean',
         'analyzed_at' => 'datetime',

app/Models/TeamInvitation.php

@@ -17,6 +17,7 @@ class TeamInvitation extends JetstreamTeamInvitation
     protected $fillable = [
         'email',
         'role',
+        'token',
     ];
 
     /**

app/Models/User.php

@@ -102,6 +102,25 @@ protected function casts(): array
         ];
     }
 
+    /**
+     * Delete the user's profile photo.
+     */
+    public function deleteProfilePhoto(): void
+    {
+        if (!is_null($this->profile_photo_path)) {
+            \Illuminate\Support\Facades\Storage::disk($this->profilePhotoDisk())->delete($this->profile_photo_path);
+            $this->forceFill(['profile_photo_path' => null])->save();
+        }
+    }
+
+    /**
+     * Get the disk used for storing profile photos.
+     */
+    protected function profilePhotoDisk(): string
+    {
+        return env('VAPOR_ARTIFACT_NAME') ? 's3' : config('jetstream.profile_photo_disk', 'public');
+    }
+
     /**
      * Get the URL to the user's profile photo.
      */
@@ -435,6 +454,14 @@ public function socialConnectionPrivacy(): HasOne
         return $this->hasOne(SocialConnectionPrivacy::class);
     }
 
+    /**
+     * Get the user's connected accounts.
+     */
+    public function connectedAccounts(): HasMany
+    {
+        return $this->hasMany(ConnectedAccount::class);
+    }
+
     /**
      * Get the user's social family connections.
      */

app/Services/SocialMediaConnectionService.php

@@ -139,7 +139,7 @@ public function needsSync(ConnectedAccount $account): bool
         }
 
         // Sync if older than 24 hours
-        return now()->diffInHours($account->last_synced_at) > 24;
+        return $account->last_synced_at->diffInHours(now()) >= 24;
     }
 
     /**