From 115487d546787a8321229a142d8af053753696c2 Mon Sep 17 00:00:00 2001 From: Adnan Maolood Date: Sun, 13 Feb 2022 16:55:33 -0500 Subject: [PATCH] api/graph: Execute webhook queries before deletion Execute GraphQL webhook queries after the repository has been deleted from the database, but before the files have been removed from the filesystem. This prevents filesystem errors during query execution. We don't need to execute the query before the repository is deleted from the database since all the information we need from the database has been retrieved. References: https://todo.sr.ht/~sircmpwn/sr.ht/301 --- api/graph/schema.resolvers.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/api/graph/schema.resolvers.go b/api/graph/schema.resolvers.go index f9af2e7..13e4502 100644 --- a/api/graph/schema.resolvers.go +++ b/api/graph/schema.resolvers.go @@ -453,13 +453,13 @@ func (r *mutationResolver) DeleteRepository(ctx context.Context, id int) (*model return err } + webhooks.DeliverRepoEvent(ctx, model.WebhookEventRepoDeleted, &repo) + webhooks.DeliverLegacyRepoDeleted(ctx, &repo) + err := os.RemoveAll(repo.Path) if err != nil { return err } - - webhooks.DeliverRepoEvent(ctx, model.WebhookEventRepoDeleted, &repo) - webhooks.DeliverLegacyRepoDeleted(ctx, &repo) return nil }); err != nil { return nil, err -- 2.38.4