diff --git a/service/telegram_service/handlers/approval/notify.go b/service/telegram_service/handlers/approval/notify.go index 6f66634..73c8c86 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,20 @@ func (n *Notifier) NotifyInitiatorApproved( ctx := context.Background() - topicFullName := getTopicFullName(ctx, n.ipc, approval.TopicID) + 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\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) @@ -236,18 +237,20 @@ 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 } - ctx := context.Background() - topicFullName := getTopicFullName(ctx, n.ipc, approval.TopicID) + + card := n.topic.FormatApproverMessage(initiator, initiatorCollected) + 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..589fa43 100644 --- a/service/telegram_service/handlers/approval/selection_approver.go +++ b/service/telegram_service/handlers/approval/selection_approver.go @@ -234,29 +234,49 @@ 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) + } + + 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) + } 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, ) }