updated executors filters #38
|
|
@ -28,6 +28,73 @@ type ApprovalTopicExecutorDBI interface {
|
|||
DeleteApprovalTopicExecutorDB(ctx context.Context, params *typescore.ApprovalTopicExecutor) error
|
||||
GetExecutorsByTopicIDDB(ctx context.Context, topicID uint64) ([]*typescore.ApprovalTopicExecutor, error)
|
||||
GetApprovalTopicExecutorListWithParamsDB(ctx context.Context, opts typescore.ListDbOptions) ([]*typescore.ApprovalTopicExecutor, uint64, error)
|
||||
GetApprovalTopicExecutorListByCategoryDB(ctx context.Context, opts typescore.ListDbOptions, categoryID uint64) ([]*typescore.ApprovalTopicExecutor, uint64, error)
|
||||
}
|
||||
|
||||
func (d *ApprovalTopicExecutorDB) GetApprovalTopicExecutorListByCategoryDB(ctx context.Context, opts typescore.ListDbOptions, categoryID uint64) ([]*typescore.ApprovalTopicExecutor, uint64, error) {
|
||||
options, filter, err := dbutils.GetOptionsDB[typescore.ApprovalTopicExecutor](opts)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
|
||||
countQuery := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).
|
||||
Select("COUNT(DISTINCT ate.id)").
|
||||
From(dbcoretablenames.TableNameApprovalTopicExecutor.ToString() + " ate").
|
||||
Join(dbcoretablenames.TableNameApprovalTopics.ToString() + " t ON t.id = ate.topic_id").
|
||||
Where(squirrel.Eq{"t.category_id": categoryID})
|
||||
|
||||
countQuery = dbutils.ApplyFilters(countQuery, filter, options.LikeFields, dbcoretablenames.TableNameApprovalTopicExecutor.ToString())
|
||||
|
||||
countSQL, countArgs, err := countQuery.ToSql()
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
|
||||
var totalCount uint64
|
||||
err = d.pool.QueryRow(ctx, countSQL, countArgs...).Scan(&totalCount)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
|
||||
query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).
|
||||
Select("ate.*").
|
||||
From(dbcoretablenames.TableNameApprovalTopicExecutor.ToString() + " ate").
|
||||
Join(dbcoretablenames.TableNameApprovalTopics.ToString() + " t ON t.id = ate.topic_id").
|
||||
Where(squirrel.Eq{"t.category_id": categoryID}).
|
||||
GroupBy("ate.id")
|
||||
|
||||
query = dbutils.ApplyFilters(query, filter, options.LikeFields, dbcoretablenames.TableNameApprovalTopicExecutor.ToString())
|
||||
|
||||
query = query.OrderBy("ate.step_order ASC, ate.id ASC")
|
||||
query = dbutils.SetterLimitAndOffsetQuery(query, options.Offset, options.Limit)
|
||||
|
||||
sql, args, err := query.ToSql()
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
|
||||
rows, err := d.pool.Query(ctx, sql, args...)
|
||||
if err != nil {
|
||||
logrus.Errorf("GetApprovalTopicExecutorListByCategoryDB Query error: %v", err)
|
||||
return nil, 0, err
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
var result []*typescore.ApprovalTopicExecutor
|
||||
for rows.Next() {
|
||||
item := &typescore.ApprovalTopicExecutor{}
|
||||
if err := dbutils.ScanRowsToStructRows(rows, item, nil); err != nil {
|
||||
logrus.Warn("GetApprovalTopicExecutorListByCategoryDB:ScanRowsToStructRows", err)
|
||||
continue
|
||||
}
|
||||
result = append(result, item)
|
||||
}
|
||||
|
||||
if err = rows.Err(); err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
|
||||
return result, totalCount, nil
|
||||
}
|
||||
|
||||
func (d *ApprovalTopicExecutorDB) GetApprovalTopicExecutorListWithParamsDB(ctx context.Context, opts typescore.ListDbOptions) ([]*typescore.ApprovalTopicExecutor, uint64, error) {
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ import (
|
|||
// @Param limit query integer false "Количество записей на странице"
|
||||
// @Param topic_id query integer false "Фильтр по теме"
|
||||
// @Param user_id query integer false "Фильтр по пользователю"
|
||||
// @Param category_id query integer false "Фильтр по категории темы"
|
||||
// @Param is_active query boolean false "Фильтр по активности"
|
||||
// @Success 200 {object} typescore.ApiResponseBase "Успех"
|
||||
// @Failure 400 {object} handlers.ErrorResponse "Некорректный запрос"
|
||||
|
|
@ -38,6 +39,14 @@ func (s *TopicExecutorsReg) GetTopicExecutorsListHandler(w http.ResponseWriter,
|
|||
return nil, errW
|
||||
}
|
||||
|
||||
// ✅ Добавляем поддержку category_id
|
||||
var categoryID *uint64
|
||||
if categoryIDStr := queryParams.Get("category_id"); categoryIDStr != "" {
|
||||
if id, err := strconv.ParseUint(categoryIDStr, 10, 64); err == nil {
|
||||
categoryID = &id
|
||||
}
|
||||
}
|
||||
|
||||
options := typescore.ListDbOptions{
|
||||
Filtering: executorParams,
|
||||
Offset: offset,
|
||||
|
|
@ -46,12 +55,21 @@ func (s *TopicExecutorsReg) GetTopicExecutorsListHandler(w http.ResponseWriter,
|
|||
}
|
||||
|
||||
ctx := r.Context()
|
||||
executorsDbLst, total, errW := s.ipc.Database.ApprovalTopicExecutor.GetApprovalTopicExecutorListDB(ctx, options)
|
||||
if errW != nil {
|
||||
return nil, errW
|
||||
|
||||
var executorsDbLst []*typescore.ApprovalTopicExecutor
|
||||
var total uint64
|
||||
var err error
|
||||
|
||||
if categoryID != nil {
|
||||
executorsDbLst, total, err = s.ipc.Database.ApprovalTopicExecutor.GetApprovalTopicExecutorListByCategoryDB(ctx, options, *categoryID)
|
||||
} else {
|
||||
executorsDbLst, total, err = s.ipc.Database.ApprovalTopicExecutor.GetApprovalTopicExecutorListDB(ctx, options)
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// 🚀 Подгружаем связанные данные
|
||||
for _, exec := range executorsDbLst {
|
||||
s.enrichExecutor(ctx, exec)
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue