Added env variable to config && update db tables for addtitional observers
This commit is contained in:
parent
bcab566f41
commit
69db31ec4c
|
|
@ -8,6 +8,7 @@ type ExposedServiceOptions struct {
|
|||
|
||||
// ConfigLoadOptions определяет, какие группы конфигурации нужно загружать
|
||||
type ConfigLoadOptions struct {
|
||||
Env bool
|
||||
Redis bool
|
||||
Database bool
|
||||
Bitrix bool
|
||||
|
|
|
|||
|
|
@ -84,10 +84,11 @@ type SecretsConfig struct {
|
|||
}
|
||||
|
||||
type Config struct {
|
||||
Redis RedisConfig `yaml:"redis"`
|
||||
Database DatabaseConfig `yaml:"database"`
|
||||
Telegram TelegramConfig `yaml:"telegram"`
|
||||
Server Server `yaml:"server"`
|
||||
Secrets SecretsConfig `yaml:"secrets"`
|
||||
Bitrix Bitrix `yaml:"bitrix"`
|
||||
Environment string `yaml:"env"`
|
||||
Redis RedisConfig `yaml:"redis"`
|
||||
Database DatabaseConfig `yaml:"database"`
|
||||
Telegram TelegramConfig `yaml:"telegram"`
|
||||
Server Server `yaml:"server"`
|
||||
Secrets SecretsConfig `yaml:"secrets"`
|
||||
Bitrix Bitrix `yaml:"bitrix"`
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
env: "dev" # dev \ prod
|
||||
redis:
|
||||
addr: ""
|
||||
username: ""
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import (
|
|||
_ "embed"
|
||||
"errors"
|
||||
"fmt"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
//go:embed config.yml
|
||||
|
|
@ -30,6 +31,14 @@ func LoadConfig(options *ConfigLoadOptions) (*Config, error) {
|
|||
|
||||
// copyConfigFields копирует поля из source в target на основе опций options
|
||||
func copyConfigFields(options *ConfigLoadOptions, source, target *Config) {
|
||||
if options == nil {
|
||||
logrus.Error("config options is nil")
|
||||
return
|
||||
}
|
||||
|
||||
if options.Env {
|
||||
target.Environment = source.Environment
|
||||
}
|
||||
// Копируем Redis
|
||||
if options.Redis {
|
||||
target.Redis = source.Redis
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ type ModuleDB struct {
|
|||
ApprovalComment *dbcore.ApprovalCommentDB
|
||||
Suggestion *dbcore.SuggestionDB
|
||||
SuggestionMessage *dbcore.SuggestionMessageDB
|
||||
ApprovalAdditionalObserver *dbcore.ApprovalAdditionalObserverDB
|
||||
}
|
||||
|
||||
func NewModuleDB(
|
||||
|
|
@ -78,6 +79,7 @@ func initDBModules(modules *ModuleDB, redisClient *redismodule.ModuleRedis) *Mod
|
|||
modules.ApprovalComment = dbcore.NewApprovalCommentDB(modules.Pool)
|
||||
modules.SuggestionMessage = dbcore.NewSuggestionMessageDB(modules.Pool)
|
||||
modules.Suggestion = dbcore.NewSuggestionDB(modules.Pool)
|
||||
modules.ApprovalAdditionalObserver = dbcore.NewApprovalAdditionalObserverDB(modules.Pool)
|
||||
|
||||
return modules
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ func (m *MigrationFunctions) migrateTables() error {
|
|||
tablesmigration.ApprovalCommentsTableMigrate,
|
||||
tablesmigration.SuggestionsTableMigrate,
|
||||
tablesmigration.SuggestionMessagesTableMigrate,
|
||||
tablesmigration.ApprovalAdditionalObserverTableMigrate,
|
||||
}
|
||||
|
||||
for _, migrate := range migrations {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
package tablesmigration
|
||||
|
||||
import (
|
||||
"gorm.io/gorm"
|
||||
"time"
|
||||
)
|
||||
|
||||
func ApprovalAdditionalObserverTableMigrate(db *gorm.DB) error {
|
||||
hasTable := db.Migrator().HasTable(&ApprovalAdditionalObserver{})
|
||||
|
||||
if err := db.AutoMigrate(&ApprovalAdditionalObserver{}); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if !hasTable {
|
||||
time.Sleep(5 * time.Second)
|
||||
|
||||
// Foreign key constraints
|
||||
db.Exec(`ALTER TABLE approval_additional_observers ADD CONSTRAINT fk_approval_additional_approvers_approval_id FOREIGN KEY (approval_id) REFERENCES approvals(id) ON DELETE CASCADE ON UPDATE CASCADE`)
|
||||
db.Exec(`ALTER TABLE approval_additional_observers ADD CONSTRAINT fk_approval_additional_approvers_observer_id FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE ON UPDATE CASCADE`)
|
||||
db.Exec(`ALTER TABLE approval_additional_observers ADD CONSTRAINT fk_approval_additional_approvers_added_by_id FOREIGN KEY (added_by_id) REFERENCES users(id) ON DELETE CASCADE ON UPDATE CASCADE`)
|
||||
|
||||
// Comments
|
||||
execComments(db, `
|
||||
COMMENT ON TABLE "approval_additional_observers" IS 'Дополнительные наблюдатели заявки: кто добавлен для согласования конкретной заявки';
|
||||
COMMENT ON COLUMN "approval_additional_observers".id IS 'Внутренний уникальный идентификатор записи';
|
||||
COMMENT ON COLUMN "approval_additional_observers".approval_id IS 'ID заявки, к которой добавлен согласующий (ссылка на approvals.id)';
|
||||
COMMENT ON COLUMN "approval_additional_observers".user_id IS 'ID сотрудника, добавленного как дополнительный наблюдатель (ссылка на users.id)';
|
||||
COMMENT ON COLUMN "approval_additional_observers".added_by_id IS 'ID сотрудника, который добавил этого согласующего (ссылка на users.id)';
|
||||
COMMENT ON COLUMN "approval_additional_observers".created_at IS 'Дата и время создания записи';
|
||||
`)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
@ -18,6 +18,7 @@ type LocalApprovalDelegationProvider typescore.ApprovalDelegation
|
|||
type LocalApprovalFileProvider typescore.ApprovalFile
|
||||
type LocalApprovalStepProvider typescore.ApprovalStep
|
||||
type ApprovalAdditionalApprover typescore.ApprovalAdditionalApprover
|
||||
type ApprovalAdditionalObserver typescore.ApprovalAdditionalObserver
|
||||
type ApprovalTaskProvider typescore.ApprovalTask
|
||||
type ApprovalCommentsProvider typescore.ApprovalComment
|
||||
type LocalSuggestionProvider typescore.Suggestion
|
||||
|
|
@ -74,3 +75,6 @@ func (LocalSuggestionProvider) TableName() string {
|
|||
func (LocalSuggestionMessagesProvider) TableName() string {
|
||||
return dbcoretablenames.TableNameSuggestionMessages.ToString()
|
||||
}
|
||||
func (ApprovalAdditionalObserver) TableName() string {
|
||||
return dbcoretablenames.TableNameApprovalAdditionalObservers.ToString()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,186 @@
|
|||
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"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type ApprovalAdditionalObserverDB struct {
|
||||
pool *pgxpool.Pool
|
||||
}
|
||||
|
||||
func NewApprovalAdditionalObserverDB(pool *pgxpool.Pool) *ApprovalAdditionalObserverDB {
|
||||
return &ApprovalAdditionalObserverDB{
|
||||
pool: pool,
|
||||
}
|
||||
}
|
||||
|
||||
type ApprovalAdditionalObserverDBI interface {
|
||||
GetApprovalAdditionalObserversListDB(ctx context.Context, options ...typescore.ListDbOptions) ([]*typescore.ApprovalAdditionalObserver, uint64, error)
|
||||
CreateApprovalAdditionalObserverDB(ctx context.Context, tx pgx.Tx, ApprovalAdditionalObserverObj *typescore.ApprovalAdditionalObserver, returnObj ...bool) (*typescore.ApprovalAdditionalObserver, pgx.Tx, error)
|
||||
UpdateApprovalAdditionalObserverDB(ctx context.Context, tx pgx.Tx, paramsUpdate *typescore.ApprovalAdditionalObserver, returnObj ...bool) (*typescore.ApprovalAdditionalObserver, pgx.Tx, error)
|
||||
DeleteApprovalAdditionalObserverDB(ctx context.Context, params *typescore.ApprovalAdditionalObserver) error
|
||||
GetApprovalAdditionalObserverByIDDB(ctx context.Context, id uint64) (*typescore.ApprovalAdditionalObserver, error)
|
||||
}
|
||||
|
||||
func (u *ApprovalAdditionalObserverDB) GetApprovalAdditionalObserversListDB(ctx context.Context, opts ...typescore.ListDbOptions) ([]*typescore.ApprovalAdditionalObserver, uint64, error) {
|
||||
fields := dbutils.GetStructFieldsDB(&typescore.ApprovalAdditionalObserver{}, dbcoretablenames.TableNameApprovalAdditionalObservers.ToString())
|
||||
selectFields := append(fields, "COUNT(*) OVER() AS total_count")
|
||||
|
||||
options, filter, err := dbutils.GetOptionsDB[typescore.ApprovalAdditionalObserver](opts...)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
|
||||
query := dbutils.BuildSelectQuery(dbcoretablenames.TableNameApprovalAdditionalObservers.ToString(), selectFields)
|
||||
query = dbutils.SetterLimitAndOffsetQuery(query, options.Offset, options.Limit)
|
||||
query = dbutils.ApplyFilters(query, filter, options.LikeFields, dbcoretablenames.TableNameApprovalAdditionalObservers.ToString())
|
||||
query = query.OrderBy("created_at DESC")
|
||||
|
||||
sql, args, err := query.ToSql()
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
|
||||
rows, err := u.pool.Query(ctx, sql, args...)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
var ApprovalAdditionalObservers []*typescore.ApprovalAdditionalObserver
|
||||
var totalCount uint64
|
||||
for rows.Next() {
|
||||
ApprovalAdditionalObserver := &typescore.ApprovalAdditionalObserver{}
|
||||
if err := dbutils.ScanRowsToStructRows(rows, ApprovalAdditionalObserver, &totalCount); err != nil {
|
||||
logrus.Warn("GetApprovalAdditionalObserversListDB:ScanRowsToStructRows", err)
|
||||
continue
|
||||
}
|
||||
ApprovalAdditionalObservers = append(ApprovalAdditionalObservers, ApprovalAdditionalObserver)
|
||||
}
|
||||
|
||||
return ApprovalAdditionalObservers, totalCount, nil
|
||||
}
|
||||
|
||||
func (u *ApprovalAdditionalObserverDB) CreateApprovalAdditionalObserverDB(ctx context.Context, tx pgx.Tx, ApprovalAdditionalObserverObj *typescore.ApprovalAdditionalObserver, returnObj ...bool) (*typescore.ApprovalAdditionalObserver, pgx.Tx, error) {
|
||||
if ApprovalAdditionalObserverObj == nil {
|
||||
return nil, nil, errors.New("ApprovalAdditionalObserver obj is nil")
|
||||
}
|
||||
|
||||
var insertedID uint64
|
||||
|
||||
err := dbutils.ExecuteTx(ctx, u.pool, tx, func(tx pgx.Tx) error {
|
||||
query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).
|
||||
Insert(dbcoretablenames.TableNameApprovalAdditionalObservers.ToString())
|
||||
|
||||
sqlV, args, err := dbutils.GenerateInsertRequest(query, ApprovalAdditionalObserverObj)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
*sqlV = *sqlV + " RETURNING id"
|
||||
|
||||
return tx.QueryRow(ctx, *sqlV, args...).Scan(&insertedID)
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
return nil, tx, err
|
||||
}
|
||||
|
||||
returnObjBool := len(returnObj) > 0 && returnObj[0]
|
||||
if returnObjBool && insertedID > 0 {
|
||||
created, err := u.GetApprovalAdditionalObserverByIDDB(ctx, insertedID)
|
||||
return created, tx, err
|
||||
}
|
||||
|
||||
return nil, tx, nil
|
||||
}
|
||||
|
||||
func (u *ApprovalAdditionalObserverDB) UpdateApprovalAdditionalObserverDB(ctx context.Context, tx pgx.Tx, paramsUpdate *typescore.ApprovalAdditionalObserver, returnObj ...bool) (*typescore.ApprovalAdditionalObserver, pgx.Tx, error) {
|
||||
if paramsUpdate.ID == nil {
|
||||
return nil, nil, errors.New("ApprovalAdditionalObserver obj is nil")
|
||||
}
|
||||
|
||||
err := dbutils.ExecuteTx(ctx, u.pool, tx, func(tx pgx.Tx) error {
|
||||
query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).Update(dbcoretablenames.TableNameApprovalAdditionalObservers.ToString())
|
||||
query = dbutils.AddNonNullFieldsToQueryUpdate(query, *paramsUpdate)
|
||||
query = query.Where(squirrel.Eq{"id": paramsUpdate.ID})
|
||||
|
||||
sql, args, err := query.ToSql()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
_, err = tx.Exec(ctx, sql, args...)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
return nil, tx, err
|
||||
}
|
||||
|
||||
returnObjBool := false
|
||||
if len(returnObj) > 0 {
|
||||
returnObjBool = returnObj[0]
|
||||
}
|
||||
|
||||
if returnObjBool {
|
||||
options := typescore.ListDbOptions{Filtering: &typescore.ApprovalAdditionalObserver{ID: paramsUpdate.ID}}
|
||||
getInfoUp, _, err := u.GetApprovalAdditionalObserversListDB(ctx, options)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
if len(getInfoUp) > 0 {
|
||||
return getInfoUp[0], tx, nil
|
||||
}
|
||||
}
|
||||
|
||||
return nil, tx, nil
|
||||
}
|
||||
|
||||
func (u *ApprovalAdditionalObserverDB) DeleteApprovalAdditionalObserverDB(ctx context.Context, params *typescore.ApprovalAdditionalObserver) error {
|
||||
if params != nil && params.ID != nil {
|
||||
query, args, err := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).
|
||||
Delete(dbcoretablenames.TableNameApprovalAdditionalObservers.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("ApprovalAdditionalObserver obj is nil")
|
||||
}
|
||||
}
|
||||
|
||||
func (u *ApprovalAdditionalObserverDB) GetApprovalAdditionalObserverByIDDB(ctx context.Context, id uint64) (*typescore.ApprovalAdditionalObserver, error) {
|
||||
ApprovalAdditionalObservers, _, err := u.GetApprovalAdditionalObserversListDB(ctx, typescore.ListDbOptions{
|
||||
Filtering: &typescore.ApprovalAdditionalObserver{ID: &id},
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if len(ApprovalAdditionalObservers) == 0 {
|
||||
return nil, nil
|
||||
}
|
||||
return ApprovalAdditionalObservers[0], nil
|
||||
}
|
||||
|
|
@ -16,6 +16,7 @@ const (
|
|||
TableNameApprovalFiles TableName = "approval_files"
|
||||
TableNameApprovalDelegations TableName = "approval_delegations"
|
||||
TableNameApprovalAdditionalApprovers TableName = "approval_additional_approvers"
|
||||
TableNameApprovalAdditionalObservers TableName = "approval_additional_observers"
|
||||
TableNameApprovalTasks TableName = "approval_tasks"
|
||||
TableNameApprovalComments TableName = "approval_comments"
|
||||
TableNameSuggestions TableName = "suggestions"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,70 @@
|
|||
package telegram
|
||||
|
||||
import "io"
|
||||
|
||||
func main() {
|
||||
// Инициализация
|
||||
client, _ := NewTgBotClient(&BotConfig{
|
||||
BotKey: "YOUR_BOT_TOKEN",
|
||||
})
|
||||
|
||||
// Отправка сообщения с inline-клавиатурой
|
||||
client.SendMessage(MessageParams{
|
||||
ChatID: 123456789,
|
||||
Text: "Выберите действие:",
|
||||
ParseMode: ParseModeHTML,
|
||||
ReplyMarkup: NewInlineKeyboard().
|
||||
AddRow(
|
||||
NewInlineButton("✅ Принять", "accept"),
|
||||
NewInlineButton("❌ Отклонить", "reject"),
|
||||
).
|
||||
AddRow(
|
||||
NewInlineButtonURL("📖 Документация", "https://example.com"),
|
||||
).
|
||||
Build(),
|
||||
})
|
||||
|
||||
// Отправка документа
|
||||
file := io.Reader(nil) // io.Reader с файлом
|
||||
client.SendDocument(DocumentParams{
|
||||
ChatID: 123456789,
|
||||
Document: file,
|
||||
Caption: "Ваш документ готов",
|
||||
ParseMode: ParseModeHTML,
|
||||
FileName: "report.pdf",
|
||||
})
|
||||
|
||||
// Reply-клавиатура
|
||||
client.SendMessage(MessageParams{
|
||||
ChatID: 123456789,
|
||||
Text: "Выберите из меню:",
|
||||
ReplyMarkup: NewReplyKeyboard().
|
||||
AddRow(
|
||||
NewReplyButton("📋 Согласования"),
|
||||
NewReplyButton("📂 Мои заявки"),
|
||||
).
|
||||
AddRow(NewReplyButton("⚙️ Настройки")).
|
||||
SetPlaceholder("Выберите команду...").
|
||||
Build(),
|
||||
})
|
||||
|
||||
// Редактирование сообщения
|
||||
client.EditMessageText(EditMessageTextParams{
|
||||
ChatID: 123456789,
|
||||
MessageID: 987654321,
|
||||
Text: "Обновлённый текст",
|
||||
ParseMode: ParseModeHTML,
|
||||
})
|
||||
|
||||
// Удаление сообщения
|
||||
client.DeleteMessage(DeleteMessageParams{
|
||||
ChatID: 123456789,
|
||||
MessageID: 987654321,
|
||||
})
|
||||
|
||||
// Ответ на callback
|
||||
client.AnswerCallbackQuery("callback_id", "Принято!", false)
|
||||
|
||||
// Chat action
|
||||
client.SendChatAction(123456789, ChatActionTyping)
|
||||
}
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
package typescore
|
||||
|
||||
import "time"
|
||||
|
||||
type ApprovalAdditionalObserver struct {
|
||||
ID *uint64 `gorm:"column:id;index;type:bigint;autoIncrement;not null;unique" json:"id" db:"id"`
|
||||
ApprovalID *uint64 `gorm:"type:bigint;not null;index;column:approval_id" json:"approval_id" db:"approval_id"`
|
||||
UserID *uint64 `gorm:"type:bigint;not null;index;column:user_id" json:"user_id" db:"user_id"`
|
||||
AddedByID *uint64 `gorm:"type:bigint;not null;index;column:added_by_id" json:"added_by_id" db:"added_by_id"`
|
||||
CreatedAt *time.Time `gorm:"type:timestamp;default:CURRENT_TIMESTAMP;column:created_at" json:"created_at" db:"created_at"`
|
||||
|
||||
User *User `gorm:"-" json:"user,omitempty"`
|
||||
AddedBy *User `gorm:"-" json:"added_by,omitempty"`
|
||||
Approval *Approval `gorm:"-" json:"approval,omitempty"`
|
||||
}
|
||||
|
|
@ -8,20 +8,24 @@ import "time"
|
|||
// PaymentType: own_expense | vacation_account | not_applicable (для partial)
|
||||
// Template хранит шаблон строки для подсказки пользователю при вводе.
|
||||
type ApprovalTopic struct {
|
||||
ID *uint64 `gorm:"column:id;index;type:bigserial;autoIncrement;not null;unique" ignore_update_db:"true" json:"id" db:"id" mapstructure:"id"`
|
||||
CategoryID *uint64 `gorm:"type:bigint;not null;index;column:category_id" json:"category_id" db:"category_id" mapstructure:"category_id"`
|
||||
Name *string `gorm:"type:text;not null;column:name" json:"name" db:"name" mapstructure:"name"`
|
||||
Code *string `gorm:"type:text;not null;unique;column:code" json:"code" db:"code" mapstructure:"code"`
|
||||
DurationType *string `gorm:"type:text;column:duration_type" json:"duration_type,omitempty" db:"duration_type" mapstructure:"duration_type"`
|
||||
TimeType *string `gorm:"type:text;column:time_type" json:"time_type,omitempty" db:"time_type" mapstructure:"time_type"`
|
||||
PaymentType *string `gorm:"type:text;column:payment_type" json:"payment_type,omitempty" db:"payment_type" mapstructure:"payment_type"`
|
||||
Template *string `gorm:"type:text;column:template" json:"template" db:"template" mapstructure:"template"`
|
||||
TaskTemplate *string `gorm:"type:text;column:task_template" json:"task_template,omitempty" db:"task_template" mapstructure:"task_template"`
|
||||
AllowsFile *bool `gorm:"type:boolean;not null;default:false;column:allows_file" json:"allows_file" db:"allows_file" mapstructure:"allows_file"`
|
||||
AllowApproverSelection *bool `gorm:"type:boolean;not null;default:false;column:allow_approver_selection" json:"allow_approver_selection" db:"allow_approver_selection" mapstructure:"allow_approver_selection"`
|
||||
IsActive *bool `gorm:"type:boolean;not null;default:true;column:is_active" json:"is_active" db:"is_active" mapstructure:"is_active"`
|
||||
CreatedAt *time.Time `gorm:"type:timestamp;default:CURRENT_TIMESTAMP;column:created_at" json:"created_at" db:"created_at"`
|
||||
UpdatedAt *time.Time `gorm:"type:timestamp;default:CURRENT_TIMESTAMP;column:updated_at" json:"updated_at" db:"updated_at"`
|
||||
ID *uint64 `gorm:"column:id;index;type:bigserial;autoIncrement;not null;unique" ignore_update_db:"true" json:"id" db:"id" mapstructure:"id"`
|
||||
CategoryID *uint64 `gorm:"type:bigint;not null;index;column:category_id" json:"category_id" db:"category_id" mapstructure:"category_id"`
|
||||
Name *string `gorm:"type:text;not null;column:name" json:"name" db:"name" mapstructure:"name"`
|
||||
Code *string `gorm:"type:text;not null;unique;column:code" json:"code" db:"code" mapstructure:"code"`
|
||||
DurationType *string `gorm:"type:text;column:duration_type" json:"duration_type,omitempty" db:"duration_type" mapstructure:"duration_type"`
|
||||
TimeType *string `gorm:"type:text;column:time_type" json:"time_type,omitempty" db:"time_type" mapstructure:"time_type"`
|
||||
PaymentType *string `gorm:"type:text;column:payment_type" json:"payment_type,omitempty" db:"payment_type" mapstructure:"payment_type"`
|
||||
Template *string `gorm:"type:text;column:template" json:"template" db:"template" mapstructure:"template"`
|
||||
TaskTemplate *string `gorm:"type:text;column:task_template" json:"task_template,omitempty" db:"task_template" mapstructure:"task_template"`
|
||||
FirstApproverRoleCode *string `gorm:"type:text;column:first_approver_role_code"` // если задан — первый согласующий выбирается из этой роли
|
||||
|
||||
AllowsFile *bool `gorm:"type:boolean;not null;default:false;column:allows_file" json:"allows_file" db:"allows_file" mapstructure:"allows_file"`
|
||||
AllowApproverSelection *bool `gorm:"type:boolean;not null;default:false;column:allow_approver_selection"`
|
||||
AllowObserverSelection *bool `gorm:"type:boolean;not null;default:false;column:allow_observer_selection"`
|
||||
|
||||
IsActive *bool `gorm:"type:boolean;not null;default:true;column:is_active" json:"is_active" db:"is_active" mapstructure:"is_active"`
|
||||
CreatedAt *time.Time `gorm:"type:timestamp;default:CURRENT_TIMESTAMP;column:created_at" json:"created_at" db:"created_at"`
|
||||
UpdatedAt *time.Time `gorm:"type:timestamp;default:CURRENT_TIMESTAMP;column:updated_at" json:"updated_at" db:"updated_at"`
|
||||
|
||||
Category *ApprovalTopicCategory `gorm:"-" json:"category,omitempty"`
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,11 +14,15 @@ func WorkerJobsStart(ipc *types.InternalProviderControl) error {
|
|||
ipc: ipc,
|
||||
}
|
||||
|
||||
err := jobs.ipc.Database.Migrate().MigrateDB()
|
||||
if err != nil {
|
||||
return err
|
||||
if ipc.Config.Environment == "" || ipc.Config.Environment == "dev" {
|
||||
err := jobs.ipc.Database.Migrate().MigrateDB()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
logrus.Info("🟢🟢🟢 Database migration completed successfully")
|
||||
} else {
|
||||
logrus.Info("⚠️ production environment variable is set to prod mode. Skip migration")
|
||||
}
|
||||
logrus.Info("🟢🟢🟢 Database migration completed successfully")
|
||||
|
||||
return nil
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue