fix: create organizations from form uploads
All checks were successful
All checks were successful
This commit is contained in:
@@ -7,7 +7,7 @@ from apps.organization.models import Organization
|
||||
|
||||
|
||||
class OrganizationNotFoundError(ValueError):
|
||||
"""Raised when a non-Mostovik import references an unknown organization."""
|
||||
"""Raised when organization identifiers cannot be resolved."""
|
||||
|
||||
|
||||
class OrganizationService(BaseService[Organization]):
|
||||
@@ -16,6 +16,7 @@ class OrganizationService(BaseService[Organization]):
|
||||
|
||||
Методы:
|
||||
get_or_create_by_inn: Legacy lookup API. Creation is intentionally disabled.
|
||||
get_or_create_from_form_identifiers: Создать организацию из строки формы.
|
||||
update_organization: Обновить данные организации
|
||||
search_by_name: Поиск по наименованию
|
||||
"""
|
||||
@@ -53,6 +54,58 @@ class OrganizationService(BaseService[Organization]):
|
||||
)
|
||||
return organization
|
||||
|
||||
@classmethod
|
||||
def get_or_create_from_form_identifiers(
|
||||
cls,
|
||||
*,
|
||||
name: str | None,
|
||||
inn: str | None,
|
||||
ogrn: str | None = None,
|
||||
kpp: str | None = None,
|
||||
okpo: str | None = None,
|
||||
) -> Organization:
|
||||
"""
|
||||
Return an organization for a report row, creating it when missing.
|
||||
|
||||
Form imports are allowed to create the organization reference when the row
|
||||
contains the standard identifiers. Existing organizations are not
|
||||
overwritten; the form row only fills identifier fields that are still blank.
|
||||
"""
|
||||
normalized_inn = cls._clean_digits(inn)
|
||||
if not normalized_inn:
|
||||
raise OrganizationNotFoundError("ИНН организации не указан")
|
||||
|
||||
normalized_name = cls._clean_string(name)
|
||||
if not normalized_name:
|
||||
raise OrganizationNotFoundError("Наименование организации не указано")
|
||||
|
||||
organization, created = cls.model.objects.get_or_create(
|
||||
inn=normalized_inn,
|
||||
defaults={
|
||||
"name": normalized_name,
|
||||
"ogrn": cls._clean_digits(ogrn),
|
||||
"kpp": cls._clean_digits(kpp),
|
||||
"okpo": cls._clean_digits(okpo),
|
||||
},
|
||||
)
|
||||
if created:
|
||||
return organization
|
||||
|
||||
update_fields: list[str] = []
|
||||
for field_name, value in (
|
||||
("ogrn", cls._clean_digits(ogrn)),
|
||||
("kpp", cls._clean_digits(kpp)),
|
||||
("okpo", cls._clean_digits(okpo)),
|
||||
):
|
||||
if value and not getattr(organization, field_name):
|
||||
setattr(organization, field_name, value)
|
||||
update_fields.append(field_name)
|
||||
|
||||
if update_fields:
|
||||
organization.save(update_fields=update_fields + ["updated_at"])
|
||||
|
||||
return organization
|
||||
|
||||
@classmethod
|
||||
def search_by_name(cls, query: str, limit: int = 20):
|
||||
"""
|
||||
@@ -91,3 +144,9 @@ class OrganizationService(BaseService[Organization]):
|
||||
if value is None:
|
||||
return ""
|
||||
return "".join(char for char in str(value).strip() if char.isdigit())
|
||||
|
||||
@staticmethod
|
||||
def _clean_string(value: Any) -> str:
|
||||
if value is None:
|
||||
return ""
|
||||
return str(value).strip()
|
||||
|
||||
Reference in New Issue
Block a user