make lint/fmt

dannykopping · dannykopping · commit aa9f5a055b22 · 2024-08-05T13:55:35.000+02:00
Signed-off-by: Danny Kopping &lt;danny@coder.com&gt;
diff --git a/coderd/notifications.go b/coderd/notifications.go
@@ -219,7 +219,7 @@ func (api *API) putUserNotificationPreferences(rw http.ResponseWriter, r *http.R
 
 	updated, err := api.Database.UpdateUserNotificationPreferences(ctx, input)
 	if err != nil {
-		logger.Error(ctx, "failed to update", slog.Error(err))
+		logger.Error(ctx, "failed to update preferences", slog.Error(err))
 
 		httpapi.Write(r.Context(), rw, http.StatusInternalServerError, codersdk.Response{
 			Message: "Failed to update user notifications preferences.",
@@ -228,11 +228,11 @@ func (api *API) putUserNotificationPreferences(rw http.ResponseWriter, r *http.R
 		return
 	}
 
-	logger.Info(ctx, "updated", slog.F("count", updated))
+	logger.Info(ctx, "updated preferences", slog.F("count", updated))
 
 	userPrefs, err := api.Database.GetUserNotificationPreferences(ctx, user.ID)
 	if err != nil {
-		logger.Error(ctx, "failed to retrieve", slog.Error(err))
+		logger.Error(ctx, "failed to retrieve preferences", slog.Error(err))
 
 		httpapi.Write(r.Context(), rw, http.StatusInternalServerError, codersdk.Response{
 			Message: "Failed to retrieve user notifications preferences.",
diff --git a/coderd/notifications/notifications_test.go b/coderd/notifications/notifications_test.go
@@ -723,17 +723,17 @@ func TestDisabledBeforeEnqueue(t *testing.T) {
 	user := createSampleUser(t, db)
 
 	// WHEN: the user has a preference set to not receive the "workspace deleted" notification
-	templateId := notifications.TemplateWorkspaceDeleted
+	templateID := notifications.TemplateWorkspaceDeleted
 	n, err := db.UpdateUserNotificationPreferences(ctx, database.UpdateUserNotificationPreferencesParams{
 		UserID:                  user.ID,
-		NotificationTemplateIds: []uuid.UUID{templateId},
+		NotificationTemplateIds: []uuid.UUID{templateID},
 		Disableds:               []bool{true},
 	})
 	require.NoError(t, err, "failed to set preferences")
 	require.EqualValues(t, 1, n, "unexpected number of affected rows")
 
 	// THEN: enqueuing the "workspace deleted" notification should fail with an error
-	_, err = enq.Enqueue(ctx, user.ID, templateId, map[string]string{}, "test")
+	_, err = enq.Enqueue(ctx, user.ID, templateID, map[string]string{}, "test")
 	require.ErrorIs(t, err, notifications.ErrCannotEnqueueDisabledNotification, "enqueueing did not fail with expected error")
 }
 
@@ -763,14 +763,14 @@ func TestDisabledAfterEnqueue(t *testing.T) {
 	user := createSampleUser(t, db)
 
 	// GIVEN: a notification is enqueued which has not (yet) been disabled
-	templateId := notifications.TemplateWorkspaceDeleted
-	msgId, err := enq.Enqueue(ctx, user.ID, templateId, map[string]string{}, "test")
+	templateID := notifications.TemplateWorkspaceDeleted
+	msgID, err := enq.Enqueue(ctx, user.ID, templateID, map[string]string{}, "test")
 	require.NoError(t, err)
 
 	// Disable the notification template.
 	n, err := db.UpdateUserNotificationPreferences(ctx, database.UpdateUserNotificationPreferencesParams{
 		UserID:                  user.ID,
-		NotificationTemplateIds: []uuid.UUID{templateId},
+		NotificationTemplateIds: []uuid.UUID{templateID},
 		Disableds:               []bool{true},
 	})
 	require.NoError(t, err, "failed to set preferences")
@@ -787,7 +787,7 @@ func TestDisabledAfterEnqueue(t *testing.T) {
 		})
 		assert.NoError(ct, err)
 		if assert.Equal(ct, len(m), 1) {
-			assert.Equal(ct, m[0].ID.String(), msgId.String())
+			assert.Equal(ct, m[0].ID.String(), msgID.String())
 			assert.Contains(ct, m[0].StatusReason.String, "disabled by user")
 		}
 	}, testutil.WaitLong, testutil.IntervalFast, "did not find the expected inhibited message")
diff --git a/coderd/notifications/notifier.go b/coderd/notifications/notifier.go
@@ -143,7 +143,6 @@ func (n *notifier) process(ctx context.Context, success chan<- dispatchResult, f
 
 	var eg errgroup.Group
 	for _, msg := range msgs {
-
 		// If a notification template has been disabled by the user after a notification was enqueued, mark it as inhibited
 		if msg.Disabled {
 			failure <- n.newInhibitedDispatch(msg)
