Merge "Add capabilities of the DMS query"

[pti/o2.git] / o2ims / domain / stx_object.py

diff --git a/o2ims/domain/stx_object.py b/o2ims/domain/stx_object.py
index 2eee7b7..549c4fc 100644 (file)
--- a/o2ims/domain/stx_object.py
+++ b/o2ims/domain/stx_object.py
@@ -36,14 +36,16 @@ class StxGenericModel(AgRoot):
             self.createtime = datetime.datetime.strptime(
                 api_response.created_at.split('.')[0], "%Y-%m-%dT%H:%M:%S") \
                 if api_response.created_at else None
-            self.hash = content_hash
-            if not self.hash:
-                if hasattr(api_response, 'filtered'):
-                    self.filtered = api_response.filtered
-                    self.hash = str(hash((self.id, str(self.filtered))))
-                else:
-                    self.hash = str(hash((self.id, self.updatetime)))
-            self.content = json.dumps(api_response.to_dict())
+            self.filtered = getattr(api_response, 'filtered', None)
+            self.hash = content_hash or str(
+                hash((self.id, str(self.filtered)
+                      if self.filtered else self.updatetime)))
+
+            def handle_non_serializable(obj):
+                return repr(obj)
+            self.content = json.dumps(
+                vars(api_response), default=handle_non_serializable)
+
             if ResourceTypeEnum.RESOURCE_POOL == type:
                 self.res_pool_id = self.id