Updated approval revocation. Needed to approve now
This commit is contained in:
parent
fb24876125
commit
43af69b57b
|
|
@ -37,6 +37,7 @@ type ModuleDB struct {
|
|||
Notification *dbcore.NotificationDB
|
||||
DirectorNotifications *dbcore.DirectorNotificationDB
|
||||
ApprovalTaskTransfer *dbcore.ApprovalTaskTransferDB
|
||||
ApprovalRevocation *dbcore.ApprovalRevocationDB
|
||||
}
|
||||
|
||||
func NewModuleDB(
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ func (m *MigrationFunctions) migrateTables() error {
|
|||
tablesmigration.NotificationsTableMigrate,
|
||||
tablesmigration.DirectorNotificationSubscriptionsTableMigrate,
|
||||
tablesmigration.ApprovalTaskTransfersTableMigrate,
|
||||
tablesmigration.ApprovalRevocationTablesMigrate,
|
||||
}
|
||||
|
||||
for _, migrate := range migrations {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,77 @@
|
|||
package tablesmigration
|
||||
|
||||
import (
|
||||
"gorm.io/gorm"
|
||||
"time"
|
||||
)
|
||||
|
||||
type LocalApprovalRevocationRequestProvider struct {
|
||||
ID uint64 `gorm:"column:id;primaryKey;autoIncrement"`
|
||||
ApprovalID uint64 `gorm:"column:approval_id;not null"`
|
||||
RequestedByID uint64 `gorm:"column:requested_by_id;not null"`
|
||||
Reason *string `gorm:"column:reason;type:text"`
|
||||
Status string `gorm:"column:status;type:text;not null;default:'pending'"`
|
||||
CreatedAt time.Time `gorm:"column:created_at;default:CURRENT_TIMESTAMP"`
|
||||
UpdatedAt time.Time `gorm:"column:updated_at;default:CURRENT_TIMESTAMP"`
|
||||
}
|
||||
|
||||
func (LocalApprovalRevocationRequestProvider) TableName() string {
|
||||
return "approval_revocation_requests"
|
||||
}
|
||||
|
||||
type LocalApprovalRevocationApproverProvider struct {
|
||||
ID uint64 `gorm:"column:id;primaryKey;autoIncrement"`
|
||||
RevocationRequestID uint64 `gorm:"column:revocation_request_id;not null"`
|
||||
ApproverID uint64 `gorm:"column:approver_id;not null"`
|
||||
Status string `gorm:"column:status;type:text;not null;default:'pending'"`
|
||||
Comment *string `gorm:"column:comment;type:text"`
|
||||
ActedAt *time.Time `gorm:"column:acted_at"`
|
||||
CreatedAt time.Time `gorm:"column:created_at;default:CURRENT_TIMESTAMP"`
|
||||
}
|
||||
|
||||
func (LocalApprovalRevocationApproverProvider) TableName() string {
|
||||
return "approval_revocation_approvers"
|
||||
}
|
||||
|
||||
func ApprovalRevocationTablesMigrate(db *gorm.DB) error {
|
||||
hasReqTable := db.Migrator().HasTable(&LocalApprovalRevocationRequestProvider{})
|
||||
hasApprTable := db.Migrator().HasTable(&LocalApprovalRevocationApproverProvider{})
|
||||
|
||||
if err := db.AutoMigrate(&LocalApprovalRevocationRequestProvider{}); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := db.AutoMigrate(&LocalApprovalRevocationApproverProvider{}); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if !hasReqTable || !hasApprTable {
|
||||
time.Sleep(5 * time.Second)
|
||||
|
||||
db.Exec(`ALTER TABLE approval_revocation_requests ADD CONSTRAINT fk_arr_approval_id FOREIGN KEY (approval_id) REFERENCES approvals(id) ON DELETE CASCADE ON UPDATE CASCADE`)
|
||||
db.Exec(`ALTER TABLE approval_revocation_requests ADD CONSTRAINT fk_arr_requested_by_id FOREIGN KEY (requested_by_id) REFERENCES users(id) ON DELETE CASCADE ON UPDATE CASCADE`)
|
||||
|
||||
db.Exec(`ALTER TABLE approval_revocation_approvers ADD CONSTRAINT fk_ara_request_id FOREIGN KEY (revocation_request_id) REFERENCES approval_revocation_requests(id) ON DELETE CASCADE ON UPDATE CASCADE`)
|
||||
db.Exec(`ALTER TABLE approval_revocation_approvers ADD CONSTRAINT fk_ara_approver_id FOREIGN KEY (approver_id) REFERENCES users(id) ON DELETE CASCADE ON UPDATE CASCADE`)
|
||||
|
||||
execComments(db, `
|
||||
COMMENT ON TABLE "approval_revocation_requests" IS 'Запрос инициатора на отзыв уже согласованной заявки, требующий согласия всех согласующих';
|
||||
COMMENT ON COLUMN "approval_revocation_requests".approval_id IS 'Заявка, которую пытаются отозвать';
|
||||
COMMENT ON COLUMN "approval_revocation_requests".requested_by_id IS 'Инициатор, запросивший отзыв';
|
||||
COMMENT ON COLUMN "approval_revocation_requests".reason IS 'Причина отзыва, указанная инициатором';
|
||||
COMMENT ON COLUMN "approval_revocation_requests".status IS 'pending | approved | rejected | cancelled';
|
||||
|
||||
COMMENT ON TABLE "approval_revocation_approvers" IS 'Согласующие, чьё согласие требуется для отзыва уже согласованной заявки';
|
||||
COMMENT ON COLUMN "approval_revocation_approvers".revocation_request_id IS 'Запрос на отзыв';
|
||||
COMMENT ON COLUMN "approval_revocation_approvers".approver_id IS 'Согласующий, участвовавший в первоначальном согласовании';
|
||||
COMMENT ON COLUMN "approval_revocation_approvers".status IS 'pending | approved | rejected';
|
||||
`)
|
||||
}
|
||||
|
||||
db.Exec(`CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_arr_approval_id ON approval_revocation_requests (approval_id)`)
|
||||
db.Exec(`CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_arr_status ON approval_revocation_requests (status)`)
|
||||
db.Exec(`CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_ara_request_id ON approval_revocation_approvers (revocation_request_id)`)
|
||||
db.Exec(`CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_ara_approver_id ON approval_revocation_approvers (approver_id)`)
|
||||
db.Exec(`CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_ara_request_status ON approval_revocation_approvers (revocation_request_id, status)`)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
|
@ -0,0 +1,215 @@
|
|||
package dbcore
|
||||
|
||||
import (
|
||||
dbcoretablenames "bitrix_balancer_api/core/db/table_names"
|
||||
"bitrix_balancer_api/core/typescore"
|
||||
dbutils "bitrix_balancer_api/core/utilscore/db"
|
||||
"context"
|
||||
"errors"
|
||||
"github.com/Masterminds/squirrel"
|
||||
"github.com/jackc/pgx/v5/pgxpool"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type ApprovalRevocationDB struct {
|
||||
pool *pgxpool.Pool
|
||||
}
|
||||
|
||||
func NewApprovalRevocationDB(pool *pgxpool.Pool) *ApprovalRevocationDB {
|
||||
return &ApprovalRevocationDB{pool: pool}
|
||||
}
|
||||
|
||||
type ApprovalRevocationDBI interface {
|
||||
CreateRevocationRequestDB(ctx context.Context, obj *typescore.ApprovalRevocationRequest, returnObj ...bool) (*typescore.ApprovalRevocationRequest, error)
|
||||
UpdateRevocationRequestDB(ctx context.Context, obj *typescore.ApprovalRevocationRequest, returnObj ...bool) (*typescore.ApprovalRevocationRequest, error)
|
||||
GetRevocationRequestByIDDB(ctx context.Context, id uint64) (*typescore.ApprovalRevocationRequest, error)
|
||||
GetPendingRevocationRequestForApprovalDB(ctx context.Context, approvalID uint64) (*typescore.ApprovalRevocationRequest, error)
|
||||
|
||||
CreateRevocationApproversDB(ctx context.Context, approvers []*typescore.ApprovalRevocationApprover) error
|
||||
UpdateRevocationApproverDB(ctx context.Context, obj *typescore.ApprovalRevocationApprover) error
|
||||
GetRevocationApproversByRequestIDDB(ctx context.Context, requestID uint64) ([]*typescore.ApprovalRevocationApprover, error)
|
||||
GetRevocationApproverForUserDB(ctx context.Context, requestID uint64, approverID uint64) (*typescore.ApprovalRevocationApprover, error)
|
||||
}
|
||||
|
||||
func (d *ApprovalRevocationDB) CreateRevocationRequestDB(ctx context.Context, obj *typescore.ApprovalRevocationRequest, returnObj ...bool) (*typescore.ApprovalRevocationRequest, error) {
|
||||
if obj == nil {
|
||||
return nil, errors.New("revocation request obj is nil")
|
||||
}
|
||||
|
||||
query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).
|
||||
Insert(dbcoretablenames.TableNameApprovalRevocationRequests.ToString())
|
||||
|
||||
sqlV, args, err := dbutils.GenerateInsertRequest(query, obj)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
*sqlV = *sqlV + " RETURNING id"
|
||||
|
||||
var insertedID uint64
|
||||
if err := d.pool.QueryRow(ctx, *sqlV, args...).Scan(&insertedID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if len(returnObj) > 0 && returnObj[0] {
|
||||
return d.GetRevocationRequestByIDDB(ctx, insertedID)
|
||||
}
|
||||
obj.ID = &insertedID
|
||||
return obj, nil
|
||||
}
|
||||
|
||||
func (d *ApprovalRevocationDB) UpdateRevocationRequestDB(ctx context.Context, obj *typescore.ApprovalRevocationRequest, returnObj ...bool) (*typescore.ApprovalRevocationRequest, error) {
|
||||
if obj.ID == nil {
|
||||
return nil, errors.New("revocation request id is nil")
|
||||
}
|
||||
|
||||
query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).
|
||||
Update(dbcoretablenames.TableNameApprovalRevocationRequests.ToString())
|
||||
query = dbutils.AddNonNullFieldsToQueryUpdate(query, *obj)
|
||||
query = query.Where(squirrel.Eq{"id": obj.ID})
|
||||
|
||||
sql, args, err := query.ToSql()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if _, err := d.pool.Exec(ctx, sql, args...); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if len(returnObj) > 0 && returnObj[0] {
|
||||
return d.GetRevocationRequestByIDDB(ctx, *obj.ID)
|
||||
}
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (d *ApprovalRevocationDB) getRevocationRequestListDB(ctx context.Context, opts typescore.ListDbOptions) ([]*typescore.ApprovalRevocationRequest, error) {
|
||||
fields := dbutils.GetStructFieldsDB(&typescore.ApprovalRevocationRequest{}, dbcoretablenames.TableNameApprovalRevocationRequests.ToString())
|
||||
query := dbutils.BuildSelectQuery(dbcoretablenames.TableNameApprovalRevocationRequests.ToString(), fields)
|
||||
|
||||
options, filter, err := dbutils.GetOptionsDB[typescore.ApprovalRevocationRequest](opts)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
query = dbutils.ApplyFilters(query, filter, options.LikeFields, dbcoretablenames.TableNameApprovalRevocationRequests.ToString())
|
||||
query = query.OrderBy("created_at DESC")
|
||||
|
||||
sql, args, err := query.ToSql()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
rows, err := d.pool.Query(ctx, sql, args...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
var result []*typescore.ApprovalRevocationRequest
|
||||
for rows.Next() {
|
||||
obj := &typescore.ApprovalRevocationRequest{}
|
||||
if err := dbutils.ScanRowsToStructRows(rows, obj, nil); err != nil {
|
||||
logrus.Warn("getRevocationRequestListDB:ScanRowsToStructRows", err)
|
||||
continue
|
||||
}
|
||||
result = append(result, obj)
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
func (d *ApprovalRevocationDB) GetRevocationRequestByIDDB(ctx context.Context, id uint64) (*typescore.ApprovalRevocationRequest, error) {
|
||||
list, err := d.getRevocationRequestListDB(ctx, typescore.ListDbOptions{
|
||||
Filtering: &typescore.ApprovalRevocationRequest{ID: &id},
|
||||
})
|
||||
if err != nil || len(list) == 0 {
|
||||
return nil, err
|
||||
}
|
||||
return list[0], nil
|
||||
}
|
||||
|
||||
func (d *ApprovalRevocationDB) GetPendingRevocationRequestForApprovalDB(ctx context.Context, approvalID uint64) (*typescore.ApprovalRevocationRequest, error) {
|
||||
pendingStatus := "pending"
|
||||
list, err := d.getRevocationRequestListDB(ctx, typescore.ListDbOptions{
|
||||
Filtering: &typescore.ApprovalRevocationRequest{ApprovalID: &approvalID, Status: &pendingStatus},
|
||||
})
|
||||
if err != nil || len(list) == 0 {
|
||||
return nil, err
|
||||
}
|
||||
return list[0], nil
|
||||
}
|
||||
|
||||
func (d *ApprovalRevocationDB) CreateRevocationApproversDB(ctx context.Context, approvers []*typescore.ApprovalRevocationApprover) error {
|
||||
if len(approvers) == 0 {
|
||||
return nil
|
||||
}
|
||||
query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).
|
||||
Insert(dbcoretablenames.TableNameApprovalRevocationApprovers.ToString()).
|
||||
Columns("revocation_request_id", "approver_id", "status")
|
||||
|
||||
for _, a := range approvers {
|
||||
query = query.Values(*a.RevocationRequestID, *a.ApproverID, *a.Status)
|
||||
}
|
||||
|
||||
sql, args, err := query.ToSql()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = d.pool.Exec(ctx, sql, args...)
|
||||
return err
|
||||
}
|
||||
|
||||
func (d *ApprovalRevocationDB) UpdateRevocationApproverDB(ctx context.Context, obj *typescore.ApprovalRevocationApprover) error {
|
||||
if obj.ID == nil {
|
||||
return errors.New("revocation approver id is nil")
|
||||
}
|
||||
|
||||
query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).
|
||||
Update(dbcoretablenames.TableNameApprovalRevocationApprovers.ToString())
|
||||
query = dbutils.AddNonNullFieldsToQueryUpdate(query, *obj)
|
||||
query = query.Where(squirrel.Eq{"id": obj.ID})
|
||||
|
||||
sql, args, err := query.ToSql()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = d.pool.Exec(ctx, sql, args...)
|
||||
return err
|
||||
}
|
||||
|
||||
func (d *ApprovalRevocationDB) GetRevocationApproversByRequestIDDB(ctx context.Context, requestID uint64) ([]*typescore.ApprovalRevocationApprover, error) {
|
||||
fields := dbutils.GetStructFieldsDB(&typescore.ApprovalRevocationApprover{}, dbcoretablenames.TableNameApprovalRevocationApprovers.ToString())
|
||||
query := dbutils.BuildSelectQuery(dbcoretablenames.TableNameApprovalRevocationApprovers.ToString(), fields).
|
||||
Where(squirrel.Eq{"revocation_request_id": requestID})
|
||||
|
||||
sql, args, err := query.ToSql()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
rows, err := d.pool.Query(ctx, sql, args...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
var result []*typescore.ApprovalRevocationApprover
|
||||
for rows.Next() {
|
||||
obj := &typescore.ApprovalRevocationApprover{}
|
||||
if err := dbutils.ScanRowsToStructRows(rows, obj, nil); err != nil {
|
||||
continue
|
||||
}
|
||||
result = append(result, obj)
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
func (d *ApprovalRevocationDB) GetRevocationApproverForUserDB(ctx context.Context, requestID uint64, approverID uint64) (*typescore.ApprovalRevocationApprover, error) {
|
||||
all, err := d.GetRevocationApproversByRequestIDDB(ctx, requestID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, a := range all {
|
||||
if a.ApproverID != nil && *a.ApproverID == approverID {
|
||||
return a, nil
|
||||
}
|
||||
}
|
||||
return nil, nil
|
||||
}
|
||||
|
|
@ -27,6 +27,8 @@ const (
|
|||
TableNameNotificationsRecipients TableName = "notification_recipients"
|
||||
TableNameDirectorNotificationSubscriptions TableName = "director_notification_subscriptions"
|
||||
TableNameApprovalTaskTransfers TableName = "approval_task_transfers"
|
||||
TableNameApprovalRevocationRequests TableName = "approval_revocation_requests"
|
||||
TableNameApprovalRevocationApprovers TableName = "approval_revocation_approvers"
|
||||
)
|
||||
|
||||
func (t TableName) ToString() string {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
package typescore
|
||||
|
||||
import "time"
|
||||
|
||||
type ApprovalRevocationRequest struct {
|
||||
ID *uint64 `gorm:"column:id" json:"id" db:"id"`
|
||||
ApprovalID *uint64 `gorm:"column:approval_id" json:"approval_id" db:"approval_id"`
|
||||
RequestedByID *uint64 `gorm:"column:requested_by_id" json:"requested_by_id" db:"requested_by_id"`
|
||||
Reason *string `gorm:"column:reason" json:"reason,omitempty" db:"reason"`
|
||||
Status *string `gorm:"column:status" json:"status" db:"status"`
|
||||
CreatedAt *time.Time `gorm:"column:created_at" json:"created_at" db:"created_at"`
|
||||
UpdatedAt *time.Time `gorm:"column:updated_at" json:"updated_at" db:"updated_at"`
|
||||
}
|
||||
|
||||
type ApprovalRevocationApprover struct {
|
||||
ID *uint64 `gorm:"column:id" json:"id" db:"id"`
|
||||
RevocationRequestID *uint64 `gorm:"column:revocation_request_id" json:"revocation_request_id" db:"revocation_request_id"`
|
||||
ApproverID *uint64 `gorm:"column:approver_id" json:"approver_id" db:"approver_id"`
|
||||
Status *string `gorm:"column:status" json:"status" db:"status"`
|
||||
Comment *string `gorm:"column:comment" json:"comment,omitempty" db:"comment"`
|
||||
ActedAt *time.Time `gorm:"column:acted_at" json:"acted_at,omitempty" db:"acted_at"`
|
||||
CreatedAt *time.Time `gorm:"column:created_at" json:"created_at" db:"created_at"`
|
||||
}
|
||||
|
|
@ -478,6 +478,15 @@ func (s *UpdateHandler) handleCallback(bot *tgbotapi.BotAPI, cq *tgbotapi.Callba
|
|||
approvalID := parseID(data, "appr_show_card:")
|
||||
s.approvalHandler.HandleShowApprovalCardCallback(bot, cq, approvalID)
|
||||
|
||||
// ── СОГЛАСОВАНИЕ ОТЗЫВА ────────────────────────────────────
|
||||
case strings.HasPrefix(data, "revoke_appr_yes:"):
|
||||
requestID := parseID(data, "revoke_appr_yes:")
|
||||
s.approvalHandler.HandleRevocationApproverDecision(bot, cq, requestID, true)
|
||||
|
||||
case strings.HasPrefix(data, "revoke_appr_no:"):
|
||||
requestID := parseID(data, "revoke_appr_no:")
|
||||
s.approvalHandler.HandleRevocationApproverDecision(bot, cq, requestID, false)
|
||||
|
||||
// Мои заявки
|
||||
case strings.HasPrefix(data, "my_appr_topic:"):
|
||||
topicFilter := strings.TrimPrefix(data, "my_appr_topic:")
|
||||
|
|
|
|||
|
|
@ -0,0 +1,271 @@
|
|||
package approval
|
||||
|
||||
import (
|
||||
"bitrix_balancer_api/core/typescore"
|
||||
"bitrix_balancer_api/telegram_service/keyboard"
|
||||
"context"
|
||||
"fmt"
|
||||
tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
|
||||
"github.com/sirupsen/logrus"
|
||||
"time"
|
||||
)
|
||||
|
||||
// getDistinctApprovedApproverIDs — все, кто реально одобрил хотя бы один шаг этой заявки.
|
||||
func (h *Handler) getDistinctApprovedApproverIDs(ctx context.Context, approvalID uint64) []uint64 {
|
||||
steps, _, err := h.ipc.Database.ApprovalStep.GetApprovalStepsListDB(ctx, typescore.ListDbOptions{
|
||||
Filtering: &typescore.ApprovalStep{ApprovalID: &approvalID},
|
||||
})
|
||||
if err != nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
seen := make(map[uint64]bool)
|
||||
var ids []uint64
|
||||
for _, s := range steps {
|
||||
if s.Status == nil || *s.Status != "approved" || s.ApproverID == nil {
|
||||
continue
|
||||
}
|
||||
if !seen[*s.ApproverID] {
|
||||
seen[*s.ApproverID] = true
|
||||
ids = append(ids, *s.ApproverID)
|
||||
}
|
||||
}
|
||||
return ids
|
||||
}
|
||||
|
||||
// startApprovalRevocationRequest создаёт запрос на отзыв уже согласованной заявки
|
||||
// и рассылает его всем, кто участвовал в согласовании, для получения их согласия.
|
||||
func (h *Handler) startApprovalRevocationRequest(
|
||||
bot *tgbotapi.BotAPI,
|
||||
chatID int64,
|
||||
approval *typescore.Approval,
|
||||
initiator *typescore.User,
|
||||
comment string,
|
||||
) {
|
||||
ctx := context.Background()
|
||||
approvalID := *approval.ID
|
||||
|
||||
if existing, _ := h.ipc.Database.ApprovalRevocation.GetPendingRevocationRequestForApprovalDB(ctx, approvalID); existing != nil {
|
||||
sendText(bot, chatID, "⚠️ По этой заявке уже есть ожидающий рассмотрения запрос на отзыв.")
|
||||
return
|
||||
}
|
||||
|
||||
approverIDs := h.getDistinctApprovedApproverIDs(ctx, approvalID)
|
||||
if len(approverIDs) == 0 {
|
||||
// Заявку никто не одобрял (странный случай, но не блокируем инициатора навсегда)
|
||||
h.HandleRevokeWithComment(bot, chatID, *initiator.TelegramID, approvalID, comment)
|
||||
return
|
||||
}
|
||||
|
||||
pendingStatus := "pending"
|
||||
var reasonPtr *string
|
||||
if comment != "" {
|
||||
reasonPtr = &comment
|
||||
}
|
||||
|
||||
request := &typescore.ApprovalRevocationRequest{
|
||||
ApprovalID: &approvalID,
|
||||
RequestedByID: initiator.ID,
|
||||
Reason: reasonPtr,
|
||||
Status: &pendingStatus,
|
||||
}
|
||||
created, err := h.ipc.Database.ApprovalRevocation.CreateRevocationRequestDB(ctx, request, true)
|
||||
if err != nil || created == nil || created.ID == nil {
|
||||
logrus.Errorf("startApprovalRevocationRequest: CreateRevocationRequestDB err=%v", err)
|
||||
sendText(bot, chatID, "⚠️ Ошибка при создании запроса на отзыв.")
|
||||
return
|
||||
}
|
||||
|
||||
var approvers []*typescore.ApprovalRevocationApprover
|
||||
for _, id := range approverIDs {
|
||||
id := id
|
||||
approvers = append(approvers, &typescore.ApprovalRevocationApprover{
|
||||
RevocationRequestID: created.ID,
|
||||
ApproverID: &id,
|
||||
Status: &pendingStatus,
|
||||
})
|
||||
}
|
||||
if err := h.ipc.Database.ApprovalRevocation.CreateRevocationApproversDB(ctx, approvers); err != nil {
|
||||
logrus.Errorf("startApprovalRevocationRequest: CreateRevocationApproversDB err=%v", err)
|
||||
sendText(bot, chatID, "⚠️ Ошибка при создании списка согласующих.")
|
||||
return
|
||||
}
|
||||
|
||||
initiatorName := "—"
|
||||
if initiator.FullName != nil {
|
||||
initiatorName = *initiator.FullName
|
||||
}
|
||||
topicFullName := getTopicFullName(ctx, h.ipc, approval.TopicID)
|
||||
content := "—"
|
||||
if approval.Content != nil {
|
||||
content = *approval.Content
|
||||
}
|
||||
reasonLine := ""
|
||||
if comment != "" {
|
||||
reasonLine = fmt.Sprintf("\n💬 <b>Причина:</b> %s", comment)
|
||||
}
|
||||
|
||||
notifyText := fmt.Sprintf(
|
||||
"⚠️ <b>Запрос на отзыв согласованной заявки #%d</b>\n\n"+
|
||||
"👤 <b>Инициатор:</b> %s\n"+
|
||||
"📋 <b>Тема:</b> %s\n"+
|
||||
"📝 <b>Текст:</b> %s%s\n\n"+
|
||||
"Требуется согласие всех, кто участвовал в согласовании. Ваше решение:",
|
||||
approvalID, initiatorName, topicFullName, content, reasonLine,
|
||||
)
|
||||
|
||||
for _, id := range approverIDs {
|
||||
approver, err := h.ipc.Database.User.GetUserByIDDB(ctx, id)
|
||||
if err != nil || approver == nil || approver.TelegramID == nil {
|
||||
continue
|
||||
}
|
||||
msg := tgbotapi.NewMessage(*approver.TelegramID, notifyText)
|
||||
msg.ParseMode = "HTML"
|
||||
msg.ReplyMarkup = keyboard.BuildRevocationApprovalDecision(approvalID, *created.ID, h.GetCommentsCount(ctx, approvalID))
|
||||
bot.Send(msg) //nolint:errcheck
|
||||
}
|
||||
|
||||
sendText(bot, chatID, fmt.Sprintf(
|
||||
"📤 <b>Запрос на отзыв заявки #%d отправлен</b>\n\n"+
|
||||
"Ожидаем согласия от всех согласующих (%d чел.). Заявка будет отозвана только после единодушного согласия.",
|
||||
approvalID, len(approverIDs),
|
||||
))
|
||||
}
|
||||
|
||||
// HandleRevocationApproverDecision — согласующий дал ответ на запрос отзыва.
|
||||
func (h *Handler) HandleRevocationApproverDecision(bot *tgbotapi.BotAPI, cq *tgbotapi.CallbackQuery, requestID uint64, approved bool) {
|
||||
ctx := context.Background()
|
||||
chatID := cq.Message.Chat.ID
|
||||
|
||||
bot.Request(tgbotapi.NewCallback(cq.ID, "")) //nolint:errcheck
|
||||
bot.Request(tgbotapi.NewDeleteMessage(chatID, cq.Message.MessageID)) //nolint:errcheck
|
||||
|
||||
user, err := h.ipc.Database.User.GetUserByTelegramIDDB(ctx, cq.From.ID)
|
||||
if err != nil || user == nil || user.ID == nil {
|
||||
return
|
||||
}
|
||||
|
||||
request, err := h.ipc.Database.ApprovalRevocation.GetRevocationRequestByIDDB(ctx, requestID)
|
||||
if err != nil || request == nil {
|
||||
sendText(bot, chatID, "⚠️ Запрос не найден.")
|
||||
return
|
||||
}
|
||||
if request.Status == nil || *request.Status != "pending" {
|
||||
sendText(bot, chatID, "⚠️ Этот запрос уже обработан.")
|
||||
return
|
||||
}
|
||||
|
||||
approverRecord, err := h.ipc.Database.ApprovalRevocation.GetRevocationApproverForUserDB(ctx, requestID, *user.ID)
|
||||
if err != nil || approverRecord == nil {
|
||||
sendText(bot, chatID, "⚠️ Вы не являетесь участником этого согласования.")
|
||||
return
|
||||
}
|
||||
if approverRecord.Status == nil || *approverRecord.Status != "pending" {
|
||||
sendText(bot, chatID, "⚠️ Вы уже дали ответ на этот запрос.")
|
||||
return
|
||||
}
|
||||
|
||||
now := time.Now()
|
||||
newStatus := "approved"
|
||||
if !approved {
|
||||
newStatus = "rejected"
|
||||
}
|
||||
approverRecord.Status = &newStatus
|
||||
approverRecord.ActedAt = &now
|
||||
if err := h.ipc.Database.ApprovalRevocation.UpdateRevocationApproverDB(ctx, approverRecord); err != nil {
|
||||
logrus.Errorf("HandleRevocationApproverDecision: UpdateRevocationApproverDB err=%v", err)
|
||||
return
|
||||
}
|
||||
|
||||
responderName := "—"
|
||||
if user.FullName != nil {
|
||||
responderName = *user.FullName
|
||||
}
|
||||
|
||||
if !approved {
|
||||
// Один отказ — отклоняем весь запрос сразу
|
||||
rejectedStatus := "rejected"
|
||||
request.Status = &rejectedStatus
|
||||
h.ipc.Database.ApprovalRevocation.UpdateRevocationRequestDB(ctx, request) //nolint:errcheck
|
||||
|
||||
sendText(bot, chatID, fmt.Sprintf("❌ Вы отклонили отзыв заявки #%d.", *request.ApprovalID))
|
||||
h.notifyRevocationRequestClosed(bot, ctx, request, false, responderName)
|
||||
return
|
||||
}
|
||||
|
||||
sendText(bot, chatID, fmt.Sprintf("✅ Вы согласились на отзыв заявки #%d.", *request.ApprovalID))
|
||||
|
||||
// Проверяем, все ли уже согласились
|
||||
allApprovers, err := h.ipc.Database.ApprovalRevocation.GetRevocationApproversByRequestIDDB(ctx, requestID)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
allApproved := true
|
||||
for _, a := range allApprovers {
|
||||
if a.Status == nil || *a.Status != "approved" {
|
||||
allApproved = false
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
if !allApproved {
|
||||
return
|
||||
}
|
||||
|
||||
approvedStatus := "approved"
|
||||
request.Status = &approvedStatus
|
||||
if _, err := h.ipc.Database.ApprovalRevocation.UpdateRevocationRequestDB(ctx, request); err != nil {
|
||||
logrus.Errorf("HandleRevocationApproverDecision: UpdateRevocationRequestDB err=%v", err)
|
||||
return
|
||||
}
|
||||
|
||||
// Все согласились — выполняем фактический отзыв
|
||||
approval, err := h.ipc.Database.Approval.GetApprovalByIDDB(ctx, *request.ApprovalID)
|
||||
if err != nil || approval == nil || request.RequestedByID == nil {
|
||||
return
|
||||
}
|
||||
initiator, err := h.ipc.Database.User.GetUserByIDDB(ctx, *request.RequestedByID)
|
||||
if err != nil || initiator == nil || initiator.TelegramID == nil {
|
||||
return
|
||||
}
|
||||
|
||||
reason := ""
|
||||
if request.Reason != nil {
|
||||
reason = *request.Reason
|
||||
}
|
||||
|
||||
// В этой ветке отзывающий — инициатор (запрос был именно от него),
|
||||
// isDirectorRevoking всегда false, т.к. в этот путь директор не попадает
|
||||
steps, _, _ := h.ipc.Database.ApprovalStep.GetApprovalStepsListDB(ctx, typescore.ListDbOptions{
|
||||
Filtering: &typescore.ApprovalStep{ApprovalID: request.ApprovalID},
|
||||
})
|
||||
|
||||
h.performActualRevoke(bot, ctx, approval, initiator, "инициатором", reason, steps, true, false)
|
||||
h.notifyRevocationRequestClosed(bot, ctx, request, true, "")
|
||||
}
|
||||
|
||||
// notifyRevocationRequestClosed уведомляет инициатора об итоге запроса на отзыв.
|
||||
func (h *Handler) notifyRevocationRequestClosed(bot *tgbotapi.BotAPI, ctx context.Context, request *typescore.ApprovalRevocationRequest, approved bool, rejectorName string) {
|
||||
if request.RequestedByID == nil {
|
||||
return
|
||||
}
|
||||
initiator, err := h.ipc.Database.User.GetUserByIDDB(ctx, *request.RequestedByID)
|
||||
if err != nil || initiator == nil || initiator.TelegramID == nil {
|
||||
return
|
||||
}
|
||||
|
||||
if approved {
|
||||
sendText(bot, *initiator.TelegramID, fmt.Sprintf(
|
||||
"✅ <b>Заявка #%d отозвана</b>\n\nВсе согласующие дали согласие на отзыв.",
|
||||
*request.ApprovalID,
|
||||
))
|
||||
return
|
||||
}
|
||||
|
||||
sendText(bot, *initiator.TelegramID, fmt.Sprintf(
|
||||
"❌ <b>Отзыв заявки #%d отклонён</b>\n\n"+
|
||||
"👤 <b>Отклонил:</b> %s\n\n"+
|
||||
"Заявка остаётся согласованной.",
|
||||
*request.ApprovalID, rejectorName,
|
||||
))
|
||||
}
|
||||
|
|
@ -10,10 +10,9 @@ import (
|
|||
"context"
|
||||
"encoding/base64"
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
|
||||
"github.com/sirupsen/logrus"
|
||||
"time"
|
||||
)
|
||||
|
||||
type Handler struct {
|
||||
|
|
@ -290,11 +289,9 @@ func (h *Handler) HandleRevokeWithComment(bot *tgbotapi.BotAPI, chatID int64, te
|
|||
return
|
||||
}
|
||||
|
||||
// Определяем роли пользователя
|
||||
isInitiator := approval.InitiatorID != nil && *approval.InitiatorID == *revoker.ID
|
||||
isDirector, _ := h.ipc.Database.User.IsDirectorDB(ctx, *revoker.ID)
|
||||
|
||||
// 🚀 НОВОЕ: Проверяем, является ли пользователь согласующим по этой заявке
|
||||
isApprover := false
|
||||
steps, _, _ := h.ipc.Database.ApprovalStep.GetApprovalStepsListDB(ctx, typescore.ListDbOptions{
|
||||
Filtering: &typescore.ApprovalStep{ApprovalID: &approvalID},
|
||||
|
|
@ -306,7 +303,6 @@ func (h *Handler) HandleRevokeWithComment(bot *tgbotapi.BotAPI, chatID int64, te
|
|||
}
|
||||
}
|
||||
|
||||
// Проверка прав в зависимости от статуса
|
||||
switch *approval.Status {
|
||||
case "revoked":
|
||||
sendText(bot, chatID, "Заявка уже отозвана.")
|
||||
|
|
@ -324,6 +320,13 @@ func (h *Handler) HandleRevokeWithComment(bot *tgbotapi.BotAPI, chatID int64, te
|
|||
sendText(bot, chatID, "⚠️ У вас нет прав для отзыва этой заявки.")
|
||||
return
|
||||
}
|
||||
|
||||
// Инициатор (не директор) отзывает уже согласованную заявку —
|
||||
// требуется согласие всех, кто участвовал в согласовании
|
||||
if isInitiator && !isDirector {
|
||||
h.startApprovalRevocationRequest(bot, chatID, approval, revoker, comment)
|
||||
return
|
||||
}
|
||||
default:
|
||||
if !isInitiator && !isDirector {
|
||||
sendText(bot, chatID, "⚠️ У вас нет прав для отзыва этой заявки.")
|
||||
|
|
@ -331,32 +334,6 @@ func (h *Handler) HandleRevokeWithComment(bot *tgbotapi.BotAPI, chatID int64, te
|
|||
}
|
||||
}
|
||||
|
||||
now := time.Now()
|
||||
revokedStatus := "revoked"
|
||||
approval.Status = &revokedStatus
|
||||
approval.RevokedByID = revoker.ID
|
||||
approval.RevokedAt = &now
|
||||
|
||||
if _, _, err := h.ipc.Database.Approval.UpdateApprovalDB(ctx, nil, approval); err != nil {
|
||||
logrus.Errorf("HandleRevokeWithComment: UpdateApprovalDB err=%v", err)
|
||||
sendText(bot, chatID, "Ошибка при отзыве заявки.")
|
||||
return
|
||||
}
|
||||
|
||||
h.handleRevokeCancellationTask(bot, ctx, approval)
|
||||
|
||||
revokerName := "—"
|
||||
if revoker.FullName != nil {
|
||||
revokerName = *revoker.FullName
|
||||
}
|
||||
|
||||
topicFullName := getTopicFullName(ctx, h.ipc, approval.TopicID)
|
||||
|
||||
content := "—"
|
||||
if approval.Content != nil {
|
||||
content = *approval.Content
|
||||
}
|
||||
|
||||
revokerRole := ""
|
||||
switch {
|
||||
case isInitiator:
|
||||
|
|
@ -367,6 +344,71 @@ func (h *Handler) HandleRevokeWithComment(bot *tgbotapi.BotAPI, chatID int64, te
|
|||
revokerRole = "согласующим"
|
||||
}
|
||||
|
||||
h.performActualRevoke(bot, ctx, approval, revoker, revokerRole, comment, steps, isInitiator, isDirector)
|
||||
|
||||
// Обратная связь тому, кто выполнил отзыв
|
||||
topicFullName := getTopicFullName(ctx, h.ipc, approval.TopicID)
|
||||
content := "—"
|
||||
if approval.Content != nil {
|
||||
content = *approval.Content
|
||||
}
|
||||
approvalCard := fmt.Sprintf(
|
||||
"📋 <b>Тема:</b> %s\n📝 <b>Текст:</b> %s\n💬 <b>Причина отзыва:</b> %s",
|
||||
topicFullName, content, comment,
|
||||
)
|
||||
feedbackMsg := tgbotapi.NewMessage(chatID, fmt.Sprintf(
|
||||
"↩️ <b>Заявка #%d отозвана</b>\n\n%s",
|
||||
approvalID, approvalCard,
|
||||
))
|
||||
feedbackMsg.ParseMode = "HTML"
|
||||
feedbackMsg.ReplyMarkup = keyboard.BuildCommentNotificationKeyboard(approvalID, h.GetCommentsCount(ctx, approvalID))
|
||||
bot.Send(feedbackMsg) //nolint:errcheck
|
||||
}
|
||||
|
||||
// performActualRevoke выполняет отзыв заявки в БД и уведомляет всех участников
|
||||
// с возможностью комментирования. Вызывается либо напрямую (директор/согласующий/
|
||||
// инициатор для pending), либо после того как все согласующие подтвердили согласие
|
||||
// на отзыв уже одобренной заявки.
|
||||
func (h *Handler) performActualRevoke(
|
||||
bot *tgbotapi.BotAPI,
|
||||
ctx context.Context,
|
||||
approval *typescore.Approval,
|
||||
revoker *typescore.User,
|
||||
revokerRole string,
|
||||
comment string,
|
||||
steps []*typescore.ApprovalStep,
|
||||
isInitiatorRevoking bool,
|
||||
isDirectorRevoking bool,
|
||||
) {
|
||||
if approval.ID == nil {
|
||||
return
|
||||
}
|
||||
approvalID := *approval.ID
|
||||
|
||||
now := time.Now().UTC()
|
||||
revokedStatus := "revoked"
|
||||
approval.Status = &revokedStatus
|
||||
approval.RevokedByID = revoker.ID
|
||||
approval.RevokedAt = &now
|
||||
|
||||
if _, _, err := h.ipc.Database.Approval.UpdateApprovalDB(ctx, nil, approval); err != nil {
|
||||
logrus.Errorf("performActualRevoke: UpdateApprovalDB err=%v", err)
|
||||
return
|
||||
}
|
||||
|
||||
h.handleRevokeCancellationTask(bot, ctx, approval)
|
||||
|
||||
revokerName := "—"
|
||||
if revoker.FullName != nil {
|
||||
revokerName = *revoker.FullName
|
||||
}
|
||||
|
||||
topicFullName := getTopicFullName(ctx, h.ipc, approval.TopicID)
|
||||
content := "—"
|
||||
if approval.Content != nil {
|
||||
content = *approval.Content
|
||||
}
|
||||
|
||||
approvalCard := fmt.Sprintf(
|
||||
"📋 <b>Тема:</b> %s\n"+
|
||||
"📝 <b>Текст:</b> %s\n"+
|
||||
|
|
@ -374,23 +416,29 @@ func (h *Handler) HandleRevokeWithComment(bot *tgbotapi.BotAPI, chatID int64, te
|
|||
topicFullName, content, comment,
|
||||
)
|
||||
|
||||
// Уведомление тому, кто отзывает
|
||||
sendText(bot, chatID, fmt.Sprintf(
|
||||
"↩️ <b>Заявка #%d отозвана</b>\n\n%s",
|
||||
approvalID, approvalCard,
|
||||
))
|
||||
commentsCount := h.GetCommentsCount(ctx, approvalID)
|
||||
commentKeyboard := keyboard.BuildCommentNotificationKeyboard(approvalID, commentsCount)
|
||||
|
||||
if !isInitiator && approval.InitiatorID != nil {
|
||||
notify := func(chatID int64, text string) {
|
||||
msg := tgbotapi.NewMessage(chatID, text)
|
||||
msg.ParseMode = "HTML"
|
||||
msg.ReplyMarkup = commentKeyboard
|
||||
bot.Send(msg) //nolint:errcheck
|
||||
}
|
||||
|
||||
// Инициатор (если не сам отзывал)
|
||||
if !isInitiatorRevoking && approval.InitiatorID != nil {
|
||||
initiator, err := h.ipc.Database.User.GetUserByIDDB(ctx, *approval.InitiatorID)
|
||||
if err == nil && initiator != nil && initiator.TelegramID != nil {
|
||||
sendText(bot, *initiator.TelegramID, fmt.Sprintf(
|
||||
notify(*initiator.TelegramID, fmt.Sprintf(
|
||||
"↩️ <b>Ваша заявка #%d отозвана %s %s</b>\n\n%s",
|
||||
approvalID, revokerRole, revokerName, approvalCard,
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
if !isDirector {
|
||||
// Директора (если не сам отзывал)
|
||||
if !isDirectorRevoking {
|
||||
directors, _ := h.ipc.Database.User.GetDirectorsDB(ctx)
|
||||
for _, director := range directors {
|
||||
if director.TelegramID == nil {
|
||||
|
|
@ -399,13 +447,15 @@ func (h *Handler) HandleRevokeWithComment(bot *tgbotapi.BotAPI, chatID int64, te
|
|||
if revoker.ID != nil && director.ID != nil && *director.ID == *revoker.ID {
|
||||
continue
|
||||
}
|
||||
sendText(bot, *director.TelegramID, fmt.Sprintf(
|
||||
notify(*director.TelegramID, fmt.Sprintf(
|
||||
"↩️ <b>Заявка #%d отозвана %s %s</b>\n\n%s",
|
||||
approvalID, revokerRole, revokerName, approvalCard,
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
// Согласующие (кроме самого отозвавшего)
|
||||
notifiedApprovers := make(map[uint64]bool)
|
||||
for _, step := range steps {
|
||||
if step.ApproverID == nil {
|
||||
continue
|
||||
|
|
@ -413,31 +463,35 @@ func (h *Handler) HandleRevokeWithComment(bot *tgbotapi.BotAPI, chatID int64, te
|
|||
if revoker.ID != nil && *step.ApproverID == *revoker.ID {
|
||||
continue
|
||||
}
|
||||
if notifiedApprovers[*step.ApproverID] {
|
||||
continue
|
||||
}
|
||||
notifiedApprovers[*step.ApproverID] = true
|
||||
|
||||
approver, _ := h.ipc.Database.User.GetUserByIDDB(ctx, *step.ApproverID)
|
||||
if approver == nil || approver.TelegramID == nil {
|
||||
continue
|
||||
}
|
||||
sendText(bot, *approver.TelegramID, fmt.Sprintf(
|
||||
notify(*approver.TelegramID, fmt.Sprintf(
|
||||
"↩️ <b>Заявка #%d отозвана %s %s</b>\n\n%s",
|
||||
approvalID, revokerRole, revokerName, approvalCard,
|
||||
))
|
||||
}
|
||||
|
||||
if *approval.Status == "revoked" {
|
||||
categoryCode := h.getTopicCodeByApproval(ctx, approval)
|
||||
observers, _ := h.ipc.Database.User.GetObserversForApprovalDB(ctx, categoryCode, approval.TopicID)
|
||||
for _, obs := range observers {
|
||||
if obs.TelegramID == nil {
|
||||
continue
|
||||
}
|
||||
if revoker.ID != nil && obs.ID != nil && *obs.ID == *revoker.ID {
|
||||
continue
|
||||
}
|
||||
sendText(bot, *obs.TelegramID, fmt.Sprintf(
|
||||
"↩️ <b>Заявка #%d отозвана %s %s</b>\n\n%s",
|
||||
approvalID, revokerRole, revokerName, approvalCard,
|
||||
))
|
||||
// Наблюдатели
|
||||
categoryCode := h.getTopicCodeByApproval(ctx, approval)
|
||||
observers, _ := h.ipc.Database.User.GetObserversForApprovalDB(ctx, categoryCode, approval.TopicID)
|
||||
for _, obs := range observers {
|
||||
if obs.TelegramID == nil {
|
||||
continue
|
||||
}
|
||||
if revoker.ID != nil && obs.ID != nil && *obs.ID == *revoker.ID {
|
||||
continue
|
||||
}
|
||||
notify(*obs.TelegramID, fmt.Sprintf(
|
||||
"↩️ <b>Заявка #%d отозвана %s %s</b>\n\n%s",
|
||||
approvalID, revokerRole, revokerName, approvalCard,
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -378,3 +378,17 @@ func BuildTaskTransferConfirmation(transferID uint64) tgbotapi.InlineKeyboardMar
|
|||
).
|
||||
Build()
|
||||
}
|
||||
|
||||
// BuildRevocationApprovalDecision — Да/Нет для согласующего, дающего согласие на отзыв
|
||||
func BuildRevocationApprovalDecision(approvalID uint64, requestID uint64, commentsCount int) tgbotapi.InlineKeyboardMarkup {
|
||||
return tgkit.NewInlineKeyboard().
|
||||
Row(
|
||||
tgkit.BtnStyled(tgkit.ButtonStyleSuccess, "✅ Да", fmt.Sprintf("revoke_appr_yes:%d", requestID)),
|
||||
tgkit.BtnStyled(tgkit.ButtonStyleDanger, "❌ Нет", fmt.Sprintf("revoke_appr_no:%d", requestID)),
|
||||
).
|
||||
Row(
|
||||
tgkit.Btn("💬 Добавить комментарий", fmt.Sprintf("appr_comment:%d", approvalID)),
|
||||
buildCommentsButton(approvalID, commentsCount),
|
||||
).
|
||||
Build()
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue