adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-17 04:32:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

override current_team_id in makeMemberToPlaceholder to avoid fk constraint error on user delete, fixes #989

Browse Source
This commit is contained in:
Gregor Vostrak
2026-02-16 15:02:42 +01:00
parent 2c222f3f67
commit 2c60d04ba4
2 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Service/MemberService.php
View File

@@ -196,6 +196,7 @@ class MemberService
$placeholderUser = $user->replicate(); $placeholderUser = $user->replicate();
$placeholderUser->is_placeholder = true; $placeholderUser->is_placeholder = true;
$placeholderUser->current_team_id = $member->organization_id;
$placeholderUser->save(); $placeholderUser->save();
$member->user()->associate($placeholderUser); $member->user()->associate($placeholderUser);

41
tests/Unit/Service/DeletionServiceTest.php
View File

@@ -382,4 +382,45 @@ class DeletionServiceTest extends TestCaseWithDatabase
1 1
); );
} }
public function test_delete_user_with_current_organization_set_to_owned_org_that_will_be_deleted_does_not_cause_foreign_key_violation(): void
{
// Arrange
// User A creates an organization and invites User B
$userA = User::factory()->create();
$userB = User::factory()->create();
$organizationOfA = Organization::factory()->withOwner($userA)->create();
$organizationOfB = Organization::factory()->withOwner($userB)->create();
Member::factory()->forUser($userA)->forOrganization($organizationOfA)->role(Role::Owner)->create();
Member::factory()->forUser($userB)->forOrganization($organizationOfB)->role(Role::Owner)->create();
$memberBInOrgA = Member::factory()->forUser($userB)->forOrganization($organizationOfA)->role(Role::Employee)->create();
TimeEntry::factory()->forOrganization($organizationOfA)->forMember($memberBInOrgA)->createMany(2);
// User B's current_organization_id points to their own org (the one that will be deleted)
$userB->update(['current_team_id' => $organizationOfB->getKey()]);
// Act
$this->deletionService->deleteUser($userB);
// Assert
$this->assertDatabaseMissing(User::class, [
'id' => $userB->getKey(),
]);
$this->assertDatabaseMissing(Organization::class, [
'id' => $organizationOfB->getKey(),
]);
$this->assertDatabaseHas(Organization::class, [
'id' => $organizationOfA->getKey(),
]);
// The placeholder user should exist with current_team_id set to the org where they are a placeholder
$placeholderUser = User::query()->where('is_placeholder', true)->first();
$this->assertNotNull($placeholderUser);
$this->assertSame($organizationOfA->getKey(), $placeholderUser->current_team_id);
$this->assertDatabaseHas(Member::class, [
'id' => $memberBInOrgA->getKey(),
'user_id' => $placeholderUser->getKey(),
'organization_id' => $organizationOfA->getKey(),
'role' => Role::Placeholder->value,
]);
}
} }