Updated ZNZT app #157

Merged
romanskijdev merged 1 commits from fix-permissions into main 2026-09-29 12:54:47 +03:00
2 changed files with 77 additions and 12 deletions

View File

@ -19,6 +19,61 @@ func NewMonthlyOrderDB(pool *pgxpool.Pool) *MonthlyOrderDB {
return &MonthlyOrderDB{pool: pool}
}
type OrderFilterOptions struct {
ManagerID *uint64
Month *int
Year *int
Status *string
OrderType *string
}
// GetFilteredClientOrdersDB получает заказы с опциональной фильтрацией в SQL
func (db *MonthlyOrderDB) GetFilteredClientOrdersDB(ctx context.Context, opts OrderFilterOptions) ([]*typescore.MonthlyOrderClient, error) {
fields := dbutils.GetStructFieldsDB(&typescore.MonthlyOrderClient{}, string(dbcoretablenames.TableNameMonthlyOrderClients))
query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).
Select(fields...).
From(string(dbcoretablenames.TableNameMonthlyOrderClients))
if opts.ManagerID != nil {
query = query.Where(squirrel.Eq{"manager_id": *opts.ManagerID})
}
if opts.Month != nil {
query = query.Where(squirrel.Eq{"month": *opts.Month})
}
if opts.Year != nil {
query = query.Where(squirrel.Eq{"year": *opts.Year})
}
if opts.Status != nil {
query = query.Where(squirrel.Eq{"status": *opts.Status})
}
if opts.OrderType != nil {
query = query.Where(squirrel.Eq{"order_type": *opts.OrderType})
}
sqlStr, args, err := query.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
}
func (db *MonthlyOrderDB) GetFilesByOrderIDDB(ctx context.Context, orderID uint64) ([]*typescore.MonthlyOrderFile, error) {
fields := dbutils.GetStructFieldsDB(&typescore.MonthlyOrderFile{}, "monthly_order_files")

View File

@ -1,6 +1,7 @@
package monthly_orders
import (
dbcore "bitrix_balancer_api/core/db/methods"
"bitrix_balancer_api/core/lib/external/googlesheets"
"bitrix_balancer_api/core/typescore"
"bitrix_balancer_api/telegram_service/types"
@ -91,23 +92,32 @@ func (s *MonthlyOrderService) GetMyOrderData(ctx context.Context, managerID uint
ordersMap := make(map[string]*typescore.MonthlyOrderClient)
// Всегда читаем заказы из БД, но фильтруем их интеллектуально
dbOrders, err := s.ipc.Database.MonthlyOrders.GetClientOrdersByManagerDB(ctx, managerID, month, year)
// Определяем, какой статус и тип заказа нам нужен в зависимости от блокировки (дедлайна)
statusDraft := "draft"
suppType := "supplementary"
mainType := "main"
filterOpts := dbcore.OrderFilterOptions{
ManagerID: &managerID,
Month: &month,
Year: &year,
Status: &statusDraft, // Берем только черновики!
}
if isLocked {
filterOpts.OrderType = &suppType
} else {
filterOpts.OrderType = &mainType
}
logrus.Infof("Период: %s", *filterOpts.OrderType)
dbOrders, err := s.ipc.Database.MonthlyOrders.GetFilteredClientOrdersDB(ctx, filterOpts)
if err != nil {
logrus.Errorf("🚨 ОШИБКА ЧТЕНИЯ ЗАКАЗОВ ИЗ БД: %v", err)
}
for _, o := range dbOrders {
if isLocked {
if o.Status == nil || *o.Status != "draft" || (o.OrderType != nil && *o.OrderType != "supplementary") {
continue
}
} else {
if o.Status != nil && *o.Status != "draft" {
continue
}
}
if o.ID != nil {
// Достаем позиции
items, err := s.ipc.Database.MonthlyOrders.GetItemsByOrderIDDB(ctx, *o.ID)