chore: changes from feedback

DanielleMaywood · DanielleMaywood · commit 66e80cf5a503 · 2024-12-06T09:23:59.000Z
diff --git a/coderd/schedule/template_test.go b/coderd/schedule/template_test.go
@@ -36,6 +36,12 @@ func TestTemplateTTL(t *testing.T) {
 			toTTL:    36 * time.Hour,
 			expected: sql.NullInt64{Valid: true, Int64: int64(36 * time.Hour)},
 		},
+		{
+			name:     "ModifyTTLDurationSame",
+			fromTTL:  24 * time.Hour,
+			toTTL:    24 * time.Hour,
+			expected: sql.NullInt64{Valid: true, Int64: int64(24 * time.Hour)},
+		},
 		{
 			name:     "DisableTTL",
 			fromTTL:  24 * time.Hour,
diff --git a/enterprise/coderd/schedule/template.go b/enterprise/coderd/schedule/template.go
@@ -198,8 +198,7 @@ func (s *EnterpriseTemplateScheduleStore) Set(ctx context.Context, db database.S
 		// Update all workspace's TTL using this template if either of the following:
 		//   - The template's AllowUserAutostop has just been disabled
 		//   - The template's TTL has been modified and AllowUserAutostop is disabled
-		if (!opts.UserAutostopEnabled && opts.UserAutostopEnabled != tpl.AllowUserAutostop) ||
-			(!template.AllowUserAutostop && int64(opts.DefaultTTL) != tpl.DefaultTTL) {
+		if !opts.UserAutostopEnabled && (tpl.AllowUserAutostop || int64(opts.DefaultTTL) != tpl.DefaultTTL) {
 			var ttl sql.NullInt64
 			if opts.DefaultTTL != 0 {
 				ttl = sql.NullInt64{Valid: true, Int64: int64(opts.DefaultTTL)}
diff --git a/enterprise/coderd/schedule/template_test.go b/enterprise/coderd/schedule/template_test.go
@@ -733,6 +733,13 @@ func TestTemplateTTL(t *testing.T) {
 			toTTL:             36 * time.Hour,
 			expected:          sql.NullInt64{Valid: true, Int64: int64(36 * time.Hour)},
 		},
+		{
+			name:              "AllowUserAutostopFalse/ModifyTTLDurationSame",
+			allowUserAutostop: false,
+			fromTTL:           24 * time.Hour,
+			toTTL:             24 * time.Hour,
+			expected:          sql.NullInt64{Valid: true, Int64: int64(24 * time.Hour)},
+		},
 		{
 			name:              "AllowUserAutostopFalse/DisableTTL",
 			allowUserAutostop: false,
@@ -754,6 +761,13 @@ func TestTemplateTTL(t *testing.T) {
 			toTTL:             36 * time.Hour,
 			expected:          sql.NullInt64{Valid: true, Int64: int64(24 * time.Hour)},
 		},
+		{
+			name:              "AllowUserAutostopTrue/ModifyTTLDurationSame",
+			allowUserAutostop: true,
+			fromTTL:           24 * time.Hour,
+			toTTL:             24 * time.Hour,
+			expected:          sql.NullInt64{Valid: true, Int64: int64(24 * time.Hour)},
+		},
 		{
 			name:              "AllowUserAutostopTrue/DisableTTL",
 			allowUserAutostop: true,
@@ -929,15 +943,15 @@ func TestTemplateTTL(t *testing.T) {
 
 		// Disable AllowUserAutostop
 		template, err = templateScheduleStore.Set(ctx, db, template, agplschedule.TemplateScheduleOptions{
-			DefaultTTL:          24 * time.Hour,
+			DefaultTTL:          23 * time.Hour,
 			UserAutostopEnabled: false,
 		})
 		require.NoError(t, err)
 
 		// Ensure the workspace ends with the correct TTLs
 		ws, err := db.GetWorkspaceByID(ctx, workspace.ID)
 		require.NoError(t, err)
-		require.Equal(t, sql.NullInt64{Valid: true, Int64: int64(24 * time.Hour)}, ws.Ttl)
+		require.Equal(t, sql.NullInt64{Valid: true, Int64: int64(23 * time.Hour)}, ws.Ttl)
 	})
 }
 
