fix: return correct metadata for failed templates (#1417)

Author: dobrac

packages/api/internal/handlers/templates_list.go

@@ -4,10 +4,8 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"go.uber.org/zap"
 
 	"github.com/e2b-dev/infra/packages/api/internal/api"
-	"github.com/e2b-dev/infra/packages/shared/pkg/logger"
 	"github.com/e2b-dev/infra/packages/shared/pkg/telemetry"
 )
 
@@ -63,8 +61,6 @@ func (a *APIStore) GetTemplates(c *gin.Context, params api.GetTemplatesParams) {
 		envdVersion := ""
 		if item.BuildEnvdVersion != nil {
 			envdVersion = *item.BuildEnvdVersion
-		} else {
-			zap.L().Error("failed to determine envd version", logger.WithTemplateID(item.Env.ID))
 		}
 
 		diskMB := int64(0)
@@ -75,9 +71,9 @@ func (a *APIStore) GetTemplates(c *gin.Context, params api.GetTemplatesParams) {
 		templates = append(templates, &api.Template{
 			TemplateID:    item.Env.ID,
 			BuildID:       item.BuildID.String(),
-			CpuCount:      int32(item.BuildVcpu),
-			MemoryMB:      int32(item.BuildRamMb),
-			DiskSizeMB:    int32(diskMB),
+			CpuCount:      api.CPUCount(item.BuildVcpu),
+			MemoryMB:      api.MemoryMB(item.BuildRamMb),
+			DiskSizeMB:    api.DiskSizeMB(diskMB),
 			Public:        item.Env.Public,
 			Aliases:       item.Aliases,
 			CreatedAt:     item.Env.CreatedAt,

packages/db/queries/get_team_templates.sql

@@ -1,6 +1,12 @@
 -- 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.status as build_status,
+       COALESCE(eb.id, '00000000-0000-0000-0000-000000000000'::uuid) as build_id,
+       COALESCE(eb.vcpu, 0) as build_vcpu,
+       COALESCE(eb.ram_mb, 0) as build_ram_mb,
+       eb.total_disk_size_mb as build_total_disk_size_mb,
+       eb.envd_version as build_envd_version,
+       COALESCE(eb.firecracker_version, 'N/A') as build_firecracker_version,
+       COALESCE(eba.status, 'waiting') 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
@@ -16,10 +22,16 @@ LEFT JOIN LATERAL (
     WHERE b.env_id = e.id
     ORDER BY b.finished_at DESC
     LIMIT 1
+) eba ON TRUE
+LEFT JOIN LATERAL (
+    SELECT b.*
+    FROM public.env_builds AS b
+    WHERE b.env_id = e.id AND b.status = 'uploaded'
+    ORDER BY b.finished_at DESC
+    LIMIT 1
 ) eb ON TRUE
 WHERE
   e.team_id = $1
-  AND eb.id IS NOT NULL
   AND NOT EXISTS (
     SELECT 1
     FROM public.snapshots AS s