Email application url #1491
Email application url #1491
Conversation
|
| # Applied to all tests | ||
| pytestmark = [ | ||
| pytest.mark.django_db, | ||
| ] | ||
|
|
There was a problem hiding this comment.
I wouldn't add this on the top level in this case, since most of the tests in this file don't need database access. It just makes them run slower.
| @@ -81,7 +81,7 @@ def actions(self) -> LocationActions: | |||
|
|
|||
| @property | |||
| def address(self) -> str: | |||
| return f"{self.address_street}, {self.address_zip} {self.address_city}" | |||
| return ", ".join([self.address_street, f"{self.address_zip} {self.address_city}".strip()]) | |||
There was a problem hiding this comment.
Is this some lint rule? I think the previous version was more readable.
| def get_my_applications_ext_link( | ||
| *, | ||
| language: Lang, | ||
| application_section: ApplicationSection | None = None, | ||
| ) -> str: | ||
| """ | ||
| Return the link to the 'My applications' page: | ||
| e.g. https://varaamo.hel.fi/applications/{application_id}/view?tab=reservations§ion={application_section_id} | ||
| """ | ||
| url = settings.EMAIL_VARAAMO_EXT_LINK.removesuffix("/") | ||
|
|
||
| if language != "fi": | ||
| return f"{url_base}/{language}/applications" | ||
| return f"{url_base}/applications" | ||
| url = f"{url}/{language}" | ||
| url = f"{url}/applications" | ||
|
|
||
| if application_section: | ||
| application_id = getattr(application_section, "application_id", None) | ||
| application_section_id = getattr(application_section, "id", None) | ||
|
|
||
| url = f"{url}/{application_id}/view?tab=reservations§ion={application_section_id}" | ||
|
|
||
| return url |
There was a problem hiding this comment.
I would create a separate function to create the section link. Then I would give that function more specific info instead of the whole ApplicationSection, e.g. just the application_id and application_section_id, which would allow us to generate the same link using test data.
| } | ||
| else: | ||
| data.update(get_contex_for_seasonal_reservation_check_details_url(language=language)) |
There was a problem hiding this comment.
Since this doesn't get the section, it creates a different link when using e.g. the email tester in django admin. This might be confusing, so I would make this a different function that can create the same link even without the section itself.
🛠️ Changelog
🧪 Test plan
🚧 Dependencies
🎫 Tickets