Use new permissions project join where possible

Author: ChrisPenner

share-api/src/Share/Postgres/Contributions/Queries.hs

@@ -260,10 +260,10 @@ listContributionsByUserId callerUserId userId limit mayCursor mayStatusFilter ma
         contribution.author_id,
         (SELECT COUNT(*) FROM comments comment WHERE comment.contribution_id = contribution.id AND comment.deleted_at IS NULL) as num_comments
       FROM contributions AS contribution
-        JOIN projects AS project ON project.id = contribution.project_id
+        JOIN projects_by_user_permission(#{callerUserId}, #{ProjectView}) AS project
+          ON project.id = contribution.project_id
       WHERE
         contribution.author_id = #{userId}
-        AND user_has_project_permission(#{callerUserId}, project.id, #{ProjectView})
         AND (#{mayStatusFilter} IS NULL OR contribution.status = #{mayStatusFilter})
         AND ^{cursorFilter}
         AND ^{kindFilter}

share-api/src/Share/Postgres/Queries.hs

@@ -273,10 +273,9 @@ listProjectsByUserWithMetadata callerUserId projectOwnerUserId = do
           owner.handle,
           owner.name,
           EXISTS (SELECT FROM org_members WHERE org_members.organization_user_id = owner.id) AS is_org
-        FROM projects p
+        FROM projects_by_user_permission(#{callerUserId}, #{ProjectView}) AS project ON project.id = b.project_id
           JOIN users owner ON owner.id = p.owner_user_id
         WHERE p.owner_user_id = #{projectOwnerUserId}
-          AND user_has_project_permission(#{callerUserId}, p.id, #{ProjectView})
         ORDER BY p.created_at DESC
       |]
   where
@@ -876,12 +875,11 @@ listContributorBranchesOfUserAccessibleToCaller contributorUserId mayCallerUserI
               project_owner.name,
               EXISTS (SELECT FROM org_members WHERE org_members.organization_user_id = project.owner_user_id)
             FROM project_branches b
-            JOIN projects project ON project.id = b.project_id
+            JOIN projects_by_user_permission(#{mayCallerUserId}, #{ProjectView}) AS project ON project.id = b.project_id
             JOIN users AS project_owner ON project_owner.id = project.owner_user_id
             WHERE
               b.deleted_at IS NULL
               AND b.contributor_id = #{contributorUserId}
-              AND user_has_project_permission(#{mayCallerUserId}, b.project_id, #{ProjectView})
               |],
                 branchNameFilter,
                 cursorFilter,

share-api/src/Share/Postgres/Search/DefinitionSearch/Queries.hs

@@ -401,13 +401,13 @@ globalDefNameCompletionSearch mayCaller mayUserFilter (Query query) limit = do
     [sql|
     WITH results(name, tag) AS (
       SELECT DISTINCT doc.name, doc.tag FROM global_definition_search_docs doc
-        JOIN projects p ON p.id = doc.project_id
+        JOIN projects_by_user_permission(#{mayCaller}, #{ProjectView}) p
+          ON p.id = doc.project_id
         WHERE
           -- Find names which contain the query
           doc.name ILIKE ('%.' || like_escape(#{query}) || '%')
 
-        AND user_has_project_permission(#{mayCaller}, p.id, #{ProjectView})
-          ^{filters}
+        ^{filters}
       ) SELECT r.name, r.tag FROM results r
         -- Docs and tests to the bottom, then
         -- prefer matches where the original query appears (case-matched),
@@ -501,11 +501,11 @@ globalDefinitionTokenSearch mayCaller mayUserFilter limit searchTokens preferred
     queryListRows @(ProjectId, ReleaseId, Name, Hasql.Jsonb)
       [sql|
       SELECT doc.project_id, doc.release_id, doc.name, doc.metadata FROM global_definition_search_docs doc
-        JOIN projects p ON p.id = doc.project_id
+        JOIN projects_by_user_permission(#{mayCaller}, #{ProjectView}) p
+          ON p.id = doc.project_id
         WHERE
           -- match on search tokens using GIN index.
           tsquery(#{tsQueryText}) @@ doc.search_tokens
-        AND user_has_project_permission(#{mayCaller}, p.id, #{ProjectView})
         AND (#{preferredArity} IS NULL OR doc.arity >= #{preferredArity})
           ^{filters}
           ^{namesFilter}
@@ -619,11 +619,10 @@ globalDefinitionNameSearch mayCaller mayUserFilter limit (Query query) = do
     queryListRows @(ProjectId, ReleaseId, Name, Hasql.Jsonb)
       [sql|
       SELECT doc.project_id, doc.release_id, doc.name, doc.metadata FROM global_definition_search_docs doc
-        JOIN projects p ON p.id = doc.project_id
+        JOIN projects_by_user_permission(#{mayCaller}, #{ProjectView}) p ON p.id = doc.project_id
         WHERE
           -- We may wish to adjust the similarity threshold before the query.
           #{query} <% doc.name
-        AND user_has_project_permission(#{mayCaller}, p.id, #{ProjectView})
           ^{filters}
         -- Score matches by:
         -- - projects in the catalog

share-api/src/Share/Postgres/Tickets/Queries.hs

@@ -251,10 +251,9 @@ listTicketsByUserId callerUserId userId limit mayCursor mayStatusFilter = do
         ticket.author_id,
         (SELECT COUNT(*) FROM comments comment WHERE comment.ticket_id = ticket.id AND comment.deleted_at IS NULL) as num_comments
       FROM tickets AS ticket
-        JOIN projects AS project ON project.id = ticket.project_id
+        JOIN projects_by_user_permission(#{callerUserId}, #{ProjectView}) AS project ON project.id = ticket.project_id
       WHERE
         ticket.author_id = #{userId}
-        AND user_has_project_permission(#{callerUserId}, project.id, #{ProjectView})
         AND (#{mayStatusFilter} IS NULL OR ticket.status = #{mayStatusFilter}::ticket_status)
         AND ^{cursorFilter}
       ORDER BY ticket.updated_at DESC, ticket.id DESC