-
Notifications
You must be signed in to change notification settings - Fork 445
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* feat: projects and project grants seperated * fix: tests * fix: add mock
- Loading branch information
1 parent
c4eaeee
commit e631795
Showing
33 changed files
with
4,244 additions
and
3,485 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
internal/management/repository/eventsourcing/handler/project.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| package handler | ||
|
|
||
| import ( | ||
| "time" | ||
|
|
||
| "github.com/caos/logging" | ||
|
|
||
| "github.com/caos/zitadel/internal/eventstore" | ||
| "github.com/caos/zitadel/internal/eventstore/models" | ||
| "github.com/caos/zitadel/internal/eventstore/spooler" | ||
| proj_event "github.com/caos/zitadel/internal/project/repository/eventsourcing" | ||
| es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model" | ||
| view_model "github.com/caos/zitadel/internal/project/repository/view/model" | ||
| ) | ||
|
|
||
| type Project struct { | ||
| handler | ||
| eventstore eventstore.Eventstore | ||
| } | ||
|
|
||
| const ( | ||
| projectTable = "management.projects" | ||
| ) | ||
|
|
||
| func (p *Project) MinimumCycleDuration() time.Duration { return p.cycleDuration } | ||
|
|
||
| func (p *Project) ViewModel() string { | ||
| return projectTable | ||
| } | ||
|
|
||
| func (p *Project) EventQuery() (*models.SearchQuery, error) { | ||
| sequence, err := p.view.GetLatestProjectSequence() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return proj_event.ProjectQuery(sequence), nil | ||
| } | ||
|
|
||
| func (p *Project) Process(event *models.Event) (err error) { | ||
| project := new(view_model.ProjectView) | ||
| switch event.Type { | ||
| case es_model.ProjectAdded: | ||
| project.AppendEvent(event) | ||
| case es_model.ProjectChanged, | ||
| es_model.ProjectDeactivated, | ||
| es_model.ProjectReactivated: | ||
| project, err = p.view.ProjectByID(event.AggregateID) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| err = project.AppendEvent(event) | ||
| default: | ||
| return p.view.ProcessedProjectSequence(event.Sequence) | ||
| } | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return p.view.PutProject(project) | ||
| } | ||
|
|
||
| func (p *Project) OnError(event *models.Event, err error) error { | ||
| logging.LogWithFields("SPOOL-dLsop3", "id", event.AggregateID).WithError(err).Warn("something went wrong in projecthandler") | ||
| return spooler.HandleError(event, err, p.view.GetLatestProjectFailedEvent, p.view.ProcessedProjectFailedEvent, p.view.ProcessedProjectSequence, p.errorCountUntilSkip) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 0 additions & 60 deletions
60
internal/management/repository/eventsourcing/view/granted_project.go
This file was deleted.
Oops, something went wrong.
52 changes: 52 additions & 0 deletions
52
internal/management/repository/eventsourcing/view/project.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| package view | ||
|
|
||
| import ( | ||
| proj_model "github.com/caos/zitadel/internal/project/model" | ||
| "github.com/caos/zitadel/internal/project/repository/view" | ||
| "github.com/caos/zitadel/internal/project/repository/view/model" | ||
| global_view "github.com/caos/zitadel/internal/view" | ||
| ) | ||
|
|
||
| const ( | ||
| projectTable = "management.projects" | ||
| ) | ||
|
|
||
| func (v *View) ProjectByID(projectID string) (*model.ProjectView, error) { | ||
| return view.ProjectByID(v.Db, projectTable, projectID) | ||
| } | ||
|
|
||
| func (v *View) SearchProjects(request *proj_model.ProjectViewSearchRequest) ([]*model.ProjectView, int, error) { | ||
| return view.SearchProjects(v.Db, projectTable, request) | ||
| } | ||
|
|
||
| func (v *View) PutProject(project *model.ProjectView) error { | ||
| err := view.PutProject(v.Db, projectTable, project) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return v.ProcessedProjectSequence(project.Sequence) | ||
| } | ||
|
|
||
| func (v *View) DeleteProject(projectID string, eventSequence uint64) error { | ||
| err := view.DeleteProject(v.Db, projectTable, projectID) | ||
| if err != nil { | ||
| return nil | ||
| } | ||
| return v.ProcessedProjectSequence(eventSequence) | ||
| } | ||
|
|
||
| func (v *View) GetLatestProjectSequence() (uint64, error) { | ||
| return v.latestSequence(projectTable) | ||
| } | ||
|
|
||
| func (v *View) ProcessedProjectSequence(eventSequence uint64) error { | ||
| return v.saveCurrentSequence(projectTable, eventSequence) | ||
| } | ||
|
|
||
| func (v *View) GetLatestProjectFailedEvent(sequence uint64) (*global_view.FailedEvent, error) { | ||
| return v.latestFailedEvent(projectTable, sequence) | ||
| } | ||
|
|
||
| func (v *View) ProcessedProjectFailedEvent(failedEvent *global_view.FailedEvent) error { | ||
| return v.saveFailedEvent(failedEvent) | ||
| } |
Oops, something went wrong.