From 566161ae8978b68f972a6821b6098d436d4574dc Mon Sep 17 00:00:00 2001 From: Silvan Date: Tue, 30 Jun 2020 07:56:03 +0200 Subject: [PATCH] fix: correct search params for project role by id (#316) * fix: project by id loads project from view and from eventstore * fix: correct search key for role --- internal/project/repository/eventsourcing/eventstore.go | 2 +- internal/project/repository/view/project_role_view.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/project/repository/eventsourcing/eventstore.go b/internal/project/repository/eventsourcing/eventstore.go index 2f058e14ea..04000f73fa 100644 --- a/internal/project/repository/eventsourcing/eventstore.go +++ b/internal/project/repository/eventsourcing/eventstore.go @@ -258,7 +258,7 @@ func (es *ProjectEventstore) RemoveProjectMember(ctx context.Context, member *pr func (es *ProjectEventstore) AddProjectRoles(ctx context.Context, roles ...*proj_model.ProjectRole) (*proj_model.ProjectRole, error) { if roles == nil || len(roles) == 0 { - return nil, caos_errs.ThrowPreconditionFailed(nil, "EVENT-idue3", "Errors.Project.MinimumOneRoleNeeded") + return nil, caos_errs.ThrowPreconditionFailed(nil, "EVENT-uOJAs", "Errors.Project.MinimumOneRoleNeeded") } for _, role := range roles { if !role.IsValid() { diff --git a/internal/project/repository/view/project_role_view.go b/internal/project/repository/view/project_role_view.go index a9eb336cf3..90443f002f 100644 --- a/internal/project/repository/view/project_role_view.go +++ b/internal/project/repository/view/project_role_view.go @@ -13,7 +13,7 @@ func ProjectRoleByIDs(db *gorm.DB, table, projectID, orgID, key string) (*model. projectIDQuery := model.ProjectRoleSearchQuery{Key: proj_model.ProjectRoleSearchKeyProjectID, Value: projectID, Method: global_model.SearchMethodEquals} grantIDQuery := model.ProjectRoleSearchQuery{Key: proj_model.ProjectRoleSearchKeyOrgID, Value: orgID, Method: global_model.SearchMethodEquals} - keyQuery := model.ProjectRoleSearchQuery{Key: proj_model.ProjectRoleSearchKeyKey, Value: orgID, Method: global_model.SearchMethodEquals} + keyQuery := model.ProjectRoleSearchQuery{Key: proj_model.ProjectRoleSearchKeyKey, Value: key, Method: global_model.SearchMethodEquals} query := repository.PrepareGetByQuery(table, projectIDQuery, grantIDQuery, keyQuery) err := query(db, role) return role, err