augustin64/partitioncloud-server
1
1
Fork 0
mirror of https://github.com/partitioncloud/partitioncloud-server.git synced 2025-01-23 09:16:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix groupe deletion (removed orphans)

Browse Source
This commit is contained in:
augustin64 2023-10-26 23:38:09 +02:00
parent 34cae34236
commit 2de234870e
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
partitioncloud/modules/classes/album.py
View File

@ -2,7 +2,7 @@ import os
from ..db import get_db
from .attachment import Attachment
class Album():
def __init__(self, uuid=None, id=None):
@ -116,6 +116,18 @@ class Album():
"""
)
for partition in partitions.fetchall():
data = db.execute(
"""
SELECT * FROM attachments
WHERE partition_uuid = ?
""",
(partition["uuid"],)
)
attachments = [Attachment(data=i) for i in data]
for attachment in attachments:
attachment.delete()
os.remove(f"partitioncloud/partitions/{partition['uuid']}.pdf")
if os.path.exists(f"partitioncloud/static/thumbnails/{partition['uuid']}.jpg"):
os.remove(f"partitioncloud/static/thumbnails/{partition['uuid']}.jpg")

4
partitioncloud/modules/classes/groupe.py
View File

@ -54,9 +54,9 @@ class Groupe():
"""
SELECT id FROM album
LEFT JOIN groupe_contient_album
LEFT JOIN contient_user
ON groupe_contient_album.album_id=album.id
AND contient_user.album_id=album.id
LEFT JOIN contient_user
ON contient_user.album_id=album.id
WHERE user_id IS NULL AND groupe_id IS NULL
"""
).fetchall()

7
partitioncloud/modules/classes/user.py
View File

@ -194,15 +194,16 @@ class User():
def quit_album(self, album_uuid):
db = get_db()
album = Album(uuid=album_uuid)
db.execute(
"""
DELETE FROM contient_user
JOIN album
ON album.id = album_id
WHERE user_id = ?
AND album_id = ?
AND album.uuid = ?
""",
(self.id, album.id)
(self.id, album_uuid)
)
db.commit()