added operator to monitor incident response

Author: TeisNP

internal/incident/repository.go

@@ -68,13 +68,14 @@ type IncidentAndAssertion struct {
 	entities.Incident
 	Property string `gorm:"column:property"`
 	Target   string `gorm:"column:target"`
+	Operator string `gorm:"column:operator"`
 }
 
 func (r *RepositoryImpl) GetByMonitorIDWithAssertionPaginated(ctx context.Context, monitorID uint, offset, limit *int) (*[]IncidentAndAssertion, error) {
 	var incidents []IncidentAndAssertion
 	if err := r.db.WithContext(
 		ctx,
-	).Select("incidents.*, ma.property as property, ma.target as target").Where(entities.Incident{
+	).Select("incidents.*, ma.property as property, ma.target as target, ma.operator as operator").Where(entities.Incident{
 		MonitorID: monitorID,
 	}).Where(
 		"resolved = ?", false,

internal/rest/controllers/incidents/incidents.go

@@ -158,6 +158,7 @@ type GetMonitorIncidentsResponseIncident struct {
 	UpdatedAt   string `json:"updatedAt"`
 	Property    string `json:"property"`
 	Target      string `json:"target"`
+	Operator    string `json:"operator"`
 }
 
 func (h *Handlers) GetMonitorIncidents(c hs.AuthenticatedContext) error {
@@ -202,6 +203,7 @@ func (h *Handlers) GetMonitorIncidentsResponse(incidents *[]incident.IncidentAnd
 			UpdatedAt:   in.UpdatedAt.Format("2006-01-02T15:04:05Z07:00"),
 			Property:    in.Property,
 			Target:      in.Target,
+			Operator:    in.Operator,
 		}
 	}