Use dbtime

BrunoQuaresma · BrunoQuaresma · commit 8d3acc93048b · 2024-08-19T17:14:08.000Z
diff --git a/coderd/autobuild/lifecycle_executor.go b/coderd/autobuild/lifecycle_executor.go
@@ -324,7 +324,7 @@ func (e *Executor) runOnce(t time.Time) Stats {
 					}
 				}
 				if shouldNotifyDormancy {
-					dormantTime := time.Now().Add(time.Duration(tmpl.TimeTilDormant))
+					dormantTime := dbtime.Now().Add(time.Duration(tmpl.TimeTilDormant))
 					_, err = e.notificationsEnqueuer.Enqueue(
 						e.ctx,
 						ws.OwnerID,
diff --git a/coderd/notifications/notifications_test.go b/coderd/notifications/notifications_test.go
@@ -720,6 +720,19 @@ func TestNotificationTemplatesCanRender(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "TemplateWorkspaceMarkedForDeletionInOneWeek",
+			id:   notifications.TemplateWorkspaceMarkedForDeletion,
+			payload: types.MessagePayload{
+				UserName: "bobby",
+				Labels: map[string]string{
+					"name":           "bobby-workspace",
+					"reason":         "template updated to new dormancy policy",
+					"dormancyHours":  "168", // 168 hours = 7 days = 1 week
+					"timeTilDormant": "1 week",
+				},
+			},
+		},
 		{
 			name: "TemplateUserAccountCreated",
 			id:   notifications.TemplateUserAccountCreated,
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -1056,7 +1056,7 @@ func (api *API) putWorkspaceDormant(rw http.ResponseWriter, r *http.Request) {
 		}
 
 		if initiatorErr == nil && tmplErr == nil {
-			dormantTime := time.Now().Add(time.Duration(tmpl.TimeTilDormant))
+			dormantTime := dbtime.Now().Add(time.Duration(tmpl.TimeTilDormant))
 			_, err = api.NotificationsEnqueuer.Enqueue(
 				ctx,
 				workspace.OwnerID,
diff --git a/enterprise/coderd/schedule/template.go b/enterprise/coderd/schedule/template.go
@@ -206,7 +206,7 @@ func (s *EnterpriseTemplateScheduleStore) Set(ctx context.Context, db database.S
 	}
 
 	for _, ws := range markedForDeletion {
-		dormantTime := time.Now().Add(opts.TimeTilDormantAutoDelete)
+		dormantTime := dbtime.Now().Add(opts.TimeTilDormantAutoDelete)
 		_, err = s.enqueuer.Enqueue(
 			ctx,
 			ws.OwnerID,

Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ func (e *Executor) runOnce(t time.Time) Stats {`
`324`	`324`	`}`
`325`	`325`	`}`
`326`	`326`	`if shouldNotifyDormancy {`
`327`		`- dormantTime := time.Now().Add(time.Duration(tmpl.TimeTilDormant))`
	`327`	`+ dormantTime := dbtime.Now().Add(time.Duration(tmpl.TimeTilDormant))`
`328`	`328`	`_, err = e.notificationsEnqueuer.Enqueue(`
`329`	`329`	`e.ctx,`
`330`	`330`	`ws.OwnerID,`
Original file line number	Diff line number	Diff line change
`@@ -1056,7 +1056,7 @@ func (api API) putWorkspaceDormant(rw http.ResponseWriter, r http.Request) {`
`1056`	`1056`	`}`
`1057`	`1057`
`1058`	`1058`	`if initiatorErr == nil && tmplErr == nil {`
`1059`		`- dormantTime := time.Now().Add(time.Duration(tmpl.TimeTilDormant))`
	`1059`	`+ dormantTime := dbtime.Now().Add(time.Duration(tmpl.TimeTilDormant))`
`1060`	`1060`	`_, err = api.NotificationsEnqueuer.Enqueue(`
`1061`	`1061`	`ctx,`
`1062`	`1062`	`workspace.OwnerID,`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ func (s *EnterpriseTemplateScheduleStore) Set(ctx context.Context, db database.S`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`for _, ws := range markedForDeletion {`
`209`		`- dormantTime := time.Now().Add(opts.TimeTilDormantAutoDelete)`
	`209`	`+ dormantTime := dbtime.Now().Add(opts.TimeTilDormantAutoDelete)`
`210`	`210`	`_, err = s.enqueuer.Enqueue(`
`211`	`211`	`ctx,`
`212`	`212`	`ws.OwnerID,`