Merge pull request 'fix-permissions' (#88) from fix-permissions into main
Deploy / deploy (push) Successful in 2m29s
Details
Deploy / deploy (push) Successful in 2m29s
Details
Reviewed-on: https://72.56.235.246.nip.io/gitea/romanskijdev/ruspet_portal_back/pulls/88
This commit is contained in:
commit
d698a3edae
|
|
@ -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(
|
||||
"✅ <b>Заявка #%d согласована</b>\n\n"+
|
||||
"👤 <b>Последний согласующий:</b> %s\n"+
|
||||
"📋 <b>Тема:</b> %s\n"+
|
||||
"📝 <b>Текст:</b> %s",
|
||||
*approval.ID, approverName, topicFullName, content,
|
||||
"✅ <b>Заявка #%d согласована</b>\n"+
|
||||
"👤 <b>Последний согласующий:</b> %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(
|
||||
"❌ <b>Заявка #%d отклонена</b>\n\n"+
|
||||
"👤 <b>Согласующий:</b> %s\n"+
|
||||
"📋 <b>Тема:</b> %s\n"+
|
||||
"📝 <b>Текст:</b> %s",
|
||||
*approval.ID, approverName, topicFullName, content,
|
||||
"👤 <b>Согласующий:</b> %s\n\n%s",
|
||||
*approval.ID, approverName, card,
|
||||
)
|
||||
|
||||
if comment != "" {
|
||||
|
|
|
|||
|
|
@ -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("📋 <b>Тема:</b> %s\n📝 <b>Текст:</b> %s", topicFullName, content)
|
||||
}
|
||||
|
||||
var confirmMsg string
|
||||
if isAnyOf {
|
||||
confirmMsg = fmt.Sprintf(
|
||||
"📤 <b>Заявка #%d отправлена на согласование</b>\n\n"+
|
||||
"👤 <b>Согласует один из:</b> %s\n\n"+
|
||||
"📋 <b>Тема:</b> %s\n"+
|
||||
"📝 <b>Текст:</b> %s",
|
||||
*approval.ID, approverLine, topicFullName, content,
|
||||
"📤 <b>Заявка #%d отправлена на согласование</b>\n"+
|
||||
"👤 <b>Согласует один из:</b> %s\n\n%s",
|
||||
*approval.ID, approverLine, card,
|
||||
)
|
||||
} else {
|
||||
confirmMsg = fmt.Sprintf(
|
||||
"📤 <b>Заявка #%d отправлена на согласование</b>\n\n"+
|
||||
"👤 <b>Согласующий:</b> %s\n\n"+
|
||||
"📋 <b>Тема:</b> %s\n"+
|
||||
"📝 <b>Текст:</b> %s",
|
||||
*approval.ID, approverLine, topicFullName, content,
|
||||
"📤 <b>Заявка #%d отправлена на согласование</b>\n"+
|
||||
"👤 <b>Согласующий:</b> %s\n\n%s",
|
||||
*approval.ID, approverLine, card,
|
||||
)
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue