Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 10 additions & 7 deletions src/extforms/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class Meta:
"family",
"member_code",
"member_code_override",
"eventbrite_url",
"event_registration_url",
"email",
"secondary_email",
"github",
Expand Down Expand Up @@ -294,12 +294,15 @@ def validate_member_code(self, request: HttpRequest) -> None | dict[str, Validat

return errors

def clean_eventbrite_url(self) -> str:
"""Check that entered URL includes 'eventbrite' in the domain."""
eventbrite_url = str(self.cleaned_data.get("eventbrite_url", ""))
if eventbrite_url and "eventbrite" not in (urlparse(eventbrite_url).hostname or ""):
raise ValidationError("Must be an Eventbrite URL.")
return eventbrite_url
def clean_event_registration_url(self) -> str:
"""Check that entered URL includes 'pretix' or 'eventbrite' in the domain."""
event_registration_url = str(self.cleaned_data.get("event_registration_url", ""))
hostname = urlparse(event_registration_url).hostname or ""
# This is a looser check than `url_matches_eventbrite_or_pretix_format` because it only checks the hostname,
# not the full URL format.
if event_registration_url and not ("eventbrite" in hostname or "pretix" in hostname):
raise ValidationError("Must be a Pretix or Eventbrite URL.")
return event_registration_url

def clean(self) -> None:
super().clean()
Expand Down
31 changes: 22 additions & 9 deletions src/extforms/tests/test_training_request_form.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class TestTrainingRequestForm(TestBase):
INVALID_MEMBER_CODE_ERROR = "This code is invalid."
MEMBER_CODE_OVERRIDE_LABEL = "Continue with registration code marked as invalid"
MEMBER_CODE_OVERRIDE_EMAIL_WARNING = "A member of our team will check the code and follow up with you"
INVALID_EVENTBRITE_URL_ERROR = "Must be an Eventbrite URL."
INVALID_EVENTBRITE_URL_ERROR = "Must be a Pretix or Eventbrite URL."

def setUp(self) -> None:
self._setUpUsersAndLogin()
Expand All @@ -34,7 +34,7 @@ def setUp(self) -> None:
"review_process": "preapproved",
"benefit": self.benefit.pk,
"member_code": "coolprogrammers",
"eventbrite_url": "https://www.eventbrite.com/e/711576483417",
"event_registration_url": "https://www.eventbrite.com/e/711576483417",
"personal": "John",
"family": "Smith",
"email": "john@smith.com",
Expand Down Expand Up @@ -489,11 +489,11 @@ def test_member_code_validation__code_invalid_override_full_request(self) -> Non
self.assertIn(self.MEMBER_CODE_OVERRIDE_EMAIL_WARNING, msg.body)
self.assertNotIn(settings.TEMPLATES[0]["OPTIONS"]["string_if_invalid"], msg.body) # type: ignore[index]

def test_eventbrite_url_validation__none(self) -> None:
def test_event_registration_url_validation__none(self) -> None:
"""Should not error if no URL is entered."""
# Arrange
self.setUpMembership()
data = {"eventbrite_url": ""}
data = {"event_registration_url": ""}

# Act
rv = self.client.post(reverse("training_request"), data=data)
Expand All @@ -502,11 +502,11 @@ def test_eventbrite_url_validation__none(self) -> None:
self.assertEqual(rv.status_code, 200)
self.assertNotContains(rv, self.INVALID_EVENTBRITE_URL_ERROR)

def test_eventbrite_url_validation__invalid(self) -> None:
"""Should error if a non-Eventbrite URL is entered."""
def test_event_registration_url_validation__invalid(self) -> None:
"""Should error if a non-Eventbrite and non-Pretix URL is entered."""
# Arrange
self.setUpMembership()
data = {"eventbrite_url": "https://google.com"}
data = {"event_registration_url": "https://google.com"}

# Act
rv = self.client.post(reverse("training_request"), data=data)
Expand All @@ -515,11 +515,24 @@ def test_eventbrite_url_validation__invalid(self) -> None:
self.assertEqual(rv.status_code, 200)
self.assertContains(rv, self.INVALID_EVENTBRITE_URL_ERROR)

def test_eventbrite_url_validation__valid(self) -> None:
def test_event_registration_url_validation__valid(self) -> None:
"""Should not error if an Eventbrite URL is entered."""
# Arrange
self.setUpMembership()
data = {"eventbrite_url": "https://www.eventbrite.com/e/711576483417"}
data = {"event_registration_url": "https://www.eventbrite.com/e/711576483417"}

# Act
rv = self.client.post(reverse("training_request"), data=data)

# Assert
self.assertEqual(rv.status_code, 200)
self.assertNotContains(rv, self.INVALID_EVENTBRITE_URL_ERROR)

def test_event_registration_url_validation__valid_pretix(self) -> None:
"""Should not error if a Pretix URL is entered."""
# Arrange
self.setUpMembership()
data = {"event_registration_url": "https://pretix.eu/carpentries/event-slug/"}

# Act
rv = self.client.post(reverse("training_request"), data=data)
Expand Down
6 changes: 3 additions & 3 deletions src/extrequests/filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from django.utils.datastructures import MultiValueDict

from src.extrequests.models import SelfOrganisedSubmission, WorkshopInquiryRequest
from src.extrequests.utils import get_eventbrite_id_from_url_or_return_input
from src.extrequests.utils import get_event_id_from_pretix_or_eventbrite_url_or_return_input
from src.offering.models import Benefit
from src.workshops.fields import Select2Widget
from src.workshops.filters import (
Expand Down Expand Up @@ -196,9 +196,9 @@ def filter_eventbrite_id(
int(value)
except ValueError:
# otherwise, try to extract an ID from the input
value = get_eventbrite_id_from_url_or_return_input(value)
value = get_event_id_from_pretix_or_eventbrite_url_or_return_input(value)

return queryset.filter(eventbrite_url__icontains=value)
return queryset.filter(event_registration_url__icontains=value)


# ------------------------------------------------------------
Expand Down
14 changes: 14 additions & 0 deletions src/extrequests/templatetags/event_registration_url.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import re

from django import template

from src.extrequests.utils import EVENTBRITE_URL_PATTERN, PRETIX_URL_PATTERN

register = template.Library()


@register.simple_tag
def url_matches_eventbrite_or_pretix_format(url: str) -> bool:
match1 = re.search(EVENTBRITE_URL_PATTERN, url)
match2 = re.search(PRETIX_URL_PATTERN, url)
return match1 is not None or match2 is not None
13 changes: 0 additions & 13 deletions src/extrequests/templatetags/eventbrite.py

This file was deleted.

2 changes: 1 addition & 1 deletion src/extrequests/tests/test_filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def setUp(self) -> None:
person=self.ironman,
review_process="preapproved",
member_code=self.membership.registration_code or "",
eventbrite_url="https://www.eventbrite.com/e/711575811407",
event_registration_url="https://www.eventbrite.com/e/711575811407",
personal="Tony",
family="Stark",
email="me@stark.com",
Expand Down
56 changes: 48 additions & 8 deletions src/extrequests/tests/test_template_tags.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from django.test import TestCase

from src.extrequests.templatetags.eventbrite import url_matches_eventbrite_format
from src.extrequests.templatetags.event_registration_url import url_matches_eventbrite_or_pretix_format
from src.extrequests.templatetags.request_membership import (
membership_active,
membership_alert_type,
Expand Down Expand Up @@ -107,7 +107,7 @@ def test_long_url(self) -> None:
url = "https://www.eventbrite.com/e/online-instructor-training-7-8-november-2023-tickets-711575811407?aff=oddtdtcreator" # noqa: E501

# Act
result = url_matches_eventbrite_format(url)
result = url_matches_eventbrite_or_pretix_format(url)

# Assert
self.assertTrue(result)
Expand All @@ -117,7 +117,7 @@ def test_short_url(self) -> None:
url = "www.eventbrite.com/e/711575811407"

# Act
result = url_matches_eventbrite_format(url)
result = url_matches_eventbrite_or_pretix_format(url)

# Assert
self.assertTrue(result)
Expand All @@ -127,7 +127,7 @@ def test_localised_url__couk(self) -> None:
url = "https://www.eventbrite.co.uk/e/711575811407"

# Act
result = url_matches_eventbrite_format(url)
result = url_matches_eventbrite_or_pretix_format(url)

# Assert
self.assertTrue(result)
Expand All @@ -137,7 +137,7 @@ def test_localised_url__fr(self) -> None:
url = "https://www.eventbrite.fr/e/711575811407"

# Act
result = url_matches_eventbrite_format(url)
result = url_matches_eventbrite_or_pretix_format(url)

# Assert
self.assertTrue(result)
Expand All @@ -148,7 +148,7 @@ def test_admin_url(self) -> None:
url = "https://www.eventbrite.com/myevent?eid=711575811407"

# Act
result = url_matches_eventbrite_format(url)
result = url_matches_eventbrite_or_pretix_format(url)

# Assert
self.assertFalse(result)
Expand All @@ -159,18 +159,58 @@ def test_non_eventbrite_url(self) -> None:
url = "https://carpentries.org/instructor-training/123123123123/"

# Act
result = url_matches_eventbrite_format(url)
result = url_matches_eventbrite_or_pretix_format(url)

# Assert
self.assertFalse(result)

def test_pretix_url(self) -> None:
# Arrange
urls = [
"https://pretix.carpentries.org/community-events/welcome-sessions/845/",
"https://pretix.carpentries.org/community-events/welcome-sessions/845",
"pretix.carpentries.org/community-events/welcome-sessions/845/",
"https://pretix.carpentries.org/other-organizer/instructor-training/12/?voucher=ABC",
"https://pretix.carpentries.org/single-segment/845/",
"https://test-pretix.terrier-vibe.ts.net/community-events/welcome-sessions/845/",
]

for url in urls:
with self.subTest(url=url):
# Act
result = url_matches_eventbrite_or_pretix_format(url)

# Assert
self.assertTrue(result)

def test_pretix_url__invalid(self) -> None:
"""Pretix URLs without an event number, or on other domains, should fail."""
# Arrange
urls = [
"https://pretix.carpentries.org/community-events/welcome-sessions/",
"https://pretix.carpentries.org/845/",
"https://pretix.carpentries.org/community-events/welcome-sessions/845/checkout/",
"https://pretix.eu/community-events/welcome-sessions/845/",
"https://pretix.carpentries.org.evil.com/community-events/welcome-sessions/845/",
"https://test-pretix.terrier-vibe.ts.net.evil.com/community-events/welcome-sessions/845/",
"https://other.terrier-vibe.ts.net/community-events/welcome-sessions/845/",
]

for url in urls:
with self.subTest(url=url):
# Act
result = url_matches_eventbrite_or_pretix_format(url)

# Assert
self.assertFalse(result)

def test_empty_string(self) -> None:
"""Empty string should fail."""
# Arrange
url = ""

# Act
result = url_matches_eventbrite_format(url)
result = url_matches_eventbrite_or_pretix_format(url)

# Assert
self.assertFalse(result)
69 changes: 64 additions & 5 deletions src/extrequests/tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@

from src.extrequests.tests.test_training_request import create_training_request
from src.extrequests.utils import (
EVENTBRITE_URL_PATTERN,
PRETIX_URL_PATTERN,
accept_training_request_and_match_to_event,
get_account_benefit_from_partnership,
get_account_benefit_or_none_from_code,
get_account_benefit_warnings_after_match,
get_eventbrite_id_from_url_or_return_input,
get_event_id_from_pretix_or_eventbrite_url_or_return_input,
get_membership_or_none_from_code,
get_membership_warnings_after_match,
get_partnership_or_none_from_code,
Expand Down Expand Up @@ -628,13 +630,13 @@ def test_multiple_warnings(self) -> None:
self.assertListEqual(expected, result)


class TestGetEventbriteIdFromUrl(TestCase):
class TestGetEventIdFromPretixOrEventbriteUrl(TestCase):
def test_long_url(self) -> None:
# Arrange
url = "https://www.eventbrite.com/e/online-instructor-training-7-8-november-2023-tickets-711575811407?aff=oddtdtcreator" # noqa: E501

# Act
result = get_eventbrite_id_from_url_or_return_input(url)
result = get_event_id_from_pretix_or_eventbrite_url_or_return_input(url)

# Assert
self.assertEqual(result, "711575811407")
Expand All @@ -644,7 +646,7 @@ def test_short_url(self) -> None:
url = "https://www.eventbrite.com/e/711575811407"

# Act
result = get_eventbrite_id_from_url_or_return_input(url)
result = get_event_id_from_pretix_or_eventbrite_url_or_return_input(url)

# Assert
self.assertEqual(result, "711575811407")
Expand All @@ -654,11 +656,68 @@ def test_admin_url(self) -> None:
url = "https://www.eventbrite.com/myevent?eid=711575811407"

# Act
result = get_eventbrite_id_from_url_or_return_input(url)
result = get_event_id_from_pretix_or_eventbrite_url_or_return_input(url)

# Assert
self.assertEqual(result, "711575811407")

def test_pretix_url(self) -> None:
# Arrange
url = "https://pretix.carpentries.org/community-events/welcome-sessions/845/"

# Act
result = get_event_id_from_pretix_or_eventbrite_url_or_return_input(url)

# Assert
self.assertEqual(result, "845")

def test_no_id_returns_input(self) -> None:
# Arrange
url = "https://pretix.carpentries.org/community-events/welcome-sessions/"

# Act
result = get_event_id_from_pretix_or_eventbrite_url_or_return_input(url)

# Assert
self.assertEqual(result, url)


class TestEventRegistrationUrlPatternsEventIdGroup(TestCase):
def test_eventbrite_event_id(self) -> None:
# Arrange
urls = [
"https://www.eventbrite.com/e/online-instructor-training-7-8-november-2023-tickets-711575811407?aff=oddtdtcreator", # noqa: E501
"https://www.eventbrite.com/e/711575811407",
"www.eventbrite.co.uk/e/711575811407",
]

for url in urls:
with self.subTest(url=url):
# Act
match = EVENTBRITE_URL_PATTERN.search(url)

# Assert
assert match is not None
self.assertEqual(match.group("event_id"), "711575811407")

def test_pretix_event_id(self) -> None:
# Arrange
urls = [
"https://pretix.carpentries.org/community-events/welcome-sessions/845/",
"https://pretix.carpentries.org/community-events/welcome-sessions/845",
"pretix.carpentries.org/other-organizer/2026/845/?voucher=ABC",
"https://test-pretix.terrier-vibe.ts.net/community-events/welcome-sessions/845/",
]

for url in urls:
with self.subTest(url=url):
# Act
match = PRETIX_URL_PATTERN.search(url)

# Assert
assert match is not None
self.assertEqual(match.group("event_id"), "845")


class TestGetAccountBenefitWarningsAfterMatch(TestBase):
def setUp(self) -> None:
Expand Down
Loading
Loading