Add comments flow for approver, executor && observer

This commit is contained in:
romanskijdev 2026-04-25 20:53:08 +03:00
parent 51178e42d2
commit cd2fb22b43
18 changed files with 810 additions and 12 deletions

View File

@ -28,6 +28,7 @@ type ModuleDB struct {
ApprovalDelegation *dbcore.ApprovalDelegationDB
ApprovalAdditionalApprover *dbcore.ApprovalAdditionalApproverDB
ApprovalTasks *dbcore.ApprovalTaskDB
ApprovalComment *dbcore.ApprovalCommentDB
}
func NewModuleDB(
@ -72,6 +73,7 @@ func initDBModules(modules *ModuleDB, redisClient *redismodule.ModuleRedis) *Mod
modules.ApprovalDelegation = dbcore.NewApprovalDelegationDB(modules.Pool)
modules.ApprovalAdditionalApprover = dbcore.NewApprovalAdditionalApproverDB(modules.Pool)
modules.ApprovalTasks = dbcore.NewApprovalTaskDB(modules.Pool)
modules.ApprovalComment = dbcore.NewApprovalCommentDB(modules.Pool)
return modules
}

View File

@ -32,6 +32,7 @@ func (m *MigrationFunctions) migrateTables() error {
tablesmigration.ApprovalDelegationTableMigrate,
tablesmigration.ApprovalAdditionalApproverTableMigrate,
tablesmigration.ApprovalTasksTableMigrate,
tablesmigration.ApprovalCommentsTableMigrate,
}
for _, migrate := range migrations {

View File

@ -0,0 +1,32 @@
package tablesmigration
import (
"gorm.io/gorm"
"time"
)
func ApprovalCommentsTableMigrate(db *gorm.DB) error {
hasTable := db.Migrator().HasTable(&ApprovalCommentsProvider{})
if err := db.AutoMigrate(&ApprovalCommentsProvider{}); err != nil {
return err
}
if !hasTable {
time.Sleep(5 * time.Second)
db.Exec(`ALTER TABLE approval_comments ADD CONSTRAINT fk_approval_id FOREIGN KEY (approval_id) REFERENCES approvals(id) ON DELETE CASCADE ON UPDATE CASCADE`)
db.Exec(`ALTER TABLE approval_comments ADD CONSTRAINT fk_approval_comm_user_id FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE RESTRICT ON UPDATE CASCADE`)
execComments(db, `
COMMENT ON TABLE "approval_comments" IS 'Заявки на согласование, поданные сотрудниками';
COMMENT ON COLUMN "approval_comments".id IS 'Внутренний ID файла';
COMMENT ON COLUMN "approval_comments".approval_id IS 'ID заявки, к которой привязаны комментарии';
COMMENT ON COLUMN "approval_comments".user_id IS 'ID пользователя, оставившего комментарий';
COMMENT ON COLUMN "approval_comments".comment IS 'Комментарий к согласованию';
COMMENT ON COLUMN "approval_comments".created_at IS 'Дата создания комментария';
COMMENT ON COLUMN "approval_comments".updated_at IS 'Дата последнего изменения комментария';
`)
}
return nil
}

View File

@ -19,6 +19,7 @@ type LocalApprovalFileProvider typescore.ApprovalFile
type LocalApprovalStepProvider typescore.ApprovalStep
type ApprovalAdditionalApprover typescore.ApprovalAdditionalApprover
type ApprovalTaskProvider typescore.ApprovalTask
type ApprovalCommentsProvider typescore.ApprovalComment
func (LocalUserProvider) TableName() string {
return dbcoretablenames.TableNameUsers.ToString()
@ -62,3 +63,6 @@ func (ApprovalAdditionalApprover) TableName() string {
func (ApprovalTaskProvider) TableName() string {
return dbcoretablenames.TableNameApprovalTasks.ToString()
}
func (ApprovalCommentsProvider) TableName() string {
return dbcoretablenames.TableNameApprovalComments.ToString()
}

View File

@ -0,0 +1,217 @@
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"
"github.com/jackc/pgx/v5/pgxpool"
"github.com/sirupsen/logrus"
)
type ApprovalCommentDB struct {
pool *pgxpool.Pool
}
func NewApprovalCommentDB(pool *pgxpool.Pool) *ApprovalCommentDB {
return &ApprovalCommentDB{
pool: pool,
}
}
type ApprovalCommentDBI interface {
GetApprovalCommentsListDB(ctx context.Context, opts ...typescore.ListDbOptions) ([]*typescore.ApprovalComment, uint64, error)
CreateApprovalCommentDB(ctx context.Context, tx pgx.Tx, ApprovalCommentObj *typescore.ApprovalComment, returnObj ...bool) (*typescore.ApprovalComment, pgx.Tx, error)
UpdateApprovalCommentDB(ctx context.Context, tx pgx.Tx, paramsUpdate *typescore.ApprovalComment, returnObj ...bool) (*typescore.ApprovalComment, pgx.Tx, error)
DeleteApprovalCommentDB(ctx context.Context, params *typescore.ApprovalComment) error
GetCommentsByApprovalIDDB(ctx context.Context, id uint64) ([]*typescore.ApprovalComment, error)
GetApprovalCommentByIDDB(ctx context.Context, id uint64) (*typescore.ApprovalComment, error)
}
func (u *ApprovalCommentDB) GetApprovalCommentsListDB(ctx context.Context, opts ...typescore.ListDbOptions) ([]*typescore.ApprovalComment, uint64, error) {
fields := dbutils.GetStructFieldsDB(&typescore.ApprovalComment{}, dbcoretablenames.TableNameApprovalComments.ToString())
selectFields := append(fields, "COUNT(*) OVER() AS total_count")
options, filter, err := dbutils.GetOptionsDB[typescore.ApprovalComment](opts...)
if err != nil {
return nil, 0, err
}
query := dbutils.BuildSelectQuery(dbcoretablenames.TableNameApprovalComments.ToString(), selectFields)
query = dbutils.SetterLimitAndOffsetQuery(query, options.Offset, options.Limit)
query = dbutils.ApplyFilters(query, filter, options.LikeFields, dbcoretablenames.TableNameApprovalComments.ToString())
query = query.OrderBy("created_at DESC")
sql, args, err := query.ToSql()
if err != nil {
return nil, 0, err
}
rows, err := u.pool.Query(ctx, sql, args...)
if err != nil {
return nil, 0, err
}
defer rows.Close()
var ApprovalComments []*typescore.ApprovalComment
var totalCount uint64
for rows.Next() {
ApprovalComment := &typescore.ApprovalComment{}
if err := dbutils.ScanRowsToStructRows(rows, ApprovalComment, &totalCount); err != nil {
logrus.Warn("GetApprovalCommentsListDB:ScanRowsToStructRows", err)
continue
}
ApprovalComments = append(ApprovalComments, ApprovalComment)
}
return ApprovalComments, totalCount, nil
}
func (u *ApprovalCommentDB) CreateApprovalCommentDB(ctx context.Context, tx pgx.Tx, ApprovalCommentObj *typescore.ApprovalComment, returnObj ...bool) (*typescore.ApprovalComment, pgx.Tx, error) {
if ApprovalCommentObj == nil {
return nil, nil, errors.New("ApprovalComment obj is nil")
}
var insertedID uint64
err := dbutils.ExecuteTx(ctx, u.pool, tx, func(tx pgx.Tx) error {
query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).
Insert(dbcoretablenames.TableNameApprovalComments.ToString())
sqlV, args, err := dbutils.GenerateInsertRequest(query, ApprovalCommentObj)
if err != nil {
return err
}
*sqlV = *sqlV + " RETURNING id"
return tx.QueryRow(ctx, *sqlV, args...).Scan(&insertedID)
})
if err != nil {
return nil, tx, err
}
returnObjBool := len(returnObj) > 0 && returnObj[0]
if returnObjBool && insertedID > 0 {
created, err := u.GetApprovalCommentByIDDB(ctx, insertedID)
return created, tx, err
}
return nil, tx, nil
}
func (u *ApprovalCommentDB) UpdateApprovalCommentDB(ctx context.Context, tx pgx.Tx, paramsUpdate *typescore.ApprovalComment, returnObj ...bool) (*typescore.ApprovalComment, pgx.Tx, error) {
if paramsUpdate.ID == nil {
return nil, nil, errors.New("ApprovalComment obj is nil")
}
err := dbutils.ExecuteTx(ctx, u.pool, tx, func(tx pgx.Tx) error {
query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).Update(dbcoretablenames.TableNameApprovalComments.ToString())
query = dbutils.AddNonNullFieldsToQueryUpdate(query, *paramsUpdate)
query = query.Where(squirrel.Eq{"id": paramsUpdate.ID})
sql, args, err := query.ToSql()
if err != nil {
return err
}
_, err = tx.Exec(ctx, sql, args...)
if err != nil {
return err
}
return nil
})
if err != nil {
return nil, tx, err
}
returnObjBool := false
if len(returnObj) > 0 {
returnObjBool = returnObj[0]
}
if returnObjBool {
options := typescore.ListDbOptions{Filtering: &typescore.ApprovalComment{ID: paramsUpdate.ID}}
getInfoUp, _, err := u.GetApprovalCommentsListDB(ctx, options)
if err != nil {
return nil, nil, err
}
if len(getInfoUp) > 0 {
return getInfoUp[0], tx, nil
}
}
return nil, tx, nil
}
func (u *ApprovalCommentDB) DeleteApprovalCommentDB(ctx context.Context, params *typescore.ApprovalComment) error {
if params != nil && params.ID != nil {
query, args, err := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).
Delete(dbcoretablenames.TableNameApprovalComments.ToString()).
Where(squirrel.Eq{"id": *params.ID}).
ToSql()
if err != nil {
return err
}
rows, err := u.pool.Query(ctx, query, args...)
if err != nil {
return err
}
defer rows.Close()
return nil
} else {
return errors.New("ApprovalComment obj is nil")
}
}
func (u *ApprovalCommentDB) GetCommentsByApprovalIDDB(ctx context.Context, id uint64) ([]*typescore.ApprovalComment, error) {
ApprovalComments, _, err := u.GetApprovalCommentsListDB(ctx, typescore.ListDbOptions{
Filtering: &typescore.ApprovalComment{ApprovalID: &id},
})
if err != nil {
return nil, err
}
return ApprovalComments, nil
}
func (u *ApprovalCommentDB) GetApprovalCommentByIDDB(ctx context.Context, id uint64) (*typescore.ApprovalComment, error) {
approvals, _, err := u.GetApprovalCommentsListDB(ctx, typescore.ListDbOptions{
Filtering: &typescore.Approval{ID: &id},
})
if err != nil {
return nil, err
}
if len(approvals) == 0 {
return nil, nil
}
return approvals[0], nil
}
// queryApprovalComments — общий сканер строк
func (u *ApprovalCommentDB) queryApprovalComments(ctx context.Context, sql string, args []interface{}) ([]*typescore.ApprovalComment, error) {
rows, err := u.pool.Query(ctx, sql, args...)
if err != nil {
return nil, err
}
defer rows.Close()
var result []*typescore.ApprovalComment
for rows.Next() {
a := &typescore.ApprovalComment{}
if err := dbutils.ScanRowsToStructRows(rows, a, nil); err != nil {
logrus.Warn("queryApprovalComments:ScanRowsToStruct", err)
continue
}
result = append(result, a)
}
return result, nil
}

View File

@ -30,6 +30,7 @@ type ApprovalTaskDBI interface {
UpdateApprovalTaskDB(ctx context.Context, tx pgx.Tx, paramsUpdate *typescore.ApprovalTask, returnObj ...bool) (*typescore.ApprovalTask, pgx.Tx, error)
DeleteApprovalTaskDB(ctx context.Context, params *typescore.ApprovalTask) error
GetApprovalTaskByIDDB(ctx context.Context, id uint64) (*typescore.ApprovalTask, error)
GetApprovalTaskByApprovalIDDB(ctx context.Context, id uint64) (*typescore.ApprovalTask, error)
}
func (u *ApprovalTaskDB) GetApprovalTasksListDB(ctx context.Context, opts ...typescore.ListDbOptions) ([]*typescore.ApprovalTask, uint64, error) {
@ -187,6 +188,19 @@ func (u *ApprovalTaskDB) GetApprovalTaskByIDDB(ctx context.Context, id uint64) (
return ApprovalTasks[0], nil
}
func (u *ApprovalTaskDB) GetApprovalTaskByApprovalIDDB(ctx context.Context, id uint64) (*typescore.ApprovalTask, error) {
ApprovalTasks, _, err := u.GetApprovalTasksListDB(ctx, typescore.ListDbOptions{
Filtering: &typescore.ApprovalTask{ApprovalID: &id},
})
if err != nil {
return nil, err
}
if len(ApprovalTasks) == 0 {
return nil, nil
}
return ApprovalTasks[0], nil
}
func (u *ApprovalTaskDB) GetTasksForReportDB(ctx context.Context, filter typescore.TaskReportFilter) ([]*typescore.ApprovalTask, error) {
q := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).
Select("DISTINCT t.*").

View File

@ -17,6 +17,7 @@ const (
TableNameApprovalDelegations TableName = "approval_delegations"
TableNameApprovalAdditionalApprovers TableName = "approval_additional_approvers"
TableNameApprovalTasks TableName = "approval_tasks"
TableNameApprovalComments TableName = "approval_comments"
)
func (t TableName) ToString() string {

View File

@ -0,0 +1,15 @@
package typescore
import "time"
type ApprovalComment struct {
ID *uint64 `gorm:"column:id;index;type:bigint;autoIncrement;not null;unique" json:"id" db:"id"`
ApprovalID *uint64 `gorm:"type:bigint;not null;index;column:approval_id" json:"approval_id" db:"approval_id"`
UserID *uint64 `gorm:"type:bigint;not null;index;column:user_id" json:"user_id" db:"user_id"`
Comment *string `gorm:"type:text;not null;column:comment" json:"comment" db:"comment"`
CreatedAt *time.Time `gorm:"type:timestamp;default:CURRENT_TIMESTAMP;column:created_at" json:"created_at" db:"created_at"`
UpdatedAt *time.Time `gorm:"type:timestamp;default:CURRENT_TIMESTAMP;column:updated_at" json:"updated_at" db:"updated_at"`
Approval *Approval `gorm:"-" json:"approval,omitempty"`
User *User `gorm:"-" json:"user,omitempty"`
}

View File

@ -317,6 +317,11 @@ func (s *UpdateHandler) handleCallback(bot *tgbotapi.BotAPI, cq *tgbotapi.Callba
case data == "report_generate":
s.approvalHandler.HandleReportGenerate(bot, cq)
// КОММЕНТАРИИ К СОГЛАСОВАНИЯМ
case strings.HasPrefix(data, "appr_comment:"):
approvalID := parseID(data, "appr_comment:")
s.approvalHandler.HandleAddCommentCallback(bot, cq, approvalID)
// ВЫБОР СОГЛАСУЮЩЕГО
case strings.HasPrefix(data, "select_approver:"):
approverID := parseID(data, "select_approver:")

View File

@ -183,6 +183,9 @@ func (s *UpdateHandler) handleMessage(bot *tgbotapi.BotAPI, msg *tgbotapi.Messag
if s.startHandler.HandleTextInput(bot, msg) {
return
}
if s.approvalHandler.HandleCommentTextInput(bot, msg) {
return
}
// Проверка pending состояния для отказа
rejectKey := fmt.Sprintf("appr_reject_pending:%d", msg.From.ID)

View File

@ -0,0 +1,312 @@
package approval
import (
"bitrix_balancer_api/core/typescore"
"bitrix_balancer_api/telegram_service/state"
"context"
"fmt"
tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
"github.com/sirupsen/logrus"
)
func (h *Handler) HandleAddCommentCallback(bot *tgbotapi.BotAPI, cq *tgbotapi.CallbackQuery, approvalID uint64) {
ctx := context.Background()
chatID := cq.Message.Chat.ID
telegramID := cq.From.ID
bot.Request(tgbotapi.NewCallback(cq.ID, "")) //nolint:errcheck
user, err := h.ipc.Database.User.GetUserByTelegramIDDB(ctx, telegramID)
if err != nil {
logrus.Errorf("HandleAddCommentCallback: GetUserByTelegramIDDB err=%v", err)
sendText(bot, chatID, "⚠️ Ошибка при получении данных пользователя.")
return
}
if user == nil || user.ID == nil {
logrus.Warn("HandleAddCommentCallback: user or user.ID is nil")
sendText(bot, chatID, "⚠️ Пользователь не найден.")
return
}
approval, err := h.ipc.Database.Approval.GetApprovalByIDDB(ctx, approvalID)
if err != nil {
logrus.Errorf("HandleAddCommentCallback: GetApprovalByIDDB err=%v", err)
sendText(bot, chatID, "⚠️ Ошибка при получении заявки.")
return
}
if approval == nil {
logrus.Warnf("HandleAddCommentCallback: approval not found approvalID=%d", approvalID)
sendText(bot, chatID, "⚠️ Заявка не найдена.")
return
}
// Проверяем, может ли пользователь комментировать эту заявку
canComment, err := h.canUserCommentApproval(ctx, *user.ID, approval)
if err != nil {
logrus.Errorf("HandleAddCommentCallback: canUserCommentApproval err=%v", err)
sendText(bot, chatID, "Ошибка при проверке прав.")
return
}
if !canComment {
sendText(bot, chatID, "⚠️ Вы не можете комментировать эту заявку в текущем статусе.")
return
}
// Сохраняем состояние ожидания комментария
commentState := &state.CommentFlowState{
ApprovalID: approvalID,
Stage: "await_text",
}
if err := h.States.SetCommentFlow(ctx, telegramID, commentState); err != nil {
logrus.Errorf("HandleAddCommentCallback: SetCommentFlow err=%v", err)
sendText(bot, chatID, "Ошибка при сохранении состояния.")
return
}
sendText(bot, chatID, "💬 <b>Введите текст комментария:</b>")
}
func (h *Handler) HandleCommentTextInput(bot *tgbotapi.BotAPI, msg *tgbotapi.Message) bool {
ctx := context.Background()
telegramID := msg.From.ID
chatID := msg.Chat.ID
commentState, err := h.States.GetCommentFlow(ctx, telegramID)
if err != nil || commentState == nil || commentState.Stage != "await_text" {
return false
}
user, err := h.ipc.Database.User.GetUserByTelegramIDDB(ctx, telegramID)
if err != nil || user == nil || user.ID == nil {
return false
}
approval, err := h.ipc.Database.Approval.GetApprovalByIDDB(ctx, commentState.ApprovalID)
if err != nil || approval == nil {
sendText(bot, chatID, "⚠️ Заявка не найдена.")
h.States.ClearCommentFlow(ctx, telegramID) //nolint:errcheck
return true
}
// Создаем комментарий
comment := &typescore.ApprovalComment{
ApprovalID: &commentState.ApprovalID,
UserID: user.ID,
Comment: &msg.Text,
}
createdComment, _, err := h.ipc.Database.ApprovalComment.CreateApprovalCommentDB(ctx, nil, comment)
if err != nil {
logrus.Errorf("HandleCommentTextInput: CreateApprovalCommentDB err=%v", err)
sendText(bot, chatID, "Ошибка при сохранении комментария.")
h.States.ClearCommentFlow(ctx, telegramID) //nolint:errcheck
return true
}
// Проверяем, что комментарий создан
if createdComment == nil {
logrus.Errorf("HandleCommentTextInput: createdComment is nil")
sendText(bot, chatID, "Ошибка при сохранении комментария.")
h.States.ClearCommentFlow(ctx, telegramID) //nolint:errcheck
return true
}
h.States.ClearCommentFlow(ctx, telegramID) //nolint:errcheck
userName := "—"
if user.FullName != nil {
userName = *user.FullName
}
sendText(bot, chatID, fmt.Sprintf(
"✅ <b>Комментарий добавлен</b>\n\n"+
"📋 Заявка: #%d\n"+
"👤 Автор: %s\n"+
"💬 Текст: %s",
commentState.ApprovalID, userName, msg.Text,
))
// Уведомляем инициатора
if approval.InitiatorID != nil {
initiator, err := h.ipc.Database.User.GetUserByIDDB(ctx, *approval.InitiatorID)
if err != nil {
logrus.Errorf("HandleCommentTextInput: GetUserByIDDB initiator err=%v", err)
} else if initiator != nil && initiator.TelegramID != nil {
h.notifyInitiatorAboutComment(bot, ctx, initiator, approval, user, createdComment)
}
}
return true
}
func (h *Handler) canUserCommentApproval(ctx context.Context, userID uint64, approval *typescore.Approval) (bool, error) {
if approval == nil || approval.ID == nil {
return false, fmt.Errorf("approval or approval ID is nil")
}
// Проверяем, является ли пользователь текущим согласующим
activeStep, err := h.ipc.Database.ApprovalStep.GetActiveStepDB(ctx, *approval.ID)
if err == nil && activeStep != nil && activeStep.ApproverID != nil && *activeStep.ApproverID == userID {
return true, nil
}
// Проверяем, является ли пользователь дополнительным согласующим с pending статусом
additionalApprovers, _, err := h.ipc.Database.ApprovalAdditionalApprover.GetApprovalAdditionalApproversListDB(ctx, typescore.ListDbOptions{
Filtering: &typescore.ApprovalAdditionalApprover{
ApprovalID: approval.ID,
},
})
if err == nil && additionalApprovers != nil {
for _, aa := range additionalApprovers {
if aa.ApproverID != nil && *aa.ApproverID == userID {
if aa.Status != nil && *aa.Status == "pending" {
return true, nil
}
}
}
}
// Проверяем, является ли пользователь наблюдателем этой категории
if approval.TopicID != nil {
topic, err := h.ipc.Database.ApprovalTopic.GetApprovalTopicByIDDB(ctx, *approval.TopicID)
if err == nil && topic != nil && topic.Code != nil {
isObserver, _ := h.ipc.Database.User.IsObserverDB(ctx, userID)
if isObserver {
// Проверяем права наблюдателя на эту категорию
observers, _ := h.ipc.Database.User.GetObserversForCategoryDB(ctx, *topic.Code)
if observers != nil {
for _, obs := range observers {
if obs.ID != nil && *obs.ID == userID {
return true, nil
}
}
}
}
}
}
// Проверяем, является ли пользователь исполнителем задачи по этой заявке
task, err := h.ipc.Database.ApprovalTasks.GetApprovalTaskByApprovalIDDB(ctx, *approval.ID)
if err == nil && task != nil && task.ExecutorID != nil && *task.ExecutorID == userID {
if task.Status != nil && *task.Status == "pending" {
return true, nil
}
}
return false, nil
}
func (h *Handler) notifyInitiatorAboutComment(
bot *tgbotapi.BotAPI,
ctx context.Context,
initiator *typescore.User,
approval *typescore.Approval,
commenter *typescore.User,
comment *typescore.ApprovalComment,
) {
if initiator == nil || initiator.TelegramID == nil {
logrus.Warn("notifyInitiatorAboutComment: initiator or TelegramID is nil")
return
}
if approval == nil || approval.ID == nil {
logrus.Warn("notifyInitiatorAboutComment: approval or ID is nil")
return
}
if commenter == nil {
logrus.Warn("notifyInitiatorAboutComment: commenter is nil")
return
}
if comment == nil || comment.Comment == nil {
logrus.Warn("notifyInitiatorAboutComment: comment or Comment text is nil")
return
}
commenterName := "—"
if commenter.FullName != nil {
commenterName = *commenter.FullName
}
topicName := "—"
if approval.TopicID != nil {
topic, _ := h.ipc.Database.ApprovalTopic.GetApprovalTopicByIDDB(ctx, *approval.TopicID)
if topic != nil && topic.Name != nil {
topicName = *topic.Name
}
}
content := "—"
if approval.Content != nil {
content = *approval.Content
}
msg := tgbotapi.NewMessage(*initiator.TelegramID, fmt.Sprintf(
"💬 <b>Новый комментарий к вашей заявке</b>\n\n"+
"📋 <b>Заявка #%d</b> — %s\n"+
"📝 <b>Текст заявки:</b> %s\n\n"+
"👤 <b>Автор комментария:</b> %s\n"+
"💬 <b>Комментарий:</b>\n%s",
*approval.ID, topicName, content, commenterName, *comment.Comment,
))
msg.ParseMode = "HTML"
if _, err := bot.Send(msg); err != nil {
logrus.Errorf("notifyInitiatorAboutComment: Send err=%v", err)
}
}
func (h *Handler) formatCommentsSection(ctx context.Context, approvalID uint64) string {
comments, err := h.ipc.Database.ApprovalComment.GetCommentsByApprovalIDDB(ctx, approvalID)
if err != nil {
logrus.Errorf("formatCommentsSection: GetCommentsByApprovalIDDB err=%v", err)
return ""
}
if len(comments) == 0 {
return ""
}
result := "\n\n💬 <b>Комментарии:</b>"
for _, comment := range comments {
if comment == nil {
continue
}
if comment.UserID == nil || comment.Comment == nil {
logrus.Warnf("formatCommentsSection: comment UserID or Comment is nil, commentID=%v", comment.ID)
continue
}
user, err := h.ipc.Database.User.GetUserByIDDB(ctx, *comment.UserID)
if err != nil {
logrus.Errorf("formatCommentsSection: GetUserByIDDB err=%v", err)
continue
}
if user == nil {
logrus.Warnf("formatCommentsSection: user is nil for userID=%d", *comment.UserID)
continue
}
userName := "—"
if user.FullName != nil {
userName = *user.FullName
}
timestamp := ""
if comment.CreatedAt != nil {
timestamp = comment.CreatedAt.Format("02.01.2006 15:04")
}
result += fmt.Sprintf("\n\n<b>%s</b> (%s):\n%s", userName, timestamp, *comment.Comment)
}
return result
}

View File

@ -104,9 +104,13 @@ func (h *Handler) sendTaskCard(bot *tgbotapi.BotAPI, chatID int64, approval *typ
*approval.ID, initiatorName, topicName, content, createdAt, taskText,
)
// Добавляем комментарии
commentsSection := h.formatCommentsSection(ctx, *approval.ID)
text += commentsSection
msg := tgbotapi.NewMessage(chatID, text)
msg.ParseMode = "HTML"
msg.ReplyMarkup = keyboard.BuildExecutorTaskActions(*task.ID)
msg.ReplyMarkup = keyboard.BuildExecutorTaskActions(*task.ID, *approval.ID)
bot.Send(msg) //nolint:errcheck
}

View File

@ -403,3 +403,105 @@ func (h *Handler) showFileStatus(bot *tgbotapi.BotAPI, chatID int64, telegramID
flowState.FileStatusMsgID = sent.MessageID
h.States.Set(ctx, telegramID, flowState) //nolint:errcheck
}
func (h *Handler) buildApprovalCard(ctx context.Context, approval *typescore.Approval, collected map[string]string) string {
if approval.ID == nil {
return ""
}
approvalID := *approval.ID
initiatorName := "—"
if approval.InitiatorID != nil {
initiator, _ := h.ipc.Database.User.GetUserByIDDB(ctx, *approval.InitiatorID)
if initiator != nil && initiator.FullName != nil {
initiatorName = *initiator.FullName
}
}
topicName := "—"
if approval.TopicID != nil {
topic, _ := h.ipc.Database.ApprovalTopic.GetApprovalTopicByIDDB(ctx, *approval.TopicID)
if topic != nil && topic.Name != nil {
topicName = *topic.Name
}
}
content := "—"
if approval.Content != nil {
content = *approval.Content
}
status := "⏳ ожидает"
if approval.Status != nil {
switch *approval.Status {
case "approved":
status = "✅ согласована"
case "rejected":
status = "❌ отклонена"
case "revoked":
status = "🔙 отозвана"
}
}
createdAt := "—"
if approval.CreatedAt != nil {
createdAt = approval.CreatedAt.Format("02.01.2006 15:04")
}
card := fmt.Sprintf(
"📋 <b>Заявка #%d</b>\n\n"+
"👤 <b>Инициатор:</b> %s\n"+
"📂 <b>Тема:</b> %s\n"+
"📝 <b>Текст:</b> %s\n"+
"📅 <b>Создана:</b> %s\n"+
"📊 <b>Статус:</b> %s",
approvalID, initiatorName, topicName, content, createdAt, status,
)
// Добавляем информацию о текущем согласующем если заявка в процессе
if approval.Status != nil && *approval.Status == "pending" {
activeStep, _ := h.ipc.Database.ApprovalStep.GetActiveStepDB(ctx, approvalID)
if activeStep != nil && activeStep.ApproverID != nil {
approver, _ := h.ipc.Database.User.GetUserByIDDB(ctx, *activeStep.ApproverID)
if approver != nil && approver.FullName != nil {
card += fmt.Sprintf("\n🔄 <b>У согласующего:</b> %s", *approver.FullName)
}
}
}
// Добавляем информацию о дополнительных согласующих
additionalApprovers, _, _ := h.ipc.Database.ApprovalAdditionalApprover.GetApprovalAdditionalApproversListDB(ctx, typescore.ListDbOptions{
Filtering: &typescore.ApprovalAdditionalApprover{
ApprovalID: &approvalID,
},
})
if len(additionalApprovers) > 0 {
card += "\n\n👥 <b>Дополнительные согласующие:</b>"
for _, aa := range additionalApprovers {
if aa.ApproverID == nil {
continue
}
approver, _ := h.ipc.Database.User.GetUserByIDDB(ctx, *aa.ApproverID)
if approver == nil || approver.FullName == nil {
continue
}
statusIcon := "⏳"
if aa.Status != nil {
switch *aa.Status {
case "approved":
statusIcon = "✅"
case "rejected":
statusIcon = "❌"
}
}
card += fmt.Sprintf("\n• %s %s", statusIcon, *approver.FullName)
}
}
// Добавляем комментарии
commentsSection := h.formatCommentsSection(ctx, approvalID)
card += commentsSection
return card
}

View File

@ -31,7 +31,7 @@ func (h *Handler) notifyExecutor(
collected map[string]string,
task *typescore.ApprovalTask,
) {
if executor.TelegramID == nil || task.ID == nil {
if executor.TelegramID == nil || task.ID == nil || approval.ID == nil {
return
}
@ -67,9 +67,13 @@ func (h *Handler) notifyExecutor(
*approval.ID, initiatorName, topicName, content, taskText,
)
// Добавляем комментарии
commentsSection := h.formatCommentsSection(ctx, *approval.ID)
text += commentsSection
msg := tgbotapi.NewMessage(*executor.TelegramID, text)
msg.ParseMode = "HTML"
msg.ReplyMarkup = keyboard.BuildExecutorTaskActions(*task.ID)
msg.ReplyMarkup = keyboard.BuildExecutorTaskActions(*task.ID, *approval.ID)
bot.Send(msg) //nolint:errcheck
}
@ -81,15 +85,42 @@ func (n *Notifier) NotifyApprover(
approval *typescore.Approval,
collected map[string]string,
) {
if approver.TelegramID == nil {
if approver.TelegramID == nil || approval.ID == nil {
return
}
text := fmt.Sprintf("📬 <b>Новая заявка #%d на согласование</b>\n\n", *approval.ID) +
ctx := context.Background()
// Формируем основное сообщение
msgText := fmt.Sprintf("📬 <b>Новая заявка #%d на согласование</b>\n\n", *approval.ID) +
n.topic.FormatApproverMessage(initiator, collected)
// Добавляем комментарии если есть
comments, _ := n.ipc.Database.ApprovalComment.GetCommentsByApprovalIDDB(ctx, *approval.ID)
if len(comments) > 0 {
msgText += "\n\n💬 <b>Комментарии:</b>"
for _, comment := range comments {
if comment.UserID == nil || comment.Comment == nil {
continue
}
user, _ := n.ipc.Database.User.GetUserByIDDB(ctx, *comment.UserID)
if user == nil || user.FullName == nil {
continue
}
timestamp := ""
if comment.CreatedAt != nil {
timestamp = comment.CreatedAt.Format("02.01.2006 15:04")
}
msgText += fmt.Sprintf("\n\n<b>%s</b> (%s):\n%s", *user.FullName, timestamp, *comment.Comment)
}
}
// Отправляем с файлами или без
if len(approval.Files) == 0 {
n.sendTextToApprover(bot, approver, approval, text)
n.sendTextToApprover(bot, approver, approval, msgText)
return
}
@ -97,7 +128,7 @@ func (n *Notifier) NotifyApprover(
bot,
*approver.TelegramID,
approval,
text,
msgText,
keyboard.BuildApproverDecision(*approval.ID),
)
}
@ -417,6 +448,10 @@ func (h *Handler) sendAdditionalApprovalCard(bot *tgbotapi.BotAPI, chatID int64,
*approval.ID, addedByName, initiatorName, topicName, content,
)
// Добавляем комментарии
commentsSection := h.formatCommentsSection(ctx, *approval.ID)
text += commentsSection
msg := tgbotapi.NewMessage(chatID, text)
msg.ParseMode = "HTML"
msg.ReplyMarkup = keyboard.BuildApproverDecision(*approval.ID)

View File

@ -104,6 +104,9 @@ func BuildApproverDecision(approvalID uint64) tgbotapi.InlineKeyboardMarkup {
tgbotapi.NewInlineKeyboardButtonData("✅ Да", fmt.Sprintf("appr_yes:%d", approvalID)),
tgbotapi.NewInlineKeyboardButtonData("❌ Нет", fmt.Sprintf("appr_no:%d", approvalID)),
),
tgbotapi.NewInlineKeyboardRow(
tgbotapi.NewInlineKeyboardButtonData("💬 Добавить комментарий", fmt.Sprintf("appr_comment:%d", approvalID)),
),
tgbotapi.NewInlineKeyboardRow(
tgbotapi.NewInlineKeyboardButtonData("Стадия согласования", fmt.Sprintf("appr_stage:%d", approvalID)),
),

View File

@ -5,10 +5,13 @@ import (
tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
)
func BuildExecutorTaskActions(taskID uint64) tgbotapi.InlineKeyboardMarkup {
func BuildExecutorTaskActions(taskID, approvalID uint64) tgbotapi.InlineKeyboardMarkup {
return tgbotapi.NewInlineKeyboardMarkup(
tgbotapi.NewInlineKeyboardRow(
tgbotapi.NewInlineKeyboardButtonData("✅ Выполнено", fmt.Sprintf("task_complete:%d", taskID)),
),
tgbotapi.NewInlineKeyboardRow(
tgbotapi.NewInlineKeyboardButtonData("💬 Добавить комментарий", fmt.Sprintf("appr_comment:%d", approvalID)),
),
)
}

View File

@ -57,10 +57,8 @@ func BuildObserverApprovalList(
func BuildObserverApprovalDetail(approvalID uint64, topicCode string) tgbotapi.InlineKeyboardMarkup {
return tgbotapi.NewInlineKeyboardMarkup(
tgbotapi.NewInlineKeyboardRow(
tgbotapi.NewInlineKeyboardButtonData(
"🔔 Напомнить согласующему",
fmt.Sprintf("obs_remind:%d", approvalID),
),
tgbotapi.NewInlineKeyboardButtonData("🔔 Напомнить согласующему", fmt.Sprintf("obs_remind:%d", approvalID)),
tgbotapi.NewInlineKeyboardButtonData("💬 Добавить комментарий", fmt.Sprintf("appr_comment:%d", approvalID)),
),
tgbotapi.NewInlineKeyboardRow(
tgbotapi.NewInlineKeyboardButtonData(

View File

@ -0,0 +1,47 @@
package state
import (
"context"
"encoding/json"
"errors"
"fmt"
"time"
"github.com/redis/go-redis/v9"
)
type CommentFlowState struct {
ApprovalID uint64 `json:"approval_id"`
Stage string `json:"stage"` // "await_text"
}
func (s *StateManager) SetCommentFlow(ctx context.Context, telegramID int64, state *CommentFlowState) error {
key := fmt.Sprintf("comment_flow:%d", telegramID)
data, err := json.Marshal(state)
if err != nil {
return err
}
return s.redis.Set(ctx, key, data, 30*time.Minute)
}
func (s *StateManager) GetCommentFlow(ctx context.Context, telegramID int64) (*CommentFlowState, error) {
key := fmt.Sprintf("comment_flow:%d", telegramID)
data, err := s.redis.Get(ctx, key)
if errors.Is(err, redis.Nil) {
return nil, nil
}
if err != nil {
return nil, err
}
var state CommentFlowState
if err := json.Unmarshal([]byte(data), &state); err != nil {
return nil, err
}
return &state, nil
}
func (s *StateManager) ClearCommentFlow(ctx context.Context, telegramID int64) error {
key := fmt.Sprintf("comment_flow:%d", telegramID)
return s.redis.Del(ctx, key)
}