TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-12 03:57:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(adminAPI): localize event type (#5059)

Browse Source 
* fix(adminAPI): localisation of event types, aggregate types
* fix(adminAPI): validations of ListEvent request
* implement caching of editor user information
This commit is contained in:
Silvan
2023-01-19 16:50:05 +01:00
committed by GitHub
parent a3f5885823
commit 7b5135e637
16 changed files with 679 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
internal/query/event.go
View File

@@ -5,6 +5,7 @@ import (
"time"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/telemetry/tracing"
)
type Event struct {
@@ -22,7 +23,9 @@ type EventEditor struct {
Service string
}
func (q *Queries) SearchEvents(ctx context.Context, query *eventstore.SearchQueryBuilder) ([]*Event, error) {
func (q *Queries) SearchEvents(ctx context.Context, query *eventstore.SearchQueryBuilder) (_ []*Event, err error) {
ctx, span := tracing.NewSpan(ctx)
defer func() { span.EndWithError(err) }()
events, err := q.eventstore.Filter(ctx, query)
if err != nil {
return nil, err
@@ -41,21 +44,22 @@ func (q *Queries) SearchAggregateTypes(ctx context.Context) []string {
func (q *Queries) convertEvents(ctx context.Context, events []eventstore.Event) []*Event {
result := make([]*Event, len(events))
users := make(map[string]string)
for i, event := range events {
result[i] = q.convertEvent(ctx, event)
result[i] = q.convertEvent(ctx, event, users)
}
return result
}
func (q *Queries) convertEvent(ctx context.Context, event eventstore.Event) *Event {
displayName := event.EditorUser()
user, err := q.GetUserByID(ctx, false, event.EditorUser(), false)
if err == nil {
if user.Human != nil {
displayName = user.Human.DisplayName
} else if user.Machine != nil {
displayName = user.Machine.Name
}
func (q *Queries) convertEvent(ctx context.Context, event eventstore.Event, users map[string]string) *Event {
ctx, span := tracing.NewSpan(ctx)
var err error
defer func() { span.EndWithError(err) }()
displayName, ok := users[event.EditorUser()]
if !ok {
displayName = q.editorUserByID(ctx, event.EditorUser())
users[event.EditorUser()] = displayName
}
return &Event{
@@ -71,3 +75,16 @@ func (q *Queries) convertEvent(ctx context.Context, event eventstore.Event) *Eve
Payload: event.DataAsBytes(),
}
}
func (q *Queries) editorUserByID(ctx context.Context, userID string) string {
user, err := q.GetUserByID(ctx, false, userID, false)
if err != nil {
return userID
}
if user.Human != nil {
return user.Human.DisplayName
} else if user.Machine != nil {
return user.Machine.Name
}
return userID
}