TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2024-12-12 02:54:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: return correct empty flow if not found (#3749)

Browse Source
This commit is contained in:
Livio Amstutz 2022-06-01 08:11:48 +02:00 committed by GitHub
parent e0dd84367e
commit b0436c995b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/query/action_flow.go
View File

@ -63,7 +63,7 @@ type Flow struct {
}
func (q *Queries) GetFlow(ctx context.Context, flowType domain.FlowType, orgID string) (*Flow, error) {
query, scan := prepareFlowQuery()
query, scan := prepareFlowQuery(flowType)
stmt, args, err := query.Where(
sq.Eq{
FlowsTriggersColumnFlowType.identifier(): flowType,
@ -188,7 +188,7 @@ func prepareTriggerActionsQuery() (sq.SelectBuilder, func(*sql.Rows) ([]*Action,
}
}
func prepareFlowQuery() (sq.SelectBuilder, func(*sql.Rows) (*Flow, error)) {
func prepareFlowQuery(flowType domain.FlowType) (sq.SelectBuilder, func(*sql.Rows) (*Flow, error)) {
return sq.Select(
ActionColumnID.identifier(),
ActionColumnCreationDate.identifier(),
@ -211,6 +211,7 @@ func prepareFlowQuery() (sq.SelectBuilder, func(*sql.Rows) (*Flow, error)) {
func(rows *sql.Rows) (*Flow, error) {
flow := &Flow{
TriggerActions: make(map[domain.TriggerType][]*Action),
Type: flowType,
}
for rows.Next() {
var (

37
internal/query/action_flow_test.go
View File

@ -8,6 +8,8 @@ import (
"regexp"
"testing"
sq "github.com/Masterminds/squirrel"
"github.com/zitadel/zitadel/internal/domain"
)
@ -23,8 +25,10 @@ func Test_FlowPrepares(t *testing.T) {
object interface{}
}{
{
name: "prepareFlowQuery no result",
prepare: prepareFlowQuery,
name: "prepareFlowQuery no result",
prepare: func() (sq.SelectBuilder, func(*sql.Rows) (*Flow, error)) {
return prepareFlowQuery(domain.FlowTypeExternalAuthentication)
},
want: want{
sqlExpectations: mockQueries(
regexp.QuoteMeta(`SELECT projections.actions.id,`+
@ -47,11 +51,16 @@ func Test_FlowPrepares(t *testing.T) {
nil,
),
},
object: &Flow{TriggerActions: map[domain.TriggerType][]*Action{}},
object: &Flow{
TriggerActions: map[domain.TriggerType][]*Action{},
Type: domain.FlowTypeExternalAuthentication,
},
},
{
name: "prepareFlowQuery one action",
prepare: prepareFlowQuery,
name: "prepareFlowQuery one action",
prepare: func() (sq.SelectBuilder, func(*sql.Rows) (*Flow, error)) {
return prepareFlowQuery(domain.FlowTypeExternalAuthentication)
},
want: want{
sqlExpectations: mockQueries(
regexp.QuoteMeta(`SELECT projections.actions.id,`+
@ -129,8 +138,10 @@ func Test_FlowPrepares(t *testing.T) {
},
},
{
name: "prepareFlowQuery multiple actions",
prepare: prepareFlowQuery,
name: "prepareFlowQuery multiple actions",
prepare: func() (sq.SelectBuilder, func(*sql.Rows) (*Flow, error)) {
return prepareFlowQuery(domain.FlowTypeExternalAuthentication)
},
want: want{
sqlExpectations: mockQueries(
regexp.QuoteMeta(`SELECT projections.actions.id,`+
@ -236,8 +247,10 @@ func Test_FlowPrepares(t *testing.T) {
},
},
{
name: "prepareFlowQuery no action",
prepare: prepareFlowQuery,
name: "prepareFlowQuery no action",
prepare: func() (sq.SelectBuilder, func(*sql.Rows) (*Flow, error)) {
return prepareFlowQuery(domain.FlowTypeExternalAuthentication)
},
want: want{
sqlExpectations: mockQueries(
regexp.QuoteMeta(`SELECT projections.actions.id,`+
@ -302,8 +315,10 @@ func Test_FlowPrepares(t *testing.T) {
},
},
{
name: "prepareFlowQuery sql err",
prepare: prepareFlowQuery,
name: "prepareFlowQuery sql err",
prepare: func() (sq.SelectBuilder, func(*sql.Rows) (*Flow, error)) {
return prepareFlowQuery(domain.FlowTypeExternalAuthentication)
},
want: want{
sqlExpectations: mockQueryErr(
regexp.QuoteMeta(`SELECT projections.actions.id,`+