From e11acda6728b8ba702b251575223b2c4f87ae095 Mon Sep 17 00:00:00 2001 From: romanskijdev Date: Fri, 31 Jul 2026 15:21:04 +0300 Subject: [PATCH 1/2] Updated flows tree --- .../handlers/approval/notify.go | 27 +++++-------- .../handlers/approval/selection_approver.go | 40 ++++++++++++------- 2 files changed, 35 insertions(+), 32 deletions(-) diff --git a/service/telegram_service/handlers/approval/notify.go b/service/telegram_service/handlers/approval/notify.go index 6f66634..68bb02a 100644 --- a/service/telegram_service/handlers/approval/notify.go +++ b/service/telegram_service/handlers/approval/notify.go @@ -176,18 +176,12 @@ func (n *Notifier) NotifyInitiatorApproved( logrus.Warnf("NotifyInitiatorApproved: TelegramID is nil") return } - logrus.Infof("NotifyInitiatorApproved: sending to telegramID=%d approvalID=%d", *initiator.TelegramID, *approval.ID) approverName := "—" if lastApprover != nil && lastApprover.FullName != nil { approverName = *lastApprover.FullName } - content := collected["content"] - if content == "" { - content = "—" - } - status := "" if approval.Status != nil { status = *approval.Status @@ -195,13 +189,12 @@ func (n *Notifier) NotifyInitiatorApproved( ctx := context.Background() - topicFullName := getTopicFullName(ctx, n.ipc, approval.TopicID) + card := n.topic.FormatApproverMessage(initiator, collected) + text := fmt.Sprintf( - "✅ Заявка #%d согласована\n\n"+ - "👤 Последний согласующий: %s\n"+ - "📋 Тема: %s\n"+ - "📝 Текст: %s", - *approval.ID, approverName, topicFullName, content, + "✅ Заявка #%d согласована\n"+ + "👤 Последний согласующий: %s\n\n%s", + *approval.ID, approverName, card, ) filesCount := len(approval.Files) @@ -240,14 +233,12 @@ func (n *Notifier) NotifyInitiatorRejected( if content == "" { content = "—" } - ctx := context.Background() - topicFullName := getTopicFullName(ctx, n.ipc, approval.TopicID) + card := n.topic.FormatApproverMessage(initiator, collected) + text := fmt.Sprintf( "❌ Заявка #%d отклонена\n\n"+ - "👤 Согласующий: %s\n"+ - "📋 Тема: %s\n"+ - "📝 Текст: %s", - *approval.ID, approverName, topicFullName, content, + "👤 Согласующий: %s\n\n%s", + *approval.ID, approverName, card, ) if comment != "" { diff --git a/service/telegram_service/handlers/approval/selection_approver.go b/service/telegram_service/handlers/approval/selection_approver.go index fb3186a..d018c28 100644 --- a/service/telegram_service/handlers/approval/selection_approver.go +++ b/service/telegram_service/handlers/approval/selection_approver.go @@ -234,29 +234,41 @@ func (h *Handler) finalizeAndSubmit(bot *tgbotapi.BotAPI, ctx context.Context, c } } - topicFullName := getTopicFullName(ctx, h.ipc, approval.TopicID) + topic, err := h.Registry.Get(flowState.TopicCode) + if err != nil || topic == nil { + logrus.Errorf("finalizeAndSubmit: Registry.Get(%s) err=%v", flowState.TopicCode, err) + } - content := "—" - if approval.Content != nil { - content = *approval.Content + initiator, err := h.ipc.Database.User.GetUserByTelegramIDDB(ctx, int64(telegramID)) + if err != nil || initiator == nil { + logrus.Errorf("finalizeAndSubmit: GetUserByTelegramIDDB err=%v", err) + } + + var card string + if topic != nil { + card = topic.FormatApproverMessage(initiator, flowState.Collected) + } else { + // fallback на старое поведение, если тему почему-то не нашли + topicFullName := getTopicFullName(ctx, h.ipc, approval.TopicID) + content := "—" + if approval.Content != nil { + content = *approval.Content + } + card = fmt.Sprintf("📋 Тема: %s\n📝 Текст: %s", topicFullName, content) } var confirmMsg string if isAnyOf { confirmMsg = fmt.Sprintf( - "📤 Заявка #%d отправлена на согласование\n\n"+ - "👤 Согласует один из: %s\n\n"+ - "📋 Тема: %s\n"+ - "📝 Текст: %s", - *approval.ID, approverLine, topicFullName, content, + "📤 Заявка #%d отправлена на согласование\n"+ + "👤 Согласует один из: %s\n\n%s", + *approval.ID, approverLine, card, ) } else { confirmMsg = fmt.Sprintf( - "📤 Заявка #%d отправлена на согласование\n\n"+ - "👤 Согласующий: %s\n\n"+ - "📋 Тема: %s\n"+ - "📝 Текст: %s", - *approval.ID, approverLine, topicFullName, content, + "📤 Заявка #%d отправлена на согласование\n"+ + "👤 Согласующий: %s\n\n%s", + *approval.ID, approverLine, card, ) } -- 2.43.0 From e96f301350e218d4a7814fb6bc27553051a80ec2 Mon Sep 17 00:00:00 2001 From: romanskijdev Date: Fri, 31 Jul 2026 15:59:48 +0300 Subject: [PATCH 2/2] Updated flows tree --- .../handlers/approval/notify.go | 22 ++++++++++++++----- .../handlers/approval/selection_approver.go | 8 +++++++ 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/service/telegram_service/handlers/approval/notify.go b/service/telegram_service/handlers/approval/notify.go index 68bb02a..73c8c86 100644 --- a/service/telegram_service/handlers/approval/notify.go +++ b/service/telegram_service/handlers/approval/notify.go @@ -189,7 +189,15 @@ func (n *Notifier) NotifyInitiatorApproved( ctx := context.Background() - card := n.topic.FormatApproverMessage(initiator, collected) + initiatorCollected := make(map[string]string, len(collected)) + for k, v := range collected { + if k == "instructions" { + continue + } + initiatorCollected[k] = v + } + + card := n.topic.FormatApproverMessage(initiator, initiatorCollected) text := fmt.Sprintf( "✅ Заявка #%d согласована\n"+ @@ -229,11 +237,15 @@ func (n *Notifier) NotifyInitiatorRejected( approverName = *approver.FullName } - content := collected["content"] - if content == "" { - content = "—" + initiatorCollected := make(map[string]string, len(collected)) + for k, v := range collected { + if k == "instructions" { + continue + } + initiatorCollected[k] = v } - card := n.topic.FormatApproverMessage(initiator, collected) + + card := n.topic.FormatApproverMessage(initiator, initiatorCollected) text := fmt.Sprintf( "❌ Заявка #%d отклонена\n\n"+ diff --git a/service/telegram_service/handlers/approval/selection_approver.go b/service/telegram_service/handlers/approval/selection_approver.go index d018c28..589fa43 100644 --- a/service/telegram_service/handlers/approval/selection_approver.go +++ b/service/telegram_service/handlers/approval/selection_approver.go @@ -244,6 +244,14 @@ func (h *Handler) finalizeAndSubmit(bot *tgbotapi.BotAPI, ctx context.Context, c logrus.Errorf("finalizeAndSubmit: GetUserByTelegramIDDB err=%v", err) } + initiatorCollected := make(map[string]string, len(flowState.Collected)) + for k, v := range flowState.Collected { + if k == "instructions" { + continue + } + initiatorCollected[k] = v + } + var card string if topic != nil { card = topic.FormatApproverMessage(initiator, flowState.Collected) -- 2.43.0