reviewers: use target repo owner as default reviewer in case of CE edition.

- Fixes  #5515
- This was somehow different than in EE edition

rhodecode/api/tests/test_create_pull_request.py

@@ -66,7 +66,7 b' class TestCreatePullRequestApi(object):'
         expected_message = "Created new pull request `{title}`".format(
             title=data['title'])
         result = response.json
-        assert result['error'] == None
+        assert result['error'] is None
         assert result['result']['msg'] == expected_message
         pull_request_id = result['result']['pull_request_id']
         pull_request = PullRequestModel().get(pull_request_id)
@@ -89,7 +89,7 b' class TestCreatePullRequestApi(object):'
         expected_message = "Created new pull request `{title}`".format(
             title=data['title'])
         result = response.json
-        assert result['error'] == None
+        assert result['error'] is None
         assert result['result']['msg'] == expected_message
         pull_request_id = result['result']['pull_request_id']
         pull_request = PullRequestModel().get(pull_request_id)
@@ -129,7 +129,7 b' class TestCreatePullRequestApi(object):'
         expected_message = "Created new pull request `{title}`".format(
             title=data['title'])
         result = response.json
-        assert result['error'] == None
+        assert result['error'] is None
         assert result['result']['msg'] == expected_message
         pull_request_id = result['result']['pull_request_id']
         pull_request = PullRequestModel().get(pull_request_id)
@@ -144,11 +144,15 b' class TestCreatePullRequestApi(object):'
                 entry['mandatory'] = rev.mandatory
             actual_reviewers.append(entry)
 
-        # default reviewer will be added who is an owner of the repo
-        reviewers.append(
-            {'username': pull_request.author.username,
-             'reasons': [u'Default reviewer', u'Repository owner']},
-        )
+        owner_username = pull_request.target_repo.user.username
+        for spec_reviewer in reviewers[::]:
+            # default reviewer will be added who is an owner of the repo
+            # this get's overridden by a add owner to reviewers rule
+            if spec_reviewer['username'] == owner_username:
+                spec_reviewer['reasons'] = [u'Default reviewer', u'Repository owner']
+                # since owner is more important, we don't inherit mandatory flag
+                del spec_reviewer['mandatory']
+
         assert sorted(actual_reviewers, key=lambda e: e['username']) \
                == sorted(reviewers, key=lambda e: e['username'])
 
@@ -173,7 +177,7 b' class TestCreatePullRequestApi(object):'
         expected_message = "Created new pull request `{title}`".format(
             title=data['title'])
         result = response.json
-        assert result['error'] == None
+        assert result['error'] is None
         assert result['result']['msg'] == expected_message
         pull_request_id = result['result']['pull_request_id']
         pull_request = PullRequestModel().get(pull_request_id)
@@ -187,11 +191,14 b' class TestCreatePullRequestApi(object):'
             if rev.mandatory:
                 entry['mandatory'] = rev.mandatory
             actual_reviewers.append(entry)
-        # default reviewer will be added who is an owner of the repo
-        reviewers.append(
-            {'username': pull_request.author.user_id,
-             'reasons': [u'Default reviewer', u'Repository owner']},
-        )
+
+        owner_user_id = pull_request.target_repo.user.user_id
+        for spec_reviewer in reviewers[::]:
+            # default reviewer will be added who is an owner of the repo
+            # this get's overridden by a add owner to reviewers rule
+            if spec_reviewer['username'] == owner_user_id:
+                spec_reviewer['reasons'] = [u'Default reviewer', u'Repository owner']
+
         assert sorted(actual_reviewers, key=lambda e: e['username']) \
                == sorted(reviewers, key=lambda e: e['username'])
 

rhodecode/apps/repository/utils.py

@@ -51,12 +51,12 b' def get_default_reviewers_data('
     """ Return json for default reviewers of a repository """
 
     reasons = ['Default reviewer', 'Repository owner']
-    default = reviewer_as_json(
-        user=current_user, reasons=reasons, mandatory=False)
+    json_reviewers = [reviewer_as_json(
+        user=target_repo.user, reasons=reasons, mandatory=False, rules=None)]
 
     return {
         'api_ver': 'v1',  # define version for later possible schema upgrade
-        'reviewers': [default],
+        'reviewers': json_reviewers,
         'rules': {},
         'rules_data': {},
     }