Skip to content

Commit cae0a1a

Browse files
committed
Format using black
1 parent 9e6c613 commit cae0a1a

21 files changed

+171
-104
lines changed

app/api/attendees.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,7 @@ def before_update_object(self, obj, data, kwargs):
225225
'Only admin or that user itself can update attendee info',
226226
)
227227

228-
if order.status != 'initializing' and (
229-
'checkin_times' not in data
230-
):
228+
if order.status != 'initializing' and ('checkin_times' not in data):
231229
raise UnprocessableEntityError(
232230
{'pointer': '/data/id'},
233231
"Attendee can't be updated because the corresponding order is not in initializing state",

app/api/custom/invoices.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,11 @@ def order_invoices(order_identifier):
5656
order = Order.query.filter_by(identifier=order_identifier).first()
5757
except NoResultFound:
5858
raise NotFoundError({'source': ''}, 'Order Invoice not found')
59-
if (
60-
has_access(
61-
'is_coorganizer_or_user_itself',
62-
event_id=order.event_id,
63-
user_id=order.user_id,
64-
)
65-
or order.is_attendee(current_user)
66-
):
59+
if has_access(
60+
'is_coorganizer_or_user_itself',
61+
event_id=order.event_id,
62+
user_id=order.user_id,
63+
) or order.is_attendee(current_user):
6764
file_path = order.invoice_pdf_path
6865
if not os.path.isfile(file_path):
6966
create_pdf_tickets_for_holder(order)

app/api/custom/orders.py

Lines changed: 39 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@
1212
from app.api.helpers.db import safe_query, save_to_db
1313
from app.api.helpers.errors import ForbiddenError, NotFoundError, UnprocessableEntityError
1414
from app.api.helpers.mail import send_email_to_attendees
15-
from app.api.helpers.order import calculate_order_amount, create_pdf_tickets_for_holder, on_order_completed
15+
from app.api.helpers.order import (
16+
calculate_order_amount,
17+
create_pdf_tickets_for_holder,
18+
on_order_completed,
19+
)
1620
from app.api.helpers.permission_manager import has_access
1721
from app.api.orders import validate_attendees
1822
from app.api.schema.orders import OrderSchema
@@ -40,14 +44,11 @@ def ticket_attendee_authorized(order_identifier):
4044
raise NotFoundError(
4145
{'source': ''}, 'This ticket is not associated with any order'
4246
)
43-
if (
44-
has_access(
45-
'is_coorganizer_or_user_itself',
46-
event_id=order.event_id,
47-
user_id=order.user_id,
48-
)
49-
or order.is_attendee(current_user)
50-
):
47+
if has_access(
48+
'is_coorganizer_or_user_itself',
49+
event_id=order.event_id,
50+
user_id=order.user_id,
51+
) or order.is_attendee(current_user):
5152
file_path = order.ticket_pdf_path
5253
if not os.path.isfile(file_path):
5354
create_pdf_tickets_for_holder(order)
@@ -155,7 +156,7 @@ def create_order():
155156
ticket_info = ticket_map[order_ticket.ticket.id]
156157
order_ticket.price = ticket_info.get('price')
157158
save_to_db(order_ticket)
158-
159+
159160
return OrderSchema().dump(order)
160161

161162

@@ -184,30 +185,47 @@ def ticket_attendee_pdf(attendee_id):
184185
create_pdf_tickets_for_holder(ticket_holder.order)
185186
return send_from_directory('../', file_path, as_attachment=True)
186187

188+
187189
@order_blueprint.route('/<string:order_identifier>/verify', methods=['POST'])
188190
def verify_order_payment(order_identifier):
189191

190192
order = Order.query.filter_by(identifier=order_identifier).first()
191-
193+
192194
if order.payment_mode == 'stripe':
193195
try:
194-
payment_intent = StripePaymentsManager.retrieve_payment_intent(order.event, order.stripe_payment_intent_id)
196+
payment_intent = StripePaymentsManager.retrieve_payment_intent(
197+
order.event, order.stripe_payment_intent_id
198+
)
195199
except Exception as e:
196200
raise e
197201

198202
if payment_intent['status'] == 'succeeded':
199203
order.status = 'completed'
200204
order.completed_at = datetime.utcnow()
201-
order.paid_via = payment_intent['charges']['data'][0]['payment_method_details']['type']
202-
order.transaction_id = payment_intent['charges']['data'][0]['balance_transaction']
203-
if payment_intent['charges']['data'][0]['payment_method_details']['type'] == 'card' :
204-
order.brand = payment_intent['charges']['data'][0]['payment_method_details']['card']['brand']
205-
order.exp_month = payment_intent['charges']['data'][0]['payment_method_details']['card']['exp_month']
206-
order.exp_year = payment_intent['charges']['data'][0]['payment_method_details']['card']['exp_year']
207-
order.last4 = payment_intent['charges']['data'][0]['payment_method_details']['card']['last4']
205+
order.paid_via = payment_intent['charges']['data'][0][
206+
'payment_method_details'
207+
]['type']
208+
order.transaction_id = payment_intent['charges']['data'][0][
209+
'balance_transaction'
210+
]
211+
if (
212+
payment_intent['charges']['data'][0]['payment_method_details']['type']
213+
== 'card'
214+
):
215+
order.brand = payment_intent['charges']['data'][0][
216+
'payment_method_details'
217+
]['card']['brand']
218+
order.exp_month = payment_intent['charges']['data'][0][
219+
'payment_method_details'
220+
]['card']['exp_month']
221+
order.exp_year = payment_intent['charges']['data'][0][
222+
'payment_method_details'
223+
]['card']['exp_year']
224+
order.last4 = payment_intent['charges']['data'][0][
225+
'payment_method_details'
226+
]['card']['last4']
208227
save_to_db(order)
209228

210229
on_order_completed(order)
211230

212-
213-
return jsonify({ 'payment_status': order.status})
231+
return jsonify({'payment_status': order.status})

app/api/event_invoices.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,7 @@ def before_get_object(self, view_kwargs):
7676
if not current_user.is_staff and event_invoice.user_id != current_user.id:
7777
raise ForbiddenError({'source': ''}, 'Admin access is required')
7878

79-
methods = [
80-
'GET','PATCH'
81-
]
79+
methods = ['GET', 'PATCH']
8280
decorators = (jwt_required,)
8381
schema = EventInvoiceSchema
8482
data_layer = {

app/api/helpers/custom_forms.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,14 @@ def get_schema(form_fields):
1616
attrs = {}
1717

1818
for field in form_fields:
19-
if field.type in ['text', 'checkbox', 'select', 'paragraph', 'year', 'richtextlink']:
19+
if field.type in [
20+
'text',
21+
'checkbox',
22+
'select',
23+
'paragraph',
24+
'year',
25+
'richtextlink',
26+
]:
2027
field_type = marshmallow.fields.Str
2128
elif field.type == 'email':
2229
field_type = TrimmedEmail

app/api/helpers/mail.py

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,7 @@
2121
from app.models.user import User
2222
from app.settings import get_settings
2323
from app.models.order import OrderTicket
24-
from babel.dates import (
25-
format_date,
26-
format_time,
27-
format_datetime
28-
)
24+
from babel.dates import format_date, format_time, format_datetime
2925
from babel.numbers import format_currency
3026

3127
logger = logging.getLogger(__name__)
@@ -412,9 +408,7 @@ def send_email_announce_event(event, group, emails):
412408
event_location=event_location,
413409
event_date=convert_to_user_locale(email, date=event_date),
414410
event_time=convert_to_user_locale(
415-
email,
416-
time=event_time,
417-
tz=event.timezone
411+
email, time=event_time, tz=event.timezone
418412
),
419413
group_name=group_name,
420414
group_url=group_url,
@@ -654,16 +648,12 @@ def send_order_purchase_organizer_email(order, recipients):
654648
),
655649
timezone=order.event.timezone,
656650
purchase_time=convert_to_user_locale(
657-
emails[0],
658-
date_time=order.completed_at,
659-
tz=order.event.timezone
651+
emails[0], date_time=order.completed_at, tz=order.event.timezone
660652
),
661653
payment_mode=order.payment_mode,
662654
payment_status=order.status,
663655
order_amount=convert_to_user_locale(
664-
emails[0],
665-
amount=order.amount,
666-
currency=order.event.payment_currency
656+
emails[0], amount=order.amount, currency=order.event.payment_currency
667657
),
668658
tickets_count=order.tickets_count,
669659
order_tickets=order_tickets,
@@ -828,7 +818,9 @@ def send_email_after_event_speaker(email, event_name):
828818
)
829819

830820

831-
def convert_to_user_locale(email, date_time=None, date=None, time=None, tz=None, amount=None, currency=None):
821+
def convert_to_user_locale(
822+
email, date_time=None, date=None, time=None, tz=None, amount=None, currency=None
823+
):
832824
"""
833825
Convert date and time and amount to user selected language
834826
:return : datetime/date/time translated to user locale
@@ -845,21 +837,15 @@ def convert_to_user_locale(email, date_time=None, date=None, time=None, tz=None,
845837

846838
if date_time and tz:
847839
return format_datetime(
848-
date_time,
849-
'full',
850-
tzinfo=pytz.timezone(tz),
851-
locale=user_locale
840+
date_time, 'full', tzinfo=pytz.timezone(tz), locale=user_locale
852841
)
853-
842+
854843
if date:
855844
return format_date(date, 'd MMMM Y', locale=user_locale)
856-
845+
857846
if time and tz:
858847
return format_time(
859-
time,
860-
'HH:mm (zzzz)',
861-
tzinfo=pytz.timezone(tz),
862-
locale=user_locale
848+
time, 'HH:mm (zzzz)', tzinfo=pytz.timezone(tz), locale=user_locale
863849
)
864850

865851
return None

app/api/helpers/order.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,9 @@ def calculate_order_amount(tickets, discount_code=None):
283283
f"{ticket.min_price} to {ticket.max_price}",
284284
)
285285
else:
286-
price = ticket.price if ticket.type not in ['free', 'freeRegistration'] else 0.0
286+
price = (
287+
ticket.price if ticket.type not in ['free', 'freeRegistration'] else 0.0
288+
)
287289

288290
if tax:
289291
if tax_included:

app/api/helpers/static.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -549,8 +549,18 @@
549549
'USD',
550550
]
551551

552-
AGE_GROUP_CHOICES = ['Under 18', '18-24', '25-34', '35-44', '45-54', '55-64', '65-74', '75-84', '85+', 'I prefer not '
553-
'to say']
552+
AGE_GROUP_CHOICES = [
553+
'Under 18',
554+
'18-24',
555+
'25-34',
556+
'35-44',
557+
'45-54',
558+
'55-64',
559+
'65-74',
560+
'75-84',
561+
'85+',
562+
'I prefer not to say',
563+
]
554564

555565
GENDER_CHOICES = [
556566
'Male',

0 commit comments

Comments
 (0)