From 2d9c50d0b96669b479233c68fc6724796cb68584 Mon Sep 17 00:00:00 2001
From: ohmo <ohmo@local>
Date: Sat, 4 Jul 2026 16:42:16 +0700
Subject: [PATCH] add: department exclusion check for auto-approval

---
 sd_dispatcher.py | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/sd_dispatcher.py b/sd_dispatcher.py
index acaefff..4e41863 100644
--- a/sd_dispatcher.py
+++ b/sd_dispatcher.py
@@ -171,7 +171,7 @@ def find_user_in_ad(requester, caller_phone=None, ticket_id=None):
         server = Server(AD_SERVER, get_info=ALL, connect_timeout=AD_CONNECT_TIMEOUT)
         conn = Connection(server, user=AD_USER, password=AD_PASSWORD, auto_bind=True, receive_timeout=AD_RECEIVE_TIMEOUT)
         conn.search(search_base=AD_BASE, search_filter=ldap_filter, attributes=["l", "company", "manager"])
-
+        conn.search(search_base=AD_BASE, search_filter=ldap_filter, attributes=["l", "company", "manager", "department"])
         if not conn.entries: 
             log_to_file(f"   [AD] ❌ Объект ({search_by}) не найден in AD!", ticket_id)
             return None
@@ -195,8 +195,9 @@ def find_user_in_ad(requester, caller_phone=None, ticket_id=None):
             if conn.entries and 'mail' in conn.entries[0]:
                 manager_email = conn.entries[0].mail.value
 
+        department = user.department.value if "department" in user and user.department.value else None
         return {"city": city, "company": company, "ad_path": ad_path, "manager_email": manager_email, "source": f"AD ({search_by})"}
-    except Exception as e:
+        return {"city": city, "company": company, "department": department, "ad_path": ad_path, "manager_email": manager_email, "source": f"AD ({search_by})"}
         log_to_file(f"❌ Ошибка LDAP или таймаут сети AD: {e}", ticket_id)
         return None
 
@@ -764,6 +765,7 @@ def process_ticket_logic(req_id):
         ad_path = user_info["ad_path"] if user_info else None
         manager_email = user_info["manager_email"] if user_info else None
         info_source = user_info["source"] if user_info else "Не определен"
+        user_department = user_info["department"] if user_info else None
 
         prefix_used = False
         if caller_phone and not user_info:
@@ -891,6 +893,17 @@ def process_ticket_logic(req_id):
                 allowed_subcats = APPROVAL_CATEGORIES[cat_name]
                 if "*" in allowed_subcats or subcat_name in allowed_subcats:
                     is_cat_ok = True
+            # Проверка: отдел пользователя в списке исключений
+            is_excluded = False
+            if user_department and APPROVAL_EXCLUDED_DEPARTMENTS:
+                for dept in APPROVAL_EXCLUDED_DEPARTMENTS:
+                    if dept.lower() in user_department.lower() or user_department.lower() in dept.lower():
+                        is_excluded = True
+                        t_log(f"   ⚠️ Отдел '{user_department}' в списке исключений — автосогласование отменено")
+                        break
+            if is_excluded:
+                t_log("   ⏭ Пропуск: пользователь в исключённом отделе.")
+                continue
 
             if is_city_ok and (is_group_ok or is_cat_ok):
                 if manager_email: