yindo/UNIT3D
1
0
Fork 0
mirror of https://github.com/BillyOutlast/UNIT3D.git synced 2026-02-04 03:01:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4355 from Roardom/fix-invite-tree-query-2

Browse Source
This commit is contained in:
HDVinnie
2024-11-29 15:08:23 -05:00
committed by GitHub
parent 198bd2feb2 88888e5f6c
commit fdffaa383a
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/Http/Controllers/User/InviteTreeController.php
View File

@@ -34,28 +34,32 @@ class InviteTreeController extends Controller
$inviters = User::query()
->withTrashed()
->join(
DB::raw('
DB::raw(<<<'SQL'
(
WITH RECURSIVE cte AS (
SELECT invites.user_id
FROM invites
WHERE invites.user_id != '.(int) User::SYSTEM_USER_ID.'
AND invites.accepted_by = '.(int) $user->id.'
WHERE invites.user_id != ?
AND invites.accepted_by = ?
UNION ALL
SELECT invites.user_id
FROM invites
JOIN cte
ON cte.user_id = invites.accepted_by
WHERE invites.user_id != '.(int) User::SYSTEM_USER_ID.'
WHERE invites.user_id != ?
AND invites.accepted_by IS NOT NULL
AND invites.accepted_by != '.(int) User::SYSTEM_USER_ID.'
AND invites.accepted_by != ?
)
SELECT cte.*
FROM cte
) AS tree
'),
SQL),
fn ($join) => $join->on('users.id', '=', 'tree.user_id')
)
->addBinding(User::SYSTEM_USER_ID, 'join')
->addBinding($user->id, 'join')
->addBinding(User::SYSTEM_USER_ID, 'join')
->addBinding(User::SYSTEM_USER_ID, 'join')
->with('group')
->withCount([
'warnings' => function ($query): void {
@@ -71,17 +75,17 @@ class InviteTreeController extends Controller
WITH RECURSIVE cte AS (
SELECT invites.id, invites.accepted_by, 0 as depth, CAST(invites.accepted_by AS CHAR(200)) AS path
FROM invites
WHERE invites.user_id = '.(int) $user->id.'
WHERE invites.user_id = ?
AND invites.accepted_by IS NOT NULL
AND invites.accepted_by != '.(int) User::SYSTEM_USER_ID.'
AND invites.accepted_by != ?
UNION ALL
SELECT invites.id, invites.accepted_by, cte.depth + 1, CONCAT(cte.path, ', ', invites.accepted_by)
FROM invites
JOIN cte
ON cte.accepted_by = invites.user_id
WHERE invites.user_id != '.(int) User::SYSTEM_USER_ID.'
WHERE invites.user_id != ?
AND invites.accepted_by IS NOT NULL
AND invites.accepted_by != '.(int) User::SYSTEM_USER_ID.'
AND invites.accepted_by != ?
)
SELECT cte.*
FROM cte
@@ -90,6 +94,10 @@ class InviteTreeController extends Controller
SQL),
fn ($join) => $join->on('invites.id', '=', 'tree.id')
)
->addBinding($user->id, 'join')
->addBinding(User::SYSTEM_USER_ID, 'join')
->addBinding(User::SYSTEM_USER_ID, 'join')
->addBinding(User::SYSTEM_USER_ID, 'join')
->with([
'receiver' => fn ($query) => $query
->withTrashed()