feat: add hydrate to configuration

Co-authored-by: Midnighter <[email protected]>

Author: ilaif

src/structurizr/view/configuration.py

@@ -45,7 +45,9 @@ class ConfigurationIO(BaseModel):
     terminology: Optional[TerminologyIO]
     default_view: Optional[str] = Field(None, alias="defaultView")
     last_saved_view: Optional[str] = Field(None, alias="lastSavedView")
-    view_sort_order: Optional[ViewSortOrder] = Field(None, alias="viewSortOrder")
+    view_sort_order: ViewSortOrder = Field(
+        default=ViewSortOrder.Default, alias="viewSortOrder",
+    )
 
 
 class Configuration(AbstractBase):
@@ -65,7 +67,7 @@ def __init__(
         terminology: Optional[Terminology] = None,
         default_view: Optional[str] = None,
         last_saved_view: Optional[str] = None,
-        view_sort_order: Optional[ViewSortOrder] = None,
+        view_sort_order: ViewSortOrder = ViewSortOrder.Default,
         **kwargs
     ) -> None:
         """Initialize an element view."""
@@ -77,3 +79,17 @@ def __init__(
         self.default_view = default_view
         self.last_saved_view = last_saved_view
         self.view_sort_order = view_sort_order
+
+    @classmethod
+    def hydrate(cls, configuration_io: ConfigurationIO) -> "Configuration":
+        """"""
+        return cls(
+            # TODO:
+            # branding=Branding.hydrate(configuration_io.branding),
+            styles=Styles.hydrate(configuration_io.styles),
+            theme=configuration_io.theme,
+            # terminology=Terminology.hydrate(configuration_io.terminology),
+            default_view=configuration_io.default_view,
+            last_saved_view=configuration_io.last_saved_view,
+            view_sort_order=configuration_io.view_sort_order,
+        )

src/structurizr/view/element_style.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Moritz E. Beber, Ilai Fallach.
+# Copyright (c) 2020, Moritz E. Beber.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ class ElementStyleIO(BaseModel):
     background: Optional[Color]
     stroke: Optional[str]
     color: Optional[Color]
-    font_size: Optional[int] = Field(None, alias="fontSize")
+    font_size: Optional[int] = Field(default=None, alias="fontSize")
     shape: Optional[Shape]
     icon: Optional[str]
     border: Optional[Border]
@@ -97,3 +97,22 @@ def __init__(
         self.opacity = opacity
         self.metadata = metadata
         self.description = description
+
+    @classmethod
+    def hydrate(cls, element_style_io: ElementStyleIO) -> "ElementStyle":
+        """"""
+        return cls(
+            tag=element_style_io.tag,
+            width=element_style_io.width,
+            height=element_style_io.height,
+            background=element_style_io.background,
+            stroke=element_style_io.stroke,
+            color=element_style_io.color,
+            font_size=element_style_io.font_size,
+            shape=element_style_io.shape,
+            icon=element_style_io.icon,
+            border=element_style_io.border,
+            opacity=element_style_io.opacity,
+            metadata=element_style_io.metadata,
+            description=element_style_io.description,
+        )

src/structurizr/view/relationship_style.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Moritz E. Beber, Ilai Fallach.
+# Copyright (c) 2020, Moritz E. Beber.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@ class RelationshipStyleIO(BaseModel):
     thickness: Optional[int]
     width: Optional[int]
     color: Optional[Color]
-    font_size: Optional[int] = Field(None, alias="fontSize")
+    font_size: Optional[int] = Field(default=None, alias="fontSize")
     dashed: Optional[bool]
     routing: Optional[Routing]
     position: Optional[int]
@@ -84,3 +84,18 @@ def __init__(
         self.routing = routing
         self.position = position
         self.opacity = opacity
+
+    @classmethod
+    def hydrate(cls, relationship_style_io: RelationshipStyleIO) -> "RelationshipStyle":
+        """"""
+        return cls(
+            tag=relationship_style_io.tag,
+            thickness=relationship_style_io.thickness,
+            color=relationship_style_io.color,
+            font_size=relationship_style_io.font_size,
+            width=relationship_style_io.width,
+            dashed=relationship_style_io.dashed,
+            routing=relationship_style_io.routing,
+            position=relationship_style_io.position,
+            opacity=relationship_style_io.opacity,
+        )