step 7 done

Author: gordienkoas

pyproject.toml

@@ -8,6 +8,7 @@ dependencies = [
     "dj-database-url>=2.3.0",
     "django>=5.2.1",
     "django-bootstrap5>=25.1",
+    "django-filter>=25.1",
     "gunicorn>=23.0.0",
     "make>=0.1.6.post2",
     "psycopg2-binary>=2.9.10",

task_manager/filters.py

@@ -0,0 +1,39 @@
+import django_filters
+from django import forms
+from django.contrib.auth import get_user_model
+from .models import Task, Label
+
+User = get_user_model()
+
+class TaskFilter(django_filters.FilterSet):
+    status = django_filters.ChoiceFilter(label='Статус', empty_label='Любой')
+    executor = django_filters.ModelChoiceFilter(
+        queryset=User.objects.all(),
+        label='Исполнитель',
+        empty_label='Любой',
+    )
+    labels = django_filters.ModelMultipleChoiceFilter(
+        queryset=Label.objects.all(),
+        label='Метки',
+        widget=forms.CheckboxSelectMultiple,
+    )
+    author = django_filters.BooleanFilter(
+        method='filter_author',
+        label='Только мои задачи',
+        widget=forms.CheckboxInput,
+    )
+
+    class Meta:
+        model = Task
+        fields = ['status', 'executor', 'labels']
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        statuses = Task.objects.values_list('status', flat=True).distinct()
+        choices = [(status, status) for status in statuses if status]
+        self.filters['status'].extra['choices'] = choices
+
+    def filter_author(self, queryset, name, value):
+        if value:
+            return queryset.filter(author=self.request.user)
+        return queryset

task_manager/models.py

@@ -1,5 +1,4 @@
 from django.db import models
-from django.urls import reverse
 from django.contrib.auth.models import User
 
 class Status(models.Model):

task_manager/templates/tasks/task_list.html

@@ -8,6 +8,12 @@ <h1>Список задач</h1>
   {% endfor %}
 {% endif %}
 
+<!-- Форма фильтра -->
+<form method="get">
+  {{ filter.form.as_p }}
+  <button type="submit">Применить фильтр</button>
+</form>
+
 <table>
   <tr>
     <th>Название</th>
@@ -23,6 +29,8 @@ <h1>Список задач</h1>
       <a href="{% url 'task-delete' task.pk %}">Удалить</a>
     </td>
   </tr>
+  {% empty %}
+  <tr><td colspan="3">Задачи не найдены</td></tr>
   {% endfor %}
 </table>
 

task_manager/tests/test_filter.py

@@ -0,0 +1,86 @@
+from django.test import TestCase, RequestFactory
+from django.contrib.auth import get_user_model
+from task_manager.models import Task, Label
+from task_manager.filters import TaskFilter
+
+User = get_user_model()
+
+class TaskFilterTests(TestCase):
+    def setUp(self):
+        self.factory = RequestFactory()
+        self.user1 = User.objects.create_user(username='user1', password='pass')
+        self.user2 = User.objects.create_user(username='user2', password='pass')
+
+        self.label1 = Label.objects.create(name='Bug')
+        self.label2 = Label.objects.create(name='Feature')
+
+        self.task1 = Task.objects.create(
+            title='Task 1',
+            description='Desc 1',
+            status='new',
+            author=self.user1,
+            executor=self.user2,
+        )
+        self.task1.labels.add(self.label1)
+
+        self.task2 = Task.objects.create(
+            title='Task 2',
+            description='Desc 2',
+            status='done',
+            author=self.user2,
+            executor=self.user1,
+        )
+        self.task2.labels.add(self.label2)
+
+        self.task3 = Task.objects.create(
+            title='Task 3',
+            description='Desc 3',
+            status='in_progress',
+            author=self.user1,
+            executor=None,
+        )
+        # без меток
+
+    def test_filter_by_status(self):
+        data = {'status': 'new'}
+        filter = TaskFilter(data=data, queryset=Task.objects.all())
+        self.assertEqual(
+            list(filter.qs.order_by('id')),
+            list(Task.objects.filter(status='new').order_by('id'))
+        )
+
+    def test_filter_by_executor(self):
+        data = {'executor': str(self.user1.id)}
+        filter = TaskFilter(data=data, queryset=Task.objects.all())
+        self.assertEqual(
+            list(filter.qs.order_by('id')),
+            list(Task.objects.filter(executor=self.user1).order_by('id'))
+        )
+
+    def test_filter_by_labels(self):
+        data = {'labels': [self.label1.id]}
+        filter = TaskFilter(data=data, queryset=Task.objects.all())
+        self.assertEqual(
+            list(filter.qs.order_by('id')),
+            list(Task.objects.filter(labels=self.label1).order_by('id'))
+        )
+
+    def test_filter_by_author_true(self):
+        # Симулируем запрос с автором user1 и фильтром author=True
+        request = self.factory.get('/tasks/', {'author': 'on'})
+        request.user = self.user1
+        filter = TaskFilter(data={'author': True}, queryset=Task.objects.all(), request=request)
+        self.assertEqual(
+            list(filter.qs.order_by('id')),
+            list(Task.objects.filter(author=self.user1).order_by('id'))
+        )
+
+    def test_filter_by_author_false(self):
+        request = self.factory.get('/tasks/', {'author': ''})
+        request.user = self.user1
+        filter = TaskFilter(data={'author': False}, queryset=Task.objects.all(), request=request)
+        self.assertEqual(
+            list(filter.qs.order_by('id')),
+            list(Task.objects.all().order_by('id'))
+        )
+

task_manager/views.py

@@ -13,7 +13,8 @@
 from django.contrib import messages
 from .models import Status, Task, Label
 from .forms import StatusForm, TaskForm, LabelForm
-
+from .filters import TaskFilter
+from django_filters.views import FilterView
 
 
 def home_view(request):
@@ -212,4 +213,19 @@ def form_valid(self, form):
             messages.error(self.request, "Нельзя удалить метку, связанную с задачами")
             return redirect(reverse('label-list'))
         messages.success(self.request, "Метка успешно удалена")
-        return super().form_valid(form)
+        return super().form_valid(form)
+
+
+class TaskListView(FilterView):
+    model = Task
+    filterset_class = TaskFilter
+    template_name = 'tasks/task_list.html'
+    context_object_name = 'tasks'
+    paginate_by = 10  # если нужна пагинация
+
+    def get_filterset(self, filterset_class):
+        # Передаём request в фильтр, чтобы использовать self.request.user
+        return filterset_class(self.request.GET, queryset=self.get_queryset(), request=self.request)
+
+    def get_queryset(self):
+        return Task.objects.all().order_by('id')