diff --git a/service/telegram_service/handlers/approval/reminder.go b/service/telegram_service/handlers/approval/reminder.go index b143c16..da97496 100644 --- a/service/telegram_service/handlers/approval/reminder.go +++ b/service/telegram_service/handlers/approval/reminder.go @@ -121,6 +121,9 @@ func (h *Handler) HandleReminderApprovals(bot *tgbotapi.BotAPI, cq *tgbotapi.Cal if approval == nil { continue } + if approval.Status == nil && *approval.Status != "pending" { + continue + } h.sendApprovalCardForReminder(bot, chatID, approval) } diff --git a/service/telegram_service/scheduler/daily_reminder.go b/service/telegram_service/scheduler/daily_reminder.go index c690a5e..5dcc3ca 100644 --- a/service/telegram_service/scheduler/daily_reminder.go +++ b/service/telegram_service/scheduler/daily_reminder.go @@ -107,7 +107,7 @@ func (dr *DailyReminder) sendReminderToUser(bot *tgbotapi.BotAPI, ctx context.Co }, }) if err != nil { - logrus.Errorf("DailyReminder: GetApprovalListDB (revisions) for user=%d err=%v", userID, err) + logrus.Errorf("DailyReminder: GetApprovalsListDB (revisions) for user=%d err=%v", userID, err) } revisionsCount := len(revisions) @@ -146,7 +146,8 @@ func (dr *DailyReminder) sendReminderToUser(bot *tgbotapi.BotAPI, ctx context.Co logrus.Errorf("DailyReminder: GetApprovalAdditionalApproversListDB for user=%d err=%v", userID, err) } - approvalsCount := len(steps) + len(additionalApprovers) + // 🚀 Считаем только те шаги/доп. согласующих, у которых сама заявка в статусе pending + approvalsCount := dr.countPendingApprovals(ctx, steps, additionalApprovers) // Если нет ничего для пользователя, не отправляем сообщение if revisionsCount == 0 && tasksCount == 0 && approvalsCount == 0 { @@ -185,3 +186,44 @@ func (dr *DailyReminder) sendReminderToUser(bot *tgbotapi.BotAPI, ctx context.Co return true } + +// countPendingApprovals считает количество заявок со статусом "pending" +// из списка шагов и дополнительных согласующих +func (dr *DailyReminder) countPendingApprovals( + ctx context.Context, + steps []*typescore.ApprovalStep, + additionalApprovers []*typescore.ApprovalAdditionalApprover, +) int { + // Собираем уникальные approvalID + approvalIDs := make(map[uint64]bool) + + for _, step := range steps { + if step.ApprovalID != nil { + approvalIDs[*step.ApprovalID] = true + } + } + for _, aa := range additionalApprovers { + if aa.ApprovalID != nil { + approvalIDs[*aa.ApprovalID] = true + } + } + + if len(approvalIDs) == 0 { + return 0 + } + + // Получаем все заявки одним запросом и фильтруем по статусу pending + count := 0 + for approvalID := range approvalIDs { + id := approvalID + approval, err := dr.ipc.Database.Approval.GetApprovalByIDDB(ctx, id) + if err != nil || approval == nil { + continue + } + if approval.Status != nil && *approval.Status == "pending" { + count++ + } + } + + return count +}