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

Fixed bugs in current organization; Add database consistency checks; Add foreign key

Browse Source
This commit is contained in:
Constantin Graf
2025-05-16 12:51:27 +02:00
committed by Constantin Graf
parent c80d51c2e1
commit d64f0c52be
13 changed files with 440 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Service/DeletionService.php
View File

@@ -100,12 +100,18 @@ class DeletionService
// Make sure all users have at least one organization and delete placeholders
foreach ($users as $user) {
/** @var User $user */
if ($ignoreUser !== null && $user->is($ignoreUser)) {
continue;
}
if ($user->is_placeholder) {
$user->delete();
} else {
if ($user->current_team_id === $organization->getKey()) {
$user->currentOrganization()->disassociate();
$user->save();
}
$this->userService->makeSureUserHasAtLeastOneOrganization($user);
$this->userService->makeSureUserHasCurrentOrganization($user);
}

6
app/Service/MemberService.php
View File

@@ -164,6 +164,11 @@ class MemberService
public function makeMemberToPlaceholder(Member $member, bool $makeSureUserHasAtLeastOneOrganization = true): void
{
$user = $member->user;
if ($user->current_team_id === $member->organization_id) {
$user->currentTeam()->disassociate();
$user->save();
}
$placeholderUser = $user->replicate();
$placeholderUser->is_placeholder = true;
$placeholderUser->save();
@@ -175,6 +180,7 @@ class MemberService
$this->userService->assignOrganizationEntitiesToDifferentUser($member->organization, $user, $placeholderUser);
if ($makeSureUserHasAtLeastOneOrganization) {
$this->userService->makeSureUserHasAtLeastOneOrganization($user);
$this->userService->makeSureUserHasCurrentOrganization($user);
}
}
}

8
app/Service/UserService.php
View File

@@ -114,13 +114,15 @@ class UserService
public function makeSureUserHasCurrentOrganization(User $user): void
{
if ($user->currentOrganization !== null) {
if ($user->current_team_id !== null) {
return;
}
$organization = $user->organizations()->first();
$user->currentOrganization()->associate($organization);
$user->save();
if ($organization !== null) {
$user->currentOrganization()->associate($organization);
$user->save();
}
}
/**