Merge pull request #269 from naisnouk/fea_emails

Fea emails

Author: goranche

codeweekeu/settings.py

@@ -220,6 +220,7 @@
     # defined apps
     'web',
 	'api',
+	'mailer'
 )
 ########## END APP CONFIGURATION
 

mailer/__init__.py

@@ -0,0 +1,22 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+from django.core.mail import send_mail
+from django.template import loader, Context
+from web.processors.user import get_ambassadors_for_country
+
+
+'''
+Generates and sends event report to ambassadors users
+'''
+def send_event_report_email (user, event):
+	template = loader.get_template("mailer/event_email.txt")
+	context = Context({'user': user, 'event': event})
+
+	txt_content = template.render(context)
+
+	send_mail('A new event on codeweek.eu needs your attention', txt_content, "[email protected]", [user.email])
+
+def send_email_to_country_ambassadors(event):
+	ambassadors = get_ambassadors_for_country(event.country)
+	for user in ambassadors:
+		send_event_report_email(user, event)

mailer/event_report_mailer.py

@@ -0,0 +1,7 @@
+Hello, {{user.first_name}}!
+
+A new event {{ event.title }} has been added to the codeweek.eu site and it needs your revision. Would you be kind enough to check if everything is ok and approve it, or otherwise request an update: http://events.codeweek.eu{% url 'web.view_event' event.id event.slug %}
+
+Thank you for your help!
+
+Codeweek.eu Team

mailer/templates/mailer/event_email.txt

@@ -0,0 +1,40 @@
+import datetime
+from django.test import TestCase
+from mailer.event_report_mailer import send_event_report_email
+
+from api.models.events import Event
+from django.contrib.auth.models import User
+from api.models import UserProfile
+
+from django.core import mail
+
+
+class EmailTestCase(TestCase):
+	def setUp(self):
+		self.u1 = User.objects.create(username='user1', email='[email protected]', first_name='Nejc')
+		self.up1 = UserProfile.objects.create(user=self.u1)
+
+		self.event = Event.objects.create(
+			organizer="Organizer 1",
+			creator=User.objects.filter(pk=1)[0],
+			title="Event 1 - Pending",
+			description="Some description - Pending",
+			location="Near here",
+			start_date=datetime.datetime.now() + datetime.timedelta(days=1, hours=3),
+			end_date=datetime.datetime.now() + datetime.timedelta(days=3, hours=3),
+			event_url="http://eee.com",
+			contact_person="[email protected]",
+			country="SI",
+			pub_date=datetime.datetime.now(),
+			tags=["tag1", "tag2"])
+
+
+	def test_send_event_email(self):
+		send_event_report_email(self.u1, self.event)
+		email = mail.outbox[0]
+
+		self.assertEquals('A new event on codeweek.eu needs your attention', email.subject)
+		self.assertEquals('[email protected]', email.from_email)
+		self.assertEquals([self.u1.email], email.to)
+		self.assertIn(self.u1.first_name, email.body)
+		self.assertIn(self.event.title, email.body)

mailer/tests.py

@@ -7,6 +7,7 @@
 from django_countries import countries
 
 from web.processors import media
+from mailer.event_report_mailer import send_email_to_country_ambassadors
 
 
 def get_client_ip(forwarded=None, remote=None):
@@ -100,6 +101,7 @@ def create_or_update_event(event_id=None, **event_data):
 
 	else:
 		event = Event.objects.create(**event_data)
+		send_email_to_country_ambassadors(event)
 
 	return event
 

web/processors/event.py

@@ -34,6 +34,11 @@ def get_ambassadors_for_countries():
 	countries_ambassadors.sort()
 	return countries_ambassadors
 
+def get_ambassadors_for_country(country):
+	ambassadors = User.objects.filter(groups__name='ambassadors', userprofile__country=country)
+	return ambassadors
+
+
 def update_user_email(user_id, new_email):
 	user = User.objects.get(id=user_id)
 	user.email = new_email

web/processors/user.py

@@ -19,10 +19,9 @@ def get_user(self):
 		return User.objects.get(pk=1)
 
 	def create_event(self, title="Event title",
-	                 start_date=datetime.datetime.now() + datetime.timedelta(days=0, hours=3),
-	                 end_date=datetime.datetime.now() + datetime.timedelta(days=1, hours=3),
-	                 country_code="SI",
-	                 status="PENDING"):
+		start_date=datetime.datetime.now() + datetime.timedelta(days=0, hours=3), 
+		end_date=datetime.datetime.now() + datetime.timedelta(days=1, hours=3),
+		country_code="SI", status="PENDING"):
 
 		event_data = {
 			"end_date": start_date,
@@ -36,7 +35,7 @@ def create_event(self, title="Event title",
 			"location": "Ljubljana",
 			"audience": [1],
 			"theme": [1],
-		    "status": status,
+			"status": status,
 		}
 		return create_or_update_event(**event_data)
 
@@ -45,19 +44,19 @@ def setUp(self):
 		self.up1 = UserProfile.objects.create(user=self.u1)
 
 		Event.objects.create(organizer="asdasd",
-							 creator=User.objects.filter(pk=1)[0],
-		                     title="asdasd",
-		                     description="asdsad",
-		                     location="asdsad",
-		                     start_date=datetime.datetime.now(),
-		                     end_date=datetime.datetime.now(),
-		                     event_url="http://eee.com",
-		                     contact_person="[email protected]",
-		                     country="SI",
-		                     audience=[1],
-		                     theme=[1],		                     
-		                     pub_date=datetime.datetime.now(),
-		                     tags=["tag1", "tag2"])
+			creator=User.objects.filter(pk=1)[0],
+			title="asdasd",
+			description="asdsad",
+			location="asdsad",
+			start_date=datetime.datetime.now(),
+			end_date=datetime.datetime.now(),
+			event_url="http://eee.com",
+			contact_person="[email protected]",
+			country="SI",
+			audience=[1],
+			theme=[1],
+			pub_date=datetime.datetime.now(),
+			tags=["tag1", "tag2"])
 
 	def test_get_event(self):
 		test_event = Event.objects.get(title="asdasd")
@@ -135,15 +134,15 @@ def test_get_approved_event_without_filter_returns_zero(self):
 
 	def test_get_approved_event_without_filter_with_pending_event(self):
 		self.create_event(start_date=datetime.datetime.now() + datetime.timedelta(days=0, hours=3),
-		                  end_date=datetime.datetime.now() + datetime.timedelta(days=1, hours=3),
-		                  status="APPROVED",)
+			end_date=datetime.datetime.now() + datetime.timedelta(days=1, hours=3),
+			status="APPROVED",)
 		events = get_approved_events()
 		self.assertEqual(1, len(events))
 
 	def test_get_approved_event_without_filter_with_approved_event_but_passed_date(self):
 		self.create_event(start_date=datetime.datetime.now() - datetime.timedelta(days=1, hours=3),
-		                  end_date=datetime.datetime.now() - datetime.timedelta(days=2, hours=3),
-		                  status="APPROVED")
+			end_date=datetime.datetime.now() - datetime.timedelta(days=2, hours=3),
+			status="APPROVED")
 		events = get_approved_events()
 		self.assertEqual(0, len(events))
 
@@ -157,8 +156,8 @@ def test_get_approved_event_with_filter_country_code_and_order_with_approved_eve
 		countries = ["IS", "DK", "FI", "FI", "LI"]
 		for index, country in enumerate(countries):
 			self.create_event(title="Testing event" + str(index + 1), country_code=country, status="APPROVED",
-			                  start_date=datetime.datetime.now() + datetime.timedelta(days=0, hours=index + 1),
-			                  end_date=datetime.datetime.now() + datetime.timedelta(days=1, hours=index + 1))
+				start_date=datetime.datetime.now() + datetime.timedelta(days=0, hours=index + 1),
+				end_date=datetime.datetime.now() + datetime.timedelta(days=1, hours=index + 1))
 
 		events = get_approved_events(order="start_date")
 		self.assertEqual(5, len(events))
@@ -172,8 +171,8 @@ def test_get_approved_event_with_filter_country_code_and_order_and_limit__with_a
 		countries = ["IS", "DK", "FI", "FI", "FI"]
 		for index, country in enumerate(countries):
 			self.create_event(title="Testing event" + str(index + 1), country_code=country, status="APPROVED",
-			                  start_date=datetime.datetime.now() + datetime.timedelta(days=0, hours=index + 1),
-			                  end_date=datetime.datetime.now() + datetime.timedelta(days=1, hours=index + 1))
+				start_date=datetime.datetime.now() + datetime.timedelta(days=0, hours=index + 1),
+				end_date=datetime.datetime.now() + datetime.timedelta(days=1, hours=index + 1))
 
 		events = get_approved_events(order="start_date", limit=2, country_code="FI")
 		self.assertEqual(2, len(events))

web/tests/test_events_processors.py

@@ -0,0 +1,41 @@
+import datetime
+from django.test import TestCase
+from django.db import IntegrityError
+from django.contrib.auth.models import User, Group
+
+from api.models.events import Event
+from api.models import UserProfile
+from web.processors.user import get_ambassadors_for_country
+
+
+class EventTestCase(TestCase):
+	
+	def setUp(self):
+		self.u1 = User.objects.create(username='user1')
+		self.up1 = UserProfile.objects.create(user=self.u1)
+
+		Event.objects.create(organizer="asdasd",
+			creator=User.objects.filter(pk=1)[0],
+			title="asdasd",
+			description="asdsad",
+			location="asdsad",
+			start_date=datetime.datetime.now(),
+			end_date=datetime.datetime.now(),
+			event_url="http://eee.com",
+			contact_person="[email protected]",
+			country="SI",
+			audience=[1],
+			theme=[1],
+			pub_date=datetime.datetime.now(),
+			tags=["tag1", "tag2"])
+
+	def test_get_ambassadors_for_country(self):
+		self.up1.country = "SI"
+		self.up1.save()
+
+		group = Group.objects.get(name="ambassadors")
+
+		group.user_set.add(self.u1)
+
+		self.assertItemsEqual ([self.u1], get_ambassadors_for_country("SI"))
+		self.assertItemsEqual ([], get_ambassadors_for_country("FR"))