Skip to content

GitLab

Commit e8ec6a3c authored by Joren Vrancken's avatar Joren Vrancken Committed by Sébastiaan Versteeg
Browse files

Merge branch 'fix/member-email-tests' into 'master' 

Fix automatic membership emails

See merge request !898

(cherry picked from commit 0247dfbf)

2ff07609 Add tests for automatic membership emails"
4494b6a2 Fix automatic member emails
parent 7afb4086
Hide whitespace changes
Inline Side-by-side
website/members/emails.py
View file @ e8ec6a3c
......@@ -8,12 +8,13 @@ from django.utils import translation
from django.utils.datetime_safe import datetime
from django.utils.translation import ugettext as _
from members.models import Member
from members.models import Member, Membership
def send_membership_announcement(dry_run=False):
members = (Member.current_members
.filter(membership__until__isnull=True)
.exclude(membership__type=Membership.HONORARY)
.distinct())
with mail.get_connection() as connection:
......@@ -26,7 +27,8 @@ def send_membership_announcement(dry_run=False):
'members/email/membership_announcement.txt',
{'name': member.get_full_name()})
mail.EmailMessage(
_('Membership announcement'),
'[THALIA] {}'.format(
_('Membership announcement')),
email_body,
settings.WEBSITE_FROM_ADDRESS,
[member.email],
......@@ -58,7 +60,8 @@ def send_information_request(dry_run=False):
{'name': member.get_full_name(),
'member': member})
mail.EmailMessage(
_('Membership information check'),
'[THALIA] {}'.format(
_('Membership information check')),
email_body,
settings.WEBSITE_FROM_ADDRESS,
[member.email],
......@@ -80,6 +83,7 @@ def send_expiration_announcement(dry_run=False):
expiry_date = datetime.now() + timedelta(days=31)
members = (Member.current_members
.filter(membership__until__lte=expiry_date)
.exclude(membership__until__isnull=True)
.distinct())
with mail.get_connection() as connection:
......@@ -93,12 +97,16 @@ def send_expiration_announcement(dry_run=False):
{
'name': member.get_full_name(),
'membership_price': floatformat(
settings.MEMBERSHIP_PRICES['year'], 2
settings.MEMBERSHIP_PRICES['year'], 2
),
'renewal_url': reverse('registrations:renew')
'renewal_url': '{}{}'.format(
'https://thalia.nu',
reverse('registrations:renew')
)
})
mail.EmailMessage(
_('Membership expiration announcement'),
'[THALIA] {}'.format(
_('Membership expiration announcement')),
email_body,
settings.WEBSITE_FROM_ADDRESS,
[member.email],
......
website/members/tests/test_emails.py 0 → 100644
View file @ e8ec6a3c
from django.core import mail
from django.test import TestCase
from django.utils import timezone
from freezegun import freeze_time
from members import emails
from members.models import Member, Profile, Membership
class EmailsTest(TestCase):
@classmethod
def setUpTestData(cls):
cls.year_member_nl = Member.objects.create(
username='test1',
first_name='Test1',
last_name='Example',
email='test1@example.org'
)
Profile.objects.create(
user=cls.year_member_nl,
language='nl',
)
Membership.objects.create(
user=cls.year_member_nl,
type=Membership.MEMBER,
since=timezone.now().replace(year=2017, month=9, day=1),
until=timezone.now().replace(year=2018, month=9, day=1)
)
cls.year_member_en = Member.objects.create(
username='test2',
first_name='Test2',
last_name='Example',
email='test2@example.org'
)
Profile.objects.create(
user=cls.year_member_en,
language='en',
)
Membership.objects.create(
user=cls.year_member_en,
type=Membership.MEMBER,
since=timezone.now().replace(year=2017, month=9, day=1),
until=timezone.now().replace(year=2018, month=9, day=1)
)
cls.year_member_no_expiry = Member.objects.create(
username='test3',
first_name='Test3',
last_name='Example',
email='test3@example.org'
)
Profile.objects.create(
user=cls.year_member_no_expiry,
language='nl',
)
Membership.objects.create(
user=cls.year_member_no_expiry,
type=Membership.MEMBER,
since=timezone.now().replace(year=2017, month=9, day=1),
until=timezone.now().replace(year=2019, month=9, day=1)
)
cls.study_member = Member.objects.create(
username='test4',
first_name='Test4',
last_name='Example',
email='test4@example.org'
)
Profile.objects.create(
user=cls.study_member,
language='nl',
)
Membership.objects.create(
user=cls.study_member,
type=Membership.MEMBER,
since=timezone.now().replace(year=2017, month=9, day=1),
until=None
)
cls.study_member_2 = Member.objects.create(
username='test5',
first_name='Test5',
last_name='Example',
email='test5@example.org'
)
Profile.objects.create(
user=cls.study_member_2,
language='nl',
)
Membership.objects.create(
user=cls.study_member_2,
type=Membership.MEMBER,
since=timezone.now().replace(year=2016, month=9, day=1),
until=timezone.now().replace(year=2017, month=9, day=1),
)
Membership.objects.create(
user=cls.study_member_2,
type=Membership.MEMBER,
since=timezone.now().replace(year=2017, month=9, day=6),
until=None
)
cls.supporter = Member.objects.create(
username='test6',
first_name='Test6',
last_name='Example',
email='test6@example.org'
)
Membership.objects.create(
user=cls.supporter,
type=Membership.SUPPORTER,
since=timezone.now().replace(year=2017, month=9, day=1),
until=timezone.now().replace(year=2018, month=9, day=1)
)
Profile.objects.create(
user=cls.supporter,
language='nl',
)
cls.honorary_member = Member.objects.create(
username='test7',
first_name='Test7',
last_name='Example',
email='test7@example.org'
)
Profile.objects.create(
user=cls.honorary_member,
language='nl',
)
Membership.objects.create(
user=cls.honorary_member,
type=Membership.HONORARY,
since=timezone.now().replace(year=2016, month=12, day=6),
until=timezone.now().replace(year=2017, month=6, day=12),
)
Membership.objects.create(
user=cls.honorary_member,
type=Membership.HONORARY,
since=timezone.now().replace(year=2017, month=6, day=12),
until=None
)
cls.old_member = Member.objects.create(
username='test8',
first_name='Test8',
last_name='Example',
email='test8@example.org'
)
Profile.objects.create(
user=cls.old_member,
language='nl',
)
Membership.objects.create(
user=cls.old_member,
type=Membership.MEMBER,
since=timezone.now().replace(year=2016, month=12, day=6),
until=timezone.now().replace(year=2017, month=6, day=12),
)
@freeze_time('2017-10-01')
def test_send_membership_announcement(self):
emails.send_membership_announcement()
self.assertEqual(len(mail.outbox), 2)
self.assertEqual(mail.outbox[0].to, ['test4@example.org'])
self.assertEqual(mail.outbox[1].to, ['test5@example.org'])
@freeze_time('2017-10-01')
def test_send_information_request(self):
emails.send_information_request()
self.assertEqual(len(mail.outbox), 7)
self.assertEqual(mail.outbox[0].to, ['test1@example.org'])
self.assertEqual(mail.outbox[0].subject,
'[THALIA] Controle gegevens lidmaatschap')
self.assertEqual(mail.outbox[1].to, ['test2@example.org'])
self.assertEqual(mail.outbox[1].subject,
'[THALIA] Membership information check')
self.assertEqual(mail.outbox[2].to, ['test3@example.org'])
self.assertEqual(mail.outbox[3].to, ['test4@example.org'])
self.assertEqual(mail.outbox[4].to, ['test5@example.org'])
self.assertEqual(mail.outbox[5].to, ['test6@example.org'])
self.assertEqual(mail.outbox[6].to, ['test7@example.org'])
@freeze_time('2018-08-15')
def test_send_expiration_announcement(self):
emails.send_expiration_announcement()
self.assertEqual(len(mail.outbox), 3)
self.assertEqual(mail.outbox[0].to, ['test1@example.org'])
self.assertEqual(mail.outbox[0].subject,
'[THALIA] Verlopen lidmaatschap')
self.assertEqual(mail.outbox[1].to, ['test2@example.org'])
self.assertEqual(mail.outbox[1].subject,
'[THALIA] Membership expiration announcement')
self.assertEqual(mail.outbox[2].to, ['test6@example.org'])
@freeze_time('2018-08-15')
def test_send_welcome_message(self):
emails.send_welcome_message(self.year_member_nl, 'password1', 'nl')
emails.send_welcome_message(self.year_member_nl, 'password1', 'en')
self.assertEqual(len(mail.outbox), 2)
self.assertEqual(mail.outbox[0].to, ['test1@example.org'])
self.assertEqual(mail.outbox[0].subject,
'Welkom bij Studievereniging Thalia')
self.assertEqual(mail.outbox[1].to, ['test1@example.org'])
self.assertEqual(mail.outbox[1].subject,
'Welcome to Study Association Thalia')
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment