change view to workspaces

coder · f0ssel · May 15, 2024 · May 15, 2024 · May 15, 2024 · May 16, 2024
commit 02c9991ed3b4e6708a677cdfde5d20b5ed09d388
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000209_workspace_deadline_view.up.sql b/coderd/database/migrations/000209_workspace_deadline_view.up.sql
@@ -1,16 +1,22 @@
-CREATE VIEW workspace_build_deadlines AS
+CREATE VIEW workspace_deadlines AS
 	SELECT 
-		workspace_builds.id, 
-		COALESCE(
-			LEAST(
-				workspaces.last_used_at + (workspaces.ttl / 1000 / 1000 / 1000 || ' seconds')::interval,
-				workspace_builds.max_deadline
-			),
-			'0001-01-01 00:00:00+00'::timestamp with time zone
+		workspaces.id, 
+		LEAST(
+			workspaces.last_used_at + (workspaces.ttl / 1000 / 1000 / 1000 || ' seconds')::interval,
+			workspace_builds.max_deadline
 		) AS deadline
 FROM 
-	workspace_builds 
+	workspaces
 LEFT JOIN 
-	workspaces 
+	workspace_builds
 ON 
-	workspace_builds.workspace_id = workspaces.id;
+	workspace_builds.workspace_id = workspaces.id
+WHERE
+    workspace_builds.build_number = (
+		SELECT
+			MAX(build_number)
+		FROM
+			workspace_builds
+		WHERE
+			workspace_builds.workspace_id = workspaces.id
+	);
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/sqlc.yaml b/coderd/database/sqlc.yaml
@@ -51,7 +51,7 @@ sql:
           - column: "template_usage_stats.app_usage_mins"
             go_type:
               type: "StringMapOfInt"
-          - column: "workspace_build_deadlines.deadline"
+          - column: "workspace_deadlines.deadline"
             go_type:
               type: "time.Time"
         rename: