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

fix: reduce (#635)

Browse Source 
* fix: management reduce optimization

* fix: reduce optimization

* fix: reduce optimization

* fix: merge master
This commit is contained in:
Fabi
2020-08-26 13:01:37 +02:00
committed by GitHub
parent 87aa97b9c7
commit 4af38b37a6
29 changed files with 184 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/management/repository/eventsourcing/handler/org_domain.go
View File

@@ -71,10 +71,10 @@ func (d *OrgDomain) processOrgDomain(event *models.Event) (err error) {
}
for _, existing := range existingDomains {
existing.Primary = false
err := d.view.PutOrgDomain(existing, 0)
if err != nil {
return err
}
}
err = d.view.PutOrgDomains(existingDomains, 0)
if err != nil {
return err
}
err = domain.AppendEvent(event)
case model.OrgDomainRemoved:

5
internal/management/repository/eventsourcing/handler/org_member.go
View File

@@ -99,11 +99,8 @@ func (m *OrgMember) processUser(event *models.Event) (err error) {
}
for _, member := range members {
m.fillUserData(member, user)
err = m.view.PutOrgMember(member, event.Sequence)
if err != nil {
return err
}
}
return m.view.PutOrgMembers(members, event.Sequence)
default:
return m.view.ProcessedOrgMemberSequence(event.Sequence)
}

12
internal/management/repository/eventsourcing/handler/project_grant.go
View File

@@ -47,7 +47,7 @@ func (p *ProjectGrant) Reduce(event *models.Event) (err error) {
if err != nil {
return err
}
return p.updateExistingProjects(project)
return p.updateExistingProjects(project, event.Sequence)
case es_model.ProjectGrantAdded:
err = grantedProject.AppendEvent(event)
if err != nil {
@@ -106,21 +106,15 @@ func (p *ProjectGrant) getProject(projectID string) (*proj_model.Project, error)
return p.projectEvents.ProjectByID(context.Background(), projectID)
}
func (p *ProjectGrant) updateExistingProjects(project *view_model.ProjectView) error {
func (p *ProjectGrant) updateExistingProjects(project *view_model.ProjectView, sequence uint64) error {
projectGrants, err := p.view.ProjectGrantsByProjectID(project.ProjectID)
if err != nil {
logging.LogWithFields("SPOOL-los03", "id", project.ProjectID).WithError(err).Warn("could not update existing projects")
}
for _, existing := range projectGrants {
existing.Name = project.Name
err := p.view.PutProjectGrant(existing)
if err != nil {
logging.LogWithFields("SPOOL-sjwi3", "id", existing.ProjectID).WithError(err).Warn("could not update existing project")
return err
}
}
return p.view.ProcessedProjectGrantSequence(project.Sequence)
return p.view.PutProjectGrants(projectGrants, sequence)
}
func (p *ProjectGrant) OnError(event *models.Event, err error) error {

5
internal/management/repository/eventsourcing/handler/project_grant_member.go
View File

@@ -101,11 +101,8 @@ func (p *ProjectGrantMember) processUser(event *models.Event) (err error) {
}
for _, member := range members {
p.fillUserData(member, user)
err = p.view.PutProjectGrantMember(member, event.Sequence)
if err != nil {
return err
}
}
return p.view.PutProjectGrantMembers(members, event.Sequence)
default:
return p.view.ProcessedProjectGrantMemberSequence(event.Sequence)
}

5
internal/management/repository/eventsourcing/handler/project_member.go
View File

@@ -101,11 +101,8 @@ func (p *ProjectMember) processUser(event *models.Event) (err error) {
}
for _, member := range members {
p.fillUserData(member, user)
err = p.view.PutProjectMember(member, event.Sequence)
if err != nil {
return err
}
}
return p.view.PutProjectMembers(members, event.Sequence)
default:
return p.view.ProcessedProjectMemberSequence(event.Sequence)
}

7
internal/management/repository/eventsourcing/handler/user_grant.go
View File

@@ -106,11 +106,8 @@ func (u *UserGrant) processUser(event *models.Event) (err error) {
}
for _, grant := range grants {
u.fillUserData(grant, user)
err = u.view.PutUserGrant(grant, event.Sequence)
if err != nil {
return err
}
}
return u.view.PutUserGrants(grants, event.Sequence)
default:
return u.view.ProcessedUserGrantSequence(event.Sequence)
}
@@ -133,8 +130,8 @@ func (u *UserGrant) processProject(event *models.Event) (err error) {
}
for _, grant := range grants {
u.fillProjectData(grant, project)
return u.view.PutUserGrant(grant, event.Sequence)
}
return u.view.PutUserGrants(grants, event.Sequence)
default:
return u.view.ProcessedUserGrantSequence(event.Sequence)
}