message eerors

App/Messages/MessagesRoute.py

@@ -100,7 +100,8 @@ async def receive_message(message_data: MessageCreate):
             if isinstance(payment, Payment):
                 await payment.create_subscription_or_balance()
             else:
-                return payment
+                ## this is not a paymemt instance it is a json response due to an error
+                return MessageResponse(**message_data.dict())
 
             # Create a new message record with parsed_data
             message = await Message.create(

App/Messages/Schema.py

@@ -1,7 +1,11 @@
 # App/Messages/Schema.py
-from pydantic import BaseModel, UUID4, Field, ConfigDict, condecimal, constr
+from pydantic import BaseModel, UUID4, Field, ConfigDict, condecimal, constr, validator
 from datetime import datetime
-from typing import Optional
+from typing import Optional, Dict
+import uuid
+
+from pydantic import BaseModel, UUID4, Field, validator, ConfigDict
+from uuid import uuid4, UUID
 
 
 class TransactionSchema(BaseModel):
@@ -29,19 +33,34 @@ class MessageCreate(BaseModel):
 
 
 class MessageResponse(BaseModel):
-    id: UUID4
-    device_id: Optional[str]
-    event: Optional[str]
-    message_id: Optional[str]
-    webhook_id: Optional[str]
-    message_content: str
-    phone_number: str
-    received_at: datetime
-    sim_number: Optional[int]
-    parsed_data: Optional[dict]  # Include parsed_data in the response
-    created_time: datetime
+    id: Optional[UUID4] = Field(
+        default_factory=uuid.uuid4
+    )  # Automatically generate UUID4 if not provided
+    device_id: Optional[str] = None
+    event: Optional[str] = None
+    message_id: Optional[str] = None
+    webhook_id: Optional[str] = None
+    message_content: Optional[str] = None
+    phone_number: Optional[str] = None
+    received_at: Optional[datetime] = None
+    sim_number: Optional[int] = None
+    parsed_data: Optional[Dict] = None  # Include parsed_data in the response
+    created_time: Optional[datetime] = None
     model_config = ConfigDict(from_attributes=True)
 
+    @validator("id", pre=True, always=True)
+    def validate_uuid(cls, v):
+        """
+        Ensure all ID fields are valid UUIDs. If the input is invalid or missing,
+        generate a new UUID.
+        """
+        if v is None or not isinstance(v, (UUID, str)):
+            return uuid4()  # Generate a new UUID if not provided or invalid
+        try:
+            return UUID(v)  # Validate and convert to UUID
+        except ValueError:
+            return uuid4()  # Generate a new UUID if validation fails
+
     # class Config:
     #     orm_mode = True
     #     allow_population_by_field_name = True