Update other uses of .json, .copy, .schema

src/hexkit/protocols/dao.py

@@ -289,7 +289,7 @@ def _validate_dto_model_id(cls, *, dto_model: type[Dto], id_field: str) -> None:
         """Checks whether the dto_model contains the expected id_field.
         Raises IdFieldNotFoundError otherwise.
         """
-        if id_field not in dto_model.schema()["properties"]:
+        if id_field not in dto_model.model_json_schema()["properties"]:
             raise cls.IdFieldNotFoundError()
 
     @classmethod
@@ -306,11 +306,11 @@ def _validate_dto_creation_model(
         if dto_creation_model is None:
             return
 
-        expected_properties = copy(dto_model.schema()["properties"])
+        expected_properties = copy(dto_model.model_json_schema()["properties"])
         # (the schema method returns an attribute of the class, making a copy to not
         # alter the class)
         del expected_properties[id_field]
-        observed_properties = dto_creation_model.schema()["properties"]
+        observed_properties = dto_creation_model.model_json_schema()["properties"]
 
         if observed_properties != expected_properties:
             raise cls.CreationModelInvalidError()

src/hexkit/providers/mongodb/provider.py

@@ -94,7 +94,7 @@ def _dto_to_document(self, dto: Dto) -> dict[str, Any]:
         """Converts a DTO into a representation that is compatible documents for a
         MongoDB Database.
         """
-        document = json.loads(dto.json())
+        document = json.loads(dto.model_dump_json())
         document["_id"] = document.pop(self._id_field)
 
         return document

tests/integration/test_mongodb.py

@@ -163,7 +163,7 @@ async def test_dao_happy(mongodb_fixture: MongoDbFixture):  # noqa: F811
     assert resource_read == resource_inserted
 
     # update the resource:
-    resource_update = resource_inserted.copy(update={"field_c": False})
+    resource_update = resource_inserted.model_copy(update={"field_c": False})
     await dao.update(resource_update)
 
     # read the updated resource again:
@@ -241,7 +241,7 @@ async def test_dao_upsert_natural_id_happy(
     assert resource == resource_observed
 
     # update the resource:
-    resource_update = resource.copy(update={"field_c": False})
+    resource_update = resource.model_copy(update={"field_c": False})
     await dao.upsert(resource_update)
 
     # check the updated resource: