chore: changes

DanielleMaywood · DanielleMaywood · commit 90380f7c346c · 2025-01-02T11:37:18.000Z
diff --git a/coderd/workspacebuilds.go b/coderd/workspacebuilds.go
@@ -385,7 +385,17 @@ func (api *API) postWorkspaceBuilds(rw http.ResponseWriter, r *http.Request) {
 			},
 			audit.WorkspaceBuildBaggageFromRequest(r),
 		)
-		return err
+		if err != nil {
+			return err
+		}
+
+		// If this workspace build has a different template version ID to the previous build
+		// we can assume it has just been updated.
+		if createBuild.TemplateVersionID != uuid.Nil && createBuild.TemplateVersionID != previousWorkspaceBuild.TemplateVersionID {
+			api.notifyWorkspaceUpdated(ctx, tx, apiKey.UserID, workspace, createBuild.RichParameterValues)
+		}
+
+		return nil
 	}, nil)
 	var buildErr wsbuilder.BuildError
 	if xerrors.As(err, &buildErr) {
@@ -443,12 +453,6 @@ func (api *API) postWorkspaceBuilds(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// If this workspace build has a different template version ID to the previous build
-	// we can assume it has just been updated.
-	if createBuild.TemplateVersionID != uuid.Nil && createBuild.TemplateVersionID != previousWorkspaceBuild.TemplateVersionID {
-		api.notifyWorkspaceUpdated(ctx, apiKey.UserID, workspace, createBuild.RichParameterValues)
-	}
-
 	api.publishWorkspaceUpdate(ctx, workspace.OwnerID, wspubsub.WorkspaceEvent{
 		Kind:        wspubsub.WorkspaceEventKindStateChange,
 		WorkspaceID: workspace.ID,
@@ -459,31 +463,32 @@ func (api *API) postWorkspaceBuilds(rw http.ResponseWriter, r *http.Request) {
 
 func (api *API) notifyWorkspaceUpdated(
 	ctx context.Context,
+	db database.Store,
 	initiatorID uuid.UUID,
 	workspace database.Workspace,
 	parameters []codersdk.WorkspaceBuildParameter,
 ) {
 	log := api.Logger.With(slog.F("workspace_id", workspace.ID))
 
-	template, err := api.Database.GetTemplateByID(ctx, workspace.TemplateID)
+	template, err := db.GetTemplateByID(ctx, workspace.TemplateID)
 	if err != nil {
 		log.Warn(ctx, "failed to fetch template for workspace creation notification", slog.F("template_id", workspace.TemplateID), slog.Error(err))
 		return
 	}
 
-	version, err := api.Database.GetTemplateVersionByID(ctx, template.ActiveVersionID)
+	version, err := db.GetTemplateVersionByID(ctx, template.ActiveVersionID)
 	if err != nil {
 		log.Warn(ctx, "failed to fetch template version for workspace creation notification", slog.F("template_id", workspace.TemplateID), slog.Error(err))
 		return
 	}
 
-	initiator, err := api.Database.GetUserByID(ctx, initiatorID)
+	initiator, err := db.GetUserByID(ctx, initiatorID)
 	if err != nil {
 		log.Warn(ctx, "failed to fetch user for workspace update notification", slog.F("initiator_id", initiatorID), slog.Error(err))
 		return
 	}
 
-	owner, err := api.Database.GetUserByID(ctx, workspace.OwnerID)
+	owner, err := db.GetUserByID(ctx, workspace.OwnerID)
 	if err != nil {
 		log.Warn(ctx, "failed to fetch user for workspace update notification", slog.F("owner_id", workspace.OwnerID), slog.Error(err))
 		return
