pepepper/tissue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

タグ一覧の件数カウント条件を検索機能と揃える

Browse Source
This commit is contained in:
MitarashiDango 2019-09-25 23:39:36 +09:00
parent d5ee59825f
commit a434a45e4a
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/TagController.php
View File

@ -4,6 +4,7 @@ namespace App\Http\Controllers;
use App\Tag; use App\Tag;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
class TagController extends Controller class TagController extends Controller
@ -18,7 +19,14 @@ SQL
)) ))
->join('ejaculation_tag', 'tags.id', '=', 'ejaculation_tag.tag_id') ->join('ejaculation_tag', 'tags.id', '=', 'ejaculation_tag.tag_id')
->join('ejaculations', 'ejaculations.id', '=', 'ejaculation_tag.ejaculation_id') ->join('ejaculations', 'ejaculations.id', '=', 'ejaculation_tag.ejaculation_id')
->join('users', 'users.id', '=', 'ejaculations.user_id')
->where('ejaculations.is_private', false) ->where('ejaculations.is_private', false)
->where(function ($query) {
$query->where('users.is_protected', false);
if (Auth::check()) {
$query->orWhere('users.id', Auth::id());
}
})
->groupBy('tags.name') ->groupBy('tags.name')
->orderByDesc('checkins_count') ->orderByDesc('checkins_count')
->orderBy('tags.name') ->orderBy('tags.name')