refactor(changes): use queries.SearchEvents (#5388)

* refactor(changes): use `queries.SearchEvents`

---------

Co-authored-by: Livio Spring <livio.a@gmail.com>
This commit is contained in:
Silvan
2023-03-17 10:14:06 +01:00
committed by GitHub
parent 09abf06d4d
commit a3b36a0138
12 changed files with 261 additions and 215 deletions

View File

@@ -10,30 +10,23 @@ import (
"github.com/zitadel/zitadel/pkg/grpc/message"
)
func ChangeQueryToQuery(query *change_pb.ChangeQuery) (sequence uint64, limit uint64, asc bool) {
if query == nil {
return 0, 0, false
}
return query.Sequence, uint64(query.Limit), query.Asc
}
func ChangesToPb(changes []*query.Change, assetAPIPrefix string) []*change_pb.Change {
func EventsToChangesPb(changes []*query.Event, assetAPIPrefix string) []*change_pb.Change {
c := make([]*change_pb.Change, len(changes))
for i, change := range changes {
c[i] = ChangeToPb(change, assetAPIPrefix)
c[i] = EventToChangePb(change, assetAPIPrefix)
}
return c
}
func ChangeToPb(change *query.Change, assetAPIPrefix string) *change_pb.Change {
func EventToChangePb(change *query.Event, assetAPIPrefix string) *change_pb.Change {
return &change_pb.Change{
ChangeDate: timestamppb.New(change.ChangeDate),
EventType: message.NewLocalizedEventType(change.EventType),
ChangeDate: timestamppb.New(change.CreationDate),
EventType: message.NewLocalizedEventType(change.Type),
Sequence: change.Sequence,
EditorId: change.ModifierId,
EditorDisplayName: change.ModifierName,
EditorPreferredLoginName: change.ModifierLoginName,
EditorAvatarUrl: domain.AvatarURL(assetAPIPrefix, change.ModifierResourceOwner, change.ModifierAvatarKey),
ResourceOwnerId: change.ResourceOwner,
EditorId: change.Editor.ID,
EditorDisplayName: change.Editor.DisplayName,
EditorPreferredLoginName: change.Editor.PreferedLoginName,
EditorAvatarUrl: domain.AvatarURL(assetAPIPrefix, change.Aggregate.ResourceOwner, change.Editor.AvatarKey),
ResourceOwnerId: change.Aggregate.ResourceOwner,
}
}