Resolve conflicts

gonchik · gonchik · commit 794eacca3c6c · 2022-09-03T06:15:04.000+03:00
diff --git a/atlassian/bitbucket/cloud/common/builds.py b/atlassian/bitbucket/cloud/common/builds.py
@@ -0,0 +1,85 @@
+from ..base import BitbucketCloudBase
+
+
+class Build(BitbucketCloudBase):
+    STATE_FAILED = "FAILED"
+    STATE_INPROGRESS = "INPROGRESS"
+    STATE_STOPPED = "STOPPED"
+    STATE_SUCCESSFUL = "SUCCESSFUL"
+
+    def __init__(self, data, *args, **kwargs):
+        super(Build, self).__init__(None, None, *args, data=data, expected_type="build", **kwargs)
+
+    @property
+    def key(self):
+        """Key of the build."""
+        return self.get_data("key")
+
+    @property
+    def name(self):
+        """Name of the build."""
+        return self.get_data("name")
+
+    @property
+    def description(self):
+        """Build description."""
+        return self.get_data("description")
+
+    @property
+    def failed(self):
+        """True if the build failed."""
+        return self.get_data("state") == self.STATE_FAILED
+
+    @property
+    def inprogress(self):
+        """True if the build is in progress."""
+        return self.get_data("state") == self.STATE_INPROGRESS
+
+    @property
+    def successful(self):
+        """True if the build was successful."""
+        return self.get_data("state") == self.STATE_SUCCESSFUL
+
+    @property
+    def stopped(self):
+        """True if the build was stopped."""
+        return self.get_data("state") == self.STATE_STOPPED
+
+    @property
+    def created_on(self):
+        """Time of creation."""
+        return self.get_time("created_on")
+
+    @property
+    def updated_on(self):
+        """Time of last update."""
+        return self.get_time("updated_on")
+
+    @property
+    def commit(self):
+        """Return the hash key of the commit."""
+        return self.get_data("commit")["hash"]
+
+    @property
+    def website(self):
+        """Return the url to the builds webpage.
+
+        This url points to the build's frontend website (Pipelines, Jenkins ...)
+        """
+        return self.get_data("url")
+
+    @property
+    def refname(self):
+        """Return the refname.
+
+        This can be used to indicate on which branch/tag the
+        build happened.
+        """
+        return self.get_data("refname")
+
+    def update(self, **kwargs):
+        """Update build status.
+
+        See https://developer.atlassian.com/cloud/bitbucket/rest/api-group-commit-statuses/#api-repositories-workspace-repo-slug-commit-commit-statuses-build-key-put
+        """
+        return self._update_data(self.put(None, data=kwargs))
diff --git a/atlassian/bitbucket/cloud/common/comments.py b/atlassian/bitbucket/cloud/common/comments.py
@@ -0,0 +1,43 @@
+from ..base import BitbucketCloudBase
+from ..common.users import User
+
+
+class Comment(BitbucketCloudBase):
+    def __init__(self, data, *args, **kwargs):
+        super(Comment, self).__init__(None, None, *args, data=data, expected_type="pullrequest_comment", **kwargs)
+
+    @property
+    def raw(self):
+        """The raw comment."""
+        return self.get_data("content")["raw"]
+
+    @property
+    def html(self):
+        """The html comment."""
+        return self.get_data("content")["html"]
+
+    @property
+    def markup(self):
+        """The markup type."""
+        return self.get_data("content")["markup"]
+
+    @property
+    def user(self):
+        """User object with user information of the comment."""
+        return User(None, self.get_data("user"), **self._new_session_args)
+
+    def update(self, **kwargs):
+        """Update the comment properties. Fields not present in the request body are ignored.
+
+        :param kwargs: dict: The data to update.
+
+        :return: The updated comment
+        """
+        return self._update_data(self.put(None, data=kwargs))
+
+    def delete(self):
+        """Delete the comment.
+
+        :return: The response on success
+        """
+        return super(Comment, self).delete(None)
diff --git a/atlassian/bitbucket/cloud/common/users.py b/atlassian/bitbucket/cloud/common/users.py
@@ -29,3 +29,46 @@ def uuid(self):
     def avatar(self):
         """ URL to user avatar on Bitbucket Cloud """
         return self.get_data("links")["avatar"]["href"]
+
+
+class Participant(BitbucketCloudBase):
+    ROLE_REVIEWER = "REVIEWER"
+    ROLE_PARTICIPANT = "PARTICIPANT"
+    CHANGES_REQUESTED = "changes_requested"
+
+    def __init__(self, data, *args, **kwargs):
+        super(Participant, self).__init__(None, None, *args, data=data, expected_type="participant", **kwargs)
+
+    @property
+    def user(self):
+        """User object with user information of the participant."""
+        return User(None, self.get_data("user"), **self._new_session_args)
+
+    @property
+    def is_participant(self):
+        """True if the user is a pull request participant."""
+        return self.get_data("role") == self.ROLE_PARTICIPANT
+
+    @property
+    def is_reviewer(self):
+        """True if the user is a pull request reviewer."""
+        return self.get_data("role") == self.ROLE_REVIEWER
+
+    @property
+    def is_default_reviewer(self):
+        """True if the user is a default reviewer."""
+
+    @property
+    def has_changes_requested(self):
+        """True if user requested changes."""
+        return str(self.get_data("state")) == self.CHANGES_REQUESTED
+
+    @property
+    def has_approved(self):
+        """True if user approved the pull request."""
+        return self.get_data("approved")
+
+    @property
+    def participated_on(self):
+        """Time of last participation."""
+        return self.get_time("participated_on")
diff --git a/atlassian/bitbucket/cloud/repositories/__init__.py b/atlassian/bitbucket/cloud/repositories/__init__.py
@@ -4,6 +4,7 @@
 from ..base import BitbucketCloudBase
 from .issues import Issues
 from .branchRestrictions import BranchRestrictions
+from .commits import Commits
 from .defaultReviewers import DefaultReviewers
 from .pipelines import Pipelines
 from .pullRequests import PullRequests
@@ -227,6 +228,11 @@ def __init__(self, data, *args, **kwargs):
             "{}/branch-restrictions".format(self.url), **self._new_session_args
         )
         self.__branches = Branches("{}/refs/branches".format(self.url), **self._new_session_args)
+        self.__commits = Commits(
+            "{}/commits".format(self.url),
+            data={"links": {"commit": {"href": "{}/commit".format(self.url)}}},
+            **self._new_session_args
+        )
         self.__default_reviewers = DefaultReviewers("{}/default-reviewers".format(self.url), **self._new_session_args)
         self.__issues = Issues("{}/issues".format(self.url), **self._new_session_args)
         self.__pipelines = Pipelines("{}/pipelines".format(self.url), **self._new_session_args)
@@ -337,6 +343,11 @@ def branches(self):
         """The repository branches."""
         return self.__branches
 
+    @property
+    def commits(self):
+        """The repository commits."""
+        return self.__commits
+
     @property
     def default_reviewers(self):
         """The repository default reviewers"""
diff --git a/atlassian/bitbucket/cloud/repositories/commits.py b/atlassian/bitbucket/cloud/repositories/commits.py
@@ -0,0 +1,174 @@
+# coding=utf-8
+
+from ..base import BitbucketCloudBase
+from ..common.builds import Build
+from ..common.comments import Comment
+from ..common.users import User, Participant
+
+
+class Commits(BitbucketCloudBase):
+    """Bitbucket Cloud commits."""
+
+    def __init__(self, url, *args, **kwargs):
+        super(Commits, self).__init__(url, *args, **kwargs)
+
+    def __get_object(self, data):
+        return Commit(data, **self._new_session_args)
+
+    def each(self, top=None, q=None, sort=None):
+        """
+        Return the list of commits in this repository.
+
+        :param top: string: Hash of commit to get the history for.
+        :param q: string: Query string to narrow down the response.
+                          See https://developer.atlassian.com/bitbucket/api/2/reference/meta/filtering for details.
+        :param sort: string: Name of a response property to sort results.
+                             See https://developer.atlassian.com/bitbucket/api/2/reference/meta/filtering for details.
+
+        :return: A generator for the Commit objects
+
+        API docs: https://developer.atlassian.com/cloud/bitbucket/rest/api-group-commits/#api-repositories-workspace-repo-slug-commits-get
+        """
+        params = {}
+        if sort is not None:
+            params["sort"] = sort
+        if q is not None:
+            params["q"] = q
+        for commit in self._get_paged(top, trailing=True, params=params):
+            yield self.__get_object(super(Commits, self).get(commit.get("hash")))
+
+    def get(self, commit_hash):
+        """
+        Return the commit with the requested commit id in this repository.
+
+        :param commit_hash: str: The requested commit id
+
+        :return: The requested Commit object
+
+        API docs: https://developer.atlassian.com/cloud/bitbucket/rest/api-group-commits/#api-repositories-workspace-repo-slug-commit-commit-get
+        """
+        return self.__get_object(
+            super(Commits, self).get(self.url_joiner(self.get_link("commit"), commit_hash), absolute=True)
+        )
+
+
+class Commit(BitbucketCloudBase):
+    """
+    Bitbucket Cloud commit endpoint.
+
+    See https://developer.atlassian.com/cloud/bitbucket/rest/api-group-commits/#api-repositories-workspace-repo-slug-commit-commit-get
+    """
+
+    def __init__(self, data, *args, **kwargs):
+        super(Commit, self).__init__(None, *args, data=data, expected_type="commit", **kwargs)
+
+    @property
+    def hash(self):
+        """Commit id."""
+        return self.get_data("hash")
+
+    @property
+    def message(self):
+        """Commit message."""
+        return self.get_data("title")
+
+    @property
+    def date(self):
+        """Commit date."""
+        return self.get_time("date")
+
+    @property
+    def author(self):
+        """User object of the author."""
+        return User(None, self.get_data("author"))
+
+    def parents(self):
+        """Return a generator object of parent commits."""
+        for commit in self.get_data("parents"):
+            yield Commit(commit, **self._new_session_args)
+
+    def statuses(self):
+        """
+        Return generator object of the statuses endpoint.
+
+        API docs: https://developer.atlassian.com/cloud/bitbucket/rest/api-group-commit-statuses/#api-repositories-workspace-repo-slug-commit-commit-statuses-get
+        """
+        return self._get_paged("statuses")
+
+    def participants(self):
+        """Return a generator object of participants."""
+        for participant in self.get_data("participants"):
+            yield Participant(participant, **self._new_session_args)
+
+    def builds(self):
+        """Return the Build objects for the commit."""
+        builds = [b for b in self.statuses() if b["type"] == "build"]
+        for build in builds:
+            yield Build(build, **self._new_session_args)
+
+    def add_build(self, key, url=None, description=None, refname=None, state=Build.STATE_INPROGRESS):
+        """
+        Add new build status to commit.
+
+        API docs: https://developer.atlassian.com/cloud/bitbucket/rest/api-group-commit-statuses/#api-repositories-workspace-repo-slug-commit-commit-statuses-build-post
+        """
+        data = {
+            "key": key,
+            "state": state,
+            "description": description,
+            "url": url,
+            "refname": refname,
+        }
+
+        return self.post("statuses/build", data)
+
+    def get_build(self, key):
+        """
+        Return a specific build for the commit.
+
+        API docs: https://developer.atlassian.com/cloud/bitbucket/rest/api-group-commit-statuses/#api-repositories-workspace-repo-slug-commit-commit-statuses-build-key-get
+        """
+        return Build(super(Commit, self).get(self.url_joiner("statuses/build", key)), **self._new_session_args)
+
+    def comments(self):
+        """
+        Return generator object of the comments endpoint.
+
+        API docs: https://developer.atlassian.com/cloud/bitbucket/rest/api-group-commits/#api-repositories-workspace-repo-slug-commit-commit-comments-get
+        """
+        for comment in self._get_paged("comments"):
+            yield Comment(comment, **self._new_session_args)
+
+    def comment(self, raw_message):
+        """
+        Add a comment to the pull request in raw format.
+
+        API docs: https://developer.atlassian.com/cloud/bitbucket/rest/api-group-commits/#api-repositories-workspace-repo-slug-commit-commit-comments-post
+        """
+        if not raw_message:
+            raise ValueError("No message set")
+
+        data = {
+            "content": {
+                "raw": raw_message,
+            }
+        }
+
+        return self.post("comments", data)
+
+    def approve(self):
+        """
+        Approve a commit.
+
+        API docs: https://developer.atlassian.com/cloud/bitbucket/rest/api-group-commits/#api-repositories-workspace-repo-slug-commit-commit-approve-post
+        """
+        data = {"approved": True}
+        return self.post("approve", data)
+
+    def unapprove(self):
+        """
+        Unapprove a commit.
+
+        API docs: https://developer.atlassian.com/cloud/bitbucket/rest/api-group-commits/#api-repositories-workspace-repo-slug-commit-commit-approve-delete
+        """
+        return super(BitbucketCloudBase, self).delete("approve")
diff --git a/atlassian/bitbucket/cloud/repositories/pullRequests.py b/atlassian/bitbucket/cloud/repositories/pullRequests.py
