Update DeleteAccountPipeline job, add db transactions to prevent race conditions

pull/663/head
Daniel Supernault 7 years ago
parent 51c3be37d3
commit 868a83cb65
No known key found for this signature in database
GPG Key ID: 0DEF1C662C9033F7

@ -7,6 +7,7 @@ use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Foundation\Bus\Dispatchable;
use DB;
use App\{ use App\{
AccountLog, AccountLog,
Activity, Activity,
@ -57,126 +58,76 @@ class DeleteAccountPipeline implements ShouldQueue
public function handle() public function handle()
{ {
$user = $this->user; $user = $this->user;
$this->deleteAccountLogs($user); DB::transaction(function() use ($user) {
$this->deleteActivities($user); AccountLog::chunk(200, function($logs) use ($user) {
$this->deleteAvatar($user); foreach($logs as $log) {
$this->deleteBookmarks($user); if($log->user_id == $user->id) {
$this->deleteEmailVerification($user); $log->forceDelete();
$this->deleteFollowRequests($user); }
$this->deleteFollowers($user);
$this->deleteLikes($user);
$this->deleteMedia($user);
$this->deleteMentions($user);
$this->deleteNotifications($user);
$this->deleteStatuses($user);
$this->deleteReports($user);
$this->deleteProfile($user);
$this->deleteUser($user);
// TODO: send Delete to every known instance sharedInbox
}
public function deleteAccountLogs($user)
{
AccountLog::chunk(200, function($logs) use ($user) {
foreach($logs as $log) {
if($log->user_id == $user->id) {
$log->forceDelete();
} }
} });
});
}
public function deleteActivities($user) if($user->profile) {
{ $avatar = $user->profile->avatar;
// deprecated, removed inbox activity logger
}
public function deleteAvatar($user) if(is_file($avatar->media_path)) {
{ unlink($avatar->media_path);
$avatar = $user->profile->avatar; }
if(is_file($avatar->media_path)) { if(is_file($avatar->thumb_path)) {
unlink($avatar->media_path); unlink($avatar->thumb_path);
} }
$avatar->forceDelete();
}
if(is_file($avatar->thumb_path)) { Bookmark::whereProfileId($user->profile->id)->forceDelete();
unlink($avatar->thumb_path);
}
$avatar->forceDelete(); EmailVerification::whereUserId($user->id)->forceDelete();
}
public function deleteBookmarks($user) $id = $user->profile->id;
{ FollowRequest::whereFollowingId($id)->orWhere('follower_id', $id)->forceDelete();
Bookmark::whereProfileId($user->profile->id)->forceDelete();
}
public function deleteEmailVerification($user) Follower::whereProfileId($id)->orWhere('following_id', $id)->forceDelete();
{
EmailVerification::whereUserId($user->id)->forceDelete();
}
public function deleteFollowRequests($user) Like::whereProfileId($id)->forceDelete();
{
$id = $user->profile->id;
FollowRequest::whereFollowingId($id)->orWhere('follower_id', $id)->forceDelete();
}
public function deleteFollowers($user) $medias = Media::whereUserId($user->id)->get();
{ foreach($medias as $media) {
$id = $user->profile->id; $path = $media->media_path;
Follower::whereProfileId($id)->orWhere('following_id', $id)->forceDelete(); $thumb = $media->thumbnail_path;
} if(is_file($path)) {
unlink($path);
public function deleteLikes($user) }
{ if(is_file($thumb)) {
$id = $user->profile->id; unlink($thumb);
Like::whereProfileId($id)->forceDelete(); }
} $media->forceDelete();
public function deleteMedia($user)
{
$medias = Media::whereUserId($user->id)->get();
foreach($medias as $media) {
$path = $media->media_path;
$thumb = $media->thumbnail_path;
if(is_file($path)) {
unlink($path);
}
if(is_file($thumb)) {
unlink($thumb);
} }
$media->forceDelete();
}
}
public function deleteMentions($user) Mention::whereProfileId($user->profile->id)->forceDelete();
{
Mention::whereProfileId($user->profile->id)->forceDelete();
}
public function deleteNotifications($user) Notification::whereProfileId($id)->orWhere('actor_id', $id)->forceDelete();
{
$id = $user->profile->id;
Notification::whereProfileId($id)->orWhere('actor_id', $id)->forceDelete();
}
public function deleteStatuses($user) { Status::whereProfileId($user->profile->id)->forceDelete();
Status::whereProfileId($user->profile->id)->forceDelete();
}
public function deleteProfile($user) { Report::whereUserId($user->id)->forceDelete();
Profile::whereUserId($user->id)->delete(); $this->deleteProfile($user);
});
} }
public function deleteReports($user) { public function deleteProfile($user) {
Report::whereUserId($user->id)->forceDelete(); DB::transaction(function() use ($user) {
Profile::whereUserId($user->id)->delete();
$this->deleteUser($user);
});
} }
public function deleteUser($user) { public function deleteUser($user) {
UserFilter::find($user->id)->forceDelete();
UserSetting::find($user->id)->forceDelete(); DB::transaction(function() use ($user) {
User::find($user->id)->forceDelete(); UserFilter::whereUserId($user->id)->forceDelete();
UserSetting::whereUserId($user->id)->forceDelete();
$user->forceDelete();
});
} }
} }

Loading…
Cancel
Save