Skip to content

FOUR-32114 / FOUR-32202: Correct user signals on restore and delete #8893

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

Open
eiresendez wants to merge 2 commits into
base: develop
Choose a base branch
from
+64 −2
Open

FOUR-32114 / FOUR-32202: Correct user signals on restore and delete #8893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1781623
FOUR-32114: Prevent duplicate user update signal on restore
eiresendez Jul 2, 2026
1896a6d
FOUR-32202: Prevent user update signal on delete
eiresendez Jul 15, 2026
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
5 changes: 3 additions & 2 deletions ProcessMaker/Models/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,13 @@ public static function boot()

static::deleting(function ($user) {
$user->status = 'INACTIVE';
$user->save();
// Persist the inactive status without treating the delete as a user update.
$user->saveQuietly();
});

static::restoring(function ($user) {
// SoftDeletes::restore() saves this with deleted_at=null; avoid a second updated event.
$user->status = 'ACTIVE';
$user->save();
});

static::deleted(function ($user) {
Expand Down
61 changes: 61 additions & 0 deletions tests/Feature/Api/UsersTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,67 @@ public function testRestoreSoftDeletedUser()
$response->assertJsonFragment(['id' => $id]);
}

public function testRestoreSoftDeletedUserDispatchesOneUpdatedEvent()
{
$deletedUser = null;
User::withoutEvents(function () use (&$deletedUser) {
$deletedUser = User::factory()->create([
'deleted_at' => now(),
'status' => 'INACTIVE',
]);
});

$updatedEventCount = 0;
User::updated(function () use (&$updatedEventCount) {
$updatedEventCount++;
});

$response = $this->apiCall('PUT', self::API_TEST_URL . '/restore', [
'id' => $deletedUser->id,
]);

$response->assertStatus(200);

$restoredUser = User::find($deletedUser->id);
$this->assertSame('ACTIVE', $restoredUser->status);
$this->assertNull($restoredUser->deleted_at);
$this->assertFalse($restoredUser->trashed());
$this->assertSame(1, $updatedEventCount);
}

public function testDeleteUserDispatchesDeletedWithoutUpdatedEvent()
{
$user = User::factory()->create();
$group = Group::factory()->create();
$user->groups()->attach($group->id);

$updatedEventCount = 0;
$deletedEventCount = 0;
User::updated(function () use (&$updatedEventCount) {
$updatedEventCount++;
});
User::deleted(function () use (&$deletedEventCount) {
$deletedEventCount++;
});

$response = $this->apiCall('DELETE', self::API_TEST_URL . '/' . $user->id);

$response->assertStatus(204);

$deletedUser = User::withTrashed()->findOrFail($user->id);
$this->assertSame('INACTIVE', $deletedUser->status);
$this->assertNotNull($deletedUser->deleted_at);
$this->assertTrue($deletedUser->trashed());
$this->assertSame(0, $updatedEventCount);
$this->assertSame(1, $deletedEventCount);

$this->assertDatabaseMissing('group_members', [
'group_id' => $group->id,
'member_id' => $user->id,
'member_type' => User::class,
]);
}

public function testCreateWithoutPassword()
{
$payload = [
Expand Down
Loading