Rename incident.Id -> ID & drop incident#ID()

Author: yhabteab

internal/incident/incident.go

@@ -24,7 +24,7 @@ import (
 type escalationID = int64
 
 type Incident struct {
-	Id          int64           `db:"id"`
+	ID          int64           `db:"id"`
 	ObjectID    types.Binary    `db:"object_id"`
 	StartedAt   types.UnixMilli `db:"started_at"`
 	RecoveredAt types.UnixMilli `db:"recovered_at"`
@@ -79,11 +79,7 @@ func NewIncident(
 }
 
 func (i *Incident) String() string {
-	return fmt.Sprintf("#%d", i.Id)
-}
-
-func (i *Incident) ID() int64 {
-	return i.Id
+	return fmt.Sprintf("#%d", i.ID)
 }
 
 func (i *Incident) HasManager() bool {
@@ -301,7 +297,7 @@ func (i *Incident) processSeverityChangedEvent(ctx context.Context, tx *sqlx.Tx,
 	i.logger.Infof("Incident severity changed from %s to %s", oldSeverity.String(), newSeverity.String())
 
 	hr := &HistoryRow{
-		IncidentID:  i.Id,
+		IncidentID:  i.ID,
 		EventID:     utils.ToDBInt(ev.ID),
 		Time:        types.UnixMilli(time.Now()),
 		Type:        IncidentSeverityChanged,
@@ -322,7 +318,7 @@ func (i *Incident) processSeverityChangedEvent(ctx context.Context, tx *sqlx.Tx,
 		RemoveCurrent(i.Object)
 
 		hr = &HistoryRow{
-			IncidentID: i.Id,
+			IncidentID: i.ID,
 			EventID:    utils.ToDBInt(ev.ID),
 			Time:       i.RecoveredAt,
 			Type:       Closed,
@@ -358,7 +354,7 @@ func (i *Incident) processIncidentOpenedEvent(ctx context.Context, tx *sqlx.Tx,
 	i.logger.Infow(fmt.Sprintf("Source %d opened incident at severity %q", ev.SourceId, i.Severity.String()), zap.String("message", ev.Message))
 
 	hr := &HistoryRow{
-		IncidentID:  i.Id,
+		IncidentID:  i.ID,
 		Type:        Opened,
 		Time:        types.UnixMilli(ev.Time),
 		EventID:     utils.ToDBInt(ev.ID),
@@ -381,7 +377,7 @@ func (i *Incident) handleMuteUnmute(ctx context.Context, tx *sqlx.Tx, ev *event.
 		return nil
 	}
 
-	hr := &HistoryRow{IncidentID: i.Id, EventID: utils.ToDBInt(ev.ID), Time: types.UnixMilli(time.Now())}
+	hr := &HistoryRow{IncidentID: i.ID, EventID: utils.ToDBInt(ev.ID), Time: types.UnixMilli(time.Now())}
 	logger := i.logger.With(zap.String("event", ev.String()))
 	if i.Object.IsMuted() {
 		hr.Type = Muted
@@ -415,7 +411,7 @@ func (i *Incident) onFilterRuleMatch(ctx context.Context, r *rule.Rule, tx *sqlx
 	}
 
 	hr := &HistoryRow{
-		IncidentID: i.Id,
+		IncidentID: i.ID,
 		Time:       types.UnixMilli(time.Now()),
 		EventID:    utils.ToDBInt(ev.ID),
 		RuleID:     utils.ToDBInt(r.ID),
@@ -510,7 +506,7 @@ func (i *Incident) triggerEscalations(ctx context.Context, tx *sqlx.Tx, ev *even
 		}
 
 		hr := &HistoryRow{
-			IncidentID:       i.Id,
+			IncidentID:       i.ID,
 			Time:             state.TriggeredAt,
 			EventID:          utils.ToDBInt(ev.ID),
 			RuleEscalationID: utils.ToDBInt(state.RuleEscalationID),
@@ -544,7 +540,7 @@ func (i *Incident) notifyContacts(ctx context.Context, ev *event.Event, notifica
 	}
 
 	incidentUrl := baseUrl.JoinPath("/notifications/incident")
-	incidentUrl.RawQuery = fmt.Sprintf("id=%d", i.ID())
+	incidentUrl.RawQuery = fmt.Sprintf("id=%d", i.ID)
 
 	req := &plugin.NotificationRequest{
 		Object: &plugin.Object{
@@ -554,7 +550,7 @@ func (i *Incident) notifyContacts(ctx context.Context, ev *event.Event, notifica
 			ExtraTags: i.Object.ExtraTags,
 		},
 		Incident: &plugin.Incident{
-			Id:       i.Id,
+			Id:       i.ID,
 			Url:      incidentUrl.String(),
 			Severity: i.Severity.String(),
 		},
@@ -659,7 +655,7 @@ func (i *Incident) processAcknowledgementEvent(ctx context.Context, tx *sqlx.Tx,
 	i.logger.Infof("Contact %q role changed from %s to %s", contact.String(), oldRole.String(), newRole.String())
 
 	hr := &HistoryRow{
-		IncidentID:       i.Id,
+		IncidentID:       i.ID,
 		Key:              recipientKey,
 		EventID:          utils.ToDBInt(ev.ID),
 		Type:             RecipientRoleChanged,
@@ -737,7 +733,7 @@ func (i *Incident) getRecipientsChannel(t time.Time) rule.ContactChannels {
 func (i *Incident) restoreRecipients(ctx context.Context) error {
 	contact := &ContactRow{}
 	var contacts []*ContactRow
-	err := i.db.SelectContext(ctx, &contacts, i.db.Rebind(i.db.BuildSelectStmt(contact, contact)+` WHERE "incident_id" = ?`), i.Id)
+	err := i.db.SelectContext(ctx, &contacts, i.db.Rebind(i.db.BuildSelectStmt(contact, contact)+` WHERE "incident_id" = ?`), i.ID)
 	if err != nil {
 		i.logger.Errorw("Failed to restore incident recipients from the database", zap.Error(err))
 		return err

internal/incident/incidents.go

@@ -80,11 +80,11 @@ func LoadOpenIncidents(ctx context.Context, db *database.DB, logger *logging.Log
 					incidentsByObjId := make(map[string]*Incident, chunkLen)
 
 					for _, i := range bulk {
-						incidentsById[i.Id] = i
+						incidentsById[i.ID] = i
 						incidentsByObjId[i.ObjectID.String()] = i
 
 						objectIds = append(objectIds, i.ObjectID)
-						incidentIds = append(incidentIds, i.Id)
+						incidentIds = append(incidentIds, i.ID)
 					}
 
 					// Restore all incident objects matching the given object ids
@@ -192,7 +192,7 @@ func GetCurrentIncidents() map[int64]*Incident {
 
 	m := make(map[int64]*Incident)
 	for _, incident := range currentIncidents {
-		m[incident.Id] = incident
+		m[incident.ID] = incident
 	}
 	return m
 }

internal/incident/incidents_test.go

@@ -68,7 +68,7 @@ func TestLoadOpenIncidents(t *testing.T) {
 			RemoveCurrent(i.Object)
 
 			// Mark some of the existing incidents as recovered.
-			if i.Id%20 == 0 { // 1000 / 20 => 50 existing incidents will be marked as recovered!
+			if i.ID%20 == 0 { // 1000 / 20 => 50 existing incidents will be marked as recovered!
 				i.RecoveredAt = types.UnixMilli(time.Now())
 
 				require.NoError(t, i.Sync(ctx, tx), "failed to update/insert incident")
@@ -125,7 +125,7 @@ func assertIncidents(ctx context.Context, db *database.DB, t *testing.T, testDat
 		assert.NotNil(t, current.Object, "failed to restore incident object")
 
 		if i != nil {
-			assert.Equal(t, i.Id, current.Id, "incidents linked to the same object don't have the same ID")
+			assert.Equal(t, i.ID, current.ID, "incidents linked to the same object don't have the same ID")
 			assert.Equal(t, i.Severity, current.Severity, "failed to restore incident severity")
 			assert.Equal(t, i.StartedAt, current.StartedAt, "failed to restore incident started at")
 			assert.Equal(t, i.RecoveredAt, current.RecoveredAt, "failed to restore incident recovered at")

internal/incident/sync.go

@@ -25,7 +25,7 @@ func (i *Incident) Upsert() interface{} {
 // Before syncing any incident related database entries, this method should be called at least once.
 // Returns an error on db failure.
 func (i *Incident) Sync(ctx context.Context, tx *sqlx.Tx) error {
-	if i.Id != 0 {
+	if i.ID != 0 {
 		stmt, _ := i.db.BuildUpsertStmt(i)
 		_, err := tx.NamedExecContext(ctx, stmt, i)
 		if err != nil {
@@ -38,14 +38,14 @@ func (i *Incident) Sync(ctx context.Context, tx *sqlx.Tx) error {
 			return err
 		}
 
-		i.Id = incidentId
+		i.ID = incidentId
 	}
 
 	return nil
 }
 
 func (i *Incident) AddEscalationTriggered(ctx context.Context, tx *sqlx.Tx, state *EscalationState) error {
-	state.IncidentID = i.Id
+	state.IncidentID = i.ID
 
 	stmt, _ := i.db.BuildUpsertStmt(state)
 	_, err := tx.NamedExecContext(ctx, stmt, state)
@@ -55,7 +55,7 @@ func (i *Incident) AddEscalationTriggered(ctx context.Context, tx *sqlx.Tx, stat
 
 // AddEvent Inserts incident history record to the database and returns an error on db failure.
 func (i *Incident) AddEvent(ctx context.Context, tx *sqlx.Tx, ev *event.Event) error {
-	ie := &EventRow{IncidentID: i.Id, EventID: ev.ID}
+	ie := &EventRow{IncidentID: i.ID, EventID: ev.ID}
 	stmt, _ := i.db.BuildInsertStmt(ie)
 	_, err := tx.NamedExecContext(ctx, stmt, ie)
 
@@ -72,7 +72,7 @@ func (i *Incident) AddRecipient(ctx context.Context, tx *sqlx.Tx, escalation *ru
 
 	for _, escalationRecipient := range escalation.Recipients {
 		r := escalationRecipient.Recipient
-		cr := &ContactRow{IncidentID: i.Id, Role: newRole}
+		cr := &ContactRow{IncidentID: i.ID, Role: newRole}
 
 		recipientKey := recipient.ToKey(r)
 		cr.Key = recipientKey
@@ -88,7 +88,7 @@ func (i *Incident) AddRecipient(ctx context.Context, tx *sqlx.Tx, escalation *ru
 				i.logger.Infof("Contact %q role changed from %s to %s", r, state.Role.String(), newRole.String())
 
 				hr := &HistoryRow{
-					IncidentID:       i.Id,
+					IncidentID:       i.ID,
 					EventID:          utils.ToDBInt(eventId),
 					Key:              cr.Key,
 					Time:             types.UnixMilli(time.Now()),
@@ -125,7 +125,7 @@ func (i *Incident) AddRecipient(ctx context.Context, tx *sqlx.Tx, escalation *ru
 // AddRuleMatched syncs the given *rule.Rule to the database.
 // Returns an error on database failure.
 func (i *Incident) AddRuleMatched(ctx context.Context, tx *sqlx.Tx, r *rule.Rule) error {
-	rr := &RuleRow{IncidentID: i.Id, RuleID: r.ID}
+	rr := &RuleRow{IncidentID: i.ID, RuleID: r.ID}
 	stmt, _ := i.db.BuildUpsertStmt(rr)
 	_, err := tx.NamedExecContext(ctx, stmt, rr)
 
@@ -145,7 +145,7 @@ func (i *Incident) generateNotifications(
 	for contact, channels := range contactChannels {
 		for chID := range channels {
 			hr := &HistoryRow{
-				IncidentID:        i.Id,
+				IncidentID:        i.ID,
 				Key:               recipient.ToKey(contact),
 				EventID:           utils.ToDBInt(ev.ID),
 				Time:              types.UnixMilli(time.Now()),