feat: import organization exchange v3
All checks were successful
CI/CD Pipeline / Run Tests (push) Successful in 3m27s
CI/CD Pipeline / Code Quality Checks (push) Successful in 3m47s
CI/CD Pipeline / Build and Push Dev Images (push) Successful in 2m17s
CI/CD Pipeline / Deploy Dev via Compose (push) Successful in 29s

This commit is contained in:
2026-06-13 14:07:40 +02:00
parent 479d81680d
commit f93663b2a4
13 changed files with 1167 additions and 682 deletions

View File

@@ -18,8 +18,6 @@ from apps.organization.serializers import (
OrganizationCatalogDetailSerializer,
OrganizationCatalogListSerializer,
)
from apps.registers.models import RegistryMembershipPeriod
from django.db.models import Prefetch
from django_filters import rest_framework as filters
from drf_yasg import openapi
from drf_yasg.utils import swagger_auto_schema
@@ -32,19 +30,11 @@ class OrganizationFilter(filters.FilterSet):
name = filters.CharFilter(lookup_expr="icontains")
inn = filters.CharFilter(lookup_expr="exact")
ogrn = filters.CharFilter(lookup_expr="exact")
registry = filters.UUIDFilter(method="filter_registry")
corporation_scope = filters.CharFilter(method="filter_corporation_scope")
registry_category = filters.CharFilter(method="filter_registry_category")
registryCategory = filters.CharFilter(method="filter_registry_category")
organization_type = filters.CharFilter(lookup_expr="exact")
@staticmethod
def filter_registry(queryset, _name, value):
return queryset.filter(
membership_periods__registry_id=value,
membership_periods__ended_at__isnull=True,
).distinct()
@staticmethod
def filter_corporation_scope(queryset, _name, value):
requested_scopes = [
@@ -69,7 +59,6 @@ class OrganizationFilter(filters.FilterSet):
"name",
"inn",
"ogrn",
"registry",
"corporation_scope",
"registry_category",
"organization_type",
@@ -125,12 +114,6 @@ class OrganizationViewSet(ClassicReadOnlyViewSet[Organization]):
description="Фильтр по ОГРН",
type=openapi.TYPE_STRING,
),
openapi.Parameter(
"registry",
openapi.IN_QUERY,
description="ID активного реестра",
type=openapi.TYPE_STRING,
),
openapi.Parameter(
"corporation_scope",
openapi.IN_QUERY,
@@ -196,18 +179,3 @@ class OrganizationViewSet(ClassicReadOnlyViewSet[Organization]):
)
def retrieve(self, request, *args, **kwargs):
return super().retrieve(request, *args, **kwargs)
def get_queryset(self):
return (
super()
.get_queryset()
.prefetch_related(
Prefetch(
"membership_periods",
queryset=RegistryMembershipPeriod.objects.filter(
ended_at__isnull=True
).select_related("registry"),
to_attr="active_membership_periods_prefetched",
)
)
)