mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-12 19:14:23 +00:00
9da4abd459
* feat(console): add time range events filter * deprecate creation_date, use oneof filter * use range or from * implement api * fix timestamp format * translate * styles * lint * integration tests * fix until date * rearrange sorting control * sort creation date * fix events e2e test * Update console/src/app/modules/filter-events/filter-events.component.html Co-authored-by: Max Peintner <max@caos.ch> * Update console/src/app/modules/filter-events/filter-events.component.html Co-authored-by: Max Peintner <max@caos.ch> * Update console/src/app/modules/filter-events/filter-events.component.html Co-authored-by: Max Peintner <max@caos.ch> * lint * lint * don't use utc call time --------- Co-authored-by: Max Peintner <max@caos.ch> Co-authored-by: Silvan <silvan.reusser@gmail.com>
103 lines
3.1 KiB
Go
103 lines
3.1 KiB
Go
package admin
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin"
|
|
)
|
|
|
|
const (
|
|
maxLimit = 1000
|
|
)
|
|
|
|
func (s *Server) ListEvents(ctx context.Context, in *admin_pb.ListEventsRequest) (*admin_pb.ListEventsResponse, error) {
|
|
filter, err := eventRequestToFilter(ctx, in)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
events, err := s.query.SearchEvents(ctx, filter)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return admin_pb.EventsToPb(ctx, events)
|
|
}
|
|
|
|
func (s *Server) ListEventTypes(ctx context.Context, in *admin_pb.ListEventTypesRequest) (*admin_pb.ListEventTypesResponse, error) {
|
|
eventTypes := s.query.SearchEventTypes(ctx)
|
|
return admin_pb.EventTypesToPb(eventTypes), nil
|
|
}
|
|
|
|
func (s *Server) ListAggregateTypes(ctx context.Context, in *admin_pb.ListAggregateTypesRequest) (*admin_pb.ListAggregateTypesResponse, error) {
|
|
aggregateTypes := s.query.SearchAggregateTypes(ctx)
|
|
return admin_pb.AggregateTypesToPb(aggregateTypes), nil
|
|
}
|
|
|
|
func eventRequestToFilter(ctx context.Context, req *admin_pb.ListEventsRequest) (*eventstore.SearchQueryBuilder, error) {
|
|
var fromTime, sinceTime, untilTime time.Time
|
|
// We ignore the deprecation warning here because we still need to support the deprecated field.
|
|
//nolint:staticcheck
|
|
if creationDatePb := req.GetCreationDate(); creationDatePb != nil {
|
|
fromTime = creationDatePb.AsTime()
|
|
}
|
|
if fromTimePb := req.GetFrom(); fromTimePb != nil {
|
|
fromTime = fromTimePb.AsTime()
|
|
}
|
|
if timeRange := req.GetRange(); timeRange != nil {
|
|
// If range is set, we ignore the from and the deprecated creation_date fields
|
|
fromTime = time.Time{}
|
|
if timeSincePb := timeRange.GetSince(); timeSincePb != nil {
|
|
sinceTime = timeSincePb.AsTime()
|
|
}
|
|
if timeUntilPb := timeRange.GetUntil(); timeUntilPb != nil {
|
|
untilTime = timeUntilPb.AsTime()
|
|
}
|
|
}
|
|
eventTypes := make([]eventstore.EventType, len(req.EventTypes))
|
|
for i, eventType := range req.EventTypes {
|
|
eventTypes[i] = eventstore.EventType(eventType)
|
|
}
|
|
aggregateIDs := make([]string, 0, 1)
|
|
if req.AggregateId != "" {
|
|
aggregateIDs = append(aggregateIDs, req.AggregateId)
|
|
}
|
|
aggregateTypes := make([]eventstore.AggregateType, len(req.AggregateTypes))
|
|
for i, aggregateType := range req.AggregateTypes {
|
|
aggregateTypes[i] = eventstore.AggregateType(aggregateType)
|
|
}
|
|
limit := uint64(req.Limit)
|
|
if limit == 0 || limit > maxLimit {
|
|
limit = maxLimit
|
|
}
|
|
|
|
builder := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
OrderDesc().
|
|
InstanceID(authz.GetInstance(ctx).InstanceID()).
|
|
Limit(limit).
|
|
AwaitOpenTransactions().
|
|
ResourceOwner(req.ResourceOwner).
|
|
EditorUser(req.EditorUserId).
|
|
SequenceGreater(req.Sequence).
|
|
CreationDateAfter(sinceTime).
|
|
CreationDateBefore(untilTime)
|
|
|
|
if len(aggregateIDs) > 0 || len(aggregateTypes) > 0 || len(eventTypes) > 0 {
|
|
builder.AddQuery().
|
|
AggregateIDs(aggregateIDs...).
|
|
AggregateTypes(aggregateTypes...).
|
|
EventTypes(eventTypes...).
|
|
Builder()
|
|
}
|
|
|
|
if req.GetAsc() {
|
|
builder.OrderAsc()
|
|
builder.CreationDateAfter(fromTime)
|
|
} else {
|
|
builder.CreationDateBefore(fromTime)
|
|
}
|
|
return builder, nil
|
|
}
|