Fixed Link validation (#714)

* fixed Link validation in validate_self method

* reorganized tests

* added comments

* imports sorted

beanie/odm/fields.py

@@ -340,6 +340,16 @@ def validate(v: Union[DBRef, T], validation_info: ValidationInfo):
                     return cls(ref=v, document_class=document_class)
                 if isinstance(v, Link):
                     return v
+                if isinstance(v, dict) and v.keys() == {"id", "collection"}:
+                    return cls(
+                        ref=DBRef(
+                            collection=v["collection"],
+                            id=TypeAdapter(
+                                document_class.model_fields["id"].annotation
+                            ).validate_python(v["id"]),
+                        ),
+                        document_class=document_class,
+                    )
                 if isinstance(v, dict) or isinstance(v, BaseModel):
                     return parse_obj(document_class, v)
                 new_id = TypeAdapter(

tests/odm/conftest.py

@@ -90,6 +90,7 @@
     Vehicle,
     Window,
     WindowWithRevision,
+    WindowWithValidationOnSave,
     Yard,
     YardWithRevision,
 )
@@ -210,6 +211,7 @@ async def init(db):
         DocumentWithRevisionTurnedOn,
         House,
         Window,
+        WindowWithValidationOnSave,
         Door,
         Roof,
         Yard,

tests/odm/documents/test_validation_on_save.py

@@ -1,7 +1,11 @@
 import pytest
 from pydantic import ValidationError
 
-from tests.odm.models import DocumentWithValidationOnSave
+from tests.odm.models import (
+    DocumentWithValidationOnSave,
+    Lock,
+    WindowWithValidationOnSave,
+)
 
 
 async def test_validate_on_insert():
@@ -37,3 +41,14 @@ async def test_validate_on_save_skip_action():
     doc = DocumentWithValidationOnSave(num_1=1, num_2=2)
     await doc.insert(skip_actions=["num_2_plus_1"])
     assert doc.num_2 == 2
+
+
+async def test_validate_on_save_dbref():
+    lock = Lock(k=1)
+    await lock.insert()
+    window = WindowWithValidationOnSave(
+        x=1,
+        y=1,
+        lock=lock.to_ref(),  # this is what exactly we want to test
+    )
+    await window.insert()

tests/odm/models.py

@@ -508,6 +508,15 @@ class Window(Document):
     lock: Optional[Link[Lock]] = None
 
 
+class WindowWithValidationOnSave(Document):
+    x: int
+    y: int
+    lock: Optional[Link[Lock]] = None
+
+    class Settings:
+        validate_on_save = True
+
+
 class Door(Document):
     t: int = 10
     window: Optional[Link[Window]] = None