Skip to content

feat: Make discount codes & access codes support event_identifiers #6251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 29, 2019
Merged

feat: Make discount codes & access codes support event_identifiers #6251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions app/api/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,8 @@
'/tickets/<int:ticket_id>/discount-codes')
api.route(DiscountCodeDetail, 'discount_code_detail', '/discount-codes/<int:id>',
'/events/<int:event_id>/discount-code', '/event-invoices/<int:event_invoice_id>/discount-code',
'/events/<int:discount_event_id>/discount-codes/<code>')
'/events/<int:discount_event_id>/discount-codes/<code>',
'/events/<discount_event_identifier>/discount-codes/<code>')
api.route(DiscountCodeRelationshipRequired, 'discount_code_event',
'/discount-codes/<int:id>/relationships/event')
api.route(DiscountCodeRelationshipOptional, 'discount_code_events',
Expand Down Expand Up @@ -542,7 +543,8 @@
'/events/<event_identifier>/access-codes', '/users/<int:user_id>/access-codes',
'/tickets/<int:ticket_id>/access-codes')
api.route(AccessCodeDetail, 'access_code_detail', '/access-codes/<int:id>',
'/events/<int:access_event_id>/access-codes/<code>')
'/events/<int:access_event_id>/access-codes/<code>',
'/events/<int:access_event_identifier>/access-codes/<code>',)
api.route(AccessCodeRelationshipRequired, 'access_code_event',
'/access-codes/<int:id>/relationships/event')
api.route(AccessCodeRelationshipOptional, 'access_code_user',
Expand Down
9 changes: 8 additions & 1 deletion app/api/access_codes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
from app.models.access_code import AccessCode
from app.models.ticket import Ticket
from app.models.user import User
from app.models.event import Event


class AccessCodeListPost(ResourceList):
Expand Down Expand Up @@ -110,7 +111,13 @@ def before_get(self, args, kwargs):
:param kwargs:
:return:
"""
# Any registered user can fetch access code details using the code.
# Any user can fetch access code details using the code.

if kwargs.get('access_event_identifier'):
event = safe_query(
db, Event, 'identifier', kwargs['discount_event_identifier'],
'event_identifier')
kwargs['access_event_id'] = event.id
if kwargs.get('code') and kwargs.get('access_event_id'):
access = db.session.query(AccessCode).filter_by(code=kwargs.get('code'),
event_id=kwargs.get('access_event_id')).first()
Expand Down
6 changes: 6 additions & 0 deletions app/api/discount_codes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,12 @@ def before_get(self, args, kwargs):
'event_identifier')
kwargs['event_id'] = event.id

if kwargs.get('discount_event_identifier'):
event = safe_query(
db, Event, 'identifier', kwargs['discount_event_identifier'],
'event_identifier')
kwargs['discount_event_id'] = event.id

if kwargs.get('event_id') and has_access('is_admin'):
event = safe_query(db, Event, 'id', kwargs['event_id'], 'event_id')
if event.discount_code_id:
Expand Down