Merge pull request #73 from clcollins/auto-ack

auto ack

Author: clcollins

pkg/pd/pd.go

@@ -26,6 +26,7 @@ type PagerDutyClientInterface interface {
 	ListIncidentAlertsWithContext(ctx context.Context, id string, opts pagerduty.ListIncidentAlertsOptions) (*pagerduty.ListAlertsResponse, error)
 	ListIncidentsWithContext(ctx context.Context, opts pagerduty.ListIncidentsOptions) (*pagerduty.ListIncidentsResponse, error)
 	ListIncidentNotesWithContext(ctx context.Context, id string) ([]pagerduty.IncidentNote, error)
+	ListOnCallsWithContext(ctx context.Context, opts pagerduty.ListOnCallOptions) (*pagerduty.ListOnCallsResponse, error)
 	ManageIncidentsWithContext(ctx context.Context, email string, opts []pagerduty.ManageIncidentsOptions) (*pagerduty.ListIncidentsResponse, error)
 }
 
@@ -257,6 +258,28 @@ func GetUser(client PagerDutyClient, id string, opts pagerduty.GetUserOptions) (
 	return u, nil
 }
 
+func GetUserOnCalls(client PagerDutyClient, id string, opts pagerduty.ListOnCallOptions) ([]pagerduty.OnCall, error) {
+	var ctx = context.Background()
+	var o []pagerduty.OnCall
+
+	for {
+		response, err := client.ListOnCallsWithContext(ctx, opts)
+		if err != nil {
+			return o, fmt.Errorf("pd.GetUserOnCalls(): failed to get on-call entries for user `%v`: %v", id, err)
+		}
+
+		o = response.OnCalls
+
+		opts.Offset += opts.Limit
+
+		if !response.More {
+			break
+		}
+	}
+
+	return o, nil
+}
+
 func ReassignIncidents(client PagerDutyClient, incidents []pagerduty.Incident, user *pagerduty.User, users []*pagerduty.User) ([]pagerduty.Incident, error) {
 	var ctx = context.Background()
 	var i []pagerduty.Incident

pkg/tui/commands.go

@@ -169,19 +169,19 @@ func AssignedToAnyUsers(i pagerduty.Incident, ids []string) bool {
 
 // ShouldBeAcknowledged returns true if the incident is assigned to the given user,
 // the user has not acknowledged the incident yet, and autoAcknowledge is enabled
-func ShouldBeAcknowledged(i pagerduty.Incident, id string, autoAcknowledge bool) bool {
+func ShouldBeAcknowledged(p *pd.Config, i pagerduty.Incident, id string, autoAcknowledge bool) bool {
 	assigned := AssignedToUser(i, id)
 	acknowledged := AcknowledgedByUser(i, id)
-	doIt := assigned && !acknowledged && autoAcknowledge
-	if doIt {
-		log.Debug(
-			"commands.ShouldBeAcknowledged",
-			"assigned", assigned,
-			"acknowledged", acknowledged,
-			"autoAcknowledge", autoAcknowledge,
-			"doIt", doIt,
-		)
-	}
+	userIsOnCall := UserIsOnCall(p, id)
+	doIt := assigned && !acknowledged && autoAcknowledge && userIsOnCall
+	log.Debug(
+		"commands.ShouldBeAcknowledged",
+		"assigned", assigned,
+		"acknowledged", acknowledged,
+		"autoAcknowledge", autoAcknowledge,
+		"userIsOnCall", userIsOnCall,
+		"doIt", doIt,
+	)
 	return AssignedToUser(i, id) && !AcknowledgedByUser(i, id) && autoAcknowledge
 }
 
@@ -205,6 +205,43 @@ func AcknowledgedByUser(i pagerduty.Incident, id string) bool {
 	return false
 }
 
+// UserIsOnCall returns true if the current time is between any of the current user's pagerduty.OnCalls in the next six hours
+func UserIsOnCall(p *pd.Config, id string) bool {
+	var timeLayout = "2006-01-02T15:04:05Z"
+	opts := pagerduty.ListOnCallOptions{
+		UserIDs: []string{id},
+		Since:   time.Now().String(),
+		Until:   time.Now().Add(time.Hour * 6).String(),
+	}
+
+	onCalls, err := pd.GetUserOnCalls(p.Client, id, opts)
+	if err != nil {
+		log.Debug("commands.UserIsOnCall", "error", err)
+		return false
+	}
+
+	for _, o := range onCalls {
+		log.Debug("commands.UserIsOnCall", "on-call", o)
+
+		start, err := time.Parse(timeLayout, o.Start)
+		if err != nil {
+			log.Debug("commands.UserIsOnCall", "error parsing on-call start time", err)
+			return false
+		}
+		end, err := time.Parse(timeLayout, o.End)
+		if err != nil {
+			log.Debug("commands.UserIsOnCall", "error parsing on-call end time", err)
+			return false
+		}
+
+		if start.Before(time.Now()) && end.After(time.Now()) {
+			return true
+		}
+	}
+
+	return false
+}
+
 // TODO: Can we use a single function and struct to handle
 // the openEditorCmd, login and openBrowserCmd commands?
 

pkg/tui/keymap.go

@@ -11,8 +11,9 @@ func (k keymap) FullHelp() [][]key.Binding {
 	return [][]key.Binding{
 		// Each slice here is a column in the help window
 		{k.Up, k.Down, k.Enter, k.Back},
-		{k.Enter, k.Ack, k.Silence, k.Note},
-		{k.Login, k.Open, k.Team, k.AutoRefresh},
+		{k.Ack, k.Note, k.Silence},
+		{k.Login, k.Open},
+		{k.Team, k.Refresh, k.AutoRefresh, k.AutoAck},
 		{k.Quit, k.Help},
 	}
 }
@@ -32,6 +33,7 @@ type keymap struct {
 	Note        key.Binding
 	Silence     key.Binding
 	Ack         key.Binding
+	AutoAck     key.Binding
 	Input       key.Binding
 	Login       key.Binding
 	Open        key.Binding
@@ -80,7 +82,7 @@ var defaultKeyMap = keymap{
 	),
 	AutoRefresh: key.NewBinding(
 		key.WithKeys("ctrl+r"),
-		key.WithHelp("ctrl+r", "toggle auto refresh"),
+		key.WithHelp("ctrl+r", "toggle auto-refresh"),
 	),
 	Note: key.NewBinding(
 		key.WithKeys("n"),
@@ -94,6 +96,10 @@ var defaultKeyMap = keymap{
 		key.WithKeys("a"),
 		key.WithHelp("a", "acknowledge"),
 	),
+	AutoAck: key.NewBinding(
+		key.WithKeys("ctrl+a"),
+		key.WithHelp("ctrl+a", "toggle auto-acknowledge"),
+	),
 	Input: key.NewBinding(
 		key.WithKeys("i"),
 		key.WithHelp("i", "input"),

pkg/tui/msgHandlers.go

@@ -118,6 +118,11 @@ func (m model) keyMsgHandler(msg tea.Msg) (tea.Model, tea.Cmd) {
 		return m, nil
 	}
 
+	if key.Matches(msg.(tea.KeyMsg), defaultKeyMap.AutoAck) {
+		m.autoAcknowledge = !m.autoAcknowledge
+		return m, nil
+	}
+
 	// Default commands for the table view
 	switch {
 	case m.err != nil:

pkg/tui/tui.go

@@ -5,6 +5,7 @@ import (
 	"reflect"
 	"regexp"
 	"slices"
+	"strings"
 	"time"
 
 	"github.com/PagerDuty/go-pagerduty"
@@ -221,7 +222,7 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		// Check if any incidents should be auto-acknowledged;
 		// This must be done before adding the stale incidents
 		for _, i := range m.incidentList {
-			if ShouldBeAcknowledged(i, m.config.CurrentUser.ID, m.autoAcknowledge) {
+			if ShouldBeAcknowledged(m.config, i, m.config.CurrentUser.ID, m.autoAcknowledge) {
 				acknowledgeIncidentsList = append(acknowledgeIncidentsList, i)
 			}
 		}
@@ -368,10 +369,16 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		)
 
 	case acknowledgedIncidentsMsg:
+		var incidentIDs []string
 		if msg.err != nil {
 			return m, func() tea.Msg { return errMsg{msg.err} }
 		}
-		m.setStatus(fmt.Sprintf("acknowledged incidents %v; refreshing Incident List ", msg))
+		for _, i := range msg.incidents {
+			incidentIDs = append(incidentIDs, i.ID)
+		}
+		incidents := strings.Join(incidentIDs, " ")
+		m.setStatus(fmt.Sprintf("acknowledged incidents: " + incidents))
+
 		return m, func() tea.Msg { return updateIncidentListMsg("sender: acknowledgedIncidentsMsg") }
 
 	case waitForSelectedIncidentsThenAcknowledgeMsg:

pkg/tui/views.go

@@ -216,7 +216,7 @@ func (m model) renderFooter() string {
 	s.WriteString(
 		lipgloss.JoinHorizontal(
 			0.2,
-			paddedStyle.Render(refreshArea(m.autoRefresh)),
+			paddedStyle.Render(refreshArea(m.autoRefresh, m.autoAcknowledge)),
 		),
 	)
 
@@ -267,13 +267,16 @@ func statusArea(s string) string {
 	return fmt.Sprintf(fstring, s)
 }
 
-func refreshArea(autoRefresh bool) string {
+func refreshArea(autoRefresh bool, autoAck bool) string {
 	var fstring = "Watching for updates... "
-	if !autoRefresh {
+
+	if autoRefresh && autoAck {
+		fstring = fstring + " [auto-acknowledge]"
+	} else if !autoRefresh {
 		fstring = fstring + " [PAUSED]"
 	}
-	fstring = strings.TrimSuffix(fstring, "\n")
 
+	fstring = strings.TrimSuffix(fstring, "\n")
 	return fstring
 }