mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-12 01:37:31 +00:00
fix: combine resourceowner query in reduce function for user grant (#7383)
* fix: projection reduce correction with unit tests * fix: remove eventcout variable as not used anymore * fix: add errors if resoureowner is not found in user grants reduce
This commit is contained in:
@@ -2,6 +2,7 @@ package projection
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"testing"
|
||||
|
||||
"golang.org/x/text/language"
|
||||
@@ -26,7 +27,30 @@ func TestProjectMemberProjection_reduces(t *testing.T) {
|
||||
args args
|
||||
reduce func(event eventstore.Event) (*handler.Statement, error)
|
||||
want wantReduce
|
||||
}{
|
||||
}{{
|
||||
name: "project MemberAddedType, err user not found",
|
||||
args: args{
|
||||
event: getEvent(
|
||||
testEvent(
|
||||
project.MemberAddedType,
|
||||
project.AggregateType,
|
||||
[]byte(`{
|
||||
"userId": "user-id",
|
||||
"roles": ["role"]
|
||||
}`),
|
||||
), project.MemberAddedEventMapper),
|
||||
},
|
||||
reduce: (&projectMemberProjection{
|
||||
es: newMockEventStore().appendFilterResponse(
|
||||
[]eventstore.Event{},
|
||||
),
|
||||
}).reduceAdded,
|
||||
want: wantReduce{
|
||||
err: func(err error) bool {
|
||||
return errors.Is(err, zerrors.ThrowNotFound(nil, "PROJ-uahkkord22", "Errors.NotFound"))
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "project MemberAddedType",
|
||||
args: args{
|
||||
@@ -81,6 +105,72 @@ func TestProjectMemberProjection_reduces(t *testing.T) {
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "project MemberAddedType, import",
|
||||
args: args{
|
||||
event: getEvent(
|
||||
testEvent(
|
||||
project.MemberAddedType,
|
||||
project.AggregateType,
|
||||
[]byte(`{
|
||||
"userId": "user-id",
|
||||
"roles": ["role"]
|
||||
}`),
|
||||
), project.MemberAddedEventMapper),
|
||||
},
|
||||
reduce: (&projectMemberProjection{
|
||||
es: newMockEventStore().appendFilterResponse(
|
||||
[]eventstore.Event{
|
||||
user.NewHumanAddedEvent(context.Background(),
|
||||
&user.NewAggregate("user-id", "org2").Aggregate,
|
||||
"username1",
|
||||
"firstname1",
|
||||
"lastname1",
|
||||
"nickname1",
|
||||
"displayname1",
|
||||
language.German,
|
||||
domain.GenderMale,
|
||||
"email1",
|
||||
true,
|
||||
),
|
||||
user.NewHumanAddedEvent(context.Background(),
|
||||
&user.NewAggregate("user-id", "org1").Aggregate,
|
||||
"username1",
|
||||
"firstname1",
|
||||
"lastname1",
|
||||
"nickname1",
|
||||
"displayname1",
|
||||
language.German,
|
||||
domain.GenderMale,
|
||||
"email1",
|
||||
true,
|
||||
),
|
||||
},
|
||||
),
|
||||
}).reduceAdded,
|
||||
want: wantReduce{
|
||||
aggregateType: project.AggregateType,
|
||||
sequence: 15,
|
||||
executer: &testExecuter{
|
||||
executions: []execution{
|
||||
{
|
||||
expectedStmt: "INSERT INTO projections.project_members4 (user_id, user_resource_owner, roles, creation_date, change_date, sequence, resource_owner, instance_id, project_id) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)",
|
||||
expectedArgs: []interface{}{
|
||||
"user-id",
|
||||
"org1",
|
||||
database.TextArray[string]{"role"},
|
||||
anyArg{},
|
||||
anyArg{},
|
||||
uint64(15),
|
||||
"ro-id",
|
||||
"instance-id",
|
||||
"agg-id",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "project MemberChangedType",
|
||||
args: args{
|
||||
|
Reference in New Issue
Block a user