Merge pull request #464 from shikorism/fix/transact-checkin
EjaculationControllerでトランザクションを使う
This commit is contained in:
commit
0ca16459a4
@ -9,6 +9,7 @@ use App\User;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Validator;
|
||||
|
||||
class EjaculationController extends Controller
|
||||
@ -52,6 +53,7 @@ class EjaculationController extends Controller
|
||||
return redirect()->route('checkin')->withErrors($validator)->withInput();
|
||||
}
|
||||
|
||||
$ejaculation = DB::transaction(function () use ($request, $inputs) {
|
||||
$ejaculation = Ejaculation::create([
|
||||
'user_id' => Auth::id(),
|
||||
'ejaculated_date' => Carbon::createFromFormat('Y/m/d H:i', $inputs['date'] . ' ' . $inputs['time']),
|
||||
@ -76,6 +78,9 @@ class EjaculationController extends Controller
|
||||
}
|
||||
$ejaculation->tags()->sync($tagIds);
|
||||
|
||||
return $ejaculation;
|
||||
});
|
||||
|
||||
if (!empty($ejaculation->link)) {
|
||||
event(new LinkDiscovered($ejaculation->link));
|
||||
}
|
||||
@ -144,6 +149,7 @@ class EjaculationController extends Controller
|
||||
return redirect()->route('checkin.edit', ['id' => $id])->withErrors($validator)->withInput();
|
||||
}
|
||||
|
||||
DB::transaction(function () use ($ejaculation, $request, $inputs) {
|
||||
$ejaculation->fill([
|
||||
'ejaculated_date' => Carbon::createFromFormat('Y/m/d H:i', $inputs['date'] . ' ' . $inputs['time']),
|
||||
'note' => $inputs['note'] ?? '',
|
||||
@ -165,6 +171,7 @@ class EjaculationController extends Controller
|
||||
}
|
||||
}
|
||||
$ejaculation->tags()->sync($tagIds);
|
||||
});
|
||||
|
||||
if (!empty($ejaculation->link)) {
|
||||
event(new LinkDiscovered($ejaculation->link));
|
||||
@ -180,8 +187,11 @@ class EjaculationController extends Controller
|
||||
$this->authorize('edit', $ejaculation);
|
||||
|
||||
$user = User::findOrFail($ejaculation->user_id);
|
||||
|
||||
DB::transaction(function () use ($ejaculation) {
|
||||
$ejaculation->tags()->detach();
|
||||
$ejaculation->delete();
|
||||
});
|
||||
|
||||
return redirect()->route('user.profile', ['name' => $user->name])->with('status', '削除しました。');
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user