Small touch-ups

dannykopping · dannykopping · commit 44a0e9f4dc96 · 2024-07-10T10:41:15.000+02:00
Signed-off-by: Danny Kopping &lt;danny@coder.com&gt;
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/notifications.sql b/coderd/database/queries/notifications.sql
@@ -89,7 +89,8 @@ FROM acquired nm
 
 -- name: BulkMarkNotificationMessagesFailed :execrows
 UPDATE notification_messages
-SET updated_at       = subquery.failed_at,
+SET queued_seconds   = 0,
+    updated_at       = subquery.failed_at,
     attempt_count    = attempt_count + 1,
     status           = CASE
                            WHEN attempt_count + 1 < @max_attempts::int THEN subquery.status
@@ -107,7 +108,8 @@ WHERE notification_messages.id = subquery.id;
 
 -- name: BulkMarkNotificationMessagesSent :execrows
 UPDATE notification_messages
-SET updated_at       = new_values.sent_at,
+SET queued_seconds   = 0,
+    updated_at       = new_values.sent_at,
     attempt_count    = attempt_count + 1,
     status           = 'sent'::notification_message_status,
     status_reason    = NULL,
diff --git a/coderd/notifications/metrics_test.go b/coderd/notifications/metrics_test.go
@@ -92,14 +92,14 @@ func TestMetrics(t *testing.T) {
 				notifications.ResultPermFail: 1,               // 1 permanent failure after retries exhausted.
 			}
 
-			var target *float64
+			var match string
 			for result, val := range results {
 				seriesFP := fingerprintLabels(notifications.LabelMethod, string(method), notifications.LabelTemplateID, template.String(), notifications.LabelResult, result)
 				if !hasMatchingFingerprint(metric, seriesFP) {
 					continue
 				}
 
-				target = &val
+				match = result
 
 				if debug {
 					t.Logf("coderd_notifications_dispatch_attempts_total{result=%q} == %v: %v", result, val, metric.Counter.GetValue())
@@ -109,16 +109,14 @@ func TestMetrics(t *testing.T) {
 			}
 
 			// Could not find a matching series.
-			if target == nil {
+			if match == "" {
 				assert.Failf(t, "found unexpected series %q", series)
 				return false
 			}
 
-			if metric.Counter.GetValue() != *target {
-				return false
-			}
-
-			return true
+			// nolint:forcetypeassert // Already checked above.
+			target := results[match]
+			return metric.Counter.GetValue() == target
 		},
 		"coderd_notifications_retry_count": func(metric *dto.Metric, series string) bool {
 			assert.Truef(t, hasMatchingFingerprint(metric, methodTemplateFP), "found unexpected series %q", series)
