Use template id

Author: jakubno

packages/api/internal/cache/templates/cache.go

@@ -216,7 +216,7 @@ func (c *TemplatesBuildCache) Get(ctx context.Context, buildID uuid.UUID, templa
 	if item == nil {
 		zap.L().Debug("Template build info not found in cache, fetching from DB", logger.WithBuildID(buildID.String()))
 
-		template, err := c.db.GetTemplateBuildWithEnv(ctx, queries.GetTemplateBuildWithEnvParams{
+		template, err := c.db.GetTemplateBuildWithTemplate(ctx, queries.GetTemplateBuildWithTemplateParams{
 			TemplateID: templateID,
 			BuildID:    buildID,
 		})

packages/api/internal/handlers/template_start_build.go

@@ -87,7 +87,7 @@ func (a *APIStore) PostTemplatesTemplateIDBuildsBuildID(c *gin.Context, template
 	telemetry.ReportEvent(ctx, "started environment build")
 
 	// Check if the user has access to the template, load the template with build info
-	templateBuildDB, err := a.sqlcDB.GetTemplateBuildWithEnv(ctx, queries.GetTemplateBuildWithEnvParams{
+	templateBuildDB, err := a.sqlcDB.GetTemplateBuildWithTemplate(ctx, queries.GetTemplateBuildWithTemplateParams{
 		TemplateID: templateID,
 		BuildID:    buildUUID,
 	})

packages/api/internal/handlers/template_start_build_v2.go

@@ -47,7 +47,7 @@ func (a *APIStore) PostV2TemplatesTemplateIDBuildsBuildID(c *gin.Context, templa
 	telemetry.ReportEvent(ctx, "started environment build")
 
 	// Check if the user has access to the template, load the template with build info
-	templateBuildDB, err := a.sqlcDB.GetTemplateBuildWithEnv(ctx, queries.GetTemplateBuildWithEnvParams{
+	templateBuildDB, err := a.sqlcDB.GetTemplateBuildWithTemplate(ctx, queries.GetTemplateBuildWithTemplateParams{
 		TemplateID: templateID,
 		BuildID:    buildUUID,
 	})

packages/api/internal/orchestrator/pause_instance.go

@@ -80,7 +80,7 @@ func (o *Orchestrator) PauseInstance(
 		FinishedAt: &now,
 		Reason:     types.BuildReason{},
 		BuildID:    envBuild.ID,
-		EnvID:      envBuild.EnvID,
+		TemplateID: envBuild.EnvID,
 	})
 	if err != nil {
 		telemetry.ReportCriticalError(ctx, "error pausing sandbox", err)

packages/api/internal/template-manager/template_status.go

@@ -260,7 +260,7 @@ func (tm *TemplateManager) SetStatus(ctx context.Context, templateID string, bui
 		FinishedAt: &now,
 		Reason:     buildReason,
 		BuildID:    buildID,
-		EnvID:      templateID,
+		TemplateID: templateID,
 	})
 
 	tm.buildCache.SetStatus(buildID, status, buildReason)

packages/db/queries/get_template_build.sql

@@ -1,4 +1,4 @@
--- name: GetTemplateBuildWithEnv :one
+-- name: GetTemplateBuildWithTemplate :one
 SELECT sqlc.embed(e), sqlc.embed(eb)
 FROM "public"."envs" e
 JOIN "public"."env_builds" eb ON eb.env_id = e.id

packages/db/queries/get_template_build.sql.go

@@ -3,4 +3,4 @@ UPDATE "public"."env_builds"
 SET status = @status,
     finished_at = @finished_at,
     reason = sqlc.narg(reason)
-WHERE id = @build_id AND env_id = @env_id;
+WHERE id = @build_id AND env_id = @template_id;