fixed infinity context in admin req #19
|
|
@ -205,11 +205,10 @@ func (u *AdminDB) DeleteAdminDB(params *typescore.Admin) error {
|
|||
return errors.New(fmt.Sprintf("error_delete: failed to create DELETE %s SQL: %v", dbcoretablenames.TableNameAdmin.ToString(), err))
|
||||
}
|
||||
|
||||
rows, err := u.pool.Query(ctx, query, args...)
|
||||
_, err = u.pool.Exec(ctx, query, args...)
|
||||
if err != nil {
|
||||
return errors.New(fmt.Sprintf("error_delete: failed to create DELETE %s SQL: %v", dbcoretablenames.TableNameAdmin.ToString(), err))
|
||||
return err
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
return nil
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -163,11 +163,10 @@ func (u *ApprovalTaskDB) DeleteApprovalTaskDB(ctx context.Context, params *types
|
|||
return err
|
||||
}
|
||||
|
||||
rows, err := u.pool.Query(ctx, query, args...)
|
||||
_, err = u.pool.Exec(ctx, query, args...)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
return nil
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -169,11 +169,10 @@ func (u *DepartmentDB) DeleteDepartmentDB(ctx context.Context, params *typescore
|
|||
return err
|
||||
}
|
||||
|
||||
rows, err := u.pool.Query(ctx, query, args...)
|
||||
_, err = u.pool.Exec(ctx, query, args...)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
return nil
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -170,11 +170,10 @@ func (u *PermissionDB) DeletePermissionDB(ctx context.Context, params *typescore
|
|||
return err
|
||||
}
|
||||
|
||||
rows, err := u.pool.Query(ctx, query, args...)
|
||||
_, err = u.pool.Exec(ctx, query, args...)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
return nil
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -169,11 +169,10 @@ func (u *RoleDB) DeleteRoleDB(ctx context.Context, params *typescore.Role) error
|
|||
return err
|
||||
}
|
||||
|
||||
rows, err := u.pool.Query(ctx, query, args...)
|
||||
_, err = u.pool.Exec(ctx, query, args...)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
return nil
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -169,11 +169,10 @@ func (u *SuggestionDB) DeleteSuggestionDB(ctx context.Context, params *typescore
|
|||
return err
|
||||
}
|
||||
|
||||
rows, err := u.pool.Query(ctx, query, args...)
|
||||
_, err = u.pool.Exec(ctx, query, args...)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
return nil
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -169,11 +169,10 @@ func (u *SuggestionMessageDB) DeleteSuggestionMessageDB(ctx context.Context, par
|
|||
return err
|
||||
}
|
||||
|
||||
rows, err := u.pool.Query(ctx, query, args...)
|
||||
_, err = u.pool.Exec(ctx, query, args...)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
return nil
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -177,11 +177,10 @@ func (u *UserDB) DeleteUserDB(ctx context.Context, params *typescore.User) error
|
|||
return err
|
||||
}
|
||||
|
||||
rows, err := u.pool.Query(ctx, query, args...)
|
||||
_, err = u.pool.Exec(ctx, query, args...)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
return nil
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -160,26 +160,25 @@ func (u *UserHierarchyDB) UpdateUserHierarchyDB(ctx context.Context, tx pgx.Tx,
|
|||
}
|
||||
|
||||
func (u *UserHierarchyDB) DeleteUserHierarchyDB(ctx context.Context, params *typescore.UserHierarchy) error {
|
||||
if params != nil && params.ID != nil {
|
||||
query, args, err := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).
|
||||
Delete(dbcoretablenames.TableNameUserHierarchy.ToString()).
|
||||
Where(squirrel.Eq{"id": *params.ID}).
|
||||
ToSql()
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
rows, err := u.pool.Query(ctx, query, args...)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
return nil
|
||||
} else {
|
||||
return errors.New("userHierarchy obj is nil")
|
||||
if params == nil || params.ID == nil {
|
||||
return errors.New("userHierarchy obj or id is nil")
|
||||
}
|
||||
|
||||
query, args, err := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).
|
||||
Delete(dbcoretablenames.TableNameUserHierarchy.ToString()).
|
||||
Where(squirrel.Eq{"id": *params.ID}).
|
||||
ToSql()
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
_, err = u.pool.Exec(ctx, query, args...)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (u *UserHierarchyDB) GetApproversDB(ctx context.Context, subordinateID, departmentID, topicID, categoryID uint64) ([]*typescore.User, error) {
|
||||
|
|
|
|||
|
|
@ -168,11 +168,10 @@ func (u *UserRoleDB) DeleteUserRoleDB(ctx context.Context, params *typescore.Use
|
|||
return err
|
||||
}
|
||||
|
||||
rows, err := u.pool.Query(ctx, query, args...)
|
||||
_, err = u.pool.Exec(ctx, query, args...)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
return nil
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -390,17 +390,6 @@ func (s *HierarchiesReg) DeleteHierarchyHandler(w http.ResponseWriter, r *http.R
|
|||
|
||||
ctx := r.Context()
|
||||
|
||||
// Проверяем, что запись существует
|
||||
existingHierarchies, _, err := s.ipc.Database.UserHierarchy.GetUserHierarchyListDB(ctx, typescore.ListDbOptions{
|
||||
Filtering: &typescore.UserHierarchy{ID: req.ID},
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if len(existingHierarchies) == 0 {
|
||||
return nil, errors.New("hierarchy not found")
|
||||
}
|
||||
|
||||
err = s.ipc.Database.UserHierarchy.DeleteUserHierarchyDB(ctx, &req)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package approval
|
|||
import (
|
||||
"bitrix_balancer_api/core/reportcore"
|
||||
"bitrix_balancer_api/core/typescore"
|
||||
"bitrix_balancer_api/core/variables"
|
||||
"bitrix_balancer_api/telegram_service/keyboard"
|
||||
"bitrix_balancer_api/telegram_service/state"
|
||||
"context"
|
||||
|
|
@ -32,7 +33,8 @@ const reportDateLayout = "02.01.2006"
|
|||
// HandleReportMenu — первый шаг: показываем выбор типа отчёта.
|
||||
// HandleReportMenu — сразу показываем выбор периода (тип отчёта один — согласования).
|
||||
func (h *Handler) HandleReportMenu(bot *tgbotapi.BotAPI, chatID int64, telegramID int64) {
|
||||
ctx := context.Background()
|
||||
ctx, cancel := context.WithTimeout(context.Background(), variables.ContextTimeoutBase)
|
||||
cancel()
|
||||
|
||||
user, err := h.ipc.Database.User.GetUserByTelegramIDDB(ctx, telegramID)
|
||||
if err != nil || user == nil || user.ID == nil {
|
||||
|
|
|
|||
Loading…
Reference in New Issue