diff --git a/service/telegram_service/handlers/approval/registry.go b/service/telegram_service/handlers/approval/registry.go index 5f8e0d8..f62a1c5 100644 --- a/service/telegram_service/handlers/approval/registry.go +++ b/service/telegram_service/handlers/approval/registry.go @@ -2,9 +2,14 @@ package approval import ( "bitrix_balancer_api/telegram_service/approvalflow" + "bitrix_balancer_api/telegram_service/handlers/approval/topics/delivery" + "bitrix_balancer_api/telegram_service/handlers/approval/topics/expenses" "bitrix_balancer_api/telegram_service/handlers/approval/topics/free" + "bitrix_balancer_api/telegram_service/handlers/approval/topics/orders" + shipments "bitrix_balancer_api/telegram_service/handlers/approval/topics/shipmens" sickleave "bitrix_balancer_api/telegram_service/handlers/approval/topics/sick_leave" timeoff "bitrix_balancer_api/telegram_service/handlers/approval/topics/time_off" + transactionpassport "bitrix_balancer_api/telegram_service/handlers/approval/topics/transaction_passport" "bitrix_balancer_api/telegram_service/handlers/approval/topics/vacation" "fmt" ) @@ -26,32 +31,21 @@ func (r *Registry) registerAll() { r.register(vacation.NewVacationTopic()) r.register(sickleave.NewSickLeaveTopic()) - // Свободные темы — порядок соответствует миграции + // Темы с подтемами + r.register(transactionpassport.NewTransactionPassportTopic()) + r.register(orders.NewOrdersTopic()) + r.register(expenses.NewExpensesTopic()) + r.register(shipments.NewShipmentsTopic()) + r.register(delivery.NewDeliveryTopic()) + + // Свободные темы (без подтем) freeTopics := []struct{ code, name string }{ - {"alphapet_delivery", "Альфапэт доставка"}, - {"v_shipments", "В. Отгрузки"}, - {"non_budget_expenses", "Внебюджетные расходы"}, - {"non_budget_expenses_pet_line", "Внебюджетные расходы ПЭТ Лайн"}, {"returns", "Возвраты"}, {"new_clients", "Заведение новых клиентов"}, - {"orders_krasnodar", "Заказы. Краснодар"}, - {"orders_crimea", "Заказы. Крым"}, - {"manager_expenses", "Менеджерские расходы"}, - {"shipments_soh", "Отгрузки на СОХ"}, - {"shipments", "Отгрузки"}, {"nonstandard_contract", "Нестандартные условия договора поставки"}, - {"expenses_alphapet", "Расходы АЛЬФАПЭТ"}, - {"expenses_warehouse_gvardeysk", "Расходы склад Гвардейское"}, - {"ruspet_delivery", "РУСПЭТ ДОСТАВКА + НАПРЯМУЮ К КЛИЕНТУ"}, {"vacancies", "Вакансии"}, - {"vacation_approval_sales", "Согласование отпусков Отдел продаж"}, - {"approval_general", "Согласование отпусков/отгулов/больничных"}, - {"ps_belarus", "ПС Беларусь"}, - {"ps_krasnodar", "ПС Краснодар"}, - {"ps_crimea", "ПС Крым"}, - {"delivery_rates_ap", "Ставки доставки АП"}, {"payments_cashless", "Утверждение оплат безнал"}, - {"rates_logistics", "Утверждение ставок Логистика"}, + {"rates_logistics", "Утверждение ставок"}, {"freelancers_approval", "Утверждение фрилансеров"}, } for _, t := range freeTopics { diff --git a/service/telegram_service/handlers/approval/topics/delivery/topic.go b/service/telegram_service/handlers/approval/topics/delivery/topic.go new file mode 100644 index 0000000..0899ed1 --- /dev/null +++ b/service/telegram_service/handlers/approval/topics/delivery/topic.go @@ -0,0 +1,116 @@ +package delivery + +import ( + "bitrix_balancer_api/core/typescore" + "bitrix_balancer_api/telegram_service/approvalflow" + "fmt" +) + +type DeliveryTopic struct{} + +func NewDeliveryTopic() *DeliveryTopic { + return &DeliveryTopic{} +} + +func (d *DeliveryTopic) Code() string { + return "delivery" +} + +func (d *DeliveryTopic) Name() string { + return "Доставка" +} + +// BuildTree: тип доставки → ввод текста +func (d *DeliveryTopic) BuildTree() *approvalflow.FlowNode { + return &approvalflow.FlowNode{ + Key: "delivery", + Label: "Доставка", + Children: []*approvalflow.FlowNode{ + { + Key: "ruspet_delivery", + Label: "РусПЭТ", + DataKey: "delivery_type", + DataValue: "ruspet", + Children: []*approvalflow.FlowNode{ + { + Key: "ruspet_delivery_input", + IsInput: true, + InputKey: "content", + InputHint: "Опишите детали доставки", + }, + }, + }, + { + Key: "alphapet_delivery", + Label: "АльфаПЭТ", + DataKey: "delivery_type", + DataValue: "alphapet", + Children: []*approvalflow.FlowNode{ + { + Key: "alphapet_delivery_input", + IsInput: true, + InputKey: "content", + InputHint: "Опишите детали доставки Альфапэт", + }, + }, + }, + { + Key: "delivery_rates_ap", + Label: "Ставки доставки АП", + DataKey: "delivery_type", + DataValue: "rates_ap", + Children: []*approvalflow.FlowNode{ + { + Key: "delivery_rates_ap_input", + IsInput: true, + InputKey: "content", + InputHint: "Опишите ставки доставки", + }, + }, + }, + }, + } +} + +func (d *DeliveryTopic) TopicCodeFromCollected(collected map[string]string) (string, error) { + deliveryType := collected["delivery_type"] + if deliveryType == "" { + return "", fmt.Errorf("тип доставки не указан") + } + + switch deliveryType { + case "ruspet": + return "ruspet_delivery", nil + case "alphapet": + return "alphapet_delivery", nil + case "rates_ap": + return "delivery_rates_ap", nil + default: + return "", fmt.Errorf("неизвестный тип доставки: %s", deliveryType) + } +} + +func (d *DeliveryTopic) FormatApproverMessage(initiator *typescore.User, collected map[string]string) string { + name := "" + if initiator.FullName != nil { + name = *initiator.FullName + } + + var typeLabel string + switch collected["delivery_type"] { + case "ruspet": + typeLabel = "РусПЭТ" + case "alphapet": + typeLabel = "АльфаПЭТ" + case "rates_ap": + typeLabel = "Ставки доставки АП" + default: + typeLabel = "Доставка" + } + + return fmt.Sprintf( + "📋 %s\n\n"+ + "%s:\n%s", + typeLabel, name, collected["content"], + ) +} diff --git a/service/telegram_service/handlers/approval/topics/expenses/topic.go b/service/telegram_service/handlers/approval/topics/expenses/topic.go new file mode 100644 index 0000000..9f5eb94 --- /dev/null +++ b/service/telegram_service/handlers/approval/topics/expenses/topic.go @@ -0,0 +1,152 @@ +package expenses + +import ( + "bitrix_balancer_api/core/typescore" + "bitrix_balancer_api/telegram_service/approvalflow" + "fmt" +) + +type ExpensesTopic struct{} + +func NewExpensesTopic() *ExpensesTopic { + return &ExpensesTopic{} +} + +func (e *ExpensesTopic) Code() string { + return "expenses" +} + +func (e *ExpensesTopic) Name() string { + return "Расходы" +} + +// BuildTree: тип расходов → ввод описания +func (e *ExpensesTopic) BuildTree() *approvalflow.FlowNode { + return &approvalflow.FlowNode{ + Key: "expenses", + Label: "Расходы", + Children: []*approvalflow.FlowNode{ + { + Key: "non_budget_expenses", + Label: "Внебюджетные расходы", + DataKey: "expense_type", + DataValue: "non_budget", + Children: []*approvalflow.FlowNode{ + { + Key: "non_budget_expenses_input", + IsInput: true, + InputKey: "content", + InputHint: "Опишите расход: сумма, назначение, детали", + }, + }, + }, + { + Key: "non_budget_expenses_pet_line", + Label: "Внебюджетные расходы ПЭТ Лайн", + DataKey: "expense_type", + DataValue: "non_budget_pet_line", + Children: []*approvalflow.FlowNode{ + { + Key: "non_budget_expenses_pet_line_input", + IsInput: true, + InputKey: "content", + InputHint: "Опишите расход: сумма, назначение, детали", + }, + }, + }, + { + Key: "expenses_alphapet", + Label: "Расходы АЛЬФАПЭТ", + DataKey: "expense_type", + DataValue: "alphapet", + Children: []*approvalflow.FlowNode{ + { + Key: "expenses_alphapet_input", + IsInput: true, + InputKey: "content", + InputHint: "Опишите расход: сумма, назначение, детали", + }, + }, + }, + { + Key: "expenses_warehouse_gvardeysk", + Label: "Расходы склад Гвардейское", + DataKey: "expense_type", + DataValue: "warehouse_gvardeysk", + Children: []*approvalflow.FlowNode{ + { + Key: "expenses_warehouse_gvardeysk_input", + IsInput: true, + InputKey: "content", + InputHint: "Опишите расход: сумма, назначение, детали", + }, + }, + }, + { + Key: "manager_expenses", + Label: "Менеджерские расходы", + DataKey: "expense_type", + DataValue: "manager", + Children: []*approvalflow.FlowNode{ + { + Key: "manager_expenses_input", + IsInput: true, + InputKey: "content", + InputHint: "Опишите расход: сумма, назначение, детали", + }, + }, + }, + }, + } +} + +func (e *ExpensesTopic) TopicCodeFromCollected(collected map[string]string) (string, error) { + expenseType := collected["expense_type"] + if expenseType == "" { + return "", fmt.Errorf("тип расхода не указан") + } + + switch expenseType { + case "non_budget": + return "non_budget_expenses", nil + case "non_budget_pet_line": + return "non_budget_expenses_pet_line", nil + case "alphapet": + return "expenses_alphapet", nil + case "warehouse_gvardeysk": + return "expenses_warehouse_gvardeysk", nil + case "manager": + return "manager_expenses", nil + default: + return "", fmt.Errorf("неизвестный тип расхода: %s", expenseType) + } +} + +func (e *ExpensesTopic) FormatApproverMessage(initiator *typescore.User, collected map[string]string) string { + name := "" + if initiator.FullName != nil { + name = *initiator.FullName + } + + var typeLabel string + switch collected["expense_type"] { + case "non_budget": + typeLabel = "Внебюджетные расходы" + case "non_budget_pet_line": + typeLabel = "Внебюджетные расходы ПЭТ Лайн" + case "alphapet": + typeLabel = "Расходы АЛЬФАПЭТ" + case "warehouse_gvardeysk": + typeLabel = "Расходы склад Гвардейское" + case "manager": + typeLabel = "Менеджерские расходы" + default: + typeLabel = "Расходы" + } + + return fmt.Sprintf( + "📋 %s\n\n"+ + "%s:\n%s", + typeLabel, name, collected["content"], + ) +} diff --git a/service/telegram_service/handlers/approval/topics/orders/topic.go b/service/telegram_service/handlers/approval/topics/orders/topic.go new file mode 100644 index 0000000..fffb474 --- /dev/null +++ b/service/telegram_service/handlers/approval/topics/orders/topic.go @@ -0,0 +1,88 @@ +package orders + +import ( + "bitrix_balancer_api/core/typescore" + "bitrix_balancer_api/telegram_service/approvalflow" + "fmt" +) + +type OrdersTopic struct{} + +func NewOrdersTopic() *OrdersTopic { + return &OrdersTopic{} +} + +func (o *OrdersTopic) Code() string { + return "orders" +} + +func (o *OrdersTopic) Name() string { + return "Заказы" +} + +// BuildTree: выбор региона → ввод текста (+ файл опционально) +func (o *OrdersTopic) BuildTree() *approvalflow.FlowNode { + return &approvalflow.FlowNode{ + Key: "orders", + Label: "Заказы", + Children: []*approvalflow.FlowNode{ + { + Key: "orders_krasnodar", + Label: "Краснодар", + DataKey: "region", + DataValue: "krasnodar", + Children: []*approvalflow.FlowNode{ + { + Key: "orders_krasnodar_input", + IsInput: true, + InputKey: "content", + InputHint: "Опишите детали заказа", + }, + }, + }, + { + Key: "orders_crimea", + Label: "Крым", + DataKey: "region", + DataValue: "crimea", + Children: []*approvalflow.FlowNode{ + { + Key: "orders_crimea_input", + IsInput: true, + InputKey: "content", + InputHint: "Опишите детали заказа", + }, + }, + }, + }, + } +} + +func (o *OrdersTopic) TopicCodeFromCollected(collected map[string]string) (string, error) { + region := collected["region"] + if region == "" { + return "", fmt.Errorf("регион не указан") + } + return fmt.Sprintf("orders_%s", region), nil +} + +func (o *OrdersTopic) FormatApproverMessage(initiator *typescore.User, collected map[string]string) string { + name := "" + if initiator.FullName != nil { + name = *initiator.FullName + } + + regionLabel := collected["region"] + switch collected["region"] { + case "krasnodar": + regionLabel = "Краснодар" + case "crimea": + regionLabel = "Крым" + } + + return fmt.Sprintf( + "📋 Заказы — %s\n\n"+ + "%s:\n%s", + regionLabel, name, collected["content"], + ) +} diff --git a/service/telegram_service/handlers/approval/topics/shipmens/topic.go b/service/telegram_service/handlers/approval/topics/shipmens/topic.go new file mode 100644 index 0000000..0f4945f --- /dev/null +++ b/service/telegram_service/handlers/approval/topics/shipmens/topic.go @@ -0,0 +1,116 @@ +package shipments + +import ( + "bitrix_balancer_api/core/typescore" + "bitrix_balancer_api/telegram_service/approvalflow" + "fmt" +) + +type ShipmentsTopic struct{} + +func NewShipmentsTopic() *ShipmentsTopic { + return &ShipmentsTopic{} +} + +func (s *ShipmentsTopic) Code() string { + return "shipments" +} + +func (s *ShipmentsTopic) Name() string { + return "Отгрузки" +} + +// BuildTree: тип отгрузки → ввод текста +func (s *ShipmentsTopic) BuildTree() *approvalflow.FlowNode { + return &approvalflow.FlowNode{ + Key: "shipments", + Label: "Отгрузки", + Children: []*approvalflow.FlowNode{ + { + Key: "shipments_regular", + Label: "Обычные отгрузки", + DataKey: "shipment_type", + DataValue: "regular", + Children: []*approvalflow.FlowNode{ + { + Key: "shipments_regular_input", + IsInput: true, + InputKey: "content", + InputHint: "Опишите детали отгрузки", + }, + }, + }, + { + Key: "shipments_soh", + Label: "Отгрузки на СОХ", + DataKey: "shipment_type", + DataValue: "soh", + Children: []*approvalflow.FlowNode{ + { + Key: "shipments_soh_input", + IsInput: true, + InputKey: "content", + InputHint: "Опишите детали отгрузки на СОХ", + }, + }, + }, + { + Key: "v_shipments", + Label: "В. Отгрузки", + DataKey: "shipment_type", + DataValue: "v_shipments", + Children: []*approvalflow.FlowNode{ + { + Key: "v_shipments_input", + IsInput: true, + InputKey: "content", + InputHint: "Опишите детали внутренних отгрузок", + }, + }, + }, + }, + } +} + +func (s *ShipmentsTopic) TopicCodeFromCollected(collected map[string]string) (string, error) { + shipmentType := collected["shipment_type"] + if shipmentType == "" { + return "", fmt.Errorf("тип отгрузки не указан") + } + + switch shipmentType { + case "regular": + return "shipments", nil + case "soh": + return "shipments_soh", nil + case "v_shipments": + return "v_shipments", nil + default: + return "", fmt.Errorf("неизвестный тип отгрузки: %s", shipmentType) + } +} + +func (s *ShipmentsTopic) FormatApproverMessage(initiator *typescore.User, collected map[string]string) string { + name := "" + if initiator.FullName != nil { + name = *initiator.FullName + } + + var typeLabel string + switch collected["shipment_type"] { + case "regular": + typeLabel = "Отгрузки" + case "soh": + typeLabel = "Отгрузки на СОХ" + case "v_shipments": + typeLabel = "В. Отгрузки" + default: + typeLabel = "Отгрузки" + } + + return fmt.Sprintf( + "📋 %s\n\n"+ + "%s:\n%s", + typeLabel, name, collected["content"], + ) +} diff --git a/service/telegram_service/handlers/approval/topics/transaction_passport/topic.go b/service/telegram_service/handlers/approval/topics/transaction_passport/topic.go new file mode 100644 index 0000000..2e83361 --- /dev/null +++ b/service/telegram_service/handlers/approval/topics/transaction_passport/topic.go @@ -0,0 +1,104 @@ +package transactionpassport + +import ( + "bitrix_balancer_api/core/typescore" + "bitrix_balancer_api/telegram_service/approvalflow" + "fmt" +) + +type TransactionPassportTopic struct{} + +func NewTransactionPassportTopic() *TransactionPassportTopic { + return &TransactionPassportTopic{} +} + +func (p *TransactionPassportTopic) Code() string { + return "transaction_passport" +} + +func (p *TransactionPassportTopic) Name() string { + return "Паспорт сделки" +} + +// BuildTree: выбор региона → ввод текста +func (p *TransactionPassportTopic) BuildTree() *approvalflow.FlowNode { + return &approvalflow.FlowNode{ + Key: "production_meetings", + Label: "Паспорт сделки", + Children: []*approvalflow.FlowNode{ + { + Key: "ps_belarus", + Label: "Беларусь", + DataKey: "region", + DataValue: "belarus", + Children: []*approvalflow.FlowNode{ + { + Key: "ps_belarus_input", + IsInput: true, + InputKey: "content", + InputHint: "Текст для паспорта сделки", + }, + }, + }, + { + Key: "ps_krasnodar", + Label: "Краснодар", + DataKey: "region", + DataValue: "krasnodar", + Children: []*approvalflow.FlowNode{ + { + Key: "ps_krasnodar_input", + IsInput: true, + InputKey: "content", + InputHint: "Текст для паспорта сделки", + }, + }, + }, + { + Key: "ps_crimea", + Label: "Крым", + DataKey: "region", + DataValue: "crimea", + Children: []*approvalflow.FlowNode{ + { + Key: "ps_crimea_input", + IsInput: true, + InputKey: "content", + InputHint: "Текст для паспорта сделки", + }, + }, + }, + }, + } +} + +func (p *TransactionPassportTopic) TopicCodeFromCollected(collected map[string]string) (string, error) { + region := collected["region"] + if region == "" { + return "", fmt.Errorf("регион не указан") + } + return fmt.Sprintf("ps_%s", region), nil +} + +func (p *TransactionPassportTopic) FormatApproverMessage(initiator *typescore.User, collected map[string]string) string { + name := "" + if initiator.FullName != nil { + name = *initiator.FullName + } + + regionLabel := collected["region"] + switch collected["region"] { + case "belarus": + regionLabel = "Беларусь" + case "krasnodar": + regionLabel = "Краснодар" + case "crimea": + regionLabel = "Крым" + } + + return fmt.Sprintf( + "📋 ПС — %s\n\n"+ + "%s:\n%s", + regionLabel, name, collected["content"], + ) +}