From 9c995f54ef9c5062e62fcce330cf948cb0d3368f Mon Sep 17 00:00:00 2001 From: romanskijdev Date: Mon, 12 Oct 2026 12:01:22 +0300 Subject: [PATCH] Remove nomenclature type from monthly orders approval text --- core/db/methods/admin.go | 3 +++ core/db/methods/admin_action_logs.go | 3 +++ core/db/methods/approval.go | 4 ++++ core/db/methods/approval_additional_approver.go | 3 +++ core/db/methods/approval_additional_observer.go | 3 +++ core/db/methods/approval_comment.go | 3 +++ core/db/methods/approval_file.go | 3 +++ core/db/methods/approval_step.go | 3 +++ core/db/methods/approval_task.go | 2 ++ service/telegram_service/handlers/approval/handler.go | 2 +- 10 files changed, 28 insertions(+), 1 deletion(-) diff --git a/core/db/methods/admin.go b/core/db/methods/admin.go index 7f753ee..af8ed90 100644 --- a/core/db/methods/admin.go +++ b/core/db/methods/admin.go @@ -9,6 +9,7 @@ import ( "errors" "fmt" "strings" + "time" "github.com/Masterminds/squirrel" "github.com/jackc/pgx/v5" @@ -87,6 +88,8 @@ func (u *AdminDB) CreateAdminDB(tx pgx.Tx, adminObj *typescore.Admin, returnObj ctx, cancel := context.WithTimeout(context.Background(), variables.ContextTimeoutBase) defer cancel() + now := time.Now().UTC() + adminObj.CreatedAt = &now err := dbutils.ExecuteTx(ctx, u.pool, tx, func(tx pgx.Tx) error { query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).Insert(dbcoretablenames.TableNameAdmin.ToString()) diff --git a/core/db/methods/admin_action_logs.go b/core/db/methods/admin_action_logs.go index f2a843d..eb245fb 100644 --- a/core/db/methods/admin_action_logs.go +++ b/core/db/methods/admin_action_logs.go @@ -6,6 +6,7 @@ import ( dbutils "bitrix_balancer_api/core/utilscore/db" "context" "errors" + "time" "github.com/Masterminds/squirrel" "github.com/jackc/pgx/v5" @@ -134,6 +135,8 @@ func (u *AdminActionLogDB) CreateAdminActionLogDB(ctx context.Context, tx pgx.Tx var insertedID uint64 + now := time.Now().UTC() + obj.CreatedAt = &now err := dbutils.ExecuteTx(ctx, u.pool, tx, func(tx pgx.Tx) error { query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar). Insert(dbcoretablenames.TableNameAdminActionLogs.ToString()) diff --git a/core/db/methods/approval.go b/core/db/methods/approval.go index 3ea92b4..151fdf7 100644 --- a/core/db/methods/approval.go +++ b/core/db/methods/approval.go @@ -243,6 +243,8 @@ func (u *ApprovalDB) CreateApprovalDB(ctx context.Context, tx pgx.Tx, ApprovalOb var insertedID uint64 + now := time.Now().UTC() + ApprovalObj.CreatedAt = &now err := dbutils.ExecuteTx(ctx, u.pool, tx, func(tx pgx.Tx) error { query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar). Insert(dbcoretablenames.TableNameApprovals.ToString()) @@ -275,6 +277,8 @@ func (u *ApprovalDB) UpdateApprovalDB(ctx context.Context, tx pgx.Tx, paramsUpda return nil, nil, errors.New("approval obj is nil") } + now := time.Now().UTC() + paramsUpdate.CreatedAt = &now err := dbutils.ExecuteTx(ctx, u.pool, tx, func(tx pgx.Tx) error { query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).Update(dbcoretablenames.TableNameApprovals.ToString()) query = dbutils.AddNonNullFieldsToQueryUpdate(query, *paramsUpdate) diff --git a/core/db/methods/approval_additional_approver.go b/core/db/methods/approval_additional_approver.go index e9a0350..1ebadad 100644 --- a/core/db/methods/approval_additional_approver.go +++ b/core/db/methods/approval_additional_approver.go @@ -10,6 +10,7 @@ import ( "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgxpool" "github.com/sirupsen/logrus" + "time" ) type ApprovalAdditionalApproverDB struct { @@ -76,6 +77,8 @@ func (u *ApprovalAdditionalApproverDB) CreateApprovalAdditionalApproverDB(ctx co var insertedID uint64 + now := time.Now().UTC() + ApprovalAdditionalApproverObj.CreatedAt = &now err := dbutils.ExecuteTx(ctx, u.pool, tx, func(tx pgx.Tx) error { query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar). Insert(dbcoretablenames.TableNameApprovalAdditionalApprovers.ToString()) diff --git a/core/db/methods/approval_additional_observer.go b/core/db/methods/approval_additional_observer.go index 7c5295c..2be7dd4 100644 --- a/core/db/methods/approval_additional_observer.go +++ b/core/db/methods/approval_additional_observer.go @@ -10,6 +10,7 @@ import ( "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgxpool" "github.com/sirupsen/logrus" + "time" ) type ApprovalAdditionalObserverDB struct { @@ -76,6 +77,8 @@ func (u *ApprovalAdditionalObserverDB) CreateApprovalAdditionalObserverDB(ctx co var insertedID uint64 + now := time.Now().UTC() + ApprovalAdditionalObserverObj.CreatedAt = &now err := dbutils.ExecuteTx(ctx, u.pool, tx, func(tx pgx.Tx) error { query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar). Insert(dbcoretablenames.TableNameApprovalAdditionalObservers.ToString()) diff --git a/core/db/methods/approval_comment.go b/core/db/methods/approval_comment.go index 59932d1..6b20106 100644 --- a/core/db/methods/approval_comment.go +++ b/core/db/methods/approval_comment.go @@ -10,6 +10,7 @@ import ( "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgxpool" "github.com/sirupsen/logrus" + "time" ) type ApprovalCommentDB struct { @@ -77,6 +78,8 @@ func (u *ApprovalCommentDB) CreateApprovalCommentDB(ctx context.Context, tx pgx. var insertedID uint64 + now := time.Now().UTC() + ApprovalCommentObj.CreatedAt = &now err := dbutils.ExecuteTx(ctx, u.pool, tx, func(tx pgx.Tx) error { query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar). Insert(dbcoretablenames.TableNameApprovalComments.ToString()) diff --git a/core/db/methods/approval_file.go b/core/db/methods/approval_file.go index aa27e12..678b604 100644 --- a/core/db/methods/approval_file.go +++ b/core/db/methods/approval_file.go @@ -10,6 +10,7 @@ import ( "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgxpool" "github.com/sirupsen/logrus" + "time" ) type ApprovalFileDB struct { @@ -79,6 +80,8 @@ func (u *ApprovalFileDB) CreateApprovalFileDB(ctx context.Context, tx pgx.Tx, Ap var insertedID uint64 + now := time.Now().UTC() + ApprovalFileObj.CreatedAt = &now err := dbutils.ExecuteTx(ctx, u.pool, tx, func(tx pgx.Tx) error { query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar). Insert(dbcoretablenames.TableNameApprovalFiles.ToString()) diff --git a/core/db/methods/approval_step.go b/core/db/methods/approval_step.go index c76ed3a..a550140 100644 --- a/core/db/methods/approval_step.go +++ b/core/db/methods/approval_step.go @@ -7,6 +7,7 @@ import ( "context" "errors" "github.com/sirupsen/logrus" + "time" "github.com/Masterminds/squirrel" "github.com/jackc/pgx/v5" @@ -78,6 +79,8 @@ func (u *ApprovalStepDB) CreateApprovalStepDB(ctx context.Context, tx pgx.Tx, Ap return nil, nil, errors.New("ApprovalStep obj is nil") } + now := time.Now().UTC() + ApprovalStepObj.CreatedAt = &now err := dbutils.ExecuteTx(ctx, u.pool, tx, func(tx pgx.Tx) error { query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).Insert(dbcoretablenames.TableNameApprovalSteps.ToString()) diff --git a/core/db/methods/approval_task.go b/core/db/methods/approval_task.go index 397547f..30132e2 100644 --- a/core/db/methods/approval_task.go +++ b/core/db/methods/approval_task.go @@ -101,6 +101,8 @@ func (u *ApprovalTaskDB) CreateApprovalTaskDB(ctx context.Context, tx pgx.Tx, Ap var insertedID uint64 + now := time.Now().UTC() + ApprovalTaskObj.CreatedAt = &now err := dbutils.ExecuteTx(ctx, u.pool, tx, func(tx pgx.Tx) error { query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar). Insert(dbcoretablenames.TableNameApprovalTasks.ToString()) diff --git a/service/telegram_service/handlers/approval/handler.go b/service/telegram_service/handlers/approval/handler.go index d70bb20..fd3a668 100644 --- a/service/telegram_service/handlers/approval/handler.go +++ b/service/telegram_service/handlers/approval/handler.go @@ -398,7 +398,7 @@ func (h *Handler) performActualRevoke( } approvalID := *approval.ID - now := time.Now().UTC() + now := time.Now() revokedStatus := "revoked" approval.Status = &revokedStatus approval.RevokedByID = revoker.ID