Add znzt module
This commit is contained in:
parent
ac60034484
commit
a780dfdf0e
File diff suppressed because it is too large
Load Diff
|
|
@ -41,6 +41,7 @@ type ModuleDB struct {
|
|||
ApprovalFlowNode *dbcore.ApprovalFlowNodeDB
|
||||
AdminActionLogs *dbcore.AdminActionLogDB
|
||||
SMSLog *dbcore.SmsLogDB
|
||||
MonthlyOrders *dbcore.MonthlyOrderDB
|
||||
}
|
||||
|
||||
func NewModuleDB(
|
||||
|
|
@ -98,6 +99,7 @@ func initDBModules(modules *ModuleDB, redisClient *redismodule.ModuleRedis) *Mod
|
|||
modules.ApprovalFlowNode = dbcore.NewApprovalFlowNodeDB(modules.Pool)
|
||||
modules.AdminActionLogs = dbcore.NewAdminActionLogDB(modules.Pool)
|
||||
modules.SMSLog = dbcore.NewSmsLogDB(modules.Pool)
|
||||
modules.MonthlyOrders = dbcore.NewMonthlyOrderDB(modules.Pool)
|
||||
|
||||
return modules
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ func (m *MigrationFunctions) migrateTables() error {
|
|||
tablesmigration.AdminActionLogsTableMigrate,
|
||||
|
||||
tablesmigration.SmsLogsTableMigrate,
|
||||
tablesmigration.MonthlyOrdersTablesMigrate,
|
||||
}
|
||||
|
||||
for _, migrate := range migrations {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,51 @@
|
|||
package tablesmigration
|
||||
|
||||
import (
|
||||
"bitrix_balancer_api/core/typescore"
|
||||
"gorm.io/gorm"
|
||||
"time"
|
||||
)
|
||||
|
||||
type LocalMonthlyOrderSetting typescore.MonthlyOrderSetting
|
||||
type LocalMonthlyOrderClient typescore.MonthlyOrderClient
|
||||
type LocalMonthlyOrderItem typescore.MonthlyOrderItem
|
||||
type LocalMonthlyOrderFile typescore.MonthlyOrderFile
|
||||
|
||||
func (LocalMonthlyOrderSetting) TableName() string { return "monthly_order_settings" }
|
||||
func (LocalMonthlyOrderClient) TableName() string { return "monthly_order_clients" }
|
||||
func (LocalMonthlyOrderItem) TableName() string { return "monthly_order_items" }
|
||||
func (LocalMonthlyOrderFile) TableName() string { return "monthly_order_files" }
|
||||
|
||||
func MonthlyOrdersTablesMigrate(db *gorm.DB) error {
|
||||
tables := []interface{}{
|
||||
&LocalMonthlyOrderSetting{},
|
||||
&LocalMonthlyOrderClient{},
|
||||
&LocalMonthlyOrderItem{},
|
||||
&LocalMonthlyOrderFile{},
|
||||
}
|
||||
|
||||
for _, table := range tables {
|
||||
if err := db.AutoMigrate(table); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
// Устанавливаем внешние ключи (Foreign Keys)
|
||||
time.Sleep(2 * time.Second)
|
||||
|
||||
db.Exec(`ALTER TABLE monthly_order_clients ADD CONSTRAINT fk_moc_manager_id FOREIGN KEY (manager_id) REFERENCES users(id) ON DELETE CASCADE ON UPDATE CASCADE`)
|
||||
db.Exec(`ALTER TABLE monthly_order_clients ADD CONSTRAINT fk_moc_approval_id FOREIGN KEY (approval_id) REFERENCES approvals(id) ON DELETE SET NULL ON UPDATE CASCADE`)
|
||||
|
||||
db.Exec(`ALTER TABLE monthly_order_items ADD CONSTRAINT fk_moi_order_client_id FOREIGN KEY (order_client_id) REFERENCES monthly_order_clients(id) ON DELETE CASCADE ON UPDATE CASCADE`)
|
||||
|
||||
db.Exec(`ALTER TABLE monthly_order_files ADD CONSTRAINT fk_mof_order_client_id FOREIGN KEY (order_client_id) REFERENCES monthly_order_clients(id) ON DELETE CASCADE ON UPDATE CASCADE`)
|
||||
|
||||
// Индексы для быстрого поиска
|
||||
db.Exec(`CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_moc_manager_month_year ON monthly_order_clients (manager_id, month, year)`)
|
||||
db.Exec(`CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_moi_order_client_id ON monthly_order_items (order_client_id)`)
|
||||
|
||||
db.Exec(`CREATE UNIQUE INDEX CONCURRENTLY IF NOT EXISTS uq_moc_unique_client_order ON monthly_order_clients (manager_id, month, year, client_name)`)
|
||||
db.Exec(`CREATE UNIQUE INDEX CONCURRENTLY IF NOT EXISTS uq_mos_unique_settings ON monthly_order_settings (month, year)`)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
|
@ -0,0 +1,229 @@
|
|||
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"
|
||||
)
|
||||
|
||||
type MonthlyOrderDB struct {
|
||||
pool *pgxpool.Pool
|
||||
}
|
||||
|
||||
func NewMonthlyOrderDB(pool *pgxpool.Pool) *MonthlyOrderDB {
|
||||
return &MonthlyOrderDB{pool: pool}
|
||||
}
|
||||
|
||||
// GetCurrentSettings получает настройки заказа для указанного месяца и года
|
||||
func (db *MonthlyOrderDB) GetCurrentSettings(ctx context.Context, month, year int) (*typescore.MonthlyOrderSetting, error) {
|
||||
fields := dbutils.GetStructFieldsDB(&typescore.MonthlyOrderSetting{}, string(dbcoretablenames.TableNameMonthlyOrderSettings))
|
||||
sql, args, err := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).
|
||||
Select(fields...).
|
||||
From(string(dbcoretablenames.TableNameMonthlyOrderSettings)).
|
||||
Where(squirrel.Eq{"month": month, "year": year}).
|
||||
Limit(1).
|
||||
ToSql()
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
rows, err := db.pool.Query(ctx, sql, args...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
if rows.Next() {
|
||||
setting := &typescore.MonthlyOrderSetting{}
|
||||
if err := dbutils.ScanRowsToStructRows(rows, setting, nil); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return setting, nil
|
||||
}
|
||||
return nil, nil // Настройки еще не заданы
|
||||
}
|
||||
|
||||
// SaveSettings сохраняет или обновляет настройки (для аналитика)
|
||||
func (db *MonthlyOrderDB) SaveSettings(ctx context.Context, tx pgx.Tx, setting *typescore.MonthlyOrderSetting) error {
|
||||
if setting == nil {
|
||||
return errors.New("setting is nil")
|
||||
}
|
||||
|
||||
return dbutils.ExecuteTx(ctx, db.pool, tx, func(tx pgx.Tx) error {
|
||||
query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).
|
||||
Insert(string(dbcoretablenames.TableNameMonthlyOrderSettings)).
|
||||
Columns("month", "year", "deadline_date", "assembly_time_days").
|
||||
Values(*setting.Month, *setting.Year, *setting.DeadlineDate, *setting.AssemblyTimeDays).
|
||||
Suffix("ON CONFLICT (month, year) DO UPDATE SET deadline_date = EXCLUDED.deadline_date, assembly_time_days = EXCLUDED.assembly_time_days, updated_at = NOW()")
|
||||
|
||||
sqlV, args, err := query.ToSql()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
_, err = tx.Exec(ctx, sqlV, args...)
|
||||
return err
|
||||
})
|
||||
}
|
||||
|
||||
// SaveClientOrder сохраняет черновик или отправленный заказ менеджера
|
||||
func (db *MonthlyOrderDB) SaveClientOrder(ctx context.Context, tx pgx.Tx, order *typescore.MonthlyOrderClient) (*typescore.MonthlyOrderClient, error) {
|
||||
if order == nil {
|
||||
return nil, errors.New("order is nil")
|
||||
}
|
||||
|
||||
var insertedID uint64
|
||||
err := dbutils.ExecuteTx(ctx, db.pool, tx, func(tx pgx.Tx) error {
|
||||
// 1. Вставляем или обновляем основу заказа
|
||||
query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).
|
||||
Insert(string(dbcoretablenames.TableNameMonthlyOrderClients)).
|
||||
Columns("manager_id", "month", "year", "client_name", "manager_comment", "custom_reason", "free_form_comment", "decade", "delivery", "conditions", "payment_form", "status").
|
||||
Values(*order.ManagerID, *order.Month, *order.Year, *order.ClientName, order.ManagerComment, order.CustomReason, order.FreeFormComment, order.Decade, order.Delivery, order.Conditions, order.PaymentForm, *order.Status).
|
||||
Suffix("ON CONFLICT (manager_id, month, year, client_name) DO UPDATE SET manager_comment = EXCLUDED.manager_comment, custom_reason = EXCLUDED.custom_reason, free_form_comment = EXCLUDED.free_form_comment, decade = EXCLUDED.decade, delivery = EXCLUDED.delivery, conditions = EXCLUDED.conditions, payment_form = EXCLUDED.payment_form, status = EXCLUDED.status, updated_at = NOW() RETURNING id")
|
||||
|
||||
sqlV, args, err := query.ToSql()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = tx.QueryRow(ctx, sqlV, args...).Scan(&insertedID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
order.ID = &insertedID
|
||||
|
||||
// 2. Удаляем старые Items
|
||||
delSQL, delArgs, _ := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).
|
||||
Delete(string(dbcoretablenames.TableNameMonthlyOrderItems)).
|
||||
Where(squirrel.Eq{"order_client_id": insertedID}).ToSql()
|
||||
tx.Exec(ctx, delSQL, delArgs...)
|
||||
|
||||
// 3. Вставляем новые Items
|
||||
if len(order.Items) > 0 {
|
||||
insertItems := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).
|
||||
Insert(string(dbcoretablenames.TableNameMonthlyOrderItems)).
|
||||
Columns("order_client_id", "nomenclature_name", "nomenclature_type", "quantity")
|
||||
|
||||
for _, item := range order.Items {
|
||||
if item.Quantity != nil && *item.Quantity > 0 {
|
||||
insertItems = insertItems.Values(insertedID, item.NomenclatureName, item.NomenclatureType, item.Quantity)
|
||||
}
|
||||
}
|
||||
|
||||
iSQL, iArgs, _ := insertItems.ToSql()
|
||||
if iSQL != "" { // Защита от пустых инсертов
|
||||
_, err = tx.Exec(ctx, iSQL, iArgs...)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return order, nil
|
||||
}
|
||||
|
||||
// GetClientOrdersByManagerDB получает все заказы менеджера за указанный месяц и год
|
||||
func (db *MonthlyOrderDB) GetClientOrdersByManagerDB(ctx context.Context, managerID uint64, month, year int) ([]*typescore.MonthlyOrderClient, error) {
|
||||
fields := dbutils.GetStructFieldsDB(&typescore.MonthlyOrderClient{}, string(dbcoretablenames.TableNameMonthlyOrderClients))
|
||||
|
||||
sqlStr, args, err := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).
|
||||
Select(fields...).
|
||||
From(string(dbcoretablenames.TableNameMonthlyOrderClients)).
|
||||
Where(squirrel.Eq{"manager_id": managerID, "month": month, "year": year}).
|
||||
ToSql()
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
rows, err := db.pool.Query(ctx, sqlStr, args...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
var orders []*typescore.MonthlyOrderClient
|
||||
for rows.Next() {
|
||||
order := &typescore.MonthlyOrderClient{}
|
||||
if err := dbutils.ScanRowsToStructRows(rows, order, nil); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
orders = append(orders, order)
|
||||
}
|
||||
|
||||
return orders, nil
|
||||
}
|
||||
|
||||
// GetItemsByOrderIDDB получает позиции конкретного заказа (номенклатуру и количество)
|
||||
func (db *MonthlyOrderDB) GetItemsByOrderIDDB(ctx context.Context, orderID uint64) ([]*typescore.MonthlyOrderItem, error) {
|
||||
fields := dbutils.GetStructFieldsDB(&typescore.MonthlyOrderItem{}, string(dbcoretablenames.TableNameMonthlyOrderItems))
|
||||
|
||||
sqlStr, args, err := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).
|
||||
Select(fields...).
|
||||
From(string(dbcoretablenames.TableNameMonthlyOrderItems)).
|
||||
Where(squirrel.Eq{"order_client_id": orderID}).
|
||||
ToSql()
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
rows, err := db.pool.Query(ctx, sqlStr, args...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
var items []*typescore.MonthlyOrderItem
|
||||
for rows.Next() {
|
||||
item := &typescore.MonthlyOrderItem{}
|
||||
if err := dbutils.ScanRowsToStructRows(rows, item, nil); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
items = append(items, item)
|
||||
}
|
||||
|
||||
return items, nil
|
||||
}
|
||||
|
||||
// GetManagersWithDraftsDB получает список ID менеджеров, у которых есть черновики за указанный период
|
||||
func (db *MonthlyOrderDB) GetManagersWithDraftsDB(ctx context.Context, month, year int) ([]uint64, error) {
|
||||
sqlStr, args, err := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).
|
||||
Select("DISTINCT manager_id").
|
||||
From(string(dbcoretablenames.TableNameMonthlyOrderClients)).
|
||||
Where(squirrel.Eq{"month": month, "year": year, "status": "draft"}).
|
||||
ToSql()
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
rows, err := db.pool.Query(ctx, sqlStr, args...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
var managerIDs []uint64
|
||||
for rows.Next() {
|
||||
var id uint64
|
||||
if err := rows.Scan(&id); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
managerIDs = append(managerIDs, id)
|
||||
}
|
||||
|
||||
return managerIDs, nil
|
||||
}
|
||||
|
|
@ -31,6 +31,10 @@ const (
|
|||
TableNameApprovalRevocationApprovers TableName = "approval_revocation_approvers"
|
||||
TableNameApprovalFlowNodes TableName = "approval_flow_nodes"
|
||||
TableNameAdminActionLogs TableName = "admin_action_logs"
|
||||
TableNameMonthlyOrderSettings TableName = "monthly_order_settings"
|
||||
TableNameMonthlyOrderClients TableName = "monthly_order_clients"
|
||||
TableNameMonthlyOrderItems TableName = "monthly_order_items"
|
||||
TableNameMonthlyOrderFiles TableName = "monthly_order_files"
|
||||
)
|
||||
|
||||
func (t TableName) ToString() string {
|
||||
|
|
|
|||
33
core/go.mod
33
core/go.mod
|
|
@ -13,18 +13,27 @@ require (
|
|||
github.com/redis/go-redis/v9 v9.18.0
|
||||
github.com/shopspring/decimal v1.4.0
|
||||
github.com/sirupsen/logrus v1.9.4
|
||||
golang.org/x/crypto v0.40.0
|
||||
golang.org/x/net v0.42.0
|
||||
golang.org/x/crypto v0.54.0
|
||||
golang.org/x/net v0.57.0
|
||||
gopkg.in/yaml.v3 v3.0.1
|
||||
gorm.io/driver/postgres v1.6.0
|
||||
gorm.io/gorm v1.31.1
|
||||
)
|
||||
|
||||
require (
|
||||
cloud.google.com/go/auth v0.23.0 // indirect
|
||||
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
|
||||
cloud.google.com/go/compute/metadata v0.9.0 // indirect
|
||||
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
|
||||
github.com/cespare/xxhash/v2 v2.3.0 // indirect
|
||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
|
||||
github.com/go-jose/go-jose/v4 v4.1.1 // indirect
|
||||
github.com/felixge/httpsnoop v1.0.4 // indirect
|
||||
github.com/go-jose/go-jose/v4 v4.1.4 // indirect
|
||||
github.com/go-logr/logr v1.4.3 // indirect
|
||||
github.com/go-logr/stdr v1.2.2 // indirect
|
||||
github.com/google/s2a-go v0.1.9 // indirect
|
||||
github.com/googleapis/enterprise-certificate-proxy v0.3.20 // indirect
|
||||
github.com/googleapis/gax-go/v2 v2.23.0 // indirect
|
||||
github.com/hashicorp/errwrap v1.1.0 // indirect
|
||||
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
|
||||
github.com/hashicorp/go-multierror v1.1.1 // indirect
|
||||
|
|
@ -45,9 +54,19 @@ require (
|
|||
github.com/mitchellh/go-homedir v1.1.0 // indirect
|
||||
github.com/rogpeppe/go-internal v1.14.1 // indirect
|
||||
github.com/ryanuber/go-glob v1.0.0 // indirect
|
||||
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
|
||||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 // indirect
|
||||
go.opentelemetry.io/otel v1.44.0 // indirect
|
||||
go.opentelemetry.io/otel/metric v1.44.0 // indirect
|
||||
go.opentelemetry.io/otel/trace v1.44.0 // indirect
|
||||
go.uber.org/atomic v1.11.0 // indirect
|
||||
golang.org/x/sync v0.17.0 // indirect
|
||||
golang.org/x/sys v0.41.0 // indirect
|
||||
golang.org/x/text v0.29.0 // indirect
|
||||
golang.org/x/time v0.12.0 // indirect
|
||||
golang.org/x/oauth2 v0.36.0 // indirect
|
||||
golang.org/x/sync v0.22.0 // indirect
|
||||
golang.org/x/sys v0.47.0 // indirect
|
||||
golang.org/x/text v0.40.0 // indirect
|
||||
golang.org/x/time v0.15.0 // indirect
|
||||
google.golang.org/api v0.293.0 // indirect
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea // indirect
|
||||
google.golang.org/grpc v1.83.0 // indirect
|
||||
google.golang.org/protobuf v1.36.11 // indirect
|
||||
)
|
||||
|
|
|
|||
52
core/go.sum
52
core/go.sum
|
|
@ -1,3 +1,9 @@
|
|||
cloud.google.com/go/auth v0.23.0 h1:6Gg1CMgpgubRG7DGz5Vf1pcoNo8RfiRiRAPS4crTp54=
|
||||
cloud.google.com/go/auth v0.23.0/go.mod h1:4DhBRcqvtljQN3dJ57qtqbib5ZGCYE5f2crfiiC2EM0=
|
||||
cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=
|
||||
cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=
|
||||
cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdBtwLoEkH9Zs=
|
||||
cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10=
|
||||
github.com/Masterminds/squirrel v1.5.4 h1:uUcX/aBc8O7Fg9kaISIUsHXdKuqehiXAMQTYX8afzqM=
|
||||
github.com/Masterminds/squirrel v1.5.4/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10=
|
||||
github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
|
||||
|
|
@ -16,16 +22,30 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/r
|
|||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
|
||||
github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
|
||||
github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
|
||||
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
|
||||
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
|
||||
github.com/go-jose/go-jose/v4 v4.1.1 h1:JYhSgy4mXXzAdF3nUx3ygx347LRXJRrpgyU3adRmkAI=
|
||||
github.com/go-jose/go-jose/v4 v4.1.1/go.mod h1:BdsZGqgdO3b6tTc6LSE56wcDbMMLuPsw5d4ZD5f94kA=
|
||||
github.com/go-jose/go-jose/v4 v4.1.4/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
|
||||
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
|
||||
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
|
||||
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
|
||||
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
|
||||
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
|
||||
github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1 h1:wG8n/XJQ07TmjbITcGiUaOtXxdrINDz1b0J1w0SzqDc=
|
||||
github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1/go.mod h1:A2S0CWkNylc2phvKXWBBdD3K0iGnDBGbzRpISP2zBl8=
|
||||
github.com/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U=
|
||||
github.com/go-test/deep v1.1.1/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
|
||||
github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY=
|
||||
github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
|
||||
github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
|
||||
github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/googleapis/enterprise-certificate-proxy v0.3.20 h1:t/xL64VUoN69MuMRQuJETqYGOw4Z9mSRJK9epIEtwFk=
|
||||
github.com/googleapis/enterprise-certificate-proxy v0.3.20/go.mod h1:L3D/IQExI6LqEjBdXcZQ1WluSgigQmSwBboFstVPM4w=
|
||||
github.com/googleapis/gax-go/v2 v2.23.0 h1:Tchl7qkvE7Ip3y+ztvNufYFvkfqTe7NfLTYGIdJRLuE=
|
||||
github.com/googleapis/gax-go/v2 v2.23.0/go.mod h1:rBQKOVJCdb8IFEzg+FCwlt1LP/xMDGuqUXhUG+XMXEg=
|
||||
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
|
||||
github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
|
||||
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
|
||||
|
|
@ -99,20 +119,52 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
|
|||
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
||||
github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
|
||||
github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
|
||||
go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
|
||||
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
|
||||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 h1:OyrsyzuttWTSur2qN/Lm0m2a8yqyIjUVBZcxFPuXq2o=
|
||||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0/go.mod h1:C2NGBr+kAB4bk3xtMXfZ94gqFDtg/GkI7e9zqGh5Beg=
|
||||
go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU=
|
||||
go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc=
|
||||
go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc=
|
||||
go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo=
|
||||
go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk=
|
||||
go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE=
|
||||
go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
|
||||
go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
|
||||
golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
|
||||
golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
|
||||
golang.org/x/crypto v0.54.0 h1:YLIA59K4fiNzHzjnZt2tUJQjQtUWfWbeHBqKtk3eScw=
|
||||
golang.org/x/crypto v0.54.0/go.mod h1:KWL8ny2AZdGR2cWmzeHrp2azQPGogOv+HeQaVEXC2dk=
|
||||
golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
|
||||
golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
|
||||
golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE=
|
||||
golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU=
|
||||
golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
|
||||
golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
|
||||
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
|
||||
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
|
||||
golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek=
|
||||
golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
|
||||
golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
|
||||
golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
|
||||
golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
|
||||
golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
|
||||
golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
|
||||
golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
|
||||
golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs=
|
||||
golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY=
|
||||
golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
|
||||
golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
|
||||
golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U=
|
||||
golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno=
|
||||
google.golang.org/api v0.293.0 h1:p9XIWOf63U4OgYx120ZwVU8+vl4XTPmWfgVPnmOAS9w=
|
||||
google.golang.org/api v0.293.0/go.mod h1:6n5tjEB1gzwniZTepZ0g5u+wM7Bof5GeULCx/zh8ZE0=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea h1:kVhQEPTpKQahD5+JSBTfBB19wcgQTTjAIn45MBqnyHk=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
|
||||
google.golang.org/grpc v1.83.0 h1:JeNZEKJFbQxArAMl+hiytHauacDNqJUllNfmIMmpqnQ=
|
||||
google.golang.org/grpc v1.83.0/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ=
|
||||
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
|
||||
google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
|
||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
|
||||
|
|
|
|||
|
|
@ -0,0 +1,106 @@
|
|||
package googlesheets
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"golang.org/x/oauth2/google"
|
||||
"google.golang.org/api/option"
|
||||
"google.golang.org/api/sheets/v4"
|
||||
)
|
||||
|
||||
type Client struct {
|
||||
srv *sheets.Service
|
||||
}
|
||||
|
||||
func NewClient(ctx context.Context, credentialsJSON []byte) (*Client, error) {
|
||||
// 1. Проверяем, не пустой ли файл вшился (чтобы сразу поймать ошибку embed)
|
||||
if len(credentialsJSON) == 0 {
|
||||
return nil, fmt.Errorf("google-creds.json is empty or not embedded correctly")
|
||||
}
|
||||
|
||||
// 2. Явно парсим JSON и запрашиваем права на работу с таблицами (Scopes)
|
||||
creds, err := google.CredentialsFromJSON(ctx, credentialsJSON, sheets.SpreadsheetsScope)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("invalid google-creds.json format: %v", err)
|
||||
}
|
||||
|
||||
// 3. Создаем клиент с уже авторизованными кредами
|
||||
srv, err := sheets.NewService(ctx, option.WithCredentials(creds))
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to create sheets service: %v", err)
|
||||
}
|
||||
|
||||
return &Client{srv: srv}, nil
|
||||
}
|
||||
|
||||
// FetchNomenclature вытягивает справочник товаров
|
||||
func (c *Client) FetchNomenclature(spreadsheetID string) ([]NomenclatureItem, error) {
|
||||
resp, err := c.srv.Spreadsheets.Values.Get(spreadsheetID, "A:B").Do()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var items []NomenclatureItem
|
||||
for i, row := range resp.Values {
|
||||
if i == 0 {
|
||||
continue // Пропускаем заголовок
|
||||
}
|
||||
if len(row) > 0 {
|
||||
name := fmt.Sprintf("%v", row[0])
|
||||
itemType := ""
|
||||
if len(row) > 1 {
|
||||
itemType = fmt.Sprintf("%v", row[1])
|
||||
}
|
||||
if strings.TrimSpace(name) != "" {
|
||||
items = append(items, NomenclatureItem{Name: name, Type: itemType})
|
||||
}
|
||||
}
|
||||
}
|
||||
return items, nil
|
||||
}
|
||||
|
||||
// FetchActiveClientsForManager вытягивает действующих клиентов для конкретного менеджера
|
||||
func (c *Client) FetchActiveClientsForManager(spreadsheetID, managerName string) ([]ClientItem, error) {
|
||||
resp, err := c.srv.Spreadsheets.Values.Get(spreadsheetID, "A:BW").Do()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var clients []ClientItem
|
||||
for i, row := range resp.Values {
|
||||
if i == 0 {
|
||||
continue // Пропускаем заголовок
|
||||
}
|
||||
|
||||
if len(row) > 74 {
|
||||
clientName := fmt.Sprintf("%v", row[1]) // Столбец B
|
||||
manager := fmt.Sprintf("%v", row[24]) // Столбец Y
|
||||
status := fmt.Sprintf("%v", row[74]) // Столбец BW
|
||||
|
||||
if strings.EqualFold(strings.TrimSpace(status), "действующий") &&
|
||||
strings.EqualFold(strings.TrimSpace(manager), strings.TrimSpace(managerName)) {
|
||||
clients = append(clients, ClientItem{
|
||||
Name: clientName,
|
||||
Manager: manager,
|
||||
Status: status,
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
return clients, nil
|
||||
}
|
||||
|
||||
// NomenclatureItem представляет одну строку из таблицы номенклатуры
|
||||
type NomenclatureItem struct {
|
||||
Name string `json:"name"`
|
||||
Type string `json:"type"`
|
||||
}
|
||||
|
||||
// ClientItem представляет клиента из таблицы клиентов
|
||||
type ClientItem struct {
|
||||
Name string `json:"name"`
|
||||
Manager string `json:"manager"`
|
||||
Status string `json:"status"`
|
||||
}
|
||||
|
|
@ -0,0 +1,191 @@
|
|||
package monthly_orders
|
||||
|
||||
import (
|
||||
"bitrix_balancer_api/core/lib/external/googlesheets"
|
||||
"bitrix_balancer_api/core/typescore"
|
||||
"bitrix_balancer_api/telegram_service/types"
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
type MonthlyOrderService struct {
|
||||
ipc *types.InternalProviderControl
|
||||
gsClient *googlesheets.Client
|
||||
clientsSheet string
|
||||
nomSheet string
|
||||
}
|
||||
|
||||
func NewMonthlyOrderService(ipc *types.InternalProviderControl, gsClient *googlesheets.Client, clientsSheetID, nomSheetID string) *MonthlyOrderService {
|
||||
return &MonthlyOrderService{
|
||||
ipc: ipc,
|
||||
gsClient: gsClient,
|
||||
clientsSheet: clientsSheetID,
|
||||
nomSheet: nomSheetID,
|
||||
}
|
||||
}
|
||||
|
||||
type FrontendOrderMatrix struct {
|
||||
Settings *typescore.MonthlyOrderSetting `json:"settings"`
|
||||
Nomenclatures []googlesheets.NomenclatureItem `json:"nomenclatures"`
|
||||
Clients []FrontendClientData `json:"clients"`
|
||||
IsLocked bool `json:"is_locked"`
|
||||
}
|
||||
|
||||
type FrontendClientData struct {
|
||||
GoogleData googlesheets.ClientItem `json:"google_data"`
|
||||
DBOrder *typescore.MonthlyOrderClient `json:"db_order"` // Черновик или отправленный заказ (если есть)
|
||||
}
|
||||
|
||||
// GetMyOrderData собирает "матрицу" для менеджера: тянет Google Sheets + БД
|
||||
func (s *MonthlyOrderService) GetMyOrderData(ctx context.Context, managerID uint64) (*FrontendOrderMatrix, error) {
|
||||
manager, err := s.ipc.Database.User.GetUserByIDDB(ctx, managerID)
|
||||
if err != nil || manager == nil || manager.FullName == nil {
|
||||
return nil, errors.New("менеджер не найден")
|
||||
}
|
||||
|
||||
now := time.Now()
|
||||
month, year := int(now.Month()), now.Year()
|
||||
|
||||
// 1. Получаем настройки месяца
|
||||
settings, err := s.ipc.Database.MonthlyOrders.GetCurrentSettings(ctx, month, year)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
isLocked := true
|
||||
if settings != nil && settings.DeadlineDate != nil {
|
||||
// Открыто с 15-го числа И до дедлайна включительно
|
||||
if now.Day() >= 15 && now.Before(*settings.DeadlineDate) {
|
||||
isLocked = false
|
||||
}
|
||||
}
|
||||
|
||||
// 2. Идем в Google Sheets за свежими данными
|
||||
noms, err := s.gsClient.FetchNomenclature(s.nomSheet)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("ошибка парсинга номенклатуры: %v", err)
|
||||
}
|
||||
|
||||
gsClients, err := s.gsClient.FetchActiveClientsForManager(s.clientsSheet, *manager.FullName)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("ошибка парсинга клиентов: %v", err)
|
||||
}
|
||||
|
||||
// 3. Достаем черновики из нашей БД
|
||||
// (Предполагается, что вы добавите метод GetClientOrdersByManagerDB в dbcore)
|
||||
dbOrders, _ := s.ipc.Database.MonthlyOrders.GetClientOrdersByManagerDB(ctx, managerID, month, year)
|
||||
ordersMap := make(map[string]*typescore.MonthlyOrderClient)
|
||||
for _, o := range dbOrders {
|
||||
if o.ClientName != nil {
|
||||
ordersMap[*o.ClientName] = o
|
||||
}
|
||||
}
|
||||
|
||||
// 4. Сливаем данные
|
||||
var clientDataList []FrontendClientData
|
||||
for _, gsc := range gsClients {
|
||||
clientDataList = append(clientDataList, FrontendClientData{
|
||||
GoogleData: gsc,
|
||||
DBOrder: ordersMap[gsc.Name],
|
||||
})
|
||||
}
|
||||
|
||||
return &FrontendOrderMatrix{
|
||||
Settings: settings,
|
||||
Nomenclatures: noms,
|
||||
Clients: clientDataList,
|
||||
IsLocked: isLocked,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// SubmitOrdersToTelegram превращает отправленные заказы в Telegram-заявки
|
||||
func (s *MonthlyOrderService) SubmitOrdersToTelegram(ctx context.Context, managerID uint64) error {
|
||||
now := time.Now()
|
||||
month, year := int(now.Month()), now.Year()
|
||||
|
||||
// Получаем все заказы менеджера за этот месяц
|
||||
dbOrders, err := s.ipc.Database.MonthlyOrders.GetClientOrdersByManagerDB(ctx, managerID, month, year)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
manager, _ := s.ipc.Database.User.GetUserByIDDB(ctx, managerID)
|
||||
|
||||
// Находим нужную тему в БД по коду (предварительно вам нужно создать в боте тему с кодом "monthly_order")
|
||||
topic, _ := s.ipc.Database.ApprovalTopic.GetApprovalTopicByCodeDB(ctx, "monthly_order")
|
||||
if topic == nil {
|
||||
return errors.New("тема 'Заказ на месяц' (monthly_order) не найдена в БД")
|
||||
}
|
||||
|
||||
for _, order := range dbOrders {
|
||||
// Требование: Отправлять ТОЛЬКО заполненные (где есть номенклатура)
|
||||
items, _ := s.ipc.Database.MonthlyOrders.GetItemsByOrderIDDB(ctx, *order.ID)
|
||||
if len(items) == 0 {
|
||||
continue // Пустой заказ, пропускаем (останется только для отчета)
|
||||
}
|
||||
|
||||
// Заявка уже была отправлена
|
||||
if order.ApprovalID != nil && *order.ApprovalID > 0 {
|
||||
continue
|
||||
}
|
||||
|
||||
// Формируем текст заявки
|
||||
var contentBuilder strings.Builder
|
||||
contentBuilder.WriteString(fmt.Sprintf("🏢 Клиент: %s\n", *order.ClientName))
|
||||
|
||||
if order.Decade != nil {
|
||||
contentBuilder.WriteString(fmt.Sprintf("📅 Декада: %s\n", *order.Decade))
|
||||
}
|
||||
if order.Delivery != nil {
|
||||
contentBuilder.WriteString(fmt.Sprintf("🚚 Доставка: %s\n", *order.Delivery))
|
||||
}
|
||||
if order.Conditions != nil {
|
||||
contentBuilder.WriteString(fmt.Sprintf("⚖️ Условия: %s\n", *order.Conditions))
|
||||
}
|
||||
if order.PaymentForm != nil {
|
||||
contentBuilder.WriteString(fmt.Sprintf("💳 Оплата: %s\n", *order.PaymentForm))
|
||||
}
|
||||
|
||||
contentBuilder.WriteString("\n📦 <b>Заказ:</b>\n")
|
||||
for _, item := range items {
|
||||
contentBuilder.WriteString(fmt.Sprintf("- %s (%s): %d шт.\n", *item.NomenclatureName, *item.NomenclatureType, *item.Quantity))
|
||||
}
|
||||
|
||||
if order.ManagerComment != nil {
|
||||
contentBuilder.WriteString(fmt.Sprintf("\n💬 Комментарий: %s", *order.ManagerComment))
|
||||
}
|
||||
if order.FreeFormComment != nil && *order.FreeFormComment != "" {
|
||||
contentBuilder.WriteString(fmt.Sprintf("\n✍️ Доп. комментарий: %s", *order.FreeFormComment))
|
||||
}
|
||||
|
||||
contentStr := contentBuilder.String()
|
||||
status := "pending"
|
||||
|
||||
// Создаем заявку в БД
|
||||
approval := &typescore.Approval{
|
||||
InitiatorID: manager.ID,
|
||||
DepartmentID: manager.DepartmentID,
|
||||
TopicID: topic.ID,
|
||||
Content: &contentStr,
|
||||
Status: &status,
|
||||
// Метаданные (регион и прочее) можно запаковать в Metadata JSON
|
||||
}
|
||||
|
||||
createdApproval, _, err := s.ipc.Database.Approval.CreateApprovalDB(ctx, nil, approval, true)
|
||||
if err == nil && createdApproval != nil {
|
||||
// Привязываем созданную заявку к заказу
|
||||
order.ApprovalID = createdApproval.ID
|
||||
orderStatus := "submitted"
|
||||
order.Status = &orderStatus
|
||||
s.ipc.Database.MonthlyOrders.SaveClientOrder(ctx, nil, order) // Обновляем заказ
|
||||
|
||||
// Тут нужно вызвать флоу создания шагов (SubmitApprovalForSystem из handler.go),
|
||||
// чтобы заявка полетела по цепочке согласований.
|
||||
// Так как это внешний модуль, проще всего интегрировать это через Event Bus или вызов функции роутера.
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
@ -11,6 +11,7 @@ type Admin struct {
|
|||
Name *string `gorm:"type:text;column:name" json:"name,omitempty" db:"name" mapstructure:"name"`
|
||||
PasswordHash *string `gorm:"type:text;not null;column:password_hash" json:"-" db:"password_hash" mapstructure:"password_hash"`
|
||||
IsRoot *bool `gorm:"type:boolean;not null;default:false;column:is_root" json:"is_root" db:"is_root" mapstructure:"is_root"`
|
||||
IsAnalyst *bool `gorm:"type:boolean;not null;default:false;column:is_analyst" json:"is_analyst" db:"is_analyst" mapstructure:"is_analyst"`
|
||||
IsObserver *bool `gorm:"type:boolean;not null;default:false;column:is_observer" json:"is_observer" db:"is_observer" mapstructure:"is_observer"`
|
||||
TelegramID *int64 `gorm:"type:bigint;column:telegram_id" json:"telegram_id,omitempty" db:"telegram_id" mapstructure:"telegram_id"`
|
||||
CreatedAt *time.Time `gorm:"type:timestamp;default:CURRENT_TIMESTAMP;column:created_at" json:"created_at" db:"created_at"`
|
||||
|
|
@ -26,6 +27,7 @@ type AdminReq struct {
|
|||
Login *string `json:"login"`
|
||||
Name *string `json:"name"`
|
||||
Password *string `json:"password"`
|
||||
IsAnalyst *bool `json:"is_analyst"`
|
||||
IsRoot *bool `json:"is_root"`
|
||||
IsObserver *bool `json:"is_observer"`
|
||||
TelegramID *int64 `json:"telegram_id"`
|
||||
|
|
|
|||
|
|
@ -0,0 +1,60 @@
|
|||
package typescore
|
||||
|
||||
import "time"
|
||||
|
||||
// MonthlyOrderSetting — настройки периода заказа (задаются аналитиком)
|
||||
type MonthlyOrderSetting struct {
|
||||
ID *uint64 `json:"id" db:"id" gorm:"primaryKey;autoIncrement"`
|
||||
Month *int `json:"month" db:"month"`
|
||||
Year *int `json:"year" db:"year"`
|
||||
DeadlineDate *time.Time `json:"deadline_date" db:"deadline_date"` // Дата закрытия доступа
|
||||
AssemblyTimeDays *int `json:"assembly_time_days" db:"assembly_time_days"` // Срок сборки заказа (задается аналитиком)
|
||||
CreatedAt *time.Time `json:"created_at" db:"created_at"`
|
||||
UpdatedAt *time.Time `json:"updated_at" db:"updated_at"`
|
||||
}
|
||||
|
||||
// MonthlyOrderClient — заказ конкретного клиента у менеджера
|
||||
type MonthlyOrderClient struct {
|
||||
ID *uint64 `json:"id" db:"id" gorm:"primaryKey;autoIncrement"`
|
||||
ManagerID *uint64 `json:"manager_id" db:"manager_id"`
|
||||
Month *int `json:"month" db:"month"`
|
||||
Year *int `json:"year" db:"year"`
|
||||
ClientName *string `json:"client_name" db:"client_name"`
|
||||
|
||||
// Комментарии
|
||||
ManagerComment *string `json:"manager_comment" db:"manager_comment"` // Основной из списка
|
||||
CustomReason *string `json:"custom_reason" db:"custom_reason"` // Причина, если "Заказа не будет"
|
||||
FreeFormComment *string `json:"free_form_comment" db:"free_form_comment"` // Свободный текст в конце
|
||||
|
||||
// Сопроводительная информация
|
||||
Decade *string `json:"decade" db:"decade"`
|
||||
Delivery *string `json:"delivery" db:"delivery"`
|
||||
Conditions *string `json:"conditions" db:"conditions"`
|
||||
PaymentForm *string `json:"payment_form" db:"payment_form"`
|
||||
|
||||
Status *string `json:"status" db:"status"` // draft, submitted, approved
|
||||
ApprovalID *uint64 `json:"approval_id" db:"approval_id"` // ID созданной заявки в боте (если уже отправлено)
|
||||
CreatedAt *time.Time `json:"created_at" db:"created_at"`
|
||||
UpdatedAt *time.Time `json:"updated_at" db:"updated_at"`
|
||||
|
||||
// Связи (не хранятся напрямую в этой таблице)
|
||||
Items []MonthlyOrderItem `json:"items,omitempty" gorm:"-" db:"-"`
|
||||
Files []MonthlyOrderFile `json:"files,omitempty" gorm:"-" db:"-"`
|
||||
}
|
||||
|
||||
// MonthlyOrderItem — конкретная номенклатура и ее количество в заказе клиента
|
||||
type MonthlyOrderItem struct {
|
||||
ID *uint64 `json:"id" db:"id" gorm:"primaryKey;autoIncrement"`
|
||||
OrderClientID *uint64 `json:"order_client_id" db:"order_client_id"`
|
||||
NomenclatureName *string `json:"nomenclature_name" db:"nomenclature_name"`
|
||||
NomenclatureType *string `json:"nomenclature_type" db:"nomenclature_type"`
|
||||
Quantity *int `json:"quantity" db:"quantity"`
|
||||
}
|
||||
|
||||
// MonthlyOrderFile — приложенные файлы к заказе клиента
|
||||
type MonthlyOrderFile struct {
|
||||
ID *uint64 `json:"id" db:"id" gorm:"primaryKey;autoIncrement"`
|
||||
OrderClientID *uint64 `json:"order_client_id" db:"order_client_id"`
|
||||
FileBase64 *string `json:"file_base64" db:"file_base64"`
|
||||
FileName *string `json:"file_name" db:"file_name"`
|
||||
}
|
||||
67
go.work.sum
67
go.work.sum
|
|
@ -1,3 +1,13 @@
|
|||
cel.dev/expr v0.25.2 h1:K6j46C81hXtZQfuX60cVWQFBJahKSE2gfRbNuvr5bFs=
|
||||
cel.dev/expr v0.25.2/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
|
||||
cloud.google.com/go v0.112.2 h1:ZaGT6LiG7dBzi6zNOvVZwacaXlmf3lRqnC4DQzqyRQw=
|
||||
cloud.google.com/go v0.112.2/go.mod h1:iEqjp//KquGIJV/m+Pk3xecgKNhV+ry+vVTsy4TbDms=
|
||||
cloud.google.com/go/longrunning v0.5.6 h1:xAe8+0YaWoCKr9t1+aWe+OeQgN/iJK1fEgZSXmjuEaE=
|
||||
cloud.google.com/go/longrunning v0.5.6/go.mod h1:vUaDrWYOMKRuhiv6JBnn49YxCPz2Ayn9GqyjaBT8/mA=
|
||||
cloud.google.com/go/translate v1.10.3 h1:g+B29z4gtRGsiKDoTF+bNeH25bLRokAaElygX2FcZkE=
|
||||
cloud.google.com/go/translate v1.10.3/go.mod h1:GW0vC1qvPtd3pgtypCv4k4U8B7EdgK9/QEF2aJEUovs=
|
||||
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.33.0 h1:l7+6kwRMJNwdCvYdDl7Eax+wzEYHSnNY7zrrfbhDdTA=
|
||||
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.33.0/go.mod h1:pJTkW8hEUIIi3Pf65lPZOnn4Y81yCllX6IWk2jNXdkM=
|
||||
github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
|
||||
github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
|
||||
github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
|
||||
|
|
@ -13,9 +23,22 @@ github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310 h1:BUAU3CGlLvorLI26
|
|||
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
|
||||
github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY=
|
||||
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
|
||||
github.com/cncf/xds/go v0.0.0-20260202195803-dba9d589def2 h1:aBangftG7EVZoUb69Os8IaYg++6uMOdKK83QtkkvJik=
|
||||
github.com/cncf/xds/go v0.0.0-20260202195803-dba9d589def2/go.mod h1:qwXFYgsP6T7XnJtbKlf1HP8AjxZZyzxMmc+Lq5GjlU4=
|
||||
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
|
||||
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
|
||||
github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w=
|
||||
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
|
||||
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/envoyproxy/go-control-plane v0.14.0 h1:hbG2kr4RuFj222B6+7T83thSPqLjwBIfQawTkC++2HA=
|
||||
github.com/envoyproxy/go-control-plane v0.14.0/go.mod h1:NcS5X47pLl/hfqxU70yPwL9ZMkUlwlKxtAohpi2wBEU=
|
||||
github.com/envoyproxy/go-control-plane/envoy v1.37.0 h1:u3riX6BoYRfF4Dr7dwSOroNfdSbEPe9Yyl09/B6wBrQ=
|
||||
github.com/envoyproxy/go-control-plane/envoy v1.37.0/go.mod h1:DReE9MMrmecPy+YvQOAOHNYMALuowAnbjjEMkkWOi6A=
|
||||
github.com/envoyproxy/go-control-plane/ratelimit v0.1.0 h1:/G9QYbddjL25KvtKTv3an9lx6VBE2cnb8wp1vEGNYGI=
|
||||
github.com/envoyproxy/go-control-plane/ratelimit v0.1.0/go.mod h1:Wk+tMFAFbCXaJPzVVHnPgRKdUdwW/KdbRt94AzgRee4=
|
||||
github.com/envoyproxy/protoc-gen-validate v1.3.3 h1:MVQghNeW+LZcmXe7SY1V36Z+WFMDjpqGAGacLe2T0ds=
|
||||
github.com/envoyproxy/protoc-gen-validate v1.3.3/go.mod h1:TsndJ/ngyIdQRhMcVVGDDHINPLWB7C82oDArY51KfB0=
|
||||
github.com/go-jose/go-jose/v4 v4.1.4 h1:moDMcTHmvE6Groj34emNPLs/qtYXRVcd6S7NHbHz3kA=
|
||||
github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
|
||||
github.com/go-openapi/swag/cmdutils v0.26.1 h1:f2iE1ijYaJ3nuu5PaEMx3zpEhzhZFgivCJObWEObLIQ=
|
||||
github.com/go-openapi/swag/cmdutils v0.26.1/go.mod h1:Sm1MVFMkF6guJJ+pQqHnQA3N0j9qALV3NxzDSv6bETM=
|
||||
|
|
@ -26,6 +49,16 @@ github.com/go-openapi/swag/mangling v0.26.1/go.mod h1:POETDH01hqAdASXfw7ISEd9bCO
|
|||
github.com/go-openapi/swag/netutils v0.26.1 h1:BNctoc39WTAUMxyAs355fExOPzMZtPbZ0ZZ1Am2FR5M=
|
||||
github.com/go-openapi/swag/netutils v0.26.1/go.mod h1:y02vByhZhQPAVwOX+0KipXFZ/hUbk6G/Enhf5rGaOkQ=
|
||||
github.com/gofiber/fiber/v2 v2.52.0/go.mod h1:KEOE+cXMhXG0zHc9d8+E38hoX+ZN7bhOtgeF2oT6jrQ=
|
||||
github.com/golang/glog v1.2.5 h1:DrW6hGnjIhtvhOIiAKT6Psh/Kd/ldepEa81DKeiRJ5I=
|
||||
github.com/golang/glog v1.2.5/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
|
||||
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
|
||||
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
|
||||
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
|
||||
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
|
||||
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
|
||||
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
|
||||
github.com/google/go-pkcs11 v0.3.0 h1:PVRnTgtArZ3QQqTGtbtjtnIkzl2iY2kt24yqbrf7td8=
|
||||
github.com/google/go-pkcs11 v0.3.0/go.mod h1:6eQoGcuNJpa7jnd5pMGdkSaQpNDYvPlXWMcjXXThLlY=
|
||||
github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw=
|
||||
github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
|
||||
github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA=
|
||||
|
|
@ -33,6 +66,8 @@ github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH
|
|||
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
|
||||
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
|
||||
github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
|
||||
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
||||
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
||||
github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA=
|
||||
github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
|
||||
github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
|
||||
|
|
@ -49,6 +84,10 @@ github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx
|
|||
github.com/natefinch/atomic v1.0.1 h1:ZPYKxkqQOx3KZ+RsbnP/YsgvxWQPGxjC0oBt2AhwV0A=
|
||||
github.com/natefinch/atomic v1.0.1/go.mod h1:N/D/ELrljoqDyT3rZrsUmtsuzvHkeB/wWjHV22AZRbM=
|
||||
github.com/philhofer/fwd v1.1.2/go.mod h1:qkPdfjR2SIEbspLqpe1tO4n5yICnr2DY7mqEx2tUTP0=
|
||||
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=
|
||||
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
|
||||
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
|
||||
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/posener/complete v1.1.1 h1:ccV59UEOTzVDnDUEFdT95ZzHVZ+5+158q8+SJb2QV5w=
|
||||
github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
|
||||
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
||||
|
|
@ -61,6 +100,8 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV
|
|||
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
|
||||
github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
|
||||
github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
|
||||
github.com/spiffe/go-spiffe/v2 v2.7.0 h1:uXe1MflJoHw58wAUvxVlcM7WpKtijWG7I1UidcGh6g4=
|
||||
github.com/spiffe/go-spiffe/v2 v2.7.0/go.mod h1:47Q0Q9/AqGha8QLHp+kxpH4Wca7X7EnOtlIJy3mxZ3U=
|
||||
github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
|
||||
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
|
||||
github.com/tinylib/msgp v1.1.8/go.mod h1:qkpG+2ldGg4xRFmx+jfTvZPxfGFhi64BcnL9vkCm/Tw=
|
||||
|
|
@ -70,6 +111,16 @@ github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyC
|
|||
github.com/valyala/fasthttp v1.51.0/go.mod h1:oI2XroL+lI7vdXyYoQk03bXBThfFl2cVdIA3Xl7cH8g=
|
||||
github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
|
||||
github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=
|
||||
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
|
||||
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
|
||||
go.opentelemetry.io/contrib/detectors/gcp v1.44.0 h1:NmLfL734pJhM0JKaYd2Y28+nY9dPRWYAAbxhRCrKXPw=
|
||||
go.opentelemetry.io/contrib/detectors/gcp v1.44.0/go.mod h1:tNAsgd8avTGke1+MndXlU5Cru4PQ9Ai/cCNWQv/ZJ/s=
|
||||
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0 h1:yI1/OhfEPy7J9eoa6Sj051C7n5dvpj0QX8g4sRchg04=
|
||||
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0/go.mod h1:NoUCKYWK+3ecatC4HjkRktREheMeEtrXoQxrqYFeHSc=
|
||||
go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58=
|
||||
go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0=
|
||||
go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI=
|
||||
go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA=
|
||||
golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
|
||||
golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
|
||||
golang.org/x/image v0.25.0 h1:Y6uW6rH1y5y/LK1J8BPWZtr6yZ7hrsy6hFrXjgsc2fQ=
|
||||
|
|
@ -93,6 +144,8 @@ golang.org/x/telemetry v0.0.0-20260109210033-bd525da824e2 h1:O1cMQHRfwNpDfDJerqR
|
|||
golang.org/x/telemetry v0.0.0-20260109210033-bd525da824e2/go.mod h1:b7fPSJ0pKZ3ccUh8gnTONJxhn3c/PS6tyzQvyqw4iA8=
|
||||
golang.org/x/telemetry v0.0.0-20260610154732-fb80ec83bdd9 h1:FjUup8XrRy7lv+XHONi6KKUSizeF2NnVrTnz/HhbohQ=
|
||||
golang.org/x/telemetry v0.0.0-20260610154732-fb80ec83bdd9/go.mod h1:3AWMyWHS+caVoiEXpiq6+tzKA40J4vQT3MYr80ZtQpc=
|
||||
golang.org/x/telemetry v0.0.0-20260625142307-59b4966ccb57 h1:nwGZBCt+FnXUrGsj5vjzAsEmkcaFvd82BbOjECiFYZc=
|
||||
golang.org/x/telemetry v0.0.0-20260625142307-59b4966ccb57/go.mod h1:3AWMyWHS+caVoiEXpiq6+tzKA40J4vQT3MYr80ZtQpc=
|
||||
golang.org/x/term v0.33.0 h1:NuFncQrRcaRvVmgRkvM3j/F00gWIAlcmlB8ACEKmGIg=
|
||||
golang.org/x/term v0.33.0/go.mod h1:s18+ql9tYWp1IfpV9DmCtQDDSRBUjKaw9M1eAv5UeF0=
|
||||
golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4=
|
||||
|
|
@ -101,13 +154,27 @@ golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg=
|
|||
golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM=
|
||||
golang.org/x/term v0.44.0 h1:0rLvDRCtNj0gZkyIXhCyOb2OAzEhLVqc4B+hrsBhrmc=
|
||||
golang.org/x/term v0.44.0/go.mod h1:7ze4MdzUzLXpSAoFP1H0bOI9aXDqveSvatT5vKcFh2Y=
|
||||
golang.org/x/term v0.45.0 h1:NwWyBmoJCbfTHpxrWoZ9C6/VxOf7ic219I8xZZFdrf0=
|
||||
golang.org/x/term v0.45.0/go.mod h1:9aqxs0blBcrm/n0L9QW0aRVD+ktan8ssZromtqJC43w=
|
||||
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
|
||||
golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg=
|
||||
golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s=
|
||||
golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc=
|
||||
golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
|
||||
golang.org/x/tools v0.45.0/go.mod h1:LuUGqqaXcXMEFEruIVJVm5mgDD8vww/z/SR1gQ4uE/0=
|
||||
golang.org/x/tools v0.47.0 h1:7Kn5x/d1svx/PzryTsqeoZN4TZwqeH5pGWjefhLi/1Q=
|
||||
golang.org/x/tools v0.47.0/go.mod h1:dFHnyTvFWY212G+h7ZY4Vsp/K3U4/7W9TyVaAul8uCA=
|
||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
|
||||
gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
|
||||
gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
|
||||
google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
|
||||
google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
|
||||
google.golang.org/genproto v0.0.0-20260319201613-d00831a3d3e7 h1:XzmzkmB14QhVhgnawEVsOn6OFsnpyxNPRY9QV01dNB0=
|
||||
google.golang.org/genproto v0.0.0-20260319201613-d00831a3d3e7/go.mod h1:L43LFes82YgSonw6iTXTxXUX1OlULt4AQtkik4ULL/I=
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20260630182238-925bb5da69e7 h1:jQ9p21COKWjP3VwuFrNRiiOTMh3mPpN45R7SLrH/HUU=
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20260630182238-925bb5da69e7/go.mod h1:KqHwBx2upmfa1XSi1WuRvC+2VGCLtooKkfmyvRbUmqA=
|
||||
google.golang.org/genproto/googleapis/bytestream v0.0.0-20260807164820-c8921c73eeea h1:UWZWShWaGCxLql7oakxNzRXXaGjb0pm+K2zMzw0azz0=
|
||||
google.golang.org/genproto/googleapis/bytestream v0.0.0-20260807164820-c8921c73eeea/go.mod h1:zpqRtTwVou7odpidkkHm+GTCum9L4nuS3SvU5rrEeik=
|
||||
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
|
||||
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
|
||||
gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ=
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ import (
|
|||
dashboardhandler "bitrix_balancer_api/rest_admin_service/handlers/dashboard"
|
||||
departmentshandler "bitrix_balancer_api/rest_admin_service/handlers/departments"
|
||||
nodeshandler "bitrix_balancer_api/rest_admin_service/handlers/flow_nodes"
|
||||
monthlyorders "bitrix_balancer_api/rest_admin_service/handlers/monthly_orders"
|
||||
notificationshandler "bitrix_balancer_api/rest_admin_service/handlers/notification"
|
||||
permissionshandler "bitrix_balancer_api/rest_admin_service/handlers/permission"
|
||||
profilehandler "bitrix_balancer_api/rest_admin_service/handlers/profile"
|
||||
|
|
@ -227,6 +228,7 @@ func registerRoutes(router chi.Router, ipc *typesm.InternalProviderControl) erro
|
|||
{"flownodes", nodeshandler.RegisterFlowNodesRoutes},
|
||||
{"approvalextras", approvalextrashandler.RegisterApprovalExtrasRoutes},
|
||||
{"adminlog", adminloghandler.RegisterAdminLogRoutes},
|
||||
{"monthlyorders", monthlyorders.RegisterMonthlyOrdersRoutes},
|
||||
}
|
||||
|
||||
// Регистрация всех маршрутов
|
||||
|
|
|
|||
|
|
@ -137,6 +137,7 @@ func (s *AdminsReg) CreateAdminHandler(w http.ResponseWriter, r *http.Request) (
|
|||
PasswordHash: tempPasswordHash,
|
||||
IsRoot: req.IsRoot,
|
||||
IsObserver: req.IsObserver,
|
||||
IsAnalyst: req.IsAnalyst,
|
||||
TelegramID: req.TelegramID,
|
||||
}
|
||||
|
||||
|
|
@ -337,6 +338,9 @@ func (s *AdminsReg) UpdateAdminHandler(w http.ResponseWriter, r *http.Request) (
|
|||
if req.IsRoot != nil {
|
||||
updateObj.IsRoot = req.IsRoot
|
||||
}
|
||||
if req.IsAnalyst != nil {
|
||||
updateObj.IsAnalyst = req.IsAnalyst
|
||||
}
|
||||
if req.IsObserver != nil {
|
||||
updateObj.IsObserver = req.IsObserver
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
{
|
||||
"type": "service_account",
|
||||
"project_id": "ruspet",
|
||||
"private_key_id": "37f429a3549be247a03a37cc3274e8d4ea9f7bde",
|
||||
"private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCwWSW8v4Tdp3US\nxLLJUTAlW0aMFEkbCbyf5U22jjzNhHPfgg019yvgJPSjm51oSH9kC5PYo/z2Tnxp\nUsxzAaBrKL7DfrGbNQkuQyLPUQj6w2Co5P4N1lRdYeli9fxXpbf496BbSyl8M2yf\nNjIO7L+9K+nRCqkMwzDfHFS8frJNhPy5u98w/eFSSiyHI14ocXzVYgt6w4bBWwht\nDGhjxAegpGtjgkXi9BZ9tKhcK3vlkQiG4UAqWQdA4gqfFXFis7xf1z4iHBOAvIXe\nJbKIsCpGNIDe5dROt5r7wGtgXjtKfWXjs+Te0NJ8om8f29wkan6hFX/QQ7uMJio9\ndE4iiO8fAgMBAAECggEABULQ7JByzcwM+D+JrUDbT1n+66HqoRW0HLm8t56xs1iU\nE7hvssr0x6NCmyOYLsAZm39O7K55Fv4LbyGgZilHww/8SkfG06sMODxE1xYt+ZEy\nRTJOXqpPalkdRdhcgV7jyK0r3wgJ16HkcobYN81vVkeaRPls8VZcvbiSJ0IeXqVK\n1h2QIKOrcb2RtWRgE9RMrmdgczAznlUU0Lg+WPV1CgAaiGeh9PwAw7qSsSI/z1nR\nTCn027JiByrdEXWFJQSAfPqctqKgeHwfoUOWnssp8IXTNK6PpZZhBfM8h2rXUfME\nXKwhshbySrBoULMIs+O2AcRIOxuWPgsT0fcsOyeqtQKBgQDeOWn+kBQFuBlwsX/B\nn2pkG9EXY9IKUMcecIBXG76TfkQ2xtLPQMLaALWEqL/WJl0VeCSzifialLVxBIIv\nfSJu/yJMaY16VczhlqN7rBU91dFv1+ySUPeRgTMzoZhh4hi4QliA9mqDVvnk3bQN\n2QUL5nBSbigq2grBLSYv6i2MwwKBgQDLJrrP3TxWBD79kaw8P9RK2K1zdYvAwvms\nx1B2HlgS8TwQJUA69JlzKr87Tr00oK2n8mZCmzHpwK4FNkoHfqe8LFdo1ulHYlTG\nKaB5uDYun8XOKYFuUKwe0lpwgdyDefAmHAWwTSK38WOfvVdvdr9C6zpbOZXVqOC/\nXbt9FVhedQKBgQDOx3Hfk8VtxO63NBMC4gmneVLIhvPM8Xk208w4QfLFX7qtlbhX\nbZViMUK2XCeVZ0E6Vv8fqQSRIkrrDRzuf2vpCLKrk5Q3/1qTlw4sZ+WkEi+9+JeD\nVp/m3uf75SPcAPyrh+C+r4xRBj+lPL7sG8JcXmKp8SKjLRzQv+hGsYsM7QKBgQDI\nTkDGceJrAbbGOJs1sM32mpyzikQo5VZfGQtp29OFodxSIxioyMKAvrZdmO6P9Jol\nTamspO9bBwPO2c+2ghiLPsFU+wp6uybRWPwE6DBsWlckRuJ6zgpYPZq08iZmcJXs\nTZcCVZwU+Gr9dyi+G7zME7mvdyEY0XIA3j/ePmyqfQKBgCd90yw1gJU6KnRUJS0U\ns4Z4hcnxRiar9LUk/GX/ELObd6ONs0BiN/GAVRWQl8tP3+J4jlF9XkQVGsGQdHdf\nannCbxcrMt3lHcKyOAOnjMsnWPfqWL5CJ0z+9Thg5L+GXZDCk1SJOu5vwCVVxiw2\nRs5O5K+U9K2xBZcpYhNlt7o2\n-----END PRIVATE KEY-----\n",
|
||||
"client_email": "service-account@ruspet.iam.gserviceaccount.com",
|
||||
"client_id": "117800311304874293466",
|
||||
"auth_uri": "https://accounts.google.com/o/oauth2/auth",
|
||||
"token_uri": "https://oauth2.googleapis.com/token",
|
||||
"auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
|
||||
"client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/service-account%40ruspet.iam.gserviceaccount.com",
|
||||
"universe_domain": "googleapis.com"
|
||||
}
|
||||
|
|
@ -0,0 +1,231 @@
|
|||
package monthlyordershandler
|
||||
|
||||
import (
|
||||
"bitrix_balancer_api/core/lib/external/googlesheets"
|
||||
"bitrix_balancer_api/core/lib/internally/monthly_orders"
|
||||
"bitrix_balancer_api/core/typescore"
|
||||
"bitrix_balancer_api/rest_admin_service/handlers"
|
||||
typesm "bitrix_balancer_api/rest_admin_service/types"
|
||||
"bitrix_balancer_api/telegram_service/types"
|
||||
"context"
|
||||
_ "embed" // Для вшивания ключей гугла
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"io"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"github.com/go-chi/chi/v5"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
//go:embed google-creds.json
|
||||
var googleCredsJSON []byte
|
||||
|
||||
type MonthlyOrdersReg struct {
|
||||
ipc *typesm.InternalProviderControl
|
||||
moService *monthly_orders.MonthlyOrderService
|
||||
}
|
||||
|
||||
// RegisterMonthlyOrdersRoutes регистрирует маршруты для управления заказами на месяц.
|
||||
func RegisterMonthlyOrdersRoutes(
|
||||
r chi.Router,
|
||||
ipc *typesm.InternalProviderControl,
|
||||
) error {
|
||||
// Инициализируем Google Client здесь, при регистрации роутов
|
||||
gsClient, err := googlesheets.NewClient(context.Background(), googleCredsJSON)
|
||||
if err != nil {
|
||||
logrus.Errorf("Не удалось инициализировать Google Sheets API для MonthlyOrders: %v", err)
|
||||
}
|
||||
|
||||
moService := monthly_orders.NewMonthlyOrderService(
|
||||
(*types.InternalProviderControl)(ipc), // Приведение типов, если они лежат в разных пакетах
|
||||
gsClient,
|
||||
"1F1ansQeSuAwhe3Y_mhfm4ja370k5hq67RruE-CVp83w", // Таблица Клиентов
|
||||
"1C4Tl-AQRJENW4THzwH-7yP2Ni0ckMSdm3ndLCrdKr2Y", // Таблица Номенклатуры
|
||||
)
|
||||
|
||||
s := &MonthlyOrdersReg{
|
||||
ipc: ipc,
|
||||
moService: moService,
|
||||
}
|
||||
|
||||
r.Route("/api/monthly-orders", func(r chi.Router) {
|
||||
r.Use(handlers.AccessCodeVerifier(ipc.Config))
|
||||
r.Use(handlers.JWTVerifier(ipc.Config, ipc.Database.Admin, ipc.RedisClient))
|
||||
|
||||
// Менеджер / Аналитик: получение данных
|
||||
handlers.RegisterRoute(r, http.MethodGet, "/matrix", s.GetMatrixHandler)
|
||||
|
||||
// Менеджер: сохранение таблицы
|
||||
handlers.RegisterRoute(r, http.MethodPost, "/save", s.SaveOrdersHandler)
|
||||
|
||||
// Аналитик: настройки
|
||||
handlers.RegisterRoute(r, http.MethodGet, "/settings", s.GetSettingsHandler)
|
||||
handlers.RegisterRoute(r, http.MethodPost, "/settings", s.SaveSettingsHandler)
|
||||
})
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// ==========================================
|
||||
// Вспомогательные методы
|
||||
// ==========================================
|
||||
|
||||
func (s *MonthlyOrdersReg) getManagerUser(ctx context.Context, adminID uint64) (*typescore.User, *typescore.Admin, error) {
|
||||
admins, _, err := s.ipc.Database.Admin.GetAdminsListDB(typescore.ListDbOptions{Filtering: &typescore.Admin{ID: &adminID}})
|
||||
if err != nil || len(admins) == 0 {
|
||||
return nil, nil, errors.New("admin account not found")
|
||||
}
|
||||
admin := admins[0]
|
||||
|
||||
if admin.TelegramID == nil {
|
||||
return nil, admin, errors.New("ваш аккаунт не привязан к Telegram (ID пользователя). Обратитесь к администратору")
|
||||
}
|
||||
|
||||
user, err := s.ipc.Database.User.GetUserByTelegramIDDB(ctx, *admin.TelegramID)
|
||||
if err != nil || user == nil || user.ID == nil {
|
||||
return nil, admin, errors.New("пользователь с таким Telegram ID не найден в системе")
|
||||
}
|
||||
|
||||
return user, admin, nil
|
||||
}
|
||||
|
||||
// ==========================================
|
||||
// Хендлеры
|
||||
// ==========================================
|
||||
|
||||
func (s *MonthlyOrdersReg) GetMatrixHandler(w http.ResponseWriter, r *http.Request) (interface{}, error) {
|
||||
ctx := r.Context()
|
||||
adminID, err := handlers.GetIDFromContext(ctx)
|
||||
if err != nil {
|
||||
return nil, errors.New("user not authenticated")
|
||||
}
|
||||
|
||||
user, admin, err := s.getManagerUser(ctx, adminID)
|
||||
targetManagerID := uint64(0)
|
||||
|
||||
// Если авторизовался АНАЛИТИК
|
||||
if admin != nil && admin.IsAnalyst != nil && *admin.IsAnalyst {
|
||||
queryManagerID := r.URL.Query().Get("manager_id")
|
||||
if queryManagerID != "" {
|
||||
parsedID, _ := strconv.ParseUint(queryManagerID, 10, 64)
|
||||
targetManagerID = parsedID
|
||||
} else {
|
||||
return nil, errors.New("аналитику необходимо передать manager_id для просмотра таблицы")
|
||||
}
|
||||
} else {
|
||||
// Если авторизовался МЕНЕДЖЕР
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
targetManagerID = *user.ID
|
||||
}
|
||||
|
||||
if s.moService == nil {
|
||||
return nil, errors.New("сервис заказов не инициализирован (отсутствуют ключи Google)")
|
||||
}
|
||||
|
||||
matrix, err := s.moService.GetMyOrderData(ctx, targetManagerID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return matrix, nil
|
||||
}
|
||||
|
||||
type SaveOrdersRequest struct {
|
||||
Orders []typescore.MonthlyOrderClient `json:"orders"`
|
||||
}
|
||||
|
||||
func (s *MonthlyOrdersReg) SaveOrdersHandler(w http.ResponseWriter, r *http.Request) (interface{}, error) {
|
||||
ctx := r.Context()
|
||||
adminID, err := handlers.GetIDFromContext(ctx)
|
||||
if err != nil {
|
||||
return nil, errors.New("user not authenticated")
|
||||
}
|
||||
|
||||
user, admin, err := s.getManagerUser(ctx, adminID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if admin.IsAnalyst != nil && *admin.IsAnalyst {
|
||||
return nil, errors.New("аналитик не может редактировать заказы менеджеров")
|
||||
}
|
||||
|
||||
body, err := io.ReadAll(r.Body)
|
||||
defer r.Body.Close()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var req SaveOrdersRequest
|
||||
if err := json.Unmarshal(body, &req); err != nil {
|
||||
return nil, errors.New("invalid request body")
|
||||
}
|
||||
|
||||
now := time.Now()
|
||||
month, year := int(now.Month()), now.Year()
|
||||
|
||||
for _, order := range req.Orders {
|
||||
order.ManagerID = user.ID
|
||||
order.Month = &month
|
||||
order.Year = &year
|
||||
|
||||
_, err := s.ipc.Database.MonthlyOrders.SaveClientOrder(ctx, nil, &order)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
return map[string]string{"status": "success"}, nil
|
||||
}
|
||||
|
||||
func (s *MonthlyOrdersReg) GetSettingsHandler(w http.ResponseWriter, r *http.Request) (interface{}, error) {
|
||||
now := time.Now()
|
||||
month, year := int(now.Month()), now.Year()
|
||||
|
||||
settings, err := s.ipc.Database.MonthlyOrders.GetCurrentSettings(r.Context(), month, year)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return settings, nil
|
||||
}
|
||||
|
||||
func (s *MonthlyOrdersReg) SaveSettingsHandler(w http.ResponseWriter, r *http.Request) (interface{}, error) {
|
||||
ctx := r.Context()
|
||||
adminID, err := handlers.GetIDFromContext(ctx)
|
||||
if err != nil {
|
||||
return nil, errors.New("user not authenticated")
|
||||
}
|
||||
|
||||
admins, _, _ := s.ipc.Database.Admin.GetAdminsListDB(typescore.ListDbOptions{Filtering: &typescore.Admin{ID: &adminID}})
|
||||
if len(admins) == 0 || admins[0].IsAnalyst == nil || !*admins[0].IsAnalyst {
|
||||
return nil, errors.New("только аналитик может изменять настройки")
|
||||
}
|
||||
|
||||
body, err := io.ReadAll(r.Body)
|
||||
defer r.Body.Close()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var settings typescore.MonthlyOrderSetting
|
||||
if err := json.Unmarshal(body, &settings); err != nil {
|
||||
return nil, errors.New("invalid request body")
|
||||
}
|
||||
|
||||
now := time.Now()
|
||||
month, year := int(now.Month()), now.Year()
|
||||
settings.Month = &month
|
||||
settings.Year = &year
|
||||
|
||||
err = s.ipc.Database.MonthlyOrders.SaveSettings(ctx, nil, &settings)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return map[string]string{"status": "success"}, nil
|
||||
}
|
||||
|
|
@ -1,15 +1,24 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
_ "embed"
|
||||
|
||||
configcore "bitrix_balancer_api/core/config"
|
||||
"bitrix_balancer_api/core/lib/external/googlesheets"
|
||||
clientcontrollers "bitrix_balancer_api/core/lib/internally/client-controllers"
|
||||
"bitrix_balancer_api/core/lib/internally/monthly_orders"
|
||||
tgupdatehandler "bitrix_balancer_api/telegram_service/common/update"
|
||||
"bitrix_balancer_api/telegram_service/scheduler"
|
||||
"bitrix_balancer_api/telegram_service/types"
|
||||
"context"
|
||||
"github.com/sirupsen/logrus"
|
||||
"log"
|
||||
"runtime/debug"
|
||||
)
|
||||
|
||||
//go:embed google-creds.json
|
||||
var googleCredsJSON []byte
|
||||
|
||||
func main() {
|
||||
err := initService()
|
||||
if err != nil {
|
||||
|
|
@ -36,6 +45,22 @@ func initService() error {
|
|||
dailyReminder := scheduler.NewDailyReminder(ipc)
|
||||
dailyReminder.Start()
|
||||
|
||||
ctx := context.Background()
|
||||
gsClient, err := googlesheets.NewClient(ctx, googleCredsJSON)
|
||||
if err != nil {
|
||||
logrus.Errorf("Не удалось инициализировать Google Sheets API: %v", err)
|
||||
}
|
||||
|
||||
moService := monthly_orders.NewMonthlyOrderService(
|
||||
ipc,
|
||||
gsClient,
|
||||
"1F1ansQeSuAwhe3Y_mhfm4ja370k5hq67RruE-CVp83w",
|
||||
"1C4Tl-AQRJENW4THzwH-7yP2Ni0ckMSdm3ndLCrdKr2Y",
|
||||
)
|
||||
|
||||
monthlyOrderChecker := scheduler.NewMonthlyOrderChecker(ipc, moService)
|
||||
monthlyOrderChecker.Start()
|
||||
|
||||
update := tgupdatehandler.NewUpdateHandler(ipc)
|
||||
go func() {
|
||||
defer handlePanic("update.GetUpdateTelegram goroutine") // Обработка паник в горутине
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
{
|
||||
"type": "service_account",
|
||||
"project_id": "ruspet",
|
||||
"private_key_id": "37f429a3549be247a03a37cc3274e8d4ea9f7bde",
|
||||
"private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCwWSW8v4Tdp3US\nxLLJUTAlW0aMFEkbCbyf5U22jjzNhHPfgg019yvgJPSjm51oSH9kC5PYo/z2Tnxp\nUsxzAaBrKL7DfrGbNQkuQyLPUQj6w2Co5P4N1lRdYeli9fxXpbf496BbSyl8M2yf\nNjIO7L+9K+nRCqkMwzDfHFS8frJNhPy5u98w/eFSSiyHI14ocXzVYgt6w4bBWwht\nDGhjxAegpGtjgkXi9BZ9tKhcK3vlkQiG4UAqWQdA4gqfFXFis7xf1z4iHBOAvIXe\nJbKIsCpGNIDe5dROt5r7wGtgXjtKfWXjs+Te0NJ8om8f29wkan6hFX/QQ7uMJio9\ndE4iiO8fAgMBAAECggEABULQ7JByzcwM+D+JrUDbT1n+66HqoRW0HLm8t56xs1iU\nE7hvssr0x6NCmyOYLsAZm39O7K55Fv4LbyGgZilHww/8SkfG06sMODxE1xYt+ZEy\nRTJOXqpPalkdRdhcgV7jyK0r3wgJ16HkcobYN81vVkeaRPls8VZcvbiSJ0IeXqVK\n1h2QIKOrcb2RtWRgE9RMrmdgczAznlUU0Lg+WPV1CgAaiGeh9PwAw7qSsSI/z1nR\nTCn027JiByrdEXWFJQSAfPqctqKgeHwfoUOWnssp8IXTNK6PpZZhBfM8h2rXUfME\nXKwhshbySrBoULMIs+O2AcRIOxuWPgsT0fcsOyeqtQKBgQDeOWn+kBQFuBlwsX/B\nn2pkG9EXY9IKUMcecIBXG76TfkQ2xtLPQMLaALWEqL/WJl0VeCSzifialLVxBIIv\nfSJu/yJMaY16VczhlqN7rBU91dFv1+ySUPeRgTMzoZhh4hi4QliA9mqDVvnk3bQN\n2QUL5nBSbigq2grBLSYv6i2MwwKBgQDLJrrP3TxWBD79kaw8P9RK2K1zdYvAwvms\nx1B2HlgS8TwQJUA69JlzKr87Tr00oK2n8mZCmzHpwK4FNkoHfqe8LFdo1ulHYlTG\nKaB5uDYun8XOKYFuUKwe0lpwgdyDefAmHAWwTSK38WOfvVdvdr9C6zpbOZXVqOC/\nXbt9FVhedQKBgQDOx3Hfk8VtxO63NBMC4gmneVLIhvPM8Xk208w4QfLFX7qtlbhX\nbZViMUK2XCeVZ0E6Vv8fqQSRIkrrDRzuf2vpCLKrk5Q3/1qTlw4sZ+WkEi+9+JeD\nVp/m3uf75SPcAPyrh+C+r4xRBj+lPL7sG8JcXmKp8SKjLRzQv+hGsYsM7QKBgQDI\nTkDGceJrAbbGOJs1sM32mpyzikQo5VZfGQtp29OFodxSIxioyMKAvrZdmO6P9Jol\nTamspO9bBwPO2c+2ghiLPsFU+wp6uybRWPwE6DBsWlckRuJ6zgpYPZq08iZmcJXs\nTZcCVZwU+Gr9dyi+G7zME7mvdyEY0XIA3j/ePmyqfQKBgCd90yw1gJU6KnRUJS0U\ns4Z4hcnxRiar9LUk/GX/ELObd6ONs0BiN/GAVRWQl8tP3+J4jlF9XkQVGsGQdHdf\nannCbxcrMt3lHcKyOAOnjMsnWPfqWL5CJ0z+9Thg5L+GXZDCk1SJOu5vwCVVxiw2\nRs5O5K+U9K2xBZcpYhNlt7o2\n-----END PRIVATE KEY-----\n",
|
||||
"client_email": "service-account@ruspet.iam.gserviceaccount.com",
|
||||
"client_id": "117800311304874293466",
|
||||
"auth_uri": "https://accounts.google.com/o/oauth2/auth",
|
||||
"token_uri": "https://oauth2.googleapis.com/token",
|
||||
"auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
|
||||
"client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/service-account%40ruspet.iam.gserviceaccount.com",
|
||||
"universe_domain": "googleapis.com"
|
||||
}
|
||||
|
|
@ -0,0 +1,57 @@
|
|||
package scheduler
|
||||
|
||||
import (
|
||||
"bitrix_balancer_api/core/lib/internally/monthly_orders"
|
||||
"bitrix_balancer_api/telegram_service/types"
|
||||
"context"
|
||||
"github.com/sirupsen/logrus"
|
||||
"time"
|
||||
)
|
||||
|
||||
type MonthlyOrderChecker struct {
|
||||
ipc *types.InternalProviderControl
|
||||
service *monthly_orders.MonthlyOrderService
|
||||
}
|
||||
|
||||
func NewMonthlyOrderChecker(ipc *types.InternalProviderControl, service *monthly_orders.MonthlyOrderService) *MonthlyOrderChecker {
|
||||
return &MonthlyOrderChecker{ipc: ipc, service: service}
|
||||
}
|
||||
|
||||
func (c *MonthlyOrderChecker) Start() {
|
||||
go c.loop()
|
||||
}
|
||||
|
||||
func (c *MonthlyOrderChecker) loop() {
|
||||
for {
|
||||
now := time.Now()
|
||||
// Проверяем каждые 15 минут
|
||||
time.Sleep(15 * time.Minute)
|
||||
|
||||
month, year := int(now.Month()), now.Year()
|
||||
ctx := context.Background()
|
||||
|
||||
settings, err := c.ipc.Database.MonthlyOrders.GetCurrentSettings(ctx, month, year)
|
||||
if err != nil || settings == nil || settings.DeadlineDate == nil {
|
||||
continue
|
||||
}
|
||||
|
||||
// Если дедлайн прошел (время сейчас > времени дедлайна)
|
||||
if now.After(*settings.DeadlineDate) {
|
||||
// Получаем всех уникальных менеджеров, у которых есть черновики
|
||||
managers, _ := c.ipc.Database.MonthlyOrders.GetManagersWithDraftsDB(ctx, month, year)
|
||||
|
||||
for _, managerID := range managers {
|
||||
logrus.Infof("Автоотправка заказов по дедлайну для менеджера %d", managerID)
|
||||
|
||||
// Вызываем тот самый метод отправки
|
||||
err := c.service.SubmitOrdersToTelegram(ctx, managerID)
|
||||
if err != nil {
|
||||
logrus.Errorf("Ошибка автоотправки для менеджера %d: %v", managerID, err)
|
||||
}
|
||||
}
|
||||
|
||||
// Здесь же можно вызвать формирование отчета в Google Sheets
|
||||
// c.service.GenerateAndUploadReport(ctx, month, year)
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue