kallithea Changeset - b5e399286ce5

Changeset - b5e399286ce5

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Jan Heylen - 11 years ago 2015-04-30 07:05:18
heyleke@gmail.com

ChangesetCommentsModel: refactor duplicate code

Comments are now always ordered by creation date ... but that should not make
any difference.

1 file changed with 24 insertions and 25 deletions:

kallithea/model/comment.py

0 comments (0 inline, 0 general)

kallithea/model/comment.py

➞

Show inline comments

@@ @@ -236,19 +236,8 @@ class ChangesetCommentsModel(BaseModel): @@
         Returns a list, ordered by creation date.
         """
         q = ChangesetComment.query()\
                 .filter(ChangesetComment.repo_id == repo_id)\
                 .filter(ChangesetComment.line_no == None)\
                 .filter(ChangesetComment.f_path == None)
         if revision:
             q = q.filter(ChangesetComment.revision == revision)
         elif pull_request:
             pull_request = self.__get_pull_request(pull_request)
             q = q.filter(ChangesetComment.pull_request == pull_request)
         else:
             raise Exception('Please specify revision or pull_request')
         q = q.order_by(ChangesetComment.created_on)
         return q.all()
         return self._get_comments(repo_id, revision=revision, pull_request=pull_request,
                                   inline=False)
     def get_inline_comments(self, repo_id, revision=None, pull_request=None):
         """
@@ @@ -256,11 +245,27 @@ class ChangesetCommentsModel(BaseModel): @@
         Returns a list of tuples with file path and list of comments per line number.
         """
         comments = self._get_comments(repo_id, revision=revision, pull_request=pull_request,
                                       inline=True)
         paths = defaultdict(lambda: defaultdict(list))
         for co in comments:
             paths[co.f_path][co.line_no].append(co)
         return paths.items()
     def _get_comments(self, repo_id, revision=None, pull_request=None, inline=False):
         """
         Gets comments for either revision or pull_request_id, either inline or general.
         """
         q = Session().query(ChangesetComment)\
             .filter(ChangesetComment.repo_id == repo_id)\
             .filter(ChangesetComment.line_no != None)\
             .filter(ChangesetComment.f_path != None)\
             .order_by(ChangesetComment.comment_id.asc())\
             .filter(ChangesetComment.repo_id == repo_id)
         if inline:
             q = q.filter(ChangesetComment.line_no != None)\
                 .filter(ChangesetComment.f_path != None)
         else:
             q = q.filter(ChangesetComment.line_no == None)\
                 .filter(ChangesetComment.f_path == None)
         if revision:
             q = q.filter(ChangesetComment.revision == revision)
@@ @@ -268,12 +273,6 @@ class ChangesetCommentsModel(BaseModel): @@
             pull_request = self.__get_pull_request(pull_request)
             q = q.filter(ChangesetComment.pull_request == pull_request)
         else:
             raise Exception('Please specify revision or pull_request_id')
         comments = q.all()
             raise Exception('Please specify either revision or pull_request')
         paths = defaultdict(lambda: defaultdict(list))
         for co in comments:
             paths[co.f_path][co.line_no].append(co)
         return paths.items()
         return q.order_by(ChangesetComment.created_on).all()

0 comments (0 inline, 0 general)