Bitbucket: Add AppUser enrollments for User class appears #1570

Author: gonchik

atlassian/bitbucket/cloud/common/comments.py

@@ -1,5 +1,6 @@
 from ..base import BitbucketCloudBase
 from ..common.users import User
+from ..common.users import AppUser
 
 
 class Comment(BitbucketCloudBase):
@@ -31,6 +32,9 @@ def markup(self):
     @property
     def user(self):
         """User object with user information of the comment."""
+        if self.get_data("user")["type"] == "app_user":
+            # If the participant is an app user, return an AppUser instance
+            return AppUser(None, self.get_data("user"), **self._new_session_args)
         return User(None, self.get_data("user"), **self._new_session_args)
 
     def update(self, **kwargs):

atlassian/bitbucket/cloud/common/users.py

@@ -87,9 +87,9 @@ def __init__(self, data, *args, **kwargs):
     @property
     def user(self):
         """User object with user information of the participant."""
-        if self.get_data("type") == "app_user":
+        if self.get_data("user")["type"] == "app_user":
             # If the participant is an app user, return an AppUser instance
-            return AppUser(None, self.get_data("app_user"), **self._new_session_args)
+            return AppUser(None, self.get_data("user"), **self._new_session_args)
         return User(None, self.get_data("user"), **self._new_session_args)
 
     @property

atlassian/bitbucket/cloud/repositories/commits.py

@@ -3,7 +3,7 @@
 from ..base import BitbucketCloudBase
 from ..common.builds import Build
 from ..common.comments import Comment
-from ..common.users import Participant, User
+from ..common.users import Participant, User, AppUser
 
 
 class Commits(BitbucketCloudBase):
@@ -89,6 +89,9 @@ def date(self):
     @property
     def author(self):
         """User object of the author."""
+        if self.get_data("author")["type"] == "app_user":
+            # If the author is an app user, return an AppUser instance
+            return AppUser(None, self.get_data("author").get("user"), **self._new_session_args)
         return User(None, self.get_data("author").get("user"))
 
     def parents(self):

atlassian/bitbucket/cloud/repositories/pullRequests.py

@@ -5,7 +5,7 @@
 from ...cloud.repositories.commits import Commit
 from ..common.builds import Build
 from ..common.comments import Comment
-from ..common.users import User, Participant
+from ..common.users import User, Participant, AppUser
 
 
 class PullRequests(BitbucketCloudBase):
@@ -209,6 +209,9 @@ def declined_reason(self):
     @property
     def author(self):
         """User object of the author"""
+        if self.get_data("author")["type"] == "app_user":
+            # If the author is an app user, return an AppUser instance
+            return AppUser(None, self.get_data("author"), **self._new_session_args)
         return User(None, self.get_data("author"))
 
     @property
@@ -451,11 +454,17 @@ def is_resolved(self):
     @property
     def creator(self):
         """User object with user information of the task creator"""
+        if self.get_data("creator")["type"] == "app_user":
+            # If the creator is an app user, return an AppUser instance
+            return AppUser(None, self.get_data("creator"), **self._new_session_args)
         return User(None, self.get_data("creator"), **self._new_session_args)
 
     @property
     def resolved_by(self):
         """User object with user information of the task resolver"""
+        if self.get_data("resolved_by")["type"] == "app_user":
+            # If the resolver is an app user, return an AppUser instance
+            return AppUser(None, self.get_data("resolved_by"), **self._new_session_args)
         return User(None, self.get_data("resolved_by"), **self._new_session_args)
 
     def update(self, raw_message):

atlassian/bitbucket/cloud/repositories/refs.py

@@ -1,7 +1,7 @@
 # coding=utf-8
 
 from ..base import BitbucketCloudBase
-from ..common.users import User
+from ..common.users import User, AppUser
 
 
 class Refs(BitbucketCloudBase):
@@ -120,6 +120,9 @@ def __init__(self, data, *args, **kwargs):
     @property
     def author(self):
         """User object of the author."""
+        if self.get_data("author")["type"] == "app_user":
+            # If the author is an app user, return an AppUser instance
+            return AppUser(None, self.get_data("author").get("user"), **self._new_session_args)
         return User(None, self.get_data("author"))