diff --git a/fittrackee/reports/models.py b/fittrackee/reports/models.py index 7630f0143..6387dc5e8 100644 --- a/fittrackee/reports/models.py +++ b/fittrackee/reports/models.py @@ -391,12 +391,12 @@ class ReportAction(BaseModel): comment = db.relationship( 'Comment', lazy=True, - backref=db.backref('comment_admin_action', lazy='select'), + backref=db.backref('comment_report_action', lazy='select'), ) workout = db.relationship( 'Workout', lazy=True, - backref=db.backref('workout_admin_action', lazy='select'), + backref=db.backref('workout_report_action', lazy='select'), ) def __init__( @@ -594,7 +594,7 @@ def serialize(self, current_user: User) -> Dict: @listens_for(ReportAction, 'after_insert') -def on_admin_action_insert( +def on_report_action_insert( mapper: Mapper, connection: Connection, new_action: ReportAction ) -> None: @listens_for(db.Session, 'after_flush', once=True) @@ -616,7 +616,7 @@ def receive_after_flush(session: Session, context: Connection) -> None: @listens_for(ReportActionAppeal, 'after_insert') -def on_admin_action_appeal_insert( +def on_report_action_appeal_insert( mapper: Mapper, connection: Connection, new_appeal: ReportActionAppeal ) -> None: @listens_for(db.Session, 'after_flush', once=True) diff --git a/fittrackee/reports/reports.py b/fittrackee/reports/reports.py index 41a69809e..13017eea2 100644 --- a/fittrackee/reports/reports.py +++ b/fittrackee/reports/reports.py @@ -202,11 +202,9 @@ def update_report( }, 200 -@reports_blueprint.route( - "/reports//admin-actions", methods=["POST"] -) +@reports_blueprint.route("/reports//actions", methods=["POST"]) @require_auth(scopes=["reports:write"], as_admin=True) -def create_admin_action( +def create_action( auth_user: User, report_id: int ) -> Union[Tuple[Dict, int], HttpResponse]: data = request.get_json() @@ -225,7 +223,7 @@ def create_admin_action( return NotFoundErrorResponse(f"report not found (id: {report_id})") try: - action = report_service.create_admin_action( + action = report_service.create_report_action( report=report, admin_user=auth_user, action_type=action_type, @@ -235,8 +233,8 @@ def create_admin_action( db.session.flush() if current_app.config['CAN_SEND_EMAILS']: - admin_action_email_service = ReportEmailService() - admin_action_email_service.send_admin_action_email( + report_action_email_service = ReportEmailService() + report_action_email_service.send_report_action_email( report, action_type, reason, action ) @@ -286,8 +284,8 @@ def process_appeal( db.session.flush() if new_report_action and current_app.config['CAN_SEND_EMAILS']: - admin_action_email_service = ReportEmailService() - admin_action_email_service.send_admin_action_email( + report_action_email_service = ReportEmailService() + report_action_email_service.send_report_action_email( new_report_action.report, new_report_action.action_type, reason, diff --git a/fittrackee/reports/reports_email_service.py b/fittrackee/reports/reports_email_service.py index e04406821..eece70c25 100644 --- a/fittrackee/reports/reports_email_service.py +++ b/fittrackee/reports/reports_email_service.py @@ -255,7 +255,7 @@ def _send_workout_unsuspension_email( email_data["without_user_action"] = True workout_unsuspension_email.send(user_data, email_data) - def send_admin_action_email( + def send_report_action_email( self, report: Report, action_type: str, diff --git a/fittrackee/reports/reports_service.py b/fittrackee/reports/reports_service.py index d5096e236..f9c878c6f 100644 --- a/fittrackee/reports/reports_service.py +++ b/fittrackee/reports/reports_service.py @@ -123,7 +123,7 @@ def update_report( return report @staticmethod - def create_admin_action( + def create_report_action( *, report: Report, admin_user: User, @@ -149,12 +149,12 @@ def create_admin_action( if action_type.startswith("user_warning"): user = User.query.filter_by(username=username).first() - existing_admin_action = ReportAction.query.filter_by( + existing_report_action = ReportAction.query.filter_by( action_type=action_type, report_id=report.id, user_id=user.id, ).first() - if existing_admin_action: + if existing_report_action: raise UserWarningExistsException("user already warned") report_action = ReportAction( diff --git a/fittrackee/tests/comments/test_comments_api.py b/fittrackee/tests/comments/test_comments_api.py index 5f665677f..4efda3e07 100644 --- a/fittrackee/tests/comments/test_comments_api.py +++ b/fittrackee/tests/comments/test_comments_api.py @@ -3008,7 +3008,7 @@ def test_it_returns_400_if_comment_is_not_suspended( response, error_message="workout comment is not suspended" ) - def test_it_returns_400_if_suspended_comment_has_no_admin_action( + def test_it_returns_400_if_suspended_comment_has_no_report_action( self, app: Flask, user_1: User, @@ -3058,7 +3058,7 @@ def test_it_returns_400_when_appeal_text_is_missing( text_visibility=PrivacyLevel.PUBLIC, ) comment.suspended_at = datetime.utcnow() - self.create_admin_comment_action(user_2_admin, user_1, comment) + self.create_report_comment_action(user_2_admin, user_1, comment) db.session.commit() client, auth_token = self.get_test_client_and_auth_token( app, user_1.email @@ -3088,7 +3088,7 @@ def test_user_can_appeal_comment_suspension( text_visibility=PrivacyLevel.PUBLIC, ) comment.suspended_at = datetime.utcnow() - action = self.create_admin_comment_action( + action = self.create_report_comment_action( user_2_admin, user_1, comment ) db.session.commit() @@ -3132,7 +3132,7 @@ def test_user_can_appeal_comment_suspension_only_once( text_visibility=PrivacyLevel.PUBLIC, ) comment.suspended_at = datetime.utcnow() - action = self.create_admin_comment_action( + action = self.create_report_comment_action( user_2_admin, user_1, comment ) db.session.flush() diff --git a/fittrackee/tests/comments/test_comments_models.py b/fittrackee/tests/comments/test_comments_models.py index 9c3b08155..6a8b63164 100644 --- a/fittrackee/tests/comments/test_comments_models.py +++ b/fittrackee/tests/comments/test_comments_models.py @@ -136,12 +136,12 @@ def test_suspension_action_is_last_suspension_action_when_comment_is_suspended( workout_cycling_user_1: Workout, ) -> None: comment = self.create_comment(user_2, workout_cycling_user_1) - expected_admin_action = self.create_admin_comment_actions( + expected_report_action = self.create_report_comment_actions( user_1_admin, user_2, comment ) comment.suspended_at = datetime.utcnow() - assert comment.suspension_action == expected_admin_action + assert comment.suspension_action == expected_report_action def test_suspension_action_is_none_when_comment_is_unsuspended( self, @@ -152,10 +152,10 @@ def test_suspension_action_is_none_when_comment_is_unsuspended( workout_cycling_user_1: Workout, ) -> None: comment = self.create_comment(user_2, workout_cycling_user_1) - self.create_admin_comment_action( + self.create_report_comment_action( user_1_admin, user_2, comment, "comment_suspension" ) - self.create_admin_comment_action( + self.create_report_comment_action( user_1_admin, user_2, comment, "comment_unsuspension" ) @@ -284,7 +284,7 @@ def test_it_serializes_owner_comment_when_comment_is_suspended( ) -> None: workout_cycling_user_2.workout_visibility = PrivacyLevel.PRIVATE comment = self.create_comment(user_1, workout_cycling_user_2) - expected_admin_action = self.create_admin_comment_actions( + expected_report_action = self.create_report_comment_actions( user_2_admin, user_1, comment ) comment.suspended_at = datetime.utcnow() @@ -302,7 +302,7 @@ def test_it_serializes_owner_comment_when_comment_is_suspended( 'mentions': [], 'suspended': True, 'suspended_at': comment.suspended_at, - 'suspension': expected_admin_action.serialize(user_1, full=False), + 'suspension': expected_report_action.serialize(user_1, full=False), 'modification_date': comment.modification_date, 'reply_to': comment.reply_to, 'replies': [], diff --git a/fittrackee/tests/mixins.py b/fittrackee/tests/mixins.py index 30872b78f..e879d65e1 100644 --- a/fittrackee/tests/mixins.py +++ b/fittrackee/tests/mixins.py @@ -395,7 +395,7 @@ def create_user_report(self, reporter: User, user: User) -> Report: return self.create_report(reporter=reporter, reported_object=user) @staticmethod - def create_admin_action( + def create_report_action( admin_user: User, user: User, report_id: int, @@ -432,7 +432,7 @@ def create_admin_action( db.session.commit() return report_action - def create_admin_user_action( + def create_report_user_action( self, admin: User, user: User, @@ -442,7 +442,7 @@ def create_admin_user_action( report_id = ( report_id if report_id else self.create_user_report(admin, user).id ) - report_action = self.create_admin_action( + report_action = self.create_report_action( admin, user, action_type=action_type, report_id=report_id ) user.suspended_at = ( @@ -451,7 +451,7 @@ def create_admin_user_action( db.session.commit() return report_action - def create_admin_workout_action( + def create_report_workout_action( self, admin: User, user: User, @@ -470,7 +470,7 @@ def create_admin_workout_action( db.session.add(report_action) return report_action - def create_admin_comment_action( + def create_report_comment_action( self, admin: User, user: User, @@ -492,18 +492,18 @@ def create_admin_comment_action( ) return report_action - def create_admin_comment_actions( + def create_report_comment_actions( self, admin: User, user: User, comment: Comment ) -> ReportAction: for n in range(2): action_type = ( "comment_suspension" if n % 2 == 0 else "comment_unsuspension" ) - report_action = self.create_admin_comment_action( + report_action = self.create_report_comment_action( admin, user, comment, action_type ) db.session.add(report_action) - report_action = self.create_admin_comment_action( + report_action = self.create_report_comment_action( admin, user, comment, "comment_suspension" ) db.session.add(report_action) @@ -512,12 +512,12 @@ def create_admin_comment_actions( def create_action_appeal( self, action_id: int, user: User, with_commit: bool = True ) -> ReportActionAppeal: - admin_action_appeal = ReportActionAppeal( + report_action_appeal = ReportActionAppeal( action_id=action_id, user_id=user.id, text=self.random_string(), ) - db.session.add(admin_action_appeal) + db.session.add(report_action_appeal) if with_commit: db.session.commit() - return admin_action_appeal + return report_action_appeal diff --git a/fittrackee/tests/reports/test_report_actions_model.py b/fittrackee/tests/reports/test_report_actions_model.py index bcc5f5e08..01e0ba6b1 100644 --- a/fittrackee/tests/reports/test_report_actions_model.py +++ b/fittrackee/tests/reports/test_report_actions_model.py @@ -47,7 +47,7 @@ def test_it_raises_error_when_action_type_is_invalid( class TestReportActionForReportModel(ReportActionTestCase): @pytest.mark.parametrize("input_action_type", REPORT_ACTION_TYPES) - def test_it_creates_report_admin_action_for_a_given_type( + def test_it_creates_report_report_action_for_a_given_type( self, app: Flask, user_1_admin: User, @@ -155,7 +155,7 @@ def test_it_creates_report_action_with_given_reason( class TestReportActionForUserModel(ReportActionTestCase): @pytest.mark.parametrize("input_action_type", ALL_USER_ACTION_TYPES) - def test_it_raises_error_when_no_user_given_for_user_admin_action( + def test_it_raises_error_when_no_user_given_for_user_report_action( self, app: Flask, user_1_admin: User, @@ -172,7 +172,7 @@ def test_it_raises_error_when_no_user_given_for_user_admin_action( ).id, ) - def test_it_creates_user_admin_action( + def test_it_creates_user_report_action( self, app: Flask, user_1_admin: User, user_2: User, user_3: User ) -> None: report = self.create_report(reporter=user_2, reported_object=user_3) @@ -227,7 +227,7 @@ def test_it_sets_none_for_admin_user_id_when_admin_user_is_deleted( assert report_action.user_id == user_2.id assert report_action.workout is None - def test_it_deletes_admin_action_when_user_is_deleted( + def test_it_deletes_report_action_when_user_is_deleted( self, app: Flask, user_1_admin: User, user_2: User ) -> None: report_action = ReportAction( @@ -249,7 +249,7 @@ def test_it_deletes_admin_action_when_user_is_deleted( class TestReportActionForWorkoutModel(ReportActionTestCase): @pytest.mark.parametrize("input_action_type", WORKOUT_ACTION_TYPES) - def test_it_raises_error_when_no_workout_id_given_for_workout_admin_action( + def test_it_raises_error_when_no_workout_id_given_for_workout_report_action( # noqa self, app: Flask, user_1_admin: User, @@ -271,7 +271,7 @@ def test_it_raises_error_when_no_workout_id_given_for_workout_admin_action( ) @pytest.mark.parametrize("input_action_type", WORKOUT_ACTION_TYPES) - def test_it_raises_error_when_no_user_id_given_for_workout_admin_action( + def test_it_raises_error_when_no_user_id_given_for_workout_report_action( self, app: Flask, user_1_admin: User, @@ -292,7 +292,7 @@ def test_it_raises_error_when_no_user_id_given_for_workout_admin_action( workout_id=workout_cycling_user_2.id, ) - def test_it_creates_workout_admin_action( + def test_it_creates_workout_report_action( self, app: Flask, user_1_admin: User, @@ -399,7 +399,7 @@ def test_it_sets_none_for_workout_id_when_workout_is_deleted( class TestReportActionForCommentsModel(CommentMixin, ReportActionTestCase): @pytest.mark.parametrize("input_action_type", COMMENT_ACTION_TYPES) - def test_it_raises_error_when_no_comment_id_given_for_comment_admin_action( + def test_it_raises_error_when_no_comment_id_given_for_comment_report_action( # noqa self, app: Flask, user_1_admin: User, @@ -426,7 +426,7 @@ def test_it_raises_error_when_no_comment_id_given_for_comment_admin_action( ) @pytest.mark.parametrize("input_action_type", COMMENT_ACTION_TYPES) - def test_it_raises_error_when_no_user_id_given_for_comment_admin_action( + def test_it_raises_error_when_no_user_id_given_for_comment_report_action( self, app: Flask, user_1_admin: User, @@ -451,7 +451,7 @@ def test_it_raises_error_when_no_user_id_given_for_comment_admin_action( created_at=datetime.utcnow(), ) - def test_it_creates_comment_admin_action( + def test_it_creates_comment_report_action( self, app: Flask, user_1_admin: User, @@ -571,7 +571,7 @@ def test_it_sets_none_for_comment_id_when_comment_is_deleted( class TestReportActionSerializer(CommentMixin, ReportActionTestCase): - def test_it_returns_minimal_serialized_admin_action( + def test_it_returns_minimal_serialized_report_action( self, app: Flask, user_1_admin: User, user_2: User ) -> None: report_action = ReportAction( @@ -597,7 +597,7 @@ def test_it_returns_minimal_serialized_admin_action( 'user': user_2.serialize(current_user=user_1_admin), } - def test_it_returns_serialized_user_admin_action( + def test_it_returns_serialized_user_report_action( self, app: Flask, user_1_admin: User, user_2: User ) -> None: report_id = self.create_report( @@ -628,7 +628,7 @@ def test_it_returns_serialized_user_admin_action( ) assert serialized_action['workout'] is None - def test_it_returns_serialized_admin_action_with_appeal( + def test_it_returns_serialized_report_action_with_appeal( self, app: Flask, user_1_admin: User, user_2: User ) -> None: report_id = self.create_report( @@ -760,7 +760,7 @@ def test_it_raises_error_when_user_has_no_admin_rights_and_action_is_report_rela with pytest.raises(ReportActionForbiddenException): report_action.serialize(user_2) - def test_it_returns_serialized_workout_admin_action_for_user( + def test_it_returns_serialized_workout_report_action_for_user( self, app: Flask, user_1_admin: User, @@ -792,7 +792,7 @@ def test_it_returns_serialized_workout_admin_action_for_user( "workout": workout_cycling_user_2.serialize(user=user_2), } - def test_it_returns_serialized_workout_admin_action_for_admin( + def test_it_returns_serialized_workout_report_action_for_admin( self, app: Flask, user_1_admin: User, @@ -833,7 +833,7 @@ def test_it_returns_serialized_workout_admin_action_for_admin( user=user_1_admin, for_report=True ) - def test_it_returns_serialized_comment_admin_action_for_user( + def test_it_returns_serialized_comment_report_action_for_user( self, app: Flask, user_1_admin: User, @@ -870,7 +870,7 @@ def test_it_returns_serialized_comment_admin_action_for_user( "workout": None, } - def test_it_returns_serialized_comment_admin_action_for_admin( + def test_it_returns_serialized_comment_report_action_for_admin( self, app: Flask, user_1_admin: User, @@ -918,14 +918,14 @@ def test_it_returns_serialized_comment_admin_action_for_admin( class TestReportActionAppealModel(CommentMixin, ReportActionTestCase): - def test_it_raises_error_when_user_is_not_admin_action_user( + def test_it_raises_error_when_user_is_not_report_action_user( self, app: Flask, user_1_admin: User, user_2: User, user_3: User, ) -> None: - report_action = self.create_admin_user_action(user_1_admin, user_2) + report_action = self.create_report_user_action(user_1_admin, user_2) with pytest.raises(InvalidReportActionAppealUserException): ReportActionAppeal( @@ -944,7 +944,7 @@ def test_it_raises_error_when_user_action_is_invalid( user_2: User, input_action_type: str, ) -> None: - report_action = self.create_admin_user_action( + report_action = self.create_report_user_action( user_1_admin, user_2, action_type=input_action_type ) @@ -962,7 +962,7 @@ def test_it_creates_appeal_for_user_suspension_action( user_2: User, ) -> None: appeal_text = self.random_string() - report_action = self.create_admin_user_action(user_1_admin, user_2) + report_action = self.create_report_user_action(user_1_admin, user_2) created_at = datetime.utcnow() appeal = ReportActionAppeal( @@ -987,7 +987,7 @@ def test_it_creates_appeal_for_user_warning_action( user_2: User, ) -> None: appeal_text = self.random_string() - report_action = self.create_admin_user_action( + report_action = self.create_report_user_action( user_1_admin, user_2, action_type="user_warning" ) created_at = datetime.utcnow() @@ -1016,7 +1016,7 @@ def test_it_raises_error_when_workout_action_is_invalid( workout_cycling_user_2: Workout, ) -> None: workout_cycling_user_2.workout_visibility = PrivacyLevel.PUBLIC - report_action = self.create_admin_workout_action( + report_action = self.create_report_workout_action( user_1_admin, user_2, workout_cycling_user_2, @@ -1040,7 +1040,7 @@ def test_it_creates_appeal_for_workout_suspension_action( sport_1_cycling: Sport, workout_cycling_user_2: Workout, ) -> None: - report_action = self.create_admin_workout_action( + report_action = self.create_report_workout_action( user_1_admin, user_2, workout_cycling_user_2 ) db.session.add(report_action) @@ -1077,7 +1077,7 @@ def test_it_raises_error_when_comment_action_is_invalid( workout_cycling_user_1, text_visibility=PrivacyLevel.FOLLOWERS, ) - report_action = self.create_admin_comment_action( + report_action = self.create_report_comment_action( user_1_admin, user_2, comment, action_type="comment_unsuspension" ) db.session.add(report_action) @@ -1104,7 +1104,7 @@ def test_it_creates_appeal_for_comment_suspension_action( workout_cycling_user_1, text_visibility=PrivacyLevel.FOLLOWERS, ) - report_action = self.create_admin_comment_action( + report_action = self.create_report_comment_action( user_1_admin, user_2, comment ) db.session.add(report_action) @@ -1134,7 +1134,7 @@ def test_it_creates_appeal_for_a_given_action_without_creation_date( user_2: User, ) -> None: appeal_text = self.random_string() - report_action = self.create_admin_user_action(user_1_admin, user_2) + report_action = self.create_report_user_action(user_1_admin, user_2) now = datetime.utcnow() with travel(now, tick=False): @@ -1157,7 +1157,7 @@ def test_it_deletes_appeal_on_user_deletion( user_2: User, ) -> None: appeal_text = self.random_string() - report_action = self.create_admin_user_action(user_1_admin, user_2) + report_action = self.create_report_user_action(user_1_admin, user_2) appeal = ReportActionAppeal( action_id=report_action.id, user_id=user_2.id, text=appeal_text ) @@ -1176,7 +1176,7 @@ def test_it_does_not_delete_appeal_on_admin_user_deletion( user_2: User, ) -> None: appeal_text = self.random_string() - report_action = self.create_admin_user_action(user_1_admin, user_2) + report_action = self.create_report_user_action(user_1_admin, user_2) appeal = ReportActionAppeal( action_id=report_action.id, user_id=user_2.id, text=appeal_text ) @@ -1198,7 +1198,7 @@ class TestReportActionAppealSerializer(ReportActionTestCase): def test_it_returns_serialized_appeal_for_admin( self, app: Flask, user_1_admin: User, user_2_admin: User, user_3: User ) -> None: - report_action = self.create_admin_user_action(user_1_admin, user_3) + report_action = self.create_report_user_action(user_1_admin, user_3) appeal = ReportActionAppeal( action_id=report_action.id, user_id=user_3.id, @@ -1223,7 +1223,7 @@ def test_it_returns_serialized_appeal_for_admin( def test_it_returns_serialized_appeal_for_appeal_user( self, app: Flask, user_1_admin: User, user_2: User ) -> None: - report_action = self.create_admin_user_action(user_1_admin, user_2) + report_action = self.create_report_user_action(user_1_admin, user_2) appeal = ReportActionAppeal( action_id=report_action.id, user_id=user_2.id, @@ -1246,7 +1246,7 @@ def test_it_returns_serialized_appeal_for_appeal_user( def test_it_raises_error_when_user_is_not_appeal_user( self, app: Flask, user_1_admin: User, user_2: User, user_3: User ) -> None: - report_action = self.create_admin_user_action(user_1_admin, user_2) + report_action = self.create_report_user_action(user_1_admin, user_2) appeal = ReportActionAppeal( action_id=report_action.id, user_id=user_2.id, diff --git a/fittrackee/tests/reports/test_reports_api.py b/fittrackee/tests/reports/test_reports_api.py index 41fda051a..a684f5786 100644 --- a/fittrackee/tests/reports/test_reports_api.py +++ b/fittrackee/tests/reports/test_reports_api.py @@ -2061,7 +2061,7 @@ def test_it_adds_comment_one_resolved_report( class TestPostReportAction(ReportTestCase): - route = "/api/reports/{report_id}/admin-actions" + route = "/api/reports/{report_id}/actions" def test_it_returns_401_if_user_is_not_authenticated( self, @@ -2164,7 +2164,7 @@ def test_it_returns_400_when_action_type_is_invalid( class TestPostReportActionForUserAction(ReportTestCase): - route = "/api/reports/{report_id}/admin-actions" + route = "/api/reports/{report_id}/actions" def test_it_returns_400_when_action_type_is_user_warning_lifting( self, app: Flask, user_1_admin: User, user_2: User, user_3: User @@ -2187,7 +2187,7 @@ def test_it_returns_400_when_action_type_is_user_warning_lifting( self.assert_400(response, "invalid 'action_type'") - def test_it_returns_400_when_username_is_missing_on_user_admin_action( + def test_it_returns_400_when_username_is_missing_on_user_report_action( self, app: Flask, user_1_admin: User, @@ -2208,7 +2208,7 @@ def test_it_returns_400_when_username_is_missing_on_user_admin_action( self.assert_400(response, "'username' is missing") - def test_it_returns_400_when_username_is_invalid_on_user_admin_action( + def test_it_returns_400_when_username_is_invalid_on_user_report_action( self, app: Flask, user_1_admin: User, user_2: User, user_3: User ) -> None: report = self.create_report(reporter=user_3, reported_object=user_2) @@ -2305,7 +2305,7 @@ def test_it_returns_400_when_when_user_already_warned( client, auth_token = self.get_test_client_and_auth_token( app, user_1_admin.email ) - self.create_admin_action( + self.create_report_action( user_1_admin, user_2, action_type="user_warning", @@ -2352,7 +2352,7 @@ def test_it_reactivates_user( ) @pytest.mark.parametrize('input_action_type', USER_ACTION_TYPES) - def test_it_creates_admin_action( + def test_it_creates_report_action( self, app: Flask, user_1_admin: User, @@ -2571,9 +2571,9 @@ def test_it_does_not_send_when_email_sending_is_disabled( class TestPostReportActionForWorkoutAction(ReportTestCase): - route = "/api/reports/{report_id}/admin-actions" + route = "/api/reports/{report_id}/actions" - def test_it_returns_400_when_workout_id_is_missing_on_workout_admin_action( + def test_it_returns_400_when_workout_id_is_missing_on_workout_report_action( # noqa self, app: Flask, user_1_admin: User, @@ -2599,7 +2599,7 @@ def test_it_returns_400_when_workout_id_is_missing_on_workout_admin_action( self.assert_400(response, "'workout_id' is missing") - def test_it_returns_400_when_workout_is_invalid_on_workout_admin_action( + def test_it_returns_400_when_workout_is_invalid_on_workout_report_action( self, app: Flask, user_1_admin: User, @@ -2764,7 +2764,7 @@ def test_it_unsuspends_workout( is None ) - def test_it_creates_admin_action( + def test_it_creates_report_action( self, app: Flask, user_1_admin: User, @@ -2931,9 +2931,9 @@ def test_it_does_not_send_an_email_when_email_sending_is_disabled( class TestPostReportActionForCommentAction(ReportTestCase): - route = "/api/reports/{report_id}/admin-actions" + route = "/api/reports/{report_id}/actions" - def test_it_returns_400_when_comment_id_is_missing_on_comment_admin_action( + def test_it_returns_400_when_comment_id_is_missing_on_comment_report_action( # noqa self, app: Flask, user_1_admin: User, @@ -2960,7 +2960,7 @@ def test_it_returns_400_when_comment_id_is_missing_on_comment_admin_action( self.assert_400(response, "'comment_id' is missing") - def test_it_returns_400_when_comment_is_invalid_on_comment_admin_action( + def test_it_returns_400_when_comment_is_invalid_on_comment_report_action( self, app: Flask, user_1_admin: User, @@ -3126,7 +3126,7 @@ def test_it_unsuspends_comment( Comment.query.filter_by(id=comment.id).first().suspended_at is None ) - def test_it_creates_admin_action( + def test_it_creates_report_action( self, app: Flask, user_1_admin: User, @@ -3372,7 +3372,9 @@ def test_it_returns_404_if_appeal_does_not_exist( def test_it_returns_error_when_data_are_missing( self, app: Flask, user_1_admin: User, user_2: User, input_data: Dict ) -> None: - suspension_action = self.create_admin_user_action(user_1_admin, user_2) + suspension_action = self.create_report_user_action( + user_1_admin, user_2 + ) appeal = self.create_action_appeal(suspension_action.id, user_2) client, auth_token = self.get_test_client_and_auth_token( app, user_1_admin.email @@ -3390,7 +3392,9 @@ def test_it_returns_error_when_data_are_missing( def test_it_returns_400_when_user_already_unsuspended( self, app: Flask, user_1_admin: User, user_2: User ) -> None: - suspension_action = self.create_admin_user_action(user_1_admin, user_2) + suspension_action = self.create_report_user_action( + user_1_admin, user_2 + ) appeal = self.create_action_appeal(suspension_action.id, user_2) client, auth_token = self.get_test_client_and_auth_token( app, user_1_admin.email @@ -3417,7 +3421,9 @@ def test_it_returns_400_when_user_already_unsuspended( def test_it_processes_user_suspension_appeal( self, app: Flask, user_1_admin: User, user_2: User, input_data: Dict ) -> None: - suspension_action = self.create_admin_user_action(user_1_admin, user_2) + suspension_action = self.create_report_user_action( + user_1_admin, user_2 + ) appeal = self.create_action_appeal(suspension_action.id, user_2) client, auth_token = self.get_test_client_and_auth_token( app, user_1_admin.email @@ -3449,7 +3455,7 @@ def test_it_sends_an_email_when_appeal_on_user_suspension_is_approved( report = self.create_report( reporter=user_1_admin, reported_object=user_2 ) - suspension_action = self.create_admin_user_action( + suspension_action = self.create_report_user_action( user_1_admin, user_2, report_id=report.id ) appeal = self.create_action_appeal(suspension_action.id, user_2) @@ -3479,7 +3485,7 @@ def test_it_processes_user_warning_appeal( report = self.create_report( reporter=user_1_admin, reported_object=user_2 ) - warning_action = self.create_admin_user_action( + warning_action = self.create_report_user_action( user_1_admin, user_2, "user_warning", report.id ) appeal = self.create_action_appeal(warning_action.id, user_2) @@ -3513,7 +3519,7 @@ def test_it_sends_an_email_when_appeal_on_user_warning_is_approved( report = self.create_report( reporter=user_1_admin, reported_object=user_2 ) - warning_action = self.create_admin_user_action( + warning_action = self.create_report_user_action( user_1_admin, user_2, "user_warning", report.id ) appeal = self.create_action_appeal(warning_action.id, user_2) @@ -3553,7 +3559,7 @@ def test_it_processes_comment_suspension_appeal( workout_cycling_user_2, text_visibility=PrivacyLevel.PUBLIC, ) - suspension_action = self.create_admin_comment_action( + suspension_action = self.create_report_comment_action( user_1_admin, user_3, comment ) db.session.flush() @@ -3595,7 +3601,7 @@ def test_it_sends_an_email_when_appeal_on_comment_suspension_is_approved( workout_cycling_user_2, text_visibility=PrivacyLevel.PUBLIC, ) - suspension_action = self.create_admin_comment_action( + suspension_action = self.create_report_comment_action( user_1_admin, user_3, comment ) db.session.flush() @@ -3629,7 +3635,7 @@ def test_it_returns_400_when_comment_already_unsuspended( workout_cycling_user_2, text_visibility=PrivacyLevel.PUBLIC, ) - suspension_action = self.create_admin_comment_action( + suspension_action = self.create_report_comment_action( user_1_admin, user_3, comment ) db.session.flush() @@ -3666,7 +3672,7 @@ def test_it_processes_workout_suspension_appeal( workout_cycling_user_2: Workout, input_data: Dict, ) -> None: - suspension_action = self.create_admin_workout_action( + suspension_action = self.create_report_workout_action( user_1_admin, user_2, workout_cycling_user_2 ) workout_cycling_user_2.suspended_at = datetime.utcnow() @@ -3704,7 +3710,7 @@ def test_it_sends_an_email_when_appeal_on_workout_suspension_is_approved( workout_cycling_user_2: Workout, workout_unsuspension_email_mock: MagicMock, ) -> None: - suspension_action = self.create_admin_workout_action( + suspension_action = self.create_report_workout_action( user_1_admin, user_2, workout_cycling_user_2 ) workout_cycling_user_2.suspended_at = datetime.utcnow() @@ -3732,7 +3738,7 @@ def test_it_returns_400_when_workout_already_unsuspended( sport_1_cycling: Sport, workout_cycling_user_2: Workout, ) -> None: - suspension_action = self.create_admin_workout_action( + suspension_action = self.create_report_workout_action( user_1_admin, user_2, workout_cycling_user_2 ) workout_cycling_user_2.suspended_at = datetime.utcnow() diff --git a/fittrackee/tests/reports/test_reports_email_service.py b/fittrackee/tests/reports/test_reports_email_service.py index 480dc1c98..7a776a7a3 100644 --- a/fittrackee/tests/reports/test_reports_email_service.py +++ b/fittrackee/tests/reports/test_reports_email_service.py @@ -34,7 +34,7 @@ def test_it_sends_an_email_on_user_suspension( ) report_email_service = ReportEmailService() - report_email_service.send_admin_action_email( + report_email_service.send_report_action_email( report, "user_suspension", input_reason.get("reason") ) @@ -73,7 +73,7 @@ def test_it_sends_an_email_on_user_reactivation( db.session.flush() report_email_service = ReportEmailService() - report_email_service.send_admin_action_email( + report_email_service.send_report_action_email( report, "user_unsuspension", input_reason.get("reason") ) @@ -111,7 +111,7 @@ def test_it_sends_an_email_on_user_warning_for_user_report( user_3.suspended_at = datetime.utcnow() db.session.flush() report_email_service = ReportEmailService() - user_warning = report_service.create_admin_action( + user_warning = report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="user_warning", @@ -120,7 +120,7 @@ def test_it_sends_an_email_on_user_warning_for_user_report( ) db.session.flush() - report_email_service.send_admin_action_email( + report_email_service.send_report_action_email( report, "user_warning", input_reason.get("reason"), user_warning ) @@ -159,7 +159,7 @@ def test_it_sends_an_email_on_user_warning_for_comment_report( workout=workout_cycling_user_2, ) report_email_service = ReportEmailService() - user_warning = report_service.create_admin_action( + user_warning = report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="user_warning", @@ -168,7 +168,7 @@ def test_it_sends_an_email_on_user_warning_for_comment_report( ) db.session.flush() - report_email_service.send_admin_action_email( + report_email_service.send_report_action_email( report, "user_warning", None, user_warning ) @@ -216,7 +216,7 @@ def test_it_sends_an_email_on_user_warning_for_comment_report_when_workout_is_de workout=workout_cycling_user_2, ) report_email_service = ReportEmailService() - user_warning = report_service.create_admin_action( + user_warning = report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="user_warning", @@ -226,7 +226,7 @@ def test_it_sends_an_email_on_user_warning_for_comment_report_when_workout_is_de db.session.delete(workout_cycling_user_2) db.session.flush() - report_email_service.send_admin_action_email( + report_email_service.send_report_action_email( report, "user_warning", None, user_warning ) @@ -272,7 +272,7 @@ def test_it_sends_an_email_on_user_warning_for_workout_report( workout=workout_cycling_user_2, ) report_email_service = ReportEmailService() - user_warning = report_service.create_admin_action( + user_warning = report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="user_warning", @@ -281,7 +281,7 @@ def test_it_sends_an_email_on_user_warning_for_workout_report( ) db.session.flush() - report_email_service.send_admin_action_email( + report_email_service.send_report_action_email( report, "user_warning", None, user_warning ) @@ -329,7 +329,7 @@ def test_it_sends_an_email_on_user_warning_for_workout_with_gpx_report( workout=workout_cycling_user_2, ) report_email_service = ReportEmailService() - user_warning = report_service.create_admin_action( + user_warning = report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="user_warning", @@ -338,7 +338,7 @@ def test_it_sends_an_email_on_user_warning_for_workout_with_gpx_report( ) db.session.flush() - report_email_service.send_admin_action_email( + report_email_service.send_report_action_email( report, "user_warning", None, user_warning ) @@ -390,7 +390,7 @@ def test_it_sends_an_email_on_user_warning_for_user_report( user_3.suspended_at = datetime.utcnow() db.session.flush() report_email_service = ReportEmailService() - user_warning = report_service.create_admin_action( + user_warning = report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="user_warning_lifting", @@ -399,7 +399,7 @@ def test_it_sends_an_email_on_user_warning_for_user_report( ) db.session.flush() - report_email_service.send_admin_action_email( + report_email_service.send_report_action_email( report, "user_warning_lifting", None, user_warning ) @@ -435,7 +435,7 @@ def test_it_sends_an_email_on_user_warning_for_comment_report( workout=workout_cycling_user_2, ) report_email_service = ReportEmailService() - user_warning = report_service.create_admin_action( + user_warning = report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="user_warning_lifting", @@ -444,7 +444,7 @@ def test_it_sends_an_email_on_user_warning_for_comment_report( ) db.session.flush() - report_email_service.send_admin_action_email( + report_email_service.send_report_action_email( report, "user_warning_lifting", None, user_warning ) @@ -488,7 +488,7 @@ def test_it_sends_an_email_on_user_warning_for_workout_report( workout=workout_cycling_user_2, ) report_email_service = ReportEmailService() - user_warning = report_service.create_admin_action( + user_warning = report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="user_warning_lifting", @@ -497,7 +497,7 @@ def test_it_sends_an_email_on_user_warning_for_workout_report( ) db.session.flush() - report_email_service.send_admin_action_email( + report_email_service.send_report_action_email( report, "user_warning_lifting", None, user_warning ) @@ -542,7 +542,7 @@ def test_it_sends_an_email_on_user_warning_for_workout_with_gpx_report( workout=workout_cycling_user_2, ) report_email_service = ReportEmailService() - user_warning = report_service.create_admin_action( + user_warning = report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="user_warning_lifting", @@ -551,7 +551,7 @@ def test_it_sends_an_email_on_user_warning_for_workout_with_gpx_report( ) db.session.flush() - report_email_service.send_admin_action_email( + report_email_service.send_report_action_email( report, "user_warning_lifting", None, user_warning ) @@ -604,7 +604,7 @@ def test_it_sends_an_email_on_comment_suspension( ) report_email_service = ReportEmailService() - report_email_service.send_admin_action_email( + report_email_service.send_report_action_email( report, "comment_suspension", input_reason.get("reason") ) @@ -651,7 +651,7 @@ def test_it_sends_an_email_on_comment_suspension_when_workout_is_deleted( db.session.delete(workout_cycling_user_2) db.session.flush() - report_email_service.send_admin_action_email( + report_email_service.send_report_action_email( report, "comment_suspension", None ) @@ -699,7 +699,7 @@ def test_it_sends_an_email_on_comment_reactivation( db.session.flush() report_email_service = ReportEmailService() - report_email_service.send_admin_action_email( + report_email_service.send_report_action_email( report, "comment_unsuspension", input_reason.get("reason") ) @@ -748,7 +748,7 @@ def test_it_sends_an_email_on_comment_reactivation_when_workout_is_deleted( db.session.flush() report_email_service = ReportEmailService() - report_email_service.send_admin_action_email( + report_email_service.send_report_action_email( report, "comment_unsuspension", None ) @@ -796,7 +796,7 @@ def test_it_sends_an_email_on_workout_suspension( ) report_email_service = ReportEmailService() - report_email_service.send_admin_action_email( + report_email_service.send_report_action_email( report, "workout_suspension", input_reason.get("reason") ) @@ -842,7 +842,7 @@ def test_it_sends_an_email_on_workout_with_gpx_suspension( ) report_email_service = ReportEmailService() - report_email_service.send_admin_action_email( + report_email_service.send_report_action_email( report, "workout_suspension", None ) @@ -893,7 +893,7 @@ def test_it_sends_an_email_on_workout_reactivation( db.session.flush() report_email_service = ReportEmailService() - report_email_service.send_admin_action_email( + report_email_service.send_report_action_email( report, "workout_unsuspension", input_reason.get("reason") ) @@ -941,7 +941,7 @@ def test_it_sends_an_email_on_workout_with_gpx_reactivation( db.session.flush() report_email_service = ReportEmailService() - report_email_service.send_admin_action_email( + report_email_service.send_report_action_email( report, "workout_unsuspension", None ) diff --git a/fittrackee/tests/reports/test_reports_model.py b/fittrackee/tests/reports/test_reports_model.py index ed008b3a6..9a65dba4d 100644 --- a/fittrackee/tests/reports/test_reports_model.py +++ b/fittrackee/tests/reports/test_reports_model.py @@ -1080,27 +1080,27 @@ def test_it_returns_serialized_object_with_report_actions( ) db.session.add(report) db.session.flush() - admin_action_1 = ReportAction( + report_action_1 = ReportAction( action_type="user_suspension", admin_user_id=user_1_admin.id, report_id=report.id, user_id=user_3.id, ) - db.session.add(admin_action_1) - admin_action_2 = ReportAction( + db.session.add(report_action_1) + report_action_2 = ReportAction( action_type="report_resolution", admin_user_id=user_1_admin.id, report_id=report.id, ) - db.session.add(admin_action_2) + db.session.add(report_action_2) db.session.commit() serialized_report = report.serialize(user_1_admin, full=True) assert serialized_report == { "report_actions": [ - admin_action_1.serialize(user_1_admin, full=False), - admin_action_2.serialize(user_1_admin, full=False), + report_action_1.serialize(user_1_admin, full=False), + report_action_2.serialize(user_1_admin, full=False), ], "created_at": report.created_at, "comments": [], diff --git a/fittrackee/tests/reports/test_reports_service.py b/fittrackee/tests/reports/test_reports_service.py index 16dd40960..d40d8915c 100644 --- a/fittrackee/tests/reports/test_reports_service.py +++ b/fittrackee/tests/reports/test_reports_service.py @@ -568,7 +568,7 @@ def test_it_creates_a_report_comment_when_it_updates_report( assert report_comment.created_at == now assert report_comment.user_id == user_1_admin.id - def test_it_does_not_create_admin_action_on_report_comment( + def test_it_does_not_create_report_action_on_report_comment( self, app: Flask, user_1_admin: User, user_2: User, user_3: User ) -> None: report_service = ReportService() @@ -799,14 +799,14 @@ def test_it_raises_exception_when_reported_user_does_not_exist( with pytest.raises( InvalidReportActionException, match="invalid 'username'" ): - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="user_suspension", data={"username": user_3.username}, ) - def test_it_raises_exception_when_admin_action_is_invalid( + def test_it_raises_exception_when_report_action_is_invalid( self, app: Flask, user_1_admin: User, user_2: User, user_3: User ) -> None: report_service = ReportService() @@ -817,7 +817,7 @@ def test_it_raises_exception_when_admin_action_is_invalid( with pytest.raises( InvalidReportActionException, match="invalid action type" ): - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, action_type=self.random_string(), @@ -839,7 +839,7 @@ def test_it_raises_exception_when_username_is_missing( with pytest.raises( InvalidReportActionException, match="'username' is missing" ): - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="user_suspension", @@ -857,7 +857,7 @@ def test_it_raises_exception_when_username_does_not_match_reported_user_username with pytest.raises( InvalidReportActionException, match="invalid 'username'" ): - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="user_suspension", @@ -874,7 +874,7 @@ def test_it_suspends_user( now = datetime.utcnow() with travel(now, tick=False): - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="user_suspension", @@ -901,7 +901,7 @@ def test_it_raises_exception_when_user_already_suspended( UserAlreadySuspendedException, match=f"user '{user_3.username}' already suspended", ): - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="user_suspension", @@ -919,7 +919,7 @@ def test_it_reactivates_user( user_3.suspended_at = datetime.utcnow() db.session.flush() - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="user_unsuspension", @@ -933,7 +933,7 @@ def test_it_reactivates_user( ) @pytest.mark.parametrize('input_reason', [{}, {"reason": "some reason"}]) - def test_it_creates_admin_action_for_user_suspension( + def test_it_creates_report_action_for_user_suspension( self, app: Flask, user_1_admin: User, @@ -948,7 +948,7 @@ def test_it_creates_admin_action_for_user_suspension( now = datetime.utcnow() with travel(now, tick=False): - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="user_suspension", @@ -968,7 +968,7 @@ def test_it_creates_admin_action_for_user_suspension( assert report_action.user_id == user_3.id assert report_action.workout_id is None - def test_it_creates_admin_action_for_user_reactivation( + def test_it_creates_report_action_for_user_reactivation( self, app: Flask, user_1_admin: User, user_2: User, user_3: User ) -> None: report_service = ReportService() @@ -978,7 +978,7 @@ def test_it_creates_admin_action_for_user_reactivation( user_3.suspended_at = datetime.utcnow() db.session.flush() - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="user_unsuspension", @@ -996,7 +996,7 @@ def test_it_creates_admin_action_for_user_reactivation( assert report_action.user_id == user_3.id assert report_action.workout_id is None - def test_it_creates_admin_action_for_user_warning_on_user_report( + def test_it_creates_report_action_for_user_warning_on_user_report( self, app: Flask, user_1_admin: User, user_2: User, user_3: User ) -> None: report_service = ReportService() @@ -1004,7 +1004,7 @@ def test_it_creates_admin_action_for_user_warning_on_user_report( report_service, reporter=user_2, reported_user=user_3 ) - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="user_warning", @@ -1022,7 +1022,7 @@ def test_it_creates_admin_action_for_user_warning_on_user_report( assert report_action.user_id == user_3.id assert report_action.workout_id is None - def test_it_creates_admin_action_for_user_warning_on_comment_report( + def test_it_creates_report_action_for_user_warning_on_comment_report( self, app: Flask, user_1_admin: User, @@ -1039,7 +1039,7 @@ def test_it_creates_admin_action_for_user_warning_on_comment_report( workout=workout_cycling_user_2, ) - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="user_warning", @@ -1057,7 +1057,7 @@ def test_it_creates_admin_action_for_user_warning_on_comment_report( assert report_action.user_id == user_3.id assert report_action.workout_id is None - def test_it_creates_admin_action_for_user_warning_on_workout_report( + def test_it_creates_report_action_for_user_warning_on_workout_report( self, app: Flask, user_1_admin: User, @@ -1073,7 +1073,7 @@ def test_it_creates_admin_action_for_user_warning_on_workout_report( workout=workout_cycling_user_2, ) - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="user_warning", @@ -1098,7 +1098,7 @@ def test_it_raises_exception_when_user_warning_already_exists_for_report( report = self.create_report_for_user( report_service, reporter=user_2, reported_user=user_3 ) - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="user_warning", @@ -1109,14 +1109,14 @@ def test_it_raises_exception_when_user_warning_already_exists_for_report( UserWarningExistsException, match="user already warned", ): - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="user_warning", data={"username": user_3.username}, ) - def test_it_creates_admin_action_for_user_warning_when_warning_exists_for_another_report( # noqa + def test_it_creates_report_action_for_user_warning_when_warning_exists_for_another_report( # noqa self, app: Flask, user_1_admin: User, @@ -1131,14 +1131,14 @@ def test_it_creates_admin_action_for_user_warning_when_warning_exists_for_anothe another_report = self.create_report_for_user( report_service, reporter=user_4, reported_user=user_3 ) - report_service.create_admin_action( + report_service.create_report_action( report=another_report, admin_user=user_1_admin, action_type="user_warning", data={"username": user_3.username}, ) - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="user_warning", @@ -1179,7 +1179,7 @@ def test_it_raises_exception_when_report_is_invalid( with pytest.raises( InvalidReportActionException, match="'comment_id' is missing" ): - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="comment_suspension", @@ -1206,7 +1206,7 @@ def test_it_raises_exception_when_comment_id_does_not_match_reported_object_id( with pytest.raises( InvalidReportActionException, match="invalid 'comment_id'" ): - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="comment_suspension", @@ -1239,7 +1239,7 @@ def test_it_raises_error_when_comment_is_already_suspended( "already suspended" ), ): - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="comment_suspension", @@ -1265,7 +1265,7 @@ def test_it_suspends_comment( now = datetime.utcnow() with travel(now, tick=False): - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="comment_suspension", @@ -1280,7 +1280,7 @@ def test_it_suspends_comment( ) @pytest.mark.parametrize('input_reason', [{}, {"reason": "some reason"}]) - def test_it_creates_admin_action_for_comment_suspension( + def test_it_creates_report_action_for_comment_suspension( self, app: Flask, user_1_admin: User, @@ -1300,7 +1300,7 @@ def test_it_creates_admin_action_for_comment_suspension( now = datetime.utcnow() with travel(now, tick=False): - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, reason=input_reason.get("reason"), @@ -1340,7 +1340,7 @@ def test_it_unsuspends_comment( now = datetime.utcnow() with travel(now, tick=False): - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="comment_unsuspension", @@ -1354,7 +1354,7 @@ def test_it_unsuspends_comment( is None ) - def test_it_creates_admin_action_for_comment_unsuspension( + def test_it_creates_report_action_for_comment_unsuspension( self, app: Flask, user_1_admin: User, @@ -1375,7 +1375,7 @@ def test_it_creates_admin_action_for_comment_unsuspension( now = datetime.utcnow() with travel(now, tick=False): - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="comment_unsuspension", @@ -1417,7 +1417,7 @@ def test_it_raises_exception_when_report_is_invalid( with pytest.raises( InvalidReportActionException, match="'workout_id' is missing" ): - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="workout_suspension", @@ -1443,7 +1443,7 @@ def test_it_raises_exception_when_workout_id_does_not_match_reported_object_id( with pytest.raises( InvalidReportActionException, match="invalid 'workout_id'" ): - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="workout_suspension", @@ -1475,7 +1475,7 @@ def test_it_raises_error_when_workout_is_already_suspended( "already suspended" ), ): - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="workout_suspension", @@ -1500,7 +1500,7 @@ def test_it_suspends_workout( now = datetime.utcnow() with travel(now, tick=False): - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="workout_suspension", @@ -1515,7 +1515,7 @@ def test_it_suspends_workout( ) @pytest.mark.parametrize('input_reason', [{}, {"reason": "some reason"}]) - def test_it_creates_admin_action_for_workout_suspension( + def test_it_creates_report_action_for_workout_suspension( self, app: Flask, user_1_admin: User, @@ -1534,7 +1534,7 @@ def test_it_creates_admin_action_for_workout_suspension( now = datetime.utcnow() with travel(now, tick=False): - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, reason=input_reason.get("reason"), @@ -1573,7 +1573,7 @@ def test_it_unsuspends_workout( now = datetime.utcnow() with travel(now, tick=False): - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="workout_unsuspension", @@ -1587,7 +1587,7 @@ def test_it_unsuspends_workout( is None ) - def test_it_creates_admin_action_for_workout_unsuspension( + def test_it_creates_report_action_for_workout_unsuspension( self, app: Flask, user_1_admin: User, @@ -1608,7 +1608,7 @@ def test_it_creates_admin_action_for_workout_unsuspension( now = datetime.utcnow() with travel(now, tick=False): - report_service.create_admin_action( + report_service.create_report_action( report=report, admin_user=user_1_admin, action_type="workout_unsuspension", @@ -1640,7 +1640,9 @@ class TestReportServiceProcessAppeal( def test_it_processes_user_suspension_appeal( self, app: Flask, user_1_admin: User, user_2: User, input_data: Dict ) -> None: - suspension_action = self.create_admin_user_action(user_1_admin, user_2) + suspension_action = self.create_report_user_action( + user_1_admin, user_2 + ) appeal = self.create_action_appeal(suspension_action.id, user_2) report_service = ReportService() now = datetime.utcnow() @@ -1666,7 +1668,9 @@ def test_it_unsuspends_user_when_appeal_is_approved( user_1_admin: User, user_2: User, ) -> None: - suspension_action = self.create_admin_user_action(user_1_admin, user_2) + suspension_action = self.create_report_user_action( + user_1_admin, user_2 + ) appeal = self.create_action_appeal(suspension_action.id, user_2) report_service = ReportService() now = datetime.utcnow() @@ -1686,7 +1690,9 @@ def test_it_creates_unsuspended_user_action_when_appeal_is_approved( user_1_admin: User, user_2: User, ) -> None: - suspension_action = self.create_admin_user_action(user_1_admin, user_2) + suspension_action = self.create_report_user_action( + user_1_admin, user_2 + ) appeal = self.create_action_appeal(suspension_action.id, user_2) report_service = ReportService() now = datetime.utcnow() @@ -1713,7 +1719,9 @@ def test_it_creates_unsuspended_user_action_when_appeal_is_approved( def test_it_raises_error_on_appeal_approval_when_user_is_already_reactivated( # noqa self, app: Flask, user_1_admin: User, user_2: User ) -> None: - suspension_action = self.create_admin_user_action(user_1_admin, user_2) + suspension_action = self.create_report_user_action( + user_1_admin, user_2 + ) appeal = self.create_action_appeal(suspension_action.id, user_2) user_2.suspended_at = None report_service = ReportService() @@ -1731,7 +1739,9 @@ def test_it_raises_error_on_appeal_approval_when_user_is_already_reactivated( # def test_it_raises_error_on_appeal_reject_when_user_has_been_reactivated( self, app: Flask, user_1_admin: User, user_2: User ) -> None: - suspension_action = self.create_admin_user_action(user_1_admin, user_2) + suspension_action = self.create_report_user_action( + user_1_admin, user_2 + ) appeal = self.create_action_appeal(suspension_action.id, user_2) user_2.suspended_at = None report_service = ReportService() @@ -1756,7 +1766,7 @@ def test_it_raises_error_on_appeal_reject_when_user_has_been_reactivated( def test_it_processes_user_warning_appeal( self, app: Flask, user_1_admin: User, user_2: User, input_data: Dict ) -> None: - warning_action = self.create_admin_user_action( + warning_action = self.create_report_user_action( user_1_admin, user_2, "user_warning" ) appeal = self.create_action_appeal(warning_action.id, user_2) @@ -1784,7 +1794,7 @@ def test_it_creates_user_warning_lifting_action_when_appeal_is_approved( user_1_admin: User, user_2: User, ) -> None: - warning_action = self.create_admin_user_action( + warning_action = self.create_report_user_action( user_1_admin, user_2, "user_warning" ) appeal = self.create_action_appeal(warning_action.id, user_2) @@ -1833,7 +1843,7 @@ def test_it_processes_comment_suspension_appeal( workout_cycling_user_2, text_visibility=PrivacyLevel.PUBLIC, ) - suspension_action = self.create_admin_comment_action( + suspension_action = self.create_report_comment_action( user_1_admin, user_3, comment ) comment_suspended_at = comment.suspended_at @@ -1876,7 +1886,7 @@ def test_it_creates_unsuspended_comment_action_when_appeal_is_approved( workout_cycling_user_2, text_visibility=PrivacyLevel.PUBLIC, ) - suspension_action = self.create_admin_comment_action( + suspension_action = self.create_report_comment_action( user_1_admin, user_3, comment ) db.session.flush() @@ -1917,7 +1927,7 @@ def test_it_raises_error_on_appeal_approval_when_comment_is_already_reactivated( workout_cycling_user_2, text_visibility=PrivacyLevel.PUBLIC, ) - suspension_action = self.create_admin_comment_action( + suspension_action = self.create_report_comment_action( user_1_admin, user_3, comment ) db.session.flush() @@ -1952,7 +1962,7 @@ def test_it_raises_error_on_appeal_reject_when_comment_has_been_reactivated( # workout_cycling_user_2, text_visibility=PrivacyLevel.PUBLIC, ) - suspension_action = self.create_admin_comment_action( + suspension_action = self.create_report_comment_action( user_1_admin, user_3, comment ) db.session.flush() @@ -1990,7 +2000,7 @@ def test_it_processes_workout_suspension_appeal( input_data: Dict, ) -> None: workout_cycling_user_2.workout_visibility = PrivacyLevel.PUBLIC - suspension_action = self.create_admin_workout_action( + suspension_action = self.create_report_workout_action( user_1_admin, user_2, workout_cycling_user_2 ) workout_cycling_user_2.suspended_at = datetime.utcnow() @@ -2028,7 +2038,7 @@ def test_it_creates_unsuspended_workout_action_when_appeal_is_approved( workout_cycling_user_2: Workout, ) -> None: workout_cycling_user_2.workout_visibility = PrivacyLevel.PUBLIC - suspension_action = self.create_admin_workout_action( + suspension_action = self.create_report_workout_action( user_1_admin, user_2, workout_cycling_user_2 ) workout_cycling_user_2.suspended_at = datetime.utcnow() @@ -2066,7 +2076,7 @@ def test_it_raises_error_on_appeal_approval_when_workout_is_already_reactivated( workout_cycling_user_2: Workout, ) -> None: workout_cycling_user_2.workout_visibility = PrivacyLevel.PUBLIC - suspension_action = self.create_admin_workout_action( + suspension_action = self.create_report_workout_action( user_1_admin, user_2, workout_cycling_user_2 ) db.session.flush() @@ -2094,7 +2104,7 @@ def test_it_raises_error_on_appeal_reject_when_workout_has_been_reactivated( # workout_cycling_user_2: Workout, ) -> None: workout_cycling_user_2.workout_visibility = PrivacyLevel.PUBLIC - suspension_action = self.create_admin_workout_action( + suspension_action = self.create_report_workout_action( user_1_admin, user_2, workout_cycling_user_2 ) db.session.flush() diff --git a/fittrackee/tests/users/test_auth_api.py b/fittrackee/tests/users/test_auth_api.py index bae537d8d..68db85e91 100644 --- a/fittrackee/tests/users/test_auth_api.py +++ b/fittrackee/tests/users/test_auth_api.py @@ -4078,7 +4078,7 @@ def test_it_returns_404_when_user_is_not_suspended( def test_it_returns_user_suspension( self, app: Flask, user_1_admin: User, user_2: User ) -> None: - action = self.create_admin_user_action(user_1_admin, user_2) + action = self.create_report_user_action(user_1_admin, user_2) user_2.suspended_at = datetime.utcnow() db.session.commit() client, auth_token = self.get_test_client_and_auth_token( @@ -4163,7 +4163,7 @@ def test_it_returns_404_when_when_user_is_not_suspended( def test_it_returns_400_when_no_text_provided( self, app: Flask, user_1_admin: User, user_2: User, input_data: Dict ) -> None: - self.create_admin_user_action(user_1_admin, user_2) + self.create_report_user_action(user_1_admin, user_2) user_2.suspended_at = datetime.utcnow() db.session.commit() client, auth_token = self.get_test_client_and_auth_token( @@ -4182,7 +4182,7 @@ def test_it_returns_400_when_no_text_provided( def test_user_can_appeal_user_suspension( self, app: Flask, user_1_admin: User, user_2: User ) -> None: - action = self.create_admin_user_action(user_1_admin, user_2) + action = self.create_report_user_action(user_1_admin, user_2) user_2.suspended_at = datetime.utcnow() db.session.commit() client, auth_token = self.get_test_client_and_auth_token( @@ -4213,7 +4213,7 @@ def test_user_can_appeal_user_suspension( def test_user_can_appeal_user_suspension_only_once( self, app: Flask, user_1_admin: User, user_2: User ) -> None: - action = self.create_admin_user_action(user_1_admin, user_2) + action = self.create_report_user_action(user_1_admin, user_2) user_2.suspended_at = datetime.utcnow() db.session.commit() appeal = ReportActionAppeal( @@ -4299,7 +4299,7 @@ def test_it_returns_404_when_warning_does_not_exist( def test_it_returns_404_when_warning_is_for_another_user( self, app: Flask, user_1_admin: User, user_2: User, user_3: User ) -> None: - action = self.create_admin_user_action( + action = self.create_report_user_action( user_1_admin, user_3, action_type="user_warning" ) client, auth_token = self.get_test_client_and_auth_token( @@ -4320,7 +4320,7 @@ def test_it_returns_404_when_warning_is_for_another_user( def test_it_returns_user_warning( self, app: Flask, user_1_admin: User, user_2: User ) -> None: - action = self.create_admin_user_action( + action = self.create_report_user_action( user_1_admin, user_2, action_type="user_warning" ) client, auth_token = self.get_test_client_and_auth_token( @@ -4405,7 +4405,7 @@ def test_it_returns_404_when_when_no_user_warning( def test_it_returns_400_when_no_text_provided( self, app: Flask, user_1_admin: User, user_2: User, input_data: Dict ) -> None: - action = self.create_admin_user_action( + action = self.create_report_user_action( user_1_admin, user_2, action_type="user_warning" ) db.session.commit() @@ -4425,7 +4425,7 @@ def test_it_returns_400_when_no_text_provided( def test_user_can_appeal_user_warning( self, app: Flask, user_1_admin: User, user_2: User ) -> None: - action = self.create_admin_user_action( + action = self.create_report_user_action( user_1_admin, user_2, action_type="user_warning" ) client, auth_token = self.get_test_client_and_auth_token( @@ -4456,7 +4456,7 @@ def test_user_can_appeal_user_warning( def test_user_can_appeal_user_warning_only_once( self, app: Flask, user_1_admin: User, user_2: User ) -> None: - action = self.create_admin_user_action( + action = self.create_report_user_action( user_1_admin, user_2, action_type="user_warning" ) appeal = ReportActionAppeal( @@ -4492,7 +4492,7 @@ def test_expected_scopes_are_defined( client_scope: str, can_access: bool, ) -> None: - action = self.create_admin_user_action( + action = self.create_report_user_action( user_1_admin, user_2, action_type="user_warning" ) ( diff --git a/fittrackee/tests/users/test_users_model.py b/fittrackee/tests/users/test_users_model.py index 1094cbfea..4e7a84e28 100644 --- a/fittrackee/tests/users/test_users_model.py +++ b/fittrackee/tests/users/test_users_model.py @@ -1242,7 +1242,7 @@ def test_suspension_action_is_none_when_no_suspension_for_given_user( report_action = ReportAction( admin_user_id=user_1_admin.id, action_type=action_type, - report_id=self.create_admin_user_action( + report_id=self.create_report_user_action( user_1_admin, user_2, action_type ).id, user_id=user_2.id, @@ -1269,17 +1269,17 @@ def test_suspension_action_is_last_suspension_action_when_user_is_suspended( # ) db.session.add(report_action) db.session.flush() - expected_admin_action = ReportAction( + expected_report_action = ReportAction( admin_user_id=user_1_admin.id, action_type="user_suspension", report_id=report_id, user_id=user_2.id, ) user_2.suspended_at = datetime.utcnow() - db.session.add(expected_admin_action) + db.session.add(expected_report_action) db.session.commit() - assert user_2.suspension_action == expected_admin_action + assert user_2.suspension_action == expected_report_action def test_suspension_action_is_none_when_user_is_unsuspended( self, app: Flask, user_1_admin: User, user_2: User diff --git a/fittrackee/tests/users/test_users_notifications_api.py b/fittrackee/tests/users/test_users_notifications_api.py index 0343396ca..4061777c3 100644 --- a/fittrackee/tests/users/test_users_notifications_api.py +++ b/fittrackee/tests/users/test_users_notifications_api.py @@ -1099,7 +1099,7 @@ def test_it_returns_suspension_appeal_notification( user_2_admin: User, user_3: User, ) -> None: - report_action = self.create_admin_user_action(user_2_admin, user_3) + report_action = self.create_report_user_action(user_2_admin, user_3) self.create_action_appeal(report_action.id, user_3) client, auth_token = self.get_test_client_and_auth_token( app, user_1_admin.email @@ -1422,7 +1422,7 @@ def test_it_returns_unread_as_true_when_user_has_unread_suspension_notification( user_2_admin: User, user_3: User, ) -> None: - report_action = self.create_admin_user_action(user_2_admin, user_3) + report_action = self.create_report_user_action(user_2_admin, user_3) Notification.query.update({Notification.marked_as_read: True}) db.session.commit() self.create_action_appeal(report_action.id, user_3) diff --git a/fittrackee/tests/users/test_users_notifications_model.py b/fittrackee/tests/users/test_users_notifications_model.py index c051fd64e..737e10ece 100644 --- a/fittrackee/tests/users/test_users_notifications_model.py +++ b/fittrackee/tests/users/test_users_notifications_model.py @@ -492,8 +492,8 @@ def test_it_serializes_workout_comment_notification( class TestNotificationForWorkoutReportAction( NotificationTestCase, ReportMixin ): - @pytest.mark.parametrize("input_admin_action", WORKOUT_ACTION_TYPES) - def test_it_creates_notification_on_comment_admin_action( + @pytest.mark.parametrize("input_report_action", WORKOUT_ACTION_TYPES) + def test_it_creates_notification_on_comment_report_action( self, app: Flask, user_1_admin: User, @@ -501,16 +501,16 @@ def test_it_creates_notification_on_comment_admin_action( user_3: User, sport_1_cycling: Sport, workout_cycling_user_2: Workout, - input_admin_action: str, + input_report_action: str, ) -> None: report = self.create_report( reporter=user_3, reported_object=workout_cycling_user_2 ) - report_action = self.create_admin_action( + report_action = self.create_report_action( user_1_admin, user_2, - action_type=input_admin_action, + action_type=input_report_action, report_id=report.id, workout_id=workout_cycling_user_2.id, ) @@ -522,9 +522,9 @@ def test_it_creates_notification_on_comment_admin_action( ).first() assert notification.created_at == report_action.created_at assert notification.marked_as_read is False - assert notification.event_type == input_admin_action + assert notification.event_type == input_report_action - @pytest.mark.parametrize("input_admin_action", WORKOUT_ACTION_TYPES) + @pytest.mark.parametrize("input_report_action", WORKOUT_ACTION_TYPES) def test_it_serializes_comment_action_notification( self, app: Flask, @@ -533,15 +533,15 @@ def test_it_serializes_comment_action_notification( user_3: User, sport_1_cycling: Sport, workout_cycling_user_2: Workout, - input_admin_action: str, + input_report_action: str, ) -> None: report = self.create_report( reporter=user_3, reported_object=workout_cycling_user_2 ) - report_action = self.create_admin_action( + report_action = self.create_report_action( user_1_admin, user_2, - action_type=input_admin_action, + action_type=input_report_action, report_id=report.id, workout_id=workout_cycling_user_2.id, ) @@ -560,7 +560,7 @@ def test_it_serializes_comment_action_notification( assert serialized_notification["from"] is None assert serialized_notification["id"] == notification.id assert serialized_notification["marked_as_read"] is False - assert serialized_notification["type"] == input_admin_action + assert serialized_notification["type"] == input_report_action assert serialized_notification[ "workout" ] == workout_cycling_user_2.serialize(user=user_2) @@ -790,8 +790,8 @@ def test_it_serializes_comment_like_notification( class TestNotificationForCommentReportAction( NotificationTestCase, ReportMixin ): - @pytest.mark.parametrize("input_admin_action", COMMENT_ACTION_TYPES) - def test_it_creates_notification_on_comment_admin_action( + @pytest.mark.parametrize("input_report_action", COMMENT_ACTION_TYPES) + def test_it_creates_notification_on_comment_report_action( self, app: Flask, user_1_admin: User, @@ -799,15 +799,15 @@ def test_it_creates_notification_on_comment_admin_action( user_3: User, sport_1_cycling: Sport, workout_cycling_user_2: Workout, - input_admin_action: str, + input_report_action: str, ) -> None: comment = self.comment_workout(user_3, workout_cycling_user_2) report = self.create_report(reporter=user_2, reported_object=comment) - report_action = self.create_admin_action( + report_action = self.create_report_action( user_1_admin, user_3, - action_type=input_admin_action, + action_type=input_report_action, report_id=report.id, comment_id=comment.id, ) @@ -819,9 +819,9 @@ def test_it_creates_notification_on_comment_admin_action( ).first() assert notification.created_at == report_action.created_at assert notification.marked_as_read is False - assert notification.event_type == input_admin_action + assert notification.event_type == input_report_action - @pytest.mark.parametrize("input_admin_action", COMMENT_ACTION_TYPES) + @pytest.mark.parametrize("input_report_action", COMMENT_ACTION_TYPES) def test_it_serializes_comment_action_notification( self, app: Flask, @@ -830,14 +830,14 @@ def test_it_serializes_comment_action_notification( user_3: User, sport_1_cycling: Sport, workout_cycling_user_2: Workout, - input_admin_action: str, + input_report_action: str, ) -> None: comment = self.comment_workout(user_3, workout_cycling_user_2) report = self.create_report(reporter=user_2, reported_object=comment) - report_action = self.create_admin_action( + report_action = self.create_report_action( user_1_admin, user_3, - action_type=input_admin_action, + action_type=input_report_action, report_id=report.id, comment_id=comment.id, ) @@ -857,7 +857,7 @@ def test_it_serializes_comment_action_notification( assert serialized_notification["from"] is None assert serialized_notification["id"] == notification.id assert serialized_notification["marked_as_read"] is False - assert serialized_notification["type"] == input_admin_action + assert serialized_notification["type"] == input_report_action assert "report" not in serialized_notification assert "workout" not in serialized_notification @@ -1275,7 +1275,9 @@ class TestNotificationForSuspensionAppeal(ReportMixin): def test_it_does_not_create_notification_when_admin_is_inactive( self, app: Flask, user_1_admin: User, user_2: User, user_3: User ) -> None: - suspension_action = self.create_admin_user_action(user_1_admin, user_2) + suspension_action = self.create_report_user_action( + user_1_admin, user_2 + ) self.create_action_appeal( suspension_action.id, user_2, with_commit=False ) @@ -1291,7 +1293,9 @@ def test_it_does_not_create_notification_when_admin_is_inactive( def test_it_creates_notification_on_appeal( self, app: Flask, user_1_admin: User, user_2: User ) -> None: - suspension_action = self.create_admin_user_action(user_1_admin, user_2) + suspension_action = self.create_report_user_action( + user_1_admin, user_2 + ) appeal = self.create_action_appeal(suspension_action.id, user_2) notification = Notification.query.filter_by( @@ -1307,7 +1311,7 @@ def test_it_serializes_suspension_appeal_notification( self, app: Flask, user_1_admin: User, user_2: User, user_3: User ) -> None: report = self.create_report(reporter=user_3, reported_object=user_2) - suspension_action = self.create_admin_user_action( + suspension_action = self.create_report_user_action( user_1_admin, user_2, report_id=report.id ) self.create_action_appeal(suspension_action.id, user_2) @@ -1346,7 +1350,7 @@ def test_it_creates_notification_on_user_action_on_user_report( ) -> None: report = self.create_report(reporter=user_2, reported_object=user_3) - report_action = self.create_admin_action( + report_action = self.create_report_action( user_1_admin, user_3, action_type=input_action_type, @@ -1375,7 +1379,7 @@ def test_it_serializes_user_action_notification_on_user_report( input_action_type: str, ) -> None: report = self.create_report(reporter=user_2, reported_object=user_3) - report_action = self.create_admin_action( + report_action = self.create_report_action( user_1_admin, user_3, action_type=input_action_type, @@ -1417,7 +1421,7 @@ def test_it_creates_notification_on_user_action_on_workout_report( reporter=user_3, reported_object=workout_cycling_user_2 ) - report_action = self.create_admin_action( + report_action = self.create_report_action( user_1_admin, user_2, action_type=input_action_type, @@ -1449,7 +1453,7 @@ def test_it_serializes_user_action_notification_on_workout_report( report = self.create_report( reporter=user_3, reported_object=workout_cycling_user_2 ) - report_action = self.create_admin_action( + report_action = self.create_report_action( user_1_admin, user_2, action_type=input_action_type, @@ -1492,7 +1496,7 @@ def test_it_creates_notification_on_user_action_on_comment_report( comment = self.comment_workout(user_3, workout_cycling_user_2) report = self.create_report(reporter=user_2, reported_object=comment) - report_action = self.create_admin_action( + report_action = self.create_report_action( user_1_admin, user_3, action_type=input_action_type, @@ -1523,7 +1527,7 @@ def test_it_serializes_user_action_notification_on_comment_report( ) -> None: comment = self.comment_workout(user_3, workout_cycling_user_2) report = self.create_report(reporter=user_2, reported_object=comment) - report_action = self.create_admin_action( + report_action = self.create_report_action( user_1_admin, user_3, action_type=input_action_type, @@ -1554,7 +1558,7 @@ def test_it_does_not_create_notification_when_admin_is_inactive( self, app: Flask, user_1_admin: User, user_2: User, user_3: User ) -> None: report = self.create_report(reporter=user_2, reported_object=user_3) - report_action = self.create_admin_action( + report_action = self.create_report_action( user_1_admin, user_2, action_type="user_warning", @@ -1575,7 +1579,7 @@ def test_it_creates_notification_on_appeal( self, app: Flask, user_1_admin: User, user_2: User, user_3: User ) -> None: report = self.create_report(reporter=user_2, reported_object=user_3) - report_action = self.create_admin_action( + report_action = self.create_report_action( user_1_admin, user_2, action_type="user_warning", @@ -1596,7 +1600,7 @@ def test_it_serializes_user_warning_appeal_notification( self, app: Flask, user_1_admin: User, user_2: User, user_3: User ) -> None: report = self.create_report(reporter=user_2, reported_object=user_3) - report_action = self.create_admin_action( + report_action = self.create_report_action( user_1_admin, user_2, action_type="user_warning", diff --git a/fittrackee/tests/users/test_users_service.py b/fittrackee/tests/users/test_users_service.py index dc00f6a87..8eac8e0de 100644 --- a/fittrackee/tests/users/test_users_service.py +++ b/fittrackee/tests/users/test_users_service.py @@ -354,7 +354,7 @@ def test_it_does_not_update_suspended_when_suspended_is_none( 'input_suspended, expected_action_action', [(True, "user_suspension"), (False, "user_unsuspension")], ) - def test_it_creates_admin_action_when_updated_suspended_status( + def test_it_creates_report_action_when_updated_suspended_status( self, app: Flask, user_1_admin: User, diff --git a/fittrackee/tests/workouts/test_workouts_api_1_post.py b/fittrackee/tests/workouts/test_workouts_api_1_post.py index 68bb4095f..f0f69bc85 100644 --- a/fittrackee/tests/workouts/test_workouts_api_1_post.py +++ b/fittrackee/tests/workouts/test_workouts_api_1_post.py @@ -3720,7 +3720,7 @@ def test_it_returns_400_if_workout_is_not_suspended( self.assert_400(response, error_message="workout is not suspended") - def test_it_returns_400_if_suspended_workout_has_no_admin_action( + def test_it_returns_400_if_suspended_workout_has_no_report_action( self, app: Flask, user_1: User, @@ -3755,7 +3755,7 @@ def test_it_returns_400_when_appeal_text_is_missing( input_data: Dict, ) -> None: workout_cycling_user_1.suspended_at = datetime.utcnow() - self.create_admin_workout_action( + self.create_report_workout_action( user_2_admin, user_1, workout_cycling_user_1 ) db.session.commit() @@ -3781,7 +3781,7 @@ def test_user_can_appeal_comment_suspension( workout_cycling_user_1: Workout, ) -> None: workout_cycling_user_1.suspended_at = datetime.utcnow() - action = self.create_admin_workout_action( + action = self.create_report_workout_action( user_2_admin, user_1, workout_cycling_user_1 ) db.session.commit() @@ -3819,7 +3819,7 @@ def test_user_can_appeal_comment_suspension_only_once( workout_cycling_user_1: Workout, ) -> None: workout_cycling_user_1.suspended_at = datetime.utcnow() - action = self.create_admin_workout_action( + action = self.create_report_workout_action( user_2_admin, user_1, workout_cycling_user_1 ) db.session.flush() diff --git a/fittrackee/tests/workouts/test_workouts_model.py b/fittrackee/tests/workouts/test_workouts_model.py index da8c413b4..2dbe3ccdf 100644 --- a/fittrackee/tests/workouts/test_workouts_model.py +++ b/fittrackee/tests/workouts/test_workouts_model.py @@ -79,13 +79,13 @@ def test_suspension_action_is_last_suspension_action_when_comment_is_suspended( sport_1_cycling: Sport, workout_cycling_user_2: Workout, ) -> None: - expected_admin_action = self.create_admin_workout_action( + expected_report_action = self.create_report_workout_action( user_1_admin, user_2, workout_cycling_user_2 ) workout_cycling_user_2.suspended_at = datetime.utcnow() assert ( - workout_cycling_user_2.suspension_action == expected_admin_action + workout_cycling_user_2.suspension_action == expected_report_action ) def test_suspension_action_is_none_when_comment_is_unsuspended( @@ -96,7 +96,7 @@ def test_suspension_action_is_none_when_comment_is_unsuspended( sport_1_cycling: Sport, workout_cycling_user_2: Workout, ) -> None: - self.create_admin_workout_action( + self.create_report_workout_action( user_1_admin, user_2, workout_cycling_user_2 ) workout_cycling_user_2.suspended_at = None @@ -347,7 +347,7 @@ def test_it_serializes_suspended_workout( ) -> None: workout_cycling_user_1.workout_visibility = input_workout_visibility workout_cycling_user_1.suspended_at = datetime.utcnow() - expected_admin_action = self.create_admin_workout_action( + expected_report_action = self.create_report_workout_action( user_2_admin, user_1, workout_cycling_user_1 ) @@ -386,7 +386,7 @@ def test_it_serializes_suspended_workout( 'sport_id': workout_cycling_user_1.sport_id, 'suspended': True, 'suspended_at': workout_cycling_user_1.suspended_at, - 'suspension': expected_admin_action.serialize(user_1, full=False), + 'suspension': expected_report_action.serialize(user_1, full=False), 'title': None, 'user': user_1.serialize(), 'weather_end': None, @@ -511,7 +511,7 @@ def test_it_serializes_minimal_suspended_workout( workout_cycling_user_1: Workout, ) -> None: workout_cycling_user_1.suspended_at = datetime.utcnow() - self.create_admin_workout_action( + self.create_report_workout_action( user_2_admin, user_1, workout_cycling_user_1 ) @@ -1005,7 +1005,7 @@ def test_serialize_returns_suspended_workout_when_user_commented_workout( workout_cycling_user_1, text_visibility=PrivacyLevel.FOLLOWERS, ) - self.create_admin_workout_action( + self.create_report_workout_action( user_2_admin, user_1, workout_cycling_user_1 ) workout_cycling_user_1.suspended_at = datetime.utcnow() @@ -1299,7 +1299,7 @@ def test_serialize_returns_suspended_workout_when_user_commented_workout( self.create_comment( user_3, workout_cycling_user_1, text_visibility=PrivacyLevel.PUBLIC ) - self.create_admin_workout_action( + self.create_report_workout_action( user_2_admin, user_1, workout_cycling_user_1 ) workout_cycling_user_1.suspended_at = datetime.utcnow() diff --git a/fittrackee_client/src/store/modules/reports/actions.ts b/fittrackee_client/src/store/modules/reports/actions.ts index e84dcadb8..ff56fc9c5 100644 --- a/fittrackee_client/src/store/modules/reports/actions.ts +++ b/fittrackee_client/src/store/modules/reports/actions.ts @@ -112,7 +112,7 @@ export const actions: ActionTree & IReportsActions = context.commit(REPORTS_STORE.MUTATIONS.SET_REPORT_UPDATE_LOADING, true) const { report_id, ...data } = payload authApi - .post(`reports/${report_id}/admin-actions`, data) + .post(`reports/${report_id}/actions`, data) .then((res) => { if (res.data.status === 'success') { context.commit(REPORTS_STORE.MUTATIONS.SET_REPORT, res.data.report)