kallithea Changeset - 89eb2b2da3c5

Changeset - 89eb2b2da3c5

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Søren Løvborg - 9 years ago 2017-02-07 21:16:13
sorenl@unity3d.com

model: refactor listing of commenters

The ChangesetComment.get_users method was only called in two places,
with each call triggering independent codepaths inside the method.

2 files changed with 18 insertions and 25 deletions:

kallithea/model/comment.py

kallithea/model/db.py

0 comments (0 inline, 0 general)

kallithea/model/comment.py

➞

Show inline comments

@@ @@ -41,6 +41,19 @@ from kallithea.model.meta import Session @@
 log = logging.getLogger(__name__)
 def _list_changeset_commenters(revision):
     return (Session().query(User)
         .join(ChangesetComment.author)
         .filter(ChangesetComment.revision == revision)
         .all())
 def _list_pull_request_commenters(pull_request):
     return (Session().query(User)
         .join(ChangesetComment.author)
         .filter(ChangesetComment.pull_request_id == pull_request.pull_request_id)
         .all())
 class ChangesetCommentsModel(BaseModel):
     def _get_notification_data(self, repo, comment, author, comment_text,
@@ @@ -75,14 +88,15 @@ class ChangesetCommentsModel(BaseModel): @@
                           comment_url)
+            )
             # get the current participants of this changeset
-            recipients = ChangesetComment.get_users(revision=revision)
+            recipients = _list_changeset_commenters(revision)
             # add changeset author if it's known locally
             cs_author = User.get_from_cs_author(cs.author)
             if not cs_author:
                 #use repo owner if we cannot extract the author correctly
                 # FIXME: just use committer name even if not a user
                 cs_author = repo.owner
             recipients += [cs_author]
             recipients.append(cs_author)
             email_kwargs = {
                 'status_change': status_change,
                 'cs_comment_user': author.full_name_and_username,
@@ @@ -122,12 +136,8 @@ class ChangesetCommentsModel(BaseModel): @@
                           comment_url)
+            )
             # get the current participants of this pull request
             recipients = ChangesetComment.get_users(pull_request_id=
                                                 pull_request.pull_request_id)
             # add pull request author
             recipients += [pull_request.owner]
             # add the reviewers to notification
             recipients = _list_pull_request_commenters(pull_request)
             recipients.append(pull_request.owner)
             recipients += pull_request.get_reviewer_users()
             #set some variables for email notification

kallithea/model/db.py

➞

Show inline comments

@@ @@ -2224,23 +2224,6 @@ class ChangesetComment(Base, BaseDbModel @@
                                  cascade="all, delete-orphan", lazy='joined')
     pull_request = relationship('PullRequest')
     @classmethod
     def get_users(cls, revision=None, pull_request_id=None):
         """
         Returns user associated with this ChangesetComment. ie those
         who actually commented
         :param cls:
         :param revision:
         """
         q = Session().query(User) \
                 .join(ChangesetComment.author)
         if revision is not None:
             q = q.filter(cls.revision == revision)
         elif pull_request_id is not None:
             q = q.filter(cls.pull_request_id == pull_request_id)
         return q.all()
     def url(self):
         anchor = "comment-%s" % self.comment_id
         import kallithea.lib.helpers as h

0 comments (0 inline, 0 general)