From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 26 Jan 2025 10:34:50 +0000 (+0000)
Subject: users: Fix deleting push subscriptions
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a9e8eef5bd66a7b97ab1c909dc9562422e1317c4;p=pbs.git

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 0c1c476a..6d098ae5 100644
--- 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 = []