Refactor code layout

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

diff --git a/o2ims/domain/stx_object.py b/o2ims/domain/stx_object.py
index 36ce349..5e4d660 100644 (file)
--- a/o2ims/domain/stx_object.py
+++ b/o2ims/domain/stx_object.py
@@ -15,21 +15,18 @@
 # from dataclasses import dataclass\r
 import datetime\r
 import json\r
+from o2common.domain.base import AgRoot\r
 \r
-from o2ims.domain.resource_type import ResourceTypeEnum\r
-import logging\r
-logger = logging.getLogger(__name__)\r
+from o2ims.domain.resource_type import ResourceTypeEnum, MismatchedModel\r
+from o2common.helper import o2logging\r
+logger = o2logging.get_logger(__name__)\r
 \r
 \r
-class MismatchedModel(Exception):\r
-    pass\r
-\r
-\r
-class StxGenericModel:\r
+class StxGenericModel(AgRoot):\r
     def __init__(self, type: ResourceTypeEnum,\r
                  api_response: dict = None, content_hash=None) -> None:\r
         if api_response:\r
-            self.id = api_response.uuid\r
+            self.id = str(api_response.uuid)\r
             self.type = type\r
             self.updatetime = datetime.datetime.strptime(\r
                 api_response.updated_at.split('.')[0], "%Y-%m-%dT%H:%M:%S") \\r