Remove nomenclature type from monthly orders approval text #175

Merged
romanskijdev merged 1 commits from fix-permissions into main 2026-10-12 12:01:57 +03:00
10 changed files with 28 additions and 1 deletions

View File

@ -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())

View File

@ -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())

View File

@ -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)

View File

@ -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())

View File

@ -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())

View File

@ -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())

View File

@ -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())

View File

@ -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())

View File

@ -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())

View File

@ -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