update query

coder · johnstcn · Sep 14, 2023 · Sep 7, 2023 · Sep 8, 2023 · Sep 12, 2023
commit 1ee5403002c0a109be24142d26a09da262d3c6ed
diff --git a/coderd/activitybump.go b/coderd/activitybump.go
@@ -9,7 +9,6 @@ import (
 
 	"cdr.dev/slog"
 	"github.com/coder/coder/v2/coderd/database"
-	"github.com/coder/coder/v2/coderd/database/dbtime"
 )
 
 // activityBumpWorkspace automatically bumps the workspace's auto-off timer
@@ -21,10 +20,7 @@ func activityBumpWorkspace(ctx context.Context, log slog.Logger, db database.Sto
 	defer cancel()
 
 	err := db.InTx(func(s database.Store) error {
-		if err := s.ActivityBumpWorkspace(ctx, database.ActivityBumpWorkspaceParams{
-			WorkspaceID: workspaceID,
-			UpdatedAt:   dbtime.Now(),
-		}); err != nil {
+		if err := s.ActivityBumpWorkspace(ctx, workspaceID); err != nil {
 			return xerrors.Errorf("activity bump workspace: %w", err)
 		}
 		// build, err := s.GetLatestWorkspaceBuildByWorkspaceID(ctx, workspaceID)

diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -657,8 +657,11 @@ func (q *querier) AcquireProvisionerJob(ctx context.Context, arg database.Acquir
 	return q.db.AcquireProvisionerJob(ctx, arg)
 }
 
-func (q *querier) ActivityBumpWorkspace(ctx context.Context, arg database.ActivityBumpWorkspaceParams) error {
-	panic("not implemented")
+func (q *querier) ActivityBumpWorkspace(ctx context.Context, arg uuid.UUID) error {
+	fetch := func(ctx context.Context, arg uuid.UUID) (database.Workspace, error) {
+		return q.db.GetWorkspaceByID(ctx, arg)
+	}
+	return update(q.log, q.auth, fetch, q.db.ActivityBumpWorkspace)(ctx, arg)
 }
 
 func (q *querier) CleanTailnetCoordinators(ctx context.Context) error {

diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go
@@ -685,6 +685,13 @@ func (q *FakeQuerier) GetActiveDBCryptKeys(_ context.Context) ([]database.DBCryp
 	return ks, nil
 }
 
+func minTime(t, u time.Time) time.Time {
+	if t.Before(u) {
+		return t
+	}
+	return u
+}
+
 func (*FakeQuerier) AcquireLock(_ context.Context, _ int64) error {
 	return xerrors.New("AcquireLock must only be called within a transaction")
 }
@@ -744,13 +751,35 @@ func (q *FakeQuerier) AcquireProvisionerJob(_ context.Context, arg database.Acqu
 	return database.ProvisionerJob{}, sql.ErrNoRows
 }
 
-func (q *FakeQuerier) ActivityBumpWorkspace(ctx context.Context, arg database.ActivityBumpWorkspaceParams) error {
-	err := validateDatabaseType(arg)
+func (q *FakeQuerier) ActivityBumpWorkspace(ctx context.Context, workspaceID uuid.UUID) error {
+	err := validateDatabaseType(workspaceID)
+	if err != nil {
+		return err
+	}
+
+	q.mutex.Lock()
+	defer q.mutex.Unlock()
+
+	workspace, err := q.getWorkspaceByIDNoLock(ctx, workspaceID)
 	if err != nil {
 		return err
 	}
+	latestBuild, err := q.getLatestWorkspaceBuildByWorkspaceIDNoLock(ctx, workspaceID)
+	if err != nil {
+		return err
+	}
+
+	for i := range q.workspaceBuilds {
+		if q.workspaceBuilds[i].BuildNumber != latestBuild.BuildNumber {
+			continue
+		}
+		newDeadline := q.workspaceBuilds[i].Deadline.Add(time.Duration(workspace.Ttl.Int64))
+		q.workspaceBuilds[i].UpdatedAt = latestBuild.UpdatedAt
+		q.workspaceBuilds[i].Deadline = minTime(newDeadline, q.workspaceBuilds[i].MaxDeadline)
+		return nil
+	}
 
-	panic("not implemented")
+	return sql.ErrNoRows
 }
 
 func (*FakeQuerier) CleanTailnetCoordinators(_ context.Context) error {

diff --git a/coderd/database/dbmetrics/dbmetrics.go b/coderd/database/dbmetrics/dbmetrics.go
diff --git a/coderd/database/dbmock/dbmock.go b/coderd/database/dbmock/dbmock.go
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,20 +1,33 @@
 -- name: ActivityBumpWorkspace :exec
+WITH latest AS (
+	SELECT
+		workspace_builds.id,
+		workspace_builds.deadline,
+		workspace_builds.max_deadline,
+		workspaces.ttl,
+		(workspace_builds.deadline + (workspaces.ttl/1000 || ' microsecond')::interval ) AS new_deadline
+	FROM workspace_builds
+	JOIN provisioner_jobs
+		ON provisioner_jobs.id = workspace_builds.job_id
+	JOIN workspaces
+		ON workspaces.id = workspace_builds.workspace_id
+	WHERE workspace_builds.workspace_id = $1::uuid
+		AND workspace_builds.transition = 'start'
+		AND workspace_builds.deadline > NOW()
+		AND provisioner_jobs.completed_at IS NOT NULL
+	ORDER BY workspace_builds.build_number ASC
+	LIMIT 1
+)
 UPDATE
-	workspace_builds
+	workspace_builds wb
 SET
-	updated_at = $2,
-	deadline = LEAST(workspace_builds.deadline + workspace.ttl, workspace_builds.max_deadline)
+	updated_at = NOW(),
+	deadline = CASE
+		WHEN l.max_deadline = '0001-01-01 00:00:00'
+		THEN l.new_deadline
+		ELSE LEAST(l.new_deadline, l.max_deadline)
+	END
+FROM latest l
 WHERE
-	workspace_builds.id IN (
-		SELECT wb.id
-		FROM workspace_builds wb
-		JOIN provisioner_jobs pj
-			ON pj.id = wb.job_id
-		WHERE wb.workspace_id = $1
-		AND wb.transition == 'start'
-		AND wb.deadline > $2
-		AND wb.deadline != wb.max_deadline
-		AND pj.completed_at IS NOT NULL
-	ORDER BY wb.build_number ASC
-	LIMIT 1
-);
+	wb.id = l.id
+;