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

fix: ignore 0 retention on event search (#5614)

Browse Source 
* fix: filter all search events if retention

* test(e2e): test event api filter
This commit is contained in:
Elio Bischof
2023-04-05 19:56:11 +02:00
committed by GitHub
parent 5c8748d769
commit 29c0adb650
4 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
internal/query/event.go
View File

@@ -34,18 +34,25 @@ func (q *Queries) SearchEvents(ctx context.Context, query *eventstore.SearchQuer
return nil, err
}
if auditLogRetention != 0 {
events = filterAuditLogRetention(ctx, events, auditLogRetention)
}
return q.convertEvents(ctx, events), nil
}
func filterAuditLogRetention(ctx context.Context, events []eventstore.Event, auditLogRetention time.Duration) []eventstore.Event {
callTime := call.FromContext(ctx)
if callTime.IsZero() {
callTime = time.Now()
}
for i, event := range events {
if event.CreationDate().Before(callTime.Add(-auditLogRetention)) {
events = events[:i]
break
filteredEvents := make([]eventstore.Event, 0, len(events))
for _, event := range events {
if event.CreationDate().After(callTime.Add(-auditLogRetention)) {
filteredEvents = append(filteredEvents, event)
}
}
return q.convertEvents(ctx, events, auditLogRetention), nil
return filteredEvents
}
func (q *Queries) SearchEventTypes(ctx context.Context) []string {
@@ -56,7 +63,7 @@ func (q *Queries) SearchAggregateTypes(ctx context.Context) []string {
return q.eventstore.AggregateTypes()
}
func (q *Queries) convertEvents(ctx context.Context, events []eventstore.Event, auditLogRetention time.Duration) []*Event {
func (q *Queries) convertEvents(ctx context.Context, events []eventstore.Event) []*Event {
result := make([]*Event, len(events))
users := make(map[string]*EventEditor)
for i, event := range events {