Skip to content

fix(support): profile update with duplicate emails #3548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bernardhanna merged 1 commit into from
May 19, 2026
Merged

fix(support): profile update with duplicate emails #3548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 49 additions & 7 deletions app/Services/Support/UserProfileUpdateService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use App\Models\Support\SupportCase;
use App\User;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Str;

Expand Down Expand Up @@ -66,12 +67,17 @@ public function updateProfile(
return SupportJson::fail($tool, $input, 'no_matching_user_found');
}

if ($matches->count() !== 1) {
return SupportJson::fail($tool, $input, 'ambiguous_user_match');
$user = $this->resolveUserForProfileUpdate($matches, $firstname, $lastname);
if ($user === null) {
return SupportJson::fail($tool, $input, [
'ambiguous_user_match',
'matched_user_ids: '.$matches->pluck('id')->implode(','),
]);
}

/** @var User $user */
$user = $matches->first();
$warnings = $matches->count() > 1
? ['resolved_duplicate_email_to_user_id:'.$user->id]
: [];

$before = [
'user_id' => $user->id,
Expand All @@ -95,7 +101,7 @@ public function updateProfile(
'before' => $before,
'after' => $before,
'note' => 'profile_already_matches_requested_values',
]);
], $warnings);
}

$planned = [
Expand All @@ -114,7 +120,7 @@ public function updateProfile(
'changes_applied' => [],
'before' => $before,
'after' => $after,
]);
], $warnings);
}

if (config('support_gmail.dry_run') && !$viaEmailApproval) {
Expand Down Expand Up @@ -145,7 +151,43 @@ public function updateProfile(
'changes_applied' => [$planned],
'before' => $before,
'after' => $after,
]);
], $warnings);
}

/**
* When multiple users share an email, pick the one that still needs the requested name change.
*
* @param Collection<int, User> $matches
*/
private function resolveUserForProfileUpdate(Collection $matches, ?string $firstname, ?string $lastname): ?User
{
if ($matches->count() === 1) {
return $matches->first();
}

$active = $matches->filter(fn (User $user) => $user->deleted_at === null)->values();
if ($active->count() === 1) {
return $active->first();
}

$candidates = $active->isNotEmpty() ? $active : $matches->values();

$needingUpdate = $candidates->filter(function (User $user) use ($firstname, $lastname) {
if ($firstname !== null && $firstname !== $user->firstname) {
return true;
}
if ($lastname !== null && $lastname !== $user->lastname) {
return true;
}

return false;
});

if ($needingUpdate->count() === 1) {
return $needingUpdate->first();
}

return null;
}

private function isValidEmail(string $email): bool
Expand Down
36 changes: 36 additions & 0 deletions tests/Unit/Support/UserProfileUpdateServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,42 @@ public function test_profile_update_dry_run_plans_change(): void
$this->assertSame('Bernard Hanna', $u->firstname);
}

public function test_profile_update_resolves_duplicate_email_to_user_needing_change(): void
{
User::factory()->create([
'email' => 'dup@example.com',
'firstname' => 'Bernard',
'lastname' => 'Hanna',
]);
User::factory()->create([
'email' => 'dup@example.com',
'firstname' => 'Bernard Hanna',
'lastname' => '',
]);

$case = SupportCase::create([
'source_channel' => 'manual',
'processing_mode' => 'manual',
'subject' => 'test',
'raw_message' => 'test',
'status' => 'investigating',
'risk_level' => 'low',
'correlation_id' => 'cid',
]);

$payload = app(UserProfileUpdateService::class)->updateProfile(
$case,
'dup@example.com',
'Bernard',
'Hanna',
true,
);

$this->assertTrue($payload['ok']);
$this->assertSame('Bernard Hanna', $payload['result']['before']['firstname']);
$this->assertStringContainsString('resolved_duplicate_email_to_user_id:', (string) ($payload['warnings'][0] ?? ''));
}

public function test_profile_update_execute_changes_user(): void
{
config(['support_gmail.dry_run' => true]);
Expand Down