Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions internal/api/middleware.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func ValidateComponentsMW(dbInst *db.DB, logger *zap.Logger) gin.HandlerFunc {

// TODO: move this list to the memory cache
// We should check, that all components are presented in our db.
dbComps, err := dbInst.GetComponentsAsMap()
dbComps, err := dbInst.GetComponentsAsMap(c.Request.Context())
if err != nil {
apiErrors.RaiseInternalErr(c, err)
return
Expand Down Expand Up @@ -228,7 +228,7 @@ func CheckEventExistenceMW(dbInst *db.DB, logger *zap.Logger) gin.HandlerFunc {
return
}

event, err := dbInst.GetIncident(incID.ID)
event, err := dbInst.GetIncident(c.Request.Context(), incID.ID)
if err != nil {
if errors.Is(err, db.ErrDBIncidentDSNotExist) {
apiErrors.RaiseStatusNotFoundErr(c, apiErrors.ErrIncidentDSNotExist)
Expand Down
15 changes: 9 additions & 6 deletions internal/api/rss/rss.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package rss

import (
"context"
"fmt"
"net/http"
"sort"
Expand Down Expand Up @@ -45,7 +46,7 @@ func HandleRSS(dbInst *db.DB, logger *zap.Logger) gin.HandlerFunc {
baseURL: baseURL,
}

incidents, err := getIncidents(dbInst, logger, params, maxIncidents)
incidents, err := getIncidents(c.Request.Context(), dbInst, logger, params, maxIncidents)
if err != nil {
if componentName != "" {
apiErrors.RaiseStatusNotFoundErr(c, err)
Expand Down Expand Up @@ -102,7 +103,9 @@ type feedParams struct {
baseURL string
}

func getIncidents(dbInstance *db.DB, log *zap.Logger, params feedParams, maxIncidents int) ([]*db.Incident, error) {
func getIncidents(
ctx context.Context, dbInstance *db.DB, log *zap.Logger, params feedParams, maxIncidents int,
) ([]*db.Incident, error) {
var incidents []*db.Incident
var err error

Expand All @@ -116,13 +119,13 @@ func getIncidents(dbInstance *db.DB, log *zap.Logger, params feedParams, maxInci
}

var component *db.Component
component, err = dbInstance.GetComponentFromNameAttrs(params.componentName, attr)
component, err = dbInstance.GetComponentFromNameAttrs(ctx, params.componentName, attr)
if err != nil {
log.Error("failed to get component", zap.Error(err))
return nil, err
}

incidents, err = dbInstance.GetEventsByComponentID(component.ID, incParams)
incidents, err = dbInstance.GetEventsByComponentID(ctx, component.ID, incParams)
if err != nil {
return nil, err
}
Expand All @@ -132,12 +135,12 @@ func getIncidents(dbInstance *db.DB, log *zap.Logger, params feedParams, maxInci
Value: params.region,
}

incidents, err = dbInstance.GetIncidentsByComponentAttr(attr, incParams)
incidents, err = dbInstance.GetIncidentsByComponentAttr(ctx, attr, incParams)
if err != nil {
return nil, err
}
default:
incidents, err = dbInstance.GetEvents(db.PublicAccess, incParams)
incidents, err = dbInstance.GetEvents(ctx, db.PublicAccess, incParams)
if err != nil {
return nil, err
}
Expand Down
Loading
Loading