From bd9b3ace8d385100eb7c84f19cb54e835b1c02e5 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 12 Feb 2025 18:53:54 +0000 Subject: [PATCH] builds: Fix deleting groups Signed-off-by: Michael Tremer --- src/buildservice/builds.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/buildservice/builds.py b/src/buildservice/builds.py index ad3348de..5f94df29 100644 --- a/src/buildservice/builds.py +++ b/src/buildservice/builds.py @@ -406,8 +406,9 @@ class Build(database.Base, database.BackendMixin, database.SoftDeleteMixin): raise PermissionError # Delete all test builds - #if self.test_builds: - # await self.test_builds.delete(user=user) + tests = await self.get_tests() + if tests: + await tests.delete(deleted_by=deleted_by) # Delete all jobs for job in self.alljobs: @@ -1391,15 +1392,16 @@ class BuildGroup(database.Base, database.SoftDeleteMixin): # Delete - async def delete(self, user=None): + async def delete(self, deleted_by=None): + """ + Deletes this group + """ # Delete all builds in this group for build in self.builds: - await build.delete(user=user) + await build.delete(deleted_by=deleted_by) - # Mark as deleted - self._set_attribute_now("deleted_at") - if user: - self._set_attribute("deleted_by", user) + # Delete the group itself + await super().delete(deleted_by=deleted_by) # Functions to find out whether this was all successful/failed -- 2.47.2