refactor: BaseModel._deserialize

Author: c0rydoras

src/libtimed/models.py

@@ -43,59 +43,47 @@ def __init__(self, client) -> None:
     relationships: list[tuple]
     filters: list[tuple]
 
-    def _deserialize(self, item, included):  # noqa: C901
+    def _get_included_item(self, item_type: str, item_id, included: dict):
+        included_item = next(
+            (
+                included_item
+                for included_item in included
+                if included_item.get("type") == item_type and included_item.get("id") == item_id
+            ),
+            None,
+        )
+        if not included_item:
+            return None
+        included_model = self.client._type_map[item_type](self.client)
+        return included_model._deserialize(included_item, included)
+
+    def _deserialize(self, item, included):
         for key, value in item["attributes"].items():
             transform = next(
                 (transform for name, _, transform in self.__class__.attributes if name == key),
                 None,
             )
             item["attributes"][key] = (transform).deserialize(value) if transform else value
-        relationships = item.get("relationships")
-        if not relationships:
+
+        if not (relationships := item.get("relationships")):
             return item
         for key, value in relationships.items():
-            if not value:
+            if not value or not (data := value.get("data")):
                 continue
-            if value.get("data"):
-                data = value["data"]
-                if isinstance(data, list):
-                    included_items = []
-                    for rel_data in data:
-                        item_type = rel_data["type"]
-                        item_id = rel_data["id"]
-                        included_item = next(
-                            (
-                                included_item
-                                for included_item in included
-                                if included_item.get("type") == item_type
-                                and included_item.get("id") == item_id
-                            ),
-                            None,
+            if isinstance(data, list):
+                if included_items := [
+                    included_item
+                    for relationship_data in data
+                    if (
+                        included_item := self._get_included_item(
+                            relationship_data["type"], relationship_data["id"], included
                         )
-                        if included_item:
-                            included_model = self.client._type_map[item_type](self.client)
-                            included_items.append(
-                                included_model._deserialize(included_item, included)
-                            )
-                    item["relationships"][key] = included_items
-                else:
-                    item_type = data["type"]
-                    item_id = data["id"]
-                    included_item = next(
-                        (
-                            included_item
-                            for included_item in included
-                            if included_item.get("type") == item_type
-                            and included_item.get("id") == item_id
-                        ),
-                        None,
                     )
-                    if included_item:
-                        included_model = self.client._type_map[item_type](self.client)
-                        item["relationships"][key] = included_model._deserialize(
-                            included_item, included
-                        )
-
+                ]:
+                    item["relationships"][key] = included_items
+                continue
+            if included_item := self._get_included_item(data["type"], data["id"], included):
+                item["relationships"][key] = included_item
         return item
 
     def get(