default-reviewers: fixed voting rule calculation on user-group. The previous

logic took user group even for individual users, thus voting on group wasn't correct
in case of mixed single reviewers + user groups.

rhodecode/model/db.py

@@ -4323,10 +4323,15 b' class RepoReviewRule(Base, BaseModel):'
 
         return users
 
-    def user_group_vote_rule(self):
+    def user_group_vote_rule(self, user_id):
+
         rules = []
-        if self.rule_user_groups:
-            for user_group in self.rule_user_groups:
+        if not self.rule_user_groups:
+            return rules
+
+        for user_group in self.rule_user_groups:
+            user_group_members = [x.user_id for x in user_group.users_group.members]
+            if user_id in user_group_members:
                 rules.append(user_group)
         return rules
 

rhodecode/model/pull_request.py

@@ -490,11 +490,12 b' class PullRequestModel(BaseModel):'
             rule_id = list(rules)[0] if rules else None
             rule = RepoReviewRule.get(rule_id) if rule_id else None
             if rule:
-                review_group = rule.user_group_vote_rule()
+                review_group = rule.user_group_vote_rule(user_id)
+                # we check if this particular reviewer is member of a voting group
                 if review_group:
                     # NOTE(marcink):
-                    # again, can be that user is member of more,
-                    # but we pick the first same, as default reviewers algo
+                    # can be that user is member of more but we pick the first same,
+                    # same as default reviewers algo
                     review_group = review_group[0]
 
                     rule_data = {
@@ -506,6 +507,8 b' class PullRequestModel(BaseModel):'
                             review_group.users_group.users_group_name,
                         'rule_user_group_members':
                             [x.user.username for x in review_group.users_group.members],
+                        'rule_user_group_members_id':
+                            [x.user.user_id for x in review_group.users_group.members],
                     }
                     # e.g {'vote_rule': -1, 'mandatory': True}
                     rule_data.update(review_group.rule_data())