fix: hide organizations absent from the current full directory
Some checks failed
Mostovik Backend CI/CD / Tests and lint (push) Failing after 3m16s
Mostovik Backend CI/CD / Build linux/amd64 release images (push) Has been skipped
Mostovik Backend CI/CD / Deploy dev (push) Has been skipped
Mostovik Backend CI/CD / Deploy and verify internal main (push) Has been skipped
Some checks failed
Mostovik Backend CI/CD / Tests and lint (push) Failing after 3m16s
Mostovik Backend CI/CD / Build linux/amd64 release images (push) Has been skipped
Mostovik Backend CI/CD / Deploy dev (push) Has been skipped
Mostovik Backend CI/CD / Deploy and verify internal main (push) Has been skipped
This commit is contained in:
@@ -200,7 +200,8 @@ def _active_registry_lookup_targets(
|
||||
) -> list[RegistryLookupTarget]:
|
||||
"""Вернуть организации, которые сейчас состоят хотя бы в одном реестре."""
|
||||
queryset = SourceOrganization.objects.filter(
|
||||
Q(opk_registry_membership=True) | _rosatom_roscosmos_scope_query()
|
||||
Q(opk_registry_membership=True) | _rosatom_roscosmos_scope_query(),
|
||||
directory_is_current=True,
|
||||
)
|
||||
if organization_ids is not None:
|
||||
queryset = queryset.filter(uid__in=organization_ids)
|
||||
|
||||
@@ -105,6 +105,7 @@ class OrganizationDirectoryImportService:
|
||||
file_hash = cls._sha256(file_path)
|
||||
imported_at = timezone.now()
|
||||
|
||||
snapshot_ids = set()
|
||||
scanned = 0
|
||||
created = 0
|
||||
updated = 0
|
||||
@@ -134,15 +135,23 @@ class OrganizationDirectoryImportService:
|
||||
imported_at=imported_at,
|
||||
)
|
||||
|
||||
defaults["directory_is_current"] = True
|
||||
_organization, was_created = Organization.objects.update_or_create(
|
||||
rn=rn,
|
||||
defaults=defaults,
|
||||
)
|
||||
snapshot_ids.add(_organization.pk)
|
||||
if was_created:
|
||||
created += 1
|
||||
else:
|
||||
updated += 1
|
||||
|
||||
if not snapshot_ids:
|
||||
raise OrganizationDirectoryImportError("Full directory must not be empty")
|
||||
Organization.objects.filter(directory_is_current=True).exclude(
|
||||
pk__in=snapshot_ids
|
||||
).update(directory_is_current=False)
|
||||
|
||||
result = OrganizationDirectoryImportResult(
|
||||
scanned=scanned,
|
||||
created=created,
|
||||
|
||||
@@ -133,7 +133,7 @@ class OrganizationFilter(filters.FilterSet):
|
||||
registry_id: str | None = None,
|
||||
registry_name: str | None = None,
|
||||
) -> Q:
|
||||
query = Q(opk_registry_membership=True)
|
||||
query = Q(opk_registry_membership=True, directory_is_current=True)
|
||||
if registry_id:
|
||||
query &= Q(ropk_razdel_num=str(registry_id)) | Q(gk_code=str(registry_id))
|
||||
if registry_name:
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [("organizations", "0021_enable_yearly_partitioned_exports")]
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name="organization", name="directory_is_current",
|
||||
field=models.BooleanField(
|
||||
"присутствует в текущем полном перечне", default=True, db_index=True,
|
||||
),
|
||||
),
|
||||
]
|
||||
@@ -304,6 +304,11 @@ class Organization(models.Model):
|
||||
blank=True,
|
||||
db_index=True,
|
||||
)
|
||||
directory_is_current = models.BooleanField(
|
||||
_("присутствует в текущем полном перечне"),
|
||||
default=True,
|
||||
db_index=True,
|
||||
)
|
||||
opk_registry_membership = models.BooleanField(
|
||||
_("членство в реестре ОПК"),
|
||||
null=True,
|
||||
|
||||
@@ -385,7 +385,7 @@ class OrganizationViewSet(CachedReadOnlyMixin, ReadOnlyModelViewSet):
|
||||
return (
|
||||
super()
|
||||
.get_queryset()
|
||||
.filter(opk_registry_membership=True)
|
||||
.filter(opk_registry_membership=True, directory_is_current=True)
|
||||
.prefetch_related("source_extensions")
|
||||
)
|
||||
|
||||
@@ -525,7 +525,10 @@ class OrganizationSourceExtensionViewSet(ReadOnlyModelViewSet):
|
||||
|
||||
queryset = (
|
||||
OrganizationSourceExtension.objects.select_related("organization")
|
||||
.filter(organization__opk_registry_membership=True)
|
||||
.filter(
|
||||
organization__opk_registry_membership=True,
|
||||
organization__directory_is_current=True,
|
||||
)
|
||||
.order_by(
|
||||
"organization__name",
|
||||
"source_group",
|
||||
@@ -582,6 +585,7 @@ class OrganizationSourceRecordViewSet(ReadOnlyModelViewSet):
|
||||
Q(extension__organization__opk_registry_membership=True)
|
||||
| Q(extension__source_group__in=REGISTRY_GROUPS)
|
||||
)
|
||||
.filter(extension__organization__directory_is_current=True)
|
||||
.prefetch_related("financial_lines")
|
||||
.order_by("-created_at", "-uid")
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user