Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
196 changes: 98 additions & 98 deletions packages/api/internal/api/spec.gen.go

Large diffs are not rendered by default.

11 changes: 7 additions & 4 deletions packages/api/internal/api/types.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions packages/api/internal/handlers/templates_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ func (a *APIStore) GetTemplates(c *gin.Context, params api.GetTemplatesParams) {
LastSpawnedAt: item.Env.LastSpawnedAt,
SpawnCount: item.Env.SpawnCount,
BuildCount: item.Env.BuildCount,
BuildStatus: api.TemplateBuildStatus(item.BuildStatus),

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug: Status Mapping Error in API Response

Direct casting of database status to API status without proper mapping. The database uses status values like 'uploaded', 'failed', 'success', 'snapshotting' which don't match the API enum values ('ready', 'error', 'building', 'waiting'). This will cause invalid enum values to be returned in the API response. The code should use the existing getCorrespondingTemplateBuildStatus function from template_build_status.go to properly map database status values to API status values.

Fix in Cursor Fix in Web

Comment thread
jakubno marked this conversation as resolved.
CreatedBy: createdBy,
EnvdVersion: envdVersion,
})
Expand Down
4 changes: 2 additions & 2 deletions packages/db/queries/get_team_templates.sql
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-- name: GetTeamTemplates :many
SELECT sqlc.embed(e),
eb.id as build_id, eb.vcpu as build_vcpu, eb.ram_mb as build_ram_mb, eb.total_disk_size_mb as build_total_disk_size_mb, eb.envd_version as build_envd_version, eb.firecracker_version as build_firecracker_version,
eb.id as build_id, eb.vcpu as build_vcpu, eb.ram_mb as build_ram_mb, eb.total_disk_size_mb as build_total_disk_size_mb, eb.envd_version as build_envd_version, eb.firecracker_version as build_firecracker_version, eb.status as build_status,
u.id as creator_id, u.email as creator_email,
COALESCE(ea.aliases, ARRAY[]::text[])::text[] AS aliases
FROM public.envs AS e
Expand All @@ -13,7 +13,7 @@ LEFT JOIN LATERAL (
LEFT JOIN LATERAL (
SELECT b.*
FROM public.env_builds AS b
WHERE b.env_id = e.id AND b.status = 'uploaded'
WHERE b.env_id = e.id
Comment thread
jakubno marked this conversation as resolved.
ORDER BY b.finished_at DESC
LIMIT 1
) eb ON TRUE
Expand Down
6 changes: 4 additions & 2 deletions packages/db/queries/get_team_templates.sql.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 13 additions & 7 deletions spec/openapi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,7 @@ components:
- buildCount
- envdVersion
- aliases
- buildStatus
properties:
templateID:
type: string
Expand Down Expand Up @@ -588,6 +589,8 @@ components:
description: Number of times the template was built
envdVersion:
$ref: "#/components/schemas/EnvdVersion"
buildStatus:
$ref: "#/components/schemas/TemplateBuildStatus"

TemplateBuildRequest:
required:
Expand Down Expand Up @@ -800,6 +803,15 @@ components:
items:
$ref: "#/components/schemas/BuildLogEntry"

TemplateBuildStatus:
type: string
description: Status of the template build
enum:
- building
- waiting
- ready
- error

TemplateBuild:
required:
- templateID
Expand Down Expand Up @@ -827,13 +839,7 @@ components:
type: string
description: Identifier of the build
status:
type: string
description: Status of the template
enum:
- building
- waiting
- ready
- error
$ref: "#/components/schemas/TemplateBuildStatus"
reason:
$ref: "#/components/schemas/BuildStatusReason"

Expand Down
11 changes: 7 additions & 4 deletions tests/integration/internal/api/models.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading