From 5d808646743f0de6cedb35b74724f47f5894ab01 Mon Sep 17 00:00:00 2001 From: estromenko Date: Sat, 29 Nov 2025 16:54:02 +0300 Subject: [PATCH] Extend filter for get_next_vacancy function --- vacancies/main/recommendations.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vacancies/main/recommendations.py b/vacancies/main/recommendations.py index 08189f7..f9d8fdc 100644 --- a/vacancies/main/recommendations.py +++ b/vacancies/main/recommendations.py @@ -6,8 +6,10 @@ from vacancies.main.models import Vacancy def get_next_vacancy(customer_cv): vacancy = Vacancy.objects.filter( ~Q(id__in=customer_cv.customer.recommended_vacancies.values_list("vacancy_id", flat=True)), - Q(min_salary_rub__isnull=True) | Q(min_salary_rub__gt=customer_cv.min_salary_rub), job_title__title__in=customer_cv.job_titles.values_list("title", flat=True), + ).filter( + (Q(min_salary_rub__isnull=True) | Q(min_salary_rub__gt=customer_cv.min_salary_rub)) | + (Q(max_salary_rub__isnull=False) & Q(max_salary_rub__gte=customer_cv.min_salary_rub)), ).order_by("-timestamp").first() if vacancy: customer_cv.customer.recommended_vacancies.create(vacancy=vacancy)