@@ -6,6 +6,7 @@ defmodule Algora.Workspace do
6
6
alias Algora.Accounts
7
7
alias Algora.Accounts.User
8
8
alias Algora.Github
9
+ alias Algora.Organizations.Member
9
10
alias Algora.Repo
10
11
alias Algora.Util
11
12
alias Algora.Workspace.CommandResponse
@@ -531,6 +532,9 @@ defmodule Algora.Workspace do
531
532
join: u in assoc ( c , :user ) ,
532
533
where: u . type != :bot ,
533
534
where: not ilike ( u . provider_login , "%bot" ) ,
535
+ left_join: m in Member ,
536
+ on: m . user_id == u . id and m . org_id == r . user_id ,
537
+ where: is_nil ( m . id ) ,
534
538
select_merge: % { user: u } ,
535
539
order_by: [ desc: c . contributions , asc: c . inserted_at , asc: c . id ]
536
540
)
@@ -547,6 +551,9 @@ defmodule Algora.Workspace do
547
551
join: u in assoc ( c , :user ) ,
548
552
where: u . type != :bot ,
549
553
where: not ilike ( u . provider_login , "%bot" ) ,
554
+ left_join: m in Member ,
555
+ on: m . user_id == u . id and m . org_id == r . user_id ,
556
+ where: is_nil ( m . id ) ,
550
557
distinct: [ c . user_id ] ,
551
558
select_merge: % { user: u } ,
552
559
order_by: [ desc: c . contributions , asc: c . inserted_at , asc: c . id ] ,
0 commit comments