diff --git a/core/migrations/0020_merge_20191114_0803.py b/core/migrations/0020_merge_20191114_0803.py new file mode 100644 index 0000000000000000000000000000000000000000..c06f8422a4790b1988e1303ee9eff1779eae633b --- /dev/null +++ b/core/migrations/0020_merge_20191114_0803.py @@ -0,0 +1,17 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.17 on 2019-11-14 01:03 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0017_vacancy_amount'), + ('core', '0019_merge_20191006_0852'), + ('core', '0014_auto_20191004_1340'), + ] + + operations = [ + ] diff --git a/core/views/vacancies.py b/core/views/vacancies.py index f51cfd3ae9064cbee6c8f97c29071d8541bc1845..33df679a9aedaf14c6866e0c9b4ad32f496e297d 100644 --- a/core/views/vacancies.py +++ b/core/views/vacancies.py @@ -34,6 +34,16 @@ class VacancyViewSet(MultiSerializerViewSetMixin, viewsets.ModelViewSet): def list(self, request, *args, **kwargs): vacancies = Vacancy.objects.all() + + # Filter vacancies + vacancies = self.verifiedFilter(vacancies, request) + + page = self.paginate_queryset(vacancies) + if page is not None: + return self.get_paginated_response(VacancySerializer(page, many=True, context={'request': request}).data) + return Response(VacancySerializer(vacancies, many=True, context={'request': request}).data) + + def verifiedFilter(self, vacancies, request): verified = request.query_params['verified'] if 'verified' in request.query_params else "True" companies = [int(x) for x in request.query_params.getlist('company', [])] if verified.lower() in ("yes", "true", "t", "1"): @@ -42,10 +52,7 @@ class VacancyViewSet(MultiSerializerViewSetMixin, viewsets.ModelViewSet): vacancies = vacancies.filter(verified=False) if len(companies) > 0: vacancies = vacancies.filter(company__id__in=companies) - page = self.paginate_queryset(vacancies) - if page is not None: - return self.get_paginated_response(VacancySerializer(page, many=True, context={'request': request}).data) - return Response(VacancySerializer(vacancies, many=True, context={'request': request}).data) + return vacancies def create(self, request): data = request.data