a

zbook_backend/db/query/repo_relation.sql

@@ -15,34 +15,52 @@ FROM repo_relations
 WHERE user_id = $1 and repo_id=$2 and relation_type = $3;
 
 
--- name: GetSelectedUserByRepoCount :one
+-- name: GetListSelectedUserByRepoCount :one
 SELECT COUNT(*)
 FROM repos as r
 LEFT JOIN repo_relations as rr ON rr.repo_id=r.repo_id
-JOIN users as u ON u.user_id = rr.user_id
+JOIN users as u ON u.user_id = rr.user_id AND (u.blocked='false' OR @role::text='admin')
 WHERE r.repo_id=$1 AND rr.relation_type = 'visi';
 
 -- name: ListSelectedUserByRepo :many
 SELECT u.*
 FROM repos as r
 LEFT JOIN repo_relations as rr ON rr.repo_id=r.repo_id
-JOIN users as u ON u.user_id = rr.user_id
+JOIN users as u ON u.user_id = rr.user_id AND (u.blocked='false' OR @role::text='admin')
 WHERE r.repo_id=$3 AND rr.relation_type = 'visi'
 ORDER BY rr.created_at DESC
 LIMIT $1
 OFFSET $2;
 
 
 -- name: QuerySelectedUserByRepo :many
+select u.*,ts_rank(fts_username, plainto_tsquery(@query)) as rank
+FROM repos as r
+LEFT JOIN repo_relations as rr ON rr.repo_id=r.repo_id
+JOIN users as u ON u.user_id = rr.user_id
+WHERE r.repo_id=$3 AND rr.relation_type = 'visi' AND (u.blocked='false' OR @role::text='admin') AND fts_username @@ plainto_tsquery(@query)
+ORDER BY rank DESC
+LIMIT $1
+OFFSET $2;
+
+-- name: GetQuerySelectedUserByRepoCount :one
+SELECT COUNT(*)
+FROM repos as r
+LEFT JOIN repo_relations as rr ON rr.repo_id=r.repo_id
+JOIN users as u ON u.user_id = rr.user_id
+WHERE r.repo_id=$1 AND rr.relation_type = 'visi' AND (u.blocked='false' OR @role::text='admin') AND fts_username @@ plainto_tsquery(@query);
+
+
+-- name: QueryUserByRepo :many
 SELECT
-   u.*,
+   u.*,ts_rank(fts_username, plainto_tsquery(@query)) as rank,
    CASE WHEN MAX(rr.user_id) IS NOT NULL THEN true ELSE false END AS is_visible
 FROM 
   users as u 
 LEFT JOIN 
     repo_relations rr ON rr.user_id = u.user_id AND rr.repo_id=$3
-WHERE u.username=$4
+WHERE (u.blocked='false' OR @role::text='admin') AND fts_username @@ plainto_tsquery(@query)
 GROUP BY u.user_id,rr.created_at
-ORDER BY rr.created_at DESC
+ORDER BY rank DESC,rr.created_at DESC
 LIMIT $1
 OFFSET $2;