David Townley 2 lat temu
rodzic
commit
80d81da8af

+ 2 - 2
api/server/handlers/porter_app/list_events.go

@@ -71,7 +71,7 @@ func (p *PorterAppEventListHandler) ServeHTTP(w http.ResponseWriter, r *http.Req
 	porterAppEvents, paginatedResult, err := p.Repo().PorterAppEvent().ListEventsByPorterAppIDExcludingAppEvents(ctx, app.ID, helpers.WithPageSize(20), helpers.WithPage(int(pr.Page)))
 	if err != nil {
 		if !errors.Is(err, gorm.ErrRecordNotFound) {
-			e := telemetry.Error(ctx, span, nil, "error listing porter app events by porter app id")
+			e := telemetry.Error(ctx, span, err, "error listing porter app events by porter app id")
 			p.HandleAPIError(w, r, apierrors.NewErrPassThroughToClient(e, http.StatusBadRequest))
 			return
 		}
@@ -81,7 +81,7 @@ func (p *PorterAppEventListHandler) ServeHTTP(w http.ResponseWriter, r *http.Req
 		if appEvent.Status == string(types.PorterAppEventStatus_Progressing) {
 			pae, err := p.updateExistingAppEvent(ctx, *cluster, appName, *appEvent, user, project)
 			if err != nil {
-				telemetry.Error(ctx, span, nil, "unable to update existing porter app event")
+				_ = telemetry.Error(ctx, span, err, "unable to update existing porter app event")
 			}
 			porterAppEvents[idx] = &pae
 		}

+ 1 - 1
internal/repository/gorm/porter_app_event.go

@@ -57,7 +57,7 @@ func (repo *PorterAppEventRepository) ListEventsByPorterAppIDExcludingAppEvents(
 	}
 
 	db := repo.db.Model(&models.PorterAppEvent{})
-	resultDB := db.Where("porter_app_id = ? and type != APP_EVENT", id).Order("created_at DESC")
+	resultDB := db.Where("porter_app_id = ? and type != 'APP_EVENT'", id).Order("created_at DESC")
 	resultDB = resultDB.Scopes(helpers.Paginate(db, &paginatedResult, opts...))
 
 	if err := resultDB.Find(&apps).Error; err != nil {