Add comment

coder · Emyrk · Nov 15, 2023 · Nov 14, 2023 · Nov 14, 2023 · Nov 15, 2023
commit dc84fb89d2480664259a559bfe09c87c39c0018a
diff --git a/coderd/activitybump_internal_test.go b/coderd/activitybump_internal_test.go
@@ -1,7 +1,6 @@
 package coderd
 
 import (
-	"context"
 	"database/sql"
 	"testing"
 	"time"

diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -834,7 +834,7 @@ func (q *FakeQuerier) ActivityBumpWorkspace(ctx context.Context, arg database.Ac
 		if now.Add(time.Hour).After(arg.NextAutostart) && arg.NextAutostart.After(now) {
 			// Extend to TTL
 			add := arg.NextAutostart.Sub(now)
-			if workspace.Ttl.Valid {
+			if workspace.Ttl.Valid && template.AllowUserAutostop {
 				add += time.Duration(workspace.Ttl.Int64)
 			} else {
 				add += time.Duration(template.DefaultTTL)

diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/activitybump.sql b/coderd/database/queries/activitybump.sql
@@ -1,3 +1,9 @@
+-- Bumps the workspace deadline by 1 hour. If the workspace bump will
+-- cross an autostart threshold, then the bump is autostart + TTL. This
+-- is the deadline behavior if the workspace was to autostart from a stopped
+-- state.
+-- Max deadline is respected, and will never be bumped.
+-- The deadline will never decrease.
 -- name: ActivityBumpWorkspace :exec
 WITH latest AS (
 	SELECT