Merge 00d45c4 into 278b49e

Author: abryan-smartsheet

smartsheet/models/profile_image.py

@@ -0,0 +1,73 @@
+# pylint: disable=C0111,R0902,R0904,R0912,R0913,R0915,E1101
+# Smartsheet Python SDK.
+#
+# Copyright 2020 Smartsheet.com, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"): you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+from __future__ import absolute_import
+
+from ..types import *
+from ..util import serialize
+from ..util import deserialize
+
+
+class ProfileImage(object):
+
+    """Smartsheet Profile Image data model."""
+
+    def __init__(self, props=None, base_obj=None):
+        """Initialize the ProfileImage model."""
+        self._base = None
+        if base_obj is not None:
+            self._base = base_obj
+
+        self._height = Number()
+        self._image_id_ = String()
+        self._width = Number()
+
+        if props:
+            deserialize(self, props)
+
+    @property
+    def height(self):
+        return self._height.value
+
+    @height.setter
+    def height(self, value):
+        self._height.value = value
+
+    @property
+    def image_id(self):
+        return self._image_id_.value
+
+    @image_id.setter
+    def image_id(self, value):
+        self._image_id_.value = value
+
+    @property
+    def width(self):
+        return self._width.value
+
+    @width.setter
+    def width(self, value):
+        self._width.value = value
+
+    def to_dict(self):
+        return serialize(self)
+
+    def to_json(self):
+        return json.dumps(self.to_dict())
+
+    def __str__(self):
+        return self.to_json()

smartsheet/models/user_model.py

@@ -19,7 +19,7 @@
 
 from .alternate_email import AlternateEmail
 from .enums import UserStatus
-from .image import Image
+from .profile_image import ProfileImage
 from ..types import *
 from ..util import serialize
 from ..util import deserialize
@@ -48,7 +48,7 @@ def __init__(self, props=None, base_obj=None):
         self._last_name = String()
         self._licensed_sheet_creator = Boolean()
         self._mobile_phone = String()
-        self._profile_image = TypedObject(Image)
+        self._profile_image = TypedObject(ProfileImage)
         self._resource_viewer = Boolean()
         self._role = String()
         self._sheet_count = Number()

tests/integration/test_users.py

@@ -119,10 +119,16 @@ def test_delete_alternate_email(self, smart_setup):
             )
             assert action.message == 'SUCCESS'
 
+
     def test_add_profile_image(self, smart_setup):
         smart = smart_setup['smart']
         me = smart.Users.get_current_user()
         assert isinstance(me.id, six.integer_types)
 
         action = smart.Users.add_profile_image(me.id, _dir + '/fixtures/curly.jpg', 'image/jpeg')
         assert action.message == 'SUCCESS'
+        me = smart.Users.get_current_user()
+        assert me.profile_image.image_id is not None
+        square_profile_image_size = 1050
+        assert me.profile_image.width == square_profile_image_size
+        assert me.profile_image.height == square_profile_image_size