S3350290 case study 3

api/model/diagram/api/schemas/__init__.py

@@ -4,6 +4,7 @@
     ReadDiagram,
     UpdateDiagram,
     FullDiagram,
+    ExportDiagram,
 )
 
 from diagram.api.schemas.node import (
@@ -21,6 +22,7 @@
     ListEdges,
     EdgeSchema,
     UpdateEdge,
+    PatchEdge,
 )
 
 __all__ = [
@@ -37,7 +39,9 @@
     "ClassifierUsageResponse",
     "RelationUsageResponse",
     "CreateEdge",
+    "PatchEdge",
     "ListEdges",
     "EdgeSchema",
     "UpdateEdge",
+    "ExportDiagram",
 ]

api/model/diagram/api/schemas/diagram.py

@@ -4,9 +4,9 @@
 
 from ninja import ModelSchema, Schema
 
-from diagram.models import Diagram
-from .node import CreateNode, NodeSchema
-from .edge import CreateEdge, EdgeSchema
+from diagram.models import Diagram, Node
+from .node import CreateNode, NodeSchema, ExportNode, ImportNode
+from .edge import CreateEdge, EdgeSchema, ExportEdge, ImportEdge
 
 
 class DiagramType(str, Enum):
@@ -20,6 +20,7 @@ class ReadDiagram(ModelSchema):
     project: str
     system_id: UUID
     system_name: str
+    system: UUID # TODO Remove later
 
     class Meta:
         model = Diagram
@@ -37,6 +38,11 @@ def resolve_system_id(obj):
     def resolve_system_name(obj):
         return str(obj.system.name)
 
+    # TODO Remove later
+    @staticmethod
+    def resolve_system(obj):
+        return str(obj.system.id)
+
 
 class CreateDiagram(Schema):
     system: str
@@ -49,9 +55,58 @@ class UpdateDiagram(Schema):
     description: Optional[str] = None
 
 
+class RelatedClassAttribute(Schema):
+    name: str
+    type: str
+
+class RelatedNode(ModelSchema):
+    name: str
+    type: str
+    actorNode: Optional[str]
+    classAttributes: Optional[List[RelatedClassAttribute]] = None
+
+    class Meta:
+        model = Node
+        fields = ["id"]
+
+    @staticmethod
+    def resolve_name(obj):
+        return obj.cls.data.get('name') or ""
+
+    @staticmethod
+    def resolve_type(obj):
+        return obj.cls.data["type"]
+
+    @staticmethod
+    def resolve_actorNode(obj):
+        return obj.cls.data.get('actorNode')
+
+    @staticmethod
+    def resolve_classAttributes(obj):
+        if obj.cls.data.get('type') == 'class':
+            return [
+                RelatedClassAttribute(name=attribute['name'], type=attribute['type'])
+                for attribute in obj.cls.data.get('attributes', [])
+            ]
+        return None
+
+
+class RelatedDiagram(ModelSchema):
+    nodes: List[RelatedNode]
+
+    class Meta:
+        model = Diagram
+        fields = ["id", "name", "type"]
+
+    @staticmethod
+    def resolve_nodes(obj):
+        return obj.nodes.all()
+
+
 class FullDiagram(ReadDiagram):
     nodes: List[NodeSchema]
     edges: List[EdgeSchema]
+    related_diagrams: List[RelatedDiagram] = []
 
     @staticmethod
     def resolve_nodes(obj):
@@ -61,16 +116,49 @@ def resolve_nodes(obj):
     def resolve_edges(obj):
         return obj.edges.prefetch_related("rel").all()
 
+    @staticmethod
+    def resolve_related_diagrams(obj):
+        return Diagram.objects.filter(system=obj.system.id).exclude(id=obj.id)
+
 
 class ImportDiagram(CreateDiagram):
     nodes: List[CreateNode]
     edges: List[CreateEdge]
 
 
+class ExportDiagram(ModelSchema):
+    nodes: List[ExportNode] = []
+    edges: List[ExportEdge] = []
+
+    class Meta:
+        model = Diagram
+        fields = "__all__"
+
+    @staticmethod
+    def resolve_nodes(obj):
+        return obj.nodes.all()
+
+    @staticmethod
+    def resolve_edges(obj):
+        return obj.edges.all()
+
+
+class ImportDiagram(Schema):
+    id: str
+    type: DiagramType
+    name: str
+    description: Optional[str] = None
+    system: str
+    nodes: list[ImportNode]
+    edges: list[ImportEdge]
+
+
 __all__ = [
     "ReadDiagram",
     "ImportDiagram",
     "CreateDiagram",
     "UpdateDiagram",
     "FullDiagram",
+    "ExportDiagram",
+    "ImportDiagram",
 ]

api/model/diagram/api/schemas/edge.py

@@ -2,7 +2,7 @@
 from uuid import UUID
 
 from ninja import ModelSchema, Schema
-from diagram.models import Edge
+from diagram.models import Edge, Relation as RelationModel
 from metadata.specification import Relation
 
 
@@ -58,12 +58,52 @@ class UpdateEdge(Schema):
     data: Optional[EdgeData] = None
 
 
+class PatchEdge(Schema):
+    rel: Optional[dict] = None
+    data: Optional[EdgeData] = None
+
+
 class ListEdges(Schema):
     nodes: List[EdgeSchema] = []
 
+class ExportRelation(ModelSchema):
+    class Meta:
+        model = RelationModel
+        fields = "__all__"
+
+
+class ImportRelation(Schema):
+    id: str
+    data: dict
+    system: str
+    source: str
+    target: str
+
+
+class ExportEdge(ModelSchema):
+    rel_data: ExportRelation
+
+    class Meta:
+        model = Edge
+        fields = "__all__"
+
+    @staticmethod
+    def resolve_rel_data(obj):
+        return obj.rel
+
+
+class ImportEdge(Schema):
+    id: str
+    diagram: str
+    rel: str
+    data: dict
+    rel_data: ImportRelation
+
 
 __all__ = [
     "CreateEdge",
     "EdgeSchema",
     "ListEdges",
+    "ExportEdge",
+    "ImportEdge",
 ]

api/model/diagram/api/schemas/node.py

@@ -2,7 +2,7 @@
 from uuid import UUID
 
 from ninja import ModelSchema, Schema
-from diagram.models import Node
+from diagram.models import Node, Classifier as ClassifierModel
 from metadata.specification import Classifier
 
 
@@ -75,6 +75,38 @@ class RelationUsageResponse(Schema):
     usages: List[DiagramUsageItem]
 
 
+class ExportClassifier(ModelSchema):
+    class Meta:
+        model = ClassifierModel
+        fields = "__all__"
+
+
+class ImportClassifier(Schema):
+    id: str
+    system: str
+    data: dict
+
+
+class ExportNode(ModelSchema):
+    cls_data: ExportClassifier
+
+    class Meta:
+        model = Node
+        fields = "__all__"
+
+    @staticmethod
+    def resolve_cls_data(obj):
+        return obj.cls
+
+
+class ImportNode(Schema):
+    id: str
+    cls_data: ImportClassifier
+    diagram: str
+    cls: str
+    data: NodeData
+
+
 __all__ = [
     "CreateNode",
     "PatchNode",
@@ -83,4 +115,6 @@ class RelationUsageResponse(Schema):
     "DiagramUsageItem",
     "ClassifierUsageResponse",
     "RelationUsageResponse",
+    "ExportNode",
+    "ImportNode",
 ]

api/model/diagram/api/views/edge.py

@@ -4,12 +4,14 @@
 from django.shortcuts import get_object_or_404
 
 from ninja import Router
+from pydantic import BaseModel
 
 import diagram.api.utils as utils
 
-from diagram.api.schemas import CreateEdge, EdgeSchema, UpdateEdge, DiagramUsageItem, RelationUsageResponse
-from diagram.models import Node, Edge
+from diagram.api.schemas import CreateEdge, EdgeSchema, UpdateEdge, DiagramUsageItem, RelationUsageResponse, PatchEdge
+from diagram.models import Node, Edge, Edge
 from diagram.api.utils.edge import fetch_and_update_edges, remove_edge_from_diagram, delete_relation_everywhere
+from metadata.specification import Relation
 
 
 edge = Router()
@@ -89,6 +91,7 @@ def update_edge(request: HttpRequest, edge_id: UUID, data: UpdateEdge):
     if data.rel is not None:
         current = edge_obj.rel.data or {}
         merged = {**current, **data.rel}
+        PatchModel.model_validate({"rel": merged})
         new_type = merged.get("type", current.get("type"))
 
         # default fallback if type is missing
@@ -101,6 +104,7 @@ def update_edge(request: HttpRequest, edge_id: UUID, data: UpdateEdge):
             mult = merged.get("multiplicity") or {}
 
             cleaned = {
+                **merged,
                 "type": new_type,
                 "label": merged.get("label", ""),
                 "labels": {
@@ -115,12 +119,14 @@ def update_edge(request: HttpRequest, edge_id: UUID, data: UpdateEdge):
 
         elif new_type == "dependency":
             cleaned = {
+                **merged,
                 "type": "dependency",
                 "label": merged.get("label", ""),
             }
 
         elif new_type == "generalization":
             cleaned = {
+                **merged,
                 "type": "generalization",
             }
 
@@ -132,7 +138,7 @@ def update_edge(request: HttpRequest, edge_id: UUID, data: UpdateEdge):
 
     if data.data is not None:
         current_data = edge_obj.data or {}
-        updated_data = {**current_data, **data.data}
+        updated_data = {**current_data, **data.data.model_dump()}
         edge_obj.data = updated_data
         edge_obj.save()
 
@@ -159,6 +165,13 @@ def hard_delete_relation(request: HttpRequest, edge_id: str):
     return delete_relation_everywhere(diagram=diagram, edge_id=edge_id)
 
 
+
+
+
+class PatchModel(BaseModel):
+    rel: Relation
+
+
 @edge.get("/{uuid:edge_id}/", response=EdgeSchema)
 def edge_node(request: HttpRequest, edge_id: str):
     diagram = utils.get_diagram(request)

api/model/metadata/api/schemas/__init__.py

@@ -1,5 +1,5 @@
 from .project import ReadProject, UpdateProject, CreateProject
-from .system import ReadSystem, UpdateSystem, CreateSystem
+from .system import ReadSystem, UpdateSystem, CreateSystem, ExportSystem, ImportSystem
 from .interface import ReadInterface, UpdateInterface, CreateInterface
 from .release import ReadRelease, UpdateRelease
 from .meta import MetaSchema, MetaClassifiersSchema, MetaRelationsSchema
@@ -11,6 +11,8 @@
     "ReadSystem",
     "UpdateSystem",
     "CreateSystem",
+    "ExportSystem",
+    "ImportSystem",
     "MetaSchema",
     "MetaClassifiersSchema",
     "MetaRelationsSchema",