ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

server/posts: fix deleting post with comments

Browse source
This commit is contained in:
rr- 2016-08-02 11:44:00 +02:00
parent 11d3853122
commit ff189a3915
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/szurubooru/api/post_api.py
View file

@ -97,7 +97,7 @@ class PostDetailApi(BaseApi):
auth.verify_privilege(ctx.user, 'posts:delete') auth.verify_privilege(ctx.user, 'posts:delete')
post = posts.get_post_by_id(post_id) post = posts.get_post_by_id(post_id)
snapshots.save_entity_deletion(post, ctx.user) snapshots.save_entity_deletion(post, ctx.user)
ctx.session.delete(post) posts.delete(post)
ctx.session.commit() ctx.session.commit()
tags.export_to_json() tags.export_to_json()
return {} return {}

2
server/szurubooru/db/post.py
View file

@ -125,7 +125,7 @@ class Post(Base):
'PostFavorite', cascade='all, delete-orphan', lazy='joined') 'PostFavorite', cascade='all, delete-orphan', lazy='joined')
notes = relationship( notes = relationship(
'PostNote', cascade='all, delete-orphan', lazy='joined') 'PostNote', cascade='all, delete-orphan', lazy='joined')
comments = relationship('Comment') comments = relationship('Comment', cascade='all, delete-orphan')
# dynamic columns # dynamic columns
tag_count = column_property( tag_count = column_property(

3
server/szurubooru/func/posts.py
View file

@ -316,3 +316,6 @@ def feature_post(post, user):
post_feature.post = post post_feature.post = post
post_feature.user = user post_feature.user = user
db.session.add(post_feature) db.session.add(post_feature)
def delete(post):
db.session.delete(post)

7
server/szurubooru/tests/db/test_post.py
View file

@ -38,14 +38,15 @@ def test_saving_post(post_factory, user_factory, tag_factory):
assert len(related_post1.relations) == 0 assert len(related_post1.relations) == 0
assert len(related_post2.relations) == 0 assert len(related_post2.relations) == 0
def test_cascade_deletions(post_factory, user_factory, tag_factory): def test_cascade_deletions(post_factory, user_factory, tag_factory, comment_factory):
user = user_factory() user = user_factory()
tag1 = tag_factory() tag1 = tag_factory()
tag2 = tag_factory() tag2 = tag_factory()
related_post1 = post_factory() related_post1 = post_factory()
related_post2 = post_factory() related_post2 = post_factory()
post = post_factory() post = post_factory()
db.session.add_all([user, tag1, tag2, post, related_post1, related_post2]) comment = comment_factory(post=post, user=user)
db.session.add_all([user, tag1, tag2, post, related_post1, related_post2, comment])
db.session.flush() db.session.flush()
score = db.PostScore() score = db.PostScore()
@ -91,6 +92,7 @@ def test_cascade_deletions(post_factory, user_factory, tag_factory):
assert db.session.query(db.PostNote).count() == 1 assert db.session.query(db.PostNote).count() == 1
assert db.session.query(db.PostFeature).count() == 1 assert db.session.query(db.PostFeature).count() == 1
assert db.session.query(db.PostFavorite).count() == 1 assert db.session.query(db.PostFavorite).count() == 1
assert db.session.query(db.Comment).count() == 1
db.session.delete(post) db.session.delete(post)
db.session.commit() db.session.commit()
@ -105,6 +107,7 @@ def test_cascade_deletions(post_factory, user_factory, tag_factory):
assert db.session.query(db.PostNote).count() == 0 assert db.session.query(db.PostNote).count() == 0
assert db.session.query(db.PostFeature).count() == 0 assert db.session.query(db.PostFeature).count() == 0
assert db.session.query(db.PostFavorite).count() == 0 assert db.session.query(db.PostFavorite).count() == 0
assert db.session.query(db.Comment).count() == 0
def test_tracking_tag_count(post_factory, tag_factory): def test_tracking_tag_count(post_factory, tag_factory):
post = post_factory() post = post_factory()