Messages

App/Messages/Schema.py

@@ -1,7 +1,7 @@
 # App/Messages/Schema.py
 from pydantic import BaseModel, UUID4, Field, ConfigDict, condecimal, constr, validator
 from datetime import datetime
-from typing import Optional, Dict
+from typing import Optional, Dict, Union
 import uuid
 
 from pydantic import BaseModel, UUID4, Field, validator, ConfigDict
@@ -33,9 +33,7 @@ class MessageCreate(BaseModel):
 
 
 class MessageResponse(BaseModel):
-    id: Optional[UUID4] = Field(
-        default_factory=uuid.uuid4
-    )  # Automatically generate UUID4 if not provided
+    id: Optional[Union[UUID4, str]] = None
     device_id: Optional[str] = None
     event: Optional[str] = None
     message_id: Optional[str] = None
@@ -48,19 +46,6 @@ class MessageResponse(BaseModel):
     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