diff options
Diffstat (limited to 'archaeological_warehouse/serializers.py')
| -rw-r--r-- | archaeological_warehouse/serializers.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/archaeological_warehouse/serializers.py b/archaeological_warehouse/serializers.py index 2c44c9dcf..ed5a3f189 100644 --- a/archaeological_warehouse/serializers.py +++ b/archaeological_warehouse/serializers.py @@ -13,7 +13,7 @@ WAREHOUSE_MODEL_LIST = [ # TODO: associated documents -def generate_queryset(base_query_key, ids): +def generate_warehouse_queryset(base_query_key, ids): warehouse_division_q, warehouse_q, container_q = None, None, None container_loca_q = None for find_key in ("finds", "finds_ref"): @@ -63,20 +63,21 @@ def warehouse_serialization(archive=False, return_empty_types=False, if operation_queryset: operation_ids = operation_queryset.values_list("id", flat=True) base_query_key = "base_finds__context_record__operation_id__in" - result_queryset = generate_queryset(base_query_key, operation_ids) + result_queryset = generate_warehouse_queryset(base_query_key, + operation_ids) elif site_queryset: site_ids = site_queryset.values_list("id", flat=True) base_query_key = "base_finds__context_record__"\ "archaeological_site_id__in" - result_queryset = generate_queryset(base_query_key, site_ids) + result_queryset = generate_warehouse_queryset(base_query_key, site_ids) elif cr_queryset: cr_ids = cr_queryset.values_list("id", flat=True) base_query_key = "base_finds__context_record__id__in" - result_queryset = generate_queryset(base_query_key, cr_ids) + result_queryset = generate_warehouse_queryset(base_query_key, cr_ids) elif find_queryset: find_ids = find_queryset.values_list("id", flat=True) base_query_key = "id__in" - result_queryset = generate_queryset(base_query_key, find_ids) + result_queryset = generate_warehouse_queryset(base_query_key, find_ids) elif warehouse_queryset: warehouse_ids = warehouse_queryset.values_list("id", flat=True) result_queryset = { |