From e1a981928c970f159769dfb848b37b7fd9f85c07 Mon Sep 17 00:00:00 2001 From: Livio Spring Date: Fri, 26 Aug 2022 10:38:41 +0200 Subject: [PATCH] fix: action query (#4257) --- internal/api/grpc/action/action.go | 4 ++++ internal/api/grpc/management/actions_converter.go | 5 ++++- internal/query/action.go | 4 ++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/internal/api/grpc/action/action.go b/internal/api/grpc/action/action.go index bf5c3d382..7133ca9c2 100644 --- a/internal/api/grpc/action/action.go +++ b/internal/api/grpc/action/action.go @@ -111,9 +111,13 @@ func ActionStateToPb(state domain.ActionState) action_pb.ActionState { func ActionNameQuery(q *action_pb.ActionNameQuery) (query.SearchQuery, error) { return query.NewActionNameSearchQuery(object_grpc.TextMethodToQuery(q.Method), q.Name) } + func ActionStateQuery(q *action_pb.ActionStateQuery) (query.SearchQuery, error) { return query.NewActionStateSearchQuery(ActionStateToDomain(q.State)) } +func ActionIDQuery(q *action_pb.ActionIDQuery) (query.SearchQuery, error) { + return query.NewActionIDSearchQuery(q.Id) +} func ActionStateToDomain(state action_pb.ActionState) domain.ActionState { switch state { diff --git a/internal/api/grpc/management/actions_converter.go b/internal/api/grpc/management/actions_converter.go index d3e08a8bb..643ba88b1 100644 --- a/internal/api/grpc/management/actions_converter.go +++ b/internal/api/grpc/management/actions_converter.go @@ -4,6 +4,7 @@ import ( action_grpc "github.com/zitadel/zitadel/internal/api/grpc/action" "github.com/zitadel/zitadel/internal/api/grpc/object" "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/query" mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" @@ -59,6 +60,8 @@ func ActionQueryToQuery(query interface{}) (query.SearchQuery, error) { return action_grpc.ActionNameQuery(q.ActionNameQuery) case *mgmt_pb.ActionQuery_ActionStateQuery: return action_grpc.ActionStateQuery(q.ActionStateQuery) + case *mgmt_pb.ActionQuery_ActionIdQuery: + return action_grpc.ActionIDQuery(q.ActionIdQuery) } - return nil, nil + return nil, errors.ThrowInvalidArgument(nil, "MGMT-dsg3z", "Errors.Query.InvalidRequest") } diff --git a/internal/query/action.go b/internal/query/action.go index 910f306e8..bc37d138f 100644 --- a/internal/query/action.go +++ b/internal/query/action.go @@ -148,6 +148,10 @@ func NewActionStateSearchQuery(value domain.ActionState) (SearchQuery, error) { return NewNumberQuery(ActionColumnState, int(value), NumberEquals) } +func NewActionIDSearchQuery(id string) (SearchQuery, error) { + return NewTextQuery(ActionColumnID, id, TextEquals) +} + func prepareActionsQuery() (sq.SelectBuilder, func(rows *sql.Rows) (*Actions, error)) { return sq.Select( ActionColumnID.identifier(),