Refactor

Author: NorthRealm

models/actions/run.go

@@ -4,6 +4,10 @@
 package actions
 
 import (
+	actions_module "code.gitea.io/gitea/modules/actions"
+	container_module "code.gitea.io/gitea/modules/container"
+	log_module "code.gitea.io/gitea/modules/log"
+	storage_module "code.gitea.io/gitea/modules/storage"
 	"context"
 	"errors"
 	"fmt"
@@ -439,4 +443,71 @@ func UpdateRun(ctx context.Context, run *ActionRun, cols ...string) error {
 	return nil
 }
 
+// TODO: When deleting a run, it should at lease delete artifacts, tasks logs, database record.
+func DeleteRun(ctx context.Context, repoID int64, run *ActionRun, jobs []*ActionRunJob) error {
+	jobIDs := container_module.FilterSlice(jobs, func(j *ActionRunJob) (int64, bool) {
+		return j.ID, j.ID != 0
+	})
+
+	tasks := make(TaskList, 0)
+	if err := db.GetEngine(ctx).Where("repo_id = ?", repoID).In("job_id", jobIDs).Find(&tasks); err != nil {
+		return err
+	}
+
+	artifacts, err := db.Find[ActionArtifact](ctx, FindArtifactsOptions{
+		RepoID: repoID,
+		RunID:  run.ID,
+	})
+	if err != nil {
+		return err
+	}
+
+	var recordsToDelete []any
+
+	for _, task := range tasks {
+		recordsToDelete = append(recordsToDelete, &ActionTask{
+			RepoID: repoID,
+			ID:     task.ID,
+		})
+		recordsToDelete = append(recordsToDelete, &ActionTaskStep{
+			RepoID: repoID,
+			TaskID: task.ID,
+		})
+	}
+	recordsToDelete = append(recordsToDelete, &ActionRunJob{
+		RepoID: repoID,
+		RunID:  run.ID,
+	})
+	recordsToDelete = append(recordsToDelete, &ActionRun{
+		RepoID: repoID,
+		ID:     run.ID,
+	})
+	recordsToDelete = append(recordsToDelete, &ActionArtifact{
+		RepoID: repoID,
+		RunID:  run.ID,
+	})
+
+	if err := db.WithTx(ctx, func(ctx context.Context) error {
+		return db.DeleteBeans(ctx, recordsToDelete...)
+	}); err != nil {
+		return err
+	}
+
+	// Delete files on storage
+	for _, tas := range tasks {
+		err := actions_module.RemoveLogs(ctx, tas.LogInStorage, tas.LogFilename)
+		if err != nil {
+			log_module.Error("remove log file %q: %v", tas.LogFilename, err)
+		}
+	}
+	for _, art := range artifacts {
+		if err := storage_module.ActionsArtifacts.Delete(art.StoragePath); err != nil {
+			log_module.Error("remove artifact file %q: %v", art.StoragePath, err)
+		}
+	}
+
+	// TODO: Delete commit status? Looks like it has no direct reference to a run/task/job. Not quite feasible without modifying db models (Dangerous).
+	return nil
+}
+
 type ActionRunIndex db.ResourceIndex

routers/web/repo/actions/view.go

@@ -581,7 +581,6 @@ func Approve(ctx *context_module.Context) {
 	ctx.JSON(http.StatusOK, struct{}{})
 }
 
-// TODO: When deleting a run, it should at lease delete artifacts, tasks logs, database record.
 func Delete(ctx *context_module.Context) {
 	runIndex := getRunIndex(ctx)
 
@@ -599,76 +598,11 @@ func Delete(ctx *context_module.Context) {
 
 	repoID := ctx.Repo.Repository.ID
 
-	tasks := []*actions_model.ActionTask{}
-
-	for _, job := range jobs {
-		tasks0, err := db.Find[actions_model.ActionTask](ctx, actions_model.FindTaskOptions{
-			RepoID: repoID,
-			JobID:  job.ID,
-		})
-		if err != nil {
-			ctx.HTTPError(http.StatusInternalServerError, err.Error())
-			return
-		}
-		tasks = append(tasks, tasks0...)
-	}
-
-	artifacts, err := db.Find[actions_model.ActionArtifact](ctx, actions_model.FindArtifactsOptions{
-		RepoID: repoID,
-		RunID:  run.ID,
-	})
-	if err != nil {
+	if err := actions_model.DeleteRun(ctx, repoID, run, jobs); err != nil {
 		ctx.HTTPError(http.StatusInternalServerError, err.Error())
 		return
 	}
 
-	recordsToDelete := []any{}
-
-	for _, task := range tasks {
-		recordsToDelete = append(recordsToDelete, &actions_model.ActionTask{
-			RepoID: repoID,
-			ID:     task.ID,
-		})
-		recordsToDelete = append(recordsToDelete, &actions_model.ActionTaskStep{
-			RepoID: repoID,
-			TaskID: task.ID,
-		})
-	}
-	recordsToDelete = append(recordsToDelete, &actions_model.ActionRunJob{
-		RepoID: repoID,
-		RunID:  run.ID,
-	})
-	recordsToDelete = append(recordsToDelete, &actions_model.ActionRun{
-		RepoID: repoID,
-		ID:     run.ID,
-	})
-	recordsToDelete = append(recordsToDelete, &actions_model.ActionArtifact{
-		RepoID: repoID,
-		RunID:  run.ID,
-	})
-
-	if err := db.WithTx(ctx, func(ctx context.Context) error {
-		return db.DeleteBeans(ctx, recordsToDelete...)
-	}); err != nil {
-		ctx.HTTPError(http.StatusInternalServerError, err.Error())
-		return
-	}
-
-	// Delete files on storage
-	for _, task := range tasks {
-		err := actions.RemoveLogs(ctx, task.LogInStorage, task.LogFilename)
-		if err != nil {
-			log.Error("remove log file %q: %v", task.LogFilename, err)
-		}
-	}
-	for _, art := range artifacts {
-		if err := storage.ActionsArtifacts.Delete(art.StoragePath); err != nil {
-			log.Error("remove artifact file %q: %v", art.StoragePath, err)
-		}
-	}
-
-	// TODO: Delete commit status? Looks like it has no direct reference to a run/task/job. Not quite feasible without modifying db models (Dangerous).
-
 	ctx.JSON(http.StatusOK, struct{}{})
 }