Refactor brand service and related components
- Removed ListQuestionVersions method and associated types from BrandService and Queries. - Updated PromptRuleGenerationService to change task naming and handling. - Enhanced ScheduleTaskService to support filtering by created date range and keyword. - Introduced InstantTaskService for managing instant tasks with appropriate filtering and response structures. - Added InstantTaskHandler for handling API requests related to instant tasks. - Created InstantTaskTab component for the admin web interface to display and manage instant tasks. - Updated database migrations to rename source types for articles and generation tasks. - Adjusted models and repository queries to reflect the removal of question version handling.
This commit is contained in:
@@ -4,6 +4,7 @@ import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/jackc/pgx/v5/pgxpool"
|
||||
|
||||
@@ -52,8 +53,11 @@ type ScheduleTaskResponse struct {
|
||||
type ScheduleTaskListParams struct {
|
||||
PromptRuleID *int64 `json:"prompt_rule_id"`
|
||||
Status *string `json:"status"`
|
||||
Page int `json:"page"`
|
||||
PageSize int `json:"page_size"`
|
||||
Keyword *string `json:"keyword"`
|
||||
CreatedFrom *time.Time
|
||||
CreatedTo *time.Time
|
||||
Page int `json:"page"`
|
||||
PageSize int `json:"page_size"`
|
||||
}
|
||||
|
||||
type ScheduleTaskListResponse struct {
|
||||
@@ -81,7 +85,10 @@ func (s *ScheduleTaskService) List(ctx context.Context, params ScheduleTaskListP
|
||||
WHERE tenant_id = $1 AND deleted_at IS NULL
|
||||
AND ($2::bigint IS NULL OR prompt_rule_id = $2)
|
||||
AND ($3::text IS NULL OR status = $3)
|
||||
`, actor.TenantID, params.PromptRuleID, params.Status).Scan(&total)
|
||||
AND ($4::text IS NULL OR name ILIKE '%' || $4 || '%')
|
||||
AND ($5::timestamptz IS NULL OR created_at >= $5)
|
||||
AND ($6::timestamptz IS NULL OR created_at <= $6)
|
||||
`, actor.TenantID, params.PromptRuleID, params.Status, params.Keyword, params.CreatedFrom, params.CreatedTo).Scan(&total)
|
||||
if err != nil {
|
||||
return nil, response.ErrInternal(50010, "count_failed", "failed to count schedule tasks")
|
||||
}
|
||||
@@ -98,9 +105,12 @@ func (s *ScheduleTaskService) List(ctx context.Context, params ScheduleTaskListP
|
||||
WHERE st.tenant_id = $1 AND st.deleted_at IS NULL
|
||||
AND ($2::bigint IS NULL OR st.prompt_rule_id = $2)
|
||||
AND ($3::text IS NULL OR st.status = $3)
|
||||
AND ($4::text IS NULL OR st.name ILIKE '%' || $4 || '%')
|
||||
AND ($5::timestamptz IS NULL OR st.created_at >= $5)
|
||||
AND ($6::timestamptz IS NULL OR st.created_at <= $6)
|
||||
ORDER BY st.created_at DESC
|
||||
LIMIT $4 OFFSET $5
|
||||
`, actor.TenantID, params.PromptRuleID, params.Status, params.PageSize, offset)
|
||||
LIMIT $7 OFFSET $8
|
||||
`, actor.TenantID, params.PromptRuleID, params.Status, params.Keyword, params.CreatedFrom, params.CreatedTo, params.PageSize, offset)
|
||||
if err != nil {
|
||||
return nil, response.ErrInternal(50010, "query_failed", "failed to list schedule tasks")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user