feat: save last occurrence of failed events and fix instance filtering (#4710)

* fix: filter failed events and current sequence correctly

* fix failed events sorting column

* feat: save last occurrence of failed event

* fix failedEvents query and update sql statements

* change sql statement to only create index

* fix linting

* fix linting

* Update internal/query/failed_events.go

Co-authored-by: Silvan <[email protected]>

* update job name on test-docs to match the one from test-code

Co-authored-by: Silvan <[email protected]>

internal/api/grpc/system/failed_event.go

@@ -7,8 +7,8 @@ import (
 	system_pb "github.com/zitadel/zitadel/pkg/grpc/system"
 )
 
-func (s *Server) ListFailedEvents(ctx context.Context, req *system_pb.ListFailedEventsRequest) (*system_pb.ListFailedEventsResponse, error) {
-	failedEventsOld, err := s.administrator.GetFailedEvents(ctx)
+func (s *Server) ListFailedEvents(ctx context.Context, _ *system_pb.ListFailedEventsRequest) (*system_pb.ListFailedEventsResponse, error) {
+	failedEventsOld, err := s.administrator.GetFailedEvents(ctx, "")
 	if err != nil {
 		return nil, err
 	}
@@ -27,7 +27,7 @@ func (s *Server) RemoveFailedEvent(ctx context.Context, req *system_pb.RemoveFai
 	if req.Database != s.database {
 		err = s.administrator.RemoveFailedEvent(ctx, RemoveFailedEventRequestToModel(req))
 	} else {
-		err = s.query.RemoveFailedEvent(ctx, req.ViewName, req.FailedSequence)
+		err = s.query.RemoveFailedEvent(ctx, req.ViewName, req.InstanceId, req.FailedSequence)
 	}
 	if err != nil {
 		return nil, err

internal/api/grpc/system/failed_event_converter.go

@@ -1,6 +1,8 @@
 package system
 
 import (
+	"google.golang.org/protobuf/types/known/timestamppb"
+
 	"github.com/zitadel/zitadel/internal/query"
 	"github.com/zitadel/zitadel/internal/view/model"
 	system_pb "github.com/zitadel/zitadel/pkg/grpc/system"
@@ -15,12 +17,17 @@ func FailedEventsViewToPb(failedEvents []*model.FailedEvent) []*system_pb.Failed
 }
 
 func FailedEventViewToPb(failedEvent *model.FailedEvent) *system_pb.FailedEvent {
+	var lastFailed *timestamppb.Timestamp
+	if !failedEvent.LastFailed.IsZero() {
+		lastFailed = timestamppb.New(failedEvent.LastFailed)
+	}
 	return &system_pb.FailedEvent{
 		Database:       failedEvent.Database,
 		ViewName:       failedEvent.ViewName,
 		FailedSequence: failedEvent.FailedSequence,
 		FailureCount:   failedEvent.FailureCount,
 		ErrorMessage:   failedEvent.ErrMsg,
+		LastFailed:     lastFailed,
 	}
 }
 
@@ -33,12 +40,17 @@ func FailedEventsToPb(database string, failedEvents *query.FailedEvents) []*syst
 }
 
 func FailedEventToPb(database string, failedEvent *query.FailedEvent) *system_pb.FailedEvent {
+	var lastFailed *timestamppb.Timestamp
+	if !failedEvent.LastFailed.IsZero() {
+		lastFailed = timestamppb.New(failedEvent.LastFailed)
+	}
 	return &system_pb.FailedEvent{
 		Database:       database,
 		ViewName:       failedEvent.ProjectionName,
 		FailedSequence: failedEvent.FailedSequence,
 		FailureCount:   failedEvent.FailureCount,
 		ErrorMessage:   failedEvent.Error,
+		LastFailed:     lastFailed,
 	}
 }
 
@@ -47,5 +59,6 @@ func RemoveFailedEventRequestToModel(req *system_pb.RemoveFailedEventRequest) *m
 		Database:       req.Database,
 		ViewName:       req.ViewName,
 		FailedSequence: req.FailedSequence,
+		InstanceID:     req.InstanceId,
 	}
 }

internal/api/grpc/system/failed_event_converter_test.go

@@ -2,6 +2,7 @@ package system_test
 
 import (
 	"testing"
+	"time"
 
 	system_grpc "github.com/zitadel/zitadel/internal/api/grpc/system"
 	"github.com/zitadel/zitadel/internal/test"
@@ -26,6 +27,7 @@ func TestFailedEventsToPbFields(t *testing.T) {
 						ViewName:       "users",
 						FailedSequence: 456,
 						FailureCount:   5,
+						LastFailed:     time.Now(),
 						ErrMsg:         "some error",
 					},
 				},
@@ -58,6 +60,7 @@ func TestFailedEventToPbFields(t *testing.T) {
 					ViewName:       "users",
 					FailedSequence: 456,
 					FailureCount:   5,
+					LastFailed:     time.Now(),
 					ErrMsg:         "some error",
 				},
 			},
@@ -84,12 +87,13 @@ func TestRemoveFailedEventRequestToModelFields(t *testing.T) {
 					Database:       "admin",
 					ViewName:       "users",
 					FailedSequence: 456,
+					InstanceId:     "instanceID",
 				},
 			},
 		},
 	}
 	for _, tt := range tests {
 		converted := system_grpc.RemoveFailedEventRequestToModel(tt.args.req)
-		test.AssertFieldsMapped(t, converted, "FailureCount", "ErrMsg")
+		test.AssertFieldsMapped(t, converted, "FailureCount", "LastFailed", "ErrMsg")
 	}
 }

internal/api/grpc/system/view.go

@@ -13,7 +13,7 @@ func (s *Server) ListViews(ctx context.Context, _ *system_pb.ListViewsRequest) (
 		return nil, err
 	}
 	convertedCurrentSequences := CurrentSequencesToPb(s.database, currentSequences)
-	views, err := s.administrator.GetViews()
+	views, err := s.administrator.GetViews("")
 	if err != nil {
 		return nil, err
 	}

internal/api/grpc/system/view_converter.go

@@ -1,10 +1,11 @@
 package system
 
 import (
+	"google.golang.org/protobuf/types/known/timestamppb"
+
 	"github.com/zitadel/zitadel/internal/query"
 	"github.com/zitadel/zitadel/internal/view/model"
 	system_pb "github.com/zitadel/zitadel/pkg/grpc/system"
-	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
 func ViewsToPb(views []*model.View) []*system_pb.View {
@@ -35,9 +36,9 @@ func CurrentSequencesToPb(database string, currentSequences *query.CurrentSequen
 
 func CurrentSequenceToPb(database string, currentSequence *query.CurrentSequence) *system_pb.View {
 	return &system_pb.View{
-		Database:          database,
-		ViewName:          currentSequence.ProjectionName,
-		ProcessedSequence: currentSequence.CurrentSequence,
-		EventTimestamp:    timestamppb.New(currentSequence.Timestamp),
+		Database:                 database,
+		ViewName:                 currentSequence.ProjectionName,
+		ProcessedSequence:        currentSequence.CurrentSequence,
+		LastSuccessfulSpoolerRun: timestamppb.New(currentSequence.Timestamp),
 	}
 }