Fixed genre deletion

This commit is contained in:
Josef Citrine 2016-12-10 16:39:58 +00:00 committed by Josef Citrine
parent 15ab486a50
commit 9e63702387

View file

@ -47,10 +47,6 @@ class DeleteGenre extends Job implements ShouldQueue
$this->executingUser = Auth::user(); $this->executingUser = Auth::user();
$this->genreToDelete = $genreToDelete; $this->genreToDelete = $genreToDelete;
$this->destinationGenre = $destinationGenre; $this->destinationGenre = $destinationGenre;
// The genre is deleted synchronously before the job is executed in
// order to prevent race conditions.
$this->genreToDelete->delete();
} }
/** /**
@ -67,14 +63,14 @@ class DeleteGenre extends Job implements ShouldQueue
// This is done instead of a single UPDATE query in order to // This is done instead of a single UPDATE query in order to
// generate revision logs for the change. // generate revision logs for the change.
$this->genreToDelete->tracks()->chunk(200, function ($tracks) { $this->genreToDelete->tracks()->each(function ($track) {
foreach ($tracks as $track) { /** @var Track $track */
/** @var Track $track */
$track->genre_id = $this->destinationGenre->id; $track->genre_id = $this->destinationGenre->id;
$track->save(); $track->save();
$track->updateTags(); $track->updateTags();
}
}); });
$this->genreToDelete->delete();
} }
} }