feat: project view (#90)

* init for views (spooler, handler)

* init for views (spooler, handler)

* start view in management

* granted project

* implement granted project view

* search granted projects

* fix search column

* update all projects on project change

* search roles

* filter org

* project members

* project grant members

* fix tests

* application view

* project grant search

* mock

* test appendevents

* test appendevents

* Update internal/view/query.go

Co-authored-by: Livio Amstutz <livio.a@gmail.com>

* Update internal/eventstore/spooler/spooler.go

Co-authored-by: Livio Amstutz <livio.a@gmail.com>

* Update internal/view/query.go

Co-authored-by: Livio Amstutz <livio.a@gmail.com>

* merge request changes

* Update internal/project/repository/view/model/application.go

Co-authored-by: Livio Amstutz <livio.a@gmail.com>

* merge request changes

* Project view sql (#92)

* sql and configs

* error handling

* sql start in eventstore

* on error handling, config

* read user on members

* Update internal/project/repository/view/application_view.go

Co-authored-by: Silvan <silvan.reusser@gmail.com>

* Update internal/project/repository/view/model/application.go

Co-authored-by: Silvan <silvan.reusser@gmail.com>

* Update internal/project/repository/view/model/application.go

Co-authored-by: Silvan <silvan.reusser@gmail.com>

* Update internal/project/repository/view/model/application.go

Co-authored-by: Silvan <silvan.reusser@gmail.com>

* Update internal/project/repository/view/model/application.go

Co-authored-by: Silvan <silvan.reusser@gmail.com>

* Update internal/project/repository/view/model/application.go

Co-authored-by: Silvan <silvan.reusser@gmail.com>

* Update internal/project/repository/view/model/application_query.go

Co-authored-by: Silvan <silvan.reusser@gmail.com>

* Update pkg/management/api/grpc/project_grant_converter.go

Co-authored-by: Silvan <silvan.reusser@gmail.com>

* Update pkg/management/api/grpc/project_grant_member_converter.go

Co-authored-by: Silvan <silvan.reusser@gmail.com>

* Update pkg/management/api/grpc/project_grant_member_converter.go

Co-authored-by: Silvan <silvan.reusser@gmail.com>

* Update pkg/management/api/grpc/project_member_converter.go

Co-authored-by: Silvan <silvan.reusser@gmail.com>

* Update pkg/management/api/grpc/project_member_converter.go

Co-authored-by: Silvan <silvan.reusser@gmail.com>

* Update internal/project/repository/view/model/granted_project.go

Co-authored-by: Silvan <silvan.reusser@gmail.com>

* return caos errors

* Update internal/project/repository/view/model/granted_project_query.go

Co-authored-by: Silvan <silvan.reusser@gmail.com>

* Update internal/project/repository/view/model/project_grant_member.go

Co-authored-by: Silvan <silvan.reusser@gmail.com>

* Update internal/project/repository/view/model/project_grant_member_query.go

Co-authored-by: Silvan <silvan.reusser@gmail.com>

* Update internal/project/repository/view/model/project_member.go

Co-authored-by: Silvan <silvan.reusser@gmail.com>

* Update internal/project/repository/view/model/project_member_query.go

Co-authored-by: Silvan <silvan.reusser@gmail.com>

* Update internal/project/repository/view/model/project_role.go

Co-authored-by: Silvan <silvan.reusser@gmail.com>

* Update internal/project/repository/view/model/project_role_query.go

Co-authored-by: Silvan <silvan.reusser@gmail.com>

* Update pkg/management/api/grpc/application_converter.go

Co-authored-by: Silvan <silvan.reusser@gmail.com>

* Update pkg/management/api/grpc/application_converter.go

Co-authored-by: Silvan <silvan.reusser@gmail.com>

* Update pkg/management/api/grpc/project_converter.go

Co-authored-by: Silvan <silvan.reusser@gmail.com>

* Update pkg/management/api/grpc/project_converter.go

Co-authored-by: Silvan <silvan.reusser@gmail.com>

* Update pkg/management/api/grpc/project_converter.go

Co-authored-by: Silvan <silvan.reusser@gmail.com>

* Update pkg/management/api/grpc/project_converter.go

Co-authored-by: Silvan <silvan.reusser@gmail.com>

* converter fix

Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: Silvan <silvan.reusser@gmail.com>

internal/project/model/application_view.go

@@ -0,0 +1,63 @@
+package model
+
+import (
+	"github.com/caos/zitadel/internal/model"
+	"time"
+)
+
+type ApplicationView struct {
+	ID           string
+	ProjectID    string
+	Name         string
+	CreationDate time.Time
+	ChangeDate   time.Time
+	State        AppState
+
+	IsOIDC                     bool
+	OIDCClientID               string
+	OIDCRedirectUris           []string
+	OIDCResponseTypes          []OIDCResponseType
+	OIDCGrantTypes             []OIDCGrantType
+	OIDCApplicationType        OIDCApplicationType
+	OIDCAuthMethodType         OIDCAuthMethodType
+	OIDCPostLogoutRedirectUris []string
+
+	Sequence uint64
+}
+
+type ApplicationSearchRequest struct {
+	Offset        uint64
+	Limit         uint64
+	SortingColumn ApplicationSearchKey
+	Asc           bool
+	Queries       []*ApplicationSearchQuery
+}
+
+type ApplicationSearchKey int32
+
+const (
+	APPLICATIONSEARCHKEY_UNSPECIFIED ApplicationSearchKey = iota
+	APPLICATIONSEARCHKEY_NAME
+	APPLICATIONSEARCHKEY_OIDC_CLIENT_ID
+	APPLICATIONSEARCHKEY_PROJECT_ID
+	APPLICATIONSEARCHKEY_APP_ID
+)
+
+type ApplicationSearchQuery struct {
+	Key    ApplicationSearchKey
+	Method model.SearchMethod
+	Value  string
+}
+
+type ApplicationSearchResponse struct {
+	Offset      uint64
+	Limit       uint64
+	TotalResult uint64
+	Result      []*ApplicationView
+}
+
+func (r *ApplicationSearchRequest) EnsureLimit(limit uint64) {
+	if r.Limit == 0 || r.Limit > limit {
+		r.Limit = limit
+	}
+}

internal/project/model/granted_project.go

@@ -0,0 +1,85 @@
+package model
+
+import (
+	"context"
+	"github.com/caos/zitadel/internal/api"
+	grpc_util "github.com/caos/zitadel/internal/api/grpc"
+	"github.com/caos/zitadel/internal/model"
+	"time"
+)
+
+type GrantedProjectView struct {
+	ProjectID       string
+	Name            string
+	CreationDate    time.Time
+	ChangeDate      time.Time
+	State           ProjectState
+	Type            ProjectType
+	ResourceOwner   string
+	OrgID           string
+	OrgName         string
+	OrgDomain       string
+	Sequence        uint64
+	GrantID         string
+	GrantedRoleKeys []string
+}
+
+type ProjectType int32
+
+const (
+	PROJECTTYPE_OWNED ProjectType = iota
+	PROJECTTYPE_GRANTED
+)
+
+type GrantedProjectSearchRequest struct {
+	Offset        uint64
+	Limit         uint64
+	SortingColumn GrantedProjectSearchKey
+	Asc           bool
+	Queries       []*GrantedProjectSearchQuery
+}
+
+type GrantedProjectSearchKey int32
+
+const (
+	GRANTEDPROJECTSEARCHKEY_UNSPECIFIED GrantedProjectSearchKey = iota
+	GRANTEDPROJECTSEARCHKEY_NAME
+	GRANTEDPROJECTSEARCHKEY_PROJECTID
+	GRANTEDPROJECTSEARCHKEY_GRANTID
+	GRANTEDPROJECTSEARCHKEY_ORGID
+	GRANTEDPROJECTSEARCHKEY_RESOURCE_OWNER
+)
+
+type GrantedProjectSearchQuery struct {
+	Key    GrantedProjectSearchKey
+	Method model.SearchMethod
+	Value  string
+}
+
+type GrantedProjectSearchResponse struct {
+	Offset      uint64
+	Limit       uint64
+	TotalResult uint64
+	Result      []*GrantedProjectView
+}
+
+func (r *GrantedProjectSearchRequest) AppendMyOrgQuery(ctx context.Context) {
+	orgID := grpc_util.GetHeader(ctx, api.ZitadelOrgID)
+	r.Queries = append(r.Queries, &GrantedProjectSearchQuery{Key: GRANTEDPROJECTSEARCHKEY_ORGID, Method: model.SEARCHMETHOD_EQUALS, Value: orgID})
+}
+
+func (r *GrantedProjectSearchRequest) AppendNotMyOrgQuery(ctx context.Context) {
+	orgID := grpc_util.GetHeader(ctx, api.ZitadelOrgID)
+	r.Queries = append(r.Queries, &GrantedProjectSearchQuery{Key: GRANTEDPROJECTSEARCHKEY_ORGID, Method: model.SEARCHMETHOD_NOT_EQUALS, Value: orgID})
+}
+
+func (r *GrantedProjectSearchRequest) AppendMyResourceOwnerQuery(ctx context.Context) {
+	orgID := grpc_util.GetHeader(ctx, api.ZitadelOrgID)
+	r.Queries = append(r.Queries, &GrantedProjectSearchQuery{Key: GRANTEDPROJECTSEARCHKEY_RESOURCE_OWNER, Method: model.SEARCHMETHOD_EQUALS, Value: orgID})
+}
+
+func (r *GrantedProjectSearchRequest) EnsureLimit(limit uint64) {
+	if r.Limit == 0 || r.Limit > limit {
+		r.Limit = limit
+	}
+}

internal/project/model/project_grant_member_view.go

@@ -0,0 +1,59 @@
+package model
+
+import (
+	"github.com/caos/zitadel/internal/model"
+	"time"
+)
+
+type ProjectGrantMemberView struct {
+	UserID       string
+	GrantID      string
+	ProjectID    string
+	UserName     string
+	Email        string
+	FirstName    string
+	LastName     string
+	Roles        []string
+	CreationDate time.Time
+	ChangeDate   time.Time
+	Sequence     uint64
+}
+
+type ProjectGrantMemberSearchRequest struct {
+	Offset        uint64
+	Limit         uint64
+	SortingColumn ProjectGrantMemberSearchKey
+	Asc           bool
+	Queries       []*ProjectGrantMemberSearchQuery
+}
+
+type ProjectGrantMemberSearchKey int32
+
+const (
+	PROJECTGRANTMEMBERSEARCHKEY_UNSPECIFIED ProjectGrantMemberSearchKey = iota
+	PROJECTGRANTMEMBERSEARCHKEY_USER_NAME
+	PROJECTGRANTMEMBERSEARCHKEY_EMAIL
+	PROJECTGRANTMEMBERSEARCHKEY_FIRST_NAME
+	PROJECTGRANTMEMBERSEARCHKEY_LAST_NAME
+	PROJECTGRANTMEMBERSEARCHKEY_GRANT_ID
+	PROJECTGRANTMEMBERSEARCHKEY_USER_ID
+)
+
+type ProjectGrantMemberSearchQuery struct {
+	Key    ProjectGrantMemberSearchKey
+	Method model.SearchMethod
+	Value  string
+}
+
+type ProjectGrantMemberSearchResponse struct {
+	Offset      uint64
+	Limit       uint64
+	TotalResult uint64
+	Result      []*ProjectGrantMemberView
+}
+
+func (r *ProjectGrantMemberSearchRequest) EnsureLimit(limit uint64) {
+	if r.Limit == 0 || r.Limit > limit {
+		r.Limit = limit
+	}
+}

internal/project/model/project_member_view.go

@@ -0,0 +1,58 @@
+package model
+
+import (
+	"github.com/caos/zitadel/internal/model"
+	"time"
+)
+
+type ProjectMemberView struct {
+	UserID       string
+	ProjectID    string
+	UserName     string
+	Email        string
+	FirstName    string
+	LastName     string
+	Roles        []string
+	CreationDate time.Time
+	ChangeDate   time.Time
+	Sequence     uint64
+}
+
+type ProjectMemberSearchRequest struct {
+	Offset        uint64
+	Limit         uint64
+	SortingColumn ProjectMemberSearchKey
+	Asc           bool
+	Queries       []*ProjectMemberSearchQuery
+}
+
+type ProjectMemberSearchKey int32
+
+const (
+	PROJECTMEMBERSEARCHKEY_UNSPECIFIED ProjectMemberSearchKey = iota
+	PROJECTMEMBERSEARCHKEY_USER_NAME
+	PROJECTMEMBERSEARCHKEY_EMAIL
+	PROJECTMEMBERSEARCHKEY_FIRST_NAME
+	PROJECTMEMBERSEARCHKEY_LAST_NAME
+	PROJECTMEMBERSEARCHKEY_PROJECT_ID
+	PROJECTMEMBERSEARCHKEY_USER_ID
+)
+
+type ProjectMemberSearchQuery struct {
+	Key    ProjectMemberSearchKey
+	Method model.SearchMethod
+	Value  string
+}
+
+type ProjectMemberSearchResponse struct {
+	Offset      uint64
+	Limit       uint64
+	TotalResult uint64
+	Result      []*ProjectMemberView
+}
+
+func (r *ProjectMemberSearchRequest) EnsureLimit(limit uint64) {
+	if r.Limit == 0 || r.Limit > limit {
+		r.Limit = limit
+	}
+}

internal/project/model/project_role_view.go

@@ -0,0 +1,63 @@
+package model
+
+import (
+	"context"
+	"github.com/caos/zitadel/internal/api"
+	grpc_util "github.com/caos/zitadel/internal/api/grpc"
+	"github.com/caos/zitadel/internal/model"
+	"time"
+)
+
+type ProjectRoleView struct {
+	ResourceOwner string
+	OrgID         string
+	ProjectID     string
+	Key           string
+	DisplayName   string
+	Group         string
+	CreationDate  time.Time
+	Sequence      uint64
+}
+
+type ProjectRoleSearchRequest struct {
+	Offset        uint64
+	Limit         uint64
+	SortingColumn ProjectRoleSearchKey
+	Asc           bool
+	Queries       []*ProjectRoleSearchQuery
+}
+
+type ProjectRoleSearchKey int32
+
+const (
+	PROJECTROLESEARCHKEY_UNSPECIFIED ProjectRoleSearchKey = iota
+	PROJECTROLESEARCHKEY_KEY
+	PROJECTROLESEARCHKEY_PROJECTID
+	PROJECTROLESEARCHKEY_ORGID
+	PROJECTROLESEARCHKEY_RESOURCEOWNER
+	PROJECTROLESEARCHKEY_DISPLAY_NAME
+)
+
+type ProjectRoleSearchQuery struct {
+	Key    ProjectRoleSearchKey
+	Method model.SearchMethod
+	Value  string
+}
+
+type ProjectRoleSearchResponse struct {
+	Offset      uint64
+	Limit       uint64
+	TotalResult uint64
+	Result      []*ProjectRoleView
+}
+
+func (r *ProjectRoleSearchRequest) AppendMyOrgQuery(ctx context.Context) {
+	orgID := grpc_util.GetHeader(ctx, api.ZitadelOrgID)
+	r.Queries = append(r.Queries, &ProjectRoleSearchQuery{Key: PROJECTROLESEARCHKEY_ORGID, Method: model.SEARCHMETHOD_EQUALS, Value: orgID})
+}
+
+func (r *ProjectRoleSearchRequest) EnsureLimit(limit uint64) {
+	if r.Limit == 0 || r.Limit > limit {
+		r.Limit = limit
+	}
+}

internal/project/repository/eventsourcing/eventstore_mock_test.go

@@ -50,7 +50,7 @@ func GetMockPwGenerator(ctrl *gomock.Controller) crypto.Generator {
 func GetMockProjectByIDOK(ctrl *gomock.Controller) *ProjectEventstore {
 	data, _ := json.Marshal(model.Project{Name: "Name"})
 	events := []*es_models.Event{
-		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: proj_model.ProjectAdded, Data: data},
+		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: model.ProjectAdded, Data: data},
 	}
 	mockEs := mock.NewMockEventstore(ctrl)
 	mockEs.EXPECT().FilterEvents(gomock.Any(), gomock.Any()).Return(events, nil)
@@ -67,7 +67,7 @@ func GetMockProjectByIDNoEvents(ctrl *gomock.Controller) *ProjectEventstore {
 func GetMockManipulateProject(ctrl *gomock.Controller) *ProjectEventstore {
 	data, _ := json.Marshal(model.Project{Name: "Name"})
 	events := []*es_models.Event{
-		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: proj_model.ProjectAdded, Data: data},
+		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: model.ProjectAdded, Data: data},
 	}
 	mockEs := mock.NewMockEventstore(ctrl)
 	mockEs.EXPECT().FilterEvents(gomock.Any(), gomock.Any()).Return(events, nil)
@@ -79,7 +79,7 @@ func GetMockManipulateProject(ctrl *gomock.Controller) *ProjectEventstore {
 func GetMockManipulateProjectWithPw(ctrl *gomock.Controller) *ProjectEventstore {
 	data, _ := json.Marshal(model.Project{Name: "Name"})
 	events := []*es_models.Event{
-		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: proj_model.ProjectAdded, Data: data},
+		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: model.ProjectAdded, Data: data},
 	}
 	mockEs := mock.NewMockEventstore(ctrl)
 	mockEs.EXPECT().FilterEvents(gomock.Any(), gomock.Any()).Return(events, nil)
@@ -91,8 +91,8 @@ func GetMockManipulateProjectWithPw(ctrl *gomock.Controller) *ProjectEventstore
 func GetMockManipulateInactiveProject(ctrl *gomock.Controller) *ProjectEventstore {
 	data, _ := json.Marshal(model.Project{Name: "Name"})
 	events := []*es_models.Event{
-		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: proj_model.ProjectAdded, Data: data},
-		&es_models.Event{AggregateID: "AggregateID", Sequence: 2, Type: proj_model.ProjectDeactivated, Data: data},
+		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: model.ProjectAdded, Data: data},
+		&es_models.Event{AggregateID: "AggregateID", Sequence: 2, Type: model.ProjectDeactivated, Data: data},
 	}
 	mockEs := mock.NewMockEventstore(ctrl)
 	mockEs.EXPECT().FilterEvents(gomock.Any(), gomock.Any()).Return(events, nil)
@@ -105,8 +105,8 @@ func GetMockManipulateProjectWithMember(ctrl *gomock.Controller) *ProjectEventst
 	data, _ := json.Marshal(model.Project{Name: "Name"})
 	memberData, _ := json.Marshal(model.ProjectMember{UserID: "UserID", Roles: []string{"Role"}})
 	events := []*es_models.Event{
-		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: proj_model.ProjectAdded, Data: data},
-		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: proj_model.ProjectMemberAdded, Data: memberData},
+		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: model.ProjectAdded, Data: data},
+		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: model.ProjectMemberAdded, Data: memberData},
 	}
 	mockEs := mock.NewMockEventstore(ctrl)
 	mockEs.EXPECT().FilterEvents(gomock.Any(), gomock.Any()).Return(events, nil)
@@ -119,8 +119,8 @@ func GetMockManipulateProjectWithRole(ctrl *gomock.Controller) *ProjectEventstor
 	data, _ := json.Marshal(model.Project{Name: "Name"})
 	roleData, _ := json.Marshal(model.ProjectRole{Key: "Key", DisplayName: "DisplayName", Group: "Group"})
 	events := []*es_models.Event{
-		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: proj_model.ProjectAdded, Data: data},
-		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: proj_model.ProjectRoleAdded, Data: roleData},
+		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: model.ProjectAdded, Data: data},
+		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: model.ProjectRoleAdded, Data: roleData},
 	}
 	mockEs := mock.NewMockEventstore(ctrl)
 	mockEs.EXPECT().FilterEvents(gomock.Any(), gomock.Any()).Return(events, nil)
@@ -138,9 +138,9 @@ func GetMockManipulateProjectWithOIDCApp(ctrl *gomock.Controller) *ProjectEvents
 		GrantTypes:    []int32{int32(proj_model.OIDCGRANTTYPE_AUTHORIZATION_CODE)},
 	})
 	events := []*es_models.Event{
-		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: proj_model.ProjectAdded, Data: data},
-		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: proj_model.ApplicationAdded, Data: appData},
-		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: proj_model.OIDCConfigAdded, Data: oidcData},
+		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: model.ProjectAdded, Data: data},
+		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: model.ApplicationAdded, Data: appData},
+		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: model.OIDCConfigAdded, Data: oidcData},
 	}
 	mockEs := mock.NewMockEventstore(ctrl)
 	mockEs.EXPECT().FilterEvents(gomock.Any(), gomock.Any()).Return(events, nil)
@@ -154,8 +154,8 @@ func GetMockManipulateProjectWithSAMLApp(ctrl *gomock.Controller) *ProjectEvents
 	appData, _ := json.Marshal(model.Application{AppID: "AppID", Name: "Name"})
 
 	events := []*es_models.Event{
-		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: proj_model.ProjectAdded, Data: data},
-		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: proj_model.ApplicationAdded, Data: appData},
+		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: model.ProjectAdded, Data: data},
+		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: model.ApplicationAdded, Data: appData},
 	}
 	mockEs := mock.NewMockEventstore(ctrl)
 	mockEs.EXPECT().FilterEvents(gomock.Any(), gomock.Any()).Return(events, nil)
@@ -168,8 +168,8 @@ func GetMockManipulateProjectWithGrant(ctrl *gomock.Controller) *ProjectEventsto
 	data, _ := json.Marshal(model.Project{Name: "Name"})
 	grantData, _ := json.Marshal(model.ProjectGrant{GrantID: "GrantID", GrantedOrgID: "GrantedOrgID", RoleKeys: []string{"Key"}})
 	events := []*es_models.Event{
-		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: proj_model.ProjectAdded, Data: data},
-		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: proj_model.ProjectGrantAdded, Data: grantData},
+		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: model.ProjectAdded, Data: data},
+		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: model.ProjectGrantAdded, Data: grantData},
 	}
 	mockEs := mock.NewMockEventstore(ctrl)
 	mockEs.EXPECT().FilterEvents(gomock.Any(), gomock.Any()).Return(events, nil)
@@ -184,10 +184,10 @@ func GetMockManipulateProjectWithGrantExistingRole(ctrl *gomock.Controller) *Pro
 	roleData2, _ := json.Marshal(model.ProjectRole{Key: "KeyChanged", DisplayName: "DisplayName", Group: "Group"})
 	grantData, _ := json.Marshal(model.ProjectGrant{GrantID: "GrantID", GrantedOrgID: "GrantedOrgID", RoleKeys: []string{"Key"}})
 	events := []*es_models.Event{
-		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: proj_model.ProjectAdded, Data: data},
-		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: proj_model.ProjectRoleAdded, Data: roleData},
-		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: proj_model.ProjectRoleAdded, Data: roleData2},
-		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: proj_model.ProjectGrantAdded, Data: grantData},
+		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: model.ProjectAdded, Data: data},
+		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: model.ProjectRoleAdded, Data: roleData},
+		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: model.ProjectRoleAdded, Data: roleData2},
+		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: model.ProjectGrantAdded, Data: grantData},
 	}
 	mockEs := mock.NewMockEventstore(ctrl)
 	mockEs.EXPECT().FilterEvents(gomock.Any(), gomock.Any()).Return(events, nil)
@@ -201,9 +201,9 @@ func GetMockManipulateProjectWithGrantMember(ctrl *gomock.Controller) *ProjectEv
 	grantData, _ := json.Marshal(model.ProjectGrant{GrantID: "GrantID", GrantedOrgID: "GrantedOrgID", RoleKeys: []string{"Key"}})
 	memberData, _ := json.Marshal(model.ProjectGrantMember{GrantID: "GrantID", UserID: "UserID", Roles: []string{"Role"}})
 	events := []*es_models.Event{
-		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: proj_model.ProjectAdded, Data: data},
-		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: proj_model.ProjectGrantAdded, Data: grantData},
-		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: proj_model.ProjectGrantMemberAdded, Data: memberData},
+		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: model.ProjectAdded, Data: data},
+		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: model.ProjectGrantAdded, Data: grantData},
+		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: model.ProjectGrantMemberAdded, Data: memberData},
 	}
 	mockEs := mock.NewMockEventstore(ctrl)
 	mockEs.EXPECT().FilterEvents(gomock.Any(), gomock.Any()).Return(events, nil)
@@ -225,8 +225,8 @@ func GetMockProjectMemberByIDsOK(ctrl *gomock.Controller) *ProjectEventstore {
 	projectData, _ := json.Marshal(model.Project{Name: "Name"})
 	memberData, _ := json.Marshal(model.ProjectMember{UserID: "UserID", Roles: []string{"Role"}})
 	events := []*es_models.Event{
-		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: proj_model.ProjectAdded, Data: projectData},
-		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: proj_model.ProjectMemberAdded, Data: memberData},
+		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: model.ProjectAdded, Data: projectData},
+		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: model.ProjectMemberAdded, Data: memberData},
 	}
 	mockEs := mock.NewMockEventstore(ctrl)
 	mockEs.EXPECT().FilterEvents(gomock.Any(), gomock.Any()).Return(events, nil)
@@ -239,9 +239,9 @@ func GetMockProjectAppsByIDsOK(ctrl *gomock.Controller) *ProjectEventstore {
 	oidcData, _ := json.Marshal(model.OIDCConfig{ClientID: "ClientID"})
 
 	events := []*es_models.Event{
-		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: proj_model.ProjectAdded, Data: projectData},
-		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: proj_model.ApplicationAdded, Data: appData},
-		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: proj_model.OIDCConfigAdded, Data: oidcData},
+		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: model.ProjectAdded, Data: projectData},
+		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: model.ApplicationAdded, Data: appData},
+		&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: model.OIDCConfigAdded, Data: oidcData},
 	}
 	mockEs := mock.NewMockEventstore(ctrl)
 	mockEs.EXPECT().FilterEvents(gomock.Any(), gomock.Any()).Return(events, nil)
@@ -253,8 +253,8 @@ func GetMockProjectGrantByIDsOK(ctrl *gomock.Controller) *ProjectEventstore {
 	grantData, _ := json.Marshal(model.ProjectGrant{GrantID: "GrantID", GrantedOrgID: "GrantID", RoleKeys: []string{"Key"}})
 
 	events := []*es_models.Event{
-		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: proj_model.ProjectAdded, Data: projectData},
-		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: proj_model.ProjectGrantAdded, Data: grantData},
+		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: model.ProjectAdded, Data: projectData},
+		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: model.ProjectGrantAdded, Data: grantData},
 	}
 	mockEs := mock.NewMockEventstore(ctrl)
 	mockEs.EXPECT().FilterEvents(gomock.Any(), gomock.Any()).Return(events, nil)
@@ -267,9 +267,9 @@ func GetMockProjectGrantMemberByIDsOK(ctrl *gomock.Controller) *ProjectEventstor
 	memberData, _ := json.Marshal(model.ProjectGrantMember{GrantID: "GrantID", UserID: "UserID", Roles: []string{"Role"}})
 
 	events := []*es_models.Event{
-		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: proj_model.ProjectAdded, Data: projectData},
-		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: proj_model.ProjectGrantAdded, Data: grantData},
-		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: proj_model.ProjectGrantMemberAdded, Data: memberData},
+		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: model.ProjectAdded, Data: projectData},
+		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: model.ProjectGrantAdded, Data: grantData},
+		&es_models.Event{AggregateID: "ID", Sequence: 1, Type: model.ProjectGrantMemberAdded, Data: memberData},
 	}
 	mockEs := mock.NewMockEventstore(ctrl)
 	mockEs.EXPECT().FilterEvents(gomock.Any(), gomock.Any()).Return(events, nil)

internal/project/repository/eventsourcing/model/application.go

@@ -57,16 +57,11 @@ func AppsFromModel(apps []*model.Application) []*Application {
 
 func AppFromModel(app *model.Application) *Application {
 	converted := &Application{
-		ObjectRoot: es_models.ObjectRoot{
-			AggregateID:  app.ObjectRoot.AggregateID,
-			Sequence:     app.Sequence,
-			ChangeDate:   app.ChangeDate,
-			CreationDate: app.CreationDate,
-		},
-		AppID: app.AppID,
-		Name:  app.Name,
-		State: int32(app.State),
-		Type:  int32(app.Type),
+		ObjectRoot: app.ObjectRoot,
+		AppID:      app.AppID,
+		Name:       app.Name,
+		State:      int32(app.State),
+		Type:       int32(app.Type),
 	}
 	if app.OIDCConfig != nil {
 		converted.OIDCConfig = OIDCConfigFromModel(app.OIDCConfig)
@@ -76,16 +71,11 @@ func AppFromModel(app *model.Application) *Application {
 
 func AppToModel(app *Application) *model.Application {
 	converted := &model.Application{
-		ObjectRoot: es_models.ObjectRoot{
-			AggregateID:  app.AggregateID,
-			ChangeDate:   app.ChangeDate,
-			CreationDate: app.CreationDate,
-			Sequence:     app.Sequence,
-		},
-		AppID: app.AppID,
-		Name:  app.Name,
-		State: model.AppState(app.State),
-		Type:  model.AppType(app.Type),
+		ObjectRoot: app.ObjectRoot,
+		AppID:      app.AppID,
+		Name:       app.Name,
+		State:      model.AppState(app.State),
+		Type:       model.AppType(app.Type),
 	}
 	if app.OIDCConfig != nil {
 		converted.OIDCConfig = OIDCConfigToModel(app.OIDCConfig)

internal/project/repository/eventsourcing/model/oidc_config.go

@@ -56,12 +56,7 @@ func OIDCConfigFromModel(config *model.OIDCConfig) *OIDCConfig {
 		grantTypes[i] = int32(rt)
 	}
 	return &OIDCConfig{
-		ObjectRoot: es_models.ObjectRoot{
-			AggregateID:  config.ObjectRoot.AggregateID,
-			Sequence:     config.Sequence,
-			ChangeDate:   config.ChangeDate,
-			CreationDate: config.CreationDate,
-		},
+		ObjectRoot:             config.ObjectRoot,
 		AppID:                  config.AppID,
 		ClientID:               config.ClientID,
 		ClientSecret:           config.ClientSecret,
@@ -84,12 +79,7 @@ func OIDCConfigToModel(config *OIDCConfig) *model.OIDCConfig {
 		grantTypes[i] = model.OIDCGrantType(rt)
 	}
 	return &model.OIDCConfig{
-		ObjectRoot: es_models.ObjectRoot{
-			AggregateID:  config.ObjectRoot.AggregateID,
-			Sequence:     config.Sequence,
-			ChangeDate:   config.ChangeDate,
-			CreationDate: config.CreationDate,
-		},
+		ObjectRoot:             config.ObjectRoot,
 		AppID:                  config.AppID,
 		ClientID:               config.ClientID,
 		ClientSecret:           config.ClientSecret,

internal/project/repository/eventsourcing/model/project.go

@@ -35,12 +35,7 @@ func ProjectFromModel(project *model.Project) *Project {
 	apps := AppsFromModel(project.Applications)
 	grants := GrantsFromModel(project.Grants)
 	return &Project{
-		ObjectRoot: es_models.ObjectRoot{
-			AggregateID:  project.ObjectRoot.AggregateID,
-			Sequence:     project.Sequence,
-			ChangeDate:   project.ChangeDate,
-			CreationDate: project.CreationDate,
-		},
+		ObjectRoot:   project.ObjectRoot,
 		Name:         project.Name,
 		State:        int32(project.State),
 		Members:      members,
@@ -56,12 +51,7 @@ func ProjectToModel(project *Project) *model.Project {
 	apps := AppsToModel(project.Applications)
 	grants := GrantsToModel(project.Grants)
 	return &model.Project{
-		ObjectRoot: es_models.ObjectRoot{
-			AggregateID:  project.AggregateID,
-			ChangeDate:   project.ChangeDate,
-			CreationDate: project.CreationDate,
-			Sequence:     project.Sequence,
-		},
+		ObjectRoot:   project.ObjectRoot,
 		Name:         project.Name,
 		State:        model.ProjectState(project.State),
 		Members:      members,
@@ -92,63 +82,64 @@ func (p *Project) AppendEvent(event *es_models.Event) error {
 	p.ObjectRoot.AppendEvent(event)
 
 	switch event.Type {
-	case model.ProjectAdded, model.ProjectChanged:
-		if err := json.Unmarshal(event.Data, p); err != nil {
-			logging.Log("EVEN-idl93").WithError(err).Error("could not unmarshal event data")
-			return err
-		}
-		p.State = int32(model.PROJECTSTATE_ACTIVE)
-		return nil
-	case model.ProjectDeactivated:
+	case ProjectAdded, ProjectChanged:
+		return p.AppendAddProjectEvent(event)
+	case ProjectDeactivated:
 		return p.appendDeactivatedEvent()
-	case model.ProjectReactivated:
+	case ProjectReactivated:
 		return p.appendReactivatedEvent()
-	case model.ProjectMemberAdded:
+	case ProjectMemberAdded:
 		return p.appendAddMemberEvent(event)
-	case model.ProjectMemberChanged:
+	case ProjectMemberChanged:
 		return p.appendChangeMemberEvent(event)
-	case model.ProjectMemberRemoved:
+	case ProjectMemberRemoved:
 		return p.appendRemoveMemberEvent(event)
-	case model.ProjectRoleAdded:
+	case ProjectRoleAdded:
 		return p.appendAddRoleEvent(event)
-	case model.ProjectRoleChanged:
+	case ProjectRoleChanged:
 		return p.appendChangeRoleEvent(event)
-	case model.ProjectRoleRemoved:
+	case ProjectRoleRemoved:
 		return p.appendRemoveRoleEvent(event)
-	case model.ApplicationAdded:
+	case ApplicationAdded:
 		return p.appendAddAppEvent(event)
-	case model.ApplicationChanged:
+	case ApplicationChanged:
 		return p.appendChangeAppEvent(event)
-	case model.ApplicationRemoved:
+	case ApplicationRemoved:
 		return p.appendRemoveAppEvent(event)
-	case model.ApplicationDeactivated:
+	case ApplicationDeactivated:
 		return p.appendAppStateEvent(event, model.APPSTATE_INACTIVE)
-	case model.ApplicationReactivated:
+	case ApplicationReactivated:
 		return p.appendAppStateEvent(event, model.APPSTATE_ACTIVE)
-	case model.OIDCConfigAdded:
+	case OIDCConfigAdded:
 		return p.appendAddOIDCConfigEvent(event)
-	case model.OIDCConfigChanged, model.OIDCConfigSecretChanged:
+	case OIDCConfigChanged, OIDCConfigSecretChanged:
 		return p.appendChangeOIDCConfigEvent(event)
-	case model.ProjectGrantAdded:
+	case ProjectGrantAdded:
 		return p.appendAddGrantEvent(event)
-	case model.ProjectGrantChanged:
+	case ProjectGrantChanged:
 		return p.appendChangeGrantEvent(event)
-	case model.ProjectGrantDeactivated:
+	case ProjectGrantDeactivated:
 		return p.appendGrantStateEvent(event, model.PROJECTGRANTSTATE_INACTIVE)
-	case model.ProjectGrantReactivated:
+	case ProjectGrantReactivated:
 		return p.appendGrantStateEvent(event, model.PROJECTGRANTSTATE_ACTIVE)
-	case model.ProjectGrantRemoved:
+	case ProjectGrantRemoved:
 		return p.appendRemoveGrantEvent(event)
-	case model.ProjectGrantMemberAdded:
+	case ProjectGrantMemberAdded:
 		return p.appendAddGrantMemberEvent(event)
-	case model.ProjectGrantMemberChanged:
+	case ProjectGrantMemberChanged:
 		return p.appendChangeGrantMemberEvent(event)
-	case model.ProjectGrantMemberRemoved:
+	case ProjectGrantMemberRemoved:
 		return p.appendRemoveGrantMemberEvent(event)
 	}
 	return nil
 }
 
+func (p *Project) AppendAddProjectEvent(event *es_models.Event) error {
+	p.setData(event)
+	p.State = int32(model.PROJECTSTATE_ACTIVE)
+	return nil
+}
+
 func (p *Project) appendDeactivatedEvent() error {
 	p.State = int32(model.PROJECTSTATE_INACTIVE)
 	return nil
@@ -158,3 +149,11 @@ func (p *Project) appendReactivatedEvent() error {
 	p.State = int32(model.PROJECTSTATE_ACTIVE)
 	return nil
 }
+
+func (p *Project) setData(event *es_models.Event) error {
+	if err := json.Unmarshal(event.Data, p); err != nil {
+		logging.Log("EVEN-lo9sr").WithError(err).Error("could not unmarshal event data")
+		return err
+	}
+	return nil
+}

internal/project/repository/eventsourcing/model/project_grant.go

@@ -59,12 +59,7 @@ func GrantsFromModel(grants []*model.ProjectGrant) []*ProjectGrant {
 func GrantFromModel(grant *model.ProjectGrant) *ProjectGrant {
 	members := GrantMembersFromModel(grant.Members)
 	return &ProjectGrant{
-		ObjectRoot: es_models.ObjectRoot{
-			AggregateID:  grant.ObjectRoot.AggregateID,
-			Sequence:     grant.Sequence,
-			ChangeDate:   grant.ChangeDate,
-			CreationDate: grant.CreationDate,
-		},
+		ObjectRoot:   grant.ObjectRoot,
 		GrantID:      grant.GrantID,
 		GrantedOrgID: grant.GrantedOrgID,
 		State:        int32(grant.State),
@@ -76,12 +71,7 @@ func GrantFromModel(grant *model.ProjectGrant) *ProjectGrant {
 func GrantToModel(grant *ProjectGrant) *model.ProjectGrant {
 	members := GrantMembersToModel(grant.Members)
 	return &model.ProjectGrant{
-		ObjectRoot: es_models.ObjectRoot{
-			AggregateID:  grant.AggregateID,
-			ChangeDate:   grant.ChangeDate,
-			CreationDate: grant.CreationDate,
-			Sequence:     grant.Sequence,
-		},
+		ObjectRoot:   grant.ObjectRoot,
 		GrantID:      grant.GrantID,
 		GrantedOrgID: grant.GrantedOrgID,
 		State:        model.ProjectGrantState(grant.State),

internal/project/repository/eventsourcing/model/project_grant_member.go

@@ -41,29 +41,19 @@ func GrantMembersFromModel(members []*model.ProjectGrantMember) []*ProjectGrantM
 
 func GrantMemberFromModel(member *model.ProjectGrantMember) *ProjectGrantMember {
 	return &ProjectGrantMember{
-		ObjectRoot: es_models.ObjectRoot{
-			AggregateID:  member.ObjectRoot.AggregateID,
-			Sequence:     member.Sequence,
-			ChangeDate:   member.ChangeDate,
-			CreationDate: member.CreationDate,
-		},
-		GrantID: member.GrantID,
-		UserID:  member.UserID,
-		Roles:   member.Roles,
+		ObjectRoot: member.ObjectRoot,
+		GrantID:    member.GrantID,
+		UserID:     member.UserID,
+		Roles:      member.Roles,
 	}
 }
 
 func GrantMemberToModel(member *ProjectGrantMember) *model.ProjectGrantMember {
 	return &model.ProjectGrantMember{
-		ObjectRoot: es_models.ObjectRoot{
-			AggregateID:  member.AggregateID,
-			ChangeDate:   member.ChangeDate,
-			CreationDate: member.CreationDate,
-			Sequence:     member.Sequence,
-		},
-		GrantID: member.GrantID,
-		UserID:  member.UserID,
-		Roles:   member.Roles,
+		ObjectRoot: member.ObjectRoot,
+		GrantID:    member.GrantID,
+		UserID:     member.UserID,
+		Roles:      member.Roles,
 	}
 }
 

internal/project/repository/eventsourcing/model/project_member.go

@@ -40,27 +40,17 @@ func ProjectMembersFromModel(members []*model.ProjectMember) []*ProjectMember {
 
 func ProjectMemberFromModel(member *model.ProjectMember) *ProjectMember {
 	return &ProjectMember{
-		ObjectRoot: es_models.ObjectRoot{
-			AggregateID:  member.ObjectRoot.AggregateID,
-			Sequence:     member.Sequence,
-			ChangeDate:   member.ChangeDate,
-			CreationDate: member.CreationDate,
-		},
-		UserID: member.UserID,
-		Roles:  member.Roles,
+		ObjectRoot: member.ObjectRoot,
+		UserID:     member.UserID,
+		Roles:      member.Roles,
 	}
 }
 
 func ProjectMemberToModel(member *ProjectMember) *model.ProjectMember {
 	return &model.ProjectMember{
-		ObjectRoot: es_models.ObjectRoot{
-			AggregateID:  member.AggregateID,
-			ChangeDate:   member.ChangeDate,
-			CreationDate: member.CreationDate,
-			Sequence:     member.Sequence,
-		},
-		UserID: member.UserID,
-		Roles:  member.Roles,
+		ObjectRoot: member.ObjectRoot,
+		UserID:     member.UserID,
+		Roles:      member.Roles,
 	}
 }
 

internal/project/repository/eventsourcing/model/project_role.go

@@ -41,12 +41,7 @@ func ProjectRolesFromModel(roles []*model.ProjectRole) []*ProjectRole {
 
 func ProjectRoleFromModel(role *model.ProjectRole) *ProjectRole {
 	return &ProjectRole{
-		ObjectRoot: es_models.ObjectRoot{
-			AggregateID:  role.ObjectRoot.AggregateID,
-			Sequence:     role.Sequence,
-			ChangeDate:   role.ChangeDate,
-			CreationDate: role.CreationDate,
-		},
+		ObjectRoot:  role.ObjectRoot,
 		Key:         role.Key,
 		DisplayName: role.DisplayName,
 		Group:       role.Group,
@@ -55,12 +50,7 @@ func ProjectRoleFromModel(role *model.ProjectRole) *ProjectRole {
 
 func ProjectRoleToModel(role *ProjectRole) *model.ProjectRole {
 	return &model.ProjectRole{
-		ObjectRoot: es_models.ObjectRoot{
-			AggregateID:  role.AggregateID,
-			ChangeDate:   role.ChangeDate,
-			CreationDate: role.CreationDate,
-			Sequence:     role.Sequence,
-		},
+		ObjectRoot:  role.ObjectRoot,
 		Key:         role.Key,
 		DisplayName: role.DisplayName,
 		Group:       role.Group,

internal/project/repository/eventsourcing/model/project_test.go

@@ -65,7 +65,7 @@ func TestProjectFromEvents(t *testing.T) {
 			name: "project from events, ok",
 			args: args{
 				event: []*es_models.Event{
-					&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: model.ProjectAdded},
+					&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: ProjectAdded},
 				},
 				project: &Project{Name: "ProjectName"},
 			},
@@ -75,7 +75,7 @@ func TestProjectFromEvents(t *testing.T) {
 			name: "project from events, nil project",
 			args: args{
 				event: []*es_models.Event{
-					&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: model.ProjectAdded},
+					&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: ProjectAdded},
 				},
 				project: nil,
 			},
@@ -109,7 +109,7 @@ func TestAppendEvent(t *testing.T) {
 		{
 			name: "append added event",
 			args: args{
-				event:   &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: model.ProjectAdded},
+				event:   &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: ProjectAdded},
 				project: &Project{Name: "ProjectName"},
 			},
 			result: &Project{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"}, State: int32(model.PROJECTSTATE_ACTIVE), Name: "ProjectName"},
@@ -117,7 +117,7 @@ func TestAppendEvent(t *testing.T) {
 		{
 			name: "append change event",
 			args: args{
-				event:   &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: model.ProjectChanged},
+				event:   &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: ProjectChanged},
 				project: &Project{Name: "ProjectName"},
 			},
 			result: &Project{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"}, State: int32(model.PROJECTSTATE_ACTIVE), Name: "ProjectName"},
@@ -125,14 +125,14 @@ func TestAppendEvent(t *testing.T) {
 		{
 			name: "append deactivate event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: model.ProjectDeactivated},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: ProjectDeactivated},
 			},
 			result: &Project{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"}, State: int32(model.PROJECTSTATE_INACTIVE)},
 		},
 		{
 			name: "append reactivate event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: model.ProjectReactivated},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: ProjectReactivated},
 			},
 			result: &Project{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"}, State: int32(model.PROJECTSTATE_ACTIVE)},
 		},

internal/project/repository/eventsourcing/project.go

@@ -6,7 +6,6 @@ import (
 	"github.com/caos/zitadel/internal/errors"
 	"github.com/caos/zitadel/internal/eventstore/models"
 	es_models "github.com/caos/zitadel/internal/eventstore/models"
-	proj_model "github.com/caos/zitadel/internal/project/model"
 	"github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
 )
 
@@ -20,7 +19,7 @@ func ProjectByIDQuery(id string, latestSequence uint64) (*es_models.SearchQuery,
 
 func ProjectQuery(latestSequence uint64) *es_models.SearchQuery {
 	return es_models.NewSearchQuery().
-		AggregateTypeFilter(proj_model.ProjectAggregate).
+		AggregateTypeFilter(model.ProjectAggregate).
 		LatestSequenceFilter(latestSequence)
 }
 
@@ -28,7 +27,7 @@ func ProjectAggregate(ctx context.Context, aggCreator *es_models.AggregateCreato
 	if project == nil {
 		return nil, errors.ThrowPreconditionFailed(nil, "EVENT-doe93", "existing project should not be nil")
 	}
-	return aggCreator.NewAggregate(ctx, project.AggregateID, proj_model.ProjectAggregate, model.ProjectVersion, project.Sequence)
+	return aggCreator.NewAggregate(ctx, project.AggregateID, model.ProjectAggregate, model.ProjectVersion, project.Sequence)
 }
 
 func ProjectCreateAggregate(aggCreator *es_models.AggregateCreator, project *model.Project) func(ctx context.Context) (*es_models.Aggregate, error) {
@@ -42,7 +41,7 @@ func ProjectCreateAggregate(aggCreator *es_models.AggregateCreator, project *mod
 			return nil, err
 		}
 
-		return agg.AppendEvent(proj_model.ProjectAdded, project)
+		return agg.AppendEvent(model.ProjectAdded, project)
 	}
 }
 
@@ -56,16 +55,16 @@ func ProjectUpdateAggregate(aggCreator *es_models.AggregateCreator, existing *mo
 			return nil, err
 		}
 		changes := existing.Changes(new)
-		return agg.AppendEvent(proj_model.ProjectChanged, changes)
+		return agg.AppendEvent(model.ProjectChanged, changes)
 	}
 }
 
 func ProjectDeactivateAggregate(aggCreator *es_models.AggregateCreator, project *model.Project) func(ctx context.Context) (*es_models.Aggregate, error) {
-	return projectStateAggregate(aggCreator, project, proj_model.ProjectDeactivated)
+	return projectStateAggregate(aggCreator, project, model.ProjectDeactivated)
 }
 
 func ProjectReactivateAggregate(aggCreator *es_models.AggregateCreator, project *model.Project) func(ctx context.Context) (*es_models.Aggregate, error) {
-	return projectStateAggregate(aggCreator, project, proj_model.ProjectReactivated)
+	return projectStateAggregate(aggCreator, project, model.ProjectReactivated)
 }
 
 func projectStateAggregate(aggCreator *es_models.AggregateCreator, project *model.Project, state models.EventType) func(ctx context.Context) (*es_models.Aggregate, error) {
@@ -87,7 +86,7 @@ func ProjectMemberAddedAggregate(aggCreator *es_models.AggregateCreator, existin
 		if err != nil {
 			return nil, err
 		}
-		return agg.AppendEvent(proj_model.ProjectMemberAdded, member)
+		return agg.AppendEvent(model.ProjectMemberAdded, member)
 	}
 }
 
@@ -101,7 +100,7 @@ func ProjectMemberChangedAggregate(aggCreator *es_models.AggregateCreator, exist
 		if err != nil {
 			return nil, err
 		}
-		return agg.AppendEvent(proj_model.ProjectMemberChanged, member)
+		return agg.AppendEvent(model.ProjectMemberChanged, member)
 	}
 }
 
@@ -114,7 +113,7 @@ func ProjectMemberRemovedAggregate(aggCreator *es_models.AggregateCreator, exist
 		if err != nil {
 			return nil, err
 		}
-		return agg.AppendEvent(proj_model.ProjectMemberRemoved, member)
+		return agg.AppendEvent(model.ProjectMemberRemoved, member)
 	}
 }
 
@@ -127,7 +126,7 @@ func ProjectRoleAddedAggregate(aggCreator *es_models.AggregateCreator, existing
 		if err != nil {
 			return nil, err
 		}
-		return agg.AppendEvent(proj_model.ProjectRoleAdded, role)
+		return agg.AppendEvent(model.ProjectRoleAdded, role)
 	}
 }
 
@@ -140,7 +139,7 @@ func ProjectRoleChangedAggregate(aggCreator *es_models.AggregateCreator, existin
 		if err != nil {
 			return nil, err
 		}
-		return agg.AppendEvent(proj_model.ProjectRoleChanged, role)
+		return agg.AppendEvent(model.ProjectRoleChanged, role)
 	}
 }
 
@@ -153,7 +152,7 @@ func ProjectRoleRemovedAggregate(aggCreator *es_models.AggregateCreator, existin
 		if err != nil {
 			return nil, err
 		}
-		return agg.AppendEvent(proj_model.ProjectRoleRemoved, role)
+		return agg.AppendEvent(model.ProjectRoleRemoved, role)
 	}
 }
 
@@ -166,9 +165,9 @@ func ApplicationAddedAggregate(aggCreator *es_models.AggregateCreator, existing
 		if err != nil {
 			return nil, err
 		}
-		agg.AppendEvent(proj_model.ApplicationAdded, app)
+		agg.AppendEvent(model.ApplicationAdded, app)
 		if app.OIDCConfig != nil {
-			agg.AppendEvent(proj_model.OIDCConfigAdded, app.OIDCConfig)
+			agg.AppendEvent(model.OIDCConfigAdded, app.OIDCConfig)
 		}
 		return agg, nil
 	}
@@ -189,7 +188,7 @@ func ApplicationChangedAggregate(aggCreator *es_models.AggregateCreator, existin
 				changes = a.Changes(app)
 			}
 		}
-		agg.AppendEvent(proj_model.ApplicationChanged, changes)
+		agg.AppendEvent(model.ApplicationChanged, changes)
 
 		return agg, nil
 	}
@@ -204,7 +203,7 @@ func ApplicationRemovedAggregate(aggCreator *es_models.AggregateCreator, existin
 		if err != nil {
 			return nil, err
 		}
-		agg.AppendEvent(proj_model.ApplicationRemoved, &model.ApplicationID{AppID: app.AppID})
+		agg.AppendEvent(model.ApplicationRemoved, &model.ApplicationID{AppID: app.AppID})
 
 		return agg, nil
 	}
@@ -219,7 +218,7 @@ func ApplicationDeactivatedAggregate(aggCreator *es_models.AggregateCreator, exi
 		if err != nil {
 			return nil, err
 		}
-		agg.AppendEvent(proj_model.ApplicationDeactivated, &model.ApplicationID{AppID: app.AppID})
+		agg.AppendEvent(model.ApplicationDeactivated, &model.ApplicationID{AppID: app.AppID})
 
 		return agg, nil
 	}
@@ -234,7 +233,7 @@ func ApplicationReactivatedAggregate(aggCreator *es_models.AggregateCreator, exi
 		if err != nil {
 			return nil, err
 		}
-		agg.AppendEvent(proj_model.ApplicationReactivated, &model.ApplicationID{AppID: app.AppID})
+		agg.AppendEvent(model.ApplicationReactivated, &model.ApplicationID{AppID: app.AppID})
 
 		return agg, nil
 	}
@@ -257,7 +256,7 @@ func OIDCConfigChangedAggregate(aggCreator *es_models.AggregateCreator, existing
 				}
 			}
 		}
-		agg.AppendEvent(proj_model.OIDCConfigChanged, changes)
+		agg.AppendEvent(model.OIDCConfigChanged, changes)
 
 		return agg, nil
 	}
@@ -273,7 +272,7 @@ func OIDCConfigSecretChangedAggregate(aggCreator *es_models.AggregateCreator, ex
 		changes["appId"] = appID
 		changes["clientSecret"] = secret
 
-		agg.AppendEvent(proj_model.OIDCConfigSecretChanged, changes)
+		agg.AppendEvent(model.OIDCConfigSecretChanged, changes)
 
 		return agg, nil
 	}
@@ -288,7 +287,7 @@ func ProjectGrantAddedAggregate(aggCreator *es_models.AggregateCreator, existing
 		if err != nil {
 			return nil, err
 		}
-		agg.AppendEvent(proj_model.ProjectGrantAdded, grant)
+		agg.AppendEvent(model.ProjectGrantAdded, grant)
 		return agg, nil
 	}
 }
@@ -308,7 +307,7 @@ func ProjectGrantChangedAggregate(aggCreator *es_models.AggregateCreator, existi
 				changes = g.Changes(grant)
 			}
 		}
-		agg.AppendEvent(proj_model.ProjectGrantChanged, changes)
+		agg.AppendEvent(model.ProjectGrantChanged, changes)
 
 		return agg, nil
 	}
@@ -323,7 +322,7 @@ func ProjectGrantRemovedAggregate(aggCreator *es_models.AggregateCreator, existi
 		if err != nil {
 			return nil, err
 		}
-		agg.AppendEvent(proj_model.ProjectGrantRemoved, &model.ProjectGrantID{GrantID: grant.GrantID})
+		agg.AppendEvent(model.ProjectGrantRemoved, &model.ProjectGrantID{GrantID: grant.GrantID})
 
 		return agg, nil
 	}
@@ -338,7 +337,7 @@ func ProjectGrantDeactivatedAggregate(aggCreator *es_models.AggregateCreator, ex
 		if err != nil {
 			return nil, err
 		}
-		agg.AppendEvent(proj_model.ProjectGrantDeactivated, &model.ProjectGrantID{GrantID: grant.GrantID})
+		agg.AppendEvent(model.ProjectGrantDeactivated, &model.ProjectGrantID{GrantID: grant.GrantID})
 
 		return agg, nil
 	}
@@ -353,7 +352,7 @@ func ProjectGrantReactivatedAggregate(aggCreator *es_models.AggregateCreator, ex
 		if err != nil {
 			return nil, err
 		}
-		agg.AppendEvent(proj_model.ProjectGrantReactivated, &model.ProjectGrantID{GrantID: grant.GrantID})
+		agg.AppendEvent(model.ProjectGrantReactivated, &model.ProjectGrantID{GrantID: grant.GrantID})
 
 		return agg, nil
 	}
@@ -368,7 +367,7 @@ func ProjectGrantMemberAddedAggregate(aggCreator *es_models.AggregateCreator, ex
 		if err != nil {
 			return nil, err
 		}
-		agg.AppendEvent(proj_model.ProjectGrantMemberAdded, member)
+		agg.AppendEvent(model.ProjectGrantMemberAdded, member)
 		return agg, nil
 	}
 }
@@ -388,7 +387,7 @@ func ProjectGrantMemberChangedAggregate(aggCreator *es_models.AggregateCreator,
 		changes["userId"] = member.UserID
 		changes["roles"] = member.Roles
 
-		return agg.AppendEvent(proj_model.ProjectGrantMemberChanged, changes)
+		return agg.AppendEvent(model.ProjectGrantMemberChanged, changes)
 	}
 }
 
@@ -401,6 +400,6 @@ func ProjectGrantMemberRemovedAggregate(aggCreator *es_models.AggregateCreator,
 		if err != nil {
 			return nil, err
 		}
-		return agg.AppendEvent(proj_model.ProjectGrantMemberRemoved, member)
+		return agg.AppendEvent(model.ProjectGrantMemberRemoved, member)
 	}
 }

internal/project/repository/eventsourcing/project_test.go

@@ -126,7 +126,7 @@ func TestProjectAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen: 0,
-				aggType:  proj_model.ProjectAggregate,
+				aggType:  model.ProjectAggregate,
 			},
 		},
 		{
@@ -137,7 +137,7 @@ func TestProjectAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen: 0,
-				aggType:  proj_model.ProjectAggregate,
+				aggType:  model.ProjectAggregate,
 				wantErr:  true,
 				errFunc:  caos_errs.IsPreconditionFailed,
 			},
@@ -186,7 +186,7 @@ func TestProjectCreateAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectAdded,
+				eventType: model.ProjectAdded,
 			},
 		},
 		{
@@ -198,7 +198,7 @@ func TestProjectCreateAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectAdded,
+				eventType: model.ProjectAdded,
 				wantErr:   true,
 				errFunc:   caos_errs.IsPreconditionFailed,
 			},
@@ -252,7 +252,7 @@ func TestProjectUpdateAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectChanged,
+				eventType: model.ProjectChanged,
 			},
 		},
 		{
@@ -264,7 +264,7 @@ func TestProjectUpdateAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectChanged,
+				eventType: model.ProjectChanged,
 				wantErr:   true,
 				errFunc:   caos_errs.IsPreconditionFailed,
 			},
@@ -279,7 +279,7 @@ func TestProjectUpdateAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectChanged,
+				eventType: model.ProjectChanged,
 				wantErr:   true,
 				errFunc:   caos_errs.IsPreconditionFailed,
 			},
@@ -331,7 +331,7 @@ func TestProjectDeactivateAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectDeactivated,
+				eventType: model.ProjectDeactivated,
 			},
 		},
 		{
@@ -343,7 +343,7 @@ func TestProjectDeactivateAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectDeactivated,
+				eventType: model.ProjectDeactivated,
 				wantErr:   true,
 				errFunc:   caos_errs.IsPreconditionFailed,
 			},
@@ -392,7 +392,7 @@ func TestProjectReactivateAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectReactivated,
+				eventType: model.ProjectReactivated,
 			},
 		},
 		{
@@ -404,7 +404,7 @@ func TestProjectReactivateAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectReactivated,
+				eventType: model.ProjectReactivated,
 				wantErr:   true,
 				errFunc:   caos_errs.IsPreconditionFailed,
 			},
@@ -455,7 +455,7 @@ func TestProjectMemberAddedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectMemberAdded,
+				eventType: model.ProjectMemberAdded,
 			},
 		},
 		{
@@ -467,7 +467,7 @@ func TestProjectMemberAddedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectMemberAdded,
+				eventType: model.ProjectMemberAdded,
 				wantErr:   true,
 				errFunc:   caos_errs.IsPreconditionFailed,
 			},
@@ -482,7 +482,7 @@ func TestProjectMemberAddedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectMemberAdded,
+				eventType: model.ProjectMemberAdded,
 				wantErr:   true,
 				errFunc:   caos_errs.IsPreconditionFailed,
 			},
@@ -536,7 +536,7 @@ func TestProjectMemberChangedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectMemberChanged,
+				eventType: model.ProjectMemberChanged,
 			},
 		},
 		{
@@ -548,7 +548,7 @@ func TestProjectMemberChangedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectMemberChanged,
+				eventType: model.ProjectMemberChanged,
 				wantErr:   true,
 				errFunc:   caos_errs.IsPreconditionFailed,
 			},
@@ -563,7 +563,7 @@ func TestProjectMemberChangedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectMemberChanged,
+				eventType: model.ProjectMemberChanged,
 				wantErr:   true,
 				errFunc:   caos_errs.IsPreconditionFailed,
 			},
@@ -617,7 +617,7 @@ func TestProjectMemberRemovedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectMemberRemoved,
+				eventType: model.ProjectMemberRemoved,
 			},
 		},
 		{
@@ -629,7 +629,7 @@ func TestProjectMemberRemovedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectMemberRemoved,
+				eventType: model.ProjectMemberRemoved,
 				wantErr:   true,
 				errFunc:   caos_errs.IsPreconditionFailed,
 			},
@@ -644,7 +644,7 @@ func TestProjectMemberRemovedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectMemberRemoved,
+				eventType: model.ProjectMemberRemoved,
 				wantErr:   true,
 				errFunc:   caos_errs.IsPreconditionFailed,
 			},
@@ -698,7 +698,7 @@ func TestProjectRoleAddedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectRoleAdded,
+				eventType: model.ProjectRoleAdded,
 			},
 		},
 		{
@@ -710,7 +710,7 @@ func TestProjectRoleAddedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectRoleAdded,
+				eventType: model.ProjectRoleAdded,
 				wantErr:   true,
 				errFunc:   caos_errs.IsPreconditionFailed,
 			},
@@ -725,7 +725,7 @@ func TestProjectRoleAddedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectRoleAdded,
+				eventType: model.ProjectRoleAdded,
 				wantErr:   true,
 				errFunc:   caos_errs.IsPreconditionFailed,
 			},
@@ -779,7 +779,7 @@ func TestProjectRoleChangedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectRoleChanged,
+				eventType: model.ProjectRoleChanged,
 			},
 		},
 		{
@@ -791,7 +791,7 @@ func TestProjectRoleChangedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectRoleChanged,
+				eventType: model.ProjectRoleChanged,
 				wantErr:   true,
 				errFunc:   caos_errs.IsPreconditionFailed,
 			},
@@ -806,7 +806,7 @@ func TestProjectRoleChangedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectRoleChanged,
+				eventType: model.ProjectRoleChanged,
 				wantErr:   true,
 				errFunc:   caos_errs.IsPreconditionFailed,
 			},
@@ -860,7 +860,7 @@ func TestProjectRoleRemovedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectRoleRemoved,
+				eventType: model.ProjectRoleRemoved,
 			},
 		},
 		{
@@ -872,7 +872,7 @@ func TestProjectRoleRemovedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectRoleRemoved,
+				eventType: model.ProjectRoleRemoved,
 				wantErr:   true,
 				errFunc:   caos_errs.IsPreconditionFailed,
 			},
@@ -887,7 +887,7 @@ func TestProjectRoleRemovedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectRoleRemoved,
+				eventType: model.ProjectRoleRemoved,
 				wantErr:   true,
 				errFunc:   caos_errs.IsPreconditionFailed,
 			},
@@ -946,7 +946,7 @@ func TestProjectAppAddedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:   2,
-				eventTypes: []models.EventType{proj_model.ApplicationAdded, proj_model.OIDCConfigAdded},
+				eventTypes: []models.EventType{model.ApplicationAdded, model.OIDCConfigAdded},
 			},
 		},
 		{
@@ -1038,7 +1038,7 @@ func TestProjectAppChangedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:   1,
-				eventTypes: []models.EventType{proj_model.ApplicationChanged},
+				eventTypes: []models.EventType{model.ApplicationChanged},
 			},
 		},
 		{
@@ -1128,7 +1128,7 @@ func TestProjectAppRemovedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:   1,
-				eventTypes: []models.EventType{proj_model.ApplicationRemoved},
+				eventTypes: []models.EventType{model.ApplicationRemoved},
 			},
 		},
 		{
@@ -1218,7 +1218,7 @@ func TestProjectAppDeactivatedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:   1,
-				eventTypes: []models.EventType{proj_model.ApplicationDeactivated},
+				eventTypes: []models.EventType{model.ApplicationDeactivated},
 			},
 		},
 		{
@@ -1308,7 +1308,7 @@ func TestProjectAppReactivatedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:   1,
-				eventTypes: []models.EventType{proj_model.ApplicationReactivated},
+				eventTypes: []models.EventType{model.ApplicationReactivated},
 			},
 		},
 		{
@@ -1398,7 +1398,7 @@ func TestOIDCConfigchangAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:   1,
-				eventTypes: []models.EventType{proj_model.OIDCConfigChanged},
+				eventTypes: []models.EventType{model.OIDCConfigChanged},
 			},
 		},
 		{
@@ -1488,7 +1488,7 @@ func TestOIDCConfigSecretChangeAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:   1,
-				eventTypes: []models.EventType{proj_model.OIDCConfigSecretChanged},
+				eventTypes: []models.EventType{model.OIDCConfigSecretChanged},
 			},
 		},
 		{
@@ -1559,7 +1559,7 @@ func TestProjectGrantAddedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectGrantAdded,
+				eventType: model.ProjectGrantAdded,
 			},
 		},
 		{
@@ -1571,7 +1571,7 @@ func TestProjectGrantAddedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectGrantAdded,
+				eventType: model.ProjectGrantAdded,
 				wantErr:   true,
 				errFunc:   caos_errs.IsPreconditionFailed,
 			},
@@ -1586,7 +1586,7 @@ func TestProjectGrantAddedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectGrantAdded,
+				eventType: model.ProjectGrantAdded,
 				wantErr:   true,
 				errFunc:   caos_errs.IsPreconditionFailed,
 			},
@@ -1651,7 +1651,7 @@ func TestProjectGrantChangedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:   1,
-				eventTypes: []models.EventType{proj_model.ProjectGrantChanged},
+				eventTypes: []models.EventType{model.ProjectGrantChanged},
 			},
 		},
 		{
@@ -1742,7 +1742,7 @@ func TestProjectGrantRemovedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:   1,
-				eventTypes: []models.EventType{proj_model.ProjectGrantRemoved},
+				eventTypes: []models.EventType{model.ProjectGrantRemoved},
 			},
 		},
 		{
@@ -1833,7 +1833,7 @@ func TestProjectGrantDeactivatedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:   1,
-				eventTypes: []models.EventType{proj_model.ProjectGrantDeactivated},
+				eventTypes: []models.EventType{model.ProjectGrantDeactivated},
 			},
 		},
 		{
@@ -1924,7 +1924,7 @@ func TestProjectGrantReactivatedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:   1,
-				eventTypes: []models.EventType{proj_model.ProjectGrantReactivated},
+				eventTypes: []models.EventType{model.ProjectGrantReactivated},
 			},
 		},
 		{
@@ -2004,7 +2004,7 @@ func TestProjectGrantMemberAddedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectGrantMemberAdded,
+				eventType: model.ProjectGrantMemberAdded,
 			},
 		},
 		{
@@ -2016,7 +2016,7 @@ func TestProjectGrantMemberAddedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectGrantMemberAdded,
+				eventType: model.ProjectGrantMemberAdded,
 				wantErr:   true,
 				errFunc:   caos_errs.IsPreconditionFailed,
 			},
@@ -2031,7 +2031,7 @@ func TestProjectGrantMemberAddedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectGrantMemberAdded,
+				eventType: model.ProjectGrantMemberAdded,
 				wantErr:   true,
 				errFunc:   caos_errs.IsPreconditionFailed,
 			},
@@ -2085,7 +2085,7 @@ func TestProjectGrantMemberChangedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectGrantMemberChanged,
+				eventType: model.ProjectGrantMemberChanged,
 			},
 		},
 		{
@@ -2097,7 +2097,7 @@ func TestProjectGrantMemberChangedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectGrantMemberChanged,
+				eventType: model.ProjectGrantMemberChanged,
 				wantErr:   true,
 				errFunc:   caos_errs.IsPreconditionFailed,
 			},
@@ -2112,7 +2112,7 @@ func TestProjectGrantMemberChangedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectGrantMemberChanged,
+				eventType: model.ProjectGrantMemberChanged,
 				wantErr:   true,
 				errFunc:   caos_errs.IsPreconditionFailed,
 			},
@@ -2166,7 +2166,7 @@ func TestProjectGrantMemberRemovedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectGrantMemberRemoved,
+				eventType: model.ProjectGrantMemberRemoved,
 			},
 		},
 		{
@@ -2178,7 +2178,7 @@ func TestProjectGrantMemberRemovedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectGrantMemberRemoved,
+				eventType: model.ProjectGrantMemberRemoved,
 				wantErr:   true,
 				errFunc:   caos_errs.IsPreconditionFailed,
 			},
@@ -2193,7 +2193,7 @@ func TestProjectGrantMemberRemovedAggregate(t *testing.T) {
 			},
 			res: res{
 				eventLen:  1,
-				eventType: proj_model.ProjectGrantMemberRemoved,
+				eventType: model.ProjectGrantMemberRemoved,
 				wantErr:   true,
 				errFunc:   caos_errs.IsPreconditionFailed,
 			},

internal/project/repository/view/application_view.go

@@ -0,0 +1,32 @@
+package view
+
+import (
+	proj_model "github.com/caos/zitadel/internal/project/model"
+	"github.com/caos/zitadel/internal/project/repository/view/model"
+	"github.com/caos/zitadel/internal/view"
+	"github.com/jinzhu/gorm"
+)
+
+func ApplicationByID(db *gorm.DB, table, appID string) (*model.ApplicationView, error) {
+	app := new(model.ApplicationView)
+	query := view.PrepareGetByKey(table, model.ApplicationSearchKey(proj_model.APPLICATIONSEARCHKEY_APP_ID), appID)
+	err := query(db, app)
+	return app, err
+}
+
+func SearchApplications(db *gorm.DB, table string, req *proj_model.ApplicationSearchRequest) ([]*model.ApplicationView, int, error) {
+	apps := make([]*model.ApplicationView, 0)
+	query := view.PrepareSearchQuery(table, model.ApplicationSearchRequest{Limit: req.Limit, Offset: req.Offset, Queries: req.Queries})
+	count, err := query(db, &apps)
+	return apps, count, err
+}
+
+func PutApplication(db *gorm.DB, table string, app *model.ApplicationView) error {
+	save := view.PrepareSave(table)
+	return save(db, app)
+}
+
+func DeleteApplication(db *gorm.DB, table, appID string) error {
+	delete := view.PrepareDeleteByKey(table, model.ApplicationSearchKey(proj_model.APPLICATIONSEARCHKEY_APP_ID), appID)
+	return delete(db)
+}

internal/project/repository/view/granted_project_view.go

@@ -0,0 +1,56 @@
+package view
+
+import (
+	global_model "github.com/caos/zitadel/internal/model"
+	proj_model "github.com/caos/zitadel/internal/project/model"
+	"github.com/caos/zitadel/internal/project/repository/view/model"
+	"github.com/caos/zitadel/internal/view"
+	"github.com/jinzhu/gorm"
+)
+
+func GrantedProjectByIDs(db *gorm.DB, table, projectID, orgID string) (*model.GrantedProjectView, error) {
+	project := new(model.GrantedProjectView)
+
+	projectIDQuery := model.GrantedProjectSearchQuery{Key: proj_model.GRANTEDPROJECTSEARCHKEY_PROJECTID, Value: projectID, Method: global_model.SEARCHMETHOD_EQUALS}
+	grantIDQuery := model.GrantedProjectSearchQuery{Key: proj_model.GRANTEDPROJECTSEARCHKEY_ORGID, Value: orgID, Method: global_model.SEARCHMETHOD_EQUALS}
+	query := view.PrepareGetByQuery(table, projectIDQuery, grantIDQuery)
+	err := query(db, project)
+	return project, err
+}
+
+func GrantedProjectsByID(db *gorm.DB, table, projectID string) ([]*model.GrantedProjectView, error) {
+	projects := make([]*model.GrantedProjectView, 0)
+	queries := []*proj_model.GrantedProjectSearchQuery{
+		&proj_model.GrantedProjectSearchQuery{Key: proj_model.GRANTEDPROJECTSEARCHKEY_PROJECTID, Value: projectID, Method: global_model.SEARCHMETHOD_EQUALS},
+	}
+	query := view.PrepareSearchQuery(table, model.GrantedProjectSearchRequest{Queries: queries})
+	_, err := query(db, &projects)
+	if err != nil {
+		return nil, err
+	}
+	return projects, nil
+}
+
+func SearchGrantedProjects(db *gorm.DB, table string, req *proj_model.GrantedProjectSearchRequest) ([]*model.GrantedProjectView, int, error) {
+	projects := make([]*model.GrantedProjectView, 0)
+	query := view.PrepareSearchQuery(table, model.GrantedProjectSearchRequest{Limit: req.Limit, Offset: req.Offset, Queries: req.Queries})
+	count, err := query(db, &projects)
+	if err != nil {
+		return nil, 0, err
+	}
+	return projects, count, nil
+}
+
+func PutGrantedProject(db *gorm.DB, table string, project *model.GrantedProjectView) error {
+	save := view.PrepareSave(table)
+	return save(db, project)
+}
+
+func DeleteGrantedProject(db *gorm.DB, table, projectID, orgID string) error {
+	project, err := GrantedProjectByIDs(db, table, projectID, orgID)
+	if err != nil {
+		return err
+	}
+	delete := view.PrepareDeleteByObject(table, project)
+	return delete(db)
+}

internal/project/repository/view/model/application.go

@@ -0,0 +1,156 @@
+package model
+
+import (
+	"encoding/json"
+	"github.com/caos/logging"
+	caos_errs "github.com/caos/zitadel/internal/errors"
+	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/project/model"
+	es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
+	"github.com/lib/pq"
+	"time"
+)
+
+const (
+	ApplicationKeyID            = "id"
+	ApplicationKeyProjectID     = "project_id"
+	ApplicationKeyResourceOwner = "resource_owner"
+	ApplicationKeyOIDCClientID  = "oidc_client_id"
+	ApplicationKeyName          = "name"
+)
+
+type ApplicationView struct {
+	ID           string    `json:"appId" gorm:"column:id;primary_key"`
+	ProjectID    string    `json:"-" gorm:"column:project_id"`
+	Name         string    `json:"name" gorm:"column:app_name"`
+	CreationDate time.Time `json:"-" gorm:"column:creation_date"`
+	ChangeDate   time.Time `json:"-" gorm:"column:change_date"`
+	State        int32     `json:"-" gorm:"column:app_state"`
+
+	IsOIDC                     bool           `json:"-" gorm:"column:is_oidc"`
+	OIDCClientID               string         `json:"clientId" gorm:"column:oidc_client_id"`
+	OIDCRedirectUris           pq.StringArray `json:"redirectUris" gorm:"column:oidc_redirect_uris"`
+	OIDCResponseTypes          pq.Int64Array  `json:"responseTypes" gorm:"column:oidc_response_types"`
+	OIDCGrantTypes             pq.Int64Array  `json:"grantTypes" gorm:"column:oidc_grant_types"`
+	OIDCApplicationType        int32          `json:"applicationType" gorm:"column:oidc_application_type"`
+	OIDCAuthMethodType         int32          `json:"authMethodType" gorm:"column:oidc_auth_method_type"`
+	OIDCPostLogoutRedirectUris pq.StringArray `json:"postLogoutRedirectUris" gorm:"column:oidc_post_logout_redirect_uris"`
+
+	Sequence uint64 `json:"-" gorm:"sequence"`
+}
+
+func ApplicationViewFromModel(app *model.ApplicationView) *ApplicationView {
+	return &ApplicationView{
+		ID:           app.ID,
+		ProjectID:    app.ProjectID,
+		Name:         app.Name,
+		State:        int32(app.State),
+		Sequence:     app.Sequence,
+		CreationDate: app.CreationDate,
+		ChangeDate:   app.ChangeDate,
+
+		IsOIDC:                     app.IsOIDC,
+		OIDCClientID:               app.OIDCClientID,
+		OIDCRedirectUris:           app.OIDCRedirectUris,
+		OIDCResponseTypes:          OIDCResponseTypesFromModel(app.OIDCResponseTypes),
+		OIDCGrantTypes:             OIDCGrantTypesFromModel(app.OIDCGrantTypes),
+		OIDCApplicationType:        int32(app.OIDCApplicationType),
+		OIDCAuthMethodType:         int32(app.OIDCAuthMethodType),
+		OIDCPostLogoutRedirectUris: app.OIDCPostLogoutRedirectUris,
+	}
+}
+
+func OIDCResponseTypesFromModel(oidctypes []model.OIDCResponseType) []int64 {
+	result := make([]int64, len(oidctypes))
+	for i, t := range oidctypes {
+		result[i] = int64(t)
+	}
+	return result
+}
+
+func OIDCGrantTypesFromModel(granttypes []model.OIDCGrantType) []int64 {
+	result := make([]int64, len(granttypes))
+	for i, t := range granttypes {
+		result[i] = int64(t)
+	}
+	return result
+}
+
+func ApplicationViewToModel(app *ApplicationView) *model.ApplicationView {
+	return &model.ApplicationView{
+		ID:           app.ID,
+		ProjectID:    app.ProjectID,
+		Name:         app.Name,
+		State:        model.AppState(app.State),
+		Sequence:     app.Sequence,
+		CreationDate: app.CreationDate,
+		ChangeDate:   app.ChangeDate,
+
+		IsOIDC:                     app.IsOIDC,
+		OIDCClientID:               app.OIDCClientID,
+		OIDCRedirectUris:           app.OIDCRedirectUris,
+		OIDCResponseTypes:          OIDCResponseTypesToModel(app.OIDCResponseTypes),
+		OIDCGrantTypes:             OIDCGrantTypesToModel(app.OIDCGrantTypes),
+		OIDCApplicationType:        model.OIDCApplicationType(app.OIDCApplicationType),
+		OIDCAuthMethodType:         model.OIDCAuthMethodType(app.OIDCAuthMethodType),
+		OIDCPostLogoutRedirectUris: app.OIDCPostLogoutRedirectUris,
+	}
+}
+
+func OIDCResponseTypesToModel(oidctypes []int64) []model.OIDCResponseType {
+	result := make([]model.OIDCResponseType, len(oidctypes))
+	for i, t := range oidctypes {
+		result[i] = model.OIDCResponseType(t)
+	}
+	return result
+}
+
+func OIDCGrantTypesToModel(granttypes []int64) []model.OIDCGrantType {
+	result := make([]model.OIDCGrantType, len(granttypes))
+	for i, t := range granttypes {
+		result[i] = model.OIDCGrantType(t)
+	}
+	return result
+}
+
+func ApplicationViewsToModel(roles []*ApplicationView) []*model.ApplicationView {
+	result := make([]*model.ApplicationView, len(roles))
+	for i, r := range roles {
+		result[i] = ApplicationViewToModel(r)
+	}
+	return result
+}
+
+func (a *ApplicationView) AppendEvent(event *models.Event) (err error) {
+	a.Sequence = event.Sequence
+	a.ChangeDate = event.CreationDate
+	switch event.Type {
+	case es_model.ApplicationAdded:
+		a.setRootData(event)
+		a.CreationDate = event.CreationDate
+		err = a.SetData(event)
+	case es_model.OIDCConfigAdded:
+		a.IsOIDC = true
+		err = a.SetData(event)
+	case es_model.OIDCConfigChanged,
+		es_model.ApplicationChanged:
+		err = a.SetData(event)
+	case es_model.ApplicationDeactivated:
+		a.State = int32(model.APPSTATE_INACTIVE)
+	case es_model.ApplicationReactivated:
+		a.State = int32(model.APPSTATE_ACTIVE)
+	}
+	return err
+}
+
+func (a *ApplicationView) setRootData(event *models.Event) {
+	a.ProjectID = event.AggregateID
+}
+
+func (a *ApplicationView) SetData(event *models.Event) error {
+	if err := json.Unmarshal(event.Data, a); err != nil {
+		logging.Log("EVEN-lo9ds").WithError(err).Error("could not unmarshal event data")
+		return caos_errs.ThrowInternal(err, "MODEL-8suie", "Could not unmarshal data")
+	}
+	return nil
+}

internal/project/repository/view/model/application_query.go

@@ -0,0 +1,65 @@
+package model
+
+import (
+	global_model "github.com/caos/zitadel/internal/model"
+	proj_model "github.com/caos/zitadel/internal/project/model"
+	"github.com/caos/zitadel/internal/view"
+)
+
+type ApplicationSearchRequest proj_model.ApplicationSearchRequest
+type ApplicationSearchQuery proj_model.ApplicationSearchQuery
+type ApplicationSearchKey proj_model.ApplicationSearchKey
+
+func (req ApplicationSearchRequest) GetLimit() uint64 {
+	return req.Limit
+}
+
+func (req ApplicationSearchRequest) GetOffset() uint64 {
+	return req.Offset
+}
+
+func (req ApplicationSearchRequest) GetSortingColumn() view.ColumnKey {
+	if req.SortingColumn == proj_model.APPLICATIONSEARCHKEY_UNSPECIFIED {
+		return nil
+	}
+	return ApplicationSearchKey(req.SortingColumn)
+}
+
+func (req ApplicationSearchRequest) GetAsc() bool {
+	return req.Asc
+}
+
+func (req ApplicationSearchRequest) GetQueries() []view.SearchQuery {
+	result := make([]view.SearchQuery, len(req.Queries))
+	for i, q := range req.Queries {
+		result[i] = ApplicationSearchQuery{Key: q.Key, Value: q.Value, Method: q.Method}
+	}
+	return result
+}
+
+func (req ApplicationSearchQuery) GetKey() view.ColumnKey {
+	return ApplicationSearchKey(req.Key)
+}
+
+func (req ApplicationSearchQuery) GetMethod() global_model.SearchMethod {
+	return req.Method
+}
+
+func (req ApplicationSearchQuery) GetValue() interface{} {
+	return req.Value
+}
+
+func (key ApplicationSearchKey) ToColumnName() string {
+	switch proj_model.ApplicationSearchKey(key) {
+	case proj_model.APPLICATIONSEARCHKEY_APP_ID:
+		return ApplicationKeyID
+	case proj_model.APPLICATIONSEARCHKEY_NAME:
+		return ApplicationKeyName
+	case proj_model.APPLICATIONSEARCHKEY_PROJECT_ID:
+		return ApplicationKeyProjectID
+	case proj_model.APPLICATIONSEARCHKEY_OIDC_CLIENT_ID:
+		return ApplicationKeyOIDCClientID
+	default:
+		return ""
+	}
+}

internal/project/repository/view/model/application_test.go

@@ -0,0 +1,100 @@
+package model
+
+import (
+	"encoding/json"
+	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/project/model"
+	es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
+	"testing"
+)
+
+func mockAppData(app *es_model.Application) []byte {
+	data, _ := json.Marshal(app)
+	return data
+}
+
+func mockOIDCConfigData(config *es_model.OIDCConfig) []byte {
+	data, _ := json.Marshal(config)
+	return data
+}
+
+func TestApplicationAppendEvent(t *testing.T) {
+	type args struct {
+		event *es_models.Event
+		app   *ApplicationView
+	}
+	tests := []struct {
+		name   string
+		args   args
+		result *ApplicationView
+	}{
+		{
+			name: "append added app event",
+			args: args{
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.ApplicationAdded, Data: mockAppData(&es_model.Application{Name: "AppName"})},
+				app:   &ApplicationView{},
+			},
+			result: &ApplicationView{ProjectID: "AggregateID", Name: "AppName", State: int32(model.APPSTATE_ACTIVE)},
+		},
+		{
+			name: "append changed app event",
+			args: args{
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.ApplicationChanged, Data: mockAppData(&es_model.Application{Name: "AppNameChanged"})},
+				app:   &ApplicationView{ProjectID: "AggregateID", Name: "AppName", State: int32(model.APPSTATE_ACTIVE)},
+			},
+			result: &ApplicationView{ProjectID: "AggregateID", Name: "AppNameChanged", State: int32(model.APPSTATE_ACTIVE)},
+		},
+		{
+			name: "append deactivate app event",
+			args: args{
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.ApplicationDeactivated},
+				app:   &ApplicationView{ProjectID: "AggregateID", Name: "AppName", State: int32(model.APPSTATE_ACTIVE)},
+			},
+			result: &ApplicationView{ProjectID: "AggregateID", Name: "AppName", State: int32(model.APPSTATE_INACTIVE)},
+		},
+		{
+			name: "append reactivate app event",
+			args: args{
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.ApplicationReactivated},
+				app:   &ApplicationView{ProjectID: "AggregateID", Name: "AppName", State: int32(model.APPSTATE_INACTIVE)},
+			},
+			result: &ApplicationView{ProjectID: "AggregateID", Name: "AppName", State: int32(model.APPSTATE_ACTIVE)},
+		},
+		{
+			name: "append added oidc config event",
+			args: args{
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.OIDCConfigAdded, Data: mockOIDCConfigData(&es_model.OIDCConfig{ClientID: "clientID"})},
+				app:   &ApplicationView{ProjectID: "AggregateID", Name: "AppName", State: int32(model.APPSTATE_ACTIVE)},
+			},
+			result: &ApplicationView{ProjectID: "AggregateID", Name: "AppName", IsOIDC: true, OIDCClientID: "clientID", State: int32(model.APPSTATE_ACTIVE)},
+		},
+		{
+			name: "append changed oidc config event",
+			args: args{
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.OIDCConfigAdded, Data: mockOIDCConfigData(&es_model.OIDCConfig{ClientID: "clientIDChanged"})},
+				app:   &ApplicationView{ProjectID: "AggregateID", Name: "AppName", OIDCClientID: "clientID", State: int32(model.APPSTATE_ACTIVE)},
+			},
+			result: &ApplicationView{ProjectID: "AggregateID", Name: "AppName", IsOIDC: true, OIDCClientID: "clientIDChanged", State: int32(model.APPSTATE_ACTIVE)},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			tt.args.app.AppendEvent(tt.args.event)
+			if tt.args.app.ProjectID != tt.result.ProjectID {
+				t.Errorf("got wrong result projectID: expected: %v, actual: %v ", tt.result.ProjectID, tt.args.app.ProjectID)
+			}
+			if tt.args.app.Name != tt.result.Name {
+				t.Errorf("got wrong result name: expected: %v, actual: %v ", tt.result.Name, tt.args.app.Name)
+			}
+			if tt.args.app.State != tt.result.State {
+				t.Errorf("got wrong result state: expected: %v, actual: %v ", tt.result.State, tt.args.app.State)
+			}
+			if tt.args.app.IsOIDC != tt.result.IsOIDC {
+				t.Errorf("got wrong result IsOIDC: expected: %v, actual: %v ", tt.result.IsOIDC, tt.args.app.IsOIDC)
+			}
+			if tt.args.app.OIDCClientID != tt.result.OIDCClientID {
+				t.Errorf("got wrong result OIDCClientID: expected: %v, actual: %v ", tt.result.OIDCClientID, tt.args.app.OIDCClientID)
+			}
+		})
+	}
+}

internal/project/repository/view/model/granted_project.go

@@ -0,0 +1,149 @@
+package model
+
+import (
+	"encoding/json"
+	"github.com/caos/logging"
+	caos_errs "github.com/caos/zitadel/internal/errors"
+	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/project/model"
+	es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
+	"github.com/lib/pq"
+	"time"
+)
+
+const (
+	GrantedProjectKeyProjectID     = "project_id"
+	GrantedProjectKeyGrantID       = "grant_id"
+	GrantedProjectKeyOrgID         = "org_id"
+	GrantedProjectKeyResourceOwner = "resource_owner"
+	GrantedProjectKeyName          = "name"
+)
+
+type GrantedProjectView struct {
+	ProjectID       string         `json:"-" gorm:"column:project_id;primary_key"`
+	OrgID           string         `json:"-" gorm:"column:org_id;primary_key"`
+	Name            string         `json:"name" gorm:"column:project_name"`
+	CreationDate    time.Time      `json:"-" gorm:"column:creation_date"`
+	ChangeDate      time.Time      `json:"-" gorm:"column:change_date"`
+	State           int32          `json:"-" gorm:"column:project_state"`
+	Type            int32          `json:"-" gorm:"column:project_type"`
+	ResourceOwner   string         `json:"-" gorm:"column:resource_owner"`
+	OrgName         string         `json:"-" gorm:"column:org_name"`
+	OrgDomain       string         `json:"-" gorm:"column:org_domain"`
+	Sequence        uint64         `json:"-" gorm:"column:sequence"`
+	GrantID         string         `json:"-" gorm:"column:grant_id"`
+	GrantedRoleKeys pq.StringArray `json:"-" gorm:"column:granted_role_keys"`
+}
+
+type ProjectGrant struct {
+	GrantID      string   `json:"grantId"`
+	GrantedOrgID string   `json:"grantedOrgId"`
+	RoleKeys     []string `json:"roleKeys"`
+}
+
+func GrantedProjectFromModel(project *model.GrantedProjectView) *GrantedProjectView {
+	return &GrantedProjectView{
+		ProjectID:       project.ProjectID,
+		OrgID:           project.OrgID,
+		Name:            project.Name,
+		ChangeDate:      project.ChangeDate,
+		CreationDate:    project.CreationDate,
+		State:           int32(project.State),
+		Type:            int32(project.Type),
+		ResourceOwner:   project.ResourceOwner,
+		OrgName:         project.OrgName,
+		GrantID:         project.GrantID,
+		GrantedRoleKeys: project.GrantedRoleKeys,
+		Sequence:        project.Sequence,
+	}
+}
+
+func GrantedProjectToModel(project *GrantedProjectView) *model.GrantedProjectView {
+	return &model.GrantedProjectView{
+		ProjectID:     project.ProjectID,
+		OrgID:         project.OrgID,
+		Name:          project.Name,
+		ChangeDate:    project.ChangeDate,
+		CreationDate:  project.CreationDate,
+		State:         model.ProjectState(project.State),
+		Type:          model.ProjectType(project.Type),
+		ResourceOwner: project.ResourceOwner,
+		OrgName:       project.OrgName,
+		GrantID:       project.GrantID,
+		Sequence:      project.Sequence,
+	}
+}
+
+func GrantedProjectsToModel(projects []*GrantedProjectView) []*model.GrantedProjectView {
+	result := make([]*model.GrantedProjectView, len(projects))
+	for i, p := range projects {
+		result[i] = GrantedProjectToModel(p)
+	}
+	return result
+}
+
+func (p *GrantedProjectView) AppendEvent(event *models.Event) (err error) {
+	p.ChangeDate = event.CreationDate
+	p.Sequence = event.Sequence
+	switch event.Type {
+	case es_model.ProjectAdded:
+		p.State = int32(model.PROJECTSTATE_ACTIVE)
+		p.CreationDate = event.CreationDate
+		p.setRootData(event)
+		err = p.setData(event)
+	case es_model.ProjectChanged:
+		err = p.setData(event)
+	case es_model.ProjectDeactivated:
+		p.State = int32(model.PROJECTSTATE_INACTIVE)
+	case es_model.ProjectReactivated:
+		p.State = int32(model.PROJECTSTATE_ACTIVE)
+	case es_model.ProjectGrantAdded:
+		p.State = int32(model.PROJECTSTATE_ACTIVE)
+		p.CreationDate = event.CreationDate
+		p.setRootData(event)
+		err = p.setProjectGrantData(event)
+	case es_model.ProjectGrantChanged:
+		err = p.setProjectGrantData(event)
+	case es_model.ProjectGrantDeactivated:
+		p.State = int32(model.PROJECTSTATE_INACTIVE)
+	case es_model.ProjectGrantReactivated:
+		p.State = int32(model.PROJECTSTATE_ACTIVE)
+	}
+	return err
+}
+
+func (p *GrantedProjectView) setRootData(event *models.Event) {
+	p.ProjectID = event.AggregateID
+	p.OrgID = event.ResourceOwner
+	p.ResourceOwner = event.ResourceOwner
+}
+
+func (p *GrantedProjectView) setData(event *models.Event) error {
+	if err := json.Unmarshal(event.Data, p); err != nil {
+		logging.Log("EVEN-dlo92").WithError(err).Error("could not unmarshal event data")
+		return err
+	}
+	return nil
+}
+
+func (p *GrantedProjectView) setProjectGrantData(event *models.Event) error {
+	grant := new(ProjectGrant)
+	err := grant.SetData(event)
+	if err != nil {
+		return err
+	}
+	if grant.GrantedOrgID != "" {
+		p.OrgID = grant.GrantedOrgID
+	}
+	p.GrantID = grant.GrantID
+	p.GrantedRoleKeys = grant.RoleKeys
+	return nil
+}
+
+func (p *ProjectGrant) SetData(event *models.Event) error {
+	if err := json.Unmarshal(event.Data, p); err != nil {
+		logging.Log("EVEN-dlo92").WithError(err).Error("could not unmarshal event data")
+		return caos_errs.ThrowInternal(err, "MODEL-s9ols", "Could not unmarshal data")
+	}
+	return nil
+}

internal/project/repository/view/model/granted_project_query.go

@@ -0,0 +1,67 @@
+package model
+
+import (
+	global_model "github.com/caos/zitadel/internal/model"
+	proj_model "github.com/caos/zitadel/internal/project/model"
+	"github.com/caos/zitadel/internal/view"
+)
+
+type GrantedProjectSearchRequest proj_model.GrantedProjectSearchRequest
+type GrantedProjectSearchQuery proj_model.GrantedProjectSearchQuery
+type GrantedProjectSearchKey proj_model.GrantedProjectSearchKey
+
+func (req GrantedProjectSearchRequest) GetLimit() uint64 {
+	return req.Limit
+}
+
+func (req GrantedProjectSearchRequest) GetOffset() uint64 {
+	return req.Offset
+}
+
+func (req GrantedProjectSearchRequest) GetSortingColumn() view.ColumnKey {
+	if req.SortingColumn == proj_model.GRANTEDPROJECTSEARCHKEY_UNSPECIFIED {
+		return nil
+	}
+	return GrantedProjectSearchKey(req.SortingColumn)
+}
+
+func (req GrantedProjectSearchRequest) GetAsc() bool {
+	return req.Asc
+}
+
+func (req GrantedProjectSearchRequest) GetQueries() []view.SearchQuery {
+	result := make([]view.SearchQuery, len(req.Queries))
+	for i, q := range req.Queries {
+		result[i] = GrantedProjectSearchQuery{Key: q.Key, Value: q.Value, Method: q.Method}
+	}
+	return result
+}
+
+func (req GrantedProjectSearchQuery) GetKey() view.ColumnKey {
+	return GrantedProjectSearchKey(req.Key)
+}
+
+func (req GrantedProjectSearchQuery) GetMethod() global_model.SearchMethod {
+	return req.Method
+}
+
+func (req GrantedProjectSearchQuery) GetValue() interface{} {
+	return req.Value
+}
+
+func (key GrantedProjectSearchKey) ToColumnName() string {
+	switch proj_model.GrantedProjectSearchKey(key) {
+	case proj_model.GRANTEDPROJECTSEARCHKEY_NAME:
+		return GrantedProjectKeyName
+	case proj_model.GRANTEDPROJECTSEARCHKEY_GRANTID:
+		return GrantedProjectKeyGrantID
+	case proj_model.GRANTEDPROJECTSEARCHKEY_ORGID:
+		return GrantedProjectKeyOrgID
+	case proj_model.GRANTEDPROJECTSEARCHKEY_PROJECTID:
+		return GrantedProjectKeyProjectID
+	case proj_model.GRANTEDPROJECTSEARCHKEY_RESOURCE_OWNER:
+		return GrantedProjectKeyResourceOwner
+	default:
+		return ""
+	}
+}

internal/project/repository/view/model/granted_project_test.go

@@ -0,0 +1,121 @@
+package model
+
+import (
+	"encoding/json"
+	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/project/model"
+	es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
+	"github.com/lib/pq"
+	"reflect"
+	"testing"
+)
+
+func mockProjectData(project *es_model.Project) []byte {
+	data, _ := json.Marshal(project)
+	return data
+}
+
+func mockProjectGrantData(grant *es_model.ProjectGrant) []byte {
+	data, _ := json.Marshal(grant)
+	return data
+}
+
+func TestGrantedProjectAppendEvent(t *testing.T) {
+	type args struct {
+		event   *es_models.Event
+		project *GrantedProjectView
+	}
+	tests := []struct {
+		name   string
+		args   args
+		result *GrantedProjectView
+	}{
+		{
+			name: "append added project event",
+			args: args{
+				event:   &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.ProjectAdded, ResourceOwner: "OrgID", Data: mockProjectData(&es_model.Project{Name: "ProjectName"})},
+				project: &GrantedProjectView{},
+			},
+			result: &GrantedProjectView{ProjectID: "AggregateID", ResourceOwner: "OrgID", OrgID: "OrgID", Name: "ProjectName", State: int32(model.PROJECTSTATE_ACTIVE)},
+		},
+		{
+			name: "append change project event",
+			args: args{
+				event:   &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.ProjectChanged, ResourceOwner: "OrgID", Data: mockProjectData(&es_model.Project{Name: "ProjectNameChanged"})},
+				project: &GrantedProjectView{ProjectID: "AggregateID", OrgID: "OrgID", ResourceOwner: "OrgID", Name: "ProjectName", State: int32(model.PROJECTSTATE_ACTIVE)},
+			},
+			result: &GrantedProjectView{ProjectID: "AggregateID", ResourceOwner: "OrgID", OrgID: "OrgID", Name: "ProjectNameChanged", State: int32(model.PROJECTSTATE_ACTIVE)},
+		},
+		{
+			name: "append project deactivate event",
+			args: args{
+				event:   &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.ProjectDeactivated, ResourceOwner: "OrgID"},
+				project: &GrantedProjectView{ProjectID: "AggregateID", ResourceOwner: "OrgID", OrgID: "OrgID", Name: "ProjectName", State: int32(model.PROJECTSTATE_ACTIVE)},
+			},
+			result: &GrantedProjectView{ProjectID: "AggregateID", ResourceOwner: "OrgID", OrgID: "OrgID", Name: "ProjectName", State: int32(model.PROJECTSTATE_INACTIVE)},
+		},
+		{
+			name: "append project reactivate event",
+			args: args{
+				event:   &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.ProjectReactivated, ResourceOwner: "OrgID"},
+				project: &GrantedProjectView{ProjectID: "AggregateID", ResourceOwner: "OrgID", OrgID: "OrgID", Name: "ProjectName", State: int32(model.PROJECTSTATE_INACTIVE)},
+			},
+			result: &GrantedProjectView{ProjectID: "AggregateID", ResourceOwner: "OrgID", OrgID: "OrgID", Name: "ProjectName", State: int32(model.PROJECTSTATE_ACTIVE)},
+		},
+		{
+			name: "append added project grant event",
+			args: args{
+				event:   &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.ProjectGrantAdded, ResourceOwner: "OrgID", Data: mockProjectGrantData(&es_model.ProjectGrant{GrantID: "GrantID", GrantedOrgID: "GrantedOrgID", RoleKeys: pq.StringArray{"Role"}})},
+				project: &GrantedProjectView{},
+			},
+			result: &GrantedProjectView{ProjectID: "AggregateID", ResourceOwner: "OrgID", OrgID: "GrantedOrgID", State: int32(model.PROJECTSTATE_ACTIVE), GrantedRoleKeys: pq.StringArray{"Role"}},
+		},
+		{
+			name: "append change project grant event",
+			args: args{
+				event:   &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.ProjectGrantChanged, ResourceOwner: "OrgID", Data: mockProjectGrantData(&es_model.ProjectGrant{GrantID: "GrantID", RoleKeys: pq.StringArray{"RoleChanged"}})},
+				project: &GrantedProjectView{ProjectID: "AggregateID", ResourceOwner: "OrgID", OrgID: "GrantedOrgID", State: int32(model.PROJECTSTATE_ACTIVE), GrantedRoleKeys: pq.StringArray{"Role"}},
+			},
+			result: &GrantedProjectView{ProjectID: "AggregateID", ResourceOwner: "OrgID", OrgID: "GrantedOrgID", State: int32(model.PROJECTSTATE_ACTIVE), GrantedRoleKeys: pq.StringArray{"RoleChanged"}},
+		},
+		{
+			name: "append deactivate project grant event",
+			args: args{
+				event:   &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.ProjectGrantDeactivated, ResourceOwner: "OrgID", Data: mockProjectGrantData(&es_model.ProjectGrant{GrantID: "GrantID"})},
+				project: &GrantedProjectView{ProjectID: "AggregateID", ResourceOwner: "OrgID", OrgID: "GrantedOrgID", State: int32(model.PROJECTSTATE_ACTIVE), GrantedRoleKeys: pq.StringArray{"Role"}},
+			},
+			result: &GrantedProjectView{ProjectID: "AggregateID", ResourceOwner: "OrgID", OrgID: "GrantedOrgID", State: int32(model.PROJECTSTATE_INACTIVE), GrantedRoleKeys: pq.StringArray{"Role"}},
+		},
+		{
+			name: "append reactivate project grant event",
+			args: args{
+				event:   &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.ProjectGrantReactivated, ResourceOwner: "OrgID", Data: mockProjectGrantData(&es_model.ProjectGrant{GrantID: "GrantID"})},
+				project: &GrantedProjectView{ProjectID: "AggregateID", ResourceOwner: "OrgID", OrgID: "GrantedOrgID", State: int32(model.PROJECTSTATE_INACTIVE), GrantedRoleKeys: pq.StringArray{"Role"}},
+			},
+			result: &GrantedProjectView{ProjectID: "AggregateID", ResourceOwner: "OrgID", OrgID: "GrantedOrgID", State: int32(model.PROJECTSTATE_ACTIVE), GrantedRoleKeys: pq.StringArray{"Role"}},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			tt.args.project.AppendEvent(tt.args.event)
+			if tt.args.project.ProjectID != tt.result.ProjectID {
+				t.Errorf("got wrong result projectID: expected: %v, actual: %v ", tt.result.ProjectID, tt.args.project.ProjectID)
+			}
+			if tt.args.project.OrgID != tt.result.OrgID {
+				t.Errorf("got wrong result orgID: expected: %v, actual: %v ", tt.result.OrgID, tt.args.project.OrgID)
+			}
+			if tt.args.project.ResourceOwner != tt.result.ResourceOwner {
+				t.Errorf("got wrong result ResourceOwner: expected: %v, actual: %v ", tt.result.ResourceOwner, tt.args.project.ResourceOwner)
+			}
+			if tt.args.project.Name != tt.result.Name {
+				t.Errorf("got wrong result name: expected: %v, actual: %v ", tt.result.Name, tt.args.project.Name)
+			}
+			if tt.args.project.State != tt.result.State {
+				t.Errorf("got wrong result state: expected: %v, actual: %v ", tt.result.State, tt.args.project.State)
+			}
+			if !reflect.DeepEqual(tt.args.project.GrantedRoleKeys, tt.result.GrantedRoleKeys) {
+				t.Errorf("got wrong result state: expected: %v, actual: %v ", tt.result.GrantedRoleKeys, tt.args.project.GrantedRoleKeys)
+			}
+		})
+	}
+}

internal/project/repository/view/model/project_grant_member.go

@@ -0,0 +1,102 @@
+package model
+
+import (
+	"encoding/json"
+	"github.com/caos/logging"
+	caos_errs "github.com/caos/zitadel/internal/errors"
+	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/project/model"
+	es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
+	"github.com/lib/pq"
+	"time"
+)
+
+const (
+	ProjectGrantMemberKeyUserID    = "user_id"
+	ProjectGrantMemberKeyGrantID   = "grant_id"
+	ProjectGrantMemberKeyUserName  = "user_name"
+	ProjectGrantMemberKeyEmail     = "email"
+	ProjectGrantMemberKeyFirstName = "first_name"
+	ProjectGrantMemberKeyLastName  = "last_name"
+)
+
+type ProjectGrantMemberView struct {
+	UserID    string         `json:"userId" gorm:"column:user_id;primary_key"`
+	GrantID   string         `json:"grantId" gorm:"column:grant_id;primary_key"`
+	ProjectID string         `json:"-" gorm:"column:project_id"`
+	UserName  string         `json:"-" gorm:"column:user_name"`
+	Email     string         `json:"-" gorm:"column:email_address"`
+	FirstName string         `json:"-" gorm:"column:first_name"`
+	LastName  string         `json:"-" gorm:"column:last_name"`
+	Roles     pq.StringArray `json:"roles" gorm:"column:roles"`
+	Sequence  uint64         `json:"-" gorm:"column:sequence"`
+
+	CreationDate time.Time `json:"-" gorm:"column:creation_date"`
+	ChangeDate   time.Time `json:"-" gorm:"column:change_date"`
+}
+
+func ProjectGrantMemberViewFromModel(member *model.ProjectGrantMemberView) *ProjectGrantMemberView {
+	return &ProjectGrantMemberView{
+		UserID:       member.UserID,
+		GrantID:      member.GrantID,
+		ProjectID:    member.ProjectID,
+		UserName:     member.UserName,
+		Email:        member.Email,
+		FirstName:    member.FirstName,
+		LastName:     member.LastName,
+		Roles:        member.Roles,
+		Sequence:     member.Sequence,
+		CreationDate: member.CreationDate,
+		ChangeDate:   member.ChangeDate,
+	}
+}
+
+func ProjectGrantMemberToModel(member *ProjectGrantMemberView) *model.ProjectGrantMemberView {
+	return &model.ProjectGrantMemberView{
+		UserID:       member.UserID,
+		GrantID:      member.GrantID,
+		ProjectID:    member.ProjectID,
+		UserName:     member.UserName,
+		Email:        member.Email,
+		FirstName:    member.FirstName,
+		LastName:     member.LastName,
+		Roles:        member.Roles,
+		Sequence:     member.Sequence,
+		CreationDate: member.CreationDate,
+		ChangeDate:   member.ChangeDate,
+	}
+}
+
+func ProjectGrantMembersToModel(roles []*ProjectGrantMemberView) []*model.ProjectGrantMemberView {
+	result := make([]*model.ProjectGrantMemberView, len(roles))
+	for i, r := range roles {
+		result[i] = ProjectGrantMemberToModel(r)
+	}
+	return result
+}
+
+func (r *ProjectGrantMemberView) AppendEvent(event *models.Event) (err error) {
+	r.Sequence = event.Sequence
+	r.ChangeDate = event.CreationDate
+	switch event.Type {
+	case es_model.ProjectGrantMemberAdded:
+		r.setRootData(event)
+		r.CreationDate = event.CreationDate
+		err = r.SetData(event)
+	case es_model.ProjectGrantMemberChanged:
+		err = r.SetData(event)
+	}
+	return err
+}
+
+func (r *ProjectGrantMemberView) setRootData(event *models.Event) {
+	r.ProjectID = event.AggregateID
+}
+
+func (r *ProjectGrantMemberView) SetData(event *models.Event) error {
+	if err := json.Unmarshal(event.Data, r); err != nil {
+		logging.Log("EVEN-slo9s").WithError(err).Error("could not unmarshal event data")
+		return caos_errs.ThrowInternal(err, "MODEL-0plew", "Could not unmarshal data")
+	}
+	return nil
+}

internal/project/repository/view/model/project_grant_member_query.go

@@ -0,0 +1,69 @@
+package model
+
+import (
+	global_model "github.com/caos/zitadel/internal/model"
+	proj_model "github.com/caos/zitadel/internal/project/model"
+	"github.com/caos/zitadel/internal/view"
+)
+
+type ProjectGrantMemberSearchRequest proj_model.ProjectGrantMemberSearchRequest
+type ProjectGrantMemberSearchQuery proj_model.ProjectGrantMemberSearchQuery
+type ProjectGrantMemberSearchKey proj_model.ProjectGrantMemberSearchKey
+
+func (req ProjectGrantMemberSearchRequest) GetLimit() uint64 {
+	return req.Limit
+}
+
+func (req ProjectGrantMemberSearchRequest) GetOffset() uint64 {
+	return req.Offset
+}
+
+func (req ProjectGrantMemberSearchRequest) GetSortingColumn() view.ColumnKey {
+	if req.SortingColumn == proj_model.PROJECTGRANTMEMBERSEARCHKEY_UNSPECIFIED {
+		return nil
+	}
+	return ProjectGrantMemberSearchKey(req.SortingColumn)
+}
+
+func (req ProjectGrantMemberSearchRequest) GetAsc() bool {
+	return req.Asc
+}
+
+func (req ProjectGrantMemberSearchRequest) GetQueries() []view.SearchQuery {
+	result := make([]view.SearchQuery, len(req.Queries))
+	for i, q := range req.Queries {
+		result[i] = ProjectGrantMemberSearchQuery{Key: q.Key, Value: q.Value, Method: q.Method}
+	}
+	return result
+}
+
+func (req ProjectGrantMemberSearchQuery) GetKey() view.ColumnKey {
+	return ProjectGrantMemberSearchKey(req.Key)
+}
+
+func (req ProjectGrantMemberSearchQuery) GetMethod() global_model.SearchMethod {
+	return req.Method
+}
+
+func (req ProjectGrantMemberSearchQuery) GetValue() interface{} {
+	return req.Value
+}
+
+func (key ProjectGrantMemberSearchKey) ToColumnName() string {
+	switch proj_model.ProjectGrantMemberSearchKey(key) {
+	case proj_model.PROJECTGRANTMEMBERSEARCHKEY_EMAIL:
+		return ProjectGrantMemberKeyEmail
+	case proj_model.PROJECTGRANTMEMBERSEARCHKEY_FIRST_NAME:
+		return ProjectGrantMemberKeyFirstName
+	case proj_model.PROJECTGRANTMEMBERSEARCHKEY_LAST_NAME:
+		return ProjectGrantMemberKeyLastName
+	case proj_model.PROJECTGRANTMEMBERSEARCHKEY_USER_NAME:
+		return ProjectGrantMemberKeyUserName
+	case proj_model.PROJECTGRANTMEMBERSEARCHKEY_USER_ID:
+		return ProjectGrantMemberKeyUserID
+	case proj_model.PROJECTGRANTMEMBERSEARCHKEY_GRANT_ID:
+		return ProjectGrantMemberKeyGrantID
+	default:
+		return ""
+	}
+}

internal/project/repository/view/model/project_grant_member_test.go

@@ -0,0 +1,61 @@
+package model
+
+import (
+	"encoding/json"
+	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
+	"github.com/lib/pq"
+	"reflect"
+	"testing"
+)
+
+func mockProjectGrantMemberData(member *es_model.ProjectGrantMember) []byte {
+	data, _ := json.Marshal(member)
+	return data
+}
+
+func TestGrantedProjectMemberAppendEvent(t *testing.T) {
+	type args struct {
+		event  *es_models.Event
+		member *ProjectGrantMemberView
+	}
+	tests := []struct {
+		name   string
+		args   args
+		result *ProjectGrantMemberView
+	}{
+		{
+			name: "append added member event",
+			args: args{
+				event:  &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.ProjectGrantMemberAdded, ResourceOwner: "OrgID", Data: mockProjectGrantMemberData(&es_model.ProjectGrantMember{GrantID: "GrantID", UserID: "UserID", Roles: pq.StringArray{"Role"}})},
+				member: &ProjectGrantMemberView{},
+			},
+			result: &ProjectGrantMemberView{ProjectID: "AggregateID", UserID: "UserID", GrantID: "GrantID", Roles: pq.StringArray{"Role"}},
+		},
+		{
+			name: "append changed member event",
+			args: args{
+				event:  &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.ProjectGrantMemberAdded, ResourceOwner: "OrgID", Data: mockProjectGrantMemberData(&es_model.ProjectGrantMember{GrantID: "GrantID", Roles: pq.StringArray{"RoleChanged"}})},
+				member: &ProjectGrantMemberView{ProjectID: "AggregateID", UserID: "UserID", GrantID: "GrantID", Roles: pq.StringArray{"Role"}},
+			},
+			result: &ProjectGrantMemberView{ProjectID: "AggregateID", UserID: "UserID", GrantID: "GrantID", Roles: pq.StringArray{"RoleChanged"}},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			tt.args.member.AppendEvent(tt.args.event)
+			if tt.args.member.ProjectID != tt.result.ProjectID {
+				t.Errorf("got wrong result projectID: expected: %v, actual: %v ", tt.result.ProjectID, tt.args.member.ProjectID)
+			}
+			if tt.args.member.UserID != tt.result.UserID {
+				t.Errorf("got wrong result userID: expected: %v, actual: %v ", tt.result.UserID, tt.args.member.UserID)
+			}
+			if tt.args.member.GrantID != tt.result.GrantID {
+				t.Errorf("got wrong result GrantID: expected: %v, actual: %v ", tt.result.GrantID, tt.args.member.GrantID)
+			}
+			if !reflect.DeepEqual(tt.args.member.Roles, tt.result.Roles) {
+				t.Errorf("got wrong result Roles: expected: %v, actual: %v ", tt.result.Roles, tt.args.member.Roles)
+			}
+		})
+	}
+}

internal/project/repository/view/model/project_member.go

@@ -0,0 +1,99 @@
+package model
+
+import (
+	"encoding/json"
+	"github.com/caos/logging"
+	caos_errs "github.com/caos/zitadel/internal/errors"
+	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/project/model"
+	es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
+	"github.com/lib/pq"
+	"time"
+)
+
+const (
+	ProjectMemberKeyUserID    = "user_id"
+	ProjectMemberKeyProjectID = "project_id"
+	ProjectMemberKeyUserName  = "user_name"
+	ProjectMemberKeyEmail     = "email"
+	ProjectMemberKeyFirstName = "first_name"
+	ProjectMemberKeyLastName  = "last_name"
+)
+
+type ProjectMemberView struct {
+	UserID    string         `json:"userId" gorm:"column:user_id;primary_key"`
+	ProjectID string         `json:"-" gorm:"column:project_id;primary_key"`
+	UserName  string         `json:"-" gorm:"column:user_name"`
+	Email     string         `json:"-" gorm:"column:email_address"`
+	FirstName string         `json:"-" gorm:"column:first_name"`
+	LastName  string         `json:"-" gorm:"column:last_name"`
+	Roles     pq.StringArray `json:"roles" gorm:"column:roles"`
+	Sequence  uint64         `json:"-" gorm:"column:sequence"`
+
+	CreationDate time.Time `json:"-" gorm:"column:creation_date"`
+	ChangeDate   time.Time `json:"-" gorm:"column:change_date"`
+}
+
+func ProjectMemberViewFromModel(member *model.ProjectMemberView) *ProjectMemberView {
+	return &ProjectMemberView{
+		UserID:       member.UserID,
+		ProjectID:    member.ProjectID,
+		UserName:     member.UserName,
+		Email:        member.Email,
+		FirstName:    member.FirstName,
+		LastName:     member.LastName,
+		Roles:        member.Roles,
+		Sequence:     member.Sequence,
+		CreationDate: member.CreationDate,
+		ChangeDate:   member.ChangeDate,
+	}
+}
+
+func ProjectMemberToModel(member *ProjectMemberView) *model.ProjectMemberView {
+	return &model.ProjectMemberView{
+		UserID:       member.UserID,
+		ProjectID:    member.ProjectID,
+		UserName:     member.UserName,
+		Email:        member.Email,
+		FirstName:    member.FirstName,
+		LastName:     member.LastName,
+		Roles:        member.Roles,
+		Sequence:     member.Sequence,
+		CreationDate: member.CreationDate,
+		ChangeDate:   member.ChangeDate,
+	}
+}
+
+func ProjectMembersToModel(roles []*ProjectMemberView) []*model.ProjectMemberView {
+	result := make([]*model.ProjectMemberView, len(roles))
+	for i, r := range roles {
+		result[i] = ProjectMemberToModel(r)
+	}
+	return result
+}
+
+func (r *ProjectMemberView) AppendEvent(event *models.Event) (err error) {
+	r.Sequence = event.Sequence
+	r.ChangeDate = event.CreationDate
+	switch event.Type {
+	case es_model.ProjectMemberAdded:
+		r.setRootData(event)
+		r.CreationDate = event.CreationDate
+		err = r.SetData(event)
+	case es_model.ProjectMemberChanged:
+		err = r.SetData(event)
+	}
+	return err
+}
+
+func (r *ProjectMemberView) setRootData(event *models.Event) {
+	r.ProjectID = event.AggregateID
+}
+
+func (r *ProjectMemberView) SetData(event *models.Event) error {
+	if err := json.Unmarshal(event.Data, r); err != nil {
+		logging.Log("EVEN-slo9s").WithError(err).Error("could not unmarshal event data")
+		return caos_errs.ThrowInternal(err, "MODEL-lub6s", "Could not unmarshal data")
+	}
+	return nil
+}

internal/project/repository/view/model/project_member_query.go

@@ -0,0 +1,69 @@
+package model
+
+import (
+	global_model "github.com/caos/zitadel/internal/model"
+	proj_model "github.com/caos/zitadel/internal/project/model"
+	"github.com/caos/zitadel/internal/view"
+)
+
+type ProjectMemberSearchRequest proj_model.ProjectMemberSearchRequest
+type ProjectMemberSearchQuery proj_model.ProjectMemberSearchQuery
+type ProjectMemberSearchKey proj_model.ProjectMemberSearchKey
+
+func (req ProjectMemberSearchRequest) GetLimit() uint64 {
+	return req.Limit
+}
+
+func (req ProjectMemberSearchRequest) GetOffset() uint64 {
+	return req.Offset
+}
+
+func (req ProjectMemberSearchRequest) GetSortingColumn() view.ColumnKey {
+	if req.SortingColumn == proj_model.PROJECTMEMBERSEARCHKEY_UNSPECIFIED {
+		return nil
+	}
+	return ProjectMemberSearchKey(req.SortingColumn)
+}
+
+func (req ProjectMemberSearchRequest) GetAsc() bool {
+	return req.Asc
+}
+
+func (req ProjectMemberSearchRequest) GetQueries() []view.SearchQuery {
+	result := make([]view.SearchQuery, len(req.Queries))
+	for i, q := range req.Queries {
+		result[i] = ProjectMemberSearchQuery{Key: q.Key, Value: q.Value, Method: q.Method}
+	}
+	return result
+}
+
+func (req ProjectMemberSearchQuery) GetKey() view.ColumnKey {
+	return ProjectMemberSearchKey(req.Key)
+}
+
+func (req ProjectMemberSearchQuery) GetMethod() global_model.SearchMethod {
+	return req.Method
+}
+
+func (req ProjectMemberSearchQuery) GetValue() interface{} {
+	return req.Value
+}
+
+func (key ProjectMemberSearchKey) ToColumnName() string {
+	switch proj_model.ProjectMemberSearchKey(key) {
+	case proj_model.PROJECTMEMBERSEARCHKEY_EMAIL:
+		return ProjectMemberKeyEmail
+	case proj_model.PROJECTMEMBERSEARCHKEY_FIRST_NAME:
+		return ProjectMemberKeyFirstName
+	case proj_model.PROJECTMEMBERSEARCHKEY_LAST_NAME:
+		return ProjectMemberKeyLastName
+	case proj_model.PROJECTMEMBERSEARCHKEY_USER_NAME:
+		return ProjectMemberKeyUserName
+	case proj_model.PROJECTMEMBERSEARCHKEY_USER_ID:
+		return ProjectMemberKeyUserID
+	case proj_model.PROJECTMEMBERSEARCHKEY_PROJECT_ID:
+		return ProjectMemberKeyProjectID
+	default:
+		return ""
+	}
+}

internal/project/repository/view/model/project_member_test.go

@@ -0,0 +1,58 @@
+package model
+
+import (
+	"encoding/json"
+	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
+	"github.com/lib/pq"
+	"reflect"
+	"testing"
+)
+
+func mockProjectMemberData(member *es_model.ProjectMember) []byte {
+	data, _ := json.Marshal(member)
+	return data
+}
+
+func TestProjectMemberAppendEvent(t *testing.T) {
+	type args struct {
+		event  *es_models.Event
+		member *ProjectMemberView
+	}
+	tests := []struct {
+		name   string
+		args   args
+		result *ProjectMemberView
+	}{
+		{
+			name: "append added member event",
+			args: args{
+				event:  &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.ProjectMemberAdded, ResourceOwner: "OrgID", Data: mockProjectMemberData(&es_model.ProjectMember{UserID: "UserID", Roles: pq.StringArray{"Role"}})},
+				member: &ProjectMemberView{},
+			},
+			result: &ProjectMemberView{ProjectID: "AggregateID", UserID: "UserID", Roles: pq.StringArray{"Role"}},
+		},
+		{
+			name: "append changed member event",
+			args: args{
+				event:  &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.ProjectMemberAdded, ResourceOwner: "OrgID", Data: mockProjectMemberData(&es_model.ProjectMember{UserID: "UserID", Roles: pq.StringArray{"RoleChanged"}})},
+				member: &ProjectMemberView{ProjectID: "AggregateID", UserID: "UserID", Roles: pq.StringArray{"Role"}},
+			},
+			result: &ProjectMemberView{ProjectID: "AggregateID", UserID: "UserID", Roles: pq.StringArray{"RoleChanged"}},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			tt.args.member.AppendEvent(tt.args.event)
+			if tt.args.member.ProjectID != tt.result.ProjectID {
+				t.Errorf("got wrong result projectID: expected: %v, actual: %v ", tt.result.ProjectID, tt.args.member.ProjectID)
+			}
+			if tt.args.member.UserID != tt.result.UserID {
+				t.Errorf("got wrong result userID: expected: %v, actual: %v ", tt.result.UserID, tt.args.member.UserID)
+			}
+			if !reflect.DeepEqual(tt.args.member.Roles, tt.result.Roles) {
+				t.Errorf("got wrong result Roles: expected: %v, actual: %v ", tt.result.Roles, tt.args.member.Roles)
+			}
+		})
+	}
+}

internal/project/repository/view/model/project_role.go

@@ -0,0 +1,91 @@
+package model
+
+import (
+	"encoding/json"
+	"github.com/caos/logging"
+	caos_errs "github.com/caos/zitadel/internal/errors"
+	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/project/model"
+	es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
+	"time"
+)
+
+const (
+	ProjectRoleKeyKey           = "role_key"
+	ProjectRoleKeyOrgID         = "org_id"
+	ProjectRoleKeyProjectID     = "project_id"
+	ProjectRoleKeyResourceOwner = "resource_owner"
+)
+
+type ProjectRoleView struct {
+	OrgID       string `json:"-" gorm:"column:org_id;primary_key"`
+	ProjectID   string `json:"projectId,omitempty" gorm:"column:project_id;primary_key"`
+	Key         string `json:"key" gorm:"column:role_key;primary_key"`
+	DisplayName string `json:"displayName" gorm:"column:display_name"`
+	Group       string `json:"group" gorm:"column:group_name"`
+	Sequence    uint64 `json:"-" gorm:"column:sequence"`
+
+	ResourceOwner string    `json:"-" gorm:"resource_owner"`
+	CreationDate  time.Time `json:"-" gorm:"column:creation_date"`
+}
+
+func ProjectRoleViewFromModel(role *model.ProjectRoleView) *ProjectRoleView {
+	return &ProjectRoleView{
+		ResourceOwner: role.ResourceOwner,
+		OrgID:         role.OrgID,
+		ProjectID:     role.ProjectID,
+		Key:           role.Key,
+		DisplayName:   role.DisplayName,
+		Group:         role.Group,
+		Sequence:      role.Sequence,
+		CreationDate:  role.CreationDate,
+	}
+}
+
+func ProjectRoleToModel(role *ProjectRoleView) *model.ProjectRoleView {
+	return &model.ProjectRoleView{
+		ResourceOwner: role.ResourceOwner,
+		OrgID:         role.OrgID,
+		ProjectID:     role.ProjectID,
+		Key:           role.Key,
+		DisplayName:   role.DisplayName,
+		Group:         role.Group,
+		Sequence:      role.Sequence,
+		CreationDate:  role.CreationDate,
+	}
+}
+
+func ProjectRolesToModel(roles []*ProjectRoleView) []*model.ProjectRoleView {
+	result := make([]*model.ProjectRoleView, len(roles))
+	for i, r := range roles {
+		result[i] = ProjectRoleToModel(r)
+	}
+	return result
+}
+
+func (r *ProjectRoleView) AppendEvent(event *models.Event) (err error) {
+	r.Sequence = event.Sequence
+	switch event.Type {
+	case es_model.ProjectRoleAdded:
+		r.setRootData(event)
+		r.CreationDate = event.CreationDate
+		err = r.SetData(event)
+	case es_model.ProjectRoleChanged:
+		err = r.SetData(event)
+	}
+	return err
+}
+
+func (r *ProjectRoleView) setRootData(event *models.Event) {
+	r.ProjectID = event.AggregateID
+	r.OrgID = event.ResourceOwner
+	r.ResourceOwner = event.ResourceOwner
+}
+
+func (r *ProjectRoleView) SetData(event *models.Event) error {
+	if err := json.Unmarshal(event.Data, r); err != nil {
+		logging.Log("EVEN-slo9s").WithError(err).Error("could not unmarshal event data")
+		return caos_errs.ThrowInternal(err, "MODEL-6z52s", "Could not unmarshal data")
+	}
+	return nil
+}

internal/project/repository/view/model/project_role_query.go

@@ -0,0 +1,65 @@
+package model
+
+import (
+	global_model "github.com/caos/zitadel/internal/model"
+	proj_model "github.com/caos/zitadel/internal/project/model"
+	"github.com/caos/zitadel/internal/view"
+)
+
+type ProjectRoleSearchRequest proj_model.ProjectRoleSearchRequest
+type ProjectRoleSearchQuery proj_model.ProjectRoleSearchQuery
+type ProjectRoleSearchKey proj_model.ProjectRoleSearchKey
+
+func (req ProjectRoleSearchRequest) GetLimit() uint64 {
+	return req.Limit
+}
+
+func (req ProjectRoleSearchRequest) GetOffset() uint64 {
+	return req.Offset
+}
+
+func (req ProjectRoleSearchRequest) GetSortingColumn() view.ColumnKey {
+	if req.SortingColumn == proj_model.PROJECTROLESEARCHKEY_UNSPECIFIED {
+		return nil
+	}
+	return ProjectRoleSearchKey(req.SortingColumn)
+}
+
+func (req ProjectRoleSearchRequest) GetAsc() bool {
+	return req.Asc
+}
+
+func (req ProjectRoleSearchRequest) GetQueries() []view.SearchQuery {
+	result := make([]view.SearchQuery, len(req.Queries))
+	for i, q := range req.Queries {
+		result[i] = ProjectRoleSearchQuery{Key: q.Key, Value: q.Value, Method: q.Method}
+	}
+	return result
+}
+
+func (req ProjectRoleSearchQuery) GetKey() view.ColumnKey {
+	return ProjectRoleSearchKey(req.Key)
+}
+
+func (req ProjectRoleSearchQuery) GetMethod() global_model.SearchMethod {
+	return req.Method
+}
+
+func (req ProjectRoleSearchQuery) GetValue() interface{} {
+	return req.Value
+}
+
+func (key ProjectRoleSearchKey) ToColumnName() string {
+	switch proj_model.ProjectRoleSearchKey(key) {
+	case proj_model.PROJECTROLESEARCHKEY_KEY:
+		return ProjectRoleKeyKey
+	case proj_model.PROJECTROLESEARCHKEY_ORGID:
+		return ProjectRoleKeyOrgID
+	case proj_model.PROJECTROLESEARCHKEY_PROJECTID:
+		return ProjectRoleKeyProjectID
+	case proj_model.PROJECTROLESEARCHKEY_RESOURCEOWNER:
+		return ProjectRoleKeyResourceOwner
+	default:
+		return ""
+	}
+}

internal/project/repository/view/model/project_role_test.go

@@ -0,0 +1,65 @@
+package model
+
+import (
+	"encoding/json"
+	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
+	"testing"
+)
+
+func mockProjectRoleData(member *es_model.ProjectRole) []byte {
+	data, _ := json.Marshal(member)
+	return data
+}
+
+func TestProjectRoleAppendEvent(t *testing.T) {
+	type args struct {
+		event  *es_models.Event
+		member *ProjectRoleView
+	}
+	tests := []struct {
+		name   string
+		args   args
+		result *ProjectRoleView
+	}{
+		{
+			name: "append added member event",
+			args: args{
+				event:  &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.ProjectRoleAdded, ResourceOwner: "OrgID", Data: mockProjectRoleData(&es_model.ProjectRole{Key: "Key", DisplayName: "DisplayName", Group: "Group"})},
+				member: &ProjectRoleView{},
+			},
+			result: &ProjectRoleView{OrgID: "OrgID", ResourceOwner: "OrgID", ProjectID: "AggregateID", Key: "Key", DisplayName: "DisplayName", Group: "Group"},
+		},
+		{
+			name: "append added member event",
+			args: args{
+				event:  &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.ProjectRoleAdded, ResourceOwner: "OrgID", Data: mockProjectRoleData(&es_model.ProjectRole{Key: "Key", DisplayName: "DisplayNameChanged", Group: "GroupChanged"})},
+				member: &ProjectRoleView{OrgID: "OrgID", ResourceOwner: "OrgID", ProjectID: "AggregateID", Key: "Key", DisplayName: "DisplayName", Group: "Group"},
+			},
+			result: &ProjectRoleView{OrgID: "OrgID", ResourceOwner: "OrgID", ProjectID: "AggregateID", Key: "Key", DisplayName: "DisplayNameChanged", Group: "GroupChanged"},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			tt.args.member.AppendEvent(tt.args.event)
+			if tt.args.member.ProjectID != tt.result.ProjectID {
+				t.Errorf("got wrong result projectID: expected: %v, actual: %v ", tt.result.ProjectID, tt.args.member.ProjectID)
+			}
+			if tt.args.member.OrgID != tt.result.OrgID {
+				t.Errorf("got wrong result orgID: expected: %v, actual: %v ", tt.result.OrgID, tt.args.member.OrgID)
+			}
+			if tt.args.member.ResourceOwner != tt.result.ResourceOwner {
+				t.Errorf("got wrong result ResourceOwner: expected: %v, actual: %v ", tt.result.ResourceOwner, tt.args.member.ResourceOwner)
+			}
+			if tt.args.member.Key != tt.result.Key {
+				t.Errorf("got wrong result Key: expected: %v, actual: %v ", tt.result.Key, tt.args.member.Key)
+			}
+			if tt.args.member.DisplayName != tt.result.DisplayName {
+				t.Errorf("got wrong result DisplayName: expected: %v, actual: %v ", tt.result.DisplayName, tt.args.member.DisplayName)
+			}
+			if tt.args.member.Group != tt.result.Group {
+				t.Errorf("got wrong result Group: expected: %v, actual: %v ", tt.result.Group, tt.args.member.Group)
+			}
+		})
+	}
+}

internal/project/repository/view/project_grant_member_view.go

@@ -0,0 +1,56 @@
+package view
+
+import (
+	global_model "github.com/caos/zitadel/internal/model"
+	proj_model "github.com/caos/zitadel/internal/project/model"
+	"github.com/caos/zitadel/internal/project/repository/view/model"
+	"github.com/caos/zitadel/internal/view"
+	"github.com/jinzhu/gorm"
+)
+
+func ProjectGrantMemberByIDs(db *gorm.DB, table, grantID, userID string) (*model.ProjectGrantMemberView, error) {
+	role := new(model.ProjectGrantMemberView)
+
+	grantIDQuery := model.ProjectGrantMemberSearchQuery{Key: proj_model.PROJECTGRANTMEMBERSEARCHKEY_GRANT_ID, Value: grantID, Method: global_model.SEARCHMETHOD_EQUALS}
+	userIDQuery := model.ProjectGrantMemberSearchQuery{Key: proj_model.PROJECTGRANTMEMBERSEARCHKEY_USER_ID, Value: userID, Method: global_model.SEARCHMETHOD_EQUALS}
+	query := view.PrepareGetByQuery(table, grantIDQuery, userIDQuery)
+	err := query(db, role)
+	return role, err
+}
+
+func SearchProjectGrantMembers(db *gorm.DB, table string, req *proj_model.ProjectGrantMemberSearchRequest) ([]*model.ProjectGrantMemberView, int, error) {
+	roles := make([]*model.ProjectGrantMemberView, 0)
+	query := view.PrepareSearchQuery(table, model.ProjectGrantMemberSearchRequest{Limit: req.Limit, Offset: req.Offset, Queries: req.Queries})
+	count, err := query(db, &roles)
+	if err != nil {
+		return nil, 0, err
+	}
+	return roles, count, nil
+}
+
+func ProjectGrantMembersByUserID(db *gorm.DB, table, userID string) ([]*model.ProjectGrantMemberView, error) {
+	members := make([]*model.ProjectGrantMemberView, 0)
+	queries := []*proj_model.ProjectGrantMemberSearchQuery{
+		&proj_model.ProjectGrantMemberSearchQuery{Key: proj_model.PROJECTGRANTMEMBERSEARCHKEY_USER_ID, Value: userID, Method: global_model.SEARCHMETHOD_EQUALS},
+	}
+	query := view.PrepareSearchQuery(table, model.ProjectGrantMemberSearchRequest{Queries: queries})
+	_, err := query(db, &members)
+	if err != nil {
+		return nil, err
+	}
+	return members, nil
+}
+
+func PutProjectGrantMember(db *gorm.DB, table string, role *model.ProjectGrantMemberView) error {
+	save := view.PrepareSave(table)
+	return save(db, role)
+}
+
+func DeleteProjectGrantMember(db *gorm.DB, table, grantID, userID string) error {
+	role, err := ProjectGrantMemberByIDs(db, table, grantID, userID)
+	if err != nil {
+		return err
+	}
+	delete := view.PrepareDeleteByObject(table, role)
+	return delete(db)
+}

internal/project/repository/view/project_member_view.go

@@ -0,0 +1,55 @@
+package view
+
+import (
+	global_model "github.com/caos/zitadel/internal/model"
+	proj_model "github.com/caos/zitadel/internal/project/model"
+	"github.com/caos/zitadel/internal/project/repository/view/model"
+	"github.com/caos/zitadel/internal/view"
+	"github.com/jinzhu/gorm"
+)
+
+func ProjectMemberByIDs(db *gorm.DB, table, projectID, userID string) (*model.ProjectMemberView, error) {
+	role := new(model.ProjectMemberView)
+
+	projectIDQuery := model.ProjectMemberSearchQuery{Key: proj_model.PROJECTMEMBERSEARCHKEY_PROJECT_ID, Value: projectID, Method: global_model.SEARCHMETHOD_EQUALS}
+	userIDQuery := model.ProjectMemberSearchQuery{Key: proj_model.PROJECTMEMBERSEARCHKEY_USER_ID, Value: userID, Method: global_model.SEARCHMETHOD_EQUALS}
+	query := view.PrepareGetByQuery(table, projectIDQuery, userIDQuery)
+	err := query(db, role)
+	return role, err
+}
+
+func SearchProjectMembers(db *gorm.DB, table string, req *proj_model.ProjectMemberSearchRequest) ([]*model.ProjectMemberView, int, error) {
+	roles := make([]*model.ProjectMemberView, 0)
+	query := view.PrepareSearchQuery(table, model.ProjectMemberSearchRequest{Limit: req.Limit, Offset: req.Offset, Queries: req.Queries})
+	count, err := query(db, &roles)
+	if err != nil {
+		return nil, 0, err
+	}
+	return roles, count, nil
+}
+func ProjectMembersByUserID(db *gorm.DB, table string, userID string) ([]*model.ProjectMemberView, error) {
+	members := make([]*model.ProjectMemberView, 0)
+	queries := []*proj_model.ProjectMemberSearchQuery{
+		&proj_model.ProjectMemberSearchQuery{Key: proj_model.PROJECTMEMBERSEARCHKEY_USER_ID, Value: userID, Method: global_model.SEARCHMETHOD_EQUALS},
+	}
+	query := view.PrepareSearchQuery(table, model.ProjectMemberSearchRequest{Queries: queries})
+	_, err := query(db, &members)
+	if err != nil {
+		return nil, err
+	}
+	return members, nil
+}
+
+func PutProjectMember(db *gorm.DB, table string, role *model.ProjectMemberView) error {
+	save := view.PrepareSave(table)
+	return save(db, role)
+}
+
+func DeleteProjectMember(db *gorm.DB, table, projectID, userID string) error {
+	role, err := ProjectMemberByIDs(db, table, projectID, userID)
+	if err != nil {
+		return err
+	}
+	delete := view.PrepareDeleteByObject(table, role)
+	return delete(db)
+}

internal/project/repository/view/project_role_view.go

@@ -0,0 +1,73 @@
+package view
+
+import (
+	global_model "github.com/caos/zitadel/internal/model"
+	proj_model "github.com/caos/zitadel/internal/project/model"
+	"github.com/caos/zitadel/internal/project/repository/view/model"
+	"github.com/caos/zitadel/internal/view"
+	"github.com/jinzhu/gorm"
+)
+
+func ProjectRoleByIDs(db *gorm.DB, table, projectID, orgID, key string) (*model.ProjectRoleView, error) {
+	role := new(model.ProjectRoleView)
+
+	projectIDQuery := model.ProjectRoleSearchQuery{Key: proj_model.PROJECTROLESEARCHKEY_PROJECTID, Value: projectID, Method: global_model.SEARCHMETHOD_EQUALS}
+	grantIDQuery := model.ProjectRoleSearchQuery{Key: proj_model.PROJECTROLESEARCHKEY_ORGID, Value: orgID, Method: global_model.SEARCHMETHOD_EQUALS}
+	keyQuery := model.ProjectRoleSearchQuery{Key: proj_model.PROJECTROLESEARCHKEY_KEY, Value: orgID, Method: global_model.SEARCHMETHOD_EQUALS}
+	query := view.PrepareGetByQuery(table, projectIDQuery, grantIDQuery, keyQuery)
+	err := query(db, role)
+	return role, err
+}
+
+func ResourceOwnerProjectRolesByKey(db *gorm.DB, table, projectID, resourceOwner, key string) ([]*model.ProjectRoleView, error) {
+	roles := make([]*model.ProjectRoleView, 0)
+	queries := []*proj_model.ProjectRoleSearchQuery{
+		&proj_model.ProjectRoleSearchQuery{Key: proj_model.PROJECTROLESEARCHKEY_PROJECTID, Value: projectID, Method: global_model.SEARCHMETHOD_EQUALS},
+		&proj_model.ProjectRoleSearchQuery{Key: proj_model.PROJECTROLESEARCHKEY_RESOURCEOWNER, Value: resourceOwner, Method: global_model.SEARCHMETHOD_EQUALS},
+		&proj_model.ProjectRoleSearchQuery{Key: proj_model.PROJECTROLESEARCHKEY_KEY, Value: key, Method: global_model.SEARCHMETHOD_EQUALS},
+	}
+	query := view.PrepareSearchQuery(table, model.ProjectRoleSearchRequest{Queries: queries})
+	_, err := query(db, &roles)
+	if err != nil {
+		return nil, err
+	}
+	return roles, nil
+}
+
+func ResourceOwnerProjectRoles(db *gorm.DB, table, projectID, resourceOwner string) ([]*model.ProjectRoleView, error) {
+	roles := make([]*model.ProjectRoleView, 0)
+	queries := []*proj_model.ProjectRoleSearchQuery{
+		&proj_model.ProjectRoleSearchQuery{Key: proj_model.PROJECTROLESEARCHKEY_PROJECTID, Value: projectID, Method: global_model.SEARCHMETHOD_EQUALS},
+		&proj_model.ProjectRoleSearchQuery{Key: proj_model.PROJECTROLESEARCHKEY_RESOURCEOWNER, Value: resourceOwner, Method: global_model.SEARCHMETHOD_EQUALS},
+	}
+	query := view.PrepareSearchQuery(table, model.ProjectRoleSearchRequest{Queries: queries})
+	_, err := query(db, &roles)
+	if err != nil {
+		return nil, err
+	}
+	return roles, nil
+}
+
+func SearchProjectRoles(db *gorm.DB, table string, req *proj_model.ProjectRoleSearchRequest) ([]*model.ProjectRoleView, int, error) {
+	roles := make([]*model.ProjectRoleView, 0)
+	query := view.PrepareSearchQuery(table, model.ProjectRoleSearchRequest{Limit: req.Limit, Offset: req.Offset, Queries: req.Queries})
+	count, err := query(db, &roles)
+	if err != nil {
+		return nil, 0, err
+	}
+	return roles, count, nil
+}
+
+func PutProjectRole(db *gorm.DB, table string, role *model.ProjectRoleView) error {
+	save := view.PrepareSave(table)
+	return save(db, role)
+}
+
+func DeleteProjectRole(db *gorm.DB, table, projectID, orgID, key string) error {
+	role, err := ProjectRoleByIDs(db, table, projectID, orgID, key)
+	if err != nil {
+		return err
+	}
+	delete := view.PrepareDeleteByObject(table, role)
+	return delete(db)
+}