users: Fix deleting push subscriptions

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/buildservice/users.py b/src/buildservice/users.py
index 0c1c476a3bfe07f3285900807de4822c2abd64fc..6d098ae5fdda5d271f6988d103fa58b3a80465d6 100644 (file)
--- a/src/buildservice/users.py
+++ b/src/buildservice/users.py
@@ -925,7 +925,6 @@ class User(database.Base, database.BackendMixin, database.SoftDeleteMixin):
                        .select(
                                UserPushSubscription,
                        ).where(
-                               UserPushSubscription.deleted_at == None,
                                UserPushSubscription.user == self,
                        )
                        .order_by(
@@ -1110,12 +1109,19 @@ class UserPushSubscription(database.Base, database.BackendMixin):
                        # The subscription is no longer valid
                        if e.code == 410:
                                # Let's just delete ourselves
-                               self.delete()
+                               await self.delete()
                                return
 
                        # Raise everything else
                        raise e
 
+       async def delete(self):
+               """
+                       Deletes this subscription
+               """
+               # Immediately delete it
+               await self.db.delete(self)
+
        def _sign(self):
                elements = []