tasks added

Author: olyapka84

Makefile

@@ -18,3 +18,6 @@ build:
 
 lint:
 	uv run ruff check --fix
+
+test:
+	uv run pytest -v

accounts/tests/test_users_crud.py

@@ -7,6 +7,8 @@
 from django.views.generic import ListView, UpdateView, DeleteView
 from django.urls import reverse_lazy
 from django.views.generic import CreateView
+
+from tasks.models import Task
 from .forms import CustomUserCreationForm
 
 
@@ -50,14 +52,30 @@ def form_valid(self, form):
         return response
 
 
-class UserDeleteView(LoginRequiredMixin, OnlySelfMixin, DeleteView):
+class UserDeleteView(LoginRequiredMixin, UserPassesTestMixin, DeleteView):
     model = User
-    template_name = "users/delete.html"
+    template_name = "users/confirm_delete.html"
     success_url = reverse_lazy("users:list")
+    login_url = "users:login"
+
+    def test_func(self):
+        return self.get_object().pk == self.request.user.pk
 
-    def delete(self, request, *args, **kwargs):
-        messages.success(self.request, "Пользователь успешно удалён.")
-        return super().delete(request, *args, **kwargs)
+    def handle_no_permission(self):
+        if self.request.user.is_authenticated:
+            messages.error(self.request, "Можно удалять только свой аккаунт.")
+            return redirect("users:list")
+        return super().handle_no_permission()
+
+    def dispatch(self, request, *args, **kwargs):
+        user = self.get_object()
+        if hasattr(user, "created_tasks") and user.created_tasks.exists():
+            messages.error(request, "Нельзя удалить пользователя, связанного с задачами.")
+            return redirect("users:list")
+        if hasattr(user, "executed_tasks") and user.executed_tasks.exists():
+            messages.error(request, "Нельзя удалить пользователя, связанного с задачами.")
+            return redirect("users:list")
+        return super().dispatch(request, *args, **kwargs)
 
 
 class UserLoginView(LoginView):

accounts/views.py

@@ -12,6 +12,7 @@ dependencies = [
   "whitenoise",
   "django-bootstrap5>=25.2",
   "pytest>=8.4.2",
+  "pytest-django>=4.11.1",
 ]
 
 [dependency-groups]

db.sqlite3

@@ -0,0 +1,3 @@
+[pytest]
+DJANGO_SETTINGS_MODULE = task_manager.settings
+python_files = tests.py test_*.py *_tests.py

pyproject.toml

@@ -11,14 +11,14 @@ class StatusListView(LoginRequiredMixin, ListView):
     model = Status
     template_name = "statuses/index.html"
     context_object_name = "statuses"
-    login_url = "login"
+    login_url = "users:login"
 
 class StatusCreateView(LoginRequiredMixin, CreateView):
     model = Status
     form_class = StatusForm
     template_name = "statuses/form.html"
     success_url = reverse_lazy("statuses_index")
-    login_url = "login"
+    login_url = "users:login"
 
     def form_valid(self, form):
         messages.success(self.request, "Статус создан.")
@@ -29,17 +29,18 @@ class StatusUpdateView(LoginRequiredMixin, UpdateView):
     form_class = StatusForm
     template_name = "statuses/form.html"
     success_url = reverse_lazy("statuses_index")
-    login_url = "login"
+    login_url = "users:login"
 
     def form_valid(self, form):
         messages.success(self.request, "Статус обновлён.")
         return super().form_valid(form)
 
+
 class StatusDeleteView(LoginRequiredMixin, DeleteView):
     model = Status
     template_name = "statuses/confirm_delete.html"
     success_url = reverse_lazy("statuses_index")
-    login_url = "login"
+    login_url = "users:login"
 
     def post(self, request, *args, **kwargs):
         try:

pytest.ini

@@ -23,4 +23,5 @@
     path("", views.index, name="home"),
     path("users/", include("accounts.urls", namespace="users")),
     path("statuses/", include("statuses.urls")),
+    path("tasks/", include("tasks.urls")),
 ]

statuses/views.py

@@ -0,0 +1,14 @@
+from django import forms
+from .models import Task
+
+
+class TaskForm(forms.ModelForm):
+    class Meta:
+        model = Task
+        fields = ["name", "description", "status", "executor"]
+        widgets = {
+            "name": forms.TextInput(attrs={"class": "form-control"}),
+            "description": forms.Textarea(attrs={"class": "form-control", "rows": 4}),
+            "status": forms.Select(attrs={"class": "form-select"}),
+            "executor": forms.Select(attrs={"class": "form-select"}),
+        }

task_manager/urls.py

@@ -1,2 +1,18 @@
+from django.db import models
+from django.contrib.auth.models import User
+from statuses.models import Status
 
-# Create your models here.
+
+class Task(models.Model):
+    name = models.CharField(max_length=150)
+    description = models.TextField(blank=True)
+    status = models.ForeignKey(Status, on_delete=models.PROTECT, related_name="tasks")
+    author = models.ForeignKey(User, on_delete=models.PROTECT, related_name="created_tasks")
+    executor = models.ForeignKey(User, on_delete=models.PROTECT, null=True, blank=True, related_name="executed_tasks")
+    created_at = models.DateTimeField(auto_now_add=True)
+
+    class Meta:
+        ordering = ["id"]
+
+    def __str__(self):
+        return self.name