Apply Danny review suggestions

BrunoQuaresma · BrunoQuaresma · commit 64cf76bbb790 · 2024-07-12T13:31:14.000Z
diff --git a/coderd/autobuild/lifecycle_executor.go b/coderd/autobuild/lifecycle_executor.go
@@ -220,18 +220,6 @@ func (e *Executor) runOnce(t time.Time) Stats {
 							},
 						})
 
-						dormancy.NotifyWorkspaceDormant(
-							e.ctx,
-							e.log,
-							e.notificationsEnqueuer,
-							dormancy.WorkspaceDormantNotification{
-								Workspace: ws,
-								Initiator: "system",
-								Reason:    "breached the template's threshold for inactivity",
-								CreatedBy: "lifecycleexecutor",
-							},
-						)
-
 						auditLog = &auditParams{
 							Old: wsOld,
 							New: ws,
@@ -245,6 +233,18 @@ func (e *Executor) runOnce(t time.Time) Stats {
 							slog.F("time_til_dormant", templateSchedule.TimeTilDormant),
 							slog.F("since_last_used_at", time.Since(ws.LastUsedAt)),
 						)
+
+						dormancy.NotifyWorkspaceDormant(
+							e.ctx,
+							e.log,
+							e.notificationsEnqueuer,
+							dormancy.WorkspaceDormantNotification{
+								Workspace: ws,
+								Initiator: "system",
+								Reason:    "breached the template's threshold for inactivity",
+								CreatedBy: "lifecycleexecutor",
+							},
+						)
 					}
 
 					if reason == database.BuildReasonAutodelete {
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -958,19 +958,19 @@ func (api *API) putWorkspaceDormant(rw http.ResponseWriter, r *http.Request) {
 		initiator, err := api.Database.GetUserByID(ctx, apiKey.UserID)
 		if err != nil {
 			api.Logger.Warn(ctx, "failed to get the initiator by id", slog.Error(err))
-			return
+		} else {
+			dormancy.NotifyWorkspaceDormant(
+				ctx,
+				api.Logger,
+				api.NotificationsEnqueuer,
+				dormancy.WorkspaceDormantNotification{
+					Workspace: workspace,
+					Initiator: initiator.Username,
+					Reason:    "requested by user",
+					CreatedBy: "api",
+				},
+			)
 		}
-		dormancy.NotifyWorkspaceDormant(
-			ctx,
-			api.Logger,
-			api.NotificationsEnqueuer,
-			dormancy.WorkspaceDormantNotification{
-				Workspace: workspace,
-				Initiator: initiator.Username,
-				Reason:    "requested by user",
-				CreatedBy: "api",
-			},
-		)
 	}
 
 	data, err := api.workspaceData(ctx, []database.Workspace{workspace})
diff --git a/enterprise/coderd/schedule/template.go b/enterprise/coderd/schedule/template.go
@@ -132,7 +132,10 @@ func (s *EnterpriseTemplateScheduleStore) Set(ctx context.Context, db database.S
 		return database.Template{}, xerrors.Errorf("verify autostart requirement: %w", err)
 	}
 
-	var template database.Template
+	var (
+		template          database.Template
+		dormantWorkspaces []database.Workspace
+	)
 	err = db.InTx(func(tx database.Store) error {
 		ctx, span := tracing.StartSpanWithName(ctx, "(*schedule.EnterpriseTemplateScheduleStore).Set()-InTx()")
 		defer span.End()
@@ -166,27 +169,14 @@ func (s *EnterpriseTemplateScheduleStore) Set(ctx context.Context, db database.S
 		// to ensure workspaces are being cleaned up correctly. Similarly if we are
 		// disabling it (by passing 0), then we want to delete nullify the deleting_at
 		// fields of all the template workspaces.
-		dormantWorspaces, err := tx.UpdateWorkspacesDormantDeletingAtByTemplateID(ctx, database.UpdateWorkspacesDormantDeletingAtByTemplateIDParams{
+		dormantWorkspaces, err = tx.UpdateWorkspacesDormantDeletingAtByTemplateID(ctx, database.UpdateWorkspacesDormantDeletingAtByTemplateIDParams{
 			TemplateID:                 tpl.ID,
 			TimeTilDormantAutodeleteMs: opts.TimeTilDormantAutoDelete.Milliseconds(),
 			DormantAt:                  dormantAt,
 		})
 		if err != nil {
 			return xerrors.Errorf("update deleting_at of all workspaces for new time_til_dormant_autodelete %q: %w", opts.TimeTilDormantAutoDelete, err)
 		}
-		for _, workspace := range dormantWorspaces {
-			dormancy.NotifyWorkspaceDormant(
-				ctx,
-				logger,
-				ntf,
-				dormancy.WorkspaceDormantNotification{
-					Workspace: workspace,
-					Initiator: "system",
-					Reason:    "template schedule update",
-					CreatedBy: "scheduletemplate",
-				},
-			)
-		}
 
 		if opts.UpdateWorkspaceLastUsedAt != nil {
 			err = opts.UpdateWorkspaceLastUsedAt(ctx, tx, tpl.ID, s.now())
@@ -213,6 +203,20 @@ func (s *EnterpriseTemplateScheduleStore) Set(ctx context.Context, db database.S
 		return database.Template{}, err
 	}
 
+	for _, workspace := range dormantWorkspaces {
+		dormancy.NotifyWorkspaceDormant(
+			ctx,
+			logger,
+			ntf,
+			dormancy.WorkspaceDormantNotification{
+				Workspace: workspace,
+				Initiator: "system",
+				Reason:    "template schedule update",
+				CreatedBy: "scheduletemplate",
+			},
+		)
+	}
+
 	return template, nil
 }
 
diff --git a/enterprise/coderd/schedule/template_test.go b/enterprise/coderd/schedule/template_test.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"cdr.dev/slog"
+	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -298,7 +299,7 @@ func TestTemplateUpdateBuildDeadlines(t *testing.T) {
 				FailureTTL:               0,
 				TimeTilDormant:           0,
 				TimeTilDormantAutoDelete: 0,
-			}, nil, slog.Logger{})
+			}, nil, slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}).Leveled(slog.LevelDebug))
 			require.NoError(t, err)
 
 			// Check that the workspace build has the expected deadlines.
@@ -578,7 +579,7 @@ func TestTemplateUpdateBuildDeadlinesSkip(t *testing.T) {
 		FailureTTL:               0,
 		TimeTilDormant:           0,
 		TimeTilDormantAutoDelete: 0,
-	}, nil, slog.Logger{})
+	}, nil, slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}).Leveled(slog.LevelDebug))
 	require.NoError(t, err)
 
 	// Check each build.
