|
|
|
|
@ -42,28 +42,46 @@ func (h *Handler) HandleObservedApprovalsPage(bot *tgbotapi.BotAPI, chatID int64
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Собираем коды категорий
|
|
|
|
|
var visibleTopics []approvalflow.Topic
|
|
|
|
|
seenCodes := make(map[string]bool)
|
|
|
|
|
seenTopicIDs := make(map[uint64]bool)
|
|
|
|
|
|
|
|
|
|
for _, p := range perms {
|
|
|
|
|
if p.TopicCategoryID == nil {
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
category, err := h.ipc.Database.ApprovalTopicCategory.GetApprovalTopicCategoryByIDDB(ctx, *p.TopicCategoryID)
|
|
|
|
|
if err != nil || category == nil || category.Code == nil {
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
if seenCodes[*category.Code] {
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
seenCodes[*category.Code] = true
|
|
|
|
|
if p.TopicCategoryID != nil {
|
|
|
|
|
category, err := h.ipc.Database.ApprovalTopicCategory.GetApprovalTopicCategoryByIDDB(ctx, *p.TopicCategoryID)
|
|
|
|
|
if err != nil || category == nil || category.Code == nil {
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
if seenCodes[*category.Code] {
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
seenCodes[*category.Code] = true
|
|
|
|
|
|
|
|
|
|
topic, err := h.Registry.Get(*category.Code)
|
|
|
|
|
if err != nil {
|
|
|
|
|
continue
|
|
|
|
|
topic, err := h.Registry.Get(*category.Code)
|
|
|
|
|
if err != nil {
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
visibleTopics = append(visibleTopics, topic)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if p.TopicID != nil {
|
|
|
|
|
if seenTopicIDs[*p.TopicID] {
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
seenTopicIDs[*p.TopicID] = true
|
|
|
|
|
|
|
|
|
|
topicDB, err := h.ipc.Database.ApprovalTopic.GetApprovalTopicByIDDB(ctx, *p.TopicID)
|
|
|
|
|
if err != nil || topicDB == nil || topicDB.Code == nil {
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Пытаемся найти тему в Registry
|
|
|
|
|
topic, err := h.Registry.Get(*topicDB.Code)
|
|
|
|
|
if err != nil {
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
visibleTopics = append(visibleTopics, topic)
|
|
|
|
|
}
|
|
|
|
|
visibleTopics = append(visibleTopics, topic)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if len(visibleTopics) == 0 {
|
|
|
|
|
@ -252,9 +270,33 @@ func (h *Handler) HandleObserverReminderCallback(bot *tgbotapi.BotAPI, cq *tgbot
|
|
|
|
|
|
|
|
|
|
// sendObserverTopicApprovals — общий рендер списка заявок по теме.
|
|
|
|
|
func (h *Handler) sendObserverTopicApprovals(bot *tgbotapi.BotAPI, ctx context.Context, chatID int64, topicCode string) {
|
|
|
|
|
approvals, err := h.ipc.Database.Approval.GetApprovalsByCategoryDB(ctx, topicCode)
|
|
|
|
|
var approvals []*typescore.Approval
|
|
|
|
|
var err error
|
|
|
|
|
var topicName string
|
|
|
|
|
|
|
|
|
|
// Определяем, что это: код категории или код темы
|
|
|
|
|
category, catErr := h.ipc.Database.ApprovalTopicCategory.GetApprovalTopicCategoryByCodeDB(ctx, topicCode)
|
|
|
|
|
if catErr == nil && category != nil {
|
|
|
|
|
// Это категория — получаем все согласования по категории
|
|
|
|
|
topicName = *category.Name
|
|
|
|
|
approvals, err = h.ipc.Database.Approval.GetApprovalsByCategoryDB(ctx, topicCode)
|
|
|
|
|
} else {
|
|
|
|
|
// Это тема — получаем согласования только по этой теме
|
|
|
|
|
topic, topicErr := h.ipc.Database.ApprovalTopic.GetApprovalTopicByCodeDB(ctx, topicCode)
|
|
|
|
|
if topicErr != nil || topic == nil || topic.ID == nil {
|
|
|
|
|
sendText(bot, chatID, "⚠️ Тема не найдена.")
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
topicName = *topic.Name
|
|
|
|
|
approvals, _, err = h.ipc.Database.Approval.GetApprovalsListDB(ctx, typescore.ListDbOptions{
|
|
|
|
|
Filtering: &typescore.Approval{
|
|
|
|
|
TopicID: topic.ID,
|
|
|
|
|
},
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
logrus.Errorf("sendObserverTopicApprovals: GetApprovalsByCategoryDB err=%v", err)
|
|
|
|
|
logrus.Errorf("sendObserverTopicApprovals: err=%v", err)
|
|
|
|
|
sendText(bot, chatID, "Ошибка при получении заявок.")
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
@ -267,12 +309,6 @@ func (h *Handler) sendObserverTopicApprovals(bot *tgbotapi.BotAPI, ctx context.C
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
topic, _ := h.Registry.Get(topicCode)
|
|
|
|
|
topicName := topicCode
|
|
|
|
|
if topic != nil {
|
|
|
|
|
topicName = topic.Name()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if len(pending) == 0 {
|
|
|
|
|
msg := tgbotapi.NewMessage(chatID, fmt.Sprintf("👁 <b>%s</b>\n\nНет заявок, ожидающих согласования.", topicName))
|
|
|
|
|
msg.ParseMode = "HTML"
|
|
|
|
|
|