Datanar 2.6.6 (базовые модели, updated_at, фиксы редиректов, переход на psycopg3)

.github/workflows/python-app.yml

@@ -2,9 +2,9 @@ name: Datanar
 
 on:
   push:
-    branches: [ "main", "dev", "artem", "sergey", "vladimir", "for_merge" ]
+    branches: [ "main", "dev", "artem", "sergey" ]
   pull_request:
-    branches: [ "main", "dev", "artem", "sergey", "vladimir", "for_merge" ]
+    branches: [ "main", "dev", "artem", "sergey", "vladimir" ]
 
 permissions:
   contents: read
@@ -54,7 +54,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
-        python-version: [ "3.10", "3.11", "3.12", "3.13" ]
+        python-version: [ "3.11", "3.12", "3.13", "3.14" ]
     name: django-tests (${{ matrix.os }}, py${{ matrix.python-version }})
     steps:
       - uses: actions/checkout@v4
@@ -79,12 +79,12 @@ jobs:
         uses: appleboy/ssh-action@master
         with:
           host: ${{ secrets.SERVER_HOST }}
+          port: ${{ secrets.SERVER_PORT }}
           username: ${{ secrets.SERVER_USERNAME }}
           key: ${{ secrets.SERVER_SSH_KEY }}
+          # Ключ на сервере ограничен forced command: что бы ни было в script,
+          # выполнится только /usr/local/bin/deploy-datanar (git reset на
+          # origin/main, compose up --build, проверка живости). Сам script
+          # нужен action-у формально.
           script: |
-            cd ~/datanar
-            docker compose down
-            git reset --hard origin/main
-            git pull origin main
-            docker compose up --build -d
-            docker system prune -a -f --volumes
+            true

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.13.15-alpine
+FROM python:3.13.17-alpine
 
 RUN apk add --no-cache gettext
 

README.md

@@ -67,7 +67,6 @@
 - [Docker](https://www.docker.com/) - развёртывание сайта на удалённом сервере
 - [Prism](https://prismjs.com/) - подсветка синтаксиса кода
 - [Segno](https://github.com/heuer/segno/) - генерация QR-кодов
-- [Sqids](https://sqids.org/) - для помощи в генерации сокращённых ссылок
 
 ### База данных
 Функциональная структура базы данных следующая:

datanar/api/tests/test_correct_operations.py

@@ -31,6 +31,7 @@ def setUp(self) -> None:
             Redirect.validity_days.field.name,
             Redirect.validity_clicks.field.name,
             Redirect.created_at.field.name,
+            Redirect.updated_at.field.name,
             Redirect.create_method.field.name,
             Redirect.is_active.field.name,
             Redirect.deactivated_at.field.name,
@@ -42,6 +43,7 @@ def setUp(self) -> None:
             Redirect.validity_days.field.name,
             Redirect.validity_clicks.field.name,
             Redirect.created_at.field.name,
+            Redirect.updated_at.field.name,
         }
 
     def test_create_new_token_context(self) -> None:

datanar/core/mixins.py

@@ -11,6 +11,7 @@
     Http404,
     HttpRequest,
     HttpResponse,
+    HttpResponseBase,
     HttpResponseRedirect,
 )
 from django.views.generic import View
@@ -68,9 +69,9 @@ def post(
         request: HttpRequest,
         *args: Any,
         **kwargs: Any,
-    ) -> HttpResponse:
-        method = request.POST.get("_method", None)
-        if method:
+    ) -> "HttpResponseBase":
+        method = request.POST.get("_method", "")
+        if method.upper() in ("DELETE", "PATCH", "PUT"):
             request.method = method
             return super().dispatch(request, *args, **kwargs)
         return super().post(request, *args, **kwargs)
@@ -82,7 +83,7 @@ def dispatch(
         request: HttpRequest,
         *args: Any,
         **kwargs: Any,
-    ) -> HttpResponse:
-        if not self.request.user.is_staff:
+    ) -> "HttpResponseBase":
+        if not request.user.is_staff:
             return self.handle_no_permission()
         return super().dispatch(request, *args, **kwargs)

datanar/core/models.py

@@ -0,0 +1,115 @@
+__all__ = ("TimeStampedModel", "UserLinkModel", "UserStampedModel")
+
+from datetime import timedelta
+
+from django.conf import settings
+from django.db import models
+from django.utils import timezone
+from django.utils.translation import gettext_lazy as _
+
+
+class TimeStampedModel(models.Model):
+    created_at = models.DateTimeField(
+        _("Creation time"),
+        help_text=_("When the object was created."),
+        auto_now_add=True,
+    )
+    updated_at = models.DateTimeField(
+        _("Update time"),
+        help_text=_("When the object was last updated."),
+        auto_now=True,
+    )
+
+    class Meta:
+        abstract = True
+
+
+class UserStampedModel(TimeStampedModel):
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.CASCADE,
+        verbose_name=_("user"),
+        help_text=_("user_who_create_bond"),
+        null=True,
+    )
+
+    class CreateMethod(models.TextChoices):
+        API = "API", _("API")
+        WEB = "WEB", _("Web")
+        WEB_FILE = "WEB+FILE", _("Web (file)")
+
+    create_method = models.CharField(
+        _("create_method"),
+        help_text=_("method_which_redirect_was_created"),
+        max_length=20,
+        choices=CreateMethod.choices,
+        default=CreateMethod.WEB,
+    )
+
+    class Meta:
+        abstract = True
+
+
+class UserLinkModel(UserStampedModel):
+    short_link = models.SlugField(
+        _("short_link"),
+        help_text=_("shorten_link_to_redirect_to_resource"),
+        max_length=50,
+        unique=True,
+        allow_unicode=True,
+    )
+    validity_days = models.PositiveIntegerField(
+        _("valid_day_number"),
+        help_text=_("how_many_day_link_will_be_valid"),
+        default=90,
+        null=True,
+        blank=True,
+    )
+    validity_clicks = models.PositiveIntegerField(
+        _("valid_click_number"),
+        help_text=_("how_many_click_on_link_will_be_valid"),
+        default=None,
+        null=True,
+        blank=True,
+    )
+    is_active = models.BooleanField(
+        _("active"),
+        help_text=_("is_active"),
+        default=True,
+    )
+    deactivated_at = models.DateTimeField(
+        _("deactivation_time"),
+        help_text=_("when_bond_was_deactivated"),
+        default=None,
+        null=True,
+        blank=True,
+    )
+
+    class Meta:
+        abstract = True
+
+    def is_clicks_exceeded(self, clicks_count: int) -> bool:
+        if not self.validity_clicks:
+            return False
+        return clicks_count >= self.validity_clicks
+
+    def is_expired(self) -> bool:
+        if not self.validity_days:
+            return False
+        return (
+            self.created_at + timedelta(days=self.validity_days)
+            < timezone.now()
+        )
+
+    def is_deactivation_expired(self) -> bool:
+        if self.is_active or self.deactivated_at is None:
+            return False
+        return (self.deactivated_at + timedelta(days=10)) < timezone.now()
+
+    def reactivate(self) -> None:
+        self.is_active = True
+        self.deactivated_at = None
+
+    def deactivate(self) -> None:
+        self.is_active = False
+        self.deactivated_at = timezone.now()

datanar/dashboard/migrations/0003_blockeddomain_created_at_blockeddomain_updated_at.py

@@ -0,0 +1,34 @@
+# Generated by Django 5.2.17 on 2026-10-06 19:09
+
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("dashboard", "0002_alter_blockeddomain_options"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="blockeddomain",
+            name="created_at",
+            field=models.DateTimeField(
+                auto_now_add=True,
+                default=django.utils.timezone.now,
+                help_text="When the object was created.",
+                verbose_name="Creation time",
+            ),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="blockeddomain",
+            name="updated_at",
+            field=models.DateTimeField(
+                auto_now=True,
+                help_text="When the object was last updated.",
+                verbose_name="Update time",
+            ),
+        ),
+    ]

datanar/dashboard/models.py

@@ -6,6 +6,8 @@
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
+from core.models import TimeStampedModel
+
 
 class BlockedDomainManager(models.Manager):
     def upgrade_regex(self, domain_regex: str) -> str:
@@ -27,15 +29,18 @@ def upgrade_regex(self, domain_regex: str) -> str:
         return domain_regex
 
     def is_blocked(self, url: str) -> bool:
-        if is_link_shortener(url):
-            return True
+        try:
+            if is_link_shortener(url):
+                return True
+        except ValueError:
+            pass
         for domain in self.all():
             if re.fullmatch(self.upgrade_regex(domain.domain_regex), url):
                 return True
         return False
 
 
-class BlockedDomain(models.Model):
+class BlockedDomain(TimeStampedModel):
     domain_regex = models.CharField(
         _("domain_regex"),
         help_text=_("domain_regex_that_will_be_prohibited_from_shortening"),

datanar/dashboard/views.py

@@ -30,16 +30,15 @@ class AllLinksView(
     paginate_by = 6
 
     def get_queryset(self) -> "QuerySet":
-        redirects = (
-            Redirect.objects.all()
-            .only(Redirect.short_link.field.name)
-            .order_by("-created_at")
+        return Redirect.objects.only(
+            Redirect.short_link.field.name,
+        ).order_by(
+            f"-{Redirect.created_at.field.name}",
         )
-        return [redirect.short_link for redirect in redirects]
 
     def delete(self, request: HttpRequest) -> HttpResponse:
         Redirect.objects.filter(
-            short_link=request.POST.get("short_link"),
+            short_link=request.POST.get(Redirect.short_link.field.name),
         ).delete()
         return HttpResponseRedirect(request.get_full_path())
 

datanar/datanar/settings.py

@@ -2,13 +2,12 @@
 import sys
 
 from decouple import config
-from django.conf import settings
 from django.utils.translation import gettext_lazy as _
 
 BASE_DIR = Path(__file__).resolve().parent.parent
 
-VERSION = "2.6.5"
-API_VERSION = "1.2.0"
+VERSION = "2.6.6"
+API_VERSION = "1.2.1"
 
 SECRET_KEY = config(
     "DATANAR_SECRET_KEY",
@@ -105,7 +104,7 @@
     "tz_detect.middleware.TimezoneMiddleware",
 ]
 
-if settings.DEBUG and not TEST:
+if DEBUG and not TEST:
     INSTALLED_APPS.append("debug_toolbar")
     MIDDLEWARE.append("debug_toolbar.middleware.DebugToolbarMiddleware")
     INTERNAL_IPS = ["127.0.0.1"]
@@ -155,7 +154,7 @@
 if not USE_FILE_DATABASE:
     DATABASES = {
         "default": {
-            "ENGINE": "django.db.backends.postgresql_psycopg2",
+            "ENGINE": "django.db.backends.postgresql",
             "NAME": config("DATANAR_DATABASE_NAME"),
             "USER": config("DATANAR_DATABASE_USER"),
             "PASSWORD": config("DATANAR_DATABASE_PASSWORD"),

datanar/datanar/urls.py

@@ -8,7 +8,7 @@
 urlpatterns = [
     path("", include("homepage.urls")),
     path("admin/", admin.site.urls),
-    path("api/v1/", include("api.urls")),
+    path("api/", include("api.urls")),
     path("auth/", include("users.urls")),
     path("auth/", include("allauth.urls")),
     path("dashboard/", include("dashboard.urls")),