Skip to content

fix(#802): add OR-based self-relevant filter fields to data export workflow API #604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LordofAvernus merged 1 commit into from
Apr 30, 2026
Merged

fix(#802): add OR-based self-relevant filter fields to data export workflow API #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions api/dms/service/v1/data_export_workflow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,15 @@ type FilterGlobalDataExportWorkflowReq struct {
// filter fuzzy key word for id/name
// in:query
FuzzyKeyword string `json:"fuzzy_keyword" query:"fuzzy_keyword"`
// enable OR-based self-relevant filtering (creator OR assignee OR viewable db_service)
// in:query
CheckUserCanAccess bool `json:"check_user_can_access" query:"check_user_can_access"`
// current user id for check_user_can_access filter
// in:query
CurrentUserID string `json:"current_user_id" query:"current_user_id"`
// db_service UIDs with view_others_workflow permission for check_user_can_access
// in:query
ViewableDBServiceUids []string `json:"viewable_db_service_uids" query:"viewable_db_service_uids"`
}

// swagger:model GetGlobalDataExportWorkflowsReply
Expand Down
8 changes: 8 additions & 0 deletions pkg/dms-common/api/dms/v1/workflow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,14 @@ type FilterGlobalDataExportWorkflowReq struct {
FilterCurrentStepAssigneeUserUid string `json:"filter_current_step_assignee_user_uid" query:"filter_current_step_assignee_user_uid"`
FilterByDBServiceUid string `json:"filter_by_db_service_uid" query:"filter_by_db_service_uid"`
FuzzyKeyword string `json:"fuzzy_keyword" query:"fuzzy_keyword"`

// CheckUserCanAccess enables OR-based self-relevant filtering:
// (creator OR current assignee OR viewable db_service). When true,
// CurrentUserID must be set. This replaces the broken AND approach of
// setting both FilterByCreateUserUid and FilterCurrentStepAssigneeUserId.
CheckUserCanAccess bool `json:"check_user_can_access" query:"check_user_can_access"`
CurrentUserID string `json:"current_user_id" query:"current_user_id"`
ViewableDBServiceUids []string `json:"viewable_db_service_uids" query:"viewable_db_service_uids"`
}

type DataExportWorkflowStatus string
Expand Down
20 changes: 20 additions & 0 deletions pkg/dms-common/dmsobject/data_export_workflow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,26 @@ func GetGlobalDataExportWorkflowsList(ctx context.Context, dmsAddr string, req d
query.Set("filter_current_step_assignee_user_id", req.FilterCurrentStepAssigneeUserId)
}

if req.FuzzyKeyword != "" {
query.Set("fuzzy_keyword", req.FuzzyKeyword)
}

if req.CheckUserCanAccess {
query.Set("check_user_can_access", "true")
}

if req.CurrentUserID != "" {
query.Set("current_user_id", req.CurrentUserID)
}

if len(req.ViewableDBServiceUids) > 0 {
for _, v := range req.ViewableDBServiceUids {
if v != "" {
query.Add("viewable_db_service_uids", v)
}
}
}

// 将查询参数附加到 URL
baseURL.RawQuery = query.Encode()

Expand Down