chore: Refactor unnecessary else / elif when if block has a raise statement (#7328)

Co-authored-by: deepsource-autofix[bot] <62050782+deepsource-autofix[bot]@users.noreply.github.com>

Author: deepsource-autofix[bot]

app/api/attendees.py

@@ -90,12 +90,12 @@ def before_post(self, args, kwargs, data):
                     {'pointer': '/data/attributes/device_name_checkin'},
                     "Attendee needs to be checked in first",
                 )
-            elif 'checkin_times' not in data or data['checkin_times'] is None:
+            if 'checkin_times' not in data or data['checkin_times'] is None:
                 raise UnprocessableEntityError(
                     {'pointer': '/data/attributes/device_name_checkin'},
                     "Check in Times missing",
                 )
-            elif len(data['checkin_times'].split(",")) != len(
+            if len(data['checkin_times'].split(",")) != len(
                 data['device_name_checkin'].split(",")
             ):
                 raise UnprocessableEntityError(
@@ -232,44 +232,43 @@ def before_update_object(self, obj, data, kwargs):
                     {'pointer': '/data/attributes/checkin_times'},
                     "Check in time missing while trying to check in attendee",
                 )
-            else:
-                if obj.checkin_times and data[
-                    'checkin_times'
-                ] not in obj.checkin_times.split(","):
-                    data['checkin_times'] = '{},{}'.format(
-                        obj.checkin_times, data['checkin_times']
-                    )
-                elif obj.checkin_times and data[
-                    'checkin_times'
-                ] in obj.checkin_times.split(","):
-                    raise UnprocessableEntityError(
-                        {'pointer': '/data/attributes/checkin_times'},
-                        "Check in time already present",
+            if obj.checkin_times and data[
+                'checkin_times'
+            ] not in obj.checkin_times.split(","):
+                data['checkin_times'] = '{},{}'.format(
+                    obj.checkin_times, data['checkin_times']
+                )
+            elif obj.checkin_times and data[
+                'checkin_times'
+            ] in obj.checkin_times.split(","):
+                raise UnprocessableEntityError(
+                    {'pointer': '/data/attributes/checkin_times'},
+                    "Check in time already present",
+                )
+
+            if (
+                'device_name_checkin' in data
+                and data['device_name_checkin'] is not None
+            ):
+                if obj.device_name_checkin is not None:
+                    data['device_name_checkin'] = '{},{}'.format(
+                        obj.device_name_checkin, data['device_name_checkin']
                     )
 
-                if (
-                    'device_name_checkin' in data
-                    and data['device_name_checkin'] is not None
+                if len(data['checkin_times'].split(",")) != len(
+                    data['device_name_checkin'].split(",")
                 ):
-                    if obj.device_name_checkin is not None:
-                        data['device_name_checkin'] = '{},{}'.format(
-                            obj.device_name_checkin, data['device_name_checkin']
-                        )
-
-                    if len(data['checkin_times'].split(",")) != len(
-                        data['device_name_checkin'].split(",")
-                    ):
-                        raise UnprocessableEntityError(
-                            {'pointer': '/data/attributes/device_name_checkin'},
-                            "Check in Time missing for the corresponding device name",
-                        )
+                    raise UnprocessableEntityError(
+                        {'pointer': '/data/attributes/device_name_checkin'},
+                        "Check in Time missing for the corresponding device name",
+                    )
+            else:
+                if obj.device_name_checkin is not None:
+                    data['device_name_checkin'] = '{},{}'.format(
+                        obj.device_name_checkin, '-'
+                    )
                 else:
-                    if obj.device_name_checkin is not None:
-                        data['device_name_checkin'] = '{},{}'.format(
-                            obj.device_name_checkin, '-'
-                        )
-                    else:
-                        data['device_name_checkin'] = '-'
+                    data['device_name_checkin'] = '-'
 
         if 'is_checked_out' in data and data['is_checked_out']:
             attendee = safe_query(TicketHolder, 'id', kwargs['id'], 'attendee_id')

app/api/custom/attendees.py

@@ -33,7 +33,7 @@ def send_receipt():
                 {'source': ''},
                 'You need to be the event organizer or order buyer to send receipts.',
             )
-        elif order.status != 'completed':
+        if order.status != 'completed':
             abort(
                 make_response(
                     jsonify(error="Cannot send receipt for an incomplete order"), 409

app/api/data_layers/ChargesLayer.py

@@ -32,7 +32,7 @@ def create_object(self, data, view_kwargs):
                     view_kwargs['order_identifier']
                 ),
             )
-        elif (
+        if (
             order.status == 'cancelled'
             or order.status == 'expired'
             or order.status == 'completed'
@@ -41,7 +41,7 @@ def create_object(self, data, view_kwargs):
                 {'parameter': 'id'},
                 "You cannot charge payments on a cancelled, expired or completed order",
             )
-        elif (not order.amount) or order.amount == 0:
+        if (not order.amount) or order.amount == 0:
             raise ConflictError(
                 {'parameter': 'id'}, "You cannot charge payments on a free order"
             )

app/api/discount_codes.py

@@ -274,7 +274,7 @@ def before_get(self, args, kwargs):
                     raise MethodNotAllowed(
                         {'parameter': '{code}'}, "Discount Code is not active"
                     )
-                elif (
+                if (
                     current_time < discount.valid_from
                     or current_time > discount.valid_till
                 ):

app/api/events.py

@@ -681,8 +681,7 @@ def before_update_object(self, event, data, view_kwargs):
                 raise ForbiddenError(
                     {'source': ''}, "Event associated with orders cannot be deleted"
                 )
-            else:
-                event.deleted_at = data.get('deleted_at')
+            event.deleted_at = data.get('deleted_at')
 
         if (
             data.get('original_image_url')

app/api/orders.py

@@ -65,7 +65,7 @@ def check_event_user_ticket_holders(order, data, element):
         raise ForbiddenError(
             {'pointer': f'data/{element}'}, f"You cannot update {element} of an order",
         )
-    elif element == 'ticket_holders':
+    if element == 'ticket_holders':
         ticket_holders = []
         for ticket_holder in order.ticket_holders:
             ticket_holders.append(str(ticket_holder.id))
@@ -409,8 +409,7 @@ def before_update_object(self, order, data, view_kwargs):
                                 {'pointer': f'data/{element}'},
                                 f"You cannot update {element} of an order",
                             )
-                        else:
-                            check_event_user_ticket_holders(order, data, element)
+                        check_event_user_ticket_holders(order, data, element)
 
             else:
                 # Order created from the public pages.
@@ -424,7 +423,7 @@ def before_update_object(self, order, data, view_kwargs):
                                     {'pointer': f'data/{element}'},
                                     f"You cannot update {element} of an order",
                                 )
-                            elif (
+                            if (
                                 element == 'status'
                                 and order.amount
                                 and order.status == 'completed'
@@ -434,7 +433,7 @@ def before_update_object(self, order, data, view_kwargs):
                                     {'pointer': 'data/status'},
                                     "You cannot update the status of a completed paid order",
                                 )
-                            elif element == 'status' and order.status == 'cancelled':
+                            if element == 'status' and order.status == 'cancelled':
                                 # Since the tickets have been unlocked and we can't revert it.
                                 raise ForbiddenError(
                                     {'pointer': 'data/status'},
@@ -449,9 +448,8 @@ def before_update_object(self, order, data, view_kwargs):
                     {'pointer': ''},
                     "You cannot update a non-initialized or non-pending order",
                 )
-            else:
-                for element in data:
-                    if data[element]:
+            for element in data:
+                if data[element]:
                         if (
                             element == 'is_billing_enabled'
                             and order.status == 'completed'
@@ -463,7 +461,7 @@ def before_update_object(self, order, data, view_kwargs):
                                     element
                                 ),
                             )
-                        elif (
+                        if (
                             element not in relationships
                             and data[element] != getattr(order, element, None)
                             and element not in get_updatable_fields()
@@ -472,8 +470,7 @@ def before_update_object(self, order, data, view_kwargs):
                                 {'pointer': f'data/{element}'},
                                 f"You cannot update {element} of an order",
                             )
-                        else:
-                            check_event_user_ticket_holders(order, data, element)
+                        check_event_user_ticket_holders(order, data, element)
 
         if has_access('is_organizer', event_id=order.event_id) and 'order_notes' in data:
             if order.order_notes and data['order_notes'] not in order.order_notes.split(
@@ -488,7 +485,7 @@ def before_update_object(self, order, data, view_kwargs):
                 {'pointer': '/data/attributes/payment-mode'},
                 "payment-mode cannot be free for order with amount > 0",
             )
-        elif (
+        if (
             data.get('status') == 'completed'
             and data.get('payment_mode') == 'stripe'
             and not is_payment_valid(order, 'stripe')
@@ -497,7 +494,7 @@ def before_update_object(self, order, data, view_kwargs):
                 {'pointer': '/data/attributes/payment-mode'},
                 "insufficient data to verify stripe payment",
             )
-        elif (
+        if (
             data.get('status') == 'completed'
             and data.get('payment_mode') == 'paypal'
             and not is_payment_valid(order, 'paypal')
@@ -583,7 +580,7 @@ def before_delete_object(self, order, view_kwargs):
         """
         if not has_access('is_coorganizer', event_id=order.event.id):
             raise ForbiddenError({'source': ''}, 'Access Forbidden')
-        elif (
+        if (
             order.amount
             and order.amount > 0
             and (order.status == 'completed' or order.status == 'placed')

app/api/speakers.py

@@ -75,7 +75,7 @@ def before_post(self, args, kwargs, data=None):
                 {'pointer': 'data/attributes/is_email_overridden'},
                 'Organizer access required to override email',
             )
-        elif (
+        if (
             data.get('is_email_overridden')
             and has_access('is_organizer', event_id=data['event'])
             and not data.get('email')
@@ -186,7 +186,7 @@ def before_update_object(self, speaker, data, view_kwargs):
                 {'pointer': 'data/attributes/is_email_overridden'},
                 'Organizer access required to override email',
             )
-        elif (
+        if (
             data.get('is_email_overridden')
             and has_access('is_organizer', event_id=speaker.event_id)
             and not data.get('email')

app/api/users.py

@@ -274,13 +274,12 @@ def before_update_object(self, user, data, view_kwargs):
                             {'source': ''},
                             "Users associated with events cannot be deleted",
                         )
-                    elif len(user.orders) != 0:
+                    if len(user.orders) != 0:
                         raise ForbiddenError(
                             {'source': ''},
                             "Users associated with orders cannot be deleted",
                         )
-                    else:
-                        modify_email_for_user_to_be_deleted(user)
+                    modify_email_for_user_to_be_deleted(user)
                 else:
                     modify_email_for_user_to_be_restored(user)
                     data['email'] = user.email