Fix observer selection #42

Merged
romanskijdev merged 1 commits from fix-permissions into main 2026-06-29 15:14:49 +03:00
3 changed files with 60 additions and 12 deletions

View File

@ -398,17 +398,22 @@ func (u *UserDB) GetObserversForApprovalDB(
Where(squirrel.Eq{"p.action": "observe"}).
Where(squirrel.Eq{"u.is_blocked": false})
// Условие: право на категорию ИЛИ право на конкретную тему
if topicID != nil {
// Логика:
// 1. Наблюдатели категории: topic_id IS NULL И category_id совпадает
// 2. Наблюдатели конкретной темы: topic_id совпадает (category игнорируем)
q = q.Where(squirrel.Or{
squirrel.Expr(
"p.topic_category_id IN (SELECT id FROM approval_topic_categories WHERE code = ?)",
categoryCode,
),
squirrel.And{
squirrel.Expr("p.topic_id IS NULL"),
squirrel.Expr(
"p.topic_category_id IN (SELECT id FROM approval_topic_categories WHERE code = ?)",
categoryCode,
),
},
squirrel.Eq{"p.topic_id": *topicID},
})
} else {
// Если topicID не передан — fallback на старую логику
// Если topicID не передан — fallback на старую логику (только по категории)
q = q.Join(
dbcoretablenames.TableNameApprovalTopicCategories.ToString() +
" c ON c.id = p.topic_category_id",
@ -420,6 +425,9 @@ func (u *UserDB) GetObserversForApprovalDB(
return nil, err
}
logrus.Infof("🔍 GetObserversForApprovalDB SQL: %s", sql)
logrus.Infof("🔍 GetObserversForApprovalDB Args: %v", args)
rows, err := u.pool.Query(ctx, sql, args...)
if err != nil {
return nil, err
@ -435,6 +443,8 @@ func (u *UserDB) GetObserversForApprovalDB(
}
result = append(result, usr)
}
logrus.Infof("✅ GetObserversForApprovalDB found %d observers", len(result))
return result, nil
}

View File

@ -250,9 +250,21 @@ func (h *Handler) processNextStepOrComplete(bot *tgbotapi.BotAPI, ctx context.Co
}
}
if observers, err := h.ipc.Database.User.GetObserversForApprovalDB(ctx, categoryCode, approval.TopicID); err == nil && len(observers) > 0 {
stepApprover, _ := h.ipc.Database.User.GetUserByIDDB(ctx, *currentStep.ApproverID)
notifier.NotifyObserversDecision(bot, observers, initiator, stepApprover, approval, collected)
observers, obsErr := h.ipc.Database.User.GetObserversForApprovalDB(ctx, categoryCode, approval.TopicID)
if obsErr != nil {
logrus.Errorf("❌ processNextStepOrComplete: GetObserversForApprovalDB err=%v (categoryCode=%s, topicID=%v)",
obsErr, categoryCode, approval.TopicID)
} else {
logrus.Infof("👁 processNextStepOrComplete: found %d observers for approvalID=%d categoryCode=%s topicID=%v",
len(observers), approvalID, categoryCode, approval.TopicID)
if len(observers) > 0 {
stepApprover, _ := h.ipc.Database.User.GetUserByIDDB(ctx, *currentStep.ApproverID)
notifier.NotifyObserversDecision(bot, observers, initiator, stepApprover, approval, collected)
} else {
logrus.Warnf("⚠️ processNextStepOrComplete: no observers found for categoryCode=%s topicID=%v",
categoryCode, approval.TopicID)
}
}
}

View File

@ -310,6 +310,7 @@ func (n *Notifier) NotifyDirector(bot *tgbotapi.BotAPI, director *typescore.User
bot.Send(msg) //nolint:errcheck
}
// NotifyObserversDecision — кто, кому и что согласовал/отклонил.
// NotifyObserversDecision — кто, кому и что согласовал/отклонил.
func (n *Notifier) NotifyObserversDecision(
bot *tgbotapi.BotAPI,
@ -319,12 +320,25 @@ func (n *Notifier) NotifyObserversDecision(
approval *typescore.Approval,
collected map[string]string,
) {
// 🔍 Логирование входа
statusStr := "nil"
if approval.Status != nil {
statusStr = *approval.Status
}
logrus.Infof("📢 NotifyObserversDecision: status=%s, observers=%d, approvalID=%v",
statusStr, len(observers), approval.ID)
if approval.Status == nil || *approval.Status != "approved" {
logrus.Warnf("⚠️ NotifyObserversDecision: skipped — status is not 'approved' (got: %s)", statusStr)
return
}
if len(observers) == 0 {
logrus.Warnf("⚠️ NotifyObserversDecision: no observers to notify")
return
}
ctx := context.Background()
// 🚀 Передаем initiator и collected
card := n.buildApprovalCard(ctx, approval, initiator, collected)
approverName := "—"
@ -338,7 +352,6 @@ func (n *Notifier) NotifyObserversDecision(
text := header + card
// Считаем файлы для кнопки
filesCount := len(approval.Files)
if filesCount == 0 {
files, _ := n.ipc.Database.ApprovalFile.GetFilesByApprovalIDDB(ctx, *approval.ID)
@ -349,14 +362,27 @@ func (n *Notifier) NotifyObserversDecision(
if approval.Status != nil {
status = *approval.Status
}
for _, obs := range observers {
if obs.TelegramID == nil {
logrus.Warnf("⚠️ NotifyObserversDecision: observer %v (id=%v) has no TelegramID, skipping",
obs.FullName, obs.ID)
continue
}
logrus.Infof("📨 NotifyObserversDecision: sending to observer %s (telegramID=%d)",
*obs.FullName, *obs.TelegramID)
msg := tgbotapi.NewMessage(*obs.TelegramID, text)
msg.ParseMode = "HTML"
msg.ReplyMarkup = keyboard.BuildObserverActions(*approval.ID, "", status, filesCount)
bot.Send(msg) //nolint:errcheck
if _, err := bot.Send(msg); err != nil {
logrus.Errorf("❌ NotifyObserversDecision: Send to %d err=%v", *obs.TelegramID, err)
} else {
logrus.Infof("✅ NotifyObserversDecision: sent to %s (telegramID=%d)",
*obs.FullName, *obs.TelegramID)
}
}
}