fix(asyncapi): preserve default value when resolving schema $ref

Author: huynguyengl99

chanx/asyncapi/type_defs.py

@@ -386,6 +386,16 @@ def _resolve_model(self, model: BaseModel) -> BaseModel | Any:
         if ref_value is not None:
             resolved = self._lookup_reference(ref_value)
             if resolved is not None and resolved is not model:
+                # If both are SchemaObjects and original has default, preserve it
+                if isinstance(model, SchemaObject) and isinstance(
+                    resolved, SchemaObject
+                ):
+                    original_default = getattr(model, "default", None)
+                    if original_default is not None:
+                        # Create a copy with the default preserved
+                        resolved = resolved.model_copy(
+                            update={"default": original_default}
+                        )
                 return resolved
 
         # Recursively process all model fields (access via class, not instance)

sandbox_fastapi/apps/room_chat/messages.py

@@ -2,15 +2,23 @@
 Message types for the room chat consumer.
 """
 
+from enum import StrEnum
 from typing import Literal
 
 from chanx.messages.base import BaseMessage
 from pydantic import BaseModel
 
 
+class MessageStatus(StrEnum):
+    PENDING = "PENDING"
+    DELIVERED = "DELIVERED"
+    FAILED = "FAILED"
+
+
 class RoomMessagePayload(BaseModel):
     message: str
     room_name: str | None = None
+    status: MessageStatus = MessageStatus.PENDING
 
 
 class RoomChatMessage(BaseMessage):

sandbox_fastapi/tests/test_results/asyncapi_schema.json

@@ -879,6 +879,15 @@
         "title": "MessagePayload",
         "type": "object"
       },
+      "MessageStatus": {
+        "enum": [
+          "PENDING",
+          "DELIVERED",
+          "FAILED"
+        ],
+        "title": "MessageStatus",
+        "type": "string"
+      },
       "NotificationBroadcastMessage": {
         "description": "Notification broadcast message.",
         "properties": {
@@ -1058,6 +1067,10 @@
             ],
             "default": null,
             "title": "Room Name"
+          },
+          "status": {
+            "$ref": "#/components/schemas/MessageStatus",
+            "default": "PENDING"
           }
         },
         "required": [

sandbox_fastapi/tests/test_results/asyncapi_schema.yaml

@@ -538,6 +538,13 @@ components:
       - message
       title: MessagePayload
       type: object
+    MessageStatus:
+      enum:
+      - PENDING
+      - DELIVERED
+      - FAILED
+      title: MessageStatus
+      type: string
     NotificationBroadcastMessage:
       description: Notification broadcast message.
       properties:
@@ -669,6 +676,9 @@ components:
           - type: 'null'
           default: null
           title: Room Name
+        status:
+          $ref: '#/components/schemas/MessageStatus'
+          default: PENDING
       required:
       - message
       title: RoomMessagePayload

tests/fixtures/client_generation/expected_output/room_chat/messages.py

@@ -10,6 +10,7 @@ class RoomMessagePayload(BaseModel):
 
     message: str
     room_name: str | None = None
+    status: Literal["PENDING", "DELIVERED", "FAILED"] = "PENDING"
 
 
 class RoomChatMessage(BaseModel):

tests/fixtures/client_generation/schema.json

@@ -879,6 +879,15 @@
         "title": "MessagePayload",
         "type": "object"
       },
+      "MessageStatus": {
+        "enum": [
+          "PENDING",
+          "DELIVERED",
+          "FAILED"
+        ],
+        "title": "MessageStatus",
+        "type": "string"
+      },
       "NotificationBroadcastMessage": {
         "description": "Notification broadcast message.",
         "properties": {
@@ -1058,6 +1067,10 @@
             ],
             "default": null,
             "title": "Room Name"
+          },
+          "status": {
+            "$ref": "#/components/schemas/MessageStatus",
+            "default": "PENDING"
           }
         },
         "required": [