-
Notifications
You must be signed in to change notification settings - Fork 7
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.
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
Email application url #1491
Open
ranta
wants to merge
4
commits into
main
Choose a base branch
from
email-application-url
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Email application url #1491
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
5bfd1e0
Refactor address property for cleaner output with missing address_zip
ranta c98c4da
Fix invalid series keys in application section staff emails
ranta b794261
Add tests for creating email contexts from model instances
ranta 43c0761
Add application and section ids to email links
ranta File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| from __future__ import annotations | ||
|
|
||
| import datetime | ||
| from typing import TYPE_CHECKING | ||
|
|
||
| import pytest | ||
|
|
||
| from tilavarauspalvelu.enums import WeekdayChoice | ||
| from utils.date_utils import local_datetime | ||
|
|
||
| from tests.factories import ( | ||
| ApplicationSectionFactory, | ||
| RecurringReservationFactory, | ||
| ReservationFactory, | ||
| ReservationUnitFactory, | ||
| ) | ||
|
|
||
| if TYPE_CHECKING: | ||
| from tilavarauspalvelu.models import Reservation | ||
|
|
||
|
|
||
| @pytest.fixture | ||
| def email_reservation() -> Reservation: | ||
| reservation_unit = ReservationUnitFactory.create( | ||
| name_en="Test reservation unit", | ||
| unit__name_en="Test unit", | ||
| unit__location__address_street_en="Test Street", | ||
| unit__location__address_zip="", | ||
| unit__location__address_city_en="City", | ||
| reservation_confirmed_instructions_en="[HYVÄKSYTYN VARAUKSEN OHJEET]", | ||
| reservation_cancelled_instructions_en="[PERUUTETUN VARAUKSEN OHJEET]", | ||
| reservation_pending_instructions_en="[KÄSITELTÄVÄN VARAUKSEN OHJEET]", | ||
| pricings__lowest_price=0, | ||
| pricings__highest_price=0, | ||
| ) | ||
| application_section = ApplicationSectionFactory.create( | ||
| name="[HAKEMUKSEN OSAN NIMI]", | ||
| application__application_round__name_en="[KAUSIVARAUSKIERROKSEN NIMI]", | ||
| application__organisation__name_en="[SÄHKÖPOSTIN VASTAANOTTAJAN NIMI]", | ||
| ) | ||
| recurring_reservation = RecurringReservationFactory.create( | ||
| weekdays=f"{WeekdayChoice.MONDAY}", | ||
| begin_date=datetime.date(2024, 1, 1), | ||
| begin_time=datetime.time(12), | ||
| end_time=datetime.time(14), | ||
| allocated_time_slot__reservation_unit_option__reservation_unit=reservation_unit, | ||
| allocated_time_slot__reservation_unit_option__application_section=application_section, | ||
| ) | ||
| reservation = ReservationFactory.create_for_reservation_unit( | ||
| name="Test reservation", | ||
| reservation_unit=reservation_unit, | ||
| user=application_section.application.user, | ||
| reservee_first_name="[SÄHKÖPOSTIN VASTAANOTTAJAN NIMI]", | ||
| reservee_last_name="", | ||
| cancel_reason__reason_en="[PERUUTUKSEN SYY]", | ||
| deny_reason__reason_en="[HYLKÄYKSEN SYY]", | ||
| begin=local_datetime(2024, 1, 1, 12, 0), | ||
| end=local_datetime(2024, 1, 1, 14, 0), | ||
| recurring_reservation=recurring_reservation, | ||
| ) | ||
|
|
||
| recurring_reservation_2 = RecurringReservationFactory.create( | ||
| weekdays=f"{WeekdayChoice.TUESDAY}", | ||
| begin_date=datetime.date(2024, 1, 2), | ||
| begin_time=datetime.time(21), | ||
| end_time=datetime.time(22), | ||
| allocated_time_slot__reservation_unit_option__reservation_unit=reservation_unit, | ||
| allocated_time_slot__reservation_unit_option__application_section=application_section, | ||
| ) | ||
| ReservationFactory.create_for_reservation_unit( | ||
| reservation_unit=reservation_unit, | ||
| user=application_section.application.user, | ||
| reservee_first_name="[SÄHKÖPOSTIN VASTAANOTTAJAN NIMI]", | ||
| reservee_last_name="", | ||
| cancel_reason__reason_en="[PERUUTUKSEN SYY]", | ||
| deny_reason__reason_en="[HYLKÄYKSEN SYY]", | ||
| begin=local_datetime(2024, 1, 2, 12, 0), | ||
| end=local_datetime(2024, 1, 2, 14, 0), | ||
| recurring_reservation=recurring_reservation_2, | ||
| ) | ||
|
|
||
| return reservation |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.