From aa37e330efa448b6742f1ce2c4ddf5a5b2a9352f Mon Sep 17 00:00:00 2001 From: romanskijdev Date: Wed, 14 Oct 2026 17:06:45 +0300 Subject: [PATCH 1/2] Updated hierarchy flow --- core/db/methods/user_hierarchy.go | 67 ------------------------------- 1 file changed, 67 deletions(-) diff --git a/core/db/methods/user_hierarchy.go b/core/db/methods/user_hierarchy.go index 9e3aab7..b6b696f 100644 --- a/core/db/methods/user_hierarchy.go +++ b/core/db/methods/user_hierarchy.go @@ -199,73 +199,6 @@ func (u *UserHierarchyDB) GetApproversDB( system = systems[0] } - logrus.Infof("🔍 GetApproversDB START: subordinateID=%d, departmentID=%d, topicID=%d, categoryID=%d, system='%s'", - subordinateID, departmentID, topicID, categoryID, system) - - // ========================================== - // 🐛 БЛОК ОТЛАДОЧНОГО ЛОГИРОВАНИЯ (DEBUG) - // ========================================== - debugSQL := ` - WITH target_topic AS ( - SELECT code, category_id FROM approval_topics WHERE id = $3 - ), - matching_topics AS ( - SELECT t.id, t.code, LENGTH(t.code) as spec_score - FROM approval_topics t - CROSS JOIN target_topic tt - WHERE strpos(tt.code || '_', t.code || '_') = 1 - AND t.category_id = tt.category_id - ), - ranked AS ( - SELECT - uh.id as hierarchy_id, - uh.approver_id, - uh.priority, - mt.code as matched_code, - CASE - WHEN mt.id IS NOT NULL THEN 1000 - mt.spec_score - WHEN uh.topic_category_id = $4 AND uh.topic_id IS NULL THEN 2000 - WHEN uh.topic_id IS NULL AND uh.topic_category_id IS NULL THEN 3000 - END AS specificity - FROM user_hierarchy uh - LEFT JOIN matching_topics mt ON uh.topic_id = mt.id - WHERE uh.subordinate_id = $1 - AND uh.department_id = $2 - AND ( - mt.id IS NOT NULL - OR (uh.topic_category_id = $4 AND uh.topic_id IS NULL) - OR (uh.topic_id IS NULL AND uh.topic_category_id IS NULL) - ) - ) - SELECT hierarchy_id, approver_id, priority, COALESCE(matched_code, 'CATEGORY_OR_GLOBAL'), specificity - FROM ranked - ORDER BY specificity ASC, priority ASC - ` - dRows, dErr := u.pool.Query(ctx, debugSQL, subordinateID, departmentID, topicID, categoryID) - if dErr == nil { - logrus.Infof(" 📊 [DEBUG] Список найденных правил для пользователя:") - foundRules := false - for dRows.Next() { - var hID, apprID uint64 - var prio, spec int - var mCode string - if err := dRows.Scan(&hID, &apprID, &prio, &mCode, &spec); err == nil { - foundRules = true - logrus.Infof(" ---> Правило ID=%d | Согласующий=%d | Priority=%d | Совпадение='%s' | SCORE=%d (меньше=важнее)", - hID, apprID, prio, mCode, spec) - } - } - dRows.Close() - if !foundRules { - logrus.Infof(" ---> ⚠️ Для связки subordinateID=%d и departmentID=%d не найдено ни одного правила!", subordinateID, departmentID) - } - } else { - logrus.Warnf(" ❌ [DEBUG] Ошибка при выполнении отладочного запроса: %v", dErr) - } - // ========================================== - // КОНЕЦ БЛОКА ОТЛАДКИ - // ========================================== - rawSQL := ` WITH target_topic AS ( SELECT code, category_id FROM approval_topics WHERE id = $3 -- 2.43.0 From f730e6841e4c76d3a275d3062d56c308d86ef28e Mon Sep 17 00:00:00 2001 From: romanskijdev Date: Thu, 15 Oct 2026 11:17:45 +0300 Subject: [PATCH 2/2] Updated approval topic code generation --- .../approvalflow/dynamic_topic.go | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/service/telegram_service/approvalflow/dynamic_topic.go b/service/telegram_service/approvalflow/dynamic_topic.go index e954333..af168d6 100644 --- a/service/telegram_service/approvalflow/dynamic_topic.go +++ b/service/telegram_service/approvalflow/dynamic_topic.go @@ -130,9 +130,6 @@ func (d *DynamicTopic) BuildTree() *FlowNode { return root } -// TopicCodeFromCollected: если задан codeTemplate на корневом узле дерева -// категории — используем его; иначе прежняя дефолтная генерация кода -// (актуально для delivery_clients и goods_order, где дефолт и так совпадает). func (d *DynamicTopic) TopicCodeFromCollected(collected map[string]string) (string, error) { baseCode := d.Code() @@ -187,19 +184,28 @@ func createTemplateFuncMap() template.FuncMap { func (d *DynamicTopic) applyCodeTemplate(tmpl string, data map[string]string) (string, error) { logrus.Printf("🔍 DEBUG applyCodeTemplate: шаблон = %q", tmpl) - t, err := template.New("code").Funcs(createTemplateFuncMap()).Parse(tmpl) + + t, err := template.New("code").Option("missingkey=zero").Funcs(createTemplateFuncMap()).Parse(tmpl) if err != nil { return "", fmt.Errorf("parse code template: %w", err) } - // Шаблон кода работает с map[string]string напрямую (а не interface{}), - // т.к. использует только .field и eq/ne без доп. переменных. var buf bytes.Buffer if err := t.Execute(&buf, data); err != nil { return "", fmt.Errorf("execute code template: %w", err) } - return strings.TrimSpace(buf.String()), nil + result := buf.String() + + result = strings.ReplaceAll(result, "", "") + + for strings.Contains(result, "__") { + result = strings.ReplaceAll(result, "__", "_") + } + + result = strings.TrimSuffix(result, "_") + + return strings.TrimSpace(result), nil } func (d *DynamicTopic) applyMessageTemplate(tmpl, initiatorName string, data map[string]string) string { -- 2.43.0