Some changes in model

Author: tkachoff

reportportal_client/model/response.py

@@ -1,24 +1,45 @@
 import json
 
 
-class EntryCreatedRS(object):
-    def __init__(self, id=None, raw=None):
-        super(EntryCreatedRS, self).__init__()
-        self.id = id
+class RS(object):
+    def __init__(self, raw):
+        super(RS, self).__init__()
         self.raw = raw
-        if raw is not None:
-            self.id = json.loads(raw)["id"]
+
+
+class EntryCreatedRS(RS):
+    def __init__(self, raw):
+        super(EntryCreatedRS, self).__init__(raw)
+
+    @property
+    def id(self):
+        try:
+            return json.loads(self.raw)["id"]
+        except KeyError:
+            print("{0} object has no attribute 'id'".format(self.raw))
+            return None
 
     def as_dict(self):
-        return {"id": self.id}
+        try:
+            return {"id": self.id}
+        except KeyError:
+            return json.loads(self.raw)
+
 
+class OperationCompletionRS(RS):
+    def __init__(self, raw):
+        super(OperationCompletionRS, self).__init__(raw)
 
-class OperationCompletionRS(object):
-    def __init__(self, msg=None, raw=None):
-        super(OperationCompletionRS, self).__init__()
-        self.msg = msg
-        if raw is not None:
-            self.msg = json.loads(raw)["msg"]
+    @property
+    def msg(self):
+        try:
+            return json.loads(self.raw)["msg"]
+        except KeyError:
+            print("{0} object has no attribute 'msg'".format(self.raw))
+            return None
 
     def as_dict(self):
-        return {"msg": self.msg}
+        try:
+            return {"msg": json.loads(self.raw)["msg"]}
+        except KeyError:
+            return json.loads(self.raw)