kallithea Changeset - f4c712ab3e40

Changeset - f4c712ab3e40

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Søren Løvborg - 9 years ago 2016-08-03 16:16:38
sorenl@unity3d.com

model: inline superfluous "helper" methods

__get_changeset_status wasn't even used and has simply been removed.

Notification.__get_notification reimplemented BaseModel._get_instance,
warts and all, and has been replaced by calls to that method.

The rest were just needless indirection, and have been inlined.

4 files changed with 11 insertions and 36 deletions:

kallithea/model/changeset_status.py

kallithea/model/comment.py

kallithea/model/notification.py

kallithea/model/pull_request.py

0 comments (0 inline, 0 general)

kallithea/model/changeset_status.py

➞

Show inline comments

@@ @@ -36,18 +36,12 @@ log = logging.getLogger(__name__) @@
 class ChangesetStatusModel(BaseModel):
     cls = ChangesetStatus
     def __get_changeset_status(self, changeset_status):
         return self._get_instance(ChangesetStatus, changeset_status)
     def __get_pull_request(self, pull_request):
         return self._get_instance(PullRequest, pull_request)
     def _get_status_query(self, repo, revision, pull_request,
                           with_revisions=False):
         repo = self._get_repo(repo)
         q = ChangesetStatus.query() \
             .filter(ChangesetStatus.repo == repo)
@@ @@ -55,13 +49,13 @@ class ChangesetStatusModel(BaseModel): @@
             # only report the latest vote across all users! TODO: be smarter!
             q = q.filter(ChangesetStatus.version == 0)
         if revision:
             q = q.filter(ChangesetStatus.revision == revision)
         elif pull_request:
-            pull_request = self.__get_pull_request(pull_request)
+            pull_request = self._get_instance(PullRequest, pull_request)
             q = q.filter(ChangesetStatus.pull_request == pull_request)
         else:
             raise Exception('Please specify revision or pull_request')
         q = q.order_by(ChangesetStatus.version.asc())
         return q
@@ @@ -164,13 +158,13 @@ class ChangesetStatusModel(BaseModel): @@
             assert pull_request is None
             q = q.filter(ChangesetStatus.repo == repo)
             q = q.filter(ChangesetStatus.revision == revision)
             revisions = [revision]
         else:
             assert pull_request is not None
-            pull_request = self.__get_pull_request(pull_request)
+            pull_request = self._get_instance(PullRequest, pull_request)
             repo = pull_request.org_repo
             q = q.filter(ChangesetStatus.repo == repo)
             q = q.filter(ChangesetStatus.revision.in_(pull_request.revisions))
             revisions = pull_request.revisions
         cur_statuses = q.all()

kallithea/model/comment.py

➞

Show inline comments

@@ @@ -42,18 +42,12 @@ log = logging.getLogger(__name__) @@
 class ChangesetCommentsModel(BaseModel):
     cls = ChangesetComment
     def __get_changeset_comment(self, changeset_comment):
         return self._get_instance(ChangesetComment, changeset_comment)
     def __get_pull_request(self, pull_request):
         return self._get_instance(PullRequest, pull_request)
     def _get_notification_data(self, repo, comment, user, comment_text,
                                line_no=None, revision=None, pull_request=None,
                                status_change=None, closing_pr=False):
         """
         :returns: tuple (subj,body,recipients,notification_type,email_kwargs)
         """
@@ @@ -183,13 +177,13 @@ class ChangesetCommentsModel(BaseModel): @@
         comment.f_path = f_path
         comment.line_no = line_no
         if revision is not None:
             comment.revision = revision
         elif pull_request is not None:
-            pull_request = self.__get_pull_request(pull_request)
+            pull_request = self._get_instance(PullRequest, pull_request)
             comment.pull_request = pull_request
         else:
             raise Exception('Please specify revision or pull_request_id')
         Session().add(comment)
         Session().flush()
@@ @@ -224,13 +218,13 @@ class ChangesetCommentsModel(BaseModel): @@
                     email_kwargs=email_kwargs
+                )
         return comment
     def delete(self, comment):
-        comment = self.__get_changeset_comment(comment)
+        comment = self._get_instance(ChangesetComment, comment)
         Session().delete(comment)
         return comment
     def get_comments(self, repo_id, revision=None, pull_request=None):
         """
@@ @@ -269,12 +263,12 @@ class ChangesetCommentsModel(BaseModel): @@
                 .filter(ChangesetComment.f_path == None)
         if revision is not None:
             q = q.filter(ChangesetComment.revision == revision) \
                 .filter(ChangesetComment.repo_id == repo_id)
         elif pull_request is not None:
-            pull_request = self.__get_pull_request(pull_request)
+            pull_request = self._get_instance(PullRequest, pull_request)
             q = q.filter(ChangesetComment.pull_request == pull_request)
         else:
             raise Exception('Please specify either revision or pull_request')
         return q.order_by(ChangesetComment.created_on).all()

kallithea/model/notification.py

➞

Show inline comments

@@ @@ -44,22 +44,12 @@ log = logging.getLogger(__name__) @@
 class NotificationModel(BaseModel):
     cls = Notification
     def __get_notification(self, notification):
         if isinstance(notification, Notification):
             return notification
         elif isinstance(notification, (int, long)):
             return Notification.get(notification)
         else:
             if notification is not None:
                 raise Exception('notification must be int, long or Instance'
                                 ' of Notification got %s' % type(notification))
     def create(self, created_by, subject, body, recipients=None,
                type_=Notification.TYPE_MESSAGE, with_email=True,
                email_kwargs=None, repo_name=None):
         """
         Creates notification of given type
@@ @@ -149,13 +139,13 @@ class NotificationModel(BaseModel): @@
         return notif
     def delete(self, user, notification):
         # we don't want to remove actual notification just the assignment
         try:
-            notification = self.__get_notification(notification)
+            notification = self._get_instance(Notification, notification)
             user = self._get_user(user)
             if notification and user:
                 obj = UserNotification.query() \
                         .filter(UserNotification.user == user) \
                         .filter(UserNotification.notification
                                 == notification) \
@@ @@ -187,13 +177,13 @@ class NotificationModel(BaseModel): @@
             q = q.filter(Notification.type_.in_(filter_))
         return q
     def mark_read(self, user, notification):
         try:
-            notification = self.__get_notification(notification)
+            notification = self._get_instance(Notification, notification)
             user = self._get_user(user)
             if notification and user:
                 obj = UserNotification.query() \
                         .filter(UserNotification.user == user) \
                         .filter(UserNotification.notification
                                 == notification) \
@@ @@ -232,13 +222,13 @@ class NotificationModel(BaseModel): @@
         return [x.notification for x in UserNotification.query() \
                 .filter(UserNotification.read == False) \
                 .filter(UserNotification.user == user).all()]
     def get_user_notification(self, user, notification):
         user = self._get_user(user)
-        notification = self.__get_notification(notification)
+        notification = self._get_instance(Notification, notification)
         return UserNotification.query() \
             .filter(UserNotification.notification == notification) \
             .filter(UserNotification.user == user).scalar()
     def make_description(self, notification, show_age=True):

kallithea/model/pull_request.py

➞

Show inline comments

@@ @@ -46,15 +46,12 @@ log = logging.getLogger(__name__) @@
 class PullRequestModel(BaseModel):
     cls = PullRequest
     def __get_pull_request(self, pull_request):
         return self._get_instance(PullRequest, pull_request)
     def get_pullrequest_cnt_for_user(self, user):
         return PullRequest.query() \
                                 .join(PullRequestReviewers) \
                                 .filter(PullRequestReviewers.user_id == user) \
                                 .filter(PullRequest.status != PullRequest.STATUS_CLOSED) \
                                 .count()
@@ @@ -199,13 +196,13 @@ class PullRequestModel(BaseModel): @@
         log.debug("Mentioning %s", mention_recipients)
         self.__add_reviewers(user, pr, set(), mention_recipients)
     def update_reviewers(self, user, pull_request, reviewers_ids):
         reviewers_ids = set(reviewers_ids)
-        pull_request = self.__get_pull_request(pull_request)
+        pull_request = self._get_instance(PullRequest, pull_request)
         current_reviewers = PullRequestReviewers.query() \
             .options(joinedload('user')) \
             .filter_by(pull_request=pull_request) \
             .all()
         current_reviewer_users = set(x.user for x in current_reviewers)
         new_reviewer_users = set(self._get_valid_reviewers(reviewers_ids))
@@ @@ -222,14 +219,14 @@ class PullRequestModel(BaseModel): @@
         log.debug("Removing %s reviewers", to_remove)
         for prr in current_reviewers:
             if prr.user in to_remove:
                 Session().delete(prr)
     def delete(self, pull_request):
-        pull_request = self.__get_pull_request(pull_request)
+        pull_request = self._get_instance(PullRequest, pull_request)
         Session().delete(pull_request)
     def close_pull_request(self, pull_request):
-        pull_request = self.__get_pull_request(pull_request)
+        pull_request = self._get_instance(PullRequest, pull_request)
         pull_request.status = PullRequest.STATUS_CLOSED
         pull_request.updated_on = datetime.datetime.now()
         Session().add(pull_request)

0 comments (0 inline, 0 general)