fix .find_many_in_all()

add more test

beanie/odm/documents.py

@@ -1248,8 +1248,8 @@ def find_many_in_all(  # type: ignore
         nesting_depth: Optional[int] = None,
         nesting_depths_per_field: Optional[Dict[str, int]] = None,
         **pymongo_kwargs,
-    ) -> FindMany[FindType]:
-        return Document.find_many(
+    ) -> Union[FindMany[FindType], FindMany["DocumentProjectionType"]]:
+        return cls._find_many_query_class(document_model=cls).find_many(
             *args,
             sort=sort,
             skip=skip,
@@ -1259,7 +1259,6 @@ def find_many_in_all(  # type: ignore
             ignore_cache=ignore_cache,
             fetch_links=fetch_links,
             lazy_parse=lazy_parse,
-            with_children=with_children,
             nesting_depth=nesting_depth,
             nesting_depths_per_field=nesting_depths_per_field,
             **pymongo_kwargs,

tests/odm/documents/test_soft_delete.py

@@ -1,7 +1,7 @@
 from tests.odm.models import DocumentTestModelWithSoftDelete
 
 
-async def test_insert_one_and_delete_one(document_soft_delete_not_inserted):
+async def test_get_item(document_soft_delete_not_inserted):
     # insert a document with soft delete
     result = await document_soft_delete_not_inserted.insert()
 
@@ -17,12 +17,59 @@ async def test_insert_one_and_delete_one(document_soft_delete_not_inserted):
     await document.delete()
     assert document.is_deleted() is True
 
-    # check if document exist
+    # check if document exist with `.get()`
     document = await DocumentTestModelWithSoftDelete.get(document_id=result.id)
+    assert document is None
+
+    # check document exist in trashed
+    results = (
+        await DocumentTestModelWithSoftDelete.find_many_in_all().to_list()
+    )
+    assert len(results) == 1
+
+
+async def test_find_one(document_soft_delete_not_inserted):
+    result = await document_soft_delete_not_inserted.insert()
+
+    # # delete the document
+    await result.delete()
 
+    # check if document exist with `.find_one()`
+    document = await DocumentTestModelWithSoftDelete.find_one(
+        DocumentTestModelWithSoftDelete.id == result.id
+    )
     assert document is None
 
 
+async def test_find(documents_soft_delete_not_inserted):
+    # insert 3 documents
+    inserted_docs = []
+    for doc in documents_soft_delete_not_inserted:
+        result = await doc.insert()
+        inserted_docs.append(result)
+
+    # use `.find_many()` to get them all
+    results = await DocumentTestModelWithSoftDelete.find().to_list()
+    assert len(results) == 3
+
+    # delete one of them
+    await inserted_docs[0].delete()
+
+    # check items in with `.find_many()`
+    results = await DocumentTestModelWithSoftDelete.find_many().to_list()
+
+    assert len(results) == 2
+
+    founded_documents_id = [doc.id for doc in results]
+    assert inserted_docs[0].id not in founded_documents_id
+
+    # check in trashed items
+    results = (
+        await DocumentTestModelWithSoftDelete.find_many_in_all().to_list()
+    )
+    assert len(results) == 3
+
+
 async def test_find_many(documents_soft_delete_not_inserted):
     # insert 2 documents
     item_1 = await documents_soft_delete_not_inserted[0].insert()
@@ -35,7 +82,29 @@ async def test_find_many(documents_soft_delete_not_inserted):
     # delete one of them
     await item_1.delete()
 
+    # check items in with `.find_many()`
     results = await DocumentTestModelWithSoftDelete.find_many().to_list()
 
     assert len(results) == 1
     assert results[0].id == item_2.id
+
+    # check in trashed items
+    results = (
+        await DocumentTestModelWithSoftDelete.find_many_in_all().to_list()
+    )
+    assert len(results) == 2
+
+
+async def test_hard_delete(document_soft_delete_not_inserted):
+    result = await document_soft_delete_not_inserted.insert()
+    await result.hard_delete()
+
+    # check items in with `.find_many()`
+    results = await DocumentTestModelWithSoftDelete.find_many().to_list()
+    assert len(results) == 0
+
+    # check in trashed
+    results = (
+        await DocumentTestModelWithSoftDelete.find_many_in_all().to_list()
+    )
+    assert len(results) == 0