Merge pull request #77 from wesokes/hotfix/from-2.0.0

bulk create fix

Author: somewes

entity_emailer/models.py

@@ -47,14 +47,20 @@ def create_emails(self, email_params_list):
 
         # Build list of recipient through relationships to create
         recipients_to_create = []
+
+        # Keep track of unique pairs to avoid unique constraint on through relationship
+        email_entity_pairs = set()
         for i, recipient_entities in enumerate(recipient_entities_per_email):
             for recipient_entity in recipient_entities:
-                recipients_to_create.append(
-                    Email.recipients.through(
-                        email_id=emails[i].id,
-                        entity_id=recipient_entity.id,
+                if (emails[i].id, recipient_entity.id) not in email_entity_pairs:
+                    email_entity_pairs.add((emails[i].id, recipient_entity.id))
+
+                    recipients_to_create.append(
+                        Email.recipients.through(
+                            email_id=emails[i].id,
+                            entity_id=recipient_entity.id,
+                        )
                     )
-                )
 
         # Bulk create the recipient relationships
         Email.recipients.through.objects.bulk_create(recipients_to_create)

entity_emailer/tests/interface_tests.py

@@ -296,10 +296,15 @@ def test_multiple_events_only_following_false(self):
 
     @freeze_time('2013-1-2')
     def test_bulk_multiple_events_only_following_false(self):
+        """
+        Handles bulk creating events and tests the unique constraint of the duplicated subscription which would cause
+        a bulk create error if it wasn't handled
+        """
         source = G(Source)
         e = G(Entity)
         other_e = G(Entity)
 
+        G(Subscription, entity=e, source=source, medium=self.email_medium, only_following=False)
         G(Subscription, entity=e, source=source, medium=self.email_medium, only_following=False)
         G(Subscription, entity=other_e, source=source, medium=self.email_medium, only_following=False)
         email_context = {
@@ -318,6 +323,35 @@ def test_bulk_multiple_events_only_following_false(self):
             self.assertEquals(email.subject, '')
             self.assertEquals(email.scheduled, datetime(2013, 1, 2))
 
+    @freeze_time('2013-1-2')
+    def test_bulk_multiple_events_only_following_true(self):
+        """
+        Handles bulk creating events and tests the unique constraint of the duplicated subscription which would cause
+        a bulk create error if it wasn't handled
+        """
+        source = G(Source)
+        e = G(Entity)
+        other_e = G(Entity)
+
+        G(Subscription, entity=e, source=source, medium=self.email_medium, only_following=True)
+        G(Subscription, entity=e, source=source, medium=self.email_medium, only_following=True)
+        G(Subscription, entity=other_e, source=source, medium=self.email_medium, only_following=True)
+        email_context = {
+            'entity_emailer_template': 'template',
+            'entity_emailer_subject': 'hi',
+        }
+        G(Event, source=source, context=email_context)
+        event = G(Event, source=source, context=email_context)
+        G(EventActor, event=event, entity=e)
+
+        EntityEmailerInterface.bulk_convert_events_to_emails()
+
+        email = Email.objects.get()
+        self.assertEquals(set(email.recipients.all()), set([e]))
+        self.assertEquals(email.event.context, email_context)
+        self.assertEquals(email.subject, '')
+        self.assertEquals(email.scheduled, datetime(2013, 1, 2))
+
     @freeze_time('2013-1-2')
     def test_multiple_events_only_following_true(self):
         source = G(Source)

entity_emailer/version.py

@@ -1 +1 @@
-__version__ = '2.0.0'
+__version__ = '2.0.0.1'

release_notes.rst

@@ -1,6 +1,10 @@
 Release Notes
 =============
 
+v2.0.0.1
+------
+* Fix unique constraint when bulk creating emails
+
 v2.0.0
 ------
 * Added bulk interface for converting to emails