Fixed approval view for approver #78
|
|
@ -185,7 +185,6 @@ func buildMyApprovalsTopicFilter(categories []*typescore.ApprovalTopicCategory)
|
|||
return tgbotapi.NewInlineKeyboardMarkup(rows...)
|
||||
}
|
||||
|
||||
// HandleIncomingApprovals — список заявок ожидающих действия согласующего
|
||||
func (h *Handler) HandleIncomingApprovals(bot *tgbotapi.BotAPI, chatID int64, telegramID int64) {
|
||||
ctx := context.Background()
|
||||
|
||||
|
|
@ -206,7 +205,39 @@ func (h *Handler) HandleIncomingApprovals(bot *tgbotapi.BotAPI, chatID int64, te
|
|||
return
|
||||
}
|
||||
|
||||
// Дополнительные согласования
|
||||
type validStep struct {
|
||||
step *typescore.ApprovalStep
|
||||
approval *typescore.Approval
|
||||
}
|
||||
var validSteps []validStep
|
||||
for _, step := range steps {
|
||||
if step.ApprovalID == nil {
|
||||
continue
|
||||
}
|
||||
approval, aErr := h.ipc.Database.Approval.GetApprovalByIDDB(ctx, *step.ApprovalID)
|
||||
if aErr != nil || approval == nil {
|
||||
continue
|
||||
}
|
||||
if approval.Status == nil || (*approval.Status != "pending" && *approval.Status != "revision") {
|
||||
approvalStatus := "nil"
|
||||
if approval.Status != nil {
|
||||
approvalStatus = *approval.Status
|
||||
}
|
||||
stepID := uint64(0)
|
||||
if step.ID != nil {
|
||||
stepID = *step.ID
|
||||
}
|
||||
logrus.Warnf(
|
||||
"HandleIncomingApprovals: осиротевший шаг stepID=%d approvalID=%d approverID=%d — статус шага=pending, статус заявки=%s; шаг пропущен из выдачи. Похоже на рассинхронизацию между ApprovalStep и Approval — стоит проверить эту заявку вручную",
|
||||
stepID, *step.ApprovalID, *user.ID, approvalStatus,
|
||||
)
|
||||
continue
|
||||
}
|
||||
validSteps = append(validSteps, validStep{step: step, approval: approval})
|
||||
}
|
||||
|
||||
// Дополнительные согласования — та же логика: не доверяем одному только
|
||||
// статусу ApprovalAdditionalApprover, сверяем со статусом заявки.
|
||||
additionalApprovers, _, err := h.ipc.Database.ApprovalAdditionalApprover.GetApprovalAdditionalApproversListDB(ctx, typescore.ListDbOptions{
|
||||
Filtering: &typescore.ApprovalAdditionalApprover{
|
||||
ApproverID: user.ID,
|
||||
|
|
@ -217,7 +248,34 @@ func (h *Handler) HandleIncomingApprovals(bot *tgbotapi.BotAPI, chatID int64, te
|
|||
logrus.Warnf("HandleIncomingApprovals: GetPendingAdditionalApprovalsByApproverDB err=%v", err)
|
||||
}
|
||||
|
||||
totalCount := len(steps) + len(additionalApprovers)
|
||||
type validAdditional struct {
|
||||
aa *typescore.ApprovalAdditionalApprover
|
||||
approval *typescore.Approval
|
||||
}
|
||||
var validAdditionals []validAdditional
|
||||
for _, aa := range additionalApprovers {
|
||||
if aa.ApprovalID == nil {
|
||||
continue
|
||||
}
|
||||
approval, aErr := h.ipc.Database.Approval.GetApprovalByIDDB(ctx, *aa.ApprovalID)
|
||||
if aErr != nil || approval == nil {
|
||||
continue
|
||||
}
|
||||
if approval.Status == nil || (*approval.Status != "pending" && *approval.Status != "revision") {
|
||||
approvalStatus := "nil"
|
||||
if approval.Status != nil {
|
||||
approvalStatus = *approval.Status
|
||||
}
|
||||
logrus.Warnf(
|
||||
"HandleIncomingApprovals: осиротевший доп.согласующий approvalID=%d approverID=%d — статус=pending, статус заявки=%s; пропущен из выдачи",
|
||||
*aa.ApprovalID, *user.ID, approvalStatus,
|
||||
)
|
||||
continue
|
||||
}
|
||||
validAdditionals = append(validAdditionals, validAdditional{aa: aa, approval: approval})
|
||||
}
|
||||
|
||||
totalCount := len(validSteps) + len(validAdditionals)
|
||||
if totalCount == 0 {
|
||||
sendText(bot, chatID, "📭 Нет заявок для согласования.")
|
||||
return
|
||||
|
|
@ -226,40 +284,19 @@ func (h *Handler) HandleIncomingApprovals(bot *tgbotapi.BotAPI, chatID int64, te
|
|||
sendText(bot, chatID, fmt.Sprintf("📬 <b>Входящие согласования (%d):</b>", totalCount))
|
||||
|
||||
// Отправляем основные согласования
|
||||
for _, step := range steps {
|
||||
if step.ApprovalID == nil {
|
||||
continue
|
||||
}
|
||||
approval, _ := h.ipc.Database.Approval.GetApprovalByIDDB(ctx, *step.ApprovalID)
|
||||
if approval == nil {
|
||||
continue
|
||||
}
|
||||
if approval.Status == nil || (*approval.Status != "pending" && *approval.Status != "revision") {
|
||||
continue
|
||||
}
|
||||
|
||||
for _, vs := range validSteps {
|
||||
addedApprovers, _, _ := h.ipc.Database.ApprovalAdditionalApprover.GetApprovalAdditionalApproversListDB(ctx, typescore.ListDbOptions{
|
||||
Filtering: &typescore.ApprovalAdditionalApprover{
|
||||
ApprovalID: step.ApprovalID,
|
||||
ApprovalID: vs.step.ApprovalID,
|
||||
Status: utilscore.PointerToString("pending"),
|
||||
},
|
||||
})
|
||||
h.sendApprovalCard(bot, chatID, approval, true, true, addedApprovers)
|
||||
h.sendApprovalCard(bot, chatID, vs.approval, true, true, addedApprovers)
|
||||
}
|
||||
|
||||
// Отправляем дополнительные согласования
|
||||
for _, aa := range additionalApprovers {
|
||||
if aa.ApprovalID == nil {
|
||||
continue
|
||||
}
|
||||
if aa.Status == nil || (*aa.Status != "pending" && *aa.Status != "revision") {
|
||||
continue
|
||||
}
|
||||
approval, _ := h.ipc.Database.Approval.GetApprovalByIDDB(ctx, *aa.ApprovalID)
|
||||
if approval == nil {
|
||||
continue
|
||||
}
|
||||
h.sendAdditionalApprovalCard(bot, chatID, approval, aa)
|
||||
for _, va := range validAdditionals {
|
||||
h.sendAdditionalApprovalCard(bot, chatID, va.approval, va.aa)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue