Fix datetime properties

Object properties should either return their value or `None` if no value is present.
WebexCommunity · Sep 14, 2018 · fc112f1 · fc112f1
1 parent c591d53
commit fc112f1
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 11 deletions.
diff --git a/webexteamssdk/models/mixins/event.py b/webexteamssdk/models/mixins/event.py
@@ -61,4 +61,8 @@ def actorId(self):
     @property
     def created(self):
         """The date and time the event was performed."""
-        return WebexTeamsDateTime.strptime(self._json_data.get('created'))
+        created = self._json_data.get('created')
+        if created:
+            return WebexTeamsDateTime.strptime(created)
+        else:
+            return None
diff --git a/webexteamssdk/models/mixins/membership.py b/webexteamssdk/models/mixins/membership.py
@@ -81,4 +81,8 @@ def isMonitor(self):
     @property
     def created(self):
         """The date and time the membership was created."""
-        return WebexTeamsDateTime.strptime(self._json_data.get('created'))
+        created = self._json_data.get('created')
+        if created:
+            return WebexTeamsDateTime.strptime(created)
+        else:
+            return None
diff --git a/webexteamssdk/models/mixins/message.py b/webexteamssdk/models/mixins/message.py
@@ -91,4 +91,8 @@ def mentionedPeople(self):
     @property
     def created(self):
         """The date and time the message was created."""
-        return WebexTeamsDateTime.strptime(self._json_data.get('created'))
+        created = self._json_data.get('created')
+        if created:
+            return WebexTeamsDateTime.strptime(created)
+        else:
+            return None
diff --git a/webexteamssdk/models/mixins/organization.py b/webexteamssdk/models/mixins/organization.py
@@ -51,4 +51,8 @@ def displayName(self):
     @property
     def created(self):
         """Creation date and time in ISO8601 format."""
-        return WebexTeamsDateTime.strptime(self._json_data.get('created'))
+        created = self._json_data.get('created')
+        if created:
+            return WebexTeamsDateTime.strptime(created)
+        else:
+            return None
diff --git a/webexteamssdk/models/mixins/person.py b/webexteamssdk/models/mixins/person.py
@@ -96,7 +96,11 @@ def licenses(self):
     @property
     def created(self):
         """The date and time the person was created."""
-        return WebexTeamsDateTime.strptime(self._json_data.get('created'))
+        created = self._json_data.get('created')
+        if created:
+            return WebexTeamsDateTime.strptime(created)
+        else:
+            return None
 
     @property
     def status(self):
@@ -106,7 +110,11 @@ def status(self):
     @property
     def lastActivity(self):
         """The date and time of the person's last activity."""
-        return WebexTeamsDateTime.strptime(self._json_data.get('lastActivity'))
+        last_activity = self._json_data.get('lastActivity')
+        if last_activity:
+            return WebexTeamsDateTime.strptime(last_activity)
+        else:
+            return None
 
     @property
     def invitePending(self):

diff --git a/webexteamssdk/models/mixins/room.py b/webexteamssdk/models/mixins/room.py
@@ -61,12 +61,20 @@ def isLocked(self):
     @property
     def lastActivity(self):
         """The date and time when the room was last active."""
-        return WebexTeamsDateTime.strptime(self._json_data.get('lastActivity'))
+        last_activity = self._json_data.get('lastActivity')
+        if last_activity:
+            return WebexTeamsDateTime.strptime(last_activity)
+        else:
+            return None
 
     @property
     def created(self):
         """The date and time when the room was created."""
-        return WebexTeamsDateTime.strptime(self._json_data.get('created'))
+        created = self._json_data.get('created')
+        if created:
+            return WebexTeamsDateTime.strptime(created)
+        else:
+            return None
 
     @property
     def creatorId(self):

diff --git a/webexteamssdk/models/mixins/team.py b/webexteamssdk/models/mixins/team.py
@@ -51,7 +51,11 @@ def name(self):
     @property
     def created(self):
         """The date and time the team was created."""
-        return WebexTeamsDateTime.strptime(self._json_data.get('created'))
+        created = self._json_data.get('created')
+        if created:
+            return WebexTeamsDateTime.strptime(created)
+        else:
+            return None
 
     @property
     def creatorId(self):

diff --git a/webexteamssdk/models/mixins/team_membership.py b/webexteamssdk/models/mixins/team_membership.py
@@ -76,4 +76,8 @@ def isModerator(self):
     @property
     def created(self):
         """The date and time the team membership was created."""
-        return WebexTeamsDateTime.strptime(self._json_data.get('created'))
+        created = self._json_data.get('created')
+        if created:
+            return WebexTeamsDateTime.strptime(created)
+        else:
+            return None
diff --git a/webexteamssdk/models/mixins/webhook.py b/webexteamssdk/models/mixins/webhook.py
@@ -112,4 +112,8 @@ def status(self):
     @property
     def created(self):
         """Creation date and time in ISO8601 format."""
-        return WebexTeamsDateTime.strptime(self._json_data.get('created'))
+        created = self._json_data.get('created')
+        if created:
+            return WebexTeamsDateTime.strptime(created)
+        else:
+            return None