Skip to content

Commit 84c7029

Browse files
committed
fix api delete statue_code
1 parent 46ecfd0 commit 84c7029

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

firefly/views/api/user.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,7 @@ def delete(self, id):
3838
.update_one(pull__following=user.to_dbref())
3939
User.objects(id=id) \
4040
.update_one(pull__follower=current_user.to_dbref())
41-
status_fields = generate_status_fields(OK)
42-
else:
43-
status_fields = generate_status_fields(NOTFOUND)
44-
return status_fields, 200
41+
return '', 204
4542

4643

4744
class BlockUserApi(Resource):
@@ -69,7 +66,4 @@ def delete(self, id):
6966
if id in current_user.blocked_user_id:
7067
User.objects(id=current_user.id) \
7168
.update_one(pull__blocked_user_id=id)
72-
status_fields = generate_status_fields(OK)
73-
else:
74-
status_fields = generate_status_fields(NOTFOUND)
75-
return status_fields, 200
69+
return '', 204

tests/test_user.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from __future__ import absolute_import
21
# coding=utf-8
2+
from __future__ import absolute_import
33
from flask import url_for
44
from flask_login import current_user
55
import pytest
@@ -51,8 +51,7 @@ def test_follow_user_api(self):
5151
# test unfollow
5252
url = url_for('api.followuserapi', id=self.users[1].id)
5353
rv = self.client.delete(url, buffered=True)
54-
assert rv.status_code == 200
55-
assert rv.json['status'] == OK
54+
assert rv.status_code == 204
5655
self.users[0].reload()
5756
self.users[1].reload()
5857
assert self.users[0].following == []
@@ -72,7 +71,6 @@ def test_block_user_api(self):
7271
# test unblock
7372
url = url_for('api.blockuserapi', id=self.users[1].id)
7473
rv = self.client.delete(url, buffered=True)
75-
assert rv.status_code == 200
76-
assert rv.json['status'] == OK
74+
assert rv.status_code == 204
7775
self.users[0].reload()
7876
assert self.users[0].following == []

0 commit comments

Comments
 (0)