paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-02 13:45:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3209 from paperless-ngx/fix/issue-3206

Browse Source 
Fix: advanced search or date searching + doc type/correspondent/storage path broken
This commit is contained in:
shamoon 2023-04-27 10:09:20 -07:00 committed by GitHub
commit deaff293d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/documents/index.py
View File

@ -172,6 +172,14 @@ class DelayedQuery:
for k, v in self.query_params.items(): for k, v in self.query_params.items():
if k == "correspondent__id": if k == "correspondent__id":
criterias.append(query.Term("correspondent_id", v)) criterias.append(query.Term("correspondent_id", v))
elif k == "correspondent__id__in":
for correspondent_id in v.split(","):
criterias.append(query.Term("correspondent_id", correspondent_id))
elif k == "correspondent__id__none":
for correspondent_id in v.split(","):
criterias.append(
query.Not(query.Term("correspondent_id", correspondent_id)),
)
elif k == "tags__id__all": elif k == "tags__id__all":
for tag_id in v.split(","): for tag_id in v.split(","):
criterias.append(query.Term("tag_id", tag_id)) criterias.append(query.Term("tag_id", tag_id))
@ -180,6 +188,12 @@ class DelayedQuery:
criterias.append(query.Not(query.Term("tag_id", tag_id))) criterias.append(query.Not(query.Term("tag_id", tag_id)))
elif k == "document_type__id": elif k == "document_type__id":
criterias.append(query.Term("type_id", v)) criterias.append(query.Term("type_id", v))
elif k == "document_type__id__in":
for document_type_id in v.split(","):
criterias.append(query.Term("type_id", document_type_id))
elif k == "document_type__id__none":
for document_type_id in v.split(","):
criterias.append(query.Not(query.Term("type_id", document_type_id)))
elif k == "correspondent__isnull": elif k == "correspondent__isnull":
criterias.append(query.Term("has_correspondent", v == "false")) criterias.append(query.Term("has_correspondent", v == "false"))
elif k == "is_tagged": elif k == "is_tagged":
@ -200,6 +214,12 @@ class DelayedQuery:
criterias.append(query.DateRange("added", start=None, end=isoparse(v))) criterias.append(query.DateRange("added", start=None, end=isoparse(v)))
elif k == "storage_path__id": elif k == "storage_path__id":
criterias.append(query.Term("path_id", v)) criterias.append(query.Term("path_id", v))
elif k == "storage_path__id__in":
for storage_path_id in v.split(","):
criterias.append(query.Term("path_id", storage_path_id))
elif k == "storage_path__id__none":
for storage_path_id in v.split(","):
criterias.append(query.Not(query.Term("path_id", storage_path_id)))
elif k == "storage_path__isnull": elif k == "storage_path__isnull":
criterias.append(query.Term("has_path", v == "false")) criterias.append(query.Term("has_path", v == "false"))

24
src/documents/tests/test_api.py
View File

@ -955,8 +955,32 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase):
[d1.id, d2.id, d5.id, d7.id], [d1.id, d2.id, d5.id, d7.id],
) )
self.assertCountEqual(search_query("&correspondent__id=" + str(c.id)), [d1.id]) self.assertCountEqual(search_query("&correspondent__id=" + str(c.id)), [d1.id])
self.assertCountEqual(
search_query("&correspondent__id__in=" + str(c.id)),
[d1.id],
)
self.assertCountEqual(
search_query("&correspondent__id__none=" + str(c.id)),
[d2.id, d3.id, d4.id, d5.id, d7.id],
)
self.assertCountEqual(search_query("&document_type__id=" + str(dt.id)), [d2.id]) self.assertCountEqual(search_query("&document_type__id=" + str(dt.id)), [d2.id])
self.assertCountEqual(
search_query("&document_type__id__in=" + str(dt.id)),
[d2.id],
)
self.assertCountEqual(
search_query("&document_type__id__none=" + str(dt.id)),
[d1.id, d3.id, d4.id, d5.id, d7.id],
)
self.assertCountEqual(search_query("&storage_path__id=" + str(sp.id)), [d7.id]) self.assertCountEqual(search_query("&storage_path__id=" + str(sp.id)), [d7.id])
self.assertCountEqual(
search_query("&storage_path__id__in=" + str(sp.id)),
[d7.id],
)
self.assertCountEqual(
search_query("&storage_path__id__none=" + str(sp.id)),
[d1.id, d2.id, d3.id, d4.id, d5.id],
)
self.assertCountEqual( self.assertCountEqual(
search_query("&storage_path__isnull"), search_query("&storage_path__isnull"),