get smart query removed

This commit is contained in:
2024-11-13 14:03:47 +03:00
parent 129e8015f3
commit 052d1f7b9c
17 changed files with 19 additions and 31 deletions

View File

@@ -47,7 +47,6 @@ class AddressListEventMethods(MethodToEvent):
status_code=404,
detail="User has no post code registered. User can not list addresses.",
)
get_street_ids = [
street_id[0]
for street_id in AddressPostcode.select_only(
@@ -62,14 +61,12 @@ class AddressListEventMethods(MethodToEvent):
status_code=404,
detail="User has no street registered. User can not list addresses.",
)
Addresses.pre_query = Addresses.filter_all(
Addresses.street_id.in_(get_street_ids),
*Addresses.valid_record_args(Addresses),
).query
Addresses.filter_attr = list_options
records = Addresses.filter_all(
*Addresses.get_smart_query(list_options.query),
*Addresses.valid_record_args(Addresses),
).data
return AlchemyJsonResponse(
@@ -87,7 +84,6 @@ class AddressListEventMethods(MethodToEvent):
Addresses.filter_attr = list_options
records = Addresses.list_via_employee(
token_dict=token_dict,
filter_expr=Addresses.get_smart_query(list_options.query),
)
return AlchemyJsonResponse(
completed=True,
@@ -419,8 +415,7 @@ class AddressPostCodeListEventMethods(MethodToEvent):
).query
AddressPostcode.filter_attr = list_options
records = AddressPostcode.filter_all(
*Addresses.get_smart_query(list_options.query),
*Addresses.valid_record_args(AddressPostcode),
*AddressPostcode.valid_record_args(AddressPostcode),
).data
return AlchemyJsonResponse(
completed=True,