Add suggestion db methods
This commit is contained in:
parent
f307458f90
commit
a07121e3c8
|
|
@ -29,6 +29,8 @@ type ModuleDB struct {
|
|||
ApprovalAdditionalApprover *dbcore.ApprovalAdditionalApproverDB
|
||||
ApprovalTasks *dbcore.ApprovalTaskDB
|
||||
ApprovalComment *dbcore.ApprovalCommentDB
|
||||
Suggestion *dbcore.SuggestionDB
|
||||
SuggestionMessage *dbcore.SuggestionMessageDB
|
||||
}
|
||||
|
||||
func NewModuleDB(
|
||||
|
|
@ -74,6 +76,8 @@ func initDBModules(modules *ModuleDB, redisClient *redismodule.ModuleRedis) *Mod
|
|||
modules.ApprovalAdditionalApprover = dbcore.NewApprovalAdditionalApproverDB(modules.Pool)
|
||||
modules.ApprovalTasks = dbcore.NewApprovalTaskDB(modules.Pool)
|
||||
modules.ApprovalComment = dbcore.NewApprovalCommentDB(modules.Pool)
|
||||
modules.SuggestionMessage = dbcore.NewSuggestionMessageDB(modules.Pool)
|
||||
modules.Suggestion = dbcore.NewSuggestionDB(modules.Pool)
|
||||
|
||||
return modules
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,192 @@
|
|||
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/sirupsen/logrus"
|
||||
|
||||
"github.com/Masterminds/squirrel"
|
||||
"github.com/jackc/pgx/v5"
|
||||
"github.com/jackc/pgx/v5/pgxpool"
|
||||
)
|
||||
|
||||
type SuggestionDB struct {
|
||||
pool *pgxpool.Pool
|
||||
}
|
||||
|
||||
func NewSuggestionDB(pool *pgxpool.Pool) *SuggestionDB {
|
||||
return &SuggestionDB{
|
||||
pool: pool,
|
||||
}
|
||||
}
|
||||
|
||||
type SuggestionDBI interface {
|
||||
GetSuggestionsListDB(ctx context.Context, options ...typescore.ListDbOptions) ([]*typescore.Suggestion, uint64, error)
|
||||
CreateSuggestionDB(ctx context.Context, tx pgx.Tx, SuggestionObj *typescore.Suggestion, returnObj ...bool) (*typescore.Suggestion, pgx.Tx, error)
|
||||
UpdateSuggestionDB(ctx context.Context, tx pgx.Tx, paramsUpdate *typescore.Suggestion, returnObj ...bool) (*typescore.Suggestion, pgx.Tx, error)
|
||||
DeleteSuggestionDB(ctx context.Context, params *typescore.Suggestion) error
|
||||
GetSuggestionByIDDB(ctx context.Context, id uint64) (*typescore.Suggestion, error)
|
||||
}
|
||||
|
||||
func (u *SuggestionDB) GetSuggestionsListDB(ctx context.Context, opts ...typescore.ListDbOptions) ([]*typescore.Suggestion, uint64, error) {
|
||||
fields := dbutils.GetStructFieldsDB(&typescore.Suggestion{}, dbcoretablenames.TableNameSuggestions.ToString())
|
||||
selectFields := append(fields, "COUNT(*) OVER() AS total_count")
|
||||
|
||||
options, filter, err := dbutils.GetOptionsDB[typescore.Suggestion](opts...)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
|
||||
query := dbutils.BuildSelectQuery(dbcoretablenames.TableNameSuggestions.ToString(), selectFields)
|
||||
query = dbutils.SetterLimitAndOffsetQuery(query, options.Offset, options.Limit)
|
||||
query = dbutils.ApplyFilters(query, filter, options.LikeFields, dbcoretablenames.TableNameSuggestions.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 Suggestions []*typescore.Suggestion
|
||||
var totalCount uint64
|
||||
for rows.Next() {
|
||||
Suggestion := &typescore.Suggestion{}
|
||||
if err := dbutils.ScanRowsToStructRows(rows, Suggestion, &totalCount); err != nil {
|
||||
logrus.Warn("GetSuggestionsListDB:ScanRowsToStructRows", err)
|
||||
continue
|
||||
}
|
||||
Suggestions = append(Suggestions, Suggestion)
|
||||
}
|
||||
|
||||
return Suggestions, totalCount, nil
|
||||
}
|
||||
|
||||
func (u *SuggestionDB) CreateSuggestionDB(ctx context.Context, tx pgx.Tx, SuggestionObj *typescore.Suggestion, returnObj ...bool) (*typescore.Suggestion, pgx.Tx, error) {
|
||||
if SuggestionObj == nil {
|
||||
return nil, nil, errors.New("Suggestion obj is nil")
|
||||
}
|
||||
|
||||
err := dbutils.ExecuteTx(ctx, u.pool, tx, func(tx pgx.Tx) error {
|
||||
query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).Insert(dbcoretablenames.TableNameSuggestions.ToString())
|
||||
|
||||
sqlV, args, err := dbutils.GenerateInsertRequest(query, SuggestionObj)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
_, err = tx.Exec(ctx, *sqlV, 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 {
|
||||
Suggestion, _, err := u.GetSuggestionsListDB(ctx, typescore.ListDbOptions{Filtering: SuggestionObj})
|
||||
if err != nil {
|
||||
return nil, tx, err
|
||||
}
|
||||
if len(Suggestion) > 0 {
|
||||
return Suggestion[0], tx, nil
|
||||
}
|
||||
}
|
||||
|
||||
return nil, tx, nil
|
||||
}
|
||||
|
||||
func (u *SuggestionDB) UpdateSuggestionDB(ctx context.Context, tx pgx.Tx, paramsUpdate *typescore.Suggestion, returnObj ...bool) (*typescore.Suggestion, pgx.Tx, error) {
|
||||
if paramsUpdate.ID == nil {
|
||||
return nil, nil, errors.New("Suggestion obj is nil")
|
||||
}
|
||||
|
||||
err := dbutils.ExecuteTx(ctx, u.pool, tx, func(tx pgx.Tx) error {
|
||||
query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).Update(dbcoretablenames.TableNameSuggestions.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.Suggestion{ID: paramsUpdate.ID}}
|
||||
getInfoUp, _, err := u.GetSuggestionsListDB(ctx, options)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
if len(getInfoUp) > 0 {
|
||||
return getInfoUp[0], tx, nil
|
||||
}
|
||||
}
|
||||
|
||||
return nil, tx, nil
|
||||
}
|
||||
|
||||
func (u *SuggestionDB) DeleteSuggestionDB(ctx context.Context, params *typescore.Suggestion) error {
|
||||
if params != nil && params.ID != nil {
|
||||
query, args, err := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).
|
||||
Delete(dbcoretablenames.TableNameSuggestions.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("Suggestion obj is nil")
|
||||
}
|
||||
}
|
||||
|
||||
func (u *SuggestionDB) GetSuggestionByIDDB(ctx context.Context, id uint64) (*typescore.Suggestion, error) {
|
||||
deps, _, err := u.GetSuggestionsListDB(ctx, typescore.ListDbOptions{
|
||||
Filtering: &typescore.Suggestion{ID: &id},
|
||||
})
|
||||
if err != nil || len(deps) == 0 {
|
||||
return nil, err
|
||||
}
|
||||
return deps[0], nil
|
||||
}
|
||||
|
|
@ -0,0 +1,192 @@
|
|||
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/sirupsen/logrus"
|
||||
|
||||
"github.com/Masterminds/squirrel"
|
||||
"github.com/jackc/pgx/v5"
|
||||
"github.com/jackc/pgx/v5/pgxpool"
|
||||
)
|
||||
|
||||
type SuggestionMessageDB struct {
|
||||
pool *pgxpool.Pool
|
||||
}
|
||||
|
||||
func NewSuggestionMessageDB(pool *pgxpool.Pool) *SuggestionMessageDB {
|
||||
return &SuggestionMessageDB{
|
||||
pool: pool,
|
||||
}
|
||||
}
|
||||
|
||||
type SuggestionMessageDBI interface {
|
||||
GetSuggestionMessagesListDB(ctx context.Context, options ...typescore.ListDbOptions) ([]*typescore.SuggestionMessage, uint64, error)
|
||||
CreateSuggestionMessageDB(ctx context.Context, tx pgx.Tx, SuggestionMessageObj *typescore.SuggestionMessage, returnObj ...bool) (*typescore.SuggestionMessage, pgx.Tx, error)
|
||||
UpdateSuggestionMessageDB(ctx context.Context, tx pgx.Tx, paramsUpdate *typescore.SuggestionMessage, returnObj ...bool) (*typescore.SuggestionMessage, pgx.Tx, error)
|
||||
DeleteSuggestionMessageDB(ctx context.Context, params *typescore.SuggestionMessage) error
|
||||
GetSuggestionMessageByIDDB(ctx context.Context, id uint64) (*typescore.SuggestionMessage, error)
|
||||
}
|
||||
|
||||
func (u *SuggestionMessageDB) GetSuggestionMessagesListDB(ctx context.Context, opts ...typescore.ListDbOptions) ([]*typescore.SuggestionMessage, uint64, error) {
|
||||
fields := dbutils.GetStructFieldsDB(&typescore.SuggestionMessage{}, dbcoretablenames.TableNameSuggestionMessages.ToString())
|
||||
selectFields := append(fields, "COUNT(*) OVER() AS total_count")
|
||||
|
||||
options, filter, err := dbutils.GetOptionsDB[typescore.SuggestionMessage](opts...)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
|
||||
query := dbutils.BuildSelectQuery(dbcoretablenames.TableNameSuggestionMessages.ToString(), selectFields)
|
||||
query = dbutils.SetterLimitAndOffsetQuery(query, options.Offset, options.Limit)
|
||||
query = dbutils.ApplyFilters(query, filter, options.LikeFields, dbcoretablenames.TableNameSuggestionMessages.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 SuggestionMessages []*typescore.SuggestionMessage
|
||||
var totalCount uint64
|
||||
for rows.Next() {
|
||||
SuggestionMessage := &typescore.SuggestionMessage{}
|
||||
if err := dbutils.ScanRowsToStructRows(rows, SuggestionMessage, &totalCount); err != nil {
|
||||
logrus.Warn("GetSuggestionMessagesListDB:ScanRowsToStructRows", err)
|
||||
continue
|
||||
}
|
||||
SuggestionMessages = append(SuggestionMessages, SuggestionMessage)
|
||||
}
|
||||
|
||||
return SuggestionMessages, totalCount, nil
|
||||
}
|
||||
|
||||
func (u *SuggestionMessageDB) CreateSuggestionMessageDB(ctx context.Context, tx pgx.Tx, SuggestionMessageObj *typescore.SuggestionMessage, returnObj ...bool) (*typescore.SuggestionMessage, pgx.Tx, error) {
|
||||
if SuggestionMessageObj == nil {
|
||||
return nil, nil, errors.New("SuggestionMessage obj is nil")
|
||||
}
|
||||
|
||||
err := dbutils.ExecuteTx(ctx, u.pool, tx, func(tx pgx.Tx) error {
|
||||
query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).Insert(dbcoretablenames.TableNameSuggestionMessages.ToString())
|
||||
|
||||
sqlV, args, err := dbutils.GenerateInsertRequest(query, SuggestionMessageObj)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
_, err = tx.Exec(ctx, *sqlV, 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 {
|
||||
SuggestionMessage, _, err := u.GetSuggestionMessagesListDB(ctx, typescore.ListDbOptions{Filtering: SuggestionMessageObj})
|
||||
if err != nil {
|
||||
return nil, tx, err
|
||||
}
|
||||
if len(SuggestionMessage) > 0 {
|
||||
return SuggestionMessage[0], tx, nil
|
||||
}
|
||||
}
|
||||
|
||||
return nil, tx, nil
|
||||
}
|
||||
|
||||
func (u *SuggestionMessageDB) UpdateSuggestionMessageDB(ctx context.Context, tx pgx.Tx, paramsUpdate *typescore.SuggestionMessage, returnObj ...bool) (*typescore.SuggestionMessage, pgx.Tx, error) {
|
||||
if paramsUpdate.ID == nil {
|
||||
return nil, nil, errors.New("SuggestionMessage obj is nil")
|
||||
}
|
||||
|
||||
err := dbutils.ExecuteTx(ctx, u.pool, tx, func(tx pgx.Tx) error {
|
||||
query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).Update(dbcoretablenames.TableNameSuggestionMessages.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.SuggestionMessage{ID: paramsUpdate.ID}}
|
||||
getInfoUp, _, err := u.GetSuggestionMessagesListDB(ctx, options)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
if len(getInfoUp) > 0 {
|
||||
return getInfoUp[0], tx, nil
|
||||
}
|
||||
}
|
||||
|
||||
return nil, tx, nil
|
||||
}
|
||||
|
||||
func (u *SuggestionMessageDB) DeleteSuggestionMessageDB(ctx context.Context, params *typescore.SuggestionMessage) error {
|
||||
if params != nil && params.ID != nil {
|
||||
query, args, err := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).
|
||||
Delete(dbcoretablenames.TableNameSuggestionMessages.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("SuggestionMessage obj is nil")
|
||||
}
|
||||
}
|
||||
|
||||
func (u *SuggestionMessageDB) GetSuggestionMessageByIDDB(ctx context.Context, id uint64) (*typescore.SuggestionMessage, error) {
|
||||
deps, _, err := u.GetSuggestionMessagesListDB(ctx, typescore.ListDbOptions{
|
||||
Filtering: &typescore.SuggestionMessage{ID: &id},
|
||||
})
|
||||
if err != nil || len(deps) == 0 {
|
||||
return nil, err
|
||||
}
|
||||
return deps[0], nil
|
||||
}
|
||||
Loading…
Reference in New Issue