From bbe07b122bd36ffe2a462ed496c2ffce2b47aa62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=B3=D0=BE=D1=80=D1=8C=20=D0=9D=D0=B0=D0=B4=D0=B5?= =?UTF-8?q?=D0=B8=D0=BD?= Date: Tue, 2 Dec 2025 10:42:48 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=B4=D0=B5=D1=82=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE?= =?UTF-8?q?=D0=B5=20=D0=BB=D0=BE=D0=B3=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B4=D0=BB=D1=8F=20=D0=B4=D0=B8=D0=B0=D0=B3?= =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D0=B8=D0=BA=D0=B8=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D0=B1=D0=BB=D0=B5=D0=BC=20=D1=81=20LDAP=20=D1=81=D0=B8=D0=BD?= =?UTF-8?q?=D1=85=D1=80=D0=BE=D0=BD=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B5?= =?UTF-8?q?=D0=B9:=20-=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D1=8B=20=D0=BB=D0=BE=D0=B3=D0=B8=20=D0=BF=D1=80=D0=B8=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B8=D1=81=D0=BA=D0=B5=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81?= =?UTF-8?q?=D0=B8=20=D1=81=D0=B8=D0=BD=D1=85=D1=80=D0=BE=D0=BD=D0=B8=D0=B7?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D0=B8=20-=20=D0=9F=D1=80=D0=B8=20=D0=BE?= =?UTF-8?q?=D1=82=D1=81=D1=83=D1=82=D1=81=D1=82=D0=B2=D0=B8=D0=B8=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=BF=D0=B8=D1=81=D0=B8=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4?= =?UTF-8?q?=D0=B8=D1=82=D1=81=D1=8F=20=D1=81=D0=BF=D0=B8=D1=81=D0=BE=D0=BA?= =?UTF-8?q?=20=D0=B2=D1=81=D0=B5=D1=85=20object=5Fpk=20=D0=B2=20=D1=82?= =?UTF-8?q?=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D0=B5=20=D1=81=D0=B8=D0=BD=D1=85?= =?UTF-8?q?=D1=80=D0=BE=D0=BD=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B8=20-=20?= =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20ID=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=B2=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BE=D0=B1=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA?= =?UTF-8?q?=D0=B5=20=D0=B4=D0=BB=D1=8F=20=D1=83=D0=BF=D1=80=D0=BE=D1=89?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BE=D1=82=D0=BB=D0=B0=D0=B4=D0=BA?= =?UTF-8?q?=D0=B8=20-=20=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD=D0=B0?= =?UTF-8?q?=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=B8=D1=81=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D0=B9=20?= =?UTF-8?q?=D1=81=20=D0=BF=D0=BE=D0=BB=D0=BD=D1=8B=D0=BC=20=D0=BB=D0=BE?= =?UTF-8?q?=D0=B3=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=D0=BC=20?= =?UTF-8?q?=D1=81=D1=82=D0=B5=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/employees/admin.py | 41 +++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/backend/employees/admin.py b/backend/employees/admin.py index d8c515b3..c0c8ffe1 100644 --- a/backend/employees/admin.py +++ b/backend/employees/admin.py @@ -231,20 +231,44 @@ class EmployeeAdmin(DjangoUserAdmin): return "-" from django.utils.html import format_html + import logging + logger = logging.getLogger(__name__) # Если не управляется LDAP if not obj.is_ldap_managed: return format_html('Локальный') try: + # Логируем попытку поиска + logger.debug( + f"[ldap_sync_status] Searching for employee {obj.pk} " + f"(email: {obj.email})" + ) + sync_state = LdapSyncState.objects.filter( model="employee", object_pk=str(obj.pk) ).first() + logger.debug( + f"[ldap_sync_status] Employee {obj.pk}: " + f"sync_state={'found' if sync_state else 'not found'}" + ) + if not sync_state: + # Попробуем найти любые записи для этого employee + all_syncs = LdapSyncState.objects.filter( + model="employee" + ).values_list("object_pk", flat=True) + logger.warning( + f"[ldap_sync_status] No sync record for employee {obj.pk}. " + f"All employee object_pks in sync table: {list(all_syncs)}" + ) + return format_html( - '❌ Нет записи' + '❌ Нет записи (ID: {})', + obj.pk, + obj.pk ) # Проверяем полноту данных @@ -255,7 +279,8 @@ class EmployeeAdmin(DjangoUserAdmin): # Полные данные if has_guid and has_dn and has_updated: return format_html( - '✅ {}', + '✅ {}', + obj.pk, sync_state.ldap_guid, sync_state.ldap_dn[:80] + '...' if len(sync_state.ldap_dn) > 80 else sync_state.ldap_dn, sync_state.updated_at.strftime("%d.%m.%Y %H:%M") @@ -269,17 +294,23 @@ class EmployeeAdmin(DjangoUserAdmin): missing.append("DN") return format_html( - '⚠️ {}', + '⚠️ {}', + obj.pk, ", ".join(missing), sync_state.updated_at.strftime("%d.%m.%Y %H:%M") ) else: return format_html( - '⚠️ Неполные данные' + '⚠️ Неполные данные', + obj.pk ) except Exception as e: + logger.exception( + f"[ldap_sync_status] Error for employee {obj.pk}: {e}" + ) return format_html( - '❌ Ошибка', + '❌ Ошибка', + obj.pk, str(e) )