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

internal/query/projection/instance_member_test.go

@@ -2,6 +2,7 @@ package projection
 
 import (
 	"context"
+	"errors"
 	"testing"
 
 	"golang.org/x/text/language"
@@ -25,7 +26,26 @@ func TestInstanceMemberProjection_reduces(t *testing.T) {
 		args   args
 		reduce func(event eventstore.Event) (*handler.Statement, error)
 		want   wantReduce
-	}{
+	}{{
+		name: "instance MemberAddedType",
+		args: args{
+			event: getEvent(
+				testEvent(
+					instance.MemberAddedEventType,
+					instance.AggregateType,
+					[]byte(`{
+					"userId": "user-id",
+					"roles": ["role"]
+				}`),
+				), instance.MemberAddedEventMapper),
+		},
+		reduce: (&instanceMemberProjection{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: "instance MemberAddedType",
 			args: args{
@@ -80,6 +100,72 @@ func TestInstanceMemberProjection_reduces(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "instance MemberAddedType, import",
+			args: args{
+				event: getEvent(
+					testEvent(
+						instance.MemberAddedEventType,
+						instance.AggregateType,
+						[]byte(`{
+					"userId": "user-id",
+					"roles": ["role"]
+				}`),
+					), instance.MemberAddedEventMapper),
+			},
+			reduce: (&instanceMemberProjection{
+				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: instance.AggregateType,
+				sequence:      15,
+				executer: &testExecuter{
+					executions: []execution{
+						{
+							expectedStmt: "INSERT INTO projections.instance_members4 (user_id, user_resource_owner, roles, creation_date, change_date, sequence, resource_owner, instance_id, 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: "instance MemberChangedType",
 			args: args{

internal/query/projection/org_member_test.go

@@ -2,6 +2,7 @@ package projection
 
 import (
 	"context"
+	"errors"
 	"testing"
 
 	"golang.org/x/text/language"
@@ -25,7 +26,28 @@ func TestOrgMemberProjection_reduces(t *testing.T) {
 		args   args
 		reduce func(event eventstore.Event) (*handler.Statement, error)
 		want   wantReduce
-	}{
+	}{{
+		name: "org MemberAddedType, error user not found",
+		args: args{
+			event: getEvent(
+				testEvent(
+					org.MemberAddedEventType,
+					org.AggregateType,
+					[]byte(`{
+					"userId": "user-id",
+					"roles": ["role"]
+				}`),
+				), org.MemberAddedEventMapper),
+		},
+		reduce: (&orgMemberProjection{
+			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: "org MemberAddedType",
 			args: args{
@@ -78,6 +100,70 @@ func TestOrgMemberProjection_reduces(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "org MemberAddedType, import",
+			args: args{
+				event: getEvent(
+					testEvent(
+						org.MemberAddedEventType,
+						org.AggregateType,
+						[]byte(`{
+					"userId": "user-id",
+					"roles": ["role"]
+				}`),
+					), org.MemberAddedEventMapper),
+			},
+			reduce: (&orgMemberProjection{
+				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: org.AggregateType,
+				sequence:      15,
+				executer: &testExecuter{
+					executions: []execution{
+						{
+							expectedStmt: "INSERT INTO projections.org_members4 (user_id, user_resource_owner, roles, creation_date, change_date, sequence, resource_owner, instance_id, org_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: "org MemberChangedType",
 			args: args{

internal/query/projection/project_grant_member.go

@@ -126,6 +126,12 @@ func (p *projectGrantMemberProjection) reduceAdded(event eventstore.Event) (*han
 	}
 	ctx := setMemberContext(e.Aggregate())
 	userOwner, _, grantedOrg, err := getResourceOwners(ctx, p.es, e.Aggregate().InstanceID, e.UserID, e.Aggregate().ID, e.GrantID)
+	if userOwner == "" {
+		return nil, zerrors.ThrowNotFound(nil, "PROJ-cuvy6nu1tq", "Errors.NotFound")
+	}
+	if grantedOrg == "" {
+		return nil, zerrors.ThrowNotFound(nil, "PROJ-i178hq18k4", "Errors.NotFound")
+	}
 	if err != nil {
 		return nil, err
 	}

internal/query/projection/project_grant_member_test.go

@@ -2,6 +2,7 @@ package projection
 
 import (
 	"context"
+	"errors"
 	"testing"
 
 	"golang.org/x/text/language"
@@ -88,6 +89,64 @@ func TestProjectGrantMemberProjection_reduces(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "project GrantMemberAddedType, error user not found",
+			args: args{
+				event: getEvent(
+					testEvent(
+						project.GrantMemberAddedType,
+						project.AggregateType,
+						[]byte(`{
+					"userId": "user-id",
+					"roles": ["role"],
+					"grantId": "grant-id"
+				}`),
+					), project.GrantMemberAddedEventMapper),
+			},
+			reduce: (&projectGrantMemberProjection{
+				es: newMockEventStore().appendFilterResponse([]eventstore.Event{}),
+			}).reduceAdded,
+			want: wantReduce{
+				err: func(err error) bool {
+					return errors.Is(err, zerrors.ThrowNotFound(nil, "PROJ-cuvy6nu1tq", "Errors.NotFound"))
+				},
+			},
+		},
+		{
+			name: "project GrantMemberAddedType, error grant not found",
+			args: args{
+				event: getEvent(
+					testEvent(
+						project.GrantMemberAddedType,
+						project.AggregateType,
+						[]byte(`{
+					"userId": "user-id",
+					"roles": ["role"],
+					"grantId": "grant-id"
+				}`),
+					), project.GrantMemberAddedEventMapper),
+			},
+			reduce: (&projectGrantMemberProjection{
+				es: newMockEventStore().appendFilterResponse([]eventstore.Event{
+					user.NewHumanAddedEvent(context.Background(),
+						&user.NewAggregate("user-id", "org1").Aggregate,
+						"username1",
+						"firstname1",
+						"lastname1",
+						"nickname1",
+						"displayname1",
+						language.German,
+						domain.GenderMale,
+						"email1",
+						true,
+					)}),
+			}).reduceAdded,
+			want: wantReduce{
+				err: func(err error) bool {
+					return errors.Is(err, zerrors.ThrowNotFound(nil, "PROJ-i178hq18k4", "Errors.NotFound"))
+				},
+			},
+		},
 		{
 			name: "project GrantMemberChangedType",
 			args: args{

internal/query/projection/project_member_test.go

@@ -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{

internal/query/projection/user_grant.go

@@ -170,7 +170,7 @@ func (p *userGrantProjection) reduceAdded(event eventstore.Event) (*handler.Stat
 	}
 
 	ctx := setUserGrantContext(e.Aggregate())
-	userOwner, projectOwner, grantOwner, err := getResourceOwners(ctx, p.es, e.Aggregate().InstanceID, e.UserID, e.ProjectID, e.ProjectGrantID)
+	userOwner, projectOwner, grantOwner, err := getUserGrantResourceOwners(ctx, p.es, e.Aggregate().InstanceID, e.UserID, e.ProjectID, e.ProjectGrantID)
 	if err != nil {
 		return nil, err
 	}
@@ -401,11 +401,33 @@ func (p *userGrantProjection) reduceOwnerRemoved(event eventstore.Event) (*handl
 
 func getUserResourceOwner(ctx context.Context, es handler.EventStore, instanceID, userID string) (string, error) {
 	userRO, _, _, err := getResourceOwners(ctx, es, instanceID, userID, "", "")
+	if userRO == "" {
+		return "", zerrors.ThrowNotFound(nil, "PROJ-uahkkord22", "Errors.NotFound")
+	}
 	return userRO, err
 }
 
+func getUserGrantResourceOwners(ctx context.Context, es handler.EventStore, instanceID, userID, projectID, grantID string) (string, string, string, error) {
+	userRO, projectRO, grantedOrg, err := getResourceOwners(ctx, es, instanceID, userID, projectID, grantID)
+	if err != nil {
+		return "", "", "", err
+	}
+	// user grant always has a user defined
+	if userRO == "" {
+		return "", "", "", zerrors.ThrowNotFound(nil, "PROJ-8x5behx5jy", "Errors.NotFound")
+	}
+	// either a projectID
+	if projectID != "" && projectRO == "" {
+		return "", "", "", zerrors.ThrowNotFound(nil, "PROJ-1ldp25o3bx", "Errors.NotFound")
+	}
+	// or a grantID
+	if grantID != "" && grantedOrg == "" {
+		return "", "", "", zerrors.ThrowNotFound(nil, "PROJ-9ngp5dcn76", "Errors.NotFound")
+	}
+	return userRO, projectRO, grantedOrg, nil
+}
+
 func getResourceOwners(ctx context.Context, es handler.EventStore, instanceID, userID, projectID, grantID string) (userRO string, projectRO string, grantedOrg string, err error) {
-	eventCount := 1
 	builder := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		AwaitOpenTransactions().
 		InstanceID(instanceID).
@@ -416,7 +438,6 @@ func getResourceOwners(ctx context.Context, es handler.EventStore, instanceID, u
 
 	// if it's a project grant then we only need the resourceowner for the projectgrant, else the project
 	if grantID != "" {
-		eventCount++
 		builder = builder.Or().
 			AggregateTypes(project.AggregateType).
 			AggregateIDs(projectID).
@@ -425,7 +446,6 @@ func getResourceOwners(ctx context.Context, es handler.EventStore, instanceID, u
 				"grantId": grantID,
 			})
 	} else if projectID != "" {
-		eventCount++
 		builder = builder.Or().
 			AggregateTypes(project.AggregateType).
 			AggregateIDs(projectID).
@@ -439,9 +459,8 @@ func getResourceOwners(ctx context.Context, es handler.EventStore, instanceID, u
 	if err != nil {
 		return "", "", "", err
 	}
-	if len(events) != eventCount {
+
-		return "", "", "", zerrors.ThrowNotFound(nil, "PROJ-0I91sp", "Errors.NotFound")
+	// sorted ascending
-	}
 	for _, event := range events {
 		switch e := event.(type) {
 		case *project.GrantAddedEvent:

internal/query/projection/user_grant_test.go

@@ -28,7 +28,85 @@ func TestUserGrantProjection_reduces(t *testing.T) {
 		args   args
 		reduce func(event eventstore.Event) (*handler.Statement, error)
 		want   wantReduce
-	}{
+	}{{
+		name: "reduceAdded, multiple import",
+		args: args{
+			event: getEvent(
+				testEvent(
+					usergrant.UserGrantAddedType,
+					usergrant.AggregateType,
+					[]byte(`{
+						"userId": "user-id",
+						"projectId": "project-id",
+						"roleKeys": ["role"]
+					}`),
+				), usergrant.UserGrantAddedEventMapper),
+		},
+		reduce: (&userGrantProjection{
+			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,
+					),
+					project.NewProjectAddedEvent(context.Background(),
+						&project.NewAggregate("project-id", "org2").Aggregate,
+						"project",
+						false,
+						false,
+						false,
+						domain.PrivateLabelingSettingUnspecified,
+					),
+				}),
+		}).reduceAdded,
+		want: wantReduce{
+			aggregateType: usergrant.AggregateType,
+			sequence:      15,
+			executer: &testExecuter{
+				executions: []execution{
+					{
+						expectedStmt: "INSERT INTO projections.user_grants4 (id, resource_owner, instance_id, creation_date, change_date, sequence, user_id, resource_owner_user, project_id, resource_owner_project, grant_id, granted_org, roles, state) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14)",
+						expectedArgs: []interface{}{
+							"agg-id",
+							"ro-id",
+							"instance-id",
+							anyArg{},
+							anyArg{},
+							uint64(15),
+							"user-id",
+							"org1",
+							"project-id",
+							"org2",
+							"",
+							"",
+							database.TextArray[string]{"role"},
+							domain.UserGrantStateActive,
+						},
+					},
+				},
+			},
+		},
+	},
 		{
 			name: "reduceAdded",
 			args: args{
@@ -126,6 +204,11 @@ func TestUserGrantProjection_reduces(t *testing.T) {
 							"email1",
 							true,
 						),
+						project.NewProjectAddedEvent(context.Background(),
+							&project.NewAggregate("project-id", "org2").Aggregate,
+							"project", true, true, true,
+							domain.PrivateLabelingSettingUnspecified,
+						),
 						project.NewGrantAddedEvent(context.Background(),
 							&project.NewAggregate("project-id", "org2").Aggregate,
 							"grant-id",
@@ -151,7 +234,7 @@ func TestUserGrantProjection_reduces(t *testing.T) {
 								"user-id",
 								"org1",
 								"project-id",
-								"",
+								"org2",
 								"grant-id",
 								"org3",
 								database.TextArray[string]{"role"},
@@ -637,6 +720,52 @@ func Test_getResourceOwners(t *testing.T) {
 				wantErr: false,
 			},
 		},
+		{
+			name: "user RO, import",
+			fields: fields{
+				eventstore: eventstoreExpect(
+					t,
+					expectFilter(
+						eventFromEventPusher(
+							user.NewHumanAddedEvent(context.Background(),
+								&user.NewAggregate("user", "org2").Aggregate,
+								"username1",
+								"firstname1",
+								"lastname1",
+								"nickname1",
+								"displayname1",
+								language.German,
+								domain.GenderMale,
+								"email1",
+								true,
+							),
+						),
+						eventFromEventPusher(
+							user.NewHumanAddedEvent(context.Background(),
+								&user.NewAggregate("user", "org1").Aggregate,
+								"username1",
+								"firstname1",
+								"lastname1",
+								"nickname1",
+								"displayname1",
+								language.German,
+								domain.GenderMale,
+								"email1",
+								true,
+							),
+						),
+					),
+				),
+			},
+			args: args{
+				instanceID: "instance",
+				userID:     "user",
+			},
+			want: want{
+				userRO:  "org1",
+				wantErr: false,
+			},
+		},
 		{
 			name: "user RO, no user",
 			fields: fields{
@@ -650,7 +779,7 @@ func Test_getResourceOwners(t *testing.T) {
 				userID:     "user",
 			},
 			want: want{
-				wantErr: true,
+				wantErr: false,
 			},
 		},
 		{
@@ -726,7 +855,8 @@ func Test_getResourceOwners(t *testing.T) {
 				projectID:  "project",
 			},
 			want: want{
-				wantErr: true,
+				userRO:  "org",
+				wantErr: false,
 			},
 		},
 		{
@@ -772,6 +902,63 @@ func Test_getResourceOwners(t *testing.T) {
 				wantErr:    false,
 			},
 		},
+		{
+			name: "user and grant RO, import",
+			fields: fields{
+				eventstore: eventstoreExpect(
+					t,
+					expectFilter(
+						eventFromEventPusher(
+							user.NewHumanAddedEvent(context.Background(),
+								&user.NewAggregate("user", "org2").Aggregate,
+								"username1",
+								"firstname1",
+								"lastname1",
+								"nickname1",
+								"displayname1",
+								language.German,
+								domain.GenderMale,
+								"email1",
+								true,
+							),
+						),
+						eventFromEventPusher(
+							user.NewHumanAddedEvent(context.Background(),
+								&user.NewAggregate("user", "org").Aggregate,
+								"username1",
+								"firstname1",
+								"lastname1",
+								"nickname1",
+								"displayname1",
+								language.German,
+								domain.GenderMale,
+								"email1",
+								true,
+							),
+						),
+						eventFromEventPusher(
+							project.NewGrantAddedEvent(context.Background(),
+								&project.NewAggregate("project", "org").Aggregate,
+								"projectgrant1",
+								"grantedorg1",
+								[]string{"key1"},
+							),
+						),
+					),
+				),
+			},
+			args: args{
+				instanceID: "instance",
+				userID:     "user",
+				projectID:  "project",
+				grantID:    "projectgrant1",
+			},
+			want: want{
+				userRO:     "org",
+				grantedOrg: "grantedorg1",
+				wantErr:    false,
+			},
+		},
 		{
 			name: "user and grant RO, no grant",
 			fields: fields{
@@ -802,7 +989,8 @@ func Test_getResourceOwners(t *testing.T) {
 				grantID:    "projectgrant1",
 			},
 			want: want{
-				wantErr: true,
+				userRO:  "org",
+				wantErr: false,
 			},
 		},
 		{
@@ -829,7 +1017,8 @@ func Test_getResourceOwners(t *testing.T) {
 				grantID:    "projectgrant1",
 			},
 			want: want{
-				wantErr: true,
+				grantedOrg: "grantedorg1",
+				wantErr:    false,
 			},
 		},
 	}