Refactor registers to flat membership model and move apps to root

src/apps/core/admin_dashboard.py

@@ -16,13 +16,13 @@ from apps.parsers.models import (
     Proxy,
 )
 from apps.parsers.source_cards import SourceCardService
-from apps.registers.models import (
+from registers.models import (
     Organization,
     Register,
     RegisterUpload,
     RegistryMembershipPeriod,
 )
-from django.db.models import Count, Max, Q
+from django.db.models import Count, Max
 from django.urls import NoReverseMatch, reverse
 
 SOURCE_COLORS = (
@@ -138,7 +138,7 @@ def build_admin_dashboard() -> dict[str, Any]:
     source_cards = _build_source_cards()
     source_mix = _build_source_mix(source_cards)
     active_registry_orgs = (
-        RegistryMembershipPeriod.objects.filter(ended_at__isnull=True)
+        RegistryMembershipPeriod.objects
         .values("organization_id")
         .distinct()
         .count()
@@ -501,8 +501,7 @@ def _build_registry_rows() -> list[dict[str, Any]]:
     registries = list(
         Register.objects.annotate(
             active_organizations=Count(
-                "membership_periods__organization",
-                filter=Q(membership_periods__ended_at__isnull=True),
+                "membership_periods",
                 distinct=True,
             ),
             uploads_count=Count("uploads", distinct=True),

src/apps/core/logging.py

@@ -24,7 +24,7 @@ class JSONFormatter(logging.Formatter):
         {
             "timestamp": "2024-01-15T10:30:45.123456Z",
             "level": "INFO",
-            "logger": "apps.user.services",
+            "logger": "user.services",
             "message": "User created",
             "request_id": "abc-123",
             "user_id": 42,

src/apps/core/signals.py

@@ -32,7 +32,7 @@ class SignalDispatcher:
 
         class UserConfig(AppConfig):
             def ready(self):
-                from apps.user.signals import register_signals
+                from user.signals import register_signals
                 register_signals(signal_dispatcher)
 
     Пример в signals.py приложения: