Skip to content

Commit 60e7771

Browse files
rantamatti-lamppu
authored andcommitted
Update email feedback URL
1 parent 00940fa commit 60e7771

3 files changed

Lines changed: 3 additions & 13 deletions

File tree

email_notification/helpers/email_builder_base.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,7 @@ def _get_varaamo_ext_link(language: LanguageType | None) -> str:
6060

6161
@staticmethod
6262
def _get_feedback_ext_link(language: LanguageType | None) -> str:
63-
params = urlencode(
64-
{
65-
"site": "varaamopalaute",
66-
"lang": language,
67-
"ref": settings.EMAIL_VARAAMO_EXT_LINK,
68-
}
69-
)
63+
params = urlencode({"lang": language})
7064
return f"{settings.EMAIL_FEEDBACK_EXT_LINK}?{params}"
7165

7266
@staticmethod

tests/test_email/test_email_builder_render_reservation.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import datetime
22
import re
3-
import urllib.parse
43
from decimal import Decimal
54

65
import freezegun
@@ -145,7 +144,7 @@ def test_email_builder__get_content(settings, email_template):
145144
copyright 2021
146145
link to varaamo {link}
147146
link to reservations {link}/reservations
148-
link to feedback {feedback}?site=varaamopalaute&lang=fi&ref={urllib.parse.quote(link, safe='')}
147+
link to feedback {feedback}?lang=fi
149148
"""
150149

151150
assert builder.get_content() == compiled_content

tests/test_email/test_email_context_application.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,5 @@ def test_email_context__from_application(language: LanguageType, settings):
1717
lang_part = f"/{language}" if language != "fi" else ""
1818
assert context.my_applications_ext_link == f"{varaamo_link}{lang_part}/applications"
1919
assert context.varaamo_ext_link == f"{varaamo_link}{lang_part}"
20-
assert (
21-
context.feedback_ext_link
22-
== f"{feedback_link}?site=varaamopalaute&lang={language}&ref=https%3A%2F%2Ffake.varaamo.hel.fi"
23-
)
20+
assert context.feedback_ext_link == f"{feedback_link}?lang={language}"
2421
assert context.current_year == datetime.datetime.now().year

0 commit comments

Comments
 (0)