fix: refactor HTTP error codes PUT /mentorship_relation/{request_id}/…

…cancel (#991)
anitab-org · May 16, 2021 · 23f28d8 · 23f28d8
1 parent bab703c
commit 23f28d8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/app/api/dao/mentorship_relation.py b/app/api/dao/mentorship_relation.py
@@ -298,11 +298,11 @@ def cancel_relation(user_id: int, relation_id: int):
 
         # verify if request is in pending state
         if request.state != MentorshipRelationState.ACCEPTED:
-            return messages.UNACCEPTED_STATE_RELATION, HTTPStatus.BAD_REQUEST
+            return messages.UNACCEPTED_STATE_RELATION, HTTPStatus.FORBIDDEN
 
         # verify if I'm involved in this relation
         if not (request.mentee_id == user_id or request.mentor_id == user_id):
-            return messages.CANT_CANCEL_UNINVOLVED_REQUEST, HTTPStatus.BAD_REQUEST
+            return messages.CANT_CANCEL_UNINVOLVED_REQUEST, HTTPStatus.FORBIDDEN
 
         # All was checked
         request.state = MentorshipRelationState.CANCELLED

diff --git a/app/api/resources/mentorship_relation.py b/app/api/resources/mentorship_relation.py
@@ -274,7 +274,7 @@ class CancelMentorshipRelation(Resource):
         HTTPStatus.OK, f"{messages.MENTORSHIP_RELATION_WAS_CANCELLED_SUCCESSFULLY}"
     )
     @mentorship_relation_ns.response(
-        HTTPStatus.BAD_REQUEST,
+        HTTPStatus.FORBIDDEN,
         f"{messages.UNACCEPTED_STATE_RELATION}\n"
         f"{messages.CANT_CANCEL_UNINVOLVED_REQUEST}",
     )

diff --git a/tests/mentorship_relation/test_api_cancel_relation.py b/tests/mentorship_relation/test_api_cancel_relation.py
@@ -126,7 +126,7 @@ def test_cancel_mentorship_relation_notinvolvedinrelation(self):
                 headers=get_test_request_header(self.admin_user.id),
             )
 
-            self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_code)
+            self.assertEqual(HTTPStatus.FORBIDDEN, response.status_code)
             self.assertDictEqual(expected_response, json.loads(response.data))
 
 

diff --git a/tests/mentorship_relation/test_dao_cancel_relation.py b/tests/mentorship_relation/test_dao_cancel_relation.py
@@ -105,7 +105,7 @@ def test_dao_mentorship_cancel_relation_not_in_accepted_state(self):
 
         result = DAO.cancel_relation(self.second_user.id, self.mentorship_relation.id)
         self.assertEqual(
-            (messages.UNACCEPTED_STATE_RELATION, HTTPStatus.BAD_REQUEST), result
+            (messages.UNACCEPTED_STATE_RELATION, HTTPStatus.FORBIDDEN), result
         )
 
         self.mentorship_relation.state = MentorshipRelationState.COMPLETED
@@ -114,7 +114,7 @@ def test_dao_mentorship_cancel_relation_not_in_accepted_state(self):
 
         result = DAO.cancel_relation(self.second_user.id, self.mentorship_relation.id)
         self.assertEqual(
-            (messages.UNACCEPTED_STATE_RELATION, HTTPStatus.BAD_REQUEST), result
+            (messages.UNACCEPTED_STATE_RELATION, HTTPStatus.FORBIDDEN), result
         )
 
         self.mentorship_relation.state = MentorshipRelationState.CANCELLED
@@ -123,7 +123,7 @@ def test_dao_mentorship_cancel_relation_not_in_accepted_state(self):
 
         result = DAO.cancel_relation(self.second_user.id, self.mentorship_relation.id)
         self.assertEqual(
-            (messages.UNACCEPTED_STATE_RELATION, HTTPStatus.BAD_REQUEST), result
+            (messages.UNACCEPTED_STATE_RELATION, HTTPStatus.FORBIDDEN), result
         )
 
         self.mentorship_relation.state = MentorshipRelationState.REJECTED
@@ -132,5 +132,5 @@ def test_dao_mentorship_cancel_relation_not_in_accepted_state(self):
 
         result = DAO.cancel_relation(self.second_user.id, self.mentorship_relation.id)
         self.assertEqual(
-            (messages.UNACCEPTED_STATE_RELATION, HTTPStatus.BAD_REQUEST), result
+            (messages.UNACCEPTED_STATE_RELATION, HTTPStatus.FORBIDDEN), result
         )