From 16db8367c1512aea22935bc5b9077264ae2b7d2a Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Oct 09 2017 14:44:09 +0000
Subject: Include the PRs opened by the user on the 'My pull-requests' page


Fixes https://pagure.io/pagure/issue/2662

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py
index 36a3d28..33fdef9 100644
--- a/pagure/lib/__init__.py
+++ b/pagure/lib/__init__.py
@@ -3583,8 +3583,17 @@ def get_pull_request_of_user(session, username):
             )
         )
     )
+    sub_q5 = session.query(
+        model.Project.id
+    ).filter(
+        sqlalchemy.and_(
+            model.Project.id == model.PullRequest.project_id,
+            model.PullRequest.user_id == model.User.id,
+            model.User.user == username
+        )
+    )
 
-    projects = projects.union(sub_q2).union(sub_q3).union(sub_q4)
+    projects = projects.union(sub_q2).union(sub_q3).union(sub_q4).union(sub_q5)
 
     query = session.query(
         model.PullRequest
diff --git a/tests/test_pagure_flask_ui_app.py b/tests/test_pagure_flask_ui_app.py
index 70faf68..eb5729b 100644
--- a/tests/test_pagure_flask_ui_app.py
+++ b/tests/test_pagure_flask_ui_app.py
@@ -1310,6 +1310,37 @@ class PagureFlaskApptests(tests.Modeltests):
             output.data.count('<tr class="pr-status pr-status-open"'),
             2)
 
+    @patch(
+        'pagure.lib.git.update_git', MagicMock(return_value=True))
+    @patch(
+        'pagure.lib.notify.send_email', MagicMock(return_value=True))
+    def test_view_my_requests_against_another_project(self):
+        """Test the view_user_requests endpoint when there is a PR opened
+        by me against a project I do not have rights on. """
+        # Create the PR
+        tests.create_projects(self.session)
+        repo = pagure.lib._get_project(self.session, 'test')
+        req = pagure.lib.new_pull_request(
+            session=self.session,
+            repo_from=repo,
+            branch_from='dev',
+            repo_to=repo,
+            branch_to='master',
+            title='test pull-request #1',
+            user='foo',
+            requestfolder=None,
+        )
+        self.session.commit()
+        self.assertEqual(req.id, 1)
+        self.assertEqual(req.title, 'test pull-request #1')
+
+        output = self.app.get('/user/foo/requests')
+        self.assertEqual(output.status_code, 200)
+        self.assertIn('test pull-request #1', output.data)
+        self.assertEqual(
+            output.data.count('<tr class="pr-status pr-status-open"'),
+            1)
+
     def test_view_my_issues_no_user(self):
         """Test the view_user_issues endpoint with a missing user."""
         output = self.app.get('/user/somenonexistentuser/issues')