fixup! add back max_ttl and put restart_requirement behind feature flag

deansheather · deansheather · commit c7ef9cb351dc · 2023-07-12T16:01:03.000Z
diff --git a/coderd/schedule/autostop.go b/coderd/schedule/autostop.go
@@ -225,7 +225,7 @@ func nextDayMidnight(t time.Time) time.Time {
 	yy, mm, dd := t.Date()
 	// time.Date will correctly normalize the date if it's past the end of the
 	// month. E.g. October 32nd will be November 1st.
-	dd += 1
+	dd++
 	return time.Date(yy, mm, dd, 0, 0, 0, 0, t.Location())
 }
 
diff --git a/coderd/schedule/autostop_test.go b/coderd/schedule/autostop_test.go
@@ -345,12 +345,15 @@ func TestCalculateAutoStop(t *testing.T) {
 				},
 			}
 
+			org := dbgen.Organization(t, db, database.Organization{})
 			user := dbgen.User(t, db, database.User{
 				QuietHoursSchedule: c.userQuietHoursSchedule,
 			})
 			template := dbgen.Template(t, db, database.Template{
-				Name:        "template",
-				Provisioner: database.ProvisionerTypeEcho,
+				Name:           "template",
+				Provisioner:    database.ProvisionerTypeEcho,
+				OrganizationID: org.ID,
+				CreatedBy:      user.ID,
 			})
 			template, err := db.UpdateTemplateScheduleByID(ctx, database.UpdateTemplateScheduleByIDParams{
 				ID:                           template.ID,
@@ -368,9 +371,10 @@ func TestCalculateAutoStop(t *testing.T) {
 				}
 			}
 			workspace := dbgen.Workspace(t, db, database.Workspace{
-				TemplateID: template.ID,
-				Ttl:        workspaceTTL,
-				OwnerID:    user.ID,
+				TemplateID:     template.ID,
+				OrganizationID: org.ID,
+				OwnerID:        user.ID,
+				Ttl:            workspaceTTL,
 			})
 
 			autostop, err := schedule.CalculateAutostop(ctx, schedule.CalculateAutostopParams{
diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -472,13 +472,9 @@ func (api *API) updateEntitlements(ctx context.Context) error {
 			templateStore := schedule.NewEnterpriseTemplateScheduleStore()
 			templateStoreInterface := agplschedule.TemplateScheduleStore(templateStore)
 			api.AGPL.TemplateScheduleStore.Store(&templateStoreInterface)
-
 		} else {
 			templateStore := agplschedule.NewAGPLTemplateScheduleStore()
 			api.AGPL.TemplateScheduleStore.Store(&templateStore)
-
-			quietHoursStore := agplschedule.NewAGPLUserQuietHoursScheduleStore()
-			api.AGPL.UserQuietHoursScheduleStore.Store(&quietHoursStore)
 		}
 	}
 
diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
@@ -421,6 +421,10 @@ export const MockTemplate: TypesGen.Template = {
   description: "This is a test description.",
   default_ttl_ms: 24 * 60 * 60 * 1000,
   max_ttl_ms: 2 * 24 * 60 * 60 * 1000,
+  restart_requirement: {
+    days_of_week: [],
+    weeks: 1,
+  },
   created_by_id: "test-creator-id",
   created_by_name: "test_creator",
   icon: "/icon/code.svg",

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ func nextDayMidnight(t time.Time) time.Time {`
`225`	`225`	`yy, mm, dd := t.Date()`
`226`	`226`	`// time.Date will correctly normalize the date if it's past the end of the`
`227`	`227`	`// month. E.g. October 32nd will be November 1st.`
`228`		`- dd += 1`
	`228`	`+ dd++`
`229`	`229`	`return time.Date(yy, mm, dd, 0, 0, 0, 0, t.Location())`
`230`	`230`	`}`
`231`	`231`
Original file line number	Diff line number	Diff line change
`@@ -472,13 +472,9 @@ func (api *API) updateEntitlements(ctx context.Context) error {`
`472`	`472`	`templateStore := schedule.NewEnterpriseTemplateScheduleStore()`
`473`	`473`	`templateStoreInterface := agplschedule.TemplateScheduleStore(templateStore)`
`474`	`474`	`api.AGPL.TemplateScheduleStore.Store(&templateStoreInterface)`
`475`		`-`
`476`	`475`	`} else {`
`477`	`476`	`templateStore := agplschedule.NewAGPLTemplateScheduleStore()`
`478`	`477`	`api.AGPL.TemplateScheduleStore.Store(&templateStore)`
`479`		`-`
`480`		`- quietHoursStore := agplschedule.NewAGPLUserQuietHoursScheduleStore()`
`481`		`- api.AGPL.UserQuietHoursScheduleStore.Store(&quietHoursStore)`
`482`	`478`	`}`
`483`	`479`	`}`
`484`	`480`